From 4dae2cdaa89f8fce994451172d61d69f94eb7880 Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Tue, 13 Apr 2021 08:59:27 +0100 Subject: [PATCH] [IMP] mis_builder_cash_flow: black, isort, prettier --- mis_builder_cash_flow/__manifest__.py | 2 +- .../models/account_account.py | 4 ++- .../models/mis_cash_flow_forecast_line.py | 19 +++++++++--- mis_builder_cash_flow/report/mis_cash_flow.py | 30 ++++++++++++++----- .../odoo/addons/mis_builder_cash_flow | 1 + setup/mis_builder_cash_flow/setup.py | 6 ++++ 6 files changed, 49 insertions(+), 13 deletions(-) create mode 120000 setup/mis_builder_cash_flow/odoo/addons/mis_builder_cash_flow create mode 100644 setup/mis_builder_cash_flow/setup.py diff --git a/mis_builder_cash_flow/__manifest__.py b/mis_builder_cash_flow/__manifest__.py index 61fcfb0c..8f2b4566 100644 --- a/mis_builder_cash_flow/__manifest__.py +++ b/mis_builder_cash_flow/__manifest__.py @@ -6,7 +6,7 @@ "version": "13.0.1.0.0", "license": "LGPL-3", "author": "ADHOC SA, " "Odoo Community Association (OCA)", - "website": "https://github.com/OCA/mis-builder", + "website": "https://github.com/OCA/account-financial-reporting", "depends": ["mis_builder"], "data": [ "security/mis_cash_flow_security.xml", diff --git a/mis_builder_cash_flow/models/account_account.py b/mis_builder_cash_flow/models/account_account.py index 2d3c4d66..50cef57e 100644 --- a/mis_builder_cash_flow/models/account_account.py +++ b/mis_builder_cash_flow/models/account_account.py @@ -7,4 +7,6 @@ class AccountAccount(models.Model): _inherit = "account.account" - hide_in_cash_flow = fields.Boolean(string="Hide in Cash Flow?",) + hide_in_cash_flow = fields.Boolean( + string="Hide in Cash Flow?", + ) diff --git a/mis_builder_cash_flow/models/mis_cash_flow_forecast_line.py b/mis_builder_cash_flow/models/mis_cash_flow_forecast_line.py index e01cd3f7..78594fe6 100644 --- a/mis_builder_cash_flow/models/mis_cash_flow_forecast_line.py +++ b/mis_builder_cash_flow/models/mis_cash_flow_forecast_line.py @@ -9,16 +9,27 @@ class MisCashFlowForecastLine(models.Model): _name = "mis.cash_flow.forecast_line" _description = "MIS Cash Flow Forecast Line" - date = fields.Date(required=True, index=True,) + date = fields.Date( + required=True, + index=True, + ) account_id = fields.Many2one( comodel_name="account.account", string="Account", required=True, help="The account of the forecast line is only for informative purpose", ) - partner_id = fields.Many2one(comodel_name="res.partner", string="Partner",) - name = fields.Char(required=True, default="/",) - balance = fields.Float(required=True,) + partner_id = fields.Many2one( + comodel_name="res.partner", + string="Partner", + ) + name = fields.Char( + required=True, + default="/", + ) + balance = fields.Float( + required=True, + ) company_id = fields.Many2one( "res.company", string="Company", diff --git a/mis_builder_cash_flow/report/mis_cash_flow.py b/mis_builder_cash_flow/report/mis_cash_flow.py index 025e3aca..b8cd6d35 100644 --- a/mis_builder_cash_flow/report/mis_cash_flow.py +++ b/mis_builder_cash_flow/report/mis_cash_flow.py @@ -16,7 +16,9 @@ class MisCashFlow(models.Model): index=True, readonly=True, ) - name = fields.Char(readonly=True,) + name = fields.Char( + readonly=True, + ) account_id = fields.Many2one( comodel_name="account.account", string="Account", @@ -25,7 +27,9 @@ class MisCashFlow(models.Model): readonly=True, ) partner_id = fields.Many2one( - comodel_name="res.partner", string="Partner", readonly=True, + comodel_name="res.partner", + string="Partner", + readonly=True, ) move_line_id = fields.Many2one( comodel_name="account.move.line", @@ -40,12 +44,24 @@ class MisCashFlow(models.Model): readonly=True, index=True, ) - credit = fields.Float(readonly=True,) - debit = fields.Float(readonly=True,) - date = fields.Date(readonly=True, index=True,) - reconciled = fields.Boolean(readonly=True,) + credit = fields.Float( + readonly=True, + ) + debit = fields.Float( + readonly=True, + ) + date = fields.Date( + readonly=True, + index=True, + ) + reconciled = fields.Boolean( + readonly=True, + ) full_reconcile_id = fields.Many2one( - "account.full.reconcile", string="Matching Number", readonly=True, index=True, + "account.full.reconcile", + string="Matching Number", + readonly=True, + index=True, ) account_internal_type = fields.Selection( related="account_id.user_type_id.type", readonly=True diff --git a/setup/mis_builder_cash_flow/odoo/addons/mis_builder_cash_flow b/setup/mis_builder_cash_flow/odoo/addons/mis_builder_cash_flow new file mode 120000 index 00000000..e47576b0 --- /dev/null +++ b/setup/mis_builder_cash_flow/odoo/addons/mis_builder_cash_flow @@ -0,0 +1 @@ +../../../../mis_builder_cash_flow \ No newline at end of file diff --git a/setup/mis_builder_cash_flow/setup.py b/setup/mis_builder_cash_flow/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/mis_builder_cash_flow/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)