Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Material Issue added to Material Request Type

Browse Source
This commit is contained in:
Neil Trini Lasrado 2014-10-20 16:04:19 +05:30
parent ae1dcabcb5
commit f24407e119
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/doctype/material_request/material_request.json
View File

@ -17,7 +17,7 @@
"fieldtype": "Select", "fieldtype": "Select",
"in_list_view": 1, "in_list_view": 1,
"label": "Type", "label": "Type",
"options": "Purchase\nTransfer", "options": "Purchase\nTransfer\nMaterial Issue",
"permlevel": 0, "permlevel": 0,
"reqd": 1 "reqd": 1
}, },
@ -235,7 +235,7 @@
"icon": "icon-ticket", "icon": "icon-ticket",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-09-09 05:35:31.735821", "modified": "2014-10-20 14:13:11.043631",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Material Request", "name": "Material Request",

4
erpnext/stock/doctype/material_request/material_request.py
View File

@ -73,7 +73,7 @@ class MaterialRequest(BuyingController):
from erpnext.utilities import validate_status from erpnext.utilities import validate_status
validate_status(self.status, ["Draft", "Submitted", "Stopped", "Cancelled"]) validate_status(self.status, ["Draft", "Submitted", "Stopped", "Cancelled"])
self.validate_value("material_request_type", "in", ["Purchase", "Transfer"]) self.validate_value("material_request_type", "in", ["Purchase", "Transfer", "Material Issue"])
pc_obj = frappe.get_doc('Purchase Common') pc_obj = frappe.get_doc('Purchase Common')
pc_obj.validate_for_items(self) pc_obj.validate_for_items(self)
@ -112,7 +112,7 @@ class MaterialRequest(BuyingController):
frappe.db.set(self,'status','Cancelled') frappe.db.set(self,'status','Cancelled')
def update_completed_qty(self, mr_items=None): def update_completed_qty(self, mr_items=None):
if self.material_request_type != "Transfer": if self.material_request_type == "Purchase":
return return
item_doclist = self.get("indent_details") item_doclist = self.get("indent_details")