Merge branch 'master' of github.com:webnotes/erpnext into edge

hr/doctype/leave_application/leave_application.js

@@ -21,7 +21,8 @@ cur_frm.cscript.onload = function(doc, dt, dn) {
 	if(!doc.posting_date) 
 		set_multiple(dt,dn,{posting_date:get_today()});
 	if(doc.__islocal) {
-		cur_frm.set_value("status", "Open")
+		cur_frm.set_value("status", "Open");
+		cur_frm.cscript.calculate_total_days(doc, dt, dn);
 	}
 	cur_frm.set_df_property("leave_approver", "options", "");
 	cur_frm.call({

hr/doctype/leave_application/leave_application.py

@@ -71,7 +71,7 @@ class DocType(DocListController):
 			for d in block_dates:
 				webnotes.msgprint(formatdate(d.block_date) + ": " + d.reason)
 				
-			if self.doc.docstatus == 1:
+			if self.doc.status == "Approved":
 				raise LeaveDayBlockedError
 			
 	def get_holidays(self):
@@ -185,7 +185,7 @@ class DocType(DocListController):
 		args = webnotes._dict(args)
 		from utilities.page.messages.messages import post
 		post({"txt": args.message, "contact": args.message_to, "subject": args.subject,
-			"notify": True})
+			"notify": cint(self.doc.follow_via_email)})
 
 @webnotes.whitelist()
 def get_leave_balance(employee, leave_type, fiscal_year):	

hr/doctype/leave_application/leave_application.txt

@@ -1,18 +1,20 @@
 [
  {
-  "creation": "2013-02-18 17:08:32", 
+  "creation": "2013-02-18 18:37:56", 
   "docstatus": 0, 
-  "modified": "2013-02-18 17:20:50", 
+  "modified": "2013-02-19 16:30:05", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
  {
+  "allow_attach": 1, 
   "allow_import": 1, 
   "autoname": "LAP/.#####", 
   "description": "Apply / Approve Leaves", 
   "doctype": "DocType", 
   "document_type": "Transaction", 
   "is_submittable": 1, 
+  "max_attachments": 3, 
   "module": "HR", 
   "name": "__common__", 
   "search_fields": "employee,employee_name,leave_type,from_date,to_date,total_leave_days,fiscal_year"
@@ -157,6 +159,16 @@
   "label": "More Info", 
   "permlevel": 0
  }, 
+ {
+  "allow_on_submit": 1, 
+  "default": "1", 
+  "doctype": "DocField", 
+  "fieldname": "follow_via_email", 
+  "fieldtype": "Check", 
+  "label": "Follow via Email", 
+  "permlevel": 0, 
+  "print_hide": 1
+ }, 
  {
   "default": "Today", 
   "doctype": "DocField", 
@@ -179,6 +191,12 @@
   "reqd": 1, 
   "search_index": 0
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "column_break_17", 
+  "fieldtype": "Column Break", 
+  "permlevel": 0
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "company", 
@@ -209,6 +227,16 @@
   "print_hide": 1, 
   "read_only": 1
  }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "file_list", 
+  "fieldtype": "Text", 
+  "hidden": 1, 
+  "label": "File List", 
+  "no_copy": 1, 
+  "permlevel": 0, 
+  "print_hide": 1
+ }, 
  {
   "create": 1, 
   "doctype": "DocPerm", 
@@ -218,11 +246,21 @@
   "role": "Employee", 
   "write": 1
  }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "permlevel": 1, 
+  "role": "All", 
+  "submit": 0
+ }, 
  {
   "amend": 1, 
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
+  "match": "company", 
   "permlevel": 0, 
   "report": 1, 
   "role": "HR User", 
@@ -247,16 +285,7 @@
   "create": 0, 
   "doctype": "DocPerm", 
   "permlevel": 1, 
-  "role": "All", 
-  "submit": 0
- }, 
- {
-  "amend": 0, 
-  "cancel": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "permlevel": 1, 
-  "report": 0, 
+  "report": 1, 
   "role": "HR User", 
   "submit": 0, 
   "write": 1
@@ -267,7 +296,7 @@
   "create": 0, 
   "doctype": "DocPerm", 
   "permlevel": 1, 
-  "report": 0, 
+  "report": 1, 
   "role": "Leave Approver", 
   "submit": 0, 
   "write": 1

hr/doctype/leave_block_list/leave_block_list.txt

@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-02-08 15:13:29", 
+  "creation": "2013-02-18 17:43:12", 
   "docstatus": 0, 
-  "modified": "2013-02-14 17:15:32", 
+  "modified": "2013-02-19 18:42:35", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -83,7 +83,7 @@
   "options": "Leave Block List Date"
  }, 
  {
-  "description": "Allow the following users to make Leave Applications for block days.", 
+  "description": "Allow the following users to approve Leave Applications for block days.", 
   "doctype": "DocField", 
   "fieldname": "allow_list", 
   "fieldtype": "Section Break",