X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fmaninvoice.pl;h=4bf294a770ee78adee31737bff711117bf6914a5;hb=5d6c092921919526ade501facb1220f8a108a08f;hp=50595adab3af80583cacab47d39697d5d4b95d16;hpb=f098258e8cf2d616c6bbc35e44c6a1df47be8517;p=koha_fer

diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index 50595adab3..4bf294a770 100755
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -32,8 +32,10 @@ use C4::Members;
 use C4::Accounts;
 use C4::Items;
 use C4::Branch;
+use C4::Members::Attributes qw(GetBorrowerAttributes);
 
 my $input=new CGI;
+my $flagsrequired = { borrowers => 1 };
 
 my $borrowernumber=$input->param('borrowernumber');
 
@@ -42,32 +44,38 @@ my $borrowernumber=$input->param('borrowernumber');
 my $data=GetMember('borrowernumber'=>$borrowernumber);
 my $add=$input->param('add');
 if ($add){
-#  print $input->header;
-    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');
-    my $error=manualinvoice($borrowernumber,$itemnum,$desc,$type,$amount);
-	if ($error){
-		my ($template, $loggedinuser, $cookie)
-		  = get_template_and_user({template_name => "members/maninvoice.tmpl",
-					query => $input,
-					type => "intranet",
-					authnotrequired => 0,
-					flagsrequired => {borrowers => 1},
-					debug => 1,
-					});
-		if ($error =~ /FOREIGN KEY/ && $error =~ /itemnumber/){
-			$template->param('ITEMNUMBER' => 1);
-		}
-		$template->param('ERROR' => $error);
-        output_html_with_http_headers $input, $cookie, $template->output;
-	}
-	else {
-		print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
-		exit;
-	}
+    if ( checkauth( $input, 0, $flagsrequired, 'intranet' ) ) {
+        #  print $input->header;
+        my $barcode=$input->param('barcode');
+        my $itemnum;
+        if ($barcode) {
+            $itemnum = GetItemnumberFromBarcode($barcode);
+        }
+        my $desc=$input->param('desc');
+        my $amount=$input->param('amount');
+        my $type=$input->param('type');
+        my $note    = $input->param('note');
+        my $error   = manualinvoice( $borrowernumber, $itemnum, $desc, $type, $amount, $note );
+        if ($error) {
+            my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+                {   template_name   => "members/maninvoice.tmpl",
+                    query           => $input,
+                    type            => "intranet",
+                    authnotrequired => 0,
+                    flagsrequired   => $flagsrequired,
+                    debug           => 1,
+                }
+            );
+            if ( $error =~ /FOREIGN KEY/ && $error =~ /itemnumber/ ) {
+                $template->param( 'ITEMNUMBER' => 1 );
+            }
+            $template->param( 'ERROR' => $error );
+            output_html_with_http_headers $input, $cookie, $template->output;
+        } else {
+            print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
+            exit;
+        }
+    }
 } else {
 
 	my ($template, $loggedinuser, $cookie)
@@ -75,7 +83,7 @@ if ($add){
 					query => $input,
 					type => "intranet",
 					authnotrequired => 0,
-					flagsrequired => {borrowers => 1, updatecharges => 1},
+                                      flagsrequired => {borrowers => 1, updatecharges => 'remaining_permissions'},
 					debug => 1,
 					});
 					
@@ -97,9 +105,16 @@ 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);
+    $template->param(
+        ExtendedPatronAttributes => 1,
+        extendedattributes => $attributes
+    );
+}
 	$template->param(
                 borrowernumber => $borrowernumber,
 		firstname => $data->{'firstname'},
@@ -111,6 +126,7 @@ if ($add){
 		address => $data->{'address'},
 		address2 => $data->{'address2'},
 		city => $data->{'city'},
+		state => $data->{'state'},
 		zipcode => $data->{'zipcode'},
 		country => $data->{'country'},
 		phone => $data->{'phone'},
@@ -118,6 +134,8 @@ if ($add){
 		branchcode => $data->{'branchcode'},
 		branchname => GetBranchName($data->{'branchcode'}),
 		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;
 }