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

Merge branch 'master' of github.com:webnotes/wnframework

Browse source
This commit is contained in:
Rushabh Mehta 2013-05-02 14:46:55 +05:30
commit 3424d4534a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public/js/legacy/widgets/form/fields.js
View file

@ -1295,11 +1295,11 @@ _f.ButtonField.prototype.make_input = function() { var me = this;
}
_f.ButtonField.prototype.hide = function() {
$dh(this.button_area);
$dh(this.wrapper);
};
_f.ButtonField.prototype.show = function() {
$ds(this.button_area);
$ds(this.wrapper);
};

2
webnotes/widgets/query_report.py
View file

@ -68,7 +68,7 @@ def run(report_name, filters=None):
+ ".report." + scrub(report.name) + "." + scrub(report.name) + ".execute"
columns, result = webnotes.get_method(method_name)(filters or {})
if cint(report.add_total_row):
if cint(report.add_total_row) and result:
result = add_total_row(result, columns)
return {