Merge remote branch 'kc/new/enh/bug_5462' into kcmaster

[koha_gimpoz] / members / maninvoice.pl

diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index 6e3f225..df12a2a 100755 (executable)
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-#wrriten 11/1/2000 by chris@katipo.oc.nz
+#written 11/1/2000 by chris@katipo.oc.nz
 #script to display borrowers account details
 
 
@@ -17,27 +17,33 @@
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# 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.
 
 use strict;
+use warnings;
+
 use C4::Auth;
 use C4::Output;
 use CGI;
 use C4::Members;
 use C4::Accounts;
+use C4::Items;
+use C4::Branch;
 
 my $input=new CGI;
 
 my $borrowernumber=$input->param('borrowernumber');
 
+
 # get borrower details
-my $data=GetMember($borrowernumber,'borrowernumber');
+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');
@@ -68,10 +74,20 @@ if ($add){
                                        query => $input,
                                        type => "intranet",
                                        authnotrequired => 0,
-                                       flagsrequired => {borrowers => 1},
+                                       flagsrequired => {borrowers => 1, updatecharges => 1},
                                        debug => 1,
                                        });
                                        
+  # get authorised values with type of MANUAL_INV
+  my @invoice_types;
+  my $dbh = C4::Context->dbh;
+  my $sth = $dbh->prepare('SELECT * FROM authorised_values WHERE category = "MANUAL_INV"');
+  $sth->execute();
+  while ( my $row = $sth->fetchrow_hashref() ) {
+    push @invoice_types, $row;
+  }
+  $template->param( invoice_types_loop => \@invoice_types );
+
     if ( $data->{'category_type'} eq 'C') {
         my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
         my $cnt = scalar(@$catcodes);
@@ -84,20 +100,23 @@ if ($add){
     $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'},
-                                       is_child        => ($data->{'category_type'} eq 'C'),
+                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'},
+               country => $data->{'country'},
+               phone => $data->{'phone'},
+               email => $data->{'email'},
+               branchcode => $data->{'branchcode'},
+               branchname => GetBranchName($data->{'branchcode'}),
+               is_child        => ($data->{'category_type'} eq 'C'),
     );
     output_html_with_http_headers $input, $cookie, $template->output;
 }