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
517f62fc
Commit
517f62fc
authored
7 years ago
by
Saurabh
Browse files
Options
Download
Plain Diff
Merge branch 'hotfix'
parents
c2e5e769
8ef42b4e
develop
v11.1.5
v11.1.4
v11.1.3
v11.1.2
v11.1.1
v11.1.0
v11.0.3
v11.0.3-beta.51
v11.0.3-beta.50
v11.0.3-beta.49
v11.0.3-beta.48
v11.0.3-beta.47
v11.0.3-beta.46
v11.0.3-beta.45
v11.0.3-beta.44
v11.0.3-beta.43
v11.0.3-beta.42
v11.0.3-beta.41
v11.0.3-beta.40
v11.0.3-beta.39
v11.0.3-beta.38
v11.0.3-beta.37
v11.0.3-beta.36
v11.0.3-beta.35
v11.0.3-beta.34
v11.0.3-beta.33
v11.0.3-beta.32
v11.0.3-beta.31
v11.0.3-beta.30
v11.0.3-beta.29
v11.0.3-beta.28
v11.0.3-beta.27
v11.0.3-beta.26
v11.0.3-beta.25
v11.0.3-beta.24
v11.0.3-beta.23
v11.0.3-beta.22
v11.0.3-beta.21
v11.0.3-beta.20
v11.0.3-beta.19
v11.0.3-beta.18
v11.0.3-beta.17
v11.0.3-beta.16
v11.0.3-beta.15
v11.0.3-beta.14
v11.0.3-beta.13
v11.0.3-beta.12
v11.0.3-beta.11
v11.0.3-beta.10
v11.0.3-beta.9
v11.0.3-beta.8
v11.0.3-beta.7
v11.0.3-beta.6
v11.0.3-beta.5
v11.0.3-beta.4
v11.0.3-beta.3
v11.0.3-beta.2
v11.0.3-beta.1
v11.0.2
v11.0.1
v11.0.0-beta
v10.1.71
v10.1.70
v10.1.69
v10.1.68
v10.1.67
v10.1.66
v10.1.65
v10.1.64
v10.1.63
v10.1.62
v10.1.61
v10.1.60
v10.1.59
v10.1.58
v10.1.57
v10.1.56
v10.1.55
v10.1.54
v10.1.53
v10.1.52
v10.1.51
v10.1.50
v10.1.49
v10.1.49-beta.1
v10.1.48
v10.1.47
v10.1.46
v10.1.45
v10.1.44
v10.1.43
v10.1.42
v10.1.41
v10.1.40
v10.1.39
v10.1.38
v10.1.37
v10.1.36
v10.1.35
v10.1.34
v10.1.33
v10.1.32
v10.1.31
v10.1.30
v10.1.29
v10.1.28
v10.1.27
v10.1.26
v10.1.25
v10.1.24
v10.1.23
v10.1.22
v10.1.21
v10.1.20
v10.1.19
v10.1.18
v10.1.17
v10.1.16
v10.1.15
v10.1.14
v10.1.13
v10.1.12
v10.1.11
v10.1.10
v10.1.9
v10.1.8
v10.1.7
v10.1.6
v10.1.5
v10.1.4
v10.1.3
v10.1.2
v10.1.1
v10.1.0
v10.0.25
v10.0.24
v10.0.23
v10.0.22
v10.0.21
v10.0.20
v10.0.19
v10.0.18
v10.0.17
v10.0.16
v10.0.15
v10.0.14
v10.0.13
v10.0.12
v10.0.11
v10.0.10
v10.0.9
v10.0.8
v10.0.7
v10.0.6
v10.0.5
v10.0.4
v10.0.3
v10.0.2
v10.0.1
v10.0.0
v9.2.25
v9.2.24
v9.2.23
v9.2.22
v9.2.21
v9.2.20
v9.2.19
v9.2.18
v9.2.17
v9.2.16
v9.2.15
v9.2.14
v9.2.13
v9.2.12
v9.2.11
v9.2.10
v9.2.9
v9.2.8
v9.2.7
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
frappe/__init__.py
+3
-2
frappe/__init__.py
frappe/core/page/data_import_tool/importer.py
+2
-0
frappe/core/page/data_import_tool/importer.py
frappe/desk/page/setup_wizard/setup_wizard.js
+2
-4
frappe/desk/page/setup_wizard/setup_wizard.js
frappe/public/css/page.css
+0
-7
frappe/public/css/page.css
frappe/public/less/page.less
+0
-8
frappe/public/less/page.less
frappe/utils/xlsxutils.py
+6
-1
frappe/utils/xlsxutils.py
with
13 additions
and
22 deletions
+13
-22
frappe/__init__.py
View file @
517f62fc
...
...
@@ -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.2.
6
'
__version__
=
'9.2.
7
'
__title__
=
"Frappe Framework"
local
=
Local
()
...
...
@@ -1220,7 +1220,7 @@ def format(*args, **kwargs):
import
frappe.utils.formatters
return
frappe
.
utils
.
formatters
.
format_value
(
*
args
,
**
kwargs
)
def
get_print
(
doctype
=
None
,
name
=
None
,
print_format
=
None
,
style
=
None
,
html
=
None
,
as_pdf
=
False
,
doc
=
None
,
output
=
None
):
def
get_print
(
doctype
=
None
,
name
=
None
,
print_format
=
None
,
style
=
None
,
html
=
None
,
as_pdf
=
False
,
doc
=
None
,
output
=
None
,
no_letterhead
=
0
):
"""Get Print Format for given document.
:param doctype: DocType of document.
...
...
@@ -1236,6 +1236,7 @@ def get_print(doctype=None, name=None, print_format=None, style=None, html=None,
local
.
form_dict
.
format
=
print_format
local
.
form_dict
.
style
=
style
local
.
form_dict
.
doc
=
doc
local
.
form_dict
.
no_letterhead
=
no_letterhead
if
not
html
:
html
=
build_page
(
"printview"
)
...
...
This diff is collapsed.
Click to expand it.
frappe/core/page/data_import_tool/importer.py
View file @
517f62fc
...
...
@@ -41,6 +41,8 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False,
update_only
=
True
if
params
.
get
(
'from_data_import'
):
from_data_import
=
params
.
get
(
'from_data_import'
)
if
not
params
.
get
(
'skip_errors'
):
skip_errors
=
params
.
get
(
'skip_errors'
)
frappe
.
flags
.
mute_emails
=
no_email
...
...
This diff is collapsed.
Click to expand it.
frappe/desk/page/setup_wizard/setup_wizard.js
View file @
517f62fc
...
...
@@ -237,7 +237,6 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides {
this
.
working_state_message
=
this
.
get_message
(
__
(
"
Setting Up
"
),
__
(
"
Sit tight while your system is being setup. This may take a few moments.
"
),
'
orange
'
,
true
).
appendTo
(
this
.
parent
);
...
...
@@ -245,8 +244,7 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides {
this
.
current_slide
=
null
;
this
.
completed_state_message
=
this
.
get_message
(
__
(
"
Setup Complete
"
),
__
(
"
You're all set!
"
),
'
green
'
__
(
"
You're all set!
"
)
);
}
...
...
@@ -259,7 +257,7 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides {
const
loading_html
=
loading
?
'
<div style="width:100%;height:100%" class="lds-rolling state-icon"><div></div></div>
'
:
`<div style="width:100%;height:100%" class="state-icon">
<i class="fa fa-check-circle text-
extra-muted
"
<i class="fa fa-check-circle text-
success
"
style="font-size: 64px; margin-top: -8px;"></i>
</div>`
;
...
...
This diff is collapsed.
Click to expand it.
frappe/public/css/page.css
View file @
517f62fc
...
...
@@ -277,13 +277,6 @@ select.input-sm {
opacity
:
1
;
cursor
:
pointer
;
}
.page-card-container
,
.setup-state
{
background-color
:
#f5f7fa
;
}
.page-container
.page-card-container
{
background-color
:
#fff
;
}
.page-card-container
{
padding
:
70px
;
}
...
...
This diff is collapsed.
Click to expand it.
frappe/public/less/page.less
View file @
517f62fc
...
...
@@ -335,14 +335,6 @@ select.input-sm {
}
}
.page-card-container, .setup-state {
background-color: #f5f7fa;
}
.page-container .page-card-container {
background-color: #fff;
}
.page-card-container {
padding: 70px;
}
...
...
This diff is collapsed.
Click to expand it.
frappe/utils/xlsxutils.py
View file @
517f62fc
...
...
@@ -6,11 +6,12 @@ import frappe
from
frappe.utils
import
encode
,
cstr
,
cint
,
flt
,
comma_or
import
openpyxl
import
re
from
openpyxl.styles
import
Font
from
openpyxl
import
load_workbook
from
six
import
StringIO
,
string_types
ILLEGAL_CHARACTERS_RE
=
re
.
compile
(
r
'[\000-\010]|[\013-\014]|[\016-\037]'
)
# return xlsx file object
def
make_xlsx
(
data
,
sheet_name
,
wb
=
None
):
...
...
@@ -30,6 +31,10 @@ def make_xlsx(data, sheet_name, wb=None):
else
:
value
=
item
if
isinstance
(
item
,
string_types
)
and
next
(
ILLEGAL_CHARACTERS_RE
.
finditer
(
value
),
None
):
# Remove illegal characters from the string
value
=
re
.
sub
(
ILLEGAL_CHARACTERS_RE
,
''
,
value
)
clean_row
.
append
(
value
)
ws
.
append
(
clean_row
)
...
...
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