From 01a2998bf22365243ae5fe88b78e8a463fd5d96f Mon Sep 17 00:00:00 2001 From: Kitti U Date: Fri, 1 Oct 2021 14:37:13 +0700 Subject: [PATCH] [IMP] account_spread_cost_revenue: black, isort, prettier --- account_spread_cost_revenue/__manifest__.py | 2 +- .../models/account_spread.py | 24 ++++++++++++++---- .../models/account_spread_template.py | 25 ++++++++++++++----- .../static/src/js/account_spread.js | 8 +++--- ...account_spread_invoice_line_link_wizard.py | 4 +-- 5 files changed, 45 insertions(+), 18 deletions(-) diff --git a/account_spread_cost_revenue/__manifest__.py b/account_spread_cost_revenue/__manifest__.py index b04823cb..c72853d3 100644 --- a/account_spread_cost_revenue/__manifest__.py +++ b/account_spread_cost_revenue/__manifest__.py @@ -9,7 +9,7 @@ "author": "Onestein,Odoo Community Association (OCA)", "maintainers": ["astirpe"], "license": "AGPL-3", - "website": "https://github.com/OCA/account-financial-tools/", + "website": "https://github.com/OCA/account-financial-tools", "category": "Accounting & Finance", "depends": ["account"], "data": [ diff --git a/account_spread_cost_revenue/models/account_spread.py b/account_spread_cost_revenue/models/account_spread.py index 93aafc35..78692ee9 100644 --- a/account_spread_cost_revenue/models/account_spread.py +++ b/account_spread_cost_revenue/models/account_spread.py @@ -63,10 +63,22 @@ class AccountSpread(models.Model): compute="_compute_deprecated_accounts" ) is_debit_account_deprecated = fields.Boolean(compute="_compute_deprecated_accounts") - unspread_amount = fields.Float(digits="Account", compute="_compute_amounts",) - unposted_amount = fields.Float(digits="Account", compute="_compute_amounts",) - posted_amount = fields.Float(digits="Account", compute="_compute_amounts",) - total_amount = fields.Float(digits="Account", compute="_compute_amounts",) + unspread_amount = fields.Float( + digits="Account", + compute="_compute_amounts", + ) + unposted_amount = fields.Float( + digits="Account", + compute="_compute_amounts", + ) + posted_amount = fields.Float( + digits="Account", + compute="_compute_amounts", + ) + total_amount = fields.Float( + digits="Account", + compute="_compute_amounts", + ) all_posted = fields.Boolean(compute="_compute_all_posted", store=True) line_ids = fields.One2many( "account.spread.line", "spread_id", string="Spread Lines" @@ -92,7 +104,9 @@ class AccountSpread(models.Model): store=True, ) invoice_id = fields.Many2one( - related="invoice_line_id.move_id", readonly=True, store=True, + related="invoice_line_id.move_id", + readonly=True, + store=True, ) estimated_amount = fields.Float(digits="Account") company_id = fields.Many2one( diff --git a/account_spread_cost_revenue/models/account_spread_template.py b/account_spread_cost_revenue/models/account_spread_template.py index 0f3e3859..56944a71 100644 --- a/account_spread_cost_revenue/models/account_spread_template.py +++ b/account_spread_cost_revenue/models/account_spread_template.py @@ -178,10 +178,23 @@ class AccountSpreadTemplateAuto(models.Model): ondelete="cascade", index=True, ) - company_id = fields.Many2one(related="template_id.company_id", store=True,) - name = fields.Char(required=True, default="/",) - product_id = fields.Many2one(comodel_name="product.product", string="Product",) - account_id = fields.Many2one(comodel_name="account.account", string="Account",) - analytic_account_id = fields.Many2one( - comodel_name="account.analytic.account", string="Analytic", + company_id = fields.Many2one( + related="template_id.company_id", + store=True, + ) + name = fields.Char( + required=True, + default="/", + ) + product_id = fields.Many2one( + comodel_name="product.product", + string="Product", + ) + account_id = fields.Many2one( + comodel_name="account.account", + string="Account", + ) + analytic_account_id = fields.Many2one( + comodel_name="account.analytic.account", + string="Analytic", ) diff --git a/account_spread_cost_revenue/static/src/js/account_spread.js b/account_spread_cost_revenue/static/src/js/account_spread.js index 70fb91d9..bfe23f58 100644 --- a/account_spread_cost_revenue/static/src/js/account_spread.js +++ b/account_spread_cost_revenue/static/src/js/account_spread.js @@ -1,4 +1,4 @@ -odoo.define("account_spread_cost_revenue.widget", function(require) { +odoo.define("account_spread_cost_revenue.widget", function (require) { "use strict"; var AbstractField = require("web.AbstractField"); @@ -16,7 +16,7 @@ odoo.define("account_spread_cost_revenue.widget", function(require) { /** * @override */ - isSet: function() { + isSet: function () { return this.value !== "unavailable"; }, @@ -24,7 +24,7 @@ odoo.define("account_spread_cost_revenue.widget", function(require) { * @override * @private */ - _render: function() { + _render: function () { var className = ""; var style = "btn fa fa-arrow-circle-right o_spread_line "; var title = ""; @@ -45,7 +45,7 @@ odoo.define("account_spread_cost_revenue.widget", function(require) { * @private * @param {MouseEvent} event */ - _onClick: function(event) { + _onClick: function (event) { event.stopPropagation(); this.trigger_up("button_clicked", { attrs: { diff --git a/account_spread_cost_revenue/wizards/account_spread_invoice_line_link_wizard.py b/account_spread_cost_revenue/wizards/account_spread_invoice_line_link_wizard.py index 0e04b2e2..ee4d74d9 100644 --- a/account_spread_cost_revenue/wizards/account_spread_invoice_line_link_wizard.py +++ b/account_spread_cost_revenue/wizards/account_spread_invoice_line_link_wizard.py @@ -46,7 +46,8 @@ class AccountSpreadInvoiceLineLinkWizard(models.TransientModel): store=True, ) spread_invoice_type_domain_ids = fields.One2many( - "account.spread", compute="_compute_spread_invoice_type_domain", + "account.spread", + compute="_compute_spread_invoice_type_domain", ) spread_id = fields.Many2one( "account.spread", @@ -115,7 +116,6 @@ class AccountSpreadInvoiceLineLinkWizard(models.TransientModel): def _inverse_spread_journal_account(self): """Keep this for making the fields editable""" - pass @api.depends("company_id", "invoice_type") def _compute_spread_invoice_type_domain(self):