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

refactor: split batch

Browse Source 
(cherry picked from commit 3c7e7a76f0c89b6bedf0b27062895f05f68c1fa5)
This commit is contained in:
barredterra 2024-01-23 14:23:32 +01:00 committed by Mergify
parent 1331fb75a3
commit 6ed42e939b
1 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
erpnext/stock/doctype/batch/batch.py
View File

@ -9,7 +9,7 @@ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
from frappe.model.naming import make_autoname, revert_series_if_last from frappe.model.naming import make_autoname, revert_series_if_last
from frappe.query_builder.functions import CurDate, Sum from frappe.query_builder.functions import CurDate, Sum
from frappe.utils import cint, flt, get_link_to_form, nowtime, today from frappe.utils import cint, flt, get_link_to_form
from frappe.utils.data import add_days from frappe.utils.data import add_days
from frappe.utils.jinja import render_template from frappe.utils.jinja import render_template
@ -248,8 +248,9 @@ def get_batches_by_oldest(item_code, warehouse):
@frappe.whitelist() @frappe.whitelist()
def split_batch(batch_no, item_code, warehouse, qty, new_batch_id=None): def split_batch(
batch_no: str, item_code: str, warehouse: str, qty: float, new_batch_id: str | None = None
):
"""Split the batch into a new batch""" """Split the batch into a new batch"""
batch = frappe.get_doc(dict(doctype="Batch", item=item_code, batch_id=new_batch_id)).insert() batch = frappe.get_doc(dict(doctype="Batch", item=item_code, batch_id=new_batch_id)).insert()
qty = flt(qty) qty = flt(qty)
@ -257,29 +258,21 @@ def split_batch(batch_no, item_code, warehouse, qty, new_batch_id=None):
company = frappe.db.get_value("Warehouse", warehouse, "company") company = frappe.db.get_value("Warehouse", warehouse, "company")
from_bundle_id = make_batch_bundle( from_bundle_id = make_batch_bundle(
frappe._dict( item_code=item_code,
{ warehouse=warehouse,
"item_code": item_code, batches=frappe._dict({batch_no: qty}),
"warehouse": warehouse, company=company,
"batches": frappe._dict({batch_no: qty}), type_of_transaction="Outward",
"company": company, qty=qty,
"type_of_transaction": "Outward",
"qty": qty,
}
)
) )
to_bundle_id = make_batch_bundle( to_bundle_id = make_batch_bundle(
frappe._dict( item_code=item_code,
{ warehouse=warehouse,
"item_code": item_code, batches=frappe._dict({batch.name: qty}),
"warehouse": warehouse, company=company,
"batches": frappe._dict({batch.name: qty}), type_of_transaction="Inward",
"company": company, qty=qty,
"type_of_transaction": "Inward",
"qty": qty,
}
)
) )
stock_entry = frappe.get_doc( stock_entry = frappe.get_doc(
@ -304,21 +297,30 @@ def split_batch(batch_no, item_code, warehouse, qty, new_batch_id=None):
return batch.name return batch.name
def make_batch_bundle(kwargs): def make_batch_bundle(
item_code: str,
warehouse: str,
batches: dict[str, float],
company: str,
type_of_transaction: str,
qty: float,
):
from frappe.utils import nowtime, today
from erpnext.stock.serial_batch_bundle import SerialBatchCreation from erpnext.stock.serial_batch_bundle import SerialBatchCreation
return ( return (
SerialBatchCreation( SerialBatchCreation(
{ {
"item_code": kwargs.item_code, "item_code": item_code,
"warehouse": kwargs.warehouse, "warehouse": warehouse,
"posting_date": today(), "posting_date": today(),
"posting_time": nowtime(), "posting_time": nowtime(),
"voucher_type": "Stock Entry", "voucher_type": "Stock Entry",
"qty": flt(kwargs.qty), "qty": qty,
"type_of_transaction": kwargs.type_of_transaction, "type_of_transaction": type_of_transaction,
"company": kwargs.company, "company": company,
"batches": kwargs.batches, "batches": batches,
"do_not_submit": True, "do_not_submit": True,
} }
) )