fix(India): Auto tax fetching based on GSTIN
(cherry picked from commit 7cae669e814a958310ca1b8ee408450569c32d10)
# Conflicts:
# erpnext/patches.txt
# erpnext/regional/india/setup.py
# erpnext/selling/doctype/quotation/quotation.json
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 028834a..83464ae 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -356,6 +356,7 @@
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
@@ -363,3 +364,9 @@
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)