diff --git a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
index 894929f..836f808 100755
--- a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
+++ b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
@@ -2,21 +2,16 @@
  {
   "owner": "Administrator", 
   "docstatus": 0, 
-  "creation": "2012-04-13 11:56:17", 
+  "creation": "2012-07-03 13:29:48", 
   "modified_by": "Administrator", 
-  "modified": "2012-06-04 12:10:22"
+  "modified": "2012-12-19 11:57:47"
  }, 
  {
-  "section_style": "Tray", 
   "istable": 1, 
-  "module": "Accounts", 
-  "server_code_error": " ", 
-  "doctype": "DocType", 
   "autoname": "EVD.######", 
   "name": "__common__", 
-  "colour": "White:FFF", 
-  "show_in_menu": 0, 
-  "version": 1
+  "doctype": "DocType", 
+  "module": "Accounts"
  }, 
  {
   "name": "__common__", 
@@ -36,7 +31,6 @@
   "label": "Item", 
   "oldfieldname": "item_code", 
   "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
   "search_index": 1, 
@@ -45,13 +39,13 @@
   "in_filter": 1
  }, 
  {
+  "oldfieldtype": "Data", 
   "search_index": 0, 
   "doctype": "DocField", 
   "label": "Item Name", 
   "oldfieldname": "item_name", 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
-  "oldfieldtype": "Data", 
   "reqd": 1, 
   "permlevel": 0, 
   "in_filter": 0
@@ -72,7 +66,6 @@
   "doctype": "DocField", 
   "label": "Qty", 
   "oldfieldname": "qty", 
-  "trigger": "Client", 
   "fieldname": "qty", 
   "fieldtype": "Currency", 
   "reqd": 1, 
@@ -82,16 +75,14 @@
   "print_hide": 1, 
   "doctype": "DocField", 
   "label": "Ref Rate ", 
-  "trigger": "Client", 
   "fieldname": "import_ref_rate", 
   "fieldtype": "Currency", 
   "permlevel": 0
  }, 
  {
-  "print_hide": 1, 
+  "print_hide": 0, 
   "doctype": "DocField", 
   "label": "Discount %", 
-  "trigger": "Client", 
   "fieldname": "discount_rate", 
   "fieldtype": "Currency", 
   "permlevel": 0
@@ -102,7 +93,6 @@
   "doctype": "DocField", 
   "label": "Rate ", 
   "oldfieldname": "import_rate", 
-  "trigger": "Client", 
   "fieldname": "import_rate", 
   "fieldtype": "Currency", 
   "reqd": 1, 
@@ -122,7 +112,6 @@
   "print_hide": 1, 
   "doctype": "DocField", 
   "label": "Ref Rate *", 
-  "trigger": "Client", 
   "fieldname": "purchase_ref_rate", 
   "fieldtype": "Currency", 
   "permlevel": 0
@@ -133,7 +122,6 @@
   "doctype": "DocField", 
   "label": "Rate *(Default Curr.)", 
   "oldfieldname": "rate", 
-  "trigger": "Client", 
   "fieldname": "rate", 
   "fieldtype": "Currency", 
   "reqd": 1, 
@@ -154,40 +142,35 @@
   "print_hide": 1, 
   "permlevel": 0, 
   "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Expense Head", 
   "oldfieldname": "expense_head", 
   "width": "120px", 
-  "trigger": "Client", 
+  "options": "Account", 
   "fieldname": "expense_head", 
   "fieldtype": "Link", 
   "reqd": 1, 
-  "options": "Account"
  }, 
  {
   "print_hide": 1, 
   "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Cost Center", 
   "oldfieldname": "cost_center", 
   "width": "120px", 
-  "trigger": "Client", 
+  "options": "Cost Center", 
   "fieldname": "cost_center", 
   "fieldtype": "Link", 
-  "options": "Cost Center", 
   "permlevel": 0
  }, 
  {
   "print_hide": 1, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Project Name", 
-  "permlevel": 0, 
+  "options": "Project", 
   "fieldname": "project_name", 
   "fieldtype": "Link", 
-  "options": "Project", 
+  "permlevel": 0, 
   "in_filter": 1
  }, 
  {
@@ -216,16 +199,17 @@
   "doctype": "DocField", 
   "label": "Item Group", 
   "oldfieldname": "item_group", 
+  "permlevel": 1, 
   "options": "Item Group", 
   "fieldname": "item_group", 
   "fieldtype": "Link", 
   "search_index": 1, 
   "hidden": 1, 
-  "permlevel": 1, 
   "in_filter": 1
  }, 
  {
   "print_hide": 1, 
+  "oldfieldtype": "Link", 
   "search_index": 1, 
   "doctype": "DocField", 
   "label": "Pur Order", 
@@ -233,25 +217,25 @@
   "options": "Purchase Order", 
   "fieldname": "purchase_order", 
   "fieldtype": "Link", 
-  "oldfieldtype": "Link", 
   "permlevel": 1, 
   "in_filter": 1
  }, 
  {
   "print_hide": 1, 
+  "oldfieldtype": "Data", 
   "search_index": 1, 
   "doctype": "DocField", 
   "label": "Purchase Order Item", 
   "oldfieldname": "po_detail", 
   "fieldname": "po_detail", 
   "fieldtype": "Data", 
-  "oldfieldtype": "Data", 
   "hidden": 1, 
   "permlevel": 1, 
   "in_filter": 1
  }, 
  {
   "print_hide": 1, 
+  "oldfieldtype": "Link", 
   "search_index": 1, 
   "doctype": "DocField", 
   "label": "Pur Receipt", 
@@ -259,19 +243,18 @@
   "options": "Purchase Receipt", 
   "fieldname": "purchase_receipt", 
   "fieldtype": "Link", 
-  "oldfieldtype": "Link", 
   "permlevel": 1, 
   "in_filter": 1
  }, 
  {
   "print_hide": 1, 
+  "oldfieldtype": "Data", 
   "search_index": 1, 
   "doctype": "DocField", 
   "label": "PR Detail", 
   "oldfieldname": "pr_detail", 
   "fieldname": "pr_detail", 
   "fieldtype": "Data", 
-  "oldfieldtype": "Data", 
   "hidden": 1, 
   "permlevel": 1, 
   "in_filter": 1
diff --git a/buying/doctype/purchase_order_item/purchase_order_item.txt b/buying/doctype/purchase_order_item/purchase_order_item.txt
index a2c0385..9f8151d 100755
--- a/buying/doctype/purchase_order_item/purchase_order_item.txt
+++ b/buying/doctype/purchase_order_item/purchase_order_item.txt
@@ -2,21 +2,16 @@
  {
   "owner": "Administrator", 
   "docstatus": 0, 
-  "creation": "2012-05-15 12:14:38", 
+  "creation": "2012-08-06 20:00:38", 
   "modified_by": "Administrator", 
-  "modified": "2012-08-06 15:55:11"
+  "modified": "2012-12-19 11:57:28"
  }, 
  {
-  "section_style": "Tray", 
   "istable": 1, 
-  "module": "Buying", 
-  "server_code_error": " ", 
-  "doctype": "DocType", 
   "autoname": "POD/.#####", 
   "name": "__common__", 
-  "colour": "White:FFF", 
-  "show_in_menu": 0, 
-  "version": 1
+  "doctype": "DocType", 
+  "module": "Buying"
  }, 
  {
   "name": "__common__", 
@@ -51,7 +46,6 @@
   "label": "Item Code", 
   "oldfieldname": "item_code", 
   "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
   "search_index": 1, 
@@ -62,7 +56,6 @@
  {
   "print_hide": 1, 
   "description": "If Supplier Part Number exists for given Item, it gets stored here", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Supplier Part Number", 
   "fieldname": "supplier_part_no", 
@@ -102,7 +95,6 @@
   "label": "Quantity", 
   "oldfieldname": "qty", 
   "width": "60px", 
-  "trigger": "Client", 
   "fieldname": "qty", 
   "fieldtype": "Currency", 
   "reqd": 1, 
@@ -117,10 +109,9 @@
   "permlevel": 0
  }, 
  {
-  "print_hide": 1, 
+  "print_hide": 0, 
   "doctype": "DocField", 
   "label": "Discount %", 
-  "trigger": "Client", 
   "fieldname": "discount_rate", 
   "fieldtype": "Currency", 
   "permlevel": 0
@@ -131,7 +122,6 @@
   "doctype": "DocField", 
   "label": "Rate ", 
   "oldfieldname": "import_rate", 
-  "trigger": "Client", 
   "fieldname": "import_rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -162,7 +152,6 @@
   "label": "Rate (Default Curr.) *", 
   "oldfieldname": "purchase_rate", 
   "width": "100px", 
-  "trigger": "Client", 
   "fieldname": "purchase_rate", 
   "fieldtype": "Currency", 
   "reqd": 1, 
@@ -186,22 +175,21 @@
   "doctype": "DocField", 
   "label": "Warehouse", 
   "oldfieldname": "warehouse", 
-  "trigger": "Client", 
+  "options": "Warehouse", 
   "fieldname": "warehouse", 
   "fieldtype": "Link", 
   "reqd": 0, 
   "hidden": 0, 
-  "options": "Warehouse", 
   "permlevel": 0
  }, 
  {
   "print_hide": 1, 
   "doctype": "DocField", 
   "label": "Project Name", 
-  "permlevel": 0, 
+  "options": "Project", 
   "fieldname": "project_name", 
   "fieldtype": "Link", 
-  "options": "Project", 
+  "permlevel": 0, 
   "report_hide": 0, 
   "in_filter": 1
  }, 
@@ -212,22 +200,19 @@
   "label": "UOM", 
   "oldfieldname": "uom", 
   "width": "100px", 
-  "trigger": "Client", 
+  "options": "UOM", 
   "fieldname": "uom", 
   "fieldtype": "Link", 
   "reqd": 1, 
-  "options": "UOM", 
   "permlevel": 0
  }, 
  {
   "print_hide": 1, 
   "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "UOM Conversion Factor", 
   "oldfieldname": "conversion_factor", 
   "width": "100px", 
-  "trigger": "Client", 
   "fieldname": "conversion_factor", 
   "fieldtype": "Currency", 
   "reqd": 1, 
@@ -251,7 +236,6 @@
   "print_hide": 1, 
   "no_copy": 0, 
   "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Prevdoc DocType", 
   "oldfieldname": "prevdoc_doctype", 
@@ -265,7 +249,6 @@
   "permlevel": 1, 
   "no_copy": 0, 
   "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Purchase Requisition No", 
   "oldfieldname": "prevdoc_docname", 
@@ -279,13 +262,13 @@
  }, 
  {
   "print_hide": 1, 
+  "oldfieldtype": "Date", 
   "search_index": 0, 
   "doctype": "DocField", 
   "label": "Purchase Request Date", 
   "oldfieldname": "prevdoc_date", 
   "fieldname": "prevdoc_date", 
   "fieldtype": "Date", 
-  "oldfieldtype": "Date", 
   "hidden": 1, 
   "permlevel": 1, 
   "in_filter": 1
@@ -294,7 +277,6 @@
   "print_hide": 1, 
   "no_copy": 0, 
   "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Purchase Request Detail No", 
   "oldfieldname": "prevdoc_detail_docname", 
@@ -309,21 +291,21 @@
   "search_index": 0, 
   "doctype": "DocField", 
   "label": "Supplier Quotation", 
-  "permlevel": 1, 
+  "options": "Supplier Quotation", 
   "fieldname": "supplier_quotation", 
   "fieldtype": "Link", 
   "hidden": 1, 
-  "options": "Supplier Quotation", 
+  "permlevel": 1, 
   "in_filter": 0
  }, 
  {
   "doctype": "DocField", 
   "label": "Supplier Quotation Item", 
-  "permlevel": 1, 
+  "options": "Supplier Quotation Item", 
   "fieldname": "supplier_quotation_item", 
   "fieldtype": "Link", 
   "hidden": 1, 
-  "options": "Supplier Quotation Item"
+  "permlevel": 1
  }, 
  {
   "print_hide": 1, 
@@ -331,11 +313,11 @@
   "doctype": "DocField", 
   "label": "Brand", 
   "oldfieldname": "brand", 
-  "permlevel": 1, 
+  "options": "Brand", 
   "fieldname": "brand", 
   "fieldtype": "Link", 
   "hidden": 1, 
-  "options": "Brand"
+  "permlevel": 1
  }, 
  {
   "print_hide": 1, 
@@ -343,24 +325,22 @@
   "doctype": "DocField", 
   "label": "Item Group", 
   "oldfieldname": "item_group", 
+  "permlevel": 1, 
   "options": "Item Group", 
   "fieldname": "item_group", 
   "fieldtype": "Link", 
   "search_index": 0, 
   "hidden": 1, 
-  "permlevel": 1, 
   "in_filter": 1
  }, 
  {
   "print_hide": 1, 
   "no_copy": 1, 
   "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Stock Qty", 
   "oldfieldname": "stock_qty", 
   "width": "100px", 
-  "trigger": "Client", 
   "fieldname": "stock_qty", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -380,12 +360,12 @@
  }, 
  {
   "print_hide": 1, 
+  "default": "0.00", 
   "no_copy": 1, 
   "oldfieldtype": "Currency", 
   "doctype": "DocField", 
   "label": "Billed Quantity", 
   "oldfieldname": "billed_qty", 
-  "default": "0.00", 
   "fieldname": "billed_qty", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -395,7 +375,6 @@
   "print_hide": 1, 
   "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", 
   "oldfieldtype": "Small Text", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Item Tax Rate", 
   "oldfieldname": "item_tax_rate", 
diff --git a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
index 0a5631f..97cddf7 100644
--- a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
+++ b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
@@ -2,17 +2,16 @@
  {
   "owner": "Administrator", 
   "docstatus": 0, 
-  "creation": "2012-08-01 20:07:22", 
+  "creation": "2012-08-06 20:00:36", 
   "modified_by": "Administrator", 
-  "modified": "2012-08-03 12:34:33"
+  "modified": "2012-12-19 11:56:59"
  }, 
  {
   "istable": 1, 
+  "autoname": "SQI-.#####", 
   "name": "__common__", 
-  "module": "Buying", 
   "doctype": "DocType", 
-  "version": 1, 
-  "autoname": "SQI-.#####"
+  "module": "Buying"
  }, 
  {
   "name": "__common__", 
@@ -32,7 +31,6 @@
   "label": "Item Code", 
   "oldfieldname": "item_code", 
   "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "item_code", 
   "fieldtype": "Link", 
   "search_index": 1, 
@@ -43,7 +41,6 @@
  {
   "print_hide": 1, 
   "description": "If Supplier Part Number exists for given Item, it gets stored here", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Supplier Part Number", 
   "fieldname": "supplier_part_no", 
@@ -83,7 +80,6 @@
   "label": "Quantity", 
   "oldfieldname": "qty", 
   "width": "60px", 
-  "trigger": "Client", 
   "fieldname": "qty", 
   "fieldtype": "Currency", 
   "reqd": 1, 
@@ -98,10 +94,9 @@
   "permlevel": 0
  }, 
  {
-  "print_hide": 1, 
+  "print_hide": 0, 
   "doctype": "DocField", 
   "label": "Discount %", 
-  "trigger": "Client", 
   "fieldname": "discount_rate", 
   "fieldtype": "Currency", 
   "permlevel": 0
@@ -112,7 +107,6 @@
   "doctype": "DocField", 
   "label": "Rate ", 
   "oldfieldname": "import_rate", 
-  "trigger": "Client", 
   "fieldname": "import_rate", 
   "fieldtype": "Currency", 
   "hidden": 0, 
@@ -143,7 +137,6 @@
   "label": "Rate (Default Curr.) *", 
   "oldfieldname": "purchase_rate", 
   "width": "100px", 
-  "trigger": "Client", 
   "fieldname": "purchase_rate", 
   "fieldtype": "Currency", 
   "reqd": 1, 
@@ -167,7 +160,6 @@
   "doctype": "DocField", 
   "label": "Warehouse", 
   "oldfieldname": "warehouse", 
-  "trigger": "Client", 
   "fieldname": "warehouse", 
   "fieldtype": "Link", 
   "reqd": 0, 
@@ -179,10 +171,10 @@
   "print_hide": 1, 
   "doctype": "DocField", 
   "label": "Project Name", 
-  "permlevel": 0, 
+  "options": "Project", 
   "fieldname": "project_name", 
   "fieldtype": "Link", 
-  "options": "Project", 
+  "permlevel": 0, 
   "report_hide": 0, 
   "in_filter": 1
  }, 
@@ -193,18 +185,16 @@
   "label": "UOM", 
   "oldfieldname": "uom", 
   "width": "100px", 
-  "trigger": "Client", 
+  "options": "UOM", 
   "fieldname": "uom", 
   "fieldtype": "Link", 
   "reqd": 1, 
-  "options": "UOM", 
   "permlevel": 0
  }, 
  {
   "print_hide": 1, 
   "no_copy": 0, 
   "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Prevdoc DocType", 
   "oldfieldname": "prevdoc_doctype", 
@@ -218,7 +208,6 @@
   "permlevel": 1, 
   "no_copy": 0, 
   "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Purchase Request No", 
   "oldfieldname": "prevdoc_docname", 
@@ -232,13 +221,13 @@
  }, 
  {
   "print_hide": 1, 
+  "oldfieldtype": "Date", 
   "search_index": 0, 
   "doctype": "DocField", 
   "label": "Purchase Request Date", 
   "oldfieldname": "prevdoc_date", 
   "fieldname": "prevdoc_date", 
   "fieldtype": "Date", 
-  "oldfieldtype": "Date", 
   "hidden": 1, 
   "permlevel": 1, 
   "in_filter": 1
@@ -247,7 +236,6 @@
   "print_hide": 1, 
   "no_copy": 0, 
   "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Purchase Request Detail No", 
   "oldfieldname": "prevdoc_detail_docname", 
@@ -264,11 +252,11 @@
   "doctype": "DocField", 
   "label": "Brand", 
   "oldfieldname": "brand", 
-  "permlevel": 1, 
+  "options": "Brand", 
   "fieldname": "brand", 
   "fieldtype": "Link", 
   "hidden": 1, 
-  "options": "Brand"
+  "permlevel": 1
  }, 
  {
   "print_hide": 1, 
@@ -276,19 +264,18 @@
   "doctype": "DocField", 
   "label": "Item Group", 
   "oldfieldname": "item_group", 
+  "permlevel": 1, 
   "options": "Item Group", 
   "fieldname": "item_group", 
   "fieldtype": "Link", 
   "search_index": 0, 
   "hidden": 1, 
-  "permlevel": 1, 
   "in_filter": 1
  }, 
  {
   "print_hide": 1, 
   "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", 
   "oldfieldtype": "Small Text", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Item Tax Rate", 
   "oldfieldname": "item_tax_rate", 
diff --git a/patches/december_2012/remove_quotation_next_contact.py b/patches/december_2012/remove_quotation_next_contact.py
new file mode 100644
index 0000000..d7e0dc7
--- /dev/null
+++ b/patches/december_2012/remove_quotation_next_contact.py
@@ -0,0 +1,16 @@
+from __future__ import unicode_literals
+import webnotes
+
+def execute():
+	from webnotes.widgets.form.assign_to import add
+	for t in webnotes.conn.sql("""select * from tabQuotation 
+		where ifnull(contact_by, '')!=''""", as_dict=1):
+		add({
+			'doctype': "Quotation",
+			'name': t['name'],
+			'assign_to': t['contact_by'],
+			'assigned_by': t['owner'],
+			'description': "Contact regarding quotation.",
+			'date': t['creation'],
+			"no_notification": True
+		})
\ No newline at end of file
diff --git a/patches/patch_list.py b/patches/patch_list.py
index 77deb00..b97e47b 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -544,6 +544,10 @@
 	},
 	{
 		'patch_module': 'patches.december_2012',
+		'patch_file': 'remove_quotation_next_contact',
+	},
+	{
+		'patch_module': 'patches.december_2012',
 		'patch_file': 'stock_entry_cleanup',
 	},
 ]
\ No newline at end of file
diff --git a/selling/doctype/customer/customer.py b/selling/doctype/customer/customer.py
index 158525c..a3c9612 100644
--- a/selling/doctype/customer/customer.py
+++ b/selling/doctype/customer/customer.py
@@ -132,7 +132,9 @@
 			msgprint("Please Select Company under which you want to create account head")
 
 	def update_credit_days_limit(self):
-		sql("update tabAccount set credit_days = '%s', credit_limit = '%s' where name = '%s'" % (self.doc.credit_days, self.doc.credit_limit, self.doc.name + " - " + self.get_company_abbr()))
+		sql("""update tabAccount set credit_days = %s, credit_limit = %s 
+			where name = %s""", (self.doc.credit_days or 0, self.doc.credit_limit or 0, 
+				self.doc.name + " - " + self.get_company_abbr()))
 
 	def create_lead_address_contact(self):
 		if self.doc.lead_name:
diff --git a/selling/doctype/lead/lead.py b/selling/doctype/lead/lead.py
index d844b8d..63f9bd0 100644
--- a/selling/doctype/lead/lead.py
+++ b/selling/doctype/lead/lead.py
@@ -80,5 +80,5 @@
 	def on_trash(self):
 		webnotes.conn.sql("""update tabCommunication set lead='' where lead=%s""",
 			self.doc.name)
-		webnotes.conn.sql("""update `tabSupport Ticket` set contact='' where contact=%s""",
+		webnotes.conn.sql("""update `tabSupport Ticket` set lead='' where lead=%s""",
 			self.doc.name)
\ No newline at end of file
diff --git a/selling/doctype/quotation/quotation.js b/selling/doctype/quotation/quotation.js
index 1b0a774..3673b07 100644
--- a/selling/doctype/quotation/quotation.js
+++ b/selling/doctype/quotation/quotation.js
@@ -47,11 +47,6 @@
 			hide_field(['customer','customer_address','contact_person', 'customer_name','contact_display', 'customer_group']);
 		}
 	}
-	//cur_frm.cscript.make_communication_body();
-	
-	if(cur_frm.fields_dict.contact_by.df.options.match(/^Profile/)) {
-		cur_frm.fields_dict.contact_by.get_query = erpnext.utils.profile_query;
-	}
 }
 
 cur_frm.cscript.onload_post_render = function(doc, dt, dn) {
diff --git a/selling/doctype/quotation/quotation.py b/selling/doctype/quotation/quotation.py
index 37a750f..0e75544 100644
--- a/selling/doctype/quotation/quotation.py
+++ b/selling/doctype/quotation/quotation.py
@@ -195,58 +195,11 @@
 		self.doc.in_words_export = sales_com_obj.get_total_in_words(self.doc.currency, self.doc.rounded_total_export)
 
 	def on_update(self):
-		# Add to calendar
-		if self.doc.contact_date and self.doc.contact_date_ref != self.doc.contact_date:
-			if self.doc.contact_by:
-				self.add_calendar_event()
-			webnotes.conn.set(self.doc, 'contact_date_ref',self.doc.contact_date)
-		
 		# Set Quotation Status
 		webnotes.conn.set(self.doc, 'status', 'Draft')
 
 		# subject for follow
 		self.doc.subject = '[%(status)s] To %(customer)s worth %(currency)s %(grand_total)s' % self.doc.fields
-
-	
-	# Add to Calendar
-	# ====================================================================================================================
-	def add_calendar_event(self):
-		desc=''
-		user_lst =[]
-		if self.doc.customer:
-			if self.doc.contact_person:
-				desc = 'Contact '+cstr(self.doc.contact_person)
-			else:
-				desc = 'Contact customer '+cstr(self.doc.customer)
-		elif self.doc.lead:
-			if self.doc.lead_name:
-				desc = 'Contact '+cstr(self.doc.lead_name)
-			else:
-				desc = 'Contact lead '+cstr(self.doc.lead)
-		desc = desc+ '.By : ' + cstr(self.doc.contact_by)
-		
-		if self.doc.to_discuss:
-			desc = desc+' To Discuss : ' + cstr(self.doc.to_discuss)
-		
-		ev = Document('Event')
-		ev.description = desc
-		ev.event_date = self.doc.contact_date
-		ev.event_hour = '10:00'
-		ev.event_type = 'Private'
-		ev.ref_type = 'Opportunity'
-		ev.ref_name = self.doc.name
-		ev.save(1)
-		
-		user_lst.append(self.doc.owner)
-		
-		chk = sql("select t1.name from `tabProfile` t1, `tabSales Person` t2 where t2.email_id = t1.name and t2.name=%s",self.doc.contact_by)
-		if chk:
-			user_lst.append(chk[0][0])
-		
-		for d in user_lst:
-			ch = addchild(ev, 'event_individuals', 'Event User', 0)
-			ch.person = d
-			ch.save(1)
 	
 	#update enquiry
 	#------------------
diff --git a/selling/doctype/quotation/quotation.txt b/selling/doctype/quotation/quotation.txt
index 2c9f880..3ebdb80 100644
--- a/selling/doctype/quotation/quotation.txt
+++ b/selling/doctype/quotation/quotation.txt
@@ -2,9 +2,9 @@
  {
   "owner": "Administrator", 
   "docstatus": 0, 
-  "creation": "2012-11-28 11:26:20", 
+  "creation": "2012-12-07 15:15:27", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-03 17:10:41"
+  "modified": "2012-12-19 12:13:38"
  }, 
  {
   "is_submittable": 1, 
@@ -51,7 +51,6 @@
   "description": "To manage multiple series please go to Setup > Manage Series", 
   "no_copy": 1, 
   "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Naming Series", 
   "oldfieldname": "naming_series", 
@@ -64,12 +63,10 @@
  {
   "print_hide": 1, 
   "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Quotation To", 
   "oldfieldname": "quotation_to", 
   "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "quotation_to", 
   "fieldtype": "Select", 
   "reqd": 1, 
@@ -80,12 +77,10 @@
  {
   "print_hide": 1, 
   "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Customer", 
   "oldfieldname": "customer", 
   "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "customer", 
   "fieldtype": "Link", 
   "search_index": 1, 
@@ -96,20 +91,17 @@
  {
   "print_hide": 1, 
   "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Lead", 
   "oldfieldname": "lead", 
-  "permlevel": 0, 
-  "trigger": "Client", 
+  "options": "Lead", 
   "fieldname": "lead", 
   "fieldtype": "Link", 
   "hidden": 0, 
-  "options": "Lead", 
+  "permlevel": 0, 
   "in_filter": 1
  }, 
  {
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Lead Name", 
   "fieldname": "lead_name", 
@@ -119,7 +111,6 @@
   "in_filter": 0
  }, 
  {
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Customer Name", 
   "fieldname": "customer_name", 
@@ -138,7 +129,6 @@
  {
   "print_hide": 0, 
   "oldfieldtype": "Small Text", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Address", 
   "oldfieldname": "customer_address", 
@@ -152,7 +142,6 @@
  }, 
  {
   "print_hide": 0, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Contact", 
   "fieldname": "contact_display", 
@@ -163,7 +152,6 @@
  }, 
  {
   "print_hide": 0, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Mobile No", 
   "fieldname": "contact_mobile", 
@@ -173,7 +161,6 @@
  }, 
  {
   "print_hide": 1, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Contact Email", 
   "fieldname": "contact_email", 
@@ -183,7 +170,6 @@
  }, 
  {
   "oldfieldtype": "Column Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "width": "50%", 
   "fieldname": "column_break1", 
@@ -210,7 +196,6 @@
   "print_hide": 1, 
   "default": "Sales", 
   "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Order Type", 
   "oldfieldname": "order_type", 
@@ -225,7 +210,6 @@
  {
   "print_hide": 0, 
   "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Items", 
   "fieldname": "items", 
@@ -235,7 +219,6 @@
  }, 
  {
   "oldfieldtype": "Table", 
-  "colour": "White:FFF", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
   "label": "Quotation Items", 
@@ -278,7 +261,6 @@
   "oldfieldtype": "Button", 
   "doctype": "DocField", 
   "label": "Re-Calculate Values", 
-  "trigger": "Client", 
   "fieldname": "recalculate_values", 
   "fieldtype": "Button", 
   "permlevel": 0
@@ -295,7 +277,6 @@
   "description": "To create Quotation against Opportunity, Select Opportunity No. and click on 'Pull Opportunity Details' ", 
   "no_copy": 0, 
   "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Opportunity No", 
   "oldfieldname": "enq_no", 
@@ -314,7 +295,6 @@
   "oldfieldtype": "Button", 
   "doctype": "DocField", 
   "label": "Pull Opportunity Detail", 
-  "trigger": "Client", 
   "fieldname": "pull_enquiry_detail", 
   "fieldtype": "Button", 
   "hidden": 0, 
@@ -322,7 +302,6 @@
   "report_hide": 0
  }, 
  {
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Price List and Currency", 
   "fieldname": "section_break0", 
@@ -334,12 +313,10 @@
   "description": "Select the price list as entered in \"Price List\" master. This will pull the reference rates of items against this price list as specified in \"Item\" master.", 
   "permlevel": 0, 
   "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Price List", 
   "oldfieldname": "price_list_name", 
   "width": "100px", 
-  "trigger": "Client", 
   "fieldname": "price_list_name", 
   "fieldtype": "Select", 
   "search_index": 0, 
@@ -350,7 +327,6 @@
  {
   "print_hide": 1, 
   "description": "Select the currency in which price list is maintained", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Price List Currency", 
   "options": "link:Currency", 
@@ -362,7 +338,6 @@
  {
   "print_hide": 1, 
   "description": "Rate at which Price list currency is converted to company's base currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Price List Currency Conversion Rate", 
   "fieldname": "plc_conversion_rate", 
@@ -382,12 +357,10 @@
   "description": "Customer's currency - If you want to select a currency that is not the default currency, then you must also specify the Currency Conversion Rate.", 
   "permlevel": 0, 
   "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Currency", 
   "oldfieldname": "currency", 
   "width": "100px", 
-  "trigger": "Client", 
   "fieldname": "currency", 
   "fieldtype": "Select", 
   "search_index": 0, 
@@ -400,12 +373,10 @@
   "description": "Rate at which customer's currency is converted to company's base currency", 
   "default": "1.00", 
   "oldfieldtype": "Currency", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Conversion Rate", 
   "oldfieldname": "conversion_rate", 
   "width": "100px", 
-  "trigger": "Client", 
   "fieldname": "conversion_rate", 
   "fieldtype": "Float", 
   "reqd": 1, 
@@ -413,7 +384,6 @@
  }, 
  {
   "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Taxes", 
   "fieldname": "taxes", 
@@ -426,11 +396,10 @@
   "doctype": "DocField", 
   "label": "Sales Taxes and Charges", 
   "oldfieldname": "charge", 
-  "trigger": "Client", 
+  "options": "Sales Taxes and Charges Master", 
   "fieldname": "charge", 
   "fieldtype": "Link", 
   "hidden": 0, 
-  "options": "Sales Taxes and Charges Master", 
   "permlevel": 0
  }, 
  {
@@ -438,7 +407,6 @@
   "oldfieldtype": "Button", 
   "doctype": "DocField", 
   "label": "Get Taxes and Charges", 
-  "trigger": "Client", 
   "fieldname": "get_charges", 
   "fieldtype": "Button", 
   "hidden": 0, 
@@ -457,10 +425,8 @@
  {
   "print_hide": 1, 
   "oldfieldtype": "Button", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Calculate Taxes and Charges", 
-  "trigger": "Client", 
   "fieldname": "calculate_charges", 
   "fieldtype": "Button", 
   "permlevel": 0
@@ -487,7 +453,6 @@
  {
   "print_hide": 1, 
   "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Totals", 
   "fieldname": "totals", 
@@ -515,7 +480,6 @@
   "label": "Rounded Total", 
   "oldfieldname": "rounded_total", 
   "width": "200px", 
-  "trigger": "Client", 
   "fieldname": "rounded_total", 
   "fieldtype": "Currency", 
   "permlevel": 1
@@ -525,7 +489,6 @@
   "description": "In Words will be visible once you save the Quotation.", 
   "no_copy": 0, 
   "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "In Words", 
   "oldfieldname": "in_words", 
@@ -573,7 +536,6 @@
   "print_hide": 0, 
   "no_copy": 0, 
   "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "In Words", 
   "oldfieldname": "in_words_export", 
@@ -586,7 +548,6 @@
   "print_hide": 0, 
   "description": "Add Terms and Conditions for the Quotation like Payment Terms, Validity of Offer etc. You can also prepare a Terms and Conditions Master and use the Template", 
   "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Terms and Conditions", 
   "fieldname": "terms_section_break", 
@@ -649,26 +610,22 @@
  }, 
  {
   "print_hide": 1, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Customer Address", 
-  "trigger": "Client", 
+  "options": "Address", 
   "fieldname": "customer_address", 
   "fieldtype": "Link", 
   "hidden": 0, 
-  "options": "Address", 
   "permlevel": 0, 
   "in_filter": 1
  }, 
  {
   "print_hide": 1, 
   "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Contact Person", 
   "oldfieldname": "contact_person", 
   "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "contact_person", 
   "fieldtype": "Link", 
   "reqd": 0, 
@@ -687,11 +644,9 @@
   "print_hide": 1, 
   "description": "Will be fetched from Customer", 
   "search_index": 0, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Territory", 
   "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "territory", 
   "fieldtype": "Link", 
   "reqd": 1, 
@@ -702,12 +657,10 @@
  {
   "print_hide": 1, 
   "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Customer Group", 
   "oldfieldname": "customer_group", 
   "permlevel": 0, 
-  "trigger": "Client", 
   "fieldname": "customer_group", 
   "fieldtype": "Link", 
   "search_index": 0, 
@@ -719,7 +672,6 @@
   "print_hide": 1, 
   "description": "Filling in additional information about the Quotation will help you analyze your data better.", 
   "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "More Info", 
   "fieldname": "more_info", 
@@ -743,12 +695,10 @@
   "description": "Select the relevant company name if you have multiple companies.", 
   "permlevel": 0, 
   "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Company", 
   "oldfieldname": "company", 
   "width": "150px", 
-  "trigger": "Client", 
   "fieldname": "company", 
   "fieldtype": "Link", 
   "search_index": 0, 
@@ -758,8 +708,21 @@
  }, 
  {
   "print_hide": 1, 
+  "no_copy": 0, 
   "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
+  "doctype": "DocField", 
+  "label": "Source", 
+  "oldfieldname": "source", 
+  "permlevel": 0, 
+  "fieldname": "source", 
+  "fieldtype": "Select", 
+  "hidden": 0, 
+  "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", 
+  "report_hide": 0
+ }, 
+ {
+  "print_hide": 1, 
+  "oldfieldtype": "Select", 
   "doctype": "DocField", 
   "label": "Fiscal Year", 
   "oldfieldname": "fiscal_year", 
@@ -775,7 +738,6 @@
   "print_hide": 1, 
   "no_copy": 0, 
   "oldfieldtype": "Text", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Opportunity Item", 
   "oldfieldname": "enq_det", 
@@ -787,61 +749,6 @@
  }, 
  {
   "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Source", 
-  "oldfieldname": "source", 
-  "permlevel": 0, 
-  "fieldname": "source", 
-  "fieldtype": "Select", 
-  "hidden": 0, 
-  "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", 
-  "report_hide": 0
- }, 
- {
-  "print_hide": 1, 
-  "no_copy": 0, 
-  "oldfieldtype": "Link", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Campaign", 
-  "oldfieldname": "campaign", 
-  "permlevel": 0, 
-  "fieldname": "campaign", 
-  "fieldtype": "Link", 
-  "hidden": 0, 
-  "options": "Campaign", 
-  "report_hide": 0
- }, 
- {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Cancel Reason", 
-  "oldfieldname": "cancel_reason", 
-  "fieldname": "cancel_reason", 
-  "fieldtype": "Data", 
-  "permlevel": 1, 
-  "report_hide": 0
- }, 
- {
-  "print_hide": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Small Text", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Quotation Lost Reason", 
-  "oldfieldname": "order_lost_reason", 
-  "fieldname": "order_lost_reason", 
-  "fieldtype": "Small Text", 
-  "permlevel": 1
- }, 
- {
-  "print_hide": 1, 
   "oldfieldtype": "Column Break", 
   "doctype": "DocField", 
   "width": "50%", 
@@ -854,7 +761,6 @@
   "permlevel": 1, 
   "no_copy": 1, 
   "oldfieldtype": "Select", 
-  "colour": "White:FFF", 
   "allow_on_submit": 0, 
   "doctype": "DocField", 
   "label": "Status", 
@@ -869,6 +775,32 @@
  }, 
  {
   "print_hide": 1, 
+  "no_copy": 0, 
+  "oldfieldtype": "Link", 
+  "doctype": "DocField", 
+  "label": "Campaign", 
+  "oldfieldname": "campaign", 
+  "permlevel": 0, 
+  "fieldname": "campaign", 
+  "fieldtype": "Link", 
+  "hidden": 0, 
+  "options": "Campaign", 
+  "report_hide": 0
+ }, 
+ {
+  "print_hide": 1, 
+  "no_copy": 1, 
+  "oldfieldtype": "Small Text", 
+  "allow_on_submit": 1, 
+  "doctype": "DocField", 
+  "label": "Quotation Lost Reason", 
+  "oldfieldname": "order_lost_reason", 
+  "fieldname": "order_lost_reason", 
+  "fieldtype": "Small Text", 
+  "permlevel": 0
+ }, 
+ {
+  "print_hide": 1, 
   "no_copy": 1, 
   "oldfieldtype": "Link", 
   "allow_on_submit": 1, 
@@ -883,52 +815,6 @@
  }, 
  {
   "print_hide": 1, 
-  "description": "Your sales person who will contact the customer/lead in future", 
-  "oldfieldtype": "Link", 
-  "doctype": "DocField", 
-  "label": "Next Contact By", 
-  "oldfieldname": "contact_by", 
-  "options": "Profile", 
-  "fieldname": "contact_by", 
-  "fieldtype": "Link", 
-  "permlevel": 0
- }, 
- {
-  "print_hide": 1, 
-  "description": "Your sales person will get a reminder on this date to contact the customer/lead", 
-  "oldfieldtype": "Date", 
-  "doctype": "DocField", 
-  "label": "Next Contact Date", 
-  "oldfieldname": "contact_date", 
-  "fieldname": "contact_date", 
-  "fieldtype": "Date", 
-  "permlevel": 0
- }, 
- {
-  "print_hide": 1, 
-  "description": "Date on which the lead/customer was last contacted", 
-  "no_copy": 1, 
-  "oldfieldtype": "Date", 
-  "colour": "White:FFF", 
-  "doctype": "DocField", 
-  "label": "Last Contact Date", 
-  "oldfieldname": "last_contact_date", 
-  "fieldname": "last_contact_date", 
-  "fieldtype": "Date", 
-  "permlevel": 1
- }, 
- {
-  "print_hide": 1, 
-  "oldfieldtype": "Small Text", 
-  "doctype": "DocField", 
-  "label": "To Discuss", 
-  "oldfieldname": "to_discuss", 
-  "fieldname": "to_discuss", 
-  "fieldtype": "Small Text", 
-  "permlevel": 0
- }, 
- {
-  "print_hide": 1, 
   "no_copy": 1, 
   "oldfieldtype": "Data", 
   "doctype": "DocField", 
@@ -956,7 +842,6 @@
   "print_hide": 1, 
   "description": "Keep a track on communications regarding this Quotation. This will help you remember earlier communications in case the Customer comes back again", 
   "oldfieldtype": "Section Break", 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "Communication History", 
   "fieldname": "communication_history", 
@@ -966,7 +851,6 @@
  {
   "print_hide": 1, 
   "oldfieldtype": "Table", 
-  "colour": "White:FFF", 
   "allow_on_submit": 1, 
   "doctype": "DocField", 
   "label": "Communication HTML", 
@@ -979,7 +863,6 @@
  {
   "print_hide": 1, 
   "no_copy": 1, 
-  "colour": "White:FFF", 
   "doctype": "DocField", 
   "label": "File List", 
   "fieldname": "file_list", 
@@ -988,13 +871,33 @@
   "permlevel": 0
  }, 
  {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
+  "role": "Sales Manager", 
+  "permlevel": 1
+ }, 
+ {
   "amend": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
   "submit": 1, 
   "write": 1, 
-  "role": "Sales User", 
   "cancel": 1, 
+  "role": "Sales Manager", 
+  "permlevel": 0
+ }, 
+ {
+  "amend": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "submit": 1, 
+  "write": 1, 
+  "cancel": 1, 
+  "role": "Sales User", 
   "permlevel": 0
  }, 
  {
@@ -1003,15 +906,29 @@
   "doctype": "DocPerm", 
   "submit": 0, 
   "write": 0, 
-  "role": "Sales User", 
   "cancel": 0, 
+  "role": "Sales User", 
   "permlevel": 1
  }, 
  {
+  "amend": 0, 
+  "create": 0, 
   "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
   "role": "Customer", 
-  "permlevel": 0, 
-  "match": "customer_name"
+  "permlevel": 0
+ }, 
+ {
+  "amend": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "submit": 1, 
+  "write": 1, 
+  "cancel": 1, 
+  "role": "Maintenance Manager", 
+  "permlevel": 0
  }, 
  {
   "amend": 0, 
@@ -1019,32 +936,7 @@
   "doctype": "DocPerm", 
   "submit": 0, 
   "write": 0, 
-  "role": "Sales Manager", 
   "cancel": 0, 
-  "permlevel": 1
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "role": "Sales Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "amend": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "submit": 1, 
-  "write": 1, 
-  "role": "Maintenance Manager", 
-  "cancel": 1, 
-  "permlevel": 0
- }, 
- {
-  "doctype": "DocPerm", 
   "role": "Maintenance Manager", 
   "permlevel": 1
  }, 
@@ -1054,12 +946,17 @@
   "doctype": "DocPerm", 
   "submit": 1, 
   "write": 1, 
+  "cancel": 1, 
   "role": "Maintenance User", 
-  "cancel": 1, 
   "permlevel": 0
  }, 
  {
+  "amend": 0, 
+  "create": 0, 
   "doctype": "DocPerm", 
+  "submit": 0, 
+  "write": 0, 
+  "cancel": 0, 
   "role": "Maintenance User", 
   "permlevel": 1
  }
diff --git a/utilities/__init__.py b/utilities/__init__.py
index b4ce38a..486568d 100644
--- a/utilities/__init__.py
+++ b/utilities/__init__.py
@@ -49,6 +49,7 @@
 		where tabDocType.module=%s
 			and tabDocType.name = tabReport.ref_doctype
 			and tabReport.docstatus in (0, NULL)
+			and ifnull(tabReport.disabled,0) != 1
 			order by tabReport.name 
 			limit %s, %s""" % \
 		("%s", cint(limit_start), cint(limit_page_length)), (module,), as_dict=True)
\ No newline at end of file