audrius/account-financial-tools
1
0
Fork 0
mirror of https://github.com/OCA/account-financial-tools.git synced 2025-02-02 12:47:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] typo overriden -> overridden

Browse Source
This commit is contained in:
Nicolas Bessi
2014-05-27 08:33:50 +02:00
parent 5ef98ad35e
commit 94524a0e82
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account_credit_control/line.py
View File

@@ -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')
}

8
account_credit_control/line_view.xml
View File

@@ -10,7 +10,7 @@
<field name="date_due"/>
<field name="date_sent"/>
<field name="level"/>
<field name="manually_overriden"/>
<field name="manually_overridden"/>
<field name="state"/>
<field name="channel"/>
<field name="invoice_id"/>
@@ -50,7 +50,7 @@
domain="[('state', 'in', ('error', 'email_error'))]"
help="An error has occured during the sending of the email."/>
<filter name="filter_manual" icon="terp-gtk-stop" string="Manual change"
domain="[('manually_overriden', '=', True)]"
domain="[('manually_overridden', '=', True)]"
help="The line was deprecated by a manual change of policy on invoice."/>
<separator orientation="vertical"/>
@@ -93,7 +93,7 @@
<separator orientation="vertical"/>
<filter domain='[]' context="{'group_by': 'channel'}"
icon="terp-document-new" string="Channel"/>
<filter domain='[]' context="{'group_by': 'manually_overriden'}"
<filter domain='[]' context="{'group_by': 'manually_overridden'}"
icon="terp-document-new" string="Manual change"/>
</group>
</search>
@@ -109,7 +109,7 @@
<field name="date"/>
<field name="date_due"/>
<field name="level"/>
<field name="manually_overriden"/>
<field name="manually_overridden"/>
<field name="state"/>
<field name="channel"/>
<field name="invoice_id"/>

8
account_credit_control/policy.py
View File

@@ -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 "

6
account_credit_control/scenarios/features/steps/account_credit_control_changer.py
View File

@@ -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

4
account_credit_control/wizard/credit_control_policy_changer.py
View File

@@ -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