thirdparty
/
CybroAddons
mirror of https://github.com/CybroOdoo/CybroAddons.git
5
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Sep 8 [FIX] : Bug Fixed 'subscription_package'

pull/254/merge
AjmalCybro 2 years ago
parent
e5f786e8f2
commit
ae0b616ee6
3 changed files with 124 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 55
      subscription_package/models/subscription_package.py
  2. 8
      subscription_package/static/description/index.html
  3. 76
      subscription_package/views/subscription_package.xml

55
subscription_package/models/subscription_package.py
View File

@ -50,6 +50,11 @@ class SubscriptionPackageProductLine(models.Model):
unit_price = fields.Float(string='Unit Price', store=True, readonly=False, unit_price = fields.Float(string='Unit Price', store=True, readonly=False,
related='product_id.list_price') related='product_id.list_price')
discount = fields.Float(string="Discount (%)") discount = fields.Float(string="Discount (%)")
tax_id = fields.Many2many('account.tax', string="Taxes",
related='product_id.taxes_id',
ondelete='restrict', readonly=False)
price_total = fields.Monetary(store=True, readonly=True)
price_tax = fields.Monetary(store=True, readonly=True)
currency_id = fields.Many2one('res.currency', string='Currency', currency_id = fields.Many2one('res.currency', string='Currency',
store=True, store=True,
related='subscription_id.currency_id') related='subscription_id.currency_id')
@ -61,14 +66,23 @@ class SubscriptionPackageProductLine(models.Model):
store=True, store=True,
related='subscription_id.partner_id') related='subscription_id.partner_id')
@api.depends('product_qty', 'unit_price', 'discount') @api.depends('product_qty', 'unit_price', 'discount', 'tax_id',
'currency_id')
def _compute_total_amount(self): def _compute_total_amount(self):
""" Calculate subtotal amount of product line """ """ Calculate subtotal amount of product line """
for rec in self: for line in self:
if rec.product_id: price = line.unit_price * (1 - (line.discount or 0.0) / 100.0)
rec.total_amount = rec.unit_price * rec.product_qty taxes = line.tax_id._origin.compute_all(
if rec.discount != 0: price, line.subscription_id._origin.currency_id,
rec.total_amount -= rec.total_amount * (rec.discount / 100) line.product_qty,
product=line.product_id,
partner=line.subscription_id._origin.partner_id)
line.write({
'price_tax': sum(
t.get('amount', 0.0) for t in taxes.get('taxes', [])),
'price_total': taxes['total_included'],
'total_amount': taxes['total_excluded'],
})
class SubscriptionPackage(models.Model): class SubscriptionPackage(models.Model):
@ -145,9 +159,12 @@ class SubscriptionPackage(models.Model):
close_date = fields.Date(string='Closed on') close_date = fields.Date(string='Closed on')
stage_category = fields.Selection(related='stage_id.category', store=True) stage_category = fields.Selection(related='stage_id.category', store=True)
invoice_mode = fields.Selection(related="plan_id.invoice_mode") invoice_mode = fields.Selection(related="plan_id.invoice_mode")
total_recurring_price = fields.Float(string='Recurring Price', total_recurring_price = fields.Float(string='Untaxed Amount',
compute='_compute_total_recurring_price', compute='_compute_total_recurring_price',
store=True) store=True)
tax_total = fields.Float("Taxes", readonly=True)
total_with_tax = fields.Monetary("Total Recurring Price", readonly=True,
store=True)
@api.depends('invoice_count') @api.depends('invoice_count')
def _compute_invoice_count(self): def _compute_invoice_count(self):
@ -273,11 +290,15 @@ class SubscriptionPackage(models.Model):
_('More than one stage is having category "Draft". ' _('More than one stage is having category "Draft". '
'Please change category of stage to "In Progress", ' 'Please change category of stage to "In Progress", '
'only one stage is allowed to have category "Draft"')) 'only one stage is allowed to have category "Draft"'))
else:
if not rec.product_line_ids:
raise UserError("Empty order lines !! Please add the "
"subscription product.")
else: else:
rec.write( rec.write(
{'stage_id': stage_id, {'stage_id': stage_id,
'date_started': fields.Date.today() 'date_started': fields.Date.today(),
}) 'start_date': fields.Date.today()})
def button_sale_order(self): def button_sale_order(self):
"""Button to create sale order""" """Button to create sale order"""
@ -369,16 +390,17 @@ class SubscriptionPackage(models.Model):
pending_subscriptions = self.env['subscription.package'].search( pending_subscriptions = self.env['subscription.package'].search(
[('stage_category', '=', 'progress')]) [('stage_category', '=', 'progress')])
today_date = fields.Date.today() today_date = fields.Date.today()
# today_date = datetime.datetime.strptime('05102023', '%d%m%Y').date()
pending_subscription = False pending_subscription = False
for pending_subscription in pending_subscriptions: for pending_subscription in pending_subscriptions:
get_dates = self.find_renew_date( get_dates = self.find_renew_date(
pending_subscription.next_invoice_date, pending_subscription.next_invoice_date,
pending_subscription.date_started, pending_subscription.date_started,
pending_subscription.plan_id.days_to_end) pending_subscription.plan_id.days_to_end)
renew_date = get_dates['renew_date'] renew_date = get_dates['renew_date']
end_date = get_dates['end_date'] end_date = get_dates['end_date']
print(renew_date)
pending_subscription.close_date = get_dates['close_date'] pending_subscription.close_date = get_dates['close_date']
if (today_date == end_date) and ( if (today_date == end_date) and (
pending_subscription.plan_id.limit_choice != 'manual'): pending_subscription.plan_id.limit_choice != 'manual'):
@ -404,7 +426,8 @@ class SubscriptionPackage(models.Model):
rec_list = [0, 0, {'product_id': rec.product_id.id, rec_list = [0, 0, {'product_id': rec.product_id.id,
'quantity': rec.product_qty, 'quantity': rec.product_qty,
'price_unit': rec.unit_price, 'price_unit': rec.unit_price,
'discount': rec.discount}] 'discount': rec.discount,
'tax_ids': rec.tax_id}]
this_products_line.append(rec_list) this_products_line.append(rec_list)
self.env['account.move'].create( self.env['account.move'].create(
{ {
@ -442,14 +465,22 @@ class SubscriptionPackage(models.Model):
return dict(pending=pending_subscription) return dict(pending=pending_subscription)
@api.depends('product_line_ids.total_amount') @api.depends('product_line_ids.total_amount',
'product_line_ids.price_total', 'product_line_ids.tax_id')
def _compute_total_recurring_price(self): def _compute_total_recurring_price(self):
""" Calculate recurring price """ """ Calculate recurring price """
for record in self: for record in self:
total_recurring = 0 total_recurring = 0
total_tax = 0.0
for line in record.product_line_ids: for line in record.product_line_ids:
if line.total_amount != line.price_total:
line_tax = line.price_total - line.total_amount
total_tax += line_tax
total_recurring += line.total_amount total_recurring += line.total_amount
record['total_recurring_price'] = total_recurring record['total_recurring_price'] = total_recurring
record['tax_total'] = total_tax
total_with_tax = total_recurring + total_tax
record['total_with_tax'] = total_with_tax
def action_renew(self): def action_renew(self):
return self.button_sale_order() return self.button_sale_order()

8
subscription_package/static/description/index.html
View File

@ -9,10 +9,10 @@
style="background-color: #7C7BAD !important; color: #fff !important; font-weight: 600 !important; padding: 5px 15px 8px !important; margin: 0 5px !important;"> style="background-color: #7C7BAD !important; color: #fff !important; font-weight: 600 !important; padding: 5px 15px 8px !important; margin: 0 5px !important;">
<i class="fa fa-check mr-1"></i>Community <i class="fa fa-check mr-1"></i>Community
</div> </div>
<div <!-- <div-->
style="background-color: #875A7B !important; color: #fff !important; font-weight: 600 !important; padding: 5px 15px 8px !important; margin: 0 5px !important;"> <!-- style="background-color: #875A7B !important; color: #fff !important; font-weight: 600 !important; padding: 5px 15px 8px !important; margin: 0 5px !important;">-->
<i class="fa fa-check mr-1"></i>Enterprise <!-- <i class="fa fa-check mr-1"></i>Enterprise-->
</div> <!-- </div>-->
</div> </div>
</div> </div>

76
subscription_package/views/subscription_package.xml
View File

@ -10,7 +10,8 @@
</record> </record>
</data> </data>
<record id="subscription_action_subscriptions" model="ir.actions.act_window"> <record id="subscription_action_subscriptions"
model="ir.actions.act_window">
<field name="name">Subscriptions</field> <field name="name">Subscriptions</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">subscription.package</field> <field name="res_model">subscription.package</field>
@ -22,7 +23,8 @@
</field> </field>
</record> </record>
<record id="subscription_action_subscriptions_customers" model="ir.actions.act_window"> <record id="subscription_action_subscriptions_customers"
model="ir.actions.act_window">
<field name="name">Subscriptions Customers</field> <field name="name">Subscriptions Customers</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">res.partner</field> <field name="res_model">res.partner</field>
@ -35,7 +37,8 @@
</field> </field>
</record> </record>
<record id="subscription_action_subscriptions_to_renew" model="ir.actions.act_window"> <record id="subscription_action_subscriptions_to_renew"
model="ir.actions.act_window">
<field name="name">Subscriptions to Renew</field> <field name="name">Subscriptions to Renew</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">subscription.package</field> <field name="res_model">subscription.package</field>
@ -65,14 +68,16 @@
<record id="subscription_package_form" model="ir.ui.view"> <record id="subscription_package_form" model="ir.ui.view">
<field name="name">subscription.package.form</field> <field name="name">subscription.package.form</field>
<field name="model">subscription.package</field> <field name="model">subscription.package</field>
<field name="groups_id" eval="[(4, ref('subscription_package.group_subscription_user'))]"/> <field name="groups_id"
eval="[(4, ref('subscription_package.group_subscription_user'))]"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form> <form>
<header> <header>
<field name="current_stage" invisible="1"/> <field name="current_stage" invisible="1"/>
<field name="is_closed" invisible="1"/> <field name="is_closed" invisible="1"/>
<button name="button_start_date" string="START" <button name="button_start_date" string="START"
type="object" class="btn-primary oe_read_only" attrs="{'invisible': [('stage_category','!=', 'draft')]}"/> type="object" class="btn-primary oe_read_only"
attrs="{'invisible': [('stage_category','!=', 'draft')]}"/>
<button name="button_sale_order" string="Create Sale Order" <button name="button_sale_order" string="Create Sale Order"
type="object" class="btn-primary oe_read_only" type="object" class="btn-primary oe_read_only"
attrs="{'invisible': ['|',('stage_category','!=', 'progress'),('so_count','>',0)]}"/> attrs="{'invisible': ['|',('stage_category','!=', 'progress'),('so_count','>',0)]}"/>
@ -83,13 +88,18 @@
<button name="button_close" string="Close Subscription" <button name="button_close" string="Close Subscription"
type="object" class="btn-primary oe_read_only" type="object" class="btn-primary oe_read_only"
attrs="{'invisible': [('stage_category', 'in', ['draft', 'closed'])]}"/> attrs="{'invisible': [('stage_category', 'in', ['draft', 'closed'])]}"/>
<button name="action_renew" string="Renew" type="object" class="btn-primary oe_read_only" attrs="{'invisible': [('so_count', '=', 0)]}"/> <button name="action_renew" string="Renew" type="object"
<field name="stage_id" widget="statusbar" options="{'clickable' :0}"/> class="btn-primary oe_read_only"
attrs="{'invisible': [('so_count', '=', 0)]}"/>
<field name="stage_id" widget="statusbar"
options="{'clickable' :0}"/>
</header> </header>
<sheet> <sheet>
<div class="oe_button_box" name="button_box"> <div class="oe_button_box" name="button_box">
<button name="button_sale_count" type="object" class="oe_stat_button" <button name="button_sale_count" type="object"
icon="fa-credit-card" attrs="{'invisible': [('sale_order', '=', False)]}"> class="oe_stat_button"
icon="fa-credit-card"
attrs="{'invisible': [('sale_order', '=', False)]}">
<div class="o_field_widget o_stat_info"> <div class="o_field_widget o_stat_info">
<span class="o_stat_value"> <span class="o_stat_value">
<field name="so_count"/> <field name="so_count"/>
@ -99,8 +109,10 @@
</span> </span>
</div> </div>
</button> </button>
<button name="button_invoice_count" type="object" class="oe_stat_button" <button name="button_invoice_count" type="object"
icon="fa-file-text" attrs="{'invisible': [('invoice_count','&lt;=',0)]}"> class="oe_stat_button"
icon="fa-file-text"
attrs="{'invisible': [('invoice_count','&lt;=',0)]}">
<div class="o_field_widget o_stat_info"> <div class="o_field_widget o_stat_info">
<span class="o_stat_value"> <span class="o_stat_value">
<field name="invoice_count"/> <field name="invoice_count"/>
@ -124,7 +136,8 @@
</div> </div>
<group> <group>
<group> <group>
<field name="partner_id" attrs="{'required': True}"/> <field name="partner_id"
attrs="{'required': True}"/>
<field name="partner_invoice_id"/> <field name="partner_invoice_id"/>
<field name="partner_shipping_id"/> <field name="partner_shipping_id"/>
<field name="date_started"/> <field name="date_started"/>
@ -145,7 +158,8 @@
</group> </group>
</group> </group>
<notebook> <notebook>
<page string="Subscriptions" name="subscription_products_line"> <page string="Subscriptions"
name="subscription_products_line">
<field name="product_line_ids"> <field name="product_line_ids">
<tree string="Product lines" editable="bottom"> <tree string="Product lines" editable="bottom">
<field name="sequence" widget="handle"/> <field name="sequence" widget="handle"/>
@ -156,17 +170,31 @@
<field name="currency_id" invisible="1"/> <field name="currency_id" invisible="1"/>
<field name="unit_price" required="1"/> <field name="unit_price" required="1"/>
<field name="discount" required="1"/> <field name="discount" required="1"/>
<field name="tax_id"
widget="many2many_tags"/>
<field name="price_tax" readonly="1" invisible="1"/>
<field name="price_total" readonly="1" invisible="1"/>
<field name="total_amount" readonly="1"/> <field name="total_amount" readonly="1"/>
</tree> </tree>
</field> </field>
<group name="note_group" col="6" class="mt-2 mt-md-0"> <group name="note_group" col="6"
<group class="oe_subtotal_footer oe_right" colspan="2" name="recurring_total"> class="mt-2 mt-md-0">
<field name="total_recurring_price"/> <group class="oe_subtotal_footer oe_right"
colspan="2" name="recurring_total">
<field name="total_recurring_price"
widget="monetary"/>
<field name="tax_total" widget="monetary"/>
<field name="currency_id" invisible="1"/>
<field name="total_with_tax"
widget="monetary"/>
</group> </group>
</group> </group>
</page> </page>
<page string="Terms and Conditions" name="terms_and_conditions"> <page string="Terms and Conditions"
<field name="description" placeholder="Terms and Conditions."/> name="terms_and_conditions">
<field name="description"
placeholder="Terms and Conditions."/>
</page> </page>
<page string="Other Info" name="other_info"> <page string="Other Info" name="other_info">
<group> <group>
@ -194,7 +222,8 @@
<field name="name">subscription.package.kanban</field> <field name="name">subscription.package.kanban</field>
<field name="model">subscription.package</field> <field name="model">subscription.package</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<kanban default_group_by="stage_id" quick_create="false" class="o_kanban_mobile" sample="1"> <kanban default_group_by="stage_id" quick_create="false"
class="o_kanban_mobile" sample="1">
<field name="stage_id"/> <field name="stage_id"/>
<field name="user_id"/> <field name="user_id"/>
<field name="to_renew"/> <field name="to_renew"/>
@ -219,10 +248,12 @@
</div> </div>
<div class="o_kanban_record_bottom"> <div class="o_kanban_record_bottom">
<div class="oe_kanban_bottom_left"> <div class="oe_kanban_bottom_left">
<field name="activity_ids" widget="kanban_activity"/> <field name="activity_ids"
widget="kanban_activity"/>
</div> </div>
<div class="oe_kanban_bottom_right"> <div class="oe_kanban_bottom_right">
<field name="user_id" widget="many2one_avatar_user"/> <field name="user_id"
widget="many2one_avatar_user"/>
</div> </div>
</div> </div>
</div> </div>
@ -247,7 +278,8 @@
<menuitem id="subscription_menu_root" <menuitem id="subscription_menu_root"
name="Subscription" name="Subscription"
action="subscription_package.subscription_action_subscriptions" action="subscription_package.subscription_action_subscriptions"
sequence="1" groups="group_subscription_user" web_icon="subscription_package,static/description/icon.png"/> sequence="1" groups="group_subscription_user"
web_icon="subscription_package,static/description/icon.png"/>
<menuitem id="subscription_menu_subscriptions" <menuitem id="subscription_menu_subscriptions"
name="Subscriptions" name="Subscriptions"

Write Preview
Loading…
Cancel
Save