Lines 121-137
sub GetSuppliersWithLateIssues {
Link Here
|
121 |
my $dbh = C4::Context->dbh; |
121 |
my $dbh = C4::Context->dbh; |
122 |
my $statuses = join(',', ( LATE, MISSING_STATUSES, CLAIMED ) ); |
122 |
my $statuses = join(',', ( LATE, MISSING_STATUSES, CLAIMED ) ); |
123 |
my $query = qq| |
123 |
my $query = qq| |
124 |
SELECT DISTINCT id, name |
124 |
SELECT DISTINCT aqbooksellers.id, aqbooksellers.name |
125 |
FROM subscription |
125 |
FROM aqbooksellers |
126 |
LEFT JOIN serial ON serial.subscriptionid=subscription.subscriptionid |
126 |
LEFT JOIN serial ON serial.aqbooksellerid = aqbooksellers.id |
127 |
LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id |
127 |
LEFT JOIN subscription ON serial.subscriptionid = subscription.subscriptionid |
128 |
WHERE id > 0 |
128 |
WHERE ( |
129 |
AND ( |
129 |
(serial.planneddate < NOW() AND serial.status = 1) |
130 |
(planneddate < now() AND serial.status=1) |
130 |
OR serial.status IN ( $statuses ) |
131 |
OR serial.STATUS IN ( $statuses ) |
131 |
) |
132 |
) |
132 |
AND subscription.closed = 0 |
133 |
AND subscription.closed = 0 |
133 |
ORDER BY name |
134 |
ORDER BY name|; |
134 |
|; |
135 |
return $dbh->selectall_arrayref($query, { Slice => {} }); |
135 |
return $dbh->selectall_arrayref($query, { Slice => {} }); |
136 |
} |
136 |
} |
137 |
|
137 |
|
Lines 1440-1445
sub NewSubscription {
Link Here
|
1440 |
serialseq_y => $subscription->{'lastvalue2'}, |
1440 |
serialseq_y => $subscription->{'lastvalue2'}, |
1441 |
serialseq_z => $subscription->{'lastvalue3'}, |
1441 |
serialseq_z => $subscription->{'lastvalue3'}, |
1442 |
subscriptionid => $subscriptionid, |
1442 |
subscriptionid => $subscriptionid, |
|
|
1443 |
aqbooksellerid => $subscription->{aqbooksellerid}, |
1443 |
biblionumber => $biblionumber, |
1444 |
biblionumber => $biblionumber, |
1444 |
status => EXPECTED, |
1445 |
status => EXPECTED, |
1445 |
planneddate => $firstacquidate, |
1446 |
planneddate => $firstacquidate, |
Lines 1550-1555
sub NewIssue {
Link Here
|
1550 |
serialseq_y => $subscription->lastvalue2(), |
1551 |
serialseq_y => $subscription->lastvalue2(), |
1551 |
serialseq_z => $subscription->lastvalue3(), |
1552 |
serialseq_z => $subscription->lastvalue3(), |
1552 |
subscriptionid => $subscriptionid, |
1553 |
subscriptionid => $subscriptionid, |
|
|
1554 |
aqbooksellerid => $subscription->aqbooksellerid(), |
1553 |
biblionumber => $biblionumber, |
1555 |
biblionumber => $biblionumber, |
1554 |
status => $status, |
1556 |
status => $status, |
1555 |
planneddate => $planneddate, |
1557 |
planneddate => $planneddate, |
Lines 1776-1782
sub GetLateOrMissingIssues {
Link Here
|
1776 |
my $sth; |
1778 |
my $sth; |
1777 |
my $byserial = ''; |
1779 |
my $byserial = ''; |
1778 |
if ($serialid) { |
1780 |
if ($serialid) { |
1779 |
$byserial = "and serialid = " . $serialid; |
1781 |
$byserial = "and s.serialid = " . $serialid; |
1780 |
} |
1782 |
} |
1781 |
if ($order) { |
1783 |
if ($order) { |
1782 |
$order .= ", title"; |
1784 |
$order .= ", title"; |
Lines 1785-1823
sub GetLateOrMissingIssues {
Link Here
|
1785 |
} |
1787 |
} |
1786 |
my $missing_statuses_string = join ',', (MISSING_STATUSES); |
1788 |
my $missing_statuses_string = join ',', (MISSING_STATUSES); |
1787 |
if ($supplierid) { |
1789 |
if ($supplierid) { |
1788 |
$sth = $dbh->prepare( |
1790 |
$sth = $dbh->prepare(qq{ |
1789 |
"SELECT |
1791 |
SELECT |
1790 |
serialid, aqbooksellerid, name, |
1792 |
s.serialid, s.aqbooksellerid, aqbooksellers.name, |
1791 |
biblio.title, biblioitems.issn, planneddate, serialseq, |
1793 |
biblio.title, biblioitems.issn, s.planneddate, s.serialseq, |
1792 |
serial.status, serial.subscriptionid, claimdate, claims_count, |
1794 |
s.status, s.subscriptionid, s.claimdate, s.claims_count, |
1793 |
subscription.branchcode |
1795 |
subscription.branchcode |
1794 |
FROM serial |
1796 |
FROM serial s |
1795 |
LEFT JOIN subscription ON serial.subscriptionid=subscription.subscriptionid |
1797 |
LEFT JOIN subscription ON s.subscriptionid = subscription.subscriptionid |
1796 |
LEFT JOIN biblio ON subscription.biblionumber=biblio.biblionumber |
1798 |
LEFT JOIN biblio ON subscription.biblionumber = biblio.biblionumber |
1797 |
LEFT JOIN biblioitems ON subscription.biblionumber=biblioitems.biblionumber |
1799 |
LEFT JOIN biblioitems ON subscription.biblionumber = biblioitems.biblionumber |
1798 |
LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id |
1800 |
LEFT JOIN aqbooksellers ON s.aqbooksellerid = aqbooksellers.id |
1799 |
WHERE subscription.subscriptionid = serial.subscriptionid |
1801 |
WHERE |
1800 |
AND (serial.STATUS IN ($missing_statuses_string) OR ((planneddate < now() AND serial.STATUS = ?) OR serial.STATUS = ? OR serial.STATUS = ?)) |
1802 |
( |
1801 |
AND subscription.aqbooksellerid=$supplierid |
1803 |
s.status IN ($missing_statuses_string) |
1802 |
$byserial |
1804 |
OR ( |
1803 |
ORDER BY $order" |
1805 |
(s.planneddate < NOW() AND s.status = ?) |
1804 |
); |
1806 |
OR s.status = ? |
|
|
1807 |
OR s.status = ? |
1808 |
) |
1809 |
) |
1810 |
AND s.aqbooksellerid = $supplierid |
1811 |
$byserial |
1812 |
ORDER BY $order |
1813 |
}); |
1805 |
} else { |
1814 |
} else { |
1806 |
$sth = $dbh->prepare( |
1815 |
$sth = $dbh->prepare(qq{ |
1807 |
"SELECT |
1816 |
SELECT |
1808 |
serialid, aqbooksellerid, name, |
1817 |
s.serialid, s.aqbooksellerid, aqbooksellers.name, |
1809 |
biblio.title, planneddate, serialseq, |
1818 |
biblio.title, s.planneddate, s.serialseq, |
1810 |
serial.status, serial.subscriptionid, claimdate, claims_count, |
1819 |
s.status, s.subscriptionid, s.claimdate, s.claims_count, |
1811 |
subscription.branchcode |
1820 |
subscription.branchcode |
1812 |
FROM serial |
1821 |
FROM serial s |
1813 |
LEFT JOIN subscription ON serial.subscriptionid=subscription.subscriptionid |
1822 |
LEFT JOIN subscription ON s.subscriptionid = subscription.subscriptionid |
1814 |
LEFT JOIN biblio ON subscription.biblionumber=biblio.biblionumber |
1823 |
LEFT JOIN biblio ON subscription.biblionumber = biblio.biblionumber |
1815 |
LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id |
1824 |
LEFT JOIN aqbooksellers ON s.aqbooksellerid = aqbooksellers.id |
1816 |
WHERE subscription.subscriptionid = serial.subscriptionid |
1825 |
WHERE |
1817 |
AND (serial.STATUS IN ($missing_statuses_string) OR ((planneddate < now() AND serial.STATUS = ?) OR serial.STATUS = ? OR serial.STATUS = ?)) |
1826 |
( |
|
|
1827 |
s.status IN ($missing_statuses_string) |
1828 |
OR ( |
1829 |
(s.planneddate < now() AND s.status = ?) |
1830 |
OR s.status = ? |
1831 |
OR s.status = ? |
1832 |
) |
1833 |
) |
1818 |
$byserial |
1834 |
$byserial |
1819 |
ORDER BY $order" |
1835 |
ORDER BY $order |
1820 |
); |
1836 |
}); |
1821 |
} |
1837 |
} |
1822 |
$sth->execute( EXPECTED, LATE, CLAIMED ); |
1838 |
$sth->execute( EXPECTED, LATE, CLAIMED ); |
1823 |
my @issuelist; |
1839 |
my @issuelist; |