nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-29 13:58:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve backport conflict in accounting dashboard number cards

Browse Source 
Resolved Mergify backport conflicts (PR #55548 / backport of #55484) by
taking the final upstream state: fiscal-year posting_date Between filter
with calendar-year fallback, Timespan filter removed.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
khushi8112
2026-06-23 16:32:16 +05:30
parent da1ccc2b62
commit f106513005
4 changed files with 0 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/accounts/number_card/total_incoming_bills/total_incoming_bills.json
View File

@@ -4,27 +4,14 @@
"docstatus": 0,
"doctype": "Number Card",
"document_type": "Purchase Invoice",
<<<<<<< HEAD
<<<<<<< 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]]\"]]",
=======
"dynamic_filters_json": "[[\"Purchase Invoice\", \"company\", \"=\", \"frappe.defaults.get_user_default(\\\"Company\\\")\"], [\"Purchase Invoice\", \"posting_date\", \"Between\", \"(frappe.boot.current_fiscal_year || [null, `${frappe.datetime.get_today().slice(0,4)}-01-01`, `${frappe.datetime.get_today().slice(0,4)}-12-31`]).slice(1)\"]]",
>>>>>>> c68918bc18 (fix: set a fallback value if no fiscal year set)
"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",

13
erpnext/accounts/number_card/total_incoming_payment/total_incoming_payment.json
View File

@@ -4,27 +4,14 @@
"docstatus": 0,
"doctype": "Number Card",
"document_type": "Payment Entry",
<<<<<<< HEAD
<<<<<<< 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]]\"]]",
=======
"dynamic_filters_json": "[[\"Payment Entry\", \"company\", \"=\", \"frappe.defaults.get_user_default(\\\"Company\\\")\"], [\"Payment Entry\", \"posting_date\", \"Between\", \"(frappe.boot.current_fiscal_year || [null, `${frappe.datetime.get_today().slice(0,4)}-01-01`, `${frappe.datetime.get_today().slice(0,4)}-12-31`]).slice(1)\"]]",
>>>>>>> c68918bc18 (fix: set a fallback value if no fiscal year set)
"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",

13
erpnext/accounts/number_card/total_outgoing_bills/total_outgoing_bills.json
View File

@@ -4,27 +4,14 @@
"docstatus": 0,
"doctype": "Number Card",
"document_type": "Sales Invoice",
<<<<<<< HEAD
<<<<<<< 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]]\"]]",
=======
"dynamic_filters_json": "[[\"Sales Invoice\", \"company\", \"=\", \"frappe.defaults.get_user_default(\\\"Company\\\")\"], [\"Sales Invoice\", \"posting_date\", \"Between\", \"(frappe.boot.current_fiscal_year || [null, `${frappe.datetime.get_today().slice(0,4)}-01-01`, `${frappe.datetime.get_today().slice(0,4)}-12-31`]).slice(1)\"]]",
>>>>>>> c68918bc18 (fix: set a fallback value if no fiscal year set)
"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",

13
erpnext/accounts/number_card/total_outgoing_payment/total_outgoing_payment.json
View File

@@ -4,27 +4,14 @@
"docstatus": 0,
"doctype": "Number Card",
"document_type": "Payment Entry",
<<<<<<< HEAD
<<<<<<< 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]]\"]]",
=======
"dynamic_filters_json": "[[\"Payment Entry\", \"company\", \"=\", \"frappe.defaults.get_user_default(\\\"Company\\\")\"], [\"Payment Entry\", \"posting_date\", \"Between\", \"(frappe.boot.current_fiscal_year || [null, `${frappe.datetime.get_today().slice(0,4)}-01-01`, `${frappe.datetime.get_today().slice(0,4)}-12-31`]).slice(1)\"]]",
>>>>>>> c68918bc18 (fix: set a fallback value if no fiscal year set)
"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",