From 635b0aeb0b5bd9daa12666449b988c081885725b Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Mon, 1 Feb 2021 13:14:45 +0000 Subject: [PATCH] Bug 27583: Proposed terminology changes Content-Type: text/plain; charset=utf-8 This patch impliments some terminology changes and clarifications for the cash management system Test plan 1/ Apply the patches 2/ Enable 'UseCashRegisters' 3/ Navigate around the cash management system (via the Tools menu) 4/ Enable 'EnablePointOfSale' 5/ Navigate around the cash management system (via the Point of sale module) 6/ Comment on what you think about the changes Signed-off-by: Sally Signed-off-by: Marcel de Rooy --- .../prog/en/includes/pos-menu.inc | 11 +++++++--- .../prog/en/modules/pos/register.tt | 6 +++--- .../prog/en/modules/pos/registers.tt | 6 +++--- .../prog/en/modules/tools/tools-home.tt | 21 ++++++++++++++----- 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc index cb9998082e..3878bfa742 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc @@ -1,10 +1,15 @@ +[% USE Branches %] +[% USE Registers %] [% END %] -

Library transaction details for [% library.branchname | html %]

+

Cash summary for [% library.branchname | html %]

Summary

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt index f9f66787c3..306d9224fe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt @@ -1,4 +1,6 @@ [% USE Koha %] +[% USE Branches %] +[% USE Registers %] [% INCLUDE 'doc-head-open.inc' %] Tools › Koha @@ -153,17 +155,26 @@
    Access files stored on the server, like log files or reports
    [% END %] - [% IF ( Koha.Preference('UseCashRegisters') && CAN_user_cash_management_cashup ) %] -
    Cashup registers
    -
    Perform cashup actions on cash registers
    - [% END %] - [% IF ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports ) %]
    OPAC problem reports
    Manage OPAC problem reports submitted by patrons
    [% END %] + +[% IF ( Koha.Preference('UseCashRegisters') && ( CAN_user_cash_management_cashup || CAN_user_cash_management_anonymous_refund ) ) %] +

    Cash management

    +
    + +
    Cash summary for [% Branches.GetLoggedInBranchname | html %]
    +
    View cash takings for the current library
    + +
    Transaction history for [% Registers.session_register_name | html %]
    +
    View transaction history for the current cash register
    + +
    +[% END %] +
    -- 2.20.1