diff --git a/crm_dashboard/__manifest__.py b/crm_dashboard/__manifest__.py index b557bee82..a98fcb8e5 100644 --- a/crm_dashboard/__manifest__.py +++ b/crm_dashboard/__manifest__.py @@ -25,7 +25,7 @@ 'summary': """CRM dashboard module brings a multipurpose graphical dashboard""" """ for CRM module and making the relationship management better and easier""", 'category': 'Sales', - 'version': '15.0.1.0.2', + 'version': '15.0.1.0.3', 'author': 'Cybrosys Techno Solutions', 'company': 'Cybrosys Techno Solutions', 'maintainer': 'Cybrosys Techno Solutions', diff --git a/crm_dashboard/doc/RELEASE_NOTES.md b/crm_dashboard/doc/RELEASE_NOTES.md index f56f697d7..a0f29184a 100644 --- a/crm_dashboard/doc/RELEASE_NOTES.md +++ b/crm_dashboard/doc/RELEASE_NOTES.md @@ -3,4 +3,9 @@ #### 30.10.2021 #### Version 15.0.1.0.0 #### ADD -- Initial commit for CRM Dashboard Module \ No newline at end of file +- Initial commit for CRM Dashboard Module + +#### 26.07.2022 +#### Version 15.0.1.0.3 +#### FIX +- Bug fixes for CRM Dashboard Module \ No newline at end of file diff --git a/crm_dashboard/models/crm_dashboard.py b/crm_dashboard/models/crm_dashboard.py index 639634985..abc9929c6 100644 --- a/crm_dashboard/models/crm_dashboard.py +++ b/crm_dashboard/models/crm_dashboard.py @@ -152,6 +152,8 @@ class CRMLead(models.Model): for rec in data2: sales.append(rec['sales']) inv_target.append(rec['invoiced_target']) + if inv_target == [None]: + inv_target = [0] team_id = rec['sale_team_id'] target_annual = (sum(sales) + sum(inv_target)) @@ -167,6 +169,8 @@ class CRMLead(models.Model): for rec in data3: sales.append(rec['sales']) inv_target.append(rec['invoiced_target']) + if inv_target == [None]: + inv_target = [0] ytd_target = (sum(sales) + sum(inv_target)) 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 percent = 0 - if achievement != 0: + if total > 0: percent = (achievement * 100 / total) / 100 goals.append(achievement) @@ -538,7 +542,6 @@ class CRMLead(models.Model): if len(data) != 3: del data else: - data[1] = 0 if data[2] == 0: ratio = 0 else: @@ -584,7 +587,10 @@ class CRMLead(models.Model): if len(data) != 3: del data 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)) salesperson_wise_ratio.append(data) @@ -622,7 +628,10 @@ class CRMLead(models.Model): if len(data) != 3: del data 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)) sales_team_wise_ratio.append(data) @@ -754,6 +763,8 @@ class CRMLead(models.Model): for rec in data2: sales.append(rec['sales']) inv_target.append(rec['invoiced_target']) + if inv_target == [None]: + inv_target = [0] team_id = rec['sale_team_id'] target_annual = (sum(sales) + sum(inv_target)) @@ -769,6 +780,8 @@ class CRMLead(models.Model): for rec in data3: sales.append(rec['sales']) inv_target.append(rec['invoiced_target']) + if inv_target == [None]: + inv_target = [0] ytd_target = (sum(sales) + sum(inv_target)) self._cr.execute('''select sum(expected_revenue) from crm_lead where stage_id=4