From 9e12af4b7c13acfc8d1bb042f37ef9aa79cb6a2f Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 12 Dec 2012 16:13:29 +0530 Subject: [PATCH] updated recipients email in communication --- selling/doctype/lead/lead.js | 2 +- selling/doctype/opportunity/opportunity.js | 2 +- selling/doctype/quotation/quotation.js | 2 +- startup/startup.py | 2 +- utilities/doctype/contact/contact.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/selling/doctype/lead/lead.js b/selling/doctype/lead/lead.js index 0c5bf87cdb8..e4b3a7db580 100644 --- a/selling/doctype/lead/lead.js +++ b/selling/doctype/lead/lead.js @@ -71,7 +71,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { list: wn.model.get("Communication", {"lead": doc.name}), parent: cur_frm.fields_dict.communication_html.wrapper, doc: doc, - email: doc.email_id + recipients: doc.email_id }) } diff --git a/selling/doctype/opportunity/opportunity.js b/selling/doctype/opportunity/opportunity.js index 2bb41b21b5b..2b530ff4a5f 100644 --- a/selling/doctype/opportunity/opportunity.js +++ b/selling/doctype/opportunity/opportunity.js @@ -51,7 +51,7 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) { list: wn.model.get("Communication", {"opportunity": doc.name}), parent: cur_frm.fields_dict.communication_html.wrapper, doc: doc, - email: doc.contact_email + recipients: doc.contact_email }); } diff --git a/selling/doctype/quotation/quotation.js b/selling/doctype/quotation/quotation.js index 1b03781b5b5..7199132d615 100644 --- a/selling/doctype/quotation/quotation.js +++ b/selling/doctype/quotation/quotation.js @@ -107,7 +107,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { list: wn.model.get("Communication", {"quotation": doc.name}), parent: cur_frm.fields_dict.communication_html.wrapper, doc: doc, - email: doc.contact_email + recipients: doc.contact_email }); } } diff --git a/startup/startup.py b/startup/startup.py index 828239ee153..15ea491b135 100644 --- a/startup/startup.py +++ b/startup/startup.py @@ -48,7 +48,7 @@ def get_things_todo(): incomplete_todos = webnotes.conn.sql("""\ SELECT COUNT(*) FROM `tabToDo` WHERE IFNULL(checked, 0) = 0 - AND owner = %s""", webnotes.session.get('user')) + AND (owner = %s or assigned_by=%s)""", (webnotes.session.user, webnotes.session.user)) return incomplete_todos and cint(incomplete_todos[0][0]) or 0 def get_todays_events(): diff --git a/utilities/doctype/contact/contact.js b/utilities/doctype/contact/contact.js index 3876ca20aef..97fd8a6a106 100644 --- a/utilities/doctype/contact/contact.js +++ b/utilities/doctype/contact/contact.js @@ -27,7 +27,7 @@ cur_frm.cscript.refresh = function() { list: wn.model.get("Communication", {"contact": doc.name}), parent: cur_frm.fields_dict.communication_html.wrapper, doc: doc, - email: doc.email_id + recipients: doc.email_id }) }