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

(-)a/C4/Acquisition.pm (+8 lines)
Lines 1530-1535 sub GetHistory { Link Here
1530
    my %params = @_;
1530
    my %params = @_;
1531
    my $title = $params{title};
1531
    my $title = $params{title};
1532
    my $author = $params{author};
1532
    my $author = $params{author};
1533
    my $isbn   = $params{isbn};
1533
    my $name = $params{name};
1534
    my $name = $params{name};
1534
    my $from_placed_on = $params{from_placed_on};
1535
    my $from_placed_on = $params{from_placed_on};
1535
    my $to_placed_on = $params{to_placed_on};
1536
    my $to_placed_on = $params{to_placed_on};
Lines 1546-1551 sub GetHistory { Link Here
1546
        SELECT
1547
        SELECT
1547
            biblio.title,
1548
            biblio.title,
1548
            biblio.author,
1549
            biblio.author,
1550
	    biblioitems.isbn,
1549
            aqorders.basketno,
1551
            aqorders.basketno,
1550
    aqbasket.basketname,
1552
    aqbasket.basketname,
1551
    aqbasket.basketgroupid,
1553
    aqbasket.basketgroupid,
Lines 1564-1569 sub GetHistory { Link Here
1564
        LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
1566
        LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
1565
    LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid=aqbasketgroups.id
1567
    LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid=aqbasketgroups.id
1566
        LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id
1568
        LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id
1569
	LEFT JOIN biblioitems ON biblioitems.biblionumber=aqorders.biblionumber
1567
        LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber";
1570
        LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber";
1568
1571
1569
    $query .= " LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber"
1572
    $query .= " LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber"
Lines 1584-1589 sub GetHistory { Link Here
1584
        push @query_params, "%$author%";
1587
        push @query_params, "%$author%";
1585
    }
1588
    }
1586
1589
1590
    if ( defined $isbn ) {
1591
        $query .= " AND biblioitems.isbn LIKE ? ";
1592
        push @query_params, "%$isbn%";
1593
    }
1594
1587
    if ( defined $name ) {
1595
    if ( defined $name ) {
1588
        $query .= " AND aqbooksellers.name LIKE ? ";
1596
        $query .= " AND aqbooksellers.name LIKE ? ";
1589
        push @query_params, "%$name%";
1597
        push @query_params, "%$name%";
(-)a/acqui/histsearch.pl (-1 / +4 lines)
Lines 61-66 use C4::Debug; Link Here
61
my $input = new CGI;
61
my $input = new CGI;
62
my $title                   = $input->param( 'title');
62
my $title                   = $input->param( 'title');
63
my $author                  = $input->param('author');
63
my $author                  = $input->param('author');
64
my $isbn          	    = $input->param('isbn');
64
my $name                    = $input->param( 'name' );
65
my $name                    = $input->param( 'name' );
65
my $basket                  = $input->param( 'basket' );
66
my $basket                  = $input->param( 'basket' );
66
my $booksellerinvoicenumber = $input->param( 'booksellerinvoicenumber' );
67
my $booksellerinvoicenumber = $input->param( 'booksellerinvoicenumber' );
Lines 89-100 if ( $d = $input->param('iso') ) { Link Here
89
90
90
my ( $order_loop, $total_qty, $total_price, $total_qtyreceived );
91
my ( $order_loop, $total_qty, $total_price, $total_qtyreceived );
91
# If we're supplied any value then we do a search. Otherwise we don't.
92
# If we're supplied any value then we do a search. Otherwise we don't.
92
my $do_search = $title || $author || $name || $basket || $booksellerinvoicenumber ||
93
my $do_search = $title || $author || $isbn || $name || $basket || $booksellerinvoicenumber ||
93
    $from_placed_on || $to_placed_on;
94
    $from_placed_on || $to_placed_on;
94
if ($do_search) {
95
if ($do_search) {
95
    ( $order_loop, $total_qty, $total_price, $total_qtyreceived ) = GetHistory(
96
    ( $order_loop, $total_qty, $total_price, $total_qtyreceived ) = GetHistory(
96
        title => $title,
97
        title => $title,
97
        author => $author,
98
        author => $author,
99
	isbn   => $isbn,
98
        name => $name,
100
        name => $name,
99
        from_placed_on => $from_iso,
101
        from_placed_on => $from_iso,
100
        to_placed_on => $to_iso,
102
        to_placed_on => $to_iso,
Lines 114-119 $template->param( Link Here
114
    numresults              => $order_loop ? scalar(@$order_loop) : undef,
116
    numresults              => $order_loop ? scalar(@$order_loop) : undef,
115
    title                   => $title,
117
    title                   => $title,
116
    author                  => $author,
118
    author                  => $author,
119
    isbn		    => $isbn,
117
    name                    => $name,
120
    name                    => $name,
118
    basket                  => $basket,
121
    basket                  => $basket,
119
    booksellerinvoicenumber => $booksellerinvoicenumber,
122
    booksellerinvoicenumber => $booksellerinvoicenumber,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-2 / +2 lines)
Lines 21-26 Link Here
21
		<ol>
21
		<ol>
22
		<li><label for="title">Title: </label> <input type="text" name="title" id="title" value="[% title %]" /></li>
22
		<li><label for="title">Title: </label> <input type="text" name="title" id="title" value="[% title %]" /></li>
23
		<li><label for="author">Author: </label> <input type="text" name="author" id="author" value="[% author %]" /></li>
23
		<li><label for="author">Author: </label> <input type="text" name="author" id="author" value="[% author %]" /></li>
24
		<li><label for="isbn">ISBN: </label> <input type="isbn" name="isbn" id="isbn" value="[% isbn %]" /></li>
24
		<li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="[% name %]" /></li>
25
		<li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="[% name %]" /></li>
25
		<li><label for="basket">Basket: </label> <input type="text" name="basket" id="basket" value="[% basket %]" /></li>
26
		<li><label for="basket">Basket: </label> <input type="text" name="basket" id="basket" value="[% basket %]" /></li>
26
		<li><label for="booksellerinvoicenumber ">Bookseller Invoice No: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% booksellerinvoicenumber %]" /></li>
27
		<li><label for="booksellerinvoicenumber ">Bookseller Invoice No: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% booksellerinvoicenumber %]" /></li>
Lines 83-89 Link Here
83
					    [% END %]
84
					    [% END %]
84
					</td>
85
					</td>
85
					<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% suggestions_loo.biblionumber %]">[% suggestions_loo.title |html %]</a>
86
					<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% suggestions_loo.biblionumber %]">[% suggestions_loo.title |html %]</a>
86
                        <br />[% suggestions_loo.author %]</td>
87
                        <br />[% suggestions_loo.author %] <br /> [% suggestions_loo.isbn %]</td>
87
					<td><a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% suggestions_loo.id %]">[% suggestions_loo.name %]</a></td>
88
					<td><a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% suggestions_loo.id %]">[% suggestions_loo.name %]</a></td>
88
					<td>[% suggestions_loo.creationdate %]</td>
89
					<td>[% suggestions_loo.creationdate %]</td>
89
					<td>[% suggestions_loo.datereceived %]</td>
90
					<td>[% suggestions_loo.datereceived %]</td>
90
- 

Return to bug 6807