-
\ No newline at end of file
+
diff --git a/frappe/core/doctype/doctype/doctype.js b/frappe/core/doctype/doctype/doctype.js
index 9a19185cfc..b3469abf29 100644
--- a/frappe/core/doctype/doctype/doctype.js
+++ b/frappe/core/doctype/doctype/doctype.js
@@ -53,7 +53,7 @@ frappe.ui.form.on('DocType', {
frm.events.autoname(frm);
},
- autoname(frm) {
+ autoname: function(frm) {
frm.set_df_property('fields', 'reqd', frm.doc.autoname !== 'Prompt');
}
})
diff --git a/frappe/core/doctype/doctype/doctype.json b/frappe/core/doctype/doctype/doctype.json
index 4e3f2fd84a..379ea227cb 100644
--- a/frappe/core/doctype/doctype/doctype.json
+++ b/frappe/core/doctype/doctype/doctype.json
@@ -54,6 +54,10 @@
"color",
"show_preview_popup",
"show_name_in_global_search",
+ "email_settings_sb",
+ "email_append_to",
+ "sender_field",
+ "subject_field",
"sb2",
"permissions",
"restrict_to_domain",
@@ -488,11 +492,37 @@
"fieldtype": "Table",
"label": "Links",
"options": "DocType Link"
+ },
+ {
+ "depends_on": "email_append_to",
+ "fieldname": "subject_field",
+ "fieldtype": "Data",
+ "label": "Subject Field"
+ },
+ {
+ "depends_on": "email_append_to",
+ "fieldname": "sender_field",
+ "fieldtype": "Data",
+ "label": "Sender Field",
+ "mandatory_depends_on": "email_append_to"
+ },
+ {
+ "default": "0",
+ "fieldname": "email_append_to",
+ "fieldtype": "Check",
+ "label": "Allow document creation via Email"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "email_settings_sb",
+ "fieldtype": "Section Break",
+ "label": "Email Settings"
}
],
"icon": "fa fa-bolt",
"idx": 6,
- "modified": "2019-11-25 17:24:03.690192",
+ "links": [],
+ "modified": "2020-03-27 14:51:44.581128",
"modified_by": "Administrator",
"module": "Core",
"name": "DocType",
diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py
index da1b184cc1..f970f51419 100644
--- a/frappe/core/doctype/doctype/doctype.py
+++ b/frappe/core/doctype/doctype/doctype.py
@@ -15,7 +15,7 @@ import frappe
import frappe.website.render
from frappe import _
from frappe.utils import now, cint
-from frappe.model import no_value_fields, default_fields, data_fieldtypes, table_fields
+from frappe.model import no_value_fields, default_fields, data_fieldtypes, table_fields, data_field_options
from frappe.model.document import Document
from frappe.custom.doctype.property_setter.property_setter import make_property_setter
from frappe.custom.doctype.custom_field.custom_field import create_custom_field
@@ -24,6 +24,7 @@ from frappe.modules import make_boilerplate, get_doc_path
from frappe.database.schema import validate_column_name, validate_column_length
from frappe.model.docfield import supports_translation
from frappe.modules.import_file import get_file_path
+from frappe.model.meta import Meta
class InvalidFieldNameError(frappe.ValidationError): pass
@@ -93,10 +94,11 @@ class DocType(Document):
if not self.is_new():
self.setup_fields_to_fetch()
+ check_email_append_to(self)
+
if self.default_print_format and not self.custom:
frappe.throw(_('Standard DocType cannot have default print format, use Customize Form'))
-
def set_default_in_list_view(self):
'''Set default in-list-view for first 4 mandatory fields'''
if not [d.fieldname for d in self.fields if d.in_list_view]:
@@ -107,14 +109,12 @@ class DocType(Document):
cnt += 1
if cnt == 4: break
-
def set_default_translatable(self):
'''Ensure that non-translatable never will be translatable'''
for d in self.fields:
if d.translatable and not supports_translation(d.fieldtype):
d.translatable = 0
-
def check_developer_mode(self):
"""Throw exception if not developer mode or via patch"""
if frappe.flags.in_patch or frappe.flags.in_test:
@@ -123,7 +123,6 @@ class DocType(Document):
if not frappe.conf.get("developer_mode") and not self.custom:
frappe.throw(_("Not in Developer Mode! Set in site_config.json or make 'Custom' DocType."), CannotCreateStandardDoctypeError)
-
def setup_fields_to_fetch(self):
'''Setup query to update values for newly set fetch values'''
try:
@@ -168,21 +167,18 @@ class DocType(Document):
)
)
-
def update_fields_to_fetch(self):
'''Update fetch values based on queries setup'''
if self.flags.update_fields_to_fetch_queries and not self.issingle:
for query in self.flags.update_fields_to_fetch_queries:
frappe.db.sql(query)
-
def validate_document_type(self):
if self.document_type=="Transaction":
self.document_type = "Document"
if self.document_type=="Master":
self.document_type = "Setup"
-
def validate_website(self):
"""Ensure that website generator has field 'route'"""
if self.has_web_view:
@@ -193,7 +189,6 @@ class DocType(Document):
# clear website cache
frappe.website.render.clear_cache()
-
def change_modified_of_parent(self):
"""Change the timestamp of parent DocType if the current one is a child to clear caches."""
if frappe.flags.in_import:
@@ -203,7 +198,6 @@ class DocType(Document):
for p in parent_list:
frappe.db.sql('UPDATE `tabDocType` SET modified=%s WHERE `name`=%s', (now(), p.parent))
-
def scrub_field_names(self):
"""Sluggify fieldnames if not set from Label."""
restricted = ('name','parent','creation','modified','modified_by',
@@ -233,7 +227,6 @@ class DocType(Document):
# unique is automatically an index
if d.unique: d.search_index = 0
-
def validate_series(self, autoname=None, name=None):
"""Validate if `autoname` property is correctly set."""
if not autoname: autoname = self.autoname
@@ -270,12 +263,11 @@ class DocType(Document):
if used_in:
frappe.throw(_("Series {0} already used in {1}").format(prefix, used_in[0][0]))
-
def on_update(self):
"""Update database schema, make controller templates if `custom` is not set and clear cache."""
self.delete_duplicate_custom_fields()
try:
- frappe.db.updatedb(self.name, self)
+ frappe.db.updatedb(self.name, Meta(self))
except Exception as e:
print("\n\nThere was an issue while migrating the DocType: {}\n".format(self.name))
raise e
@@ -324,7 +316,6 @@ class DocType(Document):
dt = {0} and fieldname in ({1})
'''.format('%s', ', '.join(['%s'] * len(fields))), tuple([self.name] + fields), as_dict=True)
-
def sync_global_search(self):
'''If global search settings are changed, rebuild search properties for this table'''
global_search_fields_before_update = [d.fieldname for d in
@@ -342,7 +333,6 @@ class DocType(Document):
frappe.enqueue('frappe.utils.global_search.rebuild_for_doctype',
now=now, doctype=self.name)
-
def set_base_class_for_controller(self):
'''Updates the controller class to subclass from `WebsiteGenertor`,
if it is a subclass of `Document`'''
@@ -362,14 +352,12 @@ class DocType(Document):
with open(controller_path, 'w') as f:
f.write(code)
-
def run_module_method(self, method):
from frappe.modules import load_doctype_module
module = load_doctype_module(self.name, self.module)
if hasattr(module, method):
getattr(module, method)()
-
def before_rename(self, old, new, merge=False):
"""Throw exception if merge. DocTypes cannot be merged."""
if not self.custom and frappe.session.user != "Administrator":
@@ -385,7 +373,6 @@ class DocType(Document):
if not self.custom and not frappe.flags.in_test and not frappe.flags.in_patch:
self.rename_files_and_folders(old, new)
-
def after_rename(self, old, new, merge=False):
"""Change table name using `RENAME TABLE` if table exists. Or update
`doctype` property for Single type."""
@@ -396,7 +383,6 @@ class DocType(Document):
else:
frappe.db.sql("rename table `tab%s` to `tab%s`" % (old, new))
-
def rename_files_and_folders(self, old, new):
# move files
new_path = get_doc_path(self.module, 'doctype', new)
@@ -413,7 +399,6 @@ class DocType(Document):
self.rename_inside_controller(new, old, new_path)
frappe.msgprint(_('Renamed files and replaced code in controllers, please check!'))
-
def rename_inside_controller(self, new, old, new_path):
for fname in ('{}.js', '{}.py', '{}_list.js', '{}_calendar.js', 'test_{}.py', 'test_{}.js'):
fname = os.path.join(new_path, fname.format(frappe.scrub(new)))
@@ -439,7 +424,6 @@ class DocType(Document):
if not (self.issingle and self.istable):
self.preserve_naming_series_options_in_property_setter()
-
def preserve_naming_series_options_in_property_setter(self):
"""Preserve naming_series as property setter if it does not exist"""
naming_series = self.get("fields", {"fieldname": "naming_series"})
@@ -459,7 +443,6 @@ class DocType(Document):
if naming_series[0].default:
make_property_setter(self.name, "naming_series", "default", naming_series[0].default, "Text", validate_fields_for_doctype=False)
-
def before_export(self, docdict):
# remove null and empty fields
def remove_null_fields(o):
@@ -504,7 +487,6 @@ class DocType(Document):
except ValueError:
pass
-
@staticmethod
def prepare_for_import(docdict):
# set order of fields from field_order
@@ -527,19 +509,16 @@ class DocType(Document):
if "field_order" in docdict:
del docdict["field_order"]
-
def export_doc(self):
"""Export to standard folder `[module]/doctype/[name]/[name].json`."""
from frappe.modules.export_file import export_to_files
export_to_files(record_list=[['DocType', self.name]], create_init=True)
-
def import_doc(self):
"""Import from standard folder `[module]/doctype/[name]/[name].json`."""
from frappe.modules.import_module import import_from_files
import_from_files(record_list=[[self.module, 'doctype', self.name]])
-
def make_controller_template(self):
"""Make boilerplate controller template."""
make_boilerplate("controller._py", self)
@@ -556,7 +535,6 @@ class DocType(Document):
make_boilerplate('templates/controller.html', self.as_dict())
make_boilerplate('templates/controller_row.html', self.as_dict())
-
def make_amendable(self):
"""If is_submittable is set, add amended_from docfields."""
if self.is_submittable:
@@ -572,7 +550,6 @@ class DocType(Document):
"no_copy": 1
})
-
def make_repeatable(self):
"""If allow_auto_repeat is set, add auto_repeat custom field."""
if self.allow_auto_repeat:
@@ -641,14 +618,12 @@ class DocType(Document):
})
self.nsm_parent_field = parent_field_name
-
def get_max_idx(self):
"""Returns the highest `idx`"""
max_idx = frappe.db.sql("""select max(idx) from `tabDocField` where parent = %s""",
self.name)
return max_idx and max_idx[0][0] or 0
-
def validate_name(self, name=None):
if not name:
name = self.name
@@ -668,7 +643,6 @@ def validate_fields_for_doctype(doctype):
doc.delete_duplicate_custom_fields()
validate_fields(frappe.get_meta(doctype, cached=False))
-
# this is separate because it is also called via custom field
def validate_fields(meta):
"""Validate doctype fields. Checks
@@ -692,29 +666,24 @@ def validate_fields(meta):
def check_illegal_characters(fieldname):
validate_column_name(fieldname)
-
def check_invalid_fieldnames(docname, fieldname):
invalid_fields = ('doctype',)
if fieldname in invalid_fields:
frappe.throw(_("{0}: Fieldname cannot be one of {1}")
.format(docname, ", ".join([frappe.bold(d) for d in invalid_fields])))
-
def check_unique_fieldname(docname, fieldname):
duplicates = list(filter(None, map(lambda df: df.fieldname==fieldname and str(df.idx) or None, fields)))
if len(duplicates) > 1:
frappe.throw(_("{0}: Fieldname {1} appears multiple times in rows {2}").format(docname, fieldname, ", ".join(duplicates)), UniqueFieldnameError)
-
def check_fieldname_length(fieldname):
validate_column_length(fieldname)
-
def check_illegal_mandatory(docname, d):
if (d.fieldtype in no_value_fields) and d.fieldtype not in table_fields and d.reqd:
frappe.throw(_("{0}: Field {1} of type {2} cannot be mandatory").format(docname, d.label, d.fieldtype), IllegalMandatoryError)
-
def check_link_table_options(docname, d):
if frappe.flags.in_patch: return
if d.fieldtype in ("Link",) + table_fields:
@@ -733,28 +702,23 @@ def validate_fields(meta):
# fix case
d.options = options
-
def check_hidden_and_mandatory(docname, d):
if d.hidden and d.reqd and not d.default:
frappe.throw(_("{0}: Field {1} in row {2} cannot be hidden and mandatory without default").format(docname, d.label, d.idx), HiddenAndMandatoryWithoutDefaultError)
-
def check_width(d):
if d.fieldtype == "Currency" and cint(d.width) < 100:
frappe.throw(_("Max width for type Currency is 100px in row {0}").format(d.idx))
-
def check_in_list_view(d):
if d.in_list_view and (d.fieldtype in not_allowed_in_list_view):
frappe.throw(_("'In List View' not allowed for type {0} in row {1}").format(d.fieldtype, d.idx))
-
def check_in_global_search(d):
if d.in_global_search and d.fieldtype in no_value_fields:
frappe.throw(_("'In Global Search' not allowed for type {0} in row {1}")
.format(d.fieldtype, d.idx))
-
def check_dynamic_link_options(d):
if d.fieldtype=="Dynamic Link":
doctype_pointer = list(filter(lambda df: df.fieldname==d.options, fields))
@@ -762,7 +726,6 @@ def validate_fields(meta):
or (doctype_pointer[0].fieldtype=="Link" and doctype_pointer[0].options!="DocType"):
frappe.throw(_("Options 'Dynamic Link' type of field must point to another Link Field with options as 'DocType'"))
-
def check_illegal_default(d):
if d.fieldtype == "Check" and not d.default:
d.default = '0'
@@ -771,12 +734,10 @@ def validate_fields(meta):
if d.fieldtype == "Select" and d.default and (d.default not in d.options.split("\n")):
frappe.throw(_("Default for {0} must be an option").format(d.fieldname))
-
def check_precision(d):
if d.fieldtype in ("Currency", "Float", "Percent") and d.precision is not None and not (1 <= cint(d.precision) <= 6):
frappe.throw(_("Precision should be between 1 and 6"))
-
def check_unique_and_text(docname, d):
if meta.issingle:
d.unique = 0
@@ -798,7 +759,6 @@ def validate_fields(meta):
if d.search_index and d.fieldtype in ("Text", "Long Text", "Small Text", "Code", "Text Editor"):
frappe.throw(_("{0}:Fieldtype {1} for {2} cannot be indexed").format(docname, d.fieldtype, d.label), CannotIndexedError)
-
def check_fold(fields):
fold_exists = False
for i, f in enumerate(fields):
@@ -813,7 +773,6 @@ def validate_fields(meta):
else:
frappe.throw(_("Fold can not be at the end of the form"))
-
def check_search_fields(meta, fields):
"""Throw exception if `search_fields` don't contain valid fields."""
if not meta.search_fields:
@@ -830,7 +789,6 @@ def validate_fields(meta):
(fieldname not in fieldname_list):
frappe.throw(_("Search field {0} is not valid").format(fieldname))
-
def check_title_field(meta):
"""Throw exception if `title_field` isn't a valid fieldname."""
if not meta.get("title_field"):
@@ -857,7 +815,6 @@ def validate_fields(meta):
_validate_title_field_pattern(df.options)
_validate_title_field_pattern(df.default)
-
def check_image_field(meta):
'''check image_field exists and is of type "Attach Image"'''
if not meta.image_field:
@@ -869,7 +826,6 @@ def validate_fields(meta):
if df[0].fieldtype != 'Attach Image':
frappe.throw(_("Image field must be of type Attach Image"), InvalidFieldNameError)
-
def check_is_published_field(meta):
if not meta.is_published_field:
return
@@ -877,7 +833,6 @@ def validate_fields(meta):
if meta.is_published_field not in fieldname_list:
frappe.throw(_("Is Published Field must be a valid fieldname"), InvalidFieldNameError)
-
def check_timeline_field(meta):
if not meta.timeline_field:
return
@@ -889,7 +844,6 @@ def validate_fields(meta):
if df.fieldtype not in ("Link", "Dynamic Link"):
frappe.throw(_("Timeline field must be a Link or Dynamic Link"), InvalidFieldNameError)
-
def check_sort_field(meta):
'''Validate that sort_field(s) is a valid field'''
if meta.sort_field:
@@ -902,7 +856,6 @@ def validate_fields(meta):
frappe.throw(_("Sort field {0} must be a valid fieldname").format(fieldname),
InvalidFieldNameError)
-
def check_illegal_depends_on_conditions(docfield):
''' assignment operation should not be allowed in the depends on condition.'''
depends_on_fields = ["depends_on", "collapsible_depends_on", "mandatory_depends_on", "read_only_depends_on"]
@@ -912,7 +865,6 @@ def validate_fields(meta):
re.match("""[\w\.:_]+\s*={1}\s*[\w\.@'"]+""", depends_on):
frappe.throw(_("Invalid {0} condition").format(frappe.unscrub(field)), frappe.ValidationError)
-
def check_table_multiselect_option(docfield):
'''check if the doctype provided in Option has atleast 1 Link field'''
if not docfield.fieldtype == 'Table MultiSelect': return
@@ -925,7 +877,6 @@ def validate_fields(meta):
frappe.throw(_('DocType {0} provided for the field {1} must have atleast one Link field')
.format(doctype, docfield.fieldname), frappe.ValidationError)
-
def scrub_options_in_select(field):
"""Strip options for whitespaces"""
@@ -937,11 +888,20 @@ def validate_fields(meta):
options_list.append(_option)
field.options = '\n'.join(options_list)
-
def scrub_fetch_from(field):
if hasattr(field, 'fetch_from') and getattr(field, 'fetch_from'):
field.fetch_from = field.fetch_from.strip('\n').strip()
+ def validate_data_field_type(docfield):
+ if docfield.fieldtype == "Data":
+ if docfield.options and (docfield.options not in data_field_options):
+ df_str = frappe.bold(_(docfield.label))
+ text_str = _("{0} is an invalid Data field.").format(df_str) + " " * 2 + _("Only Options allowed for Data field are:") + " "
+ df_options_str = "
" + "
".join([_(x) for x in data_field_options]) + "
"
+
+ frappe.msgprint(text_str + df_options_str, title="Invalid Data Field", raise_exception=True)
+
+
fields = meta.get("fields")
fieldname_list = [d.fieldname for d in fields]
@@ -972,6 +932,7 @@ def validate_fields(meta):
check_table_multiselect_option(d)
scrub_options_in_select(d)
scrub_fetch_from(d)
+ validate_data_field_type(d)
check_fold(fields)
check_search_fields(meta, fields)
@@ -981,7 +942,6 @@ def validate_fields(meta):
check_sort_field(meta)
check_image_field(meta)
-
def validate_permissions_for_doctype(doctype, for_remove=False):
"""Validates if permissions are set correctly."""
doctype = frappe.get_doc("DocType", doctype)
@@ -993,7 +953,6 @@ def validate_permissions_for_doctype(doctype, for_remove=False):
clear_permissions_cache(doctype.name)
-
def clear_permissions_cache(doctype):
frappe.clear_cache(doctype=doctype)
delete_notification_count_for(doctype)
@@ -1008,7 +967,6 @@ def clear_permissions_cache(doctype):
""", doctype):
frappe.clear_cache(user=user)
-
def validate_permissions(doctype, for_remove=False):
permissions = doctype.get("permissions")
if not permissions:
@@ -1102,7 +1060,6 @@ def validate_permissions(doctype, for_remove=False):
check_level_zero_is_set(d)
remove_rights_for_single(d)
-
def make_module_and_roles(doc, perm_fieldname="permissions"):
"""Make `Module Def` and `Role` records if already not made. Called while installing."""
try:
@@ -1133,7 +1090,6 @@ def make_module_and_roles(doc, perm_fieldname="permissions"):
else:
raise
-
def check_if_fieldname_conflicts_with_methods(doctype, fieldname):
doc = frappe.get_doc({"doctype": doctype})
method_list = [method for method in dir(doc) if isinstance(method, str) and callable(getattr(doc, method))]
@@ -1141,6 +1097,38 @@ def check_if_fieldname_conflicts_with_methods(doctype, fieldname):
if fieldname in method_list:
frappe.throw(_("Fieldname {0} conflicting with meta object").format(fieldname))
-
def clear_linked_doctype_cache():
frappe.cache().delete_value('linked_doctypes_without_ignore_user_permissions_enabled')
+
+def check_email_append_to(doc):
+ if not hasattr(doc, "email_append_to") or not doc.email_append_to:
+ return
+
+ # Subject Field
+ doc.subject_field = doc.subject_field.strip() if doc.subject_field else None
+ subject_field = get_field(doc, doc.subject_field)
+
+ if doc.subject_field and not subject_field:
+ frappe.throw(_("Select a valid Subject field for creating documents from Email"))
+
+ if subject_field and subject_field.fieldtype not in ["Data", "Text", "Long Text", "Small Text", "Text Editor"]:
+ frappe.throw(_("Subject Field type should be Data, Text, Long Text, Small Text, Text Editor"))
+
+ # Sender Field is mandatory
+ doc.sender_field = doc.sender_field.strip() if doc.sender_field else None
+ sender_field = get_field(doc, doc.sender_field)
+
+ if doc.sender_field and not sender_field:
+ frappe.throw(_("Select a valid Sender Field for creating documents from Email"))
+
+ if not sender_field.options == "Email":
+ frappe.throw(_("Sender Field should have Email in options"))
+
+
+def get_field(doc, fieldname):
+ if not (doc or fieldname):
+ return
+
+ for field in doc.fields:
+ if field.fieldname == fieldname:
+ return field
diff --git a/frappe/core/doctype/doctype/test_doctype.py b/frappe/core/doctype/doctype/test_doctype.py
index 969a71ab7d..fe9f88b9b3 100644
--- a/frappe/core/doctype/doctype/test_doctype.py
+++ b/frappe/core/doctype/doctype/test_doctype.py
@@ -113,6 +113,32 @@ class TestDocType(unittest.TestCase):
if condition:
self.assertFalse(re.match(pattern, condition))
+ def test_data_field_options(self):
+ doctype_name = "Test Data Fields"
+ valid_data_field_options = frappe.model.data_field_options + ("",)
+ invalid_data_field_options = ("Invalid Option 1", frappe.utils.random_string(5))
+
+ for field_option in (valid_data_field_options + invalid_data_field_options):
+ test_doctype = frappe.get_doc({
+ "doctype": "DocType",
+ "name": doctype_name,
+ "module": "Core",
+ "custom": 1,
+ "fields": [{
+ "fieldname": "{0}_field".format(field_option),
+ "fieldtype": "Data",
+ "options": field_option
+ }]
+ })
+
+ if field_option in invalid_data_field_options:
+ # assert that only data options in frappe.model.data_field_options are valid
+ self.assertRaises(frappe.ValidationError, test_doctype.insert)
+ else:
+ test_doctype.insert()
+ self.assertEqual(test_doctype.name, doctype_name)
+ test_doctype.delete()
+
def test_sync_field_order(self):
from frappe.modules.import_file import get_file_path
import os
@@ -349,4 +375,4 @@ class TestDocType(unittest.TestCase):
# delete doctype
link_doc.delete()
doc.delete()
- frappe.db.commit()
\ No newline at end of file
+ frappe.db.commit()
diff --git a/frappe/core/doctype/prepared_report/prepared_report.json b/frappe/core/doctype/prepared_report/prepared_report.json
index ab6650d9e3..4663dcb463 100644
--- a/frappe/core/doctype/prepared_report/prepared_report.json
+++ b/frappe/core/doctype/prepared_report/prepared_report.json
@@ -1,4 +1,5 @@
{
+ "actions": [],
"autoname": "REP.#####",
"creation": "2018-06-25 18:39:11.152960",
"doctype": "DocType",
@@ -101,7 +102,8 @@
}
],
"in_create": 1,
- "modified": "2019-09-18 04:00:55.644257",
+ "links": [],
+ "modified": "2020-03-05 10:52:56.598365",
"modified_by": "Administrator",
"module": "Core",
"name": "Prepared Report",
@@ -118,6 +120,15 @@
"role": "System Manager",
"share": 1,
"write": 1
+ },
+ {
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Prepared Report User",
+ "share": 1
}
],
"quick_entry": 1,
diff --git a/frappe/core/doctype/prepared_report/prepared_report.py b/frappe/core/doctype/prepared_report/prepared_report.py
index bc9a1fcdcd..4e87bb92dd 100644
--- a/frappe/core/doctype/prepared_report/prepared_report.py
+++ b/frappe/core/doctype/prepared_report/prepared_report.py
@@ -98,3 +98,34 @@ def download_attachment(dn):
attached_file = frappe.get_doc("File", attachment.name)
frappe.local.response.filecontent = gzip_decompress(attached_file.get_content())
frappe.local.response.type = "binary"
+
+
+def get_permission_query_condition(user):
+ if not user: user = frappe.session.user
+ if user == "Administrator":
+ return None
+
+ from frappe.utils.user import UserPermissions
+ user = UserPermissions(user)
+
+ if "System Manager" in user.roles:
+ return None
+
+ reports = [frappe.db.escape(report) for report in user.get_all_reports().keys()]
+
+ return """`tabPrepared Report`.ref_report_doctype in ({reports})"""\
+ .format(reports=','.join(reports))
+
+
+def has_permission(doc, user):
+ if not user: user = frappe.session.user
+ if user == "Administrator":
+ return True
+
+ from frappe.utils.user import UserPermissions
+ user = UserPermissions(user)
+
+ if "System Manager" in user.roles:
+ return True
+
+ return doc.ref_report_doctype in user.get_all_reports().keys()
diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py
index 2d49915f59..967b28b8b2 100644
--- a/frappe/core/doctype/report/report.py
+++ b/frappe/core/doctype/report/report.py
@@ -6,7 +6,7 @@ import frappe
import json, datetime
from frappe import _, scrub
import frappe.desk.query_report
-from frappe.utils import cint
+from frappe.utils import cint, cstr
from frappe.model.document import Document
from frappe.modules.export_file import export_to_files
from frappe.modules import make_boilerplate
@@ -92,6 +92,18 @@ class Report(Document):
make_boilerplate("controller.py", self, {"name": self.name})
make_boilerplate("controller.js", self, {"name": self.name})
+ def execute_query_report(self, filters):
+ if not self.query:
+ frappe.throw(_("Must specify a Query to run"), title=_('Report Document Error'))
+
+ if not self.query.lower().startswith("select"):
+ frappe.throw(_("Query must be a SELECT"), title=_('Report Document Error'))
+
+ result = [list(t) for t in frappe.db.sql(self.query, filters)]
+ columns = [cstr(c[0]) for c in frappe.db.get_description()]
+
+ return [columns, result]
+
def execute_script_report(self, filters):
# save the timestamp to automatically set to prepared
threshold = 30
diff --git a/frappe/core/doctype/role_profile/role_profile.js b/frappe/core/doctype/role_profile/role_profile.js
index 09aead670a..d31618cc4a 100644
--- a/frappe/core/doctype/role_profile/role_profile.js
+++ b/frappe/core/doctype/role_profile/role_profile.js
@@ -2,7 +2,7 @@
// For license information, please see license.txt
frappe.ui.form.on('Role Profile', {
- setup: function(frm) {
+ refresh: function(frm) {
if(has_common(frappe.user_roles, ["Administrator", "System Manager"])) {
if(!frm.roles_editor) {
var role_area = $('
')
diff --git a/frappe/core/doctype/system_settings/system_settings.json b/frappe/core/doctype/system_settings/system_settings.json
index eb20802624..f2c62ad1a3 100644
--- a/frappe/core/doctype/system_settings/system_settings.json
+++ b/frappe/core/doctype/system_settings/system_settings.json
@@ -37,6 +37,7 @@
"allow_login_using_user_name",
"allow_error_traceback",
"password_settings",
+ "logout_on_password_reset",
"force_user_to_reset_password",
"column_break_31",
"enable_password_policy",
@@ -407,6 +408,12 @@
"fieldname": "dormant_days",
"fieldtype": "Int",
"label": "Run Jobs only Daily if Inactive For (Days)"
+ },
+ {
+ "default": "1",
+ "fieldname": "logout_on_password_reset",
+ "fieldtype": "Check",
+ "label": "Logout All Sessions on Password Reset"
}
],
"icon": "fa fa-cog",
diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py
index 0d981c9e9e..d4c0fa98ed 100644
--- a/frappe/core/doctype/user/test_user.py
+++ b/frappe/core/doctype/user/test_user.py
@@ -224,3 +224,4 @@ class TestUser(unittest.TestCase):
def delete_contact(user):
frappe.db.sql("DELETE FROM `tabContact` WHERE `email_id`= %s", user)
+ frappe.db.sql("DELETE FROM `tabContact Email` WHERE `email_id`= %s", user)
diff --git a/frappe/core/doctype/user/user.js b/frappe/core/doctype/user/user.js
index c4873ee40e..b17548d994 100644
--- a/frappe/core/doctype/user/user.js
+++ b/frappe/core/doctype/user/user.js
@@ -97,6 +97,48 @@ frappe.ui.form.on('User', {
});
}, __("Password"));
+ frappe.db.get_single_value("LDAP Settings", "enabled").then((value) => {
+ if (value === 1 && frm.doc.name != "Administrator") {
+ frm.add_custom_button(__("Reset LDAP Password"), function() {
+ const d = new frappe.ui.Dialog({
+ title: __("Reset LDAP Password"),
+ fields: [
+ {
+ label: __("New Password"),
+ fieldtype: "Password",
+ fieldname: "new_password",
+ reqd: 1
+ },
+ {
+ label: __("Confirm New Password"),
+ fieldtype: "Password",
+ fieldname: "confirm_password",
+ reqd: 1
+ },
+ {
+ label: __("Logout All Sessions"),
+ fieldtype: "Check",
+ fieldname: "logout_sessions"
+ }
+ ],
+ primary_action: (values) => {
+ d.hide();
+ if (values.new_password !== values.confirm_password) {
+ frappe.throw(__("Passwords do not match!"));
+ }
+ frappe.call(
+ "frappe.integrations.doctype.ldap_settings.ldap_settings.reset_password", {
+ user: frm.doc.email,
+ password: values.new_password,
+ logout: values.logout_sessions
+ });
+ }
+ });
+ d.show();
+ }, __("Password"));
+ }
+ });
+
frm.add_custom_button(__("Reset OTP Secret"), function() {
frappe.call({
method: "frappe.core.doctype.user.user.reset_otp_secret",
diff --git a/frappe/core/doctype/user/user.json b/frappe/core/doctype/user/user.json
index b71c9555e1..5ebde7e7bd 100644
--- a/frappe/core/doctype/user/user.json
+++ b/frappe/core/doctype/user/user.json
@@ -1,4 +1,5 @@
{
+ "actions": [],
"allow_import": 1,
"allow_rename": 1,
"creation": "2014-03-11 14:55:00",
@@ -178,7 +179,7 @@
{
"fieldname": "time_zone",
"fieldtype": "Select",
- "label": "Timezone"
+ "label": "Time Zone"
},
{
"description": "Get your globally recognized avatar from Gravatar.com",
@@ -302,7 +303,7 @@
"default": "0",
"fieldname": "logout_all_sessions",
"fieldtype": "Check",
- "label": "Logout from all devices while changing Password"
+ "label": "Logout From All Devices After Changing Password"
},
{
"fieldname": "reset_password_key",
@@ -338,7 +339,7 @@
"default": "0",
"fieldname": "document_follow_notify",
"fieldtype": "Check",
- "label": "Send Notifications for documents followed by me"
+ "label": "Send Notifications For Documents Followed By Me"
},
{
"default": "Daily",
@@ -359,7 +360,7 @@
"default": "1",
"fieldname": "thread_notify",
"fieldtype": "Check",
- "label": "Send Notifications for Email threads"
+ "label": "Send Notifications For Email Threads"
},
{
"default": "0",
@@ -496,7 +497,7 @@
"description": "If enabled, user can login from any IP Address using Two Factor Auth, this can also be set for all users in System Settings",
"fieldname": "bypass_restrict_ip_check_if_2fa_enabled",
"fieldtype": "Check",
- "label": "Bypass restricted IP Address check If Two Factor Auth Enabled"
+ "label": "Bypass Restricted IP Address Check If Two Factor Auth Enabled"
},
{
"fieldname": "column_break1",
@@ -585,8 +586,9 @@
"icon": "fa fa-user",
"idx": 413,
"image_field": "user_image",
+ "links": [],
"max_attachments": 5,
- "modified": "2019-10-22 14:16:34.810223",
+ "modified": "2020-03-23 22:59:26.154985",
"modified_by": "Administrator",
"module": "Core",
"name": "User",
diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index b411f809cd..ddad3a91fb 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -101,7 +101,8 @@ class User(Document):
frappe.enqueue(
'frappe.core.doctype.user.user.create_contact',
user=self,
- ignore_mandatory=True
+ ignore_mandatory=True,
+ now=frappe.flags.in_test
)
if self.name not in ('Administrator', 'Guest') and not self.user_image:
frappe.enqueue('frappe.core.doctype.user.user.update_gravatar', name=self.name)
@@ -554,7 +555,8 @@ def update_password(new_password, logout_all_sessions=0, key=None, old_password=
else:
user = res['user']
- _update_password(user, new_password, logout_all_sessions=int(logout_all_sessions))
+ logout_all_sessions = cint(logout_all_sessions) or frappe.db.get_single_value("System Settings", "logout_on_password_reset")
+ _update_password(user, new_password, logout_all_sessions=cint(logout_all_sessions))
user_doc, redirect_url = reset_user_data(user)
@@ -1038,8 +1040,8 @@ def create_contact(user, ignore_links=False, ignore_mandatory=False):
from frappe.contacts.doctype.contact.contact import get_contact_name
if user.name in ["Administrator", "Guest"]: return
- contact_exists = get_contact_name(user.email)
- if not contact_exists:
+ contact_name = get_contact_name(user.email)
+ if not contact_name:
contact = frappe.get_doc({
"doctype": "Contact",
"first_name": user.first_name,
@@ -1058,7 +1060,7 @@ def create_contact(user, ignore_links=False, ignore_mandatory=False):
contact.add_phone(user.mobile_no, is_primary_mobile_no=True)
contact.insert(ignore_permissions=True, ignore_links=ignore_links, ignore_mandatory=ignore_mandatory)
else:
- contact = frappe.get_doc("Contact", contact_exists)
+ contact = frappe.get_doc("Contact", contact_name)
contact.first_name = user.first_name
contact.last_name = user.last_name
contact.gender = user.gender
diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 30941f94c0..ad65b05894 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -59,7 +59,7 @@ class Dashboard {
}
show_dashboard(current_dashboard_name) {
- if(this.dashboard_name !== current_dashboard_name) {
+ if (this.dashboard_name !== current_dashboard_name) {
this.dashboard_name = current_dashboard_name;
let title = this.dashboard_name;
if (!this.dashboard_name.toLowerCase().includes(__('dashboard'))) {
@@ -76,36 +76,48 @@ class Dashboard {
}
refresh() {
- this.get_dashboard_doc().then((doc) => {
- this.dashboard_doc = doc;
- this.charts = this.dashboard_doc.charts
- .map(chart => {
- return {
- chart_name: chart.chart,
- label: chart.chart,
- ...chart
- }
- });
+ this.get_permitted_dashboard_charts().then(charts => {
+ if (!charts.length) {
+ frappe.msgprint(__('No Permitted Charts on this Dashboard'), __('No Permitted Charts'))
+ }
- this.chart_group = new frappe.widget.WidgetGroup({
- title: null,
- container: this.container,
- type: "chart",
- columns: 2,
- options: {
- allow_sorting: false,
- allow_create: false,
- allow_delete: false,
- allow_hiding: false,
- allow_edit: false,
- },
- widgets: this.charts,
- });
+ frappe.dashboard_utils.get_dashboard_settings().then((settings) => {
+ let chart_config = settings.chart_config? JSON.parse(settings.chart_config): {};
+ this.charts =
+ charts.map(chart => {
+ return {
+ chart_name: chart.chart,
+ label: chart.chart,
+ chart_settings: chart_config[chart.chart] || {},
+ ...chart
+ }
+ });
+ this.chart_group = new frappe.widget.WidgetGroup({
+ title: null,
+ container: this.container,
+ type: "chart",
+ columns: 2,
+ options: {
+ allow_sorting: false,
+ allow_create: false,
+ allow_delete: false,
+ allow_hiding: false,
+ allow_edit: false,
+ },
+ widgets: this.charts,
+ });
+ })
});
}
- get_dashboard_doc() {
- return frappe.model.with_doc('Dashboard', this.dashboard_name);
+ get_permitted_dashboard_charts() {
+ return frappe.xcall(
+ 'frappe.desk.doctype.dashboard.dashboard.get_permitted_charts',
+ {
+ dashboard_name: this.dashboard_name
+ }).then(charts => {
+ return charts;
+ });
}
set_dropdown() {
diff --git a/frappe/core/page/dashboard/dashboard.json b/frappe/core/page/dashboard/dashboard.json
index 891dcb26f8..58fda5a34c 100644
--- a/frappe/core/page/dashboard/dashboard.json
+++ b/frappe/core/page/dashboard/dashboard.json
@@ -4,7 +4,7 @@
"docstatus": 0,
"doctype": "Page",
"idx": 0,
- "modified": "2019-01-08 19:19:48.073410",
+ "modified": "2020-03-26 13:30:44.603948",
"modified_by": "Administrator",
"module": "Core",
"name": "dashboard",
diff --git a/frappe/core/page/permission_manager/permission_manager.js b/frappe/core/page/permission_manager/permission_manager.js
index 710bb51680..ed3b0d17db 100644
--- a/frappe/core/page/permission_manager/permission_manager.js
+++ b/frappe/core/page/permission_manager/permission_manager.js
@@ -217,6 +217,7 @@ frappe.PermissionEngine = Class.extend({
me.rights.forEach(r => {
if (!d.is_submittable && ['submit', 'cancel', 'amend'].includes(r)) return;
+ if (d.in_create && ['create', 'write', 'delete'].includes(r)) return;
me.add_check(perm_container, d, r);
});
diff --git a/frappe/core/page/permission_manager/permission_manager.py b/frappe/core/page/permission_manager/permission_manager.py
index 1afd7bb423..637b526d5c 100644
--- a/frappe/core/page/permission_manager/permission_manager.py
+++ b/frappe/core/page/permission_manager/permission_manager.py
@@ -66,6 +66,7 @@ def get_permissions(doctype=None, role=None):
meta = frappe.get_meta(d.parent)
if meta:
d.is_submittable = meta.is_submittable
+ d.in_create = meta.in_create
return out
diff --git a/frappe/core/utils.py b/frappe/core/utils.py
index 55767ffe34..55cfbc34d7 100644
--- a/frappe/core/utils.py
+++ b/frappe/core/utils.py
@@ -67,3 +67,19 @@ def find_all(list_of_dict, match_function):
if match_function(entry):
found.append(entry)
return found
+
+def ljust_list(_list, length, fill_word=None):
+ """
+ Similar to ljust but for list.
+
+ Usage:
+ $ ljust_list([1, 2, 3], 5)
+ > [1, 2, 3, None, None]
+ """
+ # make a copy to avoid mutation of passed list
+ _list = list(_list)
+ fill_length = length - len(_list)
+ if fill_length > 0:
+ _list.extend([fill_word] * fill_length)
+
+ return _list
diff --git a/frappe/custom/doctype/customize_form/customize_form.js b/frappe/custom/doctype/customize_form/customize_form.js
index 63b094615a..b1743a96a5 100644
--- a/frappe/custom/doctype/customize_form/customize_form.js
+++ b/frappe/custom/doctype/customize_form/customize_form.js
@@ -85,6 +85,10 @@ frappe.ui.form.on("Customize Form", {
if(frm.doc.doc_type) {
frappe.customize_form.set_primary_action(frm);
+ frm.add_custom_button(__('Go to {0} List', [frm.doc.doc_type]), function() {
+ frappe.set_route('List', frm.doc.doc_type);
+ });
+
frm.add_custom_button(__('Refresh Form'), function() {
frm.script_manager.trigger("doc_type");
}, "fa fa-refresh", "btn-default");
@@ -139,8 +143,7 @@ frappe.ui.form.on("Customize Form", {
}, 1000);
}
- },
-
+ }
});
frappe.ui.form.on("Customize Form Field", {
diff --git a/frappe/custom/doctype/customize_form/customize_form.json b/frappe/custom/doctype/customize_form/customize_form.json
index 0b1df62f9d..51a5c0b85f 100644
--- a/frappe/custom/doctype/customize_form/customize_form.json
+++ b/frappe/custom/doctype/customize_form/customize_form.json
@@ -1,4 +1,5 @@
{
+ "actions": [],
"autoname": "DL.####",
"creation": "2013-01-29 17:55:08",
"doctype": "DocType",
@@ -28,6 +29,10 @@
"sort_field",
"column_break_10",
"sort_order",
+ "section_break_23",
+ "email_append_to",
+ "sender_field",
+ "subject_field",
"fields_section_break",
"fields"
],
@@ -174,13 +179,38 @@
"fieldname": "allow_import",
"fieldtype": "Check",
"label": "Allow Import (via Data Import Tool)"
+ },
+ {
+ "depends_on": "email_append_to",
+ "fieldname": "subject_field",
+ "fieldtype": "Data",
+ "label": "Subject Field"
+ },
+ {
+ "depends_on": "email_append_to",
+ "fieldname": "sender_field",
+ "fieldtype": "Data",
+ "label": "Sender Field",
+ "mandatory_depends_on": "email_append_to"
+ },
+ {
+ "default": "0",
+ "fieldname": "email_append_to",
+ "fieldtype": "Check",
+ "label": "Allow document creation via Email"
+ },
+ {
+ "depends_on": "doc_type",
+ "fieldname": "section_break_23",
+ "fieldtype": "Section Break"
}
],
"hide_toolbar": 1,
"icon": "fa fa-glass",
"idx": 1,
"issingle": 1,
- "modified": "2019-10-08 11:16:36.698006",
+ "links": [],
+ "modified": "2020-03-27 15:06:35.443861",
"modified_by": "Administrator",
"module": "Custom",
"name": "Customize Form",
diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py
index 8d47a075ba..68848d26f6 100644
--- a/frappe/custom/doctype/customize_form/customize_form.py
+++ b/frappe/custom/doctype/customize_form/customize_form.py
@@ -12,7 +12,7 @@ from frappe import _
from frappe.utils import cint
from frappe.model.document import Document
from frappe.model import no_value_fields, core_doctypes_list
-from frappe.core.doctype.doctype.doctype import validate_fields_for_doctype
+from frappe.core.doctype.doctype.doctype import validate_fields_for_doctype, check_email_append_to
from frappe.custom.doctype.custom_field.custom_field import create_custom_field
from frappe.model.docfield import supports_translation
@@ -31,7 +31,10 @@ doctype_properties = {
'track_changes': 'Check',
'track_views': 'Check',
'allow_auto_repeat': 'Check',
- 'allow_import': 'Check'
+ 'allow_import': 'Check',
+ 'email_append_to': 'Check',
+ 'subject_field': 'Data',
+ 'sender_field': 'Data'
}
docfield_properties = {
@@ -166,11 +169,11 @@ class CustomizeForm(Document):
self.flags.update_db = False
self.flags.rebuild_doctype_for_global_search = False
-
self.set_property_setters()
self.update_custom_fields()
self.set_name_translation()
validate_fields_for_doctype(self.doc_type)
+ check_email_append_to(self)
if self.flags.update_db:
frappe.db.updatedb(self.doc_type)
@@ -362,13 +365,49 @@ class CustomizeForm(Document):
def validate_fieldtype_change(self, df, old_value, new_value):
allowed = False
+ self.check_length_for_fieldtypes = []
for allowed_changes in allowed_fieldtype_change:
if (old_value in allowed_changes and new_value in allowed_changes):
allowed = True
+ if frappe.db.type_map.get(old_value)[1] > frappe.db.type_map.get(new_value)[1]:
+ self.check_length_for_fieldtypes.append({'df': df, 'old_value': old_value})
+ self.validate_fieldtype_length()
+ else:
+ self.flags.update_db = True
break
if not allowed:
frappe.throw(_("Fieldtype cannot be changed from {0} to {1} in row {2}").format(old_value, new_value, df.idx))
+ def validate_fieldtype_length(self):
+ for field in self.check_length_for_fieldtypes:
+ df = field.get('df')
+ max_length = frappe.db.type_map.get(df.fieldtype)[1]
+ fieldname = df.fieldname
+ docs = frappe.db.sql('''
+ SELECT name, {fieldname}, LENGTH({fieldname}) AS len
+ FROM `tab{doctype}`
+ WHERE LENGTH({fieldname}) > {max_length}
+ '''.format(
+ fieldname=fieldname,
+ doctype=self.doc_type,
+ max_length=max_length
+ ), as_dict=True)
+ links = []
+ label = df.label
+ for doc in docs:
+ links.append(frappe.utils.get_link_to_form(self.doc_type, doc.name))
+ links_str = ', '.join(links)
+
+ if docs:
+ frappe.throw(_('Value for field {0} is too long in {1}. Length should be lesser than {2} characters')
+ .format(
+ frappe.bold(label),
+ links_str,
+ frappe.bold(max_length)
+ ), title=_('Data Too Long'), is_minimizable=len(docs) > 1)
+
+ self.flags.update_db = True
+
def reset_to_defaults(self):
if not self.doc_type:
return
diff --git a/frappe/custom/doctype/customize_form/test_customize_form.py b/frappe/custom/doctype/customize_form/test_customize_form.py
index 1cd71ea05d..cace25a03d 100644
--- a/frappe/custom/doctype/customize_form/test_customize_form.py
+++ b/frappe/custom/doctype/customize_form/test_customize_form.py
@@ -46,7 +46,7 @@ class TestCustomizeForm(unittest.TestCase):
d = self.get_customize_form("Event")
self.assertEquals(d.doc_type, "Event")
- self.assertEquals(len(d.get("fields")), 35)
+ self.assertEquals(len(d.get("fields")), 36)
d = self.get_customize_form("Event")
self.assertEquals(d.doc_type, "Event")
diff --git a/frappe/database/mariadb/framework_mariadb.sql b/frappe/database/mariadb/framework_mariadb.sql
index dbe53df4e4..46940cc846 100644
--- a/frappe/database/mariadb/framework_mariadb.sql
+++ b/frappe/database/mariadb/framework_mariadb.sql
@@ -217,6 +217,9 @@ CREATE TABLE `tabDocType` (
`allow_guest_to_view` int(1) NOT NULL DEFAULT 0,
`route` varchar(255) DEFAULT NULL,
`is_published_field` varchar(255) DEFAULT NULL,
+ `email_append_to` int(1) NOT NULL DEFAULT 0,
+ `subject_field` varchar(255) DEFAULT NULL,
+ `sender_field` varchar(255) DEFAULT NULL,
PRIMARY KEY (`name`),
KEY `parent` (`parent`)
) ENGINE=InnoDB ROW_FORMAT=COMPRESSED CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
diff --git a/frappe/database/postgres/database.py b/frappe/database/postgres/database.py
index 243d0f934e..e30ef3293f 100644
--- a/frappe/database/postgres/database.py
+++ b/frappe/database/postgres/database.py
@@ -92,7 +92,7 @@ class PostgresDatabase(Database):
# pylint: disable=W0221
def sql(self, *args, **kwargs):
- if len(args):
+ if args:
# since tuple is immutable
args = list(args)
args[0] = modify_query(args[0])
@@ -276,13 +276,13 @@ class PostgresDatabase(Database):
# pylint: disable=W1401
return self.sql('''
SELECT a.column_name AS name,
- CASE a.data_type
+ CASE LOWER(a.data_type)
WHEN 'character varying' THEN CONCAT('varchar(', a.character_maximum_length ,')')
- WHEN 'timestamp without TIME zone' THEN 'timestamp'
+ WHEN 'timestamp without time zone' THEN 'timestamp'
ELSE a.data_type
END AS type,
COUNT(b.indexdef) AS Index,
- COALESCE(a.column_default, NULL) AS default,
+ SPLIT_PART(COALESCE(a.column_default, NULL), '::', 1) AS default,
BOOL_OR(b.unique) AS unique
FROM information_schema.columns a
LEFT JOIN
diff --git a/frappe/database/postgres/framework_postgres.sql b/frappe/database/postgres/framework_postgres.sql
index 457f6c906a..26760dbcc9 100644
--- a/frappe/database/postgres/framework_postgres.sql
+++ b/frappe/database/postgres/framework_postgres.sql
@@ -222,6 +222,9 @@ CREATE TABLE "tabDocType" (
"allow_guest_to_view" smallint NOT NULL DEFAULT 0,
"route" varchar(255) DEFAULT NULL,
"is_published_field" varchar(255) DEFAULT NULL,
+ "email_append_to" smallint NOT NULL DEFAULT 0,
+ "subject_field" varchar(255) DEFAULT NULL,
+ "sender_field" varchar(255) DEFAULT NULL,
PRIMARY KEY ("name")
) ;
diff --git a/frappe/database/schema.py b/frappe/database/schema.py
index 88cda9340b..28e055f382 100644
--- a/frappe/database/schema.py
+++ b/frappe/database/schema.py
@@ -13,7 +13,7 @@ class DBTable:
def __init__(self, doctype, meta=None):
self.doctype = doctype
self.table_name = 'tab{}'.format(doctype)
- self.meta = meta or frappe.get_meta(doctype)
+ self.meta = meta or frappe.get_meta(doctype, False)
self.columns = {}
self.current_columns = {}
@@ -65,64 +65,35 @@ class DBTable:
"""
get columns from docfields and custom fields
"""
- fl = frappe.db.sql("SELECT * FROM `tabDocField` WHERE parent = %s", self.doctype, as_dict = 1)
- lengths = {}
- precisions = {}
- uniques = {}
+ fields = self.meta.get_fieldnames_with_value(True)
# optional fields like _comments
- if not self.meta.istable:
+ if not self.meta.get('istable'):
for fieldname in frappe.db.OPTIONAL_COLUMNS:
- fl.append({
+ fields.append({
"fieldname": fieldname,
"fieldtype": "Text"
})
# add _seen column if track_seen
- if getattr(self.meta, 'track_seen', False):
- fl.append({
+ if self.meta.get('track_seen'):
+ fields.append({
'fieldname': '_seen',
'fieldtype': 'Text'
})
- if (not frappe.flags.in_install_db
- and (frappe.flags.in_install != "frappe"
- or frappe.flags.ignore_in_install)):
- custom_fl = frappe.db.sql("""
- SELECT * FROM `tabCustom Field`
- WHERE dt = %s AND docstatus < 2
- """, (self.doctype,), as_dict=1)
- if custom_fl: fl += custom_fl
-
- # apply length, precision and unique from property setters
- for ps in frappe.get_all("Property Setter",
- fields=["field_name", "property", "value"],
- filters={
- "doc_type": self.doctype,
- "doctype_or_field": "DocField",
- "property": ["in", ["precision", "length", "unique"]]
- }):
-
- if ps.property=="length":
- lengths[ps.field_name] = cint(ps.value)
-
- elif ps.property=="precision":
- precisions[ps.field_name] = cint(ps.value)
-
- elif ps.property=="unique":
- uniques[ps.field_name] = cint(ps.value)
-
- for f in fl:
- self.columns[f['fieldname']] = DbColumn(self,
- f['fieldname'],
- f['fieldtype'],
- lengths.get(f["fieldname"]) or f.get('length'),
- f.get('default'),
- f.get('search_index'),
- f.get('options'),
- uniques.get(f["fieldname"],
- f.get('unique')),
- precisions.get(f['fieldname']) or f.get('precision'))
+ for field in fields:
+ self.columns[field.get('fieldname')] = DbColumn(
+ self,
+ field.get('fieldname'),
+ field.get('fieldtype'),
+ field.get('length'),
+ field.get('default'),
+ field.get('search_index'),
+ field.get('options'),
+ field.get('unique'),
+ field.get('precision')
+ )
def validate(self):
"""Check if change in varchar length isn't truncating the columns"""
diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py
index 1f3a83735b..175bfa90ff 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -163,8 +163,9 @@ class Workspace:
charts = charts + self.extended_charts
for chart in charts:
- chart.label = chart.label if chart.label else chart.chart_name
- all_charts.append(chart)
+ if frappe.has_permission('Dashboard Chart', doc=chart.chart_name):
+ chart.label = chart.label if chart.label else chart.chart_name
+ all_charts.append(chart)
return all_charts
diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json
index 239f35bea8..c177ee70ac 100644
--- a/frappe/desk/doctype/dashboard/dashboard.json
+++ b/frappe/desk/doctype/dashboard/dashboard.json
@@ -34,7 +34,7 @@
}
],
"links": [],
- "modified": "2020-01-26 20:00:10.069817",
+ "modified": "2020-03-25 21:09:37.080132",
"modified_by": "Administrator",
"module": "Desk",
"name": "Dashboard",
@@ -51,6 +51,27 @@
"role": "System Manager",
"share": 1,
"write": 1
+ },
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Dashboard Manager",
+ "share": 1,
+ "write": 1
+ },
+ {
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "All",
+ "share": 1
}
],
"quick_entry": 1,
diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py
index c8f22d29b9..5c344956bf 100644
--- a/frappe/desk/doctype/dashboard/dashboard.py
+++ b/frappe/desk/doctype/dashboard/dashboard.py
@@ -12,3 +12,12 @@ class Dashboard(Document):
# make all other dashboards non-default
frappe.db.sql('''update
tabDashboard set is_default = 0 where name != %s''', self.name)
+
+@frappe.whitelist()
+def get_permitted_charts(dashboard_name):
+ permitted_charts = []
+ dashboard = frappe.get_doc('Dashboard', dashboard_name)
+ for chart in dashboard.charts:
+ if frappe.has_permission('Dashboard Chart', doc=chart.chart):
+ permitted_charts.append(chart)
+ return permitted_charts
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index 0a017a0de2..9652ae3945 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -215,7 +215,7 @@
}
],
"links": [],
- "modified": "2020-03-13 19:19:37.162771",
+ "modified": "2020-03-31 16:00:01.987059",
"modified_by": "Administrator",
"module": "Desk",
"name": "Dashboard Chart",
@@ -232,6 +232,27 @@
"role": "System Manager",
"share": 1,
"write": 1
+ },
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Dashboard Manager",
+ "share": 1,
+ "write": 1
+ },
+ {
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "All",
+ "share": 1
}
],
"sort_field": "modified",
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index f01c976b9c..b2a6f0a0ff 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -10,8 +10,51 @@ import json
from frappe.core.page.dashboard.dashboard import cache_source, get_from_date_from_timespan
from frappe.utils import nowdate, add_to_date, getdate, get_last_day, formatdate, get_datetime
from frappe.model.naming import append_number_if_name_exists
+from frappe.boot import get_allowed_reports
from frappe.model.document import Document
+
+def get_permission_query_conditions(user):
+
+ if not user:
+ user = frappe.session.user
+
+ if user == 'Administrator':
+ return
+
+ roles = frappe.get_roles(user)
+ if "System Manager" in roles:
+ return None
+
+ allowed_doctypes = tuple(frappe.permissions.get_doctypes_with_read())
+ allowed_reports = tuple([key.encode('UTF8') for key in get_allowed_reports()])
+
+ return '''
+ `tabDashboard Chart`.`document_type` in {allowed_doctypes}
+ or `tabDashboard Chart`.`report_name` in {allowed_reports}
+ '''.format(
+ allowed_doctypes=allowed_doctypes,
+ allowed_reports=allowed_reports
+ )
+
+
+def has_permission(doc, ptype, user):
+ roles = frappe.get_roles(user)
+ if "System Manager" in roles:
+ return True
+
+
+ if doc.chart_type == 'Report':
+ allowed_reports = tuple([key.encode('UTF8') for key in get_allowed_reports()])
+ if doc.report_name in allowed_reports:
+ return True
+ else:
+ allowed_doctypes = tuple(frappe.permissions.get_doctypes_with_read())
+ if doc.document_type in allowed_doctypes:
+ return True
+
+ return False
+
@frappe.whitelist()
@cache_source
def get(chart_name = None, chart = None, no_cache = None, filters = None, from_date = None,
diff --git a/frappe/desk/doctype/dashboard_settings/__init__.py b/frappe/desk/doctype/dashboard_settings/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/desk/doctype/dashboard_settings/dashboard_settings.js b/frappe/desk/doctype/dashboard_settings/dashboard_settings.js
new file mode 100644
index 0000000000..8e7966366d
--- /dev/null
+++ b/frappe/desk/doctype/dashboard_settings/dashboard_settings.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2020, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Dashboard Settings', {
+ // refresh: function(frm) {
+
+ // }
+});
diff --git a/frappe/desk/doctype/dashboard_settings/dashboard_settings.json b/frappe/desk/doctype/dashboard_settings/dashboard_settings.json
new file mode 100644
index 0000000000..e1eb75db47
--- /dev/null
+++ b/frappe/desk/doctype/dashboard_settings/dashboard_settings.json
@@ -0,0 +1,51 @@
+{
+ "actions": [],
+ "autoname": "Prompt",
+ "creation": "2020-03-31 19:41:45.785014",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "user",
+ "chart_config"
+ ],
+ "fields": [
+ {
+ "fieldname": "user",
+ "fieldtype": "Link",
+ "label": "User",
+ "options": "User",
+ "read_only": 1
+ },
+ {
+ "fieldname": "chart_config",
+ "fieldtype": "Code",
+ "label": "Chart Configuration",
+ "options": "JSON",
+ "read_only": 1
+ }
+ ],
+ "in_create": 1,
+ "links": [],
+ "modified": "2020-04-01 00:07:26.489561",
+ "modified_by": "Administrator",
+ "module": "Desk",
+ "name": "Dashboard Settings",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "All",
+ "share": 1,
+ "write": 1
+ }
+ ],
+ "read_only": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/desk/doctype/dashboard_settings/dashboard_settings.py b/frappe/desk/doctype/dashboard_settings/dashboard_settings.py
new file mode 100644
index 0000000000..4697d897fc
--- /dev/null
+++ b/frappe/desk/doctype/dashboard_settings/dashboard_settings.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+import frappe
+import json
+
+class DashboardSettings(Document):
+ pass
+
+
+@frappe.whitelist()
+def create_dashboard_settings(user):
+ if not frappe.db.exists("Dashboard Settings", user):
+ doc = frappe.new_doc('Dashboard Settings')
+ doc.name = user
+ doc.insert(ignore_permissions=True)
+ frappe.db.commit()
+ return doc
+
+def get_permission_query_conditions(user):
+ if not user: user = frappe.session.user
+
+ return '''(`tabDashboard Settings`.name = '{user}')'''.format(user=user)
+
+@frappe.whitelist()
+def save_chart_config(reset, config, chart_name):
+ reset = frappe.parse_json(reset)
+ doc = frappe.get_doc('Dashboard Settings', frappe.session.user)
+ chart_config = frappe.parse_json(doc.chart_config) or {}
+
+ if reset:
+ chart_config[chart_name] = {}
+ else:
+ config = frappe.parse_json(config)
+ if not chart_name in chart_config:
+ chart_config[chart_name] = {}
+ chart_config[chart_name].update(config)
+
+ frappe.db.set_value('Dashboard Settings', frappe.session.user, 'chart_config', json.dumps(chart_config))
\ No newline at end of file
diff --git a/frappe/desk/doctype/event/event.json b/frappe/desk/doctype/event/event.json
index 032030ddef..5768f00f32 100644
--- a/frappe/desk/doctype/event/event.json
+++ b/frappe/desk/doctype/event/event.json
@@ -1,9 +1,11 @@
{
+ "actions": [],
"allow_import": 1,
"autoname": "EV.#####",
"creation": "2013-06-10 13:17:47",
"doctype": "DocType",
"document_type": "Document",
+ "email_append_to": 1,
"engine": "InnoDB",
"field_order": [
"details",
@@ -17,6 +19,7 @@
"starts_on",
"ends_on",
"status",
+ "sender",
"all_day",
"sync_with_google_calendar",
"sb_00",
@@ -262,11 +265,19 @@
"fieldtype": "Check",
"label": "Pulled from Google Calendar",
"read_only": 1
+ },
+ {
+ "fieldname": "sender",
+ "fieldtype": "Data",
+ "label": "Sender",
+ "options": "Email",
+ "read_only": 1
}
],
"icon": "fa fa-calendar",
"idx": 1,
- "modified": "2019-08-08 16:01:19.489396",
+ "links": [],
+ "modified": "2020-01-14 21:47:15.825287",
"modified_by": "Administrator",
"module": "Desk",
"name": "Event",
@@ -297,8 +308,10 @@
}
],
"read_only": 1,
+ "sender_field": "sender",
"sort_field": "modified",
"sort_order": "DESC",
+ "subject_field": "subject",
"title_field": "subject",
"track_changes": 1,
"track_seen": 1,
diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py
index 398a3de351..17eb6371b1 100644
--- a/frappe/desk/doctype/notification_log/notification_log.py
+++ b/frappe/desk/doctype/notification_log/notification_log.py
@@ -6,14 +6,13 @@ from __future__ import unicode_literals
import frappe
from frappe import _
from frappe.model.document import Document
-from frappe.desk.doctype.notification_settings.notification_settings import (is_notifications_enabled,
- is_email_notifications_enabled, is_email_notifications_enabled_for_type, set_seen_value)
+from frappe.desk.doctype.notification_settings.notification_settings import (is_notifications_enabled, is_email_notifications_enabled_for_type, set_seen_value)
class NotificationLog(Document):
def after_insert(self):
frappe.publish_realtime('notification', after_commit=True, user=self.for_user)
set_notifications_as_unseen(self.for_user)
- if is_email_notifications_enabled(self.for_user):
+ if is_email_notifications_enabled_for_type(self.for_user, self.type):
send_notification_email(self)
@@ -73,9 +72,6 @@ def make_notification_logs(doc, users):
_doc.insert(ignore_permissions=True)
def send_notification_email(doc):
- is_type_enabled = is_email_notifications_enabled_for_type(doc.for_user, doc.type)
- if not is_type_enabled:
- return
if doc.type == 'Energy Point' and doc.email_content is None:
return
diff --git a/frappe/desk/doctype/notification_settings/notification_settings.py b/frappe/desk/doctype/notification_settings/notification_settings.py
index 295b4c8afd..233d15e3ce 100644
--- a/frappe/desk/doctype/notification_settings/notification_settings.py
+++ b/frappe/desk/doctype/notification_settings/notification_settings.py
@@ -25,6 +25,9 @@ def is_email_notifications_enabled(user):
return enabled
def is_email_notifications_enabled_for_type(user, notification_type):
+ if not is_email_notifications_enabled(user):
+ return False
+
fieldname = 'enable_email_' + frappe.scrub(notification_type)
enabled = frappe.db.get_value('Notification Settings', user, fieldname)
if enabled is None:
diff --git a/frappe/desk/doctype/todo/todo.json b/frappe/desk/doctype/todo/todo.json
index 508720a488..15e0e4abe1 100644
--- a/frappe/desk/doctype/todo/todo.json
+++ b/frappe/desk/doctype/todo/todo.json
@@ -1,8 +1,10 @@
{
+ "actions": [],
"autoname": "hash",
"creation": "2012-07-03 13:30:35",
"doctype": "DocType",
"document_type": "Setup",
+ "email_append_to": 1,
"engine": "InnoDB",
"field_order": [
"description_and_status",
@@ -142,7 +144,8 @@
"fieldname": "sender",
"fieldtype": "Data",
"hidden": 1,
- "label": "Sender"
+ "label": "Sender",
+ "options": "Email"
},
{
"fieldname": "assignment_rule",
@@ -154,7 +157,8 @@
],
"icon": "fa fa-check",
"idx": 2,
- "modified": "2019-09-10 14:34:59.161750",
+ "links": [],
+ "modified": "2020-01-14 17:04:36.971002",
"modified_by": "Administrator",
"module": "Desk",
"name": "ToDo",
@@ -185,9 +189,11 @@
],
"quick_entry": 1,
"search_fields": "description, reference_type, reference_name",
+ "sender_field": "sender",
"sort_field": "modified",
"sort_order": "DESC",
+ "subject_field": "description",
"title_field": "description",
"track_changes": 1,
"track_seen": 1
-}
+}
\ No newline at end of file
diff --git a/frappe/desk/doctype/todo/todo.py b/frappe/desk/doctype/todo/todo.py
index 6cd7c68368..8e8102d093 100644
--- a/frappe/desk/doctype/todo/todo.py
+++ b/frappe/desk/doctype/todo/todo.py
@@ -8,8 +8,6 @@ import json
from frappe.model.document import Document
from frappe.utils import get_fullname
-subject_field = "description"
-sender_field = "sender"
exclude_from_linked_with = True
class ToDo(Document):
diff --git a/frappe/desk/form/utils.py b/frappe/desk/form/utils.py
index 498ab50645..4c3bab2e23 100644
--- a/frappe/desk/form/utils.py
+++ b/frappe/desk/form/utils.py
@@ -56,18 +56,20 @@ def validate_link():
frappe.response['valid_value'] = valid_value
frappe.response['message'] = 'Ok'
+
@frappe.whitelist()
-def add_comment(reference_doctype, reference_name, content, comment_email):
+def add_comment(reference_doctype, reference_name, content, comment_email, comment_by):
"""allow any logged user to post a comment"""
doc = frappe.get_doc(dict(
- doctype = 'Comment',
- reference_doctype = reference_doctype,
- reference_name = reference_name,
- comment_email = comment_email,
- comment_type = 'Comment'
+ doctype='Comment',
+ reference_doctype=reference_doctype,
+ reference_name=reference_name,
+ comment_email=comment_email,
+ comment_type='Comment',
+ comment_by=comment_by
))
doc.content = extract_images_from_html(doc, content)
- doc.insert(ignore_permissions = True)
+ doc.insert(ignore_permissions=True)
follow_document(doc.reference_doctype, doc.reference_name, frappe.session.user)
return doc.as_dict()
diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py
index 301c37cc21..aaf859e7fd 100644
--- a/frappe/desk/query_report.py
+++ b/frappe/desk/query_report.py
@@ -8,7 +8,7 @@ import os, json
from frappe import _
from frappe.modules import scrub, get_module_path
-from frappe.utils import flt, cint, get_html_format, cstr, get_url_to_form
+from frappe.utils import flt, cint, get_html_format, get_url_to_form
from frappe.model.utils import render_include
from frappe.translate import send_translations
import frappe.desk.reportview
@@ -16,6 +16,7 @@ from frappe.permissions import get_role_permissions
from six import string_types, iteritems
from datetime import timedelta
from frappe.utils import gzip_decompress
+from frappe.core.utils import ljust_list
def get_report_doc(report_name):
doc = frappe.get_doc("Report", report_name)
@@ -42,44 +43,32 @@ def get_report_doc(report_name):
return doc
-def generate_report_result(report, filters=None, user=None):
- status = None
- if not user:
- user = frappe.session.user
- if not filters:
- filters = []
+def generate_report_result(report, filters=None, user=None, custom_columns=None):
+ user = user or frappe.session.user
+ filters = filters or []
if filters and isinstance(filters, string_types):
filters = json.loads(filters)
- columns, result, message, chart, report_summary, skip_total_row = [], [], None, None, None, 0
+
+ res = []
+
if report.report_type == "Query Report":
- if not report.query:
- status = "error"
- frappe.msgprint(_("Must specify a Query to run"), raise_exception=True)
-
- if not report.query.lower().startswith("select"):
- status = "error"
- frappe.msgprint(_("Query must be a SELECT"), raise_exception=True)
-
- result = [list(t) for t in frappe.db.sql(report.query, filters)]
- columns = [cstr(c[0]) for c in frappe.db.get_description()]
+ res = report.execute_query_report(filters)
elif report.report_type == 'Script Report':
res = report.execute_script_report(filters)
- columns, result = res[0], res[1]
- if len(res) > 2:
- message = res[2]
- if len(res) > 3:
- chart = res[3]
- if len(res) > 4:
- report_summary = res[4]
- if len(res) > 5:
- skip_total_row = cint(res[5])
+ columns, result, message, chart, report_summary, skip_total_row = \
+ ljust_list(res, 6)
- if report.custom_columns:
- columns = json.loads(report.custom_columns)
- result = add_data_to_custom_columns(columns, result)
+ if report.custom_columns:
+ columns = json.loads(report.custom_columns)
+ result = add_data_to_custom_columns(columns, result)
+ if custom_columns:
+ result = add_data_to_custom_columns(custom_columns, result)
+
+ for custom_column in custom_columns:
+ columns.insert(custom_column['insert_after_index'] + 1, custom_column)
if result:
result = get_filtered_data(report.ref_doctype, columns, result, user)
@@ -93,8 +82,8 @@ def generate_report_result(report, filters=None, user=None):
"message": message,
"chart": chart,
"report_summary": report_summary,
- "skip_total_row": skip_total_row,
- "status": status,
+ "skip_total_row": skip_total_row or 0,
+ "status": None,
"execution_time": frappe.cache().hget('report_execution_time', report.name) or 0
}
@@ -161,7 +150,7 @@ def get_script(report_name):
@frappe.whitelist()
@frappe.read_only()
-def run(report_name, filters=None, user=None, ignore_prepared_report=False):
+def run(report_name, filters=None, user=None, ignore_prepared_report=False, custom_columns=None):
report = get_report_doc(report_name)
if not user:
@@ -183,7 +172,7 @@ def run(report_name, filters=None, user=None, ignore_prepared_report=False):
dn = ""
result = get_prepared_report_result(report, filters, dn, user)
else:
- result = generate_report_result(report, filters, user)
+ result = generate_report_result(report, filters, user, custom_columns)
result["add_total_row"] = report.add_total_row and not result.get('skip_total_row', False)
@@ -294,6 +283,8 @@ def export_query():
if isinstance(data.get("file_format_type"), string_types):
file_format_type = data["file_format_type"]
+ custom_columns = frappe.parse_json(data["custom_columns"])
+
include_indentation = data["include_indentation"]
if isinstance(data.get("visible_idx"), string_types):
visible_idx = json.loads(data.get("visible_idx"))
@@ -301,7 +292,7 @@ def export_query():
visible_idx = None
if file_format_type == "Excel":
- data = run(report_name, filters)
+ data = run(report_name, filters, custom_columns=custom_columns)
data = frappe._dict(data)
if not data.columns:
frappe.respond_as_web_page(_("No data to export"),
diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py
index f3eb2188b7..c0a198f5e5 100755
--- a/frappe/email/doctype/email_account/email_account.py
+++ b/frappe/email/doctype/email_account/email_account.py
@@ -452,16 +452,15 @@ class EmailAccount(Document):
def set_sender_field_and_subject_field(self):
'''Identify the sender and subject fields from the `append_to` DocType'''
# set subject_field and sender_field
- meta_module = frappe.get_meta_module(self.append_to)
meta = frappe.get_meta(self.append_to)
+ self.subject_field = None
+ self.sender_field = None
- self.subject_field = getattr(meta_module, "subject_field", "subject")
- if not meta.get_field(self.subject_field):
- self.subject_field = None
+ if hasattr(meta, "subject_field"):
+ self.subject_field = meta.subject_field
- self.sender_field = getattr(meta_module, "sender_field", "sender")
- if not meta.get_field(self.sender_field):
- self.sender_field = None
+ if hasattr(meta, "sender_field"):
+ self.sender_field = meta.sender_field
def find_parent_based_on_subject_and_sender(self, communication, email):
'''Find parent document based on subject and sender match'''
@@ -675,8 +674,21 @@ class EmailAccount(Document):
@frappe.whitelist()
def get_append_to(doctype=None, txt=None, searchfield=None, start=None, page_len=None, filters=None):
- if not txt: txt = ""
- return [[d] for d in frappe.get_hooks("email_append_to") if txt in d]
+ txt = txt if txt else ""
+ email_append_to_list = []
+
+ # Set Email Append To DocTypes via DocType
+ filters = {"istable": 0, "issingle": 0, "email_append_to": 1}
+ for dt in frappe.get_all("DocType", filters=filters, fields=["name", "email_append_to"]):
+ email_append_to_list.append(dt.name)
+
+ # Set Email Append To DocTypes set via Customize Form
+ for dt in frappe.get_list("Property Setter", filters={"property": "email_append_to", "value": 1}, fields=["doc_type"]):
+ email_append_to_list.append(dt.doc_type)
+
+ email_append_to = [[d] for d in set(email_append_to_list) if txt in d]
+
+ return email_append_to
def test_internet(host="8.8.8.8", port=53, timeout=3):
"""Returns True if internet is connected
diff --git a/frappe/email/doctype/email_group/email_group.json b/frappe/email/doctype/email_group/email_group.json
index d02cead0b0..0d784d409a 100644
--- a/frappe/email/doctype/email_group/email_group.json
+++ b/frappe/email/doctype/email_group/email_group.json
@@ -1,120 +1,70 @@
{
- "allow_copy": 0,
- "allow_import": 1,
- "allow_rename": 0,
- "autoname": "field:title",
- "beta": 0,
- "creation": "2015-03-18 06:08:32.729800",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Setup",
- "editable_grid": 0,
+ "actions": [],
+ "allow_import": 1,
+ "autoname": "field:title",
+ "creation": "2015-03-18 06:08:32.729800",
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "field_order": [
+ "title",
+ "total_subscribers",
+ "confirmation_email_template",
+ "welcome_email_template"
+ ],
"fields": [
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "title",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Title",
- "length": 0,
- "no_copy": 1,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "title",
+ "fieldtype": "Data",
+ "label": "Title",
+ "no_copy": 1,
+ "reqd": 1,
+ "unique": 1
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0",
- "fieldname": "total_subscribers",
- "fieldtype": "Int",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Total Subscribers",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
+ "default": "0",
+ "fieldname": "total_subscribers",
+ "fieldtype": "Int",
+ "in_list_view": 1,
+ "label": "Total Subscribers",
+ "read_only": 1
+ },
+ {
+ "fieldname": "confirmation_email_template",
+ "fieldtype": "Link",
+ "label": "Confirmation Email Template",
+ "options": "Email Template"
+ },
+ {
+ "fieldname": "welcome_email_template",
+ "fieldtype": "Link",
+ "label": "Welcome Email Template",
+ "options": "Email Template"
}
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
-
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2017-02-27 19:01:17.203845",
- "modified_by": "Administrator",
- "module": "Email",
- "name": "Email Group",
- "name_case": "",
- "owner": "Administrator",
+ ],
+ "links": [],
+ "modified": "2020-02-21 14:12:48.884738",
+ "modified_by": "Administrator",
+ "module": "Email",
+ "name": "Email Group",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "if_owner": 0,
- "import": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Newsletter Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "import": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Newsletter Manager",
+ "share": 1,
"write": 1
}
- ],
- "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0
+ ],
+ "quick_entry": 1,
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
}
\ No newline at end of file
diff --git a/frappe/email/doctype/email_group/email_group.py b/frappe/email/doctype/email_group/email_group.py
index 70210faf37..23495b2d70 100755
--- a/frappe/email/doctype/email_group/email_group.py
+++ b/frappe/email/doctype/email_group/email_group.py
@@ -66,6 +66,11 @@ def import_from(name, doctype):
def add_subscribers(name, email_list):
if not isinstance(email_list, (list, tuple)):
email_list = email_list.replace(",", "\n").split("\n")
+
+ template = frappe.db.get_value('Email Group', name, 'welcome_email_template')
+ if template:
+ welcome_email = frappe.get_doc("Email Template", template)
+
count = 0
for email in email_list:
email = email.strip()
@@ -78,7 +83,9 @@ def add_subscribers(name, email_list):
"doctype": "Email Group Member",
"email_group": name,
"email": parsed_email
- }).insert(ignore_permissions = frappe.flags.ignore_permissions)
+ }).insert(ignore_permissions=frappe.flags.ignore_permissions)
+
+ send_welcome_email(welcome_email, parsed_email, name)
count += 1
else:
@@ -90,3 +97,15 @@ def add_subscribers(name, email_list):
return frappe.get_doc("Email Group", name).update_total_subscribers()
+def send_welcome_email(welcome_email, email, email_group):
+ """Send welcome email for the subscribers of a given email group."""
+ if not welcome_email:
+ return
+
+ args = dict(
+ email=email,
+ email_group=email_group
+ )
+
+ message = frappe.render_template(welcome_email.response, args)
+ frappe.sendmail(email, subject=welcome_email.subject, message=message)
\ No newline at end of file
diff --git a/frappe/email/doctype/newsletter/newsletter.js b/frappe/email/doctype/newsletter/newsletter.js
index 7bf0ae6b9a..0f1e8dc57c 100644
--- a/frappe/email/doctype/newsletter/newsletter.js
+++ b/frappe/email/doctype/newsletter/newsletter.js
@@ -4,23 +4,65 @@
frappe.ui.form.on('Newsletter', {
refresh(frm) {
let doc = frm.doc;
- if(!doc.__islocal && !cint(doc.email_sent) && !doc.__unsaved
+ if (!doc.__islocal && !cint(doc.email_sent) && !doc.__unsaved
&& in_list(frappe.boot.user.can_write, doc.doctype)) {
- frm.add_custom_button(__('Send'), function() {
- frm.call('send_emails').then(() => {
- frm.refresh();
+ frm.add_custom_button(__('Send Now'), function() {
+ frappe.confirm(__("Do you really want to send this email newsletter?"), function() {
+ frm.call('send_emails').then(() => {
+ frm.refresh();
+ });
});
}, "fa fa-play", "btn-success");
}
+ if (!doc.__islocal && cint(doc.email_sent)) {
+ frm.set_df_property('schedule_send', "read_only", 1);
+ }
frm.events.setup_dashboard(frm);
- if(doc.__islocal && !doc.send_from) {
+ if (doc.__islocal && !doc.send_from) {
let { fullname, email } = frappe.user_info(doc.owner);
frm.set_value('send_from', `${fullname} <${email}>`);
}
},
+ onload_post_render(frm) {
+ frm.trigger('setup_schedule_send');
+ },
+
+ setup_schedule_send(frm) {
+ let today = new Date();
+
+ // setting datepicker options to set min date & min time
+ today.setHours(today.getHours() + 1 );
+ frm.get_field('schedule_send').$input.datepicker({
+ maxMinutes: 0,
+ minDate: today,
+ timeFormat: 'hh:00:00',
+ onSelect: function (fd, d, picker) {
+ if (!d) return;
+ var date = d.toDateString();
+ if (date === today.toDateString()) {
+ picker.update({
+ minHours: (today.getHours() + 1)
+ });
+ } else {
+ picker.update({
+ minHours: 0
+ });
+ }
+ frm.get_field('schedule_send').$input.trigger('change');
+ }
+ });
+
+
+ const $tp = frm.get_field('schedule_send').datepicker.timepicker;
+ $tp.$minutes.parent().css('display', 'none');
+ $tp.$minutesText.css('display', 'none');
+ $tp.$minutesText.prev().css('display', 'none');
+ $tp.$seconds.parent().css('display', 'none');
+ },
+
setup_dashboard(frm) {
if(!frm.doc.__islocal && cint(frm.doc.email_sent)
&& frm.doc.__onload && frm.doc.__onload.status_count) {
diff --git a/frappe/email/doctype/newsletter/newsletter.json b/frappe/email/doctype/newsletter/newsletter.json
index 1ef51027ed..719d51c176 100644
--- a/frappe/email/doctype/newsletter/newsletter.json
+++ b/frappe/email/doctype/newsletter/newsletter.json
@@ -1,4 +1,5 @@
{
+ "actions": [],
"allow_rename": 1,
"creation": "2013-01-10 16:34:31",
"description": "Create and Send Newsletters",
@@ -6,9 +7,11 @@
"document_type": "Other",
"engine": "InnoDB",
"field_order": [
+ "send_from",
+ "column_break_2",
+ "schedule_send",
"recipients",
"email_group",
- "send_from",
"email_sent",
"newsletter_content",
"subject",
@@ -41,7 +44,7 @@
"default": "0",
"fieldname": "email_sent",
"fieldtype": "Check",
- "label": "Email Sent?",
+ "label": "Email Sent",
"no_copy": 1,
"read_only": 1
},
@@ -115,14 +118,24 @@
"fieldname": "recipients",
"fieldtype": "Section Break",
"label": "Recipients"
+ },
+ {
+ "fieldname": "schedule_send",
+ "fieldtype": "Datetime",
+ "label": "Schedule Send"
+ },
+ {
+ "fieldname": "column_break_2",
+ "fieldtype": "Column Break"
}
],
"has_web_view": 1,
"icon": "fa fa-envelope",
"idx": 1,
"is_published_field": "published",
+ "links": [],
"max_attachments": 3,
- "modified": "2019-09-06 22:15:55.471254",
+ "modified": "2020-03-02 06:26:51.622521",
"modified_by": "Administrator",
"module": "Email",
"name": "Newsletter",
diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py
index b0d1756643..2d40ffd800 100755
--- a/frappe/email/doctype/newsletter/newsletter.py
+++ b/frappe/email/doctype/newsletter/newsletter.py
@@ -11,7 +11,7 @@ from frappe.utils.verified_command import get_signed_params, verify_request
from frappe.utils.background_jobs import enqueue
from frappe.email.queue import send
from frappe.email.doctype.email_group.email_group import add_subscribers
-from frappe.utils import parse_addr
+from frappe.utils import parse_addr, now_datetime
from frappe.utils import validate_email_address
@@ -42,7 +42,6 @@ class Newsletter(WebsiteGenerator):
if self.recipients:
if getattr(frappe.local, "is_ajax", False):
self.validate_send()
-
# using default queue with a longer timeout as this isn't a scheduled task
enqueue(send_newsletter, queue='default', timeout=6000, event='send_newsletter',
newsletter=self.name)
@@ -53,6 +52,7 @@ class Newsletter(WebsiteGenerator):
frappe.msgprint(_("Scheduled to send to {0} recipients").format(len(self.recipients)))
frappe.db.set(self, "email_sent", 1)
+ frappe.db.set(self, "schedule_send", now_datetime())
frappe.db.set(self, 'scheduled_to_send', len(self.recipients))
else:
frappe.msgprint(_("Newsletter should have atleast one recipient"))
@@ -160,39 +160,52 @@ def create_lead(email_id):
@frappe.whitelist(allow_guest=True)
-def subscribe(email):
+def subscribe(email, email_group=_('Website')):
url = frappe.utils.get_url("/api/method/frappe.email.doctype.newsletter.newsletter.confirm_subscription") +\
- "?" + get_signed_params({"email": email})
+ "?" + get_signed_params({"email": email, "email_group": email_group})
- messages = (
- _("Thank you for your interest in subscribing to our updates"),
- _("Please verify your Email Address"),
- url,
- _("Click here to verify")
- )
+ email_template = frappe.db.get_value('Email Group', email_group, ['confirmation_email_template'])
- content = """
-