diff --git a/subscription_package/__manifest__.py b/subscription_package/__manifest__.py index 51866196d..0f139349e 100644 --- a/subscription_package/__manifest__.py +++ b/subscription_package/__manifest__.py @@ -48,7 +48,6 @@ 'views/subscription_renew.xml', 'views/mail_activity_views.xml', 'views/res_partner.xml', - 'views/recurrence_views.xml', 'views/sale_order_inherit.xml', 'report/subscription_report_view.xml', ], diff --git a/subscription_package/models/__init__.py b/subscription_package/models/__init__.py index 2653b9c2d..722f9c270 100644 --- a/subscription_package/models/__init__.py +++ b/subscription_package/models/__init__.py @@ -27,5 +27,4 @@ from . import subscription_products from . import subscription_close from . import subscription_renew from . import res_partner -from . import recurrence_period from . import sale_order diff --git a/subscription_package/models/recurrence_period.py b/subscription_package/models/recurrence_period.py deleted file mode 100644 index f5d83c85f..000000000 --- a/subscription_package/models/recurrence_period.py +++ /dev/null @@ -1,43 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################# -# -# Cybrosys Technologies Pvt. Ltd. -# -# Copyright (C) 2022-TODAY Cybrosys Technologies() -# Author: Cybrosys Techno Solutions() -# -# You can modify it under the terms of the GNU LESSER -# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. -# -# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE -# (LGPL v3) along with this program. -# If not, see . -# -############################################################################# -from odoo import models, fields - - -class RecurrencePeriod(models.Model): - """This class is used to create new model recurrence period""" - _name = "recurrence.period" - _description = "Recurrence Period " - - name = fields.Char(string="Name") - duration = fields.Float(string="Duration") - unit = fields.Selection([('hours', 'hours'), - ('days', 'Days'), ('weeks', 'Weeks'), - ('months', 'Months'), ('years', 'Years')], - string='Unit') - - -class SubPackages(models.Model): - """ This function is used to inherit subscription packages""" - _inherit = 'subscription.package' - - recurrence_period_id = fields.Many2one("recurrence.period", - string="Recurrence Period") diff --git a/subscription_package/models/subscription_package.py b/subscription_package/models/subscription_package.py index 716d5f7c6..30d8edc31 100644 --- a/subscription_package/models/subscription_package.py +++ b/subscription_package/models/subscription_package.py @@ -78,7 +78,6 @@ class SubscriptionPackageProductLine(models.Model): line.product_qty, product=line.product_id, partner=line.subscription_id._origin.partner_id) - print(taxes) line.write({ 'price_tax': sum( t.get('amount', 0.0) for t in taxes.get('taxes', [])), @@ -384,7 +383,6 @@ class SubscriptionPackage(models.Model): pending_subscriptions = self.env['subscription.package'].search( [('stage_category', '=', 'progress')]) today_date = fields.Date.today() - # today_date = datetime.datetime.strptime('05102023', '%d%m%Y').date() pending_subscription = False for pending_subscription in pending_subscriptions: get_dates = self.find_renew_date( @@ -393,7 +391,6 @@ class SubscriptionPackage(models.Model): pending_subscription.plan_id.days_to_end) renew_date = get_dates['renew_date'] end_date = get_dates['end_date'] - # print(renew_date) pending_subscription.close_date = get_dates['close_date'] if today_date == pending_subscription.next_invoice_date: if pending_subscription.plan_id.invoice_mode == 'draft_invoice': @@ -462,7 +459,6 @@ class SubscriptionPackage(models.Model): total_recurring = 0 total_tax = 0.0 for line in record.product_line_ids: - # print(line.tax_id._origin) if line.total_amount != line.price_total: line_tax = line.price_total - line.total_amount total_tax += line_tax diff --git a/subscription_package/security/ir.model.access.csv b/subscription_package/security/ir.model.access.csv index 5539c213b..523bde9ae 100644 --- a/subscription_package/security/ir.model.access.csv +++ b/subscription_package/security/ir.model.access.csv @@ -6,4 +6,3 @@ access_subscription_report,subscription.report,model_subscription_report,base.gr access_subscription_package_product_line,subscription.package.product.line,model_subscription_package_product_line,base.group_user,1,1,1,1 access_subscription_package_stop,subscription.package.stop,model_subscription_package_stop,base.group_user,1,1,1,1 access_subscription_close_wizard,access.subscription.close.wizard,model_subscription_close_wizard,base.group_user,1,1,1,1 -access_recurrence_period,access.recurrence.period,model_recurrence_period,base.group_user,1,1,1,1 diff --git a/subscription_package/static/description/assets/screenshots/SUB11.png b/subscription_package/static/description/assets/screenshots/SUB11.png index b89f8fc46..b6efc815e 100644 Binary files a/subscription_package/static/description/assets/screenshots/SUB11.png and b/subscription_package/static/description/assets/screenshots/SUB11.png differ diff --git a/subscription_package/static/description/assets/screenshots/SUB13.png b/subscription_package/static/description/assets/screenshots/SUB13.png index 1c21a7db0..9bfc1a6e9 100644 Binary files a/subscription_package/static/description/assets/screenshots/SUB13.png and b/subscription_package/static/description/assets/screenshots/SUB13.png differ diff --git a/subscription_package/static/description/assets/screenshots/SUB15.png b/subscription_package/static/description/assets/screenshots/SUB15.png index 0b5f50d46..a2de264e3 100644 Binary files a/subscription_package/static/description/assets/screenshots/SUB15.png and b/subscription_package/static/description/assets/screenshots/SUB15.png differ diff --git a/subscription_package/static/description/index.html b/subscription_package/static/description/index.html index 7010f0bac..15c74d5b0 100644 --- a/subscription_package/static/description/index.html +++ b/subscription_package/static/description/index.html @@ -265,18 +265,18 @@ -
-

Recurrence Period -

- - -
-
-

Create Recurrence Period -

- - -
+ + + + + + + + + + + +

Subscription Report

diff --git a/subscription_package/views/recurrence_views.xml b/subscription_package/views/recurrence_views.xml deleted file mode 100644 index 11f5c93f2..000000000 --- a/subscription_package/views/recurrence_views.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - recurrence.period.tree - recurrence.period - - - - - - - - - - recurrence.period.form - recurrence.period - -
- - - - - - - -
-
-
- - - Recurrence Period - recurrence.period - list,form - - - - - - subscription.package.form.inherit - subscription.package - - - - - - - - - -
\ No newline at end of file