Commit graph

86 commits

Author SHA1 Message Date
Faris Ansari
f23700d33a
Merge pull request #6586 from Thunderbottom/email-attachment-fix
communication: fix attachments in email queue and generated reports
2018-12-07 16:38:05 +05:30
Chinmay Pai
ba0045ef1f
communication: fix attachments in email queue and generated reports
so, apparently i messed up some things that were responsible for handling file attachments in email queue and attached on-the-fly generated reports. these issues should be fixed now.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-12-06 18:12:34 +05:30
Aditya Hase
f93a141a73 fix(email-queue): Record raised exception and traceback in Error Log 2018-11-15 16:22:13 +05:30
Ameya Shenoy
d0e7690ae2
Merge branch 'staging' into develop 2018-11-05 06:48:46 +00:00
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
e551153ea0
Merge branch 'staging' into develop 2018-09-26 07:21:28 +00:00
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
Chinmay Pai
6e84bbe80d
Merge branch 'develop' into file-api 2018-09-21 13:42:32 +05:30
Rushabh Mehta
2e6a202652 Postgres support for Frappe (#5919)
* [start] postgres

* [wip] started refactoring db_schema

* Add psycopg2 to requirements.txt

* Add support for Postgres SQL

- Separate frameworkSQL, database, schema, setup_db file for
mariaDB and postgres
- WIP

* Remove quotes from sql to make it compatible with postgres as well

* Moved some code from db_schema to database.py

* Move code from db_schema to schema.py

Add other required refactoring

* Add schema chages

* Remove redundant code in file

* Add invalid column name exception class to exceptions.py

* Add back tick in query wherever needed and replace ifnull with coalesce

* Update get_column_description code in database.py file

* Remove a print statement

* Add keys to get on_duplicate query

* Add bactick wherever necessary

- Remove db_schema.py file

* Remove DATE_SUB as it is incompatible with postgres

- Fix prepare_filter_condition

* Add backtick and quotes wherever necessary
- Move get_database_size to frappe.db namespace
- fix some left out bugs and errors

* Add code to create key and unique index
- added mysql and posgres in their respective database.py

* Add more bacticks in queries and fix some errors
- Pass keys to on_duplicate_update method
- Replace MONTH with EXTRACT function
- Remove DATEDIFF and CURDATE usage

* Cast state value to int in toggle_two_factor_auth
- since two_factor_auth has the datatype of Int

* Refactor
- Replace Timediff with normal arithmetic operator
- Add MAX_COLUMN_LENGTH
- Remove Redundant code
- Add regexp character constant
- Move create_help_table to database.py
- Add get_full_text_search_condition method
- Inherit MariaDBTable from DBTable

* Replace Database instance with get_db method

* Move db_manager to separate file

* Refactor
- Remove some unwanted code
- Separate alter table code for postgres and mysql
- Replace data_type with column_type in database.py

* Make fulltext search changes in global_search.py

* Add empty string check

* Add root_password to site config

* Create cli command for postgres console

* Move setup of help database to setup_db.py

* Add get_database_list method

* Fix exception handling
- Replace bad_field handler with missing_column handler

* Fix tests and sql queries

* Fix import error

* Fix typo db -> database

* Fix error with make_table in help.py

* Try test for postgres

* Remove pyhton 2.7 version to try postgres travis test

* Add test fixes

* Add db_type to the config of test_site_postgres

* Enable query debug to check the reason for travis fail

* Add backticks to check if the test passes

* Update travis.yml
- Add postgres addon

* Try appending 'd_' to hash for db_name
- since postgres does not support dbname starting with a number

* Try adding db_type for global help to make travis work

* Add print statements to debug travis failure

* Enable transaction and remove debug flag

* Fix help table creation query (postgres)

* Fix import issue

* Add some checks to prevent errors
- Some doctypes used to get called even before they are created

* Try fixes

* Update travis config

* Fix create index for help table

* Remove unused code

* Fix queries and update travis config

* Fix ifnull replace logic (regex)

* Add query fixes and code cleanup

* Fix typo
- get_column_description -> get_table_columns_description

* Fix tests
- Replace double quotes in query with single quote

* Replace psycopg2 with psycopg2-binary to avoid warnings
- http://initd.org/psycopg/docs/install.html#binary-install-from-pypi

* Add multisql api

* Add few multisql queries

* Remove print statements

* Remove get_fulltext_search_condition method and replace with multi query

* Remove text slicing in create user

* Set default for 'values' argument in multisql

* Fix incorrect queries and remove few debug flags
- Fix multisql bug

* Force delete user to fix test
- Fix Import error
- Fix incorrect query

* Fix query builder bug

* Fix bad query

* Fix query (minor)

* Convert boolean text to int since is_private has datatype of int
- Some query changes like removed double quotes
and replace with interpolated string to pass multiple
value pass in one of the query

* Extend database class from an object to support python 2

* Fix query
- Add quotes around value passed to the query for variable comparision

* Try setting host_name for each test site
- To avoid "RemoteDisconnected" error while testing data migration test
- Update travis.yml to add hosts
- Remove unwanted commit in setup_help_database

* Set site hostname to data migration connector (in test file)
- To connect the same site host

* Fix duplicate entry issue
- the problem is in naming series file.
In previous commits I unknowingly changed a part of a series query
due to which series were not getting reset

* Replace few sql queries with orm methods

* Fix codacy

* Fix 'Doctype Sessions not found' issue

* Fix bugs induced during codacy fixes

* Fix Notification Test

- Use ORM instead of raw sql

* Set Date fallback value to 0001-01-01

- 0000-00-00 is invalid date in Postgres
- 0001-01-01 works in both

* Fix date filter method

* Replace double quotes with single quote for literal value

* Remove print statement

* Replace double quotes with single

* Fix tests

- Replace few raw sql with ORM

* Separate query for postgres

- update_fields_to_fetch_query

* Fix tests

- replace locate with strpos for postgres

* Fix tests

- Skip test for datediff
- convert bytes to str in escape method

* Remove TestBot

* Skip fieldname extraction

* Replace docshare raw sql with ORM

* Fix typo

* Fix ancestor query test

* Fix test data migration

* Remove hardcoded hostname

* Add default option and option list for db_type

* Remove frappe.async module

* Remove a debug flag from test

* Fix codacy

* fix import issue

* Convert classmethod to static method

* Convert few instance methods to static methods

* Remove some unused imports

* Fix codacy

- Add exception type
- Replace few instance methods with static methods
- Remove unsued import

* Fix codacy

* Remove unused code

* Remove some unused codes

- Convert some instance methods to static function

* Fix a issue with query modification

* Fix add_index query

* Fix query

* Fix update_auth patch

* Fix a issue with exception handling

* Add try catch to a reload_doc

* Add try-catch to file_manager_hook patch

* import update_gravatar to set_user_gravatar patch

* Undo all the wrong patch fixes

* Fix db_setup code 😪
- previously it was not restoring db from source SQL
which is why few old patched were breaking
(because they were getting different schema structure)

* Fix typo !

* Fix exception(is_missing_column) handling

* Add deleted code
- This code is only used in a erpnext patch.
Can be moved to that patch file

* Fix codacy

* Replace a mariadb specific function in a query used in validate_series

* Remove a debug flag

* Revert changes (rename_parent_and_child)

* Fix validate_one_root method

* Fix date format issue

* Fix codacy
- Disable a pylint for variable argument warning
- Convert an instance method to static method

* Add bandit.yml

The Codacy seems to use Bandit which generates
warning for every subprocess import and its usage during pytest
Since we have carefully used subprocess (avoided user input),
warnings needs to be avoided.
This can be removed if we have any alternative for subprocess usage.

* Skip start_process_with_partial_path check

* Fix typo

* Add python 2.7 test

* Move python versions in travis.yml

* Add python versions to jobs

* Overwrite python version inheritance for postgres in travis.yml

* Add quotes around python version in .travis.yml

* Add quotes around the name of the job

* Try a travis fix

* Try .travis.yml fix

* Import missing subprocess

* Refactor travis.yml

* Refactor travis.yml
- move install and tests commands to separate files
- Use matrix to build combination of python version and db type

* Make install.sh and run-tests.sh executable

* Add sudo required to travis.yml to allow sudo cmmands in shell files

* Load nvm

* Remove verbose flag from scripts

* Remove command-trace-print flag

* Change to build dir in before script

* Add absolute path for scripts

* Fix tests

* Fix typo

* Fix codacy
- fixes - "echo won't expand escape sequences." warning

* Append (_) underscore instead of 'd' for db_name

* Remove printf and use mysql execute flag
2018-09-21 10:20:48 +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
Chinmay Pai
8943f6cfd5
file-api: migration improvements and fixes
* migrate more functions to file class
* add get_content(), returns file content from file_name
* move get_file_path() to get_full_path() to decrease naming ambiguity

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-09-06 17:30:33 +05:30
Chinmay Pai
22ba310aaf
[2/3] file-api: code migration
migrate api from file_manager.py to file.py

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2018-09-03 18:04:45 +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