fix: merge conflict(patch)
This commit is contained in:
parent
dc2944a041
commit
a7a5742375
@ -364,4 +364,5 @@ erpnext.patches.v13_0.add_cost_center_in_loans
|
||||
erpnext.patches.v13_0.set_return_against_in_pos_invoice_references
|
||||
erpnext.patches.v13_0.remove_unknown_links_to_prod_plan_items # 24-03-2022
|
||||
erpnext.patches.v13_0.update_expense_claim_status_for_paid_advances
|
||||
erpnext.patches.v13_0.create_gst_custom_fields_in_quotation
|
||||
erpnext.patches.v14_0.discount_accounting_separation
|
Loading…
x
Reference in New Issue
Block a user