From 3ffd74481dda4138452a15139c71db8a2fdf5fc7 Mon Sep 17 00:00:00 2001 From: Andrew Isherwood Date: Mon, 28 Sep 2020 15:42:52 +0100 Subject: [PATCH] Bug 24190: (follow-up) Fix erroneous tabs The QA script was reporting forbidden tabs in some of the lines in this bug, these have now been removed. --- acqui/invoice.pl | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/acqui/invoice.pl b/acqui/invoice.pl index 14ac5e2630..2864fa9bf9 100755 --- a/acqui/invoice.pl +++ b/acqui/invoice.pl @@ -175,19 +175,19 @@ elsif ( $op && $op eq 'mod_adj' ) { my @encumber_open = $input->multi_param('encumber_open'); my %e_open = map { $_ => 1 } @encumber_open; - my @keys = ('adjustment', 'reason', 'budget_id', 'encumber_open'); + my @keys = ('adjustment', 'reason', 'budget_id', 'encumber_open'); for( my $i=0; $i < scalar @adjustment; $i++ ){ if( $adjustment_id[$i] eq 'new' ){ next unless ( $adjustment[$i] || $reason[$i] ); - my $adj = { - invoiceid => $invoiceid, + my $adj = { + invoiceid => $invoiceid, adjustment => $adjustment[$i], reason => $reason[$i], note => $note[$i], budget_id => $budget_id[$i] || undef, encumber_open => defined $e_open{ $adjustment_id[$i] } ? 1 : 0, }; - my $new_adj = Koha::Acquisition::Invoice::Adjustment->new($adj); + my $new_adj = Koha::Acquisition::Invoice::Adjustment->new($adj); $new_adj->store(); # Log this addition if (C4::Context->preference("AcqLog")) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt index 334e9c0e04..a990c12892 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -194,7 +194,7 @@ [% END %] - [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'CHANGE PASS' 'Run' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' 'CANCEL_ORDER' 'CREATE_ORDER' 'MODIFY_ORDER' 'CREATE_INVOICE_ADJUSTMENT' 'UPDATE_INVOICE_ADJUSTMENT' 'DELETE_INVOICE_ADJUSTMENT' 'RECEIVE_ORDER' 'MODIFY_BUDGET' 'MODIFY_FUND' 'CREATE_FUND' 'DELETE_FUND' ] %] + [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'CHANGE PASS' 'Run' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' 'CANCEL_ORDER' 'CREATE_ORDER' 'MODIFY_ORDER' 'CREATE_INVOICE_ADJUSTMENT' 'UPDATE_INVOICE_ADJUSTMENT' 'DELETE_INVOICE_ADJUSTMENT' 'RECEIVE_ORDER' 'MODIFY_BUDGET' 'MODIFY_FUND' 'CREATE_FUND' 'DELETE_FUND' ] %] [% IF actions.grep(actx).size %] [% ELSE %] -- 2.20.1