diff --git a/account_credit_control/data.xml b/account_credit_control/data.xml index 65cf3c070..053a42940 100644 --- a/account_credit_control/data.xml +++ b/account_credit_control/data.xml @@ -95,7 +95,7 @@ - mail + mail Replace this text in level by your message @@ -107,7 +107,7 @@ - mail + mail Replace this text in level by your message @@ -119,7 +119,7 @@ - manual + manual Replace this text in level by your message @@ -137,7 +137,7 @@ - mail + mail Replace this text in level by your message @@ -149,7 +149,7 @@ - manual + manual Replace this text in level by your message diff --git a/account_credit_control/line.py b/account_credit_control/line.py index b42bc4048..f611dc5e0 100644 --- a/account_credit_control/line.py +++ b/account_credit_control/line.py @@ -59,9 +59,9 @@ class CreditControlLine(Model): ('mail_error', 'Mailing Error')], 'State', required=True, readonly=True), - 'canal': fields.selection([('manual', 'Manual'), + 'channel': fields.selection([('manual', 'Manual'), ('mail', 'E-Mail')], - 'Canal', required=True, + 'Channel', required=True, readonly=True, states={'draft': [('readonly', False)]}), @@ -125,7 +125,7 @@ class CreditControlLine(Model): data['date'] = controlling_date data['date_due'] = move_line.date_maturity data['state'] = 'draft' - data['canal'] = level.canal + data['channel'] = level.channel data['invoice_id'] = move_line.invoice_id.id if move_line.invoice_id else False data['partner_id'] = move_line.partner_id.id data['amount_due'] = (move_line.amount_currency or move_line.debit or diff --git a/account_credit_control/line_view.xml b/account_credit_control/line_view.xml index d6e62a323..049158bf6 100644 --- a/account_credit_control/line_view.xml +++ b/account_credit_control/line_view.xml @@ -11,7 +11,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -85,8 +85,8 @@ - + @@ -102,7 +102,7 @@ - + diff --git a/account_credit_control/policy.py b/account_credit_control/policy.py index 043410003..2dd3c1436 100644 --- a/account_credit_control/policy.py +++ b/account_credit_control/policy.py @@ -225,9 +225,9 @@ class CreditControlPolicyLevel(Model): 'delay_days': fields.integer('Delay (in days)', required='True'), 'mail_template_id': fields.many2one('email.template', 'Mail Template', required=True), - 'canal': fields.selection([('manual', 'Manual'), + 'channel': fields.selection([('manual', 'Manual'), ('mail', 'Mail')], - 'Canal', required=True), + 'Channel', required=True), 'custom_text': fields.text('Custom Message', required=True, translate=True), } diff --git a/account_credit_control/policy_view.xml b/account_credit_control/policy_view.xml index c1c524008..4e85ba8b2 100644 --- a/account_credit_control/policy_view.xml +++ b/account_credit_control/policy_view.xml @@ -16,7 +16,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -110,7 +110,7 @@ - + diff --git a/account_credit_control/wizard/credit_control_mailer.py b/account_credit_control/wizard/credit_control_mailer.py index a8df32b55..6600603c0 100644 --- a/account_credit_control/wizard/credit_control_mailer.py +++ b/account_credit_control/wizard/credit_control_mailer.py @@ -49,7 +49,7 @@ class CreditControlMailer(TransientModel): 'line_ids': fields.many2many( 'credit.control.line', string='Credit Control Lines', - domain="[('state', '=', 'to_be_sent'), ('canal', '=', 'mail')]"), + domain="[('state', '=', 'to_be_sent'), ('channel', '=', 'mail')]"), } _defaults = { @@ -61,11 +61,11 @@ class CreditControlMailer(TransientModel): line_obj = self.pool.get('credit.control.line') if mail_all: domain = [('state', '=', 'to_be_sent'), - ('canal', '=', 'mail')] + ('channel', '=', 'mail')] else: domain = [('state', '=', 'to_be_sent'), ('id', 'in', active_ids), - ('canal', '=', 'mail')] + ('channel', '=', 'mail')] return line_obj.search(cr, uid, domain, context=context) def mail_lines(self, cr, uid, wiz_id, context=None): diff --git a/account_credit_control/wizard/credit_control_printer.py b/account_credit_control/wizard/credit_control_printer.py index cd2853a75..c5090c4fa 100644 --- a/account_credit_control/wizard/credit_control_printer.py +++ b/account_credit_control/wizard/credit_control_printer.py @@ -61,11 +61,11 @@ class CreditControlPrinter(TransientModel): line_obj = self.pool.get('credit.control.line') if print_all: domain = [('state', '=', 'to_be_sent'), - ('canal', '=', 'manual')] + ('channel', '=', 'manual')] else: domain = [('state', '=', 'to_be_sent'), ('id', 'in', active_ids), - ('canal', '=', 'manual')] + ('channel', '=', 'manual')] return line_obj.search(cr, uid, domain, context=context) def print_lines(self, cr, uid, wiz_id, context=None):