CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-08 04:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolved conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2025-01-08 11:08:27 +05:30
committed by GitHub
parent 7318748a4c
commit e9be8583b0
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/patches.txt
View File

@@ -386,8 +386,5 @@ erpnext.patches.v14_0.update_stock_uom_in_work_order_item
erpnext.patches.v15_0.set_is_exchange_gain_loss_in_payment_entry_deductions erpnext.patches.v15_0.set_is_exchange_gain_loss_in_payment_entry_deductions
erpnext.patches.v15_0.enable_allow_existing_serial_no erpnext.patches.v15_0.enable_allow_existing_serial_no
erpnext.patches.v15_0.update_cc_in_process_statement_of_accounts erpnext.patches.v15_0.update_cc_in_process_statement_of_accounts
<<<<<<< HEAD
=======
erpnext.patches.v15_0.refactor_closing_stock_balance #5 erpnext.patches.v15_0.refactor_closing_stock_balance #5
erpnext.patches.v15_0.update_asset_status_to_work_in_progress erpnext.patches.v15_0.update_asset_status_to_work_in_progress
>>>>>>> 6850019649 (feat: work in progress status for asset (#45066))