Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
仰若水
frappe
Commits
1c8c7cc0
Commit
1c8c7cc0
authored
7 years ago
by
Nabin Hait
Browse files
Options
Download
Plain Diff
Merge branch 'hotfix'
parents
10076fc5
6fa9f81e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
frappe/__init__.py
+1
-1
frappe/__init__.py
frappe/public/js/frappe/views/reports/query_report.js
+1
-1
frappe/public/js/frappe/views/reports/query_report.js
with
2 additions
and
2 deletions
+2
-2
frappe/__init__.py
View file @
1c8c7cc0
...
...
@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from
.exceptions
import
*
from
.utils.jinja
import
get_jenv
,
get_template
,
render_template
,
get_email_from_template
__version__
=
'9.0.
7
'
__version__
=
'9.0.
8
'
__title__
=
"Frappe Framework"
local
=
Local
()
...
...
This diff is collapsed.
Click to expand it.
frappe/public/js/frappe/views/reports/query_report.js
View file @
1c8c7cc0
...
...
@@ -591,7 +591,7 @@ frappe.views.QueryReport = Class.extend({
newrow
.
id
=
newrow
.
name
?
newrow
.
name
:
(
"
_
"
+
newrow
.
_id
);
this
.
data
.
push
(
newrow
);
}
if
(
this
.
report_doc
.
add_total_row
)
{
if
(
this
.
data
.
length
&&
this
.
report_doc
.
add_total_row
)
{
this
.
total_row_id
=
this
.
data
[
this
.
data
.
length
-
1
].
id
;
}
},
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help