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
0f63f8a8
Commit
0f63f8a8
authored
7 years ago
by
Saurabh
Browse files
Options
Download
Plain Diff
Merge branch 'hotfix'
parents
e8d703ad
69085c75
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
frappe/__init__.py
+1
-1
frappe/__init__.py
frappe/commands/site.py
+1
-1
frappe/commands/site.py
frappe/printing/doctype/print_format/print_format.py
+1
-1
frappe/printing/doctype/print_format/print_format.py
with
3 additions
and
3 deletions
+3
-3
frappe/__init__.py
View file @
0f63f8a8
...
...
@@ -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__
=
'8.7.
9
'
__version__
=
'8.7.
10
'
__title__
=
"Frappe Framework"
local
=
Local
()
...
...
This diff is collapsed.
Click to expand it.
frappe/commands/site.py
View file @
0f63f8a8
...
...
@@ -470,7 +470,7 @@ def _set_limits(context, site, limits):
@
click
.
command
(
'clear-limits'
)
@
click
.
option
(
'--site'
,
help
=
'site name'
)
@
click
.
argument
(
'limits'
,
nargs
=-
1
,
type
=
click
.
Choice
([
'emails'
,
'space'
,
'users'
,
'email_group'
,
'expiry'
,
'support_email'
,
'support_chat'
,
'upgrade_url'
]))
'expiry'
,
'support_email'
,
'support_chat'
,
'upgrade_url'
,
'daily_emails'
]))
@
pass_context
def
clear_limits
(
context
,
site
,
limits
):
"""Clears given limit from the site config, and removes limit from site config if its empty"""
...
...
This diff is collapsed.
Click to expand it.
frappe/printing/doctype/print_format/print_format.py
View file @
0f63f8a8
...
...
@@ -27,7 +27,7 @@ class PrintFormat(Document):
if
not
self
.
module
:
self
.
module
=
frappe
.
db
.
get_value
(
'DocType'
,
self
.
doc_type
,
'module'
)
if
self
.
html
:
if
self
.
html
and
self
.
print_format_type
!=
'Js'
:
validate_template
(
self
.
html
)
def
extract_images
(
self
):
...
...
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