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

chore: fix conflicts

Browse Source 
Removed legacy fields related to incoming rate and parallel reposting.
This commit is contained in:
rohitwaghchaure
2026-05-21 14:30:26 +05:30
committed by GitHub
parent 08466218d8
commit 5557e982bf
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,12 +16,7 @@ class StockRepostingSettings(Document):
if TYPE_CHECKING:
from frappe.types import DF
<<<<<<< HEAD
=======
do_not_fetch_incoming_rate_from_serial_no: DF.Check
enable_parallel_reposting: DF.Check
enable_separate_reposting_for_gl: DF.Check
>>>>>>> 2773b7c002 (fix: incoming rate for legacy serial no)
end_time: DF.Time | None
item_based_reposting: DF.Check
limit_reposting_timeslot: DF.Check