From f96402cd9d56d2b5a827493c21a045277071c595 Mon Sep 17 00:00:00 2001 From: Ilyas Date: Tue, 26 Sep 2023 15:10:04 +0200 Subject: [PATCH] [IMP] subscription_oca: refactoring --- subscription_oca/README.rst | 7 ++- subscription_oca/__manifest__.py | 2 +- subscription_oca/i18n/subscription_oca.pot | 6 --- subscription_oca/models/sale_subscription.py | 6 +-- .../static/description/index.html | 54 +++++++++++-------- 5 files changed, 43 insertions(+), 32 deletions(-) diff --git a/subscription_oca/README.rst b/subscription_oca/README.rst index 0b03b4bf1..f8a70688f 100644 --- a/subscription_oca/README.rst +++ b/subscription_oca/README.rst @@ -7,7 +7,7 @@ Subscription management !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:3772d65a58c07d0348bd13d3c882810c94bfb87389c62fec6d16fe8ef130252c + !! source digest: sha256:42fc353409c68ca6defc36ba2273b97ae36edb6f629c0c041db1ef7f1e01ba00 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png @@ -81,6 +81,11 @@ Contributors * Carlos Martínez + +* `Ooops404 `__: + + * Ilyas + Maintainers ~~~~~~~~~~~ diff --git a/subscription_oca/__manifest__.py b/subscription_oca/__manifest__.py index 8e9cb33b8..fe221adda 100644 --- a/subscription_oca/__manifest__.py +++ b/subscription_oca/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Subscription management", "summary": "Generate recurring invoices.", - "version": "15.0.1.0.0", + "version": "15.0.1.0.1", "development_status": "Beta", "category": "Subscription Management", "website": "https://github.com/OCA/contract", diff --git a/subscription_oca/i18n/subscription_oca.pot b/subscription_oca/i18n/subscription_oca.pot index 60a026204..0502817f3 100644 --- a/subscription_oca/i18n/subscription_oca.pot +++ b/subscription_oca/i18n/subscription_oca.pot @@ -363,7 +363,6 @@ msgstr "" #. module: subscription_oca #: model:ir.model.fields,help:subscription_oca.field_sale_subscription__message_has_error -#: model:ir.model.fields,help:subscription_oca.field_sale_subscription__message_has_sms_error msgid "If checked, some messages have a delivery error." msgstr "" @@ -657,11 +656,6 @@ msgstr "" msgid "Rule count" msgstr "" -#. module: subscription_oca -#: model:ir.model.fields,field_description:subscription_oca.field_sale_subscription__message_has_sms_error -msgid "SMS Delivery error" -msgstr "" - #. module: subscription_oca #: model:ir.model.fields,field_description:subscription_oca.field_sale_subscription__sale_subscription_line_ids msgid "Sale Subscription Line" diff --git a/subscription_oca/models/sale_subscription.py b/subscription_oca/models/sale_subscription.py index 4cc562ee4..250f97a00 100644 --- a/subscription_oca/models/sale_subscription.py +++ b/subscription_oca/models/sale_subscription.py @@ -451,8 +451,8 @@ class SaleSubscription(models.Model): def create(self, values): if "recurring_rule_boundary" in values: if not values["recurring_rule_boundary"]: - template_id = self.env["sale.subscription.template"].search( - [("id", "=", values["template_id"])] + template_id = self.env["sale.subscription.template"].browse( + values["template_id"] ) date_start = values["date_start"] if not isinstance(values["date_start"], date): @@ -464,7 +464,7 @@ class SaleSubscription(models.Model): values["date_start"] = values["recurring_next_date"] values["stage_id"] = ( self.env["sale.subscription.stage"] - .search([("type", "=", "pre")], order="sequence desc")[-1] + .search([("type", "=", "pre")], order="sequence desc", limit=1) .id ) return super(SaleSubscription, self).create(values) diff --git a/subscription_oca/static/description/index.html b/subscription_oca/static/description/index.html index 5e4490677..da81d249f 100644 --- a/subscription_oca/static/description/index.html +++ b/subscription_oca/static/description/index.html @@ -1,20 +1,20 @@ - + - + Subscription management