nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 13:49:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-04-02 17:25:29 +05:30
parent 0f6d52c625
commit 485f5cfdfe
3 changed files with 89 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/patches.txt
View File

@@ -356,7 +356,6 @@ erpnext.patches.v13_0.update_exchange_rate_settings
erpnext.patches.v14_0.delete_amazon_mws_doctype
erpnext.patches.v13_0.set_work_order_qty_in_so_from_mr
erpnext.patches.v13_0.update_accounts_in_loan_docs
<<<<<<< HEAD
erpnext.patches.v14_0.update_batch_valuation_flag
erpnext.patches.v14_0.delete_non_profit_doctypes
erpnext.patches.v14_0.update_employee_advance_status
@@ -364,9 +363,4 @@ 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.remove_unknown_links_to_prod_plan_items
erpnext.patches.v13_0.rename_non_profit_fields
erpnext.patches.v13_0.enable_ksa_vat_docs #1
erpnext.patches.v13_0.create_gst_custom_fields_in_quotation
>>>>>>> 7cae669e81 (fix(India): Auto tax fetching based on GSTIN)
erpnext.patches.v13_0.create_gst_custom_fields_in_quotation