[fix] [minor] merge conflict fixed

This commit is contained in:
Akhilesh Darjee
2013-11-26 11:21:07 +05:30
50 changed files with 322 additions and 289 deletions

View File

@@ -36,7 +36,7 @@ class JobsMailbox(POP3Mailbox):
mail.save_attachments_in_doc(applicant.doc)
make(content=mail.content, sender=mail.from_email,
make(content=mail.content, sender=mail.from_email, subject=mail.subject or "No Subject",
doctype="Job Applicant", name=applicant.doc.name, sent_or_received="Received")
def get_job_applications():