File tree 2 files changed +4
-26
lines changed
subcontracting/doctype/subcontracting_order/patches
2 files changed +4
-26
lines changed Original file line number Diff line number Diff line change @@ -387,7 +387,11 @@ erpnext.patches.v15_0.set_is_exchange_gain_loss_in_payment_entry_deductions
387
387
erpnext.patches.v15_0.enable_allow_existing_serial_no
388
388
erpnext.patches.v15_0.update_cc_in_process_statement_of_accounts
389
389
<<<<<<< HEAD
390
+ <<<<<<< HEAD
390
391
=======
391
392
erpnext.patches.v15_0.refactor_closing_stock_balance #5
392
393
erpnext.subcontracting.doctype.subcontracting_order.patches.set_sc_conversion_factor
393
394
>>>>>>> 65dc3505c4 (fix: Added patch and fallback code to prevent future issues similiar to helpdesk ticket 28246)
395
+ =======
396
+ erpnext.patches.v15_0.refactor_closing_stock_balance #5
397
+ >>>>>>> d1d01482df (fix: Removed patch as instructed by mentor)
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments