vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into develop

Browse source
This commit is contained in:
Nabin Hait 2017-05-26 21:36:17 +05:30
commit aa16e8adf5
6 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template
__version__ = '8.0.59'
__version__ = '8.0.60'
__title__ = "Frappe Framework"
local = Local()

2
frappe/core/doctype/system_settings/system_settings.json
View file

@ -933,7 +933,7 @@
"issingle": 1,
"istable": 0,
"max_attachments": 0,
"modified": "2017-05-19 09:12:50.353887",
"modified": "2017-05-23 09:12:50.353877",
"modified_by": "Administrator",
"module": "Core",
"name": "System Settings",

5
frappe/printing/doctype/print_format/print_format.py
View file

@ -77,4 +77,7 @@ def make_default(name):
'value': name,
})
frappe.msgprint(frappe._("Done"))
frappe.msgprint(frappe._("{0} is now default print format for {1} doctype").format(
frappe.bold(name),
frappe.bold(print_format.doc_type)
))

4
frappe/public/js/frappe/model/meta.js
View file

@ -208,8 +208,8 @@ $.extend(frappe.meta, {
});
if(default_print_format && default_print_format != "Standard") {
var index = print_format_list.indexOf(default_print_format) - 1;
print_format_list.sort().splice(index, 1);
var index = print_format_list.indexOf(default_print_format);
print_format_list.splice(index, 1).sort();
print_format_list.unshift(default_print_format);
}

4
frappe/public/js/frappe/upload.js
View file

@ -198,7 +198,9 @@ frappe.upload = {
i += 1;
var file = files[i];
args.is_private = file.is_private;
frappe.show_progress(__('Uploading'), i+1, files.length);
if(!opts.progress) {
frappe.show_progress(__('Uploading'), i+1, files.length);
}
}
frappe.upload.upload_file(file, args, opts);
}

8
frappe/public/js/frappe/views/reports/query_report.js
View file

@ -215,6 +215,8 @@ frappe.views.QueryReport = Class.extend({
return false;
}
var orientation = this.print_settings.orientation;
var landscape = orientation == "Landscape" ? true: false
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});
@ -225,7 +227,8 @@ frappe.views.QueryReport = Class.extend({
title:__(this.report_name),
base_url: base_url,
print_css: print_css,
print_settings: this.print_settings
print_settings: this.print_settings,
landscape: landscape
});
} else {
// rows filtered by inline_filter of slickgrid
@ -249,7 +252,8 @@ frappe.views.QueryReport = Class.extend({
title:__(this.report_name),
base_url: base_url,
print_css: print_css,
print_settings: this.print_settings
print_settings: this.print_settings,
landscape: landscape
});
}