chore: resolve conflicts, add dependency

resilient-tech · Oct 26, 2023 · fd246b5 · fd246b5
1 parent e57df67
commit fd246b5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/india_compliance/patches.txt b/india_compliance/patches.txt
@@ -30,9 +30,6 @@ execute:import frappe; frappe.db.set_single_value("GST Settings", "gstin_status_
 execute:from india_compliance.gst_india.setup import create_email_template; create_email_template()
 india_compliance.patches.post_install.update_reconciliation_status
 india_compliance.patches.post_install.update_payment_entry_fields
-<<<<<<< HEAD
-=======
 india_compliance.patches.v15.remove_ignore_reconciliation_field
 india_compliance.patches.post_install.update_company_fixtures
 india_compliance.patches.post_install.update_itc_classification_field
->>>>>>> 212f1799 (feat: accounting automations for ineligible ITC (#1168))
diff --git a/india_compliance/patches/check_version_compatibility.py b/india_compliance/patches/check_version_compatibility.py
@@ -18,7 +18,7 @@
     {
         "app_name": "ERPNext",
         "current_version": version.parse(erpnext.__version__),
-        "required_versions": {"version-14": "14.44.0"},
+        "required_versions": {"version-14": "14.45.2"},
     },
 ]
 

diff --git a/india_compliance/public/js/transaction.js b/india_compliance/public/js/transaction.js
@@ -46,7 +46,7 @@ for (const doctype of [
     set_fetch_if_empty_for_is_ineligible_for_itc(doctype);
 }
 
-function set_fetch_if_empty_for_gst_hsn_code(doctype) {
+function set_fetch_if_empty_for_is_ineligible_for_itc(doctype) {
     frappe.ui.form.on(doctype, "setup", function (frm) {
         frm.get_docfield("items", "is_ineligible_for_itc").fetch_if_empty = 0;
     });