From 6709021dbc7420744ca6a84aa8936cbb641a5988 Mon Sep 17 00:00:00 2001 From: Stepan Savelyev Date: Thu, 24 Sep 2020 00:04:52 +0500 Subject: [PATCH] [UPD] Lint --- __manifest__.py | 8 +- models/res_partner.py | 33 +++++-- models/res_partner_contract_annex.py | 86 ++++++++++++++----- models/res_partner_contract_field.py | 27 ++++-- .../res_partner_contract_field_transient.py | 28 ++++-- models/res_partner_document_template.py | 5 +- models/sale_order.py | 9 +- wizard/res_partner_contract_wizard.py | 26 ++++-- 8 files changed, 170 insertions(+), 52 deletions(-) diff --git a/__manifest__.py b/__manifest__.py index a7b0b46..58443d0 100755 --- a/__manifest__.py +++ b/__manifest__.py @@ -10,7 +10,13 @@ "website": "http://rydlab.ru", "category": "Invoicing & Payments", "version": "0.2.0", - "depends": ["base", "contacts", "hr", "russian_requisites", "sale",], + "depends": [ + "base", + "contacts", + "hr", + "russian_requisites", + "sale", + ], "data": [ "data/assets_extension.xml", "data/fields_default.xml", diff --git a/models/res_partner.py b/models/res_partner.py index 7a9f426..f9fad93 100755 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -5,13 +5,22 @@ class ResPartner(models.Model): _inherit = "res.partner" name_write = fields.Char( - string="Name in contracts", help="This name uses in contracts", + string="Name in contracts", + help="This name uses in contracts", + ) + name_genitive = fields.Char( + string="Name Genitive", + ) + name_initials = fields.Char( + string="Name Initials", + ) + function_genitive = fields.Char( + string="Function Genitive", ) - name_genitive = fields.Char(string="Name Genitive",) - name_initials = fields.Char(string="Name Initials",) - function_genitive = fields.Char(string="Function Genitive",) client_contract_ids = fields.One2many( - "res.partner.contract", "partner_id", string="Contracts", + "res.partner.contract", + "partner_id", + string="Contracts", ) contract_count = fields.Integer( compute="_compute_contract_count", string="# of contracts" @@ -19,19 +28,25 @@ class ResPartner(models.Model): full_address = fields.Char( compute="_compute_full_address" ) # Check for res.partner.contact_address in base/res - street_actual = fields.Many2one("res.partner", string="Actual Address",) + street_actual = fields.Many2one( + "res.partner", + string="Actual Address", + ) representative_id = fields.Many2one( "res.partner", string="Representative", help="Person, who represents company" ) representative_document = fields.Char( - string="Representative acts on the basis of", help="Parent Case", + string="Representative acts on the basis of", + help="Parent Case", ) signature = fields.Binary(string="Client signature") whatsapp = fields.Char( - string="WhatsApp", help="If a contact have a WhatsApp number", + string="WhatsApp", + help="If a contact have a WhatsApp number", ) telegram = fields.Char( - string="Telegram", help="If a contact have a Telegram number or identifier", + string="Telegram", + help="If a contact have a Telegram number or identifier", ) @api.depends("street", "street2", "city", "state_id", "zip", "country_id") diff --git a/models/res_partner_contract_annex.py b/models/res_partner_contract_annex.py index 2f58012..a17c248 100755 --- a/models/res_partner_contract_annex.py +++ b/models/res_partner_contract_annex.py @@ -10,15 +10,29 @@ class ContractOrderAnnex(models.Model, IDocument, Extension): _name = "res.partner.contract.annex" _description = "Contract Annex" - name = fields.Char(string="Name",) - display_name = fields.Char(compute="_compute_display_name",) - specification_name = fields.Char(compute="_compute_specification_name",) + name = fields.Char( + string="Name", + ) + display_name = fields.Char( + compute="_compute_display_name", + ) + specification_name = fields.Char( + compute="_compute_specification_name", + ) contract_id = fields.Many2one( - "res.partner.contract", string="Contract", readonly=True, + "res.partner.contract", + string="Contract", + readonly=True, + ) + company_id = fields.Many2one( + "res.partner", + related="contract_id.company_id", + ) + partner_id = fields.Many2one( + "res.partner", + related="contract_id.partner_id", ) - company_id = fields.Many2one("res.partner", related="contract_id.company_id",) - partner_id = fields.Many2one("res.partner", related="contract_id.partner_id",) order_id = fields.Many2one( "sale.order", string="Order", @@ -26,29 +40,58 @@ class ContractOrderAnnex(models.Model, IDocument, Extension): required=True, ) date_conclusion = fields.Date( - string="Conclusion Date", default=fields.Date.today(), + string="Conclusion Date", + default=fields.Date.today(), + ) + counter = fields.Integer( + string="№", + help="Counter of Contract Annexes", + ) + currency_id = fields.Many2one( + related="company_id.currency_id", + readonly=True, ) - counter = fields.Integer(string="№", help="Counter of Contract Annexes",) - currency_id = fields.Many2one(related="company_id.currency_id", readonly=True,) - design_period = fields.Integer(string="Design Period",) - design_cost = fields.Monetary(string="Design Cost",) + design_period = fields.Integer( + string="Design Period", + ) + design_cost = fields.Monetary( + string="Design Cost", + ) - design_doc_period = fields.Integer(string="Documentation Design Period (days)",) - design_doc_cost = fields.Monetary(string="Documentation Design Cost",) + design_doc_period = fields.Integer( + string="Documentation Design Period (days)", + ) + design_doc_cost = fields.Monetary( + string="Documentation Design Cost", + ) - delivery_address = fields.Char(string="Delivery Address",) + delivery_address = fields.Char( + string="Delivery Address", + ) delivery_period = fields.Integer(string="Delivery Period (days)") - installation_address = fields.Char(string="Installation Address",) - installation_period = fields.Integer(string="Installation Period (days)",) - installation_cost = fields.Integer(string="Installation Cost",) + installation_address = fields.Char( + string="Installation Address", + ) + installation_period = fields.Integer( + string="Installation Period (days)", + ) + installation_cost = fields.Integer( + string="Installation Cost", + ) - total_cost = fields.Monetary(string="Total Cost",) + total_cost = fields.Monetary( + string="Total Cost", + ) payment_part_one = fields.Float(string="Payment 1 Part (%)", default=100) - payment_part_two = fields.Float(string="Payment 2 Part (%)",) - payment_part_three = fields.Float(string="Payment 3 Part (%)",) + payment_part_two = fields.Float( + string="Payment 2 Part (%)", + ) + payment_part_three = fields.Float( + string="Payment 3 Part (%)", + ) @api.multi @api.depends("name") @@ -85,7 +128,8 @@ class ContractOrderAnnex(models.Model, IDocument, Extension): order_number = self.order_id.name or "SO###" self.name = "{contract}-{order}".format( - contract=contract_number, order=order_number, + contract=contract_number, + order=order_number, ) @api.model diff --git a/models/res_partner_contract_field.py b/models/res_partner_contract_field.py index 3737af8..127f0df 100755 --- a/models/res_partner_contract_field.py +++ b/models/res_partner_contract_field.py @@ -6,10 +6,25 @@ class ContractField(models.Model): _description = "Contract Field" _order = "sequence" - name = fields.Char(string="Name", required=True, translate=True,) - technical_name = fields.Char( - string="Technical Name", help="Name uses in template", required=True, + name = fields.Char( + string="Name", + required=True, + translate=True, + ) + technical_name = fields.Char( + string="Technical Name", + help="Name uses in template", + required=True, + ) + description = fields.Char( + string="Description", + translate=True, + default="", + ) + sequence = fields.Integer( + string="Sequence", + ) + visible = fields.Boolean( + string="Visible", + default=True, ) - description = fields.Char(string="Description", translate=True, default="",) - sequence = fields.Integer(string="Sequence",) - visible = fields.Boolean(string="Visible", default=True,) diff --git a/models/res_partner_contract_field_transient.py b/models/res_partner_contract_field_transient.py index 07f043c..efbff8e 100755 --- a/models/res_partner_contract_field_transient.py +++ b/models/res_partner_contract_field_transient.py @@ -6,17 +6,33 @@ class ContractFieldTransient(models.TransientModel): _description = "Contract Field Transient" _contract_wizard_id = fields.Many2one( - "res.partner.contract.wizard", string="Contract", readonly=True, + "res.partner.contract.wizard", + string="Contract", + readonly=True, + ) + contract_field_id = fields.Many2one( + "res.partner.contract.field", + string="Field", + ) + name = fields.Char( + related="contract_field_id.name", + string="Name", + readonly=True, ) - contract_field_id = fields.Many2one("res.partner.contract.field", string="Field",) - name = fields.Char(related="contract_field_id.name", string="Name", readonly=True,) technical_name = fields.Char( related="contract_field_id.technical_name", string="Technical Name", readonly=True, ) description = fields.Char( - related="contract_field_id.description", string="Description", readonly=True, + related="contract_field_id.description", + string="Description", + readonly=True, + ) + visible = fields.Boolean( + related="contract_field_id.visible", + ) + value = fields.Char( + string="Value", + default="", ) - visible = fields.Boolean(related="contract_field_id.visible",) - value = fields.Char(string="Value", default="",) diff --git a/models/res_partner_document_template.py b/models/res_partner_document_template.py index 7de7d06..65f9961 100755 --- a/models/res_partner_document_template.py +++ b/models/res_partner_document_template.py @@ -39,6 +39,9 @@ class DocumentTemplate(models.Model): ] ) template_type = fields.Selection( - selection=[("contract", "Contract"), ("annex", "Annex"),] + selection=[ + ("contract", "Contract"), + ("annex", "Annex"), + ] ) sequence = fields.Integer() diff --git a/models/sale_order.py b/models/sale_order.py index ecf4788..24c6eed 100755 --- a/models/sale_order.py +++ b/models/sale_order.py @@ -6,9 +6,14 @@ from ..utils import MODULE_NAME class SaleOrder(models.Model): _inherit = "sale.order" - delivery_time = fields.Integer(string="Delivery Time", default=45,) + delivery_time = fields.Integer( + string="Delivery Time", + default=45, + ) contract_annex_id = fields.Many2one( - "res.partner.contract.annex", string="Contract Annex", readonly=True, + "res.partner.contract.annex", + string="Contract Annex", + readonly=True, ) # Extend default field payment_term_id = fields.Many2one( diff --git a/wizard/res_partner_contract_wizard.py b/wizard/res_partner_contract_wizard.py index 0394cc1..ca12ab1 100755 --- a/wizard/res_partner_contract_wizard.py +++ b/wizard/res_partner_contract_wizard.py @@ -46,10 +46,14 @@ class ContractWizard(models.TransientModel, Extension): default=_default_target, ) company_id = fields.Many2one( - "res.partner", string="Company", compute="_compute_company_id", + "res.partner", + string="Company", + compute="_compute_company_id", ) partner_id = fields.Many2one( - "res.partner", string="Partner", compute="_compute_partner_id", + "res.partner", + string="Partner", + compute="_compute_partner_id", ) document_name = fields.Char( string="Document Name", compute="_compute_document_name" @@ -67,7 +71,8 @@ class ContractWizard(models.TransientModel, Extension): string="Contract Fields", ) transient_field_ids_hidden = fields.One2many( - "res.partner.contract.field.transient", "_contract_wizard_id", + "res.partner.contract.field.transient", + "_contract_wizard_id", ) @api.depends("target") @@ -93,7 +98,11 @@ class ContractWizard(models.TransientModel, Extension): @api.onchange("document_template") def _domain_document_template(self): - return {"domain": {"document_template": self._get_template_domain(),}} + return { + "domain": { + "document_template": self._get_template_domain(), + } + } @api.onchange("document_template") def _onchange_document_template(self): @@ -103,7 +112,9 @@ class ContractWizard(models.TransientModel, Extension): def get_contract_field(technical_name): return self.env["res.partner.contract.field"].search( - [("technical_name", "=", technical_name),] + [ + ("technical_name", "=", technical_name), + ] ) model_to_action = { @@ -123,7 +134,10 @@ class ContractWizard(models.TransientModel, Extension): 4, self.env["res.partner.contract.field.transient"] .create( - {"contract_field_id": get_contract_field(field).id, "value": value,} + { + "contract_field_id": get_contract_field(field).id, + "value": value, + } ) .id, 0,