From b091707ae823f66700e23c4de336fb67aa461f2c Mon Sep 17 00:00:00 2001
From: Neil Trini Lasrado <neil@frappe.io>
Date: Wed, 18 Feb 2015 13:00:56 +0530
Subject: [PATCH 1/2] Validate renaming of activity type - manufacturing

---
 erpnext/projects/doctype/activity_type/activity_type.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/erpnext/projects/doctype/activity_type/activity_type.py b/erpnext/projects/doctype/activity_type/activity_type.py
index 7e316b532d..cc43e8249a 100644
--- a/erpnext/projects/doctype/activity_type/activity_type.py
+++ b/erpnext/projects/doctype/activity_type/activity_type.py
@@ -3,14 +3,17 @@
 
 from __future__ import unicode_literals
 import frappe
-
+from frappe import _
 from frappe.model.document import Document
 
 class ActivityType(Document):
 	
 	def on_trash(self):
 		self.validate_manufacturing_type()
-		
+
+	def before_rename(self, olddn, newdn, merge=False):
+		self.validate_manufacturing_type()
+
 	def validate_manufacturing_type(self):
 		if self.activity_type == 'Manufacturing':
-			frappe.throw(_("Activity Type 'Manufacturing' cannot be deleted."))
\ No newline at end of file
+			frappe.throw(_("Activity Type 'Manufacturing' cannot be deleted/renamed."))
\ No newline at end of file

From e20057894e5e953de4503780d9d8fbcb1ebdf4da Mon Sep 17 00:00:00 2001
From: Neil Trini Lasrado <neil@frappe.io>
Date: Wed, 18 Feb 2015 13:06:12 +0530
Subject: [PATCH 2/2] Activity Type - permissions changed for users with system
 manager role

---
 erpnext/projects/doctype/activity_type/activity_type.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/erpnext/projects/doctype/activity_type/activity_type.json b/erpnext/projects/doctype/activity_type/activity_type.json
index 9d1e15a102..7be34dcd4d 100644
--- a/erpnext/projects/doctype/activity_type/activity_type.json
+++ b/erpnext/projects/doctype/activity_type/activity_type.json
@@ -19,7 +19,7 @@
  "icon": "icon-flag", 
  "idx": 1, 
  "in_dialog": 0, 
- "modified": "2015-02-05 05:11:34.201187", 
+ "modified": "2015-02-18 13:05:23.608066", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Activity Type", 
@@ -27,7 +27,10 @@
  "permissions": [
   {
    "create": 1, 
+   "delete": 1, 
    "email": 1, 
+   "export": 1, 
+   "import": 1, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -39,6 +42,7 @@
   {
    "apply_user_permissions": 1, 
    "create": 1, 
+   "delete": 0, 
    "email": 1, 
    "permlevel": 0, 
    "print": 1,