X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fmaninvoice.pl;h=164b83309f7bd84c995582ec1d32bb018fbddae2;hb=9b8d7168beb27342c4c483a0812e3a6789fabced;hp=633153530e49b7b30f1a8528c394624dfd40c1cc;hpb=f7644ec91f2d151535f8f5125c4057a9213d766e;p=koha.git

diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index 633153530e..164b83309f 100755
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -9,25 +9,25 @@
 #
 # 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 C4::Auth;
 use C4::Output;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Members;
 use C4::Accounts;
 use C4::Items;
@@ -58,7 +58,7 @@ if ($add){
         my $error   = manualinvoice( $borrowernumber, $itemnum, $desc, $type, $amount, $note );
         if ($error) {
             my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-                {   template_name   => "members/maninvoice.tmpl",
+                {   template_name   => "members/maninvoice.tt",
                     query           => $input,
                     type            => "intranet",
                     authnotrequired => 0,
@@ -78,14 +78,15 @@ if ($add){
     }
 } else {
 
-	my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "members/maninvoice.tmpl",
-					query => $input,
-					type => "intranet",
-					authnotrequired => 0,
-					flagsrequired => {borrowers => 1, updatecharges => 1},
-					debug => 1,
-					});
+    my ($template, $loggedinuser, $cookie) = get_template_and_user({
+        template_name   => "members/maninvoice.tt",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { borrowers => 1,
+                             updatecharges => 'remaining_permissions' },
+        debug           => 1,
+    });
 					
   # get authorised values with type of MANUAL_INV
   my @invoice_types;
@@ -105,36 +106,27 @@ if ($add){
     }
 
     $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
-    my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+    my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
     $template->param( picture => 1 ) if $picture;
 
-if (C4::Context->preference('ExtendedPatronAttributes')) {
-    my $attributes = GetBorrowerAttributes($borrowernumber);
+    if (C4::Context->preference('ExtendedPatronAttributes')) {
+        my $attributes = GetBorrowerAttributes($borrowernumber);
+        $template->param(
+            ExtendedPatronAttributes => 1,
+            extendedattributes => $attributes
+        );
+    }
+
+    my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
+    $template->param(%$data);
     $template->param(
-        ExtendedPatronAttributes => 1,
-        extendedattributes => $attributes
-    );
-}
-	$template->param(
-                borrowernumber => $borrowernumber,
-		firstname => $data->{'firstname'},
-                surname  => $data->{'surname'},
-		cardnumber => $data->{'cardnumber'},
-		categorycode => $data->{'categorycode'},
-		category_type => $data->{'category_type'},
-		categoryname  => $data->{'description'},
-		address => $data->{'address'},
-		address2 => $data->{'address2'},
-		city => $data->{'city'},
-		state => $data->{'state'},
-		zipcode => $data->{'zipcode'},
-		country => $data->{'country'},
-		phone => $data->{'phone'},
-		email => $data->{'email'},
-		branchcode => $data->{'branchcode'},
-		branchname => GetBranchName($data->{'branchcode'}),
-		is_child        => ($data->{'category_type'} eq 'C'),
-		activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
+        finesview      => 1,
+        borrowernumber => $borrowernumber,
+        categoryname   => $data->{'description'},
+        branchname     => GetBranchName($data->{'branchcode'}),
+        roadtype       => $roadtype,
+        is_child       => ($data->{'category_type'} eq 'C'),
+        activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
         RoutingSerials => C4::Context->preference('RoutingSerials'),
     );
     output_html_with_http_headers $input, $cookie, $template->output;