From b754631dde9dc6cc9fa853656815d667e76078fe Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Sat, 26 Aug 2017 19:49:36 -0500 Subject: [PATCH] [FIX] Travis errors --- .../models/__init__.py | 2 +- .../models/account_banking_reconciliation.py | 41 ++++++++++--------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/account_banking_reconciliation/models/__init__.py b/account_banking_reconciliation/models/__init__.py index 2e2d04a5..2aa92cb2 100644 --- a/account_banking_reconciliation/models/__init__.py +++ b/account_banking_reconciliation/models/__init__.py @@ -4,5 +4,5 @@ # Copyright (C) 2004-2010 OpenERP SA () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from . import account_move_line +from . import account_move_line from . import account_banking_reconciliation diff --git a/account_banking_reconciliation/models/account_banking_reconciliation.py b/account_banking_reconciliation/models/account_banking_reconciliation.py index 03e74db4..571779cf 100644 --- a/account_banking_reconciliation/models/account_banking_reconciliation.py +++ b/account_banking_reconciliation/models/account_banking_reconciliation.py @@ -42,7 +42,7 @@ class BankAccRecStatement(models.Model): "state!" % (group_verifier.name))) return True - @api.model + @api.one def copy(self, default=None): if default is None: default = {} @@ -188,7 +188,7 @@ class BankAccRecStatement(models.Model): statement_line_ids.write({'cleared_bank_account': False}) return True - def _get_balance(self): + def _compute_get_balance(self): """Computed as following: A) Deposits, Credits, and Interest Amount: Total SUM of Amts of lines with Cleared = True @@ -455,18 +455,19 @@ class BankAccRecStatement(models.Model): domain=[('type', '=', 'dr')], states={ 'done': [('readonly', True)]}) - cleared_balance = fields.Float(compute='_get_balance', + cleared_balance = fields.Float(compute='_compute_get_balance', string='Cleared Balance', digits_compute=dp.get_precision('Account'), help="Total Sum of the Deposit Amount " "Cleared – Total Sum of Checks, " "Withdrawals, Debits, and Service " "Charges Amount Cleared") - difference = fields.Float(compute='_get_balance', string='Difference', + difference = fields.Float(compute='_compute_get_balance', + string='Difference', digits_compute=dp.get_precision('Account'), help="(Ending Balance – Beginning Balance) - " "Cleared Balance.") - cleared_balance_cur = fields.Float(compute='_get_balance', + cleared_balance_cur = fields.Float(compute='_compute_get_balance', string='Cleared Balance (Cur)', digits_compute=dp.get_precision( 'Account'), @@ -474,12 +475,12 @@ class BankAccRecStatement(models.Model): "Amount Cleared – Total Sum of " "Checks, Withdrawals, Debits, and" " Service Charges Amount Cleared") - difference_cur = fields.Float(compute='_get_balance', + difference_cur = fields.Float(compute='_compute_get_balance', string='Difference (Cur)', digits_compute=dp.get_precision('Account'), help="(Ending Balance – Beginning Balance)" " - Cleared Balance.") - uncleared_balance = fields.Float(compute='_get_balance', + uncleared_balance = fields.Float(compute='_compute_get_balance', string='Uncleared Balance', digits_compute=dp.get_precision( 'Account'), @@ -487,7 +488,7 @@ class BankAccRecStatement(models.Model): "Amount Uncleared – Total Sum of " "Checks, Withdrawals, Debits, and" " Service Charges Amount Uncleared") - uncleared_balance_cur = fields.Float(compute='_get_balance', + uncleared_balance_cur = fields.Float(compute='_compute_get_balance', string='Unleared Balance (Cur)', digits_compute=dp.get_precision( 'Account'), @@ -496,57 +497,57 @@ class BankAccRecStatement(models.Model): "Checks, Withdrawals, Debits, " "and Service Charges " "Amount Uncleared") - sum_of_credits = fields.Float(compute='_get_balance', + sum_of_credits = fields.Float(compute='_compute_get_balance', string='Checks, Withdrawals, Debits, and' ' Service Charges Amount', digits_compute=dp.get_precision('Account'), type='float', help="Total SUM of Amts of lines with" " Cleared = True") - sum_of_debits = fields.Float(compute='_get_balance', + sum_of_debits = fields.Float(compute='_compute_get_balance', string='Deposits, Credits, and ' 'Interest Amount', digits_compute=dp.get_precision('Account'), help="Total SUM of Amts of lines with " "Cleared = True") - sum_of_credits_cur = fields.Float(compute='_get_balance', + sum_of_credits_cur = fields.Float(compute='_compute_get_balance', string='Checks, Withdrawals, Debits, and' ' Service Charges Amount (Cur)', digits_compute=dp.get_precision( 'Account'), help="Total SUM of Amts of lines " "with Cleared = True") - sum_of_debits_cur = fields.Float(compute='_get_balance', + sum_of_debits_cur = fields.Float(compute='_compute_get_balance', string='Deposits, Credits, and ' 'Interest Amount (Cur)', digits_compute=dp.get_precision( 'Account'), help="Total SUM of Amts of lines " "with Cleared = True") - sum_of_credits_lines = fields.Float(compute='_get_balance', + sum_of_credits_lines = fields.Float(compute='_compute_get_balance', string='Checks, Withdrawals, Debits, ' 'and Service Charges # of ' 'Items', help="Total of number of lines with " "Cleared = True") - sum_of_debits_lines = fields.Float(compute='_get_balance', + sum_of_debits_lines = fields.Float(compute='_compute_get_balance', string='Deposits, Credits, and Interest' ' # of Items', help="Total of number of lines with" " Cleared = True") - sum_of_ucredits = fields.Float(compute='_get_balance', + sum_of_ucredits = fields.Float(compute='_compute_get_balance', string='Uncleared - Checks, Withdrawals, ' 'Debits, and Service Charges Amount', digits_compute=dp.get_precision('Account'), help="Total SUM of Amts of lines with " "Cleared = False") - sum_of_udebits = fields.Float(compute='_get_balance', + sum_of_udebits = fields.Float(compute='_compute_get_balance', string='Uncleared - Deposits, Credits, ' 'and Interest Amount', digits_compute=dp.get_precision('Account'), help="Total SUM of Amts of lines with " "Cleared = False") - sum_of_ucredits_cur = fields.Float(compute='_get_balance', + sum_of_ucredits_cur = fields.Float(compute='_compute_get_balance', string='Uncleared - Checks, ' 'Withdrawals, Debits, and ' 'Service Charges Amount (Cur)', @@ -554,20 +555,20 @@ class BankAccRecStatement(models.Model): 'Account'), help="Total SUM of Amts of lines " "with Cleared = False") - sum_of_udebits_cur = fields.Float(compute='_get_balance', + sum_of_udebits_cur = fields.Float(compute='_compute_get_balance', string='Uncleared - Deposits, Credits, ' 'and Interest Amount (Cur)', digits_compute=dp.get_precision( 'Account'), help="Total SUM of Amts of lines with" " Cleared = False") - sum_of_ucredits_lines = fields.Float(compute='_get_balance', + sum_of_ucredits_lines = fields.Float(compute='_compute_get_balance', string='Uncleared - Checks, ' 'Withdrawals, Debits, and ' 'Service Charges # of Items', help="Total of number of lines with" " Cleared = False") - sum_of_udebits_lines = fields.Float(compute='_get_balance', + sum_of_udebits_lines = fields.Float(compute='_compute_get_balance', string='Uncleared - Deposits, Credits,' ' and Interest # of Items', help="Total of number of lines "