vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: remove status field

Browse source
This commit is contained in:
Himanshu Warekar 2019-12-27 14:48:46 +05:30
parent 2fe3430e74
commit 9543b7d4af
6 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frappe/core/doctype/communication/communication.json
View file

@ -386,7 +386,7 @@
"icon": "fa fa-comment",
"idx": 1,
"links": [],
"modified": "2019-12-12 13:01:23.716052",
"modified": "2019-12-27 14:44:04.880373",
"modified_by": "Administrator",
"module": "Core",
"name": "Communication",
@ -436,7 +436,6 @@
"sender_field": "sender",
"sort_field": "modified",
"sort_order": "DESC",
"status_field": "status",
"subject_field": "subject",
"title_field": "subject",
"track_changes": 1,

1
frappe/database/mariadb/framework_mariadb.sql
View file

@ -218,7 +218,6 @@ CREATE TABLE `tabDocType` (
`email_append_to` int(1) NOT NULL DEFAULT 0,
`subject_field` varchar(255) DEFAULT NULL,
`sender_field` varchar(255) DEFAULT NULL,
`status_field` varchar(255) DEFAULT NULL,
PRIMARY KEY (`name`),
KEY `parent` (`parent`)
) ENGINE=InnoDB ROW_FORMAT=COMPRESSED CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

1
frappe/database/postgres/framework_postgres.sql
View file

@ -223,7 +223,6 @@ CREATE TABLE "tabDocType" (
`email_append_to` smallint NOT NULL DEFAULT 0,
`subject_field` varchar(255) DEFAULT NULL,
`sender_field` varchar(255) DEFAULT NULL,
`status_field` varchar(255) DEFAULT NULL,
PRIMARY KEY ("name")
) ;

3
frappe/desk/doctype/event/event.json
View file

@ -276,7 +276,7 @@
"icon": "fa fa-calendar",
"idx": 1,
"links": [],
"modified": "2019-12-12 12:58:36.621861",
"modified": "2019-12-27 14:45:51.332025",
"modified_by": "Administrator",
"module": "Desk",
"name": "Event",
@ -310,7 +310,6 @@
"sender_field": "sender",
"sort_field": "modified",
"sort_order": "DESC",
"status_field": "status",
"subject_field": "subject",
"title_field": "subject",
"track_changes": 1,

3
frappe/desk/doctype/todo/todo.json
View file

@ -157,7 +157,7 @@
"icon": "fa fa-check",
"idx": 2,
"links": [],
"modified": "2019-12-12 12:53:17.565139",
"modified": "2019-12-27 14:45:25.161055",
"modified_by": "Administrator",
"module": "Desk",
"name": "ToDo",
@ -191,7 +191,6 @@
"sender_field": "sender",
"sort_field": "modified",
"sort_order": "DESC",
"status_field": "status",
"subject_field": "description",
"title_field": "description",
"track_changes": 1,

16
frappe/email/doctype/email_account/email_account.py
View file

@ -637,24 +637,20 @@ class EmailAccount(Document):
frappe.throw(_("Automatic Linking can be activated only for one Email Account."))
@frappe.whitelist()
def get_append_to(doctype=None, txt=None, searchfield=None, start=None, page_len=None, filters=None, reset_cache=False):
if frappe.cache().hget("email_append_to", "email_append_to_doctypes") and not reset_cache:
return frappe.cache().hget("email_append_to", "email_append_to_doctypes")
def get_append_to(doctype=None, txt=None, searchfield=None, start=None, page_len=None, filters=None):
txt = txt if txt else ""
email_append_to_list = []
# Set Email Append To DocTypes via DocType
for dt in frappe.get_all("DocType", filters={"istable": 0, "issingle": 0}, fields=["name", "email_append_to"]):
if dt.get("email_append_to") and dt.email_append_to:
email_append_to_list.append(dt.name)
else:
meta = frappe.get_meta(dt.name)
if meta.get("email_append_to") and meta.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]
frappe.cache().hset("email_append_to", "email_append_to_doctypes", email_append_to)
return email_append_to