diff --git a/account_fiscal_month/__manifest__.py b/account_fiscal_month/__manifest__.py index a619b158..f740585b 100644 --- a/account_fiscal_month/__manifest__.py +++ b/account_fiscal_month/__manifest__.py @@ -2,18 +2,12 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { - 'name': 'Account Fiscal Month', - 'summary': """Provide a fiscal month date range type""", - 'version': '12.0.1.0.0', - 'license': 'AGPL-3', - 'author': 'ACSONE SA/NV, Odoo Community Association (OCA)', - 'website': 'https://github.com/OCA/account-financial-tools', - 'depends': [ - 'account', - 'date_range', - ], - 'data': [ - 'data/date_range_type.xml', - 'views/date_range_type.xml', - ], + "name": "Account Fiscal Month", + "summary": """Provide a fiscal month date range type""", + "version": "12.0.1.0.0", + "license": "AGPL-3", + "author": "ACSONE SA/NV, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/account-financial-tools", + "depends": ["account", "date_range",], + "data": ["data/date_range_type.xml", "views/date_range_type.xml",], } diff --git a/account_fiscal_month/data/date_range_type.xml b/account_fiscal_month/data/date_range_type.xml index 8a7dfb4a..09b13d83 100644 --- a/account_fiscal_month/data/date_range_type.xml +++ b/account_fiscal_month/data/date_range_type.xml @@ -1,13 +1,10 @@ - + - - Fiscal month - - + + - diff --git a/account_fiscal_month/models/date_range_type.py b/account_fiscal_month/models/date_range_type.py index 7c3c23f1..0bb33d29 100644 --- a/account_fiscal_month/models/date_range_type.py +++ b/account_fiscal_month/models/date_range_type.py @@ -1,20 +1,20 @@ # Copyright 2017 ACSONE SA/NV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import api, fields, models, _ +from odoo import _, api, fields, models from odoo.exceptions import UserError class DateRangeType(models.Model): - _inherit = 'date.range.type' + _inherit = "date.range.type" fiscal_month = fields.Boolean(string="Is fiscal month?", readonly=True) @api.multi def unlink(self): date_range_type_fm = self.env.ref( - 'account_fiscal_month.date_range_fiscal_month') + "account_fiscal_month.date_range_fiscal_month" + ) if date_range_type_fm.id in self.ids: - raise UserError(_("You can't delete date range type: " - "Fiscal month")) + raise UserError(_("You can't delete date range type: " "Fiscal month")) return super(DateRangeType, self).unlink() diff --git a/account_fiscal_month/models/res_company.py b/account_fiscal_month/models/res_company.py index bbeddc8f..361231c2 100644 --- a/account_fiscal_month/models/res_company.py +++ b/account_fiscal_month/models/res_company.py @@ -6,17 +6,21 @@ from odoo import api, models class ResCompany(models.Model): - _inherit = 'res.company' + _inherit = "res.company" @api.multi def find_daterange_fm(self, date_str): self.ensure_one() - fm_id = self.env.ref('account_fiscal_month.date_range_fiscal_month') - return self.env['date.range'].search([ - ('type_id', '=', fm_id.id), - ('date_start', '<=', date_str), - ('date_end', '>=', date_str), - '|', - ('company_id', '=', self.id), - ('company_id', '=', False), - ], limit=1, order='company_id asc') + fm_id = self.env.ref("account_fiscal_month.date_range_fiscal_month") + return self.env["date.range"].search( + [ + ("type_id", "=", fm_id.id), + ("date_start", "<=", date_str), + ("date_end", ">=", date_str), + "|", + ("company_id", "=", self.id), + ("company_id", "=", False), + ], + limit=1, + order="company_id asc", + ) diff --git a/account_fiscal_month/tests/test_account_fiscal_month.py b/account_fiscal_month/tests/test_account_fiscal_month.py index dc5f8d53..058a7e04 100644 --- a/account_fiscal_month/tests/test_account_fiscal_month.py +++ b/account_fiscal_month/tests/test_account_fiscal_month.py @@ -1,53 +1,60 @@ # Copyright 2017 ACSONE SA/NV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from psycopg2 import IntegrityError + from odoo.exceptions import UserError from odoo.fields import Date from odoo.tests.common import TransactionCase from odoo.tools import mute_logger -from psycopg2 import IntegrityError class TestAccountFiscalMonth(TransactionCase): - def setUp(self): super(TestAccountFiscalMonth, self).setUp() - self.DateRangeObj = self.env['date.range'] - self.DateRangeType = self.env['date.range.type'] + self.DateRangeObj = self.env["date.range"] + self.DateRangeType = self.env["date.range.type"] - self.company = self.env.ref('base.main_company') + self.company = self.env.ref("base.main_company") self.date_range_type = self.DateRangeType.create( - {'name': 'Other Type', - 'allow_overlap': False}) + {"name": "Other Type", "allow_overlap": False} + ) self.date_range_type_month = self.env.ref( - 'account_fiscal_month.date_range_fiscal_month') + "account_fiscal_month.date_range_fiscal_month" + ) - self.date_range_1 = self.DateRangeObj.create({ - 'name': "Other", - 'date_start': '2017-01-01', - 'date_end': '2017-01-31', - 'type_id': self.date_range_type.id, - 'company_id': self.company.id, - }) + self.date_range_1 = self.DateRangeObj.create( + { + "name": "Other", + "date_start": "2017-01-01", + "date_end": "2017-01-31", + "type_id": self.date_range_type.id, + "company_id": self.company.id, + } + ) - self.date_range_january_2017 = self.DateRangeObj.create({ - 'name': "January 2017", - 'date_start': '2017-01-01', - 'date_end': '2017-01-31', - 'type_id': self.date_range_type_month.id, - 'company_id': self.company.id, - }) - self.date_range_january_no_comp_2017 = self.DateRangeObj.create({ - 'name': "January 2017", - 'date_start': '2017-01-01', - 'date_end': '2017-01-31', - 'type_id': self.date_range_type_month.id, - 'company_id': False, - }) + self.date_range_january_2017 = self.DateRangeObj.create( + { + "name": "January 2017", + "date_start": "2017-01-01", + "date_end": "2017-01-31", + "type_id": self.date_range_type_month.id, + "company_id": self.company.id, + } + ) + self.date_range_january_no_comp_2017 = self.DateRangeObj.create( + { + "name": "January 2017", + "date_start": "2017-01-01", + "date_end": "2017-01-31", + "type_id": self.date_range_type_month.id, + "company_id": False, + } + ) def test_00_delete_type(self): - with self.assertRaises(IntegrityError), mute_logger('odoo.sql_db'): + with self.assertRaises(IntegrityError), mute_logger("odoo.sql_db"): self.date_range_type.unlink() def test_01_delete_type_fiscal_month(self): @@ -55,7 +62,7 @@ class TestAccountFiscalMonth(TransactionCase): self.date_range_type_month.unlink() def test_02_search_date_range(self): - january_2017_1st = Date.from_string('2017-01-01') + january_2017_1st = Date.from_string("2017-01-01") date_ranges = self.company.find_daterange_fm(january_2017_1st) self.assertEquals(len(date_ranges), 1) diff --git a/account_fiscal_month/views/date_range_type.xml b/account_fiscal_month/views/date_range_type.xml index 67b59302..cf80ac22 100644 --- a/account_fiscal_month/views/date_range_type.xml +++ b/account_fiscal_month/views/date_range_type.xml @@ -1,33 +1,25 @@ - + - - date.range.type.form (in account_fiscal_month) date.range.type - + - - + - - date.range.type.tree (in account_fiscal_month) date.range.type - + - - + - -