diff --git a/erpnext/accounts/number_card/total_incoming_bills/total_incoming_bills.json b/erpnext/accounts/number_card/total_incoming_bills/total_incoming_bills.json
index 88c7cae3f69..a184869539e 100644
--- a/erpnext/accounts/number_card/total_incoming_bills/total_incoming_bills.json
+++ b/erpnext/accounts/number_card/total_incoming_bills/total_incoming_bills.json
@@ -4,14 +4,23 @@
  "docstatus": 0,
  "doctype": "Number Card",
  "document_type": "Purchase Invoice",
+<<<<<<< HEAD
  "dynamic_filters_json": "[[\"Purchase Invoice\",\"company\",\"=\",\" frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
  "filters_json": "[[\"Purchase Invoice\",\"docstatus\",\"=\",\"1\",false],[\"Purchase Invoice\",\"posting_date\",\"Timespan\",\"this year\",false]]",
+=======
+ "dynamic_filters_json": "[[\"Purchase Invoice\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"], [\"Purchase Invoice\",\"posting_date\",\"Between\",\"[frappe.boot.current_fiscal_year[1], frappe.boot.current_fiscal_year[2]]\"]]",
+ "filters_json": "[[\"Purchase Invoice\",\"docstatus\",\"=\",\"1\"]]",
+>>>>>>> e8fff2fdad (fix: use fiscal year instead of calendar year in accounting dashboard number cards)
  "function": "Sum",
  "idx": 0,
  "is_public": 1,
  "is_standard": 1,
  "label": "Total Incoming Bills",
+<<<<<<< HEAD
  "modified": "2024-11-20 19:08:37.043777",
+=======
+ "modified": "2026-06-01 12:00:00.000000",
+>>>>>>> e8fff2fdad (fix: use fiscal year instead of calendar year in accounting dashboard number cards)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Total Incoming Bills",
diff --git a/erpnext/accounts/number_card/total_incoming_payment/total_incoming_payment.json b/erpnext/accounts/number_card/total_incoming_payment/total_incoming_payment.json
index a53b222ed7d..6714b36dc15 100644
--- a/erpnext/accounts/number_card/total_incoming_payment/total_incoming_payment.json
+++ b/erpnext/accounts/number_card/total_incoming_payment/total_incoming_payment.json
@@ -4,14 +4,23 @@
  "docstatus": 0,
  "doctype": "Number Card",
  "document_type": "Payment Entry",
+<<<<<<< HEAD
  "dynamic_filters_json": "[[\"Payment Entry\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
  "filters_json": "[[\"Payment Entry\",\"docstatus\",\"=\",\"1\",false],[\"Payment Entry\",\"posting_date\",\"Timespan\",\"this year\",false],[\"Payment Entry\",\"payment_type\",\"=\",\"Receive\",false]]",
+=======
+ "dynamic_filters_json": "[[\"Payment Entry\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"], [\"Payment Entry\",\"posting_date\",\"Between\",\"[frappe.boot.current_fiscal_year[1], frappe.boot.current_fiscal_year[2]]\"]]",
+ "filters_json": "[[\"Payment Entry\",\"docstatus\",\"=\",\"1\"],[\"Payment Entry\",\"payment_type\",\"=\",\"Receive\"]]",
+>>>>>>> e8fff2fdad (fix: use fiscal year instead of calendar year in accounting dashboard number cards)
  "function": "Sum",
  "idx": 0,
  "is_public": 1,
  "is_standard": 1,
  "label": "Total Incoming Payment",
+<<<<<<< HEAD
  "modified": "2020-07-22 13:06:20.237689",
+=======
+ "modified": "2026-06-01 12:00:00.000000",
+>>>>>>> e8fff2fdad (fix: use fiscal year instead of calendar year in accounting dashboard number cards)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Total Incoming Payment",
diff --git a/erpnext/accounts/number_card/total_outgoing_bills/total_outgoing_bills.json b/erpnext/accounts/number_card/total_outgoing_bills/total_outgoing_bills.json
index 092defd94bd..da806362b3c 100644
--- a/erpnext/accounts/number_card/total_outgoing_bills/total_outgoing_bills.json
+++ b/erpnext/accounts/number_card/total_outgoing_bills/total_outgoing_bills.json
@@ -4,14 +4,23 @@
  "docstatus": 0,
  "doctype": "Number Card",
  "document_type": "Sales Invoice",
+<<<<<<< HEAD
  "dynamic_filters_json": "[[\"Sales Invoice\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
  "filters_json": "[[\"Sales Invoice\",\"docstatus\",\"=\",\"1\",false],[\"Sales Invoice\",\"posting_date\",\"Timespan\",\"this year\",false]]",
+=======
+ "dynamic_filters_json": "[[\"Sales Invoice\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"], [\"Sales Invoice\",\"posting_date\",\"Between\",\"[frappe.boot.current_fiscal_year[1], frappe.boot.current_fiscal_year[2]]\"]]",
+ "filters_json": "[[\"Sales Invoice\",\"docstatus\",\"=\",\"1\"]]",
+>>>>>>> e8fff2fdad (fix: use fiscal year instead of calendar year in accounting dashboard number cards)
  "function": "Sum",
  "idx": 0,
  "is_public": 1,
  "is_standard": 1,
  "label": "Total Outgoing Bills",
+<<<<<<< HEAD
  "modified": "2020-07-22 13:07:19.633101",
+=======
+ "modified": "2026-06-01 12:00:00.000000",
+>>>>>>> e8fff2fdad (fix: use fiscal year instead of calendar year in accounting dashboard number cards)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Total Outgoing Bills",
diff --git a/erpnext/accounts/number_card/total_outgoing_payment/total_outgoing_payment.json b/erpnext/accounts/number_card/total_outgoing_payment/total_outgoing_payment.json
index d60f30f7c9a..5230e4679c9 100644
--- a/erpnext/accounts/number_card/total_outgoing_payment/total_outgoing_payment.json
+++ b/erpnext/accounts/number_card/total_outgoing_payment/total_outgoing_payment.json
@@ -4,14 +4,23 @@
  "docstatus": 0,
  "doctype": "Number Card",
  "document_type": "Payment Entry",
+<<<<<<< HEAD
  "dynamic_filters_json": "[[\"Payment Entry\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
  "filters_json": "[[\"Payment Entry\",\"docstatus\",\"=\",\"1\",false],[\"Payment Entry\",\"posting_date\",\"Timespan\",\"this year\",false],[\"Payment Entry\",\"payment_type\",\"=\",\"Pay\",false]]",
+=======
+ "dynamic_filters_json": "[[\"Payment Entry\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"], [\"Payment Entry\",\"posting_date\",\"Between\",\"[frappe.boot.current_fiscal_year[1], frappe.boot.current_fiscal_year[2]]\"]]",
+ "filters_json": "[[\"Payment Entry\",\"docstatus\",\"=\",\"1\"],[\"Payment Entry\",\"payment_type\",\"=\",\"Pay\"]]",
+>>>>>>> e8fff2fdad (fix: use fiscal year instead of calendar year in accounting dashboard number cards)
  "function": "Sum",
  "idx": 0,
  "is_public": 1,
  "is_standard": 1,
  "label": "Total Outgoing Payment",
+<<<<<<< HEAD
  "modified": "2020-07-22 12:49:34.942896",
+=======
+ "modified": "2026-06-01 12:00:00.000000",
+>>>>>>> e8fff2fdad (fix: use fiscal year instead of calendar year in accounting dashboard number cards)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Total Outgoing Payment",