diff --git a/erpnext/accounts/report/accounts_payable/accounts_payable.js b/erpnext/accounts/report/accounts_payable/accounts_payable.js index df700ec9d3c..4e09f99ae3e 100644 --- a/erpnext/accounts/report/accounts_payable/accounts_payable.js +++ b/erpnext/accounts/report/accounts_payable/accounts_payable.js @@ -11,18 +11,18 @@ frappe.query_reports["Accounts Payable"] = { "reqd": 1, "default": frappe.defaults.get_user_default("Company") }, + { + "fieldname":"report_date", + "label": __("Posting Date"), + "fieldtype": "Date", + "default": frappe.datetime.get_today() + }, { "fieldname":"ageing_based_on", "label": __("Ageing Based On"), "fieldtype": "Select", "options": 'Posting Date\nDue Date\nSupplier Invoice Date', - "default": "Posting Date" - }, - { - "fieldname":"report_date", - "label": __("As on Date"), - "fieldtype": "Date", - "default": frappe.datetime.get_today() + "default": "Due Date" }, { "fieldname":"range1", diff --git a/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js b/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js index 4a9f1b0dc44..d5f18b09827 100644 --- a/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js +++ b/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js @@ -10,18 +10,18 @@ frappe.query_reports["Accounts Payable Summary"] = { "options": "Company", "default": frappe.defaults.get_user_default("Company") }, + { + "fieldname":"report_date", + "label": __("Posting Date"), + "fieldtype": "Date", + "default": frappe.datetime.get_today() + }, { "fieldname":"ageing_based_on", "label": __("Ageing Based On"), "fieldtype": "Select", "options": 'Posting Date\nDue Date', - "default": "Posting Date" - }, - { - "fieldname":"report_date", - "label": __("Date"), - "fieldtype": "Date", - "default": frappe.datetime.get_today() + "default": "Due Date" }, { "fieldname":"range1", diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js index 5d0154f597e..6208eb6946b 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js @@ -11,18 +11,18 @@ frappe.query_reports["Accounts Receivable"] = { "reqd": 1, "default": frappe.defaults.get_user_default("Company") }, + { + "fieldname":"report_date", + "label": __("Posting Date"), + "fieldtype": "Date", + "default": frappe.datetime.get_today() + }, { "fieldname":"ageing_based_on", "label": __("Ageing Based On"), "fieldtype": "Select", "options": 'Posting Date\nDue Date', - "default": "Posting Date" - }, - { - "fieldname":"report_date", - "label": __("As on Date"), - "fieldtype": "Date", - "default": frappe.datetime.get_today() + "default": "Due Date" }, { "fieldname":"range1", @@ -148,7 +148,7 @@ frappe.query_reports["Accounts Receivable"] = { }, { "fieldname":"show_delivery_notes", - "label": __("Show Delivery Notes"), + "label": __("Show Linked Delivery Notes"), "fieldtype": "Check", }, { diff --git a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js index d54824b6855..b316f108d04 100644 --- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js +++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js @@ -10,18 +10,18 @@ frappe.query_reports["Accounts Receivable Summary"] = { "options": "Company", "default": frappe.defaults.get_user_default("Company") }, + { + "fieldname":"report_date", + "label": __("Posting Date"), + "fieldtype": "Date", + "default": frappe.datetime.get_today() + }, { "fieldname":"ageing_based_on", "label": __("Ageing Based On"), "fieldtype": "Select", "options": 'Posting Date\nDue Date', - "default": "Posting Date" - }, - { - "fieldname":"report_date", - "label": __("Date"), - "fieldtype": "Date", - "default": frappe.datetime.get_today() + "default": "Due Date" }, { "fieldname":"range1",