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

fix: revert last commit

Browse Source 
(cherry picked from commit 154e9813c4)

# Conflicts:
#	erpnext/patches.txt
This commit is contained in:
Mihir Kandoi
2025-02-17 20:20:17 +05:30
committed by Mergify
parent 7b13d8cd98
commit a09c57f0d1
3 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/patches.txt
View File

@@ -262,10 +262,13 @@ erpnext.patches.v14_0.clear_reconciliation_values_from_singles
execute:frappe.rename_doc("Report", "TDS Payable Monthly", "Tax Withholding Details", force=True)
erpnext.patches.v14_0.update_proprietorship_to_individual
<<<<<<< HEAD
<<<<<<< HEAD
erpnext.patches.v15_0.rename_subcontracting_fields
=======
erpnext.stock.doctype.purchase_receipt_item.patches.rename_field_from_rate_difference_to_amount_difference
>>>>>>> 17d415b105 (fix: set landed cost based on purchase invoice rate)
=======
>>>>>>> 154e9813c4 (fix: revert last commit)
[post_model_sync]
erpnext.patches.v15_0.create_asset_depreciation_schedules_from_assets
@@ -398,6 +401,7 @@ erpnext.patches.v15_0.sync_auto_reconcile_config
execute:frappe.db.set_single_value("Accounts Settings", "exchange_gain_loss_posting_date", "Payment")
erpnext.patches.v14_0.disable_add_row_in_gross_profit
<<<<<<< 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
@@ -406,3 +410,7 @@ erpnext.patches.v15_0.update_query_report
=======
erpnext.stock.doctype.purchase_receipt_item.patches.recalculate_amount_difference_field
>>>>>>> 17d415b105 (fix: set landed cost based on purchase invoice rate)
=======
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)