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

(-)a/C4/Acquisition.pm (-8 / +7 lines)
Lines 1589-1595 cancelled. Link Here
1589
=cut
1589
=cut
1590
1590
1591
sub DelOrder {
1591
sub DelOrder {
1592
    my ($ordernumber,$bibnum) = @_;
1592
    my ($ordernumber,$biblionumber) = @_;
1593
    my $dbh = C4::Context->dbh;
1593
    my $dbh = C4::Context->dbh;
1594
    my $query = "
1594
    my $query = "
1595
        UPDATE aqorders
1595
        UPDATE aqorders
Lines 1599-1608 sub DelOrder { Link Here
1599
    my $sth = $dbh->prepare($query);
1599
    my $sth = $dbh->prepare($query);
1600
    $sth->execute($ordernumber );
1600
    $sth->execute($ordernumber );
1601
    $sth->finish;
1601
    $sth->finish;
1602
    if ($bibnum) {
1602
    if ($biblionumber) {
1603
        my @itemnumbers = GetItemnumbersFromOrder( $ordernumber );
1603
        my @itemnumbers = GetItemnumbersFromOrder( $ordernumber );
1604
        foreach my $itemnumber (@itemnumbers){
1604
        foreach my $itemnumber (@itemnumbers){
1605
	   C4::Items::DelItem( $dbh, $bibnum, $itemnumber );
1605
            C4::Items::DelItem( $dbh, $biblionumber, $itemnumber );
1606
        }
1606
        }
1607
    }
1607
    }
1608
}
1608
}
Lines 2023-2030 sub GetHistory { Link Here
2023
        SELECT
2023
        SELECT
2024
            biblio.title,
2024
            biblio.title,
2025
            biblio.author,
2025
            biblio.author,
2026
	    biblioitems.isbn,
2026
            biblioitems.isbn,
2027
        biblioitems.ean,
2027
            biblioitems.ean,
2028
            aqorders.basketno,
2028
            aqorders.basketno,
2029
            aqbasket.basketname,
2029
            aqbasket.basketname,
2030
            aqbasket.basketgroupid,
2030
            aqbasket.basketgroupid,
Lines 2044-2052 sub GetHistory { Link Here
2044
        LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
2044
        LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
2045
        LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid=aqbasketgroups.id
2045
        LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid=aqbasketgroups.id
2046
        LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id
2046
        LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id
2047
	LEFT JOIN biblioitems ON biblioitems.biblionumber=aqorders.biblionumber
2047
        LEFT JOIN biblioitems ON biblioitems.biblionumber=aqorders.biblionumber
2048
        LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber
2048
        LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber
2049
    LEFT JOIN aqinvoices ON aqorders.invoiceid = aqinvoices.invoiceid";
2049
        LEFT JOIN aqinvoices ON aqorders.invoiceid = aqinvoices.invoiceid";
2050
2050
2051
    $query .= " LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber"
2051
    $query .= " LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber"
2052
    if ( C4::Context->preference("IndependentBranches") );
2052
    if ( C4::Context->preference("IndependentBranches") );
2053
- 

Return to bug 10869