Merge pull request #2640 from anandpdoshi/anand-jan-27
Fixes to Error Reports
This commit is contained in:
commit
e0b39b860f
@ -8,19 +8,22 @@ frappe.query_reports["Customer Acquisition and Loyalty"] = {
|
|||||||
"label": __("Company"),
|
"label": __("Company"),
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"options": "Company",
|
"options": "Company",
|
||||||
"default": frappe.defaults.get_user_default("company")
|
"default": frappe.defaults.get_user_default("company"),
|
||||||
|
"reqd": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"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": frappe.defaults.get_user_default("year_start_date"),
|
||||||
|
"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": frappe.defaults.get_user_default("year_end_date"),
|
||||||
|
"reqd": 1
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -166,4 +166,4 @@ def item_details(doctype, txt, searchfield, start, page_len, filters):
|
|||||||
and %s like "%s" %s
|
and %s like "%s" %s
|
||||||
limit %s, %s """ % ("%s", searchfield, "%s",
|
limit %s, %s """ % ("%s", searchfield, "%s",
|
||||||
get_match_cond(doctype), "%s", "%s"),
|
get_match_cond(doctype), "%s", "%s"),
|
||||||
(filters["delivery_note"], "%%%s%%" % txt, start, page_len))
|
((filters or {}).get("delivery_note"), "%%%s%%" % txt, start, page_len))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user