Commit graph

66 commits

Author SHA1 Message Date
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
Kanchan Chauhan
07d33c5c8e [Fix] Unsubscribe url fix 2017-01-24 17:18:25 +05:30
Rushabh Mehta
20aeaf0e4c [minor] show queueing info for newsletter and commit 2017-01-19 16:56:29 +05:30
Rushabh Mehta
357045eeac [fix] queue.py 2017-01-19 12:02:12 +05:30
Rushabh Mehta
bda8552c00 [fix] queue each email separately if too many recipients or newsletter 2017-01-19 11:55:27 +05:30
robert schouten
48dc91a59f Email inbox (#2485)
* Communication_reconciliation

* Email inbox

* added collapsed timeline for communication

* new email prefill from when only one address

* timeline duplication and notifcation and stability fixs

* add subject to timeline

* email system v7 fixes

* added password required validation

* use proper email datetime

* email inbox v7.1 fixes

* email inbox communication_date used instead of created

* email inbox communication data cleanup

* remove old patch

* email inbox permit unlinking

* [fix] duplication queue and rename domain to email domain

* fix rename domain

* email inbox index optimisation

* email inbox relink doctype query usability fix

* email_inbox Set attachment variable for forwards and replies based on whether it exists or not

* uidnext fixes and cleanup

* email inbox fix tests

* fix rebase timeline issue

* email inbox threading and cleanup

* email inbox cleanup

* bring inbox into frappe and cleanup

* fix missed path

* inbox cleanup

* email-inbox move service back to account

* separate to erpnext contact match

* email inbox cleanup and move relink and timeline fix

* relink optimisation

* inbox fix footer

* keep email drafts on pages not just forms

* email inbox add sent items

* email inbox allow not save list settings on query

* email inbox cleanup and remove communications recon

* add suspend sending button in email queue

* fix rebase error

* email inbox assorted fixes

* email inbox fixes and relink option only when linked otherwise link;

* email inbox fix sender fullname as administrator

* create user email to custom button

* email inbox sent no match and seen

* email inbox fix unicode issues with subject recipient and sender
2017-01-13 14:45:11 +05:30
Rushabh Mehta
042e2b09cb [design] Redesign, cleanup Login, Message pages (#2564)
* [cleanup] login, message pages

* [style] cleanups

* [cleanup]

* [cleanup] update password

* [fix] name for web form (fixes edit-profile)
2017-01-10 14:44:42 +05:30
KanchanChauhan
c0a685aa24 Email ID renamed to Email Address (#2541) 2017-01-05 14:55:51 +05:30
robert schouten
c044c476a8 move message_id threading to communication to work with inbox (#2458)
* move message_id threading to communication to work with inbox

* move message_id threading fix

* rebase fix

* reset threading to email queue but keep in communications
2016-12-15 14:50:52 +05:30
robert schouten
efa86c6e31 Email cc in headers if expose recipients (#2441)
* move email cc to header

* [test fixes] move email cc to header

* email cc additional tests

* email cc cleanup and unsubsribe link test

* email cc permit footer based cc with expose_recipient and tests + ui
2016-12-15 09:49:54 +05:30
Rushabh Mehta
4df583b1cf [fix] email, deprecate frappe.email.sendmail, use frappe.sendmail 2016-11-18 11:32:18 +05:30
Rushabh Mehta
f801a7c56c [fix] don't send email in test' 2016-11-18 08:12:06 +05:30