From 864a6356b96d17f100829daa68f9fc66858e76b6 Mon Sep 17 00:00:00 2001 From: Nicolas Bessi Date: Tue, 27 May 2014 08:48:17 +0200 Subject: [PATCH] [TYPO] overriden -> overridden --- account_credit_control/company.py | 2 +- account_credit_control/i18n/de.po | 4 ++-- account_credit_control/i18n/en.po | 6 +++--- account_credit_control/i18n/es.po | 6 +++--- account_credit_control/i18n/fr.po | 2 +- account_credit_control/policy.py | 4 ++-- .../features/11_credit_control_manual_setting.feature | 2 +- .../features/steps/account_credit_control_changer.py | 6 +++--- .../wizard/credit_control_policy_changer.py | 10 +++++----- async_move_line_importer/model/move_line_importer.py | 4 ++-- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/account_credit_control/company.py b/account_credit_control/company.py index eb8187a4c..893b33bb5 100644 --- a/account_credit_control/company.py +++ b/account_credit_control/company.py @@ -31,7 +31,7 @@ class ResCompany(orm.Model): '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" + " by default. This setting can be overridden" " on partners or invoices.")), } diff --git a/account_credit_control/i18n/de.po b/account_credit_control/i18n/de.po index 761cfb60a..6f3eaaf27 100644 --- a/account_credit_control/i18n/de.po +++ b/account_credit_control/i18n/de.po @@ -984,10 +984,10 @@ msgstr "60 days last reminder" #: 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." +"overridden on partners or invoices." msgstr "" "The Credit Control Policy used on partners by default. This setting can be " -"overriden on partners or invoices." +"overridden on partners or invoices." #. module: account_credit_control #: field:credit.control.line,policy_level_id:0 diff --git a/account_credit_control/i18n/en.po b/account_credit_control/i18n/en.po index a485dd7c4..4ab005650 100644 --- a/account_credit_control/i18n/en.po +++ b/account_credit_control/i18n/en.po @@ -984,10 +984,10 @@ msgstr "60 days last reminder" #: 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." +"overridden on partners or invoices." msgstr "" "The Credit Control Policy used on partners by default. This setting can be " -"overriden on partners or invoices." +"overridden on partners or invoices." #. module: account_credit_control #: field:credit.control.line,policy_level_id:0 @@ -1042,4 +1042,4 @@ 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 +msgstr "If you have any question, do not hesitate to contact us." diff --git a/account_credit_control/i18n/es.po b/account_credit_control/i18n/es.po index 8c6ef96d9..76d47c904 100644 --- a/account_credit_control/i18n/es.po +++ b/account_credit_control/i18n/es.po @@ -982,10 +982,10 @@ msgstr "60 days last reminder" #: 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." +"overridden on partners or invoices." msgstr "" "The Credit Control Policy used on partners by default. This setting can be " -"overriden on partners or invoices." +"overridden on partners or invoices." #. module: account_credit_control #: field:credit.control.line,policy_level_id:0 @@ -1040,4 +1040,4 @@ 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 +msgstr "If you have any question, do not hesitate to contact us." diff --git a/account_credit_control/i18n/fr.po b/account_credit_control/i18n/fr.po index 85867283b..6f0e83980 100644 --- a/account_credit_control/i18n/fr.po +++ b/account_credit_control/i18n/fr.po @@ -965,7 +965,7 @@ msgstr "Dernier rappel à 60 jours" #: 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." +"overridden on partners or invoices." msgstr "" "Politique de relance par défaut du client. (Ce paramétrage peut être " "défini plus spécifiquement au niveau de la facture)." diff --git a/account_credit_control/policy.py b/account_credit_control/policy.py index 3413be6c5..34b8bc69c 100644 --- a/account_credit_control/policy.py +++ b/account_credit_control/policy.py @@ -341,7 +341,7 @@ class CreditControlPolicyLevel(orm.Model): " FROM credit_control_line\n" " WHERE move_line_id = mv_line.id\n" # lines from a previous level with a draft or ignored state - # or manually overriden + # or manually overridden # have to be generated again for the previous level " AND NOT manually_overridden\n" " AND state NOT IN ('draft', 'ignored'))" @@ -376,7 +376,7 @@ class CreditControlPolicyLevel(orm.Model): " 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 + # or manually overridden # have to be generated again for the previous level " AND NOT manually_overridden\n" " AND cr_line.state NOT IN ('draft', 'ignored')\n" diff --git a/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature b/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature index bfe2aa811..6702990fe 100644 --- a/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature +++ b/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature @@ -19,7 +19,7 @@ Feature: Ensure that manually changing an invoice level feature works as expect | name | | SI_4 | When I confirm the level change - And I should have "3" credit control lines overriden + And I should have "3" credit control lines overridden And one new credit control line of level "10 days net" related to invoice "SAJ/2014/0004" Then I force date of generated credit line to "2013-09-15" 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 6a5311f30..0597438b6 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 @@ -26,13 +26,13 @@ def impl(ctx): assert_true(ctx.wizard) ctx.wizard.set_new_policy() -@when(u'I should have "{line_number:d}" credit control lines overriden') +@when(u'I should have "{line_number:d}" credit control lines overridden') 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), + overridden = model('credit.control.line').search([('move_line_id', 'in', move_ids), ('manually_overridden', '=', True)]) -# assert len(overriden) == line_number +# assert len(overridden) == line_number @when(u'one new credit control line of level "{level_name}" related to invoice "{invoice_name}"') def impl(ctx, level_name, invoice_name): diff --git a/account_credit_control/wizard/credit_control_policy_changer.py b/account_credit_control/wizard/credit_control_policy_changer.py index 4fdb65f36..41dbea5f7 100644 --- a/account_credit_control/wizard/credit_control_policy_changer.py +++ b/account_credit_control/wizard/credit_control_policy_changer.py @@ -84,13 +84,13 @@ class credit_control_policy_changer(orm.TransientModel): context=context) return {'value': {'do_nothing': policy.do_nothing}} - def _mark_as_overriden(self, cr, uid, move_lines, context=None): - """Mark `move_lines` related credit control line as overriden + def _mark_as_overridden(self, cr, uid, move_lines, context=None): + """Mark `move_lines` related credit control line as overridden This is done by setting manually_overridden fields to True - :param move_lines: move line to mark as overriden + :param move_lines: move line to mark as overridden - :retun: list of credit line ids that where marked as overriden + :retun: list of credit line ids that where marked as overridden """ credit_model = self.pool['credit.control.line'] @@ -145,7 +145,7 @@ class credit_control_policy_changer(orm.TransientModel): uid, wizard.move_line_ids, wizard.new_policy_id) - self._mark_as_overriden(cr, + self._mark_as_overridden(cr, uid, wizard.move_line_ids, context=context) diff --git a/async_move_line_importer/model/move_line_importer.py b/async_move_line_importer/model/move_line_importer.py index 2ae7c725c..f515bf8fe 100644 --- a/async_move_line_importer/model/move_line_importer.py +++ b/async_move_line_importer/model/move_line_importer.py @@ -41,7 +41,7 @@ class move_line_importer(orm.Model): It will parse the saved CSV file using orm.BaseModel.load in a thread. If you set bypass_orm to True then the load function - will use a totally overriden create function that is a lot faster + will use a totally overridden create function that is a lot faster but that totally bypass the ORM """ @@ -303,7 +303,7 @@ class move_line_importer(orm.Model): Will generate an success/failure report and generate some maile threads. It uses BaseModel.load to lookup CSV. If you set bypass_orm to True then the load function - will use a totally overriden create function that is a lot faster + will use a totally overridden create function that is a lot faster but that totally bypass the ORM """