Commit graph

13560 commits

Author SHA1 Message Date
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
Faris Ansari
cadf7bce97 [fix] Get total row by id (#4048) 2017-09-04 18:11:28 +05:30
mbauskar
a8a5347d09 [minor] fixes for https://github.com/frappe/frappe/issues/4035 2017-09-04 17:12:32 +05:30
mbauskar
6b9a95acb9 Merge branch 'hotfix' 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
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
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
Rohit Waghchaure
66cd8419a8 [Fix] Calendar view is not working for sales order 2017-09-04 11:37:34 +05:30
mbauskar
9e9c685a2d Merge branch 'hotfix' 2017-09-01 10:18:35 +05:30
mbauskar
c2891d5306 bumped to version 8.9.2 2017-09-01 10:48:35 +06:00
Makarand Bauskar
6fa9967a04 [hotfix] throw DoesNotExistError if doctype is not available on Delete api (#4013)
* [hotfix] throw DoesNotExistError if doctype is not available on Delete api

* [fixes] aded tests cases and codecy, travis fixes
2017-09-01 09:16:32 +05:30
Makarand Bauskar
9d84f387e0 [hotfix] socket command error eof while connecting to email server (#4025)
* [hotfix] socket command error eof while connecting to email server

* [minor] codecy fixes
2017-09-01 09:10:26 +05:30
mbauskar
03b9f8486e Merge branch 'hotfix' 2017-08-31 15:31:04 +05:30
mbauskar
029cb358ab bumped to version 8.9.1 2017-08-31 16:01:04 +06:00
Zarrar
9262ae0899 BOM issue - Make a new Item button was not working (#4021)
* new doc creation fix

* made requested changes
2017-08-31 14:45:00 +05:30
Rushabh Mehta
0b22ead9b4 Merge pull request #4018 from mbauskar/unicode-decode-fixes
[hotfix] fixes for UnicodeDecodeError while import translation
2017-08-31 13:40:47 +05:30
mbauskar
8eaf1c3e15 [hotfix] fixes for UnicodeDecodeError while import translation 2017-08-31 13:21:00 +05:30
Rushabh Mehta
039380a6c6 Merge pull request #4012 from mbauskar/docfield
[hotfix] only display allow_after_submit property if doctype is submittable
2017-08-30 14:07:30 +05:30
mbauskar
3e3b20d646 [hotfix] only display allow_after_submit property if doctype is submittable 2017-08-30 01:04:09 +05:30
Rushabh Mehta
b7f3282bf6 Merge pull request #4011 from mbauskar/incoming-email
[hotfix] dont update the modified date for already fetched email (communication)
2017-08-30 00:52:37 +05:30
mbauskar
36e7caa651 [minor] translated the CC & Standard Reply field of email dialog 2017-08-30 00:20:25 +05:30
mbauskar
cd989da770 [hotfix] dont update the modified date for already fetched email (communication) 2017-08-30 00:13:35 +05:30
mbauskar
28a99fc819 Merge branch 'staging' 2017-08-29 20:24:38 +05:30
mbauskar
1884269e95 bumped to version 8.9.0 2017-08-29 20:54:38 +06:00
Saurabh
24455398b5 Merge branch 'master' into staging 2017-08-28 16:15:39 +05:30
Saurabh
82193d8fcf Merge branch 'hotfix' 2017-08-28 16:15:38 +05:30
Saurabh
4948353f87 bumped to version 8.8.5 2017-08-28 16:45:38 +06:00
Rushabh Mehta
775b85c1e9 Merge pull request #4003 from rmehta/hotfix
[fix] grid trigger issues
2017-08-28 16:02:33 +05:30
Makarand Bauskar
93f9714194 codecy fixes 2017-08-28 15:40:42 +05:30
Rushabh Mehta
77cca859ec [fix] grid trigger issues 2017-08-28 15:13:58 +05:30
Rushabh Mehta
efe88591c2 Merge branch 'master' into staging 2017-08-24 16:51:28 +05:30
Rushabh Mehta
013f0bf001 Merge branch 'hotfix' 2017-08-24 16:51:27 +05:30
Rushabh Mehta
5882e5bc66 bumped to version 8.8.4 2017-08-24 17:21:27 +06:00
Rushabh Mehta
b6a17de4a9 Merge pull request #3993 from rmehta/file-delete-message
[fix] show better message for permission to delete file
2017-08-24 16:50:47 +05:30
Rushabh Mehta
a8773a5570 Merge pull request #3991 from rmehta/import-xls-fix
[fix] importer.py, allow for truncated rows due to xls import
2017-08-24 16:49:34 +05:30
Rushabh Mehta
e8c7b046ee [fix] show better message for permission to delete file 2017-08-24 16:21:39 +05:30
Rushabh Mehta
edd853c509 Merge pull request #3989 from netchampfaris/hotfix
[Fix] Desk assets for mobile
2017-08-24 16:08:16 +05:30
Rushabh Mehta
16129ce785 [fix] catch error in data import 2017-08-24 16:05:47 +05:30
Rushabh Mehta
4e456b4e42 [fix] importer.py, allow for truncated rows due to xls import 2017-08-24 15:49:47 +05:30
Faris Ansari
598930fca9 [fix] desk assets for mobile 2017-08-24 14:26:53 +05:30
Rushabh Mehta
65dc3b99a9 [fix] grid refresh async, fixes frappe/erpnext#10391 (#3982) 2017-08-23 18:16:16 +05:30
Rushabh Mehta
affb47a66f [fix] filter formatting (#3981) 2017-08-23 18:15:21 +05:30
Rushabh Mehta
798451d254 [fixes] lots of fixes to signature and added support for print_width frappe/erpnext#9686 (#3979)
* [fixes] lots of fixes to signature and added support for print_width frappe/erpnext#9686

* [minor] timeout not required

* Update layout.js
2017-08-23 18:12:59 +05:30
Rushabh Mehta
146247c17d [fix] notification filters, fixes frappe/erpnext#9982 (#3977) 2017-08-23 18:06:03 +05:30
Nabin Hait
8f978ad2c3 Merge branch 'master' into staging 2017-08-23 14:45:55 +05:30
Nabin Hait
cf3a4a61e8 Merge branch 'hotfix' 2017-08-23 14:45:54 +05:30
Nabin Hait
e3e525d5ba bumped to version 8.8.3 2017-08-23 15:15:54 +06:00
Faris Ansari
1cad0ae779 [fix] Validate color (#3978) 2017-08-23 14:41:19 +05:30
mbauskar
2c95983e4d Merge branch 'develop' into staging 2017-08-23 13:18:55 +05:30