Bugzilla – Attachment 132788 Details for
Bug 30398
Reindent invoices template
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30398: Reindent invoices template
Bug-30398-Reindent-invoices-template.patch (text/plain), 47.19 KB, created by
Séverine Queune
on 2022-03-31 15:00:44 UTC
(
hide
)
Description:
Bug 30398: Reindent invoices template
Filename:
MIME Type:
Creator:
Séverine Queune
Created:
2022-03-31 15:00:44 UTC
Size:
47.19 KB
patch
obsolete
>From 787b76e51362805e8291407708413ce5da9706a0 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 29 Mar 2022 16:14:35 +0000 >Subject: [PATCH] Bug 30398: Reindent invoices template >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >This patch updates the invoices template so that the indentation is >consistent. > >To test, apply the patch and go to Acquisitions. > >- Locate a vendor which has multiple invoices associated with it. >- View the vendor details, and click the "Invoices" link in the sidebar. >- The display of invoices should look correct. The DataTable should work > correctly. >- Test the search filters in the sidebar to confirm that they work too. > >Signed-off-by: Séverine Queune <severine.queune@bulac.fr> >--- > .../prog/en/modules/acqui/invoices.tt | 662 +++++++++--------- > 1 file changed, 344 insertions(+), 318 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >index 3809d071f7..0edb5427cb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >@@ -35,335 +35,361 @@ > > [% INCLUDE 'blocking_errors.inc' %] > >- <h1>Invoices</h1> >- [% IF ( do_search ) %] >- [% IF invoices %] >- [% BLOCK invoices_table %] >- [% IF closed %] >- [% SET tab = 'closed' %] >- [% ELSE %] >- [% SET tab = 'opened' %] >- [% END %] >- <input type="checkbox" style="vertical-align: middle;" id="show_only_subscription_[% tab | html %]" class="show_only_subscription" data-tableid="[% tab | html %]resultst"/> >- <label for="show_only_subscription_[% tab | html %]"> >- Show only subscriptions >- </label> >- <table id="[% tab | html %]resultst" class="result"> >- <thead> >- <tr> >- [% IF CAN_user_acquisition_merge_invoices %] >- <th> </th> >- [% END %] >- <th> </th> >- <th>Invoice number</th> >- <th>Vendor</th> >- <th>Shipment date</th> >- <th>Billing date</th> >- <th>Received bibliographic records</th> >- <th>Received items</th> >- <th>Status</th> >- <th> </th> >- </tr> >- </thead> >- <tbody> >- [% FOREACH invoice IN invoices %] >- <tr data-invoiceid="[% invoice.invoiceid | html %]" data-booksellerid="[% invoice.booksellerid | html %]" data-shipmentdate="[% invoice.shipmentdate | $KohaDates %]" data-billingdate="[% invoice.billingdate | $KohaDates %]" data-shipmentcost="[% invoice.shipmentcost | html %]" data-shipment_budgetid="[% invoice.shipmentcost_budgetid | html %]" data-closedate="[% invoice.closedate | $KohaDates %]"> >- [% IF CAN_user_acquisition_merge_invoices %] >- <td>[% invoice.is_linked_to_subscriptions | html %]</td> >- [% END %] >- <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid | html %]" /></td> >- <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]">[% invoice.invoicenumber | html %]</a></td> >- <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid | uri %]">[% invoice.suppliername | html %]</a></td> >- <td data-order="[% invoice.shipmentdate | html %]"> >- [% invoice.shipmentdate | $KohaDates %] >- </td> >- <td data-order="[% invoice.billingdate | html %]"> >- [% invoice.billingdate | $KohaDates %] >- </td> >- <td>[% invoice.receivedbiblios | html %]</td> >- <td>[% invoice.receiveditems | html %]</td> >- <td> >- [% IF invoice.closedate %] >- Closed on [% invoice.closedate | $KohaDates %] >- [% ELSE %] >- Open >- [% END %] >- </td> >- <td> >+ <h1>Invoices</h1> >+ [% IF ( do_search ) %] >+ [% IF invoices %] >+ [% BLOCK invoices_table %] >+ [% IF closed %] >+ [% SET tab = 'closed' %] >+ [% ELSE %] >+ [% SET tab = 'opened' %] >+ [% END %] >+ <input type="checkbox" style="vertical-align: middle;" id="show_only_subscription_[% tab | html %]" class="show_only_subscription" data-tableid="[% tab | html %]resultst"/> >+ <label for="show_only_subscription_[% tab | html %]"> >+ Show only subscriptions >+ </label> >+ <table id="[% tab | html %]resultst" class="result"> >+ <thead> >+ <tr> >+ [% IF CAN_user_acquisition_merge_invoices %] >+ <th> </th> >+ [% END %] >+ <th> </th> >+ <th>Invoice number</th> >+ <th>Vendor</th> >+ <th>Shipment date</th> >+ <th>Billing date</th> >+ <th>Received bibliographic records</th> >+ <th>Received items</th> >+ <th>Status</th> >+ <th> </th> >+ </tr> >+ </thead> >+ <tbody> >+ [% FOREACH invoice IN invoices %] >+ <tr data-invoiceid="[% invoice.invoiceid | html %]" data-booksellerid="[% invoice.booksellerid | html %]" data-shipmentdate="[% invoice.shipmentdate | $KohaDates %]" data-billingdate="[% invoice.billingdate | $KohaDates %]" data-shipmentcost="[% invoice.shipmentcost | html %]" data-shipment_budgetid="[% invoice.shipmentcost_budgetid | html %]" data-closedate="[% invoice.closedate | $KohaDates %]"> >+ [% IF CAN_user_acquisition_merge_invoices %] >+ <td>[% invoice.is_linked_to_subscriptions | html %]</td> >+ [% END %] >+ <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid | html %]" /></td> >+ <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]">[% invoice.invoicenumber | html %]</a></td> >+ <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid | uri %]">[% invoice.suppliername | html %]</a></td> >+ <td data-order="[% invoice.shipmentdate | html %]"> >+ [% invoice.shipmentdate | $KohaDates %] >+ </td> >+ <td data-order="[% invoice.billingdate | html %]"> >+ [% invoice.billingdate | $KohaDates %] >+ </td> >+ <td>[% invoice.receivedbiblios | html %]</td> >+ <td>[% invoice.receiveditems | html %]</td> >+ <td> >+ [% IF invoice.closedate %] >+ Closed on [% invoice.closedate | $KohaDates %] >+ [% ELSE %] >+ Open >+ [% END %] >+ </td> >+ <td> >+ >+ <div class="btn-group dropup"> >+ <a class="btn btn-default btn-xs dropdown-toggle" id="invoiceactions[% invoice.invoiceid | html %]" role="button" data-toggle="dropdown" href="#"> >+ Actions <b class="caret"></b> >+ </a> >+ <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="invoiceactions[% invoice.invoiceid | html %]"> >+ <li><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]"><i class="fa fa-search"></i> Details</a></li> >+ [% IF invoice.closedate %] >+ [% IF CAN_user_acquisition_reopen_closed_invoices %] >+ <li><a href="invoice.pl?op=reopen&invoiceid=[% invoice.invoiceid | uri %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-refresh"></i> Reopen</a></li> >+ [% END %] >+ [% ELSE %] >+ [% IF CAN_user_acquisition_edit_invoices %] >+ <li><a href="invoice.pl?op=close&invoiceid=[% invoice.invoiceid | uri %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-times-circle"></i> Close</a></li> >+ [% END %] >+ [% END %] >+ [% UNLESS invoice.receivedbiblios || invoice.receiveditems %] >+ [% IF CAN_user_acquisition_delete_invoices %] >+ <li><a href="invoice.pl?op=delete&invoiceid=[% invoice.invoiceid | uri %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]" class="delete_invoice"><i class="fa fa-trash"></i> Delete</a></li> >+ [% END %] >+ [% END %] >+ </ul> >+ </div> >+ </td> >+ </tr> >+ [% END %] >+ </tbody> >+ </table> > >- <div class="btn-group dropup"> >- <a class="btn btn-default btn-xs dropdown-toggle" id="invoiceactions[% invoice.invoiceid | html %]" role="button" data-toggle="dropdown" href="#"> >- Actions <b class="caret"></b> >- </a> >- <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="invoiceactions[% invoice.invoiceid | html %]"> >- <li><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]"><i class="fa fa-search"></i> Details</a></li> >- [% IF invoice.closedate %] >- [% IF CAN_user_acquisition_reopen_closed_invoices %] >- <li><a href="invoice.pl?op=reopen&invoiceid=[% invoice.invoiceid | uri %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-refresh"></i> Reopen</a></li> >+ [% IF CAN_user_acquisition_merge_invoices %] >+ [% IF tab == 'closed' %] >+ <a class="btn btn-default merge" id="merge_closed" href="#merge_invoices" data-table="closedresultst"><i class="fa fa-compress"></i> Merge selected invoices</a> >+ <a class="btn btn-default" id="open_sel" href="#reopen_selected" data-table="closedresultst" data-op="reopen" data-referer="referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-refresh"></i> Reopen selected invoices</a> >+ [% ELSE %] >+ <a class="btn btn-default merge" id="merge_open" href="#merge_invoices" data-table="openedresultst"><i class="fa fa-compress"></i> Merge selected invoices</a> >+ <a class="btn btn-default" id="close_sel" href="#close_selected" data-table="openedresultst" data-op="close" data-referer="referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-times-circle"></i> Close selected invoices</a> > [% END %] >- [% ELSE %] >- [% IF CAN_user_acquisition_edit_invoices %] >- <li><a href="invoice.pl?op=close&invoiceid=[% invoice.invoiceid | uri %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-times-circle"></i> Close</a></li> >+ [% END %] <!-- invoices_table --> >+ [% END %] >+ >+ <div id="invoicestabs" class="toptabs" style="clear:both;"> >+ <ul class="ui-tabs-nav"> >+ <li><a href="#opened">Open invoices ([% openedinvoices.size || 0 | html %])</a></li> >+ <li><a href="#closed">Closed invoices ([% closedinvoices.size || 0 | html %]) </a></li> >+ </ul> >+ <div id="opened"> >+ [% IF openedinvoices %] >+ [% INCLUDE invoices_table invoices = openedinvoices %] >+ [% ELSE %] >+ <div class="dialog message"> >+ <p>Your search returned no open invoices.</p> >+ </div> > [% END %] >- [% END %] >- [% UNLESS invoice.receivedbiblios || invoice.receiveditems %] >- [% IF CAN_user_acquisition_delete_invoices %] >- <li><a href="invoice.pl?op=delete&invoiceid=[% invoice.invoiceid | uri %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]" class="delete_invoice"><i class="fa fa-trash"></i> Delete</a></li> >+ </div> <!-- opened --> >+ <div id="closed"> >+ [% IF closedinvoices %] >+ [% INCLUDE invoices_table invoices = closedinvoices closed = 1 %] >+ [% ELSE %] >+ <div class="dialog message"> >+ <p>Your search returned no closed invoices.</p> >+ </div> > [% END %] >- [% END %] >- </ul> >- </div> >- </td> >- </tr> >- [% END %] >- </tbody> >- </table> >- [% IF CAN_user_acquisition_merge_invoices %] >- [% IF tab == 'closed' %] >- <a class="btn btn-default merge" id="merge_closed" href="#merge_invoices" data-table="closedresultst"><i class="fa fa-compress"></i> Merge selected invoices</a> >- <a class="btn btn-default" id="open_sel" href="#reopen_selected" data-table="closedresultst" data-op="reopen" data-referer="referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-refresh"></i> Reopen selected invoices</a> >- [% ELSE %] >- <a class="btn btn-default merge" id="merge_open" href="#merge_invoices" data-table="openedresultst"><i class="fa fa-compress"></i> Merge selected invoices</a> >- <a class="btn btn-default" id="close_sel" href="#close_selected" data-table="openedresultst" data-op="close" data-referer="referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-times-circle"></i> Close selected invoices</a> >- [% END %] >- [% END %] <!-- invoices_table --> >- [% END %] >- <div id="invoicestabs" class="toptabs" style="clear:both;"> >- <ul class="ui-tabs-nav"> >- <li><a href="#opened">Open invoices ([% openedinvoices.size || 0 | html %])</a></li> >- <li><a href="#closed">Closed invoices ([% closedinvoices.size || 0 | html %]) </a></li> >- </ul> >- <div id="opened"> >- [% IF openedinvoices %] >- [% INCLUDE invoices_table invoices = openedinvoices %] >- [% ELSE %] >- <div class="dialog message"> >- <p>Your search returned no open invoices.</p> >- </div> >- [% END %] >- </div> <!-- opened --> >- <div id="closed"> >- [% IF closedinvoices %] >- [% INCLUDE invoices_table invoices = closedinvoices closed = 1 %] >- [% ELSE %] >- <div class="dialog message"> >- <p>Your search returned no closed invoices.</p> >- </div> >- [% END %] >- </div> <!-- closed --> >- </div> <!-- invoicestabs --> >+ </div> <!-- closed --> >+ </div> <!-- invoicestabs --> > > >- <div id="merge_invoices"> >- <form id="merge_invoice_form" action="/cgi-bin/koha/acqui/invoice.pl" method="post"> >- <fieldset class="rows"> >- <ol> >- <li><h2>Merge invoices</h2></li> >- <li><table id="merge_table"> >- <thead><tr><th>Invoice number</th><th>Shipment date</th><th>Billing date</th><th>Shipment cost</th></tr></thead> >- <tbody> >- </tbody> >- </table></li> >- <li><label for="merge_invoicenumber" class="required">Invoice number:</label> >- <input type="text" size="10" id="merge_invoicenumber" name="invoicenumber" value="" class="required" required="required" /> >- <span class="required">Required</span> >- </li> >- <li> >- <label for="merge_shipmentdate">Shipment date:</label> >- <input type="text" size="10" id="merge_shipmentdate" name="shipmentdate" value="" class="flatpickr" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >- </li> >+ <div id="merge_invoices"> >+ <form id="merge_invoice_form" action="/cgi-bin/koha/acqui/invoice.pl" method="post"> >+ <fieldset class="rows"> >+ <ol> >+ <li><h2>Merge invoices</h2></li> >+ <li> >+ <table id="merge_table"> >+ <thead> >+ <tr> >+ <th>Invoice number</th> >+ <th>Shipment date</th> >+ <th>Billing date</th> >+ <th>Shipment cost</th> >+ </tr> >+ </thead> >+ <tbody> >+ </tbody> >+ </table> >+ </li> > >- <li> >- <label for="merge_billingdate">Billing date:</label> >- <input type="text" size="10" id="merge_billingdate" name="billingdate" value="" class="flatpickr" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >- </li> >+ <li> >+ <label for="merge_invoicenumber" class="required">Invoice number:</label> >+ <input type="text" size="10" id="merge_invoicenumber" name="invoicenumber" value="" class="required" required="required" /> >+ <span class="required">Required</span> >+ </li> > >- <li><label for="merge_shipmentcost">Shipment cost:</label> >- <input type="text" size="10" id="merge_shipmentcost" name="shipmentcost" value="" /></li> >- <li><label for="merge_shipment_budgetid">Fund:</label> >- <select id="merge_shipment_budgetid" name="shipment_budget_id"> >- <option value="">No fund</option> >- [% FOREACH budget IN budgets_loop %] >- <option value="[% budget.budget_id | html %]">[% budget.budget_name | html %] >- </option> >- [% END %] >- </select></li> >+ <li> >+ <label for="merge_shipmentdate">Shipment date:</label> >+ <input type="text" size="10" id="merge_shipmentdate" name="shipmentdate" value="" class="flatpickr" /> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ </li> > >- <li><span class="label">Status:</span> <span id="merge_status"></span></li> >- <li><input type="submit" value="Merge" /></li> >- </ol> >- <input type="hidden" name="op" value="mod" /> >- <input type="hidden" id="merge_invoiceid" name="invoiceid" value="" /> >- </fieldset> >- </form> >- </div> >- [% ELSE %] >- <p>Sorry, but there are no results for your search.</p> >- <p>Search was: >- <ul> >- [% IF ( invoicenumber ) %] >- <li>Invoice number: [% invoicenumber | html %]</li> >- [% END %] >- [% IF booksellerid %] >- <li>Vendor: [% suppliername | html %]</li> >- [% END %] >- [% IF shipmentdatefrom %] >- <li>Shipment date: >- [% IF shipmentdateto %] >- From [% shipmentdatefrom | $KohaDates %] >- To [% shipmentdateto | $KohaDates %] >- [% ELSE %] >- All since [% shipmentdatefrom | $KohaDates %] >- [% END %] >- </li> >- [% ELSE %] >- [% IF shipmentdateto %] >- <li>Shipment date: >- All until [% shipmentdateto | $KohaDates %] >- </li> >- [% END %] >- [% END %] >- [% IF billingdatefrom %] >- <li>Billing date: >- [% IF billingdateto %] >- From [% billingdatefrom | $KohaDates %] >- To [% billingdateto | $KohaDates %] >- [% ELSE %] >- All since [% billingdatefrom | $KohaDates %] >- [% END %] >- </li> >- [% ELSE %] >- [% IF billingdateto %] >- <li>Billing date: >- All until [% billingdateto | $KohaDates %] >- </li> >- [% END %] >- [% END %] >- [% IF ( isbneanissn ) %] >- <li>ISBN/EAN/ISSN: [% isbneanissn | html %]</li> >- [% END %] >- [% IF ( title ) %] >- <li>Title: [% title | html %]</li> >- [% END %] >- [% IF ( author ) %] >- <li>Author: [% author | html %]</li> >- [% END %] >- [% IF ( publisher ) %] >- <li>Publisher: [% publisher | html %]</li> >- [% END %] >- [% IF ( publicationyear ) %] >- <li>Publication year: [% publicationyear | html %]</li> >- [% END %] >- [% IF ( branch ) %] >- <li>Library: [% Branches.GetName( branch ) | html %]</li> >- [% END %] >- </ul> >- </p> >- [% END %]<!-- invoices --> >- [% ELSE %] >- <p>Use the search form on the left to find invoices.</p> >- [% END %]<!-- do_search --> >- </main> >-</div> <!-- /.col-sm-10.col-sm-push-2 --> >+ <li> >+ <label for="merge_billingdate">Billing date:</label> >+ <input type="text" size="10" id="merge_billingdate" name="billingdate" value="" class="flatpickr" /> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ </li> > >-<div class="col-sm-2 col-sm-pull-10"> >-<aside> >- <form action="" method="get"> >- <fieldset class="sidebar brief"> >- <h3>Search filters</h3> >- <ol> >- <li> >- <label for="invoicenumber">Invoice number</label> >- <input type="text" id="invoicenumber" name="invoicenumber" value="[% invoicenumber | html %]" class="focus" /> >- </li> >- <li> >- <label for="supplier">Vendor:</label> >- <select id="supplier" name="supplierid"> >- <option value="">All</option> >- [% FOREACH supplier IN suppliers_loop %] >- [% IF ( supplier.selected ) %] >- <option selected="selected" value="[% supplier.booksellerid | html %]">[% supplier.suppliername | html %]</option> >+ <li> >+ <label for="merge_shipmentcost">Shipment cost:</label> >+ <input type="text" size="10" id="merge_shipmentcost" name="shipmentcost" value="" /> >+ </li> >+ <li> >+ <label for="merge_shipment_budgetid">Fund:</label> >+ <select id="merge_shipment_budgetid" name="shipment_budget_id"> >+ <option value="">No fund</option> >+ [% FOREACH budget IN budgets_loop %] >+ <option value="[% budget.budget_id | html %]">[% budget.budget_name | html %]</option> >+ [% END %] >+ </select> >+ </li> >+ >+ <li> >+ <span class="label">Status:</span> <span id="merge_status"></span> >+ </li> >+ <li> >+ <input type="submit" value="Merge" /> >+ </li> >+ </ol> >+ <input type="hidden" name="op" value="mod" /> >+ <input type="hidden" id="merge_invoiceid" name="invoiceid" value="" /> >+ </fieldset> >+ </form> >+ </div> >+ [% ELSE %] >+ <p>Sorry, but there are no results for your search.</p> >+ <p>Search was: >+ <ul> >+ [% IF ( invoicenumber ) %] >+ <li>Invoice number: [% invoicenumber | html %]</li> >+ [% END %] >+ [% IF booksellerid %] >+ <li>Vendor: [% suppliername | html %]</li> >+ [% END %] >+ [% IF shipmentdatefrom %] >+ <li> >+ Shipment date: >+ [% IF shipmentdateto %] >+ From [% shipmentdatefrom | $KohaDates %] >+ To [% shipmentdateto | $KohaDates %] >+ [% ELSE %] >+ All since [% shipmentdatefrom | $KohaDates %] >+ [% END %] >+ </li> >+ [% ELSE %] >+ [% IF shipmentdateto %] >+ <li> >+ Shipment date: >+ All until [% shipmentdateto | $KohaDates %] >+ </li> >+ [% END %] >+ [% END %] >+ [% IF billingdatefrom %] >+ <li> >+ Billing date: >+ [% IF billingdateto %] >+ From [% billingdatefrom | $KohaDates %] >+ To [% billingdateto | $KohaDates %] >+ [% ELSE %] >+ All since [% billingdatefrom | $KohaDates %] >+ [% END %] >+ </li> >+ [% ELSE %] >+ [% IF billingdateto %] >+ <li> >+ Billing date: >+ All until [% billingdateto | $KohaDates %] >+ </li> >+ [% END %] >+ [% END %] >+ [% IF ( isbneanissn ) %] >+ <li>ISBN/EAN/ISSN: [% isbneanissn | html %]</li> >+ [% END %] >+ [% IF ( title ) %] >+ <li>Title: [% title | html %]</li> >+ [% END %] >+ [% IF ( author ) %] >+ <li>Author: [% author | html %]</li> >+ [% END %] >+ [% IF ( publisher ) %] >+ <li>Publisher: [% publisher | html %]</li> >+ [% END %] >+ [% IF ( publicationyear ) %] >+ <li>Publication year: [% publicationyear | html %]</li> >+ [% END %] >+ [% IF ( branch ) %] >+ <li>Library: [% Branches.GetName( branch ) | html %]</li> >+ [% END %] >+ </ul> >+ </p> >+ [% END %]<!-- invoices --> > [% ELSE %] >- <option value="[% supplier.booksellerid | html %]">[% supplier.suppliername | html %]</option> >- [% END %] >- [% END %] >- </select> >- </li> >- <li> >- <fieldset class="brief"> >- <legend>Shipment date</legend> >- <ol> >- <li> >- <label for="shipmentdatefrom">From:</label> >- <input type="text" id="shipmentdatefrom" name="shipmentdatefrom" size="10" value="[% shipmentdatefrom | $KohaDates %]" class="flatpickr" data-date_to="shipmentdateto" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >- </li> >- <li> >- <label for="shipmentdateto">To:</label> >- <input type="text" id="shipmentdateto" name="shipmentdateto" size="10" value="[% shipmentdateto | $KohaDates %]" class="flatpickr" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >- </li> >- </ol> >- </fieldset> >- </li> >- <li> >- <fieldset class="brief"> >- <legend>Billing date</legend> >- <ol> >- <li> >- <label for="billingdatefrom">From:</label> >- <input type="text" id="billingdatefrom" name="billingdatefrom" size="10" value="[% billingdatefrom | $KohaDates %]" class="flatpickr" data-date_to="billingdateto" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >- </li> >- <li> >- <label for="billingdateto">To:</label> >- <input type="text" id="billingdateto" name="billingdateto" size="10" value="[% billingdateto | $KohaDates %]" class="flatpickr" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >- </li> >- </ol> >- </fieldset> >- </li> >- <li> >- <label for="isbneanissn">ISBN / EAN / ISSN:</label> >- <input type="text" id="isbneanissn" name="isbneanissn" value="[% isbneanissn | html %]" /> >- </li> >- <li> >- <label for="title">Title:</label> >- <input type="text" id="title" name="title" value="[% title | html %]" /> >- </li> >- <li> >- <label for="author">Author:</label> >- <input type="text" id="author" name="author" value="[% author | html %]" /> >- </li> >- <li> >- <label for="publisher">Publisher:</label> >- <input type="text" id="publisher" name="publisher" value="[% publisher | html %]" /> >- </li> >- <li> >- <label for="publicationyear">Publication year:</label> >- <input type="text" id="publicationyear" name="publicationyear" value="[% publicationyear | html %]" /> >- </li> >- <li> >- <label for="branch">Library:</label> >- <select id="branch" name="branch"> >- <option value="">All</option> >- [%# FIXME Should not we filter the libraries %] >- [% PROCESS options_for_libraries libraries => Branches.all( selected => branch, unfiltered => 1 ) %] >- </select> >- </li> >- </ol> >- <fieldset class="action"> >- <input type="submit" value="Search" /> >- </fieldset> >- </fieldset> >- <input type="hidden" name="op" id="op" value="do_search" /> >- </form> >- [% INCLUDE 'acquisitions-menu.inc' %] >- </aside> >-</div> <!-- /.col-sm-2.col-sm-pull-10 --> >-</div> <!-- /.row --> >+ <p>Use the search form on the left to find invoices.</p> >+ [% END %]<!-- do_search --> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ <form action="" method="get"> >+ <fieldset class="sidebar brief"> >+ <h3>Search filters</h3> >+ <ol> >+ <li> >+ <label for="invoicenumber">Invoice number</label> >+ <input type="text" id="invoicenumber" name="invoicenumber" value="[% invoicenumber | html %]" >+ class="focus" /> >+ </li> >+ <li> >+ <label for="supplier">Vendor:</label> >+ <select id="supplier" name="supplierid"> >+ <option value="">All</option> >+ [% FOREACH supplier IN suppliers_loop %] >+ [% IF ( supplier.selected ) %] >+ <option selected="selected" value="[% supplier.booksellerid | html %]">[% supplier.suppliername | html %]</option> >+ [% ELSE %] >+ <option value="[% supplier.booksellerid | html %]">[% supplier.suppliername | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ </li> >+ <li> >+ <fieldset class="brief"> >+ <legend>Shipment date</legend> >+ <ol> >+ <li> >+ <label for="shipmentdatefrom">From:</label> >+ <input type="text" id="shipmentdatefrom" name="shipmentdatefrom" size="10" value="[% shipmentdatefrom | $KohaDates %]" class="flatpickr" data-date_to="shipmentdateto" /> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ </li> >+ <li> >+ <label for="shipmentdateto">To:</label> >+ <input type="text" id="shipmentdateto" name="shipmentdateto" size="10" value="[% shipmentdateto | $KohaDates %]" class="flatpickr" /> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ </li> >+ </ol> >+ </fieldset> >+ </li> >+ <li> >+ <fieldset class="brief"> >+ <legend>Billing date</legend> >+ <ol> >+ <li> >+ <label for="billingdatefrom">From:</label> >+ <input type="text" id="billingdatefrom" name="billingdatefrom" size="10" value="[% billingdatefrom | $KohaDates %]" class="flatpickr" data-date_to="billingdateto" /> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ </li> >+ <li> >+ <label for="billingdateto">To:</label> >+ <input type="text" id="billingdateto" name="billingdateto" size="10" value="[% billingdateto | $KohaDates %]" class="flatpickr" /> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ </li> >+ </ol> >+ </fieldset> >+ </li> >+ <li> >+ <label for="isbneanissn">ISBN / EAN / ISSN:</label> >+ <input type="text" id="isbneanissn" name="isbneanissn" value="[% isbneanissn | html %]" /> >+ </li> >+ <li> >+ <label for="title">Title:</label> >+ <input type="text" id="title" name="title" value="[% title | html %]" /> >+ </li> >+ <li> >+ <label for="author">Author:</label> >+ <input type="text" id="author" name="author" value="[% author | html %]" /> >+ </li> >+ <li> >+ <label for="publisher">Publisher:</label> >+ <input type="text" id="publisher" name="publisher" value="[% publisher | html %]" /> >+ </li> >+ <li> >+ <label for="publicationyear">Publication year:</label> >+ <input type="text" id="publicationyear" name="publicationyear" value="[% publicationyear | html %]" /> >+ </li> >+ <li> >+ <label for="branch">Library:</label> >+ <select id="branch" name="branch"> >+ <option value="">All</option> >+ [%# FIXME Should not we filter the libraries %] >+ [% PROCESS options_for_libraries libraries => Branches.all( selected => branch, unfiltered => 1 ) %] >+ </select> >+ </li> >+ </ol> >+ <fieldset class="action"> >+ <input type="submit" value="Search" /> >+ </fieldset> >+ </fieldset> >+ <input type="hidden" name="op" id="op" value="do_search" /> >+ </form> >+ [% INCLUDE 'acquisitions-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/acquisitions-menu.js") | $raw %] >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 30398
:
132480
|
132481
|
132788
|
132789
|
132859
|
132860