Commit graph

868 commits

Author SHA1 Message Date
Gavin D'souza
82cedb8617 fix: Attribute errors and better msgprint 2020-04-16 16:37:35 +05:30
Himanshu
80f27f6081
fix: remove Customer & Supplier to hooks (#9874) 2020-04-14 13:01:49 +05:30
ci2014
e57f005622
fix: frappe.utils in get_context (#9844)
* Remove point from frappe.utils in get_context

For example frappe.utils.data.today() does not work. If we change it and use frappeutils.data.today() it works. This has to do with Jinja. Any better ideas?

* fix: frappe.utils in context

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-04-13 12:30:44 +00:00
Chinmay D. Pai
9df69d214c
fix: set welcome_email to None if template not found
fixes UnboundLocalError: welcome_email referenced before assignment

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-10 15:42:58 +05:30
mergify[bot]
ba6415a88b
Merge pull request #9859 from Thunderbottom/newsletter-fix
fix: update newsletter status on sending
2020-04-10 03:26:27 +00:00
Chinmay Pai
ad71b6804f
chore: use orm instead of sql
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-04-09 20:18:55 +05:30
Gavin D'souza
24e0174fcf fix: enable validations for email and phone data fields 2020-04-08 12:35:33 +05:30
Mangesh-Khairnar
8e0c9201a5 chore: remove duplicate db set 2020-04-07 16:10:31 +05:30
Chinmay D. Pai
074be8124d
fix: set email_sent after enqueuing newsletters
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-07 15:47:20 +05:30
Chinmay D. Pai
a1e297ecb1
chore: fix codacy issue
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-06 19:46:57 +05:30
Chinmay D. Pai
ed9fd709ad
fix: update newsletter status on sending
sets email_sent, schedule_send, and scheduled_to_send on newsletter
being sent

also switch to raw sql query to avoid default set by coalesce

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-06 19:02:30 +05:30
mergify[bot]
f5a1b560d7
Merge pull request #9603 from Mangesh-Khairnar/news-letter
feat: newsletter and email group changes
2020-04-03 16:46:50 +00:00
Mangesh-Khairnar
4381850b61 test: schedule_send 2020-04-03 18:17:55 +05:30
Mangesh-Khairnar
0e087cf1b4 fix: handle case in which email account does not exists 2020-04-03 18:06:32 +05:30
Mangesh-Khairnar
63a6cd0c1b fix: datepicker options for min hours 2020-03-31 14:37:55 +05:30
Himanshu Warekar
595979eb1f Merge branch 'develop' of https://github.com/frappe/frappe into custom_append_to 2020-03-27 11:16:41 +05:30
Mangesh-Khairnar
daa8d14f91 fix: setup schedule send onload post render 2020-03-20 18:58:20 +05:30
Suraj Shetty
878101d16b style: Fix codacy 2020-03-18 16:46:32 +05:30
Mangesh-Khairnar
71bb527f8c fix: add a more descriptive confirmation prompt 2020-03-17 12:54:06 +05:30
Himanshu Warekar
1f82f051ef fix: mve email_append_to to a section 2020-03-13 19:56:12 +05:30
Himanshu Warekar
bf555f8004 Merge branch 'develop' of https://github.com/frappe/frappe into custom_append_to 2020-03-13 19:37:21 +05:30
Mangesh-Khairnar
2696eca30a fix: make the schedule send field read only on sending newsletter 2020-03-02 11:39:22 +05:30
Mangesh-Khairnar
5bc6da78c1 fix: send email after adding subscriber 2020-02-27 11:56:18 +05:30
Suraj Shetty
2e6e32bfc2 fix: Avoid recursive save 2020-02-24 10:51:59 +05:30
Suraj Shetty
6de17d74a0 Merge branch 'develop' of https://github.com/frappe/frappe into fix-trigger-doc-events 2020-02-24 09:02:35 +05:30
Mangesh-Khairnar
7e618550f5 feat(newsletter): add confirmation email, welcome email for email group 2020-02-21 11:52:22 +05:30
Mangesh-Khairnar
6157719a7d feat(newsletter): add an option for hourly schedule send 2020-02-18 23:48:12 +05:30
sahil28297
b1d42e1302
fix: consider Not Sent and Sending status while pulling daily e… (#9496)
Co-authored-by: Saurabh <saurabh6790@gmail.com>
2020-02-18 15:43:16 +05:30
Suraj Shetty
592e5a88ee fix: Do not translate error log title 2020-02-07 14:53:00 +05:30
Suraj Shetty
d240acaa41 fix: Value change check 2020-02-07 14:48:35 +05:30
Suraj Shetty
df669a88cb fix: Trigger notification save after doc update 2020-02-07 13:28:18 +05:30
Suraj Shetty
253cc87f24 feat: Display system updater reference on timeline 2020-02-06 10:43:44 +05:30
Suraj Shetty
c132938883 fix: Do doc.save() on every update from notification 2020-02-06 10:41:48 +05:30
Suraj Shetty
12e07b0834 Merge branch 'develop' of https://github.com/frappe/frappe into fix-trigger-doc-events 2020-02-03 18:13:38 +05:30
Suraj Shetty
8e4544567a fix: Optionally call doc.save() method 2020-02-03 08:11:20 +05:30
Suraj Shetty
a9133ebcf6 feat: Optionally trigger doc events while updating doc from notification 2020-01-31 12:57:35 +05:30
mergify[bot]
2fe8b14a27
Merge pull request #9366 from prssanna/notification-fix
fix(Notification): fix for invalid notification condition
2020-01-30 16:36:53 +00:00
prssanna
2f32097c62 fix: pass doc.as_dict to get_context 2020-01-30 12:48:13 +05:30
Faris Ansari
41b0cf87e5
fix: Move .format out of translation method 2020-01-30 12:31:04 +05:30
Suraj Shetty
51bae0df50 fix(translations): Incorrect syntax 2020-01-29 15:35:28 +05:30
Suraj Shetty
dee4a7336c fix(translations): Incorrect syntax 2020-01-29 15:22:35 +05:30
prssanna
4344348a94 fix: don't return doc as dict in get_context 2020-01-28 21:00:23 +05:30
Himanshu Warekar
57e16972c2 Merge branch 'develop' of https://github.com/frappe/frappe into custom_append_to 2020-01-28 14:01:50 +05:30
prssanna
e032e817db fix: auto email report naming 2020-01-27 20:35:46 +05:30
prssanna
411ca69400 fix: pass doc as dict to safe_eval 2020-01-27 17:36:47 +05:30
Rohit Waghchaure
54a54dd3c8 fix: auto email report not working for the prepared report 2020-01-22 19:47:25 +05:30
Himanshu
39850513ed fix: refresh email link (#9270)
* fix: refresh email link

* Update load.py

* Update timeline.js

* Update load.py

* chore: rename to document_email in docinfo
2020-01-20 09:37:19 +00:00
Himanshu Warekar
858784d558 chore: revert code changes 2020-01-19 12:07:21 +05:30
Himanshu Warekar
f62f80f33c fix: check if meta hasattr for subject and email 2020-01-13 23:54:47 +05:30
Himanshu Warekar
7d94512559 Merge branch 'develop' of https://github.com/frappe/frappe into custom_append_to 2020-01-13 15:11:05 +05:30