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

Merge pull request #33495 from dj12djdjs/fix-get-bin-details

Browse Source 
fix(stock): missing ordered_qty in get_bin_details
This commit is contained in:
Sagar Sharma 2023-01-02 11:14:25 +05:30 committed by GitHub
commit 332f4dc028
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
erpnext/stock/doctype/item/test_item.py
View File

@ -83,6 +83,7 @@ class TestItem(FrappeTestCase):
def test_get_item_details(self): def test_get_item_details(self):
# delete modified item price record and make as per test_records # delete modified item price record and make as per test_records
frappe.db.sql("""delete from `tabItem Price`""") frappe.db.sql("""delete from `tabItem Price`""")
frappe.db.sql("""delete from `tabBin`""")
to_check = { to_check = {
"item_code": "_Test Item", "item_code": "_Test Item",
@ -103,9 +104,26 @@ class TestItem(FrappeTestCase):
"batch_no": None, "batch_no": None,
"uom": "_Test UOM", "uom": "_Test UOM",
"conversion_factor": 1.0, "conversion_factor": 1.0,
"reserved_qty": 1,
"actual_qty": 5,
"ordered_qty": 10,
"projected_qty": 14,
} }
make_test_objects("Item Price") make_test_objects("Item Price")
make_test_objects(
"Bin",
[
{
"item_code": "_Test Item",
"warehouse": "_Test Warehouse - _TC",
"reserved_qty": 1,
"actual_qty": 5,
"ordered_qty": 10,
"projected_qty": 14,
}
],
)
company = "_Test Company" company = "_Test Company"
currency = frappe.get_cached_value("Company", company, "default_currency") currency = frappe.get_cached_value("Company", company, "default_currency")
@ -129,7 +147,7 @@ class TestItem(FrappeTestCase):
) )
for key, value in to_check.items(): for key, value in to_check.items():
self.assertEqual(value, details.get(key)) self.assertEqual(value, details.get(key), key)
def test_item_tax_template(self): def test_item_tax_template(self):
expected_item_tax_template = [ expected_item_tax_template = [

4
erpnext/stock/get_item_details.py
View File

@ -1175,10 +1175,10 @@ def get_bin_details(item_code, warehouse, company=None):
bin_details = frappe.db.get_value( bin_details = frappe.db.get_value(
"Bin", "Bin",
{"item_code": item_code, "warehouse": warehouse}, {"item_code": item_code, "warehouse": warehouse},
["projected_qty", "actual_qty", "reserved_qty"], ["projected_qty", "actual_qty", "reserved_qty", "ordered_qty"],
as_dict=True, as_dict=True,
cache=True, cache=True,
) or {"projected_qty": 0, "actual_qty": 0, "reserved_qty": 0} ) or {"projected_qty": 0, "actual_qty": 0, "reserved_qty": 0, "ordered_qty": 0}
if company: if company:
bin_details["company_total_stock"] = get_company_total_stock(item_code, company) bin_details["company_total_stock"] = get_company_total_stock(item_code, company)
return bin_details return bin_details