nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 00:55:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43658 from frappe/mergify/bp/version-15-hotfix/pr-43570

Browse Source 
fix: update item details with actual quantity (backport #43570)
This commit is contained in:
ruthra kumar
2024-10-15 13:15:39 +05:30
committed by GitHub
parent 2c7f5ec324 c2c6d27625
commit ec7e5c48de
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/selling/doctype/sales_order/sales_order.py
View File

@@ -35,7 +35,7 @@ from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry impor
get_sre_reserved_qty_details_for_voucher,
has_reserved_stock,
)
from erpnext.stock.get_item_details import get_default_bom, get_price_list_rate
from erpnext.stock.get_item_details import get_bin_details, get_default_bom, get_price_list_rate
from erpnext.stock.stock_balance import get_reserved_qty, update_bin_qty
form_grid_templates = {"items": "templates/form_grid/item_grid.html"}
@@ -838,6 +838,9 @@ def make_material_request(source_name, target_doc=None):
target.project = source_parent.project
target.qty = get_remaining_qty(source)
target.stock_qty = flt(target.qty) * flt(target.conversion_factor)
target.actual_qty = get_bin_details(
target.item_code, target.warehouse, source_parent.company, True
).get("actual_qty", 0)
args = target.as_dict().copy()
args.update(

7
erpnext/selling/doctype/sales_order/test_sales_order.py
View File

@@ -30,6 +30,7 @@ from erpnext.selling.doctype.sales_order.sales_order import (
)
from erpnext.stock.doctype.item.test_item import make_item
from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
from erpnext.stock.get_item_details import get_bin_details
class TestSalesOrder(AccountsTestMixin, FrappeTestCase):
@@ -96,6 +97,12 @@ class TestSalesOrder(AccountsTestMixin, FrappeTestCase):
self.assertEqual(mr.material_request_type, "Purchase")
self.assertEqual(len(mr.get("items")), len(so.get("items")))
for item in mr.get("items"):
actual_qty = get_bin_details(item.item_code, item.warehouse, mr.company, True).get(
"actual_qty", 0
)
self.assertEqual(flt(item.actual_qty), actual_qty)
def test_make_delivery_note(self):
so = make_sales_order(do_not_submit=True)