nestict/ihrm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[UPDT] BASE: Updated get_horilla_model_class call from base models

Browse Source
This commit is contained in:
Horilla
2024-10-22 11:18:01 +05:30
parent 2c5f3e300f
commit 992de654e5
5 changed files with 5 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
base/models.py
View File

@@ -1728,7 +1728,7 @@ def create_deduction_cutleave_from_penalty(sender, instance, created, **kwargs):
if created: if created:
penalty_amount = instance.penalty_amount penalty_amount = instance.penalty_amount
if apps.is_installed("payroll") and penalty_amount: if apps.is_installed("payroll") and penalty_amount:
Deduction = get_horilla_model_class(app_label="payroll", model="Deduction") Deduction = get_horilla_model_class(app_label="payroll", model="deduction")
penalty = Deduction() penalty = Deduction()
if instance.late_early_id: if instance.late_early_id:
penalty.title = f"{instance.late_early_id.get_type_display()} penalty" penalty.title = f"{instance.late_early_id.get_type_display()} penalty"

2
base/templates/base/navbar_components/breadcrumbs_view.html
View File

@@ -20,4 +20,4 @@
</li> </li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</ul> </ul>

2
base/templates/base/navbar_components/company_selection.html
View File

@@ -25,4 +25,4 @@
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>

4
base/templates/base/navbar_components/language_settings.html
View File

@@ -15,7 +15,7 @@
onclick="event.preventDefault(); document.getElementById('language-form-{{ language.0 }}').submit();"> onclick="event.preventDefault(); document.getElementById('language-form-{{ language.0 }}').submit();">
<img src="{% static 'images/ui/' %}{{ language.0 }}.png" class="oh-dropdown__lang-icon" />{{ language.1 }} <img src="{% static 'images/ui/' %}{{ language.0 }}.png" class="oh-dropdown__lang-icon" />{{ language.1 }}
{% if language.0 == LANGUAGE_CODE %} {% if language.0 == LANGUAGE_CODE %}
<ion-icon name="checkmark-circle-outline" <ion-icon name="checkmark-circle-outline"
style="position: relative; top: 3.3px; color: green; font-size: 1.2em;"> style="position: relative; top: 3.3px; color: green; font-size: 1.2em;">
</ion-icon> </ion-icon>
{% endif %} {% endif %}
@@ -29,4 +29,4 @@
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>

45
load_data/recruitment_data.json
View File

@@ -77,51 +77,6 @@
"skills": [] "skills": []
} }
}, },
{
"model": "recruitment.stage",
"pk": 1,
"fields": {
"created_at": "2024-05-22T08:48:40.159Z",
"created_by": 1,
"modified_by": 1,
"is_active": true,
"recruitment_id": 1,
"stage": "Initial",
"stage_type": "initial",
"sequence": 0,
"stage_managers": []
}
},
{
"model": "recruitment.stage",
"pk": 2,
"fields": {
"created_at": "2024-05-22T08:55:43.916Z",
"created_by": 1,
"modified_by": 1,
"is_active": true,
"recruitment_id": 2,
"stage": "Initial",
"stage_type": "initial",
"sequence": 0,
"stage_managers": []
}
},
{
"model": "recruitment.stage",
"pk": 3,
"fields": {
"created_at": "2024-05-22T09:03:26.902Z",
"created_by": 1,
"modified_by": 1,
"is_active": true,
"recruitment_id": 3,
"stage": "Initial",
"stage_type": "initial",
"sequence": 0,
"stage_managers": []
}
},
{ {
"model": "recruitment.stage", "model": "recruitment.stage",
"pk": 4, "pk": 4,