Attachment 112513 Details for Bug 24190 – Bug 24190: (follow-up) Fix erroneous tabs

[patch] Bug 24190: (follow-up) Fix erroneous tabs

Bug-24190-follow-up-Fix-erroneous-tabs.patch (text/plain), 3.67 KB, created by Andrew Isherwood on 2020-10-26 11:47:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Isherwood

Created: 2020-10-26 11:47:11 UTC

Size: 3.67 KB

patch

obsolete

>From 3c938b15355d5afc6eda15d07e6912d0056e7d99 Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>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 32d9d607fa..12a1047174 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 @@
>                                         <label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>
>                                     [% 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 %]
>                                             <label for="action[% actx | html %]" class="viewlog"><input type="checkbox" id="action[% actx | html %]" name="actions" value="[% actx | html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>
>                                         [% ELSE %]
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 24190: 96364 | 96369 | 100243 | 105082 | 105083 | 106096 | 106097 | 106098 | 106099 | 111080 | 111081 | 111082 | 111083 | 111084 | 112509 | 112510 | 112511 | 112512 | 112513 | 112514 | 116148 | 116149 | 116150 | 116151 | 116152 | 116153 | 122040 | 122041 | 122042 | 122043 | 122044 | 122045 | 123385 | 123386 | 123387 | 123388 | 123389 | 123390 | 123391 | 125119