From 852fdb14e19306ee9bded58477353208feca9071 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 15 Mar 2013 15:50:58 +0100 Subject: [PATCH 01/46] [IMP] code cleanup to last OpenERP coding rules --- account_credit_control/__init__.py | 4 +- account_credit_control/__openerp__.py | 18 +++-- account_credit_control/account.py | 48 +++++++------- account_credit_control/company.py | 26 ++++---- account_credit_control/line.py | 14 ++-- account_credit_control/partner.py | 17 +++-- account_credit_control/policy.py | 95 +++++++++++++-------------- account_credit_control/run.py | 61 ++++++++--------- 8 files changed, 132 insertions(+), 151 deletions(-) diff --git a/account_credit_control/__init__.py b/account_credit_control/__init__.py index fcbbd9b69..5f37efe65 100644 --- a/account_credit_control/__init__.py +++ b/account_credit_control/__init__.py @@ -24,5 +24,5 @@ from . import account from . import partner from . import policy from . import company -import wizard -import report +from . import wizard +from . import report diff --git a/account_credit_control/__openerp__.py b/account_credit_control/__openerp__.py index 02bff1ed5..cb475751a 100644 --- a/account_credit_control/__openerp__.py +++ b/account_credit_control/__openerp__.py @@ -18,13 +18,14 @@ # along with this program. If not, see . # ############################################################################## -{'name' : 'Account Credit Control', - 'version' : '0.1', - 'author' : 'Camptocamp', +{'name': 'Account Credit Control', + 'version': '0.1', + 'author': 'Camptocamp', 'maintainer': 'Camptocamp', 'category': 'Finance', 'complexity': "normal", - 'depends' : ['base', 'account', 'email_template', 'report_webkit'], + 'depends': ['base', 'account', + 'email_template', 'report_webkit'], 'description': """ Credit Control ============== @@ -57,8 +58,7 @@ On each generated line, you have many choices: * Change the state (so you can ignore or reopen lines) """, 'website': 'http://www.camptocamp.com', - 'init_xml': ["data.xml", - ], + 'init_xml': ["data.xml"], 'update_xml': ["line_view.xml", "account_view.xml", "partner_view.xml", @@ -69,12 +69,10 @@ On each generated line, you have many choices: "wizard/credit_control_marker_view.xml", "wizard/credit_control_printer_view.xml", "report/report.xml", - "security/ir.model.access.csv", - ], + "security/ir.model.access.csv",], 'demo_xml': ["credit_control_demo.xml"], 'tests': [], - 'installable': False, + 'installable': True, 'license': 'AGPL-3', 'application': True } - diff --git a/account_credit_control/account.py b/account_credit_control/account.py index a515bb9b0..5fc7a8418 100644 --- a/account_credit_control/account.py +++ b/account_credit_control/account.py @@ -18,42 +18,39 @@ # along with this program. If not, see . # ############################################################################## - -from openerp.osv.orm import Model, fields +from openerp.osv import orm, fields -class AccountAccount(Model): +class AccountAccount(orm.Model): """Add a link to a credit control policy on account.account""" _inherit = "account.account" - _columns = { - 'credit_control_line_ids': fields.one2many('credit.control.line', - 'account_id', - string='Credit Lines', - readonly=True) - } + _columns = {'credit_control_line_ids': fields.one2many('credit.control.line', + 'account_id', + string='Credit Lines', + readonly=True) + } -class AccountInvoice(Model): +class AccountInvoice(orm.Model): """Add a link to a credit control policy on account.account""" _inherit = "account.invoice" - _columns = { - 'credit_policy_id': fields.many2one('credit.control.policy', - 'Credit Control Policy', - help=("The Credit Control Policy " - "used for this invoice. " - "If nothing is defined, " - "it will use the account " - "setting or the partner " - "setting.")), + _columns = {'credit_policy_id': fields.many2one('credit.control.policy', + 'Credit Control Policy', + help=("The Credit Control Policy " + "used for this invoice. " + "If nothing is defined, " + "it will use the account " + "setting or the partner " + "setting.")), - 'credit_control_line_ids': fields.one2many('credit.control.line', - 'invoice_id', - string='Credit Lines', - readonly=True) - } + 'credit_control_line_ids': fields.one2many('credit.control.line', + 'invoice_id', + string='Credit Lines', + readonly=True) + } def action_move_create(self, cr, uid, ids, context=None): """ Write the id of the invoice in the generated moves. """ @@ -65,9 +62,8 @@ class AccountInvoice(Model): return res -class AccountMoveLine(Model): +class AccountMoveLine(orm.Model): _inherit = "account.move.line" _columns = {'invoice_id': fields.many2one('account.invoice', 'Invoice')} - diff --git a/account_credit_control/company.py b/account_credit_control/company.py index 7a31b7d84..eb8187a4c 100644 --- a/account_credit_control/company.py +++ b/account_credit_control/company.py @@ -18,23 +18,21 @@ # along with this program. If not, see . # ############################################################################## -from openerp.osv.orm import Model, fields +from openerp.osv import orm, fields -class ResCompany(Model): - +class ResCompany(orm.Model): + """Add credit control parameters""" _inherit = 'res.company' - _columns = { - 'credit_control_tolerance': fields.float('Credit Control Tolerance'), - # This is not a property on the partner because we cannot search - # on fields.property (subclass fields.function). - 'credit_policy_id': fields.many2one( - 'credit.control.policy', - 'Credit Control Policy', - help=("The Credit Control Policy used on partners by default. This " - "setting can be overriden on partners or invoices.")), - } + _columns = {'credit_control_tolerance': fields.float('Credit Control Tolerance'), + # This is not a property on the partner because we cannot search + # on fields.property (subclass fields.function). + 'credit_policy_id': fields.many2one('credit.control.policy', + 'Credit Control Policy', + help=("The Credit Control Policy used on partners" + " by default. This setting can be overriden" + " on partners or invoices.")), + } _defaults = {"credit_control_tolerance": 0.1} - diff --git a/account_credit_control/line.py b/account_credit_control/line.py index 208818127..7afb553b1 100644 --- a/account_credit_control/line.py +++ b/account_credit_control/line.py @@ -19,16 +19,15 @@ # ############################################################################## import logging -import pooler -from openerp.osv.orm import Model, fields +from openerp.osv import orm, fields from openerp.osv import osv from openerp.tools.translate import _ logger = logging.getLogger('credit.line.control') -class CreditControlLine(Model): +class CreditControlLine(orm.Model): """A credit control line describes an amount due by a customer for a due date. A line is created once the due date of the payment is exceeded. @@ -67,10 +66,10 @@ class CreditControlLine(Model): "generated again on the next run.")), 'channel': fields.selection([('letter', 'Letter'), - ('email', 'Email')], - 'Channel', required=True, - readonly=True, - states={'draft': [('readonly', False)]}), + ('email', 'Email')], + 'Channel', required=True, + readonly=True, + states={'draft': [('readonly', False)]}), 'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True), 'partner_id': fields.many2one('res.partner', "Partner", required=True), @@ -193,4 +192,3 @@ class CreditControlLine(Model): 'is not in draft state.')) return super(CreditControlLine, self).unlink(cr, uid, ids, context=context) - diff --git a/account_credit_control/partner.py b/account_credit_control/partner.py index 5cc33c32f..8d66428b6 100644 --- a/account_credit_control/partner.py +++ b/account_credit_control/partner.py @@ -18,10 +18,10 @@ # along with this program. If not, see . # ############################################################################## -from openerp.osv.orm import Model, fields +from openerp.osv import orm, fields -class ResPartner(Model): +class ResPartner(orm.Model): """Add a settings on the credit control policy to use on the partners, and links to the credit control lines.""" @@ -30,15 +30,14 @@ class ResPartner(Model): _columns = { 'credit_policy_id': fields.many2one('credit.control.policy', 'Credit Control Policy', - help=("The Credit Control Policy" - "used for this partner. This " - "setting can be forced on the " - "invoice. If nothing is defined, " - "it will use the company " - "setting.")), + help=("The Credit Control Policy" + "used for this partner. This " + "setting can be forced on the " + "invoice. If nothing is defined, " + "it will use the company " + "setting.")), 'credit_control_line_ids': fields.one2many('credit.control.line', 'invoice_id', string='Credit Control Lines', readonly=True) } - diff --git a/account_credit_control/policy.py b/account_credit_control/policy.py index 6f97176db..875d8a1b5 100644 --- a/account_credit_control/policy.py +++ b/account_credit_control/policy.py @@ -30,21 +30,21 @@ class CreditControlPolicy(Model): _columns = {'name': fields.char('Name', required=True, size=128), 'level_ids': fields.one2many('credit.control.policy.level', - 'policy_id', - 'Policy Levels'), + 'policy_id', + 'Policy Levels'), 'do_nothing': fields.boolean('Do nothing', - help=('For policies which should not ' - 'generate lines or are obsolete')), + help=('For policies which should not ' + 'generate lines or are obsolete')), 'company_id': fields.many2one('res.company', 'Company'), - 'account_ids': fields.many2many( - 'account.account', - string='Accounts', - required=True, - domain="[('reconcile', '=', True)]", - help='This policy will be active only for the selected accounts'), + 'account_ids': fields.many2many('account.account', + string='Accounts', + required=True, + domain="[('reconcile', '=', True)]", + help="This policy will be active only" + " for the selected accounts"), } def _move_lines_domain(self, cr, uid, policy, controlling_date, context=None): @@ -71,13 +71,12 @@ class CreditControlPolicy(Model): if user.company_id.credit_policy_id.id != policy.id: return set() - return set(move_l_obj.search( - cr, uid, - self._move_lines_domain(cr, uid, policy, controlling_date, context=context), - context=context)) + domain_line = self._move_lines_domain(cr, uid, policy, + controlling_date, context=context) + return set(move_l_obj.search(cr, uid, domain_line, context=context)) def _move_lines_subset(self, cr, uid, policy, controlling_date, - model, move_relation_field, context=None): + model, move_relation_field, context=None): """ Get the move lines related to one model for a policy. Do not use direct SQL in order to respect security rules. @@ -139,9 +138,8 @@ class CreditControlPolicy(Model): :return: set of ids to add in the process, set of ids to remove from the process """ - return self._move_lines_subset( - cr, uid, policy, controlling_date, - 'res.partner', 'partner_id', context=context) + return self._move_lines_subset(cr, uid, policy, controlling_date, + 'res.partner', 'partner_id', context=context) def _get_invoice_related_lines(self, cr, uid, policy, controlling_date, context=None): """ Get the move lines for a policy related to an invoice. @@ -154,9 +152,8 @@ class CreditControlPolicy(Model): :return: set of ids to add in the process, set of ids to remove from the process """ - return self._move_lines_subset( - cr, uid, policy, controlling_date, - 'account.invoice', 'invoice', context=context) + return self._move_lines_subset(cr, uid, policy, controlling_date, + 'account.invoice', 'invoice', context=context) def _get_move_lines_to_process(self, cr, uid, policy_id, controlling_date, context=None): """Build a list of move lines ids to include in a run for a policy at a given date. @@ -173,13 +170,14 @@ class CreditControlPolicy(Model): policy = self.browse(cr, uid, policy_id, context=context) # there is a priority between the lines, depicted by the calls below # warning, side effect method called on lines - lines = self._due_move_lines( - cr, uid, policy, controlling_date, context=context) - add_ids, remove_ids = self._get_partner_related_lines( - cr, uid, policy, controlling_date, context=context) + lines = self._due_move_lines(cr, uid, policy, controlling_date, context=context) + add_ids, remove_ids = self._get_partner_related_lines(cr, uid, policy, + controlling_date, + context=context) lines = lines.union(add_ids).difference(remove_ids) - add_ids, remove_ids = self._get_invoice_related_lines( - cr, uid, policy, controlling_date, context=context) + add_ids, remove_ids = self._get_invoice_related_lines(cr, uid, policy, + controlling_date, + context=context) lines = lines.union(add_ids).difference(remove_ids) return lines @@ -195,8 +193,8 @@ class CreditControlPolicy(Model): if isinstance(policy_id, list): policy_id = policy_id[0] cr.execute("SELECT move_line_id FROM credit_control_line" - " WHERE policy_id != %s and move_line_id in %s", - (policy_id, tuple(lines))) + " WHERE policy_id != %s and move_line_id in %s", + (policy_id, tuple(lines))) res = cr.fetchall() if res: different_lines.update([x[0] for x in res]) @@ -224,10 +222,10 @@ class CreditControlPolicyLevel(Model): 'delay_days': fields.integer('Delay (in days)', required='True'), 'email_template_id': fields.many2one('email.template', 'Email Template', - required=True), + required=True), 'channel': fields.selection([('letter', 'Letter'), - ('email', 'Email')], - 'Channel', required=True), + ('email', 'Email')], + 'Channel', required=True), 'custom_text': fields.text('Custom Message', required=True, translate=True), } @@ -314,9 +312,11 @@ class CreditControlPolicyLevel(Model): # lines from a previous level with a draft or ignored state # have to be generated again for the previous level " AND state not in ('draft', 'ignored'))") - sql += " AND" + self._get_sql_date_boundary_for_computation_mode( - cr, uid, level, controlling_date, context) - data_dict = {'controlling_date': controlling_date, 'line_ids': tuple(lines), + sql += " AND" + sql += self._get_sql_date_boundary_for_computation_mode(cr, uid, level, + controlling_date, context) + data_dict = {'controlling_date': controlling_date, + 'line_ids': tuple(lines), 'delay': level.delay_days} cr.execute(sql, data_dict) @@ -343,14 +343,15 @@ class CreditControlPolicyLevel(Model): # have to be generated again for the previous level " AND cr_line.state not in ('draft', 'ignored')\n" " AND mv_line.id in %(line_ids)s\n") - sql += " AND " + self._get_sql_date_boundary_for_computation_mode( - cr, uid, level, controlling_date, context) - previous_level_id = self._previous_level( - cr, uid, level, context=context) - previous_level = self.browse( - cr, uid, previous_level_id, context=context) - data_dict = {'controlling_date': controlling_date, 'line_ids': tuple(lines), - 'delay': level.delay_days, 'previous_level': previous_level.level} + sql += " AND " + sql += self._get_sql_date_boundary_for_computation_mode(cr, uid, level, + controlling_date, context) + previous_level_id = self._previous_level(cr, uid, level, context=context) + previous_level = self.browse(cr, uid, previous_level_id, context=context) + data_dict = {'controlling_date': controlling_date, + 'line_ids': tuple(lines), + 'delay': level.delay_days, + 'previous_level': previous_level.level} # print cr.mogrify(sql, data_dict) cr.execute(sql, data_dict) @@ -371,9 +372,7 @@ class CreditControlPolicyLevel(Model): method = self._get_first_level_move_line_ids else: method = self._get_other_level_move_line_ids - - matching_lines.update( - method(cr, uid, level, controlling_date, lines, context=context)) - + matching_lines.update(method(cr, uid, level, + controlling_date, lines, + context=context)) return matching_lines - diff --git a/account_credit_control/run.py b/account_credit_control/run.py index db5120bfe..03c833b43 100644 --- a/account_credit_control/run.py +++ b/account_credit_control/run.py @@ -20,14 +20,14 @@ ############################################################################## import logging -from openerp.osv.orm import Model, fields +from openerp.osv import orm, fields from openerp.tools.translate import _ from openerp.osv.osv import except_osv logger = logging.getLogger('credit.control.run') -class CreditControlRun(Model): +class CreditControlRun(orm.Model): """Credit Control run generate all credit control lines and reject""" _name = "credit.control.run" @@ -36,39 +36,34 @@ class CreditControlRun(Model): _columns = { 'date': fields.date('Controlling Date', required=True), 'policy_ids': fields.many2many('credit.control.policy', - rel="credit_run_policy_rel", - id1='run_id', id2='policy_id', - string='Policies', - readonly=True, - states={'draft': [('readonly', False)]}), + rel="credit_run_policy_rel", + id1='run_id', id2='policy_id', + string='Policies', + readonly=True, + states={'draft': [('readonly', False)]}), 'report': fields.text('Report', readonly=True), 'state': fields.selection([('draft', 'Draft'), - ('done', 'Done'), - ], - string='State', - required=True, - readonly=True), + ('done', 'Done')], + string='State', + required=True, + readonly=True), - 'manual_ids': fields.many2many( - 'account.move.line', - rel="credit_runreject_rel", - string='Lines to handle manually', - help=('If a credit control line has been generated on a policy ' - 'and the policy has been changed meantime, ' - 'it has to be handled manually'), - readonly=True), + 'manual_ids': fields.many2many('account.move.line', + rel="credit_runreject_rel", + string='Lines to handle manually', + help=('If a credit control line has been generated on a policy' + ' and the policy has been changed meantime,' + ' it has to be handled manually'), + readonly=True), } def _get_policies(self, cr, uid, context=None): - return self.pool.get('credit.control.policy').\ - search(cr, uid, [], context=context) + return self.pool['credit.control.policy'].search(cr, uid, [], context=context) - _defaults = { - 'state': 'draft', - 'policy_ids': _get_policies, - } + _defaults = {'state': 'draft', + 'policy_ids': _get_policies} def _check_run_date(self, cr, uid, ids, controlling_date, context=None): """Ensure that there is no credit line in the future using controlling_date""" @@ -86,7 +81,7 @@ class CreditControlRun(Model): """ Generate credit control lines. """ cr_line_obj = self.pool.get('credit.control.line') assert not (isinstance(run_id, list) and len(run_id) > 1), \ - "run_id: only one id expected" + "run_id: only one id expected" if isinstance(run_id, list): run_id = run_id[0] @@ -140,14 +135,12 @@ class CreditControlRun(Model): """ try: cr.execute('SELECT id FROM credit_control_run' - ' LIMIT 1 FOR UPDATE NOWAIT' ) - except Exception, exc: + ' LIMIT 1 FOR UPDATE NOWAIT') + except Exception as exc: # in case of exception openerp will do a rollback for us and free the lock - raise except_osv( - _('Error'), - _('A credit control run is already running' - ' in background, please try later.'), str(exc)) + raise except_osv(_('Error'), + _('A credit control run is already running' + ' in background, please try later.'), repr(exc)) self._generate_credit_lines(cr, uid, run_id, context) return True - From 58fc689dad6dcf4b98858d318bbff622b75a7476 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 18 Mar 2013 10:21:33 +0100 Subject: [PATCH 02/46] [FIX] broken views in V7.0 --- account_credit_control/line_view.xml | 2 +- account_credit_control/policy_view.xml | 14 +++++++------- account_credit_control/run_view.xml | 4 ++-- .../wizard/credit_control_emailer_view.xml | 2 +- .../wizard/credit_control_marker_view.xml | 2 +- .../wizard/credit_control_printer_view.xml | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/account_credit_control/line_view.xml b/account_credit_control/line_view.xml index a66f64c4d..f48708d2f 100644 --- a/account_credit_control/line_view.xml +++ b/account_credit_control/line_view.xml @@ -28,7 +28,7 @@ Credit Control Lines - credit.control.lines + credit.control.line search diff --git a/account_credit_control/policy_view.xml b/account_credit_control/policy_view.xml index 99daac65e..5e12f4516 100644 --- a/account_credit_control/policy_view.xml +++ b/account_credit_control/policy_view.xml @@ -6,14 +6,14 @@ credit.control.policy form -
+ - + - + @@ -21,7 +21,7 @@ - + @@ -51,7 +51,7 @@ credit.control.policy tree - + @@ -84,7 +84,7 @@ credit.control.policy.level form - + @@ -107,7 +107,7 @@ credit.control.policy.level tree - + diff --git a/account_credit_control/run_view.xml b/account_credit_control/run_view.xml index b3a7be8ae..2ca3e6827 100644 --- a/account_credit_control/run_view.xml +++ b/account_credit_control/run_view.xml @@ -6,7 +6,7 @@ credit.control.run tree - + @@ -18,7 +18,7 @@ credit.control.run form - + diff --git a/account_credit_control/wizard/credit_control_emailer_view.xml b/account_credit_control/wizard/credit_control_emailer_view.xml index ba28fd139..ac0e5eb8c 100644 --- a/account_credit_control/wizard/credit_control_emailer_view.xml +++ b/account_credit_control/wizard/credit_control_emailer_view.xml @@ -6,7 +6,7 @@ credit.control.emailer form - + diff --git a/account_credit_control/wizard/credit_control_marker_view.xml b/account_credit_control/wizard/credit_control_marker_view.xml index b8de161ae..567a26037 100644 --- a/account_credit_control/wizard/credit_control_marker_view.xml +++ b/account_credit_control/wizard/credit_control_marker_view.xml @@ -6,7 +6,7 @@ credit.control.marker form - + diff --git a/account_credit_control/wizard/credit_control_printer_view.xml b/account_credit_control/wizard/credit_control_printer_view.xml index f46128fe3..dd07c1b13 100644 --- a/account_credit_control/wizard/credit_control_printer_view.xml +++ b/account_credit_control/wizard/credit_control_printer_view.xml @@ -6,7 +6,7 @@ credit.control.printer form - + From 8754824f09f90a64ea5e189e76cb53e350110b77 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 19 Mar 2013 12:23:45 +0100 Subject: [PATCH 03/46] [FIX] group without addon --- account_credit_control/account_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_credit_control/account_view.xml b/account_credit_control/account_view.xml index cb44a7c67..f43ce633a 100644 --- a/account_credit_control/account_view.xml +++ b/account_credit_control/account_view.xml @@ -17,7 +17,7 @@ + groups="account_credit_control.group_account_credit_control_manager,account_credit_control.group_account_credit_control_user,account_credit_control.group_account_credit_control_info"> From 628f6569f66941af107acb6e3dbd8628f6888c44 Mon Sep 17 00:00:00 2001 From: openerp Date: Mon, 25 Mar 2013 15:17:45 +0100 Subject: [PATCH 04/46] [ADD] credit control scenarios --- account_credit_control/policy.py | 2 +- account_credit_control/run.py | 3 +- .../features/00_credit_control_param.feature | 46 ++ .../01_credit_control_partners.feature | 105 ++++ .../02_credit_control_invoices.feature | 588 ++++++++++++++++++ .../03_credit_control_run_jan.feature | 29 + .../04_credit_control_run_feb.feature | 33 + .../05_credit_control_run_mar.feature | 66 ++ .../06_credit_control_run_apr.feature | 43 ++ .../07_credit_control_run_may.feature | 106 ++++ .../08_credit_control_run_jun.feature | 38 ++ .../09_credit_control_run_jul.feature | 35 ++ .../features/steps/account_credit_control.py | 92 +++ 13 files changed, 1183 insertions(+), 3 deletions(-) create mode 100644 account_credit_control/scenarios/features/00_credit_control_param.feature create mode 100644 account_credit_control/scenarios/features/01_credit_control_partners.feature create mode 100644 account_credit_control/scenarios/features/02_credit_control_invoices.feature create mode 100644 account_credit_control/scenarios/features/03_credit_control_run_jan.feature create mode 100644 account_credit_control/scenarios/features/04_credit_control_run_feb.feature create mode 100644 account_credit_control/scenarios/features/05_credit_control_run_mar.feature create mode 100644 account_credit_control/scenarios/features/06_credit_control_run_apr.feature create mode 100644 account_credit_control/scenarios/features/07_credit_control_run_may.feature create mode 100644 account_credit_control/scenarios/features/08_credit_control_run_jun.feature create mode 100644 account_credit_control/scenarios/features/09_credit_control_run_jul.feature create mode 100644 account_credit_control/scenarios/features/steps/account_credit_control.py diff --git a/account_credit_control/policy.py b/account_credit_control/policy.py index 875d8a1b5..cf312d504 100644 --- a/account_credit_control/policy.py +++ b/account_credit_control/policy.py @@ -34,7 +34,7 @@ class CreditControlPolicy(Model): 'Policy Levels'), 'do_nothing': fields.boolean('Do nothing', - help=('For policies which should not ' + help=('For policies which should not', 'generate lines or are obsolete')), 'company_id': fields.many2one('res.company', 'Company'), diff --git a/account_credit_control/run.py b/account_credit_control/run.py index 03c833b43..1f86447a4 100644 --- a/account_credit_control/run.py +++ b/account_credit_control/run.py @@ -105,9 +105,8 @@ class CreditControlRun(orm.Model): manual_lines = policy._lines_different_policy(lines, context=context) lines.difference_update(manual_lines) manually_managed_lines.update(manual_lines) - + policy_generated_ids = [] if lines: - policy_generated_ids = [] # policy levels are sorted by level so iteration is in the correct order for level in reversed(policy.level_ids): level_lines = level.get_level_lines(run.date, lines, context=context) diff --git a/account_credit_control/scenarios/features/00_credit_control_param.feature b/account_credit_control/scenarios/features/00_credit_control_param.feature new file mode 100644 index 000000000..c32e47fb5 --- /dev/null +++ b/account_credit_control/scenarios/features/00_credit_control_param.feature @@ -0,0 +1,46 @@ +############################################################################### +# +# OERPScenario, OpenERP Functional Tests +# Copyright 2009 Camptocamp SA +# +############################################################################## +############################################################################## +# Branch # Module # Processes # System +@account_credit_control @account_credit_control_setup + +Feature: General parameters in order to test the credit control module + + @account_credit_control_setup_install_modules + Scenario: MODULES INSTALLATION + + Given I do not want all demo data to be loaded on install + Given I install the required modules with dependencies: + | name | + | account_credit_control | + + Then my modules should have been installed and models reloaded + + @email_params_mailtrap + Scenario: E-MAIL PARAMS WITH EMAIL EATER (http://mailtrap.railsware.com/) + Given I need a "ir.mail_server" with name: mailstrap_testings + And having: + | name | value | + | smtp_host | mailtrap.railsware.com | + | sequence | 1 | + | smtp_port | 2525 | + | smtp_user | camptocamp1 | + | smtp_pass | 20468fa2f2879cb9 | + + @account_credit_control_policy_2_times + Scenario: Configure the credit control policy in 2 times + Given I configure the following accounts on the credit control policy with oid: "account_credit_control.credit_control_2_time": + | account code | + | 4111 | + | 4112 | + + @account_credit_control_policy_3_times + Scenario: Configure the credit control policy in 3 times + Given I configure the following accounts on the credit control policy with oid: "account_credit_control.credit_control_3_time": + | account code | + | 4111 | + | 4112 | diff --git a/account_credit_control/scenarios/features/01_credit_control_partners.feature b/account_credit_control/scenarios/features/01_credit_control_partners.feature new file mode 100644 index 000000000..9edb192c7 --- /dev/null +++ b/account_credit_control/scenarios/features/01_credit_control_partners.feature @@ -0,0 +1,105 @@ +############################################################################### +# +# OERPScenario, OpenERP Functional Tests +# Copyright 2009 Camptocamp SA +# +############################################################################## +############################################################################## +# Branch # Module # Processes # System +@account_credit_control @account_credit_control_add_policy @account_credit_control_setup + +Feature: I add policy to partners already created + @account_credit_control_partner_1 + Scenario: Partner_1 + Given I need a "res.partner" with oid: scen.partner_1 + And having: + | name | value | + | name | partner_1 | + | credit_policy_id | by name: No follow | + + @account_credit_control_customer_1 + Scenario: Customer_1 + Given I need a "res.partner" with oid: scen.customer_1 + And having: + | name | value | + | name | customer_1 | + | credit_policy_id | by name: 2 time policy | + + @account_credit_control_customer_2 + Scenario: Customer_2 + Given I need a "res.partner" with oid: scen.customer_2 + And having: + | name | value | + | name | customer_2 | + | credit_policy_id | by name: 2 time policy | + + @account_credit_control_customer_3 + Scenario: Customer_3 + Given I need a "res.partner" with oid: scen.customer_3 + And having: + | name | value | + | name | customer_3 | + | credit_policy_id | by name: 2 time policy | + + @account_credit_control_customer_4 + Scenario: Customer_4 + Given I need a "res.partner" with oid: scen.customer_4 + And having: + | name | value | + | name | customer_4 | + # the credit policy must be 3 time policy (inherited from company) + + @account_credit_control_customer_5 + Scenario: Customer_5 + Given I need a "res.partner" with oid: scen.customer_5 + And having: + | name | value | + | name | customer_5_usd | + | credit_policy_id | by name: 3 time policy | + + @account_credit_control_customer_6 + Scenario: Customer_6 + Given I need a "res.partner" with oid: scen.customer_6 + And having: + | name | value | + | name | customer_6 | + | credit_policy_id | by name: 3 time policy | + + @account_credit_control_customer_partial_pay + Scenario: A customer who like to do partial payments + Given I need a "res.partner" with oid: scen.customer_partial_pay + And having: + | name | value | + | name | Scrooge McDuck | + | zip | 1000 | + | city | Duckburg | + | email | openerp@locahost.dummy | + | phone | | + | street | Duckstreet | + + + @account_credit_control_customer_multiple_payterm + Scenario: A customer who use payment terms in 2 times + Given I need a "res.partner" with oid: scen.customer_multiple_payterm + And having: + | name | value | + | name | Donald Duck | + | zip | 1100 | + | city | Duckburg | + | email | openerp@locahost.dummy | + | phone | | + | street | Duckstreet | + + @account_credit_control_customer_multiple_payterm2 + Scenario: A customer who use payment terms in 2 times + Given I need a "res.partner" with oid: scen.customer_multiple_payterm2 + And having: + | name | value | + | name | Gus Goose | + | type | default | + | name | Gus Goose | + | zip | 1100 | + | city | Duckburg | + | email | openerp@locahost.dummy | + | phone | | + | street | Duckstreet | diff --git a/account_credit_control/scenarios/features/02_credit_control_invoices.feature b/account_credit_control/scenarios/features/02_credit_control_invoices.feature new file mode 100644 index 000000000..d9803c378 --- /dev/null +++ b/account_credit_control/scenarios/features/02_credit_control_invoices.feature @@ -0,0 +1,588 @@ +############################################################################### +# +# OERPScenario, OpenERP Functional Tests +# Copyright 2012 Camptocamp SA +# Author Nicolas Bessi +############################################################################## + + +@account_credit_control @account_credit_control_setup @account_credit_control_base_data @account_credit_control_invoices + +Feature: Invoices creation + +##################### Partner 1 ########################################################## + + @inv_1 + Scenario: Create invoice 1 + + Given I need a "account.invoice" with oid: scen._inv_1 + And having: + | name | value | + | name | SI_1 | + | date_invoice | %Y-01-15 | + | partner_id | by oid: scen.partner_1 | + | account_id | by name: Debtors | + | journal_id | by name: Sales | + | currency_id | by name: EUR | + | payment_term | by name: 30 Days End of Month | + | type | out_invoice | + + + Given I need a "account.invoice.line" with oid: scen._inv1_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 1000 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_1 | + Given I find a "account.invoice" with oid: scen._inv_1 + + Given I need a "account.invoice.line" with oid: scen._inv1_line2 + And having: + | name | value | + | name | invoice line 2 | + | quantity | 1 | + | price_unit | 1000 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_1 | + Given I find a "account.invoice" with oid: scen._inv_1 + And I open the credit invoice + + @inv_2 + Scenario: Create invoice 2 + Given I need a "account.invoice" with oid: scen._inv_2 + And having: + | name | value | + | name | SI_2 | + | date_invoice | %Y-02-15 | + | partner_id | by oid: scen.partner_1 | + | account_id | by name: Debtors | + | journal_id | by name: Sales | + | currency_id | by name: USD | + | payment_term | by name: 30 Days End of Month | + | type | out_invoice | + + + Given I need a "account.invoice.line" with oid: scen._inv2_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 1200 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_2 | + Given I find a "account.invoice" with oid: scen._inv_2 + And I open the credit invoice + + + @inv_3 + Scenario: Create invoice 3 + Given I need a "account.invoice" with oid: scen._inv_3 + And having: + | name | value | + | name | SI_3 | + | date_invoice | %Y-03-15 | + | partner_id | by oid: scen.partner_1 | + | account_id | by name: Debtors | + | journal_id | by name: Sales | + | currency_id | by name: USD | + | payment_term | by name: 30 Days End of Month | + | type | out_invoice | + + + Given I need a "account.invoice.line" with oid: scen._inv3_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 1500 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_3 | + Given I find a "account.invoice" with oid: scen._inv_3 + And I open the credit invoice + +##################### Customer 2 ########################################################## + + @inv_4 + Scenario: Create invoice 4 + + Given I need a "account.invoice" with oid: scen._inv_4 + And having: + | name | value | + | name | SI_4 | + | date_invoice | %Y-01-18 | + | partner_id | by oid: scen.customer_2 | + | account_id | by name: Debtors | + | journal_id | by name: Sales | + | currency_id | by name: EUR | + | payment_term | by name: 30 Days End of Month | + | type | out_invoice | + + + Given I need a "account.invoice.line" with oid: scen._inv4_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 1000 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_4 | + Given I find a "account.invoice" with oid: scen._inv_4 + And I open the credit invoice + + + + @inv_5 + Scenario: Create invoice 5 + Given I need a "account.invoice" with oid: scen._inv_5 + And having: + | name | value | + | name | SI_5 | + | date_invoice | %Y-02-15 | + | partner_id | by oid: scen.customer_2 | + | account_id | by name: Debtors | + | journal_id | by name: Sales | + | currency_id | by name: USD | + | payment_term | by name: 30 Days End of Month | + | type | out_invoice | + + + Given I need a "account.invoice.line" with oid: scen._inv5_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 1200 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_5 | + Given I find a "account.invoice" with oid: scen._inv_5 + And I open the credit invoice + + + @inv_6 + Scenario: Create invoice 6 + Given I need a "account.invoice" with oid: scen._inv_6 + And having: + | name | value | + | name | SI_6 | + | date_invoice | %Y-03-15 | + | partner_id | by oid: scen.customer_2 | + | account_id | by name: Debtors | + | journal_id | by name: Sales | + | currency_id | by name: USD | + | payment_term | by name: 30 Days End of Month | + | type | out_invoice | + + + Given I need a "account.invoice.line" with oid: scen._inv6_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 1500 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_6 | + Given I find a "account.invoice" with oid: scen._inv_6 + And I open the credit invoice + +##################### Customer 3 ########################################################## + + @inv_7 + Scenario: Create invoice 7 + + Given I need a "account.invoice" with oid: scen._inv_7 + And having: + | name | value | + | name | SI_7 | + | date_invoice | %Y-01-18 | + | partner_id | by oid: scen.customer_3 | + | account_id | by name: Debtors | + | journal_id | by name: Sales | + | currency_id | by name: EUR | + | payment_term | by name: 30 Net Days | + | type | out_invoice | + + + Given I need a "account.invoice.line" with oid: scen._inv7_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 1000 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_7 | + Given I find a "account.invoice" with oid: scen._inv_7 + And I open the credit invoice + + + + @inv_8 + Scenario: Create invoice 8 + Given I need a "account.invoice" with oid: scen._inv_8 + And having: + | name | value | + | name | SI_8 | + | date_invoice | %Y-02-15 | + | partner_id | by oid: scen.customer_3 | + | account_id | by name: Debtors | + | journal_id | by name: Sales | + | currency_id | by name: USD | + | payment_term | by name: 30 Net Days | + | type | out_invoice | + + + Given I need a "account.invoice.line" with oid: scen._inv8_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 1200 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_8 | + Given I find a "account.invoice" with oid: scen._inv_8 + And I open the credit invoice + + + @inv_9 + Scenario: Create invoice 9 + Given I need a "account.invoice" with oid: scen._inv_9 + And having: + | name | value | + | name | SI_9 | + | date_invoice | %Y-03-15 | + | partner_id | by oid: scen.customer_3 | + | account_id | by name: Debtors | + | journal_id | by name: Sales | + | currency_id | by name: USD | + | payment_term | by name: 30 Net Days | + | type | out_invoice | + + + Given I need a "account.invoice.line" with oid: scen._inv9_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 1500 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_9 | + Given I find a "account.invoice" with oid: scen._inv_9 + And I open the credit invoice + +##################### Customer 4 ########################################################## + + @inv_10 + Scenario: Create invoice 10 + + Given I need a "account.invoice" with oid: scen._inv_10 + And having: + | name | value | + | name | SI_10 | + | date_invoice | %Y-01-18 | + | partner_id | by oid: scen.customer_4 | + | account_id | by name: Debtors | + | journal_id | by name: Sales | + | currency_id | by name: EUR | + | payment_term | by name: 30% Advance End 30 Days | + | type | out_invoice | + + + Given I need a "account.invoice.line" with oid: scen._inv10_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 1000 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_10 | + Given I find a "account.invoice" with oid: scen._inv_10 + And I open the credit invoice + + + + @inv_11 + Scenario: Create invoice 11 + Given I need a "account.invoice" with oid: scen._inv_11 + And having: + | name | value | + | name | SI_11 | + | date_invoice | %Y-02-15 | + | partner_id | by oid: scen.customer_4 | + | account_id | by name: Debtors | + | journal_id | by name: Sales | + | currency_id | by name: USD | + | payment_term | by name: 30% Advance End 30 Days | + | type | out_invoice | + + + Given I need a "account.invoice.line" with oid: scen._inv11_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 1200 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_11 | + Given I find a "account.invoice" with oid: scen._inv_11 + And I open the credit invoice + + + @inv_12 + Scenario: Create invoice 12 + Given I need a "account.invoice" with oid: scen._inv_12 + And having: + | name | value | + | name | SI_12 | + | date_invoice | %Y-03-15 | + | partner_id | by oid: scen.customer_4 | + | account_id | by name: Debtors | + | journal_id | by name: Sales | + | currency_id | by name: USD | + | payment_term | by name: 30% Advance End 30 Days | + | type | out_invoice | + + + Given I need a "account.invoice.line" with oid: scen._inv12_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 1500 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_12 | + Given I find a "account.invoice" with oid: scen._inv_12 + And I open the credit invoice + +##################### Customer 5 ########################################################## + + @inv_13 + Scenario: Create invoice 13 + + Given I need a "account.invoice" with oid: scen._inv_13 + And having: + | name | value | + | name | SI_13 | + | date_invoice | %Y-01-18 | + | partner_id | by oid: scen.customer_5 | + | account_id | by name: Debtors USD | + | journal_id | by name: Sales | + | currency_id | by name: USD | + | payment_term | by name: 30 Net Days | + | type | out_invoice | + + + Given I need a "account.invoice.line" with oid: scen._inv13_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 1000 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_13 | + Given I find a "account.invoice" with oid: scen._inv_13 + And I open the credit invoice + + + + @inv_14 + Scenario: Create invoice 14 + Given I need a "account.invoice" with oid: scen._inv_14 + And having: + | name | value | + | name | SI_14 | + | date_invoice | %Y-02-15 | + | partner_id | by oid: scen.customer_5 | + | account_id | by name: Debtors USD | + | journal_id | by name: Sales | + | currency_id | by name: USD | + | payment_term | by name: 30 Net Days | + | type | out_invoice | + + + Given I need a "account.invoice.line" with oid: scen._inv14_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 1200 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_14 | + Given I find a "account.invoice" with oid: scen._inv_14 + And I open the credit invoice + + + @inv_15 + Scenario: Create invoice 15 + Given I need a "account.invoice" with oid: scen._inv_15 + And having: + | name | value | + | name | SI_15 | + | date_invoice | %Y-03-15 | + | partner_id | by oid: scen.customer_5 | + | account_id | by name: Debtors USD | + | journal_id | by name: Sales | + | currency_id | by name: USD | + | payment_term | by name: 30 Net Days | + | type | out_invoice | + + + Given I need a "account.invoice.line" with oid: scen._inv15_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 1500 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_15 | + Given I find a "account.invoice" with oid: scen._inv_15 + And I open the credit invoice + + @inv_16 + Scenario: Create invoice 16 + Given I need a "account.invoice" with oid: scen._inv_16 + And having: + | name | value | + | name | SI_16 | + | date_invoice | %Y-03-15 | + | partner_id | by oid: scen.customer_4 | + | account_id | by name: Debtors | + | journal_id | by name: Sales | + | currency_id | by name: EUR | + | payment_term | by name: 30 Net Days | + | type | out_invoice | + + And I need a "account.invoice.line" with oid: scen._inv16_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 1500 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_16 | + Then I find a "account.invoice" with oid: scen._inv_16 + And I open the credit invoice + + @inv_17 + Scenario: Create invoice 17 + Given I need a "account.invoice" with oid: scen._inv_17 + And having: + | name | value | + | name | SI_17 | + | date_invoice | %Y-03-15 | + | partner_id | by oid: scen.customer_partial_pay | + | account_id | by name: Debtors | + | journal_id | by name: Sales | + | currency_id | by name: EUR | + | payment_term | by name: 30 Net Days | + | type | out_invoice | + + And I need a "account.invoice.line" with oid: scen._inv17_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 1500 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_17 | + Then I find a "account.invoice" with oid: scen._inv_17 + And I open the credit invoice + + @inv_18 + Scenario: Create invoice 18 + Given I need a "account.invoice" with oid: scen._inv_18 + And having: + | name | value | + | name | SI_18 | + | date_invoice | %Y-03-15 | + | partner_id | by oid: scen.customer_multiple_payterm | + | account_id | by name: Debtors | + | journal_id | by name: Sales | + | currency_id | by name: EUR | + | payment_term | by name: 30% Advance End 30 Days | + | type | out_invoice | + + And I need a "account.invoice.line" with oid: scen._inv18_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 1500 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_18 | + Then I find a "account.invoice" with oid: scen._inv_18 + And I open the credit invoice + + @inv_19 + Scenario: Create invoice 19 + Given I need a "account.invoice" with oid: scen._inv_19 + And having: + | name | value | + | name | SI_19 | + | date_invoice | %Y-03-15 | + | partner_id | by oid: scen.customer_multiple_payterm2 | + | account_id | by name: Debtors | + | journal_id | by name: Sales | + | currency_id | by name: EUR | + | payment_term | by name: 30% Advance End 30 Days | + | type | out_invoice | + And I need a "account.invoice.line" with oid: scen._inv19_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 1500 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_19 | + Then I find a "account.invoice" with oid: scen._inv_19 + And I open the credit invoice + + @inv_20 + Scenario: Create invoice 20 + Given I need a "account.invoice" with oid: scen._inv_20 + And having: + | name | value | + | name | SI_20_test_tolerance | + | date_invoice | %Y-03-23 | + | partner_id | by oid: scen.customer_6 | + | account_id | by name: Debtors | + | journal_id | by name: Sales | + | currency_id | by name: EUR | + | payment_term | by name: 30 Net Days | + | type | out_invoice | + + And I need a "account.invoice.line" with oid: scen._inv20_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 0.09 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_20 | + Then I find a "account.invoice" with oid: scen._inv_20 + And I open the credit invoice + + @inv_20 + Scenario: Create invoice 21 (this receivable account must not be chased-> no credit line creation) + Given I need a "account.invoice" with oid: scen._inv_21 + And having: + | name | value | + | name | SI_21_test_receivable_account_excluded | + | date_invoice | %Y-03-25 | + | partner_id | by oid: scen.customer_6 | + | account_id | by name: Debtors GBP | + | journal_id | by name: Sales | + | currency_id | by name: EUR | + | payment_term | by name: 30 Net Days | + | type | out_invoice | + + And I need a "account.invoice.line" with oid: scen._inv21_line1 + And having: + | name | value | + | name | invoice line 1 | + | quantity | 1 | + | price_unit | 6666 | + | account_id | by name: Sales | + | invoice_id | by oid: scen._inv_21 | + Then I find a "account.invoice" with oid: scen._inv_21 + And I open the credit invoice diff --git a/account_credit_control/scenarios/features/03_credit_control_run_jan.feature b/account_credit_control/scenarios/features/03_credit_control_run_jan.feature new file mode 100644 index 000000000..8ef59690d --- /dev/null +++ b/account_credit_control/scenarios/features/03_credit_control_run_jan.feature @@ -0,0 +1,29 @@ +############################################################################### +# +# OERPScenario, OpenERP Functional Tests +# Copyright 2012 Camptocamp SA +# Author Nicolas Bessi +############################################################################## + +# Features Generic tags (none for all) +############################################################################## + +@account_credit_control @account_credit_control_run @account_credit_control_run_jan + +Feature: Ensure that mail credit line generation first pass is correct + + Scenario: clean data + Given I clean all the credit lines + #Given I unreconcile and clean all move line + + @account_credit_control_run_month + Scenario: Create run + Given I need a "credit.control.run" with oid: credit_control.run1 + And having: + | name | value | + | date | %Y-01-31 | + When I launch the credit run + Then my credit run should be in state "done" + And the generated credit lines should have the following values: + | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | + | 300 | %Y-01-18 | Debtors | 3 time policy | %Y-01-31 | customer_4 | email | 1 | SI_10 | 10 days net | draft | 300 | | diff --git a/account_credit_control/scenarios/features/04_credit_control_run_feb.feature b/account_credit_control/scenarios/features/04_credit_control_run_feb.feature new file mode 100644 index 000000000..b76198f3a --- /dev/null +++ b/account_credit_control/scenarios/features/04_credit_control_run_feb.feature @@ -0,0 +1,33 @@ +############################################################################### +# +# OERPScenario, OpenERP Functional Tests +# Copyright 2012 Camptocamp SA +# Author Nicolas Bessi +############################################################################## + +# Features Generic tags (none for all) +############################################################################## + +@account_credit_control_run @account_credit_control_run_feb + +Feature: Ensure that mail credit line generation first pass is correct + + @account_credit_control_mark + Scenario: mark lines + Given there is "draft" credit lines + And I mark all draft email to state "to_be_sent" + Then the draft line should be in state "to_be_sent" + + @account_credit_control_run_month + Scenario: Create run + Given I need a "credit.control.run" with oid: credit_control.run2 + And having: + | name | value | + | date | 2012-02-29 | + When I launch the credit run + Then my credit run should be in state "done" + And the generated credit lines should have the following values: + | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | + | 360 | 2012-02-15 | Debtors | 3 time policy | 2012-02-29 | customer_4 | email | 1 | SI_11 | 10 days net | draft | 360 | USD | + | 1000 | 2012-02-17 | Debtors USD | 3 time policy | 2012-02-29 | customer_5_usd | email | 1 | SI_13 | 10 days net | draft | 1000 | USD | + | 300 | 2012-01-18 | Debtors | 3 time policy | 2012-02-29 | customer_4 | email | 2 | SI_10 | 30 days end of month | draft | 300 | | diff --git a/account_credit_control/scenarios/features/05_credit_control_run_mar.feature b/account_credit_control/scenarios/features/05_credit_control_run_mar.feature new file mode 100644 index 000000000..c43c7fcd5 --- /dev/null +++ b/account_credit_control/scenarios/features/05_credit_control_run_mar.feature @@ -0,0 +1,66 @@ +############################################################################### +# +# OERPScenario, OpenERP Functional Tests +# Copyright 2012 Camptocamp SA +# Author Nicolas Bessi +############################################################################## + +# Features Generic tags (none for all) +############################################################################## + +@account_credit_control_run @account_credit_control_run_mar + +Feature: Ensure that email credit line generation first pass is correct + + @account_credit_control_mark + Scenario: mark lines + Given there is "draft" credit lines + And I mark all draft email to state "to_be_sent" + Then the draft line should be in state "to_be_sent" + + @pay_invoice_si_19_part1 + Scenario: I pay a part of the first part of the invoice SI 19, + Given I need a "account.bank.statement" with oid: scen.voucher_statement_si_19 + And having: + | name | value | + | name | Bk.St.si_19_part1 | + | date | 2012-03-31 | + | currency_id | by name: EUR | + | journal_id | by oid: scen.voucher_eur_journal | + And the bank statement is linked to period "03/2012" + And I import invoice "SI_19" using import invoice button + And I should have a "account.bank.statement.line" with name: SI_19 and amount: 450 + And the line amount should be 450 + And I set the voucher paid amount to "300" + And I save the voucher + Then I modify the line amount to 300 + And I should have a "account.bank.statement.line" with name: SI_19 and amount: 1050 + And the line amount should be 1050 + And I set the voucher paid amount to "0" + And I save the voucher + Then I modify the line amount to 0 + And I should have a "account.bank.statement" with oid: scen.voucher_statement_si_19 + And I set bank statement end-balance + When I confirm bank statement + Then My invoice "SI_19" is in state "open" reconciled with a residual amount of "1200.0" + + @account_credit_control_run_month + Scenario: Create run + Given I need a "credit.control.run" with oid: credit_control.run3 + And having: + | name | value | + | date | 2012-03-31 | + When I launch the credit run + Then my credit run should be in state "done" + And the generated credit lines should have the following values: + | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | + | 1000 | 2012-02-29 | Debtors | 2 time policy | 2012-03-31 | customer_2 | email | 1 | SI_4 | 30 days end of month | draft | 1000 | | + | 1000 | 2012-02-17 | Debtors | 2 time policy | 2012-03-31 | customer_3 | email | 1 | SI_7 | 30 days end of month | draft | 1000 | | + | 700 | 2012-02-29 | Debtors | 3 time policy | 2012-03-31 | customer_4 | email | 1 | SI_10 | 10 days net | draft | 700 | | + | 450 | 2012-03-15 | Debtors | 3 time policy | 2012-03-31 | customer_4 | email | 1 | SI_12 | 10 days net | draft | 450 | | + | 1200 | 2012-03-16 | Debtors USD | 3 time policy | 2012-03-31 | customer_5_usd | email | 1 | SI_14 | 10 days net | draft | 1200 | USD | + | 360 | 2012-02-15 | Debtors | 3 time policy | 2012-03-31 | customer_4 | email | 2 | SI_11 | 30 days end of month | draft | 360 | USD | + | 1000 | 2012-02-17 | Debtors USD | 3 time policy | 2012-03-31 | customer_5_usd | email | 2 | SI_13 | 30 days end of month | draft | 1000 | USD | + | 300 | 2012-01-18 | Debtors | 3 time policy | 2012-03-31 | customer_4 | letter | 3 | SI_10 | 10 days last reminder | draft | 300 | | + | 450 | 2012-03-15 | Debtors | 3 time policy | 2012-03-31 | Donald Duck | email | 1 | SI_18 | 10 days net | draft | 450 | | + | 150 | 2012-03-15 | Debtors | 3 time policy | 2012-03-31 | Gus Goose | email | 1 | SI_19 | 10 days net | draft | 450 | | diff --git a/account_credit_control/scenarios/features/06_credit_control_run_apr.feature b/account_credit_control/scenarios/features/06_credit_control_run_apr.feature new file mode 100644 index 000000000..76c8cec90 --- /dev/null +++ b/account_credit_control/scenarios/features/06_credit_control_run_apr.feature @@ -0,0 +1,43 @@ +############################################################################### +# +# OERPScenario, OpenERP Functional Tests +# Copyright 2012 Camptocamp SA +# Author Nicolas Bessi +############################################################################## + +# Features Generic tags (none for all) +############################################################################## + +@account_credit_control_run @account_credit_control_run_apr + +Feature: Ensure that email credit line generation first pass is correct + + @account_credit_control_mark + Scenario: mark lines + Given there is "draft" credit lines + And I mark all draft email to state "to_be_sent" + Then the draft line should be in state "to_be_sent" + + @account_credit_control_run_month + Scenario: Create run + Given I need a "credit.control.run" with oid: credit_control.run4 + And having: + | name | value | + | date | 2012-04-30 | + When I launch the credit run + Then my credit run should be in state "done" + And the generated credit lines should have the following values: + | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | + | 1200 | 2012-03-31 | Debtors | 2 time policy | 2012-04-30 | customer_2 | email | 1 | SI_5 | 30 days end of month | draft | 1200 | USD | + | 1200 | 2012-03-16 | Debtors | 2 time policy | 2012-04-30 | customer_3 | email | 1 | SI_8 | 30 days end of month | draft | 1200 | USD | + | 840 | 2012-03-31 | Debtors | 3 time policy | 2012-04-30 | customer_4 | email | 1 | SI_11 | 10 days net | draft | 840 | USD | + | 1500 | 2012-04-14 | Debtors USD | 3 time policy | 2012-04-30 | customer_5_usd | email | 1 | SI_15 | 10 days net | draft | 1500 | USD | + | 700 | 2012-02-29 | Debtors | 3 time policy | 2012-04-30 | customer_4 | email | 2 | SI_10 | 30 days end of month | draft | 700 | | + | 450 | 2012-03-15 | Debtors | 3 time policy | 2012-04-30 | customer_4 | email | 2 | SI_12 | 30 days end of month | draft | 450 | USD | + | 1200 | 2012-03-16 | Debtors USD | 3 time policy | 2012-04-30 | customer_5_usd | email | 2 | SI_14 | 30 days end of month | draft | 1200 | USD | + | 360 | 2012-02-15 | Debtors | 3 time policy | 2012-04-30 | customer_4 | letter | 3 | SI_12 | 10 days last reminder | draft | 360 | USD | + | 1000 | 2012-02-17 | Debtors USD | 3 time policy | 2012-04-30 | customer_5_usd | letter | 3 | SI_14 | 10 days last reminder | draft | 1000 | USD | + | 1500 | 2012-04-14 | Debtors | 3 time policy | 2012-04-30 | customer_4 | email | 1 | SI_16 | 10 days net | draft | 1500 | | + | 1500 | 2012-04-14 | Debtors | 3 time policy | 2012-04-30 | customer_4 | email | 1 | SI_17 | 10 days net | draft | 1500 | | + | 450 | 2012-03-15 | Debtors | 3 time policy | 2012-04-30 | Donald Duck | email | 2 | SI_18 | 30 days end of month | draft | 450 | | + | 150 | 2012-03-15 | Debtors | 3 time policy | 2012-04-30 | Gus Goose | email | 2 | SI_19 | 30 days end of month | draft | 450 | | diff --git a/account_credit_control/scenarios/features/07_credit_control_run_may.feature b/account_credit_control/scenarios/features/07_credit_control_run_may.feature new file mode 100644 index 000000000..77b02fac1 --- /dev/null +++ b/account_credit_control/scenarios/features/07_credit_control_run_may.feature @@ -0,0 +1,106 @@ +############################################################################### +# +# OERPScenario, OpenERP Functional Tests +# Copyright 2012 Camptocamp SA +# Author Nicolas Bessi +############################################################################## + +# Features Generic tags (none for all) +############################################################################## + +@account_credit_control_run @account_credit_control_run_may + +Feature: Ensure that email credit line generation first pass is correct + + @account_credit_control_mark + Scenario: mark lines + Given there is "draft" credit lines + And I mark all draft email to state "to_be_sent" + Then the draft line should be in state "to_be_sent" + + @pay_invoice_si_16 + Scenario: I pay entirely the invoice SI 16, so it should no longer appear in the credit control lines + Given I need a "account.bank.statement" with oid: scen.voucher_statement_si_16 + And having: + | name | value | + | name | Bk.St.si_16 | + | date | 2012-05-30 | + | currency_id | by name: EUR | + | journal_id | by oid: scen.voucher_eur_journal | + And the bank statement is linked to period "05/2012" + And I import invoice "SI_16" using import invoice button + And I set bank statement end-balance + When I confirm bank statement + Then My invoice "SI_16" is in state "paid" reconciled with a residual amount of "0.0" + + @pay_invoice_si_17 + Scenario: I pay entirely the invoice SI 17, so it should no longer appear in the credit control lines + Given I need a "account.bank.statement" with oid: scen.voucher_statement_si_17 + And having: + | name | value | + | name | Bk.St.si_17 | + | date | 2012-05-30 | + | currency_id | by name: EUR | + | journal_id | by oid: scen.voucher_eur_journal | + And the bank statement is linked to period "05/2012" + And I import invoice "SI_17" using import invoice button + And I need a "account.bank.statement.line" with name: SI_17 + And the line amount should be 1500 + And I set the voucher paid amount to "1000" + And I save the voucher + Then I modify the line amount to 1000 + And I should have a "account.bank.statement" with oid: scen.voucher_statement_si_17 + And I set bank statement end-balance + When I confirm bank statement + Then My invoice "SI_17" is in state "open" reconciled with a residual amount of "500.0" + + @pay_invoice_si_18_part1 + Scenario: I pay the first part of the invoice SI 18, so it should no longer appear in the credit control lines however, the second move lines should still appears + Given I need a "account.bank.statement" with oid: scen.voucher_statement_si_18 + And having: + | name | value | + | name | Bk.St.si_18_part1 | + | date | 2012-05-30 | + | currency_id | by name: EUR | + | journal_id | by oid: scen.voucher_eur_journal | + And the bank statement is linked to period "05/2012" + And I import invoice "SI_18" using import invoice button + And I should have a "account.bank.statement.line" with name: SI_18 and amount: 450 + And the line amount should be 450 + And I set the voucher paid amount to "450" + And I save the voucher + Then I modify the line amount to 450 + And I should have a "account.bank.statement.line" with name: SI_18 and amount: 1050 + And the line amount should be 1050 + And I set the voucher paid amount to "0" + And I save the voucher + Then I modify the line amount to 0 + And I should have a "account.bank.statement" with oid: scen.voucher_statement_si_18 + And I set bank statement end-balance + When I confirm bank statement + Then My invoice "SI_18" is in state "open" reconciled with a residual amount of "1050.0" + + @account_credit_control_run_month + Scenario: Create run + Given I need a "credit.control.run" with oid: credit_control.run5 + And having: + | name | value | + | date | 2012-05-31 | + When I launch the credit run + Then my credit run should be in state "done" + And the generated credit lines should have the following values: + | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | + | 1500 | 2012-04-30 | Debtors | 2 time policy | 2012-05-31 | customer_2 | email | 1 | SI_6 | 30 days end of month | draft | 1500 | USD | + | 1500 | 2012-04-14 | Debtors | 2 time policy | 2012-05-31 | customer_3 | email | 1 | SI_8 | 30 days end of month | draft | 1500 | USD | + | 1050 | 2012-04-30 | Debtors | 3 time policy | 2012-05-31 | customer_4 | email | 1 | SI_11 | 10 days net | draft | 1050 | USD | + | 1000 | 2012-02-29 | Debtors | 2 time policy | 2012-05-31 | customer_2 | letter | 2 | SI_4 | 60 days last reminder | draft | 1000 | | + | 1000 | 2012-02-17 | Debtors | 2 time policy | 2012-05-31 | customer_3 | letter | 2 | SI_7 | 60 days last reminder | draft | 1000 | | + | 840 | 2012-03-31 | Debtors | 3 time policy | 2012-05-31 | customer_4 | email | 2 | SI_11 | 30 days end of month | draft | 840 | USD | + | 1500 | 2012-04-14 | Debtors USD | 3 time policy | 2012-05-31 | customer_5_usd | email | 2 | SI_15 | 30 days end of month | draft | 1500 | USD | + | 700 | 2012-02-29 | Debtors | 3 time policy | 2012-05-31 | customer_4 | letter | 3 | SI_10 | 10 days last reminder | draft | 700 | | + | 450 | 2012-03-15 | Debtors | 3 time policy | 2012-05-31 | customer_4 | letter | 3 | SI_12 | 10 days last reminder | draft | 450 | USD | + | 1200 | 2012-03-16 | Debtors USD | 3 time policy | 2012-05-31 | customer_5_usd | letter | 3 | SI_14 | 10 days last reminder | draft | 1200 | USD | + | 500 | 2012-04-14 | Debtors | 3 time policy | 2012-05-31 | Scrooge McDuck | email | 2 | SI_17 | 30 days end of month | draft | 1500 | | + | 1050 | 2012-04-30 | Debtors | 3 time policy | 2012-05-31 | Donald Duck | email | 1 | SI_18 | 10 days net | draft | 1050 | | + | 150 | 2012-03-15 | Debtors | 3 time policy | 2012-05-31 | Gus Goose | letter | 3 | SI_19 | 10 days last reminder | draft | 450 | | + | 1050 | 2012-04-30 | Debtors | 3 time policy | 2012-05-31 | Gus Goose | email | 1 | SI_19 | 10 days net | draft | 1050 | | diff --git a/account_credit_control/scenarios/features/08_credit_control_run_jun.feature b/account_credit_control/scenarios/features/08_credit_control_run_jun.feature new file mode 100644 index 000000000..fa02a20a5 --- /dev/null +++ b/account_credit_control/scenarios/features/08_credit_control_run_jun.feature @@ -0,0 +1,38 @@ +############################################################################### +# +# OERPScenario, OpenERP Functional Tests +# Copyright 2012 Camptocamp SA +# Author Nicolas Bessi +############################################################################## + +# Features Generic tags (none for all) +############################################################################## + +@account_credit_control_run @account_credit_control_run_jun + +Feature: Ensure that email credit line generation first pass is correct + + @account_credit_control_mark + Scenario: mark lines + Given there is "draft" credit lines + And I mark all draft email to state "to_be_sent" + Then the draft line should be in state "to_be_sent" + + @account_credit_control_run_month + Scenario: Create run + Given I need a "credit.control.run" with oid: credit_control.run6 + And having: + | name | value | + | date | 2012-06-30 | + When I launch the credit run + Then my credit run should be in state "done" + And the generated credit lines should have the following values: + | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | + | 1200 | 2012-03-31 | Debtors | 2 time policy | 2012-06-30 | customer_2 | letter | 2 | SI_5 | 60 days last reminder | draft | 1200 | USD | + | 1200 | 2012-03-16 | Debtors | 2 time policy | 2012-06-30 | customer_3 | letter | 2 | SI_8 | 60 days last reminder | draft | 1200 | USD | + | 1050 | 2012-04-30 | Debtors | 3 time policy | 2012-06-30 | customer_4 | email | 2 | SI_12 | 30 days end of month | draft | 1050 | USD | + | 840 | 2012-03-31 | Debtors | 3 time policy | 2012-06-30 | customer_4 | letter | 3 | SI_11 | 10 days last reminder | draft | 840 | USD | + | 1500 | 2012-04-14 | Debtors USD | 3 time policy | 2012-06-30 | customer_5_usd | letter | 3 | SI_15 | 10 days last reminder | draft | 1500 | USD | + | 500 | 2012-04-14 | Debtors | 3 time policy | 2012-06-30 | Scrooge McDuck | letter | 3 | SI_17 | 10 days last reminder | draft | 1500 | | + | 1050 | 2012-04-30 | Debtors | 3 time policy | 2012-06-30 | Donald Duck | email | 2 | SI_18 | 30 days end of month | draft | 1050 | | + | 1050 | 2012-04-30 | Debtors | 3 time policy | 2012-06-30 | Gus Goose | email | 2 | SI_19 | 30 days end of month | draft | 1050 | | diff --git a/account_credit_control/scenarios/features/09_credit_control_run_jul.feature b/account_credit_control/scenarios/features/09_credit_control_run_jul.feature new file mode 100644 index 000000000..e20728554 --- /dev/null +++ b/account_credit_control/scenarios/features/09_credit_control_run_jul.feature @@ -0,0 +1,35 @@ +############################################################################### +# +# OERPScenario, OpenERP Functional Tests +# Copyright 2012 Camptocamp SA +# Author Nicolas Bessi +############################################################################## + +# Features Generic tags (none for all) +############################################################################## + +@account_credit_control_run @account_credit_control_run_jul + +Feature: Ensure that email credit line generation first pass is correct + + @account_credit_control_mark + Scenario: mark lines + Given there is "draft" credit lines + And I mark all draft email to state "to_be_sent" + Then the draft line should be in state "to_be_sent" + + @account_credit_control_run_month + Scenario: Create run + Given I need a "credit.control.run" with oid: credit_control.run7 + And having: + | name | value | + | date | 2012-07-31 | + When I launch the credit run + Then my credit run should be in state "done" + And the generated credit lines should have the following values: + | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | + | 1500 | 2012-04-30 | Debtors | 2 time policy | 2012-07-31 | customer_2 | letter | 2 | SI_6 | 60 days last reminder | draft | 1500 | USD | + | 1500 | 2012-04-14 | Debtors | 2 time policy | 2012-07-31 | customer_3 | letter | 2 | SI_9 | 60 days last reminder | draft | 1500 | USD | + | 1050 | 2012-04-30 | Debtors | 3 time policy | 2012-07-31 | customer_4 | letter | 3 | SI_12 | 10 days last reminder | draft | 1050 | USD | + | 1050 | 2012-04-30 | Debtors | 3 time policy | 2012-07-31 | Donald Duck | letter | 3 | SI_18 | 10 days last reminder | draft | 1050 | | + | 1050 | 2012-04-30 | Debtors | 3 time policy | 2012-07-31 | Gus Goose | letter | 3 | SI_19 | 10 days last reminder | draft | 1050 | | diff --git a/account_credit_control/scenarios/features/steps/account_credit_control.py b/account_credit_control/scenarios/features/steps/account_credit_control.py new file mode 100644 index 000000000..02cdeb694 --- /dev/null +++ b/account_credit_control/scenarios/features/steps/account_credit_control.py @@ -0,0 +1,92 @@ +import time +from behave import given, when +from support import model + +@given(u'I configure the following accounts on the credit control policy with oid: "{policy_oid}"') +def impl(ctx, policy_oid): + policy = model('credit.control.policy').get(policy_oid) + assert policy, 'No policy % found' % policy_oid + acc_obj = model('account.account') + accounts = [] + for row in ctx.table: + acc = acc_obj.get(['code = %s' % row['account code']]) + assert acc, "Account with code %s not found" % row['account code'] + accounts.append(accounts) + policy.write({'account_ids': accounts}) + + +@when(u'I launch the credit run') +def impl(ctx): + assert ctx.found_item + # Must be a cleaner way to do it + assert 'credit.control.run' == ctx.found_item._model._name + ctx.found_item.generate_credit_lines() + +@given(u'I clean all the credit lines') +def impl(ctx): + model('credit.control.line').browse([]).unlink() + +@then(u'my credit run should be in state "done"') +def impl(ctx): + assert ctx.found_item + # Must be a cleaner way to do it + assert model("credit.control.run").get(ctx.found_item.id).state == 'done' + +@then(u'the generated credit lines should have the following values') +def impl(ctx): + def _row_to_dict(row): + return dict((name, row[name]) for name in row.headings if row[name]) + rows = map(_row_to_dict, ctx.table) + + def _parse_date(value): + return time.strftime(value) if '%' in value else value + + for row in rows: + account = model('account.account').get(['name = %s' % row['account']]) + assert account, "no account named %s found" % row['account'] + import pdb; pdb.set_trace() + + policy = model('credit.control.policy').get(['name = %s' % row['policy']]) + assert policy, "No policy %s found" % row['policy'] + partner = model('res.partner').get(['name = %s' % row['partner']]) + assert partner, "No partner %s found" % row['partner'] + move_line = model('account.move.line').get(['name = %s' % row['move line']]) + assert move_line, "No move line %s found" % row['move line'] + level = model('credit.control.policy.level').get(['name = %s' % row['policy level'], 'policy_id = %s' % policy.id]) + assert level, "No level % found" % row['policy level'] + domain = [['account_id', '=', account.id], + ['policy_id', '=', policy.id], + ['partner_id', '=', partner.id], + ['policy_level_id', '=', level.id], + ['amount_due', '=', row.get('amount due', 0.0)], + ['state', '=', row['state']], + ['level', '=', row.get('level', 0.0)], + ['channel', '=', row['channel']], + ['balance_due', '=', row.get('balance', 0.0)], + ['date_due', '=', _parse_date(row['date due'])], + ['date', '=', _parse_date(row['date'])], + ] + if row.get('currrency'): + curreny = model('res.currency').get(['name = %s' % row['currency']]) + assert curreny, "No currency %s found" % row['currency'] + domain.append(('currency_id', '=', curreny.id)) + + lines = model('credit.control.line').search(domain) + assert lines, "no line found for %s" % repr(row) + assert len(lines) == 1, "Too many lines found for %s" % repr(row) + date_lines = model('credit.control.lines').search([('date', '=', ctx.found_item.date)]) + assert len(date_lines) == len(ctx.table), "Too many lines generated" + +def open_invoice(ctx): + assert ctx.found_item + ctx.found_item._send('invoice_open') + # _send refresh object + assert ctx.found_item.state == 'open' + +@then(u'I open the credit invoice') +def impl(ctx): + open_invoice(ctx) + +@given(u'I open the credit invoice') +def impl(ctx): + open_invoice(ctx) From cab40b05f10eda17f23b508b838252b46e42927f Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 28 Mar 2013 14:17:04 +0100 Subject: [PATCH 05/46] [IMP] Modify scenarios to be compatible with python scenarios --- .../04_credit_control_run_feb.feature | 12 +-- .../05_credit_control_run_mar.feature | 52 ++++++------ .../06_credit_control_run_apr.feature | 34 ++++---- .../07_credit_control_run_may.feature | 82 +++++++++---------- .../08_credit_control_run_jun.feature | 20 ++--- .../09_credit_control_run_jul.feature | 14 ++-- .../features/steps/account_credit_control.py | 44 ++++++++-- 7 files changed, 137 insertions(+), 121 deletions(-) diff --git a/account_credit_control/scenarios/features/04_credit_control_run_feb.feature b/account_credit_control/scenarios/features/04_credit_control_run_feb.feature index b76198f3a..563c4e7b7 100644 --- a/account_credit_control/scenarios/features/04_credit_control_run_feb.feature +++ b/account_credit_control/scenarios/features/04_credit_control_run_feb.feature @@ -8,7 +8,7 @@ # Features Generic tags (none for all) ############################################################################## -@account_credit_control_run @account_credit_control_run_feb +@account_credit_control @account_credit_control_run @account_credit_control_run_feb Feature: Ensure that mail credit line generation first pass is correct @@ -23,11 +23,11 @@ Feature: Ensure that mail credit line generation first pass is correct Given I need a "credit.control.run" with oid: credit_control.run2 And having: | name | value | - | date | 2012-02-29 | + | date | %Y-02-28 | When I launch the credit run Then my credit run should be in state "done" And the generated credit lines should have the following values: - | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | - | 360 | 2012-02-15 | Debtors | 3 time policy | 2012-02-29 | customer_4 | email | 1 | SI_11 | 10 days net | draft | 360 | USD | - | 1000 | 2012-02-17 | Debtors USD | 3 time policy | 2012-02-29 | customer_5_usd | email | 1 | SI_13 | 10 days net | draft | 1000 | USD | - | 300 | 2012-01-18 | Debtors | 3 time policy | 2012-02-29 | customer_4 | email | 2 | SI_10 | 30 days end of month | draft | 300 | | + | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | + | 360 | %Y-02-15 | Debtors | 3 time policy | %Y-02-28 | customer_4 | email | 1 | SI_11 | 10 days net | draft | 360 | USD | + | 1000 | %Y-02-17 | Debtors USD | 3 time policy | %Y-02-28 | customer_5_usd | email | 1 | SI_13 | 10 days net | draft | 1000 | USD | + | 300 | %Y-01-18 | Debtors | 3 time policy | %Y-02-28 | customer_4 | email | 2 | SI_10 | 30 days end of month | draft | 300 | | diff --git a/account_credit_control/scenarios/features/05_credit_control_run_mar.feature b/account_credit_control/scenarios/features/05_credit_control_run_mar.feature index c43c7fcd5..4de33b86c 100644 --- a/account_credit_control/scenarios/features/05_credit_control_run_mar.feature +++ b/account_credit_control/scenarios/features/05_credit_control_run_mar.feature @@ -8,7 +8,7 @@ # Features Generic tags (none for all) ############################################################################## -@account_credit_control_run @account_credit_control_run_mar +@account_credit_control @account_credit_control_run @account_credit_control_run_mar Feature: Ensure that email credit line generation first pass is correct @@ -20,47 +20,43 @@ Feature: Ensure that email credit line generation first pass is correct @pay_invoice_si_19_part1 Scenario: I pay a part of the first part of the invoice SI 19, - Given I need a "account.bank.statement" with oid: scen.voucher_statement_si_19 + Given I need a "account.bank.statement" with oid: scen.state_control_eur_1 And having: - | name | value | - | name | Bk.St.si_19_part1 | - | date | 2012-03-31 | - | currency_id | by name: EUR | - | journal_id | by oid: scen.voucher_eur_journal | - And the bank statement is linked to period "03/2012" + | name | value | + | name | Bk.St.si_19_part1 | + | date | %Y-03-31 | + | journal_id | by oid: scen.eur_journal | + And I import invoice "SI_19" using import invoice button - And I should have a "account.bank.statement.line" with name: SI_19 and amount: 450 - And the line amount should be 450 + And I should have a "account.bank.statement.line" with name: "SI_19" and amount: "450" And I set the voucher paid amount to "300" And I save the voucher - Then I modify the line amount to 300 - And I should have a "account.bank.statement.line" with name: SI_19 and amount: 1050 - And the line amount should be 1050 + And I should have a "account.bank.statement.line" with name: "SI_19" and amount: "1050" And I set the voucher paid amount to "0" And I save the voucher - Then I modify the line amount to 0 - And I should have a "account.bank.statement" with oid: scen.voucher_statement_si_19 + Then I modify the line amount to "0" + Given I need a "account.bank.statement" with oid: scen.state_control_eur_1 And I set bank statement end-balance When I confirm bank statement Then My invoice "SI_19" is in state "open" reconciled with a residual amount of "1200.0" - @account_credit_control_run_month + @account_credit_control_run_month_mar Scenario: Create run Given I need a "credit.control.run" with oid: credit_control.run3 And having: | name | value | - | date | 2012-03-31 | + | date | %Y-03-31 | When I launch the credit run Then my credit run should be in state "done" And the generated credit lines should have the following values: - | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | - | 1000 | 2012-02-29 | Debtors | 2 time policy | 2012-03-31 | customer_2 | email | 1 | SI_4 | 30 days end of month | draft | 1000 | | - | 1000 | 2012-02-17 | Debtors | 2 time policy | 2012-03-31 | customer_3 | email | 1 | SI_7 | 30 days end of month | draft | 1000 | | - | 700 | 2012-02-29 | Debtors | 3 time policy | 2012-03-31 | customer_4 | email | 1 | SI_10 | 10 days net | draft | 700 | | - | 450 | 2012-03-15 | Debtors | 3 time policy | 2012-03-31 | customer_4 | email | 1 | SI_12 | 10 days net | draft | 450 | | - | 1200 | 2012-03-16 | Debtors USD | 3 time policy | 2012-03-31 | customer_5_usd | email | 1 | SI_14 | 10 days net | draft | 1200 | USD | - | 360 | 2012-02-15 | Debtors | 3 time policy | 2012-03-31 | customer_4 | email | 2 | SI_11 | 30 days end of month | draft | 360 | USD | - | 1000 | 2012-02-17 | Debtors USD | 3 time policy | 2012-03-31 | customer_5_usd | email | 2 | SI_13 | 30 days end of month | draft | 1000 | USD | - | 300 | 2012-01-18 | Debtors | 3 time policy | 2012-03-31 | customer_4 | letter | 3 | SI_10 | 10 days last reminder | draft | 300 | | - | 450 | 2012-03-15 | Debtors | 3 time policy | 2012-03-31 | Donald Duck | email | 1 | SI_18 | 10 days net | draft | 450 | | - | 150 | 2012-03-15 | Debtors | 3 time policy | 2012-03-31 | Gus Goose | email | 1 | SI_19 | 10 days net | draft | 450 | | + | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | + | 1000 | %Y-02-28 | Debtors | 2 time policy | %Y-03-31 | customer_2 | email | 1 | SI_4 | 30 days end of month | draft | 1000 | | + | 1000 | %Y-02-17 | Debtors | 2 time policy | %Y-03-31 | customer_3 | email | 1 | SI_7 | 30 days end of month | draft | 1000 | | + | 700 | %Y-02-28 | Debtors | 3 time policy | %Y-03-31 | customer_4 | email | 1 | SI_10 | 10 days net | draft | 700 | | + | 450 | %Y-03-15 | Debtors | 3 time policy | %Y-03-31 | customer_4 | email | 1 | SI_12 | 10 days net | draft | 450 | | + | 1200 | %Y-03-17 | Debtors USD | 3 time policy | %Y-03-31 | customer_5_usd | email | 1 | SI_14 | 10 days net | draft | 1200 | USD | + | 360 | %Y-02-15 | Debtors | 3 time policy | %Y-03-31 | customer_4 | email | 2 | SI_11 | 30 days end of month | draft | 360 | USD | + | 1000 | %Y-02-17 | Debtors USD | 3 time policy | %Y-03-31 | customer_5_usd | email | 2 | SI_13 | 30 days end of month | draft | 1000 | USD | + | 300 | %Y-01-18 | Debtors | 3 time policy | %Y-03-31 | customer_4 | letter | 3 | SI_10 | 10 days last reminder | draft | 300 | | + | 450 | %Y-03-15 | Debtors | 3 time policy | %Y-03-31 | Donald Duck | email | 1 | SI_18 | 10 days net | draft | 450 | | + | 150 | %Y-03-15 | Debtors | 3 time policy | %Y-03-31 | Gus Goose | email | 1 | SI_19 | 10 days net | draft | 450 | | diff --git a/account_credit_control/scenarios/features/06_credit_control_run_apr.feature b/account_credit_control/scenarios/features/06_credit_control_run_apr.feature index 76c8cec90..c7f6f1d69 100644 --- a/account_credit_control/scenarios/features/06_credit_control_run_apr.feature +++ b/account_credit_control/scenarios/features/06_credit_control_run_apr.feature @@ -8,7 +8,7 @@ # Features Generic tags (none for all) ############################################################################## -@account_credit_control_run @account_credit_control_run_apr +@account_credit_control @account_credit_control_run @account_credit_control_run_apr Feature: Ensure that email credit line generation first pass is correct @@ -22,22 +22,22 @@ Feature: Ensure that email credit line generation first pass is correct Scenario: Create run Given I need a "credit.control.run" with oid: credit_control.run4 And having: - | name | value | - | date | 2012-04-30 | + | name | value | + | date | %Y-04-30 | + When I launch the credit run Then my credit run should be in state "done" And the generated credit lines should have the following values: - | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | - | 1200 | 2012-03-31 | Debtors | 2 time policy | 2012-04-30 | customer_2 | email | 1 | SI_5 | 30 days end of month | draft | 1200 | USD | - | 1200 | 2012-03-16 | Debtors | 2 time policy | 2012-04-30 | customer_3 | email | 1 | SI_8 | 30 days end of month | draft | 1200 | USD | - | 840 | 2012-03-31 | Debtors | 3 time policy | 2012-04-30 | customer_4 | email | 1 | SI_11 | 10 days net | draft | 840 | USD | - | 1500 | 2012-04-14 | Debtors USD | 3 time policy | 2012-04-30 | customer_5_usd | email | 1 | SI_15 | 10 days net | draft | 1500 | USD | - | 700 | 2012-02-29 | Debtors | 3 time policy | 2012-04-30 | customer_4 | email | 2 | SI_10 | 30 days end of month | draft | 700 | | - | 450 | 2012-03-15 | Debtors | 3 time policy | 2012-04-30 | customer_4 | email | 2 | SI_12 | 30 days end of month | draft | 450 | USD | - | 1200 | 2012-03-16 | Debtors USD | 3 time policy | 2012-04-30 | customer_5_usd | email | 2 | SI_14 | 30 days end of month | draft | 1200 | USD | - | 360 | 2012-02-15 | Debtors | 3 time policy | 2012-04-30 | customer_4 | letter | 3 | SI_12 | 10 days last reminder | draft | 360 | USD | - | 1000 | 2012-02-17 | Debtors USD | 3 time policy | 2012-04-30 | customer_5_usd | letter | 3 | SI_14 | 10 days last reminder | draft | 1000 | USD | - | 1500 | 2012-04-14 | Debtors | 3 time policy | 2012-04-30 | customer_4 | email | 1 | SI_16 | 10 days net | draft | 1500 | | - | 1500 | 2012-04-14 | Debtors | 3 time policy | 2012-04-30 | customer_4 | email | 1 | SI_17 | 10 days net | draft | 1500 | | - | 450 | 2012-03-15 | Debtors | 3 time policy | 2012-04-30 | Donald Duck | email | 2 | SI_18 | 30 days end of month | draft | 450 | | - | 150 | 2012-03-15 | Debtors | 3 time policy | 2012-04-30 | Gus Goose | email | 2 | SI_19 | 30 days end of month | draft | 450 | | + | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | + | 1200 | %Y-03-31 | Debtors | 2 time policy | %Y-04-30 | customer_2 | email | 1 | SI_5 | 30 days end of month | draft | 1200 | USD | + | 1200 | %Y-03-17 | Debtors | 2 time policy | %Y-04-30 | customer_3 | email | 1 | SI_8 | 30 days end of month | draft | 1200 | USD | + | 700 | %Y-02-28 | Debtors | 3 time policy | %Y-04-30 | customer_4 | email | 2 | SI_10 | 30 days end of month | draft | 700 | | + | 840 | %Y-03-31 | Debtors | 3 time policy | %Y-04-30 | customer_4 | email | 1 | SI_11 | 10 days net | draft | 840 | USD | + | 450 | %Y-03-15 | Debtors | 3 time policy | %Y-04-30 | customer_4 | email | 2 | SI_12 | 30 days end of month | draft | 450 | USD | + | 1500 | %Y-04-14 | Debtors USD | 3 time policy | %Y-04-30 | customer_5_usd | email | 1 | SI_15 | 10 days net | draft | 1500 | USD | + | 1200 | %Y-03-17 | Debtors USD | 3 time policy | %Y-04-30 | customer_5_usd | email | 2 | SI_14 | 30 days end of month | draft | 1200 | USD | + | 1500 | %Y-04-14 | Debtors USD | 3 time policy | %Y-04-30 | customer_5_usd | email | 1 | SI_15 | 10 days net | draft | 1500 | USD | + | 1500 | %Y-04-14 | Debtors | 3 time policy | %Y-04-30 | customer_4 | email | 1 | SI_16 | 10 days net | draft | 1500 | | + | 1500 | %Y-04-14 | Debtors | 3 time policy | %Y-04-30 | Scrooge McDuck | email | 1 | SI_17 | 10 days net | draft | 1500 | | + | 450 | %Y-03-15 | Debtors | 3 time policy | %Y-04-30 | Donald Duck | email | 2 | SI_18 | 30 days end of month | draft | 450 | | + | 150 | %Y-03-15 | Debtors | 3 time policy | %Y-04-30 | Gus Goose | email | 2 | SI_19 | 30 days end of month | draft | 450 | | diff --git a/account_credit_control/scenarios/features/07_credit_control_run_may.feature b/account_credit_control/scenarios/features/07_credit_control_run_may.feature index 77b02fac1..83f1e35b5 100644 --- a/account_credit_control/scenarios/features/07_credit_control_run_may.feature +++ b/account_credit_control/scenarios/features/07_credit_control_run_may.feature @@ -22,12 +22,10 @@ Feature: Ensure that email credit line generation first pass is correct Scenario: I pay entirely the invoice SI 16, so it should no longer appear in the credit control lines Given I need a "account.bank.statement" with oid: scen.voucher_statement_si_16 And having: - | name | value | - | name | Bk.St.si_16 | - | date | 2012-05-30 | - | currency_id | by name: EUR | - | journal_id | by oid: scen.voucher_eur_journal | - And the bank statement is linked to period "05/2012" + | name | value | + | name | Bk.St.si_16 | + | date | %Y-05-30 | + | journal_id | by oid: scen.eur_journal | And I import invoice "SI_16" using import invoice button And I set bank statement end-balance When I confirm bank statement @@ -37,19 +35,16 @@ Feature: Ensure that email credit line generation first pass is correct Scenario: I pay entirely the invoice SI 17, so it should no longer appear in the credit control lines Given I need a "account.bank.statement" with oid: scen.voucher_statement_si_17 And having: - | name | value | - | name | Bk.St.si_17 | - | date | 2012-05-30 | - | currency_id | by name: EUR | - | journal_id | by oid: scen.voucher_eur_journal | - And the bank statement is linked to period "05/2012" + | name | value | + | name | Bk.St.si_17 | + | date | %Y-05-30 | + | journal_id | by oid: scen.eur_journal | And I import invoice "SI_17" using import invoice button - And I need a "account.bank.statement.line" with name: SI_17 - And the line amount should be 1500 + And I should have a "account.bank.statement.line" with name: "SI_17" and amount: "1500" And I set the voucher paid amount to "1000" And I save the voucher - Then I modify the line amount to 1000 - And I should have a "account.bank.statement" with oid: scen.voucher_statement_si_17 + And I modify the line amount to "1000" + And I need a "account.bank.statement" with oid: scen.voucher_statement_si_17 And I set bank statement end-balance When I confirm bank statement Then My invoice "SI_17" is in state "open" reconciled with a residual amount of "500.0" @@ -58,24 +53,20 @@ Feature: Ensure that email credit line generation first pass is correct Scenario: I pay the first part of the invoice SI 18, so it should no longer appear in the credit control lines however, the second move lines should still appears Given I need a "account.bank.statement" with oid: scen.voucher_statement_si_18 And having: - | name | value | - | name | Bk.St.si_18_part1 | - | date | 2012-05-30 | - | currency_id | by name: EUR | - | journal_id | by oid: scen.voucher_eur_journal | - And the bank statement is linked to period "05/2012" + | name | value | + | name | Bk.St.si_18_part1 | + | date | %Y-05-30 | + | journal_id | by oid: scen.eur_journal | And I import invoice "SI_18" using import invoice button - And I should have a "account.bank.statement.line" with name: SI_18 and amount: 450 - And the line amount should be 450 + And I should have a "account.bank.statement.line" with name: "SI_18" and amount: "450" And I set the voucher paid amount to "450" And I save the voucher - Then I modify the line amount to 450 - And I should have a "account.bank.statement.line" with name: SI_18 and amount: 1050 - And the line amount should be 1050 + And I modify the line amount to "450" + And I should have a "account.bank.statement.line" with name: "SI_18" and amount: "1050" And I set the voucher paid amount to "0" And I save the voucher - Then I modify the line amount to 0 - And I should have a "account.bank.statement" with oid: scen.voucher_statement_si_18 + Then I modify the line amount to "0" + And I need a "account.bank.statement" with oid: scen.voucher_statement_si_18 And I set bank statement end-balance When I confirm bank statement Then My invoice "SI_18" is in state "open" reconciled with a residual amount of "1050.0" @@ -85,22 +76,23 @@ Feature: Ensure that email credit line generation first pass is correct Given I need a "credit.control.run" with oid: credit_control.run5 And having: | name | value | - | date | 2012-05-31 | + | date | %Y-05-31 | When I launch the credit run Then my credit run should be in state "done" And the generated credit lines should have the following values: - | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | - | 1500 | 2012-04-30 | Debtors | 2 time policy | 2012-05-31 | customer_2 | email | 1 | SI_6 | 30 days end of month | draft | 1500 | USD | - | 1500 | 2012-04-14 | Debtors | 2 time policy | 2012-05-31 | customer_3 | email | 1 | SI_8 | 30 days end of month | draft | 1500 | USD | - | 1050 | 2012-04-30 | Debtors | 3 time policy | 2012-05-31 | customer_4 | email | 1 | SI_11 | 10 days net | draft | 1050 | USD | - | 1000 | 2012-02-29 | Debtors | 2 time policy | 2012-05-31 | customer_2 | letter | 2 | SI_4 | 60 days last reminder | draft | 1000 | | - | 1000 | 2012-02-17 | Debtors | 2 time policy | 2012-05-31 | customer_3 | letter | 2 | SI_7 | 60 days last reminder | draft | 1000 | | - | 840 | 2012-03-31 | Debtors | 3 time policy | 2012-05-31 | customer_4 | email | 2 | SI_11 | 30 days end of month | draft | 840 | USD | - | 1500 | 2012-04-14 | Debtors USD | 3 time policy | 2012-05-31 | customer_5_usd | email | 2 | SI_15 | 30 days end of month | draft | 1500 | USD | - | 700 | 2012-02-29 | Debtors | 3 time policy | 2012-05-31 | customer_4 | letter | 3 | SI_10 | 10 days last reminder | draft | 700 | | - | 450 | 2012-03-15 | Debtors | 3 time policy | 2012-05-31 | customer_4 | letter | 3 | SI_12 | 10 days last reminder | draft | 450 | USD | - | 1200 | 2012-03-16 | Debtors USD | 3 time policy | 2012-05-31 | customer_5_usd | letter | 3 | SI_14 | 10 days last reminder | draft | 1200 | USD | - | 500 | 2012-04-14 | Debtors | 3 time policy | 2012-05-31 | Scrooge McDuck | email | 2 | SI_17 | 30 days end of month | draft | 1500 | | - | 1050 | 2012-04-30 | Debtors | 3 time policy | 2012-05-31 | Donald Duck | email | 1 | SI_18 | 10 days net | draft | 1050 | | - | 150 | 2012-03-15 | Debtors | 3 time policy | 2012-05-31 | Gus Goose | letter | 3 | SI_19 | 10 days last reminder | draft | 450 | | - | 1050 | 2012-04-30 | Debtors | 3 time policy | 2012-05-31 | Gus Goose | email | 1 | SI_19 | 10 days net | draft | 1050 | | + | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | + | 1500 | %Y-04-30 | Debtors | 2 time policy | %Y-05-31 | customer_2 | email | 1 | SI_6 | 30 days end of month | draft | 1500 | USD | + | 1500 | %Y-04-14 | Debtors | 2 time policy | %Y-05-31 | customer_3 | email | 1 | SI_8 | 30 days end of month | draft | 1500 | USD | + | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-05-31 | customer_4 | email | 1 | SI_11 | 10 days net | draft | 1050 | USD | + | 1000 | %Y-02-29 | Debtors | 2 time policy | %Y-05-31 | customer_2 | letter | 2 | SI_4 | 60 days last reminder | draft | 1000 | | + | 1000 | %Y-02-17 | Debtors | 2 time policy | %Y-05-31 | customer_3 | letter | 2 | SI_7 | 60 days last reminder | draft | 1000 | | + | 840 | %Y-03-31 | Debtors | 3 time policy | %Y-05-31 | customer_4 | email | 2 | SI_11 | 30 days end of month | draft | 840 | USD | + | 1500 | %Y-04-14 | Debtors USD | 3 time policy | %Y-05-31 | customer_5_usd | email | 2 | SI_15 | 30 days end of month | draft | 1500 | USD | + | 700 | %Y-02-29 | Debtors | 3 time policy | %Y-05-31 | customer_4 | letter | 3 | SI_10 | 10 days last reminder | draft | 700 | | + | 450 | %Y-03-15 | Debtors | 3 time policy | %Y-05-31 | customer_4 | letter | 3 | SI_12 | 10 days last reminder | draft | 450 | USD | + | 360 | %Y-04-30 | Debtors | 3 time policy | %Y-04-30 | customer_4 | letter | 3 | SI_12 | 10 days last reminder | draft | 360 | USD | + | 1200 | %Y-03-16 | Debtors USD | 3 time policy | %Y-05-31 | customer_5_usd | letter | 3 | SI_14 | 10 days last reminder | draft | 1200 | USD | + | 500 | %Y-04-14 | Debtors | 3 time policy | %Y-05-31 | Scrooge McDuck | email | 2 | SI_17 | 30 days end of month | draft | 1500 | | + | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-05-31 | Donald Duck | email | 1 | SI_18 | 10 days net | draft | 1050 | | + | 150 | %Y-03-15 | Debtors | 3 time policy | %Y-05-31 | Gus Goose | letter | 3 | SI_19 | 10 days last reminder | draft | 450 | | + | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-05-31 | Gus Goose | email | 1 | SI_19 | 10 days net | draft | 1050 | | diff --git a/account_credit_control/scenarios/features/08_credit_control_run_jun.feature b/account_credit_control/scenarios/features/08_credit_control_run_jun.feature index fa02a20a5..25f04adce 100644 --- a/account_credit_control/scenarios/features/08_credit_control_run_jun.feature +++ b/account_credit_control/scenarios/features/08_credit_control_run_jun.feature @@ -23,16 +23,16 @@ Feature: Ensure that email credit line generation first pass is correct Given I need a "credit.control.run" with oid: credit_control.run6 And having: | name | value | - | date | 2012-06-30 | + | date | %Y-06-30 | When I launch the credit run Then my credit run should be in state "done" And the generated credit lines should have the following values: - | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | - | 1200 | 2012-03-31 | Debtors | 2 time policy | 2012-06-30 | customer_2 | letter | 2 | SI_5 | 60 days last reminder | draft | 1200 | USD | - | 1200 | 2012-03-16 | Debtors | 2 time policy | 2012-06-30 | customer_3 | letter | 2 | SI_8 | 60 days last reminder | draft | 1200 | USD | - | 1050 | 2012-04-30 | Debtors | 3 time policy | 2012-06-30 | customer_4 | email | 2 | SI_12 | 30 days end of month | draft | 1050 | USD | - | 840 | 2012-03-31 | Debtors | 3 time policy | 2012-06-30 | customer_4 | letter | 3 | SI_11 | 10 days last reminder | draft | 840 | USD | - | 1500 | 2012-04-14 | Debtors USD | 3 time policy | 2012-06-30 | customer_5_usd | letter | 3 | SI_15 | 10 days last reminder | draft | 1500 | USD | - | 500 | 2012-04-14 | Debtors | 3 time policy | 2012-06-30 | Scrooge McDuck | letter | 3 | SI_17 | 10 days last reminder | draft | 1500 | | - | 1050 | 2012-04-30 | Debtors | 3 time policy | 2012-06-30 | Donald Duck | email | 2 | SI_18 | 30 days end of month | draft | 1050 | | - | 1050 | 2012-04-30 | Debtors | 3 time policy | 2012-06-30 | Gus Goose | email | 2 | SI_19 | 30 days end of month | draft | 1050 | | + | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | + | 1200 | %Y-03-31 | Debtors | 2 time policy | %Y-06-30 | customer_2 | letter | 2 | SI_5 | 60 days last reminder | draft | 1200 | USD | + | 1200 | %Y-03-16 | Debtors | 2 time policy | %Y-06-30 | customer_3 | letter | 2 | SI_8 | 60 days last reminder | draft | 1200 | USD | + | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-06-30 | customer_4 | email | 2 | SI_12 | 30 days end of month | draft | 1050 | USD | + | 840 | %Y-03-31 | Debtors | 3 time policy | %Y-06-30 | customer_4 | letter | 3 | SI_11 | 10 days last reminder | draft | 840 | USD | + | 1500 | %Y-04-14 | Debtors USD | 3 time policy | %Y-06-30 | customer_5_usd | letter | 3 | SI_15 | 10 days last reminder | draft | 1500 | USD | + | 500 | %Y-04-14 | Debtors | 3 time policy | %Y-06-30 | Scrooge McDuck | letter | 3 | SI_17 | 10 days last reminder | draft | 1500 | | + | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-06-30 | Donald Duck | email | 2 | SI_18 | 30 days end of month | draft | 1050 | | + | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-06-30 | Gus Goose | email | 2 | SI_19 | 30 days end of month | draft | 1050 | | diff --git a/account_credit_control/scenarios/features/09_credit_control_run_jul.feature b/account_credit_control/scenarios/features/09_credit_control_run_jul.feature index e20728554..5d89549e3 100644 --- a/account_credit_control/scenarios/features/09_credit_control_run_jul.feature +++ b/account_credit_control/scenarios/features/09_credit_control_run_jul.feature @@ -23,13 +23,13 @@ Feature: Ensure that email credit line generation first pass is correct Given I need a "credit.control.run" with oid: credit_control.run7 And having: | name | value | - | date | 2012-07-31 | + | date | %Y-07-31 | When I launch the credit run Then my credit run should be in state "done" And the generated credit lines should have the following values: - | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | - | 1500 | 2012-04-30 | Debtors | 2 time policy | 2012-07-31 | customer_2 | letter | 2 | SI_6 | 60 days last reminder | draft | 1500 | USD | - | 1500 | 2012-04-14 | Debtors | 2 time policy | 2012-07-31 | customer_3 | letter | 2 | SI_9 | 60 days last reminder | draft | 1500 | USD | - | 1050 | 2012-04-30 | Debtors | 3 time policy | 2012-07-31 | customer_4 | letter | 3 | SI_12 | 10 days last reminder | draft | 1050 | USD | - | 1050 | 2012-04-30 | Debtors | 3 time policy | 2012-07-31 | Donald Duck | letter | 3 | SI_18 | 10 days last reminder | draft | 1050 | | - | 1050 | 2012-04-30 | Debtors | 3 time policy | 2012-07-31 | Gus Goose | letter | 3 | SI_19 | 10 days last reminder | draft | 1050 | | + | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | + | 1500 | %Y-04-30 | Debtors | 2 time policy | %Y-07-31 | customer_2 | letter | 2 | SI_6 | 60 days last reminder | draft | 1500 | USD | + | 1500 | %Y-04-14 | Debtors | 2 time policy | %Y-07-31 | customer_3 | letter | 2 | SI_9 | 60 days last reminder | draft | 1500 | USD | + | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-07-31 | customer_4 | letter | 3 | SI_12 | 10 days last reminder | draft | 1050 | USD | + | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-07-31 | Donald Duck | letter | 3 | SI_18 | 10 days last reminder | draft | 1050 | | + | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-07-31 | Gus Goose | letter | 3 | SI_19 | 10 days last reminder | draft | 1050 | | diff --git a/account_credit_control/scenarios/features/steps/account_credit_control.py b/account_credit_control/scenarios/features/steps/account_credit_control.py index 02cdeb694..dda9a07bd 100644 --- a/account_credit_control/scenarios/features/steps/account_credit_control.py +++ b/account_credit_control/scenarios/features/steps/account_credit_control.py @@ -11,8 +11,8 @@ def impl(ctx, policy_oid): for row in ctx.table: acc = acc_obj.get(['code = %s' % row['account code']]) assert acc, "Account with code %s not found" % row['account code'] - accounts.append(accounts) - policy.write({'account_ids': accounts}) + accounts.append(acc) + policy.write({'account_ids': [x.id for x in accounts]}) @when(u'I launch the credit run') @@ -44,16 +44,22 @@ def impl(ctx): for row in rows: account = model('account.account').get(['name = %s' % row['account']]) assert account, "no account named %s found" % row['account'] - import pdb; pdb.set_trace() policy = model('credit.control.policy').get(['name = %s' % row['policy']]) assert policy, "No policy %s found" % row['policy'] + partner = model('res.partner').get(['name = %s' % row['partner']]) assert partner, "No partner %s found" % row['partner'] - move_line = model('account.move.line').get(['name = %s' % row['move line']]) + + maturity_date = _parse_date(row['date due']) + move_line = model('account.move.line').get(['name = %s' % row['move line'], + 'date_maturity = %s' % maturity_date]) assert move_line, "No move line %s found" % row['move line'] - level = model('credit.control.policy.level').get(['name = %s' % row['policy level'], 'policy_id = %s' % policy.id]) + + level = model('credit.control.policy.level').get(['name = %s' % row['policy level'], + 'policy_id = %s' % policy.id]) assert level, "No level % found" % row['policy level'] + domain = [['account_id', '=', account.id], ['policy_id', '=', policy.id], ['partner_id', '=', partner.id], @@ -65,8 +71,9 @@ def impl(ctx): ['balance_due', '=', row.get('balance', 0.0)], ['date_due', '=', _parse_date(row['date due'])], ['date', '=', _parse_date(row['date'])], + ['move_line_id', '=', move_line.id], ] - if row.get('currrency'): + if row.get('currency'): curreny = model('res.currency').get(['name = %s' % row['currency']]) assert curreny, "No currency %s found" % row['currency'] domain.append(('currency_id', '=', curreny.id)) @@ -74,8 +81,9 @@ def impl(ctx): lines = model('credit.control.line').search(domain) assert lines, "no line found for %s" % repr(row) assert len(lines) == 1, "Too many lines found for %s" % repr(row) - date_lines = model('credit.control.lines').search([('date', '=', ctx.found_item.date)]) - assert len(date_lines) == len(ctx.table), "Too many lines generated" + date_lines = model('credit.control.line').search([('date', '=', ctx.found_item.date)]) + assert len(date_lines) == len(ctx.table.rows), "Too many lines generated" + def open_invoice(ctx): assert ctx.found_item @@ -90,3 +98,23 @@ def impl(ctx): @given(u'I open the credit invoice') def impl(ctx): open_invoice(ctx) + +@given(u'there is "{state}" credit lines') +def impl(ctx, state): + assert model('credit.control.line').search(['state = %s' % state]) + +@given(u'I mark all draft email to state "{state}"') +def impl(ctx, state): + wiz = model('credit.control.marker').create({'name': state}) + lines = model('credit.control.line').search([('state', '=', 'draft')]) + assert lines + ctx.lines = lines + wiz.write({'line_ids': lines}) + wiz.mark_lines() + +@then(u'the draft line should be in state "{state}"') +def impl(ctx, state): + assert ctx.lines + lines = model('credit.control.line').search([('state', '!=', state), + ('id', 'in', ctx.lines)]) + assert not lines From b75d0c0e756dd06ed41a21e3db0b72df3fef71a8 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 28 Mar 2013 15:23:02 +0100 Subject: [PATCH 06/46] [ADD] voucher/statement related steps --- .../07_credit_control_run_may.feature | 2 +- .../08_credit_control_run_jun.feature | 2 +- .../09_credit_control_run_jul.feature | 2 +- .../features/steps/account_voucher.py | 138 ++++++++++++++++++ 4 files changed, 141 insertions(+), 3 deletions(-) create mode 100644 account_credit_control/scenarios/features/steps/account_voucher.py diff --git a/account_credit_control/scenarios/features/07_credit_control_run_may.feature b/account_credit_control/scenarios/features/07_credit_control_run_may.feature index 83f1e35b5..85b0896a2 100644 --- a/account_credit_control/scenarios/features/07_credit_control_run_may.feature +++ b/account_credit_control/scenarios/features/07_credit_control_run_may.feature @@ -8,7 +8,7 @@ # Features Generic tags (none for all) ############################################################################## -@account_credit_control_run @account_credit_control_run_may +@account_credit_control @account_credit_control_run @account_credit_control_run_may Feature: Ensure that email credit line generation first pass is correct diff --git a/account_credit_control/scenarios/features/08_credit_control_run_jun.feature b/account_credit_control/scenarios/features/08_credit_control_run_jun.feature index 25f04adce..2ae94d935 100644 --- a/account_credit_control/scenarios/features/08_credit_control_run_jun.feature +++ b/account_credit_control/scenarios/features/08_credit_control_run_jun.feature @@ -8,7 +8,7 @@ # Features Generic tags (none for all) ############################################################################## -@account_credit_control_run @account_credit_control_run_jun +@account_credit_control @account_credit_control_run @account_credit_control_run_jun Feature: Ensure that email credit line generation first pass is correct diff --git a/account_credit_control/scenarios/features/09_credit_control_run_jul.feature b/account_credit_control/scenarios/features/09_credit_control_run_jul.feature index 5d89549e3..f886b8f26 100644 --- a/account_credit_control/scenarios/features/09_credit_control_run_jul.feature +++ b/account_credit_control/scenarios/features/09_credit_control_run_jul.feature @@ -8,7 +8,7 @@ # Features Generic tags (none for all) ############################################################################## -@account_credit_control_run @account_credit_control_run_jul +@account_credit_control @account_credit_control_run @account_credit_control_run_jul Feature: Ensure that email credit line generation first pass is correct diff --git a/account_credit_control/scenarios/features/steps/account_voucher.py b/account_credit_control/scenarios/features/steps/account_voucher.py new file mode 100644 index 000000000..08b67322d --- /dev/null +++ b/account_credit_control/scenarios/features/steps/account_voucher.py @@ -0,0 +1,138 @@ +from support import * +import datetime + +@step('I import invoice "{inv_name}" using import invoice button') +def impl(ctx, inv_name): + invoice = model('account.invoice').get([('name', '=', inv_name)]) + assert invoice + bank_statement = ctx.found_item + for line in bank_statement.line_ids: + line.unlink() + lines = model('account.move.line').browse([('move_id', '=', invoice.move_id.id), + ('account_id', '=', invoice.account_id.id)]) + + wizard = model('account.statement.from.invoice.lines').create({'line_ids': lines}) + wizard.populate_statement({'statement_id': bank_statement.id}) + +@given(u'I should have a "account.bank.statement.line" with name: "{name}" and amount: "{amount}"') +def impl(ctx, name, amount): + assert ctx.found_item + line = model('account.bank.statement.line').get([('name', '=', name), + ('amount', '=', amount), + ('statement_id', '=', ctx.found_item.id)]) + assert line + ctx.line = line + +@given(u'I set the voucher paid amount to "{amount}"') +def impl(ctx, amount): + assert ctx.line + voucher = model('account.voucher').get(ctx.line.voucher_id.id) + assert voucher + + vals = voucher.onchange_amount(float(amount), + voucher.payment_rate, + voucher.partner_id.id, + voucher.journal_id.id if voucher.journal_id else False, + voucher.currency_id.id if voucher.currency_id else False, + voucher.type, + voucher.date, + voucher.payment_rate, + voucher.company_id.id if voucher.company_id else false) + vals = vals['value'] + vals.update({'amount': ctx.line.voucher_id.amount}) + voucher_line_ids = [] + voucher_line_dr_ids = [] + v_l_obj = model('account.voucher.line') + for v_line_vals in vals.get('line_cr_ids', []) or []: + v_line_vals['voucher_id'] = voucher.id + voucher_line_ids.append(v_l_obj.create(v_line_vals).id) + vals['line_cr_ids'] = voucher_line_ids + + for v_line_vals in vals.get('line_dr_ids', []) or []: + v_line_vals['voucher_id'] = voucher.id + voucher_line_dr_ids.append(v_l_obj.create(v_line_vals).id) + vals['line_dr_ids'] = voucher_line_ids + + voucher.write(vals) + ctx.vals = vals + ctx.voucher = voucher + +@given(u'I save the voucher') +def impl(ctx): + assert True + +@given(u'I modify the line amount to "{amount}"') +@then(u'I modify the line amount to "{amount}"') +def impl(ctx, amount): + assert ctx.line + # we have to change voucher amount before chaning statement line amount + if ctx.line.voucher_id: + model('account.voucher').write([ctx.line.voucher_id.id], + {'amount': float(amount)}) + ctx.line.write({'amount': float(amount)}) + +@step('My invoice "{inv_name}" is in state "{state}" reconciled with a residual amount of "{amount:f}"') +def impl(ctx, inv_name, state, amount): + invoice = model('account.invoice').get([('name', '=', inv_name)]) + assert_almost_equal(invoice.residual, amount) + assert_equal(invoice.state, state) + + +@step('I should have following journal entries in voucher') +@step('I should have the following journal entries in voucher') +def impl(ctx): + rows = [] + for row in ctx.table: + cells = {} + for key, value in row.items(): + if value: + cells[key] = value + rows.append(cells) + bank_statement = ctx.found_item + assert_equal(len(bank_statement.move_line_ids), len(rows)) + errors = [] + for row in rows: + account = model('account.account').get([('name', '=', row['account'])]) + if 'curr.' in row: + currency_id = mode('res.currency').get([('name', '=', row['curr.'])]).id + else: + currency_id = False + pname = datetime.datetime.now().strftime(row['period']) + period = model('account.period').get([('name', '=', pname)]) + domain = [('account_id', '=', account.id), + ('period_id', '=', period.id), + ('date', '=', datetime.datetime.now().strftime(row['date'])), + ('credit', '=', row.get('credit', 0.)), + ('debit', '=', row.get('debit', 0.)), + ('amount_currency', '=', row.get('curr.amt', 0.)), + ('currency_id', '=', currency_id), + ('id', 'in', [line.id for line in bank_statment.move_line_ids]), + ] + if row.get('reconcile'): + domain.append(('reconcile_id', '!=', False)) + else: + domain.append(('reconcile_id', '=', False)) + if row.get('partial'): + domain.append(('reconcile_partial_id', '!=', False)) + else: + domain.append(('reconcile_partial_id', '=', False)) + line = model('account.move.line').get(domain) + +@step('I modify the bank statement line amount to {amount:f}') +def impl(ctx, amount): + line = ctx.found_item.voucher_id.line_cr_ids[0] + #ctx.voucher = model('account.voucher').get(ctx.found_item.voucher_id.id) + ctx.found_item.on_change('onchange_amount', 'amount', (), amount) + +@then(u'I set bank statement end-balance') +@given(u'I set bank statement end-balance') +def impl(ctx): + assert ctx.found_item, "No statement found" + ctx.found_item.write({'balance_end_real': ctx.found_item.balance_end}) + assert ctx.found_item.balance_end == ctx.found_item.balance_end_real + +@when(u'I confirm bank statement') +def impl(ctx): + assert ctx.found_item + assert_equal(ctx.found_item._model._name, 'account.bank.statement') + ctx.found_item.button_confirm_bank() From 98c2035b06359c15b85c62aeff7c942e4c11de42 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 28 Mar 2013 15:25:15 +0100 Subject: [PATCH 07/46] [RM] deprecated step implementation --- .../features/steps/account_voucher.py | 41 ------------------- 1 file changed, 41 deletions(-) diff --git a/account_credit_control/scenarios/features/steps/account_voucher.py b/account_credit_control/scenarios/features/steps/account_voucher.py index 08b67322d..f89ce5721 100644 --- a/account_credit_control/scenarios/features/steps/account_voucher.py +++ b/account_credit_control/scenarios/features/steps/account_voucher.py @@ -77,47 +77,6 @@ def impl(ctx, inv_name, state, amount): assert_almost_equal(invoice.residual, amount) assert_equal(invoice.state, state) - -@step('I should have following journal entries in voucher') -@step('I should have the following journal entries in voucher') -def impl(ctx): - rows = [] - for row in ctx.table: - cells = {} - for key, value in row.items(): - if value: - cells[key] = value - rows.append(cells) - bank_statement = ctx.found_item - assert_equal(len(bank_statement.move_line_ids), len(rows)) - errors = [] - for row in rows: - account = model('account.account').get([('name', '=', row['account'])]) - if 'curr.' in row: - currency_id = mode('res.currency').get([('name', '=', row['curr.'])]).id - else: - currency_id = False - pname = datetime.datetime.now().strftime(row['period']) - period = model('account.period').get([('name', '=', pname)]) - domain = [('account_id', '=', account.id), - ('period_id', '=', period.id), - ('date', '=', datetime.datetime.now().strftime(row['date'])), - ('credit', '=', row.get('credit', 0.)), - ('debit', '=', row.get('debit', 0.)), - ('amount_currency', '=', row.get('curr.amt', 0.)), - ('currency_id', '=', currency_id), - ('id', 'in', [line.id for line in bank_statment.move_line_ids]), - ] - if row.get('reconcile'): - domain.append(('reconcile_id', '!=', False)) - else: - domain.append(('reconcile_id', '=', False)) - if row.get('partial'): - domain.append(('reconcile_partial_id', '!=', False)) - else: - domain.append(('reconcile_partial_id', '=', False)) - line = model('account.move.line').get(domain) - @step('I modify the bank statement line amount to {amount:f}') def impl(ctx, amount): line = ctx.found_item.voucher_id.line_cr_ids[0] From 2fdd2bd368aaf7767b69c76e276c016534e92ff2 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 2 Apr 2013 09:33:49 +0200 Subject: [PATCH 08/46] [FIX] print report generation --- .../wizard/credit_control_communication.py | 5 +---- .../wizard/credit_control_printer.py | 17 +++++++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/account_credit_control/wizard/credit_control_communication.py b/account_credit_control/wizard/credit_control_communication.py index 8f4ac37b2..75808a999 100644 --- a/account_credit_control/wizard/credit_control_communication.py +++ b/account_credit_control/wizard/credit_control_communication.py @@ -20,9 +20,7 @@ ############################################################################## import netsvc import logging -from openerp.osv.orm import TransientModel, fields -from openerp.osv.osv import except_osv -from openerp.tools.translate import _ +from openerp.osv.orm import TransientModel, fields logger = logging.getLogger('credit.control.line.mailing') @@ -178,4 +176,3 @@ class CreditCommunication(TransientModel): l_obj = self.pool.get('credit.control.line') l_obj.write(cr, uid, line_ids, {'state': 'sent'}, context=context) return line_ids - diff --git a/account_credit_control/wizard/credit_control_printer.py b/account_credit_control/wizard/credit_control_printer.py index 9ff1ad0b3..0435d2271 100644 --- a/account_credit_control/wizard/credit_control_printer.py +++ b/account_credit_control/wizard/credit_control_printer.py @@ -65,7 +65,7 @@ class CreditControlPrinter(TransientModel): def print_lines(self, cr, uid, wiz_id, context=None): assert not (isinstance(wiz_id, list) and len(wiz_id) > 1), \ - "wiz_id: only one id expected" + "wiz_id: only one id expected" comm_obj = self.pool.get('credit.control.communication') if isinstance(wiz_id, list): wiz_id = wiz_id[0] @@ -75,15 +75,20 @@ class CreditControlPrinter(TransientModel): raise except_osv(_('Error'), _('No credit control lines selected.')) line_ids = [l.id for l in form.line_ids] - comms = comm_obj._generate_comm_from_credit_line_ids( - cr, uid, line_ids, context=context) + comms = comm_obj._generate_comm_from_credit_line_ids(cr, uid, line_ids, + context=context) report_file = comm_obj._generate_report(cr, uid, comms, context=context) form.write({'report_file': base64.b64encode(report_file), 'state': 'done'}) if form.mark_as_sent: - filtered_ids = self._filter_line_ids(cr, uid, line_ids, context) comm_obj._mark_credit_line_as_sent(cr, uid, comms, context=context) - return False # do not close the window, we need it to download the report - + return {'type': 'ir.actions.act_window', + 'res_model': 'credit.control.printer', + 'view_mode': 'form', + 'view_type': 'form', + 'res_id': form.id, + 'views': [(False, 'form')], + 'target': 'new', + } From 8ab9aefb91bbe62b126336344ec18e880d222480 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 6 Jun 2013 12:04:27 +0200 Subject: [PATCH 09/46] [FIX] all tests green --- account_credit_control/__openerp__.py | 26 +++++++++--------- .../features/00_credit_control_param.feature | 6 +++++ .../06_credit_control_run_apr.feature | 27 ++++++++++--------- .../07_credit_control_run_may.feature | 11 ++++---- .../08_credit_control_run_jun.feature | 2 +- 5 files changed, 39 insertions(+), 33 deletions(-) diff --git a/account_credit_control/__openerp__.py b/account_credit_control/__openerp__.py index cb475751a..00de80a48 100644 --- a/account_credit_control/__openerp__.py +++ b/account_credit_control/__openerp__.py @@ -58,21 +58,21 @@ On each generated line, you have many choices: * Change the state (so you can ignore or reopen lines) """, 'website': 'http://www.camptocamp.com', - 'init_xml': ["data.xml"], - 'update_xml': ["line_view.xml", - "account_view.xml", - "partner_view.xml", - "policy_view.xml", - "run_view.xml", - "company_view.xml", - "wizard/credit_control_emailer_view.xml", - "wizard/credit_control_marker_view.xml", - "wizard/credit_control_printer_view.xml", - "report/report.xml", - "security/ir.model.access.csv",], + 'data': ["data.xml", + "line_view.xml", + "account_view.xml", + "partner_view.xml", + "policy_view.xml", + "run_view.xml", + "company_view.xml", + "wizard/credit_control_emailer_view.xml", + "wizard/credit_control_marker_view.xml", + "wizard/credit_control_printer_view.xml", + "report/report.xml", + "security/ir.model.access.csv"], 'demo_xml': ["credit_control_demo.xml"], 'tests': [], 'installable': True, 'license': 'AGPL-3', 'application': True -} + } diff --git a/account_credit_control/scenarios/features/00_credit_control_param.feature b/account_credit_control/scenarios/features/00_credit_control_param.feature index c32e47fb5..4757bc081 100644 --- a/account_credit_control/scenarios/features/00_credit_control_param.feature +++ b/account_credit_control/scenarios/features/00_credit_control_param.feature @@ -10,6 +10,12 @@ Feature: General parameters in order to test the credit control module + @deactivate_journal_control + Scenario: Journal setup to vaoid unfixed voucher bug + Given I execute the SQL commands + """ + UPDATE account_journal SET allow_date = false; + """ @account_credit_control_setup_install_modules Scenario: MODULES INSTALLATION diff --git a/account_credit_control/scenarios/features/06_credit_control_run_apr.feature b/account_credit_control/scenarios/features/06_credit_control_run_apr.feature index c7f6f1d69..300359edd 100644 --- a/account_credit_control/scenarios/features/06_credit_control_run_apr.feature +++ b/account_credit_control/scenarios/features/06_credit_control_run_apr.feature @@ -28,16 +28,17 @@ Feature: Ensure that email credit line generation first pass is correct When I launch the credit run Then my credit run should be in state "done" And the generated credit lines should have the following values: - | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | - | 1200 | %Y-03-31 | Debtors | 2 time policy | %Y-04-30 | customer_2 | email | 1 | SI_5 | 30 days end of month | draft | 1200 | USD | - | 1200 | %Y-03-17 | Debtors | 2 time policy | %Y-04-30 | customer_3 | email | 1 | SI_8 | 30 days end of month | draft | 1200 | USD | - | 700 | %Y-02-28 | Debtors | 3 time policy | %Y-04-30 | customer_4 | email | 2 | SI_10 | 30 days end of month | draft | 700 | | - | 840 | %Y-03-31 | Debtors | 3 time policy | %Y-04-30 | customer_4 | email | 1 | SI_11 | 10 days net | draft | 840 | USD | - | 450 | %Y-03-15 | Debtors | 3 time policy | %Y-04-30 | customer_4 | email | 2 | SI_12 | 30 days end of month | draft | 450 | USD | - | 1500 | %Y-04-14 | Debtors USD | 3 time policy | %Y-04-30 | customer_5_usd | email | 1 | SI_15 | 10 days net | draft | 1500 | USD | - | 1200 | %Y-03-17 | Debtors USD | 3 time policy | %Y-04-30 | customer_5_usd | email | 2 | SI_14 | 30 days end of month | draft | 1200 | USD | - | 1500 | %Y-04-14 | Debtors USD | 3 time policy | %Y-04-30 | customer_5_usd | email | 1 | SI_15 | 10 days net | draft | 1500 | USD | - | 1500 | %Y-04-14 | Debtors | 3 time policy | %Y-04-30 | customer_4 | email | 1 | SI_16 | 10 days net | draft | 1500 | | - | 1500 | %Y-04-14 | Debtors | 3 time policy | %Y-04-30 | Scrooge McDuck | email | 1 | SI_17 | 10 days net | draft | 1500 | | - | 450 | %Y-03-15 | Debtors | 3 time policy | %Y-04-30 | Donald Duck | email | 2 | SI_18 | 30 days end of month | draft | 450 | | - | 150 | %Y-03-15 | Debtors | 3 time policy | %Y-04-30 | Gus Goose | email | 2 | SI_19 | 30 days end of month | draft | 450 | | + | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | + | 360 | %Y-02-15 | Debtors | 3 time policy | %Y-04-30 | customer_4 | letter | 3 | SI_11 | 10 days last reminder | draft | 360 | USD | + | 1200 | %Y-03-31 | Debtors | 2 time policy | %Y-04-30 | customer_2 | email | 1 | SI_5 | 30 days end of month | draft | 1200 | USD | + | 1200 | %Y-03-17 | Debtors | 2 time policy | %Y-04-30 | customer_3 | email | 1 | SI_8 | 30 days end of month | draft | 1200 | USD | + | 700 | %Y-02-28 | Debtors | 3 time policy | %Y-04-30 | customer_4 | email | 2 | SI_10 | 30 days end of month | draft | 700 | | + | 840 | %Y-03-31 | Debtors | 3 time policy | %Y-04-30 | customer_4 | email | 1 | SI_11 | 10 days net | draft | 840 | USD | + | 450 | %Y-03-15 | Debtors | 3 time policy | %Y-04-30 | customer_4 | email | 2 | SI_12 | 30 days end of month | draft | 450 | USD | + | 1500 | %Y-04-14 | Debtors USD | 3 time policy | %Y-04-30 | customer_5_usd | email | 1 | SI_15 | 10 days net | draft | 1500 | USD | + | 1200 | %Y-03-17 | Debtors USD | 3 time policy | %Y-04-30 | customer_5_usd | email | 2 | SI_14 | 30 days end of month | draft | 1200 | USD | + | 1500 | %Y-04-14 | Debtors USD | 3 time policy | %Y-04-30 | customer_5_usd | email | 1 | SI_15 | 10 days net | draft | 1500 | USD | + | 1500 | %Y-04-14 | Debtors | 3 time policy | %Y-04-30 | customer_4 | email | 1 | SI_16 | 10 days net | draft | 1500 | | + | 1500 | %Y-04-14 | Debtors | 3 time policy | %Y-04-30 | Scrooge McDuck | email | 1 | SI_17 | 10 days net | draft | 1500 | | + | 450 | %Y-03-15 | Debtors | 3 time policy | %Y-04-30 | Donald Duck | email | 2 | SI_18 | 30 days end of month | draft | 450 | | + | 150 | %Y-03-15 | Debtors | 3 time policy | %Y-04-30 | Gus Goose | email | 2 | SI_19 | 30 days end of month | draft | 450 | | diff --git a/account_credit_control/scenarios/features/07_credit_control_run_may.feature b/account_credit_control/scenarios/features/07_credit_control_run_may.feature index 85b0896a2..535dc8fbb 100644 --- a/account_credit_control/scenarios/features/07_credit_control_run_may.feature +++ b/account_credit_control/scenarios/features/07_credit_control_run_may.feature @@ -82,16 +82,15 @@ Feature: Ensure that email credit line generation first pass is correct And the generated credit lines should have the following values: | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | | 1500 | %Y-04-30 | Debtors | 2 time policy | %Y-05-31 | customer_2 | email | 1 | SI_6 | 30 days end of month | draft | 1500 | USD | - | 1500 | %Y-04-14 | Debtors | 2 time policy | %Y-05-31 | customer_3 | email | 1 | SI_8 | 30 days end of month | draft | 1500 | USD | - | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-05-31 | customer_4 | email | 1 | SI_11 | 10 days net | draft | 1050 | USD | - | 1000 | %Y-02-29 | Debtors | 2 time policy | %Y-05-31 | customer_2 | letter | 2 | SI_4 | 60 days last reminder | draft | 1000 | | + | 1000 | %Y-02-28 | Debtors | 2 time policy | %Y-05-31 | customer_2 | letter | 2 | SI_4 | 60 days last reminder | draft | 1000 | | | 1000 | %Y-02-17 | Debtors | 2 time policy | %Y-05-31 | customer_3 | letter | 2 | SI_7 | 60 days last reminder | draft | 1000 | | + | 1500 | %Y-04-14 | Debtors | 2 time policy | %Y-05-31 | customer_3 | email | 1 | SI_9 | 30 days end of month | draft | 1500 | | | 840 | %Y-03-31 | Debtors | 3 time policy | %Y-05-31 | customer_4 | email | 2 | SI_11 | 30 days end of month | draft | 840 | USD | | 1500 | %Y-04-14 | Debtors USD | 3 time policy | %Y-05-31 | customer_5_usd | email | 2 | SI_15 | 30 days end of month | draft | 1500 | USD | - | 700 | %Y-02-29 | Debtors | 3 time policy | %Y-05-31 | customer_4 | letter | 3 | SI_10 | 10 days last reminder | draft | 700 | | + | 700 | %Y-02-28 | Debtors | 3 time policy | %Y-05-31 | customer_4 | letter | 3 | SI_10 | 10 days last reminder | draft | 700 | | | 450 | %Y-03-15 | Debtors | 3 time policy | %Y-05-31 | customer_4 | letter | 3 | SI_12 | 10 days last reminder | draft | 450 | USD | - | 360 | %Y-04-30 | Debtors | 3 time policy | %Y-04-30 | customer_4 | letter | 3 | SI_12 | 10 days last reminder | draft | 360 | USD | - | 1200 | %Y-03-16 | Debtors USD | 3 time policy | %Y-05-31 | customer_5_usd | letter | 3 | SI_14 | 10 days last reminder | draft | 1200 | USD | + | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-05-31 | customer_4 | email | 1 | SI_12 | 10 days net | draft | 1050 | USD | + | 1200 | %Y-03-17 | Debtors USD | 3 time policy | %Y-05-31 | customer_5_usd | letter | 3 | SI_14 | 10 days last reminder | draft | 1200 | USD | | 500 | %Y-04-14 | Debtors | 3 time policy | %Y-05-31 | Scrooge McDuck | email | 2 | SI_17 | 30 days end of month | draft | 1500 | | | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-05-31 | Donald Duck | email | 1 | SI_18 | 10 days net | draft | 1050 | | | 150 | %Y-03-15 | Debtors | 3 time policy | %Y-05-31 | Gus Goose | letter | 3 | SI_19 | 10 days last reminder | draft | 450 | | diff --git a/account_credit_control/scenarios/features/08_credit_control_run_jun.feature b/account_credit_control/scenarios/features/08_credit_control_run_jun.feature index 2ae94d935..6d093af4c 100644 --- a/account_credit_control/scenarios/features/08_credit_control_run_jun.feature +++ b/account_credit_control/scenarios/features/08_credit_control_run_jun.feature @@ -29,7 +29,7 @@ Feature: Ensure that email credit line generation first pass is correct And the generated credit lines should have the following values: | balance | date due | account | policy | date | partner | channel | level | move line | policy level | state | amount due | currency | | 1200 | %Y-03-31 | Debtors | 2 time policy | %Y-06-30 | customer_2 | letter | 2 | SI_5 | 60 days last reminder | draft | 1200 | USD | - | 1200 | %Y-03-16 | Debtors | 2 time policy | %Y-06-30 | customer_3 | letter | 2 | SI_8 | 60 days last reminder | draft | 1200 | USD | + | 1200 | %Y-03-17 | Debtors | 2 time policy | %Y-06-30 | customer_3 | letter | 2 | SI_8 | 60 days last reminder | draft | 1200 | USD | | 1050 | %Y-04-30 | Debtors | 3 time policy | %Y-06-30 | customer_4 | email | 2 | SI_12 | 30 days end of month | draft | 1050 | USD | | 840 | %Y-03-31 | Debtors | 3 time policy | %Y-06-30 | customer_4 | letter | 3 | SI_11 | 10 days last reminder | draft | 840 | USD | | 1500 | %Y-04-14 | Debtors USD | 3 time policy | %Y-06-30 | customer_5_usd | letter | 3 | SI_15 | 10 days last reminder | draft | 1500 | USD | From d2ec82f983f11073ed07a0f88d9ea11bce9d57b6 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 6 Jun 2013 15:52:26 +0200 Subject: [PATCH 10/46] [FIX] mail + print of remeinder --- account_credit_control/data.xml | 5 +- .../i18n/account_credit_control.pot | 74 ----------- .../report/credit_control_summary.html.mako | 121 +++++++++++++++++- .../wizard/credit_control_communication.py | 40 ++---- 4 files changed, 130 insertions(+), 110 deletions(-) diff --git a/account_credit_control/data.xml b/account_credit_control/data.xml index de9e8ee7e..e92be1b2d 100644 --- a/account_credit_control/data.xml +++ b/account_credit_control/data.xml @@ -9,8 +9,7 @@ - %if mode != 'pdf': + %if mode and mode != 'pdf': @@ -24,7 +23,7 @@ - + diff --git a/account_credit_control/i18n/account_credit_control.pot b/account_credit_control/i18n/account_credit_control.pot index 2cc7c34c8..1dae32a8d 100644 --- a/account_credit_control/i18n/account_credit_control.pot +++ b/account_credit_control/i18n/account_credit_control.pot @@ -562,79 +562,6 @@ msgstr "" msgid "Run date" msgstr "" -#. module: account_credit_control -#: model:res.groups,name:account_credit_control.group_account_credit_control_user -msgid "Credit Control User" -msgstr "" - -#. module: account_credit_control -#: model:email.template,body_html:account_credit_control.email_template_credit_control_base -msgid "\n" -" <%page args=\"object, user=None, ctx=None, quote=None, format_exception=True, mode='mail'\" />\n" -" %if mode != 'pdf':\n" -" \n" -" \n" -" %endif\n" -"
\n" -"\n" -"

Dear ${object.partner_id.name or ''},

\n" -"\n" -" 
${object.current_policy_level.custom_text}
\n" -"\n" -"
Summary
date dueDate due Amount due Amount balance Invoice number
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -"%for line in object.credit_control_line_ids:\n" -" \n" -" \n" -" \n" -" \n" -" %if line.invoice_id:\n" -" \n" -" %else:\n" -" \n" -" %endif\n" -"%endfor\n" -"
Summary
date dueAmount dueAmount balanceInvoice number
${line.date_due}${line.amount_due}${line.balance_due}${line.invoice_id.number}n/a
\n" -"
\n" -"
\n" -"\n" -"

If you have any question, do not hesitate to contact us.

\n" -"\n" -"

Thank you for choosing ${object.company_id.name}!

\n" -"\n" -" -- more info here --\n" -"

${object.user_id.name} ${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''}
\n" -" ${object.company_id.name}
\n" -" % if object.company_id.street:\n" -" ${object.company_id.street or ''}
\n" -"\n" -" % endif\n" -"\n" -" % if object.company_id.street2:\n" -" ${object.company_id.street2}
\n" -" % endif\n" -" % if object.company_id.city or object.company_id.zip:\n" -" ${object.company_id.zip or ''} ${object.company_id.city or ''}
\n" -" % endif\n" -" % if object.company_id.country_id:\n" -" ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
\n" -" % endif\n" -" % if object.company_id.phone:\n" -" Phone: ${object.company_id.phone}
\n" -" % endif\n" -" % if object.company_id.website:\n" -" ${object.company_id.website or ''}
\n" -" % endif\n" -" " -msgstr "" - #. module: account_credit_control #: constraint:account.move.line:0 msgid "Company must be the same for its related account and period." @@ -784,4 +711,3 @@ msgstr "" #: field:credit.control.line,policy_level_id:0 msgid "Overdue Level" msgstr "" - diff --git a/account_credit_control/report/credit_control_summary.html.mako b/account_credit_control/report/credit_control_summary.html.mako index 5f3b602f4..9fd14d15a 100644 --- a/account_credit_control/report/credit_control_summary.html.mako +++ b/account_credit_control/report/credit_control_summary.html.mako @@ -2,6 +2,120 @@ @@ -11,7 +125,12 @@ setLang(comm.partner_id.lang) current_uri = '%s_policy_template' % (comm.partner_id.lang) if not context.lookup.has_template(current_uri): - context.lookup.put_string(current_uri, comm.current_policy_level.email_template_id.body_html) + # awfully horrible we add page tags here beacause openerp replaced + # mako by Jinga but not everywere so they sandbox mako into jinga + # and jinga prevent %page tag to wwork + context.lookup.put_string(current_uri, + """<%page args="object, user=None, ctx=None, quote=None, format_exception=True, mode='email'" /> + """ + comm.current_policy_level.email_template_id.body_html) %> <%include file="${current_uri}" args="object=comm,user=user,ctx=ctx,quote=quote,format_exception=format_exception,mode='pdf'"/> diff --git a/account_credit_control/wizard/credit_control_communication.py b/account_credit_control/wizard/credit_control_communication.py index 75808a999..31a6b88d3 100644 --- a/account_credit_control/wizard/credit_control_communication.py +++ b/account_credit_control/wizard/credit_control_communication.py @@ -49,24 +49,6 @@ class CreditCommunication(TransientModel): cr, uid, 'credit.control.policy', context=c), 'user_id': lambda s, cr, uid, c: uid} - def get_address(self, cr, uid, com_id, context=None): - """Return a valid address for customer""" - assert not (isinstance(com_id, list) and len(com_id) > 1), \ - "com_id: only one id expected" - if isinstance(com_id, list): - com_id = com_id[0] - form = self.browse(cr, uid, com_id, context=context) - part_obj = self.pool.get('res.partner') - adds = part_obj.address_get(cr, uid, [form.partner_id.id], - adr_pref=['invoice', 'default']) - - add = adds.get('invoice', adds.get('default')) - add_obj = self.pool.get('res.partner.address') - if add: - return add_obj.browse(cr, uid, add, context=context) - else: - return False - def get_email(self, cr, uid, com_id, context=None): """Return a valid email for customer""" assert not (isinstance(com_id, list) and len(com_id) > 1), \ @@ -74,10 +56,7 @@ class CreditCommunication(TransientModel): if isinstance(com_id, list): com_id = com_id[0] form = self.browse(cr, uid, com_id, context=context) - address = form.get_address() - email = '' - if address and address.email: - email = address.email + email = form.partner_id.id or False return email def _get_credit_lines(self, cr, uid, line_ids, partner_id, level_id, context=None): @@ -124,13 +103,10 @@ class CreditCommunication(TransientModel): email_temp_obj = self.pool.get('email.template') email_message_obj = self.pool.get('mail.message') email_ids = [] - - essential_fields = [ - 'subject', - 'body_html', - 'email_from', - 'email_to' - ] + essential_fields = ['subject', + 'body_html', + 'email_from', + 'email_to'] for comm in comms: # we want to use a local cr in order to send the maximum @@ -139,9 +115,9 @@ class CreditCommunication(TransientModel): email_values = {} cl_ids = [cl.id for cl in comm.credit_control_line_ids] email_values = email_temp_obj.generate_email(cr, uid, - template, - comm.id, - context=context) + template, + comm.id, + context=context) email_id = email_message_obj.create(cr, uid, email_values, context=context) From ab3d3abdc2054e6a8d49061d212873600d40062b Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 6 Jun 2013 15:52:48 +0200 Subject: [PATCH 11/46] [FIX] broken translations --- account_credit_control/i18n/en.po | 143 +----------------------------- account_credit_control/i18n/fr.po | 136 +--------------------------- 2 files changed, 2 insertions(+), 277 deletions(-) diff --git a/account_credit_control/i18n/en.po b/account_credit_control/i18n/en.po index e93794f55..6ac50f1a1 100644 --- a/account_credit_control/i18n/en.po +++ b/account_credit_control/i18n/en.po @@ -1,6 +1,6 @@ # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * account_credit_control +# * account_credit_control # msgid "" msgstr "" @@ -650,147 +650,6 @@ msgstr "Run date" msgid "Credit Control User" msgstr "Credit Control User" -#. module: account_credit_control -#: model:email.template,body_html:account_credit_control.email_template_credit_control_base -msgid "" -"\n" -" <%page args=\"object, user=None, ctx=None, quote=None, " -"format_exception=True, mode='mail'\" />\n" -" %if mode != 'pdf':\n" -" \n" -" \n" -" %endif\n" -"

\n" -"\n" -"

Dear ${object.partner_id.name or ''},

\n" -"\n" -" 
${object.current_policy_level.custom_text}\n"
-"\n"
-"      \n"
-"      \n"
-"      \n"
-"        \n"
-"         \n"
-"         \n"
-"         \n"
-"      \n"
-"%for line in object.credit_control_line_ids:\n"
-"      \n"
-"        \n"
-"        \n"
-"        \n"
-"      %if line.invoice_id:\n"
-"          \n"
-"      %else:\n"
-"          \n"
-"      %endif\n"
-"%endfor\n"
-"      
Summary
date dueAmount dueAmount balanceInvoice number
${line.date_due}${line.amount_due}${line.balance_due}${line.invoice_id.number}n/a
\n"
-"      
\n"
-"      
\n"
-"\n"
-"      
If you have any question, do not hesitate to contact us.
\n"
-"\n"
-"      
Thank you for choosing ${object.company_id.name}! 
\n"
-"\n"
-"      -- more info here --\n"
-"      
${object.user_id.name} ${object.user_id.user_email and '<"
-"%s>'%(object.user_id.user_email) or ''}
\n"
-"      ${object.company_id.name}
\n"
-"      % if object.company_id.street:\n"
-"      ${object.company_id.street or ''}
\n"
-"\n"
-"      % endif\n"
-"\n"
-"      % if object.company_id.street2:\n"
-"      ${object.company_id.street2}
\n"
-"      % endif\n"
-"      % if object.company_id.city or object.company_id.zip:\n"
-"      ${object.company_id.zip or ''} ${object.company_id.city or ''}
\n"
-"      % endif\n"
-"      % if object.company_id.country_id:\n"
-"      ${object.company_id.state_id and ('%s, ' % object.company_id.state_id."
-"name) or ''} ${object.company_id.country_id.name or ''}
\n"
-"      % endif\n"
-"      % if object.company_id.phone:\n"
-"      Phone: ${object.company_id.phone}
\n"
-"      % endif\n"
-"      % if object.company_id.website:\n"
-"      ${object.company_id.website or ''}
\n"
-"      % endif\n"
-"      "
-msgstr ""
-"\n"
-"      <%page args=\"object, user=None, ctx=None, quote=None, "
-"format_exception=True, mode='mail'\" />\n"
-"      %if mode != 'pdf':\n"
-"      \n"
-"      \n"
-"      %endif\n"
-"      
\n"
-"\n"
-"      
Dear ${object.partner_id.name  or ''},
\n"
-"\n"
-"      
${object.current_policy_level.custom_text}\n"
-"\n"
-"      \n"
-"      \n"
-"      \n"
-"        \n"
-"         \n"
-"         \n"
-"         \n"
-"      \n"
-"%for line in object.credit_control_line_ids:\n"
-"      \n"
-"        \n"
-"        \n"
-"        \n"
-"      %if line.invoice_id:\n"
-"          \n"
-"      %else:\n"
-"          \n"
-"      %endif\n"
-"%endfor\n"
-"      
Summary
date dueAmount dueAmount balanceInvoice number
${line.date_due}${line.amount_due}${line.balance_due}${line.invoice_id.number}n/a
\n"
-"      
\n"
-"      
\n"
-"\n"
-"      
If you have any question, do not hesitate to contact us.
\n"
-"\n"
-"      
Thank you for choosing ${object.company_id.name}! 
\n"
-"\n"
-"      -- more info here --\n"
-"      
${object.user_id.name} ${object.user_id.user_email and '<"
-"%s>'%(object.user_id.user_email) or ''}
\n"
-"      ${object.company_id.name}
\n"
-"      % if object.company_id.street:\n"
-"      ${object.company_id.street or ''}
\n"
-"\n"
-"      % endif\n"
-"\n"
-"      % if object.company_id.street2:\n"
-"      ${object.company_id.street2}
\n"
-"      % endif\n"
-"      % if object.company_id.city or object.company_id.zip:\n"
-"      ${object.company_id.zip or ''} ${object.company_id.city or ''}
\n"
-"      % endif\n"
-"      % if object.company_id.country_id:\n"
-"      ${object.company_id.state_id and ('%s, ' % object.company_id.state_id."
-"name) or ''} ${object.company_id.country_id.name or ''}
\n"
-"      % endif\n"
-"      % if object.company_id.phone:\n"
-"      Phone: ${object.company_id.phone}
\n"
-"      % endif\n"
-"      % if object.company_id.website:\n"
-"      ${object.company_id.website or ''}
\n"
-"      % endif\n"
-"      "
-
 #. module: account_credit_control
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
diff --git a/account_credit_control/i18n/fr.po b/account_credit_control/i18n/fr.po
index 67e64ae9a..1f4427305 100644
--- a/account_credit_control/i18n/fr.po
+++ b/account_credit_control/i18n/fr.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* account_credit_control
+#       * account_credit_control
 #
 msgid ""
 msgstr ""
@@ -662,139 +662,6 @@ msgstr "Date de lancement"
 msgid "Credit Control User"
 msgstr "Utilisateur du contrôle de crédit"
 
-#. module: account_credit_control
-#: model:email.template,body_html:account_credit_control.email_template_credit_control_base
-msgid ""
-"\n"
-"      <%page args=\"object, user=None, ctx=None, quote=None, format_exception=True, mode='mail'\" />\n"
-"      %if mode != 'pdf':\n"
-"      \n"
-"      \n"
-"      %endif\n"
-"      
\n"
-"\n"
-"      
Dear ${object.partner_id.name  or ''},
\n"
-"\n"
-"      
${object.current_policy_level.custom_text}
\n"
-"\n"
-"      \n"
-"      \n"
-"      \n"
-"        \n"
-"         \n"
-"         \n"
-"         \n"
-"      \n"
-"%for line in object.credit_control_line_ids:\n"
-"      \n"
-"        \n"
-"        \n"
-"        \n"
-"      %if line.invoice_id:\n"
-"          \n"
-"      %else:\n"
-"          \n"
-"      %endif\n"
-"%endfor\n"
-"      
Summary
date dueAmount dueAmount balanceInvoice number
${line.date_due}${line.amount_due}${line.balance_due}${line.invoice_id.number}n/a
\n"
-"      
\n"
-"      
\n"
-"\n"
-"      
If you have any question, do not hesitate to contact us.
\n"
-"\n"
-"      
Thank you for choosing ${object.company_id.name}! 
\n"
-"\n"
-"      -- more info here --\n"
-"      
${object.user_id.name} ${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''}
\n"
-"      ${object.company_id.name}
\n"
-"      % if object.company_id.street:\n"
-"      ${object.company_id.street or ''}
\n"
-"\n"
-"      % endif\n"
-"\n"
-"      % if object.company_id.street2:\n"
-"      ${object.company_id.street2}
\n"
-"      % endif\n"
-"      % if object.company_id.city or object.company_id.zip:\n"
-"      ${object.company_id.zip or ''} ${object.company_id.city or ''}
\n"
-"      % endif\n"
-"      % if object.company_id.country_id:\n"
-"      ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
\n"
-"      % endif\n"
-"      % if object.company_id.phone:\n"
-"      Phone: ${object.company_id.phone}
\n"
-"      % endif\n"
-"      % if object.company_id.website:\n"
-"      ${object.company_id.website or ''}
\n"
-"      % endif\n"
-"      "
-msgstr ""
-"\n"
-"      <%page args=\"object, user=None, ctx=None, quote=None, format_exception=True, mode='mail'\" />\n"
-"      %if mode != 'pdf':\n"
-"      \n"
-"      \n"
-"      %endif\n"
-"      
\n"
-"\n"
-"      
Cher ${object.partner_id.name  or ''},
\n"
-"\n"
-"      
${object.current_policy_level.custom_text}
\n"
-"\n"
-"      \n"
-"      \n"
-"      \n"
-"        \n"
-"         \n"
-"         \n"
-"         \n"
-"      \n"
-"%for line in object.credit_control_line_ids:\n"
-"      \n"
-"        \n"
-"        \n"
-"        \n"
-"      %if line.invoice_id:\n"
-"          \n"
-"      %else:\n"
-"          \n"
-"      %endif\n"
-"%endfor\n"
-"      
Summary
Date dueSomme dueSolde duNuméro de facture
${line.date_due}${line.amount_due}${line.balance_due}${line.invoice_id.number}n/a
\n"
-"      
\n"
-"      
\n"
-"\n"
-"      
Si vous avez des questions n'hésitez pas à nous contacter.
\n"
-"\n"
-"      
Merci d'avoir choisi ${object.company_id.name}! 
\n"
-"\n"
-"      -- more info here --\n"
-"      
${object.user_id.name} ${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''}
\n"
-"      ${object.company_id.name}
\n"
-"      % if object.company_id.street:\n"
-"      ${object.company_id.street or ''}
\n"
-"\n"
-"      % endif\n"
-"\n"
-"      % if object.company_id.street2:\n"
-"      ${object.company_id.street2}
\n"
-"      % endif\n"
-"      % if object.company_id.city or object.company_id.zip:\n"
-"      ${object.company_id.zip or ''} ${object.company_id.city or ''}
\n"
-"      % endif\n"
-"      % if object.company_id.country_id:\n"
-"      ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
\n"
-"      % endif\n"
-"      % if object.company_id.phone:\n"
-"      Téléphone : ${object.company_id.phone}
\n"
-"      % endif\n"
-"      % if object.company_id.website:\n"
-"      ${object.company_id.website or ''}
\n"
-"      % endif\n"
-"      "
-
 #. module: account_credit_control
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
@@ -962,4 +829,3 @@ msgstr "Niveau de créance"
 #~ msgstr "Contrôle de crédit"
 #~ msgid "New lines"
 #~ msgstr "Nouvelles lignes"
-

From f20bf46aba8513bbc04e061201c4716a718ca184 Mon Sep 17 00:00:00 2001
From: unknown 
Date: Thu, 6 Jun 2013 16:36:01 +0200
Subject: [PATCH 12/46] [ADD] address in print report

---
 .../report/credit_control_summary.html.mako   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/account_credit_control/report/credit_control_summary.html.mako b/account_credit_control/report/credit_control_summary.html.mako
index 9fd14d15a..e3a597cd0 100644
--- a/account_credit_control/report/credit_control_summary.html.mako
+++ b/account_credit_control/report/credit_control_summary.html.mako
@@ -7,6 +7,11 @@ body {
     font-size: 11px;
 }
 
+.custom_text {
+    font-family: helvetica;
+    font-size: 11px;
+}
+
 table {
     font-family: helvetica;
     font-size: 11px;
@@ -121,6 +126,22 @@ tr.line {
   
 
     %for comm in objects :
+     

+        
+            
+            %for part in comm.partner_id.contact_address.split("\n")[1:]:
+                %if part:
+                
+                %endif
+            %endfor
+        
${comm.partner_id.title and comm.partner_id.title.name or ''} ${comm.partner_id.name }
${part}

+        

+        

+        

+        

+
+    

+    

       <%
         setLang(comm.partner_id.lang)
         current_uri = '%s_policy_template' % (comm.partner_id.lang)

From 17308585e472c1998b1fc67a971d5bd4459cc1fe Mon Sep 17 00:00:00 2001
From: unknown 
Date: Thu, 6 Jun 2013 17:26:52 +0200
Subject: [PATCH 13/46] [FIX] mail generation

---
 account_credit_control/__init__.py            |  1 +
 account_credit_control/line.py                |  2 +-
 account_credit_control/mail.py                | 28 +++++++++++++++++++
 .../wizard/credit_control_communication.py    |  6 ++--
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 account_credit_control/mail.py

diff --git a/account_credit_control/__init__.py b/account_credit_control/__init__.py
index 5f37efe65..15a388665 100644
--- a/account_credit_control/__init__.py
+++ b/account_credit_control/__init__.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see .
 #
 ##############################################################################
+from . import mail
 from . import run
 from . import line
 from . import account
diff --git a/account_credit_control/line.py b/account_credit_control/line.py
index 7afb553b1..46ce0a35b 100644
--- a/account_credit_control/line.py
+++ b/account_credit_control/line.py
@@ -75,7 +75,7 @@ class CreditControlLine(orm.Model):
         'partner_id': fields.many2one('res.partner', "Partner", required=True),
         'amount_due': fields.float('Due Amount Tax incl.', required=True, readonly=True),
         'balance_due': fields.float('Due balance', required=True, readonly=True),
-        'mail_message_id': fields.many2one('mail.message', 'Sent Email', readonly=True),
+        'mail_message_id': fields.many2one('mail.mail', 'Sent Email', readonly=True),
 
         'move_line_id': fields.many2one('account.move.line', 'Move line',
                                         required=True, readonly=True),
diff --git a/account_credit_control/mail.py b/account_credit_control/mail.py
new file mode 100644
index 000000000..24ce0faac
--- /dev/null
+++ b/account_credit_control/mail.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Nicolas Bessi, Guewen Baconnier
+#    Copyright 2012 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see .
+#
+##############################################################################
+from openerp.osv import orm, fields
+
+class Mail(orm.Model):
+    _inherit = 'mail.mail'
+
+    # use HTML fields instead of text
+    _columns = {'body_html': fields.html('Rich-text Contents',
+                                         help="Rich-text/HTML message"),}
diff --git a/account_credit_control/wizard/credit_control_communication.py b/account_credit_control/wizard/credit_control_communication.py
index 31a6b88d3..be64414f6 100644
--- a/account_credit_control/wizard/credit_control_communication.py
+++ b/account_credit_control/wizard/credit_control_communication.py
@@ -56,7 +56,7 @@ class CreditCommunication(TransientModel):
         if isinstance(com_id, list):
             com_id = com_id[0]
         form = self.browse(cr, uid, com_id, context=context)
-        email = form.partner_id.id or False
+        email = form.partner_id.email or False
         return email
 
     def _get_credit_lines(self, cr, uid, line_ids, partner_id, level_id, context=None):
@@ -101,7 +101,7 @@ class CreditCommunication(TransientModel):
         """Generate email message using template related to level"""
         cr_line_obj = self.pool.get('credit.control.line')
         email_temp_obj = self.pool.get('email.template')
-        email_message_obj = self.pool.get('mail.message')
+        email_message_obj = self.pool.get('mail.mail')
         email_ids = []
         essential_fields = ['subject',
                             'body_html',
@@ -118,6 +118,8 @@ class CreditCommunication(TransientModel):
                                                          template,
                                                          comm.id,
                                                          context=context)
+            email_values['body_html'] = email_values['body']
+            email_values['type'] = 'email'
 
             email_id = email_message_obj.create(cr, uid, email_values, context=context)
 

From b61c9674861f0b2e55eace6383366dd5b9738a83 Mon Sep 17 00:00:00 2001
From: unknown 
Date: Fri, 7 Jun 2013 10:34:07 +0200
Subject: [PATCH 14/46] [ADD] mail CSS

---
 account_credit_control/data.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/account_credit_control/data.xml b/account_credit_control/data.xml
index e92be1b2d..8b3f1b772 100644
--- a/account_credit_control/data.xml
+++ b/account_credit_control/data.xml
@@ -12,6 +12,15 @@
       %if mode and  mode != 'pdf':
       
       
       %endif
       


From 729232785a0895de3c6185c8cea729ab4034d442 Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle 
Date: Sat, 8 Jun 2013 11:25:34 +0200
Subject: [PATCH 15/46] [FIX] fix failure to confirm invoice when both 
 account_credit_control  and account_constraints are installed

---
 account_credit_control/account.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/account_credit_control/account.py b/account_credit_control/account.py
index 5fc7a8418..6dc31dbe6 100644
--- a/account_credit_control/account.py
+++ b/account_credit_control/account.py
@@ -54,11 +54,17 @@ class AccountInvoice(orm.Model):
 
     def action_move_create(self, cr, uid, ids, context=None):
         """ Write the id of the invoice in the generated moves. """
-        res = super(AccountInvoice, self).action_move_create(cr, uid, ids, context=context)
-        for inv in self.browse(cr, uid, ids, context=context):
+        if context is None:
+            context = {}
+        # add from_parent_object to the conxtext to let the line.write
+        # call pass through account_constraints
+        ctxt = context.copy()
+        ctxt['from_parent_object'] = True
+        res = super(AccountInvoice, self).action_move_create(cr, uid, ids, context=ctxt)
+        for inv in self.browse(cr, uid, ids, context=ctxt):
             if inv.move_id:
                 for line in inv.move_id.line_id:
-                    line.write({'invoice_id': inv.id})
+                    line.write({'invoice_id': inv.id}, context=ctxt)
         return res
 
 

From eea0b4284c0f89ee6235e33e0b4cc360a4c8fea9 Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle 
Date: Sat, 8 Jun 2013 11:34:35 +0200
Subject: [PATCH 16/46] [REF] use except_orm instead of except_osv

---
 account_credit_control/line.py                 |  2 +-
 account_credit_control/run.py                  | 18 ++++++++----------
 .../wizard/credit_control_emailer.py           |  7 +++----
 .../wizard/credit_control_marker.py            |  7 +++----
 .../wizard/credit_control_printer.py           |  7 +++----
 5 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/account_credit_control/line.py b/account_credit_control/line.py
index 46ce0a35b..fb05ac295 100644
--- a/account_credit_control/line.py
+++ b/account_credit_control/line.py
@@ -186,7 +186,7 @@ class CreditControlLine(orm.Model):
     def unlink(self, cr, uid, ids, context=None, check=True):
         for line in self.browse(cr, uid, ids, context=context):
             if line.state != 'draft':
-                raise osv.except_osv(
+                raise orm.except_orm(
                     _('Error !'),
                     _('You are not allowed to delete a credit control line that '
                       'is not in draft state.'))
diff --git a/account_credit_control/run.py b/account_credit_control/run.py
index 1f86447a4..8f50a66de 100644
--- a/account_credit_control/run.py
+++ b/account_credit_control/run.py
@@ -22,7 +22,6 @@ import logging
 
 from openerp.osv import orm, fields
 from openerp.tools.translate import _
-from openerp.osv.osv import except_osv
 
 logger = logging.getLogger('credit.control.run')
 
@@ -72,9 +71,9 @@ class CreditControlRun(orm.Model):
                                 order='date DESC', limit=1, context=context)
         if lines:
             line = line_obj.browse(cr, uid, lines[0], context=context)
-            raise except_osv(
-                _('Error'),
-                _('A run has already been executed more recently than %s') % (line.date))
+            raise orm.except_orm(_('Error'),
+                                 _('A run has already been executed more '
+                                   'recently than %s') % (line.date))
         return True
 
     def _generate_credit_lines(self, cr, uid, run_id, context=None):
@@ -92,9 +91,8 @@ class CreditControlRun(orm.Model):
 
         policies = run.policy_ids
         if not policies:
-            raise except_osv(
-                _('Error'),
-                _('Please select a policy'))
+            raise orm.except_orm(_('Error'),
+                                 _('Please select a policy'))
 
         report = ''
         for policy in policies:
@@ -137,9 +135,9 @@ class CreditControlRun(orm.Model):
                            ' LIMIT 1 FOR UPDATE NOWAIT')
         except Exception as exc:
             # in case of exception openerp will do a rollback for us and free the lock
-            raise except_osv(_('Error'),
-                             _('A credit control run is already running'
-                               ' in background, please try later.'), repr(exc))
+            raise orm.except_orm(_('Error'),
+                                 _('A credit control run is already running'
+                                   ' in background, please try later.'))
 
         self._generate_credit_lines(cr, uid, run_id, context)
         return True
diff --git a/account_credit_control/wizard/credit_control_emailer.py b/account_credit_control/wizard/credit_control_emailer.py
index c0ca50bf6..f0d3f7c6d 100644
--- a/account_credit_control/wizard/credit_control_emailer.py
+++ b/account_credit_control/wizard/credit_control_emailer.py
@@ -19,12 +19,11 @@
 #
 ##############################################################################
 
-from openerp.osv.orm import  TransientModel, fields
-from openerp.osv.osv import except_osv
+from openerp.osv import orm, fields
 from openerp.tools.translate import _
 
 
-class CreditControlEmailer(TransientModel):
+class CreditControlEmailer(orm.TransientModel):
     """Send emails for each selected credit control lines."""
 
     _name = "credit.control.emailer"
@@ -71,7 +70,7 @@ class CreditControlEmailer(TransientModel):
         form = self.browse(cr, uid, wiz_id, context)
 
         if not form.line_ids:
-            raise except_osv(_('Error'), _('No credit control lines selected.'))
+            raise orm.except_orm(_('Error'), _('No credit control lines selected.'))
 
         line_ids = [l.id for l in form.line_ids]
         filtered_ids = self._filter_line_ids(
diff --git a/account_credit_control/wizard/credit_control_marker.py b/account_credit_control/wizard/credit_control_marker.py
index b79098f9e..a458ab394 100644
--- a/account_credit_control/wizard/credit_control_marker.py
+++ b/account_credit_control/wizard/credit_control_marker.py
@@ -18,12 +18,11 @@
 #    along with this program.  If not, see .
 #
 ##############################################################################
-from openerp.osv.orm import  TransientModel, fields
-from openerp.osv.osv import except_osv
+from openerp.osv import orm, fields
 from openerp.tools.translate import _
 
 
-class CreditControlMarker(TransientModel):
+class CreditControlMarker(orm.TransientModel):
     """Change the state of lines in mass"""
 
     _name = 'credit.control.marker'
@@ -81,7 +80,7 @@ class CreditControlMarker(TransientModel):
         form = self.browse(cr, uid, wiz_id, context)
 
         if not form.line_ids:
-            raise except_osv(_('Error'), _('No credit control lines selected.'))
+            raise orm.except_orm(_('Error'), _('No credit control lines selected.'))
 
         line_ids = [l.id for l in form.line_ids]
 
diff --git a/account_credit_control/wizard/credit_control_printer.py b/account_credit_control/wizard/credit_control_printer.py
index 0435d2271..c67f908aa 100644
--- a/account_credit_control/wizard/credit_control_printer.py
+++ b/account_credit_control/wizard/credit_control_printer.py
@@ -20,11 +20,10 @@
 ##############################################################################
 import base64
 
-from openerp.osv.orm import  TransientModel, fields
-from openerp.osv.osv import except_osv
+from openerp.osv import orm, fields
 from openerp.tools.translate import _
 
-class CreditControlPrinter(TransientModel):
+class CreditControlPrinter(orm.TransientModel):
     """Print lines"""
 
     _name = "credit.control.printer"
@@ -72,7 +71,7 @@ class CreditControlPrinter(TransientModel):
         form = self.browse(cr, uid, wiz_id, context)
 
         if not form.line_ids and not form.print_all:
-            raise except_osv(_('Error'), _('No credit control lines selected.'))
+            raise orm.except_orm(_('Error'), _('No credit control lines selected.'))
 
         line_ids = [l.id for l in form.line_ids]
         comms = comm_obj._generate_comm_from_credit_line_ids(cr, uid, line_ids,

From 982710ce2d96fbf6d44d2731fe61347d9f12e70b Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle 
Date: Sat, 8 Jun 2013 11:44:30 +0200
Subject: [PATCH 17/46] [REF] reindent code

---
 account_credit_control/account.py | 43 +++++++++++++++++--------------
 account_credit_control/partner.py | 24 ++++++++---------
 account_credit_control/run.py     | 31 ++++++++++++----------
 3 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/account_credit_control/account.py b/account_credit_control/account.py
index 6dc31dbe6..440e9a8e2 100644
--- a/account_credit_control/account.py
+++ b/account_credit_control/account.py
@@ -20,37 +20,42 @@
 ##############################################################################
 from openerp.osv import orm, fields
 
+o2m = fields.one2many
+m2o = fields.many2one
 
 class AccountAccount(orm.Model):
     """Add a link to a credit control policy on account.account"""
 
     _inherit = "account.account"
 
-    _columns = {'credit_control_line_ids': fields.one2many('credit.control.line',
-                                                           'account_id',
-                                                           string='Credit Lines',
-                                                           readonly=True)
-                }
+    _columns = {
+        'credit_control_line_ids':
+            fields.one2many('credit.control.line',
+                            'account_id',
+                            string='Credit Lines',
+                            readonly=True),
+        }
 
 
 class AccountInvoice(orm.Model):
     """Add a link to a credit control policy on account.account"""
 
     _inherit = "account.invoice"
-    _columns = {'credit_policy_id': fields.many2one('credit.control.policy',
-                                                    'Credit Control Policy',
-                                                    help=("The Credit Control Policy "
-                                                          "used for this invoice. "
-                                                          "If nothing is defined, "
-                                                          "it will use the account "
-                                                          "setting or the partner "
-                                                          "setting.")),
-
-                'credit_control_line_ids': fields.one2many('credit.control.line',
-                                                           'invoice_id',
-                                                           string='Credit Lines',
-                                                           readonly=True)
-                }
+    _columns = {
+        'credit_policy_id':
+            fields.many2one('credit.control.policy',
+                            'Credit Control Policy',
+                            help=("The Credit Control Policy used for this "
+                                  "invoice. If nothing is defined, it will "
+                                  "use the account setting or the partner "
+                                  "setting.")
+                            ),
+        'credit_control_line_ids':
+            fields.one2many('credit.control.line',
+                            'invoice_id',
+                            string='Credit Lines',
+                            readonly=True),
+        }
 
     def action_move_create(self, cr, uid, ids, context=None):
         """ Write the id of the invoice in the generated moves. """
diff --git a/account_credit_control/partner.py b/account_credit_control/partner.py
index 8d66428b6..57e88561d 100644
--- a/account_credit_control/partner.py
+++ b/account_credit_control/partner.py
@@ -28,16 +28,16 @@ class ResPartner(orm.Model):
     _inherit = "res.partner"
 
     _columns = {
-        'credit_policy_id': fields.many2one('credit.control.policy',
-                                            'Credit Control Policy',
-                                            help=("The Credit Control Policy"
-                                                  "used for this partner. This "
-                                                  "setting can be forced on the "
-                                                  "invoice. If nothing is defined, "
-                                                  "it will use the company "
-                                                  "setting.")),
-        'credit_control_line_ids': fields.one2many('credit.control.line',
-                                                   'invoice_id',
-                                                   string='Credit Control Lines',
-                                                   readonly=True)
+        'credit_policy_id':
+            fields.many2one('credit.control.policy',
+                            'Credit Control Policy',
+                            help=("The Credit Control Policy used for this "
+                                  "partner. This setting can be forced on the "
+                                  "invoice. If nothing is defined, it will use "
+                                  "the company setting.")),
+        'credit_control_line_ids':
+            fields.one2many('credit.control.line',
+                            'invoice_id',
+                            string='Credit Control Lines',
+                            readonly=True)
     }
diff --git a/account_credit_control/run.py b/account_credit_control/run.py
index 8f50a66de..cbcde05e8 100644
--- a/account_credit_control/run.py
+++ b/account_credit_control/run.py
@@ -34,12 +34,13 @@ class CreditControlRun(orm.Model):
     _description = """Credit control line generator"""
     _columns = {
         'date': fields.date('Controlling Date', required=True),
-        'policy_ids': fields.many2many('credit.control.policy',
-                                       rel="credit_run_policy_rel",
-                                       id1='run_id', id2='policy_id',
-                                       string='Policies',
-                                       readonly=True,
-                                       states={'draft': [('readonly', False)]}),
+        'policy_ids':
+            fields.many2many('credit.control.policy',
+                             rel="credit_run_policy_rel",
+                             id1='run_id', id2='policy_id',
+                             string='Policies',
+                             readonly=True,
+                             states={'draft': [('readonly', False)]}),
 
         'report': fields.text('Report', readonly=True),
 
@@ -49,14 +50,16 @@ class CreditControlRun(orm.Model):
                                   required=True,
                                   readonly=True),
 
-        'manual_ids': fields.many2many('account.move.line',
-                                       rel="credit_runreject_rel",
-                                       string='Lines to handle manually',
-                                       help=('If a credit control line has been generated on a policy'
-                                             ' and the policy has been changed meantime,'
-                                             ' it has to be handled manually'),
-                                       readonly=True),
-    }
+        'manual_ids':
+            fields.many2many('account.move.line',
+                             rel="credit_runreject_rel",
+                             string='Lines to handle manually',
+                             help=('If a credit control line has been generated'
+                                   'on a policy and the policy has been changed '
+                                   'in the meantime, it has to be handled '
+                                   'manually'),
+                             readonly=True),
+        xs}
 
     def _get_policies(self, cr, uid, context=None):
         return self.pool['credit.control.policy'].search(cr, uid, [], context=context)

From cadabaa6b26f2194ce1bb5d44a1e85efffae9f21 Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle 
Date: Sat, 8 Jun 2013 11:45:59 +0200
Subject: [PATCH 18/46] [FIX] typo

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

diff --git a/account_credit_control/run.py b/account_credit_control/run.py
index cbcde05e8..656de6bd4 100644
--- a/account_credit_control/run.py
+++ b/account_credit_control/run.py
@@ -59,7 +59,7 @@ class CreditControlRun(orm.Model):
                                    'in the meantime, it has to be handled '
                                    'manually'),
                              readonly=True),
-        xs}
+        }
 
     def _get_policies(self, cr, uid, context=None):
         return self.pool['credit.control.policy'].search(cr, uid, [], context=context)

From 1e3098232f2ae1430d0ce8595a53dbaac06913a8 Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle 
Date: Sat, 8 Jun 2013 11:46:54 +0200
Subject: [PATCH 19/46] cleanup

---
 account_credit_control/account.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/account_credit_control/account.py b/account_credit_control/account.py
index 440e9a8e2..3eaf23950 100644
--- a/account_credit_control/account.py
+++ b/account_credit_control/account.py
@@ -20,9 +20,6 @@
 ##############################################################################
 from openerp.osv import orm, fields
 
-o2m = fields.one2many
-m2o = fields.many2one
-
 class AccountAccount(orm.Model):
     """Add a link to a credit control policy on account.account"""
 

From 16ccf6773a9b65e34eb5bc11bdf29460eb68a80b Mon Sep 17 00:00:00 2001
From: unknown 
Date: Wed, 26 Jun 2013 13:40:45 +0200
Subject: [PATCH 20/46] [FIX] account_credit_control: use of deprecated field
 user_email causes permission error in multicompany setting fixed by using the
 correct 'email' field in the template

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

diff --git a/account_credit_control/data.xml b/account_credit_control/data.xml
index 8b3f1b772..9d284fa75 100644
--- a/account_credit_control/data.xml
+++ b/account_credit_control/data.xml
@@ -57,7 +57,7 @@
       
Thank you for choosing ${object.company_id.name}! 

 
       -- more info here --
-      
${object.user_id.name} ${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''}

+      
${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''}

       ${object.company_id.name}

       % if object.company_id.street:
       ${object.company_id.street or ''}


From b6151f0549af3b575a249740deef6e2f07587430 Mon Sep 17 00:00:00 2001
From: Yannick Vaucher 
Date: Thu, 27 Jun 2013 11:07:51 +0200
Subject: [PATCH 21/46] [FIX] account_credit_control - address in mako template
 to make sure address is displayed

---
 .../report/credit_control_summary.html.mako          | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/account_credit_control/report/credit_control_summary.html.mako b/account_credit_control/report/credit_control_summary.html.mako
index e3a597cd0..a45c5b775 100644
--- a/account_credit_control/report/credit_control_summary.html.mako
+++ b/account_credit_control/report/credit_control_summary.html.mako
@@ -126,10 +126,18 @@ tr.line {
   
 
     %for comm in objects :
-     

+    <% setLang(comm.partner_id.lang) %>
+    

         
+            %if comm.partner_id.parent_id:
+            
+            
+            <% address_lines = comm.partner_id.contact_address.split("\n")[1:] %>
+            %else:
             
-            %for part in comm.partner_id.contact_address.split("\n")[1:]:
+            <% address_lines = comm.partner_id.contact_address.split("\n") %>
+            %endif
+            %for part in address_lines:
                 %if part:
                 
                 %endif

From 0be1b32dcb4d74e4159e6b6e93ddcac658f244c9 Mon Sep 17 00:00:00 2001
From: Yannick Vaucher 
Date: Thu, 27 Jun 2013 11:16:46 +0200
Subject: [PATCH 22/46] [IMP] account_credit_control - remove 'more info here'
 from report

---
 account_credit_control/data.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/account_credit_control/data.xml b/account_credit_control/data.xml
index 9d284fa75..01cf85999 100644
--- a/account_credit_control/data.xml
+++ b/account_credit_control/data.xml
@@ -56,7 +56,6 @@
 
       
Thank you for choosing ${object.company_id.name}! 

 
-      -- more info here --
       
${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''}

       ${object.company_id.name}

       % if object.company_id.street:

From fb9685aad693b1a589323118504c7a8ab5d5adc5 Mon Sep 17 00:00:00 2001
From: Yannick Vaucher 
Date: Thu, 27 Jun 2013 13:55:53 +0200
Subject: [PATCH 23/46] [IMP] account_credit_control - add some css to reminder
 report and set texts taking the whole width of the document

---
 account_credit_control/data.xml | 91 ++++++++++++++++++++++-----------
 1 file changed, 61 insertions(+), 30 deletions(-)

diff --git a/account_credit_control/data.xml b/account_credit_control/data.xml
index 01cf85999..793b5bb23 100644
--- a/account_credit_control/data.xml
+++ b/account_credit_control/data.xml
@@ -13,35 +13,73 @@
       
       
       %endif
       

 
+      <%
+      def carriage_returns(text):
+          return text.replace('\n', '
')
+      %>
+      

+      

+
       
Dear ${object.partner_id.name  or ''},

 
-      
${object.current_policy_level.custom_text}

+      
${object.current_policy_level.custom_text | carriage_returns }

 
-      
${comm.partner_id.parent_id.name or ''}
${comm.partner_id.title and comm.partner_id.title.name or ''} ${comm.partner_id.name }
${comm.partner_id.title and comm.partner_id.title.name or ''} ${comm.partner_id.name }
${part}

+      

+      

+
+      

-        
-         
-         
-         
+        
+        
+        
+        
 %for line in object.credit_control_line_ids:
       
-        
-        
-        
+        
+        
+        
       %if line.invoice_id:
           
       %else:
@@ -105,10 +143,8 @@
       emailDear Sir or Madam,
 
-Our records indicate that we have not received the payment of the
-above mentioned invoice (copy attached for your convenience).  If it
-has already been sent, please disregard this notice. If not, please
-proceed with payment within 10 days.
+Our records indicate that we have not received the payment of the above mentioned invoice (copy attached for your convenience).
+If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.
 
 Thank you in advance for your anticipated cooperation in this matter.
 
@@ -127,10 +163,8 @@ Best regards,
       email
       Dear Sir or Madam,
 
-Our records indicate that we have not yet received the payment of the
-above mentioned invoice (copy attached for your convenience) despite
-our first reminder.  If it has already been sent, please disregard
-this notice. If not, please proceed with payment within 5 days.
+Our records indicate that we have not yet received the payment of the above mentioned invoice (copy attached for your convenience) despite our first reminder. 
+If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.
 
 Thank you in advance for your anticipated cooperation in this matter.
 
@@ -149,12 +183,9 @@ Best regards,
       letter
       Dear Sir or Madam,
 
-Our records indicate that we still have not received the payment of
-the above mentioned invoice (copy attached) despite our two reminders.
-If payment have already been sent, please disregard this notice. If
-not, please proceed with payment. If your payment has not been
-received in the next 5 days, your file will be transfered to our debt
-collection agency.
+Our records indicate that we still have not received the payment of the above mentioned invoice (copy attached) despite our two reminders.
+If payment have already been sent, please disregard this notice. If not, please proceed with payment.
+If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.
 
 Should you need us to arrange a payment plan for you, please advise.
 A customer account statement is enclosed for you convenience.

From 816c2df562e50dd9cfbbe5044f53fdba899952cd Mon Sep 17 00:00:00 2001
From: Yannick Vaucher 
Date: Thu, 27 Jun 2013 16:47:19 +0200
Subject: [PATCH 24/46] [IMP] account_credit_control - add a subject in
 reminder report

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

diff --git a/account_credit_control/data.xml b/account_credit_control/data.xml
index 793b5bb23..f01c91253 100644
--- a/account_credit_control/data.xml
+++ b/account_credit_control/data.xml
@@ -57,8 +57,10 @@
       def carriage_returns(text):
           return text.replace('\n', '
')
       %>
-      

-      

+
+      

+          Credit Control: ${object.current_policy_level.name or 'n/a' }
+      

 
       
Dear ${object.partner_id.name  or ''},

 

From 9724bd97fe2c64921dee31b2a8d1618771c5f45d Mon Sep 17 00:00:00 2001
From: unknown 
Date: Fri, 12 Jul 2013 08:26:03 +0200
Subject: [PATCH 25/46] [FIX] report use precise mode by default

---
 account_credit_control/report/report.xml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/account_credit_control/report/report.xml b/account_credit_control/report/report.xml
index 04e84f277..dee64b896 100644
--- a/account_credit_control/report/report.xml
+++ b/account_credit_control/report/report.xml
@@ -1,12 +1,16 @@
 
   
-            
+    
+
+    
+      
+    
   
 

From 6843db152b631b3e9ee5ff36bc1f78b7d4aeb7f9 Mon Sep 17 00:00:00 2001
From: unknown 
Date: Fri, 12 Jul 2013 08:27:14 +0200
Subject: [PATCH 26/46] [ADD] date_entry fields on line model to be used by
 report or in next MP on filter group by

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

diff --git a/account_credit_control/line.py b/account_credit_control/line.py
index fb05ac295..5b6378e25 100644
--- a/account_credit_control/line.py
+++ b/account_credit_control/line.py
@@ -48,6 +48,10 @@ class CreditControlLine(orm.Model):
                                 readonly=True,
                                 states={'draft': [('readonly', False)]}),
 
+        'date_entry': fields.related('move_line_id', 'date', type='date',
+                                     string='Entry date',
+                                     store=True, readonly=True),
+
         'date_sent': fields.date('Sent date',
                                  readonly=True,
                                  states={'draft': [('readonly', False)]}),

From 3b97ea2c676d746fc34b6ac8c687d5c2aadf2b3f Mon Sep 17 00:00:00 2001
From: unknown 
Date: Fri, 12 Jul 2013 08:28:24 +0200
Subject: [PATCH 27/46] [IMP] reporting layer, + add hook function to get
 contact address

---
 account_credit_control/data.xml               | 80 +++++++++----------
 .../report/credit_control_summary.html.mako   | 19 +++--
 .../wizard/credit_control_communication.py    | 19 +++--
 3 files changed, 65 insertions(+), 53 deletions(-)

diff --git a/account_credit_control/data.xml b/account_credit_control/data.xml
index f01c91253..542bdc708 100644
--- a/account_credit_control/data.xml
+++ b/account_credit_control/data.xml
@@ -4,7 +4,7 @@
     
       Credit Control Email
       noreply@localhost
-      Credit Control: (${object.current_policy_level.name or 'n/a' })
+      Credit Control: (${object.current_policy_level.name or 'n/a'})
       ${object.get_email() or  ''}
       
       
@@ -31,7 +31,8 @@
 
       .basic_table th {
           border: 1px solid lightGrey;
-          font-size: 12px;
+          font-size: 11px;
+          font-weight: bold;
       }
 
       .basic_table td {
@@ -41,6 +42,7 @@
 
       td.amount, th.amount {
           text-align: right;
+          padding-right: 2px;
           white-space: nowrap;
       }
 
@@ -52,19 +54,12 @@
       
       %endif
       

-
-      <%
-      def carriage_returns(text):
-          return text.replace('\n', '
')
-      %>
-
-      

+      

           Credit Control: ${object.current_policy_level.name or 'n/a' }
-      

+      
 
-      
Dear ${object.partner_id.name  or ''},

-
-      
${object.current_policy_level.custom_text | carriage_returns }

+      
Dear ${object.get_contact_address().name  or ''},

+      
${object.current_policy_level.custom_text.replace('\n', '
')}

 
       

       

@@ -72,21 +67,32 @@
       

       Summary
       
Date dueAmount dueAmount balanceInvoice numberDate dueAmount dueAmount balanceInvoice number
       
${line.date_due}${line.amount_due}${line.balance_due}${line.date_due}${line.amount_due}${line.balance_due}${line.invoice_id.number}
       

-        
-        
-        
-        
+        
+        
+        
+        
+        
+        
+
       
 %for line in object.credit_control_line_ids:
       
+      %if line.invoice_id:
+          
+      %else:
+          
+      %endif
+        
-      %if line.invoice_id:
-          
-      %else:
-          
-      %endif
+        
+      
 %endfor
       

       Summary
       
Date dueAmount dueAmount balanceInvoice numberInvoice numberInvoice dateDate dueInvoiced AmountOpen AmountCurrency
${line.invoice_id.number}
+              %if line.invoice_id.name:
+              

+              ${line.invoice_id.name}
+              %endif
+          		${line.move_line_id.name}${line.date_entry}
         ${line.date_due}
         ${line.amount_due}
         ${line.balance_due}${line.invoice_id.number}n/a${line.currency_id.name or object.company_id.currency_id.name}

       

@@ -143,8 +149,7 @@
       
       
       email
-      Dear Sir or Madam,
-
+      
 Our records indicate that we have not received the payment of the above mentioned invoice (copy attached for your convenience).
 If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.
 
@@ -163,9 +168,8 @@ Best regards,
       
       
       email
-      Dear Sir or Madam,
-
-Our records indicate that we have not yet received the payment of the above mentioned invoice (copy attached for your convenience) despite our first reminder. 
+      
+Our records indicate that we have not yet received the payment of the above mentioned invoice (copy attached for your convenience) despite our first reminder.
 If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.
 
 Thank you in advance for your anticipated cooperation in this matter.
@@ -183,8 +187,7 @@ Best regards,
       
       
       letter
-      Dear Sir or Madam,
-
+      
 Our records indicate that we still have not received the payment of the above mentioned invoice (copy attached) despite our two reminders.
 If payment have already been sent, please disregard this notice. If not, please proceed with payment.
 If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.
@@ -213,12 +216,9 @@ Best regards,
       
       
       email
-      Dear Sir or Madam,
-
-Our records indicate that we have not received the payment of the
-above mentioned invoice (copy attached for your convenience).  If it
-has already been sent, please disregard this notice. If not, please
-proceed with payment within 10 days.
+      
+Our records indicate that we have not received the payment of the above mentioned invoice (copy attached for your convenience).
+If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.
 
 Thank you in advance for your anticipated cooperation in this matter.
 
@@ -235,13 +235,11 @@ Best regards,
       
       
       letter
-      Dear Sir or Madam,
+      
+Our records indicate that we still have not received the payment of the above mentioned invoice (copy attached) despite our reminder.
 
-Our records indicate that we still have not received the payment of
-the above mentioned invoice (copy attached) despite our reminder.
-If payment have already been sent, please disregard this notice. If
-not, please proceed with payment. If your payment has not been
-received in the next 5 days, your file will be transfered to our debt
+If payment have already been sent, please disregard this notice. If not, please proceed with payment.
+If your payment has not been received in the next 5 days, your file will be transfered to our debt
 collection agency.
 
 Should you need us to arrange a payment plan for you, please advise.
diff --git a/account_credit_control/report/credit_control_summary.html.mako b/account_credit_control/report/credit_control_summary.html.mako
index a45c5b775..98d055be2 100644
--- a/account_credit_control/report/credit_control_summary.html.mako
+++ b/account_credit_control/report/credit_control_summary.html.mako
@@ -65,7 +65,7 @@ table {
 .list_table th {
     border-bottom: 2px solid black;
     text-align: left;
-    font-size: 12px;
+    font-size: 11px;
     font-weight: bold;
     padding-right: 3px
     padding-left: 3px
@@ -105,6 +105,7 @@ table .address_title {
 
 td.amount, th.amount {
     text-align: right;
+    padding-right:2px;
 }
 
 h1 {
@@ -129,13 +130,17 @@ tr.line {
     <% setLang(comm.partner_id.lang) %>
     

         
-            %if comm.partner_id.parent_id:
-            
-            
-            <% address_lines = comm.partner_id.contact_address.split("\n")[1:] %>
+          <%
+             add = comm.get_contact_address()
+          %>
+            %if comm.partner_id.id == add.id:
+              
+              <% address_lines = comm.partner_id.contact_address.split("\n") %>
+
             %else:
-            
-            <% address_lines = comm.partner_id.contact_address.split("\n") %>
+              
+              
+              <% address_lines = add.contact_address.split("\n")[1:] %>
             %endif
             %for part in address_lines:
                 %if part:
diff --git a/account_credit_control/wizard/credit_control_communication.py b/account_credit_control/wizard/credit_control_communication.py
index be64414f6..ef3ce6792 100644
--- a/account_credit_control/wizard/credit_control_communication.py
+++ b/account_credit_control/wizard/credit_control_communication.py
@@ -26,7 +26,7 @@ logger = logging.getLogger('credit.control.line.mailing')
 
 
 class CreditCommunication(TransientModel):
-    """Shell calss used to provide a base model to email template and reporting.
+    """Shell class used to provide a base model to email template and reporting.
        Il use this approche in version 7 a browse record will exist even if not saved"""
     _name = "credit.control.communication"
     _description = "credit control communication"
@@ -51,13 +51,22 @@ class CreditCommunication(TransientModel):
 
     def get_email(self, cr, uid, com_id, context=None):
         """Return a valid email for customer"""
-        assert not (isinstance(com_id, list) and len(com_id) > 1), \
-                "com_id: only one id expected"
+        if isinstance(com_id, list):
+            assert len(com_id) == 1, "get_email only support one id as parameter"
+            com_id = com_id[0]
+        form = self.browse(cr, uid, com_id, context=context)
+        contact = self.get_contact_address(form.partner_id.id, context=context)
+        return contact.email
+
+    def get_contact_address(self, cr, uid, com_id, context=None):
+        pmod = self.pool['res.partner']
         if isinstance(com_id, list):
             com_id = com_id[0]
         form = self.browse(cr, uid, com_id, context=context)
-        email = form.partner_id.email or False
-        return email
+        part = form.partner_id
+        add_ids = part.address_get(adr_pref=['invoice']) or {}
+        add_id = add_ids.get('invoice', add_ids.get('default', False))
+        return pmod.browse(cr, uid, add_id, context)
 
     def _get_credit_lines(self, cr, uid, line_ids, partner_id, level_id, context=None):
         """Return credit lines related to a partner and a policy level"""

From 1d6338589a19579684abb0d0e2bc0ad70e30c947 Mon Sep 17 00:00:00 2001
From: unknown 
Date: Fri, 12 Jul 2013 12:44:13 +0200
Subject: [PATCH 28/46] [REFACTOR] credit control mail are not in plain text
 but send as attachement

---
 account_credit_control/__openerp__.py         |   4 +-
 account_credit_control/data.xml               | 233 +++++++-----------
 account_credit_control/policy.py              |   3 +
 account_credit_control/policy_view.xml        |   5 +-
 .../report/credit_control_summary.html.mako   |  98 ++++++--
 .../wizard/credit_control_communication.py    |  20 +-
 6 files changed, 193 insertions(+), 170 deletions(-)

diff --git a/account_credit_control/__openerp__.py b/account_credit_control/__openerp__.py
index 00de80a48..5da57004a 100644
--- a/account_credit_control/__openerp__.py
+++ b/account_credit_control/__openerp__.py
@@ -58,7 +58,8 @@ On each generated line, you have many choices:
  * Change the state (so you can ignore or reopen lines)
  """,
  'website': 'http://www.camptocamp.com',
- 'data': ["data.xml",
+ 'data': ["report/report.xml",
+          "data.xml",
           "line_view.xml",
           "account_view.xml",
           "partner_view.xml",
@@ -68,7 +69,6 @@ On each generated line, you have many choices:
           "wizard/credit_control_emailer_view.xml",
           "wizard/credit_control_marker_view.xml",
           "wizard/credit_control_printer_view.xml",
-          "report/report.xml",
           "security/ir.model.access.csv"],
  'demo_xml': ["credit_control_demo.xml"],
  'tests': [],
diff --git a/account_credit_control/data.xml b/account_credit_control/data.xml
index 542bdc708..9090fbacf 100644
--- a/account_credit_control/data.xml
+++ b/account_credit_control/data.xml
@@ -8,122 +8,13 @@
       ${object.get_email() or  ''}
       
       
+      ${object.get_contact_address().lang.code or 'en_US'}
+      
       
-      
-      %endif
-      

-      

-          Credit Control: ${object.current_policy_level.name or 'n/a' }
-      

-
-      
Dear ${object.get_contact_address().name  or ''},

-      
${object.current_policy_level.custom_text.replace('\n', '
')}

-
+      Dear ${object.get_contact_address().name  or ''}
       

       

-
-      
${comm.partner_id.parent_id.name or ''}
${comm.partner_id.title and comm.partner_id.title.name or ''} ${comm.partner_id.name }
${comm.partner_id.title and comm.partner_id.title.name or ''} ${comm.partner_id.name }
${comm.partner_id.title and comm.partner_id.title.name or ''} ${comm.partner_id.name }
${comm.partner_id.name or ''}
${add.title and add.title.name or ''} ${add.name}

-      
-      
-        
-        
-        
-        
-        
-        
-
-      
-%for line in object.credit_control_line_ids:
-      
-      %if line.invoice_id:
-          
-      %else:
-          
-      %endif
-        
-        
-        
-        
-        
-      
-%endfor
-      
Summary
Invoice numberInvoice dateDate dueInvoiced AmountOpen AmountCurrency
${line.invoice_id.number}
-              %if line.invoice_id.name:
-              

-              ${line.invoice_id.name}
-              %endif
-          		${line.move_line_id.name}${line.date_entry}${line.date_due}${line.amount_due}${line.balance_due}${line.currency_id.name or object.company_id.currency_id.name}

-      

-      

-
-      
If you have any question, do not hesitate to contact us.

-
-      
Thank you for choosing ${object.company_id.name}! 

-
-      
${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''}

-      ${object.company_id.name}

-      % if object.company_id.street:
-      ${object.company_id.street or ''}

-
-      % endif
-
-      % if object.company_id.street2:
-      ${object.company_id.street2}

-      % endif
-      % if object.company_id.city or object.company_id.zip:
-      ${object.company_id.zip or ''} ${object.company_id.city or ''}

-      % endif
-      % if object.company_id.country_id:
-      ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}

-      % endif
-      % if object.company_id.phone:
-      Phone: ${object.company_id.phone}

-      % endif
-      % if object.company_id.website:
-      ${object.company_id.website or ''}

-      % endif
+      ${object.current_policy_level.custom_mail_text}
       ]]>
     
 
@@ -149,14 +40,22 @@
       
       
       email
-      
-Our records indicate that we have not received the payment of the above mentioned invoice (copy attached for your convenience).
+      Our records indicate that we have not received the payment of the above mentioned invoice.
 If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.
 
 Thank you in advance for your anticipated cooperation in this matter.
 
-Best regards,
-
+Best regards
+      
+
+      Our records indicate that we have not received the payment of the above mentioned invoice (copy attached for your convenience).
+
+If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.
+
+Thank you in advance for your anticipated cooperation in this matter.
+
+Best regards
+      
     
 
     
       
       email
-      
-Our records indicate that we have not yet received the payment of the above mentioned invoice (copy attached for your convenience) despite our first reminder.
-If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.
+      Our records indicate that we have not yet received the payment of the above mentioned invoice despite our first reminder.
+        If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.
 
 Thank you in advance for your anticipated cooperation in this matter.
 
-Best regards,
-
+Best regards
+      
+      Our records indicate that we have not yet received the payment of the above mentioned invoice (copy attached for your convenience) despite our first reminder.
+        If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.
+
+Thank you in advance for your anticipated cooperation in this matter.
+
+Best regards
+      
     
 
     
       letter
       
-Our records indicate that we still have not received the payment of the above mentioned invoice (copy attached) despite our two reminders.
-If payment have already been sent, please disregard this notice. If not, please proceed with payment.
-If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.
+        Our records indicate that we still have not received the payment of the above mentioned invoice despite our two reminders.
+        If payment have already been sent, please disregard this notice. If not, please proceed with payment.
+        If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.
 
-Should you need us to arrange a payment plan for you, please advise.
-A customer account statement is enclosed for you convenience.
+        Should you need us to arrange a payment plan for you, please advise.
+        A customer account statement is enclosed for you convenience.
 
-Thank you in advance for your anticipated cooperation in this matter.
+        Thank you in advance for your anticipated cooperation in this matter.
 
-Best regards,
-
+        Best regards
+      
+
+Our records indicate that we still have not received the payment of the above mentioned invoice (copy attached) despite our two reminders.
+        If payment have already been sent, please disregard this notice. If not, please proceed with payment.
+        If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.
+
+        Should you need us to arrange a payment plan for you, please advise.
+        A customer account statement is enclosed for you convenience.
+
+        Thank you in advance for your anticipated cooperation in this matter.
+
+        Best regards
+      
     
 
     
@@ -216,14 +133,20 @@ Best regards,
       
       
       email
-      
-Our records indicate that we have not received the payment of the above mentioned invoice (copy attached for your convenience).
+      Our records indicate that we have not received the payment of the above mentioned invoice.
+        If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.
+
+        Thank you in advance for your anticipated cooperation in this matter.
+
+        Best regards
+      
+ Our records indicate that we have not received the payment of the above mentioned invoice (copy attached for your convenience).
 If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.
 
 Thank you in advance for your anticipated cooperation in this matter.
 
-Best regards,
-
+Best regards
+      
     
 
     
       
       letter
-      
-Our records indicate that we still have not received the payment of the above mentioned invoice (copy attached) despite our reminder.
+      Our records indicate that we still have not received the payment of the above mentioned invoice despite our reminder.
+
+        If payment have already been sent, please disregard this notice. If not, please proceed with payment.
+        If your payment has not been received in the next 5 days, your file will be transfered to our debt
+        collection agency.
+
+        Should you need us to arrange a payment plan for you, please advise.
+        A customer account statement is enclosed for you convenience.
+
+        Thank you in advance for your anticipated cooperation in this matter.
+
+        Best regards
+      
+      Our records indicate that we still have not received the payment of the above mentioned invoice (copy attached) despite our reminder.
 
 If payment have already been sent, please disregard this notice. If not, please proceed with payment.
 If your payment has not been received in the next 5 days, your file will be transfered to our debt
-collection agency.
+        collection agency.
 
-Should you need us to arrange a payment plan for you, please advise.
-A customer account statement is enclosed for you convenience.
+        Should you need us to arrange a payment plan for you, please advise.
+        A customer account statement is enclosed for you convenience.
 
-Thank you in advance for your anticipated cooperation in this matter.
+        Thank you in advance for your anticipated cooperation in this matter.
 
-Best regards,
-
+        Best regards
+      
     
 
     
-        Credit Control Manager
-        
+      Credit Control Manager
+      
     
 
     
-        Credit Control User
-        
+      Credit Control User
+      
     
 
     
-        Credit Control Info
-        
+      Credit Control Info
+      
     
 
     
-        
+      
     
 
   
diff --git a/account_credit_control/policy.py b/account_credit_control/policy.py
index cf312d504..b1eff26d7 100644
--- a/account_credit_control/policy.py
+++ b/account_credit_control/policy.py
@@ -227,6 +227,9 @@ class CreditControlPolicyLevel(Model):
                                      ('email', 'Email')],
                                     'Channel', required=True),
         'custom_text': fields.text('Custom Message', required=True, translate=True),
+        'custom_mail_text': fields.text('Custom Mail Message',
+                                        required=True, translate=True),
+
     }
 
     def _check_level_mode(self, cr, uid, rids, context=None):
diff --git a/account_credit_control/policy_view.xml b/account_credit_control/policy_view.xml
index 5e12f4516..9808da98c 100644
--- a/account_credit_control/policy_view.xml
+++ b/account_credit_control/policy_view.xml
@@ -32,7 +32,10 @@
                     
                     
                       
-                      
+                      
+                      
+                      
+                      
                     
                   
                 
diff --git a/account_credit_control/report/credit_control_summary.html.mako b/account_credit_control/report/credit_control_summary.html.mako
index 98d055be2..9acce13b5 100644
--- a/account_credit_control/report/credit_control_summary.html.mako
+++ b/account_credit_control/report/credit_control_summary.html.mako
@@ -4,17 +4,17 @@
       ${css}
 body {
     font-family: helvetica;
-    font-size: 11px;
+    font-size: 12px;
 }
 
 .custom_text {
     font-family: helvetica;
-    font-size: 11px;
+    font-size: 12px;
 }
 
 table {
     font-family: helvetica;
-    font-size: 11px;
+    font-size: 12px;
 }
 
 .header {
@@ -33,11 +33,15 @@ table {
     text-align: center;
     border: 1px solid lightGrey;
     border-collapse: collapse;
+    font-family: helvetica;
+    font-size: 12px;
 }
 
 .basic_table th {
     border: 1px solid lightGrey;
-    font-size: 12px;
+    font-size: 11px;
+    font-weight: bold;
+
 }
 
 .basic_table td {
@@ -154,19 +158,81 @@ tr.line {
         

 
     

+        

+        

+        

     

-      <%
-        setLang(comm.partner_id.lang)
-        current_uri = '%s_policy_template' % (comm.partner_id.lang)
-        if not context.lookup.has_template(current_uri):
-          # awfully horrible we add page tags here beacause openerp replaced
-          # mako by Jinga but not everywere so they sandbox mako into jinga
-          # and jinga prevent %page tag to wwork
-          context.lookup.put_string(current_uri,
-                                    """<%page args="object, user=None, ctx=None, quote=None, format_exception=True, mode='email'" />
-                                    """ + comm.current_policy_level.email_template_id.body_html)
-      %>
-      <%include file="${current_uri}" args="object=comm,user=user,ctx=ctx,quote=quote,format_exception=format_exception,mode='pdf'"/>
+
+      

+          ${_('Reminder')}: ${comm.current_policy_level.name or '' }
+      

+
+      
${_('Dear')} ${comm.get_contact_address().name  or ''},

+      
${comm.current_policy_level.custom_text.replace('\n', '
')}

+
+      

+      

+
+      
+      
+      
+        
+        
+        
+        
+        
+        
+
+      
+%for line in comm.credit_control_line_ids:
+      
+      %if line.invoice_id:
+          
+      %else:
+          
+      %endif
+        
+        
+        
+        
+        
+      
+%endfor
+      
${_('Summary')}
${_('Invoice number')}${_('Invoice date')}${_('Date due')}${_('Invoiced Amount')}${_('Open Amount')}${_('Currency')}
${line.invoice_id.number}
+              %if line.invoice_id.name:
+              

+              ${line.invoice_id.name}
+              %endif
+          		${line.move_line_id.name}${line.date_entry}${line.date_due}${line.amount_due}${line.balance_due}${line.currency_id.name or comm.company_id.currency_id.name}

+      

+      

+<%doc>
+      
+      
${_('If you have any question, do not hesitate to contact us.')}

+
+      
${comm.user_id.name} ${comm.user_id.email and '<%s>'%(comm.user_id.email) or ''}

+      ${comm.company_id.name}

+      % if comm.company_id.street:
+      ${comm.company_id.street or ''}

+
+      % endif
+
+      % if comm.company_id.street2:
+      ${comm.company_id.street2}

+      % endif
+      % if comm.company_id.city or comm.company_id.zip:
+      ${comm.company_id.zip or ''} ${comm.company_id.city or ''}

+      % endif
+      % if comm.company_id.country_id:
+      ${comm.company_id.state_id and ('%s, ' % comm.company_id.state_id.name) or ''} ${comm.company_id.country_id.name or ''}

+      % endif
+      % if comm.company_id.phone:
+      Phone: ${comm.company_id.phone}

+      % endif
+      % if comm.company_id.website:
+      ${comm.company_id.website or ''}

+      % endif
+
 
       

     %endfor
diff --git a/account_credit_control/wizard/credit_control_communication.py b/account_credit_control/wizard/credit_control_communication.py
index ef3ce6792..4b0e3cdee 100644
--- a/account_credit_control/wizard/credit_control_communication.py
+++ b/account_credit_control/wizard/credit_control_communication.py
@@ -55,7 +55,7 @@ class CreditCommunication(TransientModel):
             assert len(com_id) == 1, "get_email only support one id as parameter"
             com_id = com_id[0]
         form = self.browse(cr, uid, com_id, context=context)
-        contact = self.get_contact_address(form.partner_id.id, context=context)
+        contact = form.get_contact_address()
         return contact.email
 
     def get_contact_address(self, cr, uid, com_id, context=None):
@@ -111,6 +111,7 @@ class CreditCommunication(TransientModel):
         cr_line_obj = self.pool.get('credit.control.line')
         email_temp_obj = self.pool.get('email.template')
         email_message_obj = self.pool.get('mail.mail')
+        att_obj = self.pool.get('ir.attachment')
         email_ids = []
         essential_fields = ['subject',
                             'body_html',
@@ -145,7 +146,22 @@ class CreditCommunication(TransientModel):
                     {'mail_message_id': email_id,
                      'state': state},
                     context=context)
-
+            att_ids = []
+            for att in email_values.get('attachments', []):
+                attach_fname = att[0]
+                attach_datas = att[1]
+                data_attach = {
+                    'name': attach_fname,
+                    'datas': attach_datas,
+                    'datas_fname': attach_fname,
+                    'res_model': 'mail.mail',
+                    'res_id': email_id,
+                    'type': 'binary',
+                }
+                att_ids.append(att_obj.create(cr, uid, data_attach, context=context))
+            email_message_obj.write(cr, uid, [email_id],
+                                    {'attachment_ids': [(6, 0, att_ids)]},
+                                    context=context)
             email_ids.append(email_id)
         return email_ids
 

From 3e9b50f1a1d9bd151c14e6d0e267118f93da60d7 Mon Sep 17 00:00:00 2001
From: unknown 
Date: Fri, 12 Jul 2013 12:59:12 +0200
Subject: [PATCH 29/46] [FIX] policy level name is now translatable as it is
 use in report and mail

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

diff --git a/account_credit_control/policy.py b/account_credit_control/policy.py
index b1eff26d7..a7d104961 100644
--- a/account_credit_control/policy.py
+++ b/account_credit_control/policy.py
@@ -211,7 +211,8 @@ class CreditControlPolicyLevel(Model):
     _columns = {
         'policy_id': fields.many2one('credit.control.policy',
                                      'Related Policy', required=True),
-        'name': fields.char('Name', size=128, required=True),
+        'name': fields.char('Name', size=128, required=True,
+                            translate=True),
         'level': fields.integer('Level', required=True),
 
         'computation_mode': fields.selection([('net_days', 'Due Date'),

From ff0d6f71953174b64f1696e39eb7d50b0880b925 Mon Sep 17 00:00:00 2001
From: unknown 
Date: Fri, 12 Jul 2013 13:57:49 +0200
Subject: [PATCH 30/46] [FIX] permission on invoices because onetomany widget
 load data even if hidden ...

---
 account_credit_control/account_view.xml             | 6 ++++--
 account_credit_control/security/ir.model.access.csv | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/account_credit_control/account_view.xml b/account_credit_control/account_view.xml
index f43ce633a..f91f282e5 100644
--- a/account_credit_control/account_view.xml
+++ b/account_credit_control/account_view.xml
@@ -18,9 +18,11 @@
         
         
-            
+            
             
-            
+            
           
         
       
diff --git a/account_credit_control/security/ir.model.access.csv b/account_credit_control/security/ir.model.access.csv
index 38e014a6a..b455044d2 100644
--- a/account_credit_control/security/ir.model.access.csv
+++ b/account_credit_control/security/ir.model.access.csv
@@ -16,3 +16,6 @@
 "account_credit_control.ir_model_access_287",1,1,"group_account_credit_control_manager","credit_control_manager_level","account_credit_control.model_credit_control_policy_level",1,1
 "account_credit_control.ir_model_access_288",0,0,"group_account_credit_control_user","credit_control_user_level","account_credit_control.model_credit_control_policy_level",1,0
 "account_credit_control.ir_model_access_289",0,0,"group_account_credit_control_info","credit_control_info_level","account_credit_control.model_credit_control_policy_level",1,0
+"account_credit_control.ir_model_access_290",0,0,"account.group_account_user","credit_control_fin_user_line","account_credit_control.model_credit_control_line",1,0
+"account_credit_control.ir_model_access_291",0,0,"account.group_account_invoice","credit_control_fin_invoice_line","account_credit_control.model_credit_control_line",1,0
+"account_credit_control.ir_model_access_292",1,1,"account.group_account_manager","credit_control_fin_manager_line","account_credit_control.model_credit_control_line",1,1
\ No newline at end of file

From 0ce1cd6d8ba0ddd8abef18108d43cc224d62d42f Mon Sep 17 00:00:00 2001
From: unknown 
Date: Fri, 12 Jul 2013 15:03:20 +0200
Subject: [PATCH 31/46] [FIX] translation files + lang source

---
 account_credit_control/data.xml               |    2 +-
 .../i18n/account_credit_control.pot           |  713 ------------
 account_credit_control/i18n/de.po             | 1037 +++++++++++++++++
 account_credit_control/i18n/en.po             |  816 +++++++------
 account_credit_control/i18n/es.po             | 1037 +++++++++++++++++
 account_credit_control/i18n/fr.po             |  994 +++++++++-------
 .../report/credit_control_summary.html.mako   |    6 +-
 7 files changed, 3162 insertions(+), 1443 deletions(-)
 delete mode 100644 account_credit_control/i18n/account_credit_control.pot
 create mode 100644 account_credit_control/i18n/de.po
 create mode 100644 account_credit_control/i18n/es.po

diff --git a/account_credit_control/data.xml b/account_credit_control/data.xml
index 9090fbacf..aa46023da 100644
--- a/account_credit_control/data.xml
+++ b/account_credit_control/data.xml
@@ -8,7 +8,7 @@
       ${object.get_email() or  ''}
       
       
-      ${object.get_contact_address().lang.code or 'en_US'}
+      ${object.get_contact_address().lang or 'en_US'}
       
       \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.2_time_1
-#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_1
-msgid "Dear Sir or Madam,\n"
-"\n"
-"Our records indicate that we have not received the payment of the\n"
-"above mentioned invoice (copy attached for your convenience).  If it\n"
-"has already been sent, please disregard this notice. If not, please\n"
-"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
-#: field:credit.control.policy.level,custom_text:0
-msgid "Custom Message"
-msgstr ""
-
-#. module: account_credit_control
-#: model:ir.model,name:account_credit_control.model_credit_control_mailer
-msgid "Mass credit line mailer"
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.lines:0
-msgid "More..."
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.lines:0
-msgid "Group By..."
-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
-#: field:credit.control.policy.level,computation_mode:0
-msgid "Compute Mode"
-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.model,name:account_credit_control.model_credit_control_line
-msgid "A credit control line"
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.line,move_line_id:0
-msgid "Move line"
-msgstr ""
-
-#. module: account_credit_control
-#: model:res.groups,name:account_credit_control.group_account_credit_control_info
-msgid "Credit Control Info"
-msgstr ""
-
-#. module: account_credit_control
-#: model:ir.model,name:account_credit_control.model_credit_control_emailer
-msgid "Mass credit line emailer"
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.line,account_id:0
-#: view:credit.control.lines:0
-#: model:ir.model,name:account_credit_control.model_account_account
-msgid "Account"
-msgstr ""
-
-#. module: account_credit_control
-#: selection:credit.control.policy.level,computation_mode:0
-msgid "Due Date"
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.communication,current_policy_level:0
-#: field:credit.control.line,level:0
-#: view:credit.control.lines:0
-#: field:credit.control.policy.level,level:0
-msgid "Level"
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.policy.level,delay_days:0
-msgid "Delay (in days)"
-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
-#: sql_constraint:account.move.line:0
-msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
-
-#. module: account_credit_control
-#: constraint:account.account:0
-msgid "Error ! You can not create recursive accounts."
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.emailer:0
-msgid "Send emails for the selected lines"
-msgstr ""
-
-#. module: account_credit_control
-#: model:ir.model,name:account_credit_control.model_credit_control_marker
-msgid "Mass marker"
-msgstr ""
-
-#. module: account_credit_control
-#: field:account.invoice,credit_policy_id:0
-#: field:res.company,credit_policy_id:0
-#: field:res.partner,credit_policy_id:0
-msgid "Credit Control Policy"
-msgstr ""
-
-#. module: account_credit_control
-#: view:account.invoice:0
-msgid "Credit control"
-msgstr ""
-
-#. module: account_credit_control
-#: constraint:account.move.line:0
-msgid "The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal."
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.lines:0
-msgid "New lines"
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.line,date_sent:0
-msgid "Sent date"
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.policy:0
-#: field:credit.control.policy,account_ids:0
-msgid "Accounts"
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.communication,partner_id:0
-#: field:credit.control.line,partner_id:0
-#: view:credit.control.lines:0
-#: model:ir.model,name:account_credit_control.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.emailer:0
-msgid "Send the emails"
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.marker:0
-#: model:ir.actions.act_window,name:account_credit_control.open_credit_line_marker_wizard
-#: model:ir.actions.act_window,name:account_credit_control.open_credit_line_marker_wizard_menu_action
-msgid "Change Lines' State"
-msgstr ""
-
-#. module: account_credit_control
-#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_2
-msgid "Dear Sir or Madam,\n"
-"\n"
-"Our records indicate that we have not yet received the payment of the\n"
-"above mentioned invoice (copy attached for your convenience) despite\n"
-"our first reminder.  If it has already been sent, please disregard\n"
-"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
-#: field:credit.control.policy.level,policy_id:0
-msgid "Related Policy"
-msgstr ""
-
-#. module: account_credit_control
-#: sql_constraint:account.account:0
-msgid "The code of the account must be unique per company !"
-msgstr ""
-
-#. module: account_credit_control
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.policy:0
-#: view:credit.control.policy.level:0
-msgid "Mail and reporting"
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.printer:0
-msgid "Print"
-msgstr ""
-
-#. module: account_credit_control
-#: selection:credit.control.line,channel:0
-#: selection:credit.control.policy.level,channel:0
-msgid "Email"
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.line,channel:0
-#: view:credit.control.lines:0
-#: field:credit.control.policy.level,channel:0
-msgid "Channel"
-msgstr ""
-
-#. module: account_credit_control
-#: help:credit.control.run,manual_ids:0
-msgid "If a credit control line has been generated on a policy and the policy has been changed meantime, it has to be handled manually"
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.printer,state:0
-msgid "state"
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.run,report:0
-msgid "Report"
-msgstr ""
-
-#. module: account_credit_control
-#: selection:credit.control.policy.level,computation_mode:0
-msgid "Due Date, End Of Month"
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.marker,name:0
-msgid "Mark as"
-msgstr ""
-
-#. module: account_credit_control
-#: model:credit.control.policy.level,custom_text:account_credit_control.2_time_2
-msgid "Dear Sir or Madam,\n"
-"\n"
-"Our records indicate that we still have not received the payment of\n"
-"the above mentioned invoice (copy attached) despite our reminder.\n"
-"If payment have already been sent, please disregard this notice. If\n"
-"not, please proceed with payment. If your payment has not been\n"
-"received in the next 5 days, your file will be transfered to our debt\n"
-"collection agency.\n"
-"\n"
-"Should you need us to arrange a payment plan for you, please advise.\n"
-"A customer account statement is enclosed for you convenience.\n"
-"\n"
-"Thank you in advance for your anticipated cooperation in this matter.\n"
-"\n"
-"Best regards,\n"
-""
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.run:0
-#: field:credit.control.run,policy_ids:0
-msgid "Policies"
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.line,date_due:0
-msgid "Due date"
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.policy,do_nothing:0
-msgid "Do nothing"
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.line,currency_id:0
-msgid "Currency"
-msgstr ""
-
-#. module: account_credit_control
-#: constraint:account.account:0
-msgid "Configuration Error! \n"
-"You can not define children to an account with internal type different of \"View\"! "
-msgstr ""
-
-#. module: account_credit_control
-#: model:ir.model,name:account_credit_control.model_credit_control_printer
-msgid "Mass printer"
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.communication,company_id:0
-#: field:credit.control.line,company_id:0
-#: field:credit.control.policy,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.marker:0
-#: model:ir.actions.act_window,help:account_credit_control.open_credit_line_marker_wizard
-msgid "Change the state of the selected lines."
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.printer:0
-msgid "Print the selected lines"
-msgstr ""
-
-#. module: account_credit_control
-#: selection:credit.control.line,state:0
-#: view:credit.control.lines:0
-#: selection:credit.control.marker,name:0
-#: selection:credit.control.run,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.lines:0
-msgid "Credit policy"
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.policy:0
-#: view:credit.control.policy.level:0
-msgid "Delay Setting"
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.line,balance_due:0
-msgid "Due balance"
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.lines:0
-msgid "Credit policy level"
-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
-#: field:credit.control.communication,user_id:0
-msgid "User"
-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,name:account_credit_control.model_account_move_line
-msgid "Journal Items"
-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
-#: constraint:account.move.line:0
-msgid "You can not create journal items on an account of type view."
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.emailer,line_ids:0
-#: field:credit.control.marker,line_ids:0
-#: field:credit.control.printer,line_ids:0
-#: model:ir.actions.act_window,name:account_credit_control.credit_control_line_action
-#: model:ir.ui.menu,name:account_credit_control.credit_control_line_action_menu
-#: field:res.partner,credit_control_line_ids:0
-msgid "Credit Control Lines"
-msgstr ""
-
-#. module: account_credit_control
-#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_3
-msgid "Dear Sir or Madam,\n"
-"\n"
-"Our records indicate that we still have not received the payment of\n"
-"the above mentioned invoice (copy attached) despite our two reminders.\n"
-"If payment have already been sent, please disregard this notice. If\n"
-"not, please proceed with payment. If your payment has not been\n"
-"received in the next 5 days, your file will be transfered to our debt\n"
-"collection agency.\n"
-"\n"
-"Should you need us to arrange a payment plan for you, please advise.\n"
-"A customer account statement is enclosed for you convenience.\n"
-"\n"
-"Thank you in advance for your anticipated cooperation in this matter.\n"
-"\n"
-"Best regards,\n"
-""
-msgstr ""
-
-#. module: account_credit_control
-#: model: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
-#: field:credit.control.run,date:0
-msgid "Controlling Date"
-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
-#: field:credit.control.policy.level,email_template_id:0
-msgid "Email Template"
-msgstr ""
-
-#. module: account_credit_control
-#: selection:credit.control.line,state:0
-#: view:credit.control.lines:0
-#: selection:credit.control.marker,name:0
-msgid "Ready To Send"
-msgstr ""
-
-#. module: account_credit_control
-#: model:ir.model,name:account_credit_control.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.printer,mark_as_sent:0
-msgid "Mark letter lines as sent"
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.run:0
-msgid "Compute Credit Control Lines"
-msgstr ""
-
-#. module: account_credit_control
-#: selection:credit.control.policy.level,computation_mode:0
-msgid "Previous Reminder"
-msgstr ""
-
-#. module: account_credit_control
-#: selection:credit.control.line,state:0
-#: view:credit.control.lines:0
-msgid "Error"
-msgstr ""
-
-#. module: account_credit_control
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.run:0
-msgid "Report and Errors"
-msgstr ""
-
-#. module: account_credit_control
-#: constraint:account.account:0
-msgid "Configuration Error! \n"
-"You can not select an account type with a deferral method different of \"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.line,state:0
-#: field:credit.control.run,state:0
-msgid "State"
-msgstr ""
-
-#. module: account_credit_control
-#: help:credit.control.policy,do_nothing:0
-msgid "For policies which should not generate lines or are obsolete"
-msgstr ""
-
-#. module: account_credit_control
-#: field:account.account,credit_control_line_ids:0
-#: field:account.invoice,credit_control_line_ids:0
-#: field:credit.control.communication,credit_control_line_ids:0
-#: model:ir.actions.act_window,name:account_credit_control.act_account_credit_relation_relation
-#: model:ir.actions.act_window,name:account_credit_control.act_partner_credit_relation_relation
-msgid "Credit Lines"
-msgstr ""
-
-#. module: account_credit_control
-#: 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
-#: field:account.move.line,invoice_id:0
-#: field:credit.control.line,invoice_id:0
-#: view:credit.control.lines:0
-#: model:ir.model,name:account_credit_control.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.emailer:0
-#: view:credit.control.marker:0
-#: view:credit.control.printer:0
-msgid "Cancel"
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.printer:0
-msgid "Close"
-msgstr ""
-
-#. module: account_credit_control
-#: selection:credit.control.line,state:0
-msgid "Emailing Error"
-msgstr ""
-
-#. module: account_credit_control
-#: help:account.invoice,credit_policy_id:0
-msgid "The Credit Control Policy used for this invoice. If nothing is defined, it will use the account setting or the partner setting."
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.lines:0
-msgid "Run date"
-msgstr ""
-
-#. module: account_credit_control
-#: constraint:account.move.line:0
-msgid "Company must be the same for its related account and period."
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.run,manual_ids:0
-msgid "Lines to handle manually"
-msgstr ""
-
-#. module: account_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
-msgid "Credit Control"
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.policy:0
-#: field:credit.control.policy,level_ids:0
-msgid "Policy Levels"
-msgstr ""
-
-#. module: account_credit_control
-#: constraint:account.move.line:0
-msgid "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal."
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.line,policy_id:0
-msgid "Policy"
-msgstr ""
-
-#. module: account_credit_control
-#: model:email.template,subject:account_credit_control.email_template_credit_control_base
-msgid "Credit Control: (${object.current_policy_level.name or 'n/a' })"
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.printer,report_file:0
-msgid "Generated Report"
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.run:0
-msgid "Move lines To be treated manually"
-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.actions.act_window,help:account_credit_control.open_credit_line_emailer_wizard
-msgid "Send an email for the selected lines."
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.lines:0
-msgid "Sent"
-msgstr ""
-
-#. module: account_credit_control
-#: constraint:credit.control.policy.level:0
-msgid "The smallest level can not be of type Previous Reminder"
-msgstr ""
-
-#. module: account_credit_control
-#: help:credit.control.policy,account_ids:0
-msgid "This policy will be active only for the selected accounts"
-msgstr ""
-
-#. module: account_credit_control
-#: help:credit.control.printer,mark_as_sent:0
-msgid "Only letter lines will be marked."
-msgstr ""
-
-#. module: account_credit_control
-#: view:credit.control.line:0
-#: view:credit.control.lines:0
-msgid "Control Credit Lines"
-msgstr ""
-
-#. module: account_credit_control
-#: model:res.groups,name:account_credit_control.group_account_credit_control_manager
-msgid "Credit Control Manager"
-msgstr ""
-
-#. module: account_credit_control
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.policy,name:0
-#: field:credit.control.policy.level,name:0
-msgid "Name"
-msgstr ""
-
-#. module: account_credit_control
-#: help:res.partner,credit_policy_id:0
-msgid "The Credit Control Policyused 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
-#: field:credit.control.line,mail_message_id:0
-msgid "Sent Email"
-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
-#: model:ir.actions.report.xml,name:account_credit_control.report_webkit_html
-msgid "Credit Summary"
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.line,date:0
-msgid "Controlling date"
-msgstr ""
-
-#. module: account_credit_control
-#: constraint:account.move.line:0
-msgid "You can not create journal items on closed account."
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.line,amount_due:0
-msgid "Due Amount Tax incl."
-msgstr ""
-
-#. module: account_credit_control
-#: field:res.company,credit_control_tolerance:0
-msgid "Credit Control Tolerance"
-msgstr ""
-
-#. module: account_credit_control
-#: help:res.company,credit_policy_id:0
-msgid "The Credit Control Policy used on partners by default. This setting can be overriden on partners or invoices."
-msgstr ""
-
-#. module: account_credit_control
-#: field:credit.control.line,policy_level_id:0
-msgid "Overdue Level"
-msgstr ""
diff --git a/account_credit_control/i18n/de.po b/account_credit_control/i18n/de.po
new file mode 100644
index 000000000..6bde84721
--- /dev/null
+++ b/account_credit_control/i18n/de.po
@@ -0,0 +1,1037 @@
+#. module: account_credit_control
+#: field:credit.control.policy.level,custom_text:0
+msgid "Custom Message"
+msgstr "Custom Message"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "More..."
+msgstr "More..."
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "Group By..."
+msgstr "Group By..."
+
+#. 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 "Credit Control Run"
+
+#. module: account_credit_control
+#: field:credit.control.policy.level,computation_mode:0
+msgid "Compute Mode"
+msgstr "Compute Mode"
+
+#. module: account_credit_control
+#: field:credit.control.line,date_entry:0
+msgid "Entry date"
+msgstr "Entry date"
+
+#. 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 "Send By Email"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_line
+msgid "A credit control line"
+msgstr "A credit control line"
+
+#. module: account_credit_control
+#: field:credit.control.line,move_line_id:0
+msgid "Move line"
+msgstr "Move line"
+
+#. module: account_credit_control
+#: model:res.groups,name:account_credit_control.group_account_credit_control_info
+msgid "Credit Control Info"
+msgstr "Credit Control Info"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_emailer
+msgid "Mass credit line emailer"
+msgstr "Mass credit line emailer"
+
+#. module: account_credit_control
+#: view:credit.control.line:0 field:credit.control.line,account_id:0
+#: model:ir.model,name:account_credit_control.model_account_account
+msgid "Account"
+msgstr "Konto"
+
+#. module: account_credit_control
+#: selection:credit.control.policy.level,computation_mode:0
+msgid "Due Date"
+msgstr "Due Date"
+
+#. module: account_credit_control
+#: field:credit.control.communication,current_policy_level:0
+#: view:credit.control.line:0 field:credit.control.line,level:0
+#: field:credit.control.policy.level,level:0
+msgid "Level"
+msgstr "Level"
+
+#. module: account_credit_control
+#: field:credit.control.policy.level,delay_days:0
+msgid "Delay (in days)"
+msgstr "Delay (in days)"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_communication
+msgid "credit control communication"
+msgstr "credit control communication"
+
+#. module: account_credit_control
+#: view:credit.control.emailer:0
+msgid "Send emails for the selected lines"
+msgstr "Send emails for the selected lines"
+
+#. module: account_credit_control
+#: help:credit.control.policy,account_ids:0
+msgid "This policy will be active only for the selected accounts"
+msgstr "This policy will be active only for the selected accounts"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "These lines are ready to send by email or by letter using the Actions."
+msgstr "These lines are ready to send by email or by letter using the Actions."
+
+#. module: account_credit_control
+#: view:credit.control.line:0 selection:credit.control.line,state:0
+#: selection:credit.control.marker,name:0
+msgid "Ignored"
+msgstr "Ignored"
+
+#. module: account_credit_control
+#: help:credit.control.printer,mark_as_sent:0
+msgid "Only letter lines will be marked."
+msgstr "Only letter lines will be marked."
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_marker
+msgid "Mass marker"
+msgstr "Mass marker"
+
+#. module: account_credit_control
+#: field:account.invoice,credit_policy_id:0
+#: field:res.company,credit_policy_id:0 field:res.partner,credit_policy_id:0
+msgid "Credit Control Policy"
+msgstr "Credit Control Policy"
+
+#. 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 "
+"above mentioned invoice (copy attached) 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 ""
+"Our records indicate that we still have not received the payment of the "
+"above mentioned invoice (copy attached) 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"
+"      "
+
+#. module: account_credit_control
+#: field:credit.control.line,date_sent:0
+msgid "Sent date"
+msgstr "Sent date"
+
+#. module: account_credit_control
+#: view:credit.control.policy:0 field:credit.control.policy,account_ids:0
+msgid "Accounts"
+msgstr "Accounts"
+
+#. module: account_credit_control
+#: field:credit.control.communication,partner_id:0 view:credit.control.line:0
+#: field:credit.control.line,partner_id:0
+#: model:ir.model,name:account_credit_control.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_credit_control
+#: view:credit.control.policy.level:0
+msgid "Credit control policy level"
+msgstr "Credit control policy level"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_3
+msgid ""
+"\n"
+"        Our records indicate that we still have not received the payment of "
+"the above mentioned invoice despite our two reminders.\n"
+"        If payment have already been sent, please disregard this notice. If "
+"not, please proceed with payment.\n"
+"        If your payment has not been received in the next 5 days, your file "
+"will be transfered to our debt collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+msgstr ""
+"\n"
+"        Our records indicate that we still have not received the payment of "
+"the above mentioned invoice despite our two reminders.\n"
+"        If payment have already been sent, please disregard this notice. If "
+"not, please proceed with payment.\n"
+"        If your payment has not been received in the next 5 days, your file "
+"will be transfered to our debt collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+
+#. module: account_credit_control
+#: view:credit.control.marker:0
+#: model:ir.actions.act_window,name:account_credit_control.open_credit_line_marker_wizard
+#: model:ir.actions.act_window,name:account_credit_control.open_credit_line_marker_wizard_menu_action
+msgid "Change Lines' State"
+msgstr "Change Lines' State"
+
+#. module: account_credit_control
+#: field:credit.control.policy.level,policy_id:0
+msgid "Related Policy"
+msgstr "Related Policy"
+
+#. module: account_credit_control
+#: view:credit.control.policy:0 view:credit.control.policy.level:0
+msgid "Mail and reporting"
+msgstr "Mail and reporting"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_2
+msgid ""
+"Our records indicate that we have not yet received the payment of the above "
+"mentioned invoice despite our first reminder.\n"
+"        If it has already been sent, please disregard this notice. If not, "
+"please proceed with payment within 5 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+msgstr ""
+"Our records indicate that we have not yet received the payment of the above "
+"mentioned invoice despite our first reminder.\n"
+"        If it has already been sent, please disregard this notice. If not, "
+"please proceed with payment within 5 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+
+#. module: account_credit_control
+#: model:email.template,body_html:account_credit_control.email_template_credit_control_base
+msgid ""
+"\n"
+"      Dear ${object.get_contact_address().name  or ''}\n"
+"      
\n"
+"      
\n"
+"      ${object.current_policy_level.custom_mail_text}\n"
+"      "
+msgstr ""
+"\n"
+"      Dear ${object.get_contact_address().name  or ''}\n"
+"      
\n"
+"      
\n"
+"      ${object.current_policy_level.custom_mail_text}\n"
+"      "
+
+#. module: account_credit_control
+#: view:credit.control.printer:0
+msgid "Print"
+msgstr "Print"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
+msgid ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice.\n"
+"        If it has already been sent, please disregard this notice. If not, "
+"please proceed with payment within 10 days.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+msgstr ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice.\n"
+"        If it has already been sent, please disregard this notice. If not, "
+"please proceed with payment within 10 days.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+
+#. module: account_credit_control
+#: selection:credit.control.line,channel:0
+#: selection:credit.control.policy.level,channel:0
+msgid "Email"
+msgstr "Email"
+
+#. module: account_credit_control
+#: view:credit.control.line:0 field:credit.control.line,channel:0
+#: field:credit.control.policy.level,channel:0
+msgid "Channel"
+msgstr "Channel"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.2_time_2
+msgid ""
+"Our records indicate that we still have not received the payment of the "
+"above mentioned invoice despite our reminder.\n"
+"\n"
+"        If payment have already been sent, please disregard this notice. If "
+"not, please proceed with payment.\n"
+"        If your payment has not been received in the next 5 days, your file "
+"will be transfered to our debt\n"
+"        collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+msgstr ""
+"Our records indicate that we still have not received the payment of the "
+"above mentioned invoice despite our reminder.\n"
+"\n"
+"        If payment have already been sent, please disregard this notice. If "
+"not, please proceed with payment.\n"
+"        If your payment has not been received in the next 5 days, your file "
+"will be transfered to our debt\n"
+"        collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+
+#. module: account_credit_control
+#: view:credit.control.marker:0
+msgid "Lines marker"
+msgstr "Lines marker"
+
+#. module: account_credit_control
+#: field:credit.control.printer,state:0
+msgid "state"
+msgstr "state"
+
+#. module: account_credit_control
+#: field:credit.control.run,report:0
+msgid "Report"
+msgstr "Report"
+
+#. module: account_credit_control
+#: field:credit.control.line,state:0 field:credit.control.run,state:0
+msgid "State"
+msgstr "State"
+
+#. module: account_credit_control
+#: help:credit.control.line,state:0
+msgid ""
+"Draft lines need to be triaged.\n"
+"Ignored lines are lines for which we do not want to send something.\n"
+"Draft and ignored lines will be generated again on the next run."
+msgstr ""
+"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."
+
+#. 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 "30 days end of month"
+
+#. module: account_credit_control
+#: selection:credit.control.policy.level,computation_mode:0
+msgid "Due Date, End Of Month"
+msgstr "Due Date, End Of Month"
+
+#. module: account_credit_control
+#: field:credit.control.marker,name:0
+msgid "Mark as"
+msgstr "Mark as"
+
+#. 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 above "
+"mentioned invoice (copy attached for your convenience).\n"
+"\n"
+"If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+msgstr ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice (copy attached for your convenience).\n"
+"\n"
+"If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+
+#. module: account_credit_control
+#: view:credit.control.run:0
+msgid "Credit control run"
+msgstr "Credit control run"
+
+#. module: account_credit_control
+#: view:credit.control.run:0 field:credit.control.run,policy_ids:0
+msgid "Policies"
+msgstr "Policies"
+
+#. 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 above "
+"mentioned invoice (copy attached for your convenience).\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 ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice (copy attached for your convenience).\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"
+"      "
+
+#. module: account_credit_control
+#: field:credit.control.line,date_due:0
+msgid "Due date"
+msgstr "Due date"
+
+#. module: account_credit_control
+#: field:credit.control.policy,do_nothing:0
+msgid "Do nothing"
+msgstr "Do nothing"
+
+#. module: account_credit_control
+#: field:credit.control.line,currency_id:0
+msgid "Currency"
+msgstr "Currency"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_printer
+msgid "Mass printer"
+msgstr "Mass printer"
+
+#. module: account_credit_control
+#: field:credit.control.communication,company_id:0
+#: field:credit.control.line,company_id:0
+#: field:credit.control.policy,company_id:0
+msgid "Company"
+msgstr "Company"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "An error has occured during the sending of the email."
+msgstr "An error has occured during the sending of the email."
+
+#. module: account_credit_control
+#: view:credit.control.marker:0
+#: model:ir.actions.act_window,help:account_credit_control.open_credit_line_marker_wizard
+msgid "Change the state of the selected lines."
+msgstr "Change the state of the selected lines."
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "Lines which have been ignored from previous runs."
+msgstr "Lines which have been ignored from previous runs."
+
+#. module: account_credit_control
+#: view:credit.control.printer:0
+msgid "Print the selected lines"
+msgstr "Print the selected lines"
+
+#. module: account_credit_control
+#: view:credit.control.line:0 selection:credit.control.line,state:0
+#: selection:credit.control.run,state:0
+msgid "Draft"
+msgstr "Draft"
+
+#. module: account_credit_control
+#: view:credit.control.marker:0
+msgid "Warning: you will maybe not be able to revert this operation."
+msgstr "Warning: you will maybe not be able to revert this operation."
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "Credit policy"
+msgstr "Credit policy"
+
+#. module: account_credit_control
+#: view:credit.control.policy:0 view:credit.control.policy.level:0
+msgid "Delay Setting"
+msgstr "Delay Setting"
+
+#. module: account_credit_control
+#: field:credit.control.line,balance_due:0
+msgid "Due balance"
+msgstr "Due balance"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "Credit policy level"
+msgstr "Credit policy level"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_run
+msgid "Credit control line generator"
+msgstr "Credit control line generator"
+
+#. module: account_credit_control
+#: view:credit.control.policy:0
+msgid "Credit control policy"
+msgstr "Credit control policy"
+
+#. module: account_credit_control
+#: field:credit.control.communication,user_id:0
+msgid "User"
+msgstr "User"
+
+#. module: account_credit_control
+#: selection:credit.control.line,channel:0
+#: selection:credit.control.policy.level,channel:0
+msgid "Letter"
+msgstr "Letter"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_account_move_line
+msgid "Journal Items"
+msgstr "Buchungen"
+
+#. module: account_credit_control
+#: model:ir.actions.act_window,help:account_credit_control.open_credit_line_printer_wizard
+msgid "Print selected lines"
+msgstr "Print selected lines"
+
+#. module: account_credit_control
+#: field:credit.control.emailer,line_ids:0
+#: field:credit.control.marker,line_ids:0
+#: field:credit.control.printer,line_ids:0
+#: model:ir.actions.act_window,name:account_credit_control.credit_control_line_action
+#: model:ir.ui.menu,name:account_credit_control.credit_control_line_action_menu
+#: field:res.partner,credit_control_line_ids:0
+msgid "Credit Control Lines"
+msgstr "Credit Control Lines"
+
+#. 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 "Print Lines"
+
+#. module: account_credit_control
+#: field:credit.control.run,date:0
+msgid "Controlling Date"
+msgstr "Controlling Date"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_policy
+msgid "Define a reminder policy"
+msgstr "Define a reminder policy"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "Lines already sent."
+msgstr "Lines already sent."
+
+#. module: account_credit_control
+#: field:credit.control.policy.level,email_template_id:0
+msgid "Email Template"
+msgstr "Email Template"
+
+#. module: account_credit_control
+#: view:credit.control.line:0 selection:credit.control.line,state:0
+#: selection:credit.control.marker,name:0
+msgid "Ready To Send"
+msgstr "Ready To Send"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_res_company
+msgid "Companies"
+msgstr "Unternehmen"
+
+#. module: account_credit_control
+#: field:credit.control.printer,mark_as_sent:0
+msgid "Mark letter lines as sent"
+msgstr "Mark letter lines as sent"
+
+#. module: account_credit_control
+#: view:credit.control.run:0
+msgid "Compute Credit Control Lines"
+msgstr "Compute Credit Control Lines"
+
+#. module: account_credit_control
+#: selection:credit.control.policy.level,computation_mode:0
+msgid "Previous Reminder"
+msgstr "Previous Reminder"
+
+#. module: account_credit_control
+#: view:credit.control.line:0 selection:credit.control.line,state:0
+msgid "Error"
+msgstr "Error"
+
+#. module: account_credit_control
+#: field:credit.control.policy,level_ids:0
+msgid "Policy Levels"
+msgstr "Policy Levels"
+
+#. module: account_credit_control
+#: view:credit.control.run:0
+msgid "Report and Errors"
+msgstr "Report and Errors"
+
+#. module: account_credit_control
+#: model:email.template,subject:account_credit_control.email_template_credit_control_base
+msgid "Credit Control: (${object.current_policy_level.name or 'n/a'})"
+msgstr "Credit Control: (${object.current_policy_level.name or 'n/a'})"
+
+#. module: account_credit_control
+#: field:credit.control.policy.level,custom_mail_text:0
+msgid "Custom Mail Message"
+msgstr "Custom Mail Message"
+
+#. 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 "
+"above mentioned invoice (copy attached) despite our reminder.\n"
+"\n"
+"If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.\n"
+"If your payment has not been received in the next 5 days, your file will be "
+"transfered to our debt\n"
+"        collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+msgstr ""
+"Our records indicate that we still have not received the payment of the "
+"above mentioned invoice (copy attached) despite our reminder.\n"
+"\n"
+"If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.\n"
+"If your payment has not been received in the next 5 days, your file will be "
+"transfered to our debt\n"
+"        collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+
+#. module: account_credit_control
+#: help:credit.control.run,manual_ids:0
+msgid ""
+"If a credit control line has been generatedon a policy and the policy has "
+"been changed in the meantime, it has to be handled manually"
+msgstr ""
+"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"
+
+#. module: account_credit_control
+#: field:account.account,credit_control_line_ids:0
+#: field:account.invoice,credit_control_line_ids:0
+#: field:credit.control.communication,credit_control_line_ids:0
+#: model:ir.actions.act_window,name:account_credit_control.act_account_credit_relation_relation
+#: model:ir.actions.act_window,name:account_credit_control.act_partner_credit_relation_relation
+msgid "Credit Lines"
+msgstr "Credit Lines"
+
+#. 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 "Done"
+
+#. module: account_credit_control
+#: field:account.move.line,invoice_id:0 view:credit.control.line:0
+#: field:credit.control.line,invoice_id:0
+#: model:ir.model,name:account_credit_control.model_account_invoice
+msgid "Invoice"
+msgstr "Rechnung"
+
+#. module: account_credit_control
+#: view:credit.control.emailer:0 view:credit.control.marker:0
+#: view:credit.control.printer:0
+msgid "Cancel"
+msgstr "Cancel"
+
+#. module: account_credit_control
+#: view:credit.control.printer:0
+msgid "Close"
+msgstr "Close"
+
+#. module: account_credit_control
+#: selection:credit.control.line,state:0
+msgid "Emailing Error"
+msgstr "Emailing Error"
+
+#. module: account_credit_control
+#: help:account.invoice,credit_policy_id:0
+msgid ""
+"The Credit Control Policy used for this invoice. If nothing is defined, it "
+"will use the account setting or the partner setting."
+msgstr ""
+"The Credit Control Policy used for this invoice. If nothing is defined, it "
+"will use the account setting or the partner setting."
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "Run date"
+msgstr "Run date"
+
+#. module: account_credit_control
+#: model:res.groups,name:account_credit_control.group_account_credit_control_user
+msgid "Credit Control User"
+msgstr "Credit Control User"
+
+#. module: account_credit_control
+#: view:credit.control.policy:0 view:credit.control.policy.level:0
+msgid "Policy level"
+msgstr "Policy level"
+
+#. module: account_credit_control
+#: field:credit.control.run,manual_ids:0
+msgid "Lines to handle manually"
+msgstr "Lines to handle manually"
+
+#. module: account_credit_control
+#: help:res.partner,credit_policy_id:0
+msgid ""
+"The Credit Control Policy used for this partner. This setting can be forced "
+"on the invoice. If nothing is defined, it will use the company setting."
+msgstr ""
+"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."
+
+#. module: account_credit_control
+#: view:account.invoice:0
+#: model:ir.ui.menu,name:account_credit_control.base_credit_control_configuration_menu
+#: model:ir.ui.menu,name:account_credit_control.base_credit_control_menu
+msgid "Credit Control"
+msgstr "Credit Control"
+
+#. 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 above "
+"mentioned invoice (copy attached for your convenience) 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 ""
+"Our records indicate that we have not yet received the payment of the above "
+"mentioned invoice (copy attached for your convenience) 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"
+"      "
+
+#. module: account_credit_control
+#: field:credit.control.line,policy_id:0
+msgid "Policy"
+msgstr "Policy"
+
+#. module: account_credit_control
+#: view:credit.control.policy:0
+msgid "Credit control policy Level"
+msgstr "Credit control policy Level"
+
+#. module: account_credit_control
+#: view:credit.control.emailer:0
+msgid "Mailer"
+msgstr "Mailer"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_1
+msgid ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice.\n"
+"If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+msgstr ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice.\n"
+"If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+
+#. module: account_credit_control
+#: view:credit.control.run:0
+msgid "Move lines To be treated manually"
+msgstr "Move lines To be treated manually"
+
+#. 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 "Credit Control Policies"
+
+#. 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 "Send an email for the selected lines."
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,name:account_credit_control.3_time_3
+msgid "10 days last reminder"
+msgstr "10 days last reminder"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "Sent"
+msgstr "Sent"
+
+#. module: account_credit_control
+#: constraint:credit.control.policy.level:0
+msgid "The smallest level can not be of type Previous Reminder"
+msgstr "The smallest level can not be of type Previous Reminder"
+
+#. module: account_credit_control
+#: view:credit.control.printer:0
+msgid "Lines report"
+msgstr "Lines report"
+
+#. module: account_credit_control
+#: field:credit.control.printer,report_file:0
+msgid "Generated Report"
+msgstr "Generated Report"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,name:account_credit_control.3_time_1
+msgid "10 days net"
+msgstr "10 days net"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "Control Credit Lines"
+msgstr "Control Credit Lines"
+
+#. module: account_credit_control
+#: model:res.groups,name:account_credit_control.group_account_credit_control_manager
+msgid "Credit Control Manager"
+msgstr "Credit Control Manager"
+
+#. module: account_credit_control
+#: field:credit.control.policy,name:0 field:credit.control.policy.level,name:0
+msgid "Name"
+msgstr "Name"
+
+#. module: account_credit_control
+#: view:credit.control.emailer:0
+msgid "Send the emails"
+msgstr "Send the emails"
+
+#. module: account_credit_control
+#: field:credit.control.line,mail_message_id:0
+msgid "Sent Email"
+msgstr "Sent Email"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_mail_mail
+msgid "Outgoing Mails"
+msgstr "Postausgang"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_policy_level
+msgid "A credit control policy level"
+msgstr "A credit control policy level"
+
+#. module: account_credit_control
+#: model:ir.actions.report.xml,name:account_credit_control.report_webkit_html
+msgid "Credit Summary"
+msgstr "Credit Summary"
+
+#. module: account_credit_control
+#: field:credit.control.line,date:0
+msgid "Controlling date"
+msgstr "Controlling date"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "Draft lines have to be triaged."
+msgstr "Draft lines have to be triaged."
+
+#. module: account_credit_control
+#: field:credit.control.line,amount_due:0
+msgid "Due Amount Tax incl."
+msgstr "Due Amount Tax incl."
+
+#. module: account_credit_control
+#: field:res.company,credit_control_tolerance:0
+msgid "Credit Control Tolerance"
+msgstr "Credit Control Tolerance"
+
+#. module: account_credit_control
+#: view:credit.control.policy:0
+msgid "Policy levels"
+msgstr "Policy levels"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,name:account_credit_control.2_time_2
+msgid "60 days last reminder"
+msgstr "60 days last reminder"
+
+#. module: account_credit_control
+#: help:res.company,credit_policy_id:0
+msgid ""
+"The Credit Control Policy used on partners by default. This setting can be "
+"overriden on partners or invoices."
+msgstr ""
+"The Credit Control Policy used on partners by default. This setting can be "
+"overriden on partners or invoices."
+
+#. module: account_credit_control
+#: field:credit.control.line,policy_level_id:0
+msgid "Overdue Level"
+msgstr "Overdue Level"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:167
+msgid "Reminder"
+msgstr "Reminder"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:170
+msgid "Dear"
+msgstr "Dear"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:177
+msgid "Summary"
+msgstr "Summary"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:179
+msgid "Invoice number"
+msgstr "Invoice number"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:180
+msgid "Invoice date"
+msgstr "Invoice date"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:181
+msgid "Date due"
+msgstr "Date due"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:182
+msgid "Invoiced amount"
+msgstr "Invoice amount"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:183
+msgid "Open amount"
+msgstr "Open amount"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:183
+msgid "Currency"
+msgstr "Currency"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:211
+msgid "If you have any question, do not hesitate to contact us."
+msgstr "If you have any question, do not hesitate to contact us."
diff --git a/account_credit_control/i18n/en.po b/account_credit_control/i18n/en.po
index 6ac50f1a1..bd1d5081a 100644
--- a/account_credit_control/i18n/en.po
+++ b/account_credit_control/i18n/en.po
@@ -1,59 +1,15 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#       * account_credit_control
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-07 15:35+0000\n"
-"PO-Revision-Date: 2012-11-07 14:24+0100\n"
-"Last-Translator: Guewen Baconnier \n"
-"Language-Team: EN\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
-
-#. 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 ""
-"Dear Sir or Madam,\n"
-"\n"
-"Our records indicate that we have not received the payment of the\n"
-"above mentioned invoice (copy attached for your convenience).  If it\n"
-"has already been sent, please disregard this notice. If not, please\n"
-"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 ""
-"Dear Sir or Madam,\n"
-"\n"
-"Our records indicate that we have not received the payment of the\n"
-"above mentioned invoice (copy attached for your convenience).  If it\n"
-"has already been sent, please disregard this notice. If not, please\n"
-"proceed with payment within 10 days.\n"
-"\n"
-"Thank you in advance for your anticipated cooperation in this matter.\n"
-"\n"
-"Best regards,\n"
-
 #. module: account_credit_control
 #: field:credit.control.policy.level,custom_text:0
 msgid "Custom Message"
 msgstr "Custom Message"
 
 #. module: account_credit_control
-#: view:credit.control.lines:0
+#: view:credit.control.line:0
 msgid "More..."
 msgstr "More..."
 
 #. module: account_credit_control
-#: view:credit.control.lines:0
+#: view:credit.control.line:0
 msgid "Group By..."
 msgstr "Group By..."
 
@@ -68,6 +24,11 @@ msgstr "Credit Control Run"
 msgid "Compute Mode"
 msgstr "Compute Mode"
 
+#. module: account_credit_control
+#: field:credit.control.line,date_entry:0
+msgid "Entry date"
+msgstr "Entry date"
+
 #. 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
@@ -95,7 +56,7 @@ msgid "Mass credit line emailer"
 msgstr "Mass credit line emailer"
 
 #. module: account_credit_control
-#: field:credit.control.line,account_id:0 view:credit.control.lines:0
+#: view:credit.control.line:0 field:credit.control.line,account_id:0
 #: model:ir.model,name:account_credit_control.model_account_account
 msgid "Account"
 msgstr "Account"
@@ -107,7 +68,7 @@ msgstr "Due Date"
 
 #. module: account_credit_control
 #: field:credit.control.communication,current_policy_level:0
-#: field:credit.control.line,level:0 view:credit.control.lines:0
+#: view:credit.control.line:0 field:credit.control.line,level:0
 #: field:credit.control.policy.level,level:0
 msgid "Level"
 msgstr "Level"
@@ -122,36 +83,36 @@ msgstr "Delay (in days)"
 msgid "credit control communication"
 msgstr "credit control communication"
 
-#. module: account_credit_control
-#: sql_constraint:account.move.line:0
-msgid "Wrong credit or debit value in accounting entry !"
-msgstr "Wrong credit or debit value in accounting entry!"
-
-#. module: account_credit_control
-#: view:credit.control.lines:0
-msgid "These lines are ready to send by email or by letter using the Actions."
-msgstr "These lines are ready to send by email or by letter using the Actions."
-
-#. module: account_credit_control
-#: model:ir.model,name:account_credit_control.model_credit_control_marker
-msgid "Mass marker"
-msgstr "Mass marker"
-
-#. module: account_credit_control
-#: selection:credit.control.line,state:0 view:credit.control.lines:0
-#: selection:credit.control.marker,name:0
-msgid "Ignored"
-msgstr "Ignored"
-
 #. module: account_credit_control
 #: view:credit.control.emailer:0
 msgid "Send emails for the selected lines"
 msgstr "Send emails for the selected lines"
 
 #. module: account_credit_control
-#: constraint:account.account:0
-msgid "Error ! You can not create recursive accounts."
-msgstr "Error! You can not create recursive accounts."
+#: help:credit.control.policy,account_ids:0
+msgid "This policy will be active only for the selected accounts"
+msgstr "This policy will be active only for the selected accounts"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "These lines are ready to send by email or by letter using the Actions."
+msgstr "These lines are ready to send by email or by letter using the Actions."
+
+#. module: account_credit_control
+#: view:credit.control.line:0 selection:credit.control.line,state:0
+#: selection:credit.control.marker,name:0
+msgid "Ignored"
+msgstr "Ignored"
+
+#. module: account_credit_control
+#: help:credit.control.printer,mark_as_sent:0
+msgid "Only letter lines will be marked."
+msgstr "Only letter lines will be marked."
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_marker
+msgid "Mass marker"
+msgstr "Mass marker"
 
 #. module: account_credit_control
 #: field:account.invoice,credit_policy_id:0
@@ -160,13 +121,41 @@ msgid "Credit Control Policy"
 msgstr "Credit Control Policy"
 
 #. module: account_credit_control
-#: constraint:account.move.line:0
+#: model:credit.control.policy.level,custom_mail_text:account_credit_control.3_time_3
 msgid ""
-"The date of your Journal Entry is not in the defined period! You should "
-"change the date or remove this constraint from the journal."
+"Our records indicate that we still have not received the payment of the "
+"above mentioned invoice (copy attached) 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 ""
-"The date of your Journal Entry is not in the defined period! You should "
-"change the date or remove this constraint from the journal."
+"Our records indicate that we still have not received the payment of the "
+"above mentioned invoice (copy attached) 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"
+"      "
 
 #. module: account_credit_control
 #: field:credit.control.line,date_sent:0
@@ -179,16 +168,55 @@ msgid "Accounts"
 msgstr "Accounts"
 
 #. module: account_credit_control
-#: field:credit.control.communication,partner_id:0
-#: field:credit.control.line,partner_id:0 view:credit.control.lines:0
+#: field:credit.control.communication,partner_id:0 view:credit.control.line:0
+#: field:credit.control.line,partner_id:0
 #: model:ir.model,name:account_credit_control.model_res_partner
 msgid "Partner"
 msgstr "Partner"
 
 #. module: account_credit_control
-#: view:credit.control.emailer:0
-msgid "Send the emails"
-msgstr "Send the emails"
+#: view:credit.control.policy.level:0
+msgid "Credit control policy level"
+msgstr "Credit control policy level"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_3
+msgid ""
+"\n"
+"        Our records indicate that we still have not received the payment of "
+"the above mentioned invoice despite our two reminders.\n"
+"        If payment have already been sent, please disregard this notice. If "
+"not, please proceed with payment.\n"
+"        If your payment has not been received in the next 5 days, your file "
+"will be transfered to our debt collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+msgstr ""
+"\n"
+"        Our records indicate that we still have not received the payment of "
+"the above mentioned invoice despite our two reminders.\n"
+"        If payment have already been sent, please disregard this notice. If "
+"not, please proceed with payment.\n"
+"        If your payment has not been received in the next 5 days, your file "
+"will be transfered to our debt collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
 
 #. module: account_credit_control
 #: view:credit.control.marker:0
@@ -197,56 +225,86 @@ msgstr "Send the emails"
 msgid "Change Lines' State"
 msgstr "Change Lines' State"
 
-#. module: account_credit_control
-#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_2
-msgid ""
-"Dear Sir or Madam,\n"
-"\n"
-"Our records indicate that we have not yet received the payment of the\n"
-"above mentioned invoice (copy attached for your convenience) despite\n"
-"our first reminder.  If it has already been sent, please disregard\n"
-"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 ""
-"Dear Sir or Madam,\n"
-"\n"
-"Our records indicate that we have not yet received the payment of the\n"
-"above mentioned invoice (copy attached for your convenience) despite\n"
-"our first reminder.  If it has already been sent, please disregard\n"
-"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"
-
 #. module: account_credit_control
 #: field:credit.control.policy.level,policy_id:0
 msgid "Related Policy"
 msgstr "Related Policy"
 
-#. module: account_credit_control
-#: sql_constraint:account.account:0
-msgid "The code of the account must be unique per company !"
-msgstr "The code of the account must be unique per company!"
-
-#. module: account_credit_control
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Error! You can not create recursive companies."
-
 #. module: account_credit_control
 #: view:credit.control.policy:0 view:credit.control.policy.level:0
 msgid "Mail and reporting"
 msgstr "Mail and reporting"
 
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_2
+msgid ""
+"Our records indicate that we have not yet received the payment of the above "
+"mentioned invoice despite our first reminder.\n"
+"        If it has already been sent, please disregard this notice. If not, "
+"please proceed with payment within 5 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+msgstr ""
+"Our records indicate that we have not yet received the payment of the above "
+"mentioned invoice despite our first reminder.\n"
+"        If it has already been sent, please disregard this notice. If not, "
+"please proceed with payment within 5 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+
+#. module: account_credit_control
+#: model:email.template,body_html:account_credit_control.email_template_credit_control_base
+msgid ""
+"\n"
+"      Dear ${object.get_contact_address().name  or ''}\n"
+"      
\n"
+"      
\n"
+"      ${object.current_policy_level.custom_mail_text}\n"
+"      "
+msgstr ""
+"\n"
+"      Dear ${object.get_contact_address().name  or ''}\n"
+"      
\n"
+"      
\n"
+"      ${object.current_policy_level.custom_mail_text}\n"
+"      "
+
 #. module: account_credit_control
 #: view:credit.control.printer:0
 msgid "Print"
 msgstr "Print"
 
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
+msgid ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice.\n"
+"        If it has already been sent, please disregard this notice. If not, "
+"please proceed with payment within 10 days.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+msgstr ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice.\n"
+"        If it has already been sent, please disregard this notice. If not, "
+"please proceed with payment within 10 days.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+
 #. module: account_credit_control
 #: selection:credit.control.line,channel:0
 #: selection:credit.control.policy.level,channel:0
@@ -254,19 +312,56 @@ msgid "Email"
 msgstr "Email"
 
 #. module: account_credit_control
-#: field:credit.control.line,channel:0 view:credit.control.lines:0
+#: view:credit.control.line:0 field:credit.control.line,channel:0
 #: field:credit.control.policy.level,channel:0
 msgid "Channel"
 msgstr "Channel"
 
 #. module: account_credit_control
-#: help:credit.control.run,manual_ids:0
+#: model:credit.control.policy.level,custom_text:account_credit_control.2_time_2
 msgid ""
-"If a credit control line has been generated on a policy and the policy has "
-"been changed meantime, it has to be handled manually"
+"Our records indicate that we still have not received the payment of the "
+"above mentioned invoice despite our reminder.\n"
+"\n"
+"        If payment have already been sent, please disregard this notice. If "
+"not, please proceed with payment.\n"
+"        If your payment has not been received in the next 5 days, your file "
+"will be transfered to our debt\n"
+"        collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
 msgstr ""
-"If a credit control line has been generated on a policy and the policy has "
-"been changed meantime, it has to be handled manually"
+"Our records indicate that we still have not received the payment of the "
+"above mentioned invoice despite our reminder.\n"
+"\n"
+"        If payment have already been sent, please disregard this notice. If "
+"not, please proceed with payment.\n"
+"        If your payment has not been received in the next 5 days, your file "
+"will be transfered to our debt\n"
+"        collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+
+#. module: account_credit_control
+#: view:credit.control.marker:0
+msgid "Lines marker"
+msgstr "Lines marker"
 
 #. module: account_credit_control
 #: field:credit.control.printer,state:0
@@ -278,6 +373,11 @@ msgstr "state"
 msgid "Report"
 msgstr "Report"
 
+#. module: account_credit_control
+#: field:credit.control.line,state:0 field:credit.control.run,state:0
+msgid "State"
+msgstr "State"
+
 #. module: account_credit_control
 #: help:credit.control.line,state:0
 msgid ""
@@ -289,6 +389,12 @@ msgstr ""
 "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."
 
+#. 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 "30 days end of month"
+
 #. module: account_credit_control
 #: selection:credit.control.policy.level,computation_mode:0
 msgid "Due Date, End Of Month"
@@ -300,50 +406,63 @@ msgid "Mark as"
 msgstr "Mark as"
 
 #. module: account_credit_control
-#: model:credit.control.policy.level,custom_text:account_credit_control.2_time_2
+#: model:credit.control.policy.level,custom_mail_text:account_credit_control.3_time_1
 msgid ""
-"Dear Sir or Madam,\n"
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice (copy attached for your convenience).\n"
 "\n"
-"Our records indicate that we still have not received the payment of\n"
-"the above mentioned invoice (copy attached) despite our reminder.\n"
-"If payment have already been sent, please disregard this notice. If\n"
-"not, please proceed with payment. If your payment has not been\n"
-"received in the next 5 days, your file will be transfered to our debt\n"
-"collection agency.\n"
-"\n"
-"Should you need us to arrange a payment plan for you, please advise.\n"
-"A customer account statement is enclosed for you convenience.\n"
+"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"
+"Best regards\n"
+"      "
 msgstr ""
-"Dear Sir or Madam,\n"
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice (copy attached for your convenience).\n"
 "\n"
-"Our records indicate that we still have not received the payment of\n"
-"the above mentioned invoice (copy attached) despite our reminder.\n"
-"If payment have already been sent, please disregard this notice. If\n"
-"not, please proceed with payment. If your payment has not been\n"
-"received in the next 5 days, your file will be transfered to our debt\n"
-"collection agency.\n"
-"\n"
-"Should you need us to arrange a payment plan for you, please advise.\n"
-"A customer account statement is enclosed for you convenience.\n"
+"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"
+"Best regards\n"
+"      "
 
 #. module: account_credit_control
-#: view:credit.control.lines:0
-msgid "An error has occured during the sending of the email."
-msgstr "An error has occured during the sending of the email."
+#: view:credit.control.run:0
+msgid "Credit control run"
+msgstr "Credit control run"
 
 #. module: account_credit_control
 #: view:credit.control.run:0 field:credit.control.run,policy_ids:0
 msgid "Policies"
 msgstr "Policies"
 
+#. 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 above "
+"mentioned invoice (copy attached for your convenience).\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 ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice (copy attached for your convenience).\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"
+"      "
+
 #. module: account_credit_control
 #: field:credit.control.line,date_due:0
 msgid "Due date"
@@ -359,17 +478,6 @@ msgstr "Do nothing"
 msgid "Currency"
 msgstr "Currency"
 
-#. module: account_credit_control
-#: constraint:account.account:0
-msgid ""
-"Configuration Error! \n"
-"You can not define children to an account with internal type different of "
-"\"View\"! "
-msgstr ""
-"Configuration Error! \n"
-"You can not define children to an account with internal type different of "
-"\"View\"! "
-
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_printer
 msgid "Mass printer"
@@ -382,6 +490,11 @@ msgstr "Mass printer"
 msgid "Company"
 msgstr "Company"
 
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "An error has occured during the sending of the email."
+msgstr "An error has occured during the sending of the email."
+
 #. module: account_credit_control
 #: view:credit.control.marker:0
 #: model:ir.actions.act_window,help:account_credit_control.open_credit_line_marker_wizard
@@ -389,7 +502,7 @@ msgid "Change the state of the selected lines."
 msgstr "Change the state of the selected lines."
 
 #. module: account_credit_control
-#: view:credit.control.lines:0
+#: view:credit.control.line:0
 msgid "Lines which have been ignored from previous runs."
 msgstr "Lines which have been ignored from previous runs."
 
@@ -399,7 +512,7 @@ msgid "Print the selected lines"
 msgstr "Print the selected lines"
 
 #. module: account_credit_control
-#: selection:credit.control.line,state:0 view:credit.control.lines:0
+#: view:credit.control.line:0 selection:credit.control.line,state:0
 #: selection:credit.control.run,state:0
 msgid "Draft"
 msgstr "Draft"
@@ -410,7 +523,7 @@ msgid "Warning: you will maybe not be able to revert this operation."
 msgstr "Warning: you will maybe not be able to revert this operation."
 
 #. module: account_credit_control
-#: view:credit.control.lines:0
+#: view:credit.control.line:0
 msgid "Credit policy"
 msgstr "Credit policy"
 
@@ -425,7 +538,7 @@ msgid "Due balance"
 msgstr "Due balance"
 
 #. module: account_credit_control
-#: view:credit.control.lines:0
+#: view:credit.control.line:0
 msgid "Credit policy level"
 msgstr "Credit policy level"
 
@@ -434,6 +547,11 @@ msgstr "Credit policy level"
 msgid "Credit control line generator"
 msgstr "Credit control line generator"
 
+#. module: account_credit_control
+#: view:credit.control.policy:0
+msgid "Credit control policy"
+msgstr "Credit control policy"
+
 #. module: account_credit_control
 #: field:credit.control.communication,user_id:0
 msgid "User"
@@ -455,11 +573,6 @@ msgstr "Journal Items"
 msgid "Print selected lines"
 msgstr "Print selected lines"
 
-#. module: account_credit_control
-#: constraint:account.move.line:0
-msgid "You can not create journal items on an account of type view."
-msgstr "You can not create journal items on an account of type view."
-
 #. module: account_credit_control
 #: field:credit.control.emailer,line_ids:0
 #: field:credit.control.marker,line_ids:0
@@ -470,41 +583,6 @@ msgstr "You can not create journal items on an account of type view."
 msgid "Credit Control Lines"
 msgstr "Credit Control Lines"
 
-#. module: account_credit_control
-#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_3
-msgid ""
-"Dear Sir or Madam,\n"
-"\n"
-"Our records indicate that we still have not received the payment of\n"
-"the above mentioned invoice (copy attached) despite our two reminders.\n"
-"If payment have already been sent, please disregard this notice. If\n"
-"not, please proceed with payment. If your payment has not been\n"
-"received in the next 5 days, your file will be transfered to our debt\n"
-"collection agency.\n"
-"\n"
-"Should you need us to arrange a payment plan for you, please advise.\n"
-"A customer account statement is enclosed for you convenience.\n"
-"\n"
-"Thank you in advance for your anticipated cooperation in this matter.\n"
-"\n"
-"Best regards,\n"
-msgstr ""
-"Dear Sir or Madam,\n"
-"\n"
-"Our records indicate that we still have not received the payment of\n"
-"the above mentioned invoice (copy attached) despite our two reminders.\n"
-"If payment have already been sent, please disregard this notice. If\n"
-"not, please proceed with payment. If your payment has not been\n"
-"received in the next 5 days, your file will be transfered to our debt\n"
-"collection agency.\n"
-"\n"
-"Should you need us to arrange a payment plan for you, please advise.\n"
-"A customer account statement is enclosed for you convenience.\n"
-"\n"
-"Thank you in advance for your anticipated cooperation in this matter.\n"
-"\n"
-"Best regards,\n"
-
 #. 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
@@ -522,7 +600,7 @@ msgid "Define a reminder policy"
 msgstr "Define a reminder policy"
 
 #. module: account_credit_control
-#: view:credit.control.lines:0
+#: view:credit.control.line:0
 msgid "Lines already sent."
 msgstr "Lines already sent."
 
@@ -532,7 +610,7 @@ msgid "Email Template"
 msgstr "Email Template"
 
 #. module: account_credit_control
-#: selection:credit.control.line,state:0 view:credit.control.lines:0
+#: view:credit.control.line:0 selection:credit.control.line,state:0
 #: selection:credit.control.marker,name:0
 msgid "Ready To Send"
 msgstr "Ready To Send"
@@ -558,14 +636,14 @@ msgid "Previous Reminder"
 msgstr "Previous Reminder"
 
 #. module: account_credit_control
-#: selection:credit.control.line,state:0 view:credit.control.lines:0
+#: view:credit.control.line:0 selection:credit.control.line,state:0
 msgid "Error"
 msgstr "Error"
 
 #. module: account_credit_control
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr "Invoice Number must be unique per Company!"
+#: field:credit.control.policy,level_ids:0
+msgid "Policy Levels"
+msgstr "Policy Levels"
 
 #. module: account_credit_control
 #: view:credit.control.run:0
@@ -573,25 +651,64 @@ msgid "Report and Errors"
 msgstr "Report and Errors"
 
 #. module: account_credit_control
-#: constraint:account.account:0
+#: model:email.template,subject:account_credit_control.email_template_credit_control_base
+msgid "Credit Control: (${object.current_policy_level.name or 'n/a'})"
+msgstr "Credit Control: (${object.current_policy_level.name or 'n/a'})"
+
+#. module: account_credit_control
+#: field:credit.control.policy.level,custom_mail_text:0
+msgid "Custom Mail Message"
+msgstr "Custom Mail Message"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_mail_text:account_credit_control.2_time_2
 msgid ""
-"Configuration Error! \n"
-"You can not select an account type with a deferral method different of "
-"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+"Our records indicate that we still have not received the payment of the "
+"above mentioned invoice (copy attached) despite our reminder.\n"
+"\n"
+"If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.\n"
+"If your payment has not been received in the next 5 days, your file will be "
+"transfered to our debt\n"
+"        collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
 msgstr ""
-"Configuration Error! \n"
-"You can not select an account type with a deferral method different of "
-"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+"Our records indicate that we still have not received the payment of the "
+"above mentioned invoice (copy attached) despite our reminder.\n"
+"\n"
+"If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.\n"
+"If your payment has not been received in the next 5 days, your file will be "
+"transfered to our debt\n"
+"        collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
 
 #. module: account_credit_control
-#: field:credit.control.line,state:0 field:credit.control.run,state:0
-msgid "State"
-msgstr "State"
-
-#. module: account_credit_control
-#: help:credit.control.policy,do_nothing:0
-msgid "For policies which should not generate lines or are obsolete"
-msgstr "For policies which should not generate lines or are obsolete"
+#: help:credit.control.run,manual_ids:0
+msgid ""
+"If a credit control line has been generatedon a policy and the policy has "
+"been changed in the meantime, it has to be handled manually"
+msgstr ""
+"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"
 
 #. module: account_credit_control
 #: field:account.account,credit_control_line_ids:0
@@ -609,8 +726,8 @@ msgid "Done"
 msgstr "Done"
 
 #. module: account_credit_control
-#: field:account.move.line,invoice_id:0 field:credit.control.line,invoice_id:0
-#: view:credit.control.lines:0
+#: field:account.move.line,invoice_id:0 view:credit.control.line:0
+#: field:credit.control.line,invoice_id:0
 #: model:ir.model,name:account_credit_control.model_account_invoice
 msgid "Invoice"
 msgstr "Invoice"
@@ -641,7 +758,7 @@ msgstr ""
 "will use the account setting or the partner setting."
 
 #. module: account_credit_control
-#: view:credit.control.lines:0
+#: view:credit.control.line:0
 msgid "Run date"
 msgstr "Run date"
 
@@ -651,15 +768,24 @@ msgid "Credit Control User"
 msgstr "Credit Control User"
 
 #. module: account_credit_control
-#: constraint:account.move.line:0
-msgid "Company must be the same for its related account and period."
-msgstr "Company must be the same for its related account and period."
+#: view:credit.control.policy:0 view:credit.control.policy.level:0
+msgid "Policy level"
+msgstr "Policy level"
 
 #. module: account_credit_control
 #: field:credit.control.run,manual_ids:0
 msgid "Lines to handle manually"
 msgstr "Lines to handle manually"
 
+#. module: account_credit_control
+#: help:res.partner,credit_policy_id:0
+msgid ""
+"The Credit Control Policy used for this partner. This setting can be forced "
+"on the invoice. If nothing is defined, it will use the company setting."
+msgstr ""
+"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."
+
 #. module: account_credit_control
 #: view:account.invoice:0
 #: model:ir.ui.menu,name:account_credit_control.base_credit_control_configuration_menu
@@ -668,20 +794,29 @@ msgid "Credit Control"
 msgstr "Credit Control"
 
 #. module: account_credit_control
-#: view:credit.control.policy:0 field:credit.control.policy,level_ids:0
-msgid "Policy Levels"
-msgstr "Policy Levels"
-
-#. module: account_credit_control
-#: constraint:account.move.line:0
+#: model:credit.control.policy.level,custom_mail_text:account_credit_control.3_time_2
 msgid ""
-"The selected account of your Journal Entry forces to provide a secondary "
-"currency. You should remove the secondary currency on the account or select "
-"a multi-currency view on the journal."
+"Our records indicate that we have not yet received the payment of the above "
+"mentioned invoice (copy attached for your convenience) 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 ""
-"The selected account of your Journal Entry forces to provide a secondary "
-"currency. You should remove the secondary currency on the account or select "
-"a multi-currency view on the journal."
+"Our records indicate that we have not yet received the payment of the above "
+"mentioned invoice (copy attached for your convenience) 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"
+"      "
 
 #. module: account_credit_control
 #: field:credit.control.line,policy_id:0
@@ -689,14 +824,37 @@ msgid "Policy"
 msgstr "Policy"
 
 #. module: account_credit_control
-#: model:email.template,subject:account_credit_control.email_template_credit_control_base
-msgid "Credit Control: (${object.current_policy_level.name or 'n/a' })"
-msgstr "Credit Control: (${object.current_policy_level.name or 'n/a' })"
+#: view:credit.control.policy:0
+msgid "Credit control policy Level"
+msgstr "Credit control policy Level"
 
 #. module: account_credit_control
-#: field:credit.control.printer,report_file:0
-msgid "Generated Report"
-msgstr "Generated Report"
+#: view:credit.control.emailer:0
+msgid "Mailer"
+msgstr "Mailer"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_1
+msgid ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice.\n"
+"If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+msgstr ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice.\n"
+"If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
 
 #. module: account_credit_control
 #: view:credit.control.run:0
@@ -715,7 +873,12 @@ msgid "Send an email for the selected lines."
 msgstr "Send an email for the selected lines."
 
 #. module: account_credit_control
-#: view:credit.control.lines:0
+#: model:credit.control.policy.level,name:account_credit_control.3_time_3
+msgid "10 days last reminder"
+msgstr "10 days last reminder"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
 msgid "Sent"
 msgstr "Sent"
 
@@ -725,17 +888,22 @@ msgid "The smallest level can not be of type Previous Reminder"
 msgstr "The smallest level can not be of type Previous Reminder"
 
 #. module: account_credit_control
-#: help:credit.control.policy,account_ids:0
-msgid "This policy will be active only for the selected accounts"
-msgstr "This policy will be active only for the selected accounts"
+#: view:credit.control.printer:0
+msgid "Lines report"
+msgstr "Lines report"
 
 #. module: account_credit_control
-#: help:credit.control.printer,mark_as_sent:0
-msgid "Only letter lines will be marked."
-msgstr "Only letter lines will be marked."
+#: field:credit.control.printer,report_file:0
+msgid "Generated Report"
+msgstr "Generated Report"
 
 #. module: account_credit_control
-#: view:credit.control.line:0 view:credit.control.lines:0
+#: model:credit.control.policy.level,name:account_credit_control.3_time_1
+msgid "10 days net"
+msgstr "10 days net"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
 msgid "Control Credit Lines"
 msgstr "Control Credit Lines"
 
@@ -744,30 +912,26 @@ msgstr "Control Credit Lines"
 msgid "Credit Control Manager"
 msgstr "Credit Control Manager"
 
-#. module: account_credit_control
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "The company name must be unique!"
-
 #. module: account_credit_control
 #: field:credit.control.policy,name:0 field:credit.control.policy.level,name:0
 msgid "Name"
 msgstr "Name"
 
 #. module: account_credit_control
-#: help:res.partner,credit_policy_id:0
-msgid ""
-"The Credit Control Policyused for this partner. This setting can be forced "
-"on the invoice. If nothing is defined, it will use the company setting."
-msgstr ""
-"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."
+#: view:credit.control.emailer:0
+msgid "Send the emails"
+msgstr "Send the emails"
 
 #. module: account_credit_control
 #: field:credit.control.line,mail_message_id:0
 msgid "Sent Email"
 msgstr "Sent Email"
 
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_mail_mail
+msgid "Outgoing Mails"
+msgstr "Outgoing Mails"
+
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_policy_level
 msgid "A credit control policy level"
@@ -784,12 +948,7 @@ msgid "Controlling date"
 msgstr "Controlling date"
 
 #. module: account_credit_control
-#: constraint:account.move.line:0
-msgid "You can not create journal items on closed account."
-msgstr "You can not create journal items on closed account."
-
-#. module: account_credit_control
-#: view:credit.control.lines:0
+#: view:credit.control.line:0
 msgid "Draft lines have to be triaged."
 msgstr "Draft lines have to be triaged."
 
@@ -803,6 +962,16 @@ msgstr "Due Amount Tax incl."
 msgid "Credit Control Tolerance"
 msgstr "Credit Control Tolerance"
 
+#. module: account_credit_control
+#: view:credit.control.policy:0
+msgid "Policy levels"
+msgstr "Policy levels"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,name:account_credit_control.2_time_2
+msgid "60 days last reminder"
+msgstr "60 days last reminder"
+
 #. module: account_credit_control
 #: help:res.company,credit_policy_id:0
 msgid ""
@@ -817,69 +986,52 @@ msgstr ""
 msgid "Overdue Level"
 msgstr "Overdue Level"
 
-#~ msgid "Mass credit line mailer"
-#~ msgstr "Mass credit line mailer"
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:167
+msgid "Reminder"
+msgstr "Reminder"
 
-#~ msgid "Credit control"
-#~ msgstr "Credit control"
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:170
+msgid "Dear"
+msgstr "Dear"
 
-#~ msgid "New lines"
-#~ msgstr "New lines"
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:177
+msgid "Summary"
+msgstr "Summary"
 
-#~ msgid "Please select a policy"
-#~ msgstr "Please select a policy"
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:179
+msgid "Invoice number"
+msgstr "Invoice number"
 
-#~ msgid ""
-#~ "A credit control run is already running in background, please try later."
-#~ msgstr ""
-#~ "A credit control run is already running in background, please try later."
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:180
+msgid "Invoice date"
+msgstr "Invoice date"
 
-#~ msgid "Mark Lines"
-#~ msgstr "Mark Lines"
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:181
+msgid "Date due"
+msgstr "Date due"
 
-#~ msgid "Change the status of all draft lines"
-#~ msgstr "Change the status of all draft lines"
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:182
+msgid "Invoiced amount"
+msgstr "Invoice amount"
 
-#~ msgid "state can not be empty"
-#~ msgstr "state can not be empty"
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:183
+msgid "Open amount"
+msgstr "Open amount"
 
-#~ msgid "Manual"
-#~ msgstr "Manual"
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:183
+msgid "Currency"
+msgstr "Currency"
 
-#~ msgid "No credit control lines selected."
-#~ msgstr "No credit control lines selected."
-
-#~ msgid "Canal"
-#~ msgstr "Canal"
-
-#~ msgid "E-Mail"
-#~ msgstr "E-Mail"
-
-#~ msgid "%s marked line"
-#~ msgstr "%s marked line"
-
-#~ msgid "Policy \"%s\" has generated %d Credit Control Lines.\n"
-#~ msgstr "Policy \"%s\" has generated %d Credit Control Lines.\n"
-
-#~ msgid "Information"
-#~ msgstr "Information"
-
-#~ msgid "A run has already been executed more recently than %s"
-#~ msgstr "A run has already been executed more recently than %s"
-
-#~ msgid "Can not get function for computation mode: %s is not implemented"
-#~ msgstr "Can not get function for computation mode: %s is not implemented"
-
-#~ msgid "Mail"
-#~ msgstr "Mail"
-
-#~ msgid "No lines will be changed. All the selected lines are already done."
-#~ msgstr "No lines will be changed. All the selected lines are already done."
-
-#~ msgid ""
-#~ "Send an e-mail for all \"Ready To Send\" lines of the \"E-Mail\" channel"
-#~ msgstr ""
-#~ "Send an e-mail for all \"Ready To Send\" lines of the \"E-Mail\" channel"
-
-#~ msgid "Print all \"Ready To Send\" lines of the \"Manual\" channel"
-#~ msgstr "Print all \"Ready To Send\" lines of the \"Manual\" channel"
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:211
+msgid "If you have any question, do not hesitate to contact us."
+msgstr "If you have any question, do not hesitate to contact us."
\ No newline at end of file
diff --git a/account_credit_control/i18n/es.po b/account_credit_control/i18n/es.po
new file mode 100644
index 000000000..bd1d5081a
--- /dev/null
+++ b/account_credit_control/i18n/es.po
@@ -0,0 +1,1037 @@
+#. module: account_credit_control
+#: field:credit.control.policy.level,custom_text:0
+msgid "Custom Message"
+msgstr "Custom Message"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "More..."
+msgstr "More..."
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "Group By..."
+msgstr "Group By..."
+
+#. 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 "Credit Control Run"
+
+#. module: account_credit_control
+#: field:credit.control.policy.level,computation_mode:0
+msgid "Compute Mode"
+msgstr "Compute Mode"
+
+#. module: account_credit_control
+#: field:credit.control.line,date_entry:0
+msgid "Entry date"
+msgstr "Entry date"
+
+#. 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 "Send By Email"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_line
+msgid "A credit control line"
+msgstr "A credit control line"
+
+#. module: account_credit_control
+#: field:credit.control.line,move_line_id:0
+msgid "Move line"
+msgstr "Move line"
+
+#. module: account_credit_control
+#: model:res.groups,name:account_credit_control.group_account_credit_control_info
+msgid "Credit Control Info"
+msgstr "Credit Control Info"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_emailer
+msgid "Mass credit line emailer"
+msgstr "Mass credit line emailer"
+
+#. module: account_credit_control
+#: view:credit.control.line:0 field:credit.control.line,account_id:0
+#: model:ir.model,name:account_credit_control.model_account_account
+msgid "Account"
+msgstr "Account"
+
+#. module: account_credit_control
+#: selection:credit.control.policy.level,computation_mode:0
+msgid "Due Date"
+msgstr "Due Date"
+
+#. module: account_credit_control
+#: field:credit.control.communication,current_policy_level:0
+#: view:credit.control.line:0 field:credit.control.line,level:0
+#: field:credit.control.policy.level,level:0
+msgid "Level"
+msgstr "Level"
+
+#. module: account_credit_control
+#: field:credit.control.policy.level,delay_days:0
+msgid "Delay (in days)"
+msgstr "Delay (in days)"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_communication
+msgid "credit control communication"
+msgstr "credit control communication"
+
+#. module: account_credit_control
+#: view:credit.control.emailer:0
+msgid "Send emails for the selected lines"
+msgstr "Send emails for the selected lines"
+
+#. module: account_credit_control
+#: help:credit.control.policy,account_ids:0
+msgid "This policy will be active only for the selected accounts"
+msgstr "This policy will be active only for the selected accounts"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "These lines are ready to send by email or by letter using the Actions."
+msgstr "These lines are ready to send by email or by letter using the Actions."
+
+#. module: account_credit_control
+#: view:credit.control.line:0 selection:credit.control.line,state:0
+#: selection:credit.control.marker,name:0
+msgid "Ignored"
+msgstr "Ignored"
+
+#. module: account_credit_control
+#: help:credit.control.printer,mark_as_sent:0
+msgid "Only letter lines will be marked."
+msgstr "Only letter lines will be marked."
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_marker
+msgid "Mass marker"
+msgstr "Mass marker"
+
+#. module: account_credit_control
+#: field:account.invoice,credit_policy_id:0
+#: field:res.company,credit_policy_id:0 field:res.partner,credit_policy_id:0
+msgid "Credit Control Policy"
+msgstr "Credit Control Policy"
+
+#. 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 "
+"above mentioned invoice (copy attached) 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 ""
+"Our records indicate that we still have not received the payment of the "
+"above mentioned invoice (copy attached) 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"
+"      "
+
+#. module: account_credit_control
+#: field:credit.control.line,date_sent:0
+msgid "Sent date"
+msgstr "Sent date"
+
+#. module: account_credit_control
+#: view:credit.control.policy:0 field:credit.control.policy,account_ids:0
+msgid "Accounts"
+msgstr "Accounts"
+
+#. module: account_credit_control
+#: field:credit.control.communication,partner_id:0 view:credit.control.line:0
+#: field:credit.control.line,partner_id:0
+#: model:ir.model,name:account_credit_control.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_credit_control
+#: view:credit.control.policy.level:0
+msgid "Credit control policy level"
+msgstr "Credit control policy level"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_3
+msgid ""
+"\n"
+"        Our records indicate that we still have not received the payment of "
+"the above mentioned invoice despite our two reminders.\n"
+"        If payment have already been sent, please disregard this notice. If "
+"not, please proceed with payment.\n"
+"        If your payment has not been received in the next 5 days, your file "
+"will be transfered to our debt collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+msgstr ""
+"\n"
+"        Our records indicate that we still have not received the payment of "
+"the above mentioned invoice despite our two reminders.\n"
+"        If payment have already been sent, please disregard this notice. If "
+"not, please proceed with payment.\n"
+"        If your payment has not been received in the next 5 days, your file "
+"will be transfered to our debt collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+
+#. module: account_credit_control
+#: view:credit.control.marker:0
+#: model:ir.actions.act_window,name:account_credit_control.open_credit_line_marker_wizard
+#: model:ir.actions.act_window,name:account_credit_control.open_credit_line_marker_wizard_menu_action
+msgid "Change Lines' State"
+msgstr "Change Lines' State"
+
+#. module: account_credit_control
+#: field:credit.control.policy.level,policy_id:0
+msgid "Related Policy"
+msgstr "Related Policy"
+
+#. module: account_credit_control
+#: view:credit.control.policy:0 view:credit.control.policy.level:0
+msgid "Mail and reporting"
+msgstr "Mail and reporting"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_2
+msgid ""
+"Our records indicate that we have not yet received the payment of the above "
+"mentioned invoice despite our first reminder.\n"
+"        If it has already been sent, please disregard this notice. If not, "
+"please proceed with payment within 5 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+msgstr ""
+"Our records indicate that we have not yet received the payment of the above "
+"mentioned invoice despite our first reminder.\n"
+"        If it has already been sent, please disregard this notice. If not, "
+"please proceed with payment within 5 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+
+#. module: account_credit_control
+#: model:email.template,body_html:account_credit_control.email_template_credit_control_base
+msgid ""
+"\n"
+"      Dear ${object.get_contact_address().name  or ''}\n"
+"      
\n"
+"      
\n"
+"      ${object.current_policy_level.custom_mail_text}\n"
+"      "
+msgstr ""
+"\n"
+"      Dear ${object.get_contact_address().name  or ''}\n"
+"      
\n"
+"      
\n"
+"      ${object.current_policy_level.custom_mail_text}\n"
+"      "
+
+#. module: account_credit_control
+#: view:credit.control.printer:0
+msgid "Print"
+msgstr "Print"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
+msgid ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice.\n"
+"        If it has already been sent, please disregard this notice. If not, "
+"please proceed with payment within 10 days.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+msgstr ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice.\n"
+"        If it has already been sent, please disregard this notice. If not, "
+"please proceed with payment within 10 days.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+
+#. module: account_credit_control
+#: selection:credit.control.line,channel:0
+#: selection:credit.control.policy.level,channel:0
+msgid "Email"
+msgstr "Email"
+
+#. module: account_credit_control
+#: view:credit.control.line:0 field:credit.control.line,channel:0
+#: field:credit.control.policy.level,channel:0
+msgid "Channel"
+msgstr "Channel"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.2_time_2
+msgid ""
+"Our records indicate that we still have not received the payment of the "
+"above mentioned invoice despite our reminder.\n"
+"\n"
+"        If payment have already been sent, please disregard this notice. If "
+"not, please proceed with payment.\n"
+"        If your payment has not been received in the next 5 days, your file "
+"will be transfered to our debt\n"
+"        collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+msgstr ""
+"Our records indicate that we still have not received the payment of the "
+"above mentioned invoice despite our reminder.\n"
+"\n"
+"        If payment have already been sent, please disregard this notice. If "
+"not, please proceed with payment.\n"
+"        If your payment has not been received in the next 5 days, your file "
+"will be transfered to our debt\n"
+"        collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+
+#. module: account_credit_control
+#: view:credit.control.marker:0
+msgid "Lines marker"
+msgstr "Lines marker"
+
+#. module: account_credit_control
+#: field:credit.control.printer,state:0
+msgid "state"
+msgstr "state"
+
+#. module: account_credit_control
+#: field:credit.control.run,report:0
+msgid "Report"
+msgstr "Report"
+
+#. module: account_credit_control
+#: field:credit.control.line,state:0 field:credit.control.run,state:0
+msgid "State"
+msgstr "State"
+
+#. module: account_credit_control
+#: help:credit.control.line,state:0
+msgid ""
+"Draft lines need to be triaged.\n"
+"Ignored lines are lines for which we do not want to send something.\n"
+"Draft and ignored lines will be generated again on the next run."
+msgstr ""
+"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."
+
+#. 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 "30 days end of month"
+
+#. module: account_credit_control
+#: selection:credit.control.policy.level,computation_mode:0
+msgid "Due Date, End Of Month"
+msgstr "Due Date, End Of Month"
+
+#. module: account_credit_control
+#: field:credit.control.marker,name:0
+msgid "Mark as"
+msgstr "Mark as"
+
+#. 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 above "
+"mentioned invoice (copy attached for your convenience).\n"
+"\n"
+"If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+msgstr ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice (copy attached for your convenience).\n"
+"\n"
+"If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+
+#. module: account_credit_control
+#: view:credit.control.run:0
+msgid "Credit control run"
+msgstr "Credit control run"
+
+#. module: account_credit_control
+#: view:credit.control.run:0 field:credit.control.run,policy_ids:0
+msgid "Policies"
+msgstr "Policies"
+
+#. 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 above "
+"mentioned invoice (copy attached for your convenience).\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 ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice (copy attached for your convenience).\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"
+"      "
+
+#. module: account_credit_control
+#: field:credit.control.line,date_due:0
+msgid "Due date"
+msgstr "Due date"
+
+#. module: account_credit_control
+#: field:credit.control.policy,do_nothing:0
+msgid "Do nothing"
+msgstr "Do nothing"
+
+#. module: account_credit_control
+#: field:credit.control.line,currency_id:0
+msgid "Currency"
+msgstr "Currency"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_printer
+msgid "Mass printer"
+msgstr "Mass printer"
+
+#. module: account_credit_control
+#: field:credit.control.communication,company_id:0
+#: field:credit.control.line,company_id:0
+#: field:credit.control.policy,company_id:0
+msgid "Company"
+msgstr "Company"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "An error has occured during the sending of the email."
+msgstr "An error has occured during the sending of the email."
+
+#. module: account_credit_control
+#: view:credit.control.marker:0
+#: model:ir.actions.act_window,help:account_credit_control.open_credit_line_marker_wizard
+msgid "Change the state of the selected lines."
+msgstr "Change the state of the selected lines."
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "Lines which have been ignored from previous runs."
+msgstr "Lines which have been ignored from previous runs."
+
+#. module: account_credit_control
+#: view:credit.control.printer:0
+msgid "Print the selected lines"
+msgstr "Print the selected lines"
+
+#. module: account_credit_control
+#: view:credit.control.line:0 selection:credit.control.line,state:0
+#: selection:credit.control.run,state:0
+msgid "Draft"
+msgstr "Draft"
+
+#. module: account_credit_control
+#: view:credit.control.marker:0
+msgid "Warning: you will maybe not be able to revert this operation."
+msgstr "Warning: you will maybe not be able to revert this operation."
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "Credit policy"
+msgstr "Credit policy"
+
+#. module: account_credit_control
+#: view:credit.control.policy:0 view:credit.control.policy.level:0
+msgid "Delay Setting"
+msgstr "Delay Setting"
+
+#. module: account_credit_control
+#: field:credit.control.line,balance_due:0
+msgid "Due balance"
+msgstr "Due balance"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "Credit policy level"
+msgstr "Credit policy level"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_run
+msgid "Credit control line generator"
+msgstr "Credit control line generator"
+
+#. module: account_credit_control
+#: view:credit.control.policy:0
+msgid "Credit control policy"
+msgstr "Credit control policy"
+
+#. module: account_credit_control
+#: field:credit.control.communication,user_id:0
+msgid "User"
+msgstr "User"
+
+#. module: account_credit_control
+#: selection:credit.control.line,channel:0
+#: selection:credit.control.policy.level,channel:0
+msgid "Letter"
+msgstr "Letter"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_account_move_line
+msgid "Journal Items"
+msgstr "Journal Items"
+
+#. module: account_credit_control
+#: model:ir.actions.act_window,help:account_credit_control.open_credit_line_printer_wizard
+msgid "Print selected lines"
+msgstr "Print selected lines"
+
+#. module: account_credit_control
+#: field:credit.control.emailer,line_ids:0
+#: field:credit.control.marker,line_ids:0
+#: field:credit.control.printer,line_ids:0
+#: model:ir.actions.act_window,name:account_credit_control.credit_control_line_action
+#: model:ir.ui.menu,name:account_credit_control.credit_control_line_action_menu
+#: field:res.partner,credit_control_line_ids:0
+msgid "Credit Control Lines"
+msgstr "Credit Control Lines"
+
+#. 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 "Print Lines"
+
+#. module: account_credit_control
+#: field:credit.control.run,date:0
+msgid "Controlling Date"
+msgstr "Controlling Date"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_policy
+msgid "Define a reminder policy"
+msgstr "Define a reminder policy"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "Lines already sent."
+msgstr "Lines already sent."
+
+#. module: account_credit_control
+#: field:credit.control.policy.level,email_template_id:0
+msgid "Email Template"
+msgstr "Email Template"
+
+#. module: account_credit_control
+#: view:credit.control.line:0 selection:credit.control.line,state:0
+#: selection:credit.control.marker,name:0
+msgid "Ready To Send"
+msgstr "Ready To Send"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_res_company
+msgid "Companies"
+msgstr "Companies"
+
+#. module: account_credit_control
+#: field:credit.control.printer,mark_as_sent:0
+msgid "Mark letter lines as sent"
+msgstr "Mark letter lines as sent"
+
+#. module: account_credit_control
+#: view:credit.control.run:0
+msgid "Compute Credit Control Lines"
+msgstr "Compute Credit Control Lines"
+
+#. module: account_credit_control
+#: selection:credit.control.policy.level,computation_mode:0
+msgid "Previous Reminder"
+msgstr "Previous Reminder"
+
+#. module: account_credit_control
+#: view:credit.control.line:0 selection:credit.control.line,state:0
+msgid "Error"
+msgstr "Error"
+
+#. module: account_credit_control
+#: field:credit.control.policy,level_ids:0
+msgid "Policy Levels"
+msgstr "Policy Levels"
+
+#. module: account_credit_control
+#: view:credit.control.run:0
+msgid "Report and Errors"
+msgstr "Report and Errors"
+
+#. module: account_credit_control
+#: model:email.template,subject:account_credit_control.email_template_credit_control_base
+msgid "Credit Control: (${object.current_policy_level.name or 'n/a'})"
+msgstr "Credit Control: (${object.current_policy_level.name or 'n/a'})"
+
+#. module: account_credit_control
+#: field:credit.control.policy.level,custom_mail_text:0
+msgid "Custom Mail Message"
+msgstr "Custom Mail Message"
+
+#. 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 "
+"above mentioned invoice (copy attached) despite our reminder.\n"
+"\n"
+"If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.\n"
+"If your payment has not been received in the next 5 days, your file will be "
+"transfered to our debt\n"
+"        collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+msgstr ""
+"Our records indicate that we still have not received the payment of the "
+"above mentioned invoice (copy attached) despite our reminder.\n"
+"\n"
+"If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.\n"
+"If your payment has not been received in the next 5 days, your file will be "
+"transfered to our debt\n"
+"        collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+
+#. module: account_credit_control
+#: help:credit.control.run,manual_ids:0
+msgid ""
+"If a credit control line has been generatedon a policy and the policy has "
+"been changed in the meantime, it has to be handled manually"
+msgstr ""
+"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"
+
+#. module: account_credit_control
+#: field:account.account,credit_control_line_ids:0
+#: field:account.invoice,credit_control_line_ids:0
+#: field:credit.control.communication,credit_control_line_ids:0
+#: model:ir.actions.act_window,name:account_credit_control.act_account_credit_relation_relation
+#: model:ir.actions.act_window,name:account_credit_control.act_partner_credit_relation_relation
+msgid "Credit Lines"
+msgstr "Credit Lines"
+
+#. 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 "Done"
+
+#. module: account_credit_control
+#: field:account.move.line,invoice_id:0 view:credit.control.line:0
+#: field:credit.control.line,invoice_id:0
+#: model:ir.model,name:account_credit_control.model_account_invoice
+msgid "Invoice"
+msgstr "Invoice"
+
+#. module: account_credit_control
+#: view:credit.control.emailer:0 view:credit.control.marker:0
+#: view:credit.control.printer:0
+msgid "Cancel"
+msgstr "Cancel"
+
+#. module: account_credit_control
+#: view:credit.control.printer:0
+msgid "Close"
+msgstr "Close"
+
+#. module: account_credit_control
+#: selection:credit.control.line,state:0
+msgid "Emailing Error"
+msgstr "Emailing Error"
+
+#. module: account_credit_control
+#: help:account.invoice,credit_policy_id:0
+msgid ""
+"The Credit Control Policy used for this invoice. If nothing is defined, it "
+"will use the account setting or the partner setting."
+msgstr ""
+"The Credit Control Policy used for this invoice. If nothing is defined, it "
+"will use the account setting or the partner setting."
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "Run date"
+msgstr "Run date"
+
+#. module: account_credit_control
+#: model:res.groups,name:account_credit_control.group_account_credit_control_user
+msgid "Credit Control User"
+msgstr "Credit Control User"
+
+#. module: account_credit_control
+#: view:credit.control.policy:0 view:credit.control.policy.level:0
+msgid "Policy level"
+msgstr "Policy level"
+
+#. module: account_credit_control
+#: field:credit.control.run,manual_ids:0
+msgid "Lines to handle manually"
+msgstr "Lines to handle manually"
+
+#. module: account_credit_control
+#: help:res.partner,credit_policy_id:0
+msgid ""
+"The Credit Control Policy used for this partner. This setting can be forced "
+"on the invoice. If nothing is defined, it will use the company setting."
+msgstr ""
+"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."
+
+#. module: account_credit_control
+#: view:account.invoice:0
+#: model:ir.ui.menu,name:account_credit_control.base_credit_control_configuration_menu
+#: model:ir.ui.menu,name:account_credit_control.base_credit_control_menu
+msgid "Credit Control"
+msgstr "Credit Control"
+
+#. 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 above "
+"mentioned invoice (copy attached for your convenience) 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 ""
+"Our records indicate that we have not yet received the payment of the above "
+"mentioned invoice (copy attached for your convenience) 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"
+"      "
+
+#. module: account_credit_control
+#: field:credit.control.line,policy_id:0
+msgid "Policy"
+msgstr "Policy"
+
+#. module: account_credit_control
+#: view:credit.control.policy:0
+msgid "Credit control policy Level"
+msgstr "Credit control policy Level"
+
+#. module: account_credit_control
+#: view:credit.control.emailer:0
+msgid "Mailer"
+msgstr "Mailer"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_1
+msgid ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice.\n"
+"If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+msgstr ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice.\n"
+"If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+
+#. module: account_credit_control
+#: view:credit.control.run:0
+msgid "Move lines To be treated manually"
+msgstr "Move lines To be treated manually"
+
+#. 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 "Credit Control Policies"
+
+#. 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 "Send an email for the selected lines."
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,name:account_credit_control.3_time_3
+msgid "10 days last reminder"
+msgstr "10 days last reminder"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "Sent"
+msgstr "Sent"
+
+#. module: account_credit_control
+#: constraint:credit.control.policy.level:0
+msgid "The smallest level can not be of type Previous Reminder"
+msgstr "The smallest level can not be of type Previous Reminder"
+
+#. module: account_credit_control
+#: view:credit.control.printer:0
+msgid "Lines report"
+msgstr "Lines report"
+
+#. module: account_credit_control
+#: field:credit.control.printer,report_file:0
+msgid "Generated Report"
+msgstr "Generated Report"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,name:account_credit_control.3_time_1
+msgid "10 days net"
+msgstr "10 days net"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "Control Credit Lines"
+msgstr "Control Credit Lines"
+
+#. module: account_credit_control
+#: model:res.groups,name:account_credit_control.group_account_credit_control_manager
+msgid "Credit Control Manager"
+msgstr "Credit Control Manager"
+
+#. module: account_credit_control
+#: field:credit.control.policy,name:0 field:credit.control.policy.level,name:0
+msgid "Name"
+msgstr "Name"
+
+#. module: account_credit_control
+#: view:credit.control.emailer:0
+msgid "Send the emails"
+msgstr "Send the emails"
+
+#. module: account_credit_control
+#: field:credit.control.line,mail_message_id:0
+msgid "Sent Email"
+msgstr "Sent Email"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_mail_mail
+msgid "Outgoing Mails"
+msgstr "Outgoing Mails"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_policy_level
+msgid "A credit control policy level"
+msgstr "A credit control policy level"
+
+#. module: account_credit_control
+#: model:ir.actions.report.xml,name:account_credit_control.report_webkit_html
+msgid "Credit Summary"
+msgstr "Credit Summary"
+
+#. module: account_credit_control
+#: field:credit.control.line,date:0
+msgid "Controlling date"
+msgstr "Controlling date"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "Draft lines have to be triaged."
+msgstr "Draft lines have to be triaged."
+
+#. module: account_credit_control
+#: field:credit.control.line,amount_due:0
+msgid "Due Amount Tax incl."
+msgstr "Due Amount Tax incl."
+
+#. module: account_credit_control
+#: field:res.company,credit_control_tolerance:0
+msgid "Credit Control Tolerance"
+msgstr "Credit Control Tolerance"
+
+#. module: account_credit_control
+#: view:credit.control.policy:0
+msgid "Policy levels"
+msgstr "Policy levels"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,name:account_credit_control.2_time_2
+msgid "60 days last reminder"
+msgstr "60 days last reminder"
+
+#. module: account_credit_control
+#: help:res.company,credit_policy_id:0
+msgid ""
+"The Credit Control Policy used on partners by default. This setting can be "
+"overriden on partners or invoices."
+msgstr ""
+"The Credit Control Policy used on partners by default. This setting can be "
+"overriden on partners or invoices."
+
+#. module: account_credit_control
+#: field:credit.control.line,policy_level_id:0
+msgid "Overdue Level"
+msgstr "Overdue Level"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:167
+msgid "Reminder"
+msgstr "Reminder"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:170
+msgid "Dear"
+msgstr "Dear"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:177
+msgid "Summary"
+msgstr "Summary"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:179
+msgid "Invoice number"
+msgstr "Invoice number"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:180
+msgid "Invoice date"
+msgstr "Invoice date"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:181
+msgid "Date due"
+msgstr "Date due"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:182
+msgid "Invoiced amount"
+msgstr "Invoice amount"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:183
+msgid "Open amount"
+msgstr "Open amount"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:183
+msgid "Currency"
+msgstr "Currency"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:211
+msgid "If you have any question, do not hesitate to contact us."
+msgstr "If you have any question, do not hesitate to contact us."
\ No newline at end of file
diff --git a/account_credit_control/i18n/fr.po b/account_credit_control/i18n/fr.po
index 1f4427305..caeae7441 100644
--- a/account_credit_control/i18n/fr.po
+++ b/account_credit_control/i18n/fr.po
@@ -1,61 +1,15 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#       * account_credit_control
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-07 15:35+0000\n"
-"PO-Revision-Date: 2012-11-07 16:41+0100\n"
-"Last-Translator: Guewen Baconnier \n"
-"Language-Team: FR\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
-
-#. 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 ""
-"Dear Sir or Madam,\n"
-"\n"
-"Our records indicate that we have not received the payment of the\n"
-"above mentioned invoice (copy attached for your convenience).  If it\n"
-"has already been sent, please disregard this notice. If not, please\n"
-"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 ""
-"Madame, Monsieur,\n"
-"\n"
-"Il résulte d'une récente révision de nos comptes que la facture\n"
-"susmentionnée (copie ci-jointe) reste, sauf erreur, impayée à ce\n"
-"jour. Si tel est bien le cas, nous vous invitons à réparer cet oubli\n"
-"sous 10 jours.  Dans le cas contraire, nous vous prions de nous\n"
-"indiquer la date de votre paiement et vous remercions d'excuser le\n"
-"présent courriel.\n"
-"\n"
-"Pour toute question, nous restons à votre disposition.\n"
-"\n"
-"Bien cordialement,\n"
-
 #. module: account_credit_control
 #: field:credit.control.policy.level,custom_text:0
 msgid "Custom Message"
-msgstr "Message Personnalisé"
+msgstr "Custom Message"
 
 #. module: account_credit_control
-#: view:credit.control.lines:0
+#: view:credit.control.line:0
 msgid "More..."
-msgstr "Plus..."
+msgstr "More..."
 
 #. module: account_credit_control
-#: view:credit.control.lines:0
+#: view:credit.control.line:0
 msgid "Group By..."
 msgstr "Group By..."
 
@@ -63,42 +17,46 @@ msgstr "Group By..."
 #: 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 "Contrôles de Crédit"
+msgstr "Credit Control Run"
 
 #. module: account_credit_control
 #: field:credit.control.policy.level,computation_mode:0
 msgid "Compute Mode"
-msgstr "Mode de calcul"
+msgstr "Compute Mode"
+
+#. module: account_credit_control
+#: field:credit.control.line,date_entry:0
+msgid "Entry date"
+msgstr "Entry date"
 
 #. 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 "Envoyer par courrier électronique"
+msgstr "Send By Email"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_line
 msgid "A credit control line"
-msgstr "Ligne de contrôle de crédit"
+msgstr "A credit control line"
 
 #. module: account_credit_control
 #: field:credit.control.line,move_line_id:0
 msgid "Move line"
-msgstr "Écritures comptables"
+msgstr "Move line"
 
 #. module: account_credit_control
 #: model:res.groups,name:account_credit_control.group_account_credit_control_info
 msgid "Credit Control Info"
-msgstr "Informations de contrôle de crédit"
+msgstr "Credit Control Info"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_emailer
 msgid "Mass credit line emailer"
-msgstr "Envoi de courriers électroniques en masse"
+msgstr "Mass credit line emailer"
 
 #. module: account_credit_control
-#: field:credit.control.line,account_id:0
-#: view:credit.control.lines:0
+#: view:credit.control.line:0 field:credit.control.line,account_id:0
 #: model:ir.model,name:account_credit_control.model_account_account
 msgid "Account"
 msgstr "Compte"
@@ -106,153 +64,246 @@ msgstr "Compte"
 #. module: account_credit_control
 #: selection:credit.control.policy.level,computation_mode:0
 msgid "Due Date"
-msgstr "Date d'échéance"
+msgstr "Due Date"
 
 #. module: account_credit_control
 #: field:credit.control.communication,current_policy_level:0
-#: field:credit.control.line,level:0
-#: view:credit.control.lines:0
+#: view:credit.control.line:0 field:credit.control.line,level:0
 #: field:credit.control.policy.level,level:0
 msgid "Level"
-msgstr "Niveau"
+msgstr "Level"
 
 #. module: account_credit_control
 #: field:credit.control.policy.level,delay_days:0
 msgid "Delay (in days)"
-msgstr "Délai (en jours)"
+msgstr "Delay (in days)"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_communication
 msgid "credit control communication"
-msgstr "Communication de contrôle de crédit"
-
-#. module: account_credit_control
-#: sql_constraint:account.move.line:0
-msgid "Wrong credit or debit value in accounting entry !"
-msgstr "Mauvaise entrée de crédit ou de débit dans la comptabilité !"
-
-#. module: account_credit_control
-#: view:credit.control.lines:0
-msgid "These lines are ready to send by email or by letter using the Actions."
-msgstr "These lines are ready to send by email or by letter using the Actions."
-
-#. module: account_credit_control
-#: model:ir.model,name:account_credit_control.model_credit_control_marker
-msgid "Mass marker"
-msgstr "Changer d'état en masse"
-
-#. module: account_credit_control
-#: selection:credit.control.line,state:0
-#: view:credit.control.lines:0
-#: selection:credit.control.marker,name:0
-msgid "Ignored"
-msgstr "Ignoré"
+msgstr "credit control communication"
 
 #. module: account_credit_control
 #: view:credit.control.emailer:0
 msgid "Send emails for the selected lines"
-msgstr "Envoyer des courriers électroniques pour les lignes sélectionnées"
+msgstr "Send emails for the selected lines"
 
 #. module: account_credit_control
-#: constraint:account.account:0
-msgid "Error ! You can not create recursive accounts."
-msgstr "La création de comptes récursifs est interdite"
+#: help:credit.control.policy,account_ids:0
+msgid "This policy will be active only for the selected accounts"
+msgstr "This policy will be active only for the selected accounts"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "These lines are ready to send by email or by letter using the Actions."
+msgstr "These lines are ready to send by email or by letter using the Actions."
+
+#. module: account_credit_control
+#: view:credit.control.line:0 selection:credit.control.line,state:0
+#: selection:credit.control.marker,name:0
+msgid "Ignored"
+msgstr "Ignored"
+
+#. module: account_credit_control
+#: help:credit.control.printer,mark_as_sent:0
+msgid "Only letter lines will be marked."
+msgstr "Only letter lines will be marked."
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_credit_control_marker
+msgid "Mass marker"
+msgstr "Mass marker"
 
 #. module: account_credit_control
 #: field:account.invoice,credit_policy_id:0
-#: field:res.company,credit_policy_id:0
-#: field:res.partner,credit_policy_id:0
+#: field:res.company,credit_policy_id:0 field:res.partner,credit_policy_id:0
 msgid "Credit Control Policy"
-msgstr "Politique de contrôle de crédit"
+msgstr "Credit Control Policy"
 
 #. module: account_credit_control
-#: constraint:account.move.line:0
-msgid "The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal."
+#: 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 "
+"above mentioned invoice (copy attached) 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 ""
-"La date de l'entrée de journal n'est pas dans la période choisie. Il\n"
-"faut changer la date ou supprimer la contrainte du journal."
+"Our records indicate that we still have not received the payment of the "
+"above mentioned invoice (copy attached) 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"
+"      "
 
 #. module: account_credit_control
 #: field:credit.control.line,date_sent:0
 msgid "Sent date"
-msgstr "Date d'envoi"
+msgstr "Sent date"
 
 #. module: account_credit_control
-#: view:credit.control.policy:0
-#: field:credit.control.policy,account_ids:0
+#: view:credit.control.policy:0 field:credit.control.policy,account_ids:0
 msgid "Accounts"
-msgstr "Comptes"
+msgstr "Accounts"
 
 #. module: account_credit_control
-#: field:credit.control.communication,partner_id:0
+#: field:credit.control.communication,partner_id:0 view:credit.control.line:0
 #: field:credit.control.line,partner_id:0
-#: view:credit.control.lines:0
 #: model:ir.model,name:account_credit_control.model_res_partner
 msgid "Partner"
 msgstr "Partenaire"
 
 #. module: account_credit_control
-#: view:credit.control.emailer:0
-msgid "Send the emails"
-msgstr "Envoyer les courriers électroniques"
+#: view:credit.control.policy.level:0
+msgid "Credit control policy level"
+msgstr "Credit control policy level"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_3
+msgid ""
+"\n"
+"        Our records indicate that we still have not received the payment of "
+"the above mentioned invoice despite our two reminders.\n"
+"        If payment have already been sent, please disregard this notice. If "
+"not, please proceed with payment.\n"
+"        If your payment has not been received in the next 5 days, your file "
+"will be transfered to our debt collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+msgstr ""
+"\n"
+"        Our records indicate that we still have not received the payment of "
+"the above mentioned invoice despite our two reminders.\n"
+"        If payment have already been sent, please disregard this notice. If "
+"not, please proceed with payment.\n"
+"        If your payment has not been received in the next 5 days, your file "
+"will be transfered to our debt collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
 
 #. module: account_credit_control
 #: view:credit.control.marker:0
 #: model:ir.actions.act_window,name:account_credit_control.open_credit_line_marker_wizard
 #: model:ir.actions.act_window,name:account_credit_control.open_credit_line_marker_wizard_menu_action
 msgid "Change Lines' State"
-msgstr "Changer l'état des lignes"
-
-#. module: account_credit_control
-#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_2
-msgid ""
-"Dear Sir or Madam,\n"
-"\n"
-"Our records indicate that we have not yet received the payment of the\n"
-"above mentioned invoice (copy attached for your convenience) despite\n"
-"our first reminder.  If it has already been sent, please disregard\n"
-"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 ""
-"Dear Sir or Madam,\n"
-"\n"
-"Our records indicate that we have not yet received the payment of the\n"
-"above mentioned invoice (copy attached for your convenience) despite\n"
-"our first reminder.  If it has already been sent, please disregard\n"
-"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 "Change Lines' State"
 
 #. module: account_credit_control
 #: field:credit.control.policy.level,policy_id:0
 msgid "Related Policy"
-msgstr "Politique liée"
+msgstr "Related Policy"
 
 #. module: account_credit_control
-#: sql_constraint:account.account:0
-msgid "The code of the account must be unique per company !"
-msgstr "Le code du compte doit être unique pour une société donnée."
-
-#. module: account_credit_control
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Il est interdit de créer des sociétés récursives."
-
-#. module: account_credit_control
-#: view:credit.control.policy:0
-#: view:credit.control.policy.level:0
+#: view:credit.control.policy:0 view:credit.control.policy.level:0
 msgid "Mail and reporting"
-msgstr "Courriers et rapports"
+msgstr "Mail and reporting"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_2
+msgid ""
+"Our records indicate that we have not yet received the payment of the above "
+"mentioned invoice despite our first reminder.\n"
+"        If it has already been sent, please disregard this notice. If not, "
+"please proceed with payment within 5 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+msgstr ""
+"Our records indicate that we have not yet received the payment of the above "
+"mentioned invoice despite our first reminder.\n"
+"        If it has already been sent, please disregard this notice. If not, "
+"please proceed with payment within 5 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+
+#. module: account_credit_control
+#: model:email.template,body_html:account_credit_control.email_template_credit_control_base
+msgid ""
+"\n"
+"      Dear ${object.get_contact_address().name  or ''}\n"
+"      
\n"
+"      
\n"
+"      ${object.current_policy_level.custom_mail_text}\n"
+"      "
+msgstr ""
+"\n"
+"      Dear ${object.get_contact_address().name  or ''}\n"
+"      
\n"
+"      
\n"
+"      ${object.current_policy_level.custom_mail_text}\n"
+"      "
 
 #. module: account_credit_control
 #: view:credit.control.printer:0
 msgid "Print"
-msgstr "Imprimer"
+msgstr "Print"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
+msgid ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice.\n"
+"        If it has already been sent, please disregard this notice. If not, "
+"please proceed with payment within 10 days.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+msgstr ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice.\n"
+"        If it has already been sent, please disregard this notice. If not, "
+"please proceed with payment within 10 days.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
 
 #. module: account_credit_control
 #: selection:credit.control.line,channel:0
@@ -261,28 +312,71 @@ msgid "Email"
 msgstr "Email"
 
 #. module: account_credit_control
-#: field:credit.control.line,channel:0
-#: view:credit.control.lines:0
+#: view:credit.control.line:0 field:credit.control.line,channel:0
 #: field:credit.control.policy.level,channel:0
 msgid "Channel"
-msgstr "Canal"
+msgstr "Channel"
 
 #. module: account_credit_control
-#: help:credit.control.run,manual_ids:0
-msgid "If a credit control line has been generated on a policy and the policy has been changed meantime, it has to be handled manually"
+#: model:credit.control.policy.level,custom_text:account_credit_control.2_time_2
+msgid ""
+"Our records indicate that we still have not received the payment of the "
+"above mentioned invoice despite our reminder.\n"
+"\n"
+"        If payment have already been sent, please disregard this notice. If "
+"not, please proceed with payment.\n"
+"        If your payment has not been received in the next 5 days, your file "
+"will be transfered to our debt\n"
+"        collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
 msgstr ""
-"Si une ligne de contrôle de crédit a été générée sur une politique et\n"
-"que la politique a changé entre temps, il faut traiter cette ligne manuellement."
+"Our records indicate that we still have not received the payment of the "
+"above mentioned invoice despite our reminder.\n"
+"\n"
+"        If payment have already been sent, please disregard this notice. If "
+"not, please proceed with payment.\n"
+"        If your payment has not been received in the next 5 days, your file "
+"will be transfered to our debt\n"
+"        collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
+
+#. module: account_credit_control
+#: view:credit.control.marker:0
+msgid "Lines marker"
+msgstr "Lines marker"
 
 #. module: account_credit_control
 #: field:credit.control.printer,state:0
 msgid "state"
-msgstr "état"
+msgstr "state"
 
 #. module: account_credit_control
 #: field:credit.control.run,report:0
 msgid "Report"
-msgstr "Rapport"
+msgstr "Report"
+
+#. module: account_credit_control
+#: field:credit.control.line,state:0 field:credit.control.run,state:0
+msgid "State"
+msgstr "State"
 
 #. module: account_credit_control
 #: help:credit.control.line,state:0
@@ -291,181 +385,193 @@ msgid ""
 "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 ""
-"Les lignes \"Brouillon\" nécessitent d'être triées.\n"
-"Les lignes \"Ignorées\" sont celles pour lesquelles rien ne doit être envoyé.\n"
-"Les lignes brouillon et ignorées seront régénérées lors du prochain lancement du contrôle de crédit."
+"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."
+
+#. 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 "30 days end of month"
 
 #. module: account_credit_control
 #: selection:credit.control.policy.level,computation_mode:0
 msgid "Due Date, End Of Month"
-msgstr "Date due, fin de mois"
+msgstr "Due Date, End Of Month"
 
 #. module: account_credit_control
 #: field:credit.control.marker,name:0
 msgid "Mark as"
-msgstr "Marquer comme"
+msgstr "Mark as"
 
 #. module: account_credit_control
-#: model:credit.control.policy.level,custom_text:account_credit_control.2_time_2
+#: model:credit.control.policy.level,custom_mail_text:account_credit_control.3_time_1
 msgid ""
-"Dear Sir or Madam,\n"
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice (copy attached for your convenience).\n"
 "\n"
-"Our records indicate that we still have not received the payment of\n"
-"the above mentioned invoice (copy attached) despite our reminder.\n"
-"If payment have already been sent, please disregard this notice. If\n"
-"not, please proceed with payment. If your payment has not been\n"
-"received in the next 5 days, your file will be transfered to our debt\n"
-"collection agency.\n"
-"\n"
-"Should you need us to arrange a payment plan for you, please advise.\n"
-"A customer account statement is enclosed for you convenience.\n"
+"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"
+"Best regards\n"
+"      "
 msgstr ""
-"Dear Sir or Madam,\n"
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice (copy attached for your convenience).\n"
 "\n"
-"Our records indicate that we still have not received the payment of\n"
-"the above mentioned invoice (copy attached) despite our reminder.\n"
-"If payment have already been sent, please disregard this notice. If\n"
-"not, please proceed with payment. If your payment has not been\n"
-"received in the next 5 days, your file will be transfered to our debt\n"
-"collection agency.\n"
-"\n"
-"Should you need us to arrange a payment plan for you, please advise.\n"
-"A customer account statement is enclosed for you convenience.\n"
+"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"
-
-#. module: account_credit_control
-#: view:credit.control.lines:0
-msgid "An error has occured during the sending of the email."
-msgstr "Une erreur s'est produit durant l'envoi du mail."
+"Best regards\n"
+"      "
 
 #. module: account_credit_control
 #: view:credit.control.run:0
-#: field:credit.control.run,policy_ids:0
+msgid "Credit control run"
+msgstr "Credit control run"
+
+#. module: account_credit_control
+#: view:credit.control.run:0 field:credit.control.run,policy_ids:0
 msgid "Policies"
-msgstr "Politiques"
+msgstr "Policies"
+
+#. 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 above "
+"mentioned invoice (copy attached for your convenience).\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 ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice (copy attached for your convenience).\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"
+"      "
 
 #. module: account_credit_control
 #: field:credit.control.line,date_due:0
 msgid "Due date"
-msgstr "Date d'échéance"
+msgstr "Due date"
 
 #. module: account_credit_control
 #: field:credit.control.policy,do_nothing:0
 msgid "Do nothing"
-msgstr "Ne rien faire"
+msgstr "Do nothing"
 
 #. module: account_credit_control
 #: field:credit.control.line,currency_id:0
 msgid "Currency"
-msgstr "Devise"
-
-#. module: account_credit_control
-#: constraint:account.account:0
-msgid ""
-"Configuration Error! \n"
-"You can not define children to an account with internal type different of \"View\"! "
-msgstr ""
-"Configuration Error! \n"
-"You can not define children to an account with internal type different of \"View\"! "
+msgstr "Currency"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_printer
 msgid "Mass printer"
-msgstr "Impression groupée"
+msgstr "Mass printer"
 
 #. module: account_credit_control
 #: field:credit.control.communication,company_id:0
 #: field:credit.control.line,company_id:0
 #: field:credit.control.policy,company_id:0
 msgid "Company"
-msgstr "Société"
+msgstr "Company"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
+msgid "An error has occured during the sending of the email."
+msgstr "An error has occured during the sending of the email."
 
 #. module: account_credit_control
 #: view:credit.control.marker:0
 #: model:ir.actions.act_window,help:account_credit_control.open_credit_line_marker_wizard
 msgid "Change the state of the selected lines."
-msgstr "Changer l'état des lignes sélectionnées."
+msgstr "Change the state of the selected lines."
 
 #. module: account_credit_control
-#: view:credit.control.lines:0
+#: view:credit.control.line:0
 msgid "Lines which have been ignored from previous runs."
-msgstr "Lignes qui ont été ignorées lors des précédents lancement."
+msgstr "Lines which have been ignored from previous runs."
 
 #. module: account_credit_control
 #: view:credit.control.printer:0
 msgid "Print the selected lines"
-msgstr "Imprimer les lignes sélectionnées"
+msgstr "Print the selected lines"
 
 #. module: account_credit_control
-#: selection:credit.control.line,state:0
-#: view:credit.control.lines:0
+#: view:credit.control.line:0 selection:credit.control.line,state:0
 #: selection:credit.control.run,state:0
 msgid "Draft"
-msgstr "Brouillon"
+msgstr "Draft"
 
 #. module: account_credit_control
 #: view:credit.control.marker:0
 msgid "Warning: you will maybe not be able to revert this operation."
-msgstr "Attention: vous ne pourrez peut-être pas annuler cette opération."
+msgstr "Warning: you will maybe not be able to revert this operation."
 
 #. module: account_credit_control
-#: view:credit.control.lines:0
+#: view:credit.control.line:0
 msgid "Credit policy"
-msgstr "Politique de crédit"
+msgstr "Credit policy"
 
 #. module: account_credit_control
-#: view:credit.control.policy:0
-#: view:credit.control.policy.level:0
+#: view:credit.control.policy:0 view:credit.control.policy.level:0
 msgid "Delay Setting"
-msgstr "Réglage du délai"
+msgstr "Delay Setting"
 
 #. module: account_credit_control
 #: field:credit.control.line,balance_due:0
 msgid "Due balance"
-msgstr "Solde du"
+msgstr "Due balance"
 
 #. module: account_credit_control
-#: view:credit.control.lines:0
+#: view:credit.control.line:0
 msgid "Credit policy level"
-msgstr "Niveau de politique de crédit"
+msgstr "Credit policy level"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_run
 msgid "Credit control line generator"
-msgstr "Générateur de ligne de contrôle de crédit"
+msgstr "Credit control line generator"
+
+#. module: account_credit_control
+#: view:credit.control.policy:0
+msgid "Credit control policy"
+msgstr "Credit control policy"
 
 #. module: account_credit_control
 #: field:credit.control.communication,user_id:0
 msgid "User"
-msgstr "Utilisateur"
+msgstr "User"
 
 #. module: account_credit_control
 #: selection:credit.control.line,channel:0
 #: selection:credit.control.policy.level,channel:0
 msgid "Letter"
-msgstr "Lettre"
+msgstr "Letter"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_account_move_line
 msgid "Journal Items"
-msgstr "Écritures comptables"
+msgstr "critures comptables"
 
 #. module: account_credit_control
 #: model:ir.actions.act_window,help:account_credit_control.open_credit_line_printer_wizard
 msgid "Print selected lines"
-msgstr "Imprimer les lignes sélectionnées"
-
-#. module: account_credit_control
-#: constraint:account.move.line:0
-msgid "You can not create journal items on an account of type view."
-msgstr "La création de comptes récursifs est interdite"
+msgstr "Print selected lines"
 
 #. module: account_credit_control
 #: field:credit.control.emailer,line_ids:0
@@ -475,133 +581,134 @@ msgstr "La création de comptes récursifs est interdite"
 #: model:ir.ui.menu,name:account_credit_control.credit_control_line_action_menu
 #: field:res.partner,credit_control_line_ids:0
 msgid "Credit Control Lines"
-msgstr "Lignes de contrôle de crédit"
-
-#. module: account_credit_control
-#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_3
-msgid ""
-"Dear Sir or Madam,\n"
-"\n"
-"Our records indicate that we still have not received the payment of\n"
-"the above mentioned invoice (copy attached) despite our two reminders.\n"
-"If payment have already been sent, please disregard this notice. If\n"
-"not, please proceed with payment. If your payment has not been\n"
-"received in the next 5 days, your file will be transfered to our debt\n"
-"collection agency.\n"
-"\n"
-"Should you need us to arrange a payment plan for you, please advise.\n"
-"A customer account statement is enclosed for you convenience.\n"
-"\n"
-"Thank you in advance for your anticipated cooperation in this matter.\n"
-"\n"
-"Best regards,\n"
-msgstr ""
-"Dear Sir or Madam,\n"
-"\n"
-"Our records indicate that we still have not received the payment of\n"
-"the above mentioned invoice (copy attached) despite our two reminders.\n"
-"If payment have already been sent, please disregard this notice. If\n"
-"not, please proceed with payment. If your payment has not been\n"
-"received in the next 5 days, your file will be transfered to our debt\n"
-"collection agency.\n"
-"\n"
-"Should you need us to arrange a payment plan for you, please advise.\n"
-"A customer account statement is enclosed for you convenience.\n"
-"\n"
-"Thank you in advance for your anticipated cooperation in this matter.\n"
-"\n"
-"Best regards,\n"
+msgstr "Credit Control Lines"
 
 #. 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 "Imprimer les lignes"
+msgstr "Print Lines"
 
 #. module: account_credit_control
 #: field:credit.control.run,date:0
 msgid "Controlling Date"
-msgstr "Date de contrôle"
+msgstr "Controlling Date"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_policy
 msgid "Define a reminder policy"
-msgstr "Définir une politique de rappel"
+msgstr "Define a reminder policy"
 
 #. module: account_credit_control
-#: view:credit.control.lines:0
+#: view:credit.control.line:0
 msgid "Lines already sent."
-msgstr "Déjà envoyé."
+msgstr "Lines already sent."
 
 #. module: account_credit_control
 #: field:credit.control.policy.level,email_template_id:0
 msgid "Email Template"
-msgstr "Modèle de courrier électronique"
+msgstr "Email Template"
 
 #. module: account_credit_control
-#: selection:credit.control.line,state:0
-#: view:credit.control.lines:0
+#: view:credit.control.line:0 selection:credit.control.line,state:0
 #: selection:credit.control.marker,name:0
 msgid "Ready To Send"
-msgstr "Prêt à envoyer"
+msgstr "Ready To Send"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_res_company
 msgid "Companies"
-msgstr "Sociétés"
+msgstr "Socits"
 
 #. module: account_credit_control
 #: field:credit.control.printer,mark_as_sent:0
 msgid "Mark letter lines as sent"
-msgstr "Marquer les lignes \"lettre\" comme envoyées"
+msgstr "Mark letter lines as sent"
 
 #. module: account_credit_control
 #: view:credit.control.run:0
 msgid "Compute Credit Control Lines"
-msgstr "Calcul des lignes de contrôle de crédit"
+msgstr "Compute Credit Control Lines"
 
 #. module: account_credit_control
 #: selection:credit.control.policy.level,computation_mode:0
 msgid "Previous Reminder"
-msgstr "Rappel précédent"
+msgstr "Previous Reminder"
 
 #. module: account_credit_control
-#: selection:credit.control.line,state:0
-#: view:credit.control.lines:0
+#: view:credit.control.line:0 selection:credit.control.line,state:0
 msgid "Error"
-msgstr "Erreur"
+msgstr "Error"
 
 #. module: account_credit_control
-#: sql_constraint:account.invoice:0
-msgid "Invoice Number must be unique per Company!"
-msgstr "Le code du compte doit être unique pour une société donnée."
+#: field:credit.control.policy,level_ids:0
+msgid "Policy Levels"
+msgstr "Policy Levels"
 
 #. module: account_credit_control
 #: view:credit.control.run:0
 msgid "Report and Errors"
-msgstr "Rapport et erreurs"
+msgstr "Report and Errors"
 
 #. module: account_credit_control
-#: constraint:account.account:0
+#: model:email.template,subject:account_credit_control.email_template_credit_control_base
+msgid "Credit Control: (${object.current_policy_level.name or 'n/a'})"
+msgstr "Credit Control: (${object.current_policy_level.name or 'n/a'})"
+
+#. module: account_credit_control
+#: field:credit.control.policy.level,custom_mail_text:0
+msgid "Custom Mail Message"
+msgstr "Custom Mail Message"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_mail_text:account_credit_control.2_time_2
 msgid ""
-"Configuration Error! \n"
-"You can not select an account type with a deferral method different of \"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+"Our records indicate that we still have not received the payment of the "
+"above mentioned invoice (copy attached) despite our reminder.\n"
+"\n"
+"If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.\n"
+"If your payment has not been received in the next 5 days, your file will be "
+"transfered to our debt\n"
+"        collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
 msgstr ""
-"Configuration Error! \n"
-"You can not select an account type with a deferral method different of \"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+"Our records indicate that we still have not received the payment of the "
+"above mentioned invoice (copy attached) despite our reminder.\n"
+"\n"
+"If payment have already been sent, please disregard this notice. If not, "
+"please proceed with payment.\n"
+"If your payment has not been received in the next 5 days, your file will be "
+"transfered to our debt\n"
+"        collection agency.\n"
+"\n"
+"        Should you need us to arrange a payment plan for you, please "
+"advise.\n"
+"        A customer account statement is enclosed for you convenience.\n"
+"\n"
+"        Thank you in advance for your anticipated cooperation in this "
+"matter.\n"
+"\n"
+"        Best regards\n"
+"      "
 
 #. module: account_credit_control
-#: field:credit.control.line,state:0
-#: field:credit.control.run,state:0
-msgid "State"
-msgstr "État"
-
-#. module: account_credit_control
-#: help:credit.control.policy,do_nothing:0
-msgid "For policies which should not generate lines or are obsolete"
+#: help:credit.control.run,manual_ids:0
+msgid ""
+"If a credit control line has been generatedon a policy and the policy has "
+"been changed in the meantime, it has to be handled manually"
 msgstr ""
-"Pour les politiques qui ne devraient pas générer de lignes ou qui sont\n"
-"obsolètes"
+"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"
 
 #. module: account_credit_control
 #: field:account.account,credit_control_line_ids:0
@@ -610,222 +717,321 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_credit_control.act_account_credit_relation_relation
 #: model:ir.actions.act_window,name:account_credit_control.act_partner_credit_relation_relation
 msgid "Credit Lines"
-msgstr "Lignes de crédit"
+msgstr "Credit Lines"
 
 #. 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.marker,name:0 selection:credit.control.run,state:0
 msgid "Done"
-msgstr "Terminé"
+msgstr "Done"
 
 #. module: account_credit_control
-#: field:account.move.line,invoice_id:0
+#: field:account.move.line,invoice_id:0 view:credit.control.line:0
 #: field:credit.control.line,invoice_id:0
-#: view:credit.control.lines:0
 #: model:ir.model,name:account_credit_control.model_account_invoice
 msgid "Invoice"
 msgstr "Facture"
 
 #. module: account_credit_control
-#: view:credit.control.emailer:0
-#: view:credit.control.marker:0
+#: view:credit.control.emailer:0 view:credit.control.marker:0
 #: view:credit.control.printer:0
 msgid "Cancel"
-msgstr "Annuler"
+msgstr "Cancel"
 
 #. module: account_credit_control
 #: view:credit.control.printer:0
 msgid "Close"
-msgstr "Fermer"
+msgstr "Close"
 
 #. module: account_credit_control
 #: selection:credit.control.line,state:0
 msgid "Emailing Error"
-msgstr "Erreur d'envoi de message"
+msgstr "Emailing Error"
 
 #. module: account_credit_control
 #: help:account.invoice,credit_policy_id:0
-msgid "The Credit Control Policy used for this invoice. If nothing is defined, it will use the account setting or the partner setting."
+msgid ""
+"The Credit Control Policy used for this invoice. If nothing is defined, it "
+"will use the account setting or the partner setting."
 msgstr ""
-"La politique de contrôle de crédit utilisée par cette facture. Par\n"
-"défault, la politique définie au niveau du Compte ou du Partenaire est\n"
-"utilisée."
+"The Credit Control Policy used for this invoice. If nothing is defined, it "
+"will use the account setting or the partner setting."
 
 #. module: account_credit_control
-#: view:credit.control.lines:0
+#: view:credit.control.line:0
 msgid "Run date"
-msgstr "Date de lancement"
+msgstr "Run date"
 
 #. module: account_credit_control
 #: model:res.groups,name:account_credit_control.group_account_credit_control_user
 msgid "Credit Control User"
-msgstr "Utilisateur du contrôle de crédit"
+msgstr "Credit Control User"
 
 #. module: account_credit_control
-#: constraint:account.move.line:0
-msgid "Company must be the same for its related account and period."
-msgstr "Company must be the same for its related account and period."
+#: view:credit.control.policy:0 view:credit.control.policy.level:0
+msgid "Policy level"
+msgstr "Policy level"
 
 #. module: account_credit_control
 #: field:credit.control.run,manual_ids:0
 msgid "Lines to handle manually"
-msgstr "Lignes à traiter manuellement"
+msgstr "Lines to handle manually"
+
+#. module: account_credit_control
+#: help:res.partner,credit_policy_id:0
+msgid ""
+"The Credit Control Policy used for this partner. This setting can be forced "
+"on the invoice. If nothing is defined, it will use the company setting."
+msgstr ""
+"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."
 
 #. module: account_credit_control
 #: view:account.invoice:0
 #: model:ir.ui.menu,name:account_credit_control.base_credit_control_configuration_menu
 #: model:ir.ui.menu,name:account_credit_control.base_credit_control_menu
 msgid "Credit Control"
-msgstr "Contrôle de crédit"
+msgstr "Credit Control"
 
 #. module: account_credit_control
-#: view:credit.control.policy:0
-#: field:credit.control.policy,level_ids:0
-msgid "Policy Levels"
-msgstr "Niveaux de politique"
-
-#. module: account_credit_control
-#: constraint:account.move.line:0
-msgid "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal."
-msgstr "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal."
+#: 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 above "
+"mentioned invoice (copy attached for your convenience) 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 ""
+"Our records indicate that we have not yet received the payment of the above "
+"mentioned invoice (copy attached for your convenience) 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"
+"      "
 
 #. module: account_credit_control
 #: field:credit.control.line,policy_id:0
 msgid "Policy"
-msgstr "Politique"
+msgstr "Policy"
 
 #. module: account_credit_control
-#: model:email.template,subject:account_credit_control.email_template_credit_control_base
-msgid "Credit Control: (${object.current_policy_level.name or 'n/a' })"
-msgstr "Contrôle de crédit : (${object.current_policy_level.name or 'n/a' })"
+#: view:credit.control.policy:0
+msgid "Credit control policy Level"
+msgstr "Credit control policy Level"
 
 #. module: account_credit_control
-#: field:credit.control.printer,report_file:0
-msgid "Generated Report"
-msgstr "Rapport généré"
+#: view:credit.control.emailer:0
+msgid "Mailer"
+msgstr "Mailer"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,custom_text:account_credit_control.3_time_1
+msgid ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice.\n"
+"If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
+msgstr ""
+"Our records indicate that we have not received the payment of the above "
+"mentioned invoice.\n"
+"If it has already been sent, please disregard this notice. If not, please "
+"proceed with payment within 10 days.\n"
+"\n"
+"Thank you in advance for your anticipated cooperation in this matter.\n"
+"\n"
+"Best regards\n"
+"      "
 
 #. module: account_credit_control
 #: view:credit.control.run:0
 msgid "Move lines To be treated manually"
-msgstr "Lignes à traiter manuellement"
+msgstr "Move lines To be treated manually"
 
 #. 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 "Politique de contrôle de crédit"
+msgstr "Credit Control Policies"
 
 #. 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 "Envoyer un courrier électronique pour les lignes sélectionnées"
+msgstr "Send an email for the selected lines."
 
 #. module: account_credit_control
-#: view:credit.control.lines:0
+#: model:credit.control.policy.level,name:account_credit_control.3_time_3
+msgid "10 days last reminder"
+msgstr "10 days last reminder"
+
+#. module: account_credit_control
+#: view:credit.control.line:0
 msgid "Sent"
-msgstr "Envoyer"
+msgstr "Sent"
 
 #. module: account_credit_control
 #: constraint:credit.control.policy.level:0
 msgid "The smallest level can not be of type Previous Reminder"
-msgstr "Le niveau le plus bas ne peut pas être de type \"Rappel Précédent\""
+msgstr "The smallest level can not be of type Previous Reminder"
 
 #. module: account_credit_control
-#: help:credit.control.policy,account_ids:0
-msgid "This policy will be active only for the selected accounts"
-msgstr "Cette politique sera activée pour les comptes sélectionnés"
+#: view:credit.control.printer:0
+msgid "Lines report"
+msgstr "Lines report"
 
 #. module: account_credit_control
-#: help:credit.control.printer,mark_as_sent:0
-msgid "Only letter lines will be marked."
-msgstr "Seules les lignes \"lettre\" seront marquées."
+#: field:credit.control.printer,report_file:0
+msgid "Generated Report"
+msgstr "Generated Report"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,name:account_credit_control.3_time_1
+msgid "10 days net"
+msgstr "10 days net"
 
 #. module: account_credit_control
 #: view:credit.control.line:0
-#: view:credit.control.lines:0
 msgid "Control Credit Lines"
-msgstr "Lignes de contrôle de crédit"
+msgstr "Control Credit Lines"
 
 #. module: account_credit_control
 #: model:res.groups,name:account_credit_control.group_account_credit_control_manager
 msgid "Credit Control Manager"
-msgstr "Gestionnaire de contrôle de crédit"
+msgstr "Credit Control Manager"
 
 #. module: account_credit_control
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "The company name must be unique !"
-
-#. module: account_credit_control
-#: field:credit.control.policy,name:0
-#: field:credit.control.policy.level,name:0
+#: field:credit.control.policy,name:0 field:credit.control.policy.level,name:0
 msgid "Name"
-msgstr "Nom"
+msgstr "Name"
 
 #. module: account_credit_control
-#: help:res.partner,credit_policy_id:0
-msgid "The Credit Control Policyused for this partner. This setting can be forced on the invoice. If nothing is defined, it will use the company setting."
-msgstr ""
-"Politique de contrôle de crédit pour ce partenaire. Il est possible de\n"
-"forcer ce réglage pour une facture donnée. Par défaut, la politique de\n"
-"la société est utilisée."
+#: view:credit.control.emailer:0
+msgid "Send the emails"
+msgstr "Send the emails"
 
 #. module: account_credit_control
 #: field:credit.control.line,mail_message_id:0
 msgid "Sent Email"
-msgstr "Envoyer le courrier électronique"
+msgstr "Sent Email"
+
+#. module: account_credit_control
+#: model:ir.model,name:account_credit_control.model_mail_mail
+msgid "Outgoing Mails"
+msgstr "Courriels  envoyer"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_policy_level
 msgid "A credit control policy level"
-msgstr "Un niveau de politique de contrôle de crédit"
+msgstr "A credit control policy level"
 
 #. module: account_credit_control
 #: model:ir.actions.report.xml,name:account_credit_control.report_webkit_html
 msgid "Credit Summary"
-msgstr "Synthèse du crédit"
+msgstr "Credit Summary"
 
 #. module: account_credit_control
 #: field:credit.control.line,date:0
 msgid "Controlling date"
-msgstr "Date de contrôle"
+msgstr "Controlling date"
 
 #. module: account_credit_control
-#: constraint:account.move.line:0
-msgid "You can not create journal items on closed account."
-msgstr "La création de comptes récursifs est interdite"
-
-#. module: account_credit_control
-#: view:credit.control.lines:0
+#: view:credit.control.line:0
 msgid "Draft lines have to be triaged."
-msgstr "Les lignes en brouillon doivent être triées."
+msgstr "Draft lines have to be triaged."
 
 #. module: account_credit_control
 #: field:credit.control.line,amount_due:0
 msgid "Due Amount Tax incl."
-msgstr "Somme dûe TTC"
+msgstr "Due Amount Tax incl."
 
 #. module: account_credit_control
 #: field:res.company,credit_control_tolerance:0
 msgid "Credit Control Tolerance"
-msgstr "Tolérance de contrôle de crédit"
+msgstr "Credit Control Tolerance"
+
+#. module: account_credit_control
+#: view:credit.control.policy:0
+msgid "Policy levels"
+msgstr "Policy levels"
+
+#. module: account_credit_control
+#: model:credit.control.policy.level,name:account_credit_control.2_time_2
+msgid "60 days last reminder"
+msgstr "60 days last reminder"
 
 #. module: account_credit_control
 #: help:res.company,credit_policy_id:0
-msgid "The Credit Control Policy used on partners by default. This setting can be overriden on partners or invoices."
+msgid ""
+"The Credit Control Policy used on partners by default. This setting can be "
+"overriden on partners or invoices."
 msgstr ""
-"Politique de contrôle de crédit par défaut. Elle peut être redéfinie\n"
-"au niveau des partenaires ou des factures."
+"The Credit Control Policy used on partners by default. This setting can be "
+"overriden on partners or invoices."
 
 #. module: account_credit_control
 #: field:credit.control.line,policy_level_id:0
 msgid "Overdue Level"
-msgstr "Niveau de créance"
+msgstr "Overdue Level"
 
-#~ msgid "Mass credit line mailer"
-#~ msgstr "Envoi de mails en masse"
-#~ msgid "Credit control"
-#~ msgstr "Contrôle de crédit"
-#~ msgid "New lines"
-#~ msgstr "Nouvelles lignes"
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:167
+msgid "Reminder"
+msgstr "Reminder"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:170
+msgid "Dear"
+msgstr "Dear"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:177
+msgid "Summary"
+msgstr "Summary"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:179
+msgid "Invoice number"
+msgstr "Invoice number"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:180
+msgid "Invoice date"
+msgstr "Invoice date"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:181
+msgid "Date due"
+msgstr "Date due"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:182
+msgid "Invoiced amount"
+msgstr "Invoice amount"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:183
+msgid "Open amount"
+msgstr "Open amount"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:183
+msgid "Currency"
+msgstr "Currency"
+
+#. module: account_credit_control
+#: report:addons/account_credit_control/report/credit_control_summary.html.mako:211
+msgid "If you have any question, do not hesitate to contact us."
+msgstr "If you have any question, do not hesitate to contact us."
\ No newline at end of file
diff --git a/account_credit_control/report/credit_control_summary.html.mako b/account_credit_control/report/credit_control_summary.html.mako
index 9acce13b5..7ee2cd407 100644
--- a/account_credit_control/report/credit_control_summary.html.mako
+++ b/account_credit_control/report/credit_control_summary.html.mako
@@ -131,7 +131,7 @@ tr.line {
   
 
     %for comm in objects :
-    <% setLang(comm.partner_id.lang) %>
+    <% setLang(comm.get_contact_address().lang) %>
     

         
           <%
@@ -179,8 +179,8 @@ tr.line {
         
-        
-        
+        
+        

From 2bd83146657ac074eaaa01f78380433238fbfdbb Mon Sep 17 00:00:00 2001
From: unknown 
Date: Fri, 12 Jul 2013 15:56:26 +0200
Subject: [PATCH 32/46] [ADD] french translation

---
 account_credit_control/i18n/fr.po | 401 +++++++++++++++---------------
 1 file changed, 195 insertions(+), 206 deletions(-)

diff --git a/account_credit_control/i18n/fr.po b/account_credit_control/i18n/fr.po
index caeae7441..3040efdf0 100644
--- a/account_credit_control/i18n/fr.po
+++ b/account_credit_control/i18n/fr.po
@@ -17,43 +17,43 @@ msgstr "Group By..."
 #: 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 "Credit Control Run"
+msgstr "Pass de rappel"
 
 #. module: account_credit_control
 #: field:credit.control.policy.level,computation_mode:0
 msgid "Compute Mode"
-msgstr "Compute Mode"
+msgstr "Mode de calcul"
 
 #. module: account_credit_control
 #: field:credit.control.line,date_entry:0
 msgid "Entry date"
-msgstr "Entry date"
+msgstr "Date de l'écriture"
 
 #. 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 "Send By Email"
+msgstr "Envoyer par email"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_line
 msgid "A credit control line"
-msgstr "A credit control line"
+msgstr "Ligne de relance"
 
 #. module: account_credit_control
 #: field:credit.control.line,move_line_id:0
 msgid "Move line"
-msgstr "Move line"
+msgstr "Ecriture financière"
 
 #. module: account_credit_control
 #: model:res.groups,name:account_credit_control.group_account_credit_control_info
 msgid "Credit Control Info"
-msgstr "Credit Control Info"
+msgstr "Info de rappel"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_emailer
 msgid "Mass credit line emailer"
-msgstr "Mass credit line emailer"
+msgstr "Publipostage par mail des rappels"
 
 #. module: account_credit_control
 #: view:credit.control.line:0 field:credit.control.line,account_id:0
@@ -64,61 +64,61 @@ msgstr "Compte"
 #. module: account_credit_control
 #: selection:credit.control.policy.level,computation_mode:0
 msgid "Due Date"
-msgstr "Due Date"
+msgstr "Date due"
 
 #. module: account_credit_control
 #: field:credit.control.communication,current_policy_level:0
 #: view:credit.control.line:0 field:credit.control.line,level:0
 #: field:credit.control.policy.level,level:0
 msgid "Level"
-msgstr "Level"
+msgstr "Niveau"
 
 #. module: account_credit_control
 #: field:credit.control.policy.level,delay_days:0
 msgid "Delay (in days)"
-msgstr "Delay (in days)"
+msgstr "Délais (en jours)"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_communication
 msgid "credit control communication"
-msgstr "credit control communication"
+msgstr "Lettre/communication de relance"
 
 #. module: account_credit_control
 #: view:credit.control.emailer:0
 msgid "Send emails for the selected lines"
-msgstr "Send emails for the selected lines"
+msgstr "Envoyer un mail depuis les lignes de relances sélectionnées"
 
 #. module: account_credit_control
 #: help:credit.control.policy,account_ids:0
 msgid "This policy will be active only for the selected accounts"
-msgstr "This policy will be active only for the selected accounts"
+msgstr "Cette politique de relance sera active seulement pour les comptes sélectionnés"
 
 #. module: account_credit_control
 #: view:credit.control.line:0
 msgid "These lines are ready to send by email or by letter using the Actions."
-msgstr "These lines are ready to send by email or by letter using the Actions."
+msgstr "Ces lignes sont prête à être traitées"
 
 #. module: account_credit_control
 #: view:credit.control.line:0 selection:credit.control.line,state:0
 #: selection:credit.control.marker,name:0
 msgid "Ignored"
-msgstr "Ignored"
+msgstr "Ignoré"
 
 #. module: account_credit_control
 #: help:credit.control.printer,mark_as_sent:0
 msgid "Only letter lines will be marked."
-msgstr "Only letter lines will be marked."
+msgstr "Seul les relances par courrier seront traitées."
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_marker
 msgid "Mass marker"
-msgstr "Mass marker"
+msgstr "Traiter en masse"
 
 #. module: account_credit_control
 #: field:account.invoice,credit_policy_id:0
 #: field:res.company,credit_policy_id:0 field:res.partner,credit_policy_id:0
 msgid "Credit Control Policy"
-msgstr "Credit Control Policy"
+msgstr "Politique de relance"
 
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_mail_text:account_credit_control.3_time_3
@@ -140,21 +140,19 @@ msgid ""
 "        Best regards\n"
 "      "
 msgstr ""
-"Our records indicate that we still have not received the payment of the "
-"above mentioned invoice (copy attached) 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"
+"Notre comptabilité nous indique que vous avez encore des factures ouvertes"
+"malgré nos précédents rappels.\n"
+"        Si ce courrier à croiser votre payment veuillez le considérer comme nul et non avenu.\n"
+"        Si le payment n'est pas effectuer dans les 5 jours votre dossier sera transférer à une société de recouvrement.\n"
 "\n"
-"        Should you need us to arrange a payment plan for you, please "
+"        Si vous désirez un accord de payment n'hésitez pas à nous contacter "
 "advise.\n"
-"        A customer account statement is enclosed for you convenience.\n"
+"        Un décompte est disponible ci-joint.\n"
 "\n"
-"        Thank you in advance for your anticipated cooperation in this "
+"        En vous remerciant de votre coopération "
 "matter.\n"
 "\n"
-"        Best regards\n"
+"        Salutations\n"
 "      "
 
 #. module: account_credit_control
@@ -165,7 +163,7 @@ msgstr "Sent date"
 #. module: account_credit_control
 #: view:credit.control.policy:0 field:credit.control.policy,account_ids:0
 msgid "Accounts"
-msgstr "Accounts"
+msgstr "Comptes"
 
 #. module: account_credit_control
 #: field:credit.control.communication,partner_id:0 view:credit.control.line:0
@@ -177,7 +175,7 @@ msgstr "Partenaire"
 #. module: account_credit_control
 #: view:credit.control.policy.level:0
 msgid "Credit control policy level"
-msgstr "Credit control policy level"
+msgstr "Niveau de relance"
 
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.3_time_3
@@ -200,22 +198,19 @@ msgid ""
 "        Best regards\n"
 "      "
 msgstr ""
+"Notre comptabilité nous indique que vous avez encore des factures ouvertes"
+"malgré nos précédents rappels.\n"
+"        Si ce courrier à croiser votre payment veuillez le considérer comme nul et non avenu.\n"
+"        Si le payment n'est pas effectuer dans les 5 jours votre dossier sera transférer à une société de recouvrement.\n"
 "\n"
-"        Our records indicate that we still have not received the payment of "
-"the above mentioned invoice despite our two reminders.\n"
-"        If payment have already been sent, please disregard this notice. If "
-"not, please proceed with payment.\n"
-"        If your payment has not been received in the next 5 days, your file "
-"will be transfered to our debt collection agency.\n"
-"\n"
-"        Should you need us to arrange a payment plan for you, please "
+"        Si vous désirez un accord de payment n'hésitez pas à nous contacter "
 "advise.\n"
-"        A customer account statement is enclosed for you convenience.\n"
+"        Un décompte est disponible ci-joint.\n"
 "\n"
-"        Thank you in advance for your anticipated cooperation in this "
+"        En vous remerciant de votre coopération "
 "matter.\n"
 "\n"
-"        Best regards\n"
+"        Salutations\n"
 "      "
 
 #. module: account_credit_control
@@ -223,17 +218,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_credit_control.open_credit_line_marker_wizard
 #: model:ir.actions.act_window,name:account_credit_control.open_credit_line_marker_wizard_menu_action
 msgid "Change Lines' State"
-msgstr "Change Lines' State"
+msgstr "Modifier le statut des lignes"
 
 #. module: account_credit_control
 #: field:credit.control.policy.level,policy_id:0
 msgid "Related Policy"
-msgstr "Related Policy"
+msgstr "Niveau de relance"
 
 #. module: account_credit_control
 #: view:credit.control.policy:0 view:credit.control.policy.level:0
 msgid "Mail and reporting"
-msgstr "Mail and reporting"
+msgstr "Rapports et mails"
 
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.3_time_2
@@ -248,14 +243,14 @@ msgid ""
 "Best regards\n"
 "      "
 msgstr ""
-"Our records indicate that we have not yet received the payment of the above "
-"mentioned invoice despite our first reminder.\n"
-"        If it has already been sent, please disregard this notice. If not, "
-"please proceed with payment within 5 days.\n"
+"Notre comptabilité nous informe que les factures ci-dessous "
+"n'ont pas été payées malgré un précédent rappel.\n"
+"       Si ce courrier à croiser votre payment veuillez le considérer comme nul et non avenu. Sinon, "
+"Merci de procéder au payment dans les 5 jours.\n"
 "\n"
-"Thank you in advance for your anticipated cooperation in this matter.\n"
+" En vous remerciant de votre coopération.\n"
 "\n"
-"Best regards\n"
+"Salutations\n"
 "      "
 
 #. module: account_credit_control
@@ -269,7 +264,7 @@ msgid ""
 "      "
 msgstr ""
 "\n"
-"      Dear ${object.get_contact_address().name  or ''}\n"
+"      Cher/Chère ${object.get_contact_address().name  or ''}\n"
 "      
\n"
 "      
\n"
 "      ${object.current_policy_level.custom_mail_text}\n"
@@ -278,7 +273,7 @@ msgstr ""
 #. module: account_credit_control
 #: view:credit.control.printer:0
 msgid "Print"
-msgstr "Print"
+msgstr "Imprimer"
 
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_1
@@ -294,15 +289,14 @@ msgid ""
 "        Best regards\n"
 "      "
 msgstr ""
-"Our records indicate that we have not received the payment of the above "
-"mentioned invoice.\n"
-"        If it has already been sent, please disregard this notice. If not, "
-"please proceed with payment within 10 days.\n"
+Notre comptabilité nous informe que les factures ci-dessous "
+"n'ont pas été payées malgré un précédent rappel.\n"
+"       Si ce courrier à croiser votre payment veuillez le considérer comme nul et non avenu. Sinon, "
+"Merci de procéder au payment dans les 10 jours.\n"
 "\n"
-"        Thank you in advance for your anticipated cooperation in this "
-"matter.\n"
+" En vous remerciant de votre coopération.\n"
 "\n"
-"        Best regards\n"
+"Salutations\n"
 "      "
 
 #. module: account_credit_control
@@ -315,7 +309,7 @@ msgstr "Email"
 #: view:credit.control.line:0 field:credit.control.line,channel:0
 #: field:credit.control.policy.level,channel:0
 msgid "Channel"
-msgstr "Channel"
+msgstr "Canal"
 
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.2_time_2
@@ -339,44 +333,40 @@ msgid ""
 "        Best regards\n"
 "      "
 msgstr ""
-"Our records indicate that we still have not received the payment of the "
-"above mentioned invoice despite our reminder.\n"
+"Notre comptabilité nous indique que vous avez encore des factures ouvertes"
+"malgré nos précédents rappels.\n"
+"        Si ce courrier à croiser votre payment veuillez le considérer comme nul et non avenu.\n"
+"        Si le payment n'est pas effectuer dans les 5 jours votre dossier sera transférer à une société de recouvrement.\n"
 "\n"
-"        If payment have already been sent, please disregard this notice. If "
-"not, please proceed with payment.\n"
-"        If your payment has not been received in the next 5 days, your file "
-"will be transfered to our debt\n"
-"        collection agency.\n"
-"\n"
-"        Should you need us to arrange a payment plan for you, please "
+"        Si vous désirez un accord de payment n'hésitez pas à nous contacter "
 "advise.\n"
-"        A customer account statement is enclosed for you convenience.\n"
+"        Un décompte est disponible ci-joint.\n"
 "\n"
-"        Thank you in advance for your anticipated cooperation in this "
+"        En vous remerciant de votre coopération "
 "matter.\n"
 "\n"
-"        Best regards\n"
+"        Salutations\n"
 "      "
 
 #. module: account_credit_control
 #: view:credit.control.marker:0
 msgid "Lines marker"
-msgstr "Lines marker"
+msgstr "Traiter les lignes"
 
 #. module: account_credit_control
 #: field:credit.control.printer,state:0
 msgid "state"
-msgstr "state"
+msgstr "Statut"
 
 #. module: account_credit_control
 #: field:credit.control.run,report:0
 msgid "Report"
-msgstr "Report"
+msgstr "Rapport"
 
 #. module: account_credit_control
 #: field:credit.control.line,state:0 field:credit.control.run,state:0
 msgid "State"
-msgstr "State"
+msgstr "Statut"
 
 #. module: account_credit_control
 #: help:credit.control.line,state:0
@@ -385,25 +375,25 @@ msgid ""
 "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 ""
-"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."
+"Lignes brouillons à traiter.\n"
+"Les lignes ignorées ne seront pas traitées.\n"
+"Les lignes brouillons ou ignorées seront regénérer lors du prochain controle."
 
 #. 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 "30 days end of month"
+msgstr "30 jours à la fin d'un mois"
 
 #. module: account_credit_control
 #: selection:credit.control.policy.level,computation_mode:0
 msgid "Due Date, End Of Month"
-msgstr "Due Date, End Of Month"
+msgstr "Date due, fin de mois"
 
 #. module: account_credit_control
 #: field:credit.control.marker,name:0
 msgid "Mark as"
-msgstr "Mark as"
+msgstr "Marquer comme"
 
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_mail_text:account_credit_control.3_time_1
@@ -419,26 +409,25 @@ msgid ""
 "Best regards\n"
 "      "
 msgstr ""
-"Our records indicate that we have not received the payment of the above "
-"mentioned invoice (copy attached for your convenience).\n"
+Notre comptabilité nous informe que les factures ci-jointes "
+"n'ont pas été payées.\n"
+"       Si ce courrier à croiser votre payment veuillez le considérer comme nul et non avenu. Sinon, "
+"Merci de procéder au payment dans les 10 jours.\n"
 "\n"
-"If it has already been sent, please disregard this notice. If not, please "
-"proceed with payment within 10 days.\n"
+" En vous remerciant de votre coopération.\n"
 "\n"
-"Thank you in advance for your anticipated cooperation in this matter.\n"
-"\n"
-"Best regards\n"
+"Salutations\n"
 "      "
 
 #. module: account_credit_control
 #: view:credit.control.run:0
 msgid "Credit control run"
-msgstr "Credit control run"
+msgstr "Passe de controle de relance"
 
 #. module: account_credit_control
 #: view:credit.control.run:0 field:credit.control.run,policy_ids:0
 msgid "Policies"
-msgstr "Policies"
+msgstr "Politiques"
 
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_mail_text:account_credit_control.2_time_1
@@ -453,125 +442,125 @@ msgid ""
 "Best regards\n"
 "      "
 msgstr ""
-"Our records indicate that we have not received the payment of the above "
-"mentioned invoice (copy attached for your convenience).\n"
-"If it has already been sent, please disregard this notice. If not, please "
-"proceed with payment within 10 days.\n"
+Notre comptabilité nous informe que les factures ci-jointes "
+"n'ont pas été payées.\n"
+"       Si ce courrier à croiser votre payment veuillez le considérer comme nul et non avenu. Sinon, "
+"Merci de procéder au payment dans les 10 jours.\n"
 "\n"
-"Thank you in advance for your anticipated cooperation in this matter.\n"
+" En vous remerciant de votre coopération.\n"
 "\n"
-"Best regards\n"
+"Salutations\n"
 "      "
 
 #. module: account_credit_control
 #: field:credit.control.line,date_due:0
 msgid "Due date"
-msgstr "Due date"
+msgstr "Date due"
 
 #. module: account_credit_control
 #: field:credit.control.policy,do_nothing:0
 msgid "Do nothing"
-msgstr "Do nothing"
+msgstr "Ignorer"
 
 #. module: account_credit_control
 #: field:credit.control.line,currency_id:0
 msgid "Currency"
-msgstr "Currency"
+msgstr "Devise"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_printer
 msgid "Mass printer"
-msgstr "Mass printer"
+msgstr "Imprimer en masse"
 
 #. module: account_credit_control
 #: field:credit.control.communication,company_id:0
 #: field:credit.control.line,company_id:0
 #: field:credit.control.policy,company_id:0
 msgid "Company"
-msgstr "Company"
+msgstr "Société"
 
 #. module: account_credit_control
 #: view:credit.control.line:0
 msgid "An error has occured during the sending of the email."
-msgstr "An error has occured during the sending of the email."
+msgstr "Erreur lors de la génération des mails."
 
 #. module: account_credit_control
 #: view:credit.control.marker:0
 #: model:ir.actions.act_window,help:account_credit_control.open_credit_line_marker_wizard
 msgid "Change the state of the selected lines."
-msgstr "Change the state of the selected lines."
+msgstr "Modifier le statut des lignes sélectionnées."
 
 #. module: account_credit_control
 #: view:credit.control.line:0
 msgid "Lines which have been ignored from previous runs."
-msgstr "Lines which have been ignored from previous runs."
+msgstr "Lignes ignorées lors du controle précédent."
 
 #. module: account_credit_control
 #: view:credit.control.printer:0
 msgid "Print the selected lines"
-msgstr "Print the selected lines"
+msgstr "Imprimer la sélection"
 
 #. module: account_credit_control
 #: view:credit.control.line:0 selection:credit.control.line,state:0
 #: selection:credit.control.run,state:0
 msgid "Draft"
-msgstr "Draft"
+msgstr "Brouillon"
 
 #. module: account_credit_control
 #: view:credit.control.marker:0
 msgid "Warning: you will maybe not be able to revert this operation."
-msgstr "Warning: you will maybe not be able to revert this operation."
+msgstr "Attention: Cette opération ne peut pas être annulée"
 
 #. module: account_credit_control
 #: view:credit.control.line:0
 msgid "Credit policy"
-msgstr "Credit policy"
+msgstr "Politique de relance"
 
 #. module: account_credit_control
 #: view:credit.control.policy:0 view:credit.control.policy.level:0
 msgid "Delay Setting"
-msgstr "Delay Setting"
+msgstr "Paramètres de retard"
 
 #. module: account_credit_control
 #: field:credit.control.line,balance_due:0
 msgid "Due balance"
-msgstr "Due balance"
+msgstr "Montant total"
 
 #. module: account_credit_control
 #: view:credit.control.line:0
 msgid "Credit policy level"
-msgstr "Credit policy level"
+msgstr Niveau de relance"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_run
 msgid "Credit control line generator"
-msgstr "Credit control line generator"
+msgstr "Générateur de relance"
 
 #. module: account_credit_control
 #: view:credit.control.policy:0
 msgid "Credit control policy"
-msgstr "Credit control policy"
+msgstr "Niveau de relance"
 
 #. module: account_credit_control
 #: field:credit.control.communication,user_id:0
 msgid "User"
-msgstr "User"
+msgstr "Utilisateur"
 
 #. module: account_credit_control
 #: selection:credit.control.line,channel:0
 #: selection:credit.control.policy.level,channel:0
 msgid "Letter"
-msgstr "Letter"
+msgstr "Lettre"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_account_move_line
 msgid "Journal Items"
-msgstr "critures comptables"
+msgstr "Ecritures comptables"
 
 #. module: account_credit_control
 #: model:ir.actions.act_window,help:account_credit_control.open_credit_line_printer_wizard
 msgid "Print selected lines"
-msgstr "Print selected lines"
+msgstr "Imprimer la sélection"
 
 #. module: account_credit_control
 #: field:credit.control.emailer,line_ids:0
@@ -581,84 +570,84 @@ msgstr "Print selected lines"
 #: model:ir.ui.menu,name:account_credit_control.credit_control_line_action_menu
 #: field:res.partner,credit_control_line_ids:0
 msgid "Credit Control Lines"
-msgstr "Credit Control Lines"
+msgstr "Lignes de ralance"
 
 #. 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 "Print Lines"
+msgstr "Imprimer la sélection"
 
 #. module: account_credit_control
 #: field:credit.control.run,date:0
 msgid "Controlling Date"
-msgstr "Controlling Date"
+msgstr "Date de controle"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_policy
 msgid "Define a reminder policy"
-msgstr "Define a reminder policy"
+msgstr "Defininir une politique de relance"
 
 #. module: account_credit_control
 #: view:credit.control.line:0
 msgid "Lines already sent."
-msgstr "Lines already sent."
+msgstr "Lignes déjà traitées."
 
 #. module: account_credit_control
 #: field:credit.control.policy.level,email_template_id:0
 msgid "Email Template"
-msgstr "Email Template"
+msgstr "Modèle d'email"
 
 #. module: account_credit_control
 #: view:credit.control.line:0 selection:credit.control.line,state:0
 #: selection:credit.control.marker,name:0
 msgid "Ready To Send"
-msgstr "Ready To Send"
+msgstr "Prêt"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_res_company
 msgid "Companies"
-msgstr "Socits"
+msgstr "Société"
 
 #. module: account_credit_control
 #: field:credit.control.printer,mark_as_sent:0
 msgid "Mark letter lines as sent"
-msgstr "Mark letter lines as sent"
+msgstr "Marquer comme traité"
 
 #. module: account_credit_control
 #: view:credit.control.run:0
 msgid "Compute Credit Control Lines"
-msgstr "Compute Credit Control Lines"
+msgstr "Calculer les relances"
 
 #. module: account_credit_control
 #: selection:credit.control.policy.level,computation_mode:0
 msgid "Previous Reminder"
-msgstr "Previous Reminder"
+msgstr "Précédent rappel"
 
 #. module: account_credit_control
 #: view:credit.control.line:0 selection:credit.control.line,state:0
 msgid "Error"
-msgstr "Error"
+msgstr "Erreur"
 
 #. module: account_credit_control
 #: field:credit.control.policy,level_ids:0
 msgid "Policy Levels"
-msgstr "Policy Levels"
+msgstr "Niveau de relance"
 
 #. module: account_credit_control
 #: view:credit.control.run:0
 msgid "Report and Errors"
-msgstr "Report and Errors"
+msgstr "Résumé des erreurs"
 
 #. module: account_credit_control
 #: model:email.template,subject:account_credit_control.email_template_credit_control_base
 msgid "Credit Control: (${object.current_policy_level.name or 'n/a'})"
-msgstr "Credit Control: (${object.current_policy_level.name or 'n/a'})"
+msgstr "Rappel: (${object.current_policy_level.name or 'n/a'})"
 
 #. module: account_credit_control
 #: field:credit.control.policy.level,custom_mail_text:0
 msgid "Custom Mail Message"
-msgstr "Custom Mail Message"
+msgstr "Email personnalisé"
 
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_mail_text:account_credit_control.2_time_2
@@ -682,23 +671,19 @@ msgid ""
 "        Best regards\n"
 "      "
 msgstr ""
-"Our records indicate that we still have not received the payment of the "
-"above mentioned invoice (copy attached) despite our reminder.\n"
+"Notre comptabilité nous indique que vous avez encore des factures ouvertes"
+"malgré nos précédents rappels.\n"
+"        Si ce courrier à croiser votre payment veuillez le considérer comme nul et non avenu.\n"
+"        Si le payment n'est pas effectuer dans les 5 jours votre dossier sera transférer à une société de recouvrement.\n"
 "\n"
-"If payment have already been sent, please disregard this notice. If not, "
-"please proceed with payment.\n"
-"If your payment has not been received in the next 5 days, your file will be "
-"transfered to our debt\n"
-"        collection agency.\n"
-"\n"
-"        Should you need us to arrange a payment plan for you, please "
+"        Si vous désirez un accord de payment n'hésitez pas à nous contacter "
 "advise.\n"
-"        A customer account statement is enclosed for you convenience.\n"
+"        Un décompte est disponible ci-joint.\n"
 "\n"
-"        Thank you in advance for your anticipated cooperation in this "
+"        En vous remerciant de votre coopération "
 "matter.\n"
 "\n"
-"        Best regards\n"
+"        Salutations\n"
 "      "
 
 #. module: account_credit_control
@@ -707,8 +692,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 ""
-"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"
+"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
 #: field:account.account,credit_control_line_ids:0
@@ -717,13 +702,13 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_credit_control.act_account_credit_relation_relation
 #: model:ir.actions.act_window,name:account_credit_control.act_partner_credit_relation_relation
 msgid "Credit Lines"
-msgstr "Credit Lines"
+msgstr "Lignes de relance"
 
 #. 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 "Done"
+msgstr "Fait"
 
 #. module: account_credit_control
 #: field:account.move.line,invoice_id:0 view:credit.control.line:0
@@ -736,17 +721,17 @@ msgstr "Facture"
 #: view:credit.control.emailer:0 view:credit.control.marker:0
 #: view:credit.control.printer:0
 msgid "Cancel"
-msgstr "Cancel"
+msgstr "Annuler"
 
 #. module: account_credit_control
 #: view:credit.control.printer:0
 msgid "Close"
-msgstr "Close"
+msgstr "Fermer"
 
 #. module: account_credit_control
 #: selection:credit.control.line,state:0
 msgid "Emailing Error"
-msgstr "Emailing Error"
+msgstr "Erreur sur Email"
 
 #. module: account_credit_control
 #: help:account.invoice,credit_policy_id:0
@@ -754,28 +739,28 @@ msgid ""
 "The Credit Control Policy used for this invoice. If nothing is defined, it "
 "will use the account setting or the partner setting."
 msgstr ""
-"The Credit Control Policy used for this invoice. If nothing is defined, it "
-"will use the account setting or the partner setting."
+"La politique de relance propre a cette facture "
+"Si rien n'est définit la valeur définie au niveau suppérieur sera utilisée."
 
 #. module: account_credit_control
 #: view:credit.control.line:0
 msgid "Run date"
-msgstr "Run date"
+msgstr "Date de controle"
 
 #. module: account_credit_control
 #: model:res.groups,name:account_credit_control.group_account_credit_control_user
 msgid "Credit Control User"
-msgstr "Credit Control User"
+msgstr "Responsable des relances"
 
 #. module: account_credit_control
 #: view:credit.control.policy:0 view:credit.control.policy.level:0
 msgid "Policy level"
-msgstr "Policy level"
+msgstr "Politique de relance"
 
 #. module: account_credit_control
 #: field:credit.control.run,manual_ids:0
 msgid "Lines to handle manually"
-msgstr "Lines to handle manually"
+msgstr "A traiter manuellement"
 
 #. module: account_credit_control
 #: help:res.partner,credit_policy_id:0
@@ -791,7 +776,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account_credit_control.base_credit_control_configuration_menu
 #: model:ir.ui.menu,name:account_credit_control.base_credit_control_menu
 msgid "Credit Control"
-msgstr "Credit Control"
+msgstr "Gestion des rappels"
 
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_mail_text:account_credit_control.3_time_2
@@ -807,15 +792,19 @@ msgid ""
 "Best regards\n"
 "      "
 msgstr ""
-"Our records indicate that we have not yet received the payment of the above "
-"mentioned invoice (copy attached for your convenience) 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"
+"Notre comptabilité nous indique que vous avez encore des factures ouvertes"
+"malgré nos précédents rappels.\n"
+"        Si ce courrier à croiser votre payment veuillez le considérer comme nul et non avenu.\n"
+"        Si le payment n'est pas effectuer dans les 5 jours votre dossier sera transférer à une société de recouvrement.\n"
 "\n"
-"Thank you in advance for your anticipated cooperation in this matter.\n"
+"        Si vous désirez un accord de payment n'hésitez pas à nous contacter "
+"advise.\n"
+"        Un décompte est disponible ci-joint.\n"
 "\n"
-"Best regards\n"
+"        En vous remerciant de votre coopération "
+"matter.\n"
+"\n"
+"        Salutations\n"
 "      "
 
 #. module: account_credit_control
@@ -826,7 +815,7 @@ msgstr "Policy"
 #. module: account_credit_control
 #: view:credit.control.policy:0
 msgid "Credit control policy Level"
-msgstr "Credit control policy Level"
+msgstr "Niveau de relance"
 
 #. module: account_credit_control
 #: view:credit.control.emailer:0
@@ -846,131 +835,131 @@ msgid ""
 "Best regards\n"
 "      "
 msgstr ""
-"Our records indicate that we have not received the payment of the above "
-"mentioned invoice.\n"
-"If it has already been sent, please disregard this notice. If not, please "
-"proceed with payment within 10 days.\n"
+Notre comptabilité nous informe que les factures ci-dessous "
+"n'ont pas été payées malgré un précédent rappel.\n"
+"       Si ce courrier à croiser votre payment veuillez le considérer comme nul et non avenu. Sinon, "
+"Merci de procéder au payment dans les 10 jours.\n"
 "\n"
-"Thank you in advance for your anticipated cooperation in this matter.\n"
+" En vous remerciant de votre coopération.\n"
 "\n"
-"Best regards\n"
+"Salutations\n"
 "      "
 
 #. module: account_credit_control
 #: view:credit.control.run:0
 msgid "Move lines To be treated manually"
-msgstr "Move lines To be treated manually"
+msgstr "A traiter manuellement"
 
 #. 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 "Credit Control Policies"
+msgstr "Politique de relance"
 
 #. 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 "Send an email for the selected lines."
+msgstr "Envoyer les rappels par email."
 
 #. module: account_credit_control
 #: model:credit.control.policy.level,name:account_credit_control.3_time_3
 msgid "10 days last reminder"
-msgstr "10 days last reminder"
+msgstr "10 jours depuis la dèrnière relance"
 
 #. module: account_credit_control
 #: view:credit.control.line:0
 msgid "Sent"
-msgstr "Sent"
+msgstr "Envoyé"
 
 #. module: account_credit_control
 #: constraint:credit.control.policy.level:0
 msgid "The smallest level can not be of type Previous Reminder"
-msgstr "The smallest level can not be of type Previous Reminder"
+msgstr "Le niveau le plus bas ne peut pas se baser sur un précédent rappel"
 
 #. module: account_credit_control
 #: view:credit.control.printer:0
 msgid "Lines report"
-msgstr "Lines report"
+msgstr "Lignes de rapport"
 
 #. module: account_credit_control
 #: field:credit.control.printer,report_file:0
 msgid "Generated Report"
-msgstr "Generated Report"
+msgstr "Rapport généré"
 
 #. module: account_credit_control
 #: model:credit.control.policy.level,name:account_credit_control.3_time_1
 msgid "10 days net"
-msgstr "10 days net"
+msgstr "10 jours net"
 
 #. module: account_credit_control
 #: view:credit.control.line:0
 msgid "Control Credit Lines"
-msgstr "Control Credit Lines"
+msgstr "Lignes de relance"
 
 #. module: account_credit_control
 #: model:res.groups,name:account_credit_control.group_account_credit_control_manager
 msgid "Credit Control Manager"
-msgstr "Credit Control Manager"
+msgstr "Gestionnaire des rappels"
 
 #. module: account_credit_control
 #: field:credit.control.policy,name:0 field:credit.control.policy.level,name:0
 msgid "Name"
-msgstr "Name"
+msgstr "Nom"
 
 #. module: account_credit_control
 #: view:credit.control.emailer:0
 msgid "Send the emails"
-msgstr "Send the emails"
+msgstr "Envoyer les courriels"
 
 #. module: account_credit_control
 #: field:credit.control.line,mail_message_id:0
 msgid "Sent Email"
-msgstr "Sent Email"
+msgstr "Courriels envoyés"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_mail_mail
 msgid "Outgoing Mails"
-msgstr "Courriels  envoyer"
+msgstr "Courriels  envoyés"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_policy_level
 msgid "A credit control policy level"
-msgstr "A credit control policy level"
+msgstr "Une politique de relance"
 
 #. module: account_credit_control
 #: model:ir.actions.report.xml,name:account_credit_control.report_webkit_html
 msgid "Credit Summary"
-msgstr "Credit Summary"
+msgstr "Résumé"
 
 #. module: account_credit_control
 #: field:credit.control.line,date:0
 msgid "Controlling date"
-msgstr "Controlling date"
+msgstr "Date de controle"
 
 #. module: account_credit_control
 #: view:credit.control.line:0
 msgid "Draft lines have to be triaged."
-msgstr "Draft lines have to be triaged."
+msgstr "A trier."
 
 #. module: account_credit_control
 #: field:credit.control.line,amount_due:0
 msgid "Due Amount Tax incl."
-msgstr "Due Amount Tax incl."
+msgstr "Montant dû TTC."
 
 #. module: account_credit_control
 #: field:res.company,credit_control_tolerance:0
 msgid "Credit Control Tolerance"
-msgstr "Credit Control Tolerance"
+msgstr "Tolérance"
 
 #. module: account_credit_control
 #: view:credit.control.policy:0
 msgid "Policy levels"
-msgstr "Policy levels"
+msgstr "Niveau de relance"
 
 #. module: account_credit_control
 #: model:credit.control.policy.level,name:account_credit_control.2_time_2
 msgid "60 days last reminder"
-msgstr "60 days last reminder"
+msgstr "Dernier rappel à 60 jours"
 
 #. module: account_credit_control
 #: help:res.company,credit_policy_id:0
@@ -984,22 +973,22 @@ msgstr ""
 #. module: account_credit_control
 #: field:credit.control.line,policy_level_id:0
 msgid "Overdue Level"
-msgstr "Overdue Level"
+msgstr "Niveau de relance"
 
 #. module: account_credit_control
 #: report:addons/account_credit_control/report/credit_control_summary.html.mako:167
 msgid "Reminder"
-msgstr "Reminder"
+msgstr "Rappel"
 
 #. module: account_credit_control
 #: report:addons/account_credit_control/report/credit_control_summary.html.mako:170
 msgid "Dear"
-msgstr "Dear"
+msgstr "Chère/Cher"
 
 #. module: account_credit_control
 #: report:addons/account_credit_control/report/credit_control_summary.html.mako:177
 msgid "Summary"
-msgstr "Summary"
+msgstr "Résumé"
 
 #. module: account_credit_control
 #: report:addons/account_credit_control/report/credit_control_summary.html.mako:179
@@ -1019,19 +1008,19 @@ msgstr "Date due"
 #. module: account_credit_control
 #: report:addons/account_credit_control/report/credit_control_summary.html.mako:182
 msgid "Invoiced amount"
-msgstr "Invoice amount"
+msgstr "Montant facturer"
 
 #. module: account_credit_control
 #: report:addons/account_credit_control/report/credit_control_summary.html.mako:183
 msgid "Open amount"
-msgstr "Open amount"
+msgstr "Montant ouvert"
 
 #. module: account_credit_control
 #: report:addons/account_credit_control/report/credit_control_summary.html.mako:183
 msgid "Currency"
-msgstr "Currency"
+msgstr "Devise"
 
 #. module: account_credit_control
 #: report:addons/account_credit_control/report/credit_control_summary.html.mako:211
 msgid "If you have any question, do not hesitate to contact us."
-msgstr "If you have any question, do not hesitate to contact us."
\ No newline at end of file
+msgstr "Nous sommes à disposition pour toutes questions."
\ No newline at end of file

From 1859a52b6955eced12ad61da844e4f6a9435039c Mon Sep 17 00:00:00 2001
From: Vincent Renaville 
Date: Thu, 25 Jul 2013 13:56:20 +0200
Subject: [PATCH 33/46] [FIX] improve translation + report invoice address
 layout

---
 account_credit_control/i18n/fr.po             | 182 ++++++++----------
 .../report/credit_control_summary.html.mako   |   8 +-
 2 files changed, 89 insertions(+), 101 deletions(-)

diff --git a/account_credit_control/i18n/fr.po b/account_credit_control/i18n/fr.po
index 3040efdf0..5be768682 100644
--- a/account_credit_control/i18n/fr.po
+++ b/account_credit_control/i18n/fr.po
@@ -1,23 +1,23 @@
 #. module: account_credit_control
 #: field:credit.control.policy.level,custom_text:0
 msgid "Custom Message"
-msgstr "Custom Message"
+msgstr "Message personalisable"
 
 #. module: account_credit_control
 #: view:credit.control.line:0
 msgid "More..."
-msgstr "More..."
+msgstr "Plus..."
 
 #. module: account_credit_control
 #: view:credit.control.line:0
 msgid "Group By..."
-msgstr "Group By..."
+msgstr "Grouper Par..."
 
 #. 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 "Pass de rappel"
+msgstr "Lancer le calcul des rappels"
 
 #. module: account_credit_control
 #: field:credit.control.policy.level,computation_mode:0
@@ -76,17 +76,17 @@ msgstr "Niveau"
 #. module: account_credit_control
 #: field:credit.control.policy.level,delay_days:0
 msgid "Delay (in days)"
-msgstr "Délais (en jours)"
+msgstr "Retard (en jours)"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_communication
 msgid "credit control communication"
-msgstr "Lettre/communication de relance"
+msgstr "Lettre de relance"
 
 #. module: account_credit_control
 #: view:credit.control.emailer:0
 msgid "Send emails for the selected lines"
-msgstr "Envoyer un mail depuis les lignes de relances sélectionnées"
+msgstr "Envoyer un email depuis les lignes de relances sélectionnées"
 
 #. module: account_credit_control
 #: help:credit.control.policy,account_ids:0
@@ -96,18 +96,18 @@ msgstr "Cette politique de relance sera active seulement pour les comptes sélec
 #. module: account_credit_control
 #: view:credit.control.line:0
 msgid "These lines are ready to send by email or by letter using the Actions."
-msgstr "Ces lignes sont prête à être traitées"
+msgstr "Ces lignes sont prêtes à être traitées"
 
 #. module: account_credit_control
 #: view:credit.control.line:0 selection:credit.control.line,state:0
 #: selection:credit.control.marker,name:0
 msgid "Ignored"
-msgstr "Ignoré"
+msgstr "Ignorée"
 
 #. module: account_credit_control
 #: help:credit.control.printer,mark_as_sent:0
 msgid "Only letter lines will be marked."
-msgstr "Seul les relances par courrier seront traitées."
+msgstr "Seules les relances par courrier seront traitées."
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_marker
@@ -142,23 +142,20 @@ msgid ""
 msgstr ""
 "Notre comptabilité nous indique que vous avez encore des factures ouvertes"
 "malgré nos précédents rappels.\n"
-"        Si ce courrier à croiser votre payment veuillez le considérer comme nul et non avenu.\n"
-"        Si le payment n'est pas effectuer dans les 5 jours votre dossier sera transférer à une société de recouvrement.\n"
+"        Si ce courrier a croisé votre paiement veuillez le considérer comme nul et non avenu.\n"
+"        Si le payment n'est pas effectué dans les 5 jours votre dossier sera transféré à une société de recouvrement.\n"
 "\n"
-"        Si vous désirez un accord de payment n'hésitez pas à nous contacter "
+"        Si vous désirez un accord de paiement n'hésitez pas à nous contacter "
 "advise.\n"
 "        Un décompte est disponible ci-joint.\n"
 "\n"
-"        En vous remerciant de votre coopération "
-"matter.\n"
-"\n"
-"        Salutations\n"
+"        En vous remerciant de votre coopération \n"
 "      "
 
 #. module: account_credit_control
 #: field:credit.control.line,date_sent:0
 msgid "Sent date"
-msgstr "Sent date"
+msgstr "Date d'envoi"
 
 #. module: account_credit_control
 #: view:credit.control.policy:0 field:credit.control.policy,account_ids:0
@@ -170,7 +167,7 @@ msgstr "Comptes"
 #: field:credit.control.line,partner_id:0
 #: model:ir.model,name:account_credit_control.model_res_partner
 msgid "Partner"
-msgstr "Partenaire"
+msgstr "Client"
 
 #. module: account_credit_control
 #: view:credit.control.policy.level:0
@@ -200,17 +197,15 @@ msgid ""
 msgstr ""
 "Notre comptabilité nous indique que vous avez encore des factures ouvertes"
 "malgré nos précédents rappels.\n"
-"        Si ce courrier à croiser votre payment veuillez le considérer comme nul et non avenu.\n"
-"        Si le payment n'est pas effectuer dans les 5 jours votre dossier sera transférer à une société de recouvrement.\n"
+"        Si ce courrier à croisé votre paiement veuillez le considérer comme nul et non avenu.\n"
+"        Si le paiement n'est pas effectué dans les 5 jours votre dossier sera transféré à une société de recouvrement.\n"
 "\n"
 "        Si vous désirez un accord de payment n'hésitez pas à nous contacter "
 "advise.\n"
 "        Un décompte est disponible ci-joint.\n"
 "\n"
 "        En vous remerciant de votre coopération "
-"matter.\n"
 "\n"
-"        Salutations\n"
 "      "
 
 #. module: account_credit_control
@@ -228,7 +223,7 @@ msgstr "Niveau de relance"
 #. module: account_credit_control
 #: view:credit.control.policy:0 view:credit.control.policy.level:0
 msgid "Mail and reporting"
-msgstr "Rapports et mails"
+msgstr "Lettres et e-mails"
 
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_text:account_credit_control.3_time_2
@@ -245,7 +240,7 @@ msgid ""
 msgstr ""
 "Notre comptabilité nous informe que les factures ci-dessous "
 "n'ont pas été payées malgré un précédent rappel.\n"
-"       Si ce courrier à croiser votre payment veuillez le considérer comme nul et non avenu. Sinon, "
+"       Si ce courrier à croisé votre paiement veuillez le considérer comme nul et non avenu. Sinon, "
 "Merci de procéder au payment dans les 5 jours.\n"
 "\n"
 " En vous remerciant de votre coopération.\n"
@@ -289,10 +284,10 @@ msgid ""
 "        Best regards\n"
 "      "
 msgstr ""
-Notre comptabilité nous informe que les factures ci-dessous "
+"Notre comptabilité nous informe que les factures ci-dessous "
 "n'ont pas été payées malgré un précédent rappel.\n"
-"       Si ce courrier à croiser votre payment veuillez le considérer comme nul et non avenu. Sinon, "
-"Merci de procéder au payment dans les 10 jours.\n"
+"       Si ce courrier à croisé votre paiement veuillez le considérer comme nul et non avenu. Sinon, "
+"Merci de procéder au paiement dans les 10 jours.\n"
 "\n"
 " En vous remerciant de votre coopération.\n"
 "\n"
@@ -303,7 +298,7 @@ Notre comptabilité nous informe que les factures ci-dessous "
 #: selection:credit.control.line,channel:0
 #: selection:credit.control.policy.level,channel:0
 msgid "Email"
-msgstr "Email"
+msgstr "E-mail"
 
 #. module: account_credit_control
 #: view:credit.control.line:0 field:credit.control.line,channel:0
@@ -335,18 +330,15 @@ msgid ""
 msgstr ""
 "Notre comptabilité nous indique que vous avez encore des factures ouvertes"
 "malgré nos précédents rappels.\n"
-"        Si ce courrier à croiser votre payment veuillez le considérer comme nul et non avenu.\n"
-"        Si le payment n'est pas effectuer dans les 5 jours votre dossier sera transférer à une société de recouvrement.\n"
+"        Si ce courrier a croisé votre paiement veuillez le considérer comme nul et non avenu.\n"
+"        Si le payment n'est pas effectué dans les 5 jours votre dossier sera transféré à une société de recouvrement.\n"
 "\n"
-"        Si vous désirez un accord de payment n'hésitez pas à nous contacter "
+"        Si vous désirez un accord de paiement n'hésitez pas à nous contacter "
 "advise.\n"
 "        Un décompte est disponible ci-joint.\n"
 "\n"
-"        En vous remerciant de votre coopération "
-"matter.\n"
+"        En vous remerciant de votre coopération\n "
 "\n"
-"        Salutations\n"
-"      "
 
 #. module: account_credit_control
 #: view:credit.control.marker:0
@@ -361,7 +353,7 @@ msgstr "Statut"
 #. module: account_credit_control
 #: field:credit.control.run,report:0
 msgid "Report"
-msgstr "Rapport"
+msgstr "Lettre"
 
 #. module: account_credit_control
 #: field:credit.control.line,state:0 field:credit.control.run,state:0
@@ -377,18 +369,18 @@ msgid ""
 msgstr ""
 "Lignes brouillons à traiter.\n"
 "Les lignes ignorées ne seront pas traitées.\n"
-"Les lignes brouillons ou ignorées seront regénérer lors du prochain controle."
+"Les lignes brouillons ou ignorées seront regénérées lors du prochain controle."
 
 #. 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 "30 jours à la fin d'un mois"
+msgstr "30 jours fin de mois"
 
 #. module: account_credit_control
 #: selection:credit.control.policy.level,computation_mode:0
 msgid "Due Date, End Of Month"
-msgstr "Date due, fin de mois"
+msgstr "Date d'échéance, fin de mois"
 
 #. module: account_credit_control
 #: field:credit.control.marker,name:0
@@ -409,10 +401,10 @@ msgid ""
 "Best regards\n"
 "      "
 msgstr ""
-Notre comptabilité nous informe que les factures ci-jointes "
+"Notre comptabilité nous informe que les factures ci-jointes "
 "n'ont pas été payées.\n"
-"       Si ce courrier à croiser votre payment veuillez le considérer comme nul et non avenu. Sinon, "
-"Merci de procéder au payment dans les 10 jours.\n"
+"       Si ce courrier a croisé votre paiement veuillez le considérer comme nul et non avenu. Sinon, "
+"Merci de procéder au paiement dans les 10 jours.\n"
 "\n"
 " En vous remerciant de votre coopération.\n"
 "\n"
@@ -442,9 +434,9 @@ msgid ""
 "Best regards\n"
 "      "
 msgstr ""
-Notre comptabilité nous informe que les factures ci-jointes "
+"Notre comptabilité nous informe que les factures ci-jointes "
 "n'ont pas été payées.\n"
-"       Si ce courrier à croiser votre payment veuillez le considérer comme nul et non avenu. Sinon, "
+"       Si ce courrier a croisé votre payment veuillez le considérer comme nul et non avenu. Sinon, "
 "Merci de procéder au payment dans les 10 jours.\n"
 "\n"
 " En vous remerciant de votre coopération.\n"
@@ -493,7 +485,7 @@ msgstr "Modifier le statut des lignes sélectionnées."
 #. module: account_credit_control
 #: view:credit.control.line:0
 msgid "Lines which have been ignored from previous runs."
-msgstr "Lignes ignorées lors du controle précédent."
+msgstr "Lignes ignorées lors des relances précédentes."
 
 #. module: account_credit_control
 #: view:credit.control.printer:0
@@ -519,7 +511,7 @@ msgstr "Politique de relance"
 #. module: account_credit_control
 #: view:credit.control.policy:0 view:credit.control.policy.level:0
 msgid "Delay Setting"
-msgstr "Paramètres de retard"
+msgstr "Paramètrages jours de retard"
 
 #. module: account_credit_control
 #: field:credit.control.line,balance_due:0
@@ -570,7 +562,7 @@ msgstr "Imprimer la sélection"
 #: model:ir.ui.menu,name:account_credit_control.credit_control_line_action_menu
 #: field:res.partner,credit_control_line_ids:0
 msgid "Credit Control Lines"
-msgstr "Lignes de ralance"
+msgstr "Lignes de relance"
 
 #. module: account_credit_control
 #: model:ir.actions.act_window,name:account_credit_control.open_credit_line_printer_wizard
@@ -581,7 +573,7 @@ msgstr "Imprimer la sélection"
 #. module: account_credit_control
 #: field:credit.control.run,date:0
 msgid "Controlling Date"
-msgstr "Date de controle"
+msgstr "Date de contrôle"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_credit_control_policy
@@ -596,13 +588,13 @@ msgstr "Lignes déjà traitées."
 #. module: account_credit_control
 #: field:credit.control.policy.level,email_template_id:0
 msgid "Email Template"
-msgstr "Modèle d'email"
+msgstr "Modèle d'e-mail"
 
 #. module: account_credit_control
 #: view:credit.control.line:0 selection:credit.control.line,state:0
 #: selection:credit.control.marker,name:0
 msgid "Ready To Send"
-msgstr "Prêt"
+msgstr "Prêt à l'envoi"
 
 #. module: account_credit_control
 #: model:ir.model,name:account_credit_control.model_res_company
@@ -612,7 +604,7 @@ msgstr "Société"
 #. module: account_credit_control
 #: field:credit.control.printer,mark_as_sent:0
 msgid "Mark letter lines as sent"
-msgstr "Marquer comme traité"
+msgstr "Marquer comme traitées"
 
 #. module: account_credit_control
 #: view:credit.control.run:0
@@ -673,17 +665,14 @@ msgid ""
 msgstr ""
 "Notre comptabilité nous indique que vous avez encore des factures ouvertes"
 "malgré nos précédents rappels.\n"
-"        Si ce courrier à croiser votre payment veuillez le considérer comme nul et non avenu.\n"
-"        Si le payment n'est pas effectuer dans les 5 jours votre dossier sera transférer à une société de recouvrement.\n"
+"        Si ce courrier a croisé votre paiement veuillez le considérer comme nul et non avenu.\n"
+"        Si le paiement n'est pas effectué dans les 5 jours votre dossier sera transféré à une société de recouvrement.\n"
 "\n"
-"        Si vous désirez un accord de payment n'hésitez pas à nous contacter "
+"        Si vous désirez un accord de paiement n'hésitez pas à nous contacter "
 "advise.\n"
 "        Un décompte est disponible ci-joint.\n"
 "\n"
 "        En vous remerciant de votre coopération "
-"matter.\n"
-"\n"
-"        Salutations\n"
 "      "
 
 #. module: account_credit_control
@@ -731,7 +720,7 @@ msgstr "Fermer"
 #. module: account_credit_control
 #: selection:credit.control.line,state:0
 msgid "Emailing Error"
-msgstr "Erreur sur Email"
+msgstr "Erreur sur E-mail"
 
 #. module: account_credit_control
 #: help:account.invoice,credit_policy_id:0
@@ -739,18 +728,18 @@ msgid ""
 "The Credit Control Policy used for this invoice. If nothing is defined, it "
 "will use the account setting or the partner setting."
 msgstr ""
-"La politique de relance propre a cette facture "
-"Si rien n'est définit la valeur définie au niveau suppérieur sera utilisée."
+"Il s'agit de la politique de relance propre à cette facture "
+"Si vide, la politique de relance par défaut sera utilisée."
 
 #. module: account_credit_control
 #: view:credit.control.line:0
 msgid "Run date"
-msgstr "Date de controle"
+msgstr "Date de relance"
 
 #. module: account_credit_control
 #: model:res.groups,name:account_credit_control.group_account_credit_control_user
 msgid "Credit Control User"
-msgstr "Responsable des relances"
+msgstr "Utilisateur du module de relance"
 
 #. module: account_credit_control
 #: view:credit.control.policy:0 view:credit.control.policy.level:0
@@ -768,15 +757,15 @@ 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 ""
-"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."
+"Politique de relance utilisée pour ce client. (Vous pouvez aussi en définir une autre "
+"au niveau d'une des factures de ce client.) Si vide, la politique par défaut (au niveau de la société) sera apppliquée."
 
 #. module: account_credit_control
 #: view:account.invoice:0
 #: model:ir.ui.menu,name:account_credit_control.base_credit_control_configuration_menu
 #: model:ir.ui.menu,name:account_credit_control.base_credit_control_menu
 msgid "Credit Control"
-msgstr "Gestion des rappels"
+msgstr "Relances Clients"
 
 #. module: account_credit_control
 #: model:credit.control.policy.level,custom_mail_text:account_credit_control.3_time_2
@@ -794,23 +783,20 @@ msgid ""
 msgstr ""
 "Notre comptabilité nous indique que vous avez encore des factures ouvertes"
 "malgré nos précédents rappels.\n"
-"        Si ce courrier à croiser votre payment veuillez le considérer comme nul et non avenu.\n"
-"        Si le payment n'est pas effectuer dans les 5 jours votre dossier sera transférer à une société de recouvrement.\n"
+"        Si ce courrier a croisé votre paiement veuillez le considérer comme nul et non avenu.\n"
+"        Si le paiement n'est pas effectué dans les 5 jours votre dossier sera transférer à une société de recouvrement.\n"
 "\n"
-"        Si vous désirez un accord de payment n'hésitez pas à nous contacter "
+"        Si vous désirez un accord de paiement n'hésitez pas à nous contacter "
 "advise.\n"
 "        Un décompte est disponible ci-joint.\n"
 "\n"
-"        En vous remerciant de votre coopération "
-"matter.\n"
-"\n"
-"        Salutations\n"
+"        En vous remerciant de votre coopération \n"
 "      "
 
 #. module: account_credit_control
 #: field:credit.control.line,policy_id:0
 msgid "Policy"
-msgstr "Policy"
+msgstr "Politique"
 
 #. module: account_credit_control
 #: view:credit.control.policy:0
@@ -835,10 +821,10 @@ msgid ""
 "Best regards\n"
 "      "
 msgstr ""
-Notre comptabilité nous informe que les factures ci-dessous "
+"Notre comptabilité nous informe que les factures ci-dessous "
 "n'ont pas été payées malgré un précédent rappel.\n"
-"       Si ce courrier à croiser votre payment veuillez le considérer comme nul et non avenu. Sinon, "
-"Merci de procéder au payment dans les 10 jours.\n"
+"       Si ce courrier a croisé votre paiement veuillez le considérer comme nul et non avenu. Sinon, "
+"Merci de procéder au paiement dans les 10 jours.\n"
 "\n"
 " En vous remerciant de votre coopération.\n"
 "\n"
@@ -864,27 +850,27 @@ msgstr "Envoyer les rappels par email."
 #. module: account_credit_control
 #: model:credit.control.policy.level,name:account_credit_control.3_time_3
 msgid "10 days last reminder"
-msgstr "10 jours depuis la dèrnière relance"
+msgstr "10 jours depuis la dernière relance"
 
 #. module: account_credit_control
 #: view:credit.control.line:0
 msgid "Sent"
-msgstr "Envoyé"
+msgstr "Envoyées"
 
 #. module: account_credit_control
 #: constraint:credit.control.policy.level:0
 msgid "The smallest level can not be of type Previous Reminder"
-msgstr "Le niveau le plus bas ne peut pas se baser sur un précédent rappel"
+msgstr "Le premier niveau ne peut pas être basé sur un précédent rappel"
 
 #. module: account_credit_control
 #: view:credit.control.printer:0
 msgid "Lines report"
-msgstr "Lignes de rapport"
+msgstr "Lignes de relance"
 
 #. module: account_credit_control
 #: field:credit.control.printer,report_file:0
 msgid "Generated Report"
-msgstr "Rapport généré"
+msgstr "Courrier généré"
 
 #. module: account_credit_control
 #: model:credit.control.policy.level,name:account_credit_control.3_time_1
@@ -899,7 +885,7 @@ msgstr "Lignes de relance"
 #. module: account_credit_control
 #: model:res.groups,name:account_credit_control.group_account_credit_control_manager
 msgid "Credit Control Manager"
-msgstr "Gestionnaire des rappels"
+msgstr "Responsable Relance client"
 
 #. module: account_credit_control
 #: field:credit.control.policy,name:0 field:credit.control.policy.level,name:0
@@ -929,17 +915,17 @@ msgstr "Une politique de relance"
 #. module: account_credit_control
 #: model:ir.actions.report.xml,name:account_credit_control.report_webkit_html
 msgid "Credit Summary"
-msgstr "Résumé"
+msgstr "Listes des rappels"
 
 #. module: account_credit_control
 #: field:credit.control.line,date:0
 msgid "Controlling date"
-msgstr "Date de controle"
+msgstr "Date de relance"
 
 #. module: account_credit_control
 #: view:credit.control.line:0
 msgid "Draft lines have to be triaged."
-msgstr "A trier."
+msgstr "Les lignes brouillon doivent être triées"
 
 #. module: account_credit_control
 #: field:credit.control.line,amount_due:0
@@ -949,12 +935,12 @@ msgstr "Montant dû TTC."
 #. module: account_credit_control
 #: field:res.company,credit_control_tolerance:0
 msgid "Credit Control Tolerance"
-msgstr "Tolérance"
+msgstr "Pas de relance inférieure à : "
 
 #. module: account_credit_control
 #: view:credit.control.policy:0
 msgid "Policy levels"
-msgstr "Niveau de relance"
+msgstr "Niveaux de relance"
 
 #. module: account_credit_control
 #: model:credit.control.policy.level,name:account_credit_control.2_time_2
@@ -967,8 +953,8 @@ msgid ""
 "The Credit Control Policy used on partners by default. This setting can be "
 "overriden on partners or invoices."
 msgstr ""
-"The Credit Control Policy used on partners by default. This setting can be "
-"overriden on partners or invoices."
+"Politique de relance par défaut du client. (Ce paramétrage peut être "
+"défini plus spécifiquement au niveau de la facture)."
 
 #. module: account_credit_control
 #: field:credit.control.line,policy_level_id:0
@@ -983,37 +969,37 @@ msgstr "Rappel"
 #. module: account_credit_control
 #: report:addons/account_credit_control/report/credit_control_summary.html.mako:170
 msgid "Dear"
-msgstr "Chère/Cher"
+msgstr "Madame, Monsieur"
 
 #. module: account_credit_control
 #: report:addons/account_credit_control/report/credit_control_summary.html.mako:177
 msgid "Summary"
-msgstr "Résumé"
+msgstr "Listes des factures en attente de règlement"
 
 #. module: account_credit_control
 #: report:addons/account_credit_control/report/credit_control_summary.html.mako:179
 msgid "Invoice number"
-msgstr "Invoice number"
+msgstr "Numéro Facture"
 
 #. module: account_credit_control
 #: report:addons/account_credit_control/report/credit_control_summary.html.mako:180
 msgid "Invoice date"
-msgstr "Invoice date"
+msgstr "Date Facture"
 
 #. module: account_credit_control
 #: report:addons/account_credit_control/report/credit_control_summary.html.mako:181
 msgid "Date due"
-msgstr "Date due"
+msgstr "Date Echéance"
 
 #. module: account_credit_control
 #: report:addons/account_credit_control/report/credit_control_summary.html.mako:182
 msgid "Invoiced amount"
-msgstr "Montant facturer"
+msgstr "Total Facture"
 
 #. module: account_credit_control
 #: report:addons/account_credit_control/report/credit_control_summary.html.mako:183
 msgid "Open amount"
-msgstr "Montant ouvert"
+msgstr "Restant dû"
 
 #. module: account_credit_control
 #: report:addons/account_credit_control/report/credit_control_summary.html.mako:183
@@ -1023,4 +1009,4 @@ msgstr "Devise"
 #. module: account_credit_control
 #: report:addons/account_credit_control/report/credit_control_summary.html.mako:211
 msgid "If you have any question, do not hesitate to contact us."
-msgstr "Nous sommes à disposition pour toutes questions."
\ No newline at end of file
+msgstr "Si vous avez des questions, n'hésitez pas à nous contacter."
diff --git a/account_credit_control/report/credit_control_summary.html.mako b/account_credit_control/report/credit_control_summary.html.mako
index 7ee2cd407..4c2a88502 100644
--- a/account_credit_control/report/credit_control_summary.html.mako
+++ b/account_credit_control/report/credit_control_summary.html.mako
@@ -95,10 +95,13 @@ table {
 }
 
 .address .recipient {
+    font-size: 13px;
     margin-right: 120px;
+    margin-left: 350px;
     float: right;
 }
 
+
 table .address_title {
     font-weight: bold;
 }
@@ -167,14 +170,13 @@ tr.line {
           ${_('Reminder')}: ${comm.current_policy_level.name or '' }
       
 
-      
${_('Dear')} ${comm.get_contact_address().name  or ''},

+      
${_('Dear')},

       
${comm.current_policy_level.custom_text.replace('\n', '
')}

 
       

       

-
+      
${_('Summary')}

       
${_('Invoice number')}
         ${_('Invoice date')}
         ${_('Date due')}${_('Invoiced Amount')}${_('Open Amount')}${_('Invoiced amount')}${_('Open amount')}
         ${_('Currency')}
 
       

-      

From 4f5c330f48a62468bc27a9591cc1005d8022c85f Mon Sep 17 00:00:00 2001
From: Vincent Renaville 
Date: Thu, 25 Jul 2013 17:05:33 +0200
Subject: [PATCH 34/46] [ADD] label Force credit control policy + french
 translation

---
 account_credit_control/account_view.xml | 1 +
 account_credit_control/i18n/fr.po       | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/account_credit_control/account_view.xml b/account_credit_control/account_view.xml
index f91f282e5..0bc381a67 100644
--- a/account_credit_control/account_view.xml
+++ b/account_credit_control/account_view.xml
@@ -18,6 +18,7 @@
         
         
+           
${_('Summary')}

       

         ${_('Invoice number')}
         ${_('Invoice date')}