projects
/
koha_ffzg
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_9440' into 3.12-master
[koha_ffzg]
/
members
/
moremember.pl
diff --git
a/members/moremember.pl
b/members/moremember.pl
index
25ae7e9
..
4ccba00
100755
(executable)
--- a/
members/moremember.pl
+++ b/
members/moremember.pl
@@
-85,7
+85,9
@@
my $quickslip = 0;
my $flagsrequired;
if ($print eq "page") {
$template_name = "members/moremember-print.tmpl";
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
} elsif ($print eq "slip") {
$template_name = "members/moremember-receipt.tmpl";
# circ staff who process checkouts but can't edit
@@
-406,7
+408,6
@@
$template->param( $data->{'categorycode'} => 1 );
$template->param(
detailview => 1,
AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
$template->param(
detailview => 1,
AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
CANDELETEUSER => $candeleteuser,
roaddetails => $roaddetails,
borrowernumber => $borrowernumber,
CANDELETEUSER => $candeleteuser,
roaddetails => $roaddetails,
borrowernumber => $borrowernumber,
@@
-425,8
+426,6
@@
$template->param(
StaffMember => ($category_type eq 'S'),
is_child => ($category_type eq 'C'),
# reserveloop => \@reservedata,
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 ''),
samebranch => $samebranch,
quickslip => $quickslip,
activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
@@
-457,6
+456,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->{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};
my %row = %{$issue};
$totalprice += $issue->{replacementprice};