diff --git a/erpnext/support/doctype/communication/communication.txt b/erpnext/support/doctype/communication/communication.txt index d6efd104af4..bb69e6e0380 100644 --- a/erpnext/support/doctype/communication/communication.txt +++ b/erpnext/support/doctype/communication/communication.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-05-29 16:56:41', + 'creation': '2012-06-07 11:02:55', 'docstatus': 0, - 'modified': '2012-05-31 16:14:39', + 'modified': '2012-06-07 11:24:20', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -31,12 +31,14 @@ # These values are common for all DocPerm { + 'amend': 0, 'doctype': u'DocPerm', 'name': '__common__', 'parent': u'Communication', 'parentfield': u'permissions', 'parenttype': u'DocType', 'read': 1, + 'submit': 0, 'write': 1 }, @@ -48,6 +50,7 @@ # DocPerm { + 'cancel': 0, 'create': 1, 'doctype': u'DocPerm', 'permlevel': 0, @@ -56,6 +59,7 @@ # DocPerm { + 'cancel': 0, 'create': 1, 'doctype': u'DocPerm', 'permlevel': 0, @@ -64,6 +68,7 @@ # DocPerm { + 'cancel': 0, 'create': 1, 'doctype': u'DocPerm', 'permlevel': 0, @@ -72,6 +77,8 @@ # DocPerm { + 'cancel': 0, + 'create': 0, 'doctype': u'DocPerm', 'permlevel': 1, 'role': u'Sales Manager' @@ -79,11 +86,31 @@ # DocPerm { + 'cancel': 0, + 'create': 0, 'doctype': u'DocPerm', 'permlevel': 1, 'role': u'Support Manager' }, + # DocPerm + { + 'cancel': 1, + 'create': 1, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Administrator' + }, + + # DocPerm + { + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Administrator' + }, + # DocField { 'doctype': u'DocField', @@ -112,7 +139,7 @@ 'fieldname': u'category', 'fieldtype': u'Select', 'label': u'Category', - 'options': u'\nSales\nComplaint\nHelp\nSuggestion\nMiscellaneous', + 'options': u'\nSales\nComplaint\nHelp\nSuggestion\nMiscellaneous\nSent Mail', 'permlevel': 0, 'reqd': 1 }, @@ -123,7 +150,7 @@ 'fieldname': u'action', 'fieldtype': u'Select', 'label': u'Action', - 'options': u'\nCreated Opportunity\nSent Quotation\nCreated Support Ticket\nCreated Customer Issue\nNo Action', + 'options': u'\nCreated Opportunity\nSent Quotation\nCreated Support Ticket\nCreated Customer Issue\nNo Action\nSent Mail', 'permlevel': 0, 'reqd': 1 }, diff --git a/public/js/all-app.js b/public/js/all-app.js index f7a507d4a05..c953b97187e 100644 --- a/public/js/all-app.js +++ b/public/js/all-app.js @@ -2109,7 +2109,7 @@ this.prepare_col_heads(this.flist);var table=me.make_print_table(this.flist);thi /* * lib/js/legacy/widgets/form/email.js */ -_e.email_as_field='email_id';_e.email_as_dt='Contact';_e.email_as_in='email_id,contact_name';sendmail=function(emailto,emailfrom,cc,subject,message,fmt,with_attachments){var fn=function(html){$c('webnotes.utils.email_lib.send_form',{'sendto':emailto,'sendfrom':emailfrom?emailfrom:'','cc':cc?cc:'','subject':subject,'message':replace_newlines(message),'body':html,'full_domain':wn.urllib.get_base_url(),'with_attachments':with_attachments?1:0,'dt':cur_frm.doctype,'dn':cur_frm.docname},function(r,rtxt){});} +_e.email_as_field='email_id';_e.email_as_dt='Contact';_e.email_as_in='email_id,contact_name';sendmail=function(emailto,emailfrom,cc,subject,message,fmt,with_attachments){var fn=function(html){$c('webnotes.utils.email_lib.send_form',{'sendto':emailto,'sendfrom':emailfrom?emailfrom:'','cc':cc?cc:'','subject':subject,'message':replace_newlines(message),'body':html,'full_domain':wn.urllib.get_base_url(),'with_attachments':with_attachments?1:0,'dt':cur_frm.doctype,'dn':cur_frm.docname,'customer':cur_frm.doc.customer||'','supplier':cur_frm.doc.supplier||''},function(r,rtxt){});} _p.build(fmt,fn);} _e.make=function(){var d=new Dialog(440,440,"Send Email");var email_go=function(){var emailfrom=d.widgets['From'].value;var emailto=d.widgets['To'].value;if(!emailfrom) emailfrom=user_email;emailto=emailto.replace(/ /g,"");var email_list=emailto.split(/[,|;]/);var valid=1;for(var i=0;i