Rushabh Mehta преди 9 години
родител
ревизия
ab3d1849bf
променени са 4 файла, в които са добавени 18 реда и са изтрити 17 реда
  1. +5
    -5
      frappe/core/doctype/doctype/doctype.js
  2. +1
    -0
      frappe/custom/doctype/customize_form/customize_form.js
  3. +1
    -1
      frappe/model/db_query.py
  4. +11
    -11
      frappe/public/js/frappe/views/reports/query_report.js

+ 5
- 5
frappe/core/doctype/doctype/doctype.js Целия файл

@@ -5,11 +5,11 @@
// Menu Display
// -------------

$(cur_frm.wrapper).on("grid-row-render", function(e, grid_row) {
if(grid_row.doc && grid_row.doc.fieldtype=="Section Break") {
$(grid_row.row).css({"font-weight": "bold"});
}
})
// $(cur_frm.wrapper).on("grid-row-render", function(e, grid_row) {
// if(grid_row.doc && grid_row.doc.fieldtype=="Section Break") {
// $(grid_row.row).css({"font-weight": "bold"});
// }
// })

cur_frm.cscript.refresh = function(doc, cdt, cdn) {
if(doc.__islocal && (user !== "Administrator" || !frappe.boot.developer_mode)) {


+ 1
- 0
frappe/custom/doctype/customize_form/customize_form.js Целия файл

@@ -45,6 +45,7 @@ frappe.ui.form.on("Customize Form", {
},

setup_sortable: function(frm) {
frm.page.body.find('.highlight').removeClass('highlight');
frm.doc.fields.forEach(function(f, i) {
var data_row = frm.page.body.find('[data-fieldname="fields"] [data-idx="'+ f.idx +'"] .data-row');



+ 1
- 1
frappe/model/db_query.py Целия файл

@@ -319,7 +319,7 @@ class DatabaseQuery(object):
column_name = "date_format({tname}.{fname}, '%Y-%m-%d')".format(tname=tname,
fname=f.fieldname)

if self.ignore_ifnull or not can_be_null:
if self.ignore_ifnull or not can_be_null or (value and f.operator in ('=', 'like')):
condition = '{column_name} {operator} {value}'.format(
column_name=column_name, operator=f.operator,
value=value)


+ 11
- 11
frappe/public/js/frappe/views/reports/query_report.js Целия файл

@@ -374,11 +374,11 @@ frappe.views.QueryReport = Class.extend({
if (this.get_query_report_opts().tree) {
this.setup_tree();
}
this.set_message(res.message);
this.set_message(res.message);
this.setup_chart(res);
},
make_columns: function(columns) {
var me = this;
var formatter = this.get_formatter();
@@ -717,7 +717,7 @@ frappe.views.QueryReport = Class.extend({
frappe.tools.downloadify(result, null, this.title);
return false;
},
set_message: function(msg) {
if(msg) {
this.wrapper.find(".help-msg").html(msg).toggle(true);
@@ -725,25 +725,25 @@ frappe.views.QueryReport = Class.extend({
this.wrapper.find(".help-msg").empty().toggle(false);
}
},
setup_chart: function(res) {
var me = this;
this.wrapper.find(".chart_area").parent().toggle(false);
if (this.get_query_report_opts().get_chart_data) {
var opts = query_report_opts.get_chart_data(res.columns, res.result);
var opts = this.get_query_report_opts().get_chart_data(res.columns, res.result);
} else if (res.chart) {
var opts = res.chart;
}
$.extend(opts, {
wrapper: me.wrapper,
bind_to: ".chart_area"
});
this.chart = new frappe.ui.Chart(opts);
if(this.chart)
if(this.chart)
this.wrapper.find(".chart_area").parent().toggle(true);
}
})

Зареждане…
Отказ
Запис