diff --git a/payroll/models/models.py b/payroll/models/models.py index 25e2dc5c5..cc9d95ca7 100644 --- a/payroll/models/models.py +++ b/payroll/models/models.py @@ -113,6 +113,9 @@ class FilingStatus(HorillaModel): def __str__(self) -> str: return str(self.filing_status) + class Meta: + ordering = ["-id"] + class Contract(HorillaModel): """ diff --git a/payroll/static/payroll/action.js b/payroll/static/payroll/action.js index 2aaba1803..b31536fee 100644 --- a/payroll/static/payroll/action.js +++ b/payroll/static/payroll/action.js @@ -22,11 +22,11 @@ var deleteContractMessages = { fr: "Voulez-vous vraiment supprimer tous les contrats sélectionnés?", }; -var noRowMessages = { +var noRowPayrollMessages = { ar: "لم يتم تحديد أي صفوف.", de: "Es wurden keine Zeilen ausgewählt.", es: "No se han seleccionado filas.", - en: "No rows have been selected.", + en: "No rows have been selected to delete.", fr: "Aucune ligne n'a été sélectionnée.", }; @@ -291,7 +291,7 @@ function exportPayslips() { getCurrentLanguageCode(function (code) { languageCode = code; var confirmMessage = excelMessages[languageCode]; - var textMessage = noRowMessages[languageCode]; + var textMessage = noRowPayrollMessages[languageCode]; if (ids.length === 0) { Swal.fire({ text: textMessage, @@ -346,7 +346,7 @@ $("#deletePayslipBulk").click(function (e) { getCurrentLanguageCode(function (code) { languageCode = code; var confirmMessage = deletePayslipMessages[languageCode]; - var textMessage = noRowMessages[languageCode]; + var textMessage = noRowPayrollMessages[languageCode]; var checkedRows = $(".payslip-checkbox").filter(":checked"); ids = []; ids.push($("#selectedPayslip").attr("data-ids")); @@ -590,7 +590,7 @@ function exportContractRequest() { getCurrentLanguageCode(function (code) { languageCode = code; var confirmMessage = excelMessages[languageCode]; - var textMessage = noRowMessages[languageCode]; + var textMessage = noRowPayrollMessages[languageCode]; if (ids.length === 0) { Swal.fire({ text: textMessage, @@ -645,7 +645,7 @@ $("#DeleteContractBulk").click(function (e) { getCurrentLanguageCode(function (code) { languageCode = code; var confirmMessage = deleteContractMessages[languageCode]; - var textMessage = noRowMessages[languageCode]; + var textMessage = noRowPayrollMessages[languageCode]; ids = []; ids.push($("#selectedInstances").attr("data-ids")); ids = JSON.parse($("#selectedInstances").attr("data-ids")); diff --git a/payroll/templates/payroll/contract/contract_view.html b/payroll/templates/payroll/contract/contract_view.html index 7f02c7f3e..12572e920 100644 --- a/payroll/templates/payroll/contract/contract_view.html +++ b/payroll/templates/payroll/contract/contract_view.html @@ -158,11 +158,7 @@ {% endif %} {% if perms.contract.delete_contract %}
  • - {% trans "Delete" %} + {% trans "Delete" %}
  • {% endif %} diff --git a/payroll/templates/payroll/payslip/view_payslips.html b/payroll/templates/payroll/payslip/view_payslips.html index 829c2592c..80c992918 100644 --- a/payroll/templates/payroll/payslip/view_payslips.html +++ b/payroll/templates/payroll/payslip/view_payslips.html @@ -248,6 +248,7 @@
  • {% trans "Delete" %}