From d0bad27f1267453db2c78cc95ce52330b51c9610 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 11 Dec 2013 11:03:14 -0500 Subject: [PATCH] Bug 6427 [Part 6] - Make existing scripts point to the new accounting scripts --- .../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +- .../intranet-tmpl/prog/en/includes/circ-menu.tt | 2 +- .../prog/en/includes/members-menu.inc | 2 +- .../prog/en/modules/circ/circulation.tt | 7 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- .../prog/en/modules/members/mancredit.tt | 63 -------------------- 6 files changed, 8 insertions(+), 70 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index 5687d01..c375ec5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -67,7 +67,7 @@ [% IF ( detailview ) %]
  • [% ELSE %]
  • [% END %]Details
  • [% END %] [% IF ( CAN_user_updatecharges ) %] - [% IF ( finesview ) %]
  • [% ELSE %]
  • [% END %]Fines
  • + [% IF ( accounts_view ) %]
  • [% ELSE %]
  • [% END %]Fines
  • [% END %] [% IF ( RoutingSerials ) %][% IF ( routinglistview ) %]
  • [% ELSE %]
  • [% END %]Routing lists
  • [% END %] [% IF ( intranetreadinghistory ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt index 7f8cb48..456d52d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt @@ -70,7 +70,7 @@ in the global namespace %] [% IF ( detailview ) %]
  • [% ELSE %]
  • [% END %]Details
  • [% END %] [% IF ( CAN_user_updatecharges ) %] - [% IF ( finesview ) %]
  • [% ELSE %]
  • [% END %]Fines
  • + [% IF ( accounts_view ) %]
  • [% ELSE %]
  • [% END %]Fines
  • [% END %] [% IF ( RoutingSerials ) %][% IF ( routinglistview ) %]
  • [% ELSE %]
  • [% END %]Routing lists
  • [% END %] [% IF ( intranetreadinghistory ) %][% IF ( readingrecordview ) %]
  • [% ELSE %]
  • [% END %]Circulation history
  • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc index 9bd5285..9208e17 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc @@ -4,7 +4,7 @@ [% IF ( circview ) %]
  • [% ELSE %]
  • [% END %]Check out
  • [% IF ( detailview ) %]
  • [% ELSE %]
  • [% END %]Details
  • [% IF ( CAN_user_updatecharges ) %] - [% IF ( finesview ) %]
  • [% ELSE %]
  • [% END %]Fines
  • + [% IF ( finesview ) %]
  • [% ELSE %]
  • [% END %]Fines
  • [% END %] [% IF ( intranetreadinghistory ) %] [% IF ( readingrecordview ) %]
  • [% ELSE %]
  • [% END %]Circulation history
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 5a6a82d..a118618 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1,5 +1,6 @@ [% USE Branches %] [% USE KohaDates %] +[% USE Currency %] [% IF ( export_remove_fields OR export_with_csv_profile ) %] [% SET exports_enabled = 1 %] [% END %] @@ -606,16 +607,16 @@ No patron matched [% message %] [% IF ( charges ) %]
  • - Fees & Charges: Patron has Outstanding fees & charges[% IF ( chargesamount ) %] of [% chargesamount %][% END %]. + Fees & Charges: Patron has Outstanding fees & charges[% IF ( chargesamount ) %] of [% chargesamount | $Currency %][% END %]. [% IF ( charges_is_blocker ) %] Checkouts are BLOCKED because fine balance is OVER THE LIMIT. [% END %] - Make payment
  • + Make payment [% END %] [% IF ( credits ) %]
  • - Credits: Patron has a credit[% IF ( creditsamount ) %] of [% creditsamount %][% END %] + Credits: Patron has a credit[% IF ( creditsamount ) %] of [% creditsamount | $Currency %][% END %]
  • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index aee0a5e..c654847 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -74,7 +74,7 @@ $(document).ready(function () { [% IF ( fines ) %]

    Patron has outstanding fines of [% fines %].

    -

    Make payment.

    +

    Make payment.

    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt deleted file mode 100644 index a4219fa..0000000 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt +++ /dev/null @@ -1,63 +0,0 @@ -[% INCLUDE 'doc-head-open.inc' %] -Koha › Borrowers › Create manual credit -[% INCLUDE 'doc-head-close.inc' %] - - - -[% INCLUDE 'header.inc' %] -[% INCLUDE 'patron-search.inc' %] - - - -
    - -
    -
    -
    -[% INCLUDE 'members-toolbar.inc' %] - - -
    - -
    - -
    - - -
    -Manual credit
      -
    1. -
    2. -
    3. -
    4. -
    5. Example: 5.00
    6. -
    - -
    Cancel
    -
    - -
    - -
    -
    - -
    -[% INCLUDE 'circ-menu.inc' %] -
    -
    -[% INCLUDE 'intranet-bottom.inc' %] -- 1.7.2.5