From 77762b8c86ba34d0896bb8826c4c9cb6f9284078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Marques?= Date: Mon, 2 Nov 2020 12:16:03 +0000 Subject: [PATCH] [IMP] account_bank_statement_import_move_line: black, isort, prettier --- .../__manifest__.py | 33 ++-- .../models/account_move_line.py | 20 +-- ...account_bank_statement_import_move_line.py | 101 ++++++----- .../views/account_bank_statement_view.xml | 20 +-- .../wizards/account_statement_line_create.py | 158 ++++++++++-------- .../account_statement_line_create_view.xml | 88 +++++----- 6 files changed, 225 insertions(+), 195 deletions(-) diff --git a/account_statement_import_move_line/__manifest__.py b/account_statement_import_move_line/__manifest__.py index e7795292..39c65c12 100644 --- a/account_statement_import_move_line/__manifest__.py +++ b/account_statement_import_move_line/__manifest__.py @@ -2,23 +2,20 @@ # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html { - 'name': 'Bank statement import move lines', - 'version': '12.0.1.0.0', - 'category': 'Accounting', - 'summary': 'Import journal items into bank statement', - 'author': 'Tecnativa, ' - 'Odoo Community Association (OCA)', - 'maintainers': ['pedrobaeza'], - 'website': 'https://github.com/OCA/bank-statement-import', - 'depends': [ - 'account', + "name": "Bank statement import move lines", + "version": "12.0.1.0.0", + "category": "Accounting", + "summary": "Import journal items into bank statement", + "author": "Tecnativa, " "Odoo Community Association (OCA)", + "maintainers": ["pedrobaeza"], + "website": "https://github.com/OCA/bank-statement-import", + "depends": ["account",], + "data": [ + "wizards/account_statement_line_create_view.xml", + "views/account_bank_statement_view.xml", ], - 'data': [ - 'wizards/account_statement_line_create_view.xml', - 'views/account_bank_statement_view.xml', - ], - 'license': 'AGPL-3', - 'development_status': 'Production/Stable', - 'installable': True, - 'auto_install': False, + "license": "AGPL-3", + "development_status": "Production/Stable", + "installable": True, + "auto_install": False, } diff --git a/account_statement_import_move_line/models/account_move_line.py b/account_statement_import_move_line/models/account_move_line.py index 1655f6d1..042c1644 100644 --- a/account_statement_import_move_line/models/account_move_line.py +++ b/account_statement_import_move_line/models/account_move_line.py @@ -5,7 +5,7 @@ from odoo import api, models class AccountMoveLine(models.Model): - _inherit = 'account.move.line' + _inherit = "account.move.line" @api.multi def _prepare_statement_line_vals(self, statement): @@ -16,20 +16,20 @@ class AccountMoveLine(models.Model): elif self.credit > 0: amount = -self.credit vals = { - 'name': self.name or '?', - 'amount': amount, - 'partner_id': self.partner_id.id, - 'statement_id': statement.id, - 'ref': self.ref, - 'date': self.date_maturity, - 'amount_currency': self.amount_currency, - 'currency_id': self.currency_id.id, + "name": self.name or "?", + "amount": amount, + "partner_id": self.partner_id.id, + "statement_id": statement.id, + "ref": self.ref, + "date": self.date_maturity, + "amount_currency": self.amount_currency, + "currency_id": self.currency_id.id, } return vals @api.multi def create_statement_line_from_move_line(self, statement): - abslo = self.env['account.bank.statement.line'] + abslo = self.env["account.bank.statement.line"] for mline in self: abslo.create(mline._prepare_statement_line_vals(statement)) return diff --git a/account_statement_import_move_line/tests/test_account_bank_statement_import_move_line.py b/account_statement_import_move_line/tests/test_account_bank_statement_import_move_line.py index f2eb42f2..ef9cff86 100644 --- a/account_statement_import_move_line/tests/test_account_bank_statement_import_move_line.py +++ b/account_statement_import_move_line/tests/test_account_bank_statement_import_move_line.py @@ -1,64 +1,75 @@ # Copyright 2017 Tecnativa - Luis M. Ontalba # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0 -from odoo.tests import common from odoo import fields +from odoo.tests import common class TestAccountBankStatementImportMoveLine(common.SavepointCase): @classmethod def setUpClass(cls): super(TestAccountBankStatementImportMoveLine, cls).setUpClass() - cls.account_type = cls.env['account.account.type'].create({ - 'name': 'Test Account Type'}) - cls.a_receivable = cls.env['account.account'].create({ - 'code': 'TAA', - 'name': 'Test Receivable Account', - 'internal_type': 'receivable', - 'user_type_id': cls.account_type.id, - }) - cls.partner = cls.env['res.partner'].create({ - 'name': 'Test Partner 2', - 'parent_id': False, - }) - cls.journal = cls.env['account.journal'].create({ - 'name': 'Test Journal', - 'type': 'bank', - }) - cls.invoice = cls.env['account.invoice'].create({ - 'name': 'Test Invoice 3', - 'partner_id': cls.partner.id, - 'type': 'out_invoice', - 'journal_id': cls.journal.id, - 'invoice_line_ids': [(0, 0, { - 'account_id': cls.a_receivable.id, - 'name': 'Test line', - 'quantity': 1.0, - 'price_unit': 100.00, - })], - }) - cls.statement = cls.env['account.bank.statement'].create({ - 'journal_id': cls.journal.id}) + cls.account_type = cls.env["account.account.type"].create( + {"name": "Test Account Type"} + ) + cls.a_receivable = cls.env["account.account"].create( + { + "code": "TAA", + "name": "Test Receivable Account", + "internal_type": "receivable", + "user_type_id": cls.account_type.id, + } + ) + cls.partner = cls.env["res.partner"].create( + {"name": "Test Partner 2", "parent_id": False,} + ) + cls.journal = cls.env["account.journal"].create( + {"name": "Test Journal", "type": "bank",} + ) + cls.invoice = cls.env["account.invoice"].create( + { + "name": "Test Invoice 3", + "partner_id": cls.partner.id, + "type": "out_invoice", + "journal_id": cls.journal.id, + "invoice_line_ids": [ + ( + 0, + 0, + { + "account_id": cls.a_receivable.id, + "name": "Test line", + "quantity": 1.0, + "price_unit": 100.00, + }, + ) + ], + } + ) + cls.statement = cls.env["account.bank.statement"].create( + {"journal_id": cls.journal.id} + ) def test_global(self): self.invoice.action_invoice_open() self.assertTrue(self.invoice.move_id) self.invoice.move_id.post() - wizard_o = self.env['account.statement.line.create'] + wizard_o = self.env["account.statement.line.create"] context = wizard_o._context.copy() - context.update({ - 'active_model': 'account.bank.statement', - 'active_id': self.statement.id, - }) - wizard = wizard_o.with_context(context).create({ - 'statement_id': self.statement.id, - 'partner_id': self.partner.id, - 'journal_ids': [(4, self.journal.id)], - 'allow_blocked': True, - 'date_type': 'move', - 'move_date': fields.Date.today(), - 'invoice': False, - }) + context.update( + {"active_model": "account.bank.statement", "active_id": self.statement.id,} + ) + wizard = wizard_o.with_context(context).create( + { + "statement_id": self.statement.id, + "partner_id": self.partner.id, + "journal_ids": [(4, self.journal.id)], + "allow_blocked": True, + "date_type": "move", + "move_date": fields.Date.today(), + "invoice": False, + } + ) wizard.populate() self.assertEqual(len(wizard.move_line_ids), 1) line = wizard.move_line_ids diff --git a/account_statement_import_move_line/views/account_bank_statement_view.xml b/account_statement_import_move_line/views/account_bank_statement_view.xml index c66af69a..ab637dcf 100644 --- a/account_statement_import_move_line/views/account_bank_statement_view.xml +++ b/account_statement_import_move_line/views/account_bank_statement_view.xml @@ -1,20 +1,20 @@ - - + - account.bank.statement.form.population account.bank.statement - + -