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

Merge branch 'develop' into jinja-issue

Browse source
This commit is contained in:
Suraj Shetty 2020-11-05 11:24:24 +05:30 • committed by GitHub
commit e650cd5003
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/core/doctype/report/report.js
View file

@ -2,7 +2,9 @@ frappe.ui.form.on('Report', {
refresh: function(frm) {
if (frm.doc.is_standard === "Yes" && !frappe.boot.developer_mode) {
// make the document read-only
frm.set_read_only();
frm.disable_form();
} else {
frm.enable_save();
}
let doc = frm.doc;
@ -32,8 +34,6 @@ frappe.ui.form.on('Report', {
});
}, doc.disabled ? "fa fa-check" : "fa fa-off");
}
frm.events.report_type(frm);
},
ref_doctype: function(frm) {

2
frappe/public/js/frappe/form/form.js
View file

@ -261,7 +261,7 @@ frappe.ui.form.Form = class FrappeForm {
cur_frm = this;
if(this.docname) { // document to show
this.save_disabled = false;
// set the doc
this.doc = frappe.get_doc(this.doctype, this.docname);

7
frappe/public/js/frappe/views/gantt/gantt_view.js
View file

@ -10,7 +10,12 @@ frappe.views.GanttView = class GanttView extends frappe.views.ListView {
.then(() => {
this.page_title = this.page_title + ' ' + __('Gantt');
this.calendar_settings = frappe.views.calendar[this.doctype] || {};
if(this.calendar_settings.order_by) {
if (typeof this.calendar_settings.gantt == 'object') {
Object.assign(this.calendar_settings, this.calendar_settings.gantt);
}
if (this.calendar_settings.order_by) {
this.sort_by = this.calendar_settings.order_by;
this.sort_order = 'asc';
} else {

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

@ -1043,7 +1043,11 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
// applied to Float, Currency fields, needed only for currency formatting.
// make first data column have value 'Total'
let index = 1;
if (this.datatable && this.datatable.options.checkboxColumn) index = 2;
if (this.report_settings.get_datatable_options) {
let datatable = this.report_settings.get_datatable_options({});
if (datatable && datatable.checkboxColumn) index = 2;
}
if (column.colIndex === index && !value) {
value = "Total";