Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into issue-summary-report-fix
diff --git a/erpnext/support/report/issue_summary/issue_summary.js b/erpnext/support/report/issue_summary/issue_summary.js
index eb0e06c..a5e1de6 100644
--- a/erpnext/support/report/issue_summary/issue_summary.js
+++ b/erpnext/support/report/issue_summary/issue_summary.js
@@ -42,6 +42,7 @@
"",
{label: __('Open'), value: 'Open'},
{label: __('Replied'), value: 'Replied'},
+ {label: __('Hold'), value: 'Hold'},
{label: __('Resolved'), value: 'Resolved'},
{label: __('Closed'), value: 'Closed'}
]
diff --git a/erpnext/support/report/issue_summary/issue_summary.py b/erpnext/support/report/issue_summary/issue_summary.py
index 7861e30..d93790d 100644
--- a/erpnext/support/report/issue_summary/issue_summary.py
+++ b/erpnext/support/report/issue_summary/issue_summary.py
@@ -62,7 +62,7 @@
'width': 200
})
- self.statuses = ['Open', 'Replied', 'Resolved', 'Closed']
+ self.statuses = ['Open', 'Replied', 'Hold', 'Resolved', 'Closed']
for status in self.statuses:
self.columns.append({
'label': _(status),
@@ -265,6 +265,7 @@
labels = []
open_issues = []
replied_issues = []
+ hold_issues = []
resolved_issues = []
closed_issues = []
@@ -277,6 +278,7 @@
labels.append(entry.get(entity_field))
open_issues.append(entry.get('open'))
replied_issues.append(entry.get('replied'))
+ hold_issues.append(entry.get('hold'))
resolved_issues.append(entry.get('resolved'))
closed_issues.append(entry.get('closed'))
@@ -293,6 +295,10 @@
'values': replied_issues[:30]
},
{
+ 'name': 'Hold',
+ 'values': hold_issues[:30]
+ },
+ {
'name': 'Resolved',
'values': resolved_issues[:30]
},
@@ -313,12 +319,14 @@
open_issues = 0
replied = 0
+ hold = 0
resolved = 0
closed = 0
for entry in self.data:
open_issues += entry.get('open')
replied += entry.get('replied')
+ hold += entry.get('hold')
resolved += entry.get('resolved')
closed += entry.get('closed')
@@ -336,6 +344,12 @@
'datatype': 'Int',
},
{
+ 'value': hold,
+ 'indicator': 'Grey',
+ 'label': _('Hold'),
+ 'datatype': 'Int',
+ },
+ {
'value': resolved,
'indicator': 'Green',
'label': _('Resolved'),