Commit graph

13632 commits

Author SHA1 Message Date
mbauskar
d1ee33db22 bumped to version 8.10.2 2017-09-07 12:19:19 +06:00
Makarand Bauskar
5a30cca165 [hotfix] fixed attachement issue on CommunicationComposer while reply from Communication (#4078) 2017-09-07 11:47:09 +05:30
mbauskar
518d9f742e Merge branch 'master' into hotfix 2017-09-06 19:26:32 +05:30
mbauskar
3d1027a79d Merge branch 'staging' 2017-09-06 19:26:31 +05:30
mbauskar
1c7e3a57ae bumped to version 8.10.1 2017-09-06 19:56:31 +06:00
Makarand Bauskar
41f03cd303 [hotfix] don't add trigger if the autoname field and fieldname is not same (#4074) 2017-09-06 19:25:30 +05:30
Makarand Bauskar
22036c363e Revert "[hotfix] don't add trigger if the autoname field and fieldname is not same (#4072)" (#4073)
This reverts commit a722b64eb1.
2017-09-06 19:04:05 +05:30
Makarand Bauskar
a722b64eb1 [hotfix] don't add trigger if the autoname field and fieldname is not same (#4072) 2017-09-06 18:57:47 +05:30
Makarand Bauskar
6e6fb684ec [hotfix] dont Patch Log, Module Def in Permission Manager (#4070) 2017-09-06 16:15:37 +05:30
Rushabh Mehta
2a5a6d6adc Merge pull request #4067 from gshmu/master
default value can't be true
2017-09-06 15:03:53 +05:30
Rushabh Mehta
9fa512e26f Update upload.js 2017-09-06 15:03:35 +05:30
Rushabh Mehta
98561b4f1b Update upload.js 2017-09-06 15:02:17 +05:30
Faris Ansari
3df0659c87 [Print Format] Align labels to right (#4068) 2017-09-06 12:17:48 +05:30
gshmu
aa6f9b1b24 default can't be true
after set `opts.is_private` false, is private still true.
2017-09-06 13:59:19 +08:00
mbauskar
43f4485c54 Merge branch 'staging' 2017-09-05 20:42:01 +05:30
mbauskar
d4449c37d6 bumped to version 8.10.0 2017-09-05 21:12:00 +06:00
mbauskar
c43e73d704 Merge branch 'master' into staging 2017-09-05 08:41:32 +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
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
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
0795352308 [minor] unscrub field name for download templete filename if lable is not available 2017-09-04 15:30:12 +05:30
mbauskar
ad704aaa2a Merge branch 'master' into staging 2017-09-04 14:49:25 +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
3cc7afc8e0 Merge branch 'master' into staging 2017-09-01 10:18:36 +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
bc733beaf3 Merge branch 'master' into staging 2017-08-31 15:31:04 +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
mbauskar
14533ed2c5 Merge branch 'develop' into staging 2017-08-31 15:29:24 +05:30
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
b5c449f860 Merge pull request #4008 from rmehta/list-duplicates
[minor] show duplicates instead of hiding
2017-08-31 11:05:05 +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
Rushabh Mehta
0214a3717a Merge pull request #3990 from manassolanki/listview-sorting
sorted the select field options in permission manager as per translated string
2017-08-30 14:04:49 +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