Compare commits

...

2 Commits

Author SHA1 Message Date
b63b4c6714 Merge branch 'hotfix/fix_expenditures_approve' 2025-05-16 17:18:27 +02:00
595c684e23 fix_expenditures_approve 2025-05-16 17:18:18 +02:00
2 changed files with 3 additions and 3 deletions

View File

@@ -31,10 +31,10 @@ async function onListClicked(id) {
if (exp.approved == 0 && (exp.direction < 0) == (exp.canceled == 0)) { if (exp.approved == 0 && (exp.direction < 0) == (exp.canceled == 0)) {
$('#menu-item-approve').show(); $('#menu-item-approve').show();
$('#menu-item-approve').attr('onclick', 'expenditureAction("approve", ' + exp['id'] + ', "' + (exp.canceled == 1 ? 'Stornierung' : 'Ausgabe') + ' genehmigt")'); $('#menu-item-approve').attr('onclick', 'expenditureAction("approve", ' + exp['id'] + ', "' + (exp.canceled == 1 ? 'Stornierung' : 'Ausgabe') + ' genehmigt")');
$('#menu-item-approve').text(exp.canceled == 1 ? 'Storno akzeptieren' : 'Akzeptieren'); $('#menu-item-approve').find('span').text(exp.canceled == 1 ? 'Storno akzeptieren' : 'Akzeptieren');
$('#menu-item-decline').show(); $('#menu-item-decline').show();
$('#menu-item-decline').attr('onclick', 'expenditureAction("decline", ' + exp['id'] + ', "Ausgabe ' + (exp.canceled == 1 ? 'erneut angefragt' : 'abgelehnt') + '")'); $('#menu-item-decline').attr('onclick', 'expenditureAction("decline", ' + exp['id'] + ', "Ausgabe ' + (exp.canceled == 1 ? 'erneut angefragt' : 'abgelehnt') + '")');
$('#menu-item-decline').text(exp.canceled == 1 ? 'Erneut anfragen' : 'Ablehnen'); $('#menu-item-decline').find('span').text(exp.canceled == 1 ? 'Erneut anfragen' : 'Ablehnen');
} else { } else {
$('#menu-item-approve').hide(); $('#menu-item-approve').hide();
$('#menu-item-decline').hide(); $('#menu-item-decline').hide();

View File

@@ -1,5 +1,5 @@
<?php <?php
define('PWA_VERSION', '1.13h5'); define('PWA_VERSION', '1.13h6');
?> ?>