Commit graph

77 commits

Author SHA1 Message Date
Ameya Shenoy
2ead222090 fix(email): Email status changes to Read (#6396)
The email recieved template was in unsubscribe email. Hence it
didn't used to function in case the emails were sent from DocTypes
like Issue, wherein the unsubscribe email template is not used.
Moved it to email_footer template.

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-11-05 10:49:18 +05:30
Ameya Shenoy
3b4f364919
Merge branch 'master' into staging-fixes 2018-09-26 07:12:30 +00:00
rohitwaghchaure
a8423dd782 [Fix] Email not sending if reciepients is blank because of reciepients is unsubscribed (#6136) 2018-09-25 15:37:26 +05:30
Ameya Shenoy
7c2fceb6b7
email: fix track_email_status not working
the initial method was not able to get the track_email_status value if
the email account had been set in site_config, the current method checks
for the same

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-09-10 18:57:22 +05:30
Ameya Shenoy
4b89e0d5b5 Email Read notification (#5911)
* Email Read notification

* changed email status from Opened to Read
2018-08-10 12:00:51 +05:30
Rushabh Mehta
aef1046b1f
[email] remove style from email so it does not mess up desk (#5860)
* [email] remove style from email so it does not mess up desk

* [fix] tests

* [fix] image parsing, #savedbyatestcase

* [fix] timeout issues in test

* [fix] timeout issues in test
2018-07-24 17:00:14 +05:30
Rushabh Mehta
db3a950db3
[email] smtp connection per sender (#5791)
* [fix]email error due to incorrect smtp server auth

- A dict of smtpserver objects is created for every sender
- A smtp server object is created if not present for the given sender
- smtpserver object is picked based on the sender of the mail

* [fix] remove cache from queue.py
2018-07-06 18:31:13 +05:30
Rushabh Mehta
7a532a4f21 [fix] remove cache from queue.py 2018-07-06 17:58:53 +05:30
Ameya Shenoy
f8269e3ad6 [fix]email error due to incorrect smtp server auth
- A dict of smtpserver objects is created for every sender
- A smtp server object is created if not present for the given sender
- smtpserver object is picked based on the sender of the mail
2018-07-06 14:08:11 +05:30
Nabin Hait
ef536e055b Merge branch 'master' into develop 2018-04-07 19:57:04 +05:30
rohitwaghchaure
4c032eabbe Removed owner of the document from the BCC (#5401) 2018-04-07 19:55:45 +05:30
Achilles Rasquinha
c251236e43 [FIX] module has no safe_decode 2018-03-08 14:53:36 +05:30
Achilles Rasquinha
3f14778b7c [FIX] email message to string, not bytes 2018-03-08 14:42:30 +05:30
Saurabh
6a23461b42 [fix] Send email with no letterhead if print letterhead is unchecked on print preview (#4816)
* [fix] send email with no letterhead if print letterhead is unchecked on print priview

* [fix] if not on print preview page, pull with_letterhead from print settings

* remove redundant if condition

* minor
2018-02-19 11:25:14 +05:30
Saurabh
410e6cadd7 [fix] pass language selected on email dialogue while enqueuing the function (#4808) 2018-01-12 16:43:26 +05:30
Manas Solanki
a279cdc4a2 attach print format in the emails before sending. (#4366) 2017-10-27 15:25:52 +05:30
Achilles Rasquinha
b5c4278341 BCC in Emails (#4377)
* added blank carbon copy

* [FEAT] BCC in emails

* removed test_communication, fixed comment

* fixed codacy
2017-10-25 15:33:30 +05:30
Nabin Hait
0da844dae0 Merge branch 'master' into develop 2017-09-27 13:03:10 +05:30
Makarand Bauskar
ad1c04850c [hotfix] send email from sender's email account if From field is selected on communication view (#4181)
* [hotfix] send email from sender's email account if From field is selected on communication view

* [fixes] codecy fixes
2017-09-27 12:41:35 +05:30
Aditya Hase
a1bbc200c7 Explicitly pass str to email.message.replace 2017-09-27 01:08:07 +05:30
Aditya Hase
96a1c17325 Explicitly pass bytes to quopri.encodestring 2017-09-27 01:08:07 +05:30
mbauskar
8e5becf32b Merge branch 'master' into develop 2017-08-17 11:00:37 +05:30
Makarand Bauskar
7bf6c19a31 [hotfix] daily_emails limit fixes (#3942) 2017-08-17 10:59:26 +05:30
mbauskar
bc603de8be resolved conflicts 2017-08-16 18:24:21 +05:30
Rushabh Mehta
1c8d3326a1 Merge pull request #3937 from mbauskar/daily-email-limits
[hotfix] check daily email limit before sending emails
2017-08-16 17:16:16 +05:30
mbauskar
02cc55dd48 [hotfix] minor fixes 2017-08-16 16:42:50 +05:30
mbauskar
ce8f76ff4a [hotfix] check daily email limit before sending emails 2017-08-16 16:15:26 +05:30
Faris Ansari
67e16a58a6 [fix] unsubscribe link shouldn't append always (#3932) 2017-08-16 14:12:48 +05:30
Aditya Hase
769338f136 Replaced all instances of basestring with six.string_types 2017-08-11 00:10:11 +05:30
Aditya Hase
e6bd1e4995 Replaced all instances of 'unicode' with 'six.text_type' (#3825) 2017-08-02 16:57:39 +05:30
Aditya Hase
928ebb66a6 Replaced HTMLParser imports with six.moves.html_parser (#3812) 2017-07-31 10:58:22 +05:30
Faris Ansari
f3f21554b2 Email footer refactor (#3807)
* Email footer refactor

* styling fixes

* Unsubscribe message

* fix test
2017-07-31 10:53:15 +05:30
mbauskar
3f70754e11 Merge branch 'master' into develop 2017-07-27 12:17:21 +05:30
Makarand Bauskar
22475a046c [hotfix] encode the email message to utf8 before sending mail (#3785)
* [hotfix] encode the email message to utf8 before sending mail

* [minor] review fixes
2017-07-27 12:14:37 +05:30
Faris Ansari
1332710982 Email footer (#3784)
* Add frappe.preview_email for faster feedback on email design

* Set Unsubscribe link color to text-muted

* error handling for header

* codacy fixes
2017-07-27 11:33:31 +05:30
Faris Ansari
5a498616b6 Email header (#3748)
* Fix fonts for emails

* Email header with indicator

* Login emails with header

* Add tests for email header

* fix codacy
2017-07-20 17:57:57 +05:30
Manas Solanki
bd4d0e45ca fix error in email queue (#3728) 2017-07-18 17:51:26 +05:30
Faris Ansari
f6d265b2ef Email inline_images enhancement, header (#3682)
* minor refactor

* update user.py to use new sendmail api

* On-demand attachments in email

* Replace inline_images by just specifying path

* Add header flag in frappe.sendmail

* Inline images can now be attached from assets/, files/ and private/files/

* Update tests

* Fix email_account test
2017-07-13 18:37:28 +05:30
Faris Ansari
044ac18cb5 Email (#3625)
* inline images working, ability to use template name for emails

* Extract header into separate file

* Remove erp-logo

* minor refactor

* [minor] codacy

* fix for test

* Add test case for email body

* remove unused imports

* Add more tests for email body
2017-07-12 14:02:55 +05:30
Charles-Henri Decultot
2da4bafa1e Clear outbox modification (#3628)
* Clear Outbox modification

* Correction of SQL query
2017-07-11 10:23:06 +05:30
Rushabh Mehta
834ee797ca [wip] add inline images in frappe.sendmail (#3528) 2017-06-23 17:23:29 +05:30
Nabin Hait
f7b16fc56a Prepare email message only if there is message (#3477) 2017-06-14 15:43:03 +05:30
Nabin Hait
37cd69b4df Clear email query via separate query to avoid deadlock (#3418) 2017-06-02 14:03:11 +05:30
Nabin Hait
8890165fa3 Multiple issues fixed in auto email report (#3394) 2017-05-30 15:22:25 +05:30
tundebabzy
6e29d9e925 xrange to range (#3237)
* introduces build status for local fork

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range

* converts xrange to range using six.moves.range

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* converts xrange to range using six.moves.range7

* Revert "introduces build status for local fork"

This reverts commit 61f40983d0b3c6725369171ab850a18e5c029cc4.
2017-05-11 10:55:34 +05:30
tundebabzy
6fbe20caaa Except and raise statement python 3 compatible style (#3216)
* changes exception and raise statements to python 3 style

* changes except statement to python 3 style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* adds six.reraise to fix python 3 style raise statements with traceback

* fixes indentation
2017-05-11 10:51:59 +05:30
Makarand Bauskar
835547db3b Merge branch 'develop' into email-fixes 2017-03-07 11:03:13 +05:30
Manas Solanki
8e2e1e22db [Fix] Newsletter
- Optional unsubscribe link in mail
- can be send to multiple email group
- attachments in newsletter
- confirm before unsubscribe
2017-02-28 19:06:36 +05:30
robert schouten
1071d4321d assorted email fixes 2017-02-14 16:06:36 +08:00
Rushabh Mehta
254ca3393a [merge] from master 2017-01-24 18:22:50 +05:30