From 3b8d588f3d447c31f9526bc6ff00a2dee1137278 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 5 Nov 2012 13:28:30 +0530 Subject: [PATCH 1/2] if recipients only then try to send email digest --- setup/doctype/email_digest/email_digest.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/setup/doctype/email_digest/email_digest.py b/setup/doctype/email_digest/email_digest.py index 9c5a24f1cc..017001d44b 100644 --- a/setup/doctype/email_digest/email_digest.py +++ b/setup/doctype/email_digest/email_digest.py @@ -56,10 +56,11 @@ class DocType: recipients = filter(lambda r: r in valid_users, self.doc.recipient_list.split("\n")) - from webnotes.utils.email_lib import sendmail - sendmail(recipients=recipients, subject=(self.doc.frequency + " Digest"), - sender="ERPNext Notifications ", - msg=self.get_digest_msg()) + if recipients: + from webnotes.utils.email_lib import sendmail + sendmail(recipients=recipients, subject=(self.doc.frequency + " Digest"), + sender="ERPNext Notifications ", + msg=self.get_digest_msg()) def get_digest_msg(self): """""" From 0c38d19ab8feaa8d8f39bb4e9f664180f7f17cae Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 6 Nov 2012 12:07:20 +0530 Subject: [PATCH 2/2] hide transactions based on permissions in Trend Analyzer --- .../search_criteria/trend_analyzer/trend_analyzer.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/accounts/search_criteria/trend_analyzer/trend_analyzer.js b/accounts/search_criteria/trend_analyzer/trend_analyzer.js index 53de71cb21..7f4b94b34b 100644 --- a/accounts/search_criteria/trend_analyzer/trend_analyzer.js +++ b/accounts/search_criteria/trend_analyzer/trend_analyzer.js @@ -17,7 +17,17 @@ report.customize_filters = function() { this.hide_all_filters(); - this.add_filter({fieldname:'transaction', label:'Transaction', fieldtype:'Select', options:'Quotation'+NEWLINE+'Sales Order'+NEWLINE+'Delivery Note'+NEWLINE+'Sales Invoice'+NEWLINE+'Purchase Order'+NEWLINE+'Purchase Receipt'+NEWLINE+'Purchase Invoice',report_default:'Delivery Note',ignore : 1,parent:'Profile',in_first_page : 1,single_select : 1}); + // hide transaction based on permissions + var all_transactions = ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice", + "Purchase Order", "Purchase Receipt", "Purchase Invoice"]; + var transaction_list = []; + $.each(all_transactions, function(i, dt) { + if(wn.boot.profile.can_read.indexOf(dt)!=-1) { + transaction_list.push(dt); + } + }); + + this.add_filter({fieldname:'transaction', label:'Transaction', fieldtype:'Select', options:transaction_list.join(NEWLINE),report_default:'Delivery Note',ignore : 1,parent:'Profile',in_first_page : 1,single_select : 1}); this.add_filter({fieldname:'period', label:'Period', fieldtype:'Select', options:'Monthly'+NEWLINE+'Quarterly'+NEWLINE+'Half Yearly'+NEWLINE+'Annual',report_default:'Quarterly',ignore : 1, parent:'Profile',in_first_page:1,single_select:1});