Merge master

2026-01-07 11:11:13 +05:30
parent 70bc068660
commit 2fb65ec066
2 changed files with 2 additions and 11 deletions
--- a/base/forms.py
+++ b/base/forms.py
@@ -1439,16 +1439,7 @@ class EmployeeShiftScheduleForm(ModelForm):
        """

        model = EmployeeShiftSchedule
-        fields = [
-            "shift_id",
-            "minimum_working_hour",
-            "start_time",
-            "end_time",
-            "is_auto_punch_out_enabled",
-            "auto_punch_out_time",
-            "company_id",
-            "day",
-        ]
+        fields = "__all__"
        exclude = ["is_active", "day", "is_night_shift"]
        widgets = {
            "start_time": forms.TimeInput(),
--- a/employee/templates/tabs/personal_tab.html
+++ b/employee/templates/tabs/personal_tab.html
@@ -23,7 +23,7 @@
 							<ion-icon name="transgender-outline"></ion-icon>
 							<span>{% trans "Gender" %}</span>
 						</span>
-						<span class="oh-profile__info-value">{% trans employee.get_gender_display %}</span>
+						<span class="oh-profile__info-value">{{employee.get_gender_display}}</span>
 					</li>

 					<li class="oh-profile__card-info-item">