Bug 14870: (followup) Remove stray C4::Dates
(See comment #23) This patch removes stray C4::Dates (date_fromat...) from C4/Items.pm C4/Log.pm C4/Serials.pm serials/acqui-search-result.pl t/DateUtils.t t/db_dependent/Items/GetItemsForInventory.t tools/koha-news.pl Some of them were inside comments etc. To test: - git grep 'C4::Dates' should give no result - git grep 'format_d' should give no result Exception: in one cron job there exists an own sub format_date, and occurences not related to C4::Dates - Search for regressions http://bugs.koha-community.org/show_bug.cgi?id=14870 Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> serials/acqui-search-results.pl looks like it should be revisited, containing code that might not be needed. Searching a vendor in serials still works witout a problem. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
parent
3854be91ba
commit
e8b2f04638
|
|
@ -1101,7 +1101,7 @@ sub GetItemsForInventory {
|
|||
}
|
||||
|
||||
if ($datelastseen) {
|
||||
$datelastseen = format_date_in_iso($datelastseen);
|
||||
$datelastseen = output_pref({ str => $datelastseen, dateformat => 'iso', dateonly => 1 });
|
||||
push @where_strings, '(datelastseen < ? OR datelastseen IS NULL)';
|
||||
push @bind_params, $datelastseen;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ sub displaylog {
|
|||
while (my $data = $sth->fetchrow_hashref){
|
||||
$data->{hilighted} = ($hilighted>0);
|
||||
$data->{info} =~ s/\n/<br\/>/g;
|
||||
$data->{day} = format_date($data->{timestamp});
|
||||
$data->{day} = output_pref({ str => $data->{timestamp} });
|
||||
push @results, $data;
|
||||
$count++;
|
||||
$hilighted = -$hilighted;
|
||||
|
|
|
|||
|
|
@ -863,7 +863,7 @@ $subscription is a hashref containing all the attributes of the table
|
|||
'subscription'.
|
||||
$pattern is a hashref containing all the attributes of the table
|
||||
'subscription_numberpatterns'.
|
||||
$planneddate is a C4::Dates object.
|
||||
$planneddate is a date sting in iso format.
|
||||
This function get the next issue for the subscription given on input arg
|
||||
|
||||
=cut
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ use C4::Biblio;
|
|||
use C4::Output;
|
||||
use CGI qw ( -utf8 );
|
||||
use C4::Acquisition qw( SearchOrders );
|
||||
use C4::Dates qw/format_date/;
|
||||
use Koha::DateUtils;
|
||||
|
||||
use Koha::Acquisition::Bookseller;
|
||||
|
||||
|
|
@ -79,8 +79,8 @@ for my $s (@suppliers) {
|
|||
basketno => $ord->{'basketno'},
|
||||
total => $ord->{'count(*)'},
|
||||
authorisedby => $ord->{'authorisedby'},
|
||||
creationdate => format_date($ord->{'creationdate'}),
|
||||
closedate => format_date($ord->{'closedate'}),
|
||||
creationdate => output_pref( { str => $ord->{'creationdate'} } ),
|
||||
closedate => output_pref( { str => $ord->{'closedate'} } ),
|
||||
};
|
||||
}
|
||||
push @{$loop_suppliers}, {
|
||||
|
|
|
|||
|
|
@ -91,8 +91,6 @@ cmp_ok( $new_dt->ymd(), 'eq', $testdate_iso, 'sql returns correct date' );
|
|||
$new_dt = dt_from_string( $dt, 'iso' );
|
||||
isa_ok( $new_dt, 'DateTime', 'Passed a DateTime dt_from_string returns it' );
|
||||
|
||||
# C4::Dates allowed 00th of the month
|
||||
|
||||
my $ymd = '2012-01-01';
|
||||
my $dt0 = dt_from_string( '00/01/2012', 'metric' );
|
||||
isa_ok( $dt0, 'DateTime',
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ sub OldWay {
|
|||
}
|
||||
|
||||
if ($datelastseen) {
|
||||
$datelastseen = format_date_in_iso($datelastseen);
|
||||
$datelastseen = output_pref({ str => $datelastseen, dateformat => 'iso', dateonly => 1 });
|
||||
push @where_strings, '(datelastseen < ? OR datelastseen IS NULL)';
|
||||
push @bind_params, $datelastseen;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -150,7 +150,6 @@ else {
|
|||
|
||||
foreach my $new ( @$opac_news ) {
|
||||
next unless $new->{'expirationdate'};
|
||||
#$new->{'expirationdate'}=format_date_in_iso($new->{'expirationdate'});
|
||||
my @date = split (/-/,$new->{'expirationdate'});
|
||||
if ($date[0]*$date[1]*$date[2]>0 && Date_to_Days( @date ) < Date_to_Days(&Today) ){
|
||||
$new->{'expired'} = 1;
|
||||
|
|
|
|||
Loading…
Reference in New Issue