Browse Source

Feb 9 [UPDT] : Updated 'subscription_package'

pull/267/merge
AjmalCybro 1 year ago
parent
commit
38875d1f6f
  1. 1
      subscription_package/__manifest__.py
  2. 1
      subscription_package/models/__init__.py
  3. 43
      subscription_package/models/recurrence_period.py
  4. 4
      subscription_package/models/subscription_package.py
  5. 1
      subscription_package/security/ir.model.access.csv
  6. BIN
      subscription_package/static/description/assets/screenshots/SUB11.png
  7. BIN
      subscription_package/static/description/assets/screenshots/SUB13.png
  8. BIN
      subscription_package/static/description/assets/screenshots/SUB15.png
  9. 20
      subscription_package/static/description/index.html
  10. 54
      subscription_package/views/recurrence_views.xml

1
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',
],

1
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

43
subscription_package/models/recurrence_period.py

@ -1,43 +0,0 @@
# -*- coding: utf-8 -*-
#############################################################################
#
# Cybrosys Technologies Pvt. Ltd.
#
# Copyright (C) 2022-TODAY Cybrosys Technologies(<https://www.cybrosys.com>)
# Author: Cybrosys Techno Solutions(<https://www.cybrosys.com>)
#
# 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 <http://www.gnu.org/licenses/>.
#
#############################################################################
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")

4
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

1
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

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
6 access_subscription_package_product_line subscription.package.product.line model_subscription_package_product_line base.group_user 1 1 1 1
7 access_subscription_package_stop subscription.package.stop model_subscription_package_stop base.group_user 1 1 1 1
8 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

BIN
subscription_package/static/description/assets/screenshots/SUB11.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 188 KiB

After

Width:  |  Height:  |  Size: 186 KiB

BIN
subscription_package/static/description/assets/screenshots/SUB13.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 KiB

After

Width:  |  Height:  |  Size: 184 KiB

BIN
subscription_package/static/description/assets/screenshots/SUB15.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 KiB

After

Width:  |  Height:  |  Size: 184 KiB

20
subscription_package/static/description/index.html

@ -265,18 +265,18 @@
<img src="assets/screenshots/SUB7.png" class="img-thumbnail">
</div>
</div>
<div style="display: block; margin: 30px auto;">
<h3 style="font-family: 'Montserrat', sans-serif; font-size: 18px; font-weight: bold;"> Recurrence Period
</h3>
<!-- <div style="display: block; margin: 30px auto;">-->
<!-- <h3 style="font-family: 'Montserrat', sans-serif; font-size: 18px; font-weight: bold;"> Recurrence Period-->
<!-- </h3>-->
<img src="assets/screenshots/SUB8.png" class="img-thumbnail">
</div>
<div style="display: block; margin: 30px auto;">
<h3 style="font-family: 'Montserrat', sans-serif; font-size: 18px; font-weight: bold;">Create Recurrence Period
</h3>
<!-- <img src="assets/screenshots/SUB8.png" class="img-thumbnail">-->
<!-- </div>-->
<!-- <div style="display: block; margin: 30px auto;">-->
<!-- <h3 style="font-family: 'Montserrat', sans-serif; font-size: 18px; font-weight: bold;">Create Recurrence Period-->
<!-- </h3>-->
<img src="assets/screenshots/SUB9.png" class="img-thumbnail">
</div>
<!-- <img src="assets/screenshots/SUB9.png" class="img-thumbnail">-->
<!-- </div>-->
<div style="display: block; margin: 30px auto;">
<h3 style="font-family: 'Montserrat', sans-serif; font-size: 18px; font-weight: bold;"> Subscription Report
</h3>

54
subscription_package/views/recurrence_views.xml

@ -1,54 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="recurrence_view_tree" model="ir.ui.view">
<field name="name">recurrence.period.tree</field>
<field name="model">recurrence.period</field>
<field name="arch" type="xml">
<tree string="Channel">
<field name="name"/>
<field name="duration"/>
<field name="unit"/>
</tree>
</field>
</record>
<record id="recurrence_period_views_form" model="ir.ui.view">
<field name="name">recurrence.period.form</field>
<field name="model">recurrence.period</field>
<field name="arch" type="xml">
<form string="Test">
<sheet>
<group>
<field name="name"/>
<field name="duration" widget="float_time"/>
<field name="unit"/>
</group>
</sheet>
</form>
</field>
</record>
<record id="recurrence_menu_root_id" model="ir.actions.act_window">
<field name="name">Recurrence Period</field>
<field name="res_model">recurrence.period</field>
<field name="view_mode">list,form</field>
</record>
<menuitem id="subscription_config_menu_subscription_recurrence"
name="Recurrence Period"
parent="subscription_package.subscription_menu_config"
action="subscription_package.recurrence_menu_root_id"
sequence="24"/>
<record id="recurrence_id_form_inherit" model="ir.ui.view">
<field name="name">subscription.package.form.inherit</field>
<field name="model">subscription.package</field>
<field name="inherit_id" ref="subscription_package.subscription_package_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='reference_code']" position="after">
<field name="recurrence_period_id"/>
</xpath>
</field>
</record>
</odoo>
Loading…
Cancel
Save