nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 15:39:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: do not re run patch

Browse Source 
(cherry picked from commit cad2035e07)

# Conflicts:
#	erpnext/patches.txt
This commit is contained in:
Deepesh Garg
2022-07-20 19:01:14 +05:30
committed by Mergify
parent 55399f2e58
commit 45e25b2d56
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/patches.txt
View File

@@ -368,8 +368,12 @@ erpnext.patches.v13_0.create_accounting_dimensions_in_orders
======= =======
erpnext.patches.v14_0.discount_accounting_separation erpnext.patches.v14_0.discount_accounting_separation
erpnext.patches.v14_0.delete_employee_transfer_property_doctype erpnext.patches.v14_0.delete_employee_transfer_property_doctype
<<<<<<< HEAD
erpnext.patches.v13_0.create_accounting_dimensions_in_orders #1 erpnext.patches.v13_0.create_accounting_dimensions_in_orders #1
>>>>>>> d46e406db7 (fix: Patch to make accounting dimension in orders) >>>>>>> d46e406db7 (fix: Patch to make accounting dimension in orders)
=======
erpnext.patches.v13_0.create_accounting_dimensions_in_orders
>>>>>>> cad2035e07 (chore: do not re run patch)
erpnext.patches.v13_0.set_per_billed_in_return_delivery_note erpnext.patches.v13_0.set_per_billed_in_return_delivery_note
erpnext.patches.v13_0.update_employee_advance_status erpnext.patches.v13_0.update_employee_advance_status
erpnext.patches.v13_0.job_card_status_on_hold erpnext.patches.v13_0.job_card_status_on_hold