[koha-commits] main Koha release repository branch 16.05.x updated. v16.05.11-88-gd74bac5

Git repo owner gitmaster at git.koha-community.org
Tue May 2 08:59:54 CEST 2017


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, 16.05.x has been updated
       via  d74bac52b68c12c8865d8183d51d946f58d8f34f (commit)
       via  96650b4e76a5bc1302611a3a150e195e85e6f8fa (commit)
       via  08cc470c35bf2a92147d15f48984d3020935b6b8 (commit)
       via  b811451989414e1d5baaf2e87d5c099ae98556de (commit)
       via  bb0a58494bd9886d2a9fa25bd3874c3ece2dd3b0 (commit)
       via  f5d9d7ddc86042e8fd266674899961941ff52e2a (commit)
       via  a09f17fa70f6571a9e7432339032623da5272621 (commit)
       via  8343b56ab1f93dce3f3d58d7d10907e442be3125 (commit)
       via  de90787db6c9eae54062ea6a795c4a6fde4389bf (commit)
       via  df46724747d56cfdf2fde2f9d19fae360ab8b1f4 (commit)
       via  de0e3f8512fd4831213807c7e4d83109a8504cd5 (commit)
       via  63802c7ec270d63bd5d3b5c06eaf8828c4b798e1 (commit)
       via  ad9bef2419394a7f3677a9bd8bc04fa31785612f (commit)
       via  27a3ad799ce3c125c4e727fcf39012c81ba4bb1c (commit)
       via  daefab479c758bcfa6cf92b08b811c8702fd4705 (commit)
       via  8c67c2c448b53978f0d47374456ee64f3537b974 (commit)
       via  ab4d7d6987fd1d8a3f6e42e5afa258845f8cf934 (commit)
       via  f5558529ff52baeecda4b6ca293d73ee6982dffe (commit)
       via  318f62227169215d8e6c1fcb4171025df1c87e3a (commit)
       via  e7ee2fd59f39f6092cb2420c8fed25df096e1529 (commit)
       via  a98b5468baca4716357643c87f5cb9e02f62c343 (commit)
       via  00b76faf0ac30601fb3ff12a6cd71bcdab1b7177 (commit)
       via  c481c15a4fedd13b7f0f96d519313f744a425421 (commit)
       via  63c72da9483f26d88c1b287b93105cea7d6cdf89 (commit)
       via  4cc1f7304f98886aa035fe194d5c5bc63409ff24 (commit)
       via  46fd998c85ea36291f5af6169f8860d36fb57a94 (commit)
       via  c7cfc20995d885c33f53e16ce01c09146efceab6 (commit)
       via  b63f1c8b6ebfa24ae70745da7393cb1f15637dd4 (commit)
       via  15751085e950b38df235d11e958259e15ef48f37 (commit)
       via  a2d5655093a7188028036ba439256d9f819c136e (commit)
       via  8d27cf601203990ec9f79d280a45ff4435f91975 (commit)
       via  9dbbcb8ba50f0b6c26ce159c82cd88e973df3c54 (commit)
       via  4b653d7649f59d38325b88d453965341d785a2fe (commit)
       via  71107ee25f805a64c3bd2896f48955aeee573bcc (commit)
       via  a6315f2f4423a9b90203db72f74f69bfaa31815e (commit)
       via  32ceafbf418490a34f4fa6dcf9c5f94097d0f4e1 (commit)
       via  b8c6167f9f5c22286a590539dcfae54832f35a8f (commit)
       via  f083c8a0672490ea55dcd9b2e7b57d78115c0113 (commit)
       via  eaf914f591947adf9c56c30ee018713adba91bab (commit)
       via  4e8972d9c7c40040d726819b1b1479884bb640f8 (commit)
       via  8671b3259969c0ec770040a78f6fd9372c9f4b7b (commit)
       via  34b3be97e0a369fd864d584f937e7115141a3e2b (commit)
       via  5ecd9f981aeab0a9b7658b260097647365b29811 (commit)
       via  fae6a72523cc8ccbe60ab73799e52e4b489ba4f8 (commit)
       via  42741c2689e5cad1c1b2d11fa303b60d5fff25e4 (commit)
       via  a6f9a0a529c9df6749cb2cabb1f6c2b2d9869fe9 (commit)
       via  f6cac0592397ae829e34a576173fd0c86980d1bc (commit)
       via  cf4ef31201dabc3524258bc08a1c11a8cbe15a11 (commit)
       via  593c2bd896867cbd3e9bde4f10949ddb90cec368 (commit)
       via  5323d908c170e529ff5542659e58313d849b2b1e (commit)
       via  95190934a741692f3883965e28c1c659d5ab8f85 (commit)
       via  d6bbbc1aa36e38a38d10e1ea55771b9602b52c4c (commit)
       via  719dc345f4d38b1e34ef2318f472e4757709a647 (commit)
       via  1c70793c3d20483aeae827dcd360a4c76a29ee7e (commit)
       via  fd09dd40a99b20a5095e9b05724f256868421d12 (commit)
       via  9196963828b6e2f97d500e96eabd6bceab675dfb (commit)
       via  81fa253a8f15035a87076bad77dd0b5dde562ecd (commit)
       via  41882c4f2eb4bff954b5a74537b0cad4d0187352 (commit)
       via  5cee43cbb314cdf602fb0a9719b127889e277b5b (commit)
       via  719bd8e31e536c7317eeb9cf0dfd66a769a626ee (commit)
       via  7f4d6b4dd4256394e8c569bb73b8ed5c58087275 (commit)
       via  f483053af42b184b98c1d077c21e5132d9494d43 (commit)
       via  74f24ce406cee9af6a36db6e5d948542b0554e58 (commit)
       via  5e19242713ee95ca2676981bdba00f45b2be2294 (commit)
       via  bd136bd78d0c8e2177bc861d42732635ae81d17d (commit)
       via  6771c9bf4c3a7936a1ef83b9fe22c7ecc9db97b0 (commit)
       via  6a713f7793463effc5ca7c174436c3fdc1a3bb63 (commit)
       via  7a8c0af22c46370c2a5187449da01d591c11ba75 (commit)
       via  753eda6bae0a58282e134beadc96690ac2d26226 (commit)
       via  71034e08013c5111098a648cf46113c8f671637f (commit)
       via  a4e2f71dc563af9d33376f706fa3ec384c53ab87 (commit)
       via  39b1653348fd450ded9406a35b567042bf36d886 (commit)
       via  3f139899743ac3214e49d83c099120af28f414da (commit)
       via  9e74db7b51085f62919e34ab4e5ccdf9da2066a1 (commit)
      from  9de99ca2d5494177bf4e0c805cc46cb3124fdd5c (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 d74bac52b68c12c8865d8183d51d946f58d8f34f
Author: Mason James <mtj at kohaaloha.com>
Date:   Tue May 2 17:26:19 2017 +1200

    Revert "Bug 18094: Only search in searchable patron attributes if searching in standard fields"
    
    This reverts commit b696300c3a2ddbd670775fe22a0cb95b61751abf.

commit 96650b4e76a5bc1302611a3a150e195e85e6f8fa
Author: Mason James <mtj at kohaaloha.com>
Date:   Tue May 2 17:26:09 2017 +1200

    Revert "Bug 18094: Add tests to highlight the problem"
    
    This reverts commit dde4036df4fba9b8d3652a78c320c42f9e71c660.

commit 08cc470c35bf2a92147d15f48984d3020935b6b8
Author: Mason James <mtj at kohaaloha.com>
Date:   Sun Apr 30 23:55:25 2017 +1200

    fix t/db_dependent/HoldsQueue.t tests
    
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit b811451989414e1d5baaf2e87d5c099ae98556de
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Mar 21 10:52:42 2017 -0300

    Bug 18312: Fix export unless a file is supplied
    
    Bug 18087 breaks export unless a file is supplied.
    
    Can't use an undefined value as a HASH reference at
    /home/vagrant/kohaclone/tools/export.pl line 75.
    
    Test plan:
    Export records using a file of id that is not a valid file (not txt or
    csv)
    Export records using a valid file
    Export records without supplying a file
    
    => The export should work or fail as expected.
    
    Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit bb0a58494bd9886d2a9fa25bd3874c3ece2dd3b0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Feb 14 10:52:14 2017 +0100

    Bug 18087: Handle invalid filetypes
    
    If an invalid file is used as biblionumber list, we should display a
    message.
    
    Test plan:
    1/ Use csv, plain text files
    => Should work
    2/ Use invalid files (binary files like pdf, doc*, xsl*, etc.)
    => Should not work and see a warning message.
    
    Amended patch after signoff: Remove one warn debug line
    
    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit f5d9d7ddc86042e8fd266674899961941ff52e2a
Author: Joy Nelson <joy at bywatersolutions.com>
Date:   Thu Feb 9 11:42:57 2017 -0800

    Bug 18087 - Clarification on File type when using file of biblionumbers to export data
    
    Added a line to the screen  detailing the types of files that can be used to upload a list of biblionumbers.
    
    Test plan:
    1. Go to tools->export data
    2. under File option,  (File types accepted: .csv and .txt)  should appear
    3. Check both Bibliographic and Authority Export screens for this new string.
    
    Signed-off-by: Claire Gravely <claire_gravely at hotmail.com>
    
    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit a09f17fa70f6571a9e7432339032623da5272621
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Jul 22 10:26:12 2016 +0100

    Bug 15451: Better error handling
    
    1/ If a librarian edit (add_validate) a non-existing csv profile, we
    explicitely die
    2/ If you try to delete a non-existing csv profile, you will now get a
    nice alert box

commit 8343b56ab1f93dce3f3d58d7d10907e442be3125
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Wed Apr 27 22:28:08 2016 -0300

    Bug 15451: (followup) fix filename extension for csv file
    
    This patch does the same as basket/downloadcart.pl
    to set '.csv' as filename extension for downloadshelf.pl
    
    To test:
    1) Define a CSV MARC profile
    2) On staff download a list, extension is '.NN'
    with 'NN' the CSV profile id.
    3) Apply the patch
    4) Download again, check extension is now '.csv'
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit de90787db6c9eae54062ea6a795c4a6fde4389bf
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Jan 6 08:58:13 2016 +0000

    Bug 15451: Do not considered a Resultset as a Result
    
    The previous calls were wrong, but there is something bad with the DB
    structure: export_format.profile should be a unique key.
    This patch fixes the previous calls and add a FIXME not to forget to fix
    the DB structure.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Previous test where done with all patches applied,
    including this one, and all worked.
    No errors
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit df46724747d56cfdf2fde2f9d19fae360ab8b1f4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Dec 30 18:28:55 2015 +0000

    Bug 15451: Koha::CsvProfiles - Remove the residue
    
    This patch erase all traces of C4::Csv since it's not used anymore.
    All occurrences have been replaced by previous patches to use
    Koha::CsvProfiles.
    
    Note that GetMarcFieldsForCsv was not used prior this patch set.
    
    Test plan:
      git grep 'C4::Csv'
    should not return any result.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    No more traces of the file.
    This produces a koha-qa fail, due to the missing file.
    No other errors
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit de0e3f8512fd4831213807c7e4d83109a8504cd5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Dec 30 18:26:17 2015 +0000

    Bug 15451: Koha::CsvProfiles - Remove GetCsvProfile
    
    This subroutine just returned a csv profile for a given id.
    It is replaced in this patch by a call to Koha::CsvProfiles->find.
    
    There is nothing to test here, these changes have been tested in
    previous patches.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit 63802c7ec270d63bd5d3b5c06eaf8828c4b798e1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Dec 30 18:23:24 2015 +0000

    Bug 15451: Koha::CsvProfiles - Remove GetCsvProfileId
    
    This subroutine returned the export_format_id for a given profile name.
    This can be done easily with the Koha::CsvProfiles->search method.
    
    Test plan:
    Export records using the misc/export_records.pl script and the
    export tool.
    If you are exporting using the MARC format, the profile filled in the pref
    ExportWithCsvProfile will be used (or the one passed in parameter of
    misc/export_records.pl).
    If you are exporting using the CSV format, you can choose a profile in
    the dropdown list.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Exported using tool & cmd, marc & csv. Pref is used.
    No errors
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit ad9bef2419394a7f3677a9bd8bc04fa31785612f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Dec 30 18:16:01 2015 +0000

    Bug 15451: Koha::CsvProfiles - Remove GetCsvProfiles
    
    This subroutine did the same job as GetCsvProfilesLoop, so this patch
    applies the same changes as the previous patch.
    
    Test plan:
    1/ Claim some serials, sql profiles should be listed
    2/ Export records using the export tool. MARC profiles should be listed.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Listed sql & marc profiles
    No errors
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 27a3ad799ce3c125c4e727fcf39012c81ba4bb1c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Dec 31 10:32:35 2015 +0000

    Bug 15451: Koha::CsvProfiles - Remove GetCsvProfilesLoop
    
    This subroutine returned the csv profiles for a given type.
    This could be done easily with the new Koha::CsvProfiles->search method.
    
    Test plan:
    To do at the OPAC and staff interface!
    1/ Export a list using a CSV profile
    2/ Export your CART using a CSV profile
    Note that only MARC profiles should be available.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Tested on staff/opac & cart/list
    Small problem on filename extension fixed in followup.
    No errors
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit daefab479c758bcfa6cf92b08b811c8702fd4705
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Dec 31 10:23:24 2015 +0000

    Bug 15451: Rewrite the csv profile tool script
    
    This page was inconsistent with the other admin and tool pages.
    The 2 tabs 'New profile' and 'Edit existing profile' were useless, the
    ergonomic needs to be revisited.
    This patch applies the same script/page structure as others: by default
    a table containing all csv profiles is displayed with 2 action links:
    edit and delete.
    
    Test plan:
    1/ Create 1+ CSV profiles, with different types (marc and sql)
    2/ Update some values using the Edit link
    3/ Delete a CSV profile
    
    Note: When deleting a CSV profile, it would be great to warn the user if it is
    used.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    No problems on create, update and delete.
    No errors
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 8c67c2c448b53978f0d47374456ee64f3537b974
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Dec 31 10:22:47 2015 +0000

    Bug 15451: Add the 2 new modules Koha::CsvProfile[s]
    
    There are based on Koha::Objets. Tests provided.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Test pass, no errors.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit ab4d7d6987fd1d8a3f6e42e5afa258845f8cf934
Author: Marc Véron <veron at veron.ch>
Date:   Tue Apr 18 09:21:45 2017 +0200

    Bug 18443: Get rid of warning 'uninitialized value $user' in C4/Auth.pm
    
    When logging out from OPAC, plack-error.log log and/or opac-error.log
    complain about 'uninitialized value $user' in C4/Auth.pm line 187. The
    warning is not necessary, this patch removes it.
    
    To test:
    - try to trigger warning
    - apply patch
    - verify that warning no longer occurs
    - prove t/db_dependent/Auth.t
    - verifiy that SCO still behaves like before (especially if
      you break out from sco path)
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit f5558529ff52baeecda4b6ca293d73ee6982dffe
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu Apr 13 09:55:15 2017 -0400

    Bug 18429 - Receiving an item should update the datelastseen
    
    To test:
    0 - Ensure AcqCreateItem is set to 'placing an order'
    1 - Order some items, note entrydate and datelastseen match
    2 - Alter those dates to be earlier than today (or wait some days)
    3 - Recieve the item and note datelast seen not updated
    4 - Apply patch
    5 - Repeat 1-3
    6 - Date last seen should be updated.
    
    Followed test plan, works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Works as expected.
    Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 318f62227169215d8e6c1fcb4171025df1c87e3a
Author: Marc Véron <veron at veron.ch>
Date:   Sun Mar 26 17:26:22 2017 +0200

    Bug 18335 - Check in: Make patron info in hold messages obey syspref AddressFormat
    
    When checking in, information about patrons with a hold always display
    in an US style. Address information should opey the system preference
    AddressFormat
    
    To reproduce:
    - Set syspref AddressFormat to German style
    - Check out an item to a patron A
    - Put a hold on this item for patron B
    - Check in item using the Check in field in page header
    - Result: In message 'Hold found', address does not display in German
      style
    
    To test:
    - Apply patch
    - Repeat steps above
    - Verify that address displays as expected
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit e7ee2fd59f39f6092cb2420c8fed25df096e1529
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Apr 19 12:15:46 2017 -0300

    Bug 18460: Fix undefined itemtype warning in Serials.t
    
    This patch makes the test create an itemtype, and use it for the created item so there's no warning.
    
    To test:
    - Run:
      $ prove t/db_dependent/Serials.t
    => FAIL: item-level_itypes set but no itemtype set... warning raised
    - Apply the patch
    - Run:
      $ prove t/db_dependent/Serials.t
    => SUCCESS: Tests pass and no warning is raised
    - Sign off :-D
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit a98b5468baca4716357643c87f5cb9e02f62c343
Author: Benjamin Rokseth <benjamin.rokseth at kul.oslo.kommune.no>
Date:   Tue Apr 1 14:07:59 2014 +0200

    Bug 12021 - SIP2 checkin should alert on transfer and use CT for return branch
    
    This small patch corrects the SIP2 checkin response if branch transfer is needed.
    It depends on bug 7981 and also removes an obsolete alert check in SIP2.
    
    Test plan:
     - apply bug 7981
     - make sure syspref AutomaticItemReturn is false
     - check 'Return policy' in 'Default checkout, hold and return policy'
     - make a SIP2 checkout and checkin from a branch different than item's home branch.
     - verify that SIP2 response gives alert CV04 (=send to different branch)
     - also verify that response field CT gives correct branch according to 'Return policy'
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Followed test plan, works as expected
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 00b76faf0ac30601fb3ff12a6cd71bcdab1b7177
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Tue Apr 18 14:03:37 2017 -0400

    Bug 18423 - Followup - enable Add child button for institutional borrowers
    
    If they can have guarantors and we shwo the button on one page I think
    we should in fact show it on all.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit c481c15a4fedd13b7f0f96d519313f744a425421
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Tue Apr 18 13:53:54 2017 -0400

    Bug 18423 - Add 'Add child' button to files, housebound, and deletemem pages
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 63c72da9483f26d88c1b287b93105cea7d6cdf89
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Apr 17 12:32:56 2017 -0400

    Bug 18423 Follow-up - Add 'Add child' button to statistics tab
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 4cc1f7304f98886aa035fe194d5c5bc63409ff24
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Apr 12 11:32:11 2017 -0400

    Bug 18423 follow up - fix display off add child on members/notices.pl
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 46fd998c85ea36291f5af6169f8860d36fb57a94
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Apr 12 10:23:56 2017 -0400

    Bug 18423 - Add child button not always appearing - problem in template variable
    
    This patch removes the retrieval of the syspref borrowerRelationship
    from the scripts and moves it to a check using the Template Toolkit
    plugin
    
    To test:
    1 - Apply patch
    2 - Ensure 'Add child' button displays appropriately on all member pages.
    
    Tested 3 pateches together, works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit c7cfc20995d885c33f53e16ce01c09146efceab6
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Sun Jan 15 23:26:33 2017 -0500

    Bug 17911: Message and timeout mismatch
    
    The installation step 3 has a meta refresh of 10 seconds,
    but the message says 5 seconds. People could get impatient.
    
    TEST PLAN
    ---------
    1) Fresh install
       -- notice the discrepancy on the web installation.
    2) drop and create the DB
    3) apply the patch
    4) run the web install
       -- notice it refreshes faster (5 seconds vs 10 seconds)
    5) run koha qa test tools
    
    Works as intended and passes qa test tool
     OK koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
      OK    forbidden patterns
      OK     git manipulation
      OK      spelling
      OK   tt_valid
      OK    valid_template
    
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit b63f1c8b6ebfa24ae70745da7393cb1f15637dd4
Author: pongtawat <pongtawat at punsarn.asia>
Date:   Mon Dec 26 17:50:50 2016 +0700

    Bug 17814: koha-plack --stop should make sure that Plack really stop
    
    koha-plack --stop doesn't ensure that Plack was really stopped before
    returning
    
    So in case that koha-plack --stop was quickly follows by koha-plack
    --start (e.g. logrotate), it could leave Plack in stop state. This is
    due to koha-plack --start think that Plack was already started, while it
    actually is being stopped.
    
    For me I think this is the cause why I got random Plack stop when
    logrotate is run.
    
    It should be similar to the case of Zebra in Bug #16885, and the
    solution might be the same: adding "--retry=TERM/30/KILL/5;" to
    start-stop-daemon command.
    
    TEST PLAN
    ---------
    1) Login to staff client and do something that will hold connection for
    a long time, e.g. a batch import or a slow report.
    2) sudo koha-plack --stop mykoha
    3) ps aux | grep plack   <-- a Plack process will still running work in
    1)
    4) wait for 1) to finish and all Plack processes exit
    5) sudo koha-plack --start mykoha
    6) apply the patch
    7) repeat step 1)-2)
    8) ps aux | grep plack   <-- There should be no Plack process running
    now
    9) Note that work in step 1) might get terminated midway. Since we force
    Plack to stop after some wait.
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 15751085e950b38df235d11e958259e15ef48f37
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Apr 20 12:52:47 2017 +0200

    Bug 18364: [Follow-up] Also add an environment variable to prevent locking
    
    The test in SendCirculationAlert is extended by adding an env var
    called KOHA_NO_TABLE_LOCKS. If this var is set to a true value,
    the table locking is skipped too.
    
    This is useful when running a test without prove. The variable could be
    set in a shell profile.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit a2d5655093a7188028036ba439256d9f819c136e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Mar 31 13:43:38 2017 -0300

    Bug 18364: Do not LOCK/UNLOCK tables from tests
    
    From the MySQL doc:
    "LOCK TABLES is not transaction-safe and implicitly commits any active transaction before attempting to lock the tables."
    If the LOCK/UNLOCK statements are executed from tests, the current transaction will be committed.
    To avoid that we need to guess if this code is execute from testsa or not (yes it is a bit hacky)
    
    Better ideas are welcome!
    
    Another fix would have been to revert
      commit be156d9ad9e5bcfadab34d44f90e04fd61e256ad
      Bug 15854: Use a READ and WRITE LOCK on message_queue
    but theorically a race is still possible.
    
    Existing tests seem to be safe, to test this patch you will need new
    tests from bug 17964.
    Test plan:
      prove t/db_dependent/Letters/TemplateToolkit.t
    twice, and notice that changes have been comitted.
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 8d27cf601203990ec9f79d280a45ff4435f91975
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Apr 17 13:22:24 2017 -0400

    Bug 18439 - Resend button for notices being hidden by CSS and never unhidden
    
    Current jQuery is not unhiding resend button, this patch adds an id
    and a toggle command
    
    To test:
    1 - Enable EnhancedMessagingPreferences
    2 - Find a patron with sent or failed messages
    3 - Note you can expand message, but not resend
    4 - Apply patch
    5 - Note that on expanding message a 'Resend' button appears
    6 - Ensure resend button operates as expected
    
    Works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Lari Taskula <lari.taskula at jns.fi>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 9dbbcb8ba50f0b6c26ce159c82cd88e973df3c54
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Jan 26 14:31:35 2017 +0000

    Bug 18001 - LocalHoldsPriority can cause multiple holds queue lines for same hold request
    
    If LocalHoldsPriority is enabled, and a record level request has more
    than one item that could fill that hold, there is a possibility that a
    holds queue row will be generated for the request for each of the
    available items!
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Joel Sasse <jsasse at plumcreeklibrary.net>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 4b653d7649f59d38325b88d453965341d785a2fe
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Apr 18 07:38:42 2017 -0400

    Bug 18001 - Unit Test
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 71107ee25f805a64c3bd2896f48955aeee573bcc
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Apr 11 16:45:40 2017 +0000

    Bug 18372 - transits are not created at check in despite user responsing Yes to the prompt
    
    If the AutomaticItemReturn system preference is set to "Don't" and you
    check in an item which belongs to another library, a dialog will ask you
    if you want to transfer. This patch corrects a bug to enable the "Yes"
    buttons to work, triggering the transfer.
    
    To test, apply the patch and check in an item which belongs to another
    library. In the dialog, click the 'Yes' button and confirm that the item
    has been made 'in transit' to the correct library.
    
    Perform the same test with the 'Yes, print slip' and 'No' buttons and
    confirm they are working correctly.
    
    Since this patch changes the behavior of many other popups triggered
    from this template, test other operations which trigger a 'print slip'
    option like:
    
    - Checking in an item which is part of a rotating collection
    - Checking in an item which is on hold for a patron
    
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit a6315f2f4423a9b90203db72f74f69bfaa31815e
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Wed Dec 28 15:08:42 2016 +0100

    Bug 17821 - due date in intranet search results should use TT date plugin
    
    Intranet search results displays due date from item onloan.
    This should use the TT date plugin.
    
    Test plan :
    - set syspref dateformat not on yyyy-mm-dd, for example dd/mm/yyyy
    - checkout an item
    - at intranet, perform a search where you see the item
    => You must see : "date due : dd/mm/yyyy"
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 32ceafbf418490a34f4fa6dcf9c5f94097d0f4e1
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date:   Sat Apr 8 23:18:23 2017 +0000

    Bug 12930: Web installer does not show login errors
    
    Implemented invalid_username_or_password template
    variable being handed to Auth.tt. Removed indentation
    changes and modification to return value of checkpw
    
    Test plan:
    See comment #2
    
    Alternative test plan:
    - Clear session cookies or close / open your browser
    - Go to  [MY SERVER]/cgi-bin/koha/installer/install.pl
    - Verify that message appears if wrong username/pw provided
    - Verify that you can log in with databas administrator account
    
    Tested with alternative test plan, works as expected. Title and
    description in commit message adapted.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 87eb80136d49451d0a9cc25e68db452a33f1771a)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit b8c6167f9f5c22286a590539dcfae54832f35a8f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Apr 3 12:50:27 2017 -0300

    Bug 18373: Re-add UpgradeBackup.pm
    
    Bug 18028 removed the install_misc directory but
    install_misc/UpgradeBackup.pm was still used by the 'upgrade' rule of
    make.
    
    Other files from install_misc were useless to it may be better not to
    reintroduce this directory with only 1 file.
    
    Test plan:
    `make`
    `sudo make install`
    `make upgrade`
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit f083c8a0672490ea55dcd9b2e7b57d78115c0113
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Jan 10 10:03:36 2017 +0100

    Bug 17872: Fix small error in GetBudgetHierarchy and one of its calls
    
    In aqbudgetperiods.pl a commented line is removed that contains a
    wrong userenv hash key. Should be branch instead of branchcode.
    
    In aqbudgets GetBudgetHierarchy is called with the same wrong userenv
    hash key. Should be userenv->{branch}.
    This made another bug visible: if you call GetBudgetHierarchy with a
    branch and without owner, the where clause should take into account
    that the branchcode can be empty (not null).
    
    Test plan:
    [1] Run Budgets.t
    [2] Run aqbudgets.pl from Administration
    [3] Add the show_mine=1 parameter in the URL
    [4] Change owner of one of the funds and repeat step 2 and 3.
    
    t/Budgets.t returns green. Followed test plan, works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit eaf914f591947adf9c56c30ee018713adba91bab
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Apr 11 10:31:49 2017 -0300

    Bug 14932: Do not call can_edit_subscription with an empty value
    
    ref($sub) eq 'ARRAY' should always be true, what we want is to call
    can_edit_subscription if there is at least 1 serial for this
    subscription.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 4e8972d9c7c40040d726819b1b1479884bb640f8
Author: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
Date:   Thu Oct 1 15:23:23 2015 +0300

    Bug 14932 - serials/serials-collection.pl-page is very slow. GetFullSubscription* checks permission for each serial!
    
    Currently we have subscriptions with 300+ serials received.
    It takes a lot of time to show serials-collection.pl (~20s).
    This is especially troublesome when receiving serials, since after receival we get redirected to that page.
    
    We no longer can receive daily serials in the allotted timeframe.
    
    This quick and dirty fix prevents checking the subscription editing for each serial, but instead checks it for the first serial only.
    
    This reduced page load time by ~18s
    
    TEST PLAN:
    1. Receive ~300 serials (or just a bunch :)  )
    2. Observe the gradual slowing of the receival action.
    
    AFTER THIS PATCH:
    1. Receive ~300 serials more (or just a bunch)
    2. Observe a significant performance improvement.
    
    Signed-off-by: Paul POULAIN <paul.poulain at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 8671b3259969c0ec770040a78f6fd9372c9f4b7b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Apr 7 10:13:00 2017 +0200

    Bug 18349: [QA Follow-up] Add four missing error messages
    
    The error codes come from CanBookBeIssued.
    The warnings speak for themselves. Note that the GNA message is similar
    to the one used in opac-user.tt (gonenoaddress is translated to the patron
    as contact information not up-to-date).
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 34b3be97e0a369fd864d584f937e7115141a3e2b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Mar 31 13:25:13 2017 -0300

    Bug 18349: Remove useless info in alert message
    
    Empty tags should be removed, and message id
    Note that not all error codes are covered here.
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 5ecd9f981aeab0a9b7658b260097647365b29811
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Mar 31 13:22:05 2017 -0300

    Bug 18349: If a confirmation is required, consider as blocker
    
    Only RENEW_ISSUE should not be considered as blocker, others should.
    Note that this code is not robust and the whole script as well as the
    return of CanBookBeIssued should be rewrittent completely.
    We need a small patch to easy backport to stable releases
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit fae6a72523cc8ccbe60ab73799e52e4b489ba4f8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Mar 30 21:51:28 2017 -0300

    Bug 18349: $borrower is a hashref
    
    I guess this code was never called before...
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 42741c2689e5cad1c1b2d11fa303b60d5fff25e4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Mar 29 18:25:40 2017 -0300

    Bug 18349: SCO - Do not trust the confirmed flag
    
    The "confirmed" flag is used to know if that user confirmed a situation
    that needs a confirmation.
    But if the issue/renew is impossible the CanBookBeIssued and the
    'impossible flags' should be checked.
    
    Otherwise a patron can checkout and renew bypassing the circulation
    rules (Understand 'no limit' here...)
    
    Test plan:
    Want to renew?
    Checkin $barcode, then
    /cgi-bin/koha/sco/sco-main.pl?patronid=$cardnumber&barcode=$barcode&confirmed=1&op=checkout
    
    Want to bypass the checkin?
    Same url...
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 85bd15a83ffdab0c2e28eae54e50ce4dee9e608b)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Conflicts:
    	opac/sco/sco-main.pl

commit a6f9a0a529c9df6749cb2cabb1f6c2b2d9869fe9
Author: David Kuhn <techservspec at gmail.com>
Date:   Wed Dec 14 16:02:26 2016 -0800

    Bug 17309 - Renewing and HomeOrHoldingBranch syspref
    
    The AddRenewal subroutine currently uses the circulation rules for the branch
    stored in the Issues table (which is the holding branch) when calculating the new due date.
    
    This patch replaces using the branch from the Issues table with the branch
    specified by the HomeOrHoldingBranch syspref.
    
    To test:
    1. Set up 2 branches, Branch1 and Branch2
    2. Set up a loan rule in Branch1 for DVDs with a 21 day loan period and a
       21 day renewal period.
    3. Set up a loan rule in Branch2 for DVDs with a 14 day loan period and a
       14 day renewal period.
    4. Checkout a DVD belonging to Branch1 while logged into Branch2. It will
       receive the correct 21 day loan period.
    5. Renewing the same DVD while logged into either Branch1 or Branch2
       will give a 14 day due date, rather than 21 days.
    6. Checkout a DVD belonging to Branch2 while logged into Branch1. It will
       receive the correct 14 day loan period.
    7. Renewing the same DVD while logged into either Branch1 or Branch2
       will give a 21 day due date, rather than 14 days.
    8. Apply the patch and repeat steps 4-7. The correct due date should be given
       when the item is renewed, regardless of where it is checked out or renewed.
    
    This update removes reassignment of $branch variable.
    
    Signed-off-by: Cédric Vita <cedric.vita at dracenie.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 7d35bdf58a0bcebab20df47b50b249cafe12ddb6)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit f6cac0592397ae829e34a576173fd0c86980d1bc
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Fri Mar 24 16:07:16 2017 +0100

    Bug 18329 - Batch record deletion broken
    
    Hie, Tools > Batch record deletion seems broken.
    Any deletion returns error :
    Bibliographic record YYY was not deleted. An error occurred. (The error was: {UNKNOWN}: DBD::mysql::db begin_work failed: Already in a transaction at /usr/share/perl5/DBIx/Class/Storage/DBI.pm line 1560. at /home/koha/src/C4/Biblio.pm line 3468 , see the Koha log file for more information).
    
    Looks like it is because of Bug 18242 which added a transaction  in C4::Biblio::_koha_delete_biblio_metadata : $schema->txn_do.
    The script batch_delete_records created a transaction with $dbh->{AutoCommit} = 0;
    
    This patch fixes by using also Koha::Schema in batch_delete_records to manage transaction.
    It also removes "$dbh->{RaiseError} = 1", this behavior is managed in Koha::Database.
    
    Test plan :
     - Go to Staff interface : Tools > Batch record deletion
     - Enter a few existing biblionumbers
     - Click on "Continue"
     - Click on "Delete selected records"
    => Without patch you get a DB error
    => With patch you get confirmation message
     - Try to get the biblios to confirm they are deleted : /cgi-bin/koha/catalogue/detail.pl?biblionumber=xxx
     - Test with and without Plack
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 0f32bd99997c82cf7b70eef32818dc817cbff64b)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit cf4ef31201dabc3524258bc08a1c11a8cbe15a11
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Mar 21 12:24:28 2017 -0300

    Bug 18266: Fix internal error when paying fine for lost item without.. item
    
    If a fine is created for a lost item but the itemnumber is not supplied,
    the system will return it.
    The item should not be mark as returned if there is no item linked to
    the fine.
    
    Test plan:
    1. Turn StoreLastBorrower on
    2. Create a manual invoice for a lost item, do not supply a barcode
    3. Pay the fines 'Pay fines > Pay'
    
    => Without this patch applied you get
    Can't call method "last_returned_by" on an undefined value at
    /home/marc/koha/C4/Circulation.pm line 2188.
    
    => With this patch applied, you must not get the error.

commit 593c2bd896867cbd3e9bde4f10949ddb90cec368
Author: Christopher Brannon <cbrannon at cdalibrary.org>
Date:   Fri Mar 10 19:54:05 2017 +0000

    Bug 17346: Make checkin column hidable
    
    To test:
    1) Go to columns_settings.pl --> Circulation --> issues-table and note that you cannot change the settings for checkin.
    2) Go to columns_settings.pl --> Patrons --> issues-table and note that you cannot change the settings for checkin.
    3) Apply the patch.
    4) Go to both tables again and note that you can now change the settings.
    
    Followed test plan, works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 9098a4d3fa7268bf11ab108693192070c44c9eaf)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 5323d908c170e529ff5542659e58313d849b2b1e
Author: Luke Honiss <luke.honiss at gmail.com>
Date:   Thu Jan 19 22:52:49 2017 +0000

    Bug 17945 - Breadcrumbs broken on opac-serial-issues.pl
    
    ==TEST PLAN==
    1) Make a subscription with a record
    2) Search and view the record in OPAC
    3) Click on the subscription tab and click more details
    4) The breadcrumb will say 'Detals for' without the record name
    5) Apply patch
    6) Refresh the page
    7) The breadcrumb will display the name of the record
    
    (fixed small error)
    
    Signed-off-by: Sonia BOUIS <sonia.bouis at univ-lyon3.fr>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 39bcba540a6c00fc374284dc025297a568befed6)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 95190934a741692f3883965e28c1c659d5ab8f85
Author: Marc Véron <veron at veron.ch>
Date:   Tue Mar 14 14:29:08 2017 +0100

    Bug 18263: Make use of syspref 'CurrencyFormat' for Account and Pay fines tables
    
    On Home > Patrons > Accounts for... and Home > Patrons > Pay fines for...,
    make the amounts display as defined in syspref 'CurrencyFormat'
    
    To test:
    - Apply patch
    - Give a patron a high fine or credit (e.g. 12345.67)
    - Got to pages Home > Patrons > Accounts for... and
      Home > Patrons > Pay fines
    - Verify that amounts display following syspref 'CurrencyFormat'
      (e.g. 12'345.67 for syspref set to 360'000.00 (CH)
    
    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit db467287d174827e52c322cb86d75b8628df52fe)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Conflicts:
    	koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt

commit d6bbbc1aa36e38a38d10e1ea55771b9602b52c4c
Author: Grace McKenzie <grace.mcky at gmail.com>
Date:   Tue Jan 17 22:45:28 2017 +0000

    Bug 17290 - Standardize on "Patron Categories"
    
    We need to standardize on terminology, this changes all instances of
    patron types to be patron categories.  To text, just view the patch
    
    Signed-off-by: Cédric Vita <cedric.vita at dracenie.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 9a4fd7b27074d7ce923f7b47061d1e6636ecbc56)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 719dc345f4d38b1e34ef2318f472e4757709a647
Author: Marc Véron <veron at veron.ch>
Date:   Tue Mar 21 14:52:51 2017 +0100

    Bug 18307 - Branchname is no longer displayed in subscription tab view
    
    This patch restores the branchname in OPAC subscription detail view.
    Additionally, it adds the subscriptons count to the tab title to make
    it consistent with the other tab titles.
    
    To test:
    - Search a subscription in OPAC catalog
    - Go to Subscriptions tab (see screenshot in initial comment)
    - Verify that library name does not display
    - Apply patch
    - Verify that library name displays properly in Subscriptons tab
    - Verify that the tab title displays the subscriptions count
      e.g.: Subscriptions (2)
    
    Signed-off-by: Claire Gravely <claire_gravely at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit c6463c258f644ea5a1983680814eb765f1801283)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Conflicts:
    	koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt

commit 1c70793c3d20483aeae827dcd360a4c76a29ee7e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Mar 9 11:25:28 2017 -0300

    Bug 18209: Add default, 'Actions' and fix case
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit f14de0007c47ae66d0276186df073c0375d37610)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit fd09dd40a99b20a5095e9b05724f256868421d12
Author: Blou <philippe.blouin at inlibro.com>
Date:   Fri Mar 3 16:13:40 2017 -0500

    Bug 18209 - Patron's card manage.pl page is not fully translatable
    
    The headers of the tables displayed in patroncards/manage.tt are hardcoded in the .pl and thus cannot be translated.
    
    This simple fix reuse the translate_card_element tool already in the code to make the strings translatable.
    
    Applied patch and verified that table headers on manage.pl display the same as before.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Re-tested, works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit bb1492e9f67439753bf428bd06fa710791e70c74)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 9196963828b6e2f97d500e96eabd6bceab675dfb
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Mar 30 10:20:30 2017 +0200

    Bug 18019: [QA Follow-up] Also catch the delete from authorities detail
    
    Good catch from Jonathan. See comment11.
    Authorities detail should pass a CSRF token to authorities-home when
    deleting a record without linked biblios.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Passing the token with GET is not a good way to do, but nothing quick to
    replace that.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit d2ee53fb5f90277d47fc56667e71018f5d9b88a9)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 81fa253a8f15035a87076bad77dd0b5dde562ecd
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Feb 7 09:09:33 2017 +0100

    Bug 18019: Add CSRF protection to authorities-home.pl (op==delete)
    
    Without this patch, it is possible to delete authority records with URL
    manipulation.
    Like: /cgi-bin/koha/authorities/authorities-home.pl?op=delete&authid=[XXX]
    
    Test plan:
    [1] Go to Authorities. Search for some authorities (without links).
    [2] Delete an authority. Should work.
    [3] Apply patch.
    [4] Construct an URL like above to delete another authority. Should fail.
        Under Plack this results in an internal server error, the log tells
        you: Wrong CSRF token.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    Amended the test plan.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 5a7dc0749f581e4c4bc6ec68d3f3ab6bac12afd5)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 41882c4f2eb4bff954b5a74537b0cad4d0187352
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Mar 3 14:56:31 2017 +0000

    Bug 12972 - Transfer slip and transfer message (blue box) can conflict
    
    Instead of passing the homebranch to the slip, let's pass
    TransferWaitingAt (the value we display)
    
    To test:
    1 - Check in an item that will initiate a transfer (hold or automatic
            item return)
    2 - Note the transfer message and receipt match
    3 - Remove the reason for transfer (bot don't cancel transfer)
        i.e. cancel hold or change homebranch of item to current library
    4 - Check the item in again
    5 - Note the message displays the transfer destination and the slip
    shows the homebranch
    6 - Apply patch
    7 - Repeat 5 but note slip and message match
    8 - Test any edge cases for correctness
    9 - sign off
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit f454013ec9beb8f6e4c382253b76bfac5ca65244)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 5cee43cbb314cdf602fb0a9719b127889e277b5b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Mar 17 13:24:41 2017 +0100

    Bug 7728: [QA Follow-up] Fix POD whitespace
    
    Resolves complaints from qa tools.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 53f2b56fa15fac2f0d2ef0777e95f436d6914ec7)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Conflicts:
    	C4/Serials.pm

commit 719bd8e31e536c7317eeb9cf0dfd66a769a626ee
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Wed Jan 11 14:51:43 2017 +0100

    Bug 7728: QA fixes
    
    - Remove useless comments
    - Use Koha::Objects::find instead of Koha::Objects::search
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit c26afc2568311a2b7a99f33705cbc35b715563a8)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 7f4d6b4dd4256394e8c569bb73b8ed5c58087275
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Tue Jan 26 14:03:21 2016 +0000

    Bug 7728: Adding unit test ReNewSubscription.t
    
    Test plan:
     * run without the patch, the test will fail
     * run with the patch, the test will pass
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit d79a264b6991d48bda026fc0ccde0607b519423f)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit f483053af42b184b98c1d077c21e5132d9494d43
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Dec 9 10:25:43 2015 +0000

    Bug 7728: Fix subs history end date consistency
    
    Without this patch, there is an inconsistency in subscriptions:
     * a new subscription has no history end date set (as expected)
     * if you renew it, a date is set.
    
    This patch removes the setting of the history end date during renewal
    
    Test plan:
     * create a subscription, go to subscription-detail.pl page, tab "Summary". No History end date is set
     * renew the subscription => a date has been set
     * apply the patch
     * create another subscription
     * renew it => no history end date has been set
     * sign-off
    
    Signed-off-by: beroud <isabelle.beroud at univ-lyon3.fr>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 1843ee148b25a904d8baffbbe8f0ea504b539a64)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 74f24ce406cee9af6a36db6e5d948542b0554e58
Author: Marc Véron <veron at veron.ch>
Date:   Fri Mar 10 11:22:24 2017 +0100

    Bug 18244: Patron card creator does not take in account fields with underscore (B_address etc.)
    
    Fields with underscore like B_address do not print on patron cards.
    
    To reproduce:
    - Create patron card layout using fields with underscore in their name
      (e.g. <surname><B_address> )
    - Print (export) patron card
    - Verify that fields without underscore are replaced by their value,
      but fields with underscore do not replace but show the field name
    
    To test:
    - Apply patch
    - Try to reproduce and verify that fields with underscore are replace
      as expected
    
    Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit a723de2ae0c393743fc111955ee81b5e6c5b7f4a)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 5e19242713ee95ca2676981bdba00f45b2be2294
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Feb 6 10:29:44 2017 +0100

    Bug 14535: Update the supplier filter too
    
    The combobox on the left side of late orders is filled by sub
    GetBooksellersWithLateOrders. The same change as in the first patch
    must be made here to include suppliers with late orders without a
    price.
    
    Bonus: Sort the list.
    
    Test plan:
    [1] Run t/db_dependent/Bookseller.t.
    [2] Go to late orders. Use the filter on suppliers.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit b76eac9ca2c32a5db51b9b8ca32a2cf4fa6397b5)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit bd136bd78d0c8e2177bc861d42732635ae81d17d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Feb 6 10:04:57 2017 +0100

    Bug 14535: Late orders does not show orders with price = 0
    
    This patch removes the filter of unitpricesupplier <> 0 and
    unitpricelib <> 0 from GetLateOrders as used in lateorders.pl.
    This allows you to claim late orders without a price entered.
    
    Test plan:
    [1] Run t/db_dependent/Acquisition.t
    [2] Check if you see an order with no price in lateorders.pl. (If needed,
        remove prices from a few orders.)
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 71f267fd3f3750510e3df5f2819d57ed45dcf919)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 6771c9bf4c3a7936a1ef83b9fe22c7ecc9db97b0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Mar 28 16:39:25 2017 +0200

    Bug 12913: [QA Follow-up] Reword 'change item status' and add zero status
    
    The zero status should be added in @notforloans. It is a legitimate status
    for available books. The zero status description can be translated in
    the template.
    The 'Change item status' is confusing. We mean that we saw a notforloan
    status that we do not expect (read: does not exist in the table).
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 664d6534171677455f3cf1467e8726146714133a)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 6a713f7793463effc5ca7c174436c3fdc1a3bb63
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Fri Sep 12 15:21:18 2014 +0200

    Bug 12913 - wrong inventory results when notforloan filter is not used
    
    In inventory tool, there is a test on scanned items notforloan value : if the value is not one of authorized values, the inventory results displays the problem "Change item status".
    The bug is that if notforloan filter is not used, the notforloan values array is not filled and so all scanned items are marked with this problem.
    
    Test plan :
    - Check you have in default framework an item subfield mapped with items.notforloan and with an authorized value catergory, for example 'NOTFORLOAN'
    - Check the authorized value category has at least value '0'
    - Create a new value in this category, for example '9'
    - Create a biblio with default framework
    - Create an item with barcode='000AAA1', callnumber='ZZZAAA1' and notforloan=0
    - Create an item with barcode='000AAA2', callnumber='ZZZAAA2' and notforloan=9
    - Delete new value created above, for example '9'
    - Create a file 'barecodes.txt' containing 2 lines '000AAA1' and '000AAA2'
    - Go to inventory tool : /cgi-bin/koha/tools/inventory.pl
    - Choose file in 'Barcode file'
    - Enter item callnumber between 'ZZZ' and 'ZZZZ'
    - Check 'Compare barcodes list to results'
    - Submit
    => without patch, you get 2 results with problem 'Change item status' even for item with notforloan=0
    => with patch, you get 1 result with 'Change item status' on item with notforloan=9
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 358fb744c74cc63b7d2ae7d7e406ada205502ea8)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 7a8c0af22c46370c2a5187449da01d591c11ba75
Author: Benjamin Rokseth <benjamin.rokseth at kul.oslo.kommune.no>
Date:   Tue Dec 13 13:38:19 2016 +0100

    Bug 17758 - SIP checkin does not handle holds correctly
    
    This patch updates SIP checkin to use reserve_id as param, to fix regression
    introduced by Bug 14695.
    
    To test:
    
    Given 1 patron and 1 biblio with two items attached:
    
    1) create two record level holds on one biblio on same user
    Using SIP client or telnet:
    2) checkin item x on pickup branch, observe item is waiting and hold 1 is filled
    3) checkin item y on pickup branch, observe item y now is waiting and x is available
    4) apply this patch and repeat 1-3, now expected behaviour should be
       that both holds are filled and both items waiting
    
    Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 72de37e24bd02ffccad3cd1a76e0d74202cf7794)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 753eda6bae0a58282e134beadc96690ac2d26226
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Jan 25 17:00:34 2017 +0000

    Bug 17995 - HOLDPLACED notice should have access to the reserves table
    
    To test:
    1 - Add reserves.reservenotes to HOLDPLACED message
    2 - Enable emailLibrarianWhenHoldIsPlaced OpacHoldNotes sysprefs
    3 - Place a hold via OPAC with a note
    4 - view the messagequeue and note the reservenotes is blank
    5 - Apply patch
    6 - Place a hold with a note
    7 - view the messagequeue and note the reservenotes is populated
    
    Followed test plan, works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
    (cherry picked from commit 3b794b1312d0cfac81b302d0e823e2c5683a1f0e)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 71034e08013c5111098a648cf46113c8f671637f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Feb 24 11:44:23 2017 +0100

    Bug 18022: Fix possible crash if CircAutoPrintQuickSlip=clear screen
    
    If CircAutoPrintQuickSlip is set to clear screen, the $borrowernumber variable
    is reset but $borrower.
    In 16.11.x and before that causes the app to crash, because
    $borrower->{flags} is set to a hashref by GetMemberDetails, if
    $borrowernumber is set.
    
    This case is better handled in master (17.05) but side-effects could
    happen: if $borrowernumber is reset, $borrower should be reset too.
    
    The way to drive this behaviour is terrible and lot of things should be
    done to clean this area. This patch is a quick and easy fix to make it
    backportable easily.
    
    Test plan:
    On master, no change expected
    On 16.11 and before:
    0. Set CircAutoPrintQuickSlip=clear screen
    1. Create a new patron
    2. Set permission for this patron to 'reservesforothers' (or something
    else).
    3. Go on the circulation tab
    4. Do not fill the barcode input and submit
    => Without this patch you will get an error
    Can't use string ("64") as a HASH ref while "strict refs"....
    => With this patch apply you will get a blank screen (expected
    behaviour).
    
    I would recommend to test this patch with the other value of
    CircAutoPrintQuickSlip as well

commit a4e2f71dc563af9d33376f706fa3ec384c53ab87
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Feb 14 14:39:48 2017 +0000

    Bug 18058: Allow borrower_message_preferences to be truncated
    
    borrower_message_preferences cannot be truncated because of the foreign.
    DBMS fails with
      "Cannot truncate a table referenced in a foreign key constraint"
    
    To avoid that we should remove the FK check and truncate the other table
    as well.
    
    I am wondering if we really need a truncate here
      DELETE FROM borrower_message_preferences;
    should do the job, but leave it as it because of the param name.
    
    Test plan
      perl misc/maintenance/borrowers-force-messaging-defaults --doit --truncate
    Should no longer raise the error message
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit dd88c8f710e4915dac6437355c356f0632b776fb)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 39b1653348fd450ded9406a35b567042bf36d886
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Feb 15 17:14:13 2017 +0100

    Bug 18124: Change the calls to generate and check CSRF tokens
    
    The parameter change in Koha::Token should be applied to the calling
    scripts.
    
    Test plan:
    Confirm that the different forms of the scripts modified by this patch
    still work correctly.
    
    Test the problematic behavior:
    Open 2 tabs with in same user's session, go on the edit patron page
    (memberentry.pl).
    Log out and log in from the other tab.
    Submit the form
    => Wrong CSRF token should be raised
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 3f139899743ac3214e49d83c099120af28f414da
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Feb 16 11:59:12 2017 +0100

    Bug 18124: [Follow-up] Handle default parameters in a sub
    
    Adds a internal routine to handle default values for the parameters
    id and secret.
    Also adds a parameter session_id for generate_csrf and check_csrf. This
    session parameter is combined with the id parameter when generating or
    checking a token.
    
    Test plan:
    Run t/Token.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 9e74db7b51085f62919e34ab4e5ccdf9da2066a1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Feb 15 17:14:13 2017 +0100

    Bug 18124: Restrict CSRF token to user's session
    
    Currently the CSRF token generated is based on the borrowernumber, and
    is valid across user's session.
    We need to restrict the CSRF token to the current session.
    
    With this patch the CSRF token is generated concatenating the id
    (borrowernumber) and the CGISESSID cookie.
    
    Test plan:
    Run t/Token.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

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

Summary of changes:
 C4/Accounts.pm                                     |    2 +-
 C4/Acquisition.pm                                  |    6 +-
 C4/Auth.pm                                         |    2 +-
 C4/Bookseller.pm                                   |    2 -
 C4/Budgets.pm                                      |    2 +-
 C4/Circulation.pm                                  |   17 +-
 C4/Csv.pm                                          |  116 ----
 C4/HoldsQueue.pm                                   |    7 +-
 C4/InstallAuth.pm                                  |    4 +
 C4/Installer/UpgradeBackup.pm                      |   94 +++
 C4/Patroncards/Patroncard.pm                       |    6 +-
 C4/Record.pm                                       |   18 +-
 C4/Reserves.pm                                     |    2 +
 C4/SIP/ILS/Transaction/Checkin.pm                  |   12 +-
 C4/SIP/Sip/MsgType.pm                              |    8 -
 C4/Search.pm                                       |    2 +-
 C4/Serials.pm                                      |   23 +-
 C4/Utils/DataTables/Members.pm                     |    2 +-
 Koha/{Patron/Image.pm => CsvProfile.pm}            |    6 +-
 Koha/{Patron/Messages.pm => CsvProfiles.pm}        |   10 +-
 Koha/Exporter/Record.pm                            |    9 +-
 Koha/Token.pm                                      |   36 +-
 Makefile.PL                                        |    2 +-
 acqui/finishreceive.pl                             |    1 +
 acqui/lateorders.pl                                |    2 +-
 admin/aqbudgetperiods.pl                           |    2 -
 admin/aqbudgets.pl                                 |    3 +-
 admin/columns_settings.yml                         |    4 -
 authorities/authorities-home.pl                    |   13 +
 authorities/detail.pl                              |    2 +
 basket/basket.pl                                   |    8 +-
 basket/downloadcart.pl                             |    9 +-
 basket/sendbasket.pl                               |    6 +-
 circ/circulation.pl                                |    4 +-
 circ/returns.pl                                    |   28 +-
 debian/scripts/koha-plack                          |    2 +-
 .../prog/en/includes/members-toolbar.inc           |    4 +-
 .../prog/en/modules/admin/smart-rules.tt           |   18 +-
 .../prog/en/modules/authorities/detail.tt          |    2 +-
 .../en/modules/authorities/searchresultlist.tt     |    3 +-
 .../prog/en/modules/catalogue/results.tt           |    4 +-
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |   46 +-
 .../prog/en/modules/help/admin/categorie.tt        |    6 +-
 .../modules/help/admin/item_circulation_alerts.tt  |    6 +-
 .../prog/en/modules/help/admin/smart-rules.tt      |   22 +-
 .../prog/en/modules/help/members/boraccount.tt     |    4 +-
 .../prog/en/modules/installer/step3.tt             |    2 +-
 .../prog/en/modules/members/boraccount.tt          |   10 +-
 .../prog/en/modules/members/notices.tt             |    3 +-
 .../intranet-tmpl/prog/en/modules/members/pay.tt   |   12 +-
 .../prog/en/modules/patroncards/manage.tt          |   20 +-
 .../prog/en/modules/tools/csv-profiles.tt          |  614 ++++++++------------
 .../intranet-tmpl/prog/en/modules/tools/export.tt  |   13 +-
 .../prog/en/modules/tools/inventory.tt             |   14 +-
 .../opac-tmpl/bootstrap/en/modules/opac-detail.tt  |    4 +-
 .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt |   32 +-
 members/boraccount.pl                              |    3 +-
 members/deletemem.pl                               |    4 +-
 members/files.pl                                   |    1 +
 members/mancredit.pl                               |    3 +-
 members/maninvoice.pl                              |    3 +-
 members/member-flags.pl                            |   14 +-
 members/member-password.pl                         |   18 +-
 members/memberentry.pl                             |   17 +
 members/moremember.pl                              |    5 +-
 members/notices.pl                                 |    3 +-
 members/pay.pl                                     |    3 +-
 members/paycollect.pl                              |    3 +-
 members/printfeercpt.pl                            |    2 +-
 members/printinvoice.pl                            |    2 +-
 members/readingrec.pl                              |    4 +-
 members/routing-lists.pl                           |    2 +-
 members/statistics.pl                              |    2 +
 misc/export_records.pl                             |    9 +-
 .../maintenance/borrowers-force-messaging-defaults |    6 +-
 opac/opac-downloadcart.pl                          |    9 +-
 opac/opac-downloadshelf.pl                         |    7 +-
 opac/opac-memberentry.pl                           |   14 +-
 opac/opac-sendbasket.pl                            |    7 +-
 opac/opac-serial-issues.pl                         |    5 +-
 opac/sco/sco-main.pl                               |   35 +-
 serials/claims.pl                                  |    8 +-
 serials/lateissues-export.pl                       |   11 +-
 t/Token.t                                          |   56 +-
 t/db_dependent/Csv.t                               |   67 ---
 t/db_dependent/HoldsQueue.t                        |   35 ++
 t/db_dependent/Koha/CsvProfiles.t                  |   57 ++
 t/db_dependent/Serials.t                           |   27 +-
 t/db_dependent/Serials/ReNewSubscription.t         |   96 +++
 t/db_dependent/Utils/Datatables_Members.t          |   31 +-
 tools/batch_delete_records.pl                      |   21 +-
 tools/csv-profiles.pl                              |  161 ++---
 tools/export.pl                                    |   27 +-
 tools/import_borrowers.pl                          |   14 +-
 tools/inventory.pl                                 |   23 +-
 tools/picture-upload.pl                            |   18 +
 virtualshelves/downloadshelf.pl                    |   14 +-
 virtualshelves/shelves.pl                          |    5 +-
 98 files changed, 1172 insertions(+), 991 deletions(-)
 delete mode 100644 C4/Csv.pm
 create mode 100644 C4/Installer/UpgradeBackup.pm
 copy Koha/{Patron/Image.pm => CsvProfile.pm} (89%)
 copy Koha/{Patron/Messages.pm => CsvProfiles.pm} (84%)
 delete mode 100755 t/db_dependent/Csv.t
 create mode 100644 t/db_dependent/Koha/CsvProfiles.t
 create mode 100644 t/db_dependent/Serials/ReNewSubscription.t


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list