diff --git a/account_move_fiscal_month/__manifest__.py b/account_move_fiscal_month/__manifest__.py
index 7e654869..3b36882d 100644
--- a/account_move_fiscal_month/__manifest__.py
+++ b/account_move_fiscal_month/__manifest__.py
@@ -2,17 +2,12 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
{
- 'name': 'Account Move Fiscal Month',
- 'summary': """Display the fiscal month on journal entries/item""",
- 'version': '12.0.1.1.1',
- 'license': 'AGPL-3',
- 'author': 'ACSONE SA/NV,Odoo Community Association (OCA)',
- 'website': 'https://github.com/OCA/account-financial-tools',
- 'depends': [
- 'account_fiscal_month',
- ],
- 'data': [
- 'views/account_move.xml',
- 'views/account_move_line.xml',
- ],
+ "name": "Account Move Fiscal Month",
+ "summary": """Display the fiscal month on journal entries/item""",
+ "version": "12.0.1.1.1",
+ "license": "AGPL-3",
+ "author": "ACSONE SA/NV,Odoo Community Association (OCA)",
+ "website": "https://github.com/OCA/account-financial-tools",
+ "depends": ["account_fiscal_month",],
+ "data": ["views/account_move.xml", "views/account_move_line.xml",],
}
diff --git a/account_move_fiscal_month/models/account_move.py b/account_move_fiscal_month/models/account_move.py
index fd571baf..9da846e0 100644
--- a/account_move_fiscal_month/models/account_move.py
+++ b/account_move_fiscal_month/models/account_move.py
@@ -7,39 +7,45 @@ from odoo.osv import expression
class AccountMove(models.Model):
- _inherit = 'account.move'
+ _inherit = "account.move"
date_range_fm_id = fields.Many2one(
- comodel_name='date.range', string="Fiscal month",
- compute='_compute_date_range_fm', search='_search_date_range_fm',
+ comodel_name="date.range",
+ string="Fiscal month",
+ compute="_compute_date_range_fm",
+ search="_search_date_range_fm",
)
@api.multi
- @api.depends('date', 'company_id')
+ @api.depends("date", "company_id")
def _compute_date_range_fm(self):
for rec in self:
date = rec.date
company = rec.company_id
- rec.date_range_fm_id =\
- company and company.find_daterange_fm(date) or False
+ rec.date_range_fm_id = company and company.find_daterange_fm(date) or False
@api.model
def _search_date_range_fm(self, operator, value):
- if operator in ('=', '!=', 'in', 'not in'):
- date_range_domain = [('id', operator, value)]
+ if operator in ("=", "!=", "in", "not in"):
+ date_range_domain = [("id", operator, value)]
else:
- date_range_domain = [('name', operator, value)]
+ date_range_domain = [("name", operator, value)]
- date_ranges = self.env['date.range'].search(date_range_domain)
+ date_ranges = self.env["date.range"].search(date_range_domain)
domain = []
for date_range in date_ranges:
- domain = expression.OR([domain, [
- '&',
- '&',
- ('date', '>=', date_range.date_start),
- ('date', '<=', date_range.date_end),
- '|',
- ('company_id', '=', False),
- ('company_id', '=', date_range.company_id.id),
- ]])
+ domain = expression.OR(
+ [
+ domain,
+ [
+ "&",
+ "&",
+ ("date", ">=", date_range.date_start),
+ ("date", "<=", date_range.date_end),
+ "|",
+ ("company_id", "=", False),
+ ("company_id", "=", date_range.company_id.id),
+ ],
+ ]
+ )
return domain
diff --git a/account_move_fiscal_month/models/account_move_line.py b/account_move_fiscal_month/models/account_move_line.py
index 1ba739ed..042d5fec 100644
--- a/account_move_fiscal_month/models/account_move_line.py
+++ b/account_move_fiscal_month/models/account_move_line.py
@@ -6,8 +6,6 @@ from odoo import fields, models
class AccountMoveLine(models.Model):
- _inherit = 'account.move.line'
+ _inherit = "account.move.line"
- date_range_fm_id = fields.Many2one(
- related='move_id.date_range_fm_id',
- )
+ date_range_fm_id = fields.Many2one(related="move_id.date_range_fm_id",)
diff --git a/account_move_fiscal_month/tests/test_account_move_fiscal_month.py b/account_move_fiscal_month/tests/test_account_move_fiscal_month.py
index e140f5dd..e76a951e 100644
--- a/account_move_fiscal_month/tests/test_account_move_fiscal_month.py
+++ b/account_move_fiscal_month/tests/test_account_move_fiscal_month.py
@@ -6,150 +6,191 @@ from odoo.tests.common import TransactionCase
class TestAccountMoveFiscalMonth(TransactionCase):
-
def setUp(self):
super(TestAccountMoveFiscalMonth, self).setUp()
- self.AccountObj = self.env['account.account']
- self.AccountJournalObj = self.env['account.journal']
- self.AccountMoveObj = self.env['account.move']
- self.DateRangeObj = self.env['date.range']
+ self.AccountObj = self.env["account.account"]
+ self.AccountJournalObj = self.env["account.journal"]
+ self.AccountMoveObj = self.env["account.move"]
+ self.DateRangeObj = self.env["date.range"]
- self.bank_journal = self.AccountJournalObj.search([
- ('type', '=', 'bank')
- ], limit=1)
+ self.bank_journal = self.AccountJournalObj.search(
+ [("type", "=", "bank")], limit=1
+ )
- self.account_type_recv = self.env.ref(
- 'account.data_account_type_receivable')
- self.account_type_rev = self.env.ref(
- 'account.data_account_type_revenue')
+ self.account_type_recv = self.env.ref("account.data_account_type_receivable")
+ self.account_type_rev = self.env.ref("account.data_account_type_revenue")
- self.account_recv = self.AccountObj.create({
- 'code': 'RECV_DR',
- 'name': "Receivable (test)",
- 'reconcile': True,
- 'user_type_id': self.account_type_recv.id,
- })
- self.account_sale = self.AccountObj.create({
- 'code': 'SALE_DR',
- 'name': "Receivable (sale)",
- 'reconcile': True,
- 'user_type_id': self.account_type_rev.id,
- })
+ self.account_recv = self.AccountObj.create(
+ {
+ "code": "RECV_DR",
+ "name": "Receivable (test)",
+ "reconcile": True,
+ "user_type_id": self.account_type_recv.id,
+ }
+ )
+ self.account_sale = self.AccountObj.create(
+ {
+ "code": "SALE_DR",
+ "name": "Receivable (sale)",
+ "reconcile": True,
+ "user_type_id": self.account_type_rev.id,
+ }
+ )
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_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,
- })
+ 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,
+ }
+ )
- self.date_range_february_2017 = self.DateRangeObj.create({
- 'name': "February 2017",
- 'date_start': '2017-02-01',
- 'date_end': '2017-02-28',
- 'type_id': self.date_range_type_month.id,
- })
+ self.date_range_february_2017 = self.DateRangeObj.create(
+ {
+ "name": "February 2017",
+ "date_start": "2017-02-01",
+ "date_end": "2017-02-28",
+ "type_id": self.date_range_type_month.id,
+ }
+ )
- self.date_range_january_2018 = self.DateRangeObj.create({
- 'name': "January 2018",
- 'date_start': '2018-01-01',
- 'date_end': '2018-01-31',
- 'type_id': self.date_range_type_month.id,
- })
+ self.date_range_january_2018 = self.DateRangeObj.create(
+ {
+ "name": "January 2018",
+ "date_start": "2018-01-01",
+ "date_end": "2018-01-31",
+ "type_id": self.date_range_type_month.id,
+ }
+ )
def create_account_move(self, date_str):
- return self.AccountMoveObj.create({
- 'journal_id': self.bank_journal.id,
- 'date': date_str,
- 'line_ids': [
- (0, 0, {
- 'name': "Debit",
- 'debit': 1000,
- 'account_id': self.account_recv.id,
- }),
- (0, 0, {
- 'name': "Credit",
- 'credit': 1000,
- 'account_id': self.account_sale.id,
- }),
- ]
- })
+ return self.AccountMoveObj.create(
+ {
+ "journal_id": self.bank_journal.id,
+ "date": date_str,
+ "line_ids": [
+ (
+ 0,
+ 0,
+ {
+ "name": "Debit",
+ "debit": 1000,
+ "account_id": self.account_recv.id,
+ },
+ ),
+ (
+ 0,
+ 0,
+ {
+ "name": "Credit",
+ "credit": 1000,
+ "account_id": self.account_sale.id,
+ },
+ ),
+ ],
+ }
+ )
def test_01_account_move_date_range_fm_id_compute(self):
- january_1st = Date.from_string('2017-01-01')
+ january_1st = Date.from_string("2017-01-01")
move = self.create_account_move(january_1st)
self.assertEquals(
- move.date_range_fm_id, self.date_range_january_2017,
- msg="Move period should be January 2017")
- self.assertTrue(all([
- line.date_range_fm_id == self.date_range_january_2017
- for line in move.line_ids
- ]), msg="All lines period should be January 2017")
+ move.date_range_fm_id,
+ self.date_range_january_2017,
+ msg="Move period should be January 2017",
+ )
+ self.assertTrue(
+ all(
+ [
+ line.date_range_fm_id == self.date_range_january_2017
+ for line in move.line_ids
+ ]
+ ),
+ msg="All lines period should be January 2017",
+ )
- march_1st = Date.from_string('2017-03-01')
+ march_1st = Date.from_string("2017-03-01")
move = self.create_account_move(march_1st)
self.assertFalse(
- bool(move.date_range_fm_id),
- msg="Move shouldn't have any date range")
+ bool(move.date_range_fm_id), msg="Move shouldn't have any date range"
+ )
def test_02_account_move_date_range_fm_id_search(self):
- january_2017_1st = Date.from_string('2017-01-01')
- february_2017_1st = Date.from_string('2017-02-01')
- march_2017_1st = Date.from_string('2017-03-01')
- january_2018_1st = Date.from_string('2018-01-01')
+ january_2017_1st = Date.from_string("2017-01-01")
+ february_2017_1st = Date.from_string("2017-02-01")
+ march_2017_1st = Date.from_string("2017-03-01")
+ january_2018_1st = Date.from_string("2018-01-01")
move_jan_2017 = self.create_account_move(january_2017_1st)
move_feb_2017 = self.create_account_move(february_2017_1st)
move_march_2017 = self.create_account_move(march_2017_1st)
move_jan_2018 = self.create_account_move(january_2018_1st)
- moves = self.AccountMoveObj.search([
- ('date_range_fm_id', 'ilike', 'January'),
- ])
+ moves = self.AccountMoveObj.search([("date_range_fm_id", "ilike", "January"),])
- self.assertTrue(all([
- move_jan_2017 in moves,
- move_feb_2017 not in moves,
- move_march_2017 not in moves,
- move_jan_2018 in moves,
- ]), msg="There should be only moves in January")
+ self.assertTrue(
+ all(
+ [
+ move_jan_2017 in moves,
+ move_feb_2017 not in moves,
+ move_march_2017 not in moves,
+ move_jan_2018 in moves,
+ ]
+ ),
+ msg="There should be only moves in January",
+ )
- moves = self.AccountMoveObj.search([
- ('date_range_fm_id', 'ilike', '2017'),
- ])
+ moves = self.AccountMoveObj.search([("date_range_fm_id", "ilike", "2017"),])
- self.assertTrue(all([
- move_jan_2017 in moves,
- move_feb_2017 in moves,
- move_march_2017 not in moves,
- move_jan_2018 not in moves,
- ]))
+ self.assertTrue(
+ all(
+ [
+ move_jan_2017 in moves,
+ move_feb_2017 in moves,
+ move_march_2017 not in moves,
+ move_jan_2018 not in moves,
+ ]
+ )
+ )
- moves = self.AccountMoveObj.search([
- ('date_range_fm_id', '=', self.date_range_january_2017.id),
- ])
+ moves = self.AccountMoveObj.search(
+ [("date_range_fm_id", "=", self.date_range_january_2017.id),]
+ )
- self.assertTrue(all([
- move_jan_2017 in moves,
- move_feb_2017 not in moves,
- move_march_2017 not in moves,
- move_jan_2018 not in moves,
- ]))
+ self.assertTrue(
+ all(
+ [
+ move_jan_2017 in moves,
+ move_feb_2017 not in moves,
+ move_march_2017 not in moves,
+ move_jan_2018 not in moves,
+ ]
+ )
+ )
- moves = self.AccountMoveObj.search([
- ('date_range_fm_id', 'in', (
- self.date_range_january_2017.id,
- self.date_range_february_2017.id
- )),
- ])
+ moves = self.AccountMoveObj.search(
+ [
+ (
+ "date_range_fm_id",
+ "in",
+ (self.date_range_january_2017.id, self.date_range_february_2017.id),
+ ),
+ ]
+ )
- self.assertTrue(all([
- move_jan_2017 in moves,
- move_feb_2017 in moves,
- move_march_2017 not in moves,
- move_jan_2018 not in moves,
- ]))
+ self.assertTrue(
+ all(
+ [
+ move_jan_2017 in moves,
+ move_feb_2017 in moves,
+ move_march_2017 not in moves,
+ move_jan_2018 not in moves,
+ ]
+ )
+ )
diff --git a/account_move_fiscal_month/views/account_move.xml b/account_move_fiscal_month/views/account_move.xml
index 0abf17f6..80633841 100644
--- a/account_move_fiscal_month/views/account_move.xml
+++ b/account_move_fiscal_month/views/account_move.xml
@@ -1,46 +1,35 @@
-
+
-
-
account.move.form (in account_move_fiscal_month)
account.move
-
+
-
-
+
-
-
account.move.search (in account_move_fiscal_month)
account.move
-
+
-
-
+
-
-
account.move.tree (in account_move_fiscal_month)
account.move
-
+
-
-
+
-
-
diff --git a/account_move_fiscal_month/views/account_move_line.xml b/account_move_fiscal_month/views/account_move_line.xml
index 524aa429..53170821 100644
--- a/account_move_fiscal_month/views/account_move_line.xml
+++ b/account_move_fiscal_month/views/account_move_line.xml
@@ -1,46 +1,41 @@
-
+
-
-
- account.move.line.form (in account_move_line_fiscal_month)
+ account.move.line.form (in account_move_line_fiscal_month)
account.move.line
-
+
-
-
+
-
-
- account.move.line.search (in account_move_line_fiscal_month)
+ account.move.line.search (in account_move_line_fiscal_month)
account.move.line
-
+
-
-
+
-
-
- account.move.line.tree (in account_move_line_fiscal_month)
+ account.move.line.tree (in account_move_line_fiscal_month)
account.move.line
-
+
-
-
+
-
-