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

chore: fix conflicts

Browse Source 
Removed merge conflict markers and cleaned up code.
This commit is contained in:
rohitwaghchaure
2026-07-10 10:42:16 +05:30
committed by GitHub
parent 9655c4812a
commit 65f7e9c9ad
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py
View File

@@ -219,8 +219,6 @@ def create_reposting_entries(rows, company):
if entries:
entries = ", ".join(entries)
frappe.msgprint(_("Reposting entries created: {0}").format(entries))
<<<<<<< HEAD
=======
def repost_based_on_transaction(rows, company=None, entries=None):
@@ -264,4 +262,3 @@ def repost_based_on_transaction(rows, company=None, entries=None):
entries.append(get_link_to_form("Repost Item Valuation", doc.name))
except frappe.DuplicateEntryError:
frappe.db.rollback(save_point="repost_based_on_transaction")
>>>>>>> adae0bd732 (feat: weekly auto-repost of incorrect stock valuation entries (#56637))