[mapper] material request - PO/supp quote/stock entry

stock/doctype/material_request/material_request.js

@@ -36,23 +36,27 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten
 		
 		if(doc.docstatus == 1 && doc.status != 'Stopped'){
 			if(doc.material_request_type === "Purchase")
-				cur_frm.add_custom_button("Make Supplier Quotation", cur_frm.cscript.make_supplier_quotation);
+				cur_frm.add_custom_button("Make Supplier Quotation", 
+					cur_frm.cscript.make_supplier_quotation);
 				
 			if(doc.material_request_type === "Transfer" && doc.status === "Submitted")
 				cur_frm.add_custom_button("Transfer Material", cur_frm.cscript.make_stock_entry);
 			
 			if(flt(doc.per_ordered, 2) < 100) {
 				if(doc.material_request_type === "Purchase")
-					cur_frm.add_custom_button('Make Purchase Order', cur_frm.cscript['Make Purchase Order']);
+					cur_frm.add_custom_button('Make Purchase Order', 
+						cur_frm.cscript.make_purchase_order);
 				
-				cur_frm.add_custom_button('Stop Material Request', cur_frm.cscript['Stop Material Request']);
+				cur_frm.add_custom_button('Stop Material Request', 
+					cur_frm.cscript['Stop Material Request']);
 			}
 			cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms);
 
 		}
 
 		if(doc.docstatus == 1 && doc.status == 'Stopped')
-			cur_frm.add_custom_button('Unstop Material Request', cur_frm.cscript['Unstop Material Request']);
+			cur_frm.add_custom_button('Unstop Material Request', 
+				cur_frm.cscript['Unstop Material Request']);
 		
 		if(doc.material_request_type === "Transfer") {
 			cur_frm.toggle_display("sales_order_no", false);
@@ -66,6 +70,27 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten
 	
 	calculate_taxes_and_totals: function() {
 		return;
+	},
+	
+	make_purchase_order: function() {
+		wn.model.open_mapped_doc({
+			method: "stock.doctype.material_request.material_request.make_purchase_order",
+			source_name: cur_frm.doc.name
+		})
+	},
+
+	make_supplier_quotation: function() {
+		wn.model.open_mapped_doc({
+			method: "stock.doctype.material_request.material_request.make_supplier_quotation",
+			source_name: cur_frm.doc.name
+		})
+	},
+
+	make_stock_entry: function() {
+		wn.model.open_mapped_doc({
+			method: "stock.doctype.material_request.material_request.make_stock_entry",
+			source_name: cur_frm.doc.name
+		})
 	}
 });
 
@@ -96,26 +121,6 @@ cur_frm.cscript['Unstop Material Request'] = function(){
 	if (check) {
 		$c('runserverobj', args={'method':'update_status', 'arg': 'Submitted','docs': wn.model.compress(make_doclist(doc.doctype, doc.name))}, function(r,rt) {
 			cur_frm.refresh();
-			
 		});
 	}
 };
-
-cur_frm.cscript['Make Purchase Order'] = function() {
-	wn.model.open_mapped_doc({
-		method: "stock.doctype.material_request.material_request.make_purchase_order",
-		source_name: cur_frm.doc.name
-	})
-}
-
-cur_frm.cscript.make_supplier_quotation = function() {
-	cur_frm.map([
-		["Material Request", "Supplier Quotation"], 
-		["Material Request Item", "Supplier Quotation Item"]]);
-};
-
-cur_frm.cscript.make_stock_entry = function() {
-	cur_frm.map([
-		["Material Request", "Stock Entry"], 
-		["Material Request Item", "Stock Entry Detail"]]);
-};

stock/doctype/material_request/material_request.py

@@ -250,6 +250,10 @@ def make_purchase_order(source_name, target_doclist=None):
 	def update_item(obj, target):
 		target.conversion_factor = 1
 		target.qty = flt(obj.qty) - flt(obj.ordered_qty)
+		
+	def set_missing_values(source, target):
+		po = webnotes.bean(target)
+		po.run_method("set_missing_values")
 
 	doclist = get_mapped_doclist("Material Request", source_name, 	{
 		"Material Request": {
@@ -269,6 +273,68 @@ def make_purchase_order(source_name, target_doclist=None):
 			},
 			"postprocess": update_item
 		}
-	}, target_doclist)
+	}, target_doclist, set_missing_values)
+
+	return [d.fields for d in doclist]
+	
+@webnotes.whitelist()
+def make_supplier_quotation(source_name, target_doclist=None):
+	from webnotes.model.mapper import get_mapped_doclist
+
+	def set_missing_values(source, target):
+		sq = webnotes.bean(target)
+		sq.run_method("set_missing_values")
+
+	doclist = get_mapped_doclist("Material Request", source_name, {
+		"Material Request": {
+			"doctype": "Supplier Quotation", 
+			"validation": {
+				"docstatus": ["=", 1],
+				"material_request_type": ["=", "Purchase"]
+			}
+		}, 
+		"Material Request Item": {
+			"doctype": "Supplier Quotation Item", 
+			"field_map": {
+				"name": "prevdoc_detail_docname", 
+				"parent": "prevdoc_docname", 
+				"parenttype": "prevdoc_doctype"
+			}
+		}
+	}, target_doclist, set_missing_values)
+
+	return [d.fields for d in doclist]
+	
+@webnotes.whitelist()
+def make_stock_entry(source_name, target_doclist=None):
+	from webnotes.model.mapper import get_mapped_doclist
+
+	def set_purpose(source, target):
+		target[0].purpose = "Material Transfer"
+		
+	def update_item(source, target):
+		target.conversion_factor = 1
+		target.qty = flt(source.qty) - flt(source.ordered_qty)
+		
+
+	doclist = get_mapped_doclist("Material Request", source_name, {
+		"Material Request": {
+			"doctype": "Stock Entry", 
+			"validation": {
+				"docstatus": ["=", 1],
+				"material_request_type": ["=", "Transfer"]
+			}
+		}, 
+		"Material Request Item": {
+			"doctype": "Stock Entry Detail", 
+			"field_map": {
+				"name": "material_request_item", 
+				"parent": "material_request", 
+				"uom": "stock_uom", 
+				"warehouse": "t_warehouse"
+			},
+			"postprocess": update_item
+		}
+	}, target_doclist, set_purpose)
 
 	return [d.fields for d in doclist]

stock/doctype/material_request/test_material_request.py

@@ -20,6 +20,38 @@ class TestMaterialRequest(unittest.TestCase):
 		
 		self.assertEquals(po[0]["doctype"], "Purchase Order")
 		self.assertEquals(len(po), len(mr.doclist))
+		
+	def test_make_supplier_quotation(self):
+		from stock.doctype.material_request.material_request import make_supplier_quotation
+
+		mr = webnotes.bean(copy=test_records[0]).insert()
+
+		self.assertRaises(webnotes.ValidationError, make_supplier_quotation, 
+			mr.doc.name)
+
+		mr = webnotes.bean("Material Request", mr.doc.name)
+		mr.submit()
+		sq = make_supplier_quotation(mr.doc.name)
+		
+		self.assertEquals(sq[0]["doctype"], "Supplier Quotation")
+		self.assertEquals(len(sq), len(mr.doclist))
+		
+			
+	def test_make_stock_entry(self):
+		from stock.doctype.material_request.material_request import make_stock_entry
+
+		mr = webnotes.bean(copy=test_records[0]).insert()
+
+		self.assertRaises(webnotes.ValidationError, make_stock_entry, 
+			mr.doc.name)
+
+		mr = webnotes.bean("Material Request", mr.doc.name)
+		mr.doc.material_request_type = "Transfer"
+		mr.submit()
+		se = make_stock_entry(mr.doc.name)
+		
+		self.assertEquals(se[0]["doctype"], "Stock Entry")
+		self.assertEquals(len(se), len(mr.doclist))
 	
 	def _test_expected(self, doclist, expected_values):
 		for i, expected in enumerate(expected_values):