Просмотр исходного кода

Minor issue when generating the pdf for the reports having html format (#3478)

version-14
Manas Solanki 8 лет назад
committed by Nabin Hait
Родитель
Сommit
b6cb70d232
1 измененных файлов: 7 добавлений и 3 удалений
  1. +7
    -3
      frappe/public/js/frappe/views/reports/query_report.js

+ 7
- 3
frappe/public/js/frappe/views/reports/query_report.js Просмотреть файл

@@ -217,12 +217,17 @@ frappe.views.QueryReport = Class.extend({


var orientation = this.print_settings.orientation; var orientation = this.print_settings.orientation;
var landscape = orientation == "Landscape" ? true: false var landscape = orientation == "Landscape" ? true: false
var columns = this.grid.getColumns();
if(this.html_format) { if(this.html_format) {
var content = frappe.render(this.html_format,
{data: frappe.slickgrid_tools.get_filtered_items(this.dataView), filters:this.get_values(), report:this});
var content = frappe.render(this.html_format, {
data: frappe.slickgrid_tools.get_filtered_items(this.dataView),
filters:this.get_values(),
report:this
});


//Render Report in HTML //Render Report in HTML
var html = frappe.render_template("print_template", { var html = frappe.render_template("print_template", {
columns:columns,
content:content, content:content,
title:__(this.report_name), title:__(this.report_name),
base_url: base_url, base_url: base_url,
@@ -236,7 +241,6 @@ frappe.views.QueryReport = Class.extend({
.get_view_data(this.columns, this.dataView) .get_view_data(this.columns, this.dataView)
.map(row => row[0]).filter(idx => idx !== 'Sr No'); .map(row => row[0]).filter(idx => idx !== 'Sr No');


var columns = this.grid.getColumns();
var data = this.grid.getData().getItems(); var data = this.grid.getData().getItems();
data = data.filter(d => visible_idx.includes(d._id)); data = data.filter(d => visible_idx.includes(d._id));




Загрузка…
Отмена
Сохранить