Attachment 50851 Details for Bug 16253 – Bug 16253: Changing 'delete order' to 'cancel order'

[patch] Bug 16253: Changing 'delete order' to 'cancel order'

Bug-16253-Changing-delete-order-to-cancel-order.patch (text/plain), 6.49 KB, created by Mirko Tietgen on 2016-04-27 21:18:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mirko Tietgen

Created: 2016-04-27 21:18:26 UTC

Size: 6.49 KB

patch

obsolete

>From 20e6781b4ed95247488f4f039d109ec7e6fe8b09 Mon Sep 17 00:00:00 2001
>From: Aleisha <aleishaamohia@hotmail.com>
>Date: Tue, 26 Apr 2016 01:15:47 +0000
>Subject: [PATCH] Bug 16253: Changing 'delete order' to 'cancel order'
>
>To test:
>1) Go to Acqui -> do a vendor search and view an open basket
>2) Confirm last column heading says cancel instead of delete
>3) Confirm link to cancel order says cancel instead of delete
>4) If can't delete record, confirm reasons say cancel order instead of delete
>5) Click the vendor name, then Baskets tab, then Receive Shipment
>6) Fill vendor invoice field and click next
>7) If there are any pending orders, confirm that all instances of 'delete order' now say cancel
>
>Sponsored-by: Catalyst IT
>Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 10 +++++-----
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 8 ++++----
> 2 files changed, 9 insertions(+), 9 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>index 6fe023d..385cc0a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>@@ -406,7 +406,7 @@
> [% IF ( active ) %]
> [% UNLESS ( closedate ) %]
> <th>Modify</th>
>- <th>Delete</th>
>+ <th>Cancel order line</th>
> [% END %]
> [% END %]
> </tr>
>@@ -534,14 +534,14 @@
> </td>
> <td>
> [% IF ( books_loo.left_holds_on_order ) %]
>- Can't delete order 
>+ Can't cancel order 
> [% ELSE %]
>- <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> 
>+ <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> 
> [% END %]
> [% IF ( books_loo.can_del_bib ) %]
>- <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> 
>+ <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> 
> [% ELSE %]
>- Can't delete order and catalog record 
>+ Can't cancel order and delete catalog record 
> [% END %]
> [% IF ( books_loo.left_item ) %]
> [% books_loo.items %] item(s) left 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>index 05de288..bee55a8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>@@ -287,14 +287,14 @@
> 				</td>
> 				<td>
> [% IF ( loop_order.left_holds_on_order ) %]
>- Can't delete order 
>+ Can't cancel order 
> [% ELSE %]
>- <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> 
>+ <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> 
> [% END %]
> [% IF ( loop_order.can_del_bib ) %]
>- <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> 
>+ <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> 
> [% ELSE %]
>- Can't delete order and catalog record 
>+ Can't cancel order and delete catalog record 
> [% END %]
> [% IF ( loop_order.left_item ) %]
> [% loop_order.items %] item(s) left 
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 16253: 50691 | 50851 | 50854