From 489618e6f77026d112dbd9ca1c9a4ca42b318417 Mon Sep 17 00:00:00 2001 From: AaronHForgeFlow Date: Fri, 16 Jul 2021 12:22:47 +0200 Subject: [PATCH] [IMP] account_mass_reconcile_by_sale_line: black, isort, prettier --- .../__manifest__.py | 11 ++---- .../models/advanced_reconciliation.py | 17 +++++---- .../models/base_advanced_reconciliation.py | 6 +-- .../models/mass_reconcile.py | 8 ++-- .../views/mass_reconcile.xml | 38 +++++++++++-------- 5 files changed, 42 insertions(+), 38 deletions(-) diff --git a/account_mass_reconcile_by_sale_line/__manifest__.py b/account_mass_reconcile_by_sale_line/__manifest__.py index f8948b6b..7dbc0220 100644 --- a/account_mass_reconcile_by_sale_line/__manifest__.py +++ b/account_mass_reconcile_by_sale_line/__manifest__.py @@ -5,17 +5,12 @@ "name": "Account Mass Reconcile by Sale Line", "summary": "Allows to reconcile based on the SO line", "version": "11.0.1.0.0", - "author": "ForgeFlow S.L., " - "Odoo Community Association (OCA)", + "author": "ForgeFlow S.L., " "Odoo Community Association (OCA)", "website": "https://github.com/OCA/bank-statement-reconcile", "category": "Finance", - "depends": ["account_mass_reconcile", - "account_move_line_sale_info" - ], + "depends": ["account_mass_reconcile", "account_move_line_sale_info"], "license": "AGPL-3", - "data": [ - "views/mass_reconcile.xml", - ], + "data": ["views/mass_reconcile.xml",], "installable": True, "auto_install": False, } diff --git a/account_mass_reconcile_by_sale_line/models/advanced_reconciliation.py b/account_mass_reconcile_by_sale_line/models/advanced_reconciliation.py index 6436d020..afede3f1 100644 --- a/account_mass_reconcile_by_sale_line/models/advanced_reconciliation.py +++ b/account_mass_reconcile_by_sale_line/models/advanced_reconciliation.py @@ -5,8 +5,8 @@ from odoo import models class MassReconcileAdvancedByPurchaseLine(models.TransientModel): - _name = 'mass.reconcile.advanced.by.sale.line' - _inherit = 'mass.reconcile.advanced' + _name = "mass.reconcile.advanced.by.sale.line" + _inherit = "mass.reconcile.advanced" @staticmethod def _skip_line(move_line): @@ -15,15 +15,16 @@ class MassReconcileAdvancedByPurchaseLine(models.TransientModel): will be skipped for reconciliation. Can be inherited to skip on some conditions. ie: ref or partner_id is empty. """ - return not (move_line.get('product_id') and - move_line.get('sale_line_id')) + return not (move_line.get("product_id") and move_line.get("sale_line_id")) @staticmethod def _matchers(move_line): - return (('product_id', move_line['product_id']), - ('sale_line_id', move_line['sale_line_id'])) + return ( + ("product_id", move_line["product_id"]), + ("sale_line_id", move_line["sale_line_id"]), + ) @staticmethod def _opposite_matchers(move_line): - yield ('product_id', move_line['product_id']) - yield ('sale_line_id', move_line['sale_line_id']) + yield ("product_id", move_line["product_id"]) + yield ("sale_line_id", move_line["sale_line_id"]) diff --git a/account_mass_reconcile_by_sale_line/models/base_advanced_reconciliation.py b/account_mass_reconcile_by_sale_line/models/base_advanced_reconciliation.py index 1c3a1720..63a3f2b0 100644 --- a/account_mass_reconcile_by_sale_line/models/base_advanced_reconciliation.py +++ b/account_mass_reconcile_by_sale_line/models/base_advanced_reconciliation.py @@ -5,10 +5,10 @@ from odoo import models class MassReconcileAdvanced(models.AbstractModel): - _inherit = 'mass.reconcile.advanced' + _inherit = "mass.reconcile.advanced" def _selection_columns(self): aml_cols = super(MassReconcileAdvanced, self)._selection_columns() - aml_cols.append('account_move_line.sale_line_id') - aml_cols.append('account_move_line.product_id') + aml_cols.append("account_move_line.sale_line_id") + aml_cols.append("account_move_line.product_id") return aml_cols diff --git a/account_mass_reconcile_by_sale_line/models/mass_reconcile.py b/account_mass_reconcile_by_sale_line/models/mass_reconcile.py index 149810b1..457d7f0c 100644 --- a/account_mass_reconcile_by_sale_line/models/mass_reconcile.py +++ b/account_mass_reconcile_by_sale_line/models/mass_reconcile.py @@ -5,12 +5,14 @@ from odoo import models class AccountMassReconcileMethod(models.Model): - _inherit = 'account.mass.reconcile.method' + _inherit = "account.mass.reconcile.method" def _selection_name(self): methods = super(AccountMassReconcileMethod, self)._selection_name() methods += [ - ('mass.reconcile.advanced.by.sale.line', - 'Advanced. Product, sale order line.'), + ( + "mass.reconcile.advanced.by.sale.line", + "Advanced. Product, sale order line.", + ), ] return methods diff --git a/account_mass_reconcile_by_sale_line/views/mass_reconcile.xml b/account_mass_reconcile_by_sale_line/views/mass_reconcile.xml index ad198868..3804d57b 100644 --- a/account_mass_reconcile_by_sale_line/views/mass_reconcile.xml +++ b/account_mass_reconcile_by_sale_line/views/mass_reconcile.xml @@ -1,18 +1,24 @@ - + - - account.mass.reconcile.form - 20 - account.mass.reconcile - - - - - - - - - + + account.mass.reconcile.form + 20 + account.mass.reconcile + + + + + + + + +