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
715933c2
Commit
715933c2
authored
8 years ago
by
Nabin Hait
Browse files
Options
Download
Plain Diff
Merge branch 'hotfix'
parents
ff9819ed
e60d438a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
frappe/__init__.py
+1
-1
frappe/__init__.py
frappe/patches.txt
+1
-0
frappe/patches.txt
frappe/patches/v7_1/disabled_print_settings_for_custom_print_format.py
+16
-0
...s/v7_1/disabled_print_settings_for_custom_print_format.py
frappe/print/doctype/print_format/print_format.js
+9
-0
frappe/print/doctype/print_format/print_format.js
with
27 additions
and
1 deletion
+27
-1
frappe/__init__.py
View file @
715933c2
...
...
@@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
from
.exceptions
import
*
from
.utils.jinja
import
get_jenv
,
get_template
,
render_template
__version__
=
'7.1.
8
'
__version__
=
'7.1.
9
'
__title__
=
"Frappe Framework"
local
=
Local
()
...
...
This diff is collapsed.
Click to expand it.
frappe/patches.txt
View file @
715933c2
...
...
@@ -145,3 +145,4 @@ frappe.patches.v7_0.cleanup_list_settings
execute:frappe.db.set_default('language', '')
frappe.patches.v7_1.refactor_integration_broker
frappe.patches.v7_1.set_backup_limit
frappe.patches.v7_1.disabled_print_settings_for_custom_print_format
This diff is collapsed.
Click to expand it.
frappe/patches/v7_1/disabled_print_settings_for_custom_print_format.py
0 → 100644
View file @
715933c2
# -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from
__future__
import
unicode_literals
import
frappe
def
execute
():
frappe
.
db
.
sql
(
"""
update
`tabPrint Format`
set
align_labels_left = 0, line_breaks = 0, show_section_headings = 0
where
custom_format = 1
"""
)
\ No newline at end of file
This diff is collapsed.
Click to expand it.
frappe/print/doctype/print_format/print_format.js
View file @
715933c2
...
...
@@ -33,3 +33,12 @@ frappe.ui.form.on("Print Format", "refresh", function(frm) {
});
}
});
frappe
.
ui
.
form
.
on
(
"
Print Format
"
,
{
'
custom_format
'
:
function
(
frm
)
{
value
=
frm
.
doc
.
custom_format
?
0
:
1
;
frm
.
set_value
(
'
align_labels_left
'
,
value
);
frm
.
set_value
(
'
show_section_headings
'
,
value
);
frm
.
set_value
(
'
line_breaks
'
,
value
);
}
})
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