Skip to content

Commit cb7339d

Browse files
AyshaHakeemAyshaHakeem
authored
Merge branch 'frappe:develop' into fix-hrms
2 parents dc0ba93 + b5b6c63 commit cb7339d

File tree

19 files changed

+203
-166
lines changed

19 files changed

+203
-166
lines changed

‎hrms/hr/doctype/employee_advance/employee_advance.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def validate(self):
3232
self.set_pending_amount()
3333

3434
def on_cancel(self):
35-
self.ignore_linked_doctypes = "GL Entry"
35+
self.ignore_linked_doctypes = ("GL Entry", "Payment Ledger Entry")
3636
self.check_linked_payment_entry()
3737
self.set_status(update=True)
3838

‎hrms/hr/doctype/interview/interview.js

+1
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ frappe.ui.form.on("Interview", {
221221
interview_round: frm.doc.interview_round || "",
222222
},
223223
callback: function (r) {
224+
frm.clear_table("interview_details");
224225
r.message.forEach((interviewer) =>
225226
frm.add_child("interview_details", interviewer),
226227
);

‎hrms/hr/report/vehicle_expenses/vehicle_expenses.js

+20-3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,20 @@ frappe.query_reports["Vehicle Expenses"] = {
99
options: ["Fiscal Year", "Date Range"],
1010
default: ["Fiscal Year"],
1111
reqd: 1,
12+
on_change: () => {
13+
let filter_based_on = frappe.query_report.get_filter_value("filter_based_on");
14+
15+
if (filter_based_on == "Fiscal Year") {
16+
set_reqd_filter("fiscal_year", true);
17+
set_reqd_filter("from_date", false);
18+
set_reqd_filter("to_date", false);
19+
}
20+
if (filter_based_on == "Date Range") {
21+
set_reqd_filter("fiscal_year", false);
22+
set_reqd_filter("from_date", true);
23+
set_reqd_filter("to_date", true);
24+
}
25+
},
1226
},
1327
{
1428
fieldname: "fiscal_year",
@@ -17,21 +31,18 @@ frappe.query_reports["Vehicle Expenses"] = {
1731
options: "Fiscal Year",
1832
default: frappe.defaults.get_user_default("fiscal_year"),
1933
depends_on: "eval: doc.filter_based_on == 'Fiscal Year'",
20-
reqd: 1,
2134
},
2235
{
2336
fieldname: "from_date",
2437
label: __("From Date"),
2538
fieldtype: "Date",
26-
reqd: 1,
2739
depends_on: "eval: doc.filter_based_on == 'Date Range'",
2840
default: frappe.datetime.add_months(frappe.datetime.nowdate(), -12),
2941
},
3042
{
3143
fieldname: "to_date",
3244
label: __("To Date"),
3345
fieldtype: "Date",
34-
reqd: 1,
3546
depends_on: "eval: doc.filter_based_on == 'Date Range'",
3647
default: frappe.datetime.nowdate(),
3748
},
@@ -49,3 +60,9 @@ frappe.query_reports["Vehicle Expenses"] = {
4960
},
5061
],
5162
};
63+
64+
function set_reqd_filter(fieldname, is_reqd) {
65+
let filter = frappe.query_report.get_filter(fieldname);
66+
filter.df.reqd = is_reqd;
67+
filter.refresh();
68+
}

‎hrms/locale/ar.po

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: frappe\n"
44
"Report-Msgid-Bugs-To: [email protected]\n"
5-
"POT-Creation-Date: 2024-11-10 09:33+0000\n"
6-
"PO-Revision-Date: 2024-11-11 18:35\n"
5+
"POT-Creation-Date: 2024-11-24 09:35+0000\n"
6+
"PO-Revision-Date: 2024-11-25 22:09\n"
77
"Last-Translator: [email protected]\n"
88
"Language-Team: Arabic\n"
99
"MIME-Version: 1.0\n"
@@ -5865,7 +5865,7 @@ msgstr "من الكمية"
58655865
#. Label of the from_date (Date) field in DocType 'Salary Structure Assignment'
58665866
#. Label of the from_date (Date) field in DocType 'Salary Withholding'
58675867
#. Label of the from_date (Date) field in DocType 'Salary Withholding Cycle'
5868-
#: frontend/src/views/attendance/AttendanceRequestList.vue:24
5868+
#: frontend/src/views/attendance/AttendanceRequestList.vue:27
58695869
#: frontend/src/views/attendance/ShiftRequestList.vue:57
58705870
#: hrms/hr/dashboard_chart_source/hiring_vs_attrition_count/hiring_vs_attrition_count.js:15
58715871
#: hrms/hr/doctype/attendance_request/attendance_request.json
@@ -8137,7 +8137,7 @@ msgid "Log Out"
81378137
msgstr ""
81388138

81398139
#. Label of the log_type (Select) field in DocType 'Employee Checkin'
8140-
#: frontend/src/views/attendance/EmployeeCheckinList.vue:22
8140+
#: frontend/src/views/attendance/EmployeeCheckinList.vue:25
81418141
#: hrms/hr/doctype/employee_checkin/employee_checkin.json
81428142
msgid "Log Type"
81438143
msgstr "نوع السجل"
@@ -11754,8 +11754,8 @@ msgstr ""
1175411754
#. Label of the shift (Link) field in DocType 'Attendance Request'
1175511755
#. Label of the shift (Link) field in DocType 'Employee Attendance Tool'
1175611756
#. Label of the shift (Link) field in DocType 'Employee Checkin'
11757-
#: frontend/src/views/attendance/AttendanceRequestList.vue:21
11758-
#: frontend/src/views/attendance/EmployeeCheckinList.vue:28
11757+
#: frontend/src/views/attendance/AttendanceRequestList.vue:24
11758+
#: frontend/src/views/attendance/EmployeeCheckinList.vue:31
1175911759
#: hrms/hr/doctype/attendance/attendance.json
1176011760
#: hrms/hr/doctype/attendance_request/attendance_request.json
1176111761
#: hrms/hr/doctype/employee_attendance_tool/employee_attendance_tool.json
@@ -12839,7 +12839,7 @@ msgstr "لكمية"
1283912839
#. Label of the to_date (Date) field in DocType 'Additional Salary'
1284012840
#. Label of the to_date (Date) field in DocType 'Salary Withholding'
1284112841
#. Label of the to_date (Date) field in DocType 'Salary Withholding Cycle'
12842-
#: frontend/src/views/attendance/AttendanceRequestList.vue:25
12842+
#: frontend/src/views/attendance/AttendanceRequestList.vue:28
1284312843
#: frontend/src/views/attendance/ShiftRequestList.vue:58
1284412844
#: hrms/hr/dashboard_chart_source/hiring_vs_attrition_count/hiring_vs_attrition_count.js:22
1284512845
#: hrms/hr/doctype/attendance_request/attendance_request.json

‎hrms/locale/bs.po

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: frappe\n"
44
"Report-Msgid-Bugs-To: [email protected]\n"
5-
"POT-Creation-Date: 2024-11-10 09:33+0000\n"
6-
"PO-Revision-Date: 2024-11-11 18:36\n"
5+
"POT-Creation-Date: 2024-11-24 09:35+0000\n"
6+
"PO-Revision-Date: 2024-11-25 22:09\n"
77
"Last-Translator: [email protected]\n"
88
"Language-Team: Bosnian\n"
99
"MIME-Version: 1.0\n"
@@ -5865,7 +5865,7 @@ msgstr ""
58655865
#. Label of the from_date (Date) field in DocType 'Salary Structure Assignment'
58665866
#. Label of the from_date (Date) field in DocType 'Salary Withholding'
58675867
#. Label of the from_date (Date) field in DocType 'Salary Withholding Cycle'
5868-
#: frontend/src/views/attendance/AttendanceRequestList.vue:24
5868+
#: frontend/src/views/attendance/AttendanceRequestList.vue:27
58695869
#: frontend/src/views/attendance/ShiftRequestList.vue:57
58705870
#: hrms/hr/dashboard_chart_source/hiring_vs_attrition_count/hiring_vs_attrition_count.js:15
58715871
#: hrms/hr/doctype/attendance_request/attendance_request.json
@@ -8137,7 +8137,7 @@ msgid "Log Out"
81378137
msgstr ""
81388138

81398139
#. Label of the log_type (Select) field in DocType 'Employee Checkin'
8140-
#: frontend/src/views/attendance/EmployeeCheckinList.vue:22
8140+
#: frontend/src/views/attendance/EmployeeCheckinList.vue:25
81418141
#: hrms/hr/doctype/employee_checkin/employee_checkin.json
81428142
msgid "Log Type"
81438143
msgstr ""
@@ -11754,8 +11754,8 @@ msgstr ""
1175411754
#. Label of the shift (Link) field in DocType 'Attendance Request'
1175511755
#. Label of the shift (Link) field in DocType 'Employee Attendance Tool'
1175611756
#. Label of the shift (Link) field in DocType 'Employee Checkin'
11757-
#: frontend/src/views/attendance/AttendanceRequestList.vue:21
11758-
#: frontend/src/views/attendance/EmployeeCheckinList.vue:28
11757+
#: frontend/src/views/attendance/AttendanceRequestList.vue:24
11758+
#: frontend/src/views/attendance/EmployeeCheckinList.vue:31
1175911759
#: hrms/hr/doctype/attendance/attendance.json
1176011760
#: hrms/hr/doctype/attendance_request/attendance_request.json
1176111761
#: hrms/hr/doctype/employee_attendance_tool/employee_attendance_tool.json
@@ -12839,7 +12839,7 @@ msgstr ""
1283912839
#. Label of the to_date (Date) field in DocType 'Additional Salary'
1284012840
#. Label of the to_date (Date) field in DocType 'Salary Withholding'
1284112841
#. Label of the to_date (Date) field in DocType 'Salary Withholding Cycle'
12842-
#: frontend/src/views/attendance/AttendanceRequestList.vue:25
12842+
#: frontend/src/views/attendance/AttendanceRequestList.vue:28
1284312843
#: frontend/src/views/attendance/ShiftRequestList.vue:58
1284412844
#: hrms/hr/dashboard_chart_source/hiring_vs_attrition_count/hiring_vs_attrition_count.js:22
1284512845
#: hrms/hr/doctype/attendance_request/attendance_request.json

‎hrms/locale/de.po

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: frappe\n"
44
"Report-Msgid-Bugs-To: [email protected]\n"
5-
"POT-Creation-Date: 2024-11-10 09:33+0000\n"
6-
"PO-Revision-Date: 2024-11-11 18:36\n"
5+
"POT-Creation-Date: 2024-11-24 09:35+0000\n"
6+
"PO-Revision-Date: 2024-11-25 22:09\n"
77
"Last-Translator: [email protected]\n"
88
"Language-Team: German\n"
99
"MIME-Version: 1.0\n"
@@ -5871,7 +5871,7 @@ msgstr "Von Menge"
58715871
#. Label of the from_date (Date) field in DocType 'Salary Structure Assignment'
58725872
#. Label of the from_date (Date) field in DocType 'Salary Withholding'
58735873
#. Label of the from_date (Date) field in DocType 'Salary Withholding Cycle'
5874-
#: frontend/src/views/attendance/AttendanceRequestList.vue:24
5874+
#: frontend/src/views/attendance/AttendanceRequestList.vue:27
58755875
#: frontend/src/views/attendance/ShiftRequestList.vue:57
58765876
#: hrms/hr/dashboard_chart_source/hiring_vs_attrition_count/hiring_vs_attrition_count.js:15
58775877
#: hrms/hr/doctype/attendance_request/attendance_request.json
@@ -8143,7 +8143,7 @@ msgid "Log Out"
81438143
msgstr ""
81448144

81458145
#. Label of the log_type (Select) field in DocType 'Employee Checkin'
8146-
#: frontend/src/views/attendance/EmployeeCheckinList.vue:22
8146+
#: frontend/src/views/attendance/EmployeeCheckinList.vue:25
81478147
#: hrms/hr/doctype/employee_checkin/employee_checkin.json
81488148
msgid "Log Type"
81498149
msgstr "Protokolltyp"
@@ -11760,8 +11760,8 @@ msgstr "Für Benutzer {0} mit „Buchen“-Berechtigung freigegeben"
1176011760
#. Label of the shift (Link) field in DocType 'Attendance Request'
1176111761
#. Label of the shift (Link) field in DocType 'Employee Attendance Tool'
1176211762
#. Label of the shift (Link) field in DocType 'Employee Checkin'
11763-
#: frontend/src/views/attendance/AttendanceRequestList.vue:21
11764-
#: frontend/src/views/attendance/EmployeeCheckinList.vue:28
11763+
#: frontend/src/views/attendance/AttendanceRequestList.vue:24
11764+
#: frontend/src/views/attendance/EmployeeCheckinList.vue:31
1176511765
#: hrms/hr/doctype/attendance/attendance.json
1176611766
#: hrms/hr/doctype/attendance_request/attendance_request.json
1176711767
#: hrms/hr/doctype/employee_attendance_tool/employee_attendance_tool.json
@@ -12845,7 +12845,7 @@ msgstr "Zu Betrag"
1284512845
#. Label of the to_date (Date) field in DocType 'Additional Salary'
1284612846
#. Label of the to_date (Date) field in DocType 'Salary Withholding'
1284712847
#. Label of the to_date (Date) field in DocType 'Salary Withholding Cycle'
12848-
#: frontend/src/views/attendance/AttendanceRequestList.vue:25
12848+
#: frontend/src/views/attendance/AttendanceRequestList.vue:28
1284912849
#: frontend/src/views/attendance/ShiftRequestList.vue:58
1285012850
#: hrms/hr/dashboard_chart_source/hiring_vs_attrition_count/hiring_vs_attrition_count.js:22
1285112851
#: hrms/hr/doctype/attendance_request/attendance_request.json

‎hrms/locale/eo.po

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: frappe\n"
44
"Report-Msgid-Bugs-To: [email protected]\n"
5-
"POT-Creation-Date: 2024-11-10 09:33+0000\n"
6-
"PO-Revision-Date: 2024-11-11 18:36\n"
5+
"POT-Creation-Date: 2024-11-24 09:35+0000\n"
6+
"PO-Revision-Date: 2024-11-25 22:09\n"
77
"Last-Translator: [email protected]\n"
88
"Language-Team: Esperanto\n"
99
"MIME-Version: 1.0\n"
@@ -5865,7 +5865,7 @@ msgstr "crwdns141548:0crwdne141548:0"
58655865
#. Label of the from_date (Date) field in DocType 'Salary Structure Assignment'
58665866
#. Label of the from_date (Date) field in DocType 'Salary Withholding'
58675867
#. Label of the from_date (Date) field in DocType 'Salary Withholding Cycle'
5868-
#: frontend/src/views/attendance/AttendanceRequestList.vue:24
5868+
#: frontend/src/views/attendance/AttendanceRequestList.vue:27
58695869
#: frontend/src/views/attendance/ShiftRequestList.vue:57
58705870
#: hrms/hr/dashboard_chart_source/hiring_vs_attrition_count/hiring_vs_attrition_count.js:15
58715871
#: hrms/hr/doctype/attendance_request/attendance_request.json
@@ -8137,7 +8137,7 @@ msgid "Log Out"
81378137
msgstr "crwdns151256:0crwdne151256:0"
81388138

81398139
#. Label of the log_type (Select) field in DocType 'Employee Checkin'
8140-
#: frontend/src/views/attendance/EmployeeCheckinList.vue:22
8140+
#: frontend/src/views/attendance/EmployeeCheckinList.vue:25
81418141
#: hrms/hr/doctype/employee_checkin/employee_checkin.json
81428142
msgid "Log Type"
81438143
msgstr "crwdns141858:0crwdne141858:0"
@@ -11754,8 +11754,8 @@ msgstr "crwdns148500:0{0}crwdne148500:0"
1175411754
#. Label of the shift (Link) field in DocType 'Attendance Request'
1175511755
#. Label of the shift (Link) field in DocType 'Employee Attendance Tool'
1175611756
#. Label of the shift (Link) field in DocType 'Employee Checkin'
11757-
#: frontend/src/views/attendance/AttendanceRequestList.vue:21
11758-
#: frontend/src/views/attendance/EmployeeCheckinList.vue:28
11757+
#: frontend/src/views/attendance/AttendanceRequestList.vue:24
11758+
#: frontend/src/views/attendance/EmployeeCheckinList.vue:31
1175911759
#: hrms/hr/doctype/attendance/attendance.json
1176011760
#: hrms/hr/doctype/attendance_request/attendance_request.json
1176111761
#: hrms/hr/doctype/employee_attendance_tool/employee_attendance_tool.json
@@ -12839,7 +12839,7 @@ msgstr "crwdns142554:0crwdne142554:0"
1283912839
#. Label of the to_date (Date) field in DocType 'Additional Salary'
1284012840
#. Label of the to_date (Date) field in DocType 'Salary Withholding'
1284112841
#. Label of the to_date (Date) field in DocType 'Salary Withholding Cycle'
12842-
#: frontend/src/views/attendance/AttendanceRequestList.vue:25
12842+
#: frontend/src/views/attendance/AttendanceRequestList.vue:28
1284312843
#: frontend/src/views/attendance/ShiftRequestList.vue:58
1284412844
#: hrms/hr/dashboard_chart_source/hiring_vs_attrition_count/hiring_vs_attrition_count.js:22
1284512845
#: hrms/hr/doctype/attendance_request/attendance_request.json

‎hrms/locale/es.po

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: frappe\n"
44
"Report-Msgid-Bugs-To: [email protected]\n"
5-
"POT-Creation-Date: 2024-11-10 09:33+0000\n"
6-
"PO-Revision-Date: 2024-11-16 19:39\n"
5+
"POT-Creation-Date: 2024-11-24 09:35+0000\n"
6+
"PO-Revision-Date: 2024-11-25 22:09\n"
77
"Last-Translator: [email protected]\n"
88
"Language-Team: Spanish\n"
99
"MIME-Version: 1.0\n"
@@ -5865,7 +5865,7 @@ msgstr "Desde Monto"
58655865
#. Label of the from_date (Date) field in DocType 'Salary Structure Assignment'
58665866
#. Label of the from_date (Date) field in DocType 'Salary Withholding'
58675867
#. Label of the from_date (Date) field in DocType 'Salary Withholding Cycle'
5868-
#: frontend/src/views/attendance/AttendanceRequestList.vue:24
5868+
#: frontend/src/views/attendance/AttendanceRequestList.vue:27
58695869
#: frontend/src/views/attendance/ShiftRequestList.vue:57
58705870
#: hrms/hr/dashboard_chart_source/hiring_vs_attrition_count/hiring_vs_attrition_count.js:15
58715871
#: hrms/hr/doctype/attendance_request/attendance_request.json
@@ -8137,7 +8137,7 @@ msgid "Log Out"
81378137
msgstr ""
81388138

81398139
#. Label of the log_type (Select) field in DocType 'Employee Checkin'
8140-
#: frontend/src/views/attendance/EmployeeCheckinList.vue:22
8140+
#: frontend/src/views/attendance/EmployeeCheckinList.vue:25
81418141
#: hrms/hr/doctype/employee_checkin/employee_checkin.json
81428142
msgid "Log Type"
81438143
msgstr "Tipo de registro"
@@ -11754,8 +11754,8 @@ msgstr ""
1175411754
#. Label of the shift (Link) field in DocType 'Attendance Request'
1175511755
#. Label of the shift (Link) field in DocType 'Employee Attendance Tool'
1175611756
#. Label of the shift (Link) field in DocType 'Employee Checkin'
11757-
#: frontend/src/views/attendance/AttendanceRequestList.vue:21
11758-
#: frontend/src/views/attendance/EmployeeCheckinList.vue:28
11757+
#: frontend/src/views/attendance/AttendanceRequestList.vue:24
11758+
#: frontend/src/views/attendance/EmployeeCheckinList.vue:31
1175911759
#: hrms/hr/doctype/attendance/attendance.json
1176011760
#: hrms/hr/doctype/attendance_request/attendance_request.json
1176111761
#: hrms/hr/doctype/employee_attendance_tool/employee_attendance_tool.json
@@ -12839,7 +12839,7 @@ msgstr "Al Monto"
1283912839
#. Label of the to_date (Date) field in DocType 'Additional Salary'
1284012840
#. Label of the to_date (Date) field in DocType 'Salary Withholding'
1284112841
#. Label of the to_date (Date) field in DocType 'Salary Withholding Cycle'
12842-
#: frontend/src/views/attendance/AttendanceRequestList.vue:25
12842+
#: frontend/src/views/attendance/AttendanceRequestList.vue:28
1284312843
#: frontend/src/views/attendance/ShiftRequestList.vue:58
1284412844
#: hrms/hr/dashboard_chart_source/hiring_vs_attrition_count/hiring_vs_attrition_count.js:22
1284512845
#: hrms/hr/doctype/attendance_request/attendance_request.json

0 commit comments

Comments
 (0)