nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 12:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[minor] fixed conflict while merging with master

Browse Source
This commit is contained in:
Nabin Hait
2013-09-05 10:56:44 +05:30
parent 4e8216696f 2162fee396
commit a653cd3608
67 changed files with 872 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@
from __future__ import unicode_literals
import webnotes
from webnotes import _
from webnotes.utils import cstr, validate_email_add, cint
from webnotes.utils import cstr, validate_email_add, cint, extract_email_id
from webnotes import session, msgprint
sql = webnotes.conn.sql
@@ -28,8 +28,14 @@ class DocType(SellingController):
if customer:
self.doc.fields["__is_customer"] = customer
def on_communication_sent(self, comm):
webnotes.conn.set(self.doc, 'status', 'Replied')
def on_communication(self, comm):
if comm.sender == self.get_sender(comm) or \
webnotes.conn.get_value("Profile", extract_email_id(comm.sender), "user_type")=="System User":
status = "Replied"
else:
status = "Open"
webnotes.conn.set(self.doc, 'status', status)
def check_status(self):
chk = sql("select status from `tabLead` where name=%s", self.doc.name)

4
selling/doctype/quotation/quotation.js
View File

@@ -62,11 +62,11 @@ erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({
if (!doc.__islocal) {
cur_frm.communication_view = new wn.views.CommunicationList({
list: wn.model.get("Communication", {"quotation": doc.name}),
list: wn.model.get("Communication", {"parent": doc.name, "parenttype": "Quotation"}),
parent: cur_frm.fields_dict.communication_html.wrapper,
doc: doc,
recipients: doc.contact_email
});
});
}
this.quotation_to();