@@ -, +, @@ --- C4/Auth.pm | 1 + installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 8 ++++++++ .../prog/en/includes/patron-default-view.inc | 5 +++++ .../prog/en/modules/admin/aqbudgets.tt | 4 ++-- .../prog/en/modules/admin/preferences/patrons.pref | 6 ++++++ .../prog/en/modules/catalogue/detail.tt | 4 ++-- .../prog/en/modules/catalogue/issuehistory.tt | 2 +- .../prog/en/modules/catalogue/moredetail.tt | 8 ++++---- .../prog/en/modules/circ/branchoverdues.tt | 4 ++-- .../prog/en/modules/circ/branchtransfers.tt | 6 +++--- .../prog/en/modules/circ/circulation.tt | 10 +++++----- .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 14 +++++++------- .../prog/en/modules/circ/transferstoreceive.tt | 2 +- .../prog/en/modules/circ/view_holdsqueue.tt | 2 +- .../prog/en/modules/circ/waitingreserves.tt | 4 ++-- .../prog/en/modules/members/member-password.tt | 10 ++++++++-- .../prog/en/modules/members/member.tt | 2 +- .../prog/en/modules/members/memberentrygen.tt | 9 +++++++-- .../prog/en/modules/members/moremember-print.tt | 2 +- .../prog/en/modules/members/moremember-receipt.tt | 9 ++------- .../prog/en/modules/members/moremember.tt | 6 +++--- .../prog/en/modules/members/update-child.tt | 3 ++- .../prog/en/modules/offline_circ/list.tt | 4 ++-- .../prog/en/modules/offline_circ/process_koc.tt | 8 ++++---- .../prog/en/modules/patroncards/members-search.tt | 2 +- .../prog/en/modules/reports/bor_issues_top.tt | 2 +- .../prog/en/modules/reserve/request.tt | 16 ++++++++-------- .../prog/en/modules/reviews/reviewswaiting.tt | 2 +- .../prog/en/modules/serials/viewalerts.tt | 2 +- .../prog/en/modules/suggestion/suggestion.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 15 +++++++-------- .../prog/en/modules/virtualshelves/shelves.tt | 2 +- 34 files changed, 105 insertions(+), 78 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/patron-default-view.inc --- a/C4/Auth.pm +++ a/C4/Auth.pm @@ -352,6 +352,7 @@ sub get_template_and_user { IntranetUserCSS => C4::Context->preference("IntranetUserCSS"), intranetuserjs => C4::Context->preference("intranetuserjs"), intranetbookbag => C4::Context->preference("intranetbookbag"), + PatronDefaultView => C4::Context->preference("PatronDefaultView"), suggestion => C4::Context->preference("suggestion"), virtualshelves => C4::Context->preference("virtualshelves"), StaffSerialIssueDisplayCount => C4::Context->preference("StaffSerialIssueDisplayCount"), --- a/installer/data/mysql/sysprefs.sql +++ a/installer/data/mysql/sysprefs.sql @@ -69,6 +69,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('memberofinstitution',0,'If ON, patrons can be linked to institutions',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('noissuescharge',5,'Define maximum amount withstanding before check outs are blocked','','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NotifyBorrowerDeparture',30,'Define number of days before expiry where circulation is warned about patron account expiry',NULL,'Integer'); +INSERT INTO `systempreferences` (variable, value, options, explanation, type) VALUES ( 'PatronDefaultView', 'normal', 'circ|detail', 'Choose the default destination for links to patron records: checkout or patron details', 'Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacAuthorities',1,'If ON, enables the search authorities link on OPAC',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacbookbag',1,'If ON, enables display of Cart feature','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('intranetbookbag','1','If ON, enables display of Cart feature in the intranet','','YesNo'); --- a/installer/data/mysql/updatedatabase.pl +++ a/installer/data/mysql/updatedatabase.pl @@ -4892,6 +4892,14 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.07.00.XXX"; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("INSERT INTO koha.systempreferences (variable, value, options, explanation, type) VALUES ( +'PatronDefaultView', 'normal', 'circ|detail', 'Choose the default destination for links to patron records: checkout or patron details', 'Choice');"); + print "Upgrade to $DBversion done (Bug 7680 - Create a PatronDefaultView preference for the staff client)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 DropAllForeignKeys($table) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-default-view.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-default-view.inc @@ -0,0 +1,5 @@ +[% IF ( PatronDefaultView == 'circ' ) %] + +[% ELSE %] + +[% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -211,7 +211,7 @@ [% END %] [% budge.budget_remaining %] - [% IF ( budge.budget_owner_id ) %]Owner: [% budge.budget_owner_name %][% END %] + [% IF ( budge.budget_owner_id ) %]Owner: [% INCLUDE 'patron-default-view.inc' borrowernumber = budge.budget_owner_id %][% budge.budget_owner_name %][% END %] [% IF ( budge.budget_branchcode ) %]
Library: [% budge.budget_branchcode %][% END %] [% IF ( budge.budget_notes ) %]
Notes: [% budge.budget_notes %][% END %] [% IF ( budge.budget_hierarchy ) %] @@ -294,7 +294,7 @@
  • Owner: - [% budget_owner_name %] + [% INCLUDE 'patron-default-view.inc' borrowernumber = budget_owner_id %][% budget_owner_name %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref @@ -94,6 +94,12 @@ Patrons: class: integer - days beforehand. - + - Links to patron records point to + - pref: PatronDefaultView + choices: + circ: checkout + detail: "patron details" + - - pref: patronimages choices: yes: Allow --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -308,7 +308,7 @@ function verify_images() { [% IF ( itemloo.datedue ) %] Checked out [% UNLESS ( itemloo.NOTSAMEBRANCH ) %] - to + to [% INCLUDE 'patron-default-view.inc' borrowernumber = itemloo.borrowernumber %] [% IF ( itemloo.hidepatronname ) %] [% itemloo.cardnumber %] [% ELSE %] @@ -366,7 +366,7 @@ function verify_images() { [% ELSE %] Item-level hold [% END %] - [% IF ( canreservefromotherbranches ) %]for + [% IF ( canreservefromotherbranches ) %]for [% INCLUDE 'patron-default-view.inc' borrowernumber = itemloo.ReservedForBorrowernumber %] [% IF ( itemloo.hidepatronname ) %] [% itemloo.Reservedcardnumber %] [% ELSE %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt @@ -34,7 +34,7 @@ [% FOREACH issue IN issues %] [% UNLESS ( loop.odd ) %][% ELSE %][% END %] - [% IF HidePatronName %][% issue.cardnumber %][% ELSE %][% issue.surname %][% IF ( issue.firstname ) %], [% issue.firstname %][% END %][% END %] + [% INCLUDE 'patron-default-view.inc' borrowernumber = issue.borrowernumber %][% IF HidePatronName %][% issue.cardnumber %][% ELSE %][% issue.surname %][% IF ( issue.firstname ) %], [% issue.firstname %][% END %][% END %] [% IF ( issue.barcode ) %] [% issue.barcode %] [% ELSE %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -69,7 +69,7 @@
    1. Current Location: [% ITEM_DAT.holdingbranchname %] 
    2. -
    3. Checkout Status: [% IF ( ITEM_DAT.issue ) %]Checked out to [% ITEM_DAT.cardnumber %][% IF ( ITEM_DAT.lastreneweddate ) %], Last renewed [% ITEM_DAT.lastreneweddate %][% END %], Due back on [% ITEM_DAT.datedue %][% ELSE %]Not Checked out [% END %]
    4. +
    5. Checkout Status: [% IF ( ITEM_DAT.issue ) %]Checked out to [% INCLUDE 'patron-default-view.inc' borrowernumber = ITEM_DAT.borrowernumber %][% ITEM_DAT.cardnumber %][% IF ( ITEM_DAT.lastreneweddate ) %], Last renewed [% ITEM_DAT.lastreneweddate %][% END %], Due back on [% ITEM_DAT.datedue %][% ELSE %]Not Checked out [% END %]
    6. Current Renewals: [% ITEM_DAT.renewals %] 
    7. [% IF ( ITEM_DAT.itemlostloop ) %]
    8. Lost Status: @@ -171,9 +171,9 @@
    9. Last seen: [% ITEM_DAT.datelastseen %] 
    10. Last borrowed: [% ITEM_DAT.datelastborrowed %] 
    11. - [% IF ( ITEM_DAT.card0 ) %]
    12. Last Borrower: [% ITEM_DAT.card0 %] 
    13. [% END %] - [% IF ( ITEM_DAT.card1 ) %]
    14. Previous Borrower: [% ITEM_DAT.card1 %] 
    15. [% END %] - [% IF ( ITEM_DAT.card2 ) %]
    16. Previous Borrower: [% ITEM_DAT.card2 %] 
    17. [% END %] + [% IF ( ITEM_DAT.card0 ) %]
    18. Last Borrower: [% INCLUDE 'patron-default-view.inc' borrowernumber = ITEM_DAT.borrower0 %][% ITEM_DAT.card0 %] 
    19. [% END %] + [% IF ( ITEM_DAT.card1 ) %]
    20. Previous Borrower: [% INCLUDE 'patron-default-view.inc' borrowernumber = ITEM_DAT.borrower1 %][% ITEM_DAT.card1 %] 
    21. [% END %] + [% IF ( ITEM_DAT.card2 ) %]
    22. Previous Borrower: [% INCLUDE 'patron-default-view.inc' borrowernumber = ITEM_DAT.borrower2 %][% ITEM_DAT.card2 %] 
    23. [% END %]
    24. Paid for?: [% ITEM_DAT.paidfor %] 
    25. Serial enumeration: [% ITEM_DAT.enumchron %] 
    26. Public Note: --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt @@ -48,7 +48,7 @@
      Barcode : [% overduesloo.barcode %] - [% overduesloo.borrowersurname %], [% overduesloo.borrowerfirstname %]
      [% overduesloo.borrowerphone %]
      + [% INCLUDE 'patron-default-view.inc' borrowernumber = overduesloo.borrowernumber %][% overduesloo.borrowersurname %], [% overduesloo.borrowerfirstname %]
      [% overduesloo.borrowerphone %]
      [% IF ( overduesloo.borroweremail ) %] [% overduesloo.borroweremail %][% END %] @@ -126,7 +126,7 @@

      -

      [% todayoverduesloo.borrowersurname %]   [% todayoverduesloo.borrowerfirstname %]
      [% todayoverduesloo.borrowerphone %]
      +

      [% INCLUDE 'patron-default-view.inc' borrowernumber = todayoverduesloo.borrowernumber %][% todayoverduesloo.borrowersurname %]   [% todayoverduesloo.borrowerfirstname %]
      [% todayoverduesloo.borrowerphone %]
      [% IF ( todayoverduesloo.borroweremail ) %] [% todayoverduesloo.borroweremail %][% END %]

      --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt @@ -16,10 +16,10 @@ @@ -116,7 +116,7 @@
    27. Item is already at destination library.
    28. [% END %] [% IF ( errmsgloo.errwasreturned ) %] -
    29. Item was on loan to +
    30. Item was on loan to [% INCLUDE 'patron-default-view.inc' borrowernumber = errmsgloo.borrowernumber %] [% errmsgloo.firstname %] [% errmsgloo.surname %] ([% errmsgloo.cardnumber %]) and has been returned.
    31. [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -249,15 +249,15 @@ function refocus(calendar) { [% END %] [% IF ( RESERVE_WAITING ) %] -
    32. Item [% getTitleMessageIteminfo %] ([% getBarcodeMessageIteminfo %]) has been waiting for [% resfirstname %] [% ressurname %] ([% rescardnumber %]) at [% resbranchname %] since [% reswaitingdate %]
    33. +
    34. Item [% getTitleMessageIteminfo %] ([% getBarcodeMessageIteminfo %]) has been waiting for [% INCLUDE 'patron-default-view.inc' borrowernumber = resborrowernumber %][% resfirstname %] [% ressurname %] ([% rescardnumber %]) at [% resbranchname %] since [% reswaitingdate %]
    35. [% END %] [% IF ( RESERVED ) %] -
    36. Item [% getTitleMessageIteminfo %] ([% getBarcodeMessageIteminfo %]) has been on hold for [% resfirstname %] [% ressurname %] ([% rescardnumber %]) at [% resbranchname %] since [% resreservedate %]
    37. +
    38. Item [% getTitleMessageIteminfo %] ([% getBarcodeMessageIteminfo %]) has been on hold for [% INCLUDE 'patron-default-view.inc' borrowernumber = resborrowernumber %][% resfirstname %] [% ressurname %] ([% rescardnumber %]) at [% resbranchname %] since [% resreservedate %]
    39. [% END %] [% IF ( ISSUED_TO_ANOTHER ) %] -
    40. Item [% getTitleMessageIteminfo %] ([% getBarcodeMessageIteminfo %]) is checked out to [% issued_firstname %] [% issued_surname %] ([% issued_cardnumber %]). Check in and check out?
    41. +
    42. Item [% getTitleMessageIteminfo %] ([% getBarcodeMessageIteminfo %]) is checked out to [% INCLUDE 'patron-default-view.inc' borrowernumber = issued_borrowernumber %][% issued_firstname %] [% issued_surname %] ([% issued_cardnumber %]). Check in and check out?
    43. [% END %] [% IF ( TOO_MANY ) %] @@ -903,7 +903,7 @@ No patron matched [% message %] - + [% END %] [% END %] @@ -926,7 +926,7 @@ No patron matched [% message %] [% IF ( relprevissue.multiple_borrowers ) %][% END %] - + [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt @@ -116,7 +116,7 @@ [% FOREACH overdueloo IN overdueloop %] - --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -88,7 +88,7 @@ function Dopop(link) { [% IF ( WrongTransfer ) %]

      Please return [% title |html %] to [% TransferWaitingAt %]

      Print Slip or Cancel Transfer

      [% IF ( wborcnum ) %]
      Hold for:
      -
      • +
        • [% INCLUDE 'patron-default-view.inc' %] [% borsurname %], [% borfirstname %] ([% borcnum %])
        • [% wboraddress %][% IF ( wboraddress2 ) %]
          [% wboraddress2 %]
          [% END %] @@ -122,7 +122,7 @@ function Dopop(link) { [% IF ( reservenotes ) %]

          Notes: [% reservenotes %]

          [% END %]

          Hold for:

            -
          • [% borsurname %], [% borfirstname %] ([% borcnum %])
          • +
          • [% INCLUDE 'patron-default-view.inc' %][% borsurname %], [% borfirstname %] ([% borcnum %])
          • [% boraddress %]
            [% IF ( boraddress2 ) %][% boraddress2 %]
            [% END %] [% borcity %] [% borzip %]
          • @@ -163,7 +163,7 @@ function Dopop(link) {

            Hold needing transfer found: [% title |html %]

            Hold for:

              -
            • [% borsurname %], [% borfirstname %] ([% borcnum %])
            • +
            • [% INCLUDE 'patron-default-view.inc' %][% borsurname %], [% borfirstname %] ([% borcnum %])
            • [% boraddress %]
              [% IF ( boraddress2 ) %][% boraddress2 %]
              [% END %] [% borcity %] [% borzip %]
            • @@ -269,7 +269,7 @@ function Dopop(link) { [% IF ( reservenotes ) %]

              Notes: [% reservenotes %]

              [% END %]
              Hold for:
      --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt @@ -65,7 +65,7 @@ $(document).ready(function() {
      Barcode: [% reser.barcode %] - + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -93,7 +93,7 @@ $.tablesorter.addParser({   ([% reserveloo.itemtype %])
      Barcode: [% reserveloo.barcode %] - @@ -152,7 +152,7 @@ $.tablesorter.addParser({ [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %]  ([% overloo.itemtype %])[% END %][% END %]
      Barcode: [% overloo.barcode %] - --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt @@ -40,7 +40,7 @@ [% ELSE %] - + [% IF ( errormsg ) %] @@ -85,7 +85,13 @@ -
      Cancel
      +
      + [% IF ( destination == 'circ' ) %] + + [% ELSE %] + + [% END %] + Cancel
      [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt @@ -60,7 +60,7 @@ [% END %] [% END %] - --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -74,7 +74,7 @@ Add[% IF ( categoryname ) %] [% categoryname %] patron[% ELSE %][% IF ( I ) %] Organization patron[% END %][% IF ( A ) %] Adult patron[% END %][% IF ( C ) %] Child patron[% END %][% IF ( P ) %] Professional patron[% END %][% IF ( S ) %] Staff patron[% END %][% END %] [% surname %] [% firstname %] [% ELSE %] -[% firstname %] [% surname %][% IF ( opduplicate ) %]Duplicate[% ELSE %]Modify[% END %][% IF ( categoryname ) %] [% categoryname %] patron[% ELSE %][% IF ( I ) %] Organization patron[% END %][% IF ( A ) %] Adult patron[% END %][% IF ( C ) %] Child patron[% END %][% IF ( P ) %] Professional patron[% END %][% IF ( S ) %] Staff patron[% END %][% END %] +[% INCLUDE 'patron-default-view.inc' %][% firstname %] [% surname %] › [% IF ( opduplicate ) %]Duplicate[% ELSE %]Modify[% END %][% IF ( categoryname ) %] [% categoryname %] patron[% ELSE %][% IF ( I ) %] Organization patron[% END %][% IF ( A ) %] Adult patron[% END %][% IF ( C ) %] Child patron[% END %][% IF ( P ) %] Professional patron[% END %][% IF ( S ) %] Staff patron[% END %][% END %] [% END %] [% IF ( opadd ) %]
      [% ELSE %]
      [% END %] @@ -1464,7 +1464,12 @@ [% IF ( opadd ) %] Cancel [% ELSE %] - Cancel + [% IF ( destination == 'circ' ) %] + + [% ELSE %] + + [% END %] + Cancel [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt @@ -16,7 +16,7 @@
      -

      Account Summary: [% firstname %] [% surname %] ([% cardnumber %])

      +

      [% INCLUDE 'patron-default-view.inc' %]Account Summary: [% firstname %] [% surname %] ([% cardnumber %])

      • [% address %]
        [% address2 %]
      • [% city %], [% zipcode %]
      • [% IF ( phone ) %][% phone %][% ELSE %](no phone number on file)[% END %]
      • --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt @@ -4,12 +4,7 @@ - + @@ -18,7 +13,7 @@

        [% LibraryName %]

        [% IF ( branchname ) %][% branchname %]
        [% END %] Checked out to [% firstname %] [% surname %]
        -([% cardnumber %])
        +([% INCLUDE 'patron-default-view.inc' %][% cardnumber %])
        [% todaysdate %]
        --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -226,11 +226,11 @@ function validate1(date) { [% END %] [% IF ( isguarantee ) %] [% IF ( guaranteeloop ) %] -
      • Guarantees:
      • +
      • Guarantees:
          [% FOREACH guaranteeloo IN guaranteeloop %]
        • [% INCLUDE 'patron-default-view.inc' borrowernumber = guaranteeloo.borrowernumber %][% guaranteeloo.name %]
        • [% END %]
      • [% END %] [% ELSE %] [% IF ( guarantorborrowernumber ) %] -
      • Guarantor:[% guarantorsurname %], [% guarantorfirstname %]
      • +
      • Guarantor:[% INCLUDE 'patron-default-view.inc' borrowernumber = guarantorborrowernumber %][% guarantorsurname %], [% guarantorfirstname %]
      • [% END %] [% END %] @@ -572,7 +572,7 @@ function validate1(date) {
      - + [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt @@ -36,7 +36,8 @@ confirm_updatechild([% borrowernumber %]); [% IF ( SUCCESS ) %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt @@ -78,7 +78,7 @@ - + @@ -97,7 +97,7 @@ - + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt @@ -51,7 +51,7 @@ function Dopop(link) { [% loopro.rowtitle %] [% FOREACH loopcel IN loopro.loopcell %] [% IF ( loopcel.hilighted ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -204,10 +204,10 @@ function checkMultiHold() {

      Cannot Place Hold

        [% IF ( maxreserves ) %] -
      • Too Many Holds: [% borrowerfirstname %] [% borrowersurname %] has too many holds.
      • +
      • Too Many Holds: [% INCLUDE 'patron-default-view.inc' %][% borrowerfirstname %] [% borrowersurname %] has too many holds.
      • [% END %] [% IF ( alreadyreserved ) %] -
      • [% borrowerfirstname %] [% borrowersurname %] already has a hold on this item
      • +
      • [% INCLUDE 'patron-default-view.inc' %][% borrowerfirstname %] [% borrowersurname %] already has a hold on this item
      • [% END %] [% IF ( none_available ) %]
      • No copies are available to be placed on hold
      • @@ -223,11 +223,11 @@ function checkMultiHold() { [% IF ( messages ) %]
          [% IF ( expiry ) %] -
        • [% borrowerfirstname %] [% borrowersurname %]'s account has expired
        • +
        • [% INCLUDE 'patron-default-view.inc' %][% borrowerfirstname %] [% borrowersurname %]'s account has expired
        • [% END %] [% IF ( diffbranch ) %] -
        • Pickup library is different than [% borrowerfirstname %] [% borrowersurname %]'s home library ([% borrower_branchname %] / [% borrower_branchcode %] )
        • +
        • Pickup library is different than [% INCLUDE 'patron-default-view.inc' %][% borrowerfirstname %] [% borrowersurname %]'s home library ([% borrower_branchname %] / [% borrower_branchcode %] )
        • [% END %]
        @@ -265,7 +265,7 @@ function checkMultiHold() {
        1. Patron: [% IF ( borrowernumber ) %] - [% borrowerfirstname %] [% borrowersurname %] ([% cardnumber %]) + [% INCLUDE 'patron-default-view.inc' %][% borrowerfirstname %] [% borrowersurname %] ([% cardnumber %]) [% ELSE %] Not defined yet [% END %] @@ -460,7 +460,7 @@ function checkMultiHold() { Can't be cancelled when item is in transit [% ELSE %] [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %] - [% IF ( itemloo.canreservefromotherbranches ) %]for [% itemloo.ReservedForFirstname %] [% itemloo.ReservedForSurname %][% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% itemloo.ExpectedAtLibrary %] + [% IF ( itemloo.canreservefromotherbranches ) %]for [% INCLUDE 'patron-default-view.inc' borrowernumber = itemloo.ReservedForBorrowernumber %][% itemloo.ReservedForFirstname %] [% itemloo.ReservedForSurname %][% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% itemloo.ExpectedAtLibrary %] since [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %][% END %]. Cancel hold @@ -526,7 +526,7 @@ function checkMultiHold() { [% END %] [% IF ( biblioloo.alreadyres ) %] -
        2. [% borrowerfirstname %] [% borrowersurname %] already has a hold on this item
        3. +
        4. [% INCLUDE 'patron-default-view.inc' %][% borrowerfirstname %] [% borrowersurname %] already has a hold on this item
        5. [% END %] [% IF ( biblioloo.none_avail ) %]
        6. No copies are available to be placed on hold
        7. @@ -639,7 +639,7 @@ function checkMultiHold() { [% END %]
      [% FOREACH review IN reviews %] - + [% END %]
      [% IF ( reserved ) %] - Reserve found for [% name %] ([% borrowernumber %]). + Reserve found for [% name %] ([% INCLUDE 'patron-default-view.inc' %][% borrowernumber %]). [% END %] [% IF ( waiting ) %] - Item is marked waiting at [% branchname %] for [% name %] ([% borrowernumber %]). + Item is marked waiting at [% branchname %] for [% name %] ([% INCLUDE 'patron-default-view.inc' %][% borrowernumber %]). [% END %]
      [% relissue.issuingbranchname %] [% relissue.itemcallnumber %] [% relissue.charge %][% relissue.replacementprice %][% relissue.firstname %] [% relissue.surname %] ([% relissue.cardnumber %])[% relissue.replacementprice %][% INCLUDE 'patron-default-view.inc' borrowernumber = relissue.borrowernumber %][% relissue.firstname %] [% relissue.surname %] ([% relissue.cardnumber %])
      [% relprevissue.firstname %] [% relprevissue.surname %][% relprevissue.charge %] [% relprevissue.replacementprice %][% relprevissue.firstname %] [% relprevissue.surname %] ([% relprevissue.cardnumber %])[% INCLUDE 'patron-default-view.inc' borrowernumber = relprevissue.borrowernumber %][% relprevissue.firstname %] [% relprevissue.surname %] ([% relprevissue.cardnumber %])
      [% overdueloo.duedate %][% overdueloo.surname %] [% overdueloo.firstname %] + [% INCLUDE 'patron-default-view.inc' borrowernumber = overdueloo.borrowernumber %][% overdueloo.surname %] [% overdueloo.firstname %] [% IF ( overdueloo.email ) %][email][% END %] [% IF ( overdueloo.phone ) %]([% overdueloo.phone %])[% ELSIF ( overdueloo.mobile ) %]([% overdueloo.mobile %])[% ELSIF ( overdueloo.phonepro ) %]([% overdueloo.phonepro %])[% END %] [% overdueloo.branchcode %][% title |html %] - [% riborsurname %], [% ribortitle %] [% riborfirstname %] ([% riborcnum %]) + [% INCLUDE 'patron-default-view.inc' borrowernumber = riborrowernumber %][% riborsurname %], [% ribortitle %] [% riborfirstname %] ([% riborcnum %]) [% IF ( flagset ) %] ([% FOREACH flagloo IN flagloop %] [% flagloo.flag %] @@ -445,7 +445,7 @@ function Dopop(link) { [% riloo.itemcallnumber %] [% riloo.itemtype %] [% riloo.ccode %] [% IF ( riloo.duedate ) %] - + [% INCLUDE 'patron-default-view.inc' borrowernumber = riloo.borrowernumber %] [% riloo.borsurname %], [% riloo.borfirstname %] ([% riloo.borcategorycode %]) [% ELSE %]Not checked out[% END %] [% IF ( reser.borrowername ) %] - + [% INCLUDE 'patron-default-view.inc' borrowernumber = reser.borrowernum %] [% reser.borrowername %]   [% reser.borrowerfirstname %]
      [% reser.borrowerphone %]
      --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt @@ -77,7 +77,7 @@ $(document).ready(function() { [% itemsloo.barcode %] or any available [% END %]

      [% itemsloo.surname %], [% itemsloo.firstname %] ([% itemsloo.cardnumber %])

      [% itemsloo.phone %]

      [% INCLUDE 'patron-default-view.inc' borrowernumber = itemsloo.borrowernumber %][% itemsloo.surname %], [% itemsloo.firstname %] ([% itemsloo.cardnumber %])

      [% itemsloo.phone %]

      [% itemsloo.pickbranch %] [% itemsloo.reservedate %] [% itemsloo.notes %][% reserveloo.borrowername %], [% reserveloo.borrowerfirstname %]
      [% reserveloo.borrowerphone %]
      +
      [% INCLUDE 'patron-default-view.inc' borrowernumber = reserveloo.borrowernum %][% reserveloo.borrowername %], [% reserveloo.borrowerfirstname %]
      [% reserveloo.borrowerphone %]
      [% IF ( reserveloo.borrowermail ) %] [% reserveloo.borrowermail %][% END %]
      [% overloo.borrowername %], [% overloo.borrowerfirstname %]
      [% overloo.borrowerphone %]
      +
      [% INCLUDE 'patron-default-view.inc' borrowernumber = overloo.borrowernum %][% overloo.borrowername %], [% overloo.borrowerfirstname %]
      [% overloo.borrowerphone %]
      [% IF ( overloo.borrowermail ) %] [% overloo.borrowermail %][% END %]
      [% resultsloo.cardnumber %] + [% INCLUDE 'patron-default-view.inc' borrowernumber = resultsloo.borrowernumber %] [% INCLUDE 'patron-title.inc' category_type = resultsloo.category_type firstname = resultsloo.firstname surname = resultsloo.surname othernames = resultsloo.othernames cardnumber = resultsloo.cardnumber %]
      [% IF ( resultsloo.streetnumber ) %][% resultsloo.streetnumber %] [% END %][% resultsloo.address %][% IF ( resultsloo.address2 ) %]
      [% resultsloo.address2 %][% END %][% IF ( resultsloo.city ) %]
      [% resultsloo.city %][% IF ( resultsloo.state ) %],[% END %][% END %][% IF ( resultsloo.state ) %] [% resultsloo.state %][% END %] [% IF ( resultsloo.zipcode ) %] [% resultsloo.zipcode %][% END %][% IF ( resultsloo.country ) %], [% resultsloo.country %][% END %]
      [% resultsloo.category_description %] ([% resultsloo.category_type %])[% relissueloo.itemcallnumber %] [% relissueloo.charge %] [% relissueloo.replacementprice %][% relissueloo.firstname %] [% relissueloo.surname %] ([% relissueloo.cardnumber %])[% INCLUDE 'patron-default-view.inc' borrowernumber = relissueloo.borrowernumber %][% relissueloo.firstname %] [% relissueloo.surname %] ([% relissueloo.cardnumber %])
      Date Action BarcodeCardnumberPatron
      [% IF ( operation.actionissue ) %] [% IF ( operation.borrowernumber ) %] - [% operation.cardnumber %] + [% INCLUDE 'patron-default-view.inc' borrowernumber = operation.borrowernumber %][% operation.borrower %] ([% operation.cardnumber %]) [% ELSE %] [% operation.cardnumber %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt @@ -54,10 +54,10 @@ function CheckForm(f) { [% END %] [% IF ( message.ERROR_no_borrower_from_item ) %]

      Warning: Unable to determine patron from item barcode ([% message.badbarcode %]). Cannot check in.

      [% END %] - [% IF ( message.issue ) %]

      Checked out [% message.title |html %] ([% message.barcode %]) to [% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

      [% END %] - [% IF ( message.renew ) %]

      Renewed [% message.title |html %] ([% message.barcode %]) for [% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

      [% END %] - [% IF ( message.return ) %]

      Checked in [% message.title |html %] ([% message.barcode %]) from [% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

      [% END %] - [% IF ( message.payment ) %]

      Accepted payment ([% message.amount %]) from [% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

      [% END %] + [% IF ( message.issue ) %]

      Checked out [% message.title |html %] ([% message.barcode %]) to [% INCLUDE 'patron-default-view.inc' borrowernumber = message.borrowernumber %][% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

      [% END %] + [% IF ( message.renew ) %]

      Renewed [% message.title |html %] ([% message.barcode %]) for [% INCLUDE 'patron-default-view.inc' borrowernumber = message.borrowernumber %][% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

      [% END %] + [% IF ( message.return ) %]

      Checked in [% message.title |html %] ([% message.barcode %]) from [% INCLUDE 'patron-default-view.inc' borrowernumber = message.borrowernumber %][% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

      [% END %] + [% IF ( message.payment ) %]

      Accepted payment ([% message.amount %]) from [% INCLUDE 'patron-default-view.inc' borrowernumber = message.borrowernumber %][% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

      [% END %] [% END %] [% ELSE %]

      Upload Offline Circulation Data

      --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt @@ -113,7 +113,7 @@ function add_item(borrowernum,batch_id,type_id){ [% END %]
      [% resultsloo.cardnumber %][% resultsloo.surname %], [% resultsloo.firstname %]
      [% resultsloo.address %][% IF ( resultsloo.address2 ) %]
      [% resultsloo.address2 %][% END %][% IF ( resultsloo.city ) %]
      [% resultsloo.city %][% END %]
      [% INCLUDE 'patron-default-view.inc' borrowernumber = resultsloo.borrowernumber %][% resultsloo.surname %], [% resultsloo.firstname %]
      [% resultsloo.address %][% IF ( resultsloo.address2 ) %]
      [% resultsloo.address2 %][% END %][% IF ( resultsloo.city ) %]
      [% resultsloo.city %][% END %]
      [% resultsloo.category_description %] ([% resultsloo.categorycode %]) [% resultsloo.branchcode %] [% resultsloo.dateexpiry %][% ELSE %][% END %] - [% IF ( loopcel.reference ) %][% END %] + [% IF ( loopcel.reference ) %][% INCLUDE 'patron-default-view.inc' borrowernumber = loopcel.reference %][% END %] [% IF ( loopcel.value ) %][% loopcel.value %][% END %] [% IF ( loopcel.reference ) %][% END %] - + [% INCLUDE 'patron-default-view.inc' borrowernumber = reserveloo.borrowernumber %] [% IF ( reserveloo.hidename ) %] [% reserveloo.cardnumber (reserveloo.borrowernumber) %] [% ELSE %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt @@ -44,7 +44,7 @@
      - [% IF ( review.borrowernumber ) %][% review.surname %], [% review.firstname %][% ELSE %](deleted patron)[% END %] + [% IF ( review.borrowernumber ) %][% INCLUDE 'patron-default-view.inc' borrowernumber = review.borrowernumber %][% review.surname %], [% review.firstname %][% ELSE %](deleted patron)[% END %] [% review.bibliotitle %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt @@ -26,7 +26,7 @@ [% FOREACH alertloo IN alertloop %]
      [% alertloo.name %]View[% INCLUDE 'patron-default-view.inc' borrowernumber = alertloo.borrowernumber %]View
      --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -145,18 +145,18 @@ $(document).ready(function() { calcNewsuggTotal(); }); - [% IF ( suggestedby_borrowernumber ) %][% suggestedby_surname %], [% suggestedby_firstname %] [% suggestedby_branchcode %] ([% suggestedby_description %])[% END %] + [% IF ( suggestedby_borrowernumber ) %][% INCLUDE 'patron-default-view.inc' borrowernumber = suggestedby_borrowernumber %][% suggestedby_surname %], [% suggestedby_firstname %] [% suggestedby_branchcode %] ([% suggestedby_description %])[% END %] - [% IF ( managedby_borrowernumber ) %][% managedby_surname %], [% managedby_firstname %] [% managedby_branchcode %] ([% managedby_description %])[% END %] + [% IF ( managedby_borrowernumber ) %][% INCLUDE 'patron-default-view.inc' borrowernumber = managedby_borrowernumber %][% managedby_surname %], [% managedby_firstname %] [% managedby_branchcode %] ([% managedby_description %])[% END %] - [% IF ( acceptedby_borrowernumber ) %][% acceptedby_surname %], [% acceptedby_firstname %] [% acceptedby_branchcode %] ([% acceptedby_description %])[% END %] + [% IF ( acceptedby_borrowernumber ) %][% INCLUDE 'patron-default-view.inc' borrowernumber = acceptedby_borrowernumber %][% acceptedby_surname %], [% acceptedby_firstname %] [% acceptedby_branchcode %] ([% acceptedby_description %])[% END %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -153,27 +153,26 @@ [% loopro.timestamp %] [% IF ( module == 'CIRCULATION' ) %] - [% loopro.user %] + [% INCLUDE 'patron-default-view.inc' borrowernumber = loopro.user %] [% loopro.user %] [% ELSE %] - [% loopro.user %] + [% INCLUDE 'patron-default-view.inc' borrowernumber = loopro.user %] [% loopro.user %] [% END %] [% loopro.module %] [% loopro.action %] [% IF ( module == 'MEMBERS' ) %] - member [% loopro.object %] + [% INCLUDE 'patron-default-view.inc' borrowernumber = loopro.object %] patron [% loopro.object %] [% ELSE %] [% IF ( module == 'CIRCULATION' ) %] - - [% IF ( loopro.object ) %] - member [% loopro.object %] + [% INCLUDE 'patron-default-view.inc' borrowernumber = loopro.object %] [% IF ( loopro.object ) %] + patron [% loopro.object %] [% END %] [% ELSE %] [% IF ( module == 'CATALOGUING' ) %] [% IF ( info == 'item' ) %] - Item [% loopro.object %] + Item [% loopro.object %] [% ELSE %] biblio [% loopro.object %] [% END %] @@ -208,7 +207,7 @@ for Bibliographic Record [% object %] [% END %] [% IF ( MEMBERS ) %] - for [% INCLUDE 'patron-title.inc' %] + for [% INCLUDE 'patron-default-view.inc' borrowernumber = object %][% INCLUDE 'patron-title.inc' %] [% END %] . --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -403,7 +403,7 @@ function placeHold () { [% FOREACH shelvesloo IN shelvesloop %] [% IF ( shelvesloo.toggle ) %][% ELSE %][% END %] [% shelvesloo.shelfname |html %] - [% shelvesloo.ownername %] + [% INCLUDE 'patron-default-view.inc' borrowernumber = shelvesloo.owner %][% shelvesloo.ownername %] [% shelvesloo.count %] item(s) [% IF ( shelvesloo.authorsort ) %]Author[% ELSIF ( shelvesloo.yearsort ) %]Year[% ELSE %]Title[% END %] [% IF ( shelvesloo.viewcategory1 ) %]Private[% END %] --