schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(report): add options to multiselectlist fields

Browse Source 
(cherry picked from commit 8785342fce)

# Conflicts:
#	erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js
#	erpnext/accounts/report/gross_profit/gross_profit.js
#	erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js
#	erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js
This commit is contained in:
venkat102
2025-02-08 22:49:35 +05:30
committed by Mergify
parent 534b25c448
commit aa0ada9670
20 changed files with 204 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/accounts/report/accounts_payable/accounts_payable.js
View File

@@ -111,6 +111,7 @@ frappe.query_reports["Accounts Payable"] = {
fieldname: "party",
label: __("Party"),
fieldtype: "MultiSelectList",
options: "party_type",
get_data: function (txt) {
if (!frappe.query_report.filters) return;

1
erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js
View File

@@ -88,6 +88,7 @@ frappe.query_reports["Accounts Payable Summary"] = {
fieldname: "party",
label: __("Party"),
fieldtype: "MultiSelectList",
options: "party_type",
get_data: function (txt) {
if (!frappe.query_report.filters) return;

1
erpnext/accounts/report/accounts_receivable/accounts_receivable.js
View File

@@ -56,6 +56,7 @@ frappe.query_reports["Accounts Receivable"] = {
fieldname: "party",
label: __("Party"),
fieldtype: "MultiSelectList",
options: "party_type",
get_data: function (txt) {
if (!frappe.query_report.filters) return;

1
erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js
View File

@@ -88,6 +88,7 @@ frappe.query_reports["Accounts Receivable Summary"] = {
fieldname: "party",
label: __("Party"),
fieldtype: "MultiSelectList",
options: "party_type",
get_data: function (txt) {
if (!frappe.query_report.filters) return;

1
erpnext/accounts/report/budget_variance_report/budget_variance_report.js
View File

@@ -91,6 +91,7 @@ function get_filters() {
fieldname: "budget_against_filter",
label: __("Dimension Filter"),
fieldtype: "MultiSelectList",
options: "budget_against",
get_data: function (txt) {
if (!frappe.query_report.filters) return;

25
erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js
View File

@@ -93,5 +93,30 @@ frappe.query_reports["Customer Ledger Summary"] = {
fieldtype: "Data",
hidden: 1,
},
<<<<<<< HEAD
=======
{
fieldname: "cost_center",
label: __("Cost Center"),
fieldtype: "MultiSelectList",
options: "Cost Center",
get_data: function (txt) {
return frappe.db.get_link_options("Cost Center", txt, {
company: frappe.query_report.get_filter_value("company"),
});
},
},
{
fieldname: "project",
label: __("Project"),
fieldtype: "MultiSelectList",
options: "Project",
get_data: function (txt) {
return frappe.db.get_link_options("Project", txt, {
company: frappe.query_report.get_filter_value("company"),
});
},
},
>>>>>>> 8785342fce (fix(report): add options to multiselectlist fields)
],
};

3
erpnext/accounts/report/general_ledger/general_ledger.js
View File

@@ -68,6 +68,7 @@ frappe.query_reports["General Ledger"] = {
fieldname: "party",
label: __("Party"),
fieldtype: "MultiSelectList",
options: "party_type",
get_data: function (txt) {
if (!frappe.query_report.filters) return;
@@ -146,6 +147,7 @@ frappe.query_reports["General Ledger"] = {
fieldname: "cost_center",
label: __("Cost Center"),
fieldtype: "MultiSelectList",
options: "Cost Center",
get_data: function (txt) {
return frappe.db.get_link_options("Cost Center", txt, {
company: frappe.query_report.get_filter_value("company"),
@@ -156,6 +158,7 @@ frappe.query_reports["General Ledger"] = {
fieldname: "project",
label: __("Project"),
fieldtype: "MultiSelectList",
options: "Project",
get_data: function (txt) {
return frappe.db.get_link_options("Project", txt, {
company: frappe.query_report.get_filter_value("company"),

37
erpnext/accounts/report/gross_profit/gross_profit.js
View File

@@ -51,6 +51,43 @@ frappe.query_reports["Gross Profit"] = {
fieldtype: "Link",
options: "Sales Person",
},
<<<<<<< HEAD
=======
{
fieldname: "warehouse",
label: __("Warehouse"),
fieldtype: "Link",
options: "Warehouse",
get_query: function () {
var company = frappe.query_report.get_filter_value("company");
return {
filters: [["Warehouse", "company", "=", company]],
};
},
},
{
fieldname: "cost_center",
label: __("Cost Center"),
fieldtype: "MultiSelectList",
options: "Cost Center",
get_data: function (txt) {
return frappe.db.get_link_options("Cost Center", txt, {
company: frappe.query_report.get_filter_value("company"),
});
},
},
{
fieldname: "project",
label: __("Project"),
fieldtype: "MultiSelectList",
options: "Project",
get_data: function (txt) {
return frappe.db.get_link_options("Project", txt, {
company: frappe.query_report.get_filter_value("company"),
});
},
},
>>>>>>> 8785342fce (fix(report): add options to multiselectlist fields)
],
tree: true,
name_field: "parent",

1
erpnext/accounts/report/payment_ledger/payment_ledger.js
View File

@@ -51,6 +51,7 @@ function get_filters() {
fieldname: "party",
label: __("Party"),
fieldtype: "MultiSelectList",
options: "party_type",
get_data: function (txt) {
if (!frappe.query_report.filters) return;

25
erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js
View File

@@ -75,5 +75,30 @@ frappe.query_reports["Supplier Ledger Summary"] = {
fieldtype: "Data",
hidden: 1,
},
<<<<<<< HEAD
=======
{
fieldname: "cost_center",
label: __("Cost Center"),
fieldtype: "MultiSelectList",
options: "Cost Center",
get_data: function (txt) {
return frappe.db.get_link_options("Cost Center", txt, {
company: frappe.query_report.get_filter_value("company"),
});
},
},
{
fieldname: "project",
label: __("Project"),
fieldtype: "MultiSelectList",
options: "Project",
get_data: function (txt) {
return frappe.db.get_link_options("Project", txt, {
company: frappe.query_report.get_filter_value("company"),
});
},
},
>>>>>>> 8785342fce (fix(report): add options to multiselectlist fields)
],
};

1
erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js
View File

@@ -53,6 +53,7 @@ frappe.query_reports["Purchase Order Analysis"] = {
label: __("Status"),
fieldtype: "MultiSelectList",
width: "80",
options: ["To Pay", "To Bill", "To Receive", "To Receive and Bill", "Completed"],
get_data: function (txt) {
let status = ["To Bill", "To Receive", "To Receive and Bill", "Completed"];
let options = [];

2
erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js
View File

@@ -50,6 +50,7 @@ frappe.query_reports["Supplier Quotation Comparison"] = {
fieldname: "supplier",
label: __("Supplier"),
fieldtype: "MultiSelectList",
options: "Supplier",
get_data: function (txt) {
return frappe.db.get_link_options("Supplier", txt);
},
@@ -58,6 +59,7 @@ frappe.query_reports["Supplier Quotation Comparison"] = {
fieldtype: "MultiSelectList",
label: __("Supplier Quotation"),
fieldname: "supplier_quotation",
options: "Supplier Quotation",
default: "",
get_data: function (txt) {
return frappe.db.get_link_options("Supplier Quotation", txt, { docstatus: ["<", 2] });

1
erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js
View File

@@ -32,6 +32,7 @@ frappe.query_reports["Opportunity Summary by Sales Stage"] = {
fieldname: "status",
label: __("Status"),
fieldtype: "MultiSelectList",
options: ["Open", "Converted", "Quotation", "Replied"],
get_data: function () {
return [
{ value: "Open", description: "Status" },

2
erpnext/manufacturing/report/job_card_summary/job_card_summary.js
View File

@@ -57,6 +57,7 @@ frappe.query_reports["Job Card Summary"] = {
label: __("Work Orders"),
fieldname: "work_order",
fieldtype: "MultiSelectList",
options: "Work Order",
get_data: function (txt) {
return frappe.db.get_link_options("Work Order", txt);
},
@@ -65,6 +66,7 @@ frappe.query_reports["Job Card Summary"] = {
label: __("Production Item"),
fieldname: "production_item",
fieldtype: "MultiSelectList",
options: "Item",
get_data: function (txt) {
return frappe.db.get_link_options("Item", txt);
},

2
erpnext/manufacturing/report/production_planning_report/production_planning_report.js
View File

@@ -42,7 +42,7 @@ frappe.query_reports["Production Planning Report"] = {
fieldname: "docnames",
label: __("Document Name"),
fieldtype: "MultiSelectList",
options: "Sales Order",
options: "based_on",
get_data: function (txt) {
if (!frappe.query_report.filters) return;

2
erpnext/manufacturing/report/work_order_summary/work_order_summary.js
View File

@@ -43,6 +43,7 @@ frappe.query_reports["Work Order Summary"] = {
label: __("Sales Orders"),
fieldname: "sales_order",
fieldtype: "MultiSelectList",
options: "Sales Order",
get_data: function (txt) {
return frappe.db.get_link_options("Sales Order", txt);
},
@@ -51,6 +52,7 @@ frappe.query_reports["Work Order Summary"] = {
label: __("Production Item"),
fieldname: "production_item",
fieldtype: "MultiSelectList",
options: "Item",
get_data: function (txt) {
return frappe.db.get_link_options("Item", txt);
},

1
erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js
View File

@@ -88,6 +88,7 @@ function get_filters() {
fieldname: "status",
label: __("Status"),
fieldtype: "MultiSelectList",
options: ["Overdue", "Unpaid", "Completed", "Partly Paid"],
width: 100,
get_data: function (txt) {
let status = ["Overdue", "Unpaid", "Completed", "Partly Paid"];

1
erpnext/selling/report/sales_order_analysis/sales_order_analysis.js
View File

@@ -48,6 +48,7 @@ frappe.query_reports["Sales Order Analysis"] = {
fieldname: "status",
label: __("Status"),
fieldtype: "MultiSelectList",
options: ["To Pay", "To Bill", "To Deliver", "To Deliver and Bill", "Completed"],
width: "80",
get_data: function (txt) {
let status = ["To Bill", "To Deliver", "To Deliver and Bill", "Completed"];

1
erpnext/stock/report/item_shortage_report/item_shortage_report.js
View File

@@ -17,6 +17,7 @@ frappe.query_reports["Item Shortage Report"] = {
fieldname: "warehouse",
label: __("Warehouse"),
fieldtype: "MultiSelectList",
options: "Warehouse",
width: "100",
get_data: function (txt) {
return frappe.db.get_link_options("Warehouse", txt);

96
erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js Normal file
View File

@@ -0,0 +1,96 @@
// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
/* eslint-disable */
frappe.query_reports["Serial and Batch Summary"] = {
filters: [
{
fieldname: "company",
label: __("Company"),
fieldtype: "Link",
options: "Company",
default: frappe.defaults.get_user_default("Company"),
},
{
fieldname: "from_date",
label: __("From Date"),
fieldtype: "Date",
default: frappe.datetime.add_months(frappe.datetime.get_today(), -1),
},
{
fieldname: "to_date",
label: __("To Date"),
fieldtype: "Date",
default: frappe.datetime.get_today(),
},
{
fieldname: "item_code",
label: __("Item"),
fieldtype: "Link",
options: "Item",
},
{
fieldname: "warehouse",
label: __("Warehouse"),
fieldtype: "Link",
options: "Warehouse",
},
{
fieldname: "voucher_type",
label: __("Voucher Type"),
fieldtype: "Link",
options: "DocType",
get_query: function () {
return {
query: "erpnext.stock.report.serial_and_batch_summary.serial_and_batch_summary.get_voucher_type",
};
},
},
{
fieldname: "voucher_no",
label: __("Voucher No"),
fieldtype: "MultiSelectList",
options: "voucher_type",
get_data: function (txt) {
if (!frappe.query_report.filters) return;
let voucher_type = frappe.query_report.get_filter_value("voucher_type");
if (!voucher_type) return;
return frappe.db.get_link_options(voucher_type, txt);
},
},
{
fieldname: "serial_no",
label: __("Serial No"),
fieldtype: "Link",
options: "Serial No",
get_query: function () {
return {
query: "erpnext.stock.report.serial_and_batch_summary.serial_and_batch_summary.get_serial_nos",
filters: {
item_code: frappe.query_report.get_filter_value("item_code"),
voucher_type: frappe.query_report.get_filter_value("voucher_type"),
voucher_no: frappe.query_report.get_filter_value("voucher_no"),
},
};
},
},
{
fieldname: "batch_no",
label: __("Batch No"),
fieldtype: "Link",
options: "Batch",
get_query: function () {
return {
query: "erpnext.stock.report.serial_and_batch_summary.serial_and_batch_summary.get_batch_nos",
filters: {
item_code: frappe.query_report.get_filter_value("item_code"),
voucher_type: frappe.query_report.get_filter_value("voucher_type"),
voucher_no: frappe.query_report.get_filter_value("voucher_no"),
},
};
},
},
],
};