[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.06-70-g6030501

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.22.x has been updated
       via  6030501a748d4390a899734204da3e8e4ccbd6da (commit)
      from  15c08b887cfdfcd0b9d9dd9d99d65f03f5486bc2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6030501a748d4390a899734204da3e8e4ccbd6da
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Tue Apr 26 01:15:47 2016 +0000

    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 at abunchofthings.net>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 61d670795fe89aca2d244668c51b1b75145bb5a5)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

-----------------------------------------------------------------------

Summary of changes:
 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(-)


hooks/post-receive
-- 
main Koha release repository