Merge pull request #168 from anandpdoshi/master

Fix Image attachments and Enable Email Digests

erpnext/home/page/profile_settings/profile_settings.js

@@ -97,7 +97,12 @@ MyProfile = function(wrapper) {
 			]);	
 
 			var w = d.widgets['wrapper'];
-			me.uploader = new Uploader(w, {cmd:'home.page.profile_settings.profile_settings.set_user_image'}, pscript.user_image_upload, 1)
+			me.uploader = new Uploader(w, 
+				{
+					modulename:'home.page.profile_settings.profile_settings',
+					method: 'set_user_image'
+				}, 
+				pscript.user_image_upload, 1)
 			me.change_dialog = d;
 		}
 		me.change_dialog.show();

erpnext/home/page/profile_settings/profile_settings.py

@@ -36,24 +36,10 @@ def set_user_details(arg=None):
 	p.save()
 	webnotes.msgprint('Updated')
 
-def set_user_image(arg=None):
+def set_user_image(fid, fname):
 	"""
 		Set uploaded image as user image
 	"""
-	from webnotes.utils.upload_handler import UploadHandler
+	from webnotes.utils.file_manager import add_file_list, remove_all
-	
+	remove_all('Profile', webnotes.session['user'])
-	uh = UploadHandler()
+	add_file_list('Profile', webnotes.session['user'], fname, fid)
-	if not uh.file_name:
-		# do nothing - no file found
-		return
-	else:
-		# save the file
-		from webnotes.utils.file_manager import FileAttachments
-		
-		fa = FileAttachments('Profile', webnotes.session['user'])
-		fa.delete_all()
-		fa.add(uh.file_name, uh.content)
-		fa.save()
-		
-		uh.set_callback('window.parent.upload_callback("%s", "%s")' \
-		 	% (webnotes.form_dict['uploader_id'], fa.get_fid(0)))

erpnext/patches/deploy_email_digest.py

@@ -10,10 +10,27 @@ def execute():
 	# Minor fix in print_format doctype
 	#reload_doc('core', 'doctype', 'print_format')
 	
-	reload_doc('setup', 'doctype', 'email_digest')
+	#reload_doc('setup', 'doctype', 'email_digest')
 
-	global create_default_email_digest
+	#global create_default_email_digest
-	create_default_email_digest()
+	#create_default_email_digest()
+
+	global enabled_default_email_digest
+	enabled_default_email_digest()
+
+
+def enabled_default_email_digest():
+	"""
+		Enables the created email digest
+	"""
+	from webnotes.model.doc import Document
+	companies_list = webnotes.conn.sql("SELECT company_name FROM `tabCompany`", as_list=1)
+	for company in companies_list:
+		if company and company[0]:
+			edigest = Document('Email Digest', 'Default Weekly Digest - ' + company[0])
+			if edigest:
+				edigest.enabled = 1
+				edigest.save()
 
 
 def create_default_email_digest():

index.html

@@ -3,7 +3,7 @@
 	<meta charset="utf-8">
 	<title>ERPNext</title>
 	<meta name="author" content="">
-	<script type="text/javascript">window._version_number="338"
+	<script type="text/javascript">window._version_number="340"
 
 wn={}
 wn.provide=function(namespace){var nsl=namespace.split('.');var l=nsl.length;var parent=window;for(var i=0;i<l;i++){var n=nsl[i];if(!parent[n]){parent[n]={}}