From 4e61564f73f9f1469d0eeea6a4ba6bbceea59170 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 22 Nov 2016 21:59:20 +0530 Subject: [PATCH] [minor] fixes to daily work summary formatting --- .../doctype/daily_work_summary/daily_work_summary.py | 11 +++++++---- erpnext/projects/doctype/timesheet/timesheet.json | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py index 0e0abc4919..7fff5f52df 100644 --- a/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +++ b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py @@ -39,11 +39,14 @@ class DailyWorkSummary(Document): replies = frappe.get_all('Communication', fields=['content', 'text_content', 'sender'], filters=dict(reference_doctype=self.doctype, reference_name=self.name, - communication_type='Communication', sent_or_received='Received')) + communication_type='Communication', sent_or_received='Received'), + order_by='creation asc') did_not_reply = self.email_sent_to.split() for d in replies: + d.sender_name = frappe.db.get_value("Employee", {"user_id": d.sender}, + "employee_name") or d.sender if d.sender in did_not_reply: did_not_reply.remove(d.sender) if d.text_content: @@ -62,17 +65,17 @@ class DailyWorkSummary(Document): def get_summary_template(self): return ''' -

{{ title }}

+

{{ title }}

{% for reply in replies %} -
{{ frappe.db.get_value("Employee", {"user_id": reply.sender}, "employee_name") or reply.sender }}
+

{{ reply.sender_name }}

{{ reply.content }}

+
{% endfor %} {% if did_not_reply %} -

{{ did_not_reply_title }}: {{ did_not_reply }}

{% endif %} diff --git a/erpnext/projects/doctype/timesheet/timesheet.json b/erpnext/projects/doctype/timesheet/timesheet.json index 751b7931e1..d06fbb51e9 100644 --- a/erpnext/projects/doctype/timesheet/timesheet.json +++ b/erpnext/projects/doctype/timesheet/timesheet.json @@ -220,7 +220,7 @@ "collapsible": 0, "columns": 0, "depends_on": "", - "description": "List of employee which has \"Salary Slip Based on Timesheet\" is enabled in salary structure.", + "description": "", "fieldname": "employee", "fieldtype": "Link", "hidden": 0, @@ -877,7 +877,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-11-07 06:00:12.460318", + "modified": "2016-11-22 01:42:54.204441", "modified_by": "Administrator", "module": "Projects", "name": "Timesheet",