Bug 9605: rotating collections permissions are wrong

[koha_fer] / members / moremember.pl

diff --git a/members/moremember.pl b/members/moremember.pl
index 8f529f3..e6f80dd 100755 (executable)
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -47,7 +47,6 @@ use C4::Circulation;
 use C4::Koha;
 use C4::Letters;
 use C4::Biblio;
-use C4::Reserves;
 use C4::Branch; # GetBranchName
 use C4::Overdues qw/CheckBorrowerDebarred/;
 use C4::Form::MessagingPreferences;
@@ -85,7 +84,9 @@ my $quickslip = 0;
 my $flagsrequired;
 if ($print eq "page") {
     $template_name = "members/moremember-print.tmpl";
-    $flagsrequired = { borrowers => 1 };
+    # circ staff who process checkouts but can't edit
+    # patrons still need to be able to access print view
+    $flagsrequired = { circulate => "circulate_remaining_permissions" };
 } elsif ($print eq "slip") {
     $template_name = "members/moremember-receipt.tmpl";
     # circ staff who process checkouts but can't edit
@@ -117,7 +118,6 @@ my $borrowernumber = $input->param('borrowernumber');
 
 #start the page and read in includes
 my $data           = GetMember( 'borrowernumber' => $borrowernumber );
-my $reregistration = $input->param('reregistration');
 
 if ( not defined $data ) {
     $template->param (unknowuser => 1);
@@ -125,11 +125,6 @@ if ( not defined $data ) {
     exit;
 }
 
-# re-reregistration function to automatic calcul of date expiry
-if ( $reregistration eq 'y' ) {
-       $data->{'dateexpiry'} = ExtendMemberSubscriptionTo( $borrowernumber );
-}
-
 my $category_type = $data->{'category_type'};
 
 ### $category_type
@@ -251,7 +246,7 @@ if ( @borrowernumbers ) {
 }
 my $roaddetails = &GetRoadTypeDetails( $data->{'streettype'} );
 my $today       = DateTime->now( time_zone => C4::Context->tz);
-$today->truncate(to => 'days');
+$today->truncate(to => 'day');
 my @borrowers_with_issues;
 my $overdues_exist = 0;
 my $totalprice = 0;
@@ -406,13 +401,12 @@ $template->param( $data->{'categorycode'} => 1 );
 $template->param(
     detailview => 1,
     AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
     CANDELETEUSER    => $candeleteuser,
     roaddetails     => $roaddetails,
     borrowernumber  => $borrowernumber,
     othernames      => $data->{'othernames'},
     categoryname    => $data->{'description'},
-    reregistration  => $reregistration,
+    was_renewed     => $input->param('was_renewed') ? 1 : 0,
     branch          => $branch,
     todaysdate      => C4::Dates->today(),
     totalprice      => sprintf("%.2f", $totalprice),
@@ -425,8 +419,6 @@ $template->param(
     StaffMember     => ($category_type eq 'S'),
     is_child        => ($category_type eq 'C'),
 #   reserveloop     => \@reservedata,
-    dateformat      => C4::Context->preference("dateformat"),
-    "dateformat_" . (C4::Context->preference("dateformat") || '') => 1,
     samebranch     => $samebranch,
     quickslip            => $quickslip,
     activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
@@ -457,6 +449,7 @@ sub build_issue_data {
         $issue->{date_due}  = output_pref( $issue->{date_due} );
         $issue->{issuedate} = output_pref( $issue->{issuedate} ) if defined $issue->{issuedate};
         my $biblionumber = $issue->{biblionumber};
+        $issue->{issuingbranchname} = GetBranchName($issue->{branchcode});
         my %row          = %{$issue};
         $totalprice += $issue->{replacementprice};
 
@@ -494,7 +487,7 @@ sub build_issue_data {
             $row{red} = 1;
         }
         if ($issuedate) {
-            $issuedate->truncate( to => 'days' );
+            $issuedate->truncate( to => 'day' );
             if ( DateTime->compare( $issuedate, $today ) == 0 ) {
                 $row{today} = 1;
             }