Commit graph

116 commits

Author SHA1 Message Date
rohitwaghchaure
7293311f72 [Fix] Handle the OverflowError exception in the in_words method (#5769) 2018-07-11 11:56:01 +05:30
Saurabh
e2b1ebe84c [Security][fix] To avoid possible sql injection via filters and or_filters parameters and tighten the field level checks (#5721)
* [fix] sanitize filters and or_filters to avoid sql injection

* add test cases for filter sanitizer

* codacy fix

* added test cases to test valid scenarios
2018-06-27 09:15:42 +05:30
Ameya Shenoy
09e71d0d77 added floor and ceil to frappe.utils (#5536)
Added frappe wrappers to math.ceil and math.floor, since they are widely
used functions. Also added their docstrings for documentation and wote
test cases. And some minor typo fixes
2018-05-08 15:13:50 +05:30
Shreya Shah
c007c0c225 Fix for unknown locale languages in print format (#5424)
* fix for unknown locale in dates

* formatting fix
2018-04-17 11:29:22 +05:30
Nabin Hait
8a09f915e9 Merge branch 'master' into develop 2017-12-25 13:30:48 +05:30
Rohit Waghchaure
0a367e837e [Fix] Decimal issue 2017-12-21 15:53:22 +05:30
Nabin Hait
7506c49dc4 Fixed Merge conflict 2017-12-12 19:08:53 +05:30
Faris Ansari
49b63d7680 Add is_image util (#4605) 2017-12-12 19:04:38 +05:30
Achilles Rasquinha
79a8be3633 [HOTFIX] Currency Format on Print (#4584)
* [HOTFIX] fix currency issue on print

* [HOTFIX] fix currency issue on print

* added value check for format

* added value check for format

* fix codacy
2017-12-11 15:10:32 +05:30
Saurabh
33644ebfb2 [fix] merge conflicts 2017-10-27 16:05:45 +05:30
Faris Ansari
80054e0f28 Data Migration Tool Hotfix (#4396)
* Add get_source_value to utils, and use it to get value from object or dict

* GitHub connector

* fix codacy

* remove print statement

* Remove Github Connector

* Data Migration Connector

- Create new connection with boilerplate
- Add Run button in Data Migration Plan

* minor

* fix codacy

* remove pygithub

* Minor

- Remove button from form and add to custom button
- Remove is_custom field
- Add Connector Type 'Custom'
- Show New Connection button only in developer mode

* [fix] logging

- only store the name, not the whole json

* [fix] tests
2017-10-27 15:55:41 +05:30
Faris Ansari
affd84c469 [formatdate] Return empty string if no date provided (#4385) 2017-10-26 17:35:57 +05:30
Faris Ansari
bc45beb868 Show record count in list header 2017-10-23 20:10:15 +05:30
Faris Ansari
5c9146fe9c [formatdate] Return empty string if no date provided (#4356) 2017-10-23 12:12:52 +05:30
rohitwaghchaure
705d48619c [Fix] Signature not displying in the PDF (#4271) 2017-10-09 08:46:35 +05:30
Aditya Hase
9a0d6ce056 Don't index dict.items() 2017-09-27 01:08:07 +05:30
Aditya Hase
14800deea1 Use six.moves.urllib.parse.urljoin instead of urllib.basejoin 2017-09-04 16:05:57 +05:30
Faris Ansari
b501964e1c fix test 2017-08-17 11:57:13 +05:30
Faris Ansari
65794892de Currency precision: remove trailing zeros 2017-08-16 13:15:30 +05:30
Faris Ansari
7397b68290 Scrub urls fix (#3918)
* Don't expand mailto urls

* Add test case
2017-08-11 13:00:10 +05:30
Rushabh Mehta
ce48aaa2c9 Merge branch 'develop' into fix-long 2017-08-11 12:59:02 +05:30
Aditya Hase
69c255661d Replaced long with six.integer_types 2017-08-11 00:32:26 +05:30
Aditya Hase
769338f136 Replaced all instances of basestring with six.string_types 2017-08-11 00:10:11 +05:30
Aditya Hase
9d7d384a63 Replaced urllib.quote imports with six.moves.urllib.parse.quote (#3837) 2017-08-02 17:09:16 +05:30
Aditya Hase
e6bd1e4995 Replaced all instances of 'unicode' with 'six.text_type' (#3825) 2017-08-02 16:57:39 +05:30
Aditya Hase
928ebb66a6 Replaced HTMLParser imports with six.moves.html_parser (#3812) 2017-07-31 10:58:22 +05:30
Aditya Hase
839874b357 Redefine lambdas to accept multiple args instead of a packed tuple (#3811)
Unlike Python 2, Python 3 does not automatically unpack arguments
to lambdas passed as a tuple into named arguments.
Redefinining lamdas to accept separate arguments instead of a
tuple allows them to work in both Python 2 and 3.
2017-07-31 10:55:00 +05:30
tundebabzy
bbde2ec4cf rewrite use of dict.iteritems (#3498)
* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility
2017-06-19 09:10:21 +05:30
Rushabh Mehta
d499ab619c [optimize] make things faster, lots of low hanging fruits fixed (#3495)
* [optimize] make things faster, lots of low hanging fruits fixed

* [fix] dont set gravatar for administrator and guest

* [fix] autocommit

* [fix] clear doctype cache
2017-06-19 09:04:25 +05:30
mbauskar
cc5f94367c Merge branch 'master' into develop 2017-06-16 11:43:05 +05:30
Makarand Bauskar
6b28e1b9e0 [hot] fixed ValueError: need more than 1 value to unpack for vnd currency (#3489) 2017-06-15 19:40:49 +05:30
mbauskar
19d46d92fc Merge branch 'master' into develop 2017-06-15 16:04:52 +05:30
Nabin Hait
85851d10d5 get correct number format info in in_words function 2017-06-15 15:36:54 +05:30
Saurabh
9b8d020ace Merge branch 'master' into develop 2017-06-13 15:16:34 +05:30
almeidapaulopt
374f85bfd6 several throw translations (#3441)
* several throw translations

* small fix

* codacy fixes

* fix import _

* Create file_list.js

* Create feedback.py
2017-06-13 14:32:47 +05:30
tundebabzy
ff4c86089c Make "Amount in words" spell three decimals (#3358)
* fixes frappe/erpnext#8895

* checks for non-numeric type

* makes words translatable
2017-06-13 12:09:35 +05:30
Faris Ansari
0e04d386e4 Global Date Format Localisation (#3428)
* Global Date Format localization

* Addition of the long format

* Update method description
2017-06-05 11:49:54 +05:30
Rushabh Mehta
a9ec46545b [fix] socketio 2.0 (#3257) 2017-05-10 13:58:25 +05:30
Rushabh Mehta
a1e31ed20b [feature] set decimal precision for currency in currency settings and currency formatting will be global 2017-04-13 12:39:01 +05:30
Nabin Hait
7fe50c885a Merge branch 'master' into develop 2017-03-09 14:59:02 +05:30
Wael AlShurafa
d3c6ac6d8a Fix operator validation 2017-03-07 21:53:43 +02:00
Nabin Hait
6601710465 Fixed merge conflict 2017-02-20 14:50:28 +05:30
mbauskar
6d9eab7f6e [minor] added method get_timestamp from date 2017-02-16 16:40:50 +05:30
KanchanChauhan
9fe9536f58 Added method to get report URL (#2549)
* Added method to get report URL

* Update auto_email_report.py
2017-01-05 17:18:23 +05:30
Rushabh Mehta
4fcd372921 [minor] [hot] bad import 2016-12-27 13:00:52 +05:30
Rushabh Mehta
67de814f26 [fix] missing translations #2494 2016-12-27 12:58:58 +05:30
Rushabh Mehta
a6d5cec95c [minor] unicode fix for frappe/erpnext#7070 (#2478) 2016-12-20 16:21:50 +05:30
KanchanChauhan
054d0f663f Invalid language error on creation of Language (#2390) 2016-12-05 18:20:36 +05:30
robert schouten
5ede870700 daterangepicker now as control for filtering (#2324)
* daterangepicker now as control for filtering

* rename daterange picker options

* cleanup name reference

* allow greater control of daterangepicker options

* Update data.py

comma + space
2016-11-18 14:03:56 +05:30
Rushabh Mehta
a292810202 [minor] add hours to add_to_date 2016-08-23 10:40:14 +05:30