(bug #4043) fix checkoverdues sqlquery

[koha.git] / members / maninvoice.pl

diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index 18371aa..4ad2067 100755 (executable)
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -27,6 +27,8 @@ use C4::Output;
 use CGI;
 use C4::Members;
 use C4::Accounts;
+use C4::Items;
+use C4::Branch;
 
 my $input=new CGI;
 
@@ -37,7 +39,8 @@ my $data=GetMember($borrowernumber,'borrowernumber');
 my $add=$input->param('add');
 if ($add){
 #  print $input->header;
-    my $itemnum=$input->param('itemnum');
+    my $barcode=$input->param('barcode');
+       my $itemnum = GetItemnumberFromBarcode($barcode) if $barcode;
     my $desc=$input->param('desc');
     my $amount=$input->param('amount');
     my $type=$input->param('type');
@@ -55,10 +58,7 @@ if ($add){
                        $template->param('ITEMNUMBER' => 1);
                }
                $template->param('ERROR' => $error);
-               print $input->header(
-                       -type => 'utf-8',
-                       -cookie => $cookie
-               ),$template->output;
+        output_html_with_http_headers $input, $cookie, $template->output;
        }
        else {
                print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
@@ -71,31 +71,38 @@ if ($add){
                                        query => $input,
                                        type => "intranet",
                                        authnotrequired => 0,
-                                       flagsrequired => {borrowers => 1},
+                                       flagsrequired => {borrowers => 1, updatecharges => 1},
                                        debug => 1,
                                        });
+                                       
+    if ( $data->{'category_type'} eq 'C') {
+        my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
+        my $cnt = scalar(@$catcodes);
+        $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
+        $template->param( 'catcode' =>    $catcodes->[0])  if $cnt == 1;
+    }
 
-$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
-my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
-$template->param( picture => 1 ) if $picture;
+    $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
+    my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+    $template->param( picture => 1 ) if $picture;
 
        $template->param(
-                    borrowernumber => $borrowernumber,
-                    firstname => $data->{'firstname'},
-                    surname  => $data->{'surname'},
-                                       cardnumber => $data->{'cardnumber'},
-                                   categorycode => $data->{'categorycode'},
-                               category_type => $data->{'category_type'},
-                                   category_description => $data->{'description'},
-                                   address => $data->{'address'},
-                                       address2 => $data->{'address2'},
-                                   city => $data->{'city'},
-                                       zipcode => $data->{'zipcode'},
-                                       phone => $data->{'phone'},
-                                       email => $data->{'email'},
+                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'},
+               zipcode => $data->{'zipcode'},
+               phone => $data->{'phone'},
+               email => $data->{'email'},
+               branchcode => $data->{'branchcode'},
+               branchname => GetBranchName($data->{'branchcode'}),
+               is_child        => ($data->{'category_type'} eq 'C'),
     );
-    print $input->header(
-           -type => 'utf-8',
-           -cookie => $cookie
-    ),$template->output;
+    output_html_with_http_headers $input, $cookie, $template->output;
 }