rename Purchase Request to Material Request

2026-05-30 18:34:48 +00:00 · 2013-02-18 13:49:15 +05:30
parent de46f43dc1
commit 236cc173ad
50 changed files with 1769 additions and 323 deletions
--- a/Mapper/Material
+++ b/Mapper/Material
@@ -0,0 +1,125 @@
+[
+ {
+  "creation": "2010-08-08 17:09:34", 
+  "docstatus": 0, 
+  "modified": "2013-02-18 13:41:16", 
+  "modified_by": "Administrator", 
+  "owner": "Administrator"
+ }, 
+ {
+  "doctype": "Table Mapper Detail", 
+  "name": "__common__", 
+  "parent": "Material Request-Purchase Order", 
+  "parentfield": "table_mapper_details", 
+  "parenttype": "DocType Mapper"
+ }, 
+ {
+  "doctype": "Field Mapper Detail", 
+  "name": "__common__", 
+  "parent": "Material Request-Purchase Order", 
+  "parentfield": "field_mapper_details", 
+  "parenttype": "DocType Mapper"
+ }, 
+ {
+  "doctype": "DocType Mapper", 
+  "from_doctype": "Material Request", 
+  "module": "Buying", 
+  "name": "__common__", 
+  "ref_doc_submitted": 1, 
+  "to_doctype": "Purchase Order"
+ }, 
+ {
+  "doctype": "DocType Mapper", 
+  "name": "Material Request-Purchase Order"
+ }, 
+ {
+  "checking_operator": "=", 
+  "doctype": "Field Mapper Detail", 
+  "from_field": "company", 
+  "map": "Yes", 
+  "match_id": 0, 
+  "to_field": "company"
+ }, 
+ {
+  "doctype": "Field Mapper Detail", 
+  "from_field": "parenttype", 
+  "map": "Yes", 
+  "match_id": 1, 
+  "to_field": "prevdoc_doctype"
+ }, 
+ {
+  "doctype": "Field Mapper Detail", 
+  "from_field": "parent", 
+  "map": "Yes", 
+  "match_id": 1, 
+  "to_field": "prevdoc_docname"
+ }, 
+ {
+  "doctype": "Field Mapper Detail", 
+  "from_field": "name", 
+  "map": "Yes", 
+  "match_id": 1, 
+  "to_field": "prevdoc_detail_docname"
+ }, 
+ {
+  "doctype": "Field Mapper Detail", 
+  "from_field": "uom", 
+  "map": "Yes", 
+  "match_id": 1, 
+  "to_field": "stock_uom"
+ }, 
+ {
+  "doctype": "Field Mapper Detail", 
+  "from_field": "eval:flt(1)", 
+  "map": "Yes", 
+  "match_id": 1, 
+  "to_field": "conversion_factor"
+ }, 
+ {
+  "doctype": "Field Mapper Detail", 
+  "from_field": "eval:flt(obj.qty) - flt(obj.ordered_qty)", 
+  "map": "Yes", 
+  "match_id": 1, 
+  "to_field": "stock_qty"
+ }, 
+ {
+  "doctype": "Field Mapper Detail", 
+  "from_field": "eval:flt(obj.qty) - flt(obj.ordered_qty)", 
+  "map": "Yes", 
+  "match_id": 1, 
+  "to_field": "qty"
+ }, 
+ {
+  "doctype": "Field Mapper Detail", 
+  "from_field": "schedule_date", 
+  "map": "Yes", 
+  "match_id": 1, 
+  "to_field": "schedule_date"
+ }, 
+ {
+  "checking_operator": ">=", 
+  "doctype": "Field Mapper Detail", 
+  "from_field": "transaction_date", 
+  "map": "No", 
+  "match_id": 0, 
+  "to_field": "transaction_date"
+ }, 
+ {
+  "doctype": "Table Mapper Detail", 
+  "from_table": "Material Request", 
+  "match_id": 0, 
+  "reference_key": "prevdoc_docname", 
+  "to_table": "Purchase Order", 
+  "validation_logic": "docstatus = 1"
+ }, 
+ {
+  "doctype": "Table Mapper Detail", 
+  "from_field": "indent_details", 
+  "from_table": "Material Request Item", 
+  "match_id": 1, 
+  "reference_doctype_key": "prevdoc_doctype", 
+  "to_field": "po_details", 
+  "to_table": "Purchase Order Item", 
+  "validation_logic": "qty > ifnull(ordered_qty,0) and docstatus =1"
+ }
+]
--- a/Quotation/Material
+++ b/Quotation/Material
@@ -0,0 +1,90 @@
+[
+ {
+  "creation": "2012-08-06 20:02:53", 
+  "docstatus": 0, 
+  "modified": "2013-02-18 13:41:13", 
+  "modified_by": "Administrator", 
+  "owner": "Administrator"
+ }, 
+ {
+  "doctype": "Table Mapper Detail", 
+  "name": "__common__", 
+  "parent": "Material Request-Supplier Quotation", 
+  "parentfield": "table_mapper_details", 
+  "parenttype": "DocType Mapper"
+ }, 
+ {
+  "doctype": "Field Mapper Detail", 
+  "name": "__common__", 
+  "parent": "Material Request-Supplier Quotation", 
+  "parentfield": "field_mapper_details", 
+  "parenttype": "DocType Mapper"
+ }, 
+ {
+  "doctype": "DocType Mapper", 
+  "from_doctype": "Material Request", 
+  "module": "Buying", 
+  "name": "__common__", 
+  "ref_doc_submitted": 1, 
+  "to_doctype": "Supplier Quotation"
+ }, 
+ {
+  "doctype": "DocType Mapper", 
+  "name": "Material Request-Supplier Quotation"
+ }, 
+ {
+  "checking_operator": "=", 
+  "doctype": "Field Mapper Detail", 
+  "from_field": "company", 
+  "map": "Yes", 
+  "match_id": 0, 
+  "to_field": "company"
+ }, 
+ {
+  "doctype": "Field Mapper Detail", 
+  "from_field": "parenttype", 
+  "map": "Yes", 
+  "match_id": 1, 
+  "to_field": "prevdoc_doctype"
+ }, 
+ {
+  "doctype": "Field Mapper Detail", 
+  "from_field": "parent", 
+  "map": "Yes", 
+  "match_id": 1, 
+  "to_field": "prevdoc_docname"
+ }, 
+ {
+  "doctype": "Field Mapper Detail", 
+  "from_field": "name", 
+  "map": "Yes", 
+  "match_id": 1, 
+  "to_field": "prevdoc_detail_docname"
+ }, 
+ {
+  "checking_operator": ">=", 
+  "doctype": "Field Mapper Detail", 
+  "from_field": "transaction_date", 
+  "map": "No", 
+  "match_id": 0, 
+  "to_field": "transaction_date"
+ }, 
+ {
+  "doctype": "Table Mapper Detail", 
+  "from_table": "Material Request", 
+  "match_id": 0, 
+  "reference_key": "prevdoc_docname", 
+  "to_table": "Supplier Quotation", 
+  "validation_logic": "docstatus = 1"
+ }, 
+ {
+  "doctype": "Table Mapper Detail", 
+  "from_field": "indent_details", 
+  "from_table": "Material Request Item", 
+  "match_id": 1, 
+  "reference_doctype_key": "prevdoc_doctype", 
+  "to_field": "quotation_items", 
+  "to_table": "Supplier Quotation Item", 
+  "validation_logic": "docstatus =1"
+ }
+]
--- a/buying/DocType
+++ b/buying/DocType
@@ -0,0 +1,91 @@
+[
+ {
+  "creation": "2011-05-20 10:07:55", 
+  "docstatus": 0, 
+  "modified": "2013-02-18 13:41:21", 
+  "modified_by": "Administrator", 
+  "owner": "Administrator"
+ }, 
+ {
+  "doctype": "Table Mapper Detail", 
+  "name": "__common__", 
+  "parent": "Sales Order-Material Request", 
+  "parentfield": "table_mapper_details", 
+  "parenttype": "DocType Mapper"
+ }, 
+ {
+  "doctype": "Field Mapper Detail", 
+  "name": "__common__", 
+  "parent": "Sales Order-Material Request", 
+  "parentfield": "field_mapper_details", 
+  "parenttype": "DocType Mapper"
+ }, 
+ {
+  "doctype": "DocType Mapper", 
+  "from_doctype": "Sales Order", 
+  "module": "Buying", 
+  "name": "__common__", 
+  "ref_doc_submitted": 1, 
+  "to_doctype": "Material Request"
+ }, 
+ {
+  "doctype": "DocType Mapper", 
+  "name": "Sales Order-Material Request"
+ }, 
+ {
+  "checking_operator": ">=", 
+  "doctype": "Field Mapper Detail", 
+  "from_field": "transaction_date", 
+  "map": "No", 
+  "match_id": 0, 
+  "to_field": "transaction_date"
+ }, 
+ {
+  "checking_operator": "=", 
+  "doctype": "Field Mapper Detail", 
+  "from_field": "company", 
+  "map": "Yes", 
+  "match_id": 0, 
+  "to_field": "company"
+ }, 
+ {
+  "doctype": "Field Mapper Detail", 
+  "from_field": "parent", 
+  "map": "Yes", 
+  "match_id": 1, 
+  "to_field": "sales_order_no"
+ }, 
+ {
+  "doctype": "Field Mapper Detail", 
+  "from_field": "stock_uom", 
+  "map": "Yes", 
+  "match_id": 1, 
+  "to_field": "uom"
+ }, 
+ {
+  "doctype": "Field Mapper Detail", 
+  "from_field": "reserved_warehouse", 
+  "map": "Yes", 
+  "match_id": 1, 
+  "to_field": "warehouse"
+ }, 
+ {
+  "doctype": "Table Mapper Detail", 
+  "from_field": "sales_order_details", 
+  "from_table": "Sales Order Item", 
+  "match_id": 1, 
+  "reference_doctype_key": "prevdoc_doctype", 
+  "reference_key": "prevdoc_detail_docname", 
+  "to_field": "indent_details", 
+  "to_table": "Material Request Item", 
+  "validation_logic": "docstatus=1"
+ }, 
+ {
+  "doctype": "Table Mapper Detail", 
+  "from_table": "Sales Order", 
+  "match_id": 0, 
+  "reference_key": "prevdoc_docname", 
+  "to_table": "Material Request", 
+  "validation_logic": "docstatus = 1"
+ }
+]
--- a/buying/doctype/purchase_common/purchase_common.py
+++ b/buying/doctype/purchase_common/purchase_common.py
@@ -33,17 +33,17 @@ class DocType(BuyingController):
 		self.doc = doc
 		self.doclist = doclist

-		self.chk_tol_for_list = ['Purchase Request - Purchase Order', 'Purchase Order - Purchase Receipt', 'Purchase Order - Purchase Invoice']
+		self.chk_tol_for_list = ['Material Request - Purchase Order', 'Purchase Order - Purchase Receipt', 'Purchase Order - Purchase Invoice']

 		self.update_qty = {
-			'Purchase Request - Purchase Order': 'ordered_qty',
+			'Material Request - Purchase Order': 'ordered_qty',
 			'Purchase Order - Purchase Receipt': 'received_qty',
 			'Purchase Order - Purchase Invoice': 'billed_qty',
 			'Purchase Receipt - Purchase Invoice': 'billed_qty'
 		}

 		self.update_percent_field = {
-			'Purchase Request - Purchase Order': 'per_ordered',
+			'Material Request - Purchase Order': 'per_ordered',
 			'Purchase Order - Purchase Receipt': 'per_received',
 			'Purchase Order - Purchase Invoice': 'per_billed',
 			'Purchase Receipt - Purchase Invoice': 'per_billed'
@@ -51,7 +51,7 @@ class DocType(BuyingController):

 		# used in validation for items and update_prevdoc_detail
 		self.doctype_dict = {
-			'Purchase Request': 'Purchase Request Item',
+			'Material Request': 'Material Request Item',
 			'Purchase Order': 'Purchase Order Item',
 			'Purchase Receipt': 'Purchase Receipt Item'
 		}
@@ -75,7 +75,7 @@ class DocType(BuyingController):
 			item = sql("select lead_time_days from `tabItem` where name = '%s' and (ifnull(end_of_life,'')='' or end_of_life = '0000-00-00' or end_of_life >	now())" % cstr(d.item_code) , as_dict = 1)
 			ltd = item and cint(item[0]['lead_time_days']) or 0
 			if ltd and obj.doc.transaction_date:
-				if d.fields.has_key('lead_time_date') or obj.doc.doctype == 'Purchase Request':
+				if d.fields.has_key('lead_time_date') or obj.doc.doctype == 'Material Request':
 					d.lead_time_date = cstr(add_days( obj.doc.transaction_date, cint(ltd)))
 				if not d.fields.has_key('prevdoc_docname') or (d.fields.has_key('prevdoc_docname') and not d.prevdoc_docname):
 					d.schedule_date =	cstr( add_days( obj.doc.transaction_date, cint(ltd)))
@@ -219,7 +219,7 @@ class DocType(BuyingController):
 					raise Exception
 				
 				#	Check if UOM has been modified.
-				if not cstr(data[0]['uom']) == cstr(d.uom) and not cstr(d.prevdoc_doctype) == 'Purchase Request':
+				if not cstr(data[0]['uom']) == cstr(d.uom) and not cstr(d.prevdoc_doctype) == 'Material Request':
 					msgprint("Please check UOM %s of Item %s which is not present in %s %s ." % (d.uom, d.item_code, d.prevdoc_doctype, d.prevdoc_docname))
 					raise Exception
 			
@@ -288,11 +288,11 @@ class DocType(BuyingController):
 	def get_qty(self,curr_doctype,ref_tab_fname,ref_tab_dn,ref_doc_tname, transaction, curr_parent_name):
 		# Get total Quantities of current doctype (eg. PR) except for qty of this transaction
 		#------------------------------
-		# please check as UOM changes from Purchase Request - Purchase Order ,so doing following else uom should be same .
+		# please check as UOM changes from Material Request - Purchase Order ,so doing following else uom should be same .
 		# i.e. in PO uom is NOS then in PR uom should be NOS
-		# but if in Purchase Request uom KG it can change in PO
+		# but if in Material Request uom KG it can change in PO
 		
-		get_qty = (transaction == 'Purchase Request - Purchase Order') and 'qty * conversion_factor' or 'qty'
+		get_qty = (transaction == 'Material Request - Purchase Order') and 'qty * conversion_factor' or 'qty'
 		qty = sql("select sum(%s) from `tab%s` where %s = '%s' and docstatus = 1 and parent != '%s'"% ( get_qty, curr_doctype, ref_tab_fname, ref_tab_dn, curr_parent_name))
 		qty = qty and flt(qty[0][0]) or 0 
 		
@@ -312,8 +312,8 @@ class DocType(BuyingController):
 		qty, max_qty, max_qty_plus_tol = flt(curr_ref_qty.split('~~~')[0]), flt(curr_ref_qty.split('~~~')[1]), flt(curr_ref_qty.split('~~~')[1])

 		# Qty above Tolerance should be allowed only once.
-		# But there is special case for Transaction 'Purchase Request-Purhcase Order' that there should be no restriction
-		# One can create any no. of PO against same Purchase Request!!!
+		# But there is special case for Transaction 'Material Request-Purhcase Order' that there should be no restriction
+		# One can create any no. of PO against same Material Request!!!
 		if qty >= max_qty and is_submit and flt(curr_qty) > 0:
 			reason = (curr_parent_doctype == 'Purchase Order') and 'Ordered' or (curr_parent_doctype == 'Purchase Receipt') and 'Received' or (curr_parent_doctype == 'Purchase Invoice') and 'Billed'
 			msgprint("Error: Item Code : '%s' of '%s' is already %s." %(item_code,ref_dn,reason))
@@ -364,7 +364,7 @@ class DocType(BuyingController):
 			
 			if d.fields.has_key('prevdoc_docname') and d.prevdoc_docname:
 				transaction = cstr(d.prevdoc_doctype) + ' - ' + cstr(obj.doc.doctype)
-				curr_qty = (transaction == 'Purchase Request - Purchase Order') and flt(d.qty) * flt(d.conversion_factor) or flt(d.qty)
+				curr_qty = (transaction == 'Material Request - Purchase Order') and flt(d.qty) * flt(d.conversion_factor) or flt(d.qty)
 				self.update_ref_doctype_dict( flt(curr_qty), d.doctype, d.prevdoc_docname, d.prevdoc_doctype, 'prevdoc_detail_docname', d.prevdoc_detail_docname, transaction, d.item_code, is_submit, obj.doc.doctype, obj.doc.name)
 			
 			# for payable voucher
--- a/buying/doctype/purchase_order/purchase_order.js
+++ b/buying/doctype/purchase_order/purchase_order.js
@@ -109,7 +109,7 @@ cur_frm.fields_dict['po_details'].grid.get_field('project_name').get_query = fun
 }

 cur_frm.fields_dict['indent_no'].get_query = function(doc) {
-	return 'SELECT DISTINCT `tabPurchase Request`.`name` FROM `tabPurchase Request` WHERE `tabPurchase Request`.company = "' + doc.company + '" and `tabPurchase Request`.`docstatus` = 1 and `tabPurchase Request`.`status` != "Stopped" and ifnull(`tabPurchase Request`.`per_ordered`,0) < 99.99 and `tabPurchase Request`.%(key)s LIKE "%s" ORDER BY `tabPurchase Request`.`name` DESC LIMIT 50';
+	return 'SELECT DISTINCT `tabMaterial Request`.`name` FROM `tabMaterial Request` WHERE `tabMaterial Request`.company = "' + doc.company + '" and `tabMaterial Request`.`docstatus` = 1 and `tabMaterial Request`.`status` != "Stopped" and ifnull(`tabMaterial Request`.`per_ordered`,0) < 99.99 and `tabMaterial Request`.%(key)s LIKE "%s" ORDER BY `tabMaterial Request`.`name` DESC LIMIT 50';
 }


@@ -208,7 +208,7 @@ cur_frm.pformat.indent_no = function(doc, cdt, cdn){
 	if(cl.length){
 		prevdoc_list = new Array();
 		for(var i=0;i<cl.length;i++){
-			if(cl[i].prevdoc_doctype == 'Purchase Request' && cl[i].prevdoc_docname && prevdoc_list.indexOf(cl[i].prevdoc_docname) == -1) {
+			if(cl[i].prevdoc_doctype == 'Material Request' && cl[i].prevdoc_docname && prevdoc_list.indexOf(cl[i].prevdoc_docname) == -1) {
 				prevdoc_list.push(cl[i].prevdoc_docname);
 				if(prevdoc_list.length ==1)
 					out += make_row(cl[i].prevdoc_doctype, cl[i].prevdoc_docname, cl[i].prevdoc_date,0);
--- a/buying/doctype/purchase_order/purchase_order.py
+++ b/buying/doctype/purchase_order/purchase_order.py
@@ -76,10 +76,10 @@ class DocType(BuyingController):
 	def get_bin_details(self, arg = ''):
 		return get_obj(dt='Purchase Common').get_bin_details(arg)

-	# Pull Purchase Request
+	# Pull Material Request
 	def get_indent_details(self):
 		if self.doc.indent_no:
-			get_obj('DocType Mapper','Purchase Request-Purchase Order').dt_map('Purchase Request','Purchase Order',self.doc.indent_no, self.doc, self.doclist, "[['Purchase Request','Purchase Order'],['Purchase Request Item', 'Purchase Order Item']]")
+			get_obj('DocType Mapper','Material Request-Purchase Order').dt_map('Material Request','Purchase Order',self.doc.indent_no, self.doc, self.doclist, "[['Material Request','Purchase Order'],['Material Request Item', 'Purchase Order Item']]")
 			pcomm = get_obj('Purchase Common')
 			for d in getlist(self.doclist, 'po_details'):
 				if d.item_code and not d.purchase_rate:
@@ -105,7 +105,7 @@ class DocType(BuyingController):
 			self.get_default_schedule_date()
 			for d in getlist(self.doclist, 'po_details'):
 				if d.prevdoc_detail_docname and not d.schedule_date:
-					d.schedule_date = webnotes.conn.get_value("Purchase Request Item",
+					d.schedule_date = webnotes.conn.get_value("Material Request Item",
 							d.prevdoc_detail_docname, "schedule_date")
 	
 	def get_tc_details(self):
@@ -138,19 +138,19 @@ class DocType(BuyingController):
 					po_qty = flt(d.qty) > flt(d.received_qty) and \
 						flt( flt(flt(d.qty) - flt(d.received_qty))*flt(d.conversion_factor)) or 0 
 				
-				# No updates in Purchase Request on Stop / Unstop
-				if cstr(d.prevdoc_doctype) == 'Purchase Request' and not is_stopped:
+				# No updates in Material Request on Stop / Unstop
+				if cstr(d.prevdoc_doctype) == 'Material Request' and not is_stopped:
 					# get qty and pending_qty of prevdoc 
 					curr_ref_qty = pc_obj.get_qty(d.doctype, 'prevdoc_detail_docname',
-					 	d.prevdoc_detail_docname, 'Purchase Request Item', 
-						'Purchase Request - Purchase Order', self.doc.name)
+					 	d.prevdoc_detail_docname, 'Material Request Item', 
+						'Material Request - Purchase Order', self.doc.name)
 					max_qty, qty, curr_qty = flt(curr_ref_qty.split('~~~')[1]), \
 					 	flt(curr_ref_qty.split('~~~')[0]), 0
 					
 					if flt(qty) + flt(po_qty) > flt(max_qty):
 						curr_qty = flt(max_qty) - flt(qty)
 						# special case as there is no restriction 
-						# for Purchase Request - Purchase Order 
+						# for Material Request - Purchase Order 
 						curr_qty = curr_qty > 0 and curr_qty or 0
 					else:
 						curr_qty = flt(po_qty)
@@ -232,7 +232,7 @@ class DocType(BuyingController):
 		# 4.Set Status as Cancelled
 		webnotes.conn.set(self.doc,'status','Cancelled')

-		# 5.Update Purchase Requests Pending Qty and accordingly it's Status 
+		# 5.Update Material Requests Pending Qty and accordingly it's Status 
 		pc_obj.update_prevdoc_detail(self,is_submit = 0)
 		
 		# 6.Update Bin	
--- a/buying/doctype/purchase_order/purchase_order.txt
+++ b/buying/doctype/purchase_order/purchase_order.txt
@@ -1,8 +1,8 @@
 [
 {
-  "creation": "2013-01-29 17:54:10", 
+  "creation": "2013-01-29 19:25:50", 
  "docstatus": 0, 
-  "modified": "2013-01-29 18:16:48", 
+  "modified": "2013-02-18 13:37:11", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -31,9 +31,7 @@
  "parent": "Purchase Order", 
  "parentfield": "permissions", 
  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "read": 1, 
-  "report": 1
+  "read": 1
 }, 
 {
  "doctype": "DocType", 
@@ -181,16 +179,16 @@
  "fieldtype": "Section Break"
 }, 
 {
-  "description": "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.", 
+  "description": "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.", 
  "doctype": "DocField", 
  "fieldname": "indent_no", 
  "fieldtype": "Link", 
  "hidden": 0, 
-  "label": "Select Purchase Request", 
+  "label": "Select Material Request", 
  "no_copy": 1, 
  "oldfieldname": "indent_no", 
  "oldfieldtype": "Link", 
-  "options": "Purchase Request", 
+  "options": "Material Request", 
  "print_hide": 1
 }, 
 {
@@ -814,26 +812,58 @@
  "no_copy": 1, 
  "print_hide": 1
 }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "permlevel": 1, 
+  "report": 0, 
+  "role": "Material User", 
+  "submit": 0, 
+  "write": 0
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "report": 1, 
+  "role": "Material User", 
+  "submit": 0, 
+  "write": 0
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "permlevel": 1, 
+  "report": 0, 
+  "role": "Purchase Manager", 
+  "submit": 0, 
+  "write": 0
+ }, 
 {
  "amend": 1, 
  "cancel": 1, 
  "create": 1, 
  "doctype": "DocPerm", 
-  "role": "Purchase User", 
+  "permlevel": 0, 
+  "report": 1, 
+  "role": "Purchase Manager", 
  "submit": 1, 
  "write": 1
 }, 
- {
-  "doctype": "DocPerm", 
-  "match": "supplier", 
-  "role": "Supplier"
- }, 
 {
  "amend": 1, 
  "cancel": 1, 
  "create": 1, 
  "doctype": "DocPerm", 
-  "role": "Purchase Manager", 
+  "permlevel": 0, 
+  "report": 1, 
+  "role": "Purchase User", 
  "submit": 1, 
  "write": 1
 }, 
@@ -842,8 +872,15 @@
  "cancel": 0, 
  "create": 0, 
  "doctype": "DocPerm", 
-  "role": "Material User", 
-  "submit": 0, 
-  "write": 0
+  "permlevel": 1, 
+  "role": "All", 
+  "submit": 0
+ }, 
+ {
+  "doctype": "DocPerm", 
+  "match": "supplier", 
+  "permlevel": 0, 
+  "report": 1, 
+  "role": "Supplier"
 }
 ]
--- a/buying/doctype/purchase_order_item/purchase_order_item.txt
+++ b/buying/doctype/purchase_order_item/purchase_order_item.txt
@@ -1,8 +1,8 @@
 [
 {
-  "creation": "2013-01-30 12:49:48", 
+  "creation": "2013-02-07 11:00:11", 
  "docstatus": 0, 
-  "modified": "2013-02-07 10:49:35", 
+  "modified": "2013-02-18 13:39:02", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -249,11 +249,11 @@
  "fieldtype": "Link", 
  "hidden": 0, 
  "in_filter": 1, 
-  "label": "Purchase Requisition No", 
+  "label": "Material Request No", 
  "no_copy": 0, 
  "oldfieldname": "prevdoc_docname", 
  "oldfieldtype": "Link", 
-  "options": "Purchase Request", 
+  "options": "Material Request", 
  "print_hide": 1, 
  "print_width": "120px", 
  "read_only": 1, 
@@ -266,7 +266,7 @@
  "fieldtype": "Date", 
  "hidden": 1, 
  "in_filter": 1, 
-  "label": "Purchase Request Date", 
+  "label": "Material Request Date", 
  "oldfieldname": "prevdoc_date", 
  "oldfieldtype": "Date", 
  "print_hide": 1, 
@@ -279,7 +279,7 @@
  "fieldtype": "Data", 
  "hidden": 1, 
  "in_filter": 1, 
-  "label": "Purchase Request Detail No", 
+  "label": "Material Request Detail No", 
  "no_copy": 0, 
  "oldfieldname": "prevdoc_detail_docname", 
  "oldfieldtype": "Data", 
--- a/buying/doctype/supplier_quotation/supplier_quotation.js
+++ b/buying/doctype/supplier_quotation/supplier_quotation.js
@@ -88,13 +88,13 @@ cur_frm.fields_dict['quotation_items'].grid.get_field('project_name').get_query
 	}

 cur_frm.fields_dict['indent_no'].get_query = function(doc) {
-	return "select distinct `tabPurchase Request`.`name` from `tabPurchase Request` \
-		where `tabPurchase Request`.company = \"" + doc.company +
-		"\" and `tabPurchase Request`.`docstatus` = 1 and \
-		`tabPurchase Request`.`status` != \"Stopped\" and \
-		ifnull(`tabPurchase Request`.`per_ordered`,0) < 99.99 and \
-		`tabPurchase Request`.%(key)s LIKE \"%s\" \
-		order by `tabPurchase Request`.`name` desc limit 50";
+	return "select distinct `tabMaterial Request`.`name` from `tabMaterial Request` \
+		where `tabMaterial Request`.company = \"" + doc.company +
+		"\" and `tabMaterial Request`.`docstatus` = 1 and \
+		`tabMaterial Request`.`status` != \"Stopped\" and \
+		ifnull(`tabMaterial Request`.`per_ordered`,0) < 99.99 and \
+		`tabMaterial Request`.%(key)s LIKE \"%s\" \
+		order by `tabMaterial Request`.`name` desc limit 50";
 }

 cur_frm.cscript.supplier_address = function(doc, dt, dn) {
--- a/buying/doctype/supplier_quotation/supplier_quotation.py
+++ b/buying/doctype/supplier_quotation/supplier_quotation.py
@@ -52,10 +52,10 @@ class DocType(BuyingController):
 		
 	def get_indent_details(self):
 		if self.doc.indent_no:
-			mapper = get_obj("DocType Mapper", "Purchase Request-Supplier Quotation")
-			mapper.dt_map("Purchase Request", "Supplier Quotation", self.doc.indent_no,
-				self.doc, self.doclist, """[['Purchase Request', 'Supplier Quotation'],
-				['Purchase Request Item', 'Supplier Quotation Item']]""")
+			mapper = get_obj("DocType Mapper", "Material Request-Supplier Quotation")
+			mapper.dt_map("Material Request", "Supplier Quotation", self.doc.indent_no,
+				self.doc, self.doclist, """[['Material Request', 'Supplier Quotation'],
+				['Material Request Item', 'Supplier Quotation Item']]""")
 			
 			from webnotes.model.wrapper import getlist
 			for d in getlist(self.doclist, self.fname):
--- a/buying/doctype/supplier_quotation/supplier_quotation.txt
+++ b/buying/doctype/supplier_quotation/supplier_quotation.txt
@@ -1,8 +1,8 @@
 [
 {
-  "creation": "2013-01-29 17:54:11", 
+  "creation": "2013-01-29 19:25:54", 
  "docstatus": 0, 
-  "modified": "2013-01-29 18:11:12", 
+  "modified": "2013-02-18 13:40:17", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -31,9 +31,7 @@
  "parent": "Supplier Quotation", 
  "parentfield": "permissions", 
  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "read": 1, 
-  "report": 1
+  "read": 1
 }, 
 {
  "doctype": "DocType", 
@@ -167,16 +165,16 @@
  "options": "Simple"
 }, 
 {
-  "description": "You can make a purchase order from multiple Purchase Requests. Select Purchase Requests one by one and click on the button below.", 
+  "description": "You can make a purchase order from multiple Material Requests. Select Material Requests one by one and click on the button below.", 
  "doctype": "DocField", 
  "fieldname": "indent_no", 
  "fieldtype": "Link", 
  "hidden": 0, 
-  "label": "Select Purchase Request", 
+  "label": "Select Material Request", 
  "no_copy": 1, 
  "oldfieldname": "indent_no", 
  "oldfieldtype": "Link", 
-  "options": "Purchase Request", 
+  "options": "Material Request", 
  "print_hide": 1
 }, 
 {
@@ -679,6 +677,8 @@
  "cancel": 1, 
  "create": 1, 
  "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "report": 1, 
  "role": "Manufacturing Manager", 
  "submit": 1, 
  "write": 1
@@ -688,6 +688,8 @@
  "cancel": 1, 
  "create": 1, 
  "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "report": 1, 
  "role": "Purchase Manager", 
  "submit": 1, 
  "write": 1
@@ -697,6 +699,8 @@
  "cancel": 0, 
  "create": 1, 
  "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "report": 1, 
  "role": "Purchase User", 
  "submit": 0, 
  "write": 1
@@ -706,6 +710,8 @@
  "cancel": 0, 
  "create": 0, 
  "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "report": 1, 
  "role": "Material User", 
  "submit": 0, 
  "write": 0
@@ -715,8 +721,21 @@
  "cancel": 0, 
  "create": 0, 
  "doctype": "DocPerm", 
+  "permlevel": 0, 
+  "report": 1, 
  "role": "Supplier", 
  "submit": 0, 
  "write": 0
+ }, 
+ {
+  "amend": 0, 
+  "cancel": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "permlevel": 1, 
+  "report": 0, 
+  "role": "All", 
+  "submit": 0, 
+  "write": 0
 }
 ]
--- a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
+++ b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
@@ -1,8 +1,8 @@
 [
 {
-  "creation": "2013-01-28 10:06:00", 
+  "creation": "2013-01-29 19:25:55", 
  "docstatus": 0, 
-  "modified": "2013-01-29 16:28:05", 
+  "modified": "2013-02-18 13:39:45", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -208,11 +208,11 @@
  "fieldtype": "Link", 
  "hidden": 0, 
  "in_filter": 1, 
-  "label": "Purchase Request No", 
+  "label": "Material Request No", 
  "no_copy": 0, 
  "oldfieldname": "prevdoc_docname", 
  "oldfieldtype": "Link", 
-  "options": "Purchase Request", 
+  "options": "Material Request", 
  "print_hide": 1, 
  "print_width": "120px", 
  "read_only": 1, 
@@ -225,7 +225,7 @@
  "fieldtype": "Date", 
  "hidden": 1, 
  "in_filter": 1, 
-  "label": "Purchase Request Date", 
+  "label": "Material Request Date", 
  "oldfieldname": "prevdoc_date", 
  "oldfieldtype": "Date", 
  "print_hide": 1, 
@@ -238,7 +238,7 @@
  "fieldtype": "Data", 
  "hidden": 1, 
  "in_filter": 1, 
-  "label": "Purchase Request Detail No", 
+  "label": "Material Request Detail No", 
  "no_copy": 0, 
  "oldfieldname": "prevdoc_detail_docname", 
  "oldfieldtype": "Data", 
--- a/buying/page/buying_home/buying_home.js
+++ b/buying/page/buying_home/buying_home.js
@@ -7,9 +7,9 @@ wn.module_page["Buying"] = [
 		icon: "icon-copy",
 		items: [
 			{
-				label: wn._("Purchase Request"),
+				label: wn._("Material Request"),
 				description: wn._("Request for purchase."),
-				doctype:"Purchase Request"
+				doctype:"Material Request"
 			},
 			{
 				label: wn._("Supplier Quotation"),
--- a/buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt
+++ b/buying/search_criteria/pending_po_items_to_bill/pending_po_items_to_bill.txt
@@ -21,7 +21,7 @@
  "sort_by": "`tabPurchase Order`.`name`", 
  "page_len": 50, 
  "criteria_name": "Pending PO Items To Bill", 
-  "columns": "Purchase Order\u0001ID,Purchase Order\u0001Supplier,Purchase Order\u0001Supplier Name,Purchase Order\u0001Status,Purchase Order\u0001PO Date,Purchase Order\u0001Fiscal Year,Purchase Order Item\u0001Purchase Request No,Purchase Order Item\u0001Item Code,Purchase Order Item\u0001Item Name,Purchase Order Item\u0001Description,Purchase Order Item\u0001Quantity,Purchase Order Item\u0001UOM,Purchase Order Item\u0001Received Qty"
+  "columns": "Purchase Order\u0001ID,Purchase Order\u0001Supplier,Purchase Order\u0001Supplier Name,Purchase Order\u0001Status,Purchase Order\u0001PO Date,Purchase Order\u0001Fiscal Year,Purchase Order Item\u0001Material Request No,Purchase Order Item\u0001Item Code,Purchase Order Item\u0001Item Name,Purchase Order Item\u0001Description,Purchase Order Item\u0001Quantity,Purchase Order Item\u0001UOM,Purchase Order Item\u0001Received Qty"
 }, 
 {
  "name": "pending_po_items_to_bill", 
--- a/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt
+++ b/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.txt
@@ -21,7 +21,7 @@
  "sort_by": "`tabPurchase Order`.`name`", 
  "page_len": 50, 
  "criteria_name": "Pending PO Items To Receive", 
-  "columns": "Purchase Order\u0001ID,Purchase Order\u0001Supplier,Purchase Order\u0001Supplier Name,Purchase Order\u0001Status,Purchase Order\u0001PO Date,Purchase Order\u0001Fiscal Year,Purchase Order Item\u0001Purchase Request No,Purchase Order Item\u0001Item Code,Purchase Order Item\u0001Item Name,Purchase Order Item\u0001Description,Purchase Order Item\u0001Quantity,Purchase Order Item\u0001UOM,Purchase Order Item\u0001Received Qty"
+  "columns": "Purchase Order\u0001ID,Purchase Order\u0001Supplier,Purchase Order\u0001Supplier Name,Purchase Order\u0001Status,Purchase Order\u0001PO Date,Purchase Order\u0001Fiscal Year,Purchase Order Item\u0001Material Request No,Purchase Order Item\u0001Item Code,Purchase Order Item\u0001Item Name,Purchase Order Item\u0001Description,Purchase Order Item\u0001Quantity,Purchase Order Item\u0001UOM,Purchase Order Item\u0001Received Qty"
 }, 
 {
  "name": "pending_po_items_to_receive",