From cf02a13c7c5b43f3f879a48f79f7cc95ed0e0397 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 2 Jul 2015 12:21:49 +0530 Subject: [PATCH 1/3] Print format fix for deleted fields --- frappe/templates/pages/print.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/templates/pages/print.py b/frappe/templates/pages/print.py index a2ef5b6f44..042cf15c42 100644 --- a/frappe/templates/pages/print.py +++ b/frappe/templates/pages/print.py @@ -277,7 +277,10 @@ def get_visible_columns(data, table_meta, df): # columns specified by column builder for col_df in df.get("visible_columns"): # load default docfield properties - newdf = table_meta.get_field(col_df.get("fieldname")).as_dict().copy() + docfield = table_meta.get_field(col_df.get("fieldname")) + if not docfield: + continue + newdf = docfield.as_dict().copy() newdf.update(col_df) if add_column(newdf): columns.append(newdf) From 90262f6c537aa7f800beaae5853555b48fd99ade Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 2 Jul 2015 12:22:34 +0530 Subject: [PATCH 2/3] Email sent message only if valid recilients --- frappe/public/js/frappe/views/communication.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js index e9e4291506..4f979470af 100644 --- a/frappe/public/js/frappe/views/communication.js +++ b/frappe/public/js/frappe/views/communication.js @@ -331,7 +331,7 @@ frappe.views.CommunicationComposer = Class.extend({ btn: btn, callback: function(r) { if(!r.exc) { - if(form_values.send_email) + if(form_values.send_email && r.message["recipients"]) msgprint(__("Email sent to {0}", [r.message["recipients"]])); me.dialog.hide(); From 157f3c7b6837d8c800dd26ecd8e4f2924c1732bf Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 2 Jul 2015 12:23:21 +0530 Subject: [PATCH 3/3] Convert fieldname to lowercase while creation --- frappe/core/doctype/doctype/doctype.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 74f98aeba7..170fc72989 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -315,6 +315,7 @@ def validate_fields(meta): if not d.permlevel: d.permlevel = 0 if not d.fieldname: frappe.throw(_("Fieldname is required in row {0}").format(d.idx)) + d.fieldname = d.fieldname.lower() check_illegal_characters(d.fieldname) check_unique_fieldname(d.fieldname) check_illegal_mandatory(d)