Commit graph

15098 commits

Author SHA1 Message Date
Nabin Hait
3265916640 Merge branch 'hotfix' 2018-08-29 12:46:10 +05:30
Nabin Hait
8100327b51 bumped to version 10.1.46 2018-08-29 13:16:09 +06:00
Nabin Hait
ca1946152d
Update email_alert.py 2018-08-29 12:45:01 +05:30
Shreya Shah
503da4d7d7 Modify smallest currency fraction for USD (#6000) 2018-08-23 16:00:43 +05:30
Ameya Shenoy
89a8073c1f [fix] the patch needs to be executed before reloading moduledef (#5996) 2018-08-22 11:00:26 +05:30
Shreya Shah
54238c7e4c Fix comment mentions again (#5945)
* Fix comment mentions again

* Improvise as per suggestion

* Show mentions based on emails instead of names
2018-08-13 10:30:21 +05:30
Faris Ansari
b5d967677a
Merge pull request #5935 from codingCoffee/whitespace
[fix] Prevent trailing spaces in Options for Select field
2018-08-10 18:20:42 +05:30
Ameya Shenoy
71efb0e8e6
[fix] scrub options of whitespace 2018-08-07 13:02:10 +00:00
FinByz Tech Pvt. Ltd
0f68fec03e Added outgoing sender in email alert (#5892)
* Added outgoing sender in email alert

* Added semicolon

* Minor fix
2018-08-07 14:45:36 +05:30
Shreya Shah
62a7214a9b Check if fieldname is present in row else continue (#5912) 2018-08-07 14:43:32 +05:30
Ameya Shenoy
7cc7319a8a DocType name should not have hyphens in it (#5934) 2018-08-07 14:39:39 +05:30
Saurabh
c6a97a23db Merge branch 'hotfix' 2018-08-07 12:42:53 +05:30
Saurabh
e3382f8aec bumped to version 10.1.45 2018-08-07 13:12:53 +06:00
Saurabh
66ce0998b9
Merge pull request #5936 from codingCoffee/dropbox
[minor][feature] make dropbox and S3 backup successful email optional
2018-08-07 12:31:33 +05:30
Ameya Shenoy
1d89dcea75
[minor][feature] make email for successful S3 backup optional 2018-08-06 22:49:37 +00:00
Ameya Shenoy
51d5577bb1
[minor][feature] make dropbox backup successful message optional 2018-08-06 22:38:40 +00:00
Prateeksha Singh
04bc51a398 [hotfix] prevent jinja exec in search title (#5930) 2018-08-06 13:02:03 +05:30
Ameya Shenoy
ed5e0b4628
Merge pull request #5916 from rohitwaghchaure/total_rows_not_showing_proper_value
[Fix] Total amount not showing proper if rows has blank value
2018-08-06 12:33:27 +05:30
Rohit Waghchaure
7a77093bed [Fix] Total amount not showing proper if rows has blank value 2018-08-03 15:59:27 +05:30
Ameya Shenoy
aeed481051
Merge branch 'hotfix' 2018-08-01 06:22:44 +00:00
Ameya Shenoy
ecd881628f bumped to version 10.1.44 2018-08-01 06:22:44 +00:00
Ameya Shenoy
9bc18213a4
Merge pull request #5903 from rmehta/codingCoffee-strict_email
[email] smtp connection per sender
2018-08-01 11:40:34 +05:30
Nabin Hait
288b98ca76 Merge branch 'hotfix' 2018-07-31 12:40:42 +05:30
Nabin Hait
cdfba6fd4c bumped to version 10.1.43 2018-07-31 13:10:42 +06:00
Shreya Shah
4c20d1f68f using regex instead of soup to parse pdf page margins (#5883)
* using regex instead of soup to parse pdf page margins

* Fix codacy
2018-07-30 14:32:33 +05:30
Zarrar
389739b5bb Bold email mentions in comment section (#5879) 2018-07-30 12:01:46 +05:30
Ameya Shenoy
92f288bc2f added 2 fucntions to frappe.utils (#5877)
* added 2 fucntions to frappe.utils

- get_db_count: to get the db count of any DocType
- call: a wrapper for frappe.call

* Update __init__.py
2018-07-27 11:55:58 +05:30
Sagar Vora
5ddcf40a11 [python3] let PdfFileReader handle file opening (#5878)
In Python 3, file() is deprecated. 
PdfFileReader can internally handle file opening and closing, so file() no longer necessary.

See description of stream parameter here:
https://pythonhosted.org/PyPDF2/PdfFileReader.html#PyPDF2.PdfFileReader

Alternatively, open() can be used.
2018-07-27 11:55:48 +05:30
Rushabh Mehta
e2b802f0f1
Revert "[First Cut] Address Info for customer (#5872)" (#5873)
This reverts commit 9b78824946.
2018-07-26 12:58:43 +05:30
Saurabh
9b78824946 [First Cut] Address Info for customer (#5872) 2018-07-26 12:47:30 +05:30
Faris Ansari
98a03f9f0a Use "POST" request in ListView (#5870) 2018-07-26 12:39:23 +05:30
Shreya Shah
b2fbb35efa Fix comment mentions to avoid html tags (#5865)
* Fix comment mentions to avoid html tags

* Add a test case
2018-07-24 16:34:18 +05:30
Shreya Shah
a0a23c1ead Only calculate total for int, float and currency fieldtypes (#5852)
* Only calculate total for int, float and currency

* Fix codacy

* Update reportview.js
2018-07-23 14:38:50 +05:30
Shreya Shah
71f829e2eb Make start and end date as mandatory (#5843) 2018-07-23 11:27:47 +05:30
Saurabh
b9fffc9914 Merge branch 'hotfix' 2018-07-19 13:33:07 +05:30
Saurabh
d53a5c04b0 bumped to version 10.1.42 2018-07-19 14:03:07 +06:00
Rushabh Mehta
8cb936db86 [fix] potential fix for auto-scrolling issues 2018-07-19 12:24:03 +05:30
Nabin Hait
cd6c41546e Merge branch 'hotfix' 2018-07-19 11:14:20 +05:30
Nabin Hait
5ddbe495c1 bumped to version 10.1.41 2018-07-19 11:44:20 +06:00
Saurabh
bff5e1126a
Merge pull request #5838 from rohitwaghchaure/not_able_to_login
[Fix] Not able to login
2018-07-19 10:10:16 +05:30
Rohit Waghchaure
53154c3971 [Fix] Not able to login 2018-07-19 09:44:24 +05:30
Saurabh
f0504b5b15 Merge branch 'hotfix' 2018-07-18 16:06:37 +05:30
Saurabh
6033e1e929 bumped to version 10.1.40 2018-07-18 16:36:37 +06:00
Shreya Shah
4b75e5b16e Fix comment mentions (#5820)
* Show names for mentions instead of usernames

* Modify regex to allow email ids as mentions

* Modify get_value to fetch recipients based on names

* Add test case for regex
2018-07-16 17:58:01 +05:30
rohitwaghchaure
2f3fabc4f8 [Fix] Disable Show rows with zero values checkbox, still showin zero rows in the print (#5817) 2018-07-12 16:29:59 +05:30
Saurabh
5a7ee536d3
Merge pull request #5810 from saurabh6790/test_case_fixes
test case fixes for db query engin
2018-07-11 14:43:49 +05:30
Saurabh
b40d6f9a71 test case fixes for db query engin 2018-07-11 13:45:36 +05:30
rohitwaghchaure
7293311f72 [Fix] Handle the OverflowError exception in the in_words method (#5769) 2018-07-11 11:56:01 +05:30
rohitwaghchaure
6f84e922f8 [Fix] Brute force security (#5785)
* [Fix] Brute force security

* Added patch and change the error message

* Added test case
2018-07-11 11:14:05 +05:30
Saurabh
081b17fbe8 [security][fix] tighten criteria to prevent sql injection in search-f… (#5800)
* [security][fix] tighten criteria to prevent sql injection in search-fields

* test cases
2018-07-11 11:04:51 +05:30