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

chore: fix conflicts

Browse Source 
Refactor based_on retrieval method and remove unused fields.
This commit is contained in:
rohitwaghchaure
2025-12-22 18:04:47 +05:30
committed by GitHub
parent 425dcee5bf
commit 8f52f14505
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/stock/get_item_details.py
View File

@@ -203,15 +203,7 @@ def update_stock(ctx, out, doc=None):
{
"item_code": ctx.item_code,
"warehouse": ctx.warehouse,
<<<<<<< HEAD
"based_on": frappe.db.get_single_value("Stock Settings", "pick_serial_and_batch_based_on"),
=======
"based_on": frappe.get_single_value("Stock Settings", "pick_serial_and_batch_based_on"),
"sabb_voucher_no": doc.get("name") if doc else None,
"sabb_voucher_detail_no": ctx.child_docname,
"sabb_voucher_type": ctx.doctype,
"pick_reserved_items": True,
>>>>>>> da4b78491d (fix: limit condition to fetch serial nos)
"qty": out.stock_qty,
}
)