From 896f04ba1e4b78fa466dd4cae16c1b786c7d601d Mon Sep 17 00:00:00 2001 From: Iryna Vyshnevska Date: Wed, 16 Oct 2019 18:08:48 +0300 Subject: [PATCH] [MIG][13.0] agreemnt_sale + black --- agreement_sale/__manifest__.py | 39 ++++++++---------- agreement_sale/models/res_config_settings.py | 8 ++-- agreement_sale/models/sale.py | 25 ++++++++---- agreement_sale/views/agreement.xml | 22 ++++++---- agreement_sale/views/res_config_settings.xml | 40 ++++++++++++------- agreement_sale/views/sale_order.xml | 14 +++---- .../agreement_sale/odoo/addons/agreement_sale | 1 + setup/agreement_sale/setup.py | 6 +++ 8 files changed, 90 insertions(+), 65 deletions(-) create mode 120000 setup/agreement_sale/odoo/addons/agreement_sale create mode 100644 setup/agreement_sale/setup.py diff --git a/agreement_sale/__manifest__.py b/agreement_sale/__manifest__.py index 80c8c166cd..2d2f61c3a6 100644 --- a/agreement_sale/__manifest__.py +++ b/agreement_sale/__manifest__.py @@ -2,28 +2,21 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { - 'name': 'Agreement Sale', - 'summary': "Agreement on sales", - 'version': '12.0.1.0.0', - 'category': 'Contract', - 'author': 'Akretion, ' - 'Odoo Community Association (OCA)', - 'website': 'https://github.com/oca/contract', - 'license': 'AGPL-3', - 'depends': [ - 'sale_management', - 'agreement', + "name": "Agreement Sale", + "summary": "Agreement on sales", + "version": "13.0.1.0.0", + "category": "Contract", + "author": "Akretion, " "Odoo Community Association (OCA)", + "website": "https://github.com/oca/contract", + "license": "AGPL-3", + "depends": ["sale_management", "agreement"], + "data": [ + "security/ir.model.access.csv", + "views/agreement.xml", + "views/sale_order.xml", + "views/res_config_settings.xml", ], - 'data': [ - 'security/ir.model.access.csv', - 'views/agreement.xml', - 'views/sale_order.xml', - 'views/res_config_settings.xml', - ], - 'development_status': 'Beta', - 'maintainers': [ - 'alexis-via', - 'bealdav', - ], - 'installable': True, + "development_status": "Beta", + "maintainers": ["alexis-via", "bealdav"], + "installable": True, } diff --git a/agreement_sale/models/res_config_settings.py b/agreement_sale/models/res_config_settings.py index 167bc9c482..71c6827287 100644 --- a/agreement_sale/models/res_config_settings.py +++ b/agreement_sale/models/res_config_settings.py @@ -2,13 +2,11 @@ class ResConfigSettings(models.TransientModel): - _inherit = 'res.config.settings' + _inherit = "res.config.settings" group_use_agreement_type = fields.Boolean( - 'Use agreement types', - implied_group='agreement.group_use_agreement_type' + "Use agreement types", implied_group="agreement.group_use_agreement_type" ) group_use_agreement_template = fields.Boolean( - 'Use agreement template', - implied_group='agreement.group_use_agreement_template' + "Use agreement template", implied_group="agreement.group_use_agreement_template" ) diff --git a/agreement_sale/models/sale.py b/agreement_sale/models/sale.py index bf97d9de2d..88b52345cd 100644 --- a/agreement_sale/models/sale.py +++ b/agreement_sale/models/sale.py @@ -2,19 +2,28 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import models, fields +from odoo import fields, models class SaleOrder(models.Model): - _inherit = 'sale.order' + _inherit = "sale.order" agreement_id = fields.Many2one( - comodel_name='agreement', string='Agreement', ondelete='restrict', - track_visibility='onchange', readonly=True, copy=False, - states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}) + comodel_name="agreement", + string="Agreement", + ondelete="restrict", + track_visibility="onchange", + readonly=True, + copy=False, + states={"draft": [("readonly", False)], "sent": [("readonly", False)]}, + ) agreement_type_id = fields.Many2one( - comodel_name="agreement.type", string="Agreement Type", + comodel_name="agreement.type", + string="Agreement Type", ondelete="restrict", - track_visibility='onchange', readonly=True, copy=True, - states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}) + track_visibility="onchange", + readonly=True, + copy=True, + states={"draft": [("readonly", False)], "sent": [("readonly", False)]}, + ) diff --git a/agreement_sale/views/agreement.xml b/agreement_sale/views/agreement.xml index cc30d5ce8f..ae4fa7005c 100644 --- a/agreement_sale/views/agreement.xml +++ b/agreement_sale/views/agreement.xml @@ -1,10 +1,16 @@ - - + - - - - + + diff --git a/agreement_sale/views/res_config_settings.xml b/agreement_sale/views/res_config_settings.xml index 1a24962c16..62a9c67577 100644 --- a/agreement_sale/views/res_config_settings.xml +++ b/agreement_sale/views/res_config_settings.xml @@ -1,40 +1,52 @@ - + - res.config.settings.view.form.inherit.agreement res.config.settings - - + +

Agreements

-
+
- +
-
-
+
- +
-