From 3f3d2a1ffb699b7bd99c398f8385e96827aeb818 Mon Sep 17 00:00:00 2001 From: Kev-Roche Date: Thu, 27 Oct 2022 19:13:18 +0200 Subject: [PATCH] fix pre-commit issues --- sale_partner_primeship/__manifest__.py | 3 ++- sale_partner_primeship/models/sale_order.py | 7 ++++--- .../models/sale_primeship.py | 14 ++++++-------- sale_partner_primeship/readme/USAGE.rst | 2 +- .../views/product_template_views.xml | 15 +++++++++++---- .../views/res_partner_views.xml | 19 +++++++++++++++---- .../views/sale_primeship_views.xml | 10 +++++----- .../odoo/addons/sale_partner_primeship | 1 + setup/sale_partner_primeship/setup.py | 6 ++++++ 9 files changed, 51 insertions(+), 26 deletions(-) create mode 120000 setup/sale_partner_primeship/odoo/addons/sale_partner_primeship create mode 100644 setup/sale_partner_primeship/setup.py diff --git a/sale_partner_primeship/__manifest__.py b/sale_partner_primeship/__manifest__.py index b71d8c9b722..83e36dd32cb 100644 --- a/sale_partner_primeship/__manifest__.py +++ b/sale_partner_primeship/__manifest__.py @@ -1,7 +1,8 @@ # Copyright 2021 Akretion - Florian Mounier { "name": "Sale Partner Primeship", - "summary": "Allow you to manage time limited prime memberships and prime membership activation products.", + "summary": """Allow you to manage time limited prime memberships + and prime membership activation products.""", "version": "14.0.1.0.0", "author": "Akretion, Odoo Community Association (OCA)", "website": "https://github.com/OCA/sale-workflow", diff --git a/sale_partner_primeship/models/sale_order.py b/sale_partner_primeship/models/sale_order.py index 547331bc7fd..1ea4500d252 100644 --- a/sale_partner_primeship/models/sale_order.py +++ b/sale_partner_primeship/models/sale_order.py @@ -1,6 +1,7 @@ -from odoo import api, fields, models from dateutil.relativedelta import relativedelta +from odoo import api, fields, models + class SaleOrder(models.Model): _inherit = "sale.order" @@ -53,7 +54,7 @@ class SaleOrderLine(models.Model): string="Primeships", comodel_name="sale.primeship", compute="_compute_primeship_id", - inverse="_compute_inverse_primeship_id", + inverse="_inverse_primeship_id", ) # One2one impl @@ -67,7 +68,7 @@ def _compute_primeship_id(self): if record.primeship_ids: record.primeship_id = record.primeship_ids[0] - def _compute_inverse_primeship_id(self): + def _inverse_primeship_id(self): for record in self: if record.primeship_ids: primeship = record.env["sale.primeship"].browse( diff --git a/sale_partner_primeship/models/sale_primeship.py b/sale_partner_primeship/models/sale_primeship.py index 8de7ff355a3..0e98a66af75 100644 --- a/sale_partner_primeship/models/sale_primeship.py +++ b/sale_partner_primeship/models/sale_primeship.py @@ -1,4 +1,4 @@ -from odoo import api, fields, models +from odoo import _, api, fields, models from odoo.exceptions import ValidationError @@ -52,16 +52,14 @@ def _compute_current(self): def _check_end_date(self): for record in self: if record.end_date < record.start_date: - raise ValidationError("The end date cannot be before start date") + raise ValidationError(_("The end date cannot be before start date")) if any( - ( - primeship.overlaps(record.start_date, record.end_date) - for primeship in record.partner_id.primeship_ids - if primeship.id != record.id - ) + primeship.overlaps(record.start_date, record.end_date) + for primeship in record.partner_id.primeship_ids + if primeship.id != record.id ): - raise ValidationError("Primeships cannot overlaps") + raise ValidationError(_("Primeships cannot overlaps")) def overlaps(self, start, end): self.ensure_one() diff --git a/sale_partner_primeship/readme/USAGE.rst b/sale_partner_primeship/readme/USAGE.rst index e5a2be7380e..64db4ff7c04 100644 --- a/sale_partner_primeship/readme/USAGE.rst +++ b/sale_partner_primeship/readme/USAGE.rst @@ -5,7 +5,7 @@ go to the product form Sales tab and tick the Activates primeship checkbox: You can then set a primeship duration. -You can see current primeship availability for a customer: +You can see current primeship availability for a customer: .. figure:: ../static/description/partner-with-primeship.png diff --git a/sale_partner_primeship/views/product_template_views.xml b/sale_partner_primeship/views/product_template_views.xml index 920977b91e1..5dddb8ab955 100644 --- a/sale_partner_primeship/views/product_template_views.xml +++ b/sale_partner_primeship/views/product_template_views.xml @@ -1,15 +1,22 @@ - + product.template.product.form product.template - + - + - + diff --git a/sale_partner_primeship/views/res_partner_views.xml b/sale_partner_primeship/views/res_partner_views.xml index 1d61677fbef..332b4608e83 100644 --- a/sale_partner_primeship/views/res_partner_views.xml +++ b/sale_partner_primeship/views/res_partner_views.xml @@ -1,16 +1,27 @@ - + res.partner.form res.partner - + -