From 0e178e28f892fc141bf4f30e608830e5507686ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?= Date: Fri, 16 Oct 2020 12:33:50 +0200 Subject: [PATCH] [IMP] contract_sale: black, isort, prettier --- contract_sale/__manifest__.py | 38 ++++++------- .../migrations/12.0.2.0.0/pre-migration.py | 54 ++++++++++++------- contract_sale/security/contract_security.xml | 22 ++++---- .../views/abstract_contract_line.xml | 13 +++-- contract_sale/views/contract.xml | 20 ++++--- contract_sale/views/contract_line.xml | 6 +-- contract_sale/views/contract_template.xml | 7 +-- contract_sale/views/res_partner_view.xml | 6 +-- 8 files changed, 92 insertions(+), 74 deletions(-) diff --git a/contract_sale/__manifest__.py b/contract_sale/__manifest__.py index ccf354848..208728c27 100644 --- a/contract_sale/__manifest__.py +++ b/contract_sale/__manifest__.py @@ -2,26 +2,22 @@ # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html { - 'name': 'Contract from Sale', - 'version': '12.0.3.0.0', - 'category': 'Sales', - 'author': 'Tecnativa, ' - 'Odoo Community Association (OCA)', - 'website': 'https://github.com/OCA/contract', - 'depends': [ - 'sale', - 'contract', + "name": "Contract from Sale", + "version": "12.0.3.0.0", + "category": "Sales", + "author": "Tecnativa, " "Odoo Community Association (OCA)", + "website": "https://github.com/OCA/contract", + "depends": ["sale", "contract"], + "data": [ + "security/ir.model.access.csv", + "security/contract_security.xml", + "views/abstract_contract_line.xml", + "views/contract.xml", + "views/contract_line.xml", + "views/contract_template.xml", + "views/res_partner_view.xml", ], - 'data': [ - 'security/ir.model.access.csv', - 'security/contract_security.xml', - 'views/abstract_contract_line.xml', - 'views/contract.xml', - 'views/contract_line.xml', - 'views/contract_template.xml', - 'views/res_partner_view.xml', - ], - 'license': 'AGPL-3', - 'installable': True, - 'auto_install': True, + "license": "AGPL-3", + "installable": True, + "auto_install": True, } diff --git a/contract_sale/migrations/12.0.2.0.0/pre-migration.py b/contract_sale/migrations/12.0.2.0.0/pre-migration.py index 696654698..78533de77 100644 --- a/contract_sale/migrations/12.0.2.0.0/pre-migration.py +++ b/contract_sale/migrations/12.0.2.0.0/pre-migration.py @@ -10,23 +10,41 @@ _logger = logging.getLogger(__name__) def migrate(cr, version): xmlids_to_rename = [ - ('contract_sale.account_analytic_account_own_salesman', - 'contract_sale.contract_contract_own_salesman'), - ('contract_sale.account_analytic_account_see_all', - 'contract_sale.contract_contract_see_all'), - ('contract_sale.account_analytic_contract_salesman', - 'contract_sale.contract_template_salesman'), - ('contract_sale.account_analytic_contract_sale_manager', - 'contract_sale.contract_template_sale_manager'), - ('contract_sale.account_analytic_invoice_line_saleman', - 'contract_sale.contract_line_saleman'), - ('contract_sale.account_analytic_invoice_line_manager', - 'contract_sale.contract_line_manager'), - ('contract_sale.account_analytic_contract_line_salesman', - 'contract_sale.contract_template_line_salesman'), - ('contract_sale.account_analytic_contract_line_manager', - 'contract_sale.contract_template_line_manager'), - ('contract_sale.account_analytic_account_contract_salesman', - 'contract_sale.contract_contract_salesman'), + ( + "contract_sale.account_analytic_account_own_salesman", + "contract_sale.contract_contract_own_salesman", + ), + ( + "contract_sale.account_analytic_account_see_all", + "contract_sale.contract_contract_see_all", + ), + ( + "contract_sale.account_analytic_contract_salesman", + "contract_sale.contract_template_salesman", + ), + ( + "contract_sale.account_analytic_contract_sale_manager", + "contract_sale.contract_template_sale_manager", + ), + ( + "contract_sale.account_analytic_invoice_line_saleman", + "contract_sale.contract_line_saleman", + ), + ( + "contract_sale.account_analytic_invoice_line_manager", + "contract_sale.contract_line_manager", + ), + ( + "contract_sale.account_analytic_contract_line_salesman", + "contract_sale.contract_template_line_salesman", + ), + ( + "contract_sale.account_analytic_contract_line_manager", + "contract_sale.contract_template_line_manager", + ), + ( + "contract_sale.account_analytic_account_contract_salesman", + "contract_sale.contract_contract_salesman", + ), ] openupgrade.rename_xmlids(cr, xmlids_to_rename) diff --git a/contract_sale/security/contract_security.xml b/contract_sale/security/contract_security.xml index 6d1c6e648..1b8b7aac5 100644 --- a/contract_sale/security/contract_security.xml +++ b/contract_sale/security/contract_security.xml @@ -1,20 +1,22 @@ - + - See Own Contracts - - ['|', ('user_id','=',user.id), ('user_id','=',False)] - + + ['|', ('user_id','=',user.id), ('user_id','=',False)] + See All Contracts - + [(1,'=',1)] - - + (4,ref('account.group_account_invoice'))]" + /> - diff --git a/contract_sale/views/abstract_contract_line.xml b/contract_sale/views/abstract_contract_line.xml index 5fcc060f2..1a8e63089 100644 --- a/contract_sale/views/abstract_contract_line.xml +++ b/contract_sale/views/abstract_contract_line.xml @@ -1,16 +1,19 @@ - + - - contract.abstract.contract.line form view (in contract_sale) + contract.abstract.contract.line form view (in contract_sale) contract.abstract.contract.line - + sale.group_discount_per_so_line - diff --git a/contract_sale/views/contract.xml b/contract_sale/views/contract.xml index 69543bb07..4dd6ff5f4 100644 --- a/contract_sale/views/contract.xml +++ b/contract_sale/views/contract.xml @@ -1,21 +1,27 @@ - + - - contract.contract.form.contract.sale contract.contract - + - - + + diff --git a/contract_sale/views/contract_line.xml b/contract_sale/views/contract_line.xml index 90c499a3a..aab9433c9 100644 --- a/contract_sale/views/contract_line.xml +++ b/contract_sale/views/contract_line.xml @@ -1,16 +1,14 @@ - + - contract.template.line tree view (in contract_sale) contract.line - + sale.group_discount_per_so_line - diff --git a/contract_sale/views/contract_template.xml b/contract_sale/views/contract_template.xml index 1fd7de4d3..edf1f092c 100644 --- a/contract_sale/views/contract_template.xml +++ b/contract_sale/views/contract_template.xml @@ -1,17 +1,14 @@ - + - contract.template form view (in contract_sale) contract.template - + sale.group_discount_per_so_line - - diff --git a/contract_sale/views/res_partner_view.xml b/contract_sale/views/res_partner_view.xml index d060e6d78..4491b6f3d 100644 --- a/contract_sale/views/res_partner_view.xml +++ b/contract_sale/views/res_partner_view.xml @@ -1,8 +1,6 @@ - + - - + -