Skip to content

Commit 2fcfd41

Browse files
authored
Merge pull request #44257 from aerele/number-card-dynamic-filter
fix: add company dynamic filters in number cards
2 parents 48d9e9c + 29762c4 commit 2fcfd41

File tree

13 files changed

+13
-3
lines changed

13 files changed

+13
-3
lines changed

erpnext/accounts/number_card/total_incoming_bills/total_incoming_bills.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
"docstatus": 0,
55
"doctype": "Number Card",
66
"document_type": "Purchase Invoice",
7+
"dynamic_filters_json": "[[\"Purchase Invoice\",\"company\",\"=\",\" frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
78
"filters_json": "[[\"Purchase Invoice\",\"docstatus\",\"=\",\"1\",false],[\"Purchase Invoice\",\"posting_date\",\"Timespan\",\"this year\",false]]",
89
"function": "Sum",
910
"idx": 0,
1011
"is_public": 1,
1112
"is_standard": 1,
1213
"label": "Total Incoming Bills",
13-
"modified": "2020-07-22 13:06:46.045344",
14+
"modified": "2024-11-20 19:08:37.043777",
1415
"modified_by": "Administrator",
1516
"module": "Accounts",
1617
"name": "Total Incoming Bills",

erpnext/accounts/number_card/total_incoming_payment/total_incoming_payment.json

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"docstatus": 0,
55
"doctype": "Number Card",
66
"document_type": "Payment Entry",
7+
"dynamic_filters_json": "[[\"Payment Entry\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
78
"filters_json": "[[\"Payment Entry\",\"docstatus\",\"=\",\"1\",false],[\"Payment Entry\",\"posting_date\",\"Timespan\",\"this year\",false],[\"Payment Entry\",\"payment_type\",\"=\",\"Receive\",false]]",
89
"function": "Sum",
910
"idx": 0,

erpnext/accounts/number_card/total_outgoing_bills/total_outgoing_bills.json

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"docstatus": 0,
55
"doctype": "Number Card",
66
"document_type": "Sales Invoice",
7+
"dynamic_filters_json": "[[\"Sales Invoice\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
78
"filters_json": "[[\"Sales Invoice\",\"docstatus\",\"=\",\"1\",false],[\"Sales Invoice\",\"posting_date\",\"Timespan\",\"this year\",false]]",
89
"function": "Sum",
910
"idx": 0,

erpnext/accounts/number_card/total_outgoing_payment/total_outgoing_payment.json

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"docstatus": 0,
55
"doctype": "Number Card",
66
"document_type": "Payment Entry",
7+
"dynamic_filters_json": "[[\"Payment Entry\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
78
"filters_json": "[[\"Payment Entry\",\"docstatus\",\"=\",\"1\",false],[\"Payment Entry\",\"posting_date\",\"Timespan\",\"this year\",false],[\"Payment Entry\",\"payment_type\",\"=\",\"Pay\",false]]",
89
"function": "Sum",
910
"idx": 0,

erpnext/assets/number_card/asset_value/asset_value.json

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"docstatus": 0,
55
"doctype": "Number Card",
66
"document_type": "Asset",
7+
"dynamic_filters_json": "[[\"Asset\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
78
"filters_json": "[]",
89
"function": "Sum",
910
"idx": 0,

erpnext/assets/number_card/new_assets_(this_year)/new_assets_(this_year).json

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"docstatus": 0,
44
"doctype": "Number Card",
55
"document_type": "Asset",
6+
"dynamic_filters_json": "[[\"Asset\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
67
"filters_json": "[[\"Asset\",\"creation\",\"Timespan\",\"this year\",false]]",
78
"function": "Count",
89
"idx": 0,

erpnext/assets/number_card/total_assets/total_assets.json

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"docstatus": 0,
44
"doctype": "Number Card",
55
"document_type": "Asset",
6+
"dynamic_filters_json": "[[\"Asset\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
67
"filters_json": "[]",
78
"function": "Count",
89
"idx": 0,

erpnext/crm/number_card/open_opportunity/open_opportunity.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"docstatus": 0,
44
"doctype": "Number Card",
55
"document_type": "Opportunity",
6-
"dynamic_filters_json": "[[\"Opportunity\",\"status\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
6+
"dynamic_filters_json": "[[\"Opportunity\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
77
"filters_json": "[[\"Opportunity\",\"company\",\"=\",null,false]]",
88
"function": "Count",
99
"idx": 0,

erpnext/manufacturing/number_card/monthly_completed_work_order/monthly_completed_work_order.json

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"docstatus": 0,
44
"doctype": "Number Card",
55
"document_type": "Work Order",
6+
"dynamic_filters_json": "[[\"Work Order\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
67
"filters_json": "[[\"Work Order\",\"status\",\"=\",\"Completed\"],[\"Work Order\",\"docstatus\",\"=\",1],[\"Work Order\",\"creation\",\"between\",[\"2020-06-08\",\"2020-07-08\"]]]",
78
"function": "Count",
89
"idx": 0,

erpnext/manufacturing/number_card/monthly_total_work_order/monthly_total_work_order.json

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"docstatus": 0,
44
"doctype": "Number Card",
55
"document_type": "Work Order",
6+
"dynamic_filters_json": "[[\"Work Order\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
67
"filters_json": "[[\"Work Order\",\"docstatus\",\"=\",1],[\"Work Order\",\"creation\",\"between\",[\"2020-06-08\",\"2020-07-08\"]]]",
78
"function": "Count",
89
"idx": 0,

erpnext/manufacturing/number_card/ongoing_job_card/ongoing_job_card.json

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"docstatus": 0,
44
"doctype": "Number Card",
55
"document_type": "Job Card",
6+
"dynamic_filters_json": "[[\"Job Card\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
67
"filters_json": "[[\"Job Card\",\"status\",\"!=\",\"Completed\"],[\"Job Card\",\"docstatus\",\"=\",1]]",
78
"function": "Count",
89
"idx": 0,

erpnext/selling/number_card/active_customers/active_customers.json

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"docstatus": 0,
44
"doctype": "Number Card",
55
"document_type": "Customer",
6-
"dynamic_filters_json": "",
76
"filters_json": "[[\"Customer\",\"disabled\",\"=\",\"0\"]]",
87
"function": "Count",
98
"idx": 0,

erpnext/stock/number_card/total_warehouses/total_warehouses.json

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"docstatus": 0,
44
"doctype": "Number Card",
55
"document_type": "Warehouse",
6+
"dynamic_filters_json": "[[\"Warehouse\",\"company\",\"=\",\"frappe.defaults.get_user_default(\\\"Company\\\")\"]]",
67
"filters_json": "[[\"Warehouse\",\"disabled\",\"=\",0]]",
78
"function": "Count",
89
"idx": 0,

0 commit comments

Comments
 (0)