|
|
@ -120,7 +120,7 @@ class CRMLead(models.Model): |
|
|
|
"""Sales Activity Pie""" |
|
|
|
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 |
|
|
|
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() |
|
|
|
|
|
|
|
name = [] |
|
|
@ -376,7 +376,7 @@ class CRMLead(models.Model): |
|
|
|
self.achievement_amount = achievement |
|
|
|
|
|
|
|
percent = 0 |
|
|
|
if total != 0: |
|
|
|
if total > 0: |
|
|
|
percent = (achievement * 100 / total) / 100 |
|
|
|
|
|
|
|
goals.append(achievement) |
|
|
@ -586,7 +586,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) |
|
|
|
|
|
|
@ -624,7 +627,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) |
|
|
|
|
|
|
|