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
b3042546
Commit
b3042546
authored
10 years ago
by
Pratik Vyas
Browse files
Options
Download
Plain Diff
Merge branch 'develop'
parents
05587d4e
ad1fd7fb
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
v9.2.6
v9.2.5
v9.2.4
v9.2.3
v9.2.2
v9.2.1
v9.2.0
v9.1.11
v9.1.10
v9.1.9
v9.1.8
v9.1.7
v9.1.6
v9.1.5
v9.1.4
v9.1.3
v9.1.2
v9.1.1
v9.1.0
v9.0.10
v9.0.9
v9.0.8
v9.0.7
v9.0.6
v9.0.5
v9.0.4
v9.0.3
v9.0.2
v9.0.1
v9.0.0
v8.10.9
v8.10.8
v8.10.7
v8.10.6
v8.10.5
v8.10.4
v8.10.3
v8.10.2
v8.10.1
v8.10.0
v8.9.4
v8.9.3
v8.9.2
v8.9.1
v8.9.0
v8.8.5
v8.8.4
v8.8.3
v8.8.2
v8.8.1
v8.8.0
v8.7.11
v8.7.10
v8.7.9
v8.7.8
v8.7.7
v8.7.6
v8.7.5
v8.7.4
v8.7.3
v8.7.2
v8.7.1
v8.7.0
v8.6.8
v8.6.7
v8.6.6
v8.6.5
v8.6.4
v8.6.3
v8.6.2
v8.6.1
v8.6.0
v8.5.8
v8.5.7
v8.5.6
v8.5.5
v8.5.4
v8.5.3
v8.5.2
v8.5.1
v8.5.0
v8.4.1
v8.4.0
v8.3.10
v8.3.9
v8.3.8
v8.3.7
v8.3.6
v8.3.5
v8.3.4
v8.3.3
v8.3.2
v8.3.1
v8.3.0
v8.2.7
v8.2.6
v8.2.5
v8.2.4
v8.2.3
v8.2.2
v8.2.1
v8.2.0
v8.1.4
v8.1.3
v8.1.2
v8.1.1
v8.1.0
v8.0.71
v8.0.70
v8.0.69
v8.0.68
v8.0.67
v8.0.66
v8.0.65
v8.0.64
v8.0.63
v8.0.62
v8.0.61
v8.0.60
v8.0.59
v8.0.58
v8.0.57
v8.0.56
v8.0.55
v8.0.54
v8.0.53
v8.0.52
v8.0.51
v8.0.50
v8.0.49
v8.0.48
v8.0.47
v8.0.46
v8.0.45
v8.0.44
v8.0.43
v8.0.42
v8.0.41
v8.0.40
v8.0.39
v8.0.38
v8.0.37
v8.0.36
v8.0.35
v8.0.34
v8.0.33
v8.0.32
v8.0.31
v8.0.30
v8.0.29
v8.0.28
v8.0.27
v8.0.26
v8.0.25
v8.0.24
v8.0.23
v8.0.22
v8.0.21
v8.0.20
v8.0.19
v8.0.18
v8.0.17
v8.0.16
v8.0.15
v8.0.14
v8.0.13
v8.0.12
v8.0.11
v8.0.10
v8.0.9
v8.0.8
v8.0.7
v8.0.6
v8.0.5
v8.0.4
v8.0.3
v8.0.2
v8.0.1
v8.0.0
v7.2.31
v7.2.30
v7.2.29
v7.2.28
v7.2.27
v7.2.26
v7.2.25
v7.2.24
v7.2.23
v7.2.22
v7.2.21
v7.2.20
v7.2.19
v7.2.18
v7.2.17
v7.2.16
v7.2.15
v7.2.14
v7.2.13
v7.2.12
v7.2.11
v7.2.10
v7.2.9
v7.2.8
v7.2.7
v7.2.6
v7.2.5
v7.2.4
v7.2.3
v7.2.2
v7.2.1
v7.2.0
v7.1.29
v7.1.28
v7.1.27
v7.1.26
v7.1.25
v7.1.24
v7.1.23
v7.1.22
v7.1.21
v7.1.20
v7.1.19
v7.1.18
v7.1.17
v7.1.16
v7.1.15
v7.1.14
v7.1.13
v7.1.12
v7.1.11
v7.1.10
v7.1.9
v7.1.8
v7.1.7
v7.1.6
v7.1.5
v7.1.4
v7.1.3
v7.1.2
v7.1.1
v7.1.0
v7.0.47
v7.0.46
v7.0.45
v7.0.44
v7.0.43
v7.0.42
v7.0.41
v7.0.40
v7.0.39
v7.0.38
v7.0.37
v7.0.36
v7.0.35
v7.0.34
v7.0.33
v7.0.32
v7.0.31
v7.0.30
v7.0.29
v7.0.28
v7.0.27
v7.0.26
v7.0.25
v7.0.24
v7.0.23
v7.0.22
v7.0.21
v7.0.20
v7.0.19
v7.0.18
v7.0.17
v7.0.16
v7.0.15
v7.0.14
v7.0.13
v7.0.12
v7.0.11
v7.0.10
v7.0.9
v7.0.8
v7.0.7
v7.0.6
v7.0.5
v7.0.4
v7.0.3
v7.0.2
v7.0.1
v7.0.0
v6.27.24
v6.27.23
v6.27.22
v6.27.21
v6.27.20
v6.27.19
v6.27.18
v6.27.17
v6.27.16
v6.27.15
v6.27.14
v6.27.13
v6.27.12
v6.27.11
v6.27.10
v6.27.9
v6.27.8
v6.27.7
v6.27.6
v6.27.5
v6.27.4
v6.27.3
v6.27.2
v6.27.1
v6.27.0
v6.26.6
v6.26.5
v6.26.4
v6.26.3
v6.26.2
v6.26.1
v6.26.0
v6.25.6
v6.25.5
v6.25.4
v6.25.3
v6.25.2
v6.25.1
v6.25.0
v6.24.10
v6.24.9
v6.24.8
v6.24.7
v6.24.6
v6.24.5
v6.24.4
v6.24.3
v6.24.2
v6.24.1
v6.24.0
v6.23.3
v6.23.2
v6.23.1
v6.23.0
v6.22.7
v6.22.6
v6.22.5
v6.22.4
v6.22.3
v6.22.2
v6.22.1
v6.22.0
v6.21.0
v6.20.2
v6.20.1
v6.20.0
v6.19.3
v6.19.2
v6.19.1
v6.19.0
v6.18.1
v6.18.0
v6.17.6
v6.17.5
v6.17.4
v6.17.3
v6.17.2
v6.17.1
v6.17.0
v6.16.4
v6.16.3
v6.16.2
v6.16.1
v6.16.0
v6.15.4
v6.15.3
v6.15.2
v6.15.1
v6.15.0
v6.14.1
v6.14.0
v6.13.5
v6.13.4
v6.13.3
v6.13.2
v6.13.1
v6.13.0
v6.12.4
v6.12.3
v6.12.2
v6.12.1
v6.12.0
v6.11.0
v6.10.4
v6.10.3
v6.10.2
v6.10.1
v6.10.0
v6.9.3
v6.9.2
v6.9.1
v6.9.0
v6.8.2
v6.8.1
v6.8.0
v6.7.11
v6.7.10
v6.7.9
v6.7.8
v6.7.7
v6.7.6
v6.7.5
v6.7.4
v6.7.3
v6.7.2
v6.7.1
v6.7.0
v6.6.5
v6.6.4
v6.6.3
v6.6.2
v6.6.1
v6.6.0
v6.5.4
v6.5.3
v6.5.2
v6.5.1
v6.5.0
v6.4.9
v6.4.8
v6.4.7
v6.4.6
v6.4.5
v6.4.4
v6.4.3
v6.4.2
v6.4.1
v6.4.0
v6.3.0
v6.2.0
v6.1.2
v6.1.1
v6.1.0
v6.0.8
v6.0.7
v6.0.6
v6.0.5
v6.0.4
v6.0.3
v6.0.2
v6.0.1
v6.0.0
v5.4.2
v5.4.1
v5.4.0
v5.3.1
v5.3.0
v5.2.2
v5.2.1
v5.2.0
v5.1.5
v5.1.4
v5.1.3
v5.1.2
v5.1.1
v5.1.0
v5.0.35
v5.0.34
v5.0.33
v5.0.32
v5.0.31
v5.0.30
v5.0.29
v5.0.28
v5.0.27
v5.0.26
v5.0.25
v5.0.24
v5.0.23
v5.0.22
v5.0.21
v5.0.20
v5.0.19
v5.0.18
v5.0.17
v5.0.16
v5.0.15
v5.0.14
v5.0.13
v5.0.12
v5.0.11
v5.0.10
v5.0.9
v5.0.8
v5.0.7
v5.0.6
v5.0.5
v5.0.4
v5.0.3
v5.0.2
v5.0.1
v5.0.0
v4.14.3
v4.14.2
v4.14.1
v4.14.0
v4.13.6
v4.13.5
v4.13.4
v4.13.3
v4.13.2
v4.13.1
v4.13.0
v4.12.2
v4.12.1
v4.12.0
v4.11.4
v4.11.3
v4.11.2
v4.11.1
v4.11.0
v4.10.2
v4.10.1
v4.10.0
v4.9.3
v4.9.2
v4.9.1
v4.9.0
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
frappe/__version__.py
+1
-1
frappe/__version__.py
frappe/core/doctype/print_format/print_format.py
+2
-1
frappe/core/doctype/print_format/print_format.py
frappe/hooks.py
+1
-1
frappe/hooks.py
frappe/public/js/frappe/form/control.js
+23
-8
frappe/public/js/frappe/form/control.js
frappe/public/js/frappe/misc/number_format.js
+9
-7
frappe/public/js/frappe/misc/number_format.js
setup.py
+1
-1
setup.py
with
37 additions
and
19 deletions
+37
-19
frappe/__version__.py
View file @
b3042546
__version__
=
"4.
8
.0"
__version__
=
"4.
9
.0"
This diff is collapsed.
Click to expand it.
frappe/core/doctype/print_format/print_format.py
View file @
b3042546
...
...
@@ -20,7 +20,8 @@ class PrintFormat(Document):
jenv
=
frappe
.
get_jenv
()
try
:
jenv
.
from_string
(
self
.
html
)
except
TemplateSyntaxError
:
except
TemplateSyntaxError
,
e
:
frappe
.
msgprint
(
'Line {}: {}'
.
format
(
e
.
lineno
,
e
.
message
))
frappe
.
throw
(
frappe
.
_
(
"Syntax error in Jinja template"
))
def
on_update
(
self
):
...
...
This diff is collapsed.
Click to expand it.
frappe/hooks.py
View file @
b3042546
...
...
@@ -3,7 +3,7 @@ app_title = "Frappe Framework"
app_publisher
=
"Web Notes Technologies Pvt. Ltd."
app_description
=
"Full Stack Web Application Framework in Python"
app_icon
=
"assets/frappe/images/frappe.svg"
app_version
=
"4.
8
.0"
app_version
=
"4.
9
.0"
app_color
=
"#3498db"
app_email
=
"support@frappe.io"
...
...
This diff is collapsed.
Click to expand it.
frappe/public/js/frappe/form/control.js
View file @
b3042546
...
...
@@ -387,29 +387,44 @@ frappe.ui.form.ControlInt = frappe.ui.form.ControlData.extend({
frappe
.
ui
.
form
.
ControlFloat
=
frappe
.
ui
.
form
.
ControlInt
.
extend
({
parse
:
function
(
value
)
{
return
isNaN
(
parseFloat
(
value
))
?
null
:
flt
(
value
);
return
isNaN
(
parseFloat
(
value
))
?
null
:
flt
(
value
,
this
.
get_precision
()
);
},
format_for_input
:
function
(
value
)
{
var
number_format
;
var
precision
=
this
.
df
.
precision
||
cint
(
frappe
.
boot
.
sysdefaults
.
float_precision
,
null
);
if
(
this
.
df
.
fieldtype
===
"
Float
"
&&
this
.
df
.
options
&&
this
.
df
.
options
.
trim
())
{
number_format
=
get_number_format
(
this
.
get_currency
()
);
number_format
=
this
.
get_number_format
();
}
var
formatted_value
=
format_number
(
parseFloat
(
value
),
number_format
,
precision
);
var
formatted_value
=
format_number
(
parseFloat
(
value
),
number_format
,
this
.
get_
precision
()
);
return
isNaN
(
parseFloat
(
value
))
?
""
:
formatted_value
;
},
// even a float field can be formatted based on currency format instead of float format
get_currency
:
function
()
{
return
frappe
.
meta
.
get_field_currency
(
this
.
df
,
this
.
get_doc
());
get_number_format
:
function
()
{
var
currency
=
frappe
.
meta
.
get_field_currency
(
this
.
df
,
this
.
get_doc
());
return
get_number_format
(
currency
);
},
get_precision
:
function
()
{
// round based on field precision or float precision, else don't round
return
this
.
df
.
precision
||
cint
(
frappe
.
boot
.
sysdefaults
.
float_precision
,
null
);
}
});
frappe
.
ui
.
form
.
ControlCurrency
=
frappe
.
ui
.
form
.
ControlFloat
.
extend
({
format_for_input
:
function
(
value
)
{
var
formatted_value
=
format_number
(
parseFloat
(
value
),
get_number_format
(
this
.
get_currency
()),
this
.
df
.
precision
||
null
);
var
formatted_value
=
format_number
(
parseFloat
(
value
),
this
.
get_number_format
(),
this
.
get_precision
());
return
isNaN
(
parseFloat
(
value
))
?
""
:
formatted_value
;
},
get_precision
:
function
()
{
// always round based on field precision or currency's precision
// this method is also called in this.parse()
if
(
!
this
.
df
.
precision
)
{
this
.
df
.
precision
=
get_number_format_info
(
this
.
get_number_format
()).
precision
;
}
return
this
.
df
.
precision
;
}
});
...
...
This diff is collapsed.
Click to expand it.
frappe/public/js/frappe/misc/number_format.js
View file @
b3042546
...
...
@@ -11,7 +11,8 @@ function flt(v, decimals, number_format) {
// strip currency symbol if exists
if
(
v
.
indexOf
(
"
"
)
!=-
1
)
{
v
=
v
.
split
(
"
"
)[
1
];
// using slice(1).join(" ") because space could also be a group separator
v
=
isNaN
(
parseFloat
(
v
.
split
(
"
"
)[
0
]))
?
v
.
split
(
"
"
).
slice
(
1
).
join
(
"
"
)
:
v
;
}
v
=
strip_number_groups
(
v
,
number_format
);
...
...
@@ -40,15 +41,16 @@ function cint(v, def) {
function
strip_number_groups
(
v
,
number_format
)
{
if
(
!
number_format
)
number_format
=
get_number_format
();
var
info
=
get_number_format_info
(
number_format
);
// strip groups (,)
if
(
get_number_format_info
(
number_format
)
.
group_sep
==
"
.
"
)
{
v
=
v
.
replace
(
/
\.
/g
,
''
);
var
group_regex
=
new
RegExp
(
info
.
group_sep
===
"
.
"
?
"
\\
.
"
:
info
.
group_sep
,
"
g
"
);
v
=
v
.
replace
(
group_regex
,
""
);
//
sanitiz
e decimal separator
to .
v
=
v
.
replace
(
/,/g
,
"
.
"
);
}
else
{
v
=
v
.
replace
(
/,/g
,
''
);
//
replac
e decimal separator
with (.)
if
(
info
.
decimal_str
!==
"
.
"
&&
info
.
decimal_str
!==
""
)
{
var
decimal_regex
=
new
RegExp
(
info
.
decimal_str
,
"
g
"
);
v
=
v
.
replace
(
decimal_regex
,
"
.
"
);
}
return
v
;
...
...
This diff is collapsed.
Click to expand it.
setup.py
View file @
b3042546
from
setuptools
import
setup
,
find_packages
import
os
version
=
"4.
8
.0"
version
=
"4.
9
.0"
with
open
(
"requirements.txt"
,
"r"
)
as
f
:
install_requires
=
f
.
readlines
()
...
...
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