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

Merge pull request #53805 from frappe/mergify/bp/version-16-hotfix/pr-52152

Browse Source 
Refactor reposting feature (backport #52152)
This commit is contained in:
rohitwaghchaure
2026-03-27 12:36:22 +05:30
committed by GitHub
parent fbd72ff232 15739b5d81
commit bec83c1944
5 changed files with 476 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.js
View File

@@ -69,9 +69,15 @@ frappe.ui.form.on("Repost Item Valuation", {
} }
if (frm.doc.status == "In Progress") { if (frm.doc.status == "In Progress") {
frm.doc.current_index = data.current_index; if (data.current_index) {
frm.doc.items_to_be_repost = data.items_to_be_repost; frm.doc.current_index = data.current_index;
frm.doc.total_reposting_count = data.total_reposting_count; frm.doc.items_to_be_repost = data.items_to_be_repost;
}
if (data.vouchers_posted) {
frm.doc.total_vouchers = data.total_vouchers;
frm.doc.vouchers_posted = data.vouchers_posted;
}
frm.dashboard.reset(); frm.dashboard.reset();
frm.trigger("show_reposting_progress"); frm.trigger("show_reposting_progress");
@@ -108,15 +114,31 @@ frappe.ui.form.on("Repost Item Valuation", {
show_reposting_progress: function (frm) { show_reposting_progress: function (frm) {
var bars = []; var bars = [];
let title = "";
let progress = 0.0;
let total_count = frm.doc.items_to_be_repost ? JSON.parse(frm.doc.items_to_be_repost).length : 0; let total_count = frm.doc.items_to_be_repost ? JSON.parse(frm.doc.items_to_be_repost).length : 0;
if (frm.doc?.total_reposting_count) { if (total_count > 1) {
total_count = frm.doc.total_reposting_count; progress = flt((cint(frm.doc.current_index) / total_count) * 100, 2) || 0.5;
title = __("Reposting for Item-Wh Completed {0}%", [progress]);
bars.push({
title: title,
width: progress + "%",
progress_class: "progress-bar-success",
});
frm.dashboard.add_progress(__("Reposting Progress"), bars);
} }
let progress = flt((cint(frm.doc.current_index) / total_count) * 100, 2) || 0.5; if (!frm.doc.vouchers_posted) {
var title = __("Reposting Completed {0}%", [progress]); return;
}
// Show voucher posting progress if vouchers are being reposted
bars = [];
progress = flt((cint(frm.doc.vouchers_posted) / cint(frm.doc.total_vouchers)) * 100, 2) || 0.5;
title = __("Reposting for Vouchers Completed {0}%", [progress]);
bars.push({ bars.push({
title: title, title: title,
@@ -124,7 +146,7 @@ frappe.ui.form.on("Repost Item Valuation", {
progress_class: "progress-bar-success", progress_class: "progress-bar-success",
}); });
frm.dashboard.add_progress(__("Reposting Progress"), bars); frm.dashboard.add_progress(__("Reposting Vouchers Progress"), bars);
}, },
restart_reposting: function (frm) { restart_reposting: function (frm) {

121
erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
View File

@@ -27,14 +27,23 @@
"error_section", "error_section",
"error_log", "error_log",
"reposting_info_section", "reposting_info_section",
"reposting_data_file",
"items_to_be_repost", "items_to_be_repost",
"distinct_item_and_warehouse",
"column_break_o1sj", "column_break_o1sj",
"total_reposting_count", "total_reposting_count",
"current_index", "current_index",
"gl_reposting_index", "gl_reposting_index",
"affected_transactions" "vouchers_based_on_item_and_warehouse_section",
"total_vouchers",
"column_break_yqwo",
"vouchers_posted",
"last_sle_posted_section",
"reposted_item_code",
"reposted_warehouse",
"reposting_data_file",
"column_break_miwc",
"sle_posting_date",
"sle_posting_time",
"reposted_sle_creation"
], ],
"fields": [ "fields": [
{ {
@@ -167,15 +176,6 @@
"print_hide": 1, "print_hide": 1,
"read_only": 1 "read_only": 1
}, },
{
"fieldname": "distinct_item_and_warehouse",
"fieldtype": "Code",
"hidden": 1,
"label": "Distinct Item and Warehouse",
"no_copy": 1,
"print_hide": 1,
"read_only": 1
},
{ {
"fieldname": "current_index", "fieldname": "current_index",
"fieldtype": "Int", "fieldtype": "Int",
@@ -185,14 +185,6 @@
"print_hide": 1, "print_hide": 1,
"read_only": 1 "read_only": 1
}, },
{
"fieldname": "affected_transactions",
"fieldtype": "Code",
"hidden": 1,
"label": "Affected Transactions",
"no_copy": 1,
"read_only": 1
},
{ {
"default": "0", "default": "0",
"fieldname": "gl_reposting_index", "fieldname": "gl_reposting_index",
@@ -205,7 +197,7 @@
{ {
"fieldname": "reposting_info_section", "fieldname": "reposting_info_section",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Reposting Info" "label": "Reposting Item and Warehouse"
}, },
{ {
"fieldname": "column_break_o1sj", "fieldname": "column_break_o1sj",
@@ -214,14 +206,7 @@
{ {
"fieldname": "total_reposting_count", "fieldname": "total_reposting_count",
"fieldtype": "Int", "fieldtype": "Int",
"label": "Total Reposting Count", "label": "No of Items to Repost",
"no_copy": 1,
"read_only": 1
},
{
"fieldname": "reposting_data_file",
"fieldtype": "Attach",
"label": "Reposting Data File",
"no_copy": 1, "no_copy": 1,
"read_only": 1 "read_only": 1
}, },
@@ -247,13 +232,89 @@
"fieldname": "repost_only_accounting_ledgers", "fieldname": "repost_only_accounting_ledgers",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Repost Only Accounting Ledgers" "label": "Repost Only Accounting Ledgers"
},
{
"fieldname": "vouchers_based_on_item_and_warehouse_section",
"fieldtype": "Section Break",
"label": "Reposting Vouchers"
},
{
"fieldname": "total_vouchers",
"fieldtype": "Int",
"label": "Total Ledgers",
"no_copy": 1,
"read_only": 1
},
{
"fieldname": "column_break_yqwo",
"fieldtype": "Column Break"
},
{
"fieldname": "vouchers_posted",
"fieldtype": "Int",
"label": "Ledgers Posted",
"no_copy": 1,
"read_only": 1
},
{
"fieldname": "last_sle_posted_section",
"fieldtype": "Section Break",
"label": "Last SLE Posted"
},
{
"fieldname": "reposted_item_code",
"fieldtype": "Link",
"label": "Reposted Item Code",
"no_copy": 1,
"options": "Item",
"read_only": 1
},
{
"fieldname": "reposted_warehouse",
"fieldtype": "Link",
"label": "Reposted Warehouse",
"no_copy": 1,
"options": "Warehouse",
"read_only": 1
},
{
"fieldname": "column_break_miwc",
"fieldtype": "Column Break"
},
{
"fieldname": "reposted_sle_creation",
"fieldtype": "Datetime",
"label": "Reposted SLE Creation",
"no_copy": 1,
"read_only": 1
},
{
"fieldname": "sle_posting_date",
"fieldtype": "Date",
"label": "SLE Posting Date",
"no_copy": 1,
"read_only": 1
},
{
"fieldname": "sle_posting_time",
"fieldtype": "Time",
"label": "SLE Posting Time",
"no_copy": 1,
"read_only": 1
},
{
"fieldname": "reposting_data_file",
"fieldtype": "Attach",
"label": "Reposting Data File",
"no_copy": 1,
"read_only": 1
} }
], ],
"grid_page_length": 50, "grid_page_length": 50,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2026-02-25 14:22:21.681549", "modified": "2026-03-26 13:52:51.895504",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Repost Item Valuation", "name": "Repost Item Valuation",

18
erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
View File

@@ -35,14 +35,12 @@ class RepostItemValuation(Document):
if TYPE_CHECKING: if TYPE_CHECKING:
from frappe.types import DF from frappe.types import DF
affected_transactions: DF.Code | None
allow_negative_stock: DF.Check allow_negative_stock: DF.Check
allow_zero_rate: DF.Check allow_zero_rate: DF.Check
amended_from: DF.Link | None amended_from: DF.Link | None
based_on: DF.Literal["Transaction", "Item and Warehouse"] based_on: DF.Literal["Transaction", "Item and Warehouse"]
company: DF.Link | None company: DF.Link | None
current_index: DF.Int current_index: DF.Int
distinct_item_and_warehouse: DF.Code | None
error_log: DF.LongText | None error_log: DF.LongText | None
gl_reposting_index: DF.Int gl_reposting_index: DF.Int
item_code: DF.Link | None item_code: DF.Link | None
@@ -51,13 +49,20 @@ class RepostItemValuation(Document):
posting_time: DF.Time | None posting_time: DF.Time | None
recreate_stock_ledgers: DF.Check recreate_stock_ledgers: DF.Check
repost_only_accounting_ledgers: DF.Check repost_only_accounting_ledgers: DF.Check
reposted_item_code: DF.Link | None
reposted_sle_creation: DF.Datetime | None
reposted_warehouse: DF.Link | None
reposting_data_file: DF.Attach | None reposting_data_file: DF.Attach | None
reposting_reference: DF.Data | None reposting_reference: DF.Data | None
sle_posting_date: DF.Date | None
sle_posting_time: DF.Time | None
status: DF.Literal["Queued", "In Progress", "Completed", "Skipped", "Failed", "Cancelled"] status: DF.Literal["Queued", "In Progress", "Completed", "Skipped", "Failed", "Cancelled"]
total_reposting_count: DF.Int total_reposting_count: DF.Int
total_vouchers: DF.Int
via_landed_cost_voucher: DF.Check via_landed_cost_voucher: DF.Check
voucher_no: DF.DynamicLink | None voucher_no: DF.DynamicLink | None
voucher_type: DF.Link | None voucher_type: DF.Link | None
vouchers_posted: DF.Int
warehouse: DF.Link | None warehouse: DF.Link | None
# end: auto-generated types # end: auto-generated types
@@ -261,6 +266,13 @@ class RepostItemValuation(Document):
self.items_to_be_repost = None self.items_to_be_repost = None
self.gl_reposting_index = 0 self.gl_reposting_index = 0
self.total_reposting_count = 0 self.total_reposting_count = 0
self.total_vouchers = 0
self.vouchers_posted = 0
self.reposted_item_code = None
self.reposted_warehouse = None
self.sle_posting_date = None
self.sle_posting_time = None
self.reposted_sle_creation = None
self.clear_attachment() self.clear_attachment()
self.db_update() self.db_update()
@@ -435,7 +447,7 @@ def repost_sl_entries(doc):
) )
else: else:
repost_future_sle( repost_future_sle(
args=[ items_to_be_repost=[
frappe._dict( frappe._dict(
{ {
"item_code": doc.item_code, "item_code": doc.item_code,

7
erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py
View File

@@ -248,12 +248,7 @@ def get_item_warehouse_combinations(filters: dict | None = None) -> dict:
bin.warehouse, bin.warehouse,
item.valuation_method, item.valuation_method,
) )
.where( .where((item.is_stock_item == 1) & (warehouse.is_group == 0) & (warehouse.company == filters.company))
(item.is_stock_item == 1)
& (item.has_serial_no == 0)
& (warehouse.is_group == 0)
& (warehouse.company == filters.company)
)
) )
if filters.item_code: if filters.item_code:

663
erpnext/stock/stock_ledger.py
View File

@@ -16,6 +16,7 @@ from frappe.utils import (
cstr, cstr,
flt, flt,
format_date, format_date,
get_datetime,
get_link_to_form, get_link_to_form,
getdate, getdate,
now, now,
@@ -77,9 +78,6 @@ def make_sl_entries(sl_entries, allow_negative_stock=False, via_landed_cost_vouc
future_sle_exists(args, sl_entries) future_sle_exists(args, sl_entries)
for sle in sl_entries: for sle in sl_entries:
if sle.serial_no and not via_landed_cost_voucher:
validate_serial_no(sle)
if cancelled: if cancelled:
sle["actual_qty"] = -flt(sle.get("actual_qty")) sle["actual_qty"] = -flt(sle.get("actual_qty"))
@@ -160,35 +158,6 @@ def get_args_for_future_sle(row):
) )
def validate_serial_no(sle):
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
for sn in get_serial_nos(sle.serial_no):
args = copy.deepcopy(sle)
args.serial_no = sn
args.warehouse = ""
vouchers = []
for row in get_stock_ledger_entries(args, ">"):
voucher_type = frappe.bold(row.voucher_type)
voucher_no = frappe.bold(get_link_to_form(row.voucher_type, row.voucher_no))
vouchers.append(f"{voucher_type} {voucher_no}")
if vouchers:
serial_no = frappe.bold(sn)
msg = (
f"""The serial no {serial_no} has been used in the future transactions so you need to cancel them first.
The list of the transactions are as below."""
+ "<br><br><ul><li>"
)
msg += "</li><li>".join(vouchers)
msg += "</li></ul>"
title = "Cannot Submit" if not sle.get("is_cancelled") else "Cannot Cancel"
frappe.throw(_(msg), title=_(title), exc=SerialNoExistsInFutureTransaction)
def validate_cancellation(kargs): def validate_cancellation(kargs):
if kargs[0].get("is_cancelled"): if kargs[0].get("is_cancelled"):
repost_entry = frappe.db.get_value( repost_entry = frappe.db.get_value(
@@ -242,146 +211,77 @@ def make_entry(args, allow_negative_stock=False, via_landed_cost_voucher=False):
def repost_future_sle( def repost_future_sle(
args=None, items_to_be_repost=None,
voucher_type=None, voucher_type=None,
voucher_no=None, voucher_no=None,
allow_negative_stock=None, allow_negative_stock=None,
via_landed_cost_voucher=False, via_landed_cost_voucher=False,
doc=None, doc=None,
): ):
if not args:
args = [] # set args to empty list if None to avoid enumerate error
reposting_data = {} reposting_data = {}
if doc and doc.reposting_data_file: if not items_to_be_repost:
reposting_data = get_reposting_data(doc.reposting_data_file) items_to_be_repost = get_items_to_be_repost(
voucher_type=voucher_type, voucher_no=voucher_no, doc=doc, reposting_data=reposting_data
)
items_to_be_repost = get_items_to_be_repost( repost_affected_transaction = get_affected_transactions(doc) or set()
voucher_type=voucher_type, voucher_no=voucher_no, doc=doc, reposting_data=reposting_data if not items_to_be_repost:
) return
if items_to_be_repost:
args = items_to_be_repost
distinct_item_warehouses = get_distinct_item_warehouse(args, doc, reposting_data=reposting_data)
affected_transactions = get_affected_transactions(doc, reposting_data=reposting_data)
i = get_current_index(doc) or 0
while i < len(args):
validate_item_warehouse(args[i])
index = get_current_index(doc) or 0
while index < len(items_to_be_repost):
obj = update_entries_after( obj = update_entries_after(
{ {
"item_code": args[i].get("item_code"), "item_code": items_to_be_repost[index].get("item_code"),
"warehouse": args[i].get("warehouse"), "warehouse": items_to_be_repost[index].get("warehouse"),
"posting_date": args[i].get("posting_date"), "posting_date": items_to_be_repost[index].get("posting_date"),
"posting_time": args[i].get("posting_time"), "posting_time": items_to_be_repost[index].get("posting_time"),
"creation": args[i].get("creation"), "creation": items_to_be_repost[index].get("creation"),
"distinct_item_warehouses": distinct_item_warehouses, "current_idx": index,
"items_to_be_repost": args, "items_to_be_repost": items_to_be_repost,
"current_index": i, "repost_doc": doc,
"repost_affected_transaction": repost_affected_transaction,
}, },
allow_negative_stock=allow_negative_stock, allow_negative_stock=allow_negative_stock,
via_landed_cost_voucher=via_landed_cost_voucher, via_landed_cost_voucher=via_landed_cost_voucher,
) )
affected_transactions.update(obj.affected_transactions)
key = (args[i].get("item_code"), args[i].get("warehouse")) index += 1
if distinct_item_warehouses.get(key):
distinct_item_warehouses[key].reposting_status = True
if obj.new_items_found: repost_affected_transaction.update(obj.repost_affected_transaction)
for _item_wh, data in distinct_item_warehouses.items(): update_args_in_repost_item_valuation(doc, index, items_to_be_repost, repost_affected_transaction)
if ("args_idx" not in data and not data.reposting_status) or (
data.sle_changed and data.reposting_status
):
data.args_idx = len(args)
args.append(data.sle)
elif data.sle_changed and not data.reposting_status:
args[data.args_idx] = data.sle
data.sle_changed = False
i += 1
if doc:
update_args_in_repost_item_valuation(
doc, i, args, distinct_item_warehouses, affected_transactions
)
def get_reposting_data(file_path) -> dict: def update_args_in_repost_item_valuation(
file_name = frappe.db.get_value( doc, index, items_to_be_repost, repost_affected_transaction, only_affected_transaction=False
"File", ):
file_name = ""
has_file = False
if doc.reposting_data_file:
has_file = True
if doc.reposting_data_file:
file_name = get_reposting_file_name(doc.doctype, doc.name)
# frappe.delete_doc("File", file_name, ignore_permissions=True, delete_permanently=True)
doc.reposting_data_file = create_json_gz_file(
{ {
"file_url": file_path, "repost_affected_transaction": repost_affected_transaction,
"attached_to_field": "reposting_data_file",
}, },
"name", doc,
file_name,
) )
if not file_name: if not only_affected_transaction or not has_file:
return frappe._dict()
attached_file = frappe.get_doc("File", file_name)
content = attached_file.get_content()
if isinstance(content, str):
content = content.encode("utf-8")
try:
data = gzip.decompress(content)
except Exception:
return frappe._dict()
if data := json.loads(data.decode("utf-8")):
data = data
return parse_json(data)
def validate_item_warehouse(args):
for field in ["item_code", "warehouse", "posting_date", "posting_time"]:
if args.get(field) in [None, ""]:
validation_msg = f"The field {frappe.unscrub(field)} is required for the reposting"
frappe.throw(_(validation_msg))
def update_args_in_repost_item_valuation(doc, index, args, distinct_item_warehouses, affected_transactions):
if not doc.items_to_be_repost:
file_name = ""
if doc.reposting_data_file:
file_name = get_reposting_file_name(doc.doctype, doc.name)
# frappe.delete_doc("File", file_name, ignore_permissions=True, delete_permanently=True)
doc.reposting_data_file = create_json_gz_file(
{
"items_to_be_repost": args,
"distinct_item_and_warehouse": {str(k): v for k, v in distinct_item_warehouses.items()},
"affected_transactions": affected_transactions,
},
doc,
file_name,
)
doc.db_set( doc.db_set(
{ {
"current_index": index, "current_index": index,
"total_reposting_count": len(args), "items_to_be_repost": frappe.as_json(items_to_be_repost),
"total_reposting_count": len(items_to_be_repost),
"reposting_data_file": doc.reposting_data_file, "reposting_data_file": doc.reposting_data_file,
} }
) )
else:
doc.db_set(
{
"items_to_be_repost": json.dumps(args, default=str),
"distinct_item_and_warehouse": json.dumps(
{str(k): v for k, v in distinct_item_warehouses.items()}, default=str
),
"current_index": index,
"affected_transactions": frappe.as_json(affected_transactions),
}
)
if not frappe.in_test: if not frappe.in_test:
frappe.db.commit() frappe.db.commit()
@@ -389,9 +289,8 @@ def update_args_in_repost_item_valuation(doc, index, args, distinct_item_warehou
"item_reposting_progress", "item_reposting_progress",
{ {
"name": doc.name, "name": doc.name,
"items_to_be_repost": json.dumps(args, default=str),
"current_index": index, "current_index": index,
"total_reposting_count": len(args), "total_reposting_count": len(items_to_be_repost),
}, },
doctype=doc.doctype, doctype=doc.doctype,
docname=doc.name, docname=doc.name,
@@ -448,23 +347,27 @@ def create_file(doc, compressed_content):
return _file.file_url return _file.file_url
def get_items_to_be_repost(voucher_type=None, voucher_no=None, doc=None, reposting_data=None): def validate_item_warehouse(args):
if not reposting_data and doc and doc.reposting_data_file: for field in ["item_code", "warehouse", "posting_date", "posting_time"]:
reposting_data = get_reposting_data(doc.reposting_data_file) if args.get(field) in [None, ""]:
validation_msg = f"The field {frappe.unscrub(field)} is required for the reposting"
frappe.throw(_(validation_msg))
def get_items_to_be_repost(voucher_type=None, voucher_no=None, doc=None, reposting_data=None):
if reposting_data and reposting_data.items_to_be_repost: if reposting_data and reposting_data.items_to_be_repost:
return reposting_data.items_to_be_repost return reposting_data.items_to_be_repost
items_to_be_repost = [] items_to_be_repost = []
if doc and doc.items_to_be_repost: if doc and doc.items_to_be_repost:
items_to_be_repost = json.loads(doc.items_to_be_repost) or [] items_to_be_repost = json.loads(doc.items_to_be_repost)
if not items_to_be_repost and voucher_type and voucher_no: if not items_to_be_repost and voucher_type and voucher_no:
items_to_be_repost = frappe.db.get_all( items_to_be_repost = frappe.db.get_all(
"Stock Ledger Entry", "Stock Ledger Entry",
filters={"voucher_type": voucher_type, "voucher_no": voucher_no}, filters={"voucher_type": voucher_type, "voucher_no": voucher_no},
fields=["item_code", "warehouse", "posting_date", "posting_time", "creation"], fields=["item_code", "warehouse", "posting_date", "posting_time", "creation", "posting_datetime"],
order_by="creation asc", order_by="creation asc",
group_by="item_code, warehouse", group_by="item_code, warehouse",
) )
@@ -472,51 +375,44 @@ def get_items_to_be_repost(voucher_type=None, voucher_no=None, doc=None, reposti
return items_to_be_repost or [] return items_to_be_repost or []
def get_distinct_item_warehouse(args=None, doc=None, reposting_data=None):
if not reposting_data and doc and doc.reposting_data_file:
reposting_data = get_reposting_data(doc.reposting_data_file)
if reposting_data and reposting_data.distinct_item_and_warehouse:
return parse_distinct_items_and_warehouses(reposting_data.distinct_item_and_warehouse)
distinct_item_warehouses = {}
if doc and doc.distinct_item_and_warehouse:
distinct_item_warehouses = json.loads(doc.distinct_item_and_warehouse)
distinct_item_warehouses = {
frappe.safe_eval(k): frappe._dict(v) for k, v in distinct_item_warehouses.items()
}
else:
for i, d in enumerate(args):
distinct_item_warehouses.setdefault(
(d.item_code, d.warehouse), frappe._dict({"reposting_status": False, "sle": d, "args_idx": i})
)
return distinct_item_warehouses
def parse_distinct_items_and_warehouses(distinct_items_and_warehouses):
new_dict = frappe._dict({})
# convert string keys to tuple
for k, v in distinct_items_and_warehouses.items():
new_dict[frappe.safe_eval(k)] = frappe._dict(v)
return new_dict
def get_affected_transactions(doc, reposting_data=None) -> set[tuple[str, str]]: def get_affected_transactions(doc, reposting_data=None) -> set[tuple[str, str]]:
if not reposting_data and doc and doc.reposting_data_file: if not reposting_data and doc and doc.reposting_data_file:
reposting_data = get_reposting_data(doc.reposting_data_file) reposting_data = get_reposting_data(doc.reposting_data_file)
if reposting_data and reposting_data.affected_transactions: if reposting_data and reposting_data.repost_affected_transaction:
return {tuple(transaction) for transaction in reposting_data.affected_transactions} return {tuple(transaction) for transaction in reposting_data.repost_affected_transaction}
if not doc.affected_transactions: return set()
return set()
transactions = frappe.parse_json(doc.affected_transactions)
return {tuple(transaction) for transaction in transactions} def get_reposting_data(file_path) -> dict:
file_name = frappe.db.get_value(
"File",
{
"file_url": file_path,
"attached_to_field": "reposting_data_file",
},
"name",
)
if not file_name:
return frappe._dict()
attached_file = frappe.get_doc("File", file_name)
content = attached_file.get_content()
if isinstance(content, str):
content = content.encode("utf-8")
try:
data = gzip.decompress(content)
except Exception:
return frappe._dict()
if data := json.loads(data.decode("utf-8")):
data = data
return parse_json(data)
def get_current_index(doc=None): def get_current_index(doc=None):
@@ -552,6 +448,11 @@ class update_entries_after:
self.allow_zero_rate = allow_zero_rate self.allow_zero_rate = allow_zero_rate
self.via_landed_cost_voucher = via_landed_cost_voucher self.via_landed_cost_voucher = via_landed_cost_voucher
self.item_code = args.get("item_code") self.item_code = args.get("item_code")
self.prev_sle_dict = frappe._dict({})
self.stock_ledgers_to_repost = []
self.current_idx = args.get("current_idx", 0)
self.repost_doc = args.get("repost_doc") or None
self.items_to_be_repost = args.get("items_to_be_repost") or None
self.allow_negative_stock = allow_negative_stock or is_negative_stock_allowed( self.allow_negative_stock = allow_negative_stock or is_negative_stock_allowed(
item_code=self.item_code item_code=self.item_code
@@ -564,14 +465,16 @@ class update_entries_after:
self.company = frappe.get_cached_value("Warehouse", self.args.warehouse, "company") self.company = frappe.get_cached_value("Warehouse", self.args.warehouse, "company")
self.set_precision() self.set_precision()
self.valuation_method = get_valuation_method(self.item_code, self.company) self.valuation_method = get_valuation_method(self.item_code, self.company)
self.repost_affected_transaction = args.get("repost_affected_transaction") or set()
self.new_items_found = False self.new_items_found = False
self.distinct_item_warehouses = args.get("distinct_item_warehouses", frappe._dict())
self.affected_transactions: set[tuple[str, str]] = set()
self.reserved_stock = self.get_reserved_stock() self.reserved_stock = self.get_reserved_stock()
self.data = frappe._dict() self.data = frappe._dict()
self.initialize_previous_data(self.args)
if not self.repost_doc or not self.repost_doc.reposted_item_code:
self.initialize_previous_data(self.args)
self.build() self.build()
def get_reserved_stock(self): def get_reserved_stock(self):
@@ -621,7 +524,14 @@ class update_entries_after:
""" """
self.data.setdefault(args.warehouse, frappe._dict()) self.data.setdefault(args.warehouse, frappe._dict())
warehouse_dict = self.data[args.warehouse] warehouse_dict = self.data[args.warehouse]
if self.stock_ledgers_to_repost:
return
previous_sle = get_previous_sle_of_current_voucher(args) previous_sle = get_previous_sle_of_current_voucher(args)
if previous_sle:
self.prev_sle_dict[(args.get("item_code"), args.get("warehouse"))] = previous_sle
warehouse_dict.previous_sle = previous_sle warehouse_dict.previous_sle = previous_sle
for key in ("qty_after_transaction", "valuation_rate", "stock_value"): for key in ("qty_after_transaction", "valuation_rate", "stock_value"):
@@ -643,27 +553,180 @@ class update_entries_after:
if not future_sle_exists(self.args): if not future_sle_exists(self.args):
self.update_bin() self.update_bin()
else: else:
entries_to_fix = self.get_future_entries_to_fix() ledgers_to_repost = self.get_sles_to_repost()
if not ledgers_to_repost:
return
i = 0 self.stock_ledgers_to_repost = ledgers_to_repost
while i < len(entries_to_fix): self.repost_stock_ledger_entries()
sle = entries_to_fix[i] self.update_bin()
i += 1 self.reset_vouchers_and_idx()
self.update_data_in_repost()
self.process_sle(sle)
self.update_bin_data(sle)
if sle.dependant_sle_voucher_detail_no:
entries_to_fix = self.get_dependent_entries_to_fix(entries_to_fix, sle)
if sle.voucher_type == "Stock Entry" and is_repack_entry(sle.voucher_no):
# for repack entries, we need to repost both source and target warehouses
self.update_distinct_item_warehouses_for_repack(sle)
if self.exceptions: if self.exceptions:
self.raise_exceptions() self.raise_exceptions()
def update_distinct_item_warehouses_for_repack(self, sle): def get_sles_to_repost(self):
sles = ( self.distinct_item_wh_sles = frappe._dict()
sle_dict = self.get_items_to_be_repost()
self.prepare_sles_to_repost(sle_dict)
if not self.distinct_item_wh_sles:
return []
ledgers_to_repost = sorted(
(row for rows in self.distinct_item_wh_sles.values() for row in rows),
key=lambda d: (get_datetime(d.get("posting_datetime")), get_datetime(d.get("creation"))),
)
return ledgers_to_repost
def prepare_sles_to_repost(self, sle_dict):
sles = self.get_future_entries_to_repost(sle_dict)
for sle in sles:
item_wh_key = (sle.item_code, sle.warehouse)
if item_wh_key not in self.prev_sle_dict:
prev_sle = get_previous_sle_of_current_voucher(sle)
self.prev_sle_dict[item_wh_key] = prev_sle
key = (sle.item_code, sle.warehouse, sle.voucher_detail_no, sle.name)
if key not in self.distinct_item_wh_sles:
self.distinct_item_wh_sles.setdefault(key, []).append(sle)
if sle.dependant_sle_voucher_detail_no:
self.prepare_dependent_sles_to_repost(sle)
def prepare_dependent_sles_to_repost(self, sle):
if sle.voucher_type == "Stock Entry" and is_repack_entry(sle.voucher_no):
sles = self.get_sles_for_repack(sle)
for repack_sle in sles:
key = (
repack_sle.item_code,
repack_sle.warehouse,
repack_sle.voucher_detail_no,
repack_sle.name,
)
if key not in self.distinct_item_wh_sles:
self.distinct_item_wh_sles.setdefault(key, []).append(repack_sle)
self.prepare_sles_to_repost(repack_sle)
elif sle.dependant_sle_voucher_detail_no:
dependant_sle = get_sle_by_voucher_detail_no(sle.dependant_sle_voucher_detail_no)
if not dependant_sle:
return
key = (
dependant_sle.item_code,
dependant_sle.warehouse,
dependant_sle.voucher_detail_no,
dependant_sle.name,
)
if key not in self.distinct_item_wh_sles:
self.distinct_item_wh_sles.setdefault(key, []).append(dependant_sle)
self.prepare_sles_to_repost(dependant_sle)
def get_items_to_be_repost(self):
if self.repost_doc and self.repost_doc.reposted_item_code:
return frappe._dict(
{
"item_code": self.repost_doc.reposted_item_code,
"warehouse": self.repost_doc.reposted_warehouse,
"posting_date": self.repost_doc.sle_posting_date,
"posting_time": self.repost_doc.sle_posting_time,
"creation": self.repost_doc.reposted_sle_creation,
}
)
return frappe._dict(
{
"item_code": self.args.item_code,
"warehouse": self.args.warehouse,
"posting_date": self.args.posting_date,
"posting_time": self.args.posting_time,
"creation": self.args.creation,
}
)
def repost_stock_ledger_entries(self):
i = 0
while self.stock_ledgers_to_repost:
sle = self.stock_ledgers_to_repost.pop(0)
if self.args.item_code != sle.item_code or self.args.warehouse != sle.warehouse:
self.repost_affected_transaction.add((sle.voucher_type, sle.voucher_no))
if isinstance(sle, dict):
sle = frappe._dict(sle)
self.process_sle(sle)
i += 1
if i % 500 == 0:
self.update_data_in_repost(sle, i)
def reset_vouchers_and_idx(self):
self.stock_ledgers_to_repost = []
self.prev_sle_dict = frappe._dict()
def update_data_in_repost(self, sle=None, index=None):
if not self.repost_doc:
return
values_to_update = {
"total_vouchers": len(self.stock_ledgers_to_repost) + cint(index),
"vouchers_posted": index or 0,
"reposted_item_code": None,
"reposted_warehouse": None,
"sle_posting_date": None,
"sle_posting_time": None,
"reposted_sle_creation": None,
}
if sle:
values_to_update.update(
{
"reposted_item_code": sle.item_code,
"reposted_warehouse": sle.warehouse,
"sle_posting_date": sle.posting_date,
"sle_posting_time": sle.posting_time,
"reposted_sle_creation": sle.creation,
}
)
self.repost_doc.db_set(values_to_update)
update_args_in_repost_item_valuation(
self.repost_doc,
self.current_idx,
self.items_to_be_repost,
self.repost_affected_transaction,
only_affected_transaction=True,
)
if not frappe.in_test:
# To maintain the state of the reposting, so if timeout happens, it can be resumed from the last posted voucher
frappe.db.commit() # nosemgrep
self.publish_real_time_progress(index=index)
def publish_real_time_progress(self, index=None):
frappe.publish_realtime(
"item_reposting_progress",
{
"name": self.repost_doc.name,
"total_vouchers": len(self.stock_ledgers_to_repost) + cint(index),
"vouchers_posted": index or 0,
},
doctype=self.repost_doc.doctype,
docname=self.repost_doc.name,
)
def get_future_entries_to_repost(self, kwargs):
return get_stock_ledger_entries(kwargs, ">=", "asc", for_update=True, check_serial_no=False)
def get_sles_for_repack(self, sle):
return (
frappe.get_all( frappe.get_all(
"Stock Ledger Entry", "Stock Ledger Entry",
filters={ filters={
@@ -671,16 +734,13 @@ class update_entries_after:
"voucher_no": sle.voucher_no, "voucher_no": sle.voucher_no,
"actual_qty": (">", 0), "actual_qty": (">", 0),
"is_cancelled": 0, "is_cancelled": 0,
"voucher_detail_no": ("!=", sle.dependant_sle_voucher_detail_no), "dependant_sle_voucher_detail_no": ("!=", sle.dependant_sle_voucher_detail_no),
}, },
fields=["*"], fields=["*"],
) )
or [] or []
) )
for dependant_sle in sles:
self.update_distinct_item_warehouses(dependant_sle)
def has_stock_reco_with_serial_batch(self, sle): def has_stock_reco_with_serial_batch(self, sle):
if ( if (
sle.voucher_type == "Stock Reconciliation" sle.voucher_type == "Stock Reconciliation"
@@ -691,33 +751,11 @@ class update_entries_after:
return False return False
def process_sle_against_current_timestamp(self): def process_sle_against_current_timestamp(self):
sl_entries = self.get_sle_against_current_voucher() sl_entries = get_sle_against_current_voucher(self.args)
for sle in sl_entries: for sle in sl_entries:
sle["timestamp"] = sle.posting_datetime sle["timestamp"] = sle.posting_datetime
self.process_sle(sle) self.process_sle(sle)
def get_sle_against_current_voucher(self):
self.args["posting_datetime"] = get_combine_datetime(self.args.posting_date, self.args.posting_time)
doctype = frappe.qb.DocType("Stock Ledger Entry")
query = (
frappe.qb.from_(doctype)
.select("*")
.where(
(doctype.item_code == self.args.item_code)
& (doctype.warehouse == self.args.warehouse)
& (doctype.is_cancelled == 0)
& (doctype.posting_datetime == self.args.posting_datetime)
)
.orderby(doctype.creation, order=Order.asc)
.for_update()
)
if not self.args.get("cancelled"):
query = query.where(doctype.creation == self.args.creation)
return query.run(as_dict=True)
def get_future_entries_to_fix(self): def get_future_entries_to_fix(self):
# includes current entry! # includes current entry!
args = self.data[self.args.warehouse].previous_sle or frappe._dict( args = self.data[self.args.warehouse].previous_sle or frappe._dict(
@@ -726,78 +764,8 @@ class update_entries_after:
return list(self.get_sle_after_datetime(args)) return list(self.get_sle_after_datetime(args))
def get_dependent_entries_to_fix(self, entries_to_fix, sle):
dependant_sle = get_sle_by_voucher_detail_no(
sle.dependant_sle_voucher_detail_no, excluded_sle=sle.name
)
if not dependant_sle:
return entries_to_fix
elif dependant_sle.item_code == self.item_code and dependant_sle.warehouse == self.args.warehouse:
return entries_to_fix
elif dependant_sle.item_code != self.item_code:
self.update_distinct_item_warehouses(dependant_sle)
return entries_to_fix
elif dependant_sle.item_code == self.item_code and dependant_sle.warehouse in self.data:
return entries_to_fix
else:
self.initialize_previous_data(dependant_sle)
self.update_distinct_item_warehouses(dependant_sle)
return entries_to_fix
def update_distinct_item_warehouses(self, dependant_sle):
key = (dependant_sle.item_code, dependant_sle.warehouse)
val = frappe._dict({"sle": dependant_sle})
if key not in self.distinct_item_warehouses:
self.distinct_item_warehouses[key] = val
self.new_items_found = True
else:
existing_sle = self.distinct_item_warehouses[key].get("sle", {})
if getdate(existing_sle.get("posting_date")) > getdate(dependant_sle.posting_date):
self.distinct_item_warehouses[key] = val
self.new_items_found = True
elif (
dependant_sle.actual_qty > 0
and dependant_sle.voucher_type == "Stock Entry"
and is_transfer_stock_entry(dependant_sle.voucher_no)
):
if self.distinct_item_warehouses[key].get("transfer_entry_to_repost"):
return
val["transfer_entry_to_repost"] = True
self.distinct_item_warehouses[key] = val
self.new_items_found = True
def is_dependent_voucher_reposted(self, dependant_sle) -> bool:
# Return False if the dependent voucher is not reposted
if self.args.items_to_be_repost and self.args.current_index:
index = self.args.current_index
while index < len(self.args.items_to_be_repost):
if (
self.args.items_to_be_repost[index].get("item_code") == dependant_sle.item_code
and self.args.items_to_be_repost[index].get("warehouse") == dependant_sle.warehouse
):
if getdate(self.args.items_to_be_repost[index].get("posting_date")) > getdate(
dependant_sle.posting_date
):
self.args.items_to_be_repost[index]["posting_date"] = dependant_sle.posting_date
return False
index += 1
return True
def get_dependent_voucher_detail_nos(self, key):
if "dependent_voucher_detail_nos" not in self.distinct_item_warehouses[key]:
self.distinct_item_warehouses[key].dependent_voucher_detail_nos = []
return self.distinct_item_warehouses[key].dependent_voucher_detail_nos
def validate_previous_sle_qty(self, sle): def validate_previous_sle_qty(self, sle):
previous_sle = self.data[sle.warehouse].previous_sle previous_sle = self.prev_sle_dict.get((sle.item_code, sle.warehouse))
if previous_sle and previous_sle.get("qty_after_transaction") < 0 and sle.get("actual_qty") > 0: if previous_sle and previous_sle.get("qty_after_transaction") < 0 and sle.get("actual_qty") > 0:
frappe.msgprint( frappe.msgprint(
_( _(
@@ -816,10 +784,32 @@ class update_entries_after:
def process_sle(self, sle): def process_sle(self, sle):
# previous sle data for this warehouse # previous sle data for this warehouse
self.wh_data = self.data[sle.warehouse] key = (sle.item_code, sle.warehouse)
if key not in self.prev_sle_dict:
prev_sle = get_previous_sle_of_current_voucher(sle)
if prev_sle:
self.prev_sle_dict[key] = prev_sle
if not self.prev_sle_dict.get(key):
self.prev_sle_dict[key] = frappe._dict(
{
"qty_after_transaction": 0.0,
"valuation_rate": 0.0,
"stock_value": 0.0,
"prev_stock_value": 0.0,
"stock_queue": [],
}
)
self.wh_data = self.prev_sle_dict.get(key)
if self.wh_data.stock_queue and isinstance(self.wh_data.stock_queue, str):
self.wh_data.stock_queue = json.loads(self.wh_data.stock_queue)
if not self.wh_data.prev_stock_value:
self.wh_data.prev_stock_value = self.wh_data.stock_value
self.validate_previous_sle_qty(sle) self.validate_previous_sle_qty(sle)
self.affected_transactions.add((sle.voucher_type, sle.voucher_no))
if (sle.serial_no and not self.via_landed_cost_voucher) or not cint(self.allow_negative_stock): if (sle.serial_no and not self.via_landed_cost_voucher) or not cint(self.allow_negative_stock):
# validate negative stock for serialized items, fifo valuation # validate negative stock for serialized items, fifo valuation
@@ -922,6 +912,7 @@ class update_entries_after:
sle.stock_queue = json.dumps(self.wh_data.stock_queue) sle.stock_queue = json.dumps(self.wh_data.stock_queue)
sle.stock_value_difference = stock_value_difference sle.stock_value_difference = stock_value_difference
if ( if (
sle.is_adjustment_entry sle.is_adjustment_entry
and flt(sle.qty_after_transaction, self.flt_precision) == 0 and flt(sle.qty_after_transaction, self.flt_precision) == 0
@@ -946,6 +937,8 @@ class update_entries_after:
sle.modified = now() sle.modified = now()
frappe.get_doc(sle).db_update() frappe.get_doc(sle).db_update()
self.prev_sle_dict[key] = sle
if not self.args.get("sle_id") or ( if not self.args.get("sle_id") or (
sle.serial_and_batch_bundle and sle.auto_created_serial_and_batch_bundle sle.serial_and_batch_bundle and sle.auto_created_serial_and_batch_bundle
): ):
@@ -1728,15 +1721,42 @@ class update_entries_after:
def update_bin(self): def update_bin(self):
# update bin for each warehouse # update bin for each warehouse
for warehouse, data in self.data.items(): for (item_code, warehouse), data in self.prev_sle_dict.items():
bin_name = get_or_make_bin(self.item_code, warehouse) bin_name = get_or_make_bin(item_code, warehouse)
updated_values = {"actual_qty": data.qty_after_transaction, "stock_value": data.stock_value} updated_values = {
"actual_qty": flt(data.qty_after_transaction),
"stock_value": flt(data.stock_value),
}
if data.valuation_rate is not None: if data.valuation_rate is not None:
updated_values["valuation_rate"] = data.valuation_rate updated_values["valuation_rate"] = flt(data.valuation_rate)
frappe.db.set_value("Bin", bin_name, updated_values, update_modified=True) frappe.db.set_value("Bin", bin_name, updated_values, update_modified=True)
def get_sle_against_current_voucher(kwargs):
kwargs["posting_datetime"] = get_combine_datetime(kwargs.posting_date, kwargs.posting_time)
doctype = frappe.qb.DocType("Stock Ledger Entry")
query = (
frappe.qb.from_(doctype)
.select("*")
.where(
(doctype.item_code == kwargs.item_code)
& (doctype.warehouse == kwargs.warehouse)
& (doctype.is_cancelled == 0)
& (doctype.posting_datetime == kwargs.posting_datetime)
)
.orderby(doctype.creation, order=Order.asc)
.for_update()
)
if not kwargs.get("cancelled"):
query = query.where(doctype.creation == kwargs.creation)
return query.run(as_dict=True)
def get_previous_sle_of_current_voucher(args, operator="<", exclude_current_voucher=False): def get_previous_sle_of_current_voucher(args, operator="<", exclude_current_voucher=False):
"""get stock ledger entries filtered by specific posting datetime conditions""" """get stock ledger entries filtered by specific posting datetime conditions"""
@@ -1889,22 +1909,15 @@ def get_stock_ledger_entries(
) )
def get_sle_by_voucher_detail_no(voucher_detail_no, excluded_sle=None): def get_sle_by_voucher_detail_no(voucher_detail_no):
return frappe.db.get_value( return frappe.db.get_value(
"Stock Ledger Entry", "Stock Ledger Entry",
{"voucher_detail_no": voucher_detail_no, "name": ["!=", excluded_sle], "is_cancelled": 0}, {
[ "voucher_detail_no": voucher_detail_no,
"item_code", "is_cancelled": 0,
"warehouse", "dependant_sle_voucher_detail_no": ("is", "not set"),
"actual_qty", },
"qty_after_transaction", ["*"],
"posting_date",
"posting_time",
"voucher_detail_no",
"posting_datetime as timestamp",
"voucher_type",
"voucher_no",
],
as_dict=1, as_dict=1,
) )