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

Minor fixes (#14231)

Browse Source 
* Parse date using getdate to avoid TypeError

* Fix alignment of application dashboard table text

* Use `user` instead of `email` to get value from user table
This commit is contained in:
Suraj Shetty 2018-05-26 09:10:47 +05:30 committed by Nabin Hait
parent 33df0b4fbf
commit aadfaa4493
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/hr/doctype/daily_work_summary/daily_work_summary.py
View File

@ -112,6 +112,6 @@ def get_user_emails_from_group(group):
if isinstance(group_doc, str): if isinstance(group_doc, str):
group_doc = frappe.get_doc('Daily Work Summary Group', group) group_doc = frappe.get_doc('Daily Work Summary Group', group)
emails = [d.email for d in group_doc.users if frappe.db.get_value("User", d.email, "enabled")] emails = [d.email for d in group_doc.users if frappe.db.get_value("User", d.user, "enabled")]
return emails return emails

2
erpnext/hr/doctype/leave_application/leave_application.py
View File

@ -127,7 +127,7 @@ class LeaveApplication(Document):
frappe.db.sql("""update `tabAttendance` set status = %s, leave_type = %s\ frappe.db.sql("""update `tabAttendance` set status = %s, leave_type = %s\
where name = %s""",(status, self.leave_type, d.name)) where name = %s""",(status, self.leave_type, d.name))
elif self.to_date <= nowdate(): elif getdate(self.to_date) <= getdate(nowdate()):
for dt in daterange(getdate(self.from_date), getdate(self.to_date)): for dt in daterange(getdate(self.from_date), getdate(self.to_date)):
date = dt.strftime("%Y-%m-%d") date = dt.strftime("%Y-%m-%d")
if not date == self.half_day_date: if not date == self.half_day_date:

9
erpnext/hr/doctype/leave_application/leave_application_dashboard.html
View File

@ -10,17 +10,16 @@
<th style="width: 20%" class="text-right">{{ __("Pending Leaves") }}</th> <th style="width: 20%" class="text-right">{{ __("Pending Leaves") }}</th>
<th style="width: 20%" class="text-right">{{ __("Available Leaves") }}</th> <th style="width: 20%" class="text-right">{{ __("Available Leaves") }}</th>
</tr> </tr>
<!-- <p> {{data["Sick Leave"][0]["leaves_taken"]}}</p> -->
</thead> </thead>
<tbody> <tbody>
{% for(const [key, value] of Object.entries(data)) { %} {% for(const [key, value] of Object.entries(data)) { %}
<tr> <tr>
<td> {%= key %} </td> <td> {%= key %} </td>
<td> {%= value["total_leaves"] %} </td> <td class="text-right"> {%= value["total_leaves"] %} </td>
<td> {%= value["leaves_taken"] %} </td> <td class="text-right"> {%= value["leaves_taken"] %} </td>
<td> {%= value["pending_leaves"] %} </td> <td class="text-right"> {%= value["pending_leaves"] %} </td>
<td> {%= value["remaining_leaves"] %} </td> <td class="text-right"> {%= value["remaining_leaves"] %} </td>
</tr> </tr>
{% } %} {% } %}
</tbody> </tbody>