Procházet zdrojové kódy

[minor] [fixes]

version-14
Rushabh Mehta před 9 roky
rodič
revize
0d59103410
3 změnil soubory, kde provedl 9 přidání a 27 odebrání
  1. +2
    -1
      frappe/core/doctype/communication/communication.py
  2. +1
    -1
      frappe/email/doctype/newsletter/newsletter.js
  3. +6
    -25
      frappe/email/doctype/newsletter/newsletter.json

+ 2
- 1
frappe/core/doctype/communication/communication.py Zobrazit soubor

@@ -108,7 +108,8 @@ class Communication(Document):
self.sender_full_name = self.sender
self.sender = None
else:
validate_email_add(self.sender, throw=True)
if self.sent_or_received=='Sent':
validate_email_add(self.sender, throw=True)

sender_name, sender_email = parseaddr(self.sender)



+ 1
- 1
frappe/email/doctype/newsletter/newsletter.js Zobrazit soubor

@@ -2,7 +2,7 @@
// License: GNU General Public License v3. See license.txt

cur_frm.cscript.refresh = function(doc) {
if(erpnext) erpnext.toggle_naming_series();
if(window.erpnext) erpnext.toggle_naming_series();
if(!doc.__islocal && !cint(doc.email_sent) && !doc.__unsaved
&& inList(frappe.boot.user.can_write, doc.doctype)) {
cur_frm.add_custom_button(__('Send'), function() {


+ 6
- 25
frappe/email/doctype/newsletter/newsletter.json Zobrazit soubor

@@ -10,6 +10,7 @@
"docstatus": 0,
"doctype": "DocType",
"document_type": "Other",
"editable_grid": 0,
"fields": [
{
"allow_on_submit": 0,
@@ -246,7 +247,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
"modified": "2016-06-28 17:20:07.227578",
"modified": "2016-08-05 06:26:58.705579",
"modified_by": "Administrator",
"module": "Email",
"name": "Newsletter",
@@ -254,27 +255,7 @@
"permissions": [
{
"amend": 0,
"apply_user_permissions": 1,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "All",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
},
{
"amend": 0,
"apply_user_permissions": 1,
"apply_user_permissions": 0,
"cancel": 0,
"create": 0,
"delete": 1,
@@ -287,13 +268,13 @@
"read": 1,
"report": 1,
"role": "Newsletter Manager",
"set_user_permissions": 0,
"set_user_permissions": 1,
"share": 1,
"submit": 0,
"write": 0
"write": 1
}
],
"quick_entry": 1,
"quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
"sort_order": "ASC",


Načítá se…
Zrušit
Uložit