diff --git a/india_compliance/gst_india/doctype/bill_of_entry/bill_of_entry.py b/india_compliance/gst_india/doctype/bill_of_entry/bill_of_entry.py
index 36bea1de34..7cfe74cc7f 100644
--- a/india_compliance/gst_india/doctype/bill_of_entry/bill_of_entry.py
+++ b/india_compliance/gst_india/doctype/bill_of_entry/bill_of_entry.py
@@ -143,10 +143,10 @@ def on_cancel(self):
                 "match_status": "",
                 "link_name": "",
                 "link_doctype": "",
+                "action": "No Action",
             }
             if doc_name:
-                for name in doc_name:
-                    frappe.db.set_value("GST Inward Supply", name, updated_data)
+                frappe.db.set_value("GST Inward Supply", doc_name[0], updated_data)
 
     # Code adapted from AccountsController.on_trash
     def on_trash(self):
diff --git a/india_compliance/gst_india/doctype/purchase_reconciliation_tool/__init__.py b/india_compliance/gst_india/doctype/purchase_reconciliation_tool/__init__.py
index 7867fb4adf..6843515437 100644
--- a/india_compliance/gst_india/doctype/purchase_reconciliation_tool/__init__.py
+++ b/india_compliance/gst_india/doctype/purchase_reconciliation_tool/__init__.py
@@ -433,6 +433,7 @@ def get_query(self, additional_fields=None, is_return=False):
             .on(pi_item.parent == self.PI.name)
             .where(self.PI.docstatus == 1)
             .where(IfNull(self.PI.reconciliation_status, "") != "Not Applicable")
+            .where(self.PI.is_opening == "NO")
             .groupby(self.PI.name)
             .select(
                 *fields,
diff --git a/india_compliance/gst_india/overrides/purchase_invoice.py b/india_compliance/gst_india/overrides/purchase_invoice.py
index a6ee4db133..651472a118 100644
--- a/india_compliance/gst_india/overrides/purchase_invoice.py
+++ b/india_compliance/gst_india/overrides/purchase_invoice.py
@@ -59,10 +59,10 @@ def on_cancel(doc, method=None):
             "match_status": "",
             "link_name": "",
             "link_doctype": "",
+            "action": "No Action",
         }
         if doc_name:
-            for name in doc_name:
-                frappe.db.set_value("GST Inward Supply", name, updated_data)
+            frappe.db.set_value("GST Inward Supply", doc_name[0], updated_data)
 
 
 def set_reconciliation_status(doc):