Browse Source

[UPDT] Bug Fix 'crm_dashboard'

pull/219/head
AjmalCybro 3 years ago
parent
commit
64e32ae4f5
  1. 2
      crm_dashboard/__manifest__.py
  2. 5
      crm_dashboard/doc/RELEASE_NOTES.md
  3. 21
      crm_dashboard/models/crm_dashboard.py

2
crm_dashboard/__manifest__.py

@ -25,7 +25,7 @@
'summary': """CRM dashboard module brings a multipurpose graphical dashboard""" 'summary': """CRM dashboard module brings a multipurpose graphical dashboard"""
""" for CRM module and making the relationship management better and easier""", """ for CRM module and making the relationship management better and easier""",
'category': 'Sales', 'category': 'Sales',
'version': '15.0.1.0.2', 'version': '15.0.1.0.3',
'author': 'Cybrosys Techno Solutions', 'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions', 'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions', 'maintainer': 'Cybrosys Techno Solutions',

5
crm_dashboard/doc/RELEASE_NOTES.md

@ -4,3 +4,8 @@
#### Version 15.0.1.0.0 #### Version 15.0.1.0.0
#### ADD #### ADD
- Initial commit for CRM Dashboard Module - Initial commit for CRM Dashboard Module
#### 26.07.2022
#### Version 15.0.1.0.3
#### FIX
- Bug fixes for CRM Dashboard Module

21
crm_dashboard/models/crm_dashboard.py

@ -152,6 +152,8 @@ class CRMLead(models.Model):
for rec in data2: for rec in data2:
sales.append(rec['sales']) sales.append(rec['sales'])
inv_target.append(rec['invoiced_target']) inv_target.append(rec['invoiced_target'])
if inv_target == [None]:
inv_target = [0]
team_id = rec['sale_team_id'] team_id = rec['sale_team_id']
target_annual = (sum(sales) + sum(inv_target)) target_annual = (sum(sales) + sum(inv_target))
@ -167,6 +169,8 @@ class CRMLead(models.Model):
for rec in data3: for rec in data3:
sales.append(rec['sales']) sales.append(rec['sales'])
inv_target.append(rec['invoiced_target']) inv_target.append(rec['invoiced_target'])
if inv_target == [None]:
inv_target = [0]
ytd_target = (sum(sales) + sum(inv_target)) ytd_target = (sum(sales) + sum(inv_target))
self._cr.execute('''select sum(expected_revenue) from crm_lead where stage_id=4 self._cr.execute('''select sum(expected_revenue) from crm_lead where stage_id=4
@ -373,7 +377,7 @@ class CRMLead(models.Model):
self.achievement_amount = achievement self.achievement_amount = achievement
percent = 0 percent = 0
if achievement != 0: if total > 0:
percent = (achievement * 100 / total) / 100 percent = (achievement * 100 / total) / 100
goals.append(achievement) goals.append(achievement)
@ -538,7 +542,6 @@ class CRMLead(models.Model):
if len(data) != 3: if len(data) != 3:
del data del data
else: else:
data[1] = 0
if data[2] == 0: if data[2] == 0:
ratio = 0 ratio = 0
else: else:
@ -584,7 +587,10 @@ class CRMLead(models.Model):
if len(data) != 3: if len(data) != 3:
del data del data
else: else:
ratio = round(data[1] / data[2], 2) if data[2] == 0:
ratio = 0
else:
ratio = round(data[1] / data[2], 2)
data.append(str(ratio)) data.append(str(ratio))
salesperson_wise_ratio.append(data) salesperson_wise_ratio.append(data)
@ -622,7 +628,10 @@ class CRMLead(models.Model):
if len(data) != 3: if len(data) != 3:
del data del data
else: else:
ratio = round(data[1] / data[2], 2) if data[2] == 0:
ratio = 0
else:
ratio = round(data[1] / data[2], 2)
data.append(str(ratio)) data.append(str(ratio))
sales_team_wise_ratio.append(data) sales_team_wise_ratio.append(data)
@ -754,6 +763,8 @@ class CRMLead(models.Model):
for rec in data2: for rec in data2:
sales.append(rec['sales']) sales.append(rec['sales'])
inv_target.append(rec['invoiced_target']) inv_target.append(rec['invoiced_target'])
if inv_target == [None]:
inv_target = [0]
team_id = rec['sale_team_id'] team_id = rec['sale_team_id']
target_annual = (sum(sales) + sum(inv_target)) target_annual = (sum(sales) + sum(inv_target))
@ -769,6 +780,8 @@ class CRMLead(models.Model):
for rec in data3: for rec in data3:
sales.append(rec['sales']) sales.append(rec['sales'])
inv_target.append(rec['invoiced_target']) inv_target.append(rec['invoiced_target'])
if inv_target == [None]:
inv_target = [0]
ytd_target = (sum(sales) + sum(inv_target)) ytd_target = (sum(sales) + sum(inv_target))
self._cr.execute('''select sum(expected_revenue) from crm_lead where stage_id=4 self._cr.execute('''select sum(expected_revenue) from crm_lead where stage_id=4

Loading…
Cancel
Save