nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: added new file serial batch bundle

Browse Source
This commit is contained in:
Rohit Waghchaure
2023-03-13 14:51:43 +05:30
parent f1b5966680
commit e6143abb8a
46 changed files with 1468 additions and 1131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
erpnext/stock/utils.py
View File

@@ -12,6 +12,7 @@ from frappe.utils import cstr, flt, get_link_to_form, nowdate, nowtime
import erpnext
from erpnext.stock.doctype.warehouse.warehouse import get_child_warehouses
from erpnext.stock.serial_batch_bundle import BatchNoBundleValuation, SerialNoBundleValuation
from erpnext.stock.valuation import FIFOValuation, LIFOValuation
BarcodeScanResult = Dict[str, Optional[str]]
@@ -247,28 +248,37 @@ def _create_bin(item_code, warehouse):
@frappe.whitelist()
def get_incoming_rate(args, raise_error_if_no_rate=True):
"""Get Incoming Rate based on valuation method"""
from erpnext.stock.stock_ledger import (
get_batch_incoming_rate,
get_previous_sle,
get_valuation_rate,
)
from erpnext.stock.stock_ledger import get_previous_sle, get_valuation_rate
if isinstance(args, str):
args = json.loads(args)
in_rate = None
if (args.get("serial_no") or "").strip():
in_rate = get_avg_purchase_rate(args.get("serial_no"))
elif args.get("batch_no") and frappe.db.get_value(
"Batch", args.get("batch_no"), "use_batchwise_valuation", cache=True
):
in_rate = get_batch_incoming_rate(
item_code=args.get("item_code"),
item_details = frappe.get_cached_value(
"Item", args.get("item_code"), ["has_serial_no", "has_batch_no"], as_dict=1
)
if item_details.has_serial_no and args.get("serial_and_batch_bundle"):
args["actual_qty"] = args["qty"]
sn_obj = SerialNoBundleValuation(
sle=args,
warehouse=args.get("warehouse"),
batch_no=args.get("batch_no"),
posting_date=args.get("posting_date"),
posting_time=args.get("posting_time"),
item_code=args.get("item_code"),
)
in_rate = sn_obj.get_incoming_rate()
elif item_details.has_batch_no and args.get("serial_and_batch_bundle"):
args["actual_qty"] = args["qty"]
batch_obj = BatchNoBundleValuation(
sle=args,
warehouse=args.get("warehouse"),
item_code=args.get("item_code"),
)
in_rate = batch_obj.get_incoming_rate()
else:
valuation_method = get_valuation_method(args.get("item_code"))
previous_sle = get_previous_sle(args)