From 2565c2b0393ba8f5d587ba4315dbad40a8556d6f Mon Sep 17 00:00:00 2001 From: Aleisha 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 --- 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 5aec704..1b1fc48 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 ) %] Modify - Delete + Cancel order line [% END %] [% END %] @@ -534,14 +534,14 @@ [% IF ( books_loo.left_holds_on_order ) %] - Can't delete order
+ Can't cancel order
[% ELSE %] - Delete order
+ Cancel order
[% END %] [% IF ( books_loo.can_del_bib ) %] - Delete order and catalog record
+ Cancel order and delete catalog record
[% 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 @@ [% IF ( loop_order.left_holds_on_order ) %] - Can't delete order
+ Can't cancel order
[% ELSE %] - Delete order
+ Cancel order
[% END %] [% IF ( loop_order.can_del_bib ) %] - Delete order and catalog record
+ Cancel order and catalog record
[% 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
-- 1.7.10.4