Browse Source

[UPDT] Bug Fix 'crm_dashboard'

pull/216/head
AjmalCybro 3 years ago
parent
commit
f39ff6584d
  1. 2
      crm_dashboard/__manifest__.py
  2. 5
      crm_dashboard/doc/RELEASE_NOTES.md
  3. 17
      crm_dashboard/models/crm_dashboard.py

2
crm_dashboard/__manifest__.py

@ -24,7 +24,7 @@
'description': """CRM Dashboard, Detailed Dashboard View for CRM, CRM, Dashboard, odoo14""", 'description': """CRM Dashboard, Detailed Dashboard View for CRM, CRM, Dashboard, odoo14""",
'summary': """Detailed Dashboard View for CRM""", 'summary': """Detailed Dashboard View for CRM""",
'category': 'Sales', 'category': 'Sales',
'version': '14.0.1.0.1', 'version': '14.0.1.0.2',
'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 14.0.1.0.0 #### Version 14.0.1.0.0
#### ADD #### ADD
- Initial commit for CRM Dashboard Module - Initial commit for CRM Dashboard Module
#### 15.07.2022
#### Version 14.0.1.0.2
#### FIX
- Bug fixes for CRM Dashboard Module

17
crm_dashboard/models/crm_dashboard.py

@ -120,7 +120,7 @@ class CRMLead(models.Model):
"""Sales Activity Pie""" """Sales Activity Pie"""
self._cr.execute('''select mail_activity_type.name,COUNT(*) from mail_activity self._cr.execute('''select mail_activity_type.name,COUNT(*) from mail_activity
inner join mail_activity_type on mail_activity.activity_type_id = mail_activity_type.id inner join mail_activity_type on mail_activity.activity_type_id = mail_activity_type.id
where res_model = 'crm.lead' GROUP BY mail_activity_type.name''') where mail_activity.res_model = 'crm.lead' GROUP BY mail_activity_type.name''')
data = self._cr.dictfetchall() data = self._cr.dictfetchall()
name = [] name = []
@ -151,6 +151,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))
@ -166,6 +168,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
@ -537,7 +541,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:
@ -582,6 +585,9 @@ class CRMLead(models.Model):
for data in won: for data in won:
if len(data) != 3: if len(data) != 3:
del data del data
else:
if data[2] == 0:
ratio = 0
else: else:
ratio = round(data[1] / data[2], 2) ratio = round(data[1] / data[2], 2)
data.append(str(ratio)) data.append(str(ratio))
@ -620,6 +626,9 @@ class CRMLead(models.Model):
for data in won: for data in won:
if len(data) != 3: if len(data) != 3:
del data del data
else:
if data[2] == 0:
ratio = 0
else: else:
ratio = round(data[1] / data[2], 2) ratio = round(data[1] / data[2], 2)
data.append(str(ratio)) data.append(str(ratio))
@ -753,6 +762,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))
@ -768,6 +779,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