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

[fix] Sales order link to purchase order not working fixed

Browse Source
This commit is contained in:
Vishal 2018-01-24 16:46:18 +05:30 committed by vishdha
parent e37e5d6134
commit 4dc329f5ea
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,7 @@ class MaterialRequest(BuyingController):
self.status = "Draft" self.status = "Draft"
from erpnext.controllers.status_updater import validate_status from erpnext.controllers.status_updater import validate_status
validate_status(self.status, validate_status(self.status,
["Draft", "Submitted", "Stopped", "Cancelled", "Pending", ["Draft", "Submitted", "Stopped", "Cancelled", "Pending",
"Partially Ordered", "Ordered", "Issued", "Transferred"]) "Partially Ordered", "Ordered", "Issued", "Transferred"])
@ -240,7 +240,8 @@ def make_purchase_order(source_name, target_doc=None):
["name", "material_request_item"], ["name", "material_request_item"],
["parent", "material_request"], ["parent", "material_request"],
["uom", "stock_uom"], ["uom", "stock_uom"],
["uom", "uom"] ["uom", "uom"],
["sales_order", "sales_order"]
], ],
"postprocess": update_item, "postprocess": update_item,
"condition": lambda doc: doc.ordered_qty < doc.stock_qty "condition": lambda doc: doc.ordered_qty < doc.stock_qty

4
erpnext/stock/get_item_details.py
View File

@ -472,8 +472,8 @@ def get_projected_qty(item_code, warehouse):
@frappe.whitelist() @frappe.whitelist()
def get_bin_details(item_code, warehouse): def get_bin_details(item_code, warehouse):
return frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse}, return frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse},
["projected_qty", "actual_qty"], as_dict=True) \ ["projected_qty", "actual_qty", "ordered_qty"], as_dict=True) \
or {"projected_qty": 0, "actual_qty": 0} or {"projected_qty": 0, "actual_qty": 0, "ordered_qty": 0}
@frappe.whitelist() @frappe.whitelist()
def get_serial_no_details(item_code, warehouse, stock_qty, serial_no): def get_serial_no_details(item_code, warehouse, stock_qty, serial_no):