Browse Source

Merge branch 'hotfix'

version-14
Nabin Hait 8 years ago
parent
commit
c1155eb6e6
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      frappe/__init__.py
  2. +1
    -1
      frappe/public/js/frappe/views/reports/reportview.js

+ 1
- 1
frappe/__init__.py View File

@@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
from .exceptions import * from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template from .utils.jinja import get_jenv, get_template, render_template


__version__ = '7.2.9'
__version__ = '7.2.10'
__title__ = "Frappe Framework" __title__ = "Frappe Framework"


local = Local() local = Local()


+ 1
- 1
frappe/public/js/frappe/views/reports/reportview.js View File

@@ -522,7 +522,7 @@ frappe.views.ReportView = frappe.ui.Listing.extend({
var me = this; var me = this;


this.page.add_inner_button(__('Show Totals'), function() { this.page.add_inner_button(__('Show Totals'), function() {
me.add_totals_row = 1 - me.add_totals_row;
me.add_totals_row = 1 - (me.add_totals_row ? me.add_totals_row : 0);
me.render_list(); me.render_list();
}); });
}, },


Loading…
Cancel
Save