[IMP] account_move_fiscal_month: black, isort, prettier

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",],
 }

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

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",)

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,
+                ]
+            )
+        )

account_move_fiscal_month/views/account_move.xml

@@ -1,46 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2017 ACSONE SA/NV
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <odoo>
-
     <record model="ir.ui.view" id="account_move_form_view">
         <field name="name">account.move.form (in account_move_fiscal_month)</field>
         <field name="model">account.move</field>
-        <field name="inherit_id" ref="account.view_move_form"/>
+        <field name="inherit_id" ref="account.view_move_form" />
         <field name="arch" type="xml">
-
             <field name="date" position="after">
-                <field name="date_range_fm_id" options="{'no_open': True}"/>
+                <field name="date_range_fm_id" options="{'no_open': True}" />
             </field>
-
         </field>
     </record>
-
     <record model="ir.ui.view" id="account_move_search_view">
         <field name="name">account.move.search (in account_move_fiscal_month)</field>
         <field name="model">account.move</field>
-        <field name="inherit_id" ref="account.view_account_move_filter"/>
+        <field name="inherit_id" ref="account.view_account_move_filter" />
         <field name="arch" type="xml">
-
             <field name="date" position="after">
-                <field name="date_range_fm_id"/>
+                <field name="date_range_fm_id" />
             </field>
-
         </field>
     </record>
-
     <record model="ir.ui.view" id="account_move_tree_view">
         <field name="name">account.move.tree (in account_move_fiscal_month)</field>
         <field name="model">account.move</field>
-        <field name="inherit_id" ref="account.view_move_tree"/>
+        <field name="inherit_id" ref="account.view_move_tree" />
         <field name="arch" type="xml">
-
             <field name="date" position="after">
-                <field name="date_range_fm_id"/>
+                <field name="date_range_fm_id" />
             </field>
-
         </field>
     </record>
-
 </odoo>

account_move_fiscal_month/views/account_move_line.xml

@@ -1,46 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2017 ACSONE SA/NV
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <odoo>
-
     <record model="ir.ui.view" id="account_move_line_form_view">
-        <field name="name">account.move.line.form (in account_move_line_fiscal_month)</field>
+        <field
+            name="name"
+        >account.move.line.form (in account_move_line_fiscal_month)</field>
         <field name="model">account.move.line</field>
-        <field name="inherit_id" ref="account.view_move_line_form"/>
+        <field name="inherit_id" ref="account.view_move_line_form" />
         <field name="arch" type="xml">
-
             <field name="date" position="after">
-                <field name="date_range_fm_id" options="{'no_open': True}"/>
+                <field name="date_range_fm_id" options="{'no_open': True}" />
             </field>
-
         </field>
     </record>
-
     <record model="ir.ui.view" id="account_move_line_search_view">
-        <field name="name">account.move.line.search (in account_move_line_fiscal_month)</field>
+        <field
+            name="name"
+        >account.move.line.search (in account_move_line_fiscal_month)</field>
         <field name="model">account.move.line</field>
-        <field name="inherit_id" ref="account.view_account_move_line_filter"/>
+        <field name="inherit_id" ref="account.view_account_move_line_filter" />
         <field name="arch" type="xml">
-
             <field name="date" position="after">
-                <field name="date_range_fm_id"/>
+                <field name="date_range_fm_id" />
             </field>
-            
         </field>
     </record>
-
     <record model="ir.ui.view" id="account_move_line_tree_view">
-        <field name="name">account.move.line.tree (in account_move_line_fiscal_month)</field>
+        <field
+            name="name"
+        >account.move.line.tree (in account_move_line_fiscal_month)</field>
         <field name="model">account.move.line</field>
-        <field name="inherit_id" ref="account.view_move_line_tree"/>
+        <field name="inherit_id" ref="account.view_move_line_tree" />
         <field name="arch" type="xml">
-
             <field name="date" position="after">
-                <field name="date_range_fm_id"/>
+                <field name="date_range_fm_id" />
             </field>
-
         </field>
     </record>
-
 </odoo>