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

fix: UX date range field separated in from and to date fields. (#21765)

Browse Source 
* fix for issue #21419

* changing group by filter to default Group by Voucher (Consolidated)

* divided date range to seperate from and to date

* divided date range to seperate from and to date for purcase and sales register
This commit is contained in:
Afshan
2020-05-26 18:20:47 +05:30
committed by GitHub
parent d28854b3c2
commit c0b4ec52de
4 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js
View File

@@ -4,11 +4,18 @@
frappe.query_reports["Item-wise Purchase Register"] = { frappe.query_reports["Item-wise Purchase Register"] = {
"filters": [ "filters": [
{ {
"fieldname":"date_range", "fieldname":"from_date",
"label": __("Date Range"), "label": __("From Date"),
"fieldtype": "DateRange", "fieldtype": "Date",
"default": [frappe.datetime.add_months(frappe.datetime.get_today(),-1), frappe.datetime.get_today()], "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
"reqd": 1 "reqd": 1,
},
{
"fieldname":"to_date",
"label": __("To Date"),
"fieldtype": "Date",
"default": frappe.datetime.get_today(),
"reqd": 1,
}, },
{ {
"fieldname": "item_code", "fieldname": "item_code",

1
erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
View File

@@ -14,7 +14,6 @@ def execute(filters=None):
def _execute(filters=None, additional_table_columns=None, additional_query_columns=None): def _execute(filters=None, additional_table_columns=None, additional_query_columns=None):
if not filters: filters = {} if not filters: filters = {}
filters.update({"from_date": filters.get("date_range")[0], "to_date": filters.get("date_range")[1]})
columns = get_columns(additional_table_columns, filters) columns = get_columns(additional_table_columns, filters)
company_currency = erpnext.get_company_currency(filters.company) company_currency = erpnext.get_company_currency(filters.company)

17
erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js
View File

@@ -4,11 +4,18 @@
frappe.query_reports["Item-wise Sales Register"] = { frappe.query_reports["Item-wise Sales Register"] = {
"filters": [ "filters": [
{ {
"fieldname": "date_range", "fieldname":"from_date",
"label": __("Date Range"), "label": __("From Date"),
"fieldtype": "DateRange", "fieldtype": "Date",
"default": [frappe.datetime.add_months(frappe.datetime.get_today(),-1), frappe.datetime.get_today()], "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
"reqd": 1 "reqd": 1,
},
{
"fieldname":"to_date",
"label": __("To Date"),
"fieldtype": "Date",
"default": frappe.datetime.get_today(),
"reqd": 1,
}, },
{ {
"fieldname": "customer", "fieldname": "customer",

1
erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
View File

@@ -14,7 +14,6 @@ def execute(filters=None):
def _execute(filters=None, additional_table_columns=None, additional_query_columns=None): def _execute(filters=None, additional_table_columns=None, additional_query_columns=None):
if not filters: filters = {} if not filters: filters = {}
filters.update({"from_date": filters.get("date_range") and filters.get("date_range")[0], "to_date": filters.get("date_range") and filters.get("date_range")[1]})
columns = get_columns(additional_table_columns, filters) columns = get_columns(additional_table_columns, filters)
company_currency = frappe.get_cached_value('Company', filters.get("company"), "default_currency") company_currency = frappe.get_cached_value('Company', filters.get("company"), "default_currency")