diff --git a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js index fac7ffeb27f..dec2ebd2520 100644 --- a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js +++ b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js @@ -93,30 +93,5 @@ 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) ], }; diff --git a/erpnext/accounts/report/gross_profit/gross_profit.js b/erpnext/accounts/report/gross_profit/gross_profit.js index 1f5acdae98c..64a9838f54b 100644 --- a/erpnext/accounts/report/gross_profit/gross_profit.js +++ b/erpnext/accounts/report/gross_profit/gross_profit.js @@ -51,43 +51,6 @@ 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", diff --git a/erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js b/erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js index cbf3bbcc738..1244a1b0168 100644 --- a/erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js +++ b/erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js @@ -75,30 +75,5 @@ 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) ], }; diff --git a/erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js b/erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js deleted file mode 100644 index ab1e2babc80..00000000000 --- a/erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.js +++ /dev/null @@ -1,96 +0,0 @@ -// 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"), - }, - }; - }, - }, - ], -};