소스 검색

Merge pull request #2297 from rohitwaghchaure/auto_email_report_issue

[Fix] break fieldtype issue in the auto email report, object split issue for the columns which has list and dictionary
version-14
Nabin Hait 8 년 전
committed by GitHub
부모
커밋
47e7eabc57
2개의 변경된 파일18개의 추가작업 그리고 1개의 파일을 삭제
  1. +8
    -1
      frappe/core/doctype/report/report.py
  2. +10
    -0
      frappe/email/doctype/auto_email_report/auto_email_report.js

+ 8
- 1
frappe/core/doctype/report/report.py 파일 보기

@@ -57,7 +57,14 @@ class Report(Document):
if self.report_type in ('Query Report', 'Script Report'):
# query and script reports
data = frappe.desk.query_report.run(self.name, filters=filters, user=user)
out.append([d.split(':')[0] for d in data.get('columns')])
columns_list = []
for d in data.get('columns'):
if isinstance(d, dict):
columns_list.append(d.get('label'))
else:
columns_list.append(d.split(':')[0])

out.append(columns_list)
out += data.get('result')
else:
# standard report


+ 10
- 0
frappe/email/doctype/auto_email_report/auto_email_report.js 파일 보기

@@ -60,9 +60,19 @@ frappe.ui.form.on('Auto Email Report', {
<tr><th style="width: 50%">'+__('Filter')+'</th><th>'+__('Value')+'</th></tr>\
</thead><tbody></tbody></table>').appendTo(wrapper);
$('<p class="text-muted small">' + __("Click table to edit") + '</p>').appendTo(wrapper);

var filters = JSON.parse(frm.doc.filters || '{}');
var report_filters = frappe.query_reports[frm.doc.report].filters;

report_filters_list = []
$.each(report_filters, function(key, val){
// Remove break fieldtype from the filters
if(val.fieldtype != 'Break') {
report_filters_list.push(val)
}
})
report_filters = report_filters_list;

report_filters.forEach(function(f) {
$('<tr><td>' + f.label + '</td><td>'+ frappe.format(filters[f.fieldname], f) +'</td></tr>')
.appendTo(table.find('tbody'));


불러오는 중...
취소
저장