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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-5 / +5 lines)
Lines 406-412 Link Here
406 
                        [% IF ( active ) %]
 406 
                        [% IF ( active ) %]
407 
                            [% UNLESS ( closedate ) %]
 407 
                            [% UNLESS ( closedate ) %]
408 
                                <th>Modify</th>
 408 
                                <th>Modify</th>
409 
                                <th>Delete</th>
 409 
                                <th>Cancel order</th>
410 
                            [% END %]
 410 
                            [% END %]
411 
                        [% END %]
 411 
                        [% END %]
412 
                    </tr>
 412 
                    </tr>
Lines 534-547 Link Here
534 
                            </td>
 534 
                            </td>
535 
                            <td>
 535 
                            <td>
536 
                            [% IF ( books_loo.left_holds_on_order ) %]
 536 
                            [% IF ( books_loo.left_holds_on_order ) %]
537 
                            <span class="button" title="Can't delete order, ([% books_loo.holds_on_order %]) holds are linked with this order cancel holds first">Can't delete order</span><br>
 537 
                            <span class="button" title="Can't cancel order, ([% books_loo.holds_on_order %]) holds are linked with this order cancel holds first">Can't cancel order</span><br>
538 
                            [% ELSE %]
 538 
                            [% ELSE %]
539 
                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber %]&biblionumber=[% books_loo.biblionumber %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]" class="button">Delete order</a><br>
 539 
                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber %]&biblionumber=[% books_loo.biblionumber %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]" class="button">Cancel order</a><br>
540 
                            [% END %]
 540 
                            [% END %]
541 
                            [% IF ( books_loo.can_del_bib ) %]
 541 
                            [% IF ( books_loo.can_del_bib ) %]
542 
                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber %]&biblionumber=[% books_loo.biblionumber %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]" class="button">Delete order and catalog record</a><br>
 542 
                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber %]&biblionumber=[% books_loo.biblionumber %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]" class="button">Cancel order and delete catalog record</a><br>
543 
                            [% ELSE %]
 543 
                            [% ELSE %]
544 
                            <span class="button" title="Can't delete catalog record, see constraints below">Can't delete order and catalog record</span><br>
 544 
                            <span class="button" title="Can't delete catalog record, see constraints below">Can't cancel order and delete catalog record</span><br>
545 
                            [% END %]
 545 
                            [% END %]
546 
                            [% IF ( books_loo.left_item ) %]
 546 
                            [% IF ( books_loo.left_item ) %]
547 
                            <b title="Can't delete catalog record, because of [% books_loo.items %] existing hold(s)" >[% books_loo.items %] item(s) left</b><br>
 547 
                            <b title="Can't delete catalog record, because of [% books_loo.items %] existing hold(s)" >[% books_loo.items %] item(s) left</b><br>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-5 / +4 lines)
Lines 287-300 Link Here
287 
				</td>
 287 
				</td>
288 
				<td>
 288 
				<td>
289 
                        [% IF ( loop_order.left_holds_on_order ) %]
 289 
                        [% IF ( loop_order.left_holds_on_order ) %]
290 
                        <span class="button" title="Can't delete order, ([% loop_order.holds_on_order %]) holds are linked with this order cancel holds first">Can't delete order</span><br>
 290 
                        <span class="button" title="Can't cancel order, ([% loop_order.holds_on_order %]) holds are linked with this order cancel holds first">Can't cancel order</span><br>
291 
                        [% ELSE %]
 291 
                        [% ELSE %]
292 
                        <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber %]&biblionumber=[% loop_order.biblionumber %]&referrer=[% "/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid" | uri %]">Delete order</a><br />
 292 
                        <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber %]&biblionumber=[% loop_order.biblionumber %]&referrer=[% "/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid" | uri %]">Cancel order</a><br />
293 
                        [% END %]
 293 
                        [% END %]
294 
                        [% IF ( loop_order.can_del_bib ) %]
 294 
                        [% IF ( loop_order.can_del_bib ) %]
295 
                        <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber %]&biblionumber=[% loop_order.biblionumber %]&del_biblio=1&referrer=[% "/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid" | uri %]">Delete order and catalog record</a><br />
 295 
                        <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber %]&biblionumber=[% loop_order.biblionumber %]&del_biblio=1&referrer=[% "/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid" | uri %]">Cancel order and catalog record</a><br />
296 
                        [% ELSE %]
 296 
                        [% ELSE %]
297 
                        <span class="button" title="Can't delete catalog record, see constraints below">Can't delete order and catalog record</span><br>
 297 
                        <span class="button" title="Can't delete catalog record, see constraints below">Can't cancel order and delete catalog record</span><br>
298 
                        [% END %]
 298 
                        [% END %]
299 
                        [% IF ( loop_order.left_item ) %]
 299 
                        [% IF ( loop_order.left_item ) %]
300 
                        <b title="Can't delete catalog record, because of [% loop_order.items %] existing item(s)" >[% loop_order.items %] item(s) left</b><br>
 300 
                        <b title="Can't delete catalog record, because of [% loop_order.items %] existing item(s)" >[% loop_order.items %] item(s) left</b><br>
301 
-

Return to bug 16253