From 99ecd163a656e14de41fe708e419303f34b9dcf4 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Mon, 5 Apr 2021 16:26:59 +0200 Subject: [PATCH] [IMP] account_invoice_constraint_chronology: black, isort, prettier --- .../__manifest__.py | 2 +- .../model/account_invoice.py | 63 ++++---- .../model/account_journal.py | 12 +- .../test_account_constraint_chronology.py | 147 +++++++++++------- .../view/account_view.xml | 10 +- 5 files changed, 132 insertions(+), 102 deletions(-) diff --git a/account_invoice_constraint_chronology/__manifest__.py b/account_invoice_constraint_chronology/__manifest__.py index 62342e6e..24db4af6 100644 --- a/account_invoice_constraint_chronology/__manifest__.py +++ b/account_invoice_constraint_chronology/__manifest__.py @@ -6,7 +6,7 @@ "author": "Odoo Community Association (OCA), ACSONE SA/NV", "maintainer": "ACSONE SA/NV", "website": "https://github.com/OCA/account-financial-tools/tree/12.0/" - "account_invoice_constraint_chronology", + "account_invoice_constraint_chronology", "license": "AGPL-3", "category": "Accounting", "depends": ["account"], diff --git a/account_invoice_constraint_chronology/model/account_invoice.py b/account_invoice_constraint_chronology/model/account_invoice.py index 1e17263f..31ddef27 100644 --- a/account_invoice_constraint_chronology/model/account_invoice.py +++ b/account_invoice_constraint_chronology/model/account_invoice.py @@ -3,7 +3,7 @@ import datetime -from odoo import models, api, fields, _ +from odoo import _, api, fields, models from odoo.exceptions import UserError from odoo.tools.misc import format_date @@ -14,35 +14,34 @@ class AccountInvoice(models.Model): @api.model def _prepare_previous_invoices_domain(self, invoice): domain = [ - ('state', 'not in', ['open', - 'paid', - 'cancel', - 'in_payment', - 'proforma', - 'proforma2']), - ('date_invoice', '!=', False), - ('date_invoice', '<', invoice.date_invoice), - ('journal_id', '=', invoice.journal_id.id), + ( + "state", + "not in", + ["open", "paid", "cancel", "in_payment", "proforma", "proforma2"], + ), + ("date_invoice", "!=", False), + ("date_invoice", "<", invoice.date_invoice), + ("journal_id", "=", invoice.journal_id.id), ] if ( invoice.journal_id.refund_sequence and invoice.journal_id.sequence_id != invoice.journal_id.refund_sequence_id ): - domain.append(('type', '=', invoice.type)) + domain.append(("type", "=", invoice.type)) return domain @api.model def _prepare_later_invoices_domain(self, invoice): domain = [ - ('state', 'in', ['open', 'in_payment', 'paid']), - ('date_invoice', '>', invoice.date_invoice), - ('journal_id', '=', invoice.journal_id.id), + ("state", "in", ["open", "in_payment", "paid"]), + ("date_invoice", ">", invoice.date_invoice), + ("journal_id", "=", invoice.journal_id.id), ] if ( invoice.journal_id.refund_sequence and invoice.journal_id.sequence_id != invoice.journal_id.refund_sequence_id ): - domain.append(('type', '=', invoice.type)) + domain.append(("type", "=", invoice.type)) return domain @api.multi @@ -52,8 +51,7 @@ class AccountInvoice(models.Model): for inv in self: if not inv.journal_id.check_chronology: continue - invoices = self.search( - self._prepare_previous_invoices_domain(inv), limit=1) + invoices = self.search(self._prepare_previous_invoices_domain(inv), limit=1) if invoices: date_invoice_format = datetime.datetime( year=inv.date_invoice.year, @@ -61,15 +59,18 @@ class AccountInvoice(models.Model): day=inv.date_invoice.day, ) date_invoice_tz = format_date( - self.env, fields.Date.context_today( - self, date_invoice_format)) - raise UserError(_( - "Chronology Error. Please confirm older draft invoices " - "before {date_invoice} and try again.").format( - date_invoice=date_invoice_tz)) + self.env, fields.Date.context_today(self, date_invoice_format) + ) + raise UserError( + _( + "Chronology Error. Please confirm older draft invoices " + "before {date_invoice} and try again." + ).format(date_invoice=date_invoice_tz) + ) if inv not in previously_validated: invoices = self.search( - self._prepare_later_invoices_domain(inv), limit=1) + self._prepare_later_invoices_domain(inv), limit=1 + ) if invoices: date_invoice_format = datetime.datetime( year=inv.date_invoice.year, @@ -77,10 +78,12 @@ class AccountInvoice(models.Model): day=inv.date_invoice.day, ) date_invoice_tz = format_date( - self.env, fields.Date.context_today( - self, date_invoice_format)) - raise UserError(_( - "Chronology Error. There exist at least one invoice " - "with a later date to {date_invoice}.").format( - date_invoice=date_invoice_tz)) + self.env, fields.Date.context_today(self, date_invoice_format) + ) + raise UserError( + _( + "Chronology Error. There exist at least one invoice " + "with a later date to {date_invoice}." + ).format(date_invoice=date_invoice_tz) + ) return res diff --git a/account_invoice_constraint_chronology/model/account_journal.py b/account_invoice_constraint_chronology/model/account_journal.py index 724c1d91..71f83a99 100644 --- a/account_invoice_constraint_chronology/model/account_journal.py +++ b/account_invoice_constraint_chronology/model/account_journal.py @@ -1,18 +1,16 @@ # Copyright 2015-2019 ACSONE SA/NV () # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from odoo import models, fields, api +from odoo import api, fields, models class AccountJournal(models.Model): - _inherit = ['account.journal'] + _inherit = ["account.journal"] - check_chronology = fields.Boolean( - default=False, - ) + check_chronology = fields.Boolean(default=False,) - @api.onchange('type') + @api.onchange("type") def _onchange_type(self): self.ensure_one() - if self.type not in ['sale', 'purchase']: + if self.type not in ["sale", "purchase"]: self.check_chronology = False diff --git a/account_invoice_constraint_chronology/tests/test_account_constraint_chronology.py b/account_invoice_constraint_chronology/tests/test_account_constraint_chronology.py index ad90409b..4a2501c4 100644 --- a/account_invoice_constraint_chronology/tests/test_account_constraint_chronology.py +++ b/account_invoice_constraint_chronology/tests/test_account_constraint_chronology.py @@ -9,44 +9,62 @@ from odoo.tools import DEFAULT_SERVER_DATE_FORMAT class TestAccountConstraintChronology(common.SavepointCase): - @classmethod def setUpClass(cls): super(TestAccountConstraintChronology, cls).setUpClass() # Needed to create invoice - cls.account_type1 = cls.env['account.account.type'].\ - create({'name': 'acc type test 1', - 'type': 'receivable', - 'include_initial_balance': True}) - cls.account_type2 = cls.env['account.account.type']. \ - create({'name': 'acc type test 2', - 'type': 'other', - 'include_initial_balance': True}) - cls.account_account = cls.env['account.account'].\ - create({'name': 'acc test', - 'code': 'X2020', - 'user_type_id': cls.account_type1.id, - 'reconcile': True}) - cls.account_account_line = cls.env['account.account']. \ - create({'name': 'acc inv line test', - 'code': 'X2021', - 'user_type_id': cls.account_type2.id, - 'reconcile': True}) - cls.sequence = cls.env['ir.sequence'].create( - {'name': 'Journal Sale', - 'prefix': 'SALE', 'padding': 6, - 'company_id': cls.env.ref("base.main_company").id}) - cls.account_journal_sale = cls.env['account.journal']\ - .create({'name': 'Sale journal', - 'code': 'SALE', - 'type': 'sale', - 'sequence_id': cls.sequence.id}) - cls.product = cls.env['product.product'].create( - {'name': 'product name'}) - cls.analytic_account = cls.env['account.analytic.account'].\ - create({'name': 'test account'}) + cls.account_type1 = cls.env["account.account.type"].create( + { + "name": "acc type test 1", + "type": "receivable", + "include_initial_balance": True, + } + ) + cls.account_type2 = cls.env["account.account.type"].create( + { + "name": "acc type test 2", + "type": "other", + "include_initial_balance": True, + } + ) + cls.account_account = cls.env["account.account"].create( + { + "name": "acc test", + "code": "X2020", + "user_type_id": cls.account_type1.id, + "reconcile": True, + } + ) + cls.account_account_line = cls.env["account.account"].create( + { + "name": "acc inv line test", + "code": "X2021", + "user_type_id": cls.account_type2.id, + "reconcile": True, + } + ) + cls.sequence = cls.env["ir.sequence"].create( + { + "name": "Journal Sale", + "prefix": "SALE", + "padding": 6, + "company_id": cls.env.ref("base.main_company").id, + } + ) + cls.account_journal_sale = cls.env["account.journal"].create( + { + "name": "Sale journal", + "code": "SALE", + "type": "sale", + "sequence_id": cls.sequence.id, + } + ) + cls.product = cls.env["product.product"].create({"name": "product name"}) + cls.analytic_account = cls.env["account.analytic.account"].create( + {"name": "test account"} + ) def get_journal_check(self, value): journal = self.account_journal_sale.copy() @@ -54,24 +72,28 @@ class TestAccountConstraintChronology(common.SavepointCase): return journal def create_simple_invoice(self, journal_id, date): - invoice = self.env['account.invoice'].create({ - 'partner_id': self.env.ref('base.res_partner_2').id, - 'account_id': self.account_account.id, - 'type': 'in_invoice', - 'journal_id': journal_id, - 'date_invoice': date, - 'state': 'draft', - }) + invoice = self.env["account.invoice"].create( + { + "partner_id": self.env.ref("base.res_partner_2").id, + "account_id": self.account_account.id, + "type": "in_invoice", + "journal_id": journal_id, + "date_invoice": date, + "state": "draft", + } + ) - self.env['account.invoice.line'].create({ - 'product_id': self.product.id, - 'quantity': 1.0, - 'price_unit': 100.0, - 'invoice_id': invoice.id, - 'name': 'product that cost 100', - 'account_id': self.account_account_line.id, - 'account_analytic_id': self.analytic_account.id, - }) + self.env["account.invoice.line"].create( + { + "product_id": self.product.id, + "quantity": 1.0, + "price_unit": 100.0, + "invoice_id": invoice.id, + "name": "product that cost 100", + "account_id": self.account_account_line.id, + "account_analytic_id": self.analytic_account.id, + } + ) return invoice def test_invoice_draft(self): @@ -82,8 +104,9 @@ class TestAccountConstraintChronology(common.SavepointCase): self.create_simple_invoice(journal.id, date) date = today.strftime(DEFAULT_SERVER_DATE_FORMAT) invoice_2 = self.create_simple_invoice(journal.id, date) - self.assertTrue((invoice_2.state == 'draft'), - "Initial invoice state is not Draft") + self.assertTrue( + (invoice_2.state == "draft"), "Initial invoice state is not Draft" + ) with self.assertRaises(UserError): invoice_2.action_invoice_open() @@ -95,8 +118,9 @@ class TestAccountConstraintChronology(common.SavepointCase): self.create_simple_invoice(journal.id, date) date = today.strftime(DEFAULT_SERVER_DATE_FORMAT) invoice_2 = self.create_simple_invoice(journal.id, date) - self.assertTrue((invoice_2.state == 'draft'), - "Initial invoice state is not Draft") + self.assertTrue( + (invoice_2.state == "draft"), "Initial invoice state is not Draft" + ) self.assertTrue(invoice_2.action_invoice_open()) def test_invoice_validate(self): @@ -105,13 +129,15 @@ class TestAccountConstraintChronology(common.SavepointCase): tomorrow = today + timedelta(days=1) date_tomorrow = tomorrow.strftime(DEFAULT_SERVER_DATE_FORMAT) invoice_1 = self.create_simple_invoice(journal.id, date_tomorrow) - self.assertTrue((invoice_1.state == 'draft'), - "Initial invoice state is not Draft") + self.assertTrue( + (invoice_1.state == "draft"), "Initial invoice state is not Draft" + ) invoice_1.action_invoice_open() date = today.strftime(DEFAULT_SERVER_DATE_FORMAT) invoice_2 = self.create_simple_invoice(journal.id, date) - self.assertTrue((invoice_2.state == 'draft'), - "Initial invoice state is not Draft") + self.assertTrue( + (invoice_2.state == "draft"), "Initial invoice state is not Draft" + ) with self.assertRaises(UserError): invoice_2.action_invoice_open() @@ -122,15 +148,16 @@ class TestAccountConstraintChronology(common.SavepointCase): date = yesterday.strftime(DEFAULT_SERVER_DATE_FORMAT) self.create_simple_invoice(journal.id, date) invoice_2 = self.create_simple_invoice(journal.id, False) - self.assertTrue((invoice_2.state == 'draft'), - "Initial invoice state is not Draft") + self.assertTrue( + (invoice_2.state == "draft"), "Initial invoice state is not Draft" + ) with self.assertRaises(UserError): invoice_2.action_invoice_open() def test_journal_change_type(self): self.account_journal_sale.check_chronology = True self.assertTrue(self.account_journal_sale.check_chronology) - self.account_journal_sale.type = 'bank' + self.account_journal_sale.type = "bank" self.account_journal_sale._onchange_type() self.assertFalse(self.account_journal_sale.check_chronology) diff --git a/account_invoice_constraint_chronology/view/account_view.xml b/account_invoice_constraint_chronology/view/account_view.xml index 142302b9..718bbe94 100644 --- a/account_invoice_constraint_chronology/view/account_view.xml +++ b/account_invoice_constraint_chronology/view/account_view.xml @@ -1,15 +1,17 @@ - + account.journal.form (account_constraint_chronology) account.journal - + - +