View | Details | Raw Unified | Return to bug 11814
Collapse All | Expand All

(-)a/C4/Serials.pm (-5 / +29 lines)
Lines 33-38 use C4::Serials::Numberpattern; Link Here
33
33
34
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
34
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
35
35
36
# Define statuses
37
use constant {
38
    EXPECTED               => 1,
39
    ARRIVED                => 2,
40
    LATE                   => 3,
41
    MISSING                => 4,
42
    MISSING_NEVER_RECIEVED => 41,
43
    MISSING_SOLD_OUT       => 42,
44
    MISSING_DAMAGED        => 43,
45
    MISSING_LOST           => 44,
46
    NOT_ISSUED             => 5,
47
    DELETED                => 6,
48
    CLAIMED                => 7,
49
    STOPPED                => 8,
50
};
51
52
use constant MISSING_STATUSES => (
53
    MISSING,          MISSING_NEVER_RECIEVED,
54
    MISSING_SOLD_OUT, MISSING_DAMAGED,
55
    MISSING_LOST
56
);
57
58
36
BEGIN {
59
BEGIN {
37
    $VERSION = 3.07.00.049;    # set version for version checking
60
    $VERSION = 3.07.00.049;    # set version for version checking
38
    require Exporter;
61
    require Exporter;
Lines 94-99 the array is in name order Link Here
94
117
95
sub GetSuppliersWithLateIssues {
118
sub GetSuppliersWithLateIssues {
96
    my $dbh   = C4::Context->dbh;
119
    my $dbh   = C4::Context->dbh;
120
    my $statuses = join(',', ( LATE, MISSING_STATUSES ) );
97
    my $query = qq|
121
    my $query = qq|
98
        SELECT DISTINCT id, name
122
        SELECT DISTINCT id, name
99
    FROM            subscription
123
    FROM            subscription
Lines 102-108 sub GetSuppliersWithLateIssues { Link Here
102
    WHERE id > 0
126
    WHERE id > 0
103
        AND (
127
        AND (
104
            (planneddate < now() AND serial.status=1)
128
            (planneddate < now() AND serial.status=1)
105
            OR serial.STATUS IN (3, 4, 41, 42, 43, 44)
129
            OR serial.STATUS IN ( $statuses )
106
        )
130
        )
107
        AND subscription.closed = 0
131
        AND subscription.closed = 0
108
    ORDER BY name|;
132
    ORDER BY name|;
Lines 425-431 sub PrepareSerialsData { Link Here
425
            }
449
            }
426
        }
450
        }
427
        $subs->{ "status" . $subs->{'status'} } = 1;
451
        $subs->{ "status" . $subs->{'status'} } = 1;
428
        if ( grep { $_ == $subs->{status} } qw( 1 3 4 41 42 43 44 7 ) ) {
452
        if ( grep { $_ == $subs->{status} } ( EXPECTED, LATE, MISSING_STATUSES, CLAIMED ) ) {
429
            $subs->{"checked"} = 1;
453
            $subs->{"checked"} = 1;
430
        }
454
        }
431
455
Lines 770-778 sub GetSerials { Link Here
770
    my $counter = 0;
794
    my $counter = 0;
771
    $count = 5 unless ($count);
795
    $count = 5 unless ($count);
772
    my @serials;
796
    my @serials;
797
    my $statuses = join( ',', ( ARRIVED, MISSING_STATUSES, NOT_ISSUED ) );
773
    my $query = "SELECT serialid,serialseq, status, publisheddate, planneddate,notes, routingnotes
798
    my $query = "SELECT serialid,serialseq, status, publisheddate, planneddate,notes, routingnotes
774
                        FROM   serial
799
                        FROM   serial
775
                        WHERE  subscriptionid = ? AND status NOT IN (2, 4, 41, 42, 43, 44, 5)
800
                        WHERE  subscriptionid = ? AND status NOT IN ( $statuses )
776
                        ORDER BY IF(publisheddate<>'0000-00-00',publisheddate,planneddate) DESC";
801
                        ORDER BY IF(publisheddate<>'0000-00-00',publisheddate,planneddate) DESC";
777
    my $sth = $dbh->prepare($query);
802
    my $sth = $dbh->prepare($query);
778
    $sth->execute($subscriptionid);
803
    $sth->execute($subscriptionid);
Lines 793-799 sub GetSerials { Link Here
793
    $query = "SELECT   serialid,serialseq, status, planneddate, publisheddate,notes, routingnotes
818
    $query = "SELECT   serialid,serialseq, status, planneddate, publisheddate,notes, routingnotes
794
       FROM     serial
819
       FROM     serial
795
       WHERE    subscriptionid = ?
820
       WHERE    subscriptionid = ?
796
       AND      (status in (2, 4, 41, 42, 43, 44, 5))
821
       AND      status IN ( $statuses )
797
       ORDER BY IF(publisheddate<>'0000-00-00',publisheddate,planneddate) DESC
822
       ORDER BY IF(publisheddate<>'0000-00-00',publisheddate,planneddate) DESC
798
      ";
823
      ";
799
    $sth = $dbh->prepare($query);
824
    $sth = $dbh->prepare($query);
800
- 

Return to bug 11814