nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 22:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

[minor] fixes to daily work summary formatting

Browse Source
This commit is contained in:
Rushabh Mehta
2016-11-22 21:59:20 +05:30
parent d3344ebcd1
commit 4e61564f73
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 '''
<h4>{{ title }}</h4>
<h3>{{ title }}</h3>
{% for reply in replies %}
<h5>{{ frappe.db.get_value("Employee", {"user_id": reply.sender}, "employee_name") or reply.sender }}<h5>
<h4>{{ reply.sender_name }}</h4>
<p style="padding-bottom: 20px">
{{ reply.content }}
</p>
<hr>
{% endfor %}
{% if did_not_reply %}
<hr>
<p>{{ did_not_reply_title }}: {{ did_not_reply }}</p>
{% endif %}