chore: resolve conflicts

resilient-tech · Jan 8, 2025 · 2b4122c · 2b4122c
1 parent 0a94bb9
commit 2b4122c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 44 deletions.
diff --git a/india_compliance/gst_india/doctype/gst_return_log/gst_return_log.py b/india_compliance/gst_india/doctype/gst_return_log/gst_return_log.py
@@ -252,40 +252,6 @@ def _update_gstr_1_filed_upto(filing_date):
         _update_gstr_1_filed_upto(filed_upto)
 
 
-<<<<<<< HEAD
-=======
-def get_gst_return_log(posting_date, company_gstin):
-    period = getdate(posting_date).strftime("%m%Y")
-    if name := frappe.db.exists(DOCTYPE, f"GSTR1-{period}-{company_gstin}"):
-        return frappe.get_doc(DOCTYPE, name)
-
-
-def add_comment_to_gst_return_log(doc, action):
-    if not (log := get_gst_return_log(doc.posting_date, doc.company_gstin)):
-        return
-
-    log.add_comment(
-        "Comment",
-        f"{doc.doctype} : {get_link_to_form(doc.doctype, doc.name)} has been {action} by {frappe.session.user}",
-    )
-
-
-def update_is_not_latest_gstr1_data(posting_date, company_gstin):
-    period = posting_date.strftime("%m%Y")
-
-    frappe.db.set_value(
-        "GST Return Log", f"GSTR1-{period}-{company_gstin}", "is_latest_data", 0
-    )
-
-    frappe.publish_realtime(
-        "is_not_latest_gstr1_data",
-        message={"filters": {"company_gstin": company_gstin, "period": period}},
-        doctype="GSTR-1 Beta",
-        docname="GSTR-1 Beta",
-    )
-
-
->>>>>>> dc0be5df (fix: unique name for events and doctype parameter alone is redundant (#2903))
 def get_file_doc(doctype, docname, attached_to_field):
     try:
         return frappe.get_doc(

diff --git a/india_compliance/gst_india/doctype/gst_settings/gst_settings.py b/india_compliance/gst_india/doctype/gst_settings/gst_settings.py
@@ -541,7 +541,8 @@ def update_is_not_latest_gstr1_data(posting_date, company_gstin):
     )
 
     frappe.publish_realtime(
-        "is_not_latest_data",
+        "is_not_latest_gstr1_data",
         message={"filters": {"company_gstin": company_gstin, "period": period}},
         doctype="GSTR-1 Beta",
+        docname="GSTR-1 Beta",
     )
diff --git a/...compliance/gst_india/doctype/purchase_reconciliation_tool/purchase_reconciliation_tool.js b/...compliance/gst_india/doctype/purchase_reconciliation_tool/purchase_reconciliation_tool.js
@@ -233,17 +233,8 @@ frappe.ui.form.on("Purchase Reconciliation Tool", {
     handle_download_message(frm) {
         frappe.realtime.on("gstr_2a_2b_download_message", message => {
             frm.dashboard.hide();
-<<<<<<< HEAD
-            frappe.msgprint({
-                title: __("2A/2B Download Failed"),
-                message: message.error,
-                indicator: "red"
-            });
-        })
-=======
             frappe.msgprint(message);
         });
->>>>>>> dc0be5df (fix: unique name for events and doctype parameter alone is redundant (#2903))
     },
 });