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

fix: Default dates in report

Browse Source
This commit is contained in:
Deepesh Garg
2024-04-24 16:59:51 +05:30
parent e0c8ff10da
commit c3244f009b
20 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js
View File

@@ -15,14 +15,14 @@ frappe.query_reports["Asset Depreciations and Balances"] = {
"fieldname":"from_date", "fieldname":"from_date",
"label": __("From Date"), "label": __("From Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_start_date"), "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
"reqd": 1 "reqd": 1
}, },
{ {
"fieldname":"to_date", "fieldname":"to_date",
"label": __("To Date"), "label": __("To Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_end_date"), "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
"reqd": 1 "reqd": 1
}, },
{ {

2
erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js
View File

@@ -7,7 +7,7 @@ frappe.query_reports["Bank Clearance Summary"] = {
"fieldname":"from_date", "fieldname":"from_date",
"label": __("From Date"), "label": __("From Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_start_date"), "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
"width": "80" "width": "80"
}, },
{ {

4
erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js
View File

@@ -38,14 +38,14 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
"fieldname": "from_date", "fieldname": "from_date",
"label": __("From Date"), "label": __("From Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_start_date"), "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
"reqd": 1 "reqd": 1
}, },
{ {
"fieldname": "to_date", "fieldname": "to_date",
"label": __("To Date"), "label": __("To Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_end_date"), "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
"reqd": 1 "reqd": 1
}, },
{ {

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

@@ -15,14 +15,14 @@ frappe.query_reports["Gross Profit"] = {
"fieldname": "from_date", "fieldname": "from_date",
"label": __("From Date"), "label": __("From Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_start_date"), "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
"reqd": 1 "reqd": 1
}, },
{ {
"fieldname": "to_date", "fieldname": "to_date",
"label": __("To Date"), "label": __("To Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_end_date"), "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
"reqd": 1 "reqd": 1
}, },
{ {

2
erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
View File

@@ -15,7 +15,7 @@ frappe.query_reports["Payment Period Based On Invoice Date"] = {
fieldname: "from_date", fieldname: "from_date",
label: __("From Date"), label: __("From Date"),
fieldtype: "Date", fieldtype: "Date",
default: frappe.defaults.get_user_default("year_start_date"), default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
}, },
{ {
fieldname:"to_date", fieldname:"to_date",

4
erpnext/accounts/report/profitability_analysis/profitability_analysis.js
View File

@@ -59,13 +59,13 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
"fieldname": "from_date", "fieldname": "from_date",
"label": __("From Date"), "label": __("From Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_start_date"), "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
}, },
{ {
"fieldname": "to_date", "fieldname": "to_date",
"label": __("To Date"), "label": __("To Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_end_date"), "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
}, },
{ {
"fieldname": "show_zero_values", "fieldname": "show_zero_values",

4
erpnext/accounts/report/trial_balance/trial_balance.js
View File

@@ -37,13 +37,13 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
"fieldname": "from_date", "fieldname": "from_date",
"label": __("From Date"), "label": __("From Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_start_date"), "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
}, },
{ {
"fieldname": "to_date", "fieldname": "to_date",
"label": __("To Date"), "label": __("To Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_end_date"), "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
}, },
{ {
"fieldname": "cost_center", "fieldname": "cost_center",

4
erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
View File

@@ -36,13 +36,13 @@ frappe.query_reports["Trial Balance for Party"] = {
"fieldname": "from_date", "fieldname": "from_date",
"label": __("From Date"), "label": __("From Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_start_date"), "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
}, },
{ {
"fieldname": "to_date", "fieldname": "to_date",
"label": __("To Date"), "label": __("To Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_end_date"), "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
}, },
{ {
"fieldname":"party_type", "fieldname":"party_type",

4
erpnext/buying/report/procurement_tracker/procurement_tracker.js
View File

@@ -27,13 +27,13 @@ frappe.query_reports["Procurement Tracker"] = {
fieldname: "from_date", fieldname: "from_date",
label: __("From Date"), label: __("From Date"),
fieldtype: "Date", fieldtype: "Date",
default: frappe.defaults.get_user_default("year_start_date"), default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
}, },
{ {
fieldname:"to_date", fieldname:"to_date",
label: __("To Date"), label: __("To Date"),
fieldtype: "Date", fieldtype: "Date",
default: frappe.defaults.get_user_default("year_end_date"), default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
}, },
] ]
} }

4
erpnext/buying/report/purchase_analytics/purchase_analytics.js
View File

@@ -35,14 +35,14 @@ frappe.query_reports["Purchase Analytics"] = {
fieldname: "from_date", fieldname: "from_date",
label: __("From Date"), label: __("From Date"),
fieldtype: "Date", fieldtype: "Date",
default: frappe.defaults.get_user_default("year_start_date"), default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
reqd: 1 reqd: 1
}, },
{ {
fieldname:"to_date", fieldname:"to_date",
label: __("To Date"), label: __("To Date"),
fieldtype: "Date", fieldtype: "Date",
default: frappe.defaults.get_user_default("year_end_date"), default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
reqd: 1 reqd: 1
}, },
{ {

4
erpnext/crm/report/campaign_efficiency/campaign_efficiency.js
View File

@@ -6,13 +6,13 @@ frappe.query_reports["Campaign Efficiency"] = {
"fieldname": "from_date", "fieldname": "from_date",
"label": __("From Date"), "label": __("From Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_start_date"), "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
}, },
{ {
"fieldname": "to_date", "fieldname": "to_date",
"label": __("To Date"), "label": __("To Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_end_date"), "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
} }
] ]
}; };

4
erpnext/crm/report/lead_owner_efficiency/lead_owner_efficiency.js
View File

@@ -6,12 +6,12 @@
"fieldname": "from_date", "fieldname": "from_date",
"label": __("From Date"), "label": __("From Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_start_date"), "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
}, },
{ {
"fieldname": "to_date", "fieldname": "to_date",
"label": __("To Date"), "label": __("To Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_end_date"), "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
} }
]}; ]};

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

@@ -37,14 +37,14 @@ frappe.query_reports["Job Card Summary"] = {
label: __("From Posting Date"), label: __("From Posting Date"),
fieldname:"from_date", fieldname:"from_date",
fieldtype: "Date", fieldtype: "Date",
default: frappe.defaults.get_user_default("year_start_date"), default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
reqd: 1 reqd: 1
}, },
{ {
label: __("To Posting Date"), label: __("To Posting Date"),
fieldname:"to_date", fieldname:"to_date",
fieldtype: "Date", fieldtype: "Date",
default: frappe.defaults.get_user_default("year_end_date"), default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
reqd: 1, reqd: 1,
}, },
{ {

4
erpnext/manufacturing/report/production_analytics/production_analytics.js
View File

@@ -16,14 +16,14 @@ frappe.query_reports["Production Analytics"] = {
fieldname: "from_date", fieldname: "from_date",
label: __("From Date"), label: __("From Date"),
fieldtype: "Date", fieldtype: "Date",
default: frappe.defaults.get_user_default("year_start_date"), default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
reqd: 1 reqd: 1
}, },
{ {
fieldname:"to_date", fieldname:"to_date",
label: __("To Date"), label: __("To Date"),
fieldtype: "Date", fieldtype: "Date",
default: frappe.defaults.get_user_default("year_end_date"), default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
reqd: 1 reqd: 1
}, },
{ {

21
erpnext/public/js/utils.js
View File

@@ -351,26 +351,31 @@ $.extend(erpnext.utils, {
}, },
get_fiscal_year: function(date) { get_fiscal_year: function (date, with_dates = false, boolean = false) {
if(!date) { if (!frappe.boot.setup_complete) {
return;
}
if (!date) {
date = frappe.datetime.get_today(); date = frappe.datetime.get_today();
} }
let fiscal_year = ''; let fiscal_year = "";
frappe.call({ frappe.call({
method: "erpnext.accounts.utils.get_fiscal_year", method: "erpnext.accounts.utils.get_fiscal_year",
args: { args: {
date: date date: date,
boolean: boolean,
}, },
async: false, async: false,
callback: function(r) { callback: function (r) {
if (r.message) { if (r.message) {
fiscal_year = r.message[0]; if (with_dates) fiscal_year = r.message;
} else fiscal_year = r.message[0];
} }
},
}); });
return fiscal_year; return fiscal_year;
} },
}); });
erpnext.utils.select_alternate_items = function(opts) { erpnext.utils.select_alternate_items = function(opts) {

4
erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js
View File

@@ -23,14 +23,14 @@ frappe.query_reports["Customer Acquisition and Loyalty"] = {
"fieldname":"from_date", "fieldname":"from_date",
"label": __("From Date"), "label": __("From Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_start_date"), "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
"reqd": 1 "reqd": 1
}, },
{ {
"fieldname":"to_date", "fieldname":"to_date",
"label": __("To Date"), "label": __("To Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_end_date"), "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
"reqd": 1 "reqd": 1
} }
], ],

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

@@ -35,14 +35,14 @@ frappe.query_reports["Sales Analytics"] = {
fieldname: "from_date", fieldname: "from_date",
label: __("From Date"), label: __("From Date"),
fieldtype: "Date", fieldtype: "Date",
default: frappe.defaults.get_user_default("year_start_date"), default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
reqd: 1 reqd: 1
}, },
{ {
fieldname:"to_date", fieldname:"to_date",
label: __("To Date"), label: __("To Date"),
fieldtype: "Date", fieldtype: "Date",
default: frappe.defaults.get_user_default("year_end_date"), default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
reqd: 1 reqd: 1
}, },
{ {

2
erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.js
View File

@@ -22,7 +22,7 @@ frappe.query_reports["Sales Person Commission Summary"] = {
fieldname: "from_date", fieldname: "from_date",
label: __("From Date"), label: __("From Date"),
fieldtype: "Date", fieldtype: "Date",
default: frappe.defaults.get_user_default("year_start_date"), default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
}, },
{ {
fieldname:"to_date", fieldname:"to_date",

2
erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js
View File

@@ -20,7 +20,7 @@ frappe.query_reports["Sales Person-wise Transaction Summary"] = {
fieldname: "from_date", fieldname: "from_date",
label: __("From Date"), label: __("From Date"),
fieldtype: "Date", fieldtype: "Date",
default: frappe.defaults.get_user_default("year_start_date"), default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
}, },
{ {
fieldname:"to_date", fieldname:"to_date",

4
erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js
View File

@@ -22,14 +22,14 @@ frappe.query_reports["Incorrect Serial No Valuation"] = {
fieldtype: 'Date', fieldtype: 'Date',
fieldname: 'from_date', fieldname: 'from_date',
reqd: 1, reqd: 1,
default: frappe.defaults.get_user_default("year_start_date") default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1]
}, },
{ {
label: __('To Date'), label: __('To Date'),
fieldtype: 'Date', fieldtype: 'Date',
fieldname: 'to_date', fieldname: 'to_date',
reqd: 1, reqd: 1,
default: frappe.defaults.get_user_default("year_end_date") default: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2]
} }
] ]
}; };