nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2025-02-13 14:23:46 +05:30
parent 7e85a123b2
commit dbe14d6fe4
2 changed files with 0 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,30 +92,5 @@ frappe.query_reports["Customer Ledger Summary"] = {
fieldtype: "Data", fieldtype: "Data",
hidden: 1, 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)
], ],
}; };

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

@@ -74,30 +74,5 @@ frappe.query_reports["Supplier Ledger Summary"] = {
fieldtype: "Data", fieldtype: "Data",
hidden: 1, 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)
], ],
}; };