schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolved conflict

Browse Source
This commit is contained in:
Nabin Hait
2024-05-08 17:57:43 +05:30
committed by GitHub
parent f7e165b5ff
commit 81afdcf745
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/patches.txt
View File

@@ -360,10 +360,6 @@ erpnext.patches.v15_0.create_accounting_dimensions_in_payment_request
erpnext.patches.v14_0.migrate_gl_to_payment_ledger
erpnext.stock.doctype.delivery_note.patches.drop_unused_return_against_index # 2023-12-20
erpnext.patches.v14_0.set_maintain_stock_for_bom_item
<<<<<<< HEAD
erpnext.patches.v15_0.delete_orphaned_asset_movement_item_records
=======
erpnext.patches.v15_0.delete_orphaned_asset_movement_item_records
erpnext.patches.v15_0.remove_cancelled_asset_capitalization_from_asset
erpnext.patches.v15_0.fix_debit_credit_in_transaction_currency
>>>>>>> e0d12ba4d0 (fix: Patch to fix the incorrect debit and credit in transaction currency)