audrius/account-reconcile
1
0
Fork 1
mirror of https://github.com/OCA/account-reconcile.git synced 2025-01-20 12:27:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] account_statement_bankaccount_completion: Fix PEP8

Browse Source
This commit is contained in:
Pedro M. Baeza
2014-08-04 20:22:25 +02:00
parent 85d139f776
commit b94bebee0e
2 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
account_statement_bankaccount_completion/statement.py
View File

@@ -23,11 +23,11 @@
from openerp.tools.translate import _
from openerp.osv.orm import Model
from openerp.osv import fields
from openerp.addons.account_statement_base_completion.statement import ErrorTooManyPartner
from openerp.addons.account_statement_base_completion.statement import \
ErrorTooManyPartner
class AccountStatementCompletionRule(Model):
"""Add a rule based on transaction ID"""
_inherit = "account.statement.completion.rule"
@@ -62,24 +62,21 @@ class AccountStatementCompletionRule(Model):
[('acc_number', '=', partner_acc_number)],
context=context)
if len(ids) > 1:
raise ErrorTooManyPartner(_('Line named "%s" (Ref:%s) was matched by more than '
'one partner for account number "%s".') % (st_line['name'], st_line['ref'], partner_acc_number))
raise ErrorTooManyPartner(
_('Line named "%s" (Ref:%s) was matched by more than one '
'partner for account number "%s".') %
(st_line['name'], st_line['ref'], partner_acc_number))
if len(ids) == 1:
partner = res_bank_obj.browse(
cr, uid, ids[0], context=context).partner_id
res['partner_id'] = partner.id
st_vals = st_obj.get_values_for_line(cr,
uid,
profile_id=st_line[
'profile_id'],
master_account_id=st_line[
'master_account_id'],
partner_id=res.get(
'partner_id', False),
line_type=st_line['type'],
amount=st_line['amount'] if st_line[
'amount'] else 0.0,
context=context)
st_vals = st_obj.get_values_for_line(
cr, uid, profile_id=st_line['profile_id'],
master_account_id=st_line['master_account_id'],
partner_id=res.get('partner_id', False),
line_type=st_line['type'],
amount=st_line['amount'] if st_line['amount'] else 0.0,
context=context)
res.update(st_vals)
return res
@@ -88,7 +85,6 @@ class AccountStatementLine(Model):
_inherit = "account.bank.statement.line"
_columns = {
# 'additional_bank_fields' : fields.serialized('Additional infos from bank', help="Used by completion and import system."),
'partner_acc_number': fields.sparse(
type='char',
string='Account Number',

44
account_statement_bankaccount_completion/tests/test_bankaccount_completion.py
View File

@@ -30,12 +30,11 @@ class bankaccount_completion(common.TransactionCase):
def prepare(self):
self.company_a = self.browse_ref('base.main_company')
self.profile_obj = self.registry("account.statement.profile")
self.account_bank_statement_obj = self.registry(
"account.bank.statement")
self.account_bank_statement_line_obj = self.registry(
"account.bank.statement.line")
self.st_obj = self.registry("account.bank.statement")
self.st_line_obj = self.registry("account.bank.statement.line")
self.completion_rule_id = self.ref(
'account_statement_bankaccount_completion.bank_statement_completion_rule_10')
'account_statement_bankaccount_completion.'
'bank_statement_completion_rule_10')
self.journal_id = self.registry("ir.model.data").get_object_reference(
self.cr, self. uid, "account", "bank_journal")[1]
self.partner_id = self.ref('base.main_partner')
@@ -52,17 +51,17 @@ class bankaccount_completion(common.TransactionCase):
# Create the completion rule
# Create a bank statement
self.statement_id = self.account_bank_statement_obj.create(self.cr, self.uid, {
"balance_end_real": 0.0,
"balance_start": 0.0,
"date": time.strftime('%Y-%m-%d'),
"journal_id": self.journal_id,
"profile_id": self.profile_id
})
self.statement_id = self.st_obj.create(
self.cr, self.uid, {
"balance_end_real": 0.0,
"balance_start": 0.0,
"date": time.strftime('%Y-%m-%d'),
"journal_id": self.journal_id,
"profile_id": self.profile_id
})
# Create bank a statement line
self.statement_line_id = self.account_bank_statement_line_obj.create(self.cr, self.uid, {
self.statement_line_id = self.st_line_obj.create(self.cr, self.uid, {
'amount': 1000.0,
'name': 'EXT001',
'ref': 'My ref',
@@ -84,19 +83,20 @@ class bankaccount_completion(common.TransactionCase):
def test_00(self):
"""Test complete partner_id from bank account number
Test the automatic completion of the partner_id based on the account number associated to the
Test the automatic completion of the partner_id based on the account
number associated to the
statement line
"""
self.prepare()
statement_line = self.account_bank_statement_line_obj.browse(
self.cr, self.uid, self.statement_line_id)
statement_line = self.st_line_obj.browse(self.cr, self.uid,
self.statement_line_id)
# before import, the
self.assertFalse(
statement_line.partner_id, "Partner_id must be blank before completion")
statement_obj = self.account_bank_statement_obj.browse(
self.cr, self.uid, self.statement_id)
statement_line.partner_id,
"Partner_id must be blank before completion")
statement_obj = self.st_obj.browse(self.cr, self.uid, self.statement_id)
statement_obj.button_auto_completion()
statement_line = self.account_bank_statement_line_obj.browse(
self.cr, self.uid, self.statement_line_id)
statement_line = self.st_line_obj.browse(self.cr, self.uid,
self.statement_line_id)
self.assertEquals(self.partner_id, statement_line.partner_id[
'id'], "Missing expected partner id after completion")