projects
/
koha_fer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 11764 - Move repeatedly redefined function toUC() into staff-global.js
[koha_fer]
/
tools
/
letter.pl
diff --git
a/tools/letter.pl
b/tools/letter.pl
index
44f21ab
..
7582e66
100755
(executable)
--- a/
tools/letter.pl
+++ b/
tools/letter.pl
@@
-106,7
+106,7
@@
our ( $template, $borrowernumber, $cookie, $staffflags ) = get_template_and_user
}
);
}
);
-our $my_branch = C4::Context->preference("Independ
a
ntBranches") && !$staffflags->{'superlibrarian'}
+our $my_branch = C4::Context->preference("Independ
e
ntBranches") && !$staffflags->{'superlibrarian'}
? C4::Context->userenv()->{'branch'}
: undef;
# we show only the TMPL_VAR names $op
? C4::Context->userenv()->{'branch'}
: undef;
# we show only the TMPL_VAR names $op
@@
-115,6
+115,7
@@
$template->param(
independant_branch => $my_branch,
script_name => $script_name,
searchfield => $searchfield,
independant_branch => $my_branch,
script_name => $script_name,
searchfield => $searchfield,
+ branchcode => $branchcode,
action => $script_name
);
action => $script_name
);
@@
-194,11
+195,19
@@
sub add_form {
}
else {
push @{$field_selection}, add_fields('biblio','biblioitems'),
}
else {
push @{$field_selection}, add_fields('biblio','biblioitems'),
-
{value => q{}, text => '---ITEMS---' }
,
+
add_fields('items')
,
{value => 'items.content', text => 'items.content'},
{value => 'items.content', text => 'items.content'},
- add_fields('issues','borrowers');
+ {value => 'items.fine', text => 'items.fine'},
+ add_fields('borrowers');
if ($module eq 'circulation') {
push @{$field_selection}, add_fields('opac_news');
if ($module eq 'circulation') {
push @{$field_selection}, add_fields('opac_news');
+
+ }
+
+ if ( $module eq 'circulation' && $code eq "CHECKIN" ) {
+ push @{$field_selection}, add_fields('old_issues');
+ } else {
+ push @{$field_selection}, add_fields('issues');
}
}
}
}