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

Merge pull request #54977 from frappe/mergify/bp/version-15-hotfix/pr-54962

Browse Source 
fix: incoming rate for legacy serial no (backport #54962)
This commit is contained in:
rohitwaghchaure
2026-05-21 15:00:09 +05:30
committed by GitHub
parent 1c90c3bbc2 da8d25d80a
commit fc05c38b9b
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/stock/deprecated_serial_batch.py
View File

@@ -30,11 +30,20 @@ class DeprecatedSerialNoValuation:
def get_incoming_value_for_serial_nos(self, serial_nos): def get_incoming_value_for_serial_nos(self, serial_nos):
from erpnext.stock.utils import get_combine_datetime from erpnext.stock.utils import get_combine_datetime
do_not_fetch_rate = frappe.db.get_single_value(
"Stock Reposting Settings", "do_not_fetch_incoming_rate_from_serial_no"
)
# get rate from serial nos within same company # get rate from serial nos within same company
incoming_values = 0.0 incoming_values = 0.0
for serial_no in serial_nos: for serial_no in serial_nos:
sn_details = frappe.db.get_value("Serial No", serial_no, ["purchase_rate", "company"], as_dict=1) sn_details = frappe.db.get_value("Serial No", serial_no, ["purchase_rate", "company"], as_dict=1)
if sn_details and sn_details.purchase_rate and sn_details.company == self.sle.company: if (
sn_details
and sn_details.purchase_rate
and sn_details.company == self.sle.company
and (not frappe.flags.through_repost_item_valuation or not do_not_fetch_rate)
):
self.serial_no_incoming_rate[serial_no] += flt(sn_details.purchase_rate) self.serial_no_incoming_rate[serial_no] += flt(sn_details.purchase_rate)
incoming_values += self.serial_no_incoming_rate[serial_no] incoming_values += self.serial_no_incoming_rate[serial_no]
continue continue

11
erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
View File

@@ -1,5 +1,6 @@
{ {
"actions": [], "actions": [],
"allow_bulk_edit": 1,
"allow_rename": 1, "allow_rename": 1,
"beta": 1, "beta": 1,
"creation": "2021-10-01 10:56:30.814787", "creation": "2021-10-01 10:56:30.814787",
@@ -13,6 +14,7 @@
"end_time", "end_time",
"limits_dont_apply_on", "limits_dont_apply_on",
"item_based_reposting", "item_based_reposting",
"do_not_fetch_incoming_rate_from_serial_no",
"errors_notification_section", "errors_notification_section",
"notify_reposting_error_to_role" "notify_reposting_error_to_role"
], ],
@@ -65,12 +67,19 @@
"fieldname": "errors_notification_section", "fieldname": "errors_notification_section",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Errors Notification" "label": "Errors Notification"
},
{
"default": "0",
"description": "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction",
"fieldname": "do_not_fetch_incoming_rate_from_serial_no",
"fieldtype": "Check",
"label": "Do not fetch incoming rate from Serial No"
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2025-07-08 11:27:46.659056", "modified": "2026-05-15 12:59:34.392491",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Reposting Settings", "name": "Stock Reposting Settings",

1
erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py
View File

@@ -16,6 +16,7 @@ class StockRepostingSettings(Document):
if TYPE_CHECKING: if TYPE_CHECKING:
from frappe.types import DF from frappe.types import DF
do_not_fetch_incoming_rate_from_serial_no: DF.Check
end_time: DF.Time | None end_time: DF.Time | None
item_based_reposting: DF.Check item_based_reposting: DF.Check
limit_reposting_timeslot: DF.Check limit_reposting_timeslot: DF.Check