Attachment #121796 for bug #28508

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

Lines 19-25 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc (-1 / +1 lines)
19	<input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced search</a>	19	<input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced search</a>
20	<p id="filters" style="display:none">	20	<p id="filters" style="display:none">
21	<label for="basket">Basket: </label><input type="text" name="basket" id="basket" />	21	<label for="basket">Basket: </label><input type="text" name="basket" id="basket" />
22	<label for="booksellerinvoicenumber">Invoice no.: </label><input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" />	22	<label for="booksellerinvoicenumber">Invoice number: </label><input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" />
23	</p>	23	</p>
24	</form>	24	</form>
25	</div>	25	</div>

Lines 24-30 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/filter-orders.inc (-1 / +1 lines)
24	[% PROCESS options_for_libraries libraries => Branches.all(selected => '') %]	24	[% PROCESS options_for_libraries libraries => Branches.all(selected => '') %]
25	</select>	25	</select>
26	</li>	26	</li>
27	<li><label for="booksellerinvoicenumber ">Bookseller invoice no: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% filters.booksellerinvoicenumber \| html %]" /></li>	27	<li><label for="booksellerinvoicenumber ">Vendor invoice number: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% filters.booksellerinvoicenumber \| html %]" /></li>
28	<li>	28	<li>
29	<label for="basketgroupname">Basket group:</label>	29	<label for="basketgroupname">Basket group:</label>
30	<input type="text" name="basketgroupname" id="basketgroupname" value="[% filters.basketgroupname \| html %]" />	30	<input type="text" name="basketgroupname" id="basketgroupname" value="[% filters.basketgroupname \| html %]" />




                  <th>&nbsp;</th>
                [% END %]
                <th>&nbsp;</th>
                <th>Invoice number</th>
                <th>Vendor</th>
                <th>Shipment date</th>
                <th>Billing date</th>

                        <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>

          <p>Search was:
            <ul>
              [% IF ( invoicenumber ) %]
                <li>Invoice number: [% invoicenumber | html %]</li>
              [% END %]
              [% IF booksellerid %]
                <li>Vendor: [% suppliername | html %]</li>

        <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>

Lines 50-56 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-2 / +1 lines)
50	<div id="parcels_duplicate_invoice" class="dialog alert">	50	<div id="parcels_duplicate_invoice" class="dialog alert">
51	<p>This invoice number has already been used. Would you like to receive on an existing invoice?</p>	51	<p>This invoice number has already been used. Would you like to receive on an existing invoice?</p>
52	<table>	52	<table>
53	<thead><tr><th>Invoice no.</th><th>Shipment date</th><th></th></tr></thead>	53	<thead><tr><th>Invoice number</th><th>Shipment date</th><th></th></tr></thead>
54	<tbody>	54	<tbody>
55	[% FOREACH invoice IN duplicate_invoices %]	55	[% FOREACH invoice IN duplicate_invoices %]
56	<tr>	56	<tr>
57	-

Return to bug 28508

Lines 55-61 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt (-4 / +4 lines)
55	<th> </th>	55	<th> </th>
56	[% END %]	56	[% END %]
57	<th> </th>	57	<th> </th>
58	<th>Invoice no.</th>	58	<th>Invoice number</th>
59	<th>Vendor</th>	59	<th>Vendor</th>
60	<th>Shipment date</th>	60	<th>Shipment date</th>
61	<th>Billing date</th>	61	<th>Billing date</th>
Lines 160-166 Link Here
160	<ol>	160	<ol>
161	<li><h2>Merge invoices</h2></li>	161	<li><h2>Merge invoices</h2></li>
162	<li><table id="merge_table">	162	<li><table id="merge_table">
163	<thead><tr><th>Invoice no.</th><th>Shipment date</th><th>Billing date</th><th>Shipment cost</th></tr></thead>	163	<thead><tr><th>Invoice number</th><th>Shipment date</th><th>Billing date</th><th>Shipment cost</th></tr></thead>
164	<tbody>	164	<tbody>
165	</tbody>	165	</tbody>
166	</table></li>	166	</table></li>
Lines 198-204 Link Here
198	<p>Search was:	198	<p>Search was:
199	<ul>	199	<ul>
200	[% IF ( invoicenumber ) %]	200	[% IF ( invoicenumber ) %]
201	<li>Invoice no.: [% invoicenumber \| html %]</li>	201	<li>Invoice number: [% invoicenumber \| html %]</li>
202	[% END %]	202	[% END %]
203	[% IF booksellerid %]	203	[% IF booksellerid %]
204	<li>Vendor: [% suppliername \| html %]</li>	204	<li>Vendor: [% suppliername \| html %]</li>
Lines 269-275 Link Here
269	<h3>Search filters</h3>	269	<h3>Search filters</h3>
270	<ol>	270	<ol>
271	<li>	271	<li>
272	<label for="invoicenumber">Invoice no:</label>	272	<label for="invoicenumber">Invoice number</label>
273	<input type="text" id="invoicenumber" name="invoicenumber" value="[% invoicenumber \| html %]" class="focus" />	273	<input type="text" id="invoicenumber" name="invoicenumber" value="[% invoicenumber \| html %]" class="focus" />
274	</li>	274	</li>
275	<li>	275	<li>