From 7fcec4118bbf9d14959fda69a1b02432823df591 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Wed, 30 Mar 2016 15:05:15 +0530
Subject: [PATCH 1/3] [fix] Test case

---
 .../accounts/doctype/asset_category/test_asset_category.py    | 4 ++--
 .../request_for_quotation/test_request_for_quotation.py       | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/erpnext/accounts/doctype/asset_category/test_asset_category.py b/erpnext/accounts/doctype/asset_category/test_asset_category.py
index d119066189a..9bfcc9a7bf8 100644
--- a/erpnext/accounts/doctype/asset_category/test_asset_category.py
+++ b/erpnext/accounts/doctype/asset_category/test_asset_category.py
@@ -13,8 +13,8 @@ class TestAssetCategory(unittest.TestCase):
 		
 		self.assertRaises(frappe.MandatoryError, asset_category.insert)
 		
-		asset_category.number_of_depreciations = 5
-		asset_category.number_of_months_in_a_period = 12
+		asset_category.number_of_depreciations = 3
+		asset_category.number_of_months_in_a_period = 3
 		asset_category.append("accounts", {
 			"company": "_Test Company",
 			"fixed_asset_account": "_Test Fixed Asset - _TC",
diff --git a/erpnext/buying/doctype/request_for_quotation/test_request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/test_request_for_quotation.py
index d643a051ba0..ea6e88dc287 100644
--- a/erpnext/buying/doctype/request_for_quotation/test_request_for_quotation.py
+++ b/erpnext/buying/doctype/request_for_quotation/test_request_for_quotation.py
@@ -51,6 +51,7 @@ def make_request_for_quotation():
 	rfq.status = 'Draft'
 	rfq.company = '_Test Company'
 	rfq.response = 'Test Data'
+	rfq.message_for_supplier = "Please supply the specified items at the best possible rates"
 	
 	for data in supplier_data:
 		rfq.append('suppliers', data)

From 684052e978a33cf47817f3ef3e37bbc6ad07bb55 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Wed, 30 Mar 2016 15:05:46 +0530
Subject: [PATCH 2/3] [fix] Permissions added in asset and asset category

---
 erpnext/accounts/doctype/asset/asset.json     | 22 ++++++++++++++++++-
 .../asset_category/asset_category.json        | 22 ++++++++++++++++++-
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/erpnext/accounts/doctype/asset/asset.json b/erpnext/accounts/doctype/asset/asset.json
index 6c9a0df7126..bf46074a057 100644
--- a/erpnext/accounts/doctype/asset/asset.json
+++ b/erpnext/accounts/doctype/asset/asset.json
@@ -583,7 +583,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-03-28 15:57:21.022765", 
+ "modified": "2016-03-30 05:25:56.710106", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Asset", 
@@ -609,6 +609,26 @@
    "share": 1, 
    "submit": 1, 
    "write": 1
+  }, 
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
   }
  ], 
  "read_only": 0, 
diff --git a/erpnext/accounts/doctype/asset_category/asset_category.json b/erpnext/accounts/doctype/asset_category/asset_category.json
index bad635f8c51..0f0d330aa3a 100644
--- a/erpnext/accounts/doctype/asset_category/asset_category.json
+++ b/erpnext/accounts/doctype/asset_category/asset_category.json
@@ -196,7 +196,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-03-28 12:45:42.131821", 
+ "modified": "2016-03-30 05:25:38.518509", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Asset Category", 
@@ -222,6 +222,26 @@
    "share": 1, 
    "submit": 0, 
    "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 1, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
   }
  ], 
  "read_only": 0, 

From 9501a1e0341bda3f055f85140dbe8b5df6cc69ec Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Wed, 30 Mar 2016 15:06:19 +0530
Subject: [PATCH 3/3] Links for fixed assets added in accounts module page

---
 erpnext/config/accounts.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py
index bbc86719fcd..3d6fb544a0f 100644
--- a/erpnext/config/accounts.py
+++ b/erpnext/config/accounts.py
@@ -83,6 +83,14 @@ def get_data():
 					"type": "doctype",
 					"name": "Item",
 				},
+				{
+					"type": "doctype",
+					"name": "Asset",
+				},
+				{
+					"type": "doctype",
+					"name": "Asset Category",
+				}
 			]
 		},
 		{