diff --git a/hrms/hooks.py b/hrms/hooks.py index 5855978d39e..b5f5e63610a 100644 --- a/hrms/hooks.py +++ b/hrms/hooks.py @@ -257,9 +257,6 @@ "all": [ "hrms.hr.doctype.interview.interview.send_interview_reminder", ], - "hourly": [ - "hrms.hr.doctype.daily_work_summary_group.daily_work_summary_group.trigger_emails", - ], "hourly_long": [ "hrms.hr.doctype.shift_type.shift_type.update_last_sync_of_checkin", "hrms.hr.doctype.shift_type.shift_type.process_auto_attendance_for_all_shifts", @@ -268,7 +265,6 @@ "daily": [ "hrms.controllers.employee_reminders.send_birthday_reminders", "hrms.controllers.employee_reminders.send_work_anniversary_reminders", - "hrms.hr.doctype.daily_work_summary_group.daily_work_summary_group.send_summary", "hrms.hr.doctype.interview.interview.send_daily_feedback_reminder", "hrms.hr.doctype.shift_assignment.shift_assignment.mark_expired_shift_assignments_as_inactive", "hrms.hr.doctype.job_opening.job_opening.close_expired_job_openings", diff --git a/hrms/hr/doctype/daily_work_summary/__init__.py b/hrms/hr/doctype/daily_work_summary/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/hrms/hr/doctype/daily_work_summary/daily_work_summary.js b/hrms/hr/doctype/daily_work_summary/daily_work_summary.js deleted file mode 100644 index b6ecffcae88..00000000000 --- a/hrms/hr/doctype/daily_work_summary/daily_work_summary.js +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors -// For license information, please see license.txt - -frappe.ui.form.on("Daily Work Summary", { - refresh: function (frm) {}, -}); diff --git a/hrms/hr/doctype/daily_work_summary/daily_work_summary.json b/hrms/hr/doctype/daily_work_summary/daily_work_summary.json deleted file mode 100644 index 0cafc5abbbf..00000000000 --- a/hrms/hr/doctype/daily_work_summary/daily_work_summary.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "actions": [], - "allow_import": 1, - "creation": "2016-11-08 04:58:20.001780", - "doctype": "DocType", - "document_type": "Document", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "daily_work_summary_group", - "status", - "email_sent_to" - ], - "fields": [ - { - "fieldname": "daily_work_summary_group", - "fieldtype": "Link", - "label": "Daily Work Summary Group", - "options": "Daily Work Summary Group", - "read_only": 1 - }, - { - "default": "Open", - "fieldname": "status", - "fieldtype": "Select", - "in_list_view": 1, - "label": "Status", - "options": "Open\nSent", - "read_only": 1 - }, - { - "fieldname": "email_sent_to", - "fieldtype": "Code", - "label": "Email Sent To", - "read_only": 1 - } - ], - "in_create": 1, - "links": [], - "modified": "2026-09-01 18:39:51.520758", - "modified_by": "Administrator", - "module": "HR", - "name": "Daily Work Summary", - "owner": "Administrator", - "permissions": [ - { - "read": 1, - "role": "Employee" - }, - { - "read": 1, - "role": "HR User" - }, - { - "delete": 1, - "read": 1, - "report": 1, - "role": "HR Manager" - } - ], - "quick_entry": 1, - "row_format": "Dynamic", - "sort_field": "creation", - "sort_order": "DESC", - "states": [] -} diff --git a/hrms/hr/doctype/daily_work_summary/daily_work_summary.py b/hrms/hr/doctype/daily_work_summary/daily_work_summary.py deleted file mode 100644 index 6da79da88d7..00000000000 --- a/hrms/hr/doctype/daily_work_summary/daily_work_summary.py +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors -# For license information, please see license.txt - - -from email_reply_parser import EmailReplyParser - -import frappe -from frappe import _ -from frappe.model.document import Document -from frappe.utils import global_date_format - - -class DailyWorkSummary(Document): - # begin: auto-generated types - # This code is auto-generated. Do not modify anything in this block. - - from typing import TYPE_CHECKING - - if TYPE_CHECKING: - from frappe.types import DF - - daily_work_summary_group: DF.Link | None - email_sent_to: DF.Code | None - status: DF.Literal["Open", "Sent"] - # end: auto-generated types - - def send_mails(self, dws_group, emails): - """Send emails to get daily work summary to all users \ - in selected daily work summary group""" - incoming_email_account = frappe.db.get_value( - "Email Account", dict(enable_incoming=1, default_incoming=1), "email_id" - ) - - self.db_set("email_sent_to", "\n".join(emails)) - frappe.sendmail( - recipients=emails, - message=dws_group.message, - subject=dws_group.subject, - reference_doctype=self.doctype, - reference_name=self.name, - reply_to=incoming_email_account, - ) - - def send_summary(self): - """Send summary of all replies. Called at midnight""" - args = self.get_message_details() - emails = get_user_emails_from_group(self.daily_work_summary_group) - frappe.sendmail( - recipients=emails, - template="daily_work_summary", - args=args, - subject=_(self.daily_work_summary_group), - reference_doctype=self.doctype, - reference_name=self.name, - ) - - self.db_set("status", "Sent") - - def get_message_details(self): - """Return args for template""" - dws_group = frappe.get_doc("Daily Work Summary Group", self.daily_work_summary_group) - - 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", - ), - order_by="creation asc", - ) - - did_not_reply = self.email_sent_to.split() - - for d in replies: - user = frappe.db.get_values( - "User", {"email": d.sender}, ["full_name", "user_image"], as_dict=True - ) - - d.sender_name = user[0].full_name if user else d.sender - d.image = user[0].image if user and user[0].image else None - - original_image = d.image - # make thumbnail image - try: - if original_image: - file_name = frappe.get_list("File", {"file_url": original_image}) - - if file_name: - file_name = file_name[0].name - file_doc = frappe.get_doc("File", file_name) - thumbnail_image = file_doc.make_thumbnail( - set_as_thumbnail=False, width=100, height=100, crop=True - ) - d.image = thumbnail_image - except Exception: - d.image = original_image - - if d.sender in did_not_reply: - did_not_reply.remove(d.sender) - if d.text_content: - d.content = frappe.utils.md_to_html(EmailReplyParser.parse_reply(d.text_content)) - - did_not_reply = [ - (frappe.db.get_value("User", {"email": email}, "full_name") or email) for email in did_not_reply - ] - - return dict( - replies=replies, - original_message=dws_group.message, - title=_("Work Summary for {0}").format(global_date_format(self.creation)), - did_not_reply=", ".join(did_not_reply) or "", - did_not_reply_title=_("No replies from"), - ) - - -def get_user_emails_from_group(group): - """Returns list of email of enabled users from the given group - - :param group: Daily Work Summary Group `name`""" - group_doc = group - if isinstance(group_doc, str): - group_doc = frappe.get_doc("Daily Work Summary Group", group) - - emails = get_users_email(group_doc) - - return emails - - -def get_users_email(doc): - return [d.email for d in doc.users if frappe.db.get_value("User", d.user, "enabled")] diff --git a/hrms/hr/doctype/daily_work_summary/test_daily_work_summary.py b/hrms/hr/doctype/daily_work_summary/test_daily_work_summary.py deleted file mode 100644 index 4520a6eb0f0..00000000000 --- a/hrms/hr/doctype/daily_work_summary/test_daily_work_summary.py +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# See license.txt - -import os - -import frappe -import frappe.utils - -from hrms.tests.utils import HRMSTestSuite - -# test_records = frappe.get_test_records('Daily Work Summary') - - -class TestDailyWorkSummary(HRMSTestSuite): - def test_email_trigger(self): - self.setup_and_prepare_test() - for d in self.users: - # check that email is sent to users - if d.message: - self.assertTrue( - d.email in [d.recipient for d in self.emails if self.groups.subject in d.message] - ) - - def test_email_trigger_failed(self): - hour = "00:00" - if frappe.utils.nowtime().split(":")[0] == "00": - hour = "01:00" - - self.setup_and_prepare_test(hour) - - for d in self.users: - # check that email is not sent to users - self.assertFalse( - d.email in [d.recipient for d in self.emails if self.groups.subject in d.message] - ) - - def test_incoming(self): - # get test mail with message-id as in-reply-to - self.setup_and_prepare_test() - with open(os.path.join(os.path.dirname(__file__), "test_data", "test-reply.raw")) as f: - if not self.emails: - return - test_mails = [ - f.read() - .replace("{{ sender }}", self.users[-1].email) - .replace("{{ message_id }}", self.emails[-1].message_id) - ] - - # pull the mail - email_account = frappe.get_doc("Email Account", "_Test Email Account 1") - email_account.db_set("enable_incoming", 1) - email_account.receive(test_mails=test_mails) - - daily_work_summary = frappe.get_doc( - "Daily Work Summary", frappe.get_all("Daily Work Summary")[0].name - ) - - args = daily_work_summary.get_message_details() - - self.assertTrue("I built Daily Work Summary!" in args.get("replies")[0].content) - - def setup_and_prepare_test(self, hour=None): - frappe.qb.from_("Daily Work Summary").delete().run() - frappe.qb.from_("Email Queue").delete().run() - frappe.qb.from_("Email Queue Recipient").delete().run() - frappe.qb.from_("Communication").delete().run() - frappe.qb.from_("Daily Work Summary Group").delete().run() - - self.users = frappe.get_all("User", fields=["email"], filters=dict(email=("!=", "test@example.com"))) - self.setup_groups(hour) - - from hrms.hr.doctype.daily_work_summary_group.daily_work_summary_group import trigger_emails - - trigger_emails() - - # check if emails are created - - email_queue = frappe.qb.DocType("Email Queue") - email_queue_recipient = frappe.qb.DocType("Email Queue Recipient") - self.emails = ( - frappe.qb.from_(email_queue) - .join(email_queue_recipient) - .on(email_queue.name == email_queue_recipient.parent) - .select( - email_queue_recipient.recipient, - email_queue.message, - email_queue.message_id, - ) - .run(as_dict=True) - ) - - def setup_groups(self, hour=None): - # setup email to trigger at this hour - if not hour: - hour = frappe.utils.nowtime().split(":")[0] - hour = hour + ":00" - - groups = frappe.get_doc( - dict( - doctype="Daily Work Summary Group", - name="Daily Work Summary", - users=self.users, - send_emails_at=hour, - subject="this is a subject for testing summary emails", - message="this is a message for testing summary emails", - ) - ) - groups.insert() - - self.groups = groups - self.groups.save() diff --git a/hrms/hr/doctype/daily_work_summary/test_data/test-reply.raw b/hrms/hr/doctype/daily_work_summary/test_data/test-reply.raw deleted file mode 100644 index ba01bc28273..00000000000 --- a/hrms/hr/doctype/daily_work_summary/test_data/test-reply.raw +++ /dev/null @@ -1,75 +0,0 @@ -From: {{ sender }} -Content-Type: multipart/alternative; - boundary="Apple-Mail=_29597CF7-20DD-4184-B3FA-85582C5C4361" -Message-Id: <07D687F6-10AA-4B9F-82DE-27753096164E@gmail.com> -Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) -X-Smtp-Server: 73CC8281-7E8F-4B47-8324-D5DA86EEDD4F -Subject: Re: What did you work on today? -Date: Thu, 10 Nov 2016 16:04:43 +0530 -X-Universally-Unique-Identifier: A4D9669F-179C-42D8-A3D3-AA6A8C49A6F2 -References: <{{ message_id }}> -To: test_in@iwebnotes.com -In-Reply-To: <{{ message_id }}> - - ---Apple-Mail=_29597CF7-20DD-4184-B3FA-85582C5C4361 -Content-Transfer-Encoding: quoted-printable -Content-Type: text/plain; - charset=us-ascii - -I built Daily Work Summary! - -> On 10-Nov-2016, at 3:20 PM, Frappe wrote: ->=20 -> Please share what did you do today. If you reply by midnight, your = -response will be recorded! ->=20 -> This email was sent to rmehta@gmail.com -> Unsubscribe from this list = - -> Sent via ERPNext - - ---Apple-Mail=_29597CF7-20DD-4184-B3FA-85582C5C4361 -Content-Transfer-Encoding: 7bit -Content-Type: text/html; - charset=us-ascii - -I built Daily Work Summary!

On 10-Nov-2016, at 3:20 PM, Frappe <test@erpnext.com> wrote:

- - - - -What did you work on today? - -
- -

Please share what did you do today. If you reply by midnight, your response will be recorded!

- -
- - - - - - -
-

---Apple-Mail=_29597CF7-20DD-4184-B3FA-85582C5C4361-- diff --git a/hrms/hr/doctype/daily_work_summary_group/__init__.py b/hrms/hr/doctype/daily_work_summary_group/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/hrms/hr/doctype/daily_work_summary_group/daily_work_summary_group.js b/hrms/hr/doctype/daily_work_summary_group/daily_work_summary_group.js deleted file mode 100644 index a602fd59fa7..00000000000 --- a/hrms/hr/doctype/daily_work_summary_group/daily_work_summary_group.js +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors -// For license information, please see license.txt - -frappe.ui.form.on("Daily Work Summary Group", { - refresh: function (frm) { - if (!frm.is_new()) { - frm.add_custom_button(__("Daily Work Summary"), function () { - frappe.set_route("List", "Daily Work Summary"); - }); - } - }, -}); diff --git a/hrms/hr/doctype/daily_work_summary_group/daily_work_summary_group.json b/hrms/hr/doctype/daily_work_summary_group/daily_work_summary_group.json deleted file mode 100644 index 22cbb7d8847..00000000000 --- a/hrms/hr/doctype/daily_work_summary_group/daily_work_summary_group.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "actions": [], - "allow_import": 1, - "autoname": "Prompt", - "creation": "2018-02-12 15:06:18.767239", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "enabled", - "select_users", - "users", - "send_emails_at", - "holiday_list", - "mail_details", - "subject", - "message" - ], - "fields": [ - { - "default": "1", - "fieldname": "enabled", - "fieldtype": "Check", - "label": "Enabled" - }, - { - "fieldname": "select_users", - "fieldtype": "Section Break", - "label": "Select Users" - }, - { - "fieldname": "users", - "fieldtype": "Table", - "label": "Users", - "options": "Daily Work Summary Group User", - "reqd": 1 - }, - { - "fieldname": "send_emails_at", - "fieldtype": "Select", - "label": "Send Emails At", - "options": "00:00\n01:00\n02:00\n03:00\n04:00\n05:00\n06:00\n07:00\n08:00\n09:00\n10:00\n11:00\n12:00\n13:00\n14:00\n15:00\n16:00\n17:00\n18:00\n19:00\n20:00\n21:00\n22:00\n23:00" - }, - { - "fieldname": "holiday_list", - "fieldtype": "Link", - "label": "Holiday List", - "options": "Holiday List" - }, - { - "fieldname": "mail_details", - "fieldtype": "Section Break", - "label": "Reminder" - }, - { - "default": "What did you work on today?", - "fieldname": "subject", - "fieldtype": "Data", - "label": "Subject" - }, - { - "default": "

Please share what did you do today. If you reply by midnight, your response will be recorded!

", - "fieldname": "message", - "fieldtype": "Text Editor", - "label": "Message" - } - ], - "links": [], - "modified": "2026-09-01 18:39:51.520758", - "modified_by": "Administrator", - "module": "HR", - "name": "Daily Work Summary Group", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "HR Manager", - "share": 1, - "write": 1 - } - ], - "quick_entry": 1, - "sort_field": "creation", - "sort_order": "DESC", - "states": [] -} \ No newline at end of file diff --git a/hrms/hr/doctype/daily_work_summary_group/daily_work_summary_group.py b/hrms/hr/doctype/daily_work_summary_group/daily_work_summary_group.py deleted file mode 100644 index b9eb36946d2..00000000000 --- a/hrms/hr/doctype/daily_work_summary_group/daily_work_summary_group.py +++ /dev/null @@ -1,101 +0,0 @@ -# # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors -# # For license information, please see license.txt - - -import frappe -import frappe.utils -from frappe import _ -from frappe.model.document import Document - -from erpnext.setup.doctype.holiday_list.holiday_list import is_holiday - -from hrms.hr.doctype.daily_work_summary.daily_work_summary import get_user_emails_from_group - - -class DailyWorkSummaryGroup(Document): - # begin: auto-generated types - # This code is auto-generated. Do not modify anything in this block. - - from typing import TYPE_CHECKING - - if TYPE_CHECKING: - from frappe.types import DF - - from hrms.hr.doctype.daily_work_summary_group_user.daily_work_summary_group_user import ( - DailyWorkSummaryGroupUser, - ) - - enabled: DF.Check - holiday_list: DF.Link | None - message: DF.TextEditor | None - send_emails_at: DF.Literal[ - "00:00", - "01:00", - "02:00", - "03:00", - "04:00", - "05:00", - "06:00", - "07:00", - "08:00", - "09:00", - "10:00", - "11:00", - "12:00", - "13:00", - "14:00", - "15:00", - "16:00", - "17:00", - "18:00", - "19:00", - "20:00", - "21:00", - "22:00", - "23:00", - ] - subject: DF.Data | None - users: DF.Table[DailyWorkSummaryGroupUser] - # end: auto-generated types - - def validate(self): - if self.users: - if not frappe.flags.in_test and not is_incoming_account_enabled(): - frappe.throw( - _("Please enable default incoming account before creating Daily Work Summary Group") - ) - - -def trigger_emails(): - """Send emails to Employees at the given hour asking - them what did they work on today""" - groups = frappe.get_all("Daily Work Summary Group") - for d in groups: - group_doc = frappe.get_doc("Daily Work Summary Group", d) - if ( - is_current_hour(group_doc.send_emails_at) - and not is_holiday(group_doc.holiday_list) - and group_doc.enabled - ): - emails = get_user_emails_from_group(group_doc) - # find emails relating to a company - if emails: - daily_work_summary = frappe.get_doc( - dict(doctype="Daily Work Summary", daily_work_summary_group=group_doc.name) - ).insert() - daily_work_summary.send_mails(group_doc, emails) - - -def is_current_hour(hour): - return frappe.utils.nowtime().split(":")[0] == hour.split(":")[0] - - -def send_summary(): - """Send summary to everyone""" - for d in frappe.get_all("Daily Work Summary", dict(status="Open")): - daily_work_summary = frappe.get_doc("Daily Work Summary", d.name) - daily_work_summary.send_summary() - - -def is_incoming_account_enabled(): - return frappe.db.get_value("Email Account", dict(enable_incoming=1, default_incoming=1)) diff --git a/hrms/hr/doctype/daily_work_summary_group_user/__init__.py b/hrms/hr/doctype/daily_work_summary_group_user/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/hrms/hr/doctype/daily_work_summary_group_user/daily_work_summary_group_user.json b/hrms/hr/doctype/daily_work_summary_group_user/daily_work_summary_group_user.json deleted file mode 100644 index d01480a8fc6..00000000000 --- a/hrms/hr/doctype/daily_work_summary_group_user/daily_work_summary_group_user.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "actions": [], - "creation": "2018-02-12 14:57:38.332692", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "user", - "email" - ], - "fields": [ - { - "fieldname": "user", - "fieldtype": "Link", - "in_list_view": 1, - "label": "User", - "options": "User" - }, - { - "fetch_from": "user.email", - "fieldname": "email", - "fieldtype": "Read Only", - "label": "email" - } - ], - "istable": 1, - "links": [], - "modified": "2024-03-27 13:06:49.385333", - "modified_by": "Administrator", - "module": "HR", - "name": "Daily Work Summary Group User", - "owner": "Administrator", - "permissions": [], - "quick_entry": 1, - "sort_field": "creation", - "sort_order": "DESC", - "states": [], - "track_changes": 1 -} \ No newline at end of file diff --git a/hrms/hr/doctype/daily_work_summary_group_user/daily_work_summary_group_user.py b/hrms/hr/doctype/daily_work_summary_group_user/daily_work_summary_group_user.py deleted file mode 100644 index 5054c3c7180..00000000000 --- a/hrms/hr/doctype/daily_work_summary_group_user/daily_work_summary_group_user.py +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors -# For license information, please see license.txt - - -from frappe.model.document import Document - - -class DailyWorkSummaryGroupUser(Document): - # begin: auto-generated types - # This code is auto-generated. Do not modify anything in this block. - - from typing import TYPE_CHECKING - - if TYPE_CHECKING: - from frappe.types import DF - - email: DF.ReadOnly | None - parent: DF.Data - parentfield: DF.Data - parenttype: DF.Data - user: DF.Link | None - # end: auto-generated types - - pass diff --git a/hrms/hr/page/team_updates/__init__.py b/hrms/hr/page/team_updates/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/hrms/hr/page/team_updates/team_update_row.html b/hrms/hr/page/team_updates/team_update_row.html deleted file mode 100644 index 4f367541b45..00000000000 --- a/hrms/hr/page/team_updates/team_update_row.html +++ /dev/null @@ -1,15 +0,0 @@ -
-
- {%= date_sep || "" %}
-
-
-
- {{ avatar }} -
-
- {{ content }} -
-
-
-
diff --git a/hrms/hr/page/team_updates/team_updates.css b/hrms/hr/page/team_updates/team_updates.css deleted file mode 100644 index 9fe2de8b6e0..00000000000 --- a/hrms/hr/page/team_updates/team_updates.css +++ /dev/null @@ -1,57 +0,0 @@ -.date-indicator { - background: none; - font-size: 12px; - vertical-align: middle; - font-weight: bold; - color: #6c7680; -} -.date-indicator::after { - margin: 0 -4px 0 12px; - content: ""; - display: inline-block; - height: 8px; - width: 8px; - border-radius: 8px; - background: #d1d8dd; -} - -.date-indicator.blue { - color: #5e64ff; -} - -.date-indicator.blue::after { - background: #5e64ff; -} - -.activity-row { -} - -.activity-message { - border-left: 1px solid #d1d8dd; -} - -.activity-message .row { - padding: 15px; - margin-right: 0px; - border-bottom: 1px solid #d1d8dd; -} - -.activity-row:last-child .activity-message .row { - border-bottom: none; -} - -.activity-row .content { - padding-left: 0px; - padding-right: 30px; -} - -.activity-date { - padding: 15px; - padding-right: 0px; - z-index: 1; -} - -.for-more { - border-top: 1px solid #d1d8dd; - padding: 10px; -} diff --git a/hrms/hr/page/team_updates/team_updates.js b/hrms/hr/page/team_updates/team_updates.js deleted file mode 100644 index 8973d538c16..00000000000 --- a/hrms/hr/page/team_updates/team_updates.js +++ /dev/null @@ -1,91 +0,0 @@ -frappe.pages["team-updates"].on_page_load = function (wrapper) { - var page = frappe.ui.make_app_page({ - parent: wrapper, - title: __("Team Updates"), - single_column: true, - }); - - frappe.team_updates.make(page); - frappe.team_updates.run(); - - if (frappe.model.can_read("Daily Work Summary Group")) { - page.add_menu_item(__("Daily Work Summary Group"), function () { - frappe.set_route("Form", "Daily Work Summary Group"); - }); - } -}; - -frappe.team_updates = { - start: 0, - make: function (page) { - var me = frappe.team_updates; - me.page = page; - me.body = $("
").appendTo(me.page.main); - me.more = $( - '
", - ) - .appendTo(me.page.main) - .find(".btn-more") - .on("click", function () { - me.start += 40; - me.run(); - }); - }, - run: function () { - var me = frappe.team_updates; - frappe.call({ - method: "hrms.hr.page.team_updates.team_updates.get_data", - args: { - start: me.start, - }, - callback: function (r) { - if (r.message && r.message.length > 0) { - r.message.forEach(function (d) { - me.add_row(d); - }); - } else { - frappe.show_alert({ message: __("No more updates"), indicator: "gray" }); - me.more.parent().addClass("hidden"); - } - }, - }); - }, - add_row: function (data) { - var me = frappe.team_updates; - - data.by = frappe.user.full_name(data.sender); - data.avatar = frappe.avatar(data.sender); - data.when = comment_when(data.creation); - - var date = frappe.datetime.str_to_obj(data.creation); - var last = me.last_feed_date; - - if ( - (last && frappe.datetime.obj_to_str(last) != frappe.datetime.obj_to_str(date)) || - !last - ) { - var diff = frappe.datetime.get_day_diff( - frappe.datetime.get_today(), - frappe.datetime.obj_to_str(date), - ); - var pdate; - if (diff < 1) { - pdate = "Today"; - } else if (diff < 2) { - pdate = "Yesterday"; - } else { - pdate = frappe.datetime.global_date_format(date); - } - data.date_sep = pdate; - data.date_class = pdate == "Today" ? "date-indicator blue" : "date-indicator"; - } else { - data.date_sep = null; - data.date_class = ""; - } - me.last_feed_date = date; - - $(frappe.render_template("team_update_row", data)).appendTo(me.body); - }, -}; diff --git a/hrms/hr/page/team_updates/team_updates.json b/hrms/hr/page/team_updates/team_updates.json deleted file mode 100644 index 167c67fb4ea..00000000000 --- a/hrms/hr/page/team_updates/team_updates.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "content": null, - "creation": "2017-01-31 11:02:31.614045", - "docstatus": 0, - "doctype": "Page", - "idx": 0, - "modified": "2017-01-31 11:25:01.983200", - "modified_by": "Administrator", - "module": "HR", - "name": "team-updates", - "owner": "Administrator", - "page_name": "team-updates", - "roles": [ - { - "role": "Employee" - }, - { - "role": "System Manager" - } - ], - "script": null, - "standard": "Yes", - "style": null, - "title": "Team Updates" -} \ No newline at end of file diff --git a/hrms/hr/page/team_updates/team_updates.py b/hrms/hr/page/team_updates/team_updates.py deleted file mode 100644 index ae29b0f1dc5..00000000000 --- a/hrms/hr/page/team_updates/team_updates.py +++ /dev/null @@ -1,23 +0,0 @@ -from email_reply_parser import EmailReplyParser - -import frappe - - -@frappe.whitelist() -def get_data(start: int = 0): - frappe.only_for("Employee", "System Manager") - data = frappe.get_all( - "Communication", - fields=("content", "text_content", "sender", "creation"), - filters=dict(reference_doctype="Daily Work Summary"), - order_by="creation desc", - limit=40, - start=start, - ) - - for d in data: - d.sender_name = frappe.db.get_value("Employee", {"user_id": d.sender}, "employee_name") or d.sender - if d.text_content: - d.content = frappe.utils.md_to_html(EmailReplyParser.parse_reply(d.text_content)) - - return data diff --git a/hrms/hr/report/daily_work_summary_replies/__init__.py b/hrms/hr/report/daily_work_summary_replies/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/hrms/hr/report/daily_work_summary_replies/daily_work_summary_replies.js b/hrms/hr/report/daily_work_summary_replies/daily_work_summary_replies.js deleted file mode 100644 index 2b477fb02ef..00000000000 --- a/hrms/hr/report/daily_work_summary_replies/daily_work_summary_replies.js +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors -// For license information, please see license.txt - -/* eslint-disable */ -frappe.query_reports["Daily Work Summary Replies"] = { - filters: [ - { - fieldname: "group", - label: __("Group"), - fieldtype: "Link", - options: "Daily Work Summary Group", - reqd: 1, - }, - { - fieldname: "range", - label: __("Date Range"), - fieldtype: "DateRange", - reqd: 1, - }, - ], -}; diff --git a/hrms/hr/report/daily_work_summary_replies/daily_work_summary_replies.json b/hrms/hr/report/daily_work_summary_replies/daily_work_summary_replies.json deleted file mode 100644 index 8ca90967a09..00000000000 --- a/hrms/hr/report/daily_work_summary_replies/daily_work_summary_replies.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "add_total_row": 0, - "add_translate_data": 0, - "columns": [], - "creation": "2018-06-04 10:30:25.673452", - "disabled": 0, - "docstatus": 0, - "doctype": "Report", - "filters": [], - "idx": 0, - "is_standard": "Yes", - "letter_head": null, - "modified": "2026-03-26 15:44:28.577728", - "modified_by": "Administrator", - "module": "HR", - "name": "Daily Work Summary Replies", - "owner": "Administrator", - "prepared_report": 0, - "ref_doctype": "Daily Work Summary", - "report_name": "Daily Work Summary Replies", - "report_type": "Script Report", - "roles": [ - { - "role": "Employee" - }, - { - "role": "HR User" - }, - { - "role": "HR Manager" - } - ], - "timeout": 0 -} diff --git a/hrms/hr/report/daily_work_summary_replies/daily_work_summary_replies.py b/hrms/hr/report/daily_work_summary_replies/daily_work_summary_replies.py deleted file mode 100644 index 48072fdc911..00000000000 --- a/hrms/hr/report/daily_work_summary_replies/daily_work_summary_replies.py +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors -# For license information, please see license.txt - - -import frappe -from frappe import _ - -from hrms.hr.doctype.daily_work_summary.daily_work_summary import get_user_emails_from_group - - -def execute(filters=None): - if not filters.group: - return [], [] - columns, data = get_columns(), get_data(filters) - return columns, data - - -def get_columns(filters=None): - columns = [ - {"label": _("User"), "fieldname": "user", "fieldtype": "Data", "width": 300}, - { - "label": _("Replies"), - "fieldname": "count", - "fieldtype": "data", - "width": 100, - "align": "right", - }, - { - "label": _("Total"), - "fieldname": "total", - "fieldtype": "data", - "width": 100, - "align": "right", - }, - ] - return columns - - -def get_data(filters): - daily_summary_emails = frappe.get_all( - "Daily Work Summary", fields=["name"], filters=[["creation", "Between", filters.range]] - ) - daily_summary_emails = [d.get("name") for d in daily_summary_emails] - replies = frappe.get_all( - "Communication", - fields=["content", "text_content", "sender"], - filters=[ - ["reference_doctype", "=", "Daily Work Summary"], - ["reference_name", "in", daily_summary_emails], - ["communication_type", "=", "Communication"], - ["sent_or_received", "=", "Received"], - ], - order_by="creation asc", - ) - data = [] - total = len(daily_summary_emails) - for user in get_user_emails_from_group(filters.group): - user_name = frappe.get_value("User", user, "full_name") - count = len([d for d in replies if d.sender == user]) - data.append([user_name, count, total]) - return data diff --git a/hrms/locale/main.pot b/hrms/locale/main.pot index 07689c3879e..06d441e2b63 100644 --- a/hrms/locale/main.pot +++ b/hrms/locale/main.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Frappe HR VERSION\n" "Report-Msgid-Bugs-To: contact@frappe.io\n" -"POT-Creation-Date: 2026-09-20 09:36+0000\n" -"PO-Revision-Date: 2026-09-20 09:36+0000\n" +"POT-Creation-Date: 2026-09-27 09:37+0000\n" +"PO-Revision-Date: 2026-09-27 09:37+0000\n" "Last-Translator: contact@frappe.io\n" "Language-Team: contact@frappe.io\n" "MIME-Version: 1.0\n" @@ -332,7 +332,7 @@ msgstr "" #. Label of the absent_days (Float) field in DocType 'Salary Slip' #: hrms/payroll/doctype/salary_slip/salary_slip.json -#: hrms/payroll/report/salary_register/salary_register.py:185 +#: hrms/payroll/report/salary_register/salary_register.py:235 msgid "Absent Days" msgstr "" @@ -394,7 +394,7 @@ msgstr "" msgid "Accrual Component must be set for Flexible Benefit Salary Components with accrual payout methods." msgstr "" -#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:681 +#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:693 msgid "Accrual Journal Entry for salaries from {0} to {1}" msgstr "" @@ -501,7 +501,7 @@ msgstr "" msgid "Add unused leaves from previous leave period's allocation to this allocation" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1692 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1770 msgid "Added tax components from the Salary Component master as the salary structure didn't have any tax component." msgstr "" @@ -599,7 +599,7 @@ msgstr "" msgid "Advanced Filters" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:476 +#: hrms/hr/doctype/expense_claim/expense_claim.py:508 msgid "All Exchange Gain/Loss amount of {0} has been booked through {1}" msgstr "" @@ -683,11 +683,7 @@ msgstr "" msgid "Allocation to Adjust" msgstr "" -#: hrms/hr/utils.py:433 -msgid "Allocation was skipped due to exceeding annual allocation set in leave policy" -msgstr "" - -#: hrms/hr/utils.py:441 +#: hrms/hr/utils.py:436 msgid "Allocation was skipped due to maximum leave allocation limit set in leave type. Please increase the limit and retry failed allocation." msgstr "" @@ -1148,7 +1144,7 @@ msgstr "" msgid "Approval Status" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:202 +#: hrms/hr/doctype/expense_claim/expense_claim.py:234 msgid "Approval Status must be 'Approved' or 'Rejected'" msgstr "" @@ -1240,7 +1236,7 @@ msgstr "" msgid "As per your assigned Salary Structure you cannot apply for benefits" msgstr "" -#: hrms/hr/doctype/full_and_final_statement/full_and_final_statement.py:132 +#: hrms/hr/doctype/full_and_final_statement/full_and_final_statement.py:131 msgid "Asset Recovery Cost for {0}: {1}" msgstr "" @@ -1286,7 +1282,7 @@ msgstr "" msgid "Assignment Date: " msgstr "" -#: hrms/hr/doctype/leave_policy_assignment/leave_policy_assignment.py:559 +#: hrms/hr/doctype/leave_policy_assignment/leave_policy_assignment.py:589 msgid "Assignment Failed" msgstr "" @@ -1451,7 +1447,7 @@ msgstr "" msgid "Attendance marked successfully" msgstr "" -#: hrms/hr/doctype/attendance/attendance.py:413 +#: hrms/hr/doctype/attendance/attendance.py:449 msgid "Attendance marked successfully." msgstr "" @@ -1505,7 +1501,7 @@ msgstr "" msgid "Automated Based on Goal Progress" msgstr "" -#: hrms/hr/utils.py:494 +#: hrms/hr/utils.py:499 msgid "Automatic Leave Allocation has failed for the following Earned Leaves: {0}. Please check {1} for more details." msgstr "" @@ -1585,6 +1581,11 @@ msgstr "" msgid "Bank Remittance" msgstr "" +#: hrms/overrides/employee_payment_entry.py:107 +#: hrms/overrides/employee_payment_entry.py:111 +msgid "Bank/Cash Account Required" +msgstr "" + #. Label of the base (Currency) field in DocType 'Salary Structure Assignment' #: hrms/payroll/doctype/bulk_salary_structure_assignment/bulk_salary_structure_assignment.js:180 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.json @@ -1772,11 +1773,11 @@ msgstr "" msgid "Bulk Salary Structure Assignment" msgstr "" -#: hrms/hr/doctype/attendance/attendance.py:407 +#: hrms/hr/doctype/attendance/attendance.py:443 msgid "Bulk attendance marking is already in progress for employee {0}. You can monitor the job status {1}" msgstr "" -#: hrms/hr/doctype/attendance/attendance.py:403 +#: hrms/hr/doctype/attendance/attendance.py:439 msgid "Bulk attendance marking is queued with a background job. It may take a while. You can monitor the job status {0}" msgstr "" @@ -1818,7 +1819,7 @@ msgstr "" msgid "Calculated in days" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:747 +#: hrms/hr/doctype/expense_claim/expense_claim.py:779 msgid "Cancel the Payment Entry made against it, correct the advance account to be of type Receivable, and create a new Payment Entry." msgstr "" @@ -1842,14 +1843,6 @@ msgstr "" msgid "Cannot allocate leaves outside the allocation period {0} - {1}" msgstr "" -#: hrms/hr/doctype/leave_allocation/leave_allocation.py:495 -msgid "Cannot allocate more leaves due to maximum leave allocation limit of {0} in leave policy assignment" -msgstr "" - -#: hrms/hr/doctype/leave_allocation/leave_allocation.py:487 -msgid "Cannot allocate more leaves due to maximum leaves allowed limit of {0} in {1} leave type." -msgstr "" - #: hrms/api/roster.py:202 msgid "Cannot break shift after end date" msgstr "" @@ -1870,15 +1863,15 @@ msgstr "" msgid "Cannot cancel Shift Assignment: {0} as it is linked to Employee Checkin: {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:368 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:375 msgid "Cannot create Salary Slip for Employee joining after Payroll Period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:371 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:378 msgid "Cannot create Salary Slip for Employee who has left before Payroll Period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2656 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2734 msgid "Cannot create Salary Slip: no active Salary Structure is assigned to employee {0}." msgstr "" @@ -1958,7 +1951,7 @@ msgstr "" msgid "Check {1} for more details" msgstr "" -#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1719 +#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1731 msgid "Check Error Log {0} for more details." msgstr "" @@ -1982,8 +1975,8 @@ msgstr "" msgid "Check in to create your first log." msgstr "" -#: hrms/hr/doctype/leave_policy_assignment/leave_policy_assignment.py:551 -#: hrms/hr/utils.py:953 +#: hrms/hr/doctype/leave_policy_assignment/leave_policy_assignment.py:581 +#: hrms/hr/utils.py:958 msgid "Check {0} for more details" msgstr "" @@ -2215,7 +2208,7 @@ msgstr "" msgid "Copy of Invitation/Announcement" msgstr "" -#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1799 +#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1811 msgid "Could not submit some Salary Slips: {}" msgstr "" @@ -2327,7 +2320,7 @@ msgstr "" msgid "Creating Payment Entries......" msgstr "" -#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1757 +#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1769 msgid "Creating Salary Slips..." msgstr "" @@ -2339,7 +2332,7 @@ msgstr "" msgid "Creation Date" msgstr "" -#: hrms/hr/utils.py:962 +#: hrms/hr/utils.py:967 msgid "Creation Failed" msgstr "" @@ -2558,8 +2551,6 @@ msgstr "" #. Option for the 'Type' (Select) field in DocType 'Salary Component' #: hrms/payroll/doctype/salary_component/salary_component.json -#: hrms/payroll/report/salary_register/salary_register.py:90 -#: hrms/payroll/report/salary_register/salary_register.py:96 msgid "Deduction" msgstr "" @@ -2640,7 +2631,7 @@ msgstr "" msgid "Department Wise Employee Count" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:164 +#: hrms/hr/doctype/expense_claim/expense_claim.py:196 msgid "Department {0} does not belong to company: {1}" msgstr "" @@ -2831,8 +2822,6 @@ msgstr "" #. Option for the 'Type' (Select) field in DocType 'Salary Component' #: hrms/payroll/doctype/salary_component/salary_component.json -#: hrms/payroll/report/salary_register/salary_register.py:90 -#: hrms/payroll/report/salary_register/salary_register.py:96 msgid "Earning" msgstr "" @@ -2945,19 +2934,19 @@ msgstr "" msgid "Employee Advance {0} has {1} available for return. {2} has already been scheduled for deduction in {3}." msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:737 +#: hrms/hr/doctype/expense_claim/expense_claim.py:769 msgid "Employee Advance {0} is in currency {1} and can only be claimed in an Expense Claim of the same currency. This Expense Claim is in {2}." msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:764 +#: hrms/hr/doctype/expense_claim/expense_claim.py:796 msgid "Employee Advance {0} is linked to account {1}, which is not of type Receivable. Please correct the account type before making a payment against it." msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:755 +#: hrms/hr/doctype/expense_claim/expense_claim.py:787 msgid "Employee Advance {0} is linked to account {1}, which is not of type Receivable. {2}" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:782 +#: hrms/hr/doctype/expense_claim/expense_claim.py:814 msgid "Employee Advance {0}'s payment does not match its Receivable account. This can happen if the account's type was changed after the payment was made. {1}" msgstr "" @@ -3436,6 +3425,11 @@ msgstr "" msgid "Employee can be named by Employee ID if you assign one, or via Naming Series. Select your preference here." msgstr "" +#: hrms/hr/doctype/attendance/attendance.py:393 +#: hrms/hr/doctype/attendance/attendance.py:424 +msgid "Employee must be a non-empty string." +msgstr "" + #. Label of the employee_name (Data) field in DocType 'Leave Policy Assignment' #: hrms/hr/doctype/leave_policy_assignment/leave_policy_assignment.json msgid "Employee name" @@ -3459,7 +3453,7 @@ msgstr "" msgid "Employee was marked Absent for not meeting the working hours threshold." msgstr "" -#: hrms/hr/doctype/shift_type/shift_type.py:491 +#: hrms/hr/doctype/shift_type/shift_type.py:496 msgid "Employee was marked Absent for other half due to missing Employee Checkins." msgstr "" @@ -3479,6 +3473,14 @@ msgstr "" msgid "Employee {0} already submitted an application {1} for the payroll period {2}" msgstr "" +#: hrms/hr/doctype/attendance/attendance.py:410 +msgid "Employee {0} does not belong to Company {1}" +msgstr "" + +#: hrms/hr/doctype/expense_claim/expense_claim.py:174 +msgid "Employee {0} does not belong to company: {1}" +msgstr "" + #: hrms/hr/doctype/shift_request/shift_request.py:154 msgid "Employee {0} has already applied for Shift {1}: {2} that overlaps within this period" msgstr "" @@ -3507,7 +3509,7 @@ msgstr "" msgid "Employee {0} on Half day on {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:727 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:769 msgid "Employee {0} relieved on {1} must be set as 'Left'" msgstr "" @@ -3569,7 +3571,7 @@ msgid "Employees working on a holiday" msgstr "" #. Option for the 'Type' (Select) field in DocType 'Salary Component' -#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:777 +#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:789 #: hrms/payroll/doctype/salary_component/salary_component.json msgid "Employer Contribution" msgstr "" @@ -3583,7 +3585,7 @@ msgstr "" msgid "Employer Contributions" msgstr "" -#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:772 +#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:784 msgid "Employer contribution accrual for salaries from {0} to {1}" msgstr "" @@ -3746,7 +3748,7 @@ msgstr "" msgid "Error downloading PDF" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1414 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1492 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:460 msgid "Error in formula or condition" msgstr "" @@ -3796,14 +3798,6 @@ msgstr "" msgid "Event Location" msgstr "" -#. Label of the event_name (Data) field in DocType 'Training Event' -#. Label of the event_name (Data) field in DocType 'Training Feedback' -#: hrms/hr/doctype/training_event/training_event.json -#: hrms/hr/doctype/training_feedback/training_feedback.json -#: hrms/templates/emails/training_event.html:5 -msgid "Event Name" -msgstr "" - #. Label of the event_status (Select) field in DocType 'Training Event' #: hrms/hr/doctype/training_event/training_event.json msgid "Event Status" @@ -4063,7 +4057,7 @@ msgstr "" #. Label of the expense_type (Data) field in DocType 'Expense Claim Type' #. Label of a Workspace Sidebar Item #: hrms/expenses/sidebar/expenses/expenses.json -#: hrms/hr/doctype/expense_claim/expense_claim.py:714 +#: hrms/hr/doctype/expense_claim/expense_claim.py:746 #: hrms/hr/doctype/expense_claim_detail/expense_claim_detail.json #: hrms/hr/doctype/expense_claim_type/expense_claim_type.json #: hrms/workspace_sidebar/expenses.json @@ -4143,7 +4137,7 @@ msgstr "" msgid "Expire Carry Forwarded Leaves (Days)" msgstr "" -#: hrms/hr/doctype/leave_allocation/leave_allocation.py:617 +#: hrms/hr/doctype/leave_allocation/leave_allocation.py:586 msgid "Expire Leaves" msgstr "" @@ -4165,7 +4159,7 @@ msgstr "" msgid "Exporting..." msgstr "" -#: hrms/hr/utils.py:950 +#: hrms/hr/utils.py:955 msgid "Failed to create/submit {0} for employees:" msgstr "" @@ -4177,7 +4171,7 @@ msgstr "" msgid "Failed to download PDF" msgstr "" -#: hrms/api/__init__.py:815 +#: hrms/api/__init__.py:805 msgid "Failed to download PDF: {0}" msgstr "" @@ -4217,7 +4211,7 @@ msgstr "" msgid "Failure Reason" msgstr "" -#: hrms/hr/utils.py:493 +#: hrms/hr/utils.py:498 msgid "Failure of Automatic Allocation of Earned Leaves" msgstr "" @@ -4368,7 +4362,7 @@ msgstr "" msgid "First Name " msgstr "" -#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1702 +#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1714 msgid "Fiscal Year {0} not found" msgstr "" @@ -4769,7 +4763,7 @@ msgstr "" #: hrms/payroll/doctype/salary_slip/salary_slip.json #: hrms/payroll/report/income_tax_deductions/income_tax_deductions.py:54 #: hrms/payroll/report/salary_payments_via_ecs/salary_payments_via_ecs.py:44 -#: hrms/payroll/report/salary_register/salary_register.py:211 +#: hrms/payroll/report/salary_register/salary_register.py:261 msgid "Gross Pay" msgstr "" @@ -5300,11 +5294,11 @@ msgstr "" msgid "Income Tax Slab is mandatory since the Salary Structure {0} has a tax component {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1971 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2049 msgid "Income Tax Slab must be effective on or before Payroll Period Start Date: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1959 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2037 msgid "Income Tax Slab not set in Salary Structure Assignment: {0}" msgstr "" @@ -5312,7 +5306,7 @@ msgstr "" msgid "Income Tax Slab: " msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1967 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2045 msgid "Income Tax Slab: {0} is disabled" msgstr "" @@ -5551,7 +5545,7 @@ msgstr "" msgid "Invalid Dates" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2721 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2799 msgid "Invalid LWP Days Reversed" msgstr "" @@ -5572,7 +5566,7 @@ msgstr "" msgid "Invalid employee filter: {0}" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:1006 +#: hrms/hr/doctype/expense_claim/expense_claim.py:1038 msgid "Invalid parameters provided. Please pass the required arguments." msgstr "" @@ -5945,7 +5939,7 @@ msgstr "" msgid "Key Result Area" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2718 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2796 msgid "LWP Days Reversed ({0}) does not match actual Payroll Corrections total ({1}) for employee {2} from {3} to {4}" msgstr "" @@ -6172,7 +6166,7 @@ msgstr "" msgid "Leave Block List Name" msgstr "" -#: hrms/hr/doctype/leave_application/leave_application.py:1544 +#: hrms/hr/doctype/leave_application/leave_application.py:1549 msgid "Leave Blocked" msgstr "" @@ -6371,7 +6365,7 @@ msgstr "" msgid "Leave Type {0} cannot be allocated since it is leave without pay" msgstr "" -#: hrms/hr/doctype/leave_allocation/leave_allocation.py:606 +#: hrms/hr/doctype/leave_allocation/leave_allocation.py:575 msgid "Leave Type {0} cannot be carry-forwarded" msgstr "" @@ -6381,12 +6375,12 @@ msgstr "" #. Label of the leave_without_pay (Float) field in DocType 'Salary Slip' #: hrms/payroll/doctype/salary_slip/salary_slip.json -#: hrms/payroll/report/salary_register/salary_register.py:179 hrms/setup.py:453 +#: hrms/payroll/report/salary_register/salary_register.py:229 hrms/setup.py:453 #: hrms/setup.py:454 msgid "Leave Without Pay" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:592 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:610 msgid "Leave Without Pay does not match with approved {} records" msgstr "" @@ -6423,7 +6417,7 @@ msgstr "" msgid "Leave of type {0} cannot be longer than {1}." msgstr "" -#: hrms/hr/doctype/leave_policy_assignment/leave_policy_assignment.py:548 +#: hrms/hr/doctype/leave_policy_assignment/leave_policy_assignment.py:578 msgid "Leave policy could not be assigned to the following employees:" msgstr "" @@ -6480,7 +6474,7 @@ msgstr "" msgid "Leaves Allocated" msgstr "" -#: hrms/hr/doctype/leave_allocation/leave_allocation.py:611 +#: hrms/hr/doctype/leave_allocation/leave_allocation.py:580 msgid "Leaves Expired" msgstr "" @@ -6533,11 +6527,6 @@ msgstr "" msgid "Lime" msgstr "" -#. Label of the limits_tab (Tab Break) field in DocType 'Leave Type' -#: hrms/hr/doctype/leave_type/leave_type.json -msgid "Limits" -msgstr "" - #. Description of the 'Appraisal Linking' (Section Break) field in DocType #. 'Goal' #: hrms/hr/doctype/goal/goal.json hrms/hr/doctype/goal/goal_tree.js:97 @@ -6562,7 +6551,7 @@ msgstr "" msgid "Loan Product" msgstr "" -#: hrms/payroll/report/salary_register/salary_register.py:233 hrms/setup.py:833 +#: hrms/payroll/report/salary_register/salary_register.py:283 hrms/setup.py:833 msgid "Loan Repayment" msgstr "" @@ -6571,7 +6560,7 @@ msgstr "" msgid "Loan Repayment Entry" msgstr "" -#: hrms/hr/utils.py:837 +#: hrms/hr/utils.py:842 msgid "Loan cannot be repayed from salary for Employee {0} because salary is processed in currency {1}" msgstr "" @@ -6920,7 +6909,7 @@ msgstr "" msgid "Missing Salary Components" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1962 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2040 msgid "Missing Tax Slab" msgstr "" @@ -6933,7 +6922,7 @@ msgstr "" msgid "Mode of Travel" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:496 +#: hrms/hr/doctype/expense_claim/expense_claim.py:528 msgid "Mode of payment is required to make a payment" msgstr "" @@ -6993,7 +6982,7 @@ msgid "My Requests" msgstr "" #: hrms/payroll/doctype/income_tax_slab/income_tax_slab.py:123 -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1400 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1478 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:446 msgid "Name error" msgstr "" @@ -7008,7 +6997,7 @@ msgstr "" #: hrms/payroll/doctype/salary_slip/salary_slip.json #: hrms/payroll/doctype/salary_structure/salary_structure.json #: hrms/payroll/report/salary_payments_via_ecs/salary_payments_via_ecs.py:51 -#: hrms/payroll/report/salary_register/salary_register.py:251 +#: hrms/payroll/report/salary_register/salary_register.py:301 msgid "Net Pay" msgstr "" @@ -7022,7 +7011,7 @@ msgstr "" msgid "Net Pay Info" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:271 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:278 msgid "Net Pay cannot be less than 0" msgstr "" @@ -7094,11 +7083,11 @@ msgstr "" msgid "No Employee found for the given employee field value. '{}': {}" msgstr "" -#: hrms/hr/doctype/appraisal_cycle/appraisal_cycle.py:137 hrms/hr/utils.py:940 +#: hrms/hr/doctype/appraisal_cycle/appraisal_cycle.py:137 hrms/hr/utils.py:945 msgid "No Employees Selected" msgstr "" -#: hrms/utils/holiday_list.py:279 +#: hrms/utils/holiday_list.py:283 msgid "No Holiday List was found for Employee {0} or their company {1} for date {2}. Please assign through {3}" msgstr "" @@ -7154,7 +7143,7 @@ msgstr "" msgid "No active employee found associated with the email ID {0}. Try logging in with your employee email ID or contact your HR manager for access." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:505 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:512 msgid "No active or default Salary Structure found for employee {0} for the given dates" msgstr "" @@ -7272,7 +7261,7 @@ msgstr "" msgid "No replies from" msgstr "" -#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1785 +#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1797 msgid "No salary slip found to submit for the above selected criteria OR salary slip already submitted" msgstr "" @@ -7339,7 +7328,7 @@ msgstr "" msgid "Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2271 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2349 msgid "Note: Your salary slip is password protected, the password to unlock the PDF is of the format {0}." msgstr "" @@ -7707,11 +7696,11 @@ msgstr "" msgid "Overtime Slip created for {0} employee(s)" msgstr "" -#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1411 +#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1423 msgid "Overtime Slip creation is queued. It may take a few minutes" msgstr "" -#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1437 +#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1449 msgid "Overtime Slip submission is queued. It may take a few minutes" msgstr "" @@ -7866,7 +7855,7 @@ msgstr "" #. Label of the payment_days_tab (Tab Break) field in DocType 'Salary Slip' #: hrms/payroll/doctype/payroll_correction/payroll_correction.json #: hrms/payroll/doctype/salary_slip/salary_slip.json -#: hrms/payroll/report/salary_register/salary_register.py:191 +#: hrms/payroll/report/salary_register/salary_register.py:241 msgid "Payment Days" msgstr "" @@ -7889,7 +7878,7 @@ msgstr "" msgid "Payment and Accounting" msgstr "" -#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1271 +#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1283 msgid "Payment of {0} from {1} to {2}" msgstr "" @@ -8138,7 +8127,7 @@ msgstr "" msgid "Please Select Company First" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:902 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:980 msgid "Please assign a Salary Structure for Employee {0} applicable from or before {1} first" msgstr "" @@ -8182,7 +8171,7 @@ msgstr "" msgid "Please reduce {0} to avoid shift time overlapping with itself" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2260 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2338 msgid "Please see attachment" msgstr "" @@ -8228,11 +8217,11 @@ msgstr "" msgid "Please select a company first." msgstr "" -#: hrms/hr/doctype/attendance/attendance.py:395 +#: hrms/hr/doctype/attendance/attendance.py:431 msgid "Please select a date." msgstr "" -#: hrms/hr/utils.py:828 +#: hrms/hr/utils.py:833 msgid "Please select an Applicant" msgstr "" @@ -8244,7 +8233,7 @@ msgstr "" msgid "Please select at least one Shift Request to perform this action." msgstr "" -#: hrms/hr/utils.py:939 +#: hrms/hr/utils.py:944 msgid "Please select at least one employee to perform this action." msgstr "" @@ -8305,7 +8294,7 @@ msgstr "" msgid "Please set Leave Approver for the Employee: {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:576 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:591 msgid "Please set Payroll based on in Payroll settings" msgstr "" @@ -8313,11 +8302,19 @@ msgstr "" msgid "Please set Relieving Date for employee: {0}" msgstr "" +#: hrms/overrides/employee_payment_entry.py:110 +msgid "Please set a Default Bank/Cash Account in the Company {0}" +msgstr "" + #: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js:193 #: hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py:53 msgid "Please set a date range less than 90 days." msgstr "" +#: hrms/overrides/employee_payment_entry.py:101 +msgid "Please set a {0} on this document, or a Default Bank/Cash Account in the Company {1}" +msgstr "" + #: hrms/payroll/doctype/payroll_entry/payroll_entry.py:408 msgid "Please set account in Salary Component {0}" msgstr "" @@ -8338,7 +8335,7 @@ msgstr "" msgid "Please set employee's total cost to company to see CTC breakup." msgstr "" -#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:798 +#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:810 msgid "Please set expense and liability accounts in Salary Component {0}" msgstr "" @@ -8354,7 +8351,7 @@ msgstr "" msgid "Please set the Company" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:364 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:371 msgid "Please set the Date Of Joining for employee {0}" msgstr "" @@ -8895,7 +8892,7 @@ msgstr "" msgid "Repay From Salary" msgstr "" -#: hrms/hr/utils.py:843 +#: hrms/hr/utils.py:848 msgid "Repay From Salary can be selected only for term loans" msgstr "" @@ -9017,11 +9014,6 @@ msgstr "" msgid "Retirement Age (In Years)" msgstr "" -#: hrms/hr/doctype/leave_allocation/leave_allocation.py:490 -#: hrms/hr/doctype/leave_allocation/leave_allocation.py:498 -msgid "Retry Failed" -msgstr "" - #. Label of the retry_failed_allocations (Button) field in DocType 'Leave #. Allocation' #: hrms/hr/doctype/leave_allocation/leave_allocation.json @@ -9116,11 +9108,11 @@ msgstr "" msgid "Row #{0}: Timesheet amount will overwrite the Earning component amount for the Salary Component {1}" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:974 +#: hrms/hr/doctype/expense_claim/expense_claim.py:1006 msgid "Row No {0}: Amount cannot be greater than the Outstanding Amount against Expense Claim {1}. Outstanding Amount is {2}" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:591 +#: hrms/hr/doctype/expense_claim/expense_claim.py:623 msgid "Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2}" msgstr "" @@ -9148,15 +9140,11 @@ msgstr "" msgid "Row {0}: Paid amount {1} is greater than pending accrued amount {2} against loan {3}" msgstr "" -#: hrms/hr/doctype/full_and_final_statement/full_and_final_statement.py:96 -msgid "Row {0}: {1}" -msgstr "" - -#: hrms/hr/doctype/expense_claim/expense_claim.py:486 +#: hrms/hr/doctype/expense_claim/expense_claim.py:518 msgid "Row {0}: {1} is required in the expenses table to book an expense claim." msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:601 +#: hrms/hr/doctype/expense_claim/expense_claim.py:633 msgid "Row {0}: {1}, {2} and {3} are required against advance {4}." msgstr "" @@ -9311,7 +9299,7 @@ msgstr "" msgid "Salary Slip Based on Timesheet" msgstr "" -#: hrms/payroll/report/salary_register/salary_register.py:113 +#: hrms/payroll/report/salary_register/salary_register.py:163 msgid "Salary Slip ID" msgstr "" @@ -9350,11 +9338,11 @@ msgstr "" msgid "Salary Slip not found." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:398 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:405 msgid "Salary Slip of employee {0} already created for this period" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:404 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:411 msgid "Salary Slip of employee {0} already created for time sheet {1}" msgstr "" @@ -9362,7 +9350,7 @@ msgstr "" msgid "Salary Slip submission is queued. It may take a few minutes" msgstr "" -#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1707 +#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1719 msgid "Salary Slip {0} failed for Payroll Entry {1}" msgstr "" @@ -9384,11 +9372,11 @@ msgstr "" msgid "Salary Slips Submitted" msgstr "" -#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1764 +#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1776 msgid "Salary Slips already exist for employees {}, and will not be processed by this payroll." msgstr "" -#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1791 +#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1803 msgid "Salary Slips submitted for period from {0} to {1}" msgstr "" @@ -9435,7 +9423,7 @@ msgstr "" msgid "Salary Structure Assignment not found for employee {0} on date {1}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:508 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:515 msgid "Salary Structure Missing" msgstr "" @@ -9501,7 +9489,7 @@ msgstr "" msgid "Salary components should be part of the Salary Structure." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2744 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2822 msgid "Salary slip emails have been enqueued for sending. Check {0} for status." msgstr "" @@ -9518,7 +9506,7 @@ msgstr "" msgid "Sanctioned Amount (Company Currency)" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:625 +#: hrms/hr/doctype/expense_claim/expense_claim.py:657 msgid "Sanctioned Amount cannot be greater than Claim Amount in Row {0}." msgstr "" @@ -9577,7 +9565,7 @@ msgstr "" msgid "Select Payment Account to make Bank Entry" msgstr "" -#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1943 +#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1955 msgid "Select Payroll Frequency." msgstr "" @@ -9666,7 +9654,7 @@ msgstr "" msgid "Selected employee advance is not of employee {0}" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:581 +#: hrms/hr/doctype/expense_claim/expense_claim.py:613 msgid "Selected employee advance is not of employee {}" msgstr "" @@ -9694,7 +9682,7 @@ msgstr "" msgid "Self-Study" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:178 +#: hrms/hr/doctype/expense_claim/expense_claim.py:210 msgid "Self-approval for Expense Claims is not allowed" msgstr "" @@ -9820,7 +9808,7 @@ msgstr "" msgid "Set optional filters to fetch employees in the appraisee list" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:713 +#: hrms/hr/doctype/expense_claim/expense_claim.py:745 msgid "Set the default account for the {0} {1}" msgstr "" @@ -9855,7 +9843,7 @@ msgstr "" msgid "Settle all Payables and Receivables before submission" msgstr "" -#: hrms/hr/utils.py:791 +#: hrms/hr/utils.py:796 msgid "Shared document with the user {0} with 'Submit' permission" msgstr "" @@ -10105,6 +10093,10 @@ msgstr "" msgid "Show Employee" msgstr "" +#: hrms/payroll/report/salary_register/salary_register.js:95 +msgid "Show Employer Contributions" +msgstr "" + #. Label of the show_leave_balances_in_salary_slip (Check) field in DocType #. 'Payroll Settings' #: hrms/payroll/doctype/payroll_settings/payroll_settings.json @@ -10243,7 +10235,7 @@ msgstr "" msgid "Standard Working Hours" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1896 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1974 msgid "Start and end dates not in a valid Payroll Period, cannot calculate {0}." msgstr "" @@ -10349,7 +10341,7 @@ msgstr "" msgid "Submitting Salary Slips and creating Journal Entry..." msgstr "" -#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1846 +#: hrms/payroll/doctype/payroll_entry/payroll_entry.py:1858 msgid "Submitting Salary Slips..." msgstr "" @@ -10357,7 +10349,7 @@ msgstr "" msgid "Subsidiary companies have already planned for {1} vacancies at a budget of {2}. Staffing Plan for {0} should allocate more vacancies and budget for {3} than planned for its subsidiary companies" msgstr "" -#: hrms/hr/utils.py:967 +#: hrms/hr/utils.py:972 msgid "Successfully created {0} for employees:" msgstr "" @@ -10383,7 +10375,7 @@ msgstr "" msgid "Sync {0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1407 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1485 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:453 msgid "Syntax error" msgstr "" @@ -10540,11 +10532,11 @@ msgstr "" msgid "Thank you for applying." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2675 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2753 msgid "The Assigned Salary Structure {0} for the employee {1} does not have a Salary Component configured for Salary Slip based on Timesheet." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2669 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2747 msgid "The Assigned Salary Structure {0} for the employee {1} is not configured for Salary Slip based on Timesheet." msgstr "" @@ -10626,7 +10618,7 @@ msgstr "" msgid "Theory" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:573 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:588 msgid "There are more holidays than working days this month." msgstr "" @@ -10674,17 +10666,17 @@ msgstr "" msgid "This employee already has a log with the same timestamp.{0}" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1415 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1493 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:461 msgid "This error can be due to invalid formula or condition." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1408 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1486 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:454 msgid "This error can be due to invalid syntax." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:1401 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:1479 #: hrms/payroll/doctype/salary_structure_assignment/salary_structure_assignment.py:447 msgid "This error can be due to missing or deleted field." msgstr "" @@ -10907,7 +10899,7 @@ msgstr "" #: hrms/payroll/doctype/salary_slip/salary_slip.json #: hrms/payroll/doctype/salary_structure/salary_structure.json #: hrms/payroll/report/salary_payments_based_on_payment_mode/salary_payments_based_on_payment_mode.py:155 -#: hrms/payroll/report/salary_register/salary_register.py:244 +#: hrms/payroll/report/salary_register/salary_register.py:294 msgid "Total Deduction" msgstr "" @@ -10935,6 +10927,10 @@ msgstr "" msgid "Total Employees" msgstr "" +#: hrms/payroll/report/salary_register/salary_register.py:324 +msgid "Total Employer Contribution" +msgstr "" + #. Label of the total_estimated_budget (Currency) field in DocType 'Staffing #. Plan' #: hrms/hr/doctype/staffing_plan/staffing_plan.json @@ -11116,7 +11112,7 @@ msgstr "" msgid "Total Self Score" msgstr "" -#: hrms/hr/doctype/expense_claim/expense_claim.py:619 +#: hrms/hr/doctype/expense_claim/expense_claim.py:651 msgid "Total advance amount cannot be greater than total sanctioned amount" msgstr "" @@ -11176,7 +11172,7 @@ msgstr "" msgid "Total working Days Per Year" msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:241 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:248 msgid "Total working hours should not be greater than max working hours {0}" msgstr "" @@ -11286,7 +11282,7 @@ msgstr "" msgid "Trainings (This Week)" msgstr "" -#: hrms/hr/utils.py:814 +#: hrms/hr/utils.py:819 msgid "Transactions cannot be created for an Inactive Employee {0}." msgstr "" @@ -11424,6 +11420,10 @@ msgstr "" msgid "Unmarked days" msgstr "" +#: hrms/hr/doctype/attendance/attendance.py:426 +msgid "Unmarked days must be a list of dates." +msgstr "" + #: hrms/payroll/report/accrued_earnings_report/accrued_earnings_report.py:58 msgid "Unpaid Accrual" msgstr "" @@ -11867,6 +11867,10 @@ msgstr "" msgid "Yes, Proceed" msgstr "" +#: hrms/hr/doctype/expense_claim/expense_claim.py:185 +msgid "You are not allowed to create or modify an Expense Claim for Employee {0}" +msgstr "" + #: hrms/hr/doctype/leave_application/leave_application.py:440 msgid "You are not authorized to approve leaves on Block Dates" msgstr "" @@ -11875,6 +11879,10 @@ msgstr "" msgid "You are not permitted to access the CTC report of another employee." msgstr "" +#: hrms/hr/doctype/goal/goal.py:238 +msgid "You are not permitted to update another employee's goal." +msgstr "" + #: hrms/hr/doctype/compensatory_leave_request/compensatory_leave_request.py:79 msgid "You are not present all day(s) between compensatory leave request days" msgstr "" @@ -11895,7 +11903,7 @@ msgstr "" msgid "You can only submit Leave Encashment for a valid encashment amount" msgstr "" -#: hrms/api/__init__.py:765 +#: hrms/api/__init__.py:755 msgid "You can only upload JPG, PNG, PDF, TXT or Microsoft documents." msgstr "" @@ -11903,12 +11911,16 @@ msgstr "" msgid "You cannot reverse more than the total LWP days {0}. You have already reversed {1} days for this employee." msgstr "" +#: hrms/hr/doctype/attendance/attendance.py:404 +msgid "You do not have access to Employee {0}" +msgstr "" + #: hrms/hr/doctype/shift_request/shift_request.py:170 msgid "You do not have permission to change the Status of a Shift Request." msgstr "" #: hrms/hr/doctype/leave_allocation/leave_allocation.py:466 -#: hrms/hr/doctype/leave_allocation/leave_allocation.py:629 +#: hrms/hr/doctype/leave_allocation/leave_allocation.py:598 msgid "You do not have permission to complete this action" msgstr "" @@ -12013,6 +12025,7 @@ msgid "fields are mandatory" msgstr "" #: hrms/hr/doctype/employee_advance/employee_advance.py:82 +#: hrms/overrides/employee_payment_entry.py:98 msgid "here" msgstr "" @@ -12187,7 +12200,7 @@ msgstr "" msgid "{0} leaves allocated successfully" msgstr "" -#: hrms/hr/doctype/leave_allocation/leave_allocation.py:612 +#: hrms/hr/doctype/leave_allocation/leave_allocation.py:581 msgid "{0} leaves from allocation for {1} leave type have expired and will be processed during the next scheduled job. It is recommended to expire them now before creating new leave policy assignments." msgstr "" @@ -12244,11 +12257,11 @@ msgstr "" msgid "{0} {1} {2}?" msgstr "" -#: hrms/hr/utils.py:466 +#: hrms/hr/utils.py:471 msgid "{0}. Check error log for more details." msgstr "" -#: hrms/payroll/doctype/salary_slip/salary_slip.py:2294 +#: hrms/payroll/doctype/salary_slip/salary_slip.py:2372 msgid "{0}: Employee email not found, hence email not sent" msgstr "" diff --git a/hrms/public/js/utils/telemetry.js b/hrms/public/js/utils/telemetry.js index f31e497c6d8..53b8ae6de78 100644 --- a/hrms/public/js/utils/telemetry.js +++ b/hrms/public/js/utils/telemetry.js @@ -74,7 +74,6 @@ const HR_REPORTS = new Set([ "Income Tax Deductions", "Professional Tax Deductions", "Provident Fund Deductions", - "Daily Work Summary Replies", ]); function hr_capture(event, props) { diff --git a/hrms/templates/emails/daily_work_summary.html b/hrms/templates/emails/daily_work_summary.html deleted file mode 100644 index 1764e8f7038..00000000000 --- a/hrms/templates/emails/daily_work_summary.html +++ /dev/null @@ -1,55 +0,0 @@ - - -

{{ title }}

- -
-{% for reply in replies %} - - - - - - - - - - -
- {% if reply.image %} - - {% else %} -
- {{ reply.sender_name[0] }} -
- {% endif %} -
-
- {{ reply.sender_name }} -
-
- - - - - - - - -
-
- {{ reply.content }} -
-
- - -
-{% endfor %} -{% if did_not_reply %} - - -
-

{{ did_not_reply_title }}: {{ did_not_reply }}

-
- -
-{% endif %} diff --git a/hrms/templates/emails/daily_work_summary.txt b/hrms/templates/emails/daily_work_summary.txt deleted file mode 100644 index 2fb4380d8ff..00000000000 --- a/hrms/templates/emails/daily_work_summary.txt +++ /dev/null @@ -1,11 +0,0 @@ -{{ title }} - -{% for reply in replies %} -{{ reply.sender_name }}: -{{ reply.content }} - - -{% endfor %} -{% if did_not_reply %} -{{ did_not_reply_title }}: {{ did_not_reply }} -{% endif %} \ No newline at end of file