Commit graph

14937 commits

Author SHA1 Message Date
Shreya Shah
fc7de01017 Raise exception while deleting an item which is a product bundle (#5286)
* raise exception while deleting an item which is a product bundle

* separated if statements and added a comment

* modified condition
2018-04-16 01:26:19 -08:00
Shreya Shah
64fe2749cb avoid link validation error in authentication (#5415) 2018-04-16 01:25:34 -08:00
Rushabh Mehta
e4aa433ea3 [travis] --quiet 2018-04-16 11:25:39 +05:30
Rushabh Mehta
102dd9fea8 [travis] sleep more 2018-04-16 11:04:07 +05:30
Rushabh Mehta
74046de5dd [minor] 2018-04-16 10:57:33 +05:30
Manas Solanki
68377501fc increase the field limit for the csv file (#5438) 2018-04-15 21:15:02 -08:00
FINE FILM Ltd
63170989f9 [fix][minor] Fix logical error in event repeat condition check (#5439)
Without this fix you can only create Every Day repeating events that are not ending on the same day.
The condition is doing the total opposite check, if you are trying to create a repeating event with the same day end you get the following error: "Every day events should finish on the same day."
2018-04-15 21:14:38 -08:00
Saurabh
d0666b77c9 Merge branch 'hotfix' 2018-04-15 12:50:27 +05:30
Saurabh
056f93949e bumped to version 10.1.23 2018-04-15 13:20:27 +06:00
Saurabh
7098be2ef2
Merge pull request #5447 from codingCoffee/pip10
Compatibility for pip10
2018-04-15 12:42:25 +05:30
Ameya Shenoy
a6087cb243
Compatibility for pip10
- also some spaces and tabs fixes
2018-04-15 03:41:32 +05:30
Saurabh
9385fc32be encode parameters in set route (#5442) 2018-04-13 21:29:56 -08:00
Nabin Hait
54388e7f70 Merge branch 'hotfix' 2018-04-13 14:32:02 +05:30
Nabin Hait
5527a80d3c bumped to version 10.1.22 2018-04-13 15:02:02 +06:00
Nabin Hait
ec45bc767f Set email account while creating new documents based on email 2018-04-13 14:28:59 +05:30
Saurabh
b5f4959f74 check track changes attribute with getattr (#5435) 2018-04-12 11:14:14 +05:30
rohitwaghchaure
d9f88b9622
Merge pull request #5422 from rohitwaghchaure/image_in_text_editor
[Fix] Text editor with value image not displaying in the print form
2018-04-10 17:31:42 +05:30
Rohit Waghchaure
2ccc7593b1 [Fix] Text editor with value image not displaying in the print form 2018-04-09 20:56:45 +05:30
Nabin Hait
e13f220991 Merge branch 'hotfix' 2018-04-09 19:16:00 +05:30
Nabin Hait
0e7cd23331 bumped to version 10.1.21 2018-04-09 19:45:59 +06:00
Nabin Hait
665d203146 Save versions only if track changes enabled 2018-04-09 19:06:09 +05:30
partzsch
8cc96357ff Signature field - stop the line width from expanding with each stroke (#5408)
* Update jSignature.min.js

* Adjust line width to smothen strokes
2018-04-09 18:20:46 +05:30
Nabin Hait
fed10cb199 Merge branch 'hotfix' 2018-04-09 15:21:29 +05:30
Nabin Hait
8c3a209323 bumped to version 10.1.20 2018-04-09 15:51:28 +06:00
Saurabh
fbf66336fb [hotfix][urgent] fix backup compression (#5418) 2018-04-09 15:18:55 +05:30
rohitwaghchaure
75ec77193e Removed administrator from the email list of cc, bcc (#5416) 2018-04-09 12:43:11 +05:30
Nabin Hait
7f721099a2 Merge branch 'hotfix' 2018-04-07 19:57:03 +05:30
Nabin Hait
755c0e0b05 bumped to version 10.1.19 2018-04-07 20:27:02 +06:00
rohitwaghchaure
4c032eabbe Removed owner of the document from the BCC (#5401) 2018-04-07 19:55:45 +05:30
Ameya Shenoy
a8f9a652e1 dropbox backup not ablt to find filepath (#5406) 2018-04-07 19:55:01 +05:30
Nabin Hait
5a74b9668a Merge branch 'hotfix' 2018-04-06 15:03:57 +05:30
Nabin Hait
5f6bd7a775 bumped to version 10.1.18 2018-04-06 15:33:57 +06:00
rohitwaghchaure
0b251f44fb [Fix] Owner of the document not getting the notifications for transactions they follow (#5396) 2018-04-06 14:54:29 +05:30
Saurabh
4e98f1689e [fix] breakdown backup process into two parts #5365 (#5390) 2018-04-05 18:24:19 +05:30
Saurabh
6d4d6cb8ca check whether file path exists (#5375) 2018-04-05 16:38:48 +05:30
Nabin Hait
833c24ebf6 Debounce while searching in link fields 2018-04-05 14:59:23 +05:30
Faris Ansari
6f65870e6d Email Notification Count fix (#5374)
* Email count should be for "Received" mails

* fix typo
2018-04-05 12:07:32 +05:30
rohitwaghchaure
3e58ec305c
Merge pull request #5373 from rohitwaghchaure/fotter_issue_in_report
[Fix] Footer for report print
2018-04-04 15:16:32 +05:30
Rohit Waghchaure
8044b8be89 [Fix] Footer for report print 2018-04-04 15:15:02 +05:30
Nabin Hait
0d8ab5aac5 Merge branch 'hotfix' 2018-04-04 11:23:19 +05:30
Nabin Hait
15823b07c6 bumped to version 10.1.17 2018-04-04 11:53:19 +06:00
Manas Solanki
80e20c47c3 fix the import for item variant (#5344) 2018-04-04 11:08:26 +05:30
Rushabh Mehta
d6f09c5325
[optimize] frappe.db.count with cache (#5355) 2018-04-02 19:24:41 +05:30
Shreya Shah
71d59f7ba3 sync.js fixes (#5358) 2018-04-02 19:23:59 +05:30
Zarrar
1654f2dfb1 fix clicking of upgrade button (#5356) 2018-04-02 18:31:41 +05:30
Zarrar
edd089d4a1 append now_time to the filename incase of duplicate (#5313) 2018-04-02 18:22:12 +05:30
Achilles Rasquinha
14f3bfb4c0
Merge pull request #5352 from achillesrasquinha/hf-fixes
[hotfix] get valid traceback
2018-04-02 16:42:18 +05:30
Achilles Rasquinha
91a297d85d get valid traceback 2018-04-02 16:41:09 +05:30
Shreya Shah
e2732751a2 able to pass filters (#5323) 2018-04-02 10:43:04 +05:30
Zarrar
2897ac7dc0 add_child configurable to be hidden for a node (#5319) 2018-04-02 10:41:20 +05:30