Merge pull request #5096 from nabinhait/test_case_fix
Test case fix
diff --git a/erpnext/accounts/doctype/asset/asset.json b/erpnext/accounts/doctype/asset/asset.json
index 6c9a0df..bf46074 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 bad635f..0f0d330 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,
diff --git a/erpnext/accounts/doctype/asset_category/test_asset_category.py b/erpnext/accounts/doctype/asset_category/test_asset_category.py
index d119066..9bfcc9a 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 @@
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 d643a05..ea6e88d 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 @@
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)
diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py
index bbc8671..3d6fb54 100644
--- a/erpnext/config/accounts.py
+++ b/erpnext/config/accounts.py
@@ -83,6 +83,14 @@
"type": "doctype",
"name": "Item",
},
+ {
+ "type": "doctype",
+ "name": "Asset",
+ },
+ {
+ "type": "doctype",
+ "name": "Asset Category",
+ }
]
},
{