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

fix: patch

Browse Source 
(cherry picked from commit 1230127d24)

# Conflicts:
#	erpnext/patches.txt
This commit is contained in:
Mihir Kandoi
2025-02-19 13:03:45 +05:30
committed by Mergify
parent a09c57f0d1
commit 8f2fdcae88
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/patches.txt
View File

@@ -402,6 +402,7 @@ execute:frappe.db.set_single_value("Accounts Settings", "exchange_gain_loss_post
erpnext.patches.v14_0.disable_add_row_in_gross_profit
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
erpnext.patches.v15_0.set_difference_amount_in_asset_value_adjustment
erpnext.patches.v14_0.update_posting_datetime
erpnext.stock.doctype.stock_ledger_entry.patches.ensure_sle_indexes
@@ -414,3 +415,7 @@ erpnext.stock.doctype.purchase_receipt_item.patches.recalculate_amount_differenc
erpnext.stock.doctype.purchase_receipt_item.patches.rename_field_from_rate_difference_to_amount_difference
erpnext.stock.doctype.purchase_receipt_item.patches.recalculate_amount_difference_field
>>>>>>> 154e9813c4 (fix: revert last commit)
=======
erpnext.patches.v15_0.rename_field_from_rate_difference_to_amount_difference
erpnext.patches.v15_0.recalculate_amount_difference_field
>>>>>>> 1230127d24 (fix: patch)