Bug 14946: Remove C4::Dates from acqui/* files

[srvgit] / admin / transport-cost-matrix.pl

diff --git a/admin/transport-cost-matrix.pl b/admin/transport-cost-matrix.pl
index 25d3911..3197306 100755 (executable)
--- a/admin/transport-cost-matrix.pl
+++ b/admin/transport-cost-matrix.pl
@@ -4,22 +4,22 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
 use warnings;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Context;
 use C4::Output;
 use C4::Auth;
@@ -33,7 +33,7 @@ use Data::Dumper;
 my $input = new CGI;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/transport-cost-matrix.tmpl",
+    = get_template_and_user({template_name => "admin/transport-cost-matrix.tt",
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
@@ -82,7 +82,7 @@ foreach my $branchfrom ( @branchloop ) {
                 $from_to_input_def{disabled} = 1;
             }
             else {
-                push @errors, "Invalid value for $from_row{name} -> $from_to_input_def{name}"
+                push @errors, "$from_row{name} -> $from_to_input_def{name}"
                   unless $value =~ /\d/o && $value >= 0.0;
             }
         }
@@ -91,8 +91,12 @@ foreach my $branchfrom ( @branchloop ) {
                 if ( my $cell = $cost_matrix->{$tocode}{$fromcode} ) {
                     $from_to_input_def{value} = $cell->{cost};
                     $from_to_input_def{disabled} = 1 if $cell->{disable_transfer};
+                } else {
+                    # matrix has been previously initialized, but a branch referenced here was created afterward.
+                    $from_to_input_def{disabled} = 1;
                 }
             } else {
+                # First time initializing the matrix
                 $from_to_input_def{disabled} = 1;
             }
         }