gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '21.05.x' of git.koha-community.org:Koha-community/Koha into 21.05.x-rmaint

This commit is contained in:
Wainui Witika-Park 2023-01-27 12:37:18 +13:00
parent faef448491 b0437dc643
commit e11ff1de72
12 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C4/Letters.pm
View File

@ -430,7 +430,7 @@ sub SendAlerts {
}
if ( $type eq 'orderacquisition') {
my $basketno = $externalid;
$basketno = $externalid;
$strsth = qq{
SELECT aqorders.*,aqbasket.*,biblio.*,biblioitems.*
FROM aqorders

2
koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
View File

@ -2068,6 +2068,8 @@ li {
}
table {
width: 100%;
td {
vertical-align: top;
}

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
View File

@ -1133,7 +1133,7 @@
// select the corresponding option
$(current_column).find("select option").each(function(){
opt = $(this).text().toLowerCase();
opt = opt.replace(/ \(all\)$/,""); //If option is a parent, compare without (All)
opt = opt.replace(/ \(\w*?\)$/,""); //If option is a parent, compare without (All) or the equivalent in other languages
itm = itm.replace(/.*->(.*)/,"$1"); //If item type is part of a group we need to clear the parent description
opt = opt.replace(/^\s*|\s*$/g,'');
if ( opt == itm.toLowerCase() ) {

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
View File

@ -88,7 +88,7 @@
<ol>
<li>
<label for="smtp_name" class="required">Name: </label>
<input type="text" name="smtp_name" id="smtp_name" size="60" class="required" required="required" />
<input type="text" name="smtp_name" id="smtp_name" size="60" class="required focus" required="required" />
<span class="required">Required</span>
</li>
</ol>

1
koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
View File

@ -367,6 +367,7 @@
<form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
<input type="hidden" name="barcode" value="[% item.barcode | html %]" />
<input type="hidden" name="multiple_confirm" value="1" />
<input type="hidden" name="dropboxmode" value="[% dropboxmode | html %]" />
[% FOREACH inputloo IN inputloop %]
<input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
<input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />

1
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
View File

@ -849,6 +849,7 @@
}
}
$(document).ready(function(){
$('#opac-user-article-requests caption .count').html(AR_CAPTION_COUNT.format('[% current_article_requests.size | html %]'));
$('#opac-user-views').tabs();
$(".modal-nojs").addClass("modal").addClass("hide").removeClass("modal-nojs");
$(".suspend-until").prop("readonly",1);

3
misc/cronjobs/advance_notices.pl
View File

@ -308,6 +308,7 @@ UPCOMINGITEM: foreach my $upcoming ( @$upcoming_dues ) {
## Get branch info for borrowers home library.
foreach my $transport ( keys %{$borrower_preferences->{'transports'}} ) {
next if $transport eq 'itiva';
my $letter = parse_letter( { letter_code => $letter_type,
borrowernumber => $upcoming->{'borrowernumber'},
branchcode => $branchcode,
@ -355,6 +356,7 @@ UPCOMINGITEM: foreach my $upcoming ( @$upcoming_dues ) {
## Get branch info for borrowers home library.
foreach my $transport ( keys %{$borrower_preferences->{'transports'}} ) {
next if $transport eq 'itiva';
my $letter = parse_letter( { letter_code => $letter_type,
borrowernumber => $upcoming->{'borrowernumber'},
branchcode => $branchcode,
@ -602,6 +604,7 @@ sub send_digests {
}
foreach my $transport ( keys %{ $borrower_preferences->{'transports'} } ) {
next if $transport eq 'itiva';
my $letter = parse_letter(
{
letter_code => $params->{letter_code},

1
misc/cronjobs/holds/holds_reminder.pl
View File

@ -256,6 +256,7 @@ foreach my $branchcode (@branchcodes) { #BEGIN BRANCH LOOP
my $reserves = Koha::Holds->search({
waitingdate => {$comparator => $waiting_since },
'me.branchcode' => $branchcode,
'-or' => [ expirationdate => undef, expirationdate => { '>' => \'CURDATE()' } ]
},{ prefetch => 'patron' });
$verbose and warn "No reserves found for $branchcode\n" unless $reserves->count;

1
misc/cronjobs/overdue_notices.pl
View File

@ -707,6 +707,7 @@ END_SQL
my $print_sent = 0; # A print notice is not yet sent for this patron
for my $mtt ( @message_transport_types ) {
next if $mtt eq 'itiva';
my $effective_mtt = $mtt;
if ( ($mtt eq 'email' and not scalar @emails_to_use) or ($mtt eq 'sms' and not $data->{smsalertnumber}) ) {
# email or sms is requested but not exist, do a print.

7
svc/cataloguing/automatic_linker.pl
View File

@ -28,8 +28,11 @@ my $input = CGI->new;
print $input->header('application/json');
# Check the user's permissions
my ( $auth_status, $auth_sessid ) =
C4::Auth::check_cookie_auth( $input->cookie('CGISESSID'), { editauthorities => 1, editcatalogue => 1 } );
my ( $auth_status ) =
C4::Auth::check_cookie_auth( $input->cookie('CGISESSID'), {
editauthorities => 1,
editcatalogue => 'edit_catalogue'
});
if ( $auth_status ne "ok" ) {
print to_json( { status => 'UNAUTHORIZED' } );
exit 0;

4
t/db_dependent/Context.t
View File

@ -53,7 +53,8 @@ $dbh->rollback;
ok($koha = C4::Context->new, 'C4::Context->new');
my @keys = keys %$koha;
my $width = 0;
if (ok(@keys)) {
ok( @keys, 'Expecting entries in context hash' );
if( @keys ) {
$width = (sort {$a <=> $b} map {length} @keys)[-1];
$debug and diag "widest key is $width";
}
@ -66,7 +67,6 @@ foreach (sort @keys) {
ok($config = $koha->{config}, 'Getting $koha->{config} ');
# Testing syspref caching
use Test::DBIx::Class;
my $schema = Koha::Database->new()->schema();
$schema->storage->debug(1);

6
t/db_dependent/Letters.t
View File

@ -388,7 +388,7 @@ $prepared_letter = GetPreparedLetter((
is( $prepared_letter->{content}, q|And also this one:| . output_pref({ dt => $yesterday_night }) . q|.|, 'dateonly test 3' );
$dbh->do(q{INSERT INTO letter (module, code, name, title, content) VALUES ('claimacquisition','TESTACQCLAIM','Acquisition Claim','Item Not Received','<<aqbooksellers.name>>|<<aqcontacts.name>>|<order>Ordernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered)</order>');});
$dbh->do(q{INSERT INTO letter (module, code, name, title, content) VALUES ('orderacquisition','TESTACQORDER','Acquisition Order','Order','<<aqbooksellers.name>>|<<aqcontacts.name>>|<order>Ordernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered)</order>');});
$dbh->do(q{INSERT INTO letter (module, code, name, title, content) VALUES ('orderacquisition','TESTACQORDER','Acquisition Order','Order','<<aqbooksellers.name>>|<<aqcontacts.name>>|<order>Ordernumber <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> ordered)</order> Basket name: [% basket.basketname %]');});
# Test that _parseletter doesn't modify its parameters bug 15429
{
@ -425,7 +425,7 @@ my $booksellerid = $bookseller->id;
Koha::Acquisition::Bookseller::Contact->new( { name => 'John Smith', phone => '0123456x1', claimacquisition => 1, orderacquisition => 1, booksellerid => $booksellerid } )->store;
Koha::Acquisition::Bookseller::Contact->new( { name => 'Leo Tolstoy', phone => '0123456x2', claimissues => 1, booksellerid => $booksellerid } )->store;
my $basketno = NewBasket($booksellerid, 1);
my $basketno = NewBasket($booksellerid, 1, 'The basket name');
my $budgetid = C4::Budgets::AddBudget({
budget_code => "budget_code_test_letters",
@ -490,7 +490,7 @@ warning_like {
"SendAlerts is using the mocked send_or_die routine (orderacquisition)";
is($err, 1, "Successfully sent order.");
is($email_object->email->header('To'), 'testemail@mydomain.com', "mailto correct in sent order");
is($email_object->email->body, 'my vendor|John Smith|Ordernumber ' . $ordernumber . ' (Silence in the library) (1 ordered)', 'Order notice text constructed successfully');
is($email_object->email->body, 'my vendor|John Smith|Ordernumber ' . $ordernumber . ' (Silence in the library) (1 ordered) Basket name: The basket name', 'Order notice text constructed successfully');
my $mocked_koha_email = Test::MockModule->new('Koha::Email');
$mocked_koha_email->mock( 'send_or_die', sub {