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