- if ( Date_to_Days(split "-",$expirationdate) < Date_to_Days(split "-",$date) &&
- Date_to_Days(split "-",$expirationdate) > Date_to_Days(&Today) ) {
- $subscription->{expirationdate}=format_date($subscription->{expirationdate});
- push @subscriptions_loop,$subscription;
+
+ next if $subscription->{closed};
+ if ( !C4::Context->preference("IndependentBranches")
+ or C4::Context->IsSuperLibrarian()
+ or ( ref $flags->{serials} and $flags->{serials}->{superserials} )
+ or ( !ref $flags->{serials} and $flags->{serials} == 1 ) )
+ {
+ $subscription->{cannotedit} = 0;
+ }
+ next if $subscription->{cannotedit};
+
+ my $expirationdate_dt = dt_from_string( $expirationdate, 'iso' );
+ if ( DateTime->compare( $date, $expirationdate_dt ) == 1
+ && ( !$branch || ( $subscription->{'branchcode'} eq $branch ) ) ) {
+ push @subscriptions_loop, $subscription;