Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Label and UX fixes in AP/AP reports (#20803)

Browse Source
This commit is contained in:
Deepesh Garg 2020-03-02 19:10:29 +05:30 committed by GitHub
parent ca05c83796
commit 12aa35aa43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/accounts/report/accounts_payable/accounts_payable.js
View File

@ -11,18 +11,18 @@ frappe.query_reports["Accounts Payable"] = {
"reqd": 1, "reqd": 1,
"default": frappe.defaults.get_user_default("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", "fieldname":"ageing_based_on",
"label": __("Ageing Based On"), "label": __("Ageing Based On"),
"fieldtype": "Select", "fieldtype": "Select",
"options": 'Posting Date\nDue Date\nSupplier Invoice Date', "options": 'Posting Date\nDue Date\nSupplier Invoice Date',
"default": "Posting Date" "default": "Due Date"
},
{
"fieldname":"report_date",
"label": __("As on Date"),
"fieldtype": "Date",
"default": frappe.datetime.get_today()
}, },
{ {
"fieldname":"range1", "fieldname":"range1",

14
erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js
View File

@ -10,18 +10,18 @@ frappe.query_reports["Accounts Payable Summary"] = {
"options": "Company", "options": "Company",
"default": frappe.defaults.get_user_default("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", "fieldname":"ageing_based_on",
"label": __("Ageing Based On"), "label": __("Ageing Based On"),
"fieldtype": "Select", "fieldtype": "Select",
"options": 'Posting Date\nDue Date', "options": 'Posting Date\nDue Date',
"default": "Posting Date" "default": "Due Date"
},
{
"fieldname":"report_date",
"label": __("Date"),
"fieldtype": "Date",
"default": frappe.datetime.get_today()
}, },
{ {
"fieldname":"range1", "fieldname":"range1",

16
erpnext/accounts/report/accounts_receivable/accounts_receivable.js
View File

@ -11,18 +11,18 @@ frappe.query_reports["Accounts Receivable"] = {
"reqd": 1, "reqd": 1,
"default": frappe.defaults.get_user_default("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", "fieldname":"ageing_based_on",
"label": __("Ageing Based On"), "label": __("Ageing Based On"),
"fieldtype": "Select", "fieldtype": "Select",
"options": 'Posting Date\nDue Date', "options": 'Posting Date\nDue Date',
"default": "Posting Date" "default": "Due Date"
},
{
"fieldname":"report_date",
"label": __("As on Date"),
"fieldtype": "Date",
"default": frappe.datetime.get_today()
}, },
{ {
"fieldname":"range1", "fieldname":"range1",
@ -148,7 +148,7 @@ frappe.query_reports["Accounts Receivable"] = {
}, },
{ {
"fieldname":"show_delivery_notes", "fieldname":"show_delivery_notes",
"label": __("Show Delivery Notes"), "label": __("Show Linked Delivery Notes"),
"fieldtype": "Check", "fieldtype": "Check",
}, },
{ {

14
erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js
View File

@ -10,18 +10,18 @@ frappe.query_reports["Accounts Receivable Summary"] = {
"options": "Company", "options": "Company",
"default": frappe.defaults.get_user_default("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", "fieldname":"ageing_based_on",
"label": __("Ageing Based On"), "label": __("Ageing Based On"),
"fieldtype": "Select", "fieldtype": "Select",
"options": 'Posting Date\nDue Date', "options": 'Posting Date\nDue Date',
"default": "Posting Date" "default": "Due Date"
},
{
"fieldname":"report_date",
"label": __("Date"),
"fieldtype": "Date",
"default": frappe.datetime.get_today()
}, },
{ {
"fieldname":"range1", "fieldname":"range1",