Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[communication] [minor] cleaed model

Browse Source
This commit is contained in:
Rushabh Mehta 2013-09-02 17:04:27 +05:30
parent 04c4e2aea3
commit 96690ebd0f
21 changed files with 92 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
buying/doctype/supplier/supplier.py
View File

@ -18,9 +18,6 @@ class DocType(TransactionBase):
self.doc = doc
self.doclist = doclist
def onload(self):
self.add_communication_list()
def autoname(self):
supp_master_name = webnotes.defaults.get_global_default('supp_master_name')

10
buying/doctype/supplier/supplier.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:11",
"docstatus": 0,
"modified": "2013-08-08 14:22:08",
"modified": "2013-09-02 16:25:44",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -204,6 +204,14 @@
"oldfieldname": "website",
"oldfieldtype": "Data"
},
{
"doctype": "DocField",
"fieldname": "communications",
"fieldtype": "Table",
"hidden": 1,
"label": "Communications",
"options": "Communication"
},
{
"cancel": 0,
"create": 0,

2
hr/doctype/job_applicant/get_job_applications.py
View File

@ -37,7 +37,7 @@ class JobsMailbox(POP3Mailbox):
mail.save_attachments_in_doc(applicant.doc)
make(content=mail.content, sender=mail.from_email,
doctype="Job Applicant", name=applicant.doc.name, set_lead=False)
doctype="Job Applicant", name=applicant.doc.name)
def get_job_applications():
if cint(webnotes.conn.get_value('Jobs Email Settings', None, 'extract_emails')):

3
hr/doctype/job_applicant/job_applicant.py
View File

@ -11,9 +11,6 @@ class DocType(TransactionBase):
def __init__(self, d, dl):
self.doc, self.doclist = d, dl
def onload(self):
self.add_communication_list()
def get_sender(self, comm):
return webnotes.conn.get_value('Jobs Email Settings',None,'email_id')

10
hr/doctype/job_applicant/job_applicant.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-01-29 19:25:37",
"docstatus": 0,
"modified": "2013-07-05 14:43:11",
"modified": "2013-09-02 16:26:23",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -89,6 +89,14 @@
"fieldtype": "HTML",
"label": "Thread HTML"
},
{
"doctype": "DocField",
"fieldname": "communications",
"fieldtype": "Table",
"hidden": 1,
"label": "Communications",
"options": "Communication"
},
{
"doctype": "DocPerm"
}

5
selling/doctype/customer/customer.py
View File

@ -17,10 +17,7 @@ class DocType(TransactionBase):
def __init__(self, doc, doclist=[]):
self.doc = doc
self.doclist = doclist
def onload(self):
self.add_communication_list()
def autoname(self):
cust_master_name = webnotes.defaults.get_global_default('cust_master_name')
if cust_master_name == 'Customer Name':

11
selling/doctype/customer/customer.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-06-11 14:26:44",
"docstatus": 0,
"modified": "2013-08-08 14:22:13",
"modified": "2013-09-02 16:25:13",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -348,6 +348,15 @@
"options": "Customer Discount",
"permlevel": 0
},
{
"doctype": "DocField",
"fieldname": "communications",
"fieldtype": "Table",
"hidden": 1,
"label": "Communications",
"options": "Communication",
"permlevel": 0
},
{
"amend": 0,
"cancel": 0,

7
selling/doctype/lead/get_leads.py
View File

@ -12,6 +12,9 @@ def add_sales_communication(subject, content, sender, real_name, mail=None,
lead_name = webnotes.conn.get_value("Lead", {"email_id": sender})
contact_name = webnotes.conn.get_value("Contact", {"email_id": sender})
parent_doctype = "Contact" if contact_name else "Lead"
parent_name = contact_name or lead_name
if not (lead_name or contact_name):
# none, create a new Lead
lead = webnotes.bean({
@ -26,11 +29,11 @@ def add_sales_communication(subject, content, sender, real_name, mail=None,
lead_name = lead.doc.name
message = make(content=content, sender=sender, subject=subject,
lead=lead_name, contact=contact_name, date=date)
doctype = parent_doctype, name = parent_name, date=date)
if mail:
# save attachments to parent if from mail
bean = webnotes.bean("Contact" if contact_name else "Lead", contact_name or lead_name)
bean = webnotes.bean(parent_doctype, parent_name)
mail.save_attachments_in_doc(bean.doc)
class SalesMailbox(POP3Mailbox):

1
selling/doctype/lead/lead.py
View File

@ -24,7 +24,6 @@ class DocType(SellingController):
})
def onload(self):
self.add_communication_list()
customer = webnotes.conn.get_value("Customer", {"lead_name": self.doc.name})
if customer:
self.doc.fields["__is_customer"] = customer

10
selling/doctype/lead/lead.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-04-10 11:45:37",
"docstatus": 0,
"modified": "2013-08-08 14:22:14",
"modified": "2013-09-02 16:16:14",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -410,6 +410,14 @@
"fieldtype": "Check",
"label": "Blog Subscriber"
},
{
"doctype": "DocField",
"fieldname": "communcations",
"fieldtype": "Table",
"hidden": 1,
"label": "Communcations",
"options": "Communication"
},
{
"cancel": 1,
"doctype": "DocPerm",

3
selling/doctype/opportunity/opportunity.py
View File

@ -25,9 +25,6 @@ class DocType(TransactionBase):
"contact_by": webnotes.conn.get_value("Opportunity", self.doc.name, "contact_by") if \
(not cint(self.doc.fields.get("__islocal"))) else None,
})
def onload(self):
self.add_communication_list()
def get_item_details(self, item_code):
item = sql("""select item_name, stock_uom, description_html, description, item_group, brand

10
selling/doctype/opportunity/opportunity.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-03-07 18:50:30",
"docstatus": 0,
"modified": "2013-08-08 14:22:15",
"modified": "2013-09-02 16:27:33",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -442,6 +442,14 @@
"read_only": 1,
"width": "150px"
},
{
"doctype": "DocField",
"fieldname": "communications",
"fieldtype": "Table",
"hidden": 1,
"label": "Communications",
"options": "Communication"
},
{
"doctype": "DocPerm",
"role": "Sales User"

3
selling/doctype/quotation/quotation.py
View File

@ -20,9 +20,6 @@ class DocType(SellingController):
self.doclist = doclist
self.tname = 'Quotation Item'
self.fname = 'quotation_details'
def onload(self):
self.add_communication_list()
# Get contact person details based on customer selected
# ------------------------------------------------------

10
selling/doctype/quotation/quotation.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:08",
"docstatus": 0,
"modified": "2013-08-09 14:46:11",
"modified": "2013-09-02 16:25:01",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -835,6 +835,14 @@
"read_only": 0,
"width": "40px"
},
{
"doctype": "DocField",
"fieldname": "communications",
"fieldtype": "Table",
"hidden": 1,
"label": "Communications",
"options": "Communication"
},
{
"amend": 1,
"cancel": 1,

10
setup/doctype/sales_person/sales_person.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:24",
"docstatus": 0,
"modified": "2013-08-05 18:11:22",
"modified": "2013-09-02 16:26:54",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -160,6 +160,14 @@
"options": "Budget Distribution",
"search_index": 0
},
{
"doctype": "DocField",
"fieldname": "communications",
"fieldtype": "Table",
"hidden": 1,
"label": "Communications",
"options": "Communication"
},
{
"cancel": 0,
"create": 0,

2
support/doctype/support_ticket/get_support_mails.py
View File

@ -46,7 +46,7 @@ class SupportMailbox(POP3Mailbox):
make(content=mail.content, sender=mail.from_email, subject = ticket.doc.subject,
doctype="Support Ticket", name=ticket.doc.name,
lead = ticket.doc.lead, contact=ticket.doc.contact, date=mail.date)
date=mail.date)
if new_ticket and cint(self.email_settings.send_autoreply) and \
"mailer-daemon" not in mail.from_email.lower():

5
support/doctype/support_ticket/support_ticket.py
View File

@ -11,9 +11,6 @@ class DocType(TransactionBase):
def __init__(self, doc, doclist=[]):
self.doc = doc
self.doclist = doclist
def onload(self):
self.add_communication_list()
def get_sender(self, comm):
return webnotes.conn.get_value('Email Settings',None,'support_email')
@ -53,7 +50,7 @@ class DocType(TransactionBase):
if not self.doc.company:
self.doc.company = webnotes.conn.get_value("Lead", self.doc.lead, "company") or \
webnotes.conn.get_default("company")
def on_trash(self):
webnotes.conn.sql("""update `tabCommunication` set support_ticket=NULL
where support_ticket=%s""", (self.doc.name,))

10
support/doctype/support_ticket/support_ticket.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-02-01 10:36:25",
"docstatus": 0,
"modified": "2013-08-28 18:29:06",
"modified": "2013-09-02 16:24:24",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -261,6 +261,14 @@
"hidden": 1,
"label": "Content Type"
},
{
"doctype": "DocField",
"fieldname": "communications",
"fieldtype": "Table",
"hidden": 1,
"label": "Communications",
"options": "Communication"
},
{
"cancel": 0,
"doctype": "DocPerm",

3
utilities/doctype/contact/contact.py
View File

@ -12,9 +12,6 @@ class DocType(TransactionBase):
self.doc = doc
self.doclist = doclist
def onload(self):
self.add_communication_list()
def on_communication_sent(self, comm):
webnotes.conn.set(self.doc, 'status', 'Replied')

10
utilities/doctype/contact/contact.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:32",
"docstatus": 0,
"modified": "2013-07-05 14:32:19",
"modified": "2013-09-02 16:26:13",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -225,6 +225,14 @@
"oldfieldtype": "Small Text",
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "communications",
"fieldtype": "Table",
"hidden": 1,
"label": "Communications",
"options": "Communication"
},
{
"cancel": 1,
"doctype": "DocPerm",

15
utilities/transaction_base.py
View File

@ -229,20 +229,7 @@ class TransactionBase(StatusUpdater):
if int(webnotes.conn.get_value("Notification Control", None, dt) or 0):
self.doc.fields["__notification_message"] = \
webnotes.conn.get_value("Notification Control", None, dt + "_message")
def add_communication_list(self):
# remove communications if present
self.doclist = webnotes.doclist(self.doclist).get({
"doctype": ["!=", "Communcation"]})
comm_list = webnotes.conn.sql("""select * from tabCommunication
where %s=%s order by modified desc limit 20""" \
% (self.doc.doctype.replace(" ", "_").lower(), "%s"),
self.doc.name, as_dict=1, update={"doctype":"Communication"})
self.doclist.extend(webnotes.doclist([webnotes.doc(fielddata=d) \
for d in comm_list]))
def validate_posting_time(self):
if not self.doc.posting_time:
self.doc.posting_time = now_datetime().strftime('%H:%M:%S')