feat: move subject and sender fields to json
This commit is contained in:
parent
e5692e035a
commit
c9f497d7c0
@ -440,11 +440,7 @@
|
|||||||
"idx": 5,
|
"idx": 5,
|
||||||
"image_field": "image",
|
"image_field": "image",
|
||||||
"links": [],
|
"links": [],
|
||||||
<<<<<<< HEAD
|
"modified": "2020-01-13 16:16:48.885228",
|
||||||
"modified": "2019-12-12 21:00:59.166518",
|
|
||||||
=======
|
|
||||||
"modified": "2019-12-24 16:00:44.239168",
|
|
||||||
>>>>>>> 2d151a7b85acc2bd530793ff3586a58f117ee270
|
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "CRM",
|
"module": "CRM",
|
||||||
"name": "Lead",
|
"name": "Lead",
|
||||||
@ -513,7 +509,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"search_fields": "lead_name,lead_owner,status",
|
"search_fields": "lead_name,lead_owner,status",
|
||||||
"sender_field": "status",
|
"sender_field": "email_id",
|
||||||
"show_name_in_global_search": 1,
|
"show_name_in_global_search": 1,
|
||||||
"sort_field": "modified",
|
"sort_field": "modified",
|
||||||
"sort_order": "DESC",
|
"sort_order": "DESC",
|
||||||
|
@ -12,9 +12,6 @@ from frappe.email.inbox import link_communication_to_document
|
|||||||
from frappe.model.mapper import get_mapped_doc
|
from frappe.model.mapper import get_mapped_doc
|
||||||
from frappe.utils import cint, comma_and, cstr, getdate, has_gravatar, nowdate, validate_email_address
|
from frappe.utils import cint, comma_and, cstr, getdate, has_gravatar, nowdate, validate_email_address
|
||||||
|
|
||||||
sender_field = "email_id"
|
|
||||||
|
|
||||||
|
|
||||||
class Lead(SellingController):
|
class Lead(SellingController):
|
||||||
def get_feed(self):
|
def get_feed(self):
|
||||||
return '{0}: {1}'.format(_(self.status), self.lead_name)
|
return '{0}: {1}'.format(_(self.status), self.lead_name)
|
||||||
|
@ -322,6 +322,7 @@
|
|||||||
"fieldname": "contact_email",
|
"fieldname": "contact_email",
|
||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
"label": "Contact Email",
|
"label": "Contact Email",
|
||||||
|
"options": "Email",
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -415,7 +416,7 @@
|
|||||||
"icon": "fa fa-info-sign",
|
"icon": "fa fa-info-sign",
|
||||||
"idx": 195,
|
"idx": 195,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2019-12-12 20:38:30.423368",
|
"modified": "2020-01-13 16:18:44.477818",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "CRM",
|
"module": "CRM",
|
||||||
"name": "Opportunity",
|
"name": "Opportunity",
|
||||||
|
@ -11,9 +11,6 @@ from erpnext.utilities.transaction_base import TransactionBase
|
|||||||
from erpnext.accounts.party import get_party_account_currency
|
from erpnext.accounts.party import get_party_account_currency
|
||||||
from frappe.email.inbox import link_communication_to_document
|
from frappe.email.inbox import link_communication_to_document
|
||||||
|
|
||||||
subject_field = "title"
|
|
||||||
sender_field = "contact_email"
|
|
||||||
|
|
||||||
class Opportunity(TransactionBase):
|
class Opportunity(TransactionBase):
|
||||||
def after_insert(self):
|
def after_insert(self):
|
||||||
if self.opportunity_from == "Lead":
|
if self.opportunity_from == "Lead":
|
||||||
|
@ -96,7 +96,7 @@
|
|||||||
"icon": "fa fa-user",
|
"icon": "fa fa-user",
|
||||||
"idx": 1,
|
"idx": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2019-12-12 21:10:13.637336",
|
"modified": "2020-01-13 16:19:39.113330",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "HR",
|
"module": "HR",
|
||||||
"name": "Job Applicant",
|
"name": "Job Applicant",
|
||||||
|
@ -9,8 +9,6 @@ import frappe
|
|||||||
from frappe import _
|
from frappe import _
|
||||||
from frappe.utils import comma_and, validate_email_address
|
from frappe.utils import comma_and, validate_email_address
|
||||||
|
|
||||||
sender_field = "email_id"
|
|
||||||
|
|
||||||
class DuplicationError(frappe.ValidationError): pass
|
class DuplicationError(frappe.ValidationError): pass
|
||||||
|
|
||||||
class JobApplicant(Document):
|
class JobApplicant(Document):
|
||||||
|
@ -366,7 +366,7 @@
|
|||||||
"icon": "fa fa-ticket",
|
"icon": "fa fa-ticket",
|
||||||
"idx": 7,
|
"idx": 7,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2019-12-12 21:11:01.726692",
|
"modified": "2020-01-13 16:20:30.392712",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Support",
|
"module": "Support",
|
||||||
"name": "Issue",
|
"name": "Issue",
|
||||||
|
@ -14,9 +14,6 @@ from frappe.utils.user import is_website_user
|
|||||||
from erpnext.support.doctype.service_level_agreement.service_level_agreement import get_active_service_level_agreement_for
|
from erpnext.support.doctype.service_level_agreement.service_level_agreement import get_active_service_level_agreement_for
|
||||||
from frappe.email.inbox import link_communication_to_document
|
from frappe.email.inbox import link_communication_to_document
|
||||||
|
|
||||||
sender_field = "raised_by"
|
|
||||||
|
|
||||||
|
|
||||||
class Issue(Document):
|
class Issue(Document):
|
||||||
def get_feed(self):
|
def get_feed(self):
|
||||||
return "{0}: {1}".format(_(self.status), self.subject)
|
return "{0}: {1}".format(_(self.status), self.subject)
|
||||||
|
0
erpnext/www/book-appointment/__init__.py
Normal file
0
erpnext/www/book-appointment/__init__.py
Normal file
0
erpnext/www/book-appointment/verify/__init__.py
Normal file
0
erpnext/www/book-appointment/verify/__init__.py
Normal file
Loading…
Reference in New Issue
Block a user