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

fix: standard working hours message and link for HR Settings

Browse Source
This commit is contained in:
Rucha Mahabal 2021-04-23 20:33:42 +05:30
parent 84ef7419da
commit e63f3b2f36
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/projects/report/project_profitability/project_profitability.py
View File

@ -21,11 +21,13 @@ def get_rows(filters):
conditions = get_conditions(filters) conditions = get_conditions(filters)
standard_working_hours = frappe.db.get_single_value("HR Settings", "standard_working_hours") standard_working_hours = frappe.db.get_single_value("HR Settings", "standard_working_hours")
if not standard_working_hours: if not standard_working_hours:
hr_settings = "<a href='/app/hr-settings'>HR Settings</a>" msg = _("The metrics for this report are calculated based on the Standard Working Hours. Please set {0} in {1}.").format(
frappe.msgprint(_("The metrics for this report are calculated based on the Standard Working Hours. Please set Standard Working Hours in {0}.").format(hr_settings)) frappe.bold("Standard Working Hours"), frappe.utils.get_link_to_form("HR Settings", "HR Settings"))
frappe.msgprint(msg)
return [] return []
sql = """ sql = """
SELECT SELECT
* *
FROM FROM
@ -74,7 +76,7 @@ def get_conditions(filters):
if filters.get("project"): if filters.get("project"):
conditions.append("tabTimesheet.parent_project={0}".format(frappe.db.escape(filters.get("project")))) conditions.append("tabTimesheet.parent_project={0}".format(frappe.db.escape(filters.get("project"))))
conditions = " and ".join(conditions) conditions = " and ".join(conditions)
return conditions return conditions