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

Merge branch 'master' of github.com:webnotes/wnframework

Browse source
This commit is contained in:
Rushabh Mehta 2013-08-30 14:56:59 +05:30
commit 1306ecc2ad
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/doctype/communication/communication.py
View file

@ -35,6 +35,7 @@ class DocType():
else:
parent.doc.status = "Open"
parent.ignore_permissions = True
parent.ignore_mandatory = True
parent.save()
@ -72,7 +73,9 @@ def make(doctype=None, name=None, content=None, subject=None,
d.creation = date
if doctype:
sent_via = webnotes.get_obj(doctype, name)
d.fields[doctype.replace(" ", "_").lower()] = name
fieldname = doctype.replace(" ", "_").lower()
if comm.meta.get_field(fieldname):
d.fields[fieldname] = name
if set_lead:
set_lead_and_contact(d)
@ -135,10 +138,14 @@ def send_comm_email(d, name, sent_via=None, print_html=None, attachments='[]', s
if sent_via and hasattr(sent_via, 'on_communication_sent'):
sent_via.on_communication_sent(d)
def set_lead_and_contact(d):
import email.utils
email_addr = email.utils.parseaddr(d.sender)
if webnotes.conn.get_value("Profile", email_addr[1], "user_type")=="System User":
email_addr = email.utils.parseaddr(d.recipients)
# set contact
if not d.contact:
d.contact = webnotes.conn.get_value("Contact", {"email_id": email_addr[1]},

4
public/js/wn/form/control.js
View file

@ -225,7 +225,7 @@ wn.ui.form.ControlInput = wn.ui.form.Control.extend({
if(this.only_input || this.df.description===this._description)
return;
if(this.df.description) {
this.$wrapper.find(".help-box").html(this.df.description);
this.$wrapper.find(".help-box").html(wn._(this.df.description));
} else {
this.set_empty_description();
}
@ -807,4 +807,4 @@ wn.ui.form.fieldtype_icons = {
"Datetime": "icon-time",
"Code": "icon-code",
"Select": "icon-flag"
};
};