Merge branch 'bug_9168' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2012-12-02 09:06:22 -05:00
commit 4ce8c92bbd
2 changed files with 2 additions and 5 deletions

View File

@ -333,7 +333,6 @@ $template->param(
booksellerid => $bookseller->{id},
countreceived => $countlines,
loop_received => \@loop_received,
booksellerid => $booksellerid,
loop_orders => \@loop_orders,
book_foot_loop => \@book_foot_loop,
totalprice => sprintf($cfstr, $totalprice),

View File

@ -428,11 +428,9 @@
</ol>
<fieldset class="action">
<input type="hidden" value="search" name="op" />
<input type="hidden" value="[% booksellerid %]" name="booksellerid" />
<input type="hidden" value="[% invoice %]" name="invoice" />
<input type="hidden" value="[% invoicedatereceived %]" name="datereceived" />
<input type="hidden" value="[% invoiceid %]" name="invoiceid" />
<input type="submit" value="Filter" />
<a href="/cgi-bin/koha/acqui/parcel.pl?booksellerid=[% booksellerid %]&amp;invoice=[% invoice %]&amp;op=new&amp;datereceived=[% formatteddatereceived %]">Clear</a>
<a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Clear</a>
</fieldset>