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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-11-25 12:28:02 +05:30
parent 0469b0d1ec
commit 072c5b7753
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/selling/report/sales_analytics/sales_analytics.js
View File

@@ -73,27 +73,11 @@ frappe.query_reports["Sales Analytics"] = {
default: "Monthly", default: "Monthly",
reqd: 1, reqd: 1,
}, },
<<<<<<< HEAD
=======
{
fieldname: "curves",
label: __("Curves"),
fieldtype: "Select",
options: [
{ value: "select", label: __("Select") },
{ value: "all", label: __("All") },
{ value: "non-zeros", label: __("Non-Zeros") },
{ value: "total", label: __("Total Only") },
],
default: "select",
reqd: 1,
},
{ {
fieldname: "show_aggregate_value_from_subsidiary_companies", fieldname: "show_aggregate_value_from_subsidiary_companies",
label: __("Show Aggregate Value from Subsidiary Companies"), label: __("Show Aggregate Value from Subsidiary Companies"),
fieldtype: "Check", fieldtype: "Check",
}, },
>>>>>>> c23af6af41 (feat: Show Aggregate Value from Subsidiary Companies)
], ],
get_datatable_options(options) { get_datatable_options(options) {
return Object.assign(options, { return Object.assign(options, {