Commit graph

13684 commits

Author SHA1 Message Date
Rushabh Mehta
a3ff228dfd Merge pull request #4054 from rmehta/fix-switch-to-desk
[fix] [translation] switch to desk, #3328
2017-09-05 08:56:17 +05:30
Rushabh Mehta
f8415af434 Merge pull request #4052 from rmehta/remove-unload
remove unload
2017-09-05 08:55:49 +05:30
Rushabh Mehta
d590b17df9 Merge pull request #4055 from diamorafaela/goal_translatable
[minor] Goal Translatable
2017-09-05 08:55:01 +05:30
mbauskar
226522746a resolved merge conflicts 2017-09-05 08:41:25 +05:30
mbauskar
6da8d440b2 Merge branch 'hotfix' 2017-09-05 08:39:36 +05:30
mbauskar
03c695d60d bumped to version 8.9.4 2017-09-05 09:09:36 +06:00
Francisco
77c92c7e65 Goal Translatable 2017-09-04 15:17:25 -03:00
Rushabh Mehta
faee27f773 [fix] [translation] switch to desk, #3328 2017-09-04 22:26:12 +05:30
Rushabh Mehta
9edbe5176c [minor] remove alert on unload 2017-09-04 20:59:57 +05:30
Rushabh Mehta
e7f49f5110 Merge pull request #4042 from mbauskar/hotfix
[minor] unscrub field name for download templete filename if lable is not available
2017-09-04 20:41:25 +05:30
Rushabh Mehta
09404a7276 Merge pull request #4032 from viitaset/finnish-lang-translation-fix
Fixed finnish language translation
2017-09-04 20:40:59 +05:30
Rushabh Mehta
4b5ccc96ad Merge pull request #4046 from mbauskar/twofactor
[minor] fixes for https://github.com/frappe/frappe/issues/4035
2017-09-04 20:40:24 +05:30
Rushabh Mehta
18893a0ab6 Merge pull request #4044 from rohitwaghchaure/progress_bar_issue
[fix] Progress bar not closed after completion of uplading file in the stock reconcillation
2017-09-04 20:40:02 +05:30
Rushabh Mehta
de47fe57cc Merge pull request #4049 from frappe-pr-bot/translations-2017-09-04
[Translation] Updated Translations
2017-09-04 20:39:29 +05:30
Rushabh Mehta
4fcd96a26b Merge pull request #4050 from adityahase/tests3
Python 3 comapatibility Fixes
2017-09-04 20:39:17 +05:30
Faris Ansari
cadf7bce97 [fix] Get total row by id (#4048) 2017-09-04 18:11:28 +05:30
frappe-pr-bot
44f1130a8d [Translation] Updated Translations 2017-09-04 14:30:52 +02:00
Rushabh Mehta
6ef248712c Merge pull request #4036 from mrdadah/twofactors-check
Update twofactor.py
2017-09-04 17:52:19 +05:30
mbauskar
a8a5347d09 [minor] fixes for https://github.com/frappe/frappe/issues/4035 2017-09-04 17:12:32 +05:30
Aditya Hase
352692b089 Explicitly return list from get_user_default_as_list 2017-09-04 17:05:41 +05:30
Rohit Waghchaure
985b2ff7c7 [fix] Progress bar not closed after completion of uplading file in the stock reconcillation 2017-09-04 16:09:21 +05:30
Aditya Hase
f7b7387b46 Explicitly convert filter to list wherever necessary 2017-09-04 16:05:58 +05:30
Aditya Hase
f768de6734 Replace long with int in safe_eval 2017-09-04 16:05:58 +05:30
Aditya Hase
e61a1edae2 Fixed broken (Python 3) email.Charset import 2017-09-04 16:05:58 +05:30
Aditya Hase
e4ff0444b2 Don't unnecessary encode header content 2017-09-04 16:05:58 +05:30
Aditya Hase
99f17c651c Use 'in' instead of 'has_key' 2017-09-04 16:05:58 +05:30
Aditya Hase
ac6ed0d328 Fix bleach_whitelist import 2017-09-04 16:05:57 +05:30
Aditya Hase
2974aa50e3 Fix all implicit relative imports in __init__.py 2017-09-04 16:05:57 +05:30
Aditya Hase
14800deea1 Use six.moves.urllib.parse.urljoin instead of urllib.basejoin 2017-09-04 16:05:57 +05:30
Aditya Hase
ba7412b621 Decode encryption key given by Fernet 2017-09-04 16:05:57 +05:30
Aditya Hase
79b2b93958 Pass positional arguments instead of keyword arguments to MySQLdb.connect 2017-09-04 16:05:57 +05:30
Aditya Hase
8717deb169 Use six.moves.reload_module instead of reload 2017-09-04 16:05:57 +05:30
Aditya Hase
90d7819da9 Use six.iteritems(dict) instead of dict.iteritems() 2017-09-04 16:05:57 +05:30
Aditya Hase
a72cfef14a Use six.moves.xrange instead of xrange 2017-09-04 16:05:57 +05:30
Aditya Hase
cd9c357d2b Covert filter to list before checking it's length 2017-09-04 16:05:57 +05:30
Aditya Hase
24f2669795 Use str instead of bytes for keys in exports param 2017-09-04 16:05:57 +05:30
Aditya Hase
f78df81990 Convert dict.items() to list for modifying dict while looping 2017-09-04 16:05:57 +05:30
Aditya Hase
b32ce23196 Convert dict.keys() to list explicitly 2017-09-04 16:05:57 +05:30
mbauskar
0795352308 [minor] unscrub field name for download templete filename if lable is not available 2017-09-04 15:30:12 +05:30
mbauskar
6b9a95acb9 Merge branch 'hotfix' 2017-09-04 14:49:24 +05:30
mbauskar
eb6c04fca1 Merge branch 'master' into develop 2017-09-04 14:49:24 +05:30
mbauskar
29b4ac3760 bumped to version 8.9.3 2017-09-04 15:19:24 +06:00
Rushabh Mehta
f07a6372dc Merge pull request #4041 from netchampfaris/datepicker-fixes
[Datepicker] Fix today button, disable keyboardNav
2017-09-04 14:48:08 +05:30
Rushabh Mehta
a57a140e29 Merge pull request #4037 from mbauskar/hotfix
[hotfix] delete attachment first before deleting parent doc
2017-09-04 14:46:34 +05:30
mbauskar
cb87bb5b58 [hotfix] delete attachment first before deleting parent doc 2017-09-04 14:41:12 +05:30
Rushabh Mehta
800b9c559a [minor] added create_custom_fields as a utility function 2017-09-04 14:40:40 +05:30
Faris Ansari
f5af5e8c8a Revert "Fixed top pargin issue in PDF Print (#4028)" (#4040)
This reverts commit 4ce808a81b.
2017-09-04 14:29:55 +05:30
Faris Ansari
667e89e0a1 [Datepicker] Fix today button, disable keyboardNav 2017-09-04 14:04:32 +05:30
KanchanChauhan
4ce808a81b Fixed top pargin issue in PDF Print (#4028) 2017-09-04 13:39:52 +05:30
rohitwaghchaure
ac606fbbb1 Merge pull request #4038 from rohitwaghchaure/calendar_not_working_v8
[Fix] Calendar view is not working for sales order
2017-09-04 12:13:11 +05:30