From gitmaster at git.koha-community.org  Fri Sep  1 18:06:35 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 01 Sep 2017 16:06:35 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v17.05.00-527-g185927f
Message-ID: <E1dnoSp-0002OB-2R@git.koha-community.org>

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, master has been updated
       via  185927f20981f36757c97fd33cc4c8ccd0ad5a3a (commit)
       via  b66b86402cd84026f7dabaa2e567a1956b9bbe86 (commit)
       via  8901f5702a7c6755c1f84cde01d75765687bb060 (commit)
       via  d928038a523b7ef44257ddfe97c405173c9b3b2e (commit)
       via  0e744d49b557e3401ae7b700b1410b022a4e851c (commit)
       via  0fc3f19605d3979333dc333237205b9bef6ab60b (commit)
       via  57427f7a10c887964fa4d4397c6ec238af2bc694 (commit)
       via  327495b5e0ec4de47d20bd27d6a1c5b88e0be191 (commit)
       via  4934ee4a1601bd268a7153b7189387bb073dd11f (commit)
       via  f1b0dae9a6055e8ba5e9a9638af32060c1e17e33 (commit)
       via  48f54016a7accfc0cc43bf01cbac70a8482bc3f9 (commit)
       via  bb31d99065c468fbec2443cd15894b03657a24d5 (commit)
       via  8fd0847c82adbcaf0af3285dd9cfc5e646ba6500 (commit)
       via  a932d05ace6500a3b67888aad1306e58cfa8014f (commit)
       via  65bce82b1fb32d3d98fe4d4ef1e1738a97749632 (commit)
       via  6c1504cfdb301cb0f9f3a14b5db31a63f5c3b0a5 (commit)
       via  2e9165001f69312255ad1b6706f040784460d5d1 (commit)
       via  16c25a36988b47fb9fcbabd91fdace5f98f9caed (commit)
       via  7db6067dc4cc55bee771fedb31e2454b72123ac0 (commit)
       via  786deba62beb5a52a543af5415610e14f7d0a8c5 (commit)
       via  d0e3891e251a6a11188d70a5480af0e44b8c1fb0 (commit)
       via  515e62992893b72c54a34311088a9442a37d8138 (commit)
       via  a887aeb2dff4e52f35f1f64bfc267867987cbb53 (commit)
       via  82f183c5ea802e3231cb2442cf32474c92bd6ab4 (commit)
       via  ee49d5698a11ee5806aff8c8581fa22002435cff (commit)
       via  947834f1821449faf9148f06c84f5638b0941435 (commit)
       via  391bf4f38dcaa89745115409d01cca9cd1e99dce (commit)
       via  f24e339dd603e015557107048d1a678293cb2e65 (commit)
       via  f10f6a19c53beb37e3ee0808ef6bb18bd88bef8a (commit)
       via  ae7e0ee56a17ae2a0c6fdaa96c6b04229aabca74 (commit)
       via  9d207f3832bc49232f30e8d7dbf2ac60e3ab9699 (commit)
       via  8c90bb78c9fe411c5ea549f8100939e29b7a4bc1 (commit)
       via  7abe6e9670ecb9b879e3b8c237fd9fad35f5ff18 (commit)
       via  ff4f0858950c37eeede38b2f067841602b97d7ba (commit)
       via  7f27ef71e26720604b738c86c084b91858ef7c1a (commit)
       via  9cc7268362219e39b22aebb03a83e013f467d93a (commit)
       via  10311769d460a775aa8c8ee8a190836a8f2b1f1e (commit)
       via  8d08254b2202353517c16f34172cb92dcdd5befa (commit)
       via  85b963d11fb5d8674ca6b0ec60821663f9d8cf19 (commit)
       via  831d75d09c276f25f919cbdc16c8e4105fe8ddc9 (commit)
       via  ccac8ba6d3799c52adc80298b96a8efaf05c4a9e (commit)
       via  239589b119c88a321fb8245f859855c41dda6566 (commit)
       via  d5ea914f4dc41f78dbb3a59f894f6ecbb9a1afa4 (commit)
       via  51a65731c0fa15c37351ce6bc478fa6dc63fc64f (commit)
      from  d51059807690797aa4d16b0c0dd2932235a3b683 (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 185927f20981f36757c97fd33cc4c8ccd0ad5a3a
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Aug 11 15:39:53 2017 +0000

    Bug 19076 - followup - delete fines from additional renewal
    
    Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit b66b86402cd84026f7dabaa2e567a1956b9bbe86
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu Aug 10 15:20:58 2017 +0000

    Bug 19076 - Move issue logging in AddIssue into condtional clause
    
    Currently AddIssue tests if renewal, but logs an issue even if so. This
    patch moves the logging into the conditional so a log entry is only
    added if we aren't renewing (as renewals are logged separately)
    
    To test:
    1 - prove t/db_dependent/Circulation.t - one test should fail
    2 - Enable both issue and renewal logs
    3 - Checkout an item to a patron
    4 - View the logs - the issue is captured
    5 - Checkout the item to the patron again and confirm renewal
    6 - Both an issue and a renewal are logged
    7 - Apply patch
    8 Repeat 1-6, tests should pass and only renewal should be logged
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 8901f5702a7c6755c1f84cde01d75765687bb060
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu Aug 10 15:20:19 2017 +0000

    Bug 19076 - unit tests
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit d928038a523b7ef44257ddfe97c405173c9b3b2e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Aug 28 14:00:28 2017 -0300

    Bug 19081: Do not list plugins that have been uninstalled
    
    Under plack, can_load should not check if a package is in cache, but
    reload it. Otherwise plugins that have been uninstalled will still get
    listed.
    The error raised by can_load must only be displayed if the plugin has
    been removed.
    
    Test plan:
    1/ Upload a plugin
    2/ Note the plugin is listed as installed
    3/ Modify the package of the plugin to add a compilation error (use
    'Foo' for instance)
    4/ Reload the page
    5/ The plugin is not listed and a warning appear in the logs
    6/ Remove the compilation error and uninstall the plugin
    7/ The plugin is no longer listed and no warning appear in the logs
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Bug 19081: Remove useless $plugin_file variable
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 0e744d49b557e3401ae7b700b1410b022a4e851c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Aug 28 08:51:24 2017 +0200

    Bug 19004: [QA Follow-up] No need to check item-level_itypes again
    
    As Jonathan pointed out, GetItem already called effective_itemtype.
    So we can just use $item->{itype} here.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 0fc3f19605d3979333dc333237205b9bef6ab60b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Aug 9 16:30:03 2017 +0200

    Bug 19004: Adjust AddReturn for retrieving item type
    
    In the regular situation, you can get itemtype via biblio and then
    biblioitem as well as via biblioitem (at least when item-level_itypes
    is set to biblio).
    
    But since Koha unfortunately defined two relations in item, one for
    biblioitemnumber (the good one) and one for biblionumber (redundant),
    TestBuilder (correctly) builds one biblioitem and two biblios.
    
    If you item-level_itypes to biblio record, this will result in failing tests
    when calling AddReturn (in this case Koha/Patrons.t).
    It will crash on:
        Can't call method "itemtype" on an undefined value at C4/Circulation.pm line 1826.
    Cause: AddReturn goes via the biblionumber to biblio and than to
    biblioitems, and it does not find a biblioitem. (Not a fault from TestBuilder
    but a database design problem.)
    
    This patch makes a small change in AddReturn to retrieve the itemtype via
    biblioitem. It actually is a shorter road than items->biblio->biblioitems.
    
    Note: I do not test the Biblioitems->find call, since we already checked
    the GetItem call before and we have a foreign key constraint.
    I did not call $item->effective_itemtype since we still use GetItem; this
    could be done later.
    
    Adjusted Circulation/Returns.t too: If we add an item with TestBuilder and
    we called AddBiblio before, we should link biblioitemnumber as well.
    
    Test plan:
    [1] Do not apply this patch yet.
    [2] Set item-level_itypes to biblio record.
    [3] Run t/db_dependent/Koha/Patrons.t. (It should fail.)
    [4] Apply this patch.
    [5] Run t/db_dependent/Koha/Patrons.t again.
    [6] Run t/db_dependent/Circulation/Returns.t
    [7] Git grep on AddReturn and run a few other tests calling it.
        Note: Bugs 19070/19071 address three tests that call AddReturn too.
    [8] In the interface, check in a book.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Note: Bugs 19070 and 19071 are already pushed. The command in comment #4
          has all the tests successful.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 57427f7a10c887964fa4d4397c6ec238af2bc694
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Sun Jul 30 16:53:00 2017 +0200

    Bug 19004: Patrons.t should create its own data for enrollment fees.
    
    If the patron categories J, K, YA would not exist, Patrons.t would fail.
    
    Test plan:
    [1] Remove one of these patron categories.
    [2] Run t/db_dependent/Koha/Patrons.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 327495b5e0ec4de47d20bd27d6a1c5b88e0be191
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Sat Aug 19 10:22:44 2017 +0200

    Bug 14316: Clarify meaning of record number in Batch record modification tool
    
    Same change as the first patch, but for the batch record
    modification tool.
    
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 4934ee4a1601bd268a7153b7189387bb073dd11f
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Jun 8 02:03:34 2015 +0200

    Bug 14316: Clarify meaning of record number in Batch record deletion tool
    
    Changes the label from 'list of record numbers...' to
    'List of biblionumbers or authority ids...' to make it
    more clear to the user which kind of input is expected.
    
    To test:
    - Go to Tools > Batch record deletion
    - Check the new description
    - Decide if it's more clear or not
    
    Signed-off-by: Marc Veron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit f1b0dae9a6055e8ba5e9a9638af32060c1e17e33
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Sep 1 08:41:51 2017 -0400

    Bug 18946 [QA Followup] - code cleanup
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 48f54016a7accfc0cc43bf01cbac70a8482bc3f9
Author: Karam Qubsi <karamqubsi at gmail.com>
Date:   Wed Jul 19 00:06:48 2017 +0800

    Bug 18946 - Change language from external web fails
    
    How to reproduce:
    1. Get a multiling?al Koha like
    http://demo1.orex.es/cgi-bin/koha/opac-changelanguage.pl?language=en
    http://demo1.orex.es/cgi-bin/koha/opac-changelanguage.pl?language=es-ES
    
    2. Copy that urls to any web page in an other domain -it must be in some
    host - and try to link to the spanish or english version,it will keep you in the same position.
    
    3. Apply this patch and try again , everything should work fine .
    
    Signed-off-by: Hugo Agud <hagud at orex.es>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit bb31d99065c468fbec2443cd15894b03657a24d5
Author: Lari Taskula <lari.taskula at jns.fi>
Date:   Wed May 31 17:03:54 2017 +0300

    Bug 18692 - intranet part
    
    Fixes misplaced columns introduced by previous patch and adds the "-" for phone
    transport type.
    
    To test:
    1. Set SMSSendDriver system preference on
    2. Go to intranet messaging preferences
    3. By default you should see checkboxes for all messages for SMS
    4. Ensure columns are not misplaced (pushing one column too much to the right)
    5. Delete sms method from one of the messages in message_transports table
    6. Observe that "-" is displayed instead of checkbox for that message for SMS
    7. Repeat same for TalkingTechItivaPhoneNotification system preference.
       By default it may not have transports in message_transports, so make sure
       to assign some in order to have the checkboxes visible.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 8fd0847c82adbcaf0af3285dd9cfc5e646ba6500
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Thu Jun 1 17:22:42 2017 +0200

    Bug 18692 - same with syspref TalkingTechItivaPhone
    
    Fixes misplaced columns introduced by previous patch and adds the "-" for phone
    transport type.
    
    To test:
    1. Set SMSSendDriver system preference on
    2. Go to intra and OPAC messaging preferences
    3. By default you should see checkboxes for all messages for SMS
    4. Ensure columns are not misplaced (pushing one column too much to the right)
    5. Delete sms method from one of the messages in message_transports table
    6. Observe that "-" is displayed instead of checkbox for that message for SMS
    7. Repeat same for TalkingTechItivaPhoneNotification system preference.
       By default it may not have transports in message_transports, so make sure
       to assign some in order to have the checkboxes visible.
    
    https://bugs.koha-community.org/show_bug.cgi?id=8692
    
    Signed-off-by: Michael Andrew Cabus <michael at bywatersolutons.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit a932d05ace6500a3b67888aad1306e58cfa8014f
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Mon May 29 16:32:18 2017 +0200

    Bug 18692 - When SMS is enabled the OPAC messaging table is misaligned
    
    Bug 6726 had corrected the fact that when SMS is enabled the messaging table is missing a column.
    Bug 6458 has broken this.
    The SMS column is missing an else case with cell containing only "-" like other columns.
    
    Test plan :
    - set SMSSendDriver preference empty
    - go to OPAC patron messaging
    - column SMS should not be visible
    - set SMSSendDriver preference not empty
    - go to OPAC patron messaging
    - column SMS appears with checkboxes
    
    Signed-off-by: Michael Andrew Cabus <michael at bywatersolutons.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 65bce82b1fb32d3d98fe4d4ef1e1738a97749632
Author: Marc V?ron <veron at veron.ch>
Date:   Wed Aug 9 09:46:02 2017 +0200

    Bug 18636: Sysprefs: Add explanation for conflict autonumbernum / BorrowerMandatoryFields
    
    This patch adds a note to the system preferences autonembernum and
    BorrowerMandatoryFields regarding a conflict if automembernum is on
    and BorrowerMandatoryFields contains cardnumber.
    
    To reproduce issue: See initial comment.
    
    To test:
    - Apply patch
    - Verify that in system preferences note appears with both prefs
      automembernum and BorrowerMandatoryFields
    
    Followed test plan, works as described
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 6c1504cfdb301cb0f9f3a14b5db31a63f5c3b0a5
Author: Marc V?ron <veron at veron.ch>
Date:   Tue Jun 27 18:50:44 2017 +0200

    Bug 16485: collection column in Item search is always empty
    
    This patch fills the column 'Collection' in item search from the item values.
    
    To test:
    - Go to item search
    - Reproduce issue from initial comment
    - Apply patch
    - Verify that the column 'Collection' is filled
    
    Still to do, but outside of my datatable skills:
    Filter by drop down in the column header does a substring search.
    Example: Filter for 'Fiction" returns both 'Fiction' and 'Non-fiction' items.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Laurence Rault <laurence.rault at biblibre.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 2e9165001f69312255ad1b6706f040784460d5d1
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Wed Aug 2 17:12:44 2017 +0100

    Bug 19024 Do not unset order cancelled status on basket close
    
    On closing a basket, status is updated to ordered for orders not
    completed. However the operation  was resetting the status for
    cancelled as well as new orders.
    While display is correct from the basket view (it checks the
    cancellation date). The status in the acquisitions tab from the
    catalogue view reverts erroneously to ordered.
    
    This patch adds cancelled to the statuses not updated on basket
    close.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 16c25a36988b47fb9fcbabd91fdace5f98f9caed
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Tue Aug 15 11:44:12 2017 +0100

    Bug 19024 Fix some infelicities of phrasing in test messages
    
    The test messages were awkwardly phrased, re phrase them to
    sound more natuaral. Patch is cosmetic (grammar) only
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 7db6067dc4cc55bee771fedb31e2454b72123ac0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 9 16:09:32 2017 -0300

    Bug 19024: Add tests
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 786deba62beb5a52a543af5415610e14f7d0a8c5
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Fri Aug 18 08:36:59 2017 +0000

    Bug 9857 - Follow-up - Fix for searches with su= or su:
    
    When the initial search is su=.../su:... the links was
    not constructed correctly. With this change, it should
    be the case.
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit d0e3891e251a6a11188d70a5480af0e44b8c1fb0
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Fri Dec 4 01:17:50 2015 +0100

    Bug 9857: Did you mean? uses wrong punctuation in search links
    
    The link changes the search links generated by the plugins
    from an=authid to an:authid, as suggested by Jared on the
    bug report.
    
    - Turn on the AuthorityFile und ExplodedTerms  plugins
      for the OPAC from the "Did you mean" section of the
      administration module
    - Search a term in your OPAC where one or several
      authorities exist.
      A last name or a place name might work well.
    - Verify that there are suggestions displayed on top of
      your result list.
    - Verify that the link created is something like:
      /cgi-bin/koha/opac-search.pl?q=an=14084
    - Apply patch.
    - Verify the link has changed a little and still works
      correctly:
      /cgi-bin/koha/opac-search.pl?q=an:14084
    
    Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 515e62992893b72c54a34311088a9442a37d8138
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date:   Wed Jul 12 10:09:48 2017 +1200

    Bug 18621: Added in value attribute to dateexpiry field
    
    Test plan:
    1. Create a patron category with the dateexpiry value of 29/9/2017
    
    2. Create a patron user from that patron category (which I'll refer to as patron A) with the date
    expiry value of 1/10/2017 and submit the form
    
    3. Notice that the manual dateexpiry you have submitted is correctly
    displayed
    
    4. Create a duplicate patron with the same firstname and surname and
    patron A, and set the date expiry value of 1/10/2017 and submit the form
    
    5. The form displays a duplicate patron message. Notice that the dateexpiry input box is empty now
    
    6. Select the new member (not a duplicate member) option in the
    messagebox
    
    7. The form successfully submits and notice that the date expiry value
    displayed is that of the patron category (i.e. it is 29/9/2017) not the
    dateexpiry value of 1/10/2017 that you manually set for this patron
    
    8. Apply patch
    
    9. Repeat step 4
    
    10. The form displays a duplicate patron message. Notice the dateexpiry input box still
    contains the value you entered which is 1/10/2017. Select the new member
    (not a duplicate member) option in the messagebox
    
    11. The form successfully submits and notice that the date expiry value
    displayed is 1/10/2017 that you manually set for this patron
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit a887aeb2dff4e52f35f1f64bfc267867987cbb53
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Fri Aug 18 00:14:52 2017 +0200

    Bug 19129 - Follow-up - Add changes to patron duplicate warning
    
    Adds logic from the previous fix to the brief patron summary
    shown when checking a possible patron duplicate.
    
    Bonus: Also fixes missing patron category description there.
    
    To Test:
    - Add 2 patrons
    - Add a patron with the same surname and firstname as an
      existing patron in order to trigger the duplicate message
    - Click "View existing patron"
    - Verify display is correct when existing patron is
      - an organisation
      - not an organisation
    - Verify that the patron category description shows
    
    Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 82f183c5ea802e3231cb2442cf32474c92bd6ab4
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Thu Aug 17 14:51:08 2017 +0000

    Bug 19129 - Clean up Details tab for Organisation patrons
    
    Problem: A patron category "I" would cause display problems
    on the details in the intranet. This is because the templates
    confused patron category "I" with patron type "I" (organisation).
    
    Patch:
    - Cleans up variable confusion between categorycode and
      categorytype.
    - The template contained code to change the labels below
      the address to 'Organisational phone:" etc., I have removed
      this part as it does not match the edit form anymore.
    - Initials, date of birth and gender are still hidden for
      organisation - matching the edit form.
    
    Bonus:
    - The patron category description was missing on the
      right and left side of the details tab. Now it displays.
    - Fixes some html issues:
      - doubled up class attribute in a tag
      - doubled up </li></li>
    
    To test:
    - Create 3 patrons
      - patron category code doesn't matter, but category type organisation
      - patron category code 'I', category type NOT organisation
      - patron category code NOT I, category type NOT organisaton
    - Check details tab in patron account in staff for all 3
      - Verify patron category description shows correctly
      - Verify information added to the account displays correctly
        (phone numbers, emails, ...)
    
    Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ee49d5698a11ee5806aff8c8581fa22002435cff
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Sep 1 09:56:09 2017 +0000

    Bug 11580 - [QA Followup] Remove debug statements
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 947834f1821449faf9148f06c84f5638b0941435
Author: Baptiste Wojtkowski <baptiste.wojtkowski at biblibre.com>
Date:   Thu Feb 23 16:21:05 2017 +0000

    Bug 11580 : Added unit test
    
    Added one unit test when the syspref useDaysMode is active.
    This does not move code anymore
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 391bf4f38dcaa89745115409d01cca9cd1e99dce
Author: Sophie Meynieux <sophie.meynieux at biblibre.com>
Date:   Wed Nov 16 16:46:04 2016 +0100

    Bug 11580 - If returnBeforeExpiry is ON, use calendar to calculate return date not on closed day (depending on useDaysMode)
    
    Test plan:
    1. ReturnBeforeExpiry is activated
    2. useDaysMode is different from "circulation rules only"
    3. Set expiry date of a patron to a near date
    4. Set a closed day on calendar for this date
    5. Do a checkout
    
    Without patch, return date will be patron expiration date
    With the patch, return date will be last open day before patron expiration day
    
    Signed-off-by: Claire Gravely <claire_gravely at hotmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit f24e339dd603e015557107048d1a678293cb2e65
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Tue Jun 27 04:14:47 2017 +0000

    Bug 16726: [FOLLOW-UP] Putting text in h1
    
    Works as outlined in test plan, search terms now appear at top as h1 as well
    
    Signed-off-by: Dilan Johnpull? <dilan at calyx.net.au>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit f10f6a19c53beb37e3ee0808ef6bb18bd88bef8a
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Wed Jun 7 02:09:36 2017 +0000

    Bug 16726: Clear text in syspref searchbox after submitting
    
    To test:
    1) Go to Admin -> search for a system preference
    2) Notice your search stays in the search box (this is inconsistent with
        search behaviour across Koha)
    3) Apply patch and refresh page
    4) Make another search
    5) Confirm search still works as expected and search terms have been
    cleared from search box
    6) Confirm search terms show at the top of the results
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ae7e0ee56a17ae2a0c6fdaa96c6b04229aabca74
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Dec 20 16:58:05 2016 +0100

    Bug 17797: Add XSLT_Handler in opac/unapi
    
    Replaces some code by a call to existing module.
    Removes the $@->code and $@->message calls.
    
    Test plan
    [1] Run /cgi-bin/koha/unapi?id=koha:biblionumber:[number]&format=marcxml
    [2] Try some variations.
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 9d207f3832bc49232f30e8d7dbf2ac60e3ab9699
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Aug 30 12:06:36 2017 -0400

    Bug 19209 [Followup] - Ensure checkouts don't prevent deleting patrons
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 8c90bb78c9fe411c5ea549f8100939e29b7a4bc1
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Aug 30 12:30:05 2017 -0300

    Bug 19209: (QA followup) Improve tests
    
    This path merges the pager() test and adds search results count tests
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 7abe6e9670ecb9b879e3b8c237fd9fad35f5ff18
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Aug 30 12:09:37 2017 -0300

    Bug 19209: Add ->is_paged method to Koha::Objects
    
    This patch adds ->is_paged to Koha::Objects. It is inherited from the underlying resultset
    from DBIC so there's no code besides adding it to the known methods in AUTOLOAD.
    
    Tests are added for the newly exported method.
    
    To test:
    - Apply this patch
    - Run:
      $ sudo koha-shell kohadev
     k$ cd kohaclone
     k$ prove t/db_dependent/Koha/Objects.t
    => SUCCESS: Tests pass!
    - Sign off :-D
    
    Sponsored-by: Camden County
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ff4f0858950c37eeede38b2f067841602b97d7ba
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu Jun 15 11:07:03 2017 -0400

    Bug 18812 - SIP Patron status does not respect OverduesBlockCirc
    
    To test:
    1 - Set 'OverduesBlockCirc' to block
    2 - Find or create a patron with overdues
    3 - Perform a SIP patron lookup on that patron
    misc/sip_cli_emulator.pl -a 127.0.0.1 -p 6001 -su term1 -sp term1 -l CPL
    --patron {userid or cardnumber} --password {pass} -m patron_information
    4 - Note the first character of response is a ' '
    5 - Apply patch
    6 - Restart memcached, apache, and plack
    7 - Perform SIP patron lookup
    8 - Note the first character of response is 'Y'
    9 - prove t/db_dependent/SIP/Patron.t
    10 - Test should return green
    
    Signed-off-by: Chris Kirby <chris.kirby at ilsleypubliclibrary.org>
    Works as advertised
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 7f27ef71e26720604b738c86c084b91858ef7c1a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Aug 7 17:29:43 2017 -0300

    Bug 19056: Replace C4::Reserves::GetReserveCount with Koha::Patron->holds->count
    
    This subroutine is only used once and can easily be replaced with
    Koha::Patron->holds->count
    
    Test plan:
    - Set maxreserves=5
    - Place 3 holds for a given patron
    - Place again 3 holds for this patron
    3+3 > 5 => The holds must not be placed
    
    Signed-off-by: Marc V?ron <veron at veron.ch>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 9cc7268362219e39b22aebb03a83e013f467d93a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Aug 7 17:25:15 2017 -0300

    Bug 19055: Remove C4::Reserves::GetReservesToBranch
    
    This subroutine is no longer in used and can be removed
    
    Test plan:
      git grep GetReservesToBranch
    must not return any results
    
    Signed-off-by: Marc V?ron <veron at veron.ch>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 10311769d460a775aa8c8ee8a190836a8f2b1f1e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Mon Jul 31 09:18:15 2017 -0400

    Bug 19007 - Allow paypal payments via debit or credit card again
    
    A recent change in Paypal has removed the previous default option of paying via debit or credit card without an account. To bring this option back, we need to send an additional parameter to the PayPal API.
    
    Test Plan:
    1) Enable paypal for your Koha instance
    2) Ensure you are not logged in to PayPal
    3) Attempt to pay a fine via PayPal
    4) Not the the "Pay with Debit or Credit Card" option is missing
    5) Apply this patch
    6) Refresh opac-account.pl
    7) Attempt to make a payment via PayPal again
    8) Note the option "Pay with Debit or Credit Card" is now available
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: George Williams <gwilliams at nekls.org>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 8d08254b2202353517c16f34172cb92dcdd5befa
Author: Marc V?ron <veron at veron.ch>
Date:   Sat Feb 18 18:35:39 2017 +0100

    Bug 14353 - Show 'damaged' and other status on the 'place holds' page in staff
    
    This patch adds status 'Damaged' to 'Information' 'Status' in the items
    table on 'Place hold' page.
    
    To test:
    - Apply patch
    - In staff client, try to place an item level hold for items with 'Damaged'
      status.
    - Verify that the status 'Damaged' appears in the column 'Information'.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 85b963d11fb5d8674ca6b0ec60821663f9d8cf19
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Feb 26 14:46:45 2016 +0000

    Bug 15924 - Coce not enabled on lists
    
    To test:
    Enable Coce and disable other image services
    Load a list and not there are no covers
    Apply patch
    Load a list and note there are covers
    
    https://bugs.koha-community.org/show_bug.cgi?id=15924
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 831d75d09c276f25f919cbdc16c8e4105fe8ddc9
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Aug 30 10:35:03 2017 -0400

    Bug 19208 - Pay select option doesn't pay the selected fine
    
    The "Pay selected" option on the Fines tab in the borrower account page doesn't work as intended.
    The fine on top of the list gets the amount deducted, even if another fine is choosen from the list.
    
    Test Plan:
    1) Create two or three fines, using the Create manual invoice function.
    2) Choose one of the fines (not the one on the top) and click Pay selected
    3) Pay a partial amount
    4) Go back to the Pay fines tab an notice that the fine you selected has not changed. Instead, either the top fine or the total (see attachment) has ben affected.
    5) Apply this patch
    6) Repeat steps 1-3
    7) Note the correct fine is paid
    
    Signed-off-by: Andreas Hedstr?m Mace <andreas.hedstrom.mace at sub.su.se>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ccac8ba6d3799c52adc80298b96a8efaf05c4a9e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Sep 1 12:58:18 2017 -0300

    Bug 18718: DBRev 17.05.00.005
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 239589b119c88a321fb8245f859855c41dda6566
Author: Marc V?ron <veron at veron.ch>
Date:   Fri Jun 2 12:11:47 2017 +0200

    Bug 18718: Language selector in staff header menu similar to OPAC
    
    This patch adds a language selector menu to the top menu of staff client
    similar to the OPAC.
    Display of language selectors at top, bottom or both can be configured
    with system preference StaffLangSelectorModer. It defaults to bottom.
    
    To test:
    - Apply patch
    - Udate database
    - Restart plack and memchached
    - Go to staff client, verify that language selector displays at
      the bottom of the page (as before)
    - Go to system preferences, verify that there is a new preference
      StaffLanguageSelectorMode (name similar to the sypref ror OPAC), and
      that it is set to 'footer'
    - Change mode for top, both and footer and verify, go to staff client
      and verify for each that the language selector displays as appropriate
    
    (Amended for comment #2  2017-06-02 mv)
    
    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: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit d5ea914f4dc41f78dbb3a59f894f6ecbb9a1afa4
Author: Serhij Dubyk {?????? ?????} <serhijdubyk at gmail.com>
Date:   Tue Aug 22 17:19:32 2017 +0300

    Bug 17827 - Untranslatable "by" in MARC21slim2intranetResults.xsl
    
    Signed-off-by: Serhij Dubyk {?????? ?????} <serhijdubyk at gmail.com>
    
    The "by" after the title was not translatable in the result
    lists of the intranet. This patch fixes it by removing
    a comment, that caused a problem with the translation
    scripts.
    
    To test:
    Test:
    
    Before this patch in file en-GB-marc-MARC21.po present next paragraph:
    
    msgid "by "
    msgstr " by "
    
    According string "by " in the file MARC21slim2intranetResults.xsl can not be translated (in other languages).
    
    After applying this patch performed next command:
    cd /usr/share/koha/misc/translator
    sudo env KOHA_CONF=/etc/koha/sites/mykohainstance/koha-conf.xml PERL5LIB=/usr/share/koha/lib perl -I /usr/share/koha/lib "./translate" update
    
    Now in the file en-GB-marc-MARC21.po present the following (modified) paragraph:
    
    msgid "by "
    msgstr " by "
    
    https://bugs.koha-community.org/show_bug.cgi?id=17827
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 51a65731c0fa15c37351ce6bc478fa6dc63fc64f
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Tue Aug 29 04:51:40 2017 +0000

    Bug 19194: Check itemtype is defined when receiving an order
    
    To test:
    1) Find a record with an item that has no itemtype (or remove the
    itemtype of an item)
    2) Go to Acquisitions -> Find a vendor or make a new one -> create a new
    basket
    3) Add the record from Step 1 to your basket
    4) Close the basket
    5) Go back to the vendor and click 'Receive shipments'
    6) Put in an invoice number, click Next
    7) Click the Receive link for your item
    8) Confirm you see an internal server error
    9) Apply the patch and refresh the page
    10) The error should be gone and behaviour should continue as expected
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 C4/Acquisition.pm                                  |    6 +-
 C4/Circulation.pm                                  |   22 +++---
 C4/Reserves.pm                                     |   53 --------------
 C4/SIP/ILS/Patron.pm                               |    3 +-
 Koha.pm                                            |    2 +-
 Koha/Objects.pm                                    |    2 +-
 Koha/Plugins.pm                                    |    6 +-
 Koha/SuggestionEngine/Plugin/AuthorityFile.pm      |    5 +-
 Koha/SuggestionEngine/Plugin/ExplodedTerms.pm      |    7 +-
 acqui/orderreceive.pl                              |    4 +-
 installer/data/mysql/sysprefs.sql                  |    3 +-
 installer/data/mysql/updatedatabase.pl             |   10 +++
 .../en/includes/catalogue/itemsearch_item.json.inc |    3 +-
 .../intranet-tmpl/prog/en/includes/circ-menu.inc   |    7 +-
 .../intranet-tmpl/prog/en/includes/header.inc      |    1 +
 .../prog/en/includes/intranet-bottom.inc           |    4 +-
 .../prog/en/includes/langmenu-staff-top.inc}       |   10 +--
 .../prog/en/includes/members-toolbar.inc           |    4 +-
 .../prog/en/includes/messaging-preference-form.inc |   20 ++++--
 .../prog/en/includes/prefs-admin-search.inc        |    2 +-
 .../prog/en/modules/admin/preferences.tt           |    2 +
 .../prog/en/modules/admin/preferences/patrons.pref |    2 +
 .../en/modules/admin/preferences/staff_client.pref |    7 ++
 .../prog/en/modules/catalogue/itemsearch.tt        |    4 +-
 .../prog/en/modules/members/memberentrygen.tt      |    2 +-
 .../prog/en/modules/members/moremember-brief.tt    |   28 +++-----
 .../prog/en/modules/members/moremember.tt          |   74 +++++++++-----------
 .../prog/en/modules/members/paycollect.tt          |    2 -
 .../prog/en/modules/reserve/request.tt             |    4 +-
 .../prog/en/modules/tools/batch_delete_records.tt  |    2 +-
 .../en/modules/tools/batch_record_modification.tt  |    2 +-
 .../prog/en/xslt/MARC21slim2intranetResults.xsl    |    2 +-
 .../bootstrap/en/modules/opac-messaging.tt         |   10 ++-
 .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt |   20 +++++-
 members/moremember.pl                              |    6 +-
 members/paycollect.pl                              |    5 +-
 opac/opac-account-pay.pl                           |    1 +
 opac/opac-changelanguage.pl                        |   14 ++--
 opac/unapi                                         |   27 +++----
 reserve/request.pl                                 |    3 +-
 t/db_dependent/Acquisition/close_reopen_basket.t   |   15 +++-
 t/db_dependent/Circulation.t                       |   17 ++++-
 t/db_dependent/Circulation/Returns.t               |    4 +-
 t/db_dependent/Circulation/dateexpiry.t            |   22 +++++-
 t/db_dependent/Holds.t                             |    5 +-
 t/db_dependent/Koha/Objects.t                      |   36 ++++++++--
 t/db_dependent/Koha/Patrons.t                      |   16 ++---
 t/db_dependent/SIP/Patron.t                        |   34 ++++++++-
 48 files changed, 313 insertions(+), 227 deletions(-)
 copy koha-tmpl/{opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc => intranet-tmpl/prog/en/includes/langmenu-staff-top.inc} (72%)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep  1 22:22:44 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 01 Sep 2017 20:22:44 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v17.05.00-534-gecf6ca5
Message-ID: <E1dnsSi-0001zZ-LN@git.koha-community.org>

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, master has been updated
       via  ecf6ca5d6e1472bab68f174ab50a20eec6b74888 (commit)
       via  c758e222428ba6ad69b3d52ee6030d02e17ae964 (commit)
       via  be4f624b326574a14260c94c90aeb10a9ab56d91 (commit)
       via  ba1f2f93ef58c8dd935add3e215facdd4a589d12 (commit)
       via  fba915e911a3b50ff9a0ea96d25a464836471073 (commit)
       via  a6de2b66d19b8418dcb792c23e17b211e4c17719 (commit)
       via  49778103ce528ccfc7fcc8be26bcae3b4ae7815b (commit)
      from  185927f20981f36757c97fd33cc4c8ccd0ad5a3a (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 ecf6ca5d6e1472bab68f174ab50a20eec6b74888
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed May 31 13:58:27 2017 +0000

    Bug 18708 [Revised] Show itemBarcodeFallbackSearch results in a modal window
    
    This patch modifies the circulation template so that
    itemBarcodeFallbackSearch results show in a modal window.
    
    To test, enable the itemBarcodeFallbackSearch system preference and open
    a patron's account in circulation.
    
    - Submit a string which will return search results. When the page
      reloads a modal should display showing a table of title search
      results.
      - Test the "Check out" button and confirm that the correct item is
        submitted.
      - Test closing the modal and re-displaying it using the new "Show
        matching titles" button.
      - Confirm that the "Add record using fast cataloging" button still
        works correctly.
    - Submit a string which will return no results. No modal window should
      display, and only the "Add record" button should appear.
    - Confirm that normal checkout works correctly.
    - Test with itemBarcodeFallbackSearch disabled, and with a user who
      lacks Fast Cataloging permission.
    
    Revision removes a heading which was made redundant by the modal markup.
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit c758e222428ba6ad69b3d52ee6030d02e17ae964
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Jan 19 20:14:51 2017 +0100

    Bug 17967: TT syntax for notices - Prove that ODUE is compatible
    
    Nothing new here, unless we are introducing a regression.
    The items.fine is a trick of our historical syntax.
    We need to provide a way to access this value from the a notice template
    using the TT syntax.
    A bug 17976 has been opened for discussion.
    
    Test plan:
    Define ODUE and OVERDUES_SLIP notice templates and use it to generate
    overdue notices from the cronjob script (misc/cronjobs/overdue_notices.pl)
    or the interface (members/print_overdues.pl).
    
    You should be able to generate the same notices with and without using
    the TT syntax
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit be4f624b326574a14260c94c90aeb10a9ab56d91
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Jan 17 04:32:58 2017 +0100

    Bug 17966: TT syntax for notices - Prove that ISSUESLIP is compatible
    
    Here we go, you will notice at the dependency list that this one is a
    bit different.
    In our former syntax we have 2 custom tags <checkedout> and <overdue>.
    These tags were allowed to permit loop on the checked out items and the
    overdue items.
    
    In this patch, we will use the "loops" parameter, introduced by bug
    17971, to pass the list of checkouts and overdues to the template.
    
    Note that Kyle suggested another approach on bug 15283: all the
    checkouts were send into the same array and each element of this
    array calls the is_from_today method, to know if the checkout is an
    overdue.
    I don't think we should rely on the Koha API, that's why I suggest to
    pass 2 differents object list, 1 which contains the checkouts and
    another one with the overdues.
    Note that we do rely on the Koha API, we call the Koha::Checkout->item
    and Koha::Item->biblio to propose an equivalent TT notice. But I think
    we can accept that.
    
    Test plan:
    Define the ISSUESLIP and ISSUEQSLIP notice templates to generate the
    same notices you generated with the historical syntax.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    https://bugs.koha-community.org/show_bug.cgi?id=17969
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ba1f2f93ef58c8dd935add3e215facdd4a589d12
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 2 12:46:11 2017 -0300

    Bug 19058: Move C4::Reserves::GetReserveId to the Koha namespace
    
    GetReserveId can easily be replaced with a call to
    Koha::Holds->search->next->reserve_id
    
    It will ease next changes to use Koha::Hold objects
    
    Test plan:
    Cancel a reserve and print a slip reserve
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit fba915e911a3b50ff9a0ea96d25a464836471073
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 2 12:00:00 2017 -0300

    Bug 19057: Remove C4::Reserves::GetReserve
    
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit a6de2b66d19b8418dcb792c23e17b211e4c17719
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 2 12:21:20 2017 -0300

    Bug 19057: Move C4::Reserve::GetReserve to Koha::Holds
    
    This GetReserve subroutine can be replaced with Koha::Holds->find
    
    Test plan:
    -  git grep GetReserve
    must not return results where GetReserve is called
    - Cancel a reserve
    
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 49778103ce528ccfc7fcc8be26bcae3b4ae7815b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Sep 1 16:20:18 2017 -0300

    Bug 9857: Fix failing tests
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 C4/ILSDI/Services.pm                               |    6 +-
 C4/Letters.pm                                      |    6 +
 C4/Members.pm                                      |   58 +++--
 C4/Overdues.pm                                     |    3 +
 C4/Reserves.pm                                     |  162 +++++-------
 Koha/REST/V1/Hold.pm                               |   18 +-
 koha-tmpl/intranet-tmpl/prog/css/staff-global.css  |   18 +-
 .../prog/en/modules/circ/circulation.tt            |   89 +++++--
 .../intranet-tmpl/prog/js/pages/circulation.js     |    4 +
 t/SuggestionEngine_AuthorityFile.t                 |    2 +-
 t/db_dependent/Circulation.t                       |    4 +-
 t/db_dependent/Circulation/issue.t                 |    5 +-
 t/db_dependent/Holds.t                             |   99 +++----
 t/db_dependent/Items/MoveItemFromBiblio.t          |   13 +-
 t/db_dependent/Letters/TemplateToolkit.t           |  274 +++++++++++++++++++-
 t/db_dependent/Reserves.t                          |   10 +-
 t/db_dependent/SuggestionEngine_ExplodedTerms.t    |    4 +-
 17 files changed, 527 insertions(+), 248 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep  5 12:15:15 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 05 Sep 2017 10:15:15 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.02-59-g47a61e6
Message-ID: <E1dpAt1-0006HH-Fz@git.koha-community.org>

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, 17.05.x has been updated
       via  47a61e683fcabe386b64d4802ebcf9bb381acddb (commit)
       via  c4b52cb4eff83399435a574041c12c5b4040a000 (commit)
       via  9bc653e4976945494a8e51caa6fc101abc8545ec (commit)
       via  0ad7c91a4b805e64fe8f529fa5f9db014dd0e18c (commit)
       via  923013b6f96cc24d68505a71b96416280020b309 (commit)
       via  c0cc4229904e2c91fd583c1b905ce3a214990ccb (commit)
       via  2fabe5ee8f719140065b429f6a13f4633c3145a8 (commit)
       via  6bdc17da42b62d351593540577a06a6827be94ff (commit)
       via  f2fad9d2b884c8b52def21f00b9c78542ed58a49 (commit)
       via  be1bd8b56140b1ac45259c1ac3c6de25a45687b8 (commit)
       via  84c5bebcd3a93d21bd7b800b63ba3506adcaf0bf (commit)
       via  5e5cd8025301bb6efc2031f9e6f8a48a768a0dc8 (commit)
       via  44ccf758fe94bb105c57866411a5aba5cde5f610 (commit)
       via  933f139b77cc3f75946317103848f957ebf057cc (commit)
       via  b4d95e2b08415e8041edec0c012411177decc413 (commit)
       via  aa28f0833fd525b6918f333440fbde23a2efc39d (commit)
       via  12dcd7f2e79dd9b53a0cfc1ed6e3d88fd7446405 (commit)
       via  9b7969033f6820e7e9af314018f87ec462cc5b6d (commit)
       via  bc0a636c18b3bb66e29dd7ca0bf4488fe742d75f (commit)
       via  77a8be98a47c3a424a4e81e1da25fbfed961bec3 (commit)
       via  0565a70c5cb4c8f365d64658109b4d84e8964952 (commit)
       via  06261dce0b397a4057d343e50aaf244ddff5f974 (commit)
       via  011030fc4cf3447db2b4fef85344cedc429fa1ae (commit)
       via  ac54b9703689d9c29d8b195253d26f2ff866e564 (commit)
       via  14646cd3f84db891f1fe5562ba2577c3fc82cd7c (commit)
       via  1c5b315787c5714b2453f9b1ec9eb66ae6aa51b3 (commit)
       via  24fb60d714e5c6dc3ad3dec1295b871e196cfa98 (commit)
       via  5380e93aca3376e1526e79d02169c8a4d877d645 (commit)
      from  ce8ddbf8ea7d463a822a70f474310b8b618d6347 (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 47a61e683fcabe386b64d4802ebcf9bb381acddb
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Thu Aug 24 09:38:56 2017 +0200

    Increment version for 17.05.03 release
    
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit c4b52cb4eff83399435a574041c12c5b4040a000
Merge: 0ad7c91 9bc653e
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Thu Aug 24 09:34:54 2017 +0200

    Merge remote-tracking branch 'translate/17.05.03-translate-20170824' into rm_170503

commit 9bc653e4976945494a8e51caa6fc101abc8545ec
Author: root <root at translate.koha-community.org>
Date:   Thu Aug 24 04:30:10 2017 -0300

    Translation updates for Koha 17.05.03

commit 0ad7c91a4b805e64fe8f529fa5f9db014dd0e18c
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Thu Aug 24 09:23:50 2017 +0200

    Update release notes for 17.05.03 release
    
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 923013b6f96cc24d68505a71b96416280020b309
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Thu Aug 24 09:23:21 2017 +0200

    remove html notes of 17.05

commit c0cc4229904e2c91fd583c1b905ce3a214990ccb
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 08:33:41 2017 +0530

    Bug 19035 - Stored XSS in lists.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/patron_lists/lists.pl
    2. Click on new patron list
    3. Add a text in the field Name that contains js
    4. Save the page.
    5. Notice js is execute
    6. Apply patch and reload, the js is escaped
    
    Fixed in both the pages list.pl and list.pl?patron_list_id=xx
    xx is patronlist id
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 34dcc80055998c7b301de6e2bbcfa20067c8a63c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 2fabe5ee8f719140065b429f6a13f4633c3145a8
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 20:58:34 2017 +0530

    Bug 19114 - Stored XSS in parcels.pl
    
    Test
    1. Hit the page /cgi-bin/koha/acqui/parcels.pl?booksellerid=xx
       xx is booksellerid
    2. Add a text in the field Vendor invoice that contains java script
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload the js is escaped
    
    Fixed XSS for parcels.pl/parcel.pl/orderreceive.pl
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit a4ee6ce526cf0b7897badf427c18ae6bfbefe0c5)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 6bdc17da42b62d351593540577a06a6827be94ff
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 19:51:48 2017 +0530

    Bug 19112 - Stored XSS in basketheader.pl page
    
    To Test
    
    1. Hit the page /cgi-bin/koha/acqui/basketheader.pl?booksellerid=1&op=add_form
    2. Add a text in the field Basket name, Internal note, Vendor note that contains java script
    3. Save the page
    4. Notice js is execute
    5. Apply patch, reload, js is escaped.
    
    Fixed XSS on pages basket.pl/basketheader.pl/bookseller.pl
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 65c7b505ee56f088f3c475595e53fbe53a77d4a2)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit f2fad9d2b884c8b52def21f00b9c78542ed58a49
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 15:00:55 2017 +0530

    Bug 19110 - XSS Stored in branches.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/branches.pl?op=add_form_category
    2. Add a text in the field Name and description that contains js.
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Fixed for js escaped execute for both pages
    
    1. /cgi-bin/koha/admin/branches.pl?op=delete_confirm&branchcode=xx
       xx is branchcode
    2. /cgi-bin/koha/admin/branches.pl?op=add_form with Group(s):
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0a44868b21c4ec9f3e6a7c4e4f7db8ee22e014b6)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit be1bd8b56140b1ac45259c1ac3c6de25a45687b8
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 23:22:32 2017 +0530

    Bug 19100 - XSS Flaws in memberentry.pl
    
    1. Hit /cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=xx<script>alert('amit')</script>
       xx - is a guarantorid
    2. Notice the java script is executed.
    3. Apply patch.
    4. Reload page, and hit the page again /cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=xx<script>alert('amit')</script>
       xx - is a guarantorid.
    5. Notice it is no longer executed.
    
    NOTE: I had to test in Microsoft Edge, because Chrome was blocking XSS for me.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit d42639166c9de0e83b16b04cd8c05146648b03fd)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 84c5bebcd3a93d21bd7b800b63ba3506adcaf0bf
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 09:23:13 2017 +0530

    Bug 19105 - XSS Stored in holidays.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/tools/holidays.pl
    2. Select the date
    3. Add a text in the field Title and Description that contains js
    4. Save the page.
    5. Notice js is execute
    6. Apply patch and reload, the js is escaped
    
    Fixed for all holidays
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 1ceb4367c6879be812b600487385c53bb005260d)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 5e5cd8025301bb6efc2031f9e6f8a48a768a0dc8
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 22:58:02 2017 +0530

    Bug 16069 - XSS issue in basket.pl page
    
    1. Hit /cgi-bin/koha/acqui/basket.pl?basketno=xx<script>alert('amit')</script>
       xx - is a basketno
    2. Notice the java script is executed.
    3. Apply patch.
    4. Reload page, and hit the page again /cgi-bin/koha/acqui/basket.pl?basketno==xx<script>alert('amit')</script>
       xx - is a basketno.
    5. Notice it is no longer executed.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 91711087e93e5da6265bac329791e45afb7d354f)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 44ccf758fe94bb105c57866411a5aba5cde5f610
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Fri Aug 11 21:08:14 2017 +0530

    Bug 19079 - XSS Flaws in Membership page
    
    1. Hit /cgi-bin/koha/members/moremember.pl?borrowernumber=xx<script>alert('amit')</script>.
       xx - is a borrowernumber
    2. Notice the java script is executed.
    4. Apply patch.
    5. Reload page, and hit the page again /cgi-bin/koha/members/moremember.pl?borrowernumber=xx<script>alert('amit')</script>.
       xx - is a borrowernumber.
    6. Notice it is no longer executed.
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 4f48532c4f3bede64533af6415e507640e2ed6e0)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 933f139b77cc3f75946317103848f957ebf057cc
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Fri Aug 4 09:44:52 2017 +0530

    Bug 19033: XSS Flaws in Currencies and exchange page
    
    1. Hit /cgi-bin/koha/admin/currency.pl
    2. Enter <IFRAME SRC="javascript:alert('XSS');"></IFRAME> search currencies box.
    3. Notice the iframe is executed
    4. Apply patch
    5. Reload page, and enter iframe again on search currencies box.
    6. Notice it is no longer executed
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Fixes the issue, follows common practice on the codebase.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 08fe6c3c3a8b3370ea212b049573a8618cf1e9e3)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit b4d95e2b08415e8041edec0c012411177decc413
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 15 13:26:12 2017 -0300

    Bug 19034: (followup 2) Fix letters.tt XSS flaw
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 9877aa340e75697cdb435eddf825451a93b91eaf)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit aa28f0833fd525b6918f333440fbde23a2efc39d
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Aug 7 11:27:33 2017 -0300

    Bug 19034: (followup) Fix letters.tt XSS flaw
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit d7ffd52dfd46190e630c1f25738e77d8d6ebebc8)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 12dcd7f2e79dd9b53a0cfc1ed6e3d88fd7446405
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Fri Aug 4 10:41:49 2017 +0530

    Bug 19034: XSS Flaws in Z39.50/SRU servers administration
    
    1. Hit /cgi-bin/koha/admin/z3950servers.pl
    2. Enter <IFRAME SRC="javascript:alert('XSS');"></IFRAME> search Z39.50/SRU servers box.
    3. Notice the iframe is executed.
    4. Apply patch.
    5. Reload page, and enter iframe again on search Z39.50/SRU servers box.
    6. Notice it is no longer executed.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit cd0c7ad870f4c2d202e2d6e31c1078bd29da979e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 9b7969033f6820e7e9af314018f87ec462cc5b6d
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Fri Aug 4 10:38:12 2017 +0530

    Bug 19034: XSS Flaws in Cities
    
    1. Hit /cgi-bin/koha/admin/cities.pl
    2. Enter <IFRAME SRC="javascript:alert('XSS');"></IFRAME> search cities box.
    3. Notice the iframe is executed.
    4. Apply patch.
    5. Reload page, and enter iframe again on search cities box.
    6. Notice it is no longer executed.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 8b294c5a4bece7086688fb44c7c45a1ee820247c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit bc0a636c18b3bb66e29dd7ca0bf4488fe742d75f
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Fri Aug 4 10:34:19 2017 +0530

    Bug 19034: XSS Flaws in Patron categories pages
    
    1. Hit /cgi-bin/koha/admin/categories.pl
    2. Enter <IFRAME SRC="javascript:alert('XSS');"></IFRAME> search patron categories box.
    3. Notice the iframe is executed.
    4. Apply patch.
    5. Reload page, and enter iframe again on search patron categories box.
    6. Notice it is no longer executed.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 28b9a1246781fb45427a593703542a99600f6d1f)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 77a8be98a47c3a424a4e81e1da25fbfed961bec3
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Mon Aug 7 20:49:56 2017 +0530

    Bug 19050 - XSS Flaws in Quick spine label creator
    
    1. Hit /cgi-bin/koha/labels/spinelabel-home.pl
    2. Enter <IFRAME SRC="javascript:alert('XSS');"></IFRAME> barcode text box.
    3. Notice the iframe is executed
    4. Apply patch
    5. Reload page, and enter iframe again on barcode text box.
    6. Notice it is no longer executed
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 18b6e1f5272ee4e2c4c1971a4346c1759df4b3d6)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 0565a70c5cb4c8f365d64658109b4d84e8964952
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Mon Aug 7 21:43:56 2017 +0530

    Bug 19051 - XSS Flaws in - Batch item modification page
    
    1. Hit /cgi-bin/koha/tools/batchMod.pl
    2. Enter <IFRAME SRC="javascript:alert('XSS');"></IFRAME> in the Barcode list (one barcode per line) text area.
    3. Notice the iframe is executed.
    4. Apply patch.
    5. Reload page, and enter iframe again on Barcode list (one barcode per line) text area.
    6. Notice it is no longer executed.
    7. Fixes for both barcode and itemnumber.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0726c79361a22051b847e9fe8668ab6faf81479a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 06261dce0b397a4057d343e50aaf244ddff5f974
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Mon Aug 7 21:24:44 2017 +0530

    Bug 19051 - XSS Flaws in Batch item deletion page
    
    1. Hit /cgi-bin/koha/tools/batchMod.pl?del=1
    2. Enter <IFRAME SRC="javascript:alert('XSS');"></IFRAME> in the Barcode list (one barcode per line) text area.
    3. Notice the iframe is executed.
    4. Apply patch.
    5. Reload page, and enter iframe again on Barcode list (one barcode per line) text area.
    6. Notice it is no longer executed.
    7. Fixes for both barcode and itemnumber.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 560d5e472ae30d9f0d0984cd6dbf34ca12b0cae1)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 011030fc4cf3447db2b4fef85344cedc429fa1ae
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Mon Aug 7 21:08:36 2017 +0530

    Bug 19051 - XSS Flaws in - Batch record deletion page
    
    1. Hit /cgi-bin/koha/tools/batch_delete_records.pl
    2. Enter <IFRAME SRC="javascript:alert('XSS');"></IFRAME> in the Record number list (one per line) text area.
    3. Notice the iframe is executed.
    4. Apply patch.
    5. Reload page, and enter iframe again on Record number list (one per line) text area.
    6. Notice it is no longer executed.
    7. Fixes for both biblio and authority records.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 63fce3cdb10637a14efa5ac61e9fb21e4b04e364)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit ac54b9703689d9c29d8b195253d26f2ff866e564
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Mon Aug 7 22:17:14 2017 +0530

    Bug 19052 - XSS Flaws in - Invoice search page
    
    1. Hit /cgi-bin/koha/acqui/invoices.pl
    2. Enter <IFRAME SRC="javascript:alert('XSS');"></IFRAME> Invoiceno,
       ISBN/EAN/ISSN, Title, Author, Publihser, Publication year search box.
    3. Notice the iframe is executed.
    4. Apply patch.
    5. Reload page, and enter iframe again on Invoiceno,
       ISBN/EAN/ISSN, Title, Author, Publihser, Publication year search box.
    6. Notice it is no longer executed.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 44c25d74b64ed9f125362e9627c7f9bc5635d369)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 14646cd3f84db891f1fe5562ba2577c3fc82cd7c
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Mon Aug 7 22:04:30 2017 +0530

    Bug 19052 - XSS Flaws in vendor search page
    
    1. Hit /cgi-bin/koha/acqui/booksellers.pl
    2. Enter <IFRAME SRC="javascript:alert('XSS');"></IFRAME> vendor search box.
    3. Notice the iframe is executed.
    4. Apply patch.
    5. Reload page, and enter iframe again on vendor search box.
    6. Notice it is no longer executed.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit d8b1c8fc7d9ba254b1e71d1501abfae4102e7eea)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 1c5b315787c5714b2453f9b1ec9eb66ae6aa51b3
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Mon Aug 7 22:34:05 2017 +0530

    Bug 19054 - XSS Flaws in Report - Top Most-circulated items
    
    1. Hit /cgi-bin/koha/reports/cat_issues_top.pl
    2. Enter <IFRAME SRC="javascript:alert('XSS');"></IFRAME> in Callnumber, Day, Month, Year search box.
    3. Notice the iframe is executed.
    4. Apply patch.
    5. Reload page, and enter iframe again on Callnumber, Day, Month, Year search box.
    6. Notice it is no longer executed.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 755a1fb372b29443b7d128c4c710f7a7ed63f189)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 24fb60d714e5c6dc3ad3dec1295b871e196cfa98
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Thu Aug 10 21:51:38 2017 +0530

    Bug 19078 - XSS Flaws in System preferences
    
    1. Hit /cgi-bin/koha/admin/preferences.pl
    2. Enter <script>alert('amit')</script> in search system preferences box.
    3. Notice the java script is executed.
    4. Apply patch.
    5. Reload page, and enter <script>alert('amit')</script> in search system preferences box.
    6. Notice it is no longer executed.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit b7bb60d76041bf00f6a28fe3a55ecc2c7912a275)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 5380e93aca3376e1526e79d02169c8a4d877d645
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 9 14:08:24 2017 -0300

    Bug 18726: Fix XSS at the OPAC - biblionumber
    
    The biblionumber parameter is sent by the user, we must escape all of
    them to avoid XSS.
    
    Fixes: Cross-site scripting OPAC pages
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0676334968c27337cc1f3a3407ac6eeaef75f201)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 Koha.pm                                            |    2 +-
 installer/data/mysql/updatedatabase.pl             |    6 +
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |   14 +-
 .../prog/en/modules/acqui/basketheader.tt          |    8 +-
 .../prog/en/modules/acqui/booksellers.tt           |    4 +-
 .../prog/en/modules/acqui/invoices.tt              |   24 +-
 .../prog/en/modules/acqui/orderreceive.tt          |    4 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |    6 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcels.tt |    2 +-
 .../prog/en/modules/admin/branches.tt              |   14 +-
 .../prog/en/modules/admin/categories.tt            |    2 +-
 .../intranet-tmpl/prog/en/modules/admin/cities.tt  |    2 +-
 .../prog/en/modules/admin/currency.tt              |    2 +-
 .../prog/en/modules/admin/preferences.tt           |    2 +-
 .../prog/en/modules/admin/z3950servers.tt          |    2 +-
 .../prog/en/modules/labels/spinelabel-print.tt     |    2 +-
 .../prog/en/modules/members/memberentrygen.tt      |    2 +-
 .../prog/en/modules/patron_lists/list.tt           |    4 +-
 .../prog/en/modules/patron_lists/lists.tt          |    2 +-
 .../prog/en/modules/reports/cat_issues_top.tt      |    2 +-
 .../prog/en/modules/tools/batchMod-del.tt          |    2 +-
 .../prog/en/modules/tools/batchMod-edit.tt         |    2 +-
 .../prog/en/modules/tools/batch_delete_records.tt  |    4 +-
 .../prog/en/modules/tools/holidays.tt              |   24 +-
 .../intranet-tmpl/prog/en/modules/tools/letter.tt  |    4 +-
 .../bootstrap/en/includes/opac-bottom.inc          |    6 +-
 .../bootstrap/en/includes/opac-detail-sidebar.inc  |   14 +-
 .../bootstrap/en/modules/opac-ISBDdetail.tt        |    2 +-
 .../bootstrap/en/modules/opac-MARCdetail.tt        |   12 +-
 .../bootstrap/en/modules/opac-alert-subscribe.tt   |   10 +-
 .../opac-tmpl/bootstrap/en/modules/opac-detail.tt  |   34 +-
 .../en/modules/opac-full-serial-issues.tt          |    6 +-
 .../bootstrap/en/modules/opac-serial-issues.tt     |    2 +-
 members/moremember.pl                              |    2 +
 misc/release_notes/release_notes_17_05_00.html     | 1604 --------
 misc/release_notes/release_notes_17_05_01.html     |  424 --
 misc/release_notes/release_notes_17_05_03.md       |  295 ++
 misc/translator/po/am-Ethi-marc-MARC21.po          |    2 +-
 misc/translator/po/am-Ethi-marc-NORMARC.po         |    2 +-
 misc/translator/po/am-Ethi-marc-UNIMARC.po         |    2 +-
 misc/translator/po/am-Ethi-opac-bootstrap.po       |   62 +-
 misc/translator/po/am-Ethi-staff-help.po           |    2 +-
 misc/translator/po/am-Ethi-staff-prog.po           | 1896 +++++----
 misc/translator/po/ar-Arab-marc-MARC21.po          |    2 +-
 misc/translator/po/ar-Arab-marc-NORMARC.po         |    2 +-
 misc/translator/po/ar-Arab-marc-UNIMARC.po         |    2 +-
 misc/translator/po/ar-Arab-opac-bootstrap.po       |   76 +-
 misc/translator/po/ar-Arab-staff-help.po           |   14 +-
 misc/translator/po/ar-Arab-staff-prog.po           | 1935 ++++-----
 misc/translator/po/as-IN-marc-MARC21.po            |    2 +-
 misc/translator/po/as-IN-marc-NORMARC.po           |    2 +-
 misc/translator/po/as-IN-marc-UNIMARC.po           |    2 +-
 misc/translator/po/as-IN-opac-bootstrap.po         |   62 +-
 misc/translator/po/as-IN-staff-help.po             |    2 +-
 misc/translator/po/as-IN-staff-prog.po             | 1896 +++++----
 misc/translator/po/az-AZ-marc-MARC21.po            |    2 +-
 misc/translator/po/az-AZ-marc-NORMARC.po           |    2 +-
 misc/translator/po/az-AZ-marc-UNIMARC.po           |    2 +-
 misc/translator/po/az-AZ-opac-bootstrap.po         |   62 +-
 misc/translator/po/az-AZ-staff-help.po             |    2 +-
 misc/translator/po/az-AZ-staff-prog.po             | 1896 +++++----
 misc/translator/po/be-BY-marc-MARC21.po            |    2 +-
 misc/translator/po/be-BY-marc-NORMARC.po           |    2 +-
 misc/translator/po/be-BY-marc-UNIMARC.po           |    2 +-
 misc/translator/po/be-BY-opac-bootstrap.po         |   62 +-
 misc/translator/po/be-BY-staff-help.po             |    2 +-
 misc/translator/po/be-BY-staff-prog.po             | 1900 +++++----
 misc/translator/po/bg-Cyrl-marc-MARC21.po          |    2 +-
 misc/translator/po/bg-Cyrl-marc-NORMARC.po         |    2 +-
 misc/translator/po/bg-Cyrl-marc-UNIMARC.po         |    2 +-
 misc/translator/po/bg-Cyrl-opac-bootstrap.po       |   62 +-
 misc/translator/po/bg-Cyrl-staff-help.po           |    2 +-
 misc/translator/po/bg-Cyrl-staff-prog.po           | 1896 +++++----
 misc/translator/po/bn-IN-marc-MARC21.po            |    2 +-
 misc/translator/po/bn-IN-marc-NORMARC.po           |    2 +-
 misc/translator/po/bn-IN-marc-UNIMARC.po           |    2 +-
 misc/translator/po/bn-IN-opac-bootstrap.po         |   62 +-
 misc/translator/po/bn-IN-staff-help.po             |    2 +-
 misc/translator/po/bn-IN-staff-prog.po             | 1896 +++++----
 misc/translator/po/ca-ES-marc-MARC21.po            |    2 +-
 misc/translator/po/ca-ES-marc-NORMARC.po           |    2 +-
 misc/translator/po/ca-ES-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ca-ES-opac-bootstrap.po         |   68 +-
 misc/translator/po/ca-ES-staff-help.po             |    2 +-
 misc/translator/po/ca-ES-staff-prog.po             | 1898 +++++----
 misc/translator/po/cs-CZ-marc-MARC21.po            |    6 +-
 misc/translator/po/cs-CZ-marc-NORMARC.po           |    2 +-
 misc/translator/po/cs-CZ-marc-UNIMARC.po           |    2 +-
 misc/translator/po/cs-CZ-opac-bootstrap.po         |   74 +-
 misc/translator/po/cs-CZ-pref.po                   |  238 +-
 misc/translator/po/cs-CZ-staff-help.po             |    2 +-
 misc/translator/po/cs-CZ-staff-prog.po             | 1908 +++++----
 misc/translator/po/cy-GB-marc-MARC21.po            |    2 +-
 misc/translator/po/cy-GB-marc-NORMARC.po           |    2 +-
 misc/translator/po/cy-GB-marc-UNIMARC.po           |    2 +-
 misc/translator/po/cy-GB-opac-bootstrap.po         |   62 +-
 misc/translator/po/cy-GB-staff-help.po             |    2 +-
 misc/translator/po/cy-GB-staff-prog.po             | 1896 +++++----
 misc/translator/po/da-DK-marc-MARC21.po            |    2 +-
 misc/translator/po/da-DK-marc-NORMARC.po           |    2 +-
 misc/translator/po/da-DK-marc-UNIMARC.po           |    2 +-
 misc/translator/po/da-DK-opac-bootstrap.po         |   62 +-
 misc/translator/po/da-DK-staff-help.po             |    2 +-
 misc/translator/po/da-DK-staff-prog.po             | 1903 +++++----
 misc/translator/po/de-CH-marc-MARC21.po            |    2 +-
 misc/translator/po/de-CH-marc-NORMARC.po           |    2 +-
 misc/translator/po/de-CH-marc-UNIMARC.po           |    2 +-
 misc/translator/po/de-CH-opac-bootstrap.po         |   76 +-
 misc/translator/po/de-CH-staff-help.po             |    6 +-
 misc/translator/po/de-CH-staff-prog.po             | 1907 +++++----
 misc/translator/po/de-DE-marc-MARC21.po            |    2 +-
 misc/translator/po/de-DE-marc-NORMARC.po           |    2 +-
 misc/translator/po/de-DE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/de-DE-opac-bootstrap.po         |   80 +-
 misc/translator/po/de-DE-staff-help.po             |    8 +-
 misc/translator/po/de-DE-staff-prog.po             | 1927 ++++-----
 misc/translator/po/el-GR-marc-MARC21.po            |    2 +-
 misc/translator/po/el-GR-marc-NORMARC.po           |    2 +-
 misc/translator/po/el-GR-marc-UNIMARC.po           |  240 +-
 misc/translator/po/el-GR-opac-bootstrap.po         |   74 +-
 misc/translator/po/el-GR-staff-help.po             |    2 +-
 misc/translator/po/el-GR-staff-prog.po             | 2101 +++++-----
 misc/translator/po/en-GB-marc-MARC21.po            |    2 +-
 misc/translator/po/en-GB-marc-NORMARC.po           |    2 +-
 misc/translator/po/en-GB-marc-UNIMARC.po           |    2 +-
 misc/translator/po/en-GB-opac-bootstrap.po         |   62 +-
 misc/translator/po/en-GB-staff-help.po             |    2 +-
 misc/translator/po/en-GB-staff-prog.po             | 1896 +++++----
 misc/translator/po/en-NZ-marc-MARC21.po            |    2 +-
 misc/translator/po/en-NZ-marc-NORMARC.po           |    2 +-
 misc/translator/po/en-NZ-marc-UNIMARC.po           |    2 +-
 misc/translator/po/en-NZ-opac-bootstrap.po         |   69 +-
 misc/translator/po/en-NZ-staff-help.po             |    2 +-
 misc/translator/po/en-NZ-staff-prog.po             | 1998 ++++-----
 misc/translator/po/eo-marc-MARC21.po               |    2 +-
 misc/translator/po/eo-marc-NORMARC.po              |    2 +-
 misc/translator/po/eo-marc-UNIMARC.po              |    2 +-
 misc/translator/po/eo-opac-bootstrap.po            |   65 +-
 misc/translator/po/eo-staff-help.po                |    2 +-
 misc/translator/po/eo-staff-prog.po                | 1898 +++++----
 misc/translator/po/es-ES-marc-MARC21.po            |    2 +-
 misc/translator/po/es-ES-marc-NORMARC.po           |    2 +-
 misc/translator/po/es-ES-marc-UNIMARC.po           |    2 +-
 misc/translator/po/es-ES-opac-bootstrap.po         |   76 +-
 misc/translator/po/es-ES-staff-help.po             |    6 +-
 misc/translator/po/es-ES-staff-prog.po             | 1918 +++++----
 misc/translator/po/eu-marc-MARC21.po               |    2 +-
 misc/translator/po/eu-marc-NORMARC.po              |    2 +-
 misc/translator/po/eu-marc-UNIMARC.po              |    2 +-
 misc/translator/po/eu-opac-bootstrap.po            |   67 +-
 misc/translator/po/eu-staff-help.po                |    2 +-
 misc/translator/po/eu-staff-prog.po                | 1896 +++++----
 misc/translator/po/fa-Arab-marc-MARC21.po          |    2 +-
 misc/translator/po/fa-Arab-marc-NORMARC.po         |    2 +-
 misc/translator/po/fa-Arab-marc-UNIMARC.po         |    2 +-
 misc/translator/po/fa-Arab-opac-bootstrap.po       |   62 +-
 misc/translator/po/fa-Arab-staff-help.po           |    2 +-
 misc/translator/po/fa-Arab-staff-prog.po           | 1897 +++++----
 misc/translator/po/fi-FI-marc-MARC21.po            |    2 +-
 misc/translator/po/fi-FI-marc-NORMARC.po           |    2 +-
 misc/translator/po/fi-FI-marc-UNIMARC.po           |    2 +-
 misc/translator/po/fi-FI-opac-bootstrap.po         |   70 +-
 misc/translator/po/fi-FI-pref.po                   |   81 +-
 misc/translator/po/fi-FI-staff-help.po             |    2 +-
 misc/translator/po/fi-FI-staff-prog.po             | 2053 +++++-----
 misc/translator/po/fo-FO-marc-MARC21.po            |    2 +-
 misc/translator/po/fo-FO-marc-NORMARC.po           |    2 +-
 misc/translator/po/fo-FO-marc-UNIMARC.po           |    2 +-
 misc/translator/po/fo-FO-opac-bootstrap.po         |   62 +-
 misc/translator/po/fo-FO-staff-help.po             |    2 +-
 misc/translator/po/fo-FO-staff-prog.po             | 1896 +++++----
 misc/translator/po/fr-CA-marc-MARC21.po            |   20 +-
 misc/translator/po/fr-CA-marc-NORMARC.po           |    2 +-
 misc/translator/po/fr-CA-marc-UNIMARC.po           |    2 +-
 misc/translator/po/fr-CA-opac-bootstrap.po         |   69 +-
 misc/translator/po/fr-CA-staff-help.po             |    2 +-
 misc/translator/po/fr-CA-staff-prog.po             | 1936 ++++-----
 misc/translator/po/fr-FR-marc-MARC21.po            |    2 +-
 misc/translator/po/fr-FR-marc-NORMARC.po           |    2 +-
 misc/translator/po/fr-FR-marc-UNIMARC.po           |    2 +-
 misc/translator/po/fr-FR-opac-bootstrap.po         |   79 +-
 misc/translator/po/fr-FR-pref.po                   |    4 +-
 misc/translator/po/fr-FR-staff-help.po             |    2 +-
 misc/translator/po/fr-FR-staff-prog.po             | 1916 ++++-----
 misc/translator/po/gl-marc-MARC21.po               |    2 +-
 misc/translator/po/gl-marc-NORMARC.po              |    2 +-
 misc/translator/po/gl-marc-UNIMARC.po              |    2 +-
 misc/translator/po/gl-opac-bootstrap.po            |   62 +-
 misc/translator/po/gl-staff-help.po                |    2 +-
 misc/translator/po/gl-staff-prog.po                | 1899 +++++----
 misc/translator/po/he-Hebr-marc-MARC21.po          |    2 +-
 misc/translator/po/he-Hebr-marc-NORMARC.po         |    2 +-
 misc/translator/po/he-Hebr-marc-UNIMARC.po         |    2 +-
 misc/translator/po/he-Hebr-opac-bootstrap.po       |   62 +-
 misc/translator/po/he-Hebr-staff-help.po           |    2 +-
 misc/translator/po/he-Hebr-staff-prog.po           | 1899 +++++----
 misc/translator/po/hi-marc-MARC21.po               |    2 +-
 misc/translator/po/hi-marc-NORMARC.po              |    2 +-
 misc/translator/po/hi-marc-UNIMARC.po              |    2 +-
 misc/translator/po/hi-opac-bootstrap.po            |   68 +-
 misc/translator/po/hi-staff-help.po                |    2 +-
 misc/translator/po/hi-staff-prog.po                | 1904 +++++----
 misc/translator/po/hr-HR-marc-MARC21.po            |    2 +-
 misc/translator/po/hr-HR-marc-NORMARC.po           |    2 +-
 misc/translator/po/hr-HR-marc-UNIMARC.po           |    2 +-
 misc/translator/po/hr-HR-opac-bootstrap.po         |   62 +-
 misc/translator/po/hr-HR-staff-help.po             |    2 +-
 misc/translator/po/hr-HR-staff-prog.po             | 1898 +++++----
 misc/translator/po/hu-HU-marc-MARC21.po            |    2 +-
 misc/translator/po/hu-HU-marc-NORMARC.po           |    2 +-
 misc/translator/po/hu-HU-marc-UNIMARC.po           |    2 +-
 misc/translator/po/hu-HU-opac-bootstrap.po         |   66 +-
 misc/translator/po/hu-HU-staff-help.po             |    2 +-
 misc/translator/po/hu-HU-staff-prog.po             | 1896 +++++----
 misc/translator/po/hy-Armn-marc-MARC21.po          |    2 +-
 misc/translator/po/hy-Armn-marc-NORMARC.po         |    2 +-
 misc/translator/po/hy-Armn-marc-UNIMARC.po         |    2 +-
 misc/translator/po/hy-Armn-opac-bootstrap.po       |   68 +-
 misc/translator/po/hy-Armn-staff-help.po           |    2 +-
 misc/translator/po/hy-Armn-staff-prog.po           | 1904 +++++----
 misc/translator/po/ia-marc-MARC21.po               |   99 +-
 misc/translator/po/ia-marc-NORMARC.po              |    2 +-
 misc/translator/po/ia-marc-UNIMARC.po              |    2 +-
 misc/translator/po/ia-opac-bootstrap.po            |   62 +-
 misc/translator/po/ia-staff-help.po                |    2 +-
 misc/translator/po/ia-staff-prog.po                | 1896 +++++----
 misc/translator/po/id-ID-marc-MARC21.po            |    2 +-
 misc/translator/po/id-ID-marc-NORMARC.po           |    2 +-
 misc/translator/po/id-ID-marc-UNIMARC.po           |    2 +-
 misc/translator/po/id-ID-opac-bootstrap.po         |   62 +-
 misc/translator/po/id-ID-staff-help.po             |    2 +-
 misc/translator/po/id-ID-staff-prog.po             | 1898 +++++----
 misc/translator/po/iq-CA-marc-MARC21.po            |    2 +-
 misc/translator/po/iq-CA-marc-NORMARC.po           |    2 +-
 misc/translator/po/iq-CA-marc-UNIMARC.po           |    2 +-
 misc/translator/po/iq-CA-opac-bootstrap.po         |   62 +-
 misc/translator/po/iq-CA-staff-help.po             |    2 +-
 misc/translator/po/iq-CA-staff-prog.po             | 1896 +++++----
 misc/translator/po/is-IS-marc-MARC21.po            |    2 +-
 misc/translator/po/is-IS-marc-NORMARC.po           |    2 +-
 misc/translator/po/is-IS-marc-UNIMARC.po           |    2 +-
 misc/translator/po/is-IS-opac-bootstrap.po         |   62 +-
 misc/translator/po/is-IS-staff-help.po             |    2 +-
 misc/translator/po/is-IS-staff-prog.po             | 1896 +++++----
 misc/translator/po/it-IT-marc-MARC21.po            |    2 +-
 misc/translator/po/it-IT-marc-NORMARC.po           |    2 +-
 misc/translator/po/it-IT-marc-UNIMARC.po           |    2 +-
 misc/translator/po/it-IT-opac-bootstrap.po         |   69 +-
 misc/translator/po/it-IT-staff-help.po             |    2 +-
 misc/translator/po/it-IT-staff-prog.po             | 1904 +++++----
 misc/translator/po/iu-CA-marc-MARC21.po            |    2 +-
 misc/translator/po/iu-CA-marc-NORMARC.po           |    2 +-
 misc/translator/po/iu-CA-marc-UNIMARC.po           |    2 +-
 misc/translator/po/iu-CA-opac-bootstrap.po         |   62 +-
 misc/translator/po/iu-CA-staff-help.po             |    2 +-
 misc/translator/po/iu-CA-staff-prog.po             | 1896 +++++----
 misc/translator/po/ja-Jpan-JP-marc-MARC21.po       |    2 +-
 misc/translator/po/ja-Jpan-JP-marc-NORMARC.po      |    2 +-
 misc/translator/po/ja-Jpan-JP-marc-UNIMARC.po      |    2 +-
 misc/translator/po/ja-Jpan-JP-opac-bootstrap.po    |   62 +-
 misc/translator/po/ja-Jpan-JP-staff-help.po        |    2 +-
 misc/translator/po/ja-Jpan-JP-staff-prog.po        | 1910 +++++----
 misc/translator/po/ka-marc-MARC21.po               |    2 +-
 misc/translator/po/ka-marc-NORMARC.po              |    2 +-
 misc/translator/po/ka-marc-UNIMARC.po              |    2 +-
 misc/translator/po/ka-opac-bootstrap.po            |   62 +-
 misc/translator/po/ka-staff-help.po                |    2 +-
 misc/translator/po/ka-staff-prog.po                | 1896 +++++----
 misc/translator/po/km-KH-marc-MARC21.po            |    2 +-
 misc/translator/po/km-KH-marc-NORMARC.po           |    2 +-
 misc/translator/po/km-KH-marc-UNIMARC.po           |    2 +-
 misc/translator/po/km-KH-opac-bootstrap.po         |   62 +-
 misc/translator/po/km-KH-staff-help.po             |    2 +-
 misc/translator/po/km-KH-staff-prog.po             | 1896 +++++----
 misc/translator/po/kn-Knda-marc-MARC21.po          |    2 +-
 misc/translator/po/kn-Knda-marc-NORMARC.po         |    2 +-
 misc/translator/po/kn-Knda-marc-UNIMARC.po         |    2 +-
 misc/translator/po/kn-Knda-opac-bootstrap.po       |   62 +-
 misc/translator/po/kn-Knda-staff-help.po           |    2 +-
 misc/translator/po/kn-Knda-staff-prog.po           | 1899 +++++----
 misc/translator/po/ko-Kore-KP-marc-MARC21.po       |    2 +-
 misc/translator/po/ko-Kore-KP-marc-NORMARC.po      |    2 +-
 misc/translator/po/ko-Kore-KP-marc-UNIMARC.po      |    2 +-
 misc/translator/po/ko-Kore-KP-opac-bootstrap.po    |   62 +-
 misc/translator/po/ko-Kore-KP-staff-help.po        |    2 +-
 misc/translator/po/ko-Kore-KP-staff-prog.po        | 1904 +++++----
 misc/translator/po/ku-Arab-marc-MARC21.po          |    2 +-
 misc/translator/po/ku-Arab-marc-NORMARC.po         |    2 +-
 misc/translator/po/ku-Arab-marc-UNIMARC.po         |    2 +-
 misc/translator/po/ku-Arab-opac-bootstrap.po       |   62 +-
 misc/translator/po/ku-Arab-staff-help.po           |    2 +-
 misc/translator/po/ku-Arab-staff-prog.po           | 1898 +++++----
 misc/translator/po/lo-Laoo-marc-MARC21.po          |    2 +-
 misc/translator/po/lo-Laoo-marc-NORMARC.po         |    2 +-
 misc/translator/po/lo-Laoo-marc-UNIMARC.po         |    2 +-
 misc/translator/po/lo-Laoo-opac-bootstrap.po       |   62 +-
 misc/translator/po/lo-Laoo-staff-help.po           |    2 +-
 misc/translator/po/lo-Laoo-staff-prog.po           | 1901 +++++----
 misc/translator/po/mi-NZ-marc-MARC21.po            |    2 +-
 misc/translator/po/mi-NZ-marc-NORMARC.po           |    2 +-
 misc/translator/po/mi-NZ-marc-UNIMARC.po           |    2 +-
 misc/translator/po/mi-NZ-opac-bootstrap.po         |   62 +-
 misc/translator/po/mi-NZ-staff-help.po             |    2 +-
 misc/translator/po/mi-NZ-staff-prog.po             | 1896 +++++----
 misc/translator/po/ml-marc-MARC21.po               |    2 +-
 misc/translator/po/ml-marc-NORMARC.po              |    2 +-
 misc/translator/po/ml-marc-UNIMARC.po              |    2 +-
 misc/translator/po/ml-opac-bootstrap.po            |   62 +-
 misc/translator/po/ml-staff-help.po                |    2 +-
 misc/translator/po/ml-staff-prog.po                | 1896 +++++----
 misc/translator/po/mon-marc-MARC21.po              |    2 +-
 misc/translator/po/mon-marc-NORMARC.po             |    2 +-
 misc/translator/po/mon-marc-UNIMARC.po             |    2 +-
 misc/translator/po/mon-opac-bootstrap.po           |   62 +-
 misc/translator/po/mon-staff-help.po               |    2 +-
 misc/translator/po/mon-staff-prog.po               | 1896 +++++----
 misc/translator/po/mr-marc-MARC21.po               |    2 +-
 misc/translator/po/mr-marc-NORMARC.po              |    2 +-
 misc/translator/po/mr-marc-UNIMARC.po              |    2 +-
 misc/translator/po/mr-opac-bootstrap.po            |   62 +-
 misc/translator/po/mr-staff-help.po                |    2 +-
 misc/translator/po/mr-staff-prog.po                | 1901 +++++----
 misc/translator/po/ms-MY-marc-MARC21.po            |    2 +-
 misc/translator/po/ms-MY-marc-NORMARC.po           |    2 +-
 misc/translator/po/ms-MY-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ms-MY-opac-bootstrap.po         |   62 +-
 misc/translator/po/ms-MY-staff-help.po             |    2 +-
 misc/translator/po/ms-MY-staff-prog.po             | 1910 +++++----
 misc/translator/po/my-marc-MARC21.po               |    2 +-
 misc/translator/po/my-marc-NORMARC.po              |    2 +-
 misc/translator/po/my-marc-UNIMARC.po              |    2 +-
 misc/translator/po/my-opac-bootstrap.po            |   62 +-
 misc/translator/po/my-staff-help.po                |    2 +-
 misc/translator/po/my-staff-prog.po                | 1896 +++++----
 misc/translator/po/nb-NO-marc-MARC21.po            |    2 +-
 misc/translator/po/nb-NO-marc-NORMARC.po           |    2 +-
 misc/translator/po/nb-NO-marc-UNIMARC.po           |    2 +-
 misc/translator/po/nb-NO-opac-bootstrap.po         |  976 ++---
 misc/translator/po/nb-NO-staff-help.po             |    2 +-
 misc/translator/po/nb-NO-staff-prog.po             | 1904 +++++----
 misc/translator/po/ne-NE-marc-MARC21.po            |    2 +-
 misc/translator/po/ne-NE-marc-NORMARC.po           |    2 +-
 misc/translator/po/ne-NE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ne-NE-opac-bootstrap.po         |   62 +-
 misc/translator/po/ne-NE-staff-help.po             |    2 +-
 misc/translator/po/ne-NE-staff-prog.po             | 1896 +++++----
 misc/translator/po/nl-BE-marc-MARC21.po            |    2 +-
 misc/translator/po/nl-BE-marc-NORMARC.po           |    2 +-
 misc/translator/po/nl-BE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/nl-BE-opac-bootstrap.po         |   62 +-
 misc/translator/po/nl-BE-staff-help.po             |    2 +-
 misc/translator/po/nl-BE-staff-prog.po             | 1901 +++++----
 misc/translator/po/nl-NL-marc-MARC21.po            |    2 +-
 misc/translator/po/nl-NL-marc-NORMARC.po           |    2 +-
 misc/translator/po/nl-NL-marc-UNIMARC.po           |    2 +-
 misc/translator/po/nl-NL-opac-bootstrap.po         |   62 +-
 misc/translator/po/nl-NL-staff-help.po             |    2 +-
 misc/translator/po/nl-NL-staff-prog.po             | 1900 +++++----
 misc/translator/po/nn-NO-marc-MARC21.po            |    2 +-
 misc/translator/po/nn-NO-marc-NORMARC.po           |    2 +-
 misc/translator/po/nn-NO-marc-UNIMARC.po           |    2 +-
 misc/translator/po/nn-NO-opac-bootstrap.po         |   62 +-
 misc/translator/po/nn-NO-staff-help.po             |    2 +-
 misc/translator/po/nn-NO-staff-prog.po             | 1896 +++++----
 misc/translator/po/oc-marc-MARC21.po               |    2 +-
 misc/translator/po/oc-marc-NORMARC.po              |    2 +-
 misc/translator/po/oc-marc-UNIMARC.po              |    2 +-
 misc/translator/po/oc-opac-bootstrap.po            |   62 +-
 misc/translator/po/oc-staff-help.po                |    2 +-
 misc/translator/po/oc-staff-prog.po                | 1904 +++++----
 misc/translator/po/pbr-marc-MARC21.po              |    2 +-
 misc/translator/po/pbr-marc-NORMARC.po             |    2 +-
 misc/translator/po/pbr-marc-UNIMARC.po             |    2 +-
 misc/translator/po/pbr-opac-bootstrap.po           |   62 +-
 misc/translator/po/pbr-staff-help.po               |    2 +-
 misc/translator/po/pbr-staff-prog.po               | 1896 +++++----
 misc/translator/po/pl-PL-marc-MARC21.po            |    2 +-
 misc/translator/po/pl-PL-marc-NORMARC.po           |    2 +-
 misc/translator/po/pl-PL-marc-UNIMARC.po           |    2 +-
 misc/translator/po/pl-PL-opac-bootstrap.po         |   72 +-
 misc/translator/po/pl-PL-staff-help.po             |    2 +-
 misc/translator/po/pl-PL-staff-prog.po             | 1913 +++++----
 misc/translator/po/prs-marc-MARC21.po              |    2 +-
 misc/translator/po/prs-marc-NORMARC.po             |    2 +-
 misc/translator/po/prs-marc-UNIMARC.po             |    2 +-
 misc/translator/po/prs-opac-bootstrap.po           |   62 +-
 misc/translator/po/prs-staff-help.po               |    2 +-
 misc/translator/po/prs-staff-prog.po               | 1899 +++++----
 misc/translator/po/pt-BR-marc-MARC21.po            |    2 +-
 misc/translator/po/pt-BR-marc-NORMARC.po           |    2 +-
 misc/translator/po/pt-BR-marc-UNIMARC.po           |    2 +-
 misc/translator/po/pt-BR-opac-bootstrap.po         |   62 +-
 misc/translator/po/pt-BR-staff-help.po             |    2 +-
 misc/translator/po/pt-BR-staff-prog.po             | 1904 +++++----
 misc/translator/po/pt-PT-marc-MARC21.po            |    2 +-
 misc/translator/po/pt-PT-marc-NORMARC.po           |    2 +-
 misc/translator/po/pt-PT-marc-UNIMARC.po           |    2 +-
 misc/translator/po/pt-PT-opac-bootstrap.po         |   69 +-
 misc/translator/po/pt-PT-staff-help.po             |    2 +-
 misc/translator/po/pt-PT-staff-prog.po             | 1904 +++++----
 misc/translator/po/ro-RO-marc-MARC21.po            |    2 +-
 misc/translator/po/ro-RO-marc-NORMARC.po           |    2 +-
 misc/translator/po/ro-RO-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ro-RO-opac-bootstrap.po         |   64 +-
 misc/translator/po/ro-RO-staff-help.po             |    2 +-
 misc/translator/po/ro-RO-staff-prog.po             | 1896 +++++----
 misc/translator/po/ru-RU-marc-MARC21.po            |    2 +-
 misc/translator/po/ru-RU-marc-NORMARC.po           |    2 +-
 misc/translator/po/ru-RU-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ru-RU-opac-bootstrap.po         |   71 +-
 misc/translator/po/ru-RU-staff-help.po             |    2 +-
 misc/translator/po/ru-RU-staff-prog.po             | 1902 +++++----
 misc/translator/po/rw-RW-marc-MARC21.po            |    2 +-
 misc/translator/po/rw-RW-marc-NORMARC.po           |    2 +-
 misc/translator/po/rw-RW-marc-UNIMARC.po           |    2 +-
 misc/translator/po/rw-RW-opac-bootstrap.po         |   62 +-
 misc/translator/po/rw-RW-staff-help.po             |    2 +-
 misc/translator/po/rw-RW-staff-prog.po             | 1896 +++++----
 misc/translator/po/sd-PK-marc-MARC21.po            |    2 +-
 misc/translator/po/sd-PK-marc-NORMARC.po           |    2 +-
 misc/translator/po/sd-PK-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sd-PK-opac-bootstrap.po         |   62 +-
 misc/translator/po/sd-PK-staff-help.po             |    2 +-
 misc/translator/po/sd-PK-staff-prog.po             | 1896 +++++----
 misc/translator/po/sk-SK-marc-MARC21.po            |    2 +-
 misc/translator/po/sk-SK-marc-NORMARC.po           |    2 +-
 misc/translator/po/sk-SK-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sk-SK-opac-bootstrap.po         |   68 +-
 misc/translator/po/sk-SK-staff-help.po             |    2 +-
 misc/translator/po/sk-SK-staff-prog.po             | 1904 +++++----
 misc/translator/po/sl-SI-marc-MARC21.po            |    2 +-
 misc/translator/po/sl-SI-marc-NORMARC.po           |    2 +-
 misc/translator/po/sl-SI-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sl-SI-opac-bootstrap.po         |   62 +-
 misc/translator/po/sl-SI-staff-help.po             |    2 +-
 misc/translator/po/sl-SI-staff-prog.po             | 1896 +++++----
 misc/translator/po/sq-AL-marc-MARC21.po            |    2 +-
 misc/translator/po/sq-AL-marc-NORMARC.po           |    2 +-
 misc/translator/po/sq-AL-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sq-AL-opac-bootstrap.po         |   69 +-
 misc/translator/po/sq-AL-staff-help.po             |    2 +-
 misc/translator/po/sq-AL-staff-prog.po             | 1896 +++++----
 misc/translator/po/sr-Cyrl-marc-MARC21.po          |    2 +-
 misc/translator/po/sr-Cyrl-marc-NORMARC.po         |    2 +-
 misc/translator/po/sr-Cyrl-marc-UNIMARC.po         |    2 +-
 misc/translator/po/sr-Cyrl-opac-bootstrap.po       |   62 +-
 misc/translator/po/sr-Cyrl-staff-help.po           |    2 +-
 misc/translator/po/sr-Cyrl-staff-prog.po           | 1896 +++++----
 misc/translator/po/sv-SE-marc-MARC21.po            |    2 +-
 misc/translator/po/sv-SE-marc-NORMARC.po           |    2 +-
 misc/translator/po/sv-SE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sv-SE-opac-bootstrap.po         |   69 +-
 misc/translator/po/sv-SE-staff-help.po             |    2 +-
 misc/translator/po/sv-SE-staff-prog.po             | 1904 +++++----
 misc/translator/po/sw-KE-marc-MARC21.po            |   30 +-
 misc/translator/po/sw-KE-marc-NORMARC.po           |    2 +-
 misc/translator/po/sw-KE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sw-KE-opac-bootstrap.po         |   62 +-
 misc/translator/po/sw-KE-staff-help.po             |    2 +-
 misc/translator/po/sw-KE-staff-prog.po             | 1896 +++++----
 misc/translator/po/ta-LK-marc-MARC21.po            |    2 +-
 misc/translator/po/ta-LK-marc-NORMARC.po           |    2 +-
 misc/translator/po/ta-LK-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ta-LK-opac-bootstrap.po         |   62 +-
 misc/translator/po/ta-LK-staff-help.po             |    2 +-
 misc/translator/po/ta-LK-staff-prog.po             | 1896 +++++----
 misc/translator/po/ta-marc-MARC21.po               |  372 +-
 misc/translator/po/ta-marc-NORMARC.po              |    2 +-
 misc/translator/po/ta-marc-UNIMARC.po              |    2 +-
 misc/translator/po/ta-opac-bootstrap.po            |  290 +-
 misc/translator/po/ta-staff-help.po                |    2 +-
 misc/translator/po/ta-staff-prog.po                | 2105 +++++-----
 misc/translator/po/tet-marc-MARC21.po              |    2 +-
 misc/translator/po/tet-marc-NORMARC.po             |    2 +-
 misc/translator/po/tet-marc-UNIMARC.po             |    2 +-
 misc/translator/po/tet-opac-bootstrap.po           |   62 +-
 misc/translator/po/tet-staff-help.po               |    2 +-
 misc/translator/po/tet-staff-prog.po               | 1903 +++++----
 misc/translator/po/th-TH-marc-MARC21.po            |    2 +-
 misc/translator/po/th-TH-marc-NORMARC.po           |    2 +-
 misc/translator/po/th-TH-marc-UNIMARC.po           |    2 +-
 misc/translator/po/th-TH-opac-bootstrap.po         |   62 +-
 misc/translator/po/th-TH-staff-help.po             |    2 +-
 misc/translator/po/th-TH-staff-prog.po             | 1896 +++++----
 misc/translator/po/tl-PH-marc-MARC21.po            |   12 +-
 misc/translator/po/tl-PH-marc-NORMARC.po           |    2 +-
 misc/translator/po/tl-PH-marc-UNIMARC.po           |    2 +-
 misc/translator/po/tl-PH-opac-bootstrap.po         |   62 +-
 misc/translator/po/tl-PH-staff-help.po             |   14 +-
 misc/translator/po/tl-PH-staff-prog.po             | 1896 +++++----
 misc/translator/po/tr-TR-marc-MARC21.po            |    2 +-
 misc/translator/po/tr-TR-marc-NORMARC.po           |    2 +-
 misc/translator/po/tr-TR-marc-UNIMARC.po           |    2 +-
 misc/translator/po/tr-TR-opac-bootstrap.po         |   82 +-
 misc/translator/po/tr-TR-pref.po                   |   11 +-
 misc/translator/po/tr-TR-staff-help.po             |    2 +-
 misc/translator/po/tr-TR-staff-prog.po             | 2144 +++++-----
 misc/translator/po/uk-UA-marc-MARC21.po            |    2 +-
 misc/translator/po/uk-UA-marc-NORMARC.po           |    2 +-
 misc/translator/po/uk-UA-marc-UNIMARC.po           |   14 +-
 misc/translator/po/uk-UA-opac-bootstrap.po         |   82 +-
 misc/translator/po/uk-UA-pref.po                   |   30 +-
 misc/translator/po/uk-UA-staff-help.po             |   41 +-
 misc/translator/po/uk-UA-staff-prog.po             | 4222 ++++++++++----------
 misc/translator/po/ur-Arab-marc-MARC21.po          |    2 +-
 misc/translator/po/ur-Arab-marc-NORMARC.po         |    2 +-
 misc/translator/po/ur-Arab-marc-UNIMARC.po         |    2 +-
 misc/translator/po/ur-Arab-opac-bootstrap.po       |   62 +-
 misc/translator/po/ur-Arab-staff-help.po           |    2 +-
 misc/translator/po/ur-Arab-staff-prog.po           | 1896 +++++----
 misc/translator/po/vi-VN-marc-MARC21.po            |    2 +-
 misc/translator/po/vi-VN-marc-NORMARC.po           |    2 +-
 misc/translator/po/vi-VN-marc-UNIMARC.po           |    2 +-
 misc/translator/po/vi-VN-opac-bootstrap.po         |   62 +-
 misc/translator/po/vi-VN-staff-help.po             |    2 +-
 misc/translator/po/vi-VN-staff-prog.po             | 1899 +++++----
 misc/translator/po/zh-Hans-CN-marc-MARC21.po       |    2 +-
 misc/translator/po/zh-Hans-CN-marc-NORMARC.po      |    2 +-
 misc/translator/po/zh-Hans-CN-marc-UNIMARC.po      |    2 +-
 misc/translator/po/zh-Hans-CN-opac-bootstrap.po    |   62 +-
 misc/translator/po/zh-Hans-CN-staff-help.po        |    2 +-
 misc/translator/po/zh-Hans-CN-staff-prog.po        | 1904 +++++----
 misc/translator/po/zh-Hans-TW-marc-MARC21.po       |    2 +-
 misc/translator/po/zh-Hans-TW-marc-NORMARC.po      |    2 +-
 misc/translator/po/zh-Hans-TW-marc-UNIMARC.po      |    2 +-
 misc/translator/po/zh-Hans-TW-opac-bootstrap.po    |   72 +-
 misc/translator/po/zh-Hans-TW-staff-help.po        |   12 +-
 misc/translator/po/zh-Hans-TW-staff-prog.po        | 1930 ++++-----
 528 files changed, 88932 insertions(+), 79153 deletions(-)
 delete mode 100644 misc/release_notes/release_notes_17_05_00.html
 delete mode 100644 misc/release_notes/release_notes_17_05_01.html
 create mode 100644 misc/release_notes/release_notes_17_05_03.md


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep  5 12:20:41 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 05 Sep 2017 10:20:41 +0000
Subject: [koha-commits] main Koha release repository annotated tag v17.05.03
	created. v17.05.03
Message-ID: <E1dpAyH-0006SH-Bp@git.koha-community.org>

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 annotated tag, v17.05.03 has been created
        at  065a46912eca2f1659648f5d76f6f290d47235bf (tag)
   tagging  47a61e683fcabe386b64d4802ebcf9bb381acddb (commit)
  replaces  v17.05.02
 tagged by  Fridolin Somers
        on  Tue Sep 5 12:05:37 2017 +0200

- Log -----------------------------------------------------------------
Koha security release 17.05.03
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQEcBAABAgAGBQJZrnbxAAoJECvJNkKAZAZuf5wH/jq/Q7IGBr1GN8o4eoVliyru
buq8AyeewCAYJLYI3q7K3WypKxSxGv3YgpwjwY7bmeDiWcHBjZWHFAntI0FdCfPT
jr1J/XK1AfBPoxgzwMfQia/o+PkUkxtFmsD08ZCum2wnSlSloWYbLbgQQuwfXJUK
AC3lfZyYf9d/9MWwveLyEJzAQsGcw5TEYRRh0/3PHe22C+azy5xHGTWG2LIcCm4M
f08HyZ2gWLZiLTawnV3FTqOjGD/P+gra/s7SLyaHNAZ2nGcQyekNF/abjpqvbPGC
+yLCjeEtEOKnqFTbhRT0Lwd3PtRwUGnEmZRvvNDKmZXrfELZpxn8oENhPJxe1j0=
=sfAl
-----END PGP SIGNATURE-----

Aleisha Amohia (2):
      Bug 18918: Disable CSV option if no CSV profiles exist
      Bug 18545: Remove use of onclick from OPAC cart

Alex Buckley (1):
      Bug 18987 - Added Koha::Account package pragma to Patron.pm

Amit Gupta (20):
      Bug 19078 - XSS Flaws in System preferences
      Bug 19054 - XSS Flaws in Report - Top Most-circulated items
      Bug 19052 - XSS Flaws in vendor search page
      Bug 19052 - XSS Flaws in - Invoice search page
      Bug 19051 - XSS Flaws in - Batch record deletion page
      Bug 19051 - XSS Flaws in Batch item deletion page
      Bug 19051 - XSS Flaws in - Batch item modification page
      Bug 19050 - XSS Flaws in Quick spine label creator
      Bug 19034: XSS Flaws in Patron categories pages
      Bug 19034: XSS Flaws in Cities
      Bug 19034: XSS Flaws in Z39.50/SRU servers administration
      Bug 19033: XSS Flaws in Currencies and exchange page
      Bug 19079 - XSS Flaws in Membership page
      Bug 16069 - XSS issue in basket.pl page
      Bug 19105 - XSS Stored in holidays.pl
      Bug 19100 - XSS Flaws in memberentry.pl
      Bug 19110 - XSS Stored in branches.pl
      Bug 19112 - Stored XSS in basketheader.pl page
      Bug 19114 - Stored XSS in parcels.pl
      Bug 19035 - Stored XSS in lists.pl

Chris Kirby (1):
      Bug 18839: Suggestion.pl spelling mistake

Fridolin Somers (5):
      Bug 18965 - branch transfer limits pagination save bug
      remove html notes of 17.05
      Update release notes for 17.05.03 release
      Merge remote-tracking branch 'translate/17.05.03-translate-20170824' into rm_170503
      Increment version for 17.05.03 release

Jonathan Druart (10):
      Bug 18982: Use KOHA_INTRANET_URL instead of syspref staffClientBaseURL
      Bug 18982: category.categorycode must be uppercase
      Bug 18982: Create a specific itemtype for these tests
      Bug 18982: Create a circ rule for the data we created
      Bug 18982: Remove data in the correct order
      Bug 18545: Re-add call to enableCheckboxActions
      Bug 18539: Forbid list context calls for Koha::Objects->find
      Bug 18539: remove occurrence in ReNewSubscription.t
      Bug 18726: Fix XSS at the OPAC - biblionumber
      Bug 19034: (followup 2) Fix letters.tt XSS flaw

Lari Taskula (4):
      Bug 18976: Fix t/db_dependent/Auth.t cleanup
      Bug 18976: (follow-up) Fix t/db_dependent/Search/History.t cleanup
      Bug 18977: Rollback branch in t/db_dependent/SIP/Message.t
      Bug 18991: Fix cleanup in t/db_dependent/Log.t

Marc V?ron (1):
      Bug 18832: Missing space between icon and label in button 'Patron lists'

Marcel de Rooy (9):
      Bug 18605: Remove TRUNCATE from C4/HoldsQueue.pm
      Bug 19000: Fix typo in closing p tag for items
      Bug 18991: [QA Follow-up] Use schema txn_begin and txn_rollback
      Bug 18361: Koha::Objects->find should accept composite primary keys
      Bug 18361: Additional tests for Koha::Objects->find
      Bug 18361: [QA Follow-up] Resolve warning on undef values supplied
      Bug 18951: Some t/Biblio tests are database dependent (git mv)
      Bug 18951: Create data for TransformKohaToMarc.t
      Bug 18951: Adjust Isbd.t

Nick Clemens (2):
      Bug 18367 - Fix untranslatable string from Bug 18264
      Bug 18367 - (QA Followup) Only warn if doing a lookup and not having an item

Owen Leonard (1):
      Bug 18545 [Follow-up] Remove use of onclick from OPAC Cart

Tomas Cohen Arazi (2):
      Bug 18361: (QA followup) Add tests for the no params case
      Bug 19034: (followup) Fix letters.tt XSS flaw

root (1):
      Translation updates for Koha 17.05.03

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep  6 14:23:09 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 06 Sep 2017 12:23:09 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-5-g70a0ee9
Message-ID: <E1dpZML-0002ch-B7@git.koha-community.org>

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, 17.05.x has been updated
       via  70a0ee9b5911a0d28c0312e7e3517bd7a42a6f08 (commit)
       via  50e257e217a66fa61edca5ee481c16c980838fd8 (commit)
       via  bba3b49c0960de7aa928c20209eaf5441f47da22 (commit)
       via  74c6b8a116658a0616b5825e9805ea65bb9cd504 (commit)
       via  67806ae612569160aac1d6cf57347d07b85e24bc (commit)
      from  47a61e683fcabe386b64d4802ebcf9bb381acddb (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 70a0ee9b5911a0d28c0312e7e3517bd7a42a6f08
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Aug 18 04:45:41 2017 +0000

    Bug 18996 [QA Followup] - Fix some minor whitespace issues
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 1262962a7d22b9c9b712025c5220033356c857e0)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 50e257e217a66fa61edca5ee481c16c980838fd8
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Aug 2 13:01:47 2017 +0200

    Bug 18996: [QA Follow-up] Remove global variables from Message.t
    
    As per request of Colin in comment18, this patch makes the use of global
    variables in Message.t no longer needed.
    The three subtests are now completely independent and could well be moved
    to separate test scripts.
    
    Note: Strictly speaking, the use of global (package) variables could
    potentially introduce new bugs (e.g. if the value is modified outside the
    script). This seems not to be the case here, but we are safe now.
    
    Test plan:
    Run the test again.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 37d07b28ce4089f691631bde3f6e9a2fe7b81b10)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit bba3b49c0960de7aa928c20209eaf5441f47da22
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Sat Jul 29 13:38:31 2017 +0200

    Bug 18996: Add checkin subtest in SIP/Message.t
    
    Variable $branch was not used.
    Promoted some global vars to our.
    Shared the branchcode between all three subtests now.
    The third subtest contains all six cases mentioned in the first patch.
    
    Test plan:
    Run t/db_dependent/SIP/Message.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 2490401be149d825108fc9c9f8bf556e64e2323d)

commit 74c6b8a116658a0616b5825e9805ea65bb9cd504
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Aug 1 14:10:56 2017 +0200

    Bug 18996: Resolve an uninitialized warning from ILS/Item.pm
    
    From the syslog call on line 107/108. The field $item->{title} has not
    been initialized. When catching the warns in a test script with Test::Warn,
    I got:
        Use of uninitialized value $args[1] in sprintf at /usr/lib/x86_64-linux-gnu/perl/5.20/Sys/Syslog.pm line 423.
    
    This simply resolves the warning. We might have a closer look to this title
    field on another report though.
    
    Test plan:
    Run Message.t from the next patch without this fix. It will fail since the
    additional warning makes warnings_like return false.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 66a7565995c00495fe670c809d9c7cf0c900fc7f)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 67806ae612569160aac1d6cf57347d07b85e24bc
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jul 28 10:29:51 2017 +0200

    Bug 18996: Handle data corruption from old_issues at SIP checkin
    
    As per bug 18966 AddReturn returns false with a DataCorrupted message
    when the issue_id at hand already occurs in the old_issues table.
    This should be handled when returning an item via SIP too. SIP should
    not pretend that the checkin was successful, since this item needs
    special care.
    
    The following six different situations are handled:
    
    [1] An attempt to checkin an invalid barcode is handled as before. The
    ok flag is false; the screen message shows 'Invalid Item'.
    [2] We receive a DataCorrupted message: the alert type is set to the
    unused 98 code to indicate this new error condition. The ok flag
    is false; the screen message shows 'Checkin failed: data problem'.
    [3] The item checked in was not checked out AND the option checked_in_ok
    is active. The ok flag is set to true; no screen message.
    [4] The item checked in was not checked out AND the option checked_in_ok
    is not active. The ok flag is not changed (normally false); the screen
    message shows 'Item not checked out'.
    [5] (The regular checkin) The item was checked out and AddReturn returned
    true. The ok flag is true; no screen message.
    [6] ("Otherwise") The item was checked out, but AddReturn returned false.
    The ok flag is false; the screen message shows 'Checkin failed'.
    Note: Currently this case only refers to the Wrongbranch and withdrawn
    messages from AddReturn (where doreturn==0).
    
    Note: Situation 1 and 5 are unchanged. Behavior is slightly changed for
    situation 3 and 4; the option is only used when the item was not checked
    out. Situation 2 and situation 6 are changed. After bug 18966 SIP
    returned OK in case of data corruption (while checkin failed). In the
    remaining cases under [6] SIP also returned OK while checkin failed.
    
    Test plan:
    [1] Test all six cases listed above. In order to simulate data corruption
    insert the issue_id at hand in old_issues before you check in.
    In cases 3 and 4 you need to toggle the option in your SIPconfig.xml and
    restart the SIP server.
    Case 6 can be tested by checking out at branch A, adjusting the value
    of pref AllowReturnToBranch and checking in at branch B.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 97ec4ae98c8792835717bf1de19f8782b7cb1994)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/SIP/ILS.pm                     |   37 +++----
 C4/SIP/ILS/Item.pm                |   36 +++----
 C4/SIP/ILS/Transaction/Checkin.pm |    4 +-
 t/db_dependent/SIP/Message.t      |  204 ++++++++++++++++++++++++++++++++-----
 4 files changed, 217 insertions(+), 64 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep  6 15:15:15 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 06 Sep 2017 13:15:15 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-10-g4c86b57
Message-ID: <E1dpaAl-0003fb-9H@git.koha-community.org>

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, 17.05.x has been updated
       via  4c86b575b2ef09cceefa9a2718053e45a71c2b25 (commit)
       via  c6a3c7c39babf64ad916650277ab752e54072916 (commit)
       via  ad4c173bca27de2b05a1c47a3977212f72654c40 (commit)
       via  c4e608d29954195f01ea170ff06d7e8da4814707 (commit)
       via  5b1c9cd3f27d377ddee5635f32fd1a3e2626409c (commit)
      from  70a0ee9b5911a0d28c0312e7e3517bd7a42a6f08 (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 4c86b575b2ef09cceefa9a2718053e45a71c2b25
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Aug 14 10:26:48 2017 -0300

    Bug 18331: POST_CHOMP everywhere!
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 3c6168d37436b7312e130f796d47271ff2de77cf)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit c6a3c7c39babf64ad916650277ab752e54072916
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Tue Aug 8 08:23:57 2017 +0000

    Bug 18331: Followup - fix path to orders_by_budget csv header
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 14484ba4234fd1cbb925b5f3a4844da863c65d5a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit ad4c173bca27de2b05a1c47a3977212f72654c40
Author: Lee Jamison <ldjamison at marywood.edu>
Date:   Fri Aug 4 19:27:22 2017 +0000

    Bug 18331: Followup - Fix CSV export (once and for all!)
    
    Follow-up on Comment 21 to correct the empty_line.inc
    include in basket.tt
    
    https://bugs.koha-community.org/show_bug.cgi?id=18331
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 2ee4e0ac381ed23fa23b1117725b2f6a0e0db4de)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit c4e608d29954195f01ea170ff06d7e8da4814707
Author: Marc V?ron <veron at veron.ch>
Date:   Thu Aug 3 17:50:30 2017 +0200

    Bug 18331: Force tt to insert newline to empty_line.inc
    
    See end of comment #4 and IRC:
    http://irc.koha-community.org/koha/2017-08-03#i_1958062
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit a10e5383016a5cb4117719ac858cbe02a53e457b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 5b1c9cd3f27d377ddee5635f32fd1a3e2626409c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jun 12 17:04:47 2017 -0300

    Bug 18331: Fix CSV export (once and for all!)
    
    I am going to try and explain the problem here in order to make it a
    have-to-read for next changes.
    
    There are several things to test when and most of the time we break
    something when we try to fix something else.
    
    You have to test different CSV export, not only one. There are not all
    processed the same way. For instance acqui/csv/basket.tt does not
    contain any strings to translate and the translate script will copy the
    original file as it.
    But reports/csv/orders_by_budget.tt will not! Indeed it contains "TOTAL"
    which will be translated. The generated tt file for the translated
    language will remove all the carriage returns! That's why we cannot rely
    on TT for newlines (contrary to bug 16914 assumption).
    
    There are two possible methods:
    1/ Fix the translate script
    => Hum... nope
    2/ Remove all carriage returns and make them explicit by including an
    file that only contains 1 carriage return
    
    This second method is implemented in this patch.
    
    How it works: Use the PRE_CHOMP "[%-" and POST_CHOMP "-%]"
    (http://www.template-toolkit.org/docs/manual/Config.html#section_PRE_CHOMP_POST_CHOMP)
    to remove all the newlines that could be added by TT in the original
    (en) files. Then include the new_line.inc to add a new line.
    That way original and translated files will behave the same way.
    The BLOCK in the csv_headers avoid to have the newlines added, in any
    cases. For instance: by default we will have an empty line at the end of
    the headers, but the translated headers will not have it.
    
    Test plan:
    At least 2 signoffs will be needed, please test carefully!
    You will need to generate CSV with at least 2 entries!
    Test with the non-translated interface (en) and with the language you
    want. To test with a translated language you will *have to*:
    - cd misc/translator
    - perl translate update LANG
    - manually edit the po file, remove the fuzzy tags, correctly translate
    the string (do not forget the additional %s in the headers)
    - perl translate install LANG
    1/ Export basket and basketgroup as CSV
    2/ Export late orders as CSV
    3/ Export items (from the item search) as CSV
    4/ Export the 2 reports "Orders by fund" and "Cash register" as CSV
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 8403799c7212349bee70090249e3425afd62423b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../prog/en/includes/csv_headers/acqui/basket.tt       |    2 +-
 .../prog/en/includes/csv_headers/acqui/basketgroup.tt  |    2 +-
 .../prog/en/includes/csv_headers/acqui/lateorders.tt   |    2 +-
 .../en/includes/csv_headers/catalogue/itemsearch.tt    |    2 +-
 .../csv_headers/reports/cash_register_stats.tt         |    2 +-
 .../includes/csv_headers/reports/orders_by_budget.tt   |    2 +-
 .../intranet-tmpl/prog/en/includes/empty_line.inc      |    1 +
 .../intranet-tmpl/prog/en/modules/acqui/csv/basket.tt  |    9 ++++++---
 .../prog/en/modules/acqui/csv/basketgroup.tt           |   10 ++++++----
 .../prog/en/modules/acqui/csv/lateorders.tt            |   10 ++++++----
 .../prog/en/modules/catalogue/itemsearch_csv.tt        |    8 +++++---
 .../prog/en/modules/reports/csv/cash_register_stats.tt |   16 +++++++++-------
 .../prog/en/modules/reports/csv/orders_by_budget.tt    |   14 ++++++++------
 13 files changed, 47 insertions(+), 33 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/empty_line.inc


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep  6 15:22:09 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 06 Sep 2017 13:22:09 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-12-ga0bc776
Message-ID: <E1dpaHR-0003q3-Nm@git.koha-community.org>

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, 17.05.x has been updated
       via  a0bc776e67569b83dc3d5bc47069ceb1408badb2 (commit)
       via  39a2f6421e3d0b2c415ad9abc655193357e24328 (commit)
      from  4c86b575b2ef09cceefa9a2718053e45a71c2b25 (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 a0bc776e67569b83dc3d5bc47069ceb1408badb2
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Jul 7 17:55:50 2017 +0000

    Bug 16976 - Unit tests
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 07c0d968b70421852ac4915633fa7f3cbd0d18cd)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 39a2f6421e3d0b2c415ad9abc655193357e24328
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Jun 16 06:36:22 2017 -0400

    Bug 16976 - Authorities searches with double quotes gives ZOOM error 20003 [Alternate]
    
    I dug into this a little bit, it seems the issue is that we were double
    processing the query because of an extra call to
    C4::AuthoritiesMarc::SearchAuthorities
    
    I think we can simply remove this call
    
    To test:
    1 - Perform an authority search for a value that returns results
    2 - Wrap it in quotes and search
    3 - 'Internal server error'
    4 - Apply patch
    5 - Search with quotes succeeds
    
    https://bugs.koha-community.org/show_bug.cgi?id=16796
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 9c8a04acb05466356fec8e9d6d13183295719c7d)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 Koha/SearchEngine/Zebra/QueryBuilder.pm |    1 -
 t/Search/Zebra/QueryBuilder.t           |   38 +++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 t/Search/Zebra/QueryBuilder.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep  6 15:26:36 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 06 Sep 2017 13:26:36 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-17-ga21f8a5
Message-ID: <E1dpaLk-00042C-PR@git.koha-community.org>

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, 17.05.x has been updated
       via  a21f8a552ba5798342eca04a534ea9a1503b7843 (commit)
       via  a17aa443b101f15be2b27a4bd45faa6473818247 (commit)
       via  1f83e41f2e9d92027401b6ffc8ebe052fe0beab3 (commit)
       via  efd3acb03e345a4e5c7f576038ed14961bbab3d6 (commit)
       via  4c50a19ab920b488193d78ee18d89bb143ddae4a (commit)
      from  a0bc776e67569b83dc3d5bc47069ceb1408badb2 (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 a21f8a552ba5798342eca04a534ea9a1503b7843
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 15 12:16:33 2017 -0300

    Bug 18624: Do not return 1 in tests
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 03c5eb0babc3fd7b0ecf45a8a5db91a67718d3b4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit a17aa443b101f15be2b27a4bd45faa6473818247
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Aug 7 16:23:24 2017 -0300

    Bug 18624: (followup) opac-authorities-home.tt uses 'any'
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 9d7d524f21fbf83ef7e1031e36c9772ffe21db90)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 1f83e41f2e9d92027401b6ffc8ebe052fe0beab3
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Jun 16 09:53:39 2017 -0400

    Bug 18624: Run time errors when searching authorities with Elastic search 5.3
    
    It seems we have a syntax mismatch - any vs all
    
    all seems to the be list we expect so updating code that way
    
    To test:
    1 - Enabled Elasticsearch
    2 - Index some authorities
    3 - Perform a 'Search entire record' search
    4 - Internal server error (
            Invalid marclist field provided: all at
            /usr/local/koha/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
            line 433.
            )
    5 - Run:
        $ sudo koha-shell kohadev
       k$ cd kohaclone
       k$ prove t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
    => FAIL: Tests fail because 'any is used'
    6 - Apply patch
    7 - Search should work
    8 - Run:
       k$ prove t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
    => SUCCESS: Tests pass!
    9 Sign off :-D
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Edited the test plan so it mentions the new tests
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit cfb52579ec2f8859226e0e40f66d5a6d7a2ed73f)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit efd3acb03e345a4e5c7f576038ed14961bbab3d6
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Aug 7 16:09:56 2017 -0300

    Bug 18624: Regression test for 'any' vs 'all'
    
    This test makes it explicit that the only string producing _all as index on build_authorities_query_compat is 'all'.
    To test:
    - Apply this patch
    - Run:
      $ sudo koha-shell kohadev
     k$ cd kohaclone
     k$ prove t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
    => FAIL: Test fails because the list of valid values is wrong in Koha.
    
    Note: this list has to be in sync with the templates passing the same values. A followup will be added
    to fix a discrepancy found between OPAC and Intranet.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit b308b0814bcd149e3f899058e693938d982bb425)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 4c50a19ab920b488193d78ee18d89bb143ddae4a
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Aug 7 16:07:40 2017 -0300

    Bug 18624: Minor refactoring to ease testing
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit ff41b87302c1b242f9edd7b2e8c253bd18b57ac1)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 Koha/SearchEngine/Elasticsearch/QueryBuilder.pm    |   27 +++++-----
 .../bootstrap/en/modules/opac-authorities-home.tt  |    2 +-
 .../Koha/SearchEngine/Elasticsearch/QueryBuilder.t |   55 ++++++++++++++++++++
 3 files changed, 70 insertions(+), 14 deletions(-)
 create mode 100644 t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep  6 15:29:52 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 06 Sep 2017 13:29:52 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-18-g8f3a7d8
Message-ID: <E1dpaOu-00048K-Vh@git.koha-community.org>

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, 17.05.x has been updated
       via  8f3a7d800271cb2611de0cb369e907b16c30fb0b (commit)
      from  a21f8a552ba5798342eca04a534ea9a1503b7843 (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 8f3a7d800271cb2611de0cb369e907b16c30fb0b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Aug 7 13:50:32 2017 -0300

    Bug 19053: Keep auto_renew flag if a confirmation is needed
    
    If an item is checked out with the auto renewal flag and a confirmation
    is needed (holds exist, past due date, etc.) the auto renewal flag will
    get lost.
    
    Test plan:
    - Check an item out and specify a past due date
    - Confirm the checkout on the confirmation screen
    => Without this patch the checkout is not marked as auto renewal
    => With this patch applied the auto renewal flag will be set to the
    checkout
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 3808dbc1d22b3adc43a09ba7ce00aaca01f95f5a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 circ/circulation.pl                                         |    1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt |    1 +
 2 files changed, 2 insertions(+)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep  6 15:35:01 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 06 Sep 2017 13:35:01 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-23-gf067450
Message-ID: <E1dpaTt-0004L4-IX@git.koha-community.org>

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, 17.05.x has been updated
       via  f067450d8011fb0a27a28524bec359ffad4f2278 (commit)
       via  5699df9deed09edbaa3db1087f3e453c28ac1091 (commit)
       via  3bbb89c57181c113d64ec7649195de30b52d0806 (commit)
       via  c6e3f2ac0575849a0b48170506a4986a50ac8bf1 (commit)
       via  4dd020a3019cd7e2b357153ec737b15eea95f671 (commit)
      from  8f3a7d800271cb2611de0cb369e907b16c30fb0b (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 f067450d8011fb0a27a28524bec359ffad4f2278
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Aug 11 08:34:45 2017 +0200

    Bug 19049: [QA Follow-up] Mock config, default format
    
    As requested by QA:
    [1] Mock_config enable_plugins in the test.
    [2] Fallback to MARC when format is empty. Remove die statement.
    Added:
    [3] Remove $marc. This variable got obsolete during development.
    [4] Add test on $input_file and $plugin_class. Test $text before calling
        Handler or processing $text. No need to split undef if somehow Handler
        returned undef, etc. If the routine returns an empty arrayref,
        stage-marc-import will do fine.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit a423fcff42da05e9ebf9f2b4a2f192023346e93e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 5699df9deed09edbaa3db1087f3e453c28ac1091
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Aug 10 09:02:37 2017 -0400

    Bug 19049 [QA Followup] - Make plugin name first item in description
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit d8f6315b6d9b1c7145f6036b55b7927f6d6e6e48)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 3bbb89c57181c113d64ec7649195de30b52d0806
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Aug 10 13:02:23 2017 +0200

    Bug 19049: [Follow-up] Make sure that GetPlugins finds the plugin
    
    We have to mock_config the pluginsdir before Plugins is loaded, and
    we should pass an absolute path (not a relative one).
    If you did not install the test to_marc plugin, this test would fail.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Verified patch is compatible with original KitchenSink to_marc plugin
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0987b135ea0bb8fbd4fc39643b19715dc6e3a1c8)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit c6e3f2ac0575849a0b48170506a4986a50ac8bf1
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Aug 8 14:51:41 2017 +0200

    Bug 19049: Testing RecordsFromMarcPlugin with a to_marc plugin
    
    This patch adds a simple to_marc plugin in t/Koha/Plugin that is used
    in the added subtest in ImportBatch.t.
    
    Test plan:
    [1] Run t/db_dependent/ImportBatch.t
    [2] Copy the to_marc test plugin from t to your plugin directory.
        Under Debian packages, you should do something like:
        mkdir -p /var/lib/koha/master/plugins/Koha/Plugin/
        cp [yourclone]/t/Koha/Plugin/MarcFieldValues.pm /var/lib/koha/master/plugins/Koha/Plugin/
    [3] Check if you see this plugin on plugins/plugins-home.pl
    [4] Create a text file with some fields like:
        (Note: The plugin needs an empty line between both "records".)
        100,a = Test Author 1
        245,a = Title One
    
        100,a = Author 2
        245,a = Title Two
    [5] Go to stage-marc-import.pl. Upload the created file. Select the plugin
        in the format combo and proceed. Did you create two records ?
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 83f60adbab8e96f0f14ec547029582623ac3a068)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 4dd020a3019cd7e2b357153ec737b15eea95f671
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Aug 7 21:24:48 2017 +0200

    Bug 19049: Fix regression on stage-marc-import with to_marc plugin
    
    Bug 12412 added the use of to_marc plugins allowing arbitrary file formats
    in stage-marc-import (as long as the plugins can handle them). The feature
    was not very visible in the code, and when bug 10407 added the marcxml
    format, it made some changes that broke the use of to_marc.
    
    This patch restores the functionality by:
    [1] Adding a sub RecordsFromMarcPlugin to ImportBatch.pm, specifically
        addressing the conversion from arbitrary formats to MARC::Record.
        The original to_marc interface is used: pass it the file contents,
        and it returns a string consisting of a number of MARC blobs separated
        by \x1D.
        Consequently, the call of to_marc is removed from routine
        BatchStageMarcRecords where it did not belong. The to_marc_plugin
        parameter is removed and two calls are adjusted accordingly.
    [2] Instead of a separate combo with plugins, the format combo contains
        MARC, MARCXML and optionally some plugin formats.
    [3] The code in stage-marc-import.pl now clearly shows the three main
        format types: MARC, MARCXML or plugin based.
    
    Note: This patch restores more or less the situation after bug 12412, but
    I would actually recommend to have the to_marc plugins return MARC::Record
    objects instead of large text strings. In the second example I added a
    to_marc plugin that actually converts MARC record objects to string format,
    while RecordsFromMarcPlugin reconverts them to MARC::Records.
    
    Test plan:
    See second patch.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit d24568b67256fab79b42ead54302c76d1c9653d7)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/ImportBatch.pm                                  |   53 +++++++++---
 .../prog/en/modules/tools/stage-marc-import.tt     |   20 +----
 misc/stage_file.pl                                 |    2 +-
 t/Koha/Plugin/MarcFieldValues.pm                   |   86 ++++++++++++++++++++
 t/db_dependent/ImportBatch.t                       |   43 +++++++++-
 tools/stage-marc-import.pl                         |   10 ++-
 6 files changed, 179 insertions(+), 35 deletions(-)
 create mode 100644 t/Koha/Plugin/MarcFieldValues.pm


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep  6 15:43:07 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 06 Sep 2017 13:43:07 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-24-gbfdaf11
Message-ID: <E1dpabj-0004U7-HT@git.koha-community.org>

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, 17.05.x has been updated
       via  bfdaf1136d86194102f247de58069caa5febb539 (commit)
      from  f067450d8011fb0a27a28524bec359ffad4f2278 (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 bfdaf1136d86194102f247de58069caa5febb539
Author: Baptiste Wojtkowski <baptiste.wojtkowski at biblibre.com>
Date:   Mon Jul 10 08:11:33 2017 +0000

    Bug 18919: Repair "Transaction branch" in cash_register_stats.pl
    
    - values of the option fields are now correctly loaded
    
    TEST PLAN:
    go to domain/cgi-bin/koha/reports/cash_register_stats.pl
    1 - Make a report for all branches => it works
    2 - Make a report for any branch => you will get the same or no result
    3 - apply patch
    4 - Repeat 2 => it should work
    
    Followed test plan worked as intended
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 7b5457cd0f17173ae9ebca2e71696cc09709a910)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt   |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep  6 18:35:23 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 06 Sep 2017 16:35:23 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v17.05.00-540-g0c6538f
Message-ID: <E1dpdIR-0007sh-Eq@git.koha-community.org>

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, master has been updated
       via  0c6538f033f43cde33d186561a93a197467bd9a1 (commit)
       via  1417f83e8b8a57e70e9120244a36204cf4acb3c2 (commit)
       via  f7e8391fd3aa38cdd00ce943bd826399685253d7 (commit)
       via  2671eb2f93340e8fb3c794cff918d86c526cc47f (commit)
       via  88e82a01218775b8d780769d9fdc8c0054e37180 (commit)
       via  b37ba1be0b8eaf6b778881d3e6e3c9d213757d06 (commit)
      from  ecf6ca5d6e1472bab68f174ab50a20eec6b74888 (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 0c6538f033f43cde33d186561a93a197467bd9a1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Sep 6 13:14:56 2017 -0300

    Bug 17834: Make translation easier
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 1417f83e8b8a57e70e9120244a36204cf4acb3c2
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Thu Apr 20 03:12:14 2017 +0000

    Bug 17834: Change library news text for single-branch libraries
    
    To test:
    1) Log into OPAC, go to home page
    2) Confirm that the text shows as 'RSS feed for (branchname) library
    news' if single-branch library
    3) Confirm text shows as normal for libraries with more than one branch
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: maricris <mlabancia at gmail.com>
    
    Signed-off-by: anafe <anafeazuela at yahoo.com>
    
    Signed-off-by: iflora <iflora at unimas.my>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit f7e8391fd3aa38cdd00ce943bd826399685253d7
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Thu Aug 31 00:01:59 2017 +0000

    Bug 19215: Fixing typo in URL for patron clubs
    
    To test:
    1) Go to Tools -> Clubs
    2) Create a new club template if you do not already have one
    3) Edit the template
    4) Notice the URL is incorrect and the page is not found
    5) Apply patch and go back to Clubs
    6) Click edit button
    7) Link should work as expected
    
    Sponsored-by: Catalyst IT
    Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 2671eb2f93340e8fb3c794cff918d86c526cc47f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Sep 4 12:06:56 2017 -0300

    Bug 18927: Use fully qualified subroutine names in C4::Items
    
    rebuild_zebra.pl fails in some conditions (perl version?)
    I do not recreate but it has been reported that reindex fails with:
      error retrieving biblio 94540 at /usr/share/koha/bin/migration_tools/rebuild_zebra.pl line 683, <DATA> line 751.
    
    To fix it we can use fully qualified subroutine names for:
      GetMarcFromKohaField
      GetMarcBiblio
      GetBiblionumberFromItemnumber
      TransformKohaToMarc
      GetFrameworkCode
    
    Test plan:
    Confirm the rebuild_zebra script still works correctly after this patch
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 88e82a01218775b8d780769d9fdc8c0054e37180
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Sep 6 12:52:46 2017 -0300

    Bug 11580: Add one more test and clear the cache
    
    Make sure we are not just returning J-1 and clear the cache before and
    after the tests.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit b37ba1be0b8eaf6b778881d3e6e3c9d213757d06
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date:   Wed Sep 6 15:36:15 2017 +0000

    Bug 11580 - Fix expiry calculation and rewrite tests
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 C4/Circulation.pm                                  |    6 ++--
 C4/Items.pm                                        |   30 +++++++++---------
 .../intranet-tmpl/prog/en/modules/clubs/clubs.tt   |    2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-main.tt    |   14 ++++++++-
 misc/migration_tools/rebuild_zebra.pl              |    8 ++---
 t/db_dependent/Circulation/CalcDateDue.t           |   32 ++++++++++++++++++--
 t/db_dependent/Circulation/dateexpiry.t            |   22 +-------------
 7 files changed, 68 insertions(+), 46 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep  7 20:06:08 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 07 Sep 2017 18:06:08 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v17.05.00-558-gb56c195
Message-ID: <E1dq1Bo-0008PK-LM@git.koha-community.org>

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, master has been updated
       via  b56c19528e332381384639ed347d11508086c547 (commit)
       via  ddf494b18f6c422d3654b0a78a63be86f5356065 (commit)
       via  693cc1122b2b96ef2fc176b07371a4608104eaaf (commit)
       via  9ffda7a7bc9f627165954b8272f1bb71c1b2beff (commit)
       via  6ed1513e5fe91772c1720963006bf8f04452416d (commit)
       via  5f989a81dff29db78620057d70ed864b32486bc0 (commit)
       via  6a9fafe3090333647244db99ccd39d53e51b781c (commit)
       via  594c48fb5b2c03f5d638d7115e42820294e32343 (commit)
       via  24003b84ce637d228a4062dcf29415eb8e4f2162 (commit)
       via  3c31e6e795cda3ea9b2ae4372d36572fc9e06f61 (commit)
       via  7aef2f3298b0348c2a3994e344e32e5bc41f1f07 (commit)
       via  f55af2fc078a7d6a05238232bc276e6924307179 (commit)
       via  1ffba42465faaaa257a3a82555aaeaed0c23ae43 (commit)
       via  62605145932c452bee8e5b6f49ce1b5a75803bd7 (commit)
       via  8cb6ed24ffb6f7bfa74b7ea4062070cc5cd0e6d2 (commit)
       via  d60cc56613755a432bb0962b2e808229c8c575c1 (commit)
       via  d53f7607b57d253e7f95bb6c2d699ed3e93c84b1 (commit)
       via  ebd1039bbdb041c7691eaaa2a977af9cd1687d3e (commit)
      from  0c6538f033f43cde33d186561a93a197467bd9a1 (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 b56c19528e332381384639ed347d11508086c547
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Tue Sep 5 22:42:14 2017 +0000

    Bug 19258: Prevent warn when reversing a payment
    
    The following warn is triggered when I click the Reverse button next to
    an individual payment on the Account tab:
    CGI::param called in list context from package
    CGI::Compile::ROOT::home_vagrant_kohaclone_members_boraccount_2epl line
    63, this can lead to vulnerabilities. See the warning in "Fetching the
    value or values of a single named parameter" at /usr/share/perl5/CGI.pm
    line 436.
    
    To test:
    1) Go to a members detail page in staff side, create a manual invoice,
    pay it
    2) Go to the Account tab, click Reverse next to the payment you just
    made
    3) Notice warns
    4) Apply patch and repeat steps 1 & 2
    5) Warns should be gone
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ddf494b18f6c422d3654b0a78a63be86f5356065
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Tue Sep 5 22:38:12 2017 +0000

    Bug 19258: Preventing warns when paying a fine or charge from Pay selected button
    
    The following warns are triggered when I click the Pay selected button:
    CGI::param called in list context from package
    CGI::Compile::ROOT::home_vagrant_kohaclone_members_pay_2epl line 267,
    this can lead to vulnerabilities. See the warning in "Fetching the
    value or values of a single named parameter" at
    usr/share/perl5/CGI.pm line 436.
    CGI::param called in list context from package
    CGI::Compile::ROOT::home_vagrant_kohaclone_members_pay_2epl line
    273, this can lead to vulnerabilities. See the warning in "Fetching
    the value or values of a single named parameter" at
    /usr/share/perl5/CGI.pm line 436.
    
    To test:
    1) Go to a members detail page in staff side and create a manual
    invoice
    2) Go to the pay fines tab, select the fine you just created and click
    Pay selected
    3) Notice warns
    4) Apply patch and repeat steps 1 & 2
    5) Warns should be gone
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 693cc1122b2b96ef2fc176b07371a4608104eaaf
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Tue Sep 5 22:34:18 2017 +0000

    Bug 19258: Prevent warns when writing off an individual fine
    
    The following warns are triggered when I click the Write Off button next
    to an individual fine or charge:
    CGI::param called in list context from package
    CGI::Compile::ROOT::home_vagrant_kohaclone_members_pay_2epl line 171,
    this can lead to vulnerabilities. See the warning in "Fetching the
    value or values of a single named parameter" at
    /usr/share/perl5/CGI.pm line 436. (this shows many times)
    Use of uninitialized value in subroutine entry at
    /usr/share/perl5/URI/Escape.pm line 184.
    
    To test:
    1) Go to a members detail page in staff side and create a manual
    invoice
    2) Go to the pay fines tab, click the Write off button next to the
    invoice you just created
    3) Notice warns
    4) Apply patch and repeat steps 1 & 2
    5) Warns should be gone
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 9ffda7a7bc9f627165954b8272f1bb71c1b2beff
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Tue Sep 5 22:05:36 2017 +0000

    Bug 19258: Prevent warn when paying a fine or charge
    
    To test:
     1) Go to a members detail page in staff client
     2) Select the Fines tab in the left pane
     3) Select the Create manual invoice tab below the button menu bar
     4) Create a fine and click save (e.g. Type: Fine, Amount: 5.00)
     5) Select the Pay fines tab below the button menu bar
     6) Click Pay on the item
     7) Blank the staff error log
     8) click confirm
        -- staff error log has message
     9) apply this first patch
    10) repeat steps 3-8
        -- staff error log is blank
    11) run koha qa test tools
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 6ed1513e5fe91772c1720963006bf8f04452416d
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Tue Sep 5 21:16:05 2017 +0000

    Bug 19257: Prevent warn when reopening a basket
    
    To test:
    1) Go to Acquisitions, find a vendor and a basket (create if you don't
    have either)
    2) Close the basket
    3) View the basket and reopen it
    4) Notice the warn
    5) Apply the patch and repeat steps 1-3
    6) Notice the warn no longer shows and the basket is reopened as
    expected
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 5f989a81dff29db78620057d70ed864b32486bc0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jul 10 14:15:09 2017 +0200

    Bug 18921: Resolve a few warnings in C4/XSLT.pm
    
    Resolves warnings like:
    
    Use of uninitialized value in hash element at C4/XSLT.pm line 262.
    Use of uninitialized value in numeric eq (==) at C4/XSLT.pm line 267.
    Use of uninitialized value $status in concatenation (.) or string at C4/XSLT.pm line 300.
    
    Note: Line numbers are not exactly the same anymore.
    
    Test plan:
    [1] Enable XSLT view in OPAC
    [2] Without this patch, you will probably have some of these warnings when
        doing some opac searches.
    [3] Apply this patch. Check the logs again.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 6a9fafe3090333647244db99ccd39d53e51b781c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Sep 7 14:15:20 2017 -0300

    Bug 19214: prevent crash if club_template_field is called in list context
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 594c48fb5b2c03f5d638d7115e42820294e32343
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Wed Aug 30 23:54:56 2017 +0000

    Bug 19214: Prevent crash if ->club or ->patron is called in list context
    
    To test:
    1) Create a club template and a club.
    2) Add a user to the club
    3) Log in to the OPAC as that user
    4) Go to 'your summary' and click the Clubs tab
    5) Notice clubs do not load and a warn shows:
    Template process failed: undef error - Cannot use "->find" in list
    context at /home/vagrant/kohaclone/Koha/Club/Enrollment.pm line 62.
    6) Go to the staff side and go to the member page of that user
    7) Go to 'details' and click the Clubs tab
    8) Notice clubs do not load and a warn shows:
    Template process failed: undef error - Cannot use "->find" in list
    context at /home/vagrant/kohaclone/Koha/Club/Enrollment.pm line 71.
    9) Apply patch
    1) Repeat steps 4-7, confirming the errors do not show and clubs info
    loads correctly
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 24003b84ce637d228a4062dcf29415eb8e4f2162
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Jun 12 11:49:37 2017 +0000

    Bug 17893 - Move JavaScript to the footer on staff client catalog pages
    
    This patch modifies multiple catalog-related pages in order to move
    embedded JavaScript to the footer.
    
    The JavaScript previously embedded in cat-toolbar.inc is moved to a
    separate file (catalog.js).
    
    To test, apply the patch and test JavaScript-driven interactions on all
    modified pages, including JS which isn't page-specific (menus, help,
    etc). The functionality of the catalog toolbar should be tested on each
    page.
    
    - Bibliographic detail pages (standard, MARC, labeled MARC, ISBD).
    - Advanced search page
    - Local cover image viewer
    - Item search page
    - Item detail page
    - Search history page
    - Checkout history page
    
    https://bugs.koha-community.org/show_bug.cgi?id=17839
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 3c31e6e795cda3ea9b2ae4372d36572fc9e06f61
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Fri Jan 27 03:37:31 2017 +0000

    Bug 12691: Use Koha.Preference in Self-Checkout
    
    For calls to SCOUserJS, SCOUserCSS, OPACUserCSS, AllowSelfCheckReturns,
    OpacFavicon, ShowPatronImageInWebBasedSelfCheck, SelfCheckoutByLogin
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Bug 12691: [FOLLOW-UP] Follow-up patch
    
    This patch fixes merge conflicts and fixes the problems in Comment 7
    
    QA tools complain about missing bracket, will be fixed in next followup
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Bug 12691: [FOLLOW-UP] Missing bracket
    
    Patch adds bracket to template file (Comment 16)
    
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Bug 12691: [FOLLOW-UP] Fixing some logic
    
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Patches have been squashed for readability and 1 removal occurrence of
    display_patron_image has been reintroduced.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 7aef2f3298b0348c2a3994e344e32e5bc41f1f07
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Thu Aug 31 21:18:24 2017 +0000

    Bug 19228: Trigger confirm delete when removing item from course
    
    To test:
    1) Enable UseCourseReserves syspref
    2) Go to Course Reserves
    3) Add a new course if you don't already have one
    4) Add an item to the course
    5) Click 'remove' to delete the item from the course
    6) Notice the item deletes straight away with no confirmation prompt
    7) Apply the patch
    8) Repeat steps 4 and 5
    9) Confirm the confirmation box pops up and works as expected
    
    Sponsored-by: Catalyst IT
    Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit f55af2fc078a7d6a05238232bc276e6924307179
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Thu Aug 31 21:25:28 2017 +0000

    Bug 19229: Return to course when cancelling out of edit form
    
    To test:
    1) Ensure UseCourseReserves is enabled
    2) Go to Course Reserves, create a course
    3) Edit course
    4) Click Cancel
    5) Notice you are returned to the courses home page rather than returned
    to the course
    6) Apply patch
    7) Go to edit course and click cancel again
    8) Confirm you are returned to the course and that this feels like the
    natural expectation.
    
    Sponsored-by: Catalyst IT
    Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 1ffba42465faaaa257a3a82555aaeaed0c23ae43
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Sep 7 11:48:09 2017 +0200

    Bug 19268: Fix TestBuilder parameter in C/Branch.t and K/P/Messaging.t
    
    The values parameter should be called value.
    See bug 15339.
    
    Test plan:
    Run the adjusted tests.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 62605145932c452bee8e5b6f49ce1b5a75803bd7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Sep 7 13:55:01 2017 -0300

    Bug 15339: Remove extra 'my'
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 8cb6ed24ffb6f7bfa74b7ea4062070cc5cd0e6d2
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Sep 7 09:24:28 2017 +0200

    Bug 15339: [QA Follow-up] Add a warning too when source is not supplied
    
    When you do not supply a source and add a few wrong parameters, you
    would not be warned. Because build simply returns undef.
    Adding a carp and a test for that situation too.
    
    Note: In the earlier subtest 'trivial tests' build was called without
    source. This now generates a warning. We just catch if there is a warning
    and test the actual warning itself later on.
    
    Test plan:
    Run t/db_dependent/TestBuilder.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit d60cc56613755a432bb0962b2e808229c8c575c1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Sep 6 13:41:47 2017 -0300

    Bug 15339: Improve parameter validation
    
    Only value and source are allowed
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit d53f7607b57d253e7f95bb6c2d699ed3e93c84b1
Author: Martin Persson <xarragon at gmail.com>
Date:   Wed Dec 9 11:31:12 2015 +0100

    Bug 15339: TestBuilder warnings (tests)
    
    Makes TestBuilder::build() alert the user when unreognized parameters
    are passed, which happens when the user supplies the column values
    directly, forgetting the 'value' hash.
    
    This patch contains the tests that doubles as a demonstration
    of the kind of error the patch is intended to prevent.
    
    Sponsored-By: Halland County Library
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ebd1039bbdb041c7691eaaa2a977af9cd1687d3e
Author: Martin Persson <xarragon at gmail.com>
Date:   Tue Dec 8 20:55:01 2015 +0100

    Bug 15339: TestBuilder warnings (code)
    
    Makes TestBuilder::build() alert the user when unreognized
    parameters are passed, which happens when the user supplies
    the column values directly, forgetting the 'value' hash.
    
    This patch holds the code changes. Examples of the kind of
    errors that it catches are in the tests (separate patch).
    
    Sponsored-By: Halland County Library
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 C4/XSLT.pm                                         |    6 +-
 Koha/Club/Enrollment.pm                            |    4 +-
 Koha/Club/Field.pm                                 |    2 +-
 acqui/basket.pl                                    |    2 +-
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |  129 +----
 .../prog/en/includes/catalog-strings.inc           |   30 +
 .../prog/en/modules/catalogue/ISBDdetail.tt        |   29 +-
 .../prog/en/modules/catalogue/MARCdetail.tt        |   48 +-
 .../prog/en/modules/catalogue/advsearch.tt         |   52 +-
 .../prog/en/modules/catalogue/detail.tt            |  606 ++++++++++----------
 .../prog/en/modules/catalogue/imageviewer.tt       |   42 +-
 .../prog/en/modules/catalogue/issuehistory.tt      |   30 +-
 .../prog/en/modules/catalogue/itemsearch.tt        |  476 +++++++--------
 .../prog/en/modules/catalogue/labeledMARCdetail.tt |   49 +-
 .../prog/en/modules/catalogue/moredetail.tt        |   22 +-
 .../prog/en/modules/catalogue/search-history.tt    |  218 +++----
 .../en/modules/course_reserves/course-details.tt   |   10 +-
 .../prog/en/modules/course_reserves/course.tt      |    2 +-
 koha-tmpl/intranet-tmpl/prog/js/catalog.js         |  112 ++++
 .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt |   20 +-
 members/boraccount.pl                              |    2 +-
 members/pay.pl                                     |   11 +-
 members/paycollect.pl                              |    2 +-
 opac/sco/sco-main.pl                               |   15 +-
 t/db_dependent/Circulation/Branch.t                |    8 +-
 t/db_dependent/Koha/Patron/Messages.t              |    2 +-
 t/db_dependent/TestBuilder.t                       |   36 +-
 t/lib/TestBuilder.pm                               |    9 +-
 28 files changed, 1016 insertions(+), 958 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/catalog-strings.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/js/catalog.js


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep  7 20:10:02 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 07 Sep 2017 18:10:02 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v17.05.00-561-gb465362
Message-ID: <E1dq1Fa-0008Rh-AL@git.koha-community.org>

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, master has been updated
       via  b4653629f63d410326036cef5aa8a70c55d17f45 (commit)
       via  ad9f89c6c32ba8e8fc52566d5e8c7e5b8c9d43e9 (commit)
       via  3aeb1fc7e85e01cebf7ef726ea1d877b7b0edab6 (commit)
      from  b56c19528e332381384639ed347d11508086c547 (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 b4653629f63d410326036cef5aa8a70c55d17f45
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Sep 6 14:45:00 2017 -0300

    Bug 19256: (QA followup) Add missing POD
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ad9f89c6c32ba8e8fc52566d5e8c7e5b8c9d43e9
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Sep 6 10:15:55 2017 -0400

    Bug 19256: (QA followup) Remove warn from unit test
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 3aeb1fc7e85e01cebf7ef726ea1d877b7b0edab6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 5 10:15:59 2017 -0300

    Bug 19256: Make Koha::Acq::Order using Koha::Object
    
    At the moment we have 2 different modules for acquisition orders:
    Koha::Tmp::Order[s] and Koha::Acquisition::Order
    The later has been added before the creation of Koha::Object.
    Koha::Tmp::Order[s] has been created to make the TT syntax for notices
    works with acquisition order data.
    
    This patch removes the temporary packages Koha::Tmp::Order[s] and adapt
    the code of Koha::Acquisition::Order[s] to be based on Koha::Object[s].
    
    It also overloads Koha::Object->new to add the trick that was done in
    Koha::Acquisition::Order->insert. This is needed because acqui/addorder.pl
    is called from several places and CGI->Vars is used to retrieved order's
    attributes (and so much more). To avoid regression, the easiest (but not
    cleanest) way to do is to filter on aqorders column's names.
    This is *not* a pattern to follow!
    
    Test plan:
    Create basket and add orders from different ways, then continue a whole
    acquisition process
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 C4/Acquisition.pm                                  |   13 +-
 C4/Letters.pm                                      |    2 +-
 Koha/Acquisition/Order.pm                          |  124 +++++++++++---------
 Koha/{Tmp => Acquisition}/Orders.pm                |   18 +--
 Koha/Tmp/Order.pm                                  |   44 -------
 acqui/addorder.pl                                  |    5 +-
 acqui/addorderiso2709.pl                           |    6 +-
 acqui/finishreceive.pl                             |    5 +-
 admin/currency.pl                                  |    6 +-
 t/db_dependent/Acquisition.t                       |   17 +--
 t/db_dependent/Acquisition/CancelReceipt.t         |   22 ++--
 t/db_dependent/Acquisition/GetBasketAsCSV.t        |    6 +-
 .../Acquisition/GetBasketsInfosByBookseller.t      |   10 +-
 .../Acquisition/GetOrdersByBiblionumber.t          |   14 +--
 t/db_dependent/Acquisition/Invoices.t              |   20 ++--
 t/db_dependent/Acquisition/NewOrder.t              |   16 +--
 t/db_dependent/Acquisition/OrderFromSubscription.t |    8 +-
 t/db_dependent/Acquisition/OrderUsers.t            |   15 ++-
 t/db_dependent/Acquisition/StandingOrders.t        |   29 +++--
 t/db_dependent/Acquisition/TransferOrder.t         |    8 +-
 t/db_dependent/Acquisition/close_reopen_basket.t   |   12 +-
 t/db_dependent/Bookseller.t                        |   18 +--
 t/db_dependent/Budgets.t                           |   12 +-
 t/db_dependent/Letters.t                           |    6 +-
 t/db_dependent/UsageStats.t                        |    2 +-
 25 files changed, 203 insertions(+), 235 deletions(-)
 rename Koha/{Tmp => Acquisition}/Orders.pm (79%)
 delete mode 100644 Koha/Tmp/Order.pm


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep 10 11:06:43 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 10 Sep 2017 09:06:43 +0000
Subject: [koha-commits] main Koha release repository branch 16.11.x updated.
	v16.11.11-1-15-g293d05d
Message-ID: <E1dqyCR-0004Op-Tf@git.koha-community.org>

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.11.x has been updated
       via  293d05d0af9817e7d0b31bbb19684494f259714a (commit)
       via  fe0e8e740a044ca2002091aaacbe0843749fe56d (commit)
       via  396ff22074d681d055539fa8928476fe4228a7be (commit)
       via  96d5d2995cd56ee41b9f26e621f6903d823323d5 (commit)
       via  9f06cd63b54d39510b230227bca52530d25fc221 (commit)
       via  8ef1bf53cfa0c7ee74bd157c39adc68b5e1121c7 (commit)
       via  4e59f94961cd39d079bcd3664a8e5f7fa479c156 (commit)
       via  35bbde509361ebccbf5205083b17ed650d41eeb1 (commit)
       via  98631a3e7617416acbcfdff51451367789307556 (commit)
       via  333ff8c73d90e59f14e4ee95b3c414f36837c249 (commit)
       via  61d79bc04b2beecf708a352933b6a69dab414be0 (commit)
       via  00fa408221776634ecd1066b9e67349ff2d535dd (commit)
       via  82a8f296827edf58319213640979075b60b79fe3 (commit)
       via  4fa59dbd8e7cabf92fb7d470d4ec385480f0184a (commit)
       via  9cefbaf964772848cc338a910d55c558bf579d1a (commit)
      from  b06a26fa83f6af37ee098ac0101deff786beca6e (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 293d05d0af9817e7d0b31bbb19684494f259714a
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Aug 22 16:41:46 2017 +0200

    Bug 19163: Critical typo in stage-marc-import process
    
    Template says ISO2709 but script wants MARC or MARCXML..
    Slipped in with bug 19049.
    Trivial but critical fix.
    
    Test plan:
    Import a MARC file.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    I picked this fix because I think MARC is always ambiguous. ISO2709
    clearly denotes the serialization format used.
    
    Signed-off-by: Liz Rea <liz at catalyst.net.nz>
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit fe0e8e740a044ca2002091aaacbe0843749fe56d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Aug 11 08:34:45 2017 +0200

    Bug 19049: [QA Follow-up] Mock config, default format
    
    As requested by QA:
    [1] Mock_config enable_plugins in the test.
    [2] Fallback to MARC when format is empty. Remove die statement.
    Added:
    [3] Remove $marc. This variable got obsolete during development.
    [4] Add test on $input_file and $plugin_class. Test $text before calling
        Handler or processing $text. No need to split undef if somehow Handler
        returned undef, etc. If the routine returns an empty arrayref,
        stage-marc-import will do fine.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit a423fcff42da05e9ebf9f2b4a2f192023346e93e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit f067450d8011fb0a27a28524bec359ffad4f2278)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 396ff22074d681d055539fa8928476fe4228a7be
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Aug 10 09:02:37 2017 -0400

    Bug 19049 [QA Followup] - Make plugin name first item in description
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit d8f6315b6d9b1c7145f6036b55b7927f6d6e6e48)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 5699df9deed09edbaa3db1087f3e453c28ac1091)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 96d5d2995cd56ee41b9f26e621f6903d823323d5
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Aug 10 13:02:23 2017 +0200

    Bug 19049: [Follow-up] Make sure that GetPlugins finds the plugin
    
    We have to mock_config the pluginsdir before Plugins is loaded, and
    we should pass an absolute path (not a relative one).
    If you did not install the test to_marc plugin, this test would fail.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Verified patch is compatible with original KitchenSink to_marc plugin
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0987b135ea0bb8fbd4fc39643b19715dc6e3a1c8)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 3bbb89c57181c113d64ec7649195de30b52d0806)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 9f06cd63b54d39510b230227bca52530d25fc221
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Aug 8 14:51:41 2017 +0200

    Bug 19049: Testing RecordsFromMarcPlugin with a to_marc plugin
    
    This patch adds a simple to_marc plugin in t/Koha/Plugin that is used
    in the added subtest in ImportBatch.t.
    
    Test plan:
    [1] Run t/db_dependent/ImportBatch.t
    [2] Copy the to_marc test plugin from t to your plugin directory.
        Under Debian packages, you should do something like:
        mkdir -p /var/lib/koha/master/plugins/Koha/Plugin/
        cp [yourclone]/t/Koha/Plugin/MarcFieldValues.pm /var/lib/koha/master/plugins/Koha/Plugin/
    [3] Check if you see this plugin on plugins/plugins-home.pl
    [4] Create a text file with some fields like:
        (Note: The plugin needs an empty line between both "records".)
        100,a = Test Author 1
        245,a = Title One
    
        100,a = Author 2
        245,a = Title Two
    [5] Go to stage-marc-import.pl. Upload the created file. Select the plugin
        in the format combo and proceed. Did you create two records ?
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 83f60adbab8e96f0f14ec547029582623ac3a068)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit c6e3f2ac0575849a0b48170506a4986a50ac8bf1)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 8ef1bf53cfa0c7ee74bd157c39adc68b5e1121c7
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Aug 7 21:24:48 2017 +0200

    Bug 19049: Fix regression on stage-marc-import with to_marc plugin
    
    Bug 12412 added the use of to_marc plugins allowing arbitrary file formats
    in stage-marc-import (as long as the plugins can handle them). The feature
    was not very visible in the code, and when bug 10407 added the marcxml
    format, it made some changes that broke the use of to_marc.
    
    This patch restores the functionality by:
    [1] Adding a sub RecordsFromMarcPlugin to ImportBatch.pm, specifically
        addressing the conversion from arbitrary formats to MARC::Record.
        The original to_marc interface is used: pass it the file contents,
        and it returns a string consisting of a number of MARC blobs separated
        by \x1D.
        Consequently, the call of to_marc is removed from routine
        BatchStageMarcRecords where it did not belong. The to_marc_plugin
        parameter is removed and two calls are adjusted accordingly.
    [2] Instead of a separate combo with plugins, the format combo contains
        MARC, MARCXML and optionally some plugin formats.
    [3] The code in stage-marc-import.pl now clearly shows the three main
        format types: MARC, MARCXML or plugin based.
    
    Note: This patch restores more or less the situation after bug 12412, but
    I would actually recommend to have the to_marc plugins return MARC::Record
    objects instead of large text strings. In the second example I added a
    to_marc plugin that actually converts MARC record objects to string format,
    while RecordsFromMarcPlugin reconverts them to MARC::Records.
    
    Test plan:
    See second patch.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit d24568b67256fab79b42ead54302c76d1c9653d7)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 4dd020a3019cd7e2b357153ec737b15eea95f671)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 4e59f94961cd39d079bcd3664a8e5f7fa479c156
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Aug 7 13:50:32 2017 -0300

    Bug 19053: Keep auto_renew flag if a confirmation is needed
    
    If an item is checked out with the auto renewal flag and a confirmation
    is needed (holds exist, past due date, etc.) the auto renewal flag will
    get lost.
    
    Test plan:
    - Check an item out and specify a past due date
    - Confirm the checkout on the confirmation screen
    => Without this patch the checkout is not marked as auto renewal
    => With this patch applied the auto renewal flag will be set to the
    checkout
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 3808dbc1d22b3adc43a09ba7ce00aaca01f95f5a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 8f3a7d800271cb2611de0cb369e907b16c30fb0b)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 35bbde509361ebccbf5205083b17ed650d41eeb1
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Aug 7 16:07:40 2017 -0300

    Bug 18624: Minor refactoring to ease testing
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit ff41b87302c1b242f9edd7b2e8c253bd18b57ac1)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 4c50a19ab920b488193d78ee18d89bb143ddae4a)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 98631a3e7617416acbcfdff51451367789307556
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Jul 7 17:55:50 2017 +0000

    Bug 16976 - Unit tests
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 07c0d968b70421852ac4915633fa7f3cbd0d18cd)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit a0bc776e67569b83dc3d5bc47069ceb1408badb2)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 333ff8c73d90e59f14e4ee95b3c414f36837c249
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Jun 16 06:36:22 2017 -0400

    Bug 16976 - Authorities searches with double quotes gives ZOOM error 20003 [Alternate]
    
    I dug into this a little bit, it seems the issue is that we were double
    processing the query because of an extra call to
    C4::AuthoritiesMarc::SearchAuthorities
    
    I think we can simply remove this call
    
    To test:
    1 - Perform an authority search for a value that returns results
    2 - Wrap it in quotes and search
    3 - 'Internal server error'
    4 - Apply patch
    5 - Search with quotes succeeds
    
    https://bugs.koha-community.org/show_bug.cgi?id=16796
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 9c8a04acb05466356fec8e9d6d13183295719c7d)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 39a2f6421e3d0b2c415ad9abc655193357e24328)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 61d79bc04b2beecf708a352933b6a69dab414be0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Aug 14 10:26:48 2017 -0300

    Bug 18331: POST_CHOMP everywhere!
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 3c6168d37436b7312e130f796d47271ff2de77cf)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 4c86b575b2ef09cceefa9a2718053e45a71c2b25)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 00fa408221776634ecd1066b9e67349ff2d535dd
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Tue Aug 8 08:23:57 2017 +0000

    Bug 18331: Followup - fix path to orders_by_budget csv header
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 14484ba4234fd1cbb925b5f3a4844da863c65d5a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit c6a3c7c39babf64ad916650277ab752e54072916)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 82a8f296827edf58319213640979075b60b79fe3
Author: Lee Jamison <ldjamison at marywood.edu>
Date:   Fri Aug 4 19:27:22 2017 +0000

    Bug 18331: Followup - Fix CSV export (once and for all!)
    
    Follow-up on Comment 21 to correct the empty_line.inc
    include in basket.tt
    
    https://bugs.koha-community.org/show_bug.cgi?id=18331
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 2ee4e0ac381ed23fa23b1117725b2f6a0e0db4de)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit ad4c173bca27de2b05a1c47a3977212f72654c40)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 4fa59dbd8e7cabf92fb7d470d4ec385480f0184a
Author: Marc V?ron <veron at veron.ch>
Date:   Thu Aug 3 17:50:30 2017 +0200

    Bug 18331: Force tt to insert newline to empty_line.inc
    
    See end of comment #4 and IRC:
    http://irc.koha-community.org/koha/2017-08-03#i_1958062
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit a10e5383016a5cb4117719ac858cbe02a53e457b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit c4e608d29954195f01ea170ff06d7e8da4814707)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 9cefbaf964772848cc338a910d55c558bf579d1a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jun 12 17:04:47 2017 -0300

    Bug 18331: Fix CSV export (once and for all!)
    
    I am going to try and explain the problem here in order to make it a
    have-to-read for next changes.
    
    There are several things to test when and most of the time we break
    something when we try to fix something else.
    
    You have to test different CSV export, not only one. There are not all
    processed the same way. For instance acqui/csv/basket.tt does not
    contain any strings to translate and the translate script will copy the
    original file as it.
    But reports/csv/orders_by_budget.tt will not! Indeed it contains "TOTAL"
    which will be translated. The generated tt file for the translated
    language will remove all the carriage returns! That's why we cannot rely
    on TT for newlines (contrary to bug 16914 assumption).
    
    There are two possible methods:
    1/ Fix the translate script
    => Hum... nope
    2/ Remove all carriage returns and make them explicit by including an
    file that only contains 1 carriage return
    
    This second method is implemented in this patch.
    
    How it works: Use the PRE_CHOMP "[%-" and POST_CHOMP "-%]"
    (http://www.template-toolkit.org/docs/manual/Config.html#section_PRE_CHOMP_POST_CHOMP)
    to remove all the newlines that could be added by TT in the original
    (en) files. Then include the new_line.inc to add a new line.
    That way original and translated files will behave the same way.
    The BLOCK in the csv_headers avoid to have the newlines added, in any
    cases. For instance: by default we will have an empty line at the end of
    the headers, but the translated headers will not have it.
    
    Test plan:
    At least 2 signoffs will be needed, please test carefully!
    You will need to generate CSV with at least 2 entries!
    Test with the non-translated interface (en) and with the language you
    want. To test with a translated language you will *have to*:
    - cd misc/translator
    - perl translate update LANG
    - manually edit the po file, remove the fuzzy tags, correctly translate
    the string (do not forget the additional %s in the headers)
    - perl translate install LANG
    1/ Export basket and basketgroup as CSV
    2/ Export late orders as CSV
    3/ Export items (from the item search) as CSV
    4/ Export the 2 reports "Orders by fund" and "Cash register" as CSV
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 8403799c7212349bee70090249e3425afd62423b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 5b1c9cd3f27d377ddee5635f32fd1a3e2626409c)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

Summary of changes:
 C4/ImportBatch.pm                                  |   53 +++++++++---
 Koha/SearchEngine/Elasticsearch/QueryBuilder.pm    |   27 +++---
 Koha/SearchEngine/Zebra/QueryBuilder.pm            |    1 -
 circ/circulation.pl                                |    1 +
 .../prog/en/includes/csv_headers/acqui/basket.tt   |    2 +-
 .../en/includes/csv_headers/acqui/basketgroup.tt   |    2 +-
 .../en/includes/csv_headers/acqui/lateorders.tt    |    2 +-
 .../includes/csv_headers/catalogue/itemsearch.tt   |    2 +-
 .../csv_headers/reports/cash_register_stats.tt     |    2 +-
 .../csv_headers/reports/orders_by_budget.tt        |    2 +-
 .../intranet-tmpl/prog/en/includes/empty_line.inc  |    1 +
 .../prog/en/modules/acqui/csv/basket.tt            |    9 +-
 .../prog/en/modules/acqui/csv/basketgroup.tt       |   10 ++-
 .../prog/en/modules/acqui/csv/lateorders.tt        |   10 ++-
 .../prog/en/modules/catalogue/itemsearch_csv.tt    |    8 +-
 .../prog/en/modules/circ/circulation.tt            |    1 +
 .../en/modules/reports/csv/cash_register_stats.tt  |   16 ++--
 .../en/modules/reports/csv/orders_by_budget.tt     |   14 ++--
 .../prog/en/modules/tools/stage-marc-import.tt     |   20 +----
 misc/stage_file.pl                                 |    2 +-
 t/Koha/Plugin/MarcFieldValues.pm                   |   86 ++++++++++++++++++++
 t/Search/Zebra/QueryBuilder.t                      |   38 +++++++++
 t/db_dependent/ImportBatch.t                       |   43 +++++++++-
 tools/stage-marc-import.pl                         |    8 +-
 24 files changed, 279 insertions(+), 81 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/empty_line.inc
 create mode 100644 t/Koha/Plugin/MarcFieldValues.pm
 create mode 100644 t/Search/Zebra/QueryBuilder.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Sep 10 11:24:29 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 10 Sep 2017 09:24:29 +0000
Subject: [koha-commits] main Koha release repository branch 16.11.x updated.
	v16.11.11-1-17-gd2b84a8
Message-ID: <E1dqyTd-0004fn-4V@git.koha-community.org>

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.11.x has been updated
       via  d2b84a87fbeae550a9dbc9800202813daf1affd8 (commit)
       via  e2b85aa9b96410dab6ecf5c1736e295c9cc07894 (commit)
      from  293d05d0af9817e7d0b31bbb19684494f259714a (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 d2b84a87fbeae550a9dbc9800202813daf1affd8
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Wed Jun 7 11:29:46 2017 +0200

    Bug 18741: Fix loading of SQL files in web installer
    
    Test plan:
    1. Start a normal install using the web installer
    2. When asked to select data to load, verify that
       'message_transport_types' is checked, and check some optional data
       files
    3. Continue the install to the end
    4. Verify that message_transport_types is not empty, and that the
       optional data you checked is there
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit e2b85aa9b96410dab6ecf5c1736e295c9cc07894
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Fri May 5 15:00:05 2017 +0200

    Bug 18551 - Hide with CSS dynamic elements in member search
    
    In member search page, the result table is in Ajax so fully managed by Javascript. There is also a yellow dialog message prepared in HTML.
    
    Thoses elements are hidden by JS code : ie $("#patron_list_dialog").hide().
    
    The problem is that the static page is first loaded an displayed then the JS code runs an hides the elements.
    On a low performance computer, this action is visible and looks like there is a blinking yellow message.
    
    I propose to hide with CSS so that thoses elements are not displayed in static page and are there shown in dynamic JS code.
    
    Test plan :
    Check display is unchanged :
    - Go to home page /cgi-bin/koha/members/members-home.pl
    - Perform patron search from header search box
    - Perform patron search by clicking on a letter
    - Perform patron search from filters (left of results table)
    - Select a patron and add it to a list => you see the yellow message
    
    Yellow message does no longer appear with this patch.
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Philippe <philippe.audet-fortin at inlibro.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 5cc536c68b221823f4335b5b5db1108521f88a71)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

Summary of changes:
 installer/install.pl                                      |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 14:47:22 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 12:47:22 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-25-g1c82876
Message-ID: <E1drkb4-0002W6-RL@git.koha-community.org>

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, 17.05.x has been updated
       via  1c8287632ea36e6d2a8ade922fe129f5f792d6d3 (commit)
      from  bfdaf1136d86194102f247de58069caa5febb539 (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 1c8287632ea36e6d2a8ade922fe129f5f792d6d3
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jul 10 14:15:09 2017 +0200

    Bug 18921: Resolve a few warnings in C4/XSLT.pm
    
    Resolves warnings like:
    
    Use of uninitialized value in hash element at C4/XSLT.pm line 262.
    Use of uninitialized value in numeric eq (==) at C4/XSLT.pm line 267.
    Use of uninitialized value $status in concatenation (.) or string at C4/XSLT.pm line 300.
    
    Note: Line numbers are not exactly the same anymore.
    
    Test plan:
    [1] Enable XSLT view in OPAC
    [2] Without this patch, you will probably have some of these warnings when
        doing some opac searches.
    [3] Apply this patch. Check the logs again.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 5f989a81dff29db78620057d70ed864b32486bc0)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/XSLT.pm |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 14:53:54 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 12:53:54 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-26-g0f9175c
Message-ID: <E1drkhO-0002ex-Ab@git.koha-community.org>

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, 17.05.x has been updated
       via  0f9175c0b26e9e8d65bf39dab80d99e5d7455346 (commit)
      from  1c8287632ea36e6d2a8ade922fe129f5f792d6d3 (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 0f9175c0b26e9e8d65bf39dab80d99e5d7455346
Author: Marc V?ron <veron at veron.ch>
Date:   Fri Aug 4 10:52:13 2017 +0200

    Bug 18649: Translatability: Get rid of tt directive in translation for admin/categories.tt and onboardingstep2.tt
    
    New patch without trailing IF construction in tt directives as
    requested in comment #28
    
    To test: Verify that translation tool no longer shows tt directives as
    described in comment #1
    
    New patch, needs SO.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 79338bde3e01708fe331a54745f45c620c121805)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt      |    6 +++++-
 .../intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt  |    6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 14:56:16 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 12:56:16 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-27-g4d42774
Message-ID: <E1drkjg-0002ok-NO@git.koha-community.org>

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, 17.05.x has been updated
       via  4d427740196bb0a9bcfe80787af8cdf769c06b76 (commit)
      from  0f9175c0b26e9e8d65bf39dab80d99e5d7455346 (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 4d427740196bb0a9bcfe80787af8cdf769c06b76
Author: Marc V?ron <veron at veron.ch>
Date:   Mon May 22 21:09:06 2017 +0200

    Bug 18652: Get rid of tt directive in translation for uncertainprice.tt
    
    Translation tool shows toe following for ncertainprice.tt
    0; url=[% scriptname %]?booksellerid=[% booksellerid %]
    
    This patch fixes it.
    
    To test:
    - Apply patch
    - Verify that code change makes sense
    - Verify that Home > Acquisitions > [vendor] > Uncertain prices for [vendor]
      works as before
    
    - Additional test (for a langunage 'aa-AA')
      perl translate create aa-AA
      verify that line 41 no longer appears in aa-AA-staff-prog.po
    
    Amended to switch from BLOCK to a template variable, see comment #5
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 2ee82801c7a8686523f9c5e95b0f43d44e52e4ab)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 15:14:34 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 13:14:34 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-28-g036b317
Message-ID: <E1drl1O-00037R-0u@git.koha-community.org>

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, 17.05.x has been updated
       via  036b317c0c0e96b0eb344d767cca7f87da4fb875 (commit)
      from  4d427740196bb0a9bcfe80787af8cdf769c06b76 (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 036b317c0c0e96b0eb344d767cca7f87da4fb875
Author: Marc V?ron <veron at veron.ch>
Date:   Tue May 23 17:09:49 2017 +0200

    Bug 18660: Translatability: Get rid of template directives [%% in translation for patroncards-errors.inc
    
    Translation for koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc
    contains a lot of (partial) template directives like:
    %%]%s %sLayout: [%%
    
    This patch fixes it
    
    To test:
    - Verify that code changes make sense
    - Apply patch
    - Create a translation (cd misc/translator , then: perl translate create aa-AA
    - Verify that in po/aa-AA-staff-prog.po contains no fragments like %%] or [%%
      for patroncards-errors.inc
    - Try to get an error: Try a link like
      http://[YOUR SERVER]/cgi-bin/koha/patroncards/create-pdf.pl?batch_id=1&template_id=999&layout_id=999&start_card=1
      ...where template_id and layout_id do not exist
    
    (Amended for comment #2 2017-06-05 mv)
    (Amended for comment #6 2017-08-02 mv)
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 7e39bbc61aedd6383f4d6a1b4728711c6922e877)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../prog/en/includes/patroncards-errors.inc        |   58 ++++++++++++--------
 1 file changed, 34 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 15:18:33 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 13:18:33 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-29-gb9ff28f
Message-ID: <E1drl5F-0003D1-Q5@git.koha-community.org>

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, 17.05.x has been updated
       via  b9ff28f719cb17d37e5eaecc4fb09b9032cc38e5 (commit)
      from  036b317c0c0e96b0eb344d767cca7f87da4fb875 (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 b9ff28f719cb17d37e5eaecc4fb09b9032cc38e5
Author: Marc V?ron <veron at veron.ch>
Date:   Mon Jun 12 07:48:57 2017 +0200

    Bug 18778 - Translatability: Get rid of tt directive in translation for item-status.inc
    
    The file opac-tmpl/bootstrap/en/includes/item-status.inc exposes a template directive where translators should not be confronted with.
    
    "%s %s [%%#- This include takes two parameters: an item structure and an "
    "optional loan (issue) structure. The issue structure is used by course "
    "reserves pages, which do not use an API to fetch items that populates item."
    "datedue. -%%] %s %s %s %s "
    
    This patch fixes new lines inside a tt directive (comment).
    It is merely a string patch.
    
    To test:
    Verify that the code changes make sense.
    (Bonus test: create a new language 'aa-AA', verify that line above does not
    show up in aa-AA-opac-bootstrap.po)
    
    NOTE: Followed test plan similar to bug 18776 comment 3.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit c8551645d5bdd3e6fb5b7e03280521a2fbaef636)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 15:21:25 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 13:21:25 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-30-gafb2cb0
Message-ID: <E1drl81-0003Iz-NQ@git.koha-community.org>

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, 17.05.x has been updated
       via  afb2cb0c74b6a137652ec1a2e96fc480a5a50f96 (commit)
      from  b9ff28f719cb17d37e5eaecc4fb09b9032cc38e5 (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 afb2cb0c74b6a137652ec1a2e96fc480a5a50f96
Author: Serhij Dubyk {?????? ?????} <serhijdubyk at gmail.com>
Date:   Tue Aug 22 17:19:32 2017 +0300

    Bug 17827 - Untranslatable "by" in MARC21slim2intranetResults.xsl
    
    Signed-off-by: Serhij Dubyk {?????? ?????} <serhijdubyk at gmail.com>
    
    The "by" after the title was not translatable in the result
    lists of the intranet. This patch fixes it by removing
    a comment, that caused a problem with the translation
    scripts.
    
    To test:
    Test:
    
    Before this patch in file en-GB-marc-MARC21.po present next paragraph:
    
    msgid "by "
    msgstr " by "
    
    According string "by " in the file MARC21slim2intranetResults.xsl can not be translated (in other languages).
    
    After applying this patch performed next command:
    cd /usr/share/koha/misc/translator
    sudo env KOHA_CONF=/etc/koha/sites/mykohainstance/koha-conf.xml PERL5LIB=/usr/share/koha/lib perl -I /usr/share/koha/lib "./translate" update
    
    Now in the file en-GB-marc-MARC21.po present the following (modified) paragraph:
    
    msgid "by "
    msgstr " by "
    
    https://bugs.koha-community.org/show_bug.cgi?id=17827
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit d5ea914f4dc41f78dbb3a59f894f6ecbb9a1afa4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 15:56:04 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 13:56:04 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-31-g4b71c92
Message-ID: <E1drlfY-0004DR-RK@git.koha-community.org>

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, 17.05.x has been updated
       via  4b71c9239708cd4d60190ed907fec03d1f8b08bc (commit)
      from  afb2cb0c74b6a137652ec1a2e96fc480a5a50f96 (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 4b71c9239708cd4d60190ed907fec03d1f8b08bc
Author: David Cook <dcook at prosentient.com.au>
Date:   Thu Jul 27 11:58:28 2017 +1000

    Bug 18898 - Some permissions for Reports can be bypassed
    
    If you manually visit the following links when you only have
    permission to run reports, you'll still be able to access the ability
    to create and edit reports:
    
    /cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL
    /cgi-bin/koha/reports/guided_reports.pl?phase=Edit%20SQL
    
    This patch ties these 2 unaccounted for phases to the create_reports
    permission.
    
    With patch, issue no longer can be reproduced.
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 2fdfbaf0ddbf214c0efb9a3a3c2595a54517f795)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 reports/guided_reports.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 16:04:43 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 14:04:43 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-32-gd179da5
Message-ID: <E1drlnv-0004JY-5z@git.koha-community.org>

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, 17.05.x has been updated
       via  d179da572b1d6bd7066d96f494aa805b86b92ae1 (commit)
      from  4b71c9239708cd4d60190ed907fec03d1f8b08bc (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 d179da572b1d6bd7066d96f494aa805b86b92ae1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Jul 6 18:10:10 2017 -0300

    Bug 18906: Display all funds the logged in user can use
    
    There are complex conditions to know if a librarian can use a fund, we
    cannot do that with a SQL query, we need to use C4::Budgets::CanUserUseBudget
    
    When this patch is applied then all funds are visible to both
    superlibrarian patrons and patrons with all acq permissions
    
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 19a7b498e1f4355ab1e4ee0adb5db299613f3f5c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 admin/aqbudgets.pl |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 16:06:59 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 14:06:59 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-35-g92b08a2
Message-ID: <E1drlq7-0004Ly-3J@git.koha-community.org>

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, 17.05.x has been updated
       via  92b08a23e3b2c001d208b82b6ffee2af756ca51f (commit)
       via  1865db52bbf9413574c22ee2c9180137ac357918 (commit)
       via  aca614cd95b32d2953927e8e3e908bc1248b541c (commit)
      from  d179da572b1d6bd7066d96f494aa805b86b92ae1 (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 92b08a23e3b2c001d208b82b6ffee2af756ca51f
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Thu Jul 6 08:48:18 2017 +0200

    Bug 18900: wrong number format in receiving order
    
    Bug 18471 added number formating in order receive.
    
    I found a bug generated by this.
    Koha::Number::Price defines methods to (un)format price depending on CurrencyFormat syspref.
    The bug is that for CurrencyFormat US, some params are not defined in this module so there are retrieved from system locale. If system locale is not en_US, the params will be wrong. For example fr_FR will define ',' as decimal and so saved unit price is divided by 1000.
    
    To recreate:
    - On a server with locale 'fr_FR'
    - With Plack mode
    - Set CurrencyFormat on 'US'
    - Open a basket
    - Place an order for an item
    - Close basket
    - Receive order with changing 'Actual Cost' to '1,234'
    - Note the 'Actual Cost' is now '1.23'
    - Run unit test t/Number/Price.t without and with patch
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit e35903574ce666bca32eb4676f311b99bb268ec2)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 1865db52bbf9413574c22ee2c9180137ac357918
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Aug 9 12:01:17 2017 -0300

    Bug 18900: (QA followup) Make tests conditional to locale existence
    
    It is important to highlight that tests have been skipped instead of having them pass
    on the absence of the required fr_FR.UTF-8 locale installed on the system.
    
    This patch does that check and effectively skips them.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 61f2ec769073709be3b688654ec355b3f4fbe522)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit aca614cd95b32d2953927e8e3e908bc1248b541c
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Thu Jul 6 08:44:51 2017 +0200

    Bug 18900: add UT to Number/Price.t
    
    This patch adds unit tests to t/Number/Price.t in order to valid the problem.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 91dee226cdd089353dc71e559aa9e0b34fddf72e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 Koha/Number/Price.pm |    3 +++
 t/Number/Price.t     |   22 +++++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 16:08:53 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 14:08:53 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-37-g906d602
Message-ID: <E1drlrx-0004PU-JM@git.koha-community.org>

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, 17.05.x has been updated
       via  906d602c1f5150edcb933846ec28a8c03f425fe1 (commit)
       via  2c90bd3dd184a46060dc9b7ee185dc91521ec1d1 (commit)
      from  92b08a23e3b2c001d208b82b6ffee2af756ca51f (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 906d602c1f5150edcb933846ec28a8c03f425fe1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 9 12:59:20 2017 -0300

    Bug 19067: Test Makefile.PL mapping
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 19eb17c7894c4d2d53ecfc1ad4e417aa86ab9410)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 2c90bd3dd184a46060dc9b7ee185dc91521ec1d1
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Aug 9 12:27:00 2017 -0300

    Bug 19067: Map clubs/ into INTRANET_CGI_DIR in Makefile.PL
    
    This patch adds the required entry in Makefile.PL so the clubs/ dir is correctly installed
    during the make install step.
    
    To test:
    - Run:
      $ cd kohaclone
      $ perl Makefile.PL
    - Follow any install method and options
    - Run
      $ make
      $ ls blib/INTRANET_CGI_DIR/ | grep clubs
    => FAIL: No clubs dir
    - Run:
      $ make clean
    - Apply this patch
    - Run:
       $ perl Makefile.PL
    - Follow any install method and options
    - Run
      $ make
      $ ls blib/INTRANET_CGI_DIR/ | grep clubs
    => SUCCESS: The clubs/ dir is correctly picked for inclussion in the intranet cgi dir
    - Sign off :-D
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit e57b3a6c4d9bb6319f038909832281dd4a9e39e5)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 Makefile.PL                  |    1 +
 t/{Breeding.t => Makefile.t} |   30 ++++++++++++++++++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)
 copy t/{Breeding.t => Makefile.t} (54%)
 mode change 100755 => 100644


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 16:15:37 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 14:15:37 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-38-gc37b2f3
Message-ID: <E1drlyT-0004uk-7T@git.koha-community.org>

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, 17.05.x has been updated
       via  c37b2f31d512fe200da7410199d311171306b8b0 (commit)
      from  906d602c1f5150edcb933846ec28a8c03f425fe1 (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 c37b2f31d512fe200da7410199d311171306b8b0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Aug 22 16:41:46 2017 +0200

    Bug 19163: Critical typo in stage-marc-import process
    
    Template says ISO2709 but script wants MARC or MARCXML..
    Slipped in with bug 19049.
    Trivial but critical fix.
    
    Test plan:
    Import a MARC file.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    I picked this fix because I think MARC is always ambiguous. ISO2709
    clearly denotes the serialization format used.
    
    Signed-off-by: Liz Rea <liz at catalyst.net.nz>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit af791d83e435587494fa04a45375f48a3e2ad236)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 tools/stage-marc-import.pl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 16:18:03 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 14:18:03 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-39-gc87b963
Message-ID: <E1drm0p-0004yK-Pn@git.koha-community.org>

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, 17.05.x has been updated
       via  c87b963818076a58661922116893ff052b2d76a9 (commit)
      from  c37b2f31d512fe200da7410199d311171306b8b0 (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 c87b963818076a58661922116893ff052b2d76a9
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Aug 2 10:15:10 2017 +1200

    Bug 18046: CAS logout infinite redirect
    
    To test (You need a CAS server and CAS configured in Koha)
    
    1/ Login using CAS in Koha
    2/ Logout in Koha
    3/ Notice you get redirected again and again
    4/ Apply patch
    5/ Login with CAS, then logout
    6/ Notice logout works, but no longer infinitely redirected
    
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Patch has been in production use for several months
    on several instances. Fixes a critical bug.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Looks like a typical workaround, but evidently works.
    Not tested with CAS.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 13ca4962068b184f803b6588e53e39209a77f2b6)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/Auth_with_cas.pm |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 16:26:57 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 14:26:57 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-40-gf8a6f62
Message-ID: <E1drm9R-00058r-HR@git.koha-community.org>

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, 17.05.x has been updated
       via  f8a6f62d45b556251820f18f45bc4a3661af142e (commit)
      from  c87b963818076a58661922116893ff052b2d76a9 (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 f8a6f62d45b556251820f18f45bc4a3661af142e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Aug 30 09:37:48 2017 -0400

    Bug 19205 - Pay selected fine generates 500 error
    
    Using the pay selected option from the borrowers account, to pay for one specific fine among other gives a 500 error, despite the payment going through.
    
    Test Plan:
    1) Add two fines using the Create manual invoice function.
    2) Select one fine and "pay selected".
    3) Pay a part of the amount.
    4) Note error
    5) Apply this patch
    6) Repeat steps 1-3
    7) No error!
    
    Signed-off-by: Andreas Hedstr?m Mace <andreas.hedstrom.mace at sub.su.se>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 86e8612c020cea44be123be45f2e503af38ef98b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 members/paycollect.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 16:40:25 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 14:40:25 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-41-g6431bf5
Message-ID: <E1drmMT-0005Zg-Hp@git.koha-community.org>

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, 17.05.x has been updated
       via  6431bf5d9a20737bcd6a8c4ac4426c5ba1bffd80 (commit)
      from  f8a6f62d45b556251820f18f45bc4a3661af142e (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 6431bf5d9a20737bcd6a8c4ac4426c5ba1bffd80
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Tue Aug 29 04:51:40 2017 +0000

    Bug 19194: Check itemtype is defined when receiving an order
    
    To test:
    1) Find a record with an item that has no itemtype (or remove the
    itemtype of an item)
    2) Go to Acquisitions -> Find a vendor or make a new one -> create a new
    basket
    3) Add the record from Step 1 to your basket
    4) Close the basket
    5) Go back to the vendor and click 'Receive shipments'
    6) Put in an invoice number, click Next
    7) Click the Receive link for your item
    8) Confirm you see an internal server error
    9) Apply the patch and refresh the page
    10) The error should be gone and behaviour should continue as expected
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 51a65731c0fa15c37351ce6bc478fa6dc63fc64f)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 acqui/orderreceive.pl |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 16:44:03 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 14:44:03 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-42-gdcda5a4
Message-ID: <E1drmPz-0005eJ-H3@git.koha-community.org>

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, 17.05.x has been updated
       via  dcda5a4dc52eebe621ccfd491eddbb162c476ebb (commit)
      from  6431bf5d9a20737bcd6a8c4ac4426c5ba1bffd80 (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 dcda5a4dc52eebe621ccfd491eddbb162c476ebb
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Aug 30 10:35:03 2017 -0400

    Bug 19208 - Pay select option doesn't pay the selected fine
    
    The "Pay selected" option on the Fines tab in the borrower account page doesn't work as intended.
    The fine on top of the list gets the amount deducted, even if another fine is choosen from the list.
    
    Test Plan:
    1) Create two or three fines, using the Create manual invoice function.
    2) Choose one of the fines (not the one on the top) and click Pay selected
    3) Pay a partial amount
    4) Go back to the Pay fines tab an notice that the fine you selected has not changed. Instead, either the top fine or the total (see attachment) has ben affected.
    5) Apply this patch
    6) Repeat steps 1-3
    7) Note the correct fine is paid
    
    Signed-off-by: Andreas Hedstr?m Mace <andreas.hedstrom.mace at sub.su.se>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 831d75d09c276f25f919cbdc16c8e4105fe8ddc9)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt |    2 --
 members/paycollect.pl                                         |    5 +----
 2 files changed, 1 insertion(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 16:46:30 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 14:46:30 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-43-g111ab4e
Message-ID: <E1drmSM-0005qH-Rb@git.koha-community.org>

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, 17.05.x has been updated
       via  111ab4e63257410bf7ca34e80e46675603072c36 (commit)
      from  dcda5a4dc52eebe621ccfd491eddbb162c476ebb (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 111ab4e63257410bf7ca34e80e46675603072c36
Author: Alex Sassmannshausen <alex.sassmannshausen at ptfs-europe.com>
Date:   Thu Aug 10 13:00:19 2017 +0200

    Bug 19073: (bug 15758 follow-up) Dereference correct value from Koha::Object.
    
    * tools/modborrowers.pl: Dereference 'branchcode' rather than
      'value'.
    
    Test Plan:
    - Carry out "Batch patron modification" with any number of patrons.
      + Change the library.
      + Hit Save.
    - The library will not have been updated.
    - Apply patch.
    - Run same modification.
    - The library will have been updated
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 8a328a20bf3a74268346104281688b2a81be80e6)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 tools/modborrowers.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 16:58:22 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 14:58:22 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-44-g1a50b44
Message-ID: <E1drmdq-00065Z-Ay@git.koha-community.org>

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, 17.05.x has been updated
       via  1a50b447d3d58b40d8f84e7c264f01abcb42a826 (commit)
      from  111ab4e63257410bf7ca34e80e46675603072c36 (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 1a50b447d3d58b40d8f84e7c264f01abcb42a826
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Sep 4 12:06:56 2017 -0300

    Bug 18927: Use fully qualified subroutine names in C4::Items
    
    rebuild_zebra.pl fails in some conditions (perl version?)
    I do not recreate but it has been reported that reindex fails with:
      error retrieving biblio 94540 at /usr/share/koha/bin/migration_tools/rebuild_zebra.pl line 683, <DATA> line 751.
    
    To fix it we can use fully qualified subroutine names for:
      GetMarcFromKohaField
      GetMarcBiblio
      GetBiblionumberFromItemnumber
      TransformKohaToMarc
      GetFrameworkCode
    
    Test plan:
    Confirm the rebuild_zebra script still works correctly after this patch
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 2671eb2f93340e8fb3c794cff918d86c526cc47f)

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

Summary of changes:
 C4/Items.pm                           |   30 +++++++++++++++---------------
 misc/migration_tools/rebuild_zebra.pl |    8 ++++----
 2 files changed, 19 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 17:01:12 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 15:01:12 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-46-g9600158
Message-ID: <E1drmga-00068Q-Id@git.koha-community.org>

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, 17.05.x has been updated
       via  960015819e0c19ef85c458d0bdaec8a24cd86dc3 (commit)
       via  68bbe3fb0d8238bf651d335d5a8dbaf72156f3ee (commit)
      from  1a50b447d3d58b40d8f84e7c264f01abcb42a826 (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 960015819e0c19ef85c458d0bdaec8a24cd86dc3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Sep 7 14:15:20 2017 -0300

    Bug 19214: prevent crash if club_template_field is called in list context
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 6a9fafe3090333647244db99ccd39d53e51b781c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 68bbe3fb0d8238bf651d335d5a8dbaf72156f3ee
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Wed Aug 30 23:54:56 2017 +0000

    Bug 19214: Prevent crash if ->club or ->patron is called in list context
    
    To test:
    1) Create a club template and a club.
    2) Add a user to the club
    3) Log in to the OPAC as that user
    4) Go to 'your summary' and click the Clubs tab
    5) Notice clubs do not load and a warn shows:
    Template process failed: undef error - Cannot use "->find" in list
    context at /home/vagrant/kohaclone/Koha/Club/Enrollment.pm line 62.
    6) Go to the staff side and go to the member page of that user
    7) Go to 'details' and click the Clubs tab
    8) Notice clubs do not load and a warn shows:
    Template process failed: undef error - Cannot use "->find" in list
    context at /home/vagrant/kohaclone/Koha/Club/Enrollment.pm line 71.
    9) Apply patch
    1) Repeat steps 4-7, confirming the errors do not show and clubs info
    loads correctly
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 594c48fb5b2c03f5d638d7115e42820294e32343)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 Koha/Club/Enrollment.pm |    4 ++--
 Koha/Club/Field.pm      |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 17:13:10 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 15:13:10 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v17.05.00-586-g5400795
Message-ID: <E1drmsA-0006FO-7T@git.koha-community.org>

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, master has been updated
       via  5400795a6651adc021801052fa0186747983b587 (commit)
       via  6eebfe5fe02be3c2ab3285b58cf50fac980cb302 (commit)
       via  4efe251f353cb9eddd302b6214e1f4392620b395 (commit)
       via  3d07449358010392b111a674c3606cdfe2cbe47e (commit)
       via  d0c372c5fa0e867d346b342ae470b31c33d52b26 (commit)
       via  87773a6d661f122a52b34f6c67255424c335e297 (commit)
       via  434162c1756b16b5fc715fd1cb762aaf8aff7b2b (commit)
       via  db35492c795540d6c3b10f7cba18698aeb84a816 (commit)
       via  3e631f418a3fafa485b650f0975ee0d06e366884 (commit)
       via  dc60c344768540c5e02c8e46e8ae43f7921d252a (commit)
       via  562435e767c99670dd9fb8935a2ed483b7a61930 (commit)
       via  ac653bc7cec4e2ca1f8653efff4a9c44f4255540 (commit)
       via  f45fc4d10b84dfbd8040d12484553db8c87ec45a (commit)
       via  15dee475180ac362e182e1708d1c8b1b1e25e635 (commit)
       via  ca8f8b4cd91fac4acb6e2338720b8e0a82bce0b0 (commit)
       via  7e222bb0796196f1e466b73d909fd28d529cab75 (commit)
       via  35e3de845c591958d66c6602940453f2a803a7ee (commit)
       via  f8502b0d197bab4b4966e9e02253d30f7fcf29f8 (commit)
       via  99e691feee5ef29bbc9d24a916fc4aa2fab6bba6 (commit)
       via  6ae69d27815dc01ab515b6d8f0239ef5fe59251c (commit)
       via  5a64723e6d3d21b3e0d9302b273b6fbb43c969af (commit)
       via  0ed469525fe16e36663c1f5266568beb5e27672d (commit)
       via  133e25c56ac79e0b88b89e3b749df338e63a93d0 (commit)
       via  4d223bdc6156fab0667867f3990854fddfab5684 (commit)
       via  889fabe9f28f3b6ef35fc36e73b12652f258510c (commit)
      from  b4653629f63d410326036cef5aa8a70c55d17f45 (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 5400795a6651adc021801052fa0186747983b587
Author: Dominic Pichette <dominic at inlibro.com>
Date:   Tue Sep 12 10:13:58 2017 -0400

    Bug 18584 - removed white space in C4/Accounts.pm
    
    Test Plan:
        1-go to C4/Accounts.pm
        2-there should not be a trailing space at line 279.
    
    Signed-off-by: Dominic Pichette <dominic at inlibro.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 6eebfe5fe02be3c2ab3285b58cf50fac980cb302
Author: Jon Knight <J.P.Knight at lboro.ac.uk>
Date:   Mon Aug 21 15:04:20 2017 +0000

    Bug 19068: Add quantity field to the opac suggestions form
    
    This enhancement just exposes the quantity field to the OPAC suggestions
    form to permit the end user to enter this if they wish.  The librarians
    can of course override this quantity when they process the suggestion.
    
    Test Plan (assuming using kohadevbox VM):
    1) apply patch and turn on purchase suggestions
    2) Go to http://localhost:8080/cgi-bin/koha/opac-suggestions.pl?op=add
    and notice that there is now a quantity field available.
    3) Make a purchasing suggestion using this form, including a quantity.
    4) Log in as a member of library staff and go to Home ? Acquisitions ?
    Suggestions
    5) Confirm that the previously entered suggestion is there, and that the
    correct quantity appears in the "Acquisition information" section.
    6) Edit the purchasing suggestion, change the quantity, save it and
    check that the new quantity appears in the suggestion.
    
    I've popped an ID attribute of "opac-suggestion-quantity" to the
    surrounding <li> so that CSS can easily make this optional field
    disappear (as suggested by cait on IRC).
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 4efe251f353cb9eddd302b6214e1f4392620b395
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Sep 6 11:23:10 2017 -0300

    Bug 12346: Display the correct number of pending patron modifications on the patron module home page
    
    Due to the way members-home.pl handles the variable $branch, the number
    of patron modifications listed on members-home.pl may differ from the
    number listed on mainpage.pl. When the librarian clicks this link, he or
    she may see a different number than was listed, or none at all!
    
    Test Plan:
    0) Set IndependentBranchesPatronModifications = Yes
    1) Create a number of modification request for BranchA
    2) Log into the staff intranet with a patron without superlibrarian
    permissions and set your branch to BranchB
    3) Note the modifications alert to does not display on mainpage.pl
    4) Click the "Patrons" link to take you to members-home.pl
    5) Note the modifictions alert does display on this page
    6) Apply this patch
    7) Reload members-home.pl, note the alert no longer displays
    
    QA notes: What was the point of the branch variable?
    
    Followed test plan, patch worked as described. Also passed QA test tool
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 3d07449358010392b111a674c3606cdfe2cbe47e
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Sep 1 14:39:25 2017 +0000

    Bug 17380: [QA Follow-up] Report error to user instead of throwing exception
    
    Internal server errors are good, user feedback is better.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Tiny change: removed the obsolete 'use Koha::Exceptions'.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit d0c372c5fa0e867d346b342ae470b31c33d52b26
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Sep 1 14:39:03 2017 +0000

    Bug 17380: (QA followup) Fix parameter in tests
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 87773a6d661f122a52b34f6c67255424c335e297
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jun 26 12:51:59 2017 +0200

    Bug 17380: Do not allow Default template in merge form
    
    This patch makes the following changes:
    [1] Removes Default from the template list. We should not merge with the
        Default framework, since it does not have a reporting tag.
    [2] Rearranges the error section in the template. It is confusing to have
        two error sections in this template. The error CANNOT_MOVE is not used.
        The error FRAMEWORK_NOT_SELECTED is replaced by WRONG_FRAMEWORK.
    [3] Do not allow to merge a record with itself.
    [4] Check if the merge reference record still contains any MARC tags.
    [5] Additional polishing: Simplify passing frameworks to template. Remove
        an unused Koha::Authority::Types->search. Remove obsolete POD header
        for functions from the script.
    
    Test plan:
    [1] Select two authorities to merge. Verify that you cannot select Default
        anymore as framework for the reference record.
    [2] Reproduce error WRONG_COUNT by adding another authid=999 in the URL
        after you selected two authority records for merging.
    [3] Remove the third authid from the URL and change the first or second
        authid into an unexisting record id. You should generate an Internal
        Server Error. The log should show the exception message.
    [4] Merge two authorities. Deselect all MARC tags. Should trigger the
        error EMPTY_MARC in the template.
    [5] Select the same authority record twice for merging. Should trigger the
        error DESTRUCTIVE_MERGE in the template.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 434162c1756b16b5fc715fd1cb762aaf8aff7b2b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Jul 4 14:31:21 2017 +0200

    Bug 17380: Graceful resolution of missing reporting tag in merge
    
    Altough this patch deals with a mostly hypothetical case and this report
    makes it practically impossible anymore to merge with records in the
    Default framework (having no reporting tag), we can make the code of
    sub merge still a bit more robust here.
    
    If you would merge biblio records from one authtype to another and the new
    framework would not have a reporting tag, before this patch the result would
    be data loss. Merge would handle this request as a delete. This patch makes
    merge handle it differently: instead of clearing the biblio records, it
    keeps $a and $9 in order to make a future corrective merge possible.
    
    Note: The additional condition on line 1468 for $tags_using_authtype
    makes sure that we do not select all fields when the authtype should
    unexpectedly be empty string (Default). This prevents crashing on
    a "Control fields do not have subfields" error.
    
    Test plan:
    [1] Run t/db_dependent/Authorities/Merge.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit db35492c795540d6c3b10f7cba18698aeb84a816
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jun 26 13:41:56 2017 +0200

    Bug 17380: Do not use GuessAuthTypeCode in MetadataRecord::Authority
    
    If we got an authtypecode from the database and this value is not NULL
    since the table column does not allow it, there is no need to call
    GuessAuthTypeCode for empty string (read: Default framework) in the
    sub get_from_authid.
    
    Furthermore, we remove three Koha::MetadataRecord::Authority->new calls.
    They are useless, since we do not pass a record. It just generates:
      No record passed at authorities/merge.pl line 96.
      Can't bless non-reference value at Koha/MetadataRecord/Authority.pm line 66.
    Instead we throw an ObjectNotFound exception.
    
    Test plan:
    [1] Run t/db_dependent/Koha_Authority.t
    [2] Interface will be tested in the following patches.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 3e631f418a3fafa485b650f0975ee0d06e366884
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Feb 23 10:02:57 2017 +0100

    Bug 17380: Add some checks around Authorities::Types->find
    
    Resolves:
    Use of uninitialized value $biblio_fields in scalar chop at authorities/detail.pl line 212.
    Can't call method "authtypetext" on an undefined value at authorities/detail.pl line 216.
    Can't call method "authtypecode" on an undefined value at authorities/detail.pl line 180.
    
    NOTE: Some of these problems have actually been resolved now by bugs 18801
    and 18811, but it is still better imo to have these checks.
    
    Test plan:
    [1] Verify unchanged behavior. Search for some authorities on authorities.pl
        and click on the details of a record.
    [2] Open an authorities detail page and change the authid in the URL to a
        not existing number. Instead of an internal server error, you should see
        a message like "The authority record you requested does not exist".
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit dc60c344768540c5e02c8e46e8ae43f7921d252a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 12:04:50 2017 -0300

    Bug 18811: DBRev 17.05.00.006
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 562435e767c99670dd9fb8935a2ed483b7a61930
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Sep 4 09:27:09 2017 +0200

    Bug 18811: [QA Follow-up] Resolved POD warnings
    
    Trivial changes to silence qa tools on POD warnings for Subfields and Tags.
    
    Note: Since Subfield and Tag only contain one sub which is considered as
    private by Pod::Coverage, these modules are listed as unrated (no public
    symbols defined) and trigger a FAIL on pod coverage in qa tools. This fail
    can be ignored.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ac653bc7cec4e2ca1f8653efff4a9c44f4255540
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Sep 4 09:19:01 2017 +0200

    Bug 18811: [QA Follow-up] Add tests for Koha::Authority::Subfields/Tags
    
    Renaming t/db_dependent/Authorities to Authority
    Adding Subfields.t and Tags.t
    
    Test plan:
    [1] prove t/db_dependent/Authority
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit f45fc4d10b84dfbd8040d12484553db8c87ec45a
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jun 23 07:59:04 2017 +0200

    Bug 18811: Atomic update to print warning at upgrade time
    
    The warning encourages people to run the auth_show_hidden_data script
    to check for data in hidden fields and adjust their frameworks.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 15dee475180ac362e182e1708d1c8b1b1e25e635
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Jun 22 15:39:41 2017 +0200

    Bug 18811: Add a script for checking authority data in hidden fields
    
    If you edit an authority record while having data in hidden fields or
    subfields, that data will be lost now.
    This script can help you to unhide some fields and prevent data loss.
    
    Test plan:
    [1] Add a PERSO_NAME record. Fill e.g. 100b.
    [2] Hide 100b in the PERSO_NAME framework.
    [3] Run auth_show_hidden_data.pl and verify that it reports 100b in
        the PERSO_NAME framework.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ca8f8b4cd91fac4acb6e2338720b8e0a82bce0b0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Jun 22 13:42:38 2017 +0200

    Bug 18811: Add Koha Objects for authority tags and subfields
    
    Trivial copy and paste activity.
    Will be used in a later patch.
    
    No test plan needed.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 7e222bb0796196f1e466b73d909fd28d529cab75
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Jun 15 12:30:27 2017 +0200

    Bug 18811: Change visibility checks in authorities.pl
    
    The check is now <=-4 or >=5, but the framework uses 0 for Show all and
    -5 for Hide all. (Note that sql installer scripts also use 8.)
    When modifying an authority, the script also showed hidden fields when
    filled, since it did not check the hidden field but only the tab field.
    
    NOTE: The proposed solution restores consistency, but will remove hidden
    fields from the MARC record.
    
    Test plan:
    [1] Set field 942a to Show all in an authority framework.
    [2] Open a new record in this framework and verify that you see 942a.
    [3] Edit an existing record in this framework and verify again.
    [4] Set field 942a now to Hide all in this framework.
    [5] Open a new record in this framework and verify that 942a is hidden.
    [6] Edit an existing record in this framework and verify again.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 35e3de845c591958d66c6602940453f2a803a7ee
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Sep 6 10:42:28 2017 -0300

    Bug 19262: Remove xt/author/pod_spell.t
    
    If you run `prove xt/author/pod_spell.t` without having Test::Spelling installed, it will skip the tests.
    
    If you install the lib-test-spelling-perl, the test will fail:
    xt/author/pod_spell.t .. You said to run 0 tests at xt/author/pod_spell.t line 21.
    xt/author/pod_spell.t .. Dubious, test returned 25 (wstat 6400, 0x1900)
    No subtests run
    
    This is because the call to all_pod_files_spelling_ok is expecting a path
    
    If we try to fix it with adding "." as parameter, the tests will raise tone of errors.
    
    Let's remove this file
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit f8502b0d197bab4b4966e9e02253d30f7fcf29f8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Aug 31 11:47:11 2017 -0300

    Bug 19227: Reduce the number of tests run by 00-merge-conflict-markers.t
    
    The number of tests on jenkins is sometimes confusing:
    
    https://jenkins.koha-community.org/job/Koha_Master_D8/lastCompletedBuild/testReport/(root)/t_00_merge_conflict_markers_t/
    
    shows that 00-merge-conflict-markers.t ran 10,751 tests, 124 less than
    the previous run. However 124 files have not been removed from the
    codebase!
    
    I suggest to count only 1 test for all files.
    
    Moreover files from blib and cover_db are counted, they should be
    excluded.
    
    Test plan:
      prove t/00-merge-conflict-markers.t
    must return green
    
    echo ">>>>>>>" >> mainpage.pl
    and run the test again
    It should now fail
    
    Signed-off-by: Magnus Enger <magnus at libriotech.no>
    Works as advertised.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 99e691feee5ef29bbc9d24a916fc4aa2fab6bba6
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Sep 1 13:16:43 2017 -0400

    Bug 19235: Password entry visible in OPAC Self-registration
    
    The HTML code was "text" instead of "password".
    
    TEST PLAN
    ----------
    1) 'Allow' PatronSelfRegistration system preference
    2) Define the PatronSelfRegistrationDefaultCategory system preference (e.g. PT)
    3) Open OPAC
    4) Click 'Register here' on the right.  (/cgi-bin/koha/opac-memberentry.pl)
    5) Scroll to bottom
    6) enter some passwords
       -- visible
    7) apply this patch
    8) refresh page
    9) repeat 5-6 as needed
       -- passwords should not be visible while entering
    10) run koha qa test tools
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 6ae69d27815dc01ab515b6d8f0239ef5fe59251c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Sep 8 09:41:21 2017 -0300

    Bug 19277: Make sure the tests will pass even if they are slow
    
    This patch was my first attempt to fix the issue.
    I think it is good to have it, if issue.timestamp and issue.issuedate are the same,
    the result will be orderd by issue_id.
    The tests highlight the fact that checkouts must be displayed in the
    correct order.
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 5a64723e6d3d21b3e0d9302b273b6fbb43c969af
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Sep 8 09:38:28 2017 -0300

    Bug 19277: TT syntax - Display ordered data
    
    This issue has been highlighted by a failing test: ISSUESLIP displays checkouts in random order
    
    I thought it was because of dates comparison, but it comes from the following line in C4::Letters::_get_tt_params
      my $objects = $module->search( { $key => { -in => $values } } );
    
    The DBMS will return data like there is ordered in the DB.
    For instance:
      select borrowernumber from borrowers where borrowernumber in (5, 3, 1);
    or
      select borrowernumber from borrowers where borrowernumber=5 or borrowernumber=3 or borrowernumber=1;
    
    will return 1, 3, 5
    
    I did not find a generic way to do that, so used "ORDER BY FIELD" which will not be portable.
    
    Test plan:
    If you do not apply this patch, the tests will sometime fail
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 0ed469525fe16e36663c1f5266568beb5e27672d
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Thu Mar 30 04:15:54 2017 +0000

    Bug 18351: Able to delete budget with funds
    
    To test:
    1) Create a budget, add a fund
    2) Delete budget. Notice this is successful and triggers no warning
    message etc.
    3) Go to Funds. Notice the funds appear as if they are not there
    4) Go into mysql and view the aqbudgetperiods table - notice the funds
    are still there and are now inaccessible.
    5) Apply patch
    6) Create a budget, add a fund
    7) Attempt to delete budget. Notice you can't click Delete button.
    Confirm number of funds in hover message is correct.
    8) Delete fund
    9) Confirm you can now delete budget.
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Felix Hemme <felix.hemme at thulb.uni-jena.de>
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Bug 18351: [FOLLOW-UP] Some code fixes
    
    See Comment 5. Ready to test.
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Bug 18351: [FOLLOW-UP] Code fix
    
    See comment 10.
    Ready for testing.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Bug 18351: [FOLLOW-UP] Prevent deletion from forcing URL
    
    This patch adds a check in the script for existing funds so that the
    budget cannot be deleted when forcing the URL and has other small fixes.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Bug 18351: [FOLLOW-UP] Prevent deletion if funds are added after clicking 'Delete' and before confirming delete
    
    Followed test plan and patch works as described.
    
    Signed-off-by: Dilan Johnpull? <dilan at calyx.net.au>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 133e25c56ac79e0b88b89e3b749df338e63a93d0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Sep 8 10:14:10 2017 +0200

    Bug 15438: [QA Follow-up] Moving POD statement for CanBookBeIssued
    
    The statement for head3 NB ('nota bene'?) looks like a hash key
    in the list of possible return values for $needsconfirmation.
    Moved it up and prefixed it with IMPORTANT.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 4d223bdc6156fab0667867f3990854fddfab5684
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Wed Aug 24 13:52:52 2016 +0100

    Bug 15438 - Checking out an on-hold item sends holder's borrowernumber in AF (screen message) field.
    
    The returns from C4::Circulation::CanBookBeIssued used
    to be structured as a hashref of entries like
       REASON => {
           data => 'foo',
           moredata => 'bar',
       };
    Some entries still are. But many are now
       REASON => 1,
       data   => 'foo',
       moredata => 'bar',
    
    The sip Checkout routine still assumed the former, as it
    reports any causes it was not aware of (to maintain support for
    a changing api) The data fields could leak into the screen message
    field of the response. e.g. the borrowernumber or surname of the
    borrower who has a hold on an issued title. Some real messages were
    getting obscured by this
    
    This patch sanatizes the return from from CanBookBeIssued
    by removing keys which are not all uppercase
    It also fixes a case where the key's data element was used
    for the screen message when we should use the key itself
    
    Updated the documentation of CanBookBeIssued to flag up
    the assumption re case and the fact that 3 elements rather
    than two may be returned
    
    The loop through the returned keys was a bit bogus
    so we now explicitly jump out if noerror is unset
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Tested quite extensively. Test results put on Bugzilla.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 889fabe9f28f3b6ef35fc36e73b12652f258510c
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Tue Sep 12 14:57:25 2017 +0200

    Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt
    
    Followup correcting a typo of previous patch :
      name="holdingbranch" options = branche
    it is branche[s]
    
    Test plan :
    - Look at 'Current location' in item search
    => Without patch you see only 'All libraries'
    => With patch you see 'All libraries' and each existing library, like in 'Home library'
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 C4/Accounts.pm                                     |    2 +-
 C4/AuthoritiesMarc.pm                              |   14 ++-
 C4/Circulation.pm                                  |    8 +-
 C4/Letters.pm                                      |   13 +-
 C4/Members.pm                                      |    9 +-
 C4/SIP/ILS/Transaction/Checkout.pm                 |   42 +++++--
 Koha.pm                                            |    2 +-
 Koha/{Biblioitem.pm => Authority/Subfield.pm}      |   10 +-
 Koha/{Biblioitems.pm => Authority/Subfields.pm}    |   18 +--
 Koha/{City.pm => Authority/Tag.pm}                 |   10 +-
 Koha/{Biblioitems.pm => Authority/Tags.pm}         |   18 +--
 Koha/MetadataRecord/Authority.pm                   |    7 --
 admin/aqbudgetperiods.pl                           |   30 +++--
 authorities/authorities.pl                         |   14 +--
 authorities/detail.pl                              |    8 +-
 authorities/merge.pl                               |   86 ++++++++------
 installer/data/mysql/updatedatabase.pl             |    9 ++
 .../prog/en/modules/admin/aqbudgetperiods.tt       |   40 +++++--
 .../prog/en/modules/authorities/merge.tt           |   60 ++++------
 .../prog/en/modules/catalogue/itemsearch.tt        |    2 +-
 .../bootstrap/en/modules/opac-memberentry.tt       |    8 +-
 .../bootstrap/en/modules/opac-suggestions.tt       |    1 +
 members/members-home.pl                            |   14 ++-
 misc/maintenance/auth_show_hidden_data.pl          |  124 ++++++++++++++++++++
 t/00-merge-conflict-markers.t                      |   17 ++-
 t/db_dependent/{Authorities => Authority}/Merge.t  |   33 +++++-
 .../{Authorities => Authority}/MergeRequests.t     |    0
 t/db_dependent/Authority/Subfields.t               |   49 ++++++++
 t/db_dependent/Authority/Tags.t                    |   48 ++++++++
 t/db_dependent/Letters/TemplateToolkit.t           |   14 ++-
 xt/author/pod_spell.t                              |   22 ----
 31 files changed, 517 insertions(+), 215 deletions(-)
 copy Koha/{Biblioitem.pm => Authority/Subfield.pm} (86%)
 copy Koha/{Biblioitems.pm => Authority/Subfields.pm} (78%)
 copy Koha/{City.pm => Authority/Tag.pm} (87%)
 copy Koha/{Biblioitems.pm => Authority/Tags.pm} (80%)
 create mode 100755 misc/maintenance/auth_show_hidden_data.pl
 rename t/db_dependent/{Authorities => Authority}/Merge.t (93%)
 rename t/db_dependent/{Authorities => Authority}/MergeRequests.t (100%)
 create mode 100644 t/db_dependent/Authority/Subfields.t
 create mode 100644 t/db_dependent/Authority/Tags.t
 delete mode 100644 xt/author/pod_spell.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 17:14:51 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 15:14:51 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-47-g4c76583
Message-ID: <E1drmtn-0006IE-17@git.koha-community.org>

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, 17.05.x has been updated
       via  4c76583e6d3079bad51048f62f43c3c433f1e9bd (commit)
      from  960015819e0c19ef85c458d0bdaec8a24cd86dc3 (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 4c76583e6d3079bad51048f62f43c3c433f1e9bd
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Wed Aug 2 11:21:58 2017 +0200

    Bug 19023 - inventory tool performance
    
    Inventory tool performance seems to be worst since 16.11.
    I think it is because of authorized values computing changed by Bug 17249.
    
    For each subfield of each item, we try to get the authorized value description with Koha::AuthorisedValues->search_by_marc_field.
    But this method does not use cache like Koha::AuthorisedValues->get_description_by_koha_field.
    
    I propose to use Koha::AuthorisedValues->get_description_by_koha_field and also to look for authorized value description only for item fields used in TT : location, notforloan, itemlost, damaged, withdrawn.
    
    I have experimented inventory time on 100 items from 5s to 1s.
    
    Test plan :
    - Without patch
    - Perform inventory with barcode file
    - Check results and mesure execution time
    - Apply patch
    - Reperform inventory with same barcode file
    - Check results is the same
    - Compare execution time
    - Run prove t/db_dependent/Items/GetItemsForInventory.t
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 95f1844e6c46ff51de9f95f99fcdf3369c756fd4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 tools/inventory.pl |   22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 12 17:50:30 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 12 Sep 2017 15:50:30 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v17.05.00-593-gc73b6d5
Message-ID: <E1drnSI-0007Yh-D5@git.koha-community.org>

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, master has been updated
       via  c73b6d51dac3d07d32135f0f891cc6418101a53b (commit)
       via  c43a555dbce3a50a752cdf397379766c46fb3555 (commit)
       via  adf4077b39c96bd353fb733b3e8093550cb9db09 (commit)
       via  71b9dc1e3932db29e8fa7a32dd25e7e54c95f228 (commit)
       via  db5848bf2a5b5f881a1cf59fb794ecfd01841c8d (commit)
       via  a86d7fd3d097987da8e97054ff37e3061eeb9811 (commit)
       via  82115d164a15767965d267826cc64e74132bd374 (commit)
      from  5400795a6651adc021801052fa0186747983b587 (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 c73b6d51dac3d07d32135f0f891cc6418101a53b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Sep 7 14:34:18 2017 +0200

    Bug 19059: [QA Follow-up] Typo holds for hold
    
    Resolves:
    The method found is not covered by tests at C4/Reserves.pm line 815.
    
    Test plan:
    Run t/db_dependent/Holds/CancelReserves.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit c43a555dbce3a50a752cdf397379766c46fb3555
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Sep 1 16:50:26 2017 -0300

    Bug 19059: Fix compilation issues
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit adf4077b39c96bd353fb733b3e8093550cb9db09
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Aug 7 15:13:17 2017 -0300

    Bug 19059: Remove CancelReserve
    
    It's done!
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 71b9dc1e3932db29e8fa7a32dd25e7e54c95f228
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Aug 4 10:44:56 2017 -0300

    Bug 19059: Remove CancelReserve - do not log DELETE
    
    There is something wrong with the DELETE log, it should be replaced with
    a FILLED log.
    Anyway, here we do not want it to be logged.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit db5848bf2a5b5f881a1cf59fb794ecfd01841c8d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Aug 3 18:00:22 2017 -0300

    Bug 19059: Remove CancelReserve - add new tests
    
    This is bonus, let's add new tests
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit a86d7fd3d097987da8e97054ff37e3061eeb9811
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Aug 3 15:12:25 2017 -0300

    Bug 19059: Remove CancelReserve - move tests
    
    Move the existing tests
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 82115d164a15767965d267826cc64e74132bd374
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 2 14:00:12 2017 -0300

    Bug 19059: Move C4::Reserves::CancelReserve to Koha::Hold->cancel
    
    This patch adds a new Koha::Hold->cancel method and replaces the calls
    to C4::Reserves::CancelReserve with it.
    
    Test plan:
    - Add and cancel holds
    - Change priority of holds
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 C4/Biblio.pm                                 |    3 +-
 C4/ILSDI/Services.pm                         |    2 +-
 C4/Reserves.pm                               |  111 ++++---------
 C4/SIP/ILS/Transaction/Hold.pm               |   14 +-
 Koha/Hold.pm                                 |   58 ++++++-
 Koha/Patron/Discharge.pm                     |    3 +-
 Koha/REST/V1/Hold.pm                         |    2 +-
 circ/branchtransfers.pl                      |   23 ++-
 circ/returns.pl                              |    6 +-
 circ/waitingreserves.pl                      |    2 +-
 opac/opac-modrequest.pl                      |    6 +-
 reserve/request.pl                           |    3 +-
 t/db_dependent/Circulation.t                 |    4 +-
 t/db_dependent/Holds.t                       |   68 +++-----
 t/db_dependent/Holds/HoldFulfillmentPolicy.t |   19 +--
 t/db_dependent/Holds/HoldItemtypeLimit.t     |    8 +-
 t/db_dependent/HoldsQueue.t                  |   25 +--
 t/db_dependent/Koha/Holds.t                  |  222 ++++++++++++++++++++++++++
 t/db_dependent/Reserves.t                    |   93 +----------
 t/db_dependent/UsageStats.t                  |    2 +-
 tools/batch_delete_records.pl                |    2 +-
 21 files changed, 403 insertions(+), 273 deletions(-)
 create mode 100644 t/db_dependent/Koha/Holds.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep 14 15:35:32 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 14 Sep 2017 13:35:32 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-49-gea316ad
Message-ID: <E1dsUIm-0004ag-Jy@git.koha-community.org>

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, 17.05.x has been updated
       via  ea316ad4ae5b4aea4c255d08d36bfcb0b705c23b (commit)
       via  dcafcbc036f9229d2d2854012f80fe051012a349 (commit)
      from  4c76583e6d3079bad51048f62f43c3c433f1e9bd (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 ea316ad4ae5b4aea4c255d08d36bfcb0b705c23b
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Tue Sep 12 14:57:25 2017 +0200

    Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt
    
    Followup correcting a typo of previous patch :
      name="holdingbranch" options = branche
    it is branche[s]
    
    Test plan :
    - Look at 'Current location' in item search
    => Without patch you see only 'All libraries'
    => With patch you see 'All libraries' and each existing library, like in 'Home library'
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 889fabe9f28f3b6ef35fc36e73b12652f258510c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit dcafcbc036f9229d2d2854012f80fe051012a349
Author: Marc V?ron <veron at veron.ch>
Date:   Thu Jun 29 15:22:54 2017 +0200

    Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt
    
    This patch removes entries like the following in translations of itemsearch.tt:
    "[%% INCLUDE form_field_select name=\"homebranch\" options = branches "
    "empty_option = \"All libraries\" %%] [%% INCLUDE form_field_select name="
    "\"holdingbranch\" options = branches empty_option = \"All libraries\" %%] %s "
    "[%% INCLUDE form_field_select name=\"location\" options = locations "
    "empty_option = \"All locations\" %%] %s "
    
    New patch on top of Bug 18633 that resolves parts of initial comment.
    
    To test:
    - Verify that in itemsearch.tt no tt directives are splitted by new lines
      (search for [% INCLUDE )
    - Verify that itemsearch.tt works as before
    
    Followed test plan and verified that tt directives are not split by new
    lines, the changes to the fieldset tags in comment 3 have been removed
    and itemtype.tt still works correctly as before
    
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 25fa02272d16c98d49a6020e867f60bc0510d960)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../prog/en/modules/catalogue/itemsearch.tt        |   36 ++++----------------
 1 file changed, 6 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep 16 09:15:14 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 16 Sep 2017 07:15:14 +0000
Subject: [koha-commits] main Koha release repository branch 16.11.x updated.
	v16.11.11-1-39-g42b3010
Message-ID: <E1dt7Jq-0005Iz-CA@git.koha-community.org>

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.11.x has been updated
       via  42b30105ffd2b6814873fad1cff5cd4d35c140ee (commit)
       via  ff554650015bb06bf4bf0146d81c653bd0f2c61d (commit)
       via  b559399ad52645041697558ae3eb710628c53781 (commit)
       via  632d47db0b86542512b443e9bb69c00c3add31a7 (commit)
       via  9fc57e9768426bf84d00e8238ff3851ced6e2997 (commit)
       via  a374afe92df9b25a231c20296f50c351606d2e32 (commit)
       via  85a57d0f94c18483ff67ef53a7e067c8ebdca4b9 (commit)
       via  605dcc6e1aa4b0666eb646813f13f7088d7d2b3d (commit)
       via  65eb8108509cc5c50a2e819585efe34bdb6f7ff3 (commit)
       via  fc4a184a5fda8571a7548996d5813205d25e6e5f (commit)
       via  41350af22570d32148c673e846e45d46fa1806c5 (commit)
       via  73533f0b67faba3355b27046d4017714fc08f81d (commit)
       via  353d5a1560976c34152ada5895d15446b8cc1754 (commit)
       via  3e561bb3d6b1cca470340dd1aa22dab44fc8d193 (commit)
       via  c4064d0226a67d4aca8eece7c7b54c8f370afaa7 (commit)
       via  4c90c0de023ca8edb2cab2425264f367ffacfadb (commit)
       via  502dddf9da62c5206d2be7fd94cf3ff95003dc7f (commit)
       via  099897fd2738e4589f9e8412be242ccf000fcb69 (commit)
       via  255dca62aa5f3989a981b493774517f8f53d01cb (commit)
       via  d62eea1bf38b0939b173bce2f170fa810bd194aa (commit)
       via  f270020500ef4956c73c2b9630d70e32ebae6921 (commit)
       via  056b10fcec4a68b9e379f3eb1be9120e7b2b3e98 (commit)
      from  d2b84a87fbeae550a9dbc9800202813daf1affd8 (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 42b30105ffd2b6814873fad1cff5cd4d35c140ee
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Tue Sep 12 14:57:25 2017 +0200

    Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt
    
    Followup correcting a typo of previous patch :
      name="holdingbranch" options = branche
    it is branche[s]
    
    Test plan :
    - Look at 'Current location' in item search
    => Without patch you see only 'All libraries'
    => With patch you see 'All libraries' and each existing library, like in 'Home library'
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 889fabe9f28f3b6ef35fc36e73b12652f258510c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit ea316ad4ae5b4aea4c255d08d36bfcb0b705c23b)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit ff554650015bb06bf4bf0146d81c653bd0f2c61d
Author: Marc V?ron <veron at veron.ch>
Date:   Thu Jun 29 15:22:54 2017 +0200

    Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt
    
    This patch removes entries like the following in translations of itemsearch.tt:
    "[%% INCLUDE form_field_select name=\"homebranch\" options = branches "
    "empty_option = \"All libraries\" %%] [%% INCLUDE form_field_select name="
    "\"holdingbranch\" options = branches empty_option = \"All libraries\" %%] %s "
    "[%% INCLUDE form_field_select name=\"location\" options = locations "
    "empty_option = \"All locations\" %%] %s "
    
    New patch on top of Bug 18633 that resolves parts of initial comment.
    
    To test:
    - Verify that in itemsearch.tt no tt directives are splitted by new lines
      (search for [% INCLUDE )
    - Verify that itemsearch.tt works as before
    
    Followed test plan and verified that tt directives are not split by new
    lines, the changes to the fieldset tags in comment 3 have been removed
    and itemtype.tt still works correctly as before
    
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 25fa02272d16c98d49a6020e867f60bc0510d960)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit dcafcbc036f9229d2d2854012f80fe051012a349)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit b559399ad52645041697558ae3eb710628c53781
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Wed Aug 2 11:21:58 2017 +0200

    Bug 19023 - inventory tool performance
    
    Inventory tool performance seems to be worst since 16.11.
    I think it is because of authorized values computing changed by Bug 17249.
    
    For each subfield of each item, we try to get the authorized value description with Koha::AuthorisedValues->search_by_marc_field.
    But this method does not use cache like Koha::AuthorisedValues->get_description_by_koha_field.
    
    I propose to use Koha::AuthorisedValues->get_description_by_koha_field and also to look for authorized value description only for item fields used in TT : location, notforloan, itemlost, damaged, withdrawn.
    
    I have experimented inventory time on 100 items from 5s to 1s.
    
    Test plan :
    - Without patch
    - Perform inventory with barcode file
    - Check results and mesure execution time
    - Apply patch
    - Reperform inventory with same barcode file
    - Check results is the same
    - Compare execution time
    - Run prove t/db_dependent/Items/GetItemsForInventory.t
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 95f1844e6c46ff51de9f95f99fcdf3369c756fd4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 4c76583e6d3079bad51048f62f43c3c433f1e9bd)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 632d47db0b86542512b443e9bb69c00c3add31a7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Sep 4 12:06:56 2017 -0300

    Bug 18927: Use fully qualified subroutine names in C4::Items
    
    rebuild_zebra.pl fails in some conditions (perl version?)
    I do not recreate but it has been reported that reindex fails with:
      error retrieving biblio 94540 at /usr/share/koha/bin/migration_tools/rebuild_zebra.pl line 683, <DATA> line 751.
    
    To fix it we can use fully qualified subroutine names for:
      GetMarcFromKohaField
      GetMarcBiblio
      GetBiblionumberFromItemnumber
      TransformKohaToMarc
      GetFrameworkCode
    
    Test plan:
    Confirm the rebuild_zebra script still works correctly after this patch
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 2671eb2f93340e8fb3c794cff918d86c526cc47f)
    (cherry picked from commit 1a50b447d3d58b40d8f84e7c264f01abcb42a826)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 9fc57e9768426bf84d00e8238ff3851ced6e2997
Author: Alex Sassmannshausen <alex.sassmannshausen at ptfs-europe.com>
Date:   Thu Aug 10 13:00:19 2017 +0200

    Bug 19073: (bug 15758 follow-up) Dereference correct value from Koha::Object.
    
    * tools/modborrowers.pl: Dereference 'branchcode' rather than
      'value'.
    
    Test Plan:
    - Carry out "Batch patron modification" with any number of patrons.
      + Change the library.
      + Hit Save.
    - The library will not have been updated.
    - Apply patch.
    - Run same modification.
    - The library will have been updated
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 8a328a20bf3a74268346104281688b2a81be80e6)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 111ab4e63257410bf7ca34e80e46675603072c36)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit a374afe92df9b25a231c20296f50c351606d2e32
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Thu Jul 6 08:48:18 2017 +0200

    Bug 18900: wrong number format in receiving order
    
    Bug 18471 added number formating in order receive.
    
    I found a bug generated by this.
    Koha::Number::Price defines methods to (un)format price depending on CurrencyFormat syspref.
    The bug is that for CurrencyFormat US, some params are not defined in this module so there are retrieved from system locale. If system locale is not en_US, the params will be wrong. For example fr_FR will define ',' as decimal and so saved unit price is divided by 1000.
    
    To recreate:
    - On a server with locale 'fr_FR'
    - With Plack mode
    - Set CurrencyFormat on 'US'
    - Open a basket
    - Place an order for an item
    - Close basket
    - Receive order with changing 'Actual Cost' to '1,234'
    - Note the 'Actual Cost' is now '1.23'
    - Run unit test t/Number/Price.t without and with patch
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit e35903574ce666bca32eb4676f311b99bb268ec2)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 92b08a23e3b2c001d208b82b6ffee2af756ca51f)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 85a57d0f94c18483ff67ef53a7e067c8ebdca4b9
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Aug 9 12:01:17 2017 -0300

    Bug 18900: (QA followup) Make tests conditional to locale existence
    
    It is important to highlight that tests have been skipped instead of having them pass
    on the absence of the required fr_FR.UTF-8 locale installed on the system.
    
    This patch does that check and effectively skips them.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 61f2ec769073709be3b688654ec355b3f4fbe522)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 1865db52bbf9413574c22ee2c9180137ac357918)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 605dcc6e1aa4b0666eb646813f13f7088d7d2b3d
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Thu Jul 6 08:44:51 2017 +0200

    Bug 18900: add UT to Number/Price.t
    
    This patch adds unit tests to t/Number/Price.t in order to valid the problem.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 91dee226cdd089353dc71e559aa9e0b34fddf72e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit aca614cd95b32d2953927e8e3e908bc1248b541c)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 65eb8108509cc5c50a2e819585efe34bdb6f7ff3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Jul 6 18:10:10 2017 -0300

    Bug 18906: Display all funds the logged in user can use
    
    There are complex conditions to know if a librarian can use a fund, we
    cannot do that with a SQL query, we need to use C4::Budgets::CanUserUseBudget
    
    When this patch is applied then all funds are visible to both
    superlibrarian patrons and patrons with all acq permissions
    
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 19a7b498e1f4355ab1e4ee0adb5db299613f3f5c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit d179da572b1d6bd7066d96f494aa805b86b92ae1)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit fc4a184a5fda8571a7548996d5813205d25e6e5f
Author: David Cook <dcook at prosentient.com.au>
Date:   Thu Jul 27 11:58:28 2017 +1000

    Bug 18898 - Some permissions for Reports can be bypassed
    
    If you manually visit the following links when you only have
    permission to run reports, you'll still be able to access the ability
    to create and edit reports:
    
    /cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL
    /cgi-bin/koha/reports/guided_reports.pl?phase=Edit%20SQL
    
    This patch ties these 2 unaccounted for phases to the create_reports
    permission.
    
    With patch, issue no longer can be reproduced.
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 2fdfbaf0ddbf214c0efb9a3a3c2595a54517f795)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 4b71c9239708cd4d60190ed907fec03d1f8b08bc)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 41350af22570d32148c673e846e45d46fa1806c5
Author: Serhij Dubyk {?????? ?????} <serhijdubyk at gmail.com>
Date:   Tue Aug 22 17:19:32 2017 +0300

    Bug 17827 - Untranslatable "by" in MARC21slim2intranetResults.xsl
    
    Signed-off-by: Serhij Dubyk {?????? ?????} <serhijdubyk at gmail.com>
    
    The "by" after the title was not translatable in the result
    lists of the intranet. This patch fixes it by removing
    a comment, that caused a problem with the translation
    scripts.
    
    To test:
    Test:
    
    Before this patch in file en-GB-marc-MARC21.po present next paragraph:
    
    msgid "by "
    msgstr " by "
    
    According string "by " in the file MARC21slim2intranetResults.xsl can not be translated (in other languages).
    
    After applying this patch performed next command:
    cd /usr/share/koha/misc/translator
    sudo env KOHA_CONF=/etc/koha/sites/mykohainstance/koha-conf.xml PERL5LIB=/usr/share/koha/lib perl -I /usr/share/koha/lib "./translate" update
    
    Now in the file en-GB-marc-MARC21.po present the following (modified) paragraph:
    
    msgid "by "
    msgstr " by "
    
    https://bugs.koha-community.org/show_bug.cgi?id=17827
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit d5ea914f4dc41f78dbb3a59f894f6ecbb9a1afa4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit afb2cb0c74b6a137652ec1a2e96fc480a5a50f96)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 73533f0b67faba3355b27046d4017714fc08f81d
Author: Marc V?ron <veron at veron.ch>
Date:   Mon Jun 12 07:48:57 2017 +0200

    Bug 18778 - Translatability: Get rid of tt directive in translation for item-status.inc
    
    The file opac-tmpl/bootstrap/en/includes/item-status.inc exposes a template directive where translators should not be confronted with.
    
    "%s %s [%%#- This include takes two parameters: an item structure and an "
    "optional loan (issue) structure. The issue structure is used by course "
    "reserves pages, which do not use an API to fetch items that populates item."
    "datedue. -%%] %s %s %s %s "
    
    This patch fixes new lines inside a tt directive (comment).
    It is merely a string patch.
    
    To test:
    Verify that the code changes make sense.
    (Bonus test: create a new language 'aa-AA', verify that line above does not
    show up in aa-AA-opac-bootstrap.po)
    
    NOTE: Followed test plan similar to bug 18776 comment 3.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit c8551645d5bdd3e6fb5b7e03280521a2fbaef636)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit b9ff28f719cb17d37e5eaecc4fb09b9032cc38e5)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 353d5a1560976c34152ada5895d15446b8cc1754
Author: Marc V?ron <veron at veron.ch>
Date:   Tue May 23 17:09:49 2017 +0200

    Bug 18660: Translatability: Get rid of template directives [%% in translation for patroncards-errors.inc
    
    Translation for koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc
    contains a lot of (partial) template directives like:
    %%]%s %sLayout: [%%
    
    This patch fixes it
    
    To test:
    - Verify that code changes make sense
    - Apply patch
    - Create a translation (cd misc/translator , then: perl translate create aa-AA
    - Verify that in po/aa-AA-staff-prog.po contains no fragments like %%] or [%%
      for patroncards-errors.inc
    - Try to get an error: Try a link like
      http://[YOUR SERVER]/cgi-bin/koha/patroncards/create-pdf.pl?batch_id=1&template_id=999&layout_id=999&start_card=1
      ...where template_id and layout_id do not exist
    
    (Amended for comment #2 2017-06-05 mv)
    (Amended for comment #6 2017-08-02 mv)
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 7e39bbc61aedd6383f4d6a1b4728711c6922e877)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 036b317c0c0e96b0eb344d767cca7f87da4fb875)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 3e561bb3d6b1cca470340dd1aa22dab44fc8d193
Author: Marc V?ron <veron at veron.ch>
Date:   Mon May 22 21:09:06 2017 +0200

    Bug 18652: Get rid of tt directive in translation for uncertainprice.tt
    
    Translation tool shows toe following for ncertainprice.tt
    0; url=[% scriptname %]?booksellerid=[% booksellerid %]
    
    This patch fixes it.
    
    To test:
    - Apply patch
    - Verify that code change makes sense
    - Verify that Home > Acquisitions > [vendor] > Uncertain prices for [vendor]
      works as before
    
    - Additional test (for a langunage 'aa-AA')
      perl translate create aa-AA
      verify that line 41 no longer appears in aa-AA-staff-prog.po
    
    Amended to switch from BLOCK to a template variable, see comment #5
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 2ee82801c7a8686523f9c5e95b0f43d44e52e4ab)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 4d427740196bb0a9bcfe80787af8cdf769c06b76)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit c4064d0226a67d4aca8eece7c7b54c8f370afaa7
Author: Marc V?ron <veron at veron.ch>
Date:   Fri Aug 4 10:52:13 2017 +0200

    Bug 18649: Translatability: Get rid of tt directive in translation for admin/categories.tt and onboardingstep2.tt
    
    New patch without trailing IF construction in tt directives as
    requested in comment #28
    
    To test: Verify that translation tool no longer shows tt directives as
    described in comment #1
    
    New patch, needs SO.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 79338bde3e01708fe331a54745f45c620c121805)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 0f9175c0b26e9e8d65bf39dab80d99e5d7455346)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 4c90c0de023ca8edb2cab2425264f367ffacfadb
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jul 10 14:15:09 2017 +0200

    Bug 18921: Resolve a few warnings in C4/XSLT.pm
    
    Resolves warnings like:
    
    Use of uninitialized value in hash element at C4/XSLT.pm line 262.
    Use of uninitialized value in numeric eq (==) at C4/XSLT.pm line 267.
    Use of uninitialized value $status in concatenation (.) or string at C4/XSLT.pm line 300.
    
    Note: Line numbers are not exactly the same anymore.
    
    Test plan:
    [1] Enable XSLT view in OPAC
    [2] Without this patch, you will probably have some of these warnings when
        doing some opac searches.
    [3] Apply this patch. Check the logs again.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 5f989a81dff29db78620057d70ed864b32486bc0)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 1c8287632ea36e6d2a8ade922fe129f5f792d6d3)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 502dddf9da62c5206d2be7fd94cf3ff95003dc7f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Sep 11 16:08:41 2017 -0300

    Bug 18996: [16.11.x] use Koha::OldIssues instead of Koha::Old::Checkouts

commit 099897fd2738e4589f9e8412be242ccf000fcb69
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Aug 2 13:01:47 2017 +0200

    Bug 18996: [16.11.x] [QA Follow-up] Remove global variables from Message.t
    
    As per request of Colin in comment18, this patch makes the use of global
    variables in Message.t no longer needed.
    The three subtests are now completely independent and could well be moved
    to separate test scripts.
    
    Note: Strictly speaking, the use of global (package) variables could
    potentially introduce new bugs (e.g. if the value is modified outside the
    script). This seems not to be the case here, but we are safe now.
    
    Test plan:
    Run the test again.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 255dca62aa5f3989a981b493774517f8f53d01cb
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Sat Jul 29 13:38:31 2017 +0200

    Bug 18996: [16.11.x] Add checkin subtest in SIP/Message.t
    
    Variable $branch was not used.
    Promoted some global vars to our.
    Shared the branchcode between all three subtests now.
    The third subtest contains all six cases mentioned in the first patch.
    
    Test plan:
    Run t/db_dependent/SIP/Message.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit d62eea1bf38b0939b173bce2f170fa810bd194aa
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Aug 1 14:10:56 2017 +0200

    Bug 18996: [16.11.x] Resolve an uninitialized warning from ILS/Item.pm
    
    From the syslog call on line 107/108. The field $item->{title} has not
    been initialized. When catching the warns in a test script with Test::Warn,
    I got:
        Use of uninitialized value $args[1] in sprintf at /usr/lib/x86_64-linux-gnu/perl/5.20/Sys/Syslog.pm line 423.
    
    This simply resolves the warning. We might have a closer look to this title
    field on another report though.
    
    Test plan:
    Run Message.t from the next patch without this fix. It will fail since the
    additional warning makes warnings_like return false.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit f270020500ef4956c73c2b9630d70e32ebae6921
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jul 28 10:29:51 2017 +0200

    Bug 18996: [16.11.x] Handle data corruption from old_issues at SIP checkin
    
    As per bug 18966 AddReturn returns false with a DataCorrupted message
    when the issue_id at hand already occurs in the old_issues table.
    This should be handled when returning an item via SIP too. SIP should
    not pretend that the checkin was successful, since this item needs
    special care.
    
    The following six different situations are handled:
    
    [1] An attempt to checkin an invalid barcode is handled as before. The
    ok flag is false; the screen message shows 'Invalid Item'.
    [2] We receive a DataCorrupted message: the alert type is set to the
    unused 98 code to indicate this new error condition. The ok flag
    is false; the screen message shows 'Checkin failed: data problem'.
    [3] The item checked in was not checked out AND the option checked_in_ok
    is active. The ok flag is set to true; no screen message.
    [4] The item checked in was not checked out AND the option checked_in_ok
    is not active. The ok flag is not changed (normally false); the screen
    message shows 'Item not checked out'.
    [5] (The regular checkin) The item was checked out and AddReturn returned
    true. The ok flag is true; no screen message.
    [6] ("Otherwise") The item was checked out, but AddReturn returned false.
    The ok flag is false; the screen message shows 'Checkin failed'.
    Note: Currently this case only refers to the Wrongbranch and withdrawn
    messages from AddReturn (where doreturn==0).
    
    Note: Situation 1 and 5 are unchanged. Behavior is slightly changed for
    situation 3 and 4; the option is only used when the item was not checked
    out. Situation 2 and situation 6 are changed. After bug 18966 SIP
    returned OK in case of data corruption (while checkin failed). In the
    remaining cases under [6] SIP also returned OK while checkin failed.
    
    Test plan:
    [1] Test all six cases listed above. In order to simulate data corruption
    insert the issue_id at hand in old_issues before you check in.
    In cases 3 and 4 you need to toggle the option in your SIPconfig.xml and
    restart the SIP server.
    Case 6 can be tested by checking out at branch A, adjusting the value
    of pref AllowReturnToBranch and checking in at branch B.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 056b10fcec4a68b9e379f3eb1be9120e7b2b3e98
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Aug 2 10:15:10 2017 +1200

    Bug 18046: CAS logout infinite redirect
    
    To test (You need a CAS server and CAS configured in Koha)
    
    1/ Login using CAS in Koha
    2/ Logout in Koha
    3/ Notice you get redirected again and again
    4/ Apply patch
    5/ Login with CAS, then logout
    6/ Notice logout works, but no longer infinitely redirected
    
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Patch has been in production use for several months
    on several instances. Fixes a critical bug.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Looks like a typical workaround, but evidently works.
    Not tested with CAS.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 13ca4962068b184f803b6588e53e39209a77f2b6)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit c87b963818076a58661922116893ff052b2d76a9)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

Summary of changes:
 C4/Auth_with_cas.pm                                |    1 +
 C4/Items.pm                                        |   30 +--
 C4/SIP/ILS.pm                                      |   37 ++--
 C4/SIP/ILS/Item.pm                                 |    2 +-
 C4/SIP/ILS/Transaction/Checkin.pm                  |    4 +-
 C4/XSLT.pm                                         |    6 +-
 Koha/Number/Price.pm                               |    3 +
 admin/aqbudgets.pl                                 |    3 +-
 .../prog/en/includes/patroncards-errors.inc        |   58 +++---
 .../prog/en/modules/acqui/uncertainprice.tt        |    3 +-
 .../prog/en/modules/admin/categories.tt            |    6 +-
 .../prog/en/modules/catalogue/itemsearch.tt        |   36 +---
 .../prog/en/xslt/MARC21slim2intranetResults.xsl    |    2 +-
 .../bootstrap/en/includes/item-status.inc          |   10 +-
 misc/migration_tools/rebuild_zebra.pl              |    8 +-
 reports/guided_reports.pl                          |    2 +-
 t/Number/Price.t                                   |   22 ++-
 t/db_dependent/SIP/Message.t                       |  206 +++++++++++++++++---
 tools/inventory.pl                                 |   22 +--
 tools/modborrowers.pl                              |    2 +-
 20 files changed, 312 insertions(+), 151 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 19 16:52:27 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 19 Sep 2017 14:52:27 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v17.05.00-620-ge98c178
Message-ID: <E1duJsx-00035F-Lq@git.koha-community.org>

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, master has been updated
       via  e98c178c081d4bb5673e6b04bf817b9c452cba8c (commit)
       via  6ce1cc6aada33d7f72b8d3b0b9af4add65a93842 (commit)
       via  06b602b0976e2a8d53ff31f95a2213cbeb98e9cb (commit)
       via  438a3dea0c8ef1a5adcec58d8b97474d14ccca9b (commit)
       via  17c5b76597b9a356bc215a3682d7293e307fcc46 (commit)
       via  a59eaa5277b60055df216373247efc654551d579 (commit)
       via  7f5e8668a75e2a75b638fbb39ca3b5576bcf76d3 (commit)
       via  c7ac741e6a5d5e9bf4fb96dda3e4fabeace7f025 (commit)
       via  45aea7ae1df815d241e7a34fbb5c42e9475f6d04 (commit)
       via  9355e5204074349c232c58caa678a8ab40c18efe (commit)
       via  83704cb1fab33feb0262fdab99bccf0052243d14 (commit)
       via  e722c0a29f730869df24cbe48afcedc12bb57344 (commit)
       via  0f9dce409f6dba60cbb52ae682e70d8203e96ea1 (commit)
       via  80c749df80f08be46b895715045b38cd1ded2ed1 (commit)
       via  30311019987dcddd410fd86c018443e9480253b5 (commit)
       via  6ead305ba4ee9ae5795b3956b41b6a723d7c894d (commit)
       via  2fcf6e88ba6c95461df127293ffd4931a48118f4 (commit)
       via  b36a0e1a59b92294cabe0ea33886f43f8ef1a5fe (commit)
       via  e2d56c0b2b6b45af2926fe3c8b80c35868fb3738 (commit)
       via  e4eee19747cb4c1bea2b71b9759a7bc940079492 (commit)
       via  91bdd9533b38f79e084dbfd34c7db4ada2b4041c (commit)
       via  ed94450bd6bfa509b96d0c2dcd77a3b1cf20086c (commit)
       via  c0d4313e571d44841cb2a472487e0616cd91c88f (commit)
       via  0ae70349809d51552e4297625db1382aa4e26dc5 (commit)
       via  ff22cb46a5f6a1f75422c2a90e1f80ccb05c30b9 (commit)
       via  0d03f143e25f498de780d2ddd1972c3be7947519 (commit)
       via  5bb19808bb23a01a257a0970bd7e2ae43fb5b3d6 (commit)
      from  c73b6d51dac3d07d32135f0f891cc6418101a53b (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 e98c178c081d4bb5673e6b04bf817b9c452cba8c
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Tue Aug 29 05:02:29 2017 +0000

    Bug 19195: Preventing noisy warns when creating or editing a basket
    
    To test:
    1) Open the koha intranet error log
    2) Go to Acquisitions -> Find or create a vendor
    3) Create a new basket, filling all fields
    4) Notice warns in error log
    5) Edit this basket
    6) Notice warns in error log
    7) Apply patch
    8) Create another basket, confirm warns do not show
    9) Edit this basket, confirm warns do not show
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 6ce1cc6aada33d7f72b8d3b0b9af4add65a93842
Author: Dobrica Pavlinusic <dpavlin at rot13.org>
Date:   Mon Sep 18 17:37:21 2017 +0200

    Bug 19332 - Basket grouping PDF and CSV exports empty
    
    This bug was introduced in commit 2bf3ce268de6bc8b2386cfb5d768f60b05d75f44
    Bug 17196: [QA Follow-up] Additional fix on acqui/basketgroup
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 06b602b0976e2a8d53ff31f95a2213cbeb98e9cb
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Tue Aug 29 21:21:00 2017 +0000

    Bug 19180: [FOLLOW-UP] Renaming all instances of 'name' variable to 'booksellername'
    
    ... when referring to the name of the vendor.
    
    To test:
    1) Confirm vendor shows on webpage title (tab name)
    2) Confirm vendor shows in breadcrumbs
    3) Confirm vendor shows in heading when viewing basket ('Basket x (1) for
    vendor')
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 438a3dea0c8ef1a5adcec58d8b97474d14ccca9b
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Sun Aug 27 23:00:15 2017 +0000

    Bug 19180: Add vendor name to breadcrumbs when closing an order
    
    To test:
    1) Go to Acquisitions
    2) Find a vendor and a basket
    3) Click 'Close basket' button
    4) Notice that on confirmation page, breadcrumbs are missing vendor
    5) Apply patch and refresh page
    6) Vendor name should now show
    7) Confirm link to vendor works as expected
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 17c5b76597b9a356bc215a3682d7293e307fcc46
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Wed Aug 30 04:36:50 2017 +0000

    Bug 16204: Show friendly error message if trying to edit record which no longer exists
    
    To test:
    1) Create a record
    2) Click Edit -> Edit record. open this in another tab
    3) Delete the record in the original tab
    4) Refresh the edit form in the other tab. Notice the software error
    5) Apply patch and refresh page
    6) There should be a nice error message with the form fields and buttons
    hidden. Confirm links work as expected.
    
    Sponsored-by: Catalyst IT
    Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit a59eaa5277b60055df216373247efc654551d579
Author: Marc V?ron <veron at veron.ch>
Date:   Wed Sep 6 17:46:27 2017 +0200

    Bug 18541: (QA follow-up) Add some POD for draw_guide_grid
    
    Add description to POD for draw_guide_grid
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Amended: Moved the description from draw_guide_box to .._grid.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 7f5e8668a75e2a75b638fbb39ca3b5576bcf76d3
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Sep 6 16:14:26 2017 +0200

    Bug 18541: [QA Follow-up] Add POD to Patroncard.pm
    
    Just adding the POD framework to make qa tools happy. The authors
    are encouraged to complete this information.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit c7ac741e6a5d5e9bf4fb96dda3e4fabeace7f025
Author: Marc V?ron <veron at veron.ch>
Date:   Wed Sep 6 15:56:55 2017 +0200

    Bug 18541: (QA follow-up) Fix wrong variable name ($layout_xml vs $print_layout_xml)
    
    This patch changes variable names as mentioned in comments #11 and #13
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 45aea7ae1df815d241e7a34fbb5c42e9475f6d04
Author: Marc V?ron <veron at veron.ch>
Date:   Thu May 4 17:36:24 2017 +0200

    Bug 18541 - Patron card creator: Add a grid to support layout design
    
    Add a layout grid to patron card creator to figure out the positions of text
    fields, barcode and images.
    
    To test:
    - Apply on top of patch 18465
    - Go to Home > Tools > Patron card creator
    - Edit or create a layout
    - Turn on new choice 'Guide grid' in section 'General settings'
    - Leave 'Units' unchanged
    - Crate a PDF using 'Card batches'
    - Notice that card is printed with a layout grid that reflects selected unit
      with each 5th and 10th line in different color, unit description displayed
      bottom left, card dimensions displayed top right in small print inside the
      layout grid
    - Print PDF. Set printer settings in Adobe Reader or other PDF printing
      software to 'Actual size' to prevent scaling to printer's printable
      region
    - Mesure out printed PDF and verify that grid corresponds to selecte unit.
    - Go back to layout definition and choose an other unit, repeat steps
      to verify that grid respects selected unit.
    - Go back to layout definition, turn grid off, create PDF, verify that grid
      does not display in PDF
    
    Note for testers / QAers: Position of card elements (text, image...) do not
    respect the unit, this will be fixed in Bug 18550
    
    Followed test plan and it worked as intended
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 9355e5204074349c232c58caa678a8ab40c18efe
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Jun 6 18:35:07 2017 +0000

    Bug 18739 - Add SVG version of staff-home-icons-sprite image
    
    Images display correctly. Followed test plan and patch works as described.
    
    Signed-off-by: Dilan Johnpull? <dilan at calyx.net.au>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 83704cb1fab33feb0262fdab99bccf0052243d14
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Jun 8 16:01:32 2017 +0000

    Bug 15644 - City dropdown default selection when modifying a patron matches only on city
    
    This patch modifies the include files which contain the form fields for
    city, state, zipcode, etc. shown on the patron entry screen. The files
    are modified so that the city/state/zip <select> preselects a value
    based on city, state, and zipcode matching the values in the
    corresponding text fields.
    
    To test, confirm that the bug's steps to reproduce are fixed:
    
    - Enter two cities via Administration -> Patrons and circulation
      -> Cities and towns:
        Springfield, MA 01101
        Springfield, VT 05156
    - Edit a patron choosing, Springfield VT, and save.
    - Edit the patron again and confirm that the correct city is
      pre-selected.
    - Confirm this result with all three different settings of the
      "AddressFormat" system preference.
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit e722c0a29f730869df24cbe48afcedc12bb57344
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Jun 29 13:03:39 2017 +0200

    Bug 18149: Move CountUsage calls to Koha namespace
    
    After the introduction of Koha::Authorities->get_usage_count with bug
    9988, we can now replace the remaining occurrences of CountUsage.
    
    At the same time we remove CountUsageChildren. This was an empty sub.
    The typo get_count_usage in a subtest title is adjusted.
    
    Test plan:
    [1] Run t/db_dependent/Koha/Authorities.t
    [2] Perform a search on authorities-home.pl and verify that you see
        plausible numbers for 'used in xx records'.
    [3] Click on Details for one authority. See the same number?
    [4] Do the same as in 2/3 for Authority search on OPAC.
    [5] Remember the authid and enter this in the record numbers box on
        tools/batch_delete_records.pl. Select Authorities and click
        Continue. The next form shows a column "Used in". Do you see
        the same count again?
    [6] Git grep CountUsage.
        You should see just one hit in a comment that can be kept in
        Koha/Authorities.pm.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 0f9dce409f6dba60cbb52ae682e70d8203e96ea1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 19 11:46:51 2017 -0300

    Bug 10132: DBRev 17.05.00.007
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 80c749df80f08be46b895715045b38cd1ded2ed1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 19 09:59:36 2017 -0300

    Bug 10132: Simplify code, call the method only once
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 30311019987dcddd410fd86c018443e9480253b5
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Sep 11 16:14:41 2017 -0300

    Bug 10132: (QA followup) Open LOC URL on a separate window
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 6ead305ba4ee9ae5795b3956b41b6a723d7c894d
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Sep 11 16:08:09 2017 -0300

    Bug 10132: (QA followup) Add POD to ->get_effective_marcorgcode
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 2fcf6e88ba6c95461df127293ffd4931a48118f4
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Sep 11 16:02:00 2017 -0300

    Bug 10132: (QA followup) Organize tests in subtest
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit b36a0e1a59b92294cabe0ea33886f43f8ef1a5fe
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Sun Jun 11 19:23:41 2017 +0000

    Bug 10132: Add ability to set MARC Organization Code at library level
    
    Test plan:
    0. Apply patches
    1. Update database
    2. Go to administration -> libraries, try to update some library and
    fill in some value into Marc Organization code field
    3. Save this library and edit again - the code should be stored
    correctly
    4. Go to system preferences and fill in some value into MARCOrgCode
    preference, note there is enhanced description mentioning the ability to
    set organization code on library level
    5. Set active library to the one with own org code stored
    6. Go to cataloguing, create new empty record and click into field 003 -
    there should be the code you filled for that library
    7. Set active library to one withou marc org code
    8. Go to cataloguing, create new empty record and click into field 003 -
    there should be the code from system preference
    9. Go to system preferences again and set AutoCreateAuthorities to
    'generate' and BiblioAddsAuthorities to 'allow'
    10. Go to cataloguing and create some biblio record, fill in any author
    in to create its authority record, save the biblio
    11. Go to authorities and find this created authority, go to details and
    check the fields: 003, 040$a, 040$c, 670$a - there should be used right org code
    12. prove t/db_dependent/AuthoritiesMarc.t t/db_dependent/Biblio.t t/db_dependent/Koha/Libraries.t
    
    Signed-off-by: Hugo Agud <hagud at orex.es>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit e2d56c0b2b6b45af2926fe3c8b80c35868fb3738
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Sun Jun 11 19:22:06 2017 +0000

    Bug 10132: Admin pages changes
    
    Signed-off-by: Hugo Agud <hagud at orex.es>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit e4eee19747cb4c1bea2b71b9759a7bc940079492
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Sun Jun 11 19:48:50 2017 +0000

    Bug 10132: Unit tests
    
    Signed-off-by: Hugo Agud <hagud at orex.es>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 91bdd9533b38f79e084dbfd34c7db4ada2b4041c
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Sun Jun 11 19:21:16 2017 +0000

    Bug 10132: DBIC update
    
    Signed-off-by: Hugo Agud <hagud at orex.es>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ed94450bd6bfa509b96d0c2dcd77a3b1cf20086c
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Sun Jun 11 19:19:38 2017 +0000

    Bug 10132: Database changes
    
    Signed-off-by: Hugo Agud <hagud at orex.es>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit c0d4313e571d44841cb2a472487e0616cd91c88f
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Tue Jun 20 13:06:47 2017 +0200

    Bug 18810: Update Font Awesome to 4.7.0
    
    Test plan:
    
    0) Apply the patch
    1) Edit a template and use any of the new icons, see
    http://fontawesome.io/icons/
    2) Verify that the added icon is shown
    
    For alternative test see comment #2. Works as expected.
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 0ae70349809d51552e4297625db1382aa4e26dc5
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Fri Sep 1 16:07:36 2017 +0200

    Bug 18742: (QA followup) Fix indentation
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ff22cb46a5f6a1f75422c2a90e1f80ccb05c30b9
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Jun 7 10:56:47 2017 -0400

    Bug 18742: Circulation statistics wizard no longer exports the total row
    
    To test:
    - Run the circulation wizard
    - Export to csv
    - Note there is no total row
    - Apply patch
    - Export to csv
    - Total row totally there!
    
    Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 0d03f143e25f498de780d2ddd1972c3be7947519
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Sep 18 14:23:54 2017 -0300

    Bug 19335: Fix 00-merge-conflict-markers.t when dockerised
    
    This does not make sense, but fix a bug (why?)
    Without this patch, the tests failed on po files:
    
    [17:14:26] t/00-merge-conflict-markers.t .. Failed 1/1 subtests
    Test Summary Report
    -------------------
    t/00-merge-conflict-markers.t (Wstat: 9 Tests: 0 Failed: 0)
      Non-zero wait status: 9
      Parse errors: Bad plan.  You planned 1 tests but ran 0.
    Result: FAIL
    
    Note that this is not related to bug 19227.
    
    if the ^>>>>>> and ^<<<<<< matches are done on the same line, the test fail
    As saw it failed on *-pref.po files
      misc/translator/po/kn-Knda-pref.po
      misc/translator/po/ja-Jpan-JP-pref.po
      misc/translator/po/nl-BE-pref.po
      misc/translator/po/sr-Cyrl-pref.po
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 5bb19808bb23a01a257a0970bd7e2ae43fb5b3d6
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Sep 18 15:58:15 2017 -0300

    Bug 19337: Make basic_workflow.t configurable through ENV
    
    This patch makes the basic_workflow.t selenium tests read ENV for the
    following vars:
    
    KOHA_USER
    KOHA_PASS
    KOHA_INTRANET_URL
    SELENIUM_ADDR
    SELENIUM_PORT
    
    to properly configure the running environment. If absent, all variables
    fallback to current behaviour:
    
    KOHA_USER // 'koha'
    KOHA_PASS // 'koha'
    KOHA_INTRANET_URL (unchanged)
    SELENIUM_ADDR // 'localhost'
    SELENIUM_PORT // 4444
    
    [*] Selenium defaults are documented on the Selenium::Remote::Driver docs.
    
    Prerequisites:
    Make sure you have a working environment for the Selenium tests:
    - Run:
      $ sudo apt update
      $ sudo apt install xvfb firefox-esr
    
    To test:
    - Run:
      $ sudo koha-shell kohadev
     k$ cd kohaclone
     k$ wget https://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.1.jar \
         -O /tmp/selenium.jar
     k$ SELENIUM_PATH=/tmp/selenium.jar
     k$ Xvfb :1 -screen 0 1024x768x24 2>&1 >/dev/null &
     k$ DISPLAY=:1 java -jar $SELENIUM_PATH &
     k$ prove t/db_dependent/selenium/basic_workflow.t
    => SUCCESS: Tests pass
    - Apply this patch
    - Run:
     k$ prove t/db_dependent/selenium/basic_workflow.t
    => SUCCESS: Tests pass!
    - Sign off :-D
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 C4/AuthoritiesMarc.pm                              |   55 +-
 C4/Biblio.pm                                       |    7 +-
 C4/Patroncards/Patroncard.pm                       |  139 +-
 Koha.pm                                            |    2 +-
 Koha/Library.pm                                    |   39 +-
 Koha/Schema/Result/Branch.pm                       |   12 +-
 acqui/basket.pl                                    |    7 +-
 acqui/basketgroup.pl                               |    2 +-
 acqui/basketheader.pl                              |   38 +-
 admin/branches.pl                                  |    1 +
 authorities/detail.pl                              |    2 +-
 cataloguing/addbiblio.pl                           |   10 +-
 cataloguing/value_builder/marc21_orgcode.pl        |    5 +-
 installer/data/mysql/kohastructure.sql             |    1 +
 installer/data/mysql/updatedatabase.pl             |   10 +
 .../lib/font-awesome/css/font-awesome.css          |  329 +-
 .../lib/font-awesome/css/font-awesome.min.css      |    4 +-
 .../lib/font-awesome/fonts/FontAwesome.otf         |  Bin 106260 -> 134808 bytes
 .../lib/font-awesome/fonts/fontawesome-webfont.eot |  Bin 68875 -> 165742 bytes
 .../lib/font-awesome/fonts/fontawesome-webfont.svg | 3305 ++++++++++++++++----
 .../lib/font-awesome/fonts/fontawesome-webfont.ttf |  Bin 138204 -> 165548 bytes
 .../font-awesome/fonts/fontawesome-webfont.woff    |  Bin 81284 -> 98024 bytes
 .../font-awesome/fonts/fontawesome-webfont.woff2   |  Bin 64464 -> 77160 bytes
 .../lib/font-awesome/less/font-awesome.less        |    3 +-
 .../intranet-tmpl/lib/font-awesome/less/icons.less |  114 +-
 .../lib/font-awesome/less/mixins.less              |   38 +-
 .../intranet-tmpl/lib/font-awesome/less/path.less  |    2 +-
 .../lib/font-awesome/less/screen-reader.less       |    5 +
 .../lib/font-awesome/less/variables.less           |  118 +-
 .../lib/font-awesome/scss/_icons.scss              |  114 +-
 .../lib/font-awesome/scss/_mixins.scss             |   38 +-
 .../lib/font-awesome/scss/_screen-reader.scss      |    5 +
 .../lib/font-awesome/scss/_variables.scss          |  118 +-
 .../lib/font-awesome/scss/font-awesome.scss        |    3 +-
 .../en/includes/member-main-address-style-de.inc   |    2 +-
 .../en/includes/member-main-address-style-fr.inc   |    2 +-
 .../en/includes/member-main-address-style-us.inc   |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |   22 +-
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |   10 +-
 .../prog/en/modules/admin/branches.tt              |    1 +
 .../en/modules/admin/preferences/cataloguing.pref  |    2 +-
 .../prog/en/modules/cataloguing/addbiblio.tt       |   13 +
 .../prog/en/modules/patroncards/edit-layout.tt     |   10 +
 .../prog/img/staff-home-icons-sprite.png           |  Bin 5262 -> 8960 bytes
 .../staff-home-icons-sprite.psd                    |  Bin 126748 -> 0 bytes
 .../staff-home-icons-sprite.svg                    |    1 +
 opac/opac-authoritiesdetail.pl                     |    4 +-
 patroncards/create-pdf.pl                          |    1 +
 patroncards/edit-layout.pl                         |    2 +
 reports/issues_stats.pl                            |    6 +
 t/00-merge-conflict-markers.t                      |   13 +-
 t/db_dependent/Koha/Authorities.t                  |    2 +-
 t/db_dependent/Koha/Libraries.t                    |   33 +-
 t/db_dependent/selenium/basic_workflow.t           |   21 +-
 tools/batch_delete_records.pl                      |    3 +-
 55 files changed, 3895 insertions(+), 781 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/lib/font-awesome/less/screen-reader.less
 create mode 100644 koha-tmpl/intranet-tmpl/lib/font-awesome/scss/_screen-reader.scss
 delete mode 100644 misc/interface_customization/staff-home-icons-sprite.psd
 create mode 100644 misc/interface_customization/staff-home-icons-sprite.svg


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 19 17:03:42 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 19 Sep 2017 15:03:42 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v17.05.00-621-g8088e3a
Message-ID: <E1duK3q-0003GR-N8@git.koha-community.org>

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, master has been updated
       via  8088e3a3379fb8708226cabeadc190f7310d93f4 (commit)
      from  e98c178c081d4bb5673e6b04bf817b9c452cba8c (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 8088e3a3379fb8708226cabeadc190f7310d93f4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 19 11:57:10 2017 -0300

    Bug 19195: Do not explicitely force scalar context when unecessary
    
    These ones are already called in scalar context
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 acqui/basketheader.pl |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 19 21:22:05 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 19 Sep 2017 19:22:05 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v17.05.00-628-g402c7f7
Message-ID: <E1duO5t-0001gf-DI@git.koha-community.org>

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, master has been updated
       via  402c7f756707eb3205b1ddc4a2d1f2df54a32daf (commit)
       via  323b1553b0538abb25f61f85e76f12f34e0e33e3 (commit)
       via  4270d24338f40f2e59e0814019dac9830fa09553 (commit)
       via  cfbcafb7bc665fc3992c24d4e3e6de73cfef0303 (commit)
       via  889fee73133d405be55e60c610746cdb7ba85865 (commit)
       via  5803d746a4cc12402b4b72f8b465f629e23fb3c9 (commit)
       via  b57088868ee53bce1ee6dff95cf18d8005b4b34d (commit)
      from  8088e3a3379fb8708226cabeadc190f7310d93f4 (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 402c7f756707eb3205b1ddc4a2d1f2df54a32daf
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Aug 25 06:26:21 2017 -0400

    Bug 19173: Add opac payment and marc conversion plugins to the pulldown filter list
    
    Edit: fixed tab-for-space errors (tcohen).
    
    Signed-off-by: Magnus Enger <magnus at libriotech.no>
    New categories are added to the pulldown and work as expected.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 323b1553b0538abb25f61f85e76f12f34e0e33e3
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Aug 24 06:55:49 2017 -0400

    Bug 19173: Make OPAC online payments pluggable
    
    While PayPal is fairly universal, there is a plethora of online
    payment system that are far more localized, servicing a single
    country ( e.g. Bug 18968 ) or even a single  city! Instead of
    adding support for each and every one of these payment options
    directly into Koha, it makes more sense to add the ability to
    create online payment plugins.
    
    Test Plan:
    1) Apply this patch
    2) Download and install the Kitchen Sink plugin version 2.1.1 or later
       https://github.com/bywatersolutions/koha-plugin-kitchen-sink/releases
    3) In the plugin options, enable the opac payments option
    4) Create a patron with one or more fines
    5) Log into the opac as that patron, note you now have the option
       to pay online via KitchenSink ImaginaryPay
    6) Make an online payment
    7) Note the payment was processed correctly
    
    Sponsored-by: Washoe County Library System
    
    Signed-off-by: Kyle M Hall <kyle at gmail.com>
    
    Signed-off-by: Magnus Enger <magnus at libriotech.no>
    Awesome enhancement! I know we want to add at least one Norwegian
    payment service at some point.
    I followed the test plan and everything works as advertised. Turning
    off the "opac payments option" makes the option dissappear cleanly
    from the OPAC. I have *not* looked at the code or done any
    considerations about security.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 4270d24338f40f2e59e0814019dac9830fa09553
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 19 13:03:50 2017 -0300

    Bug 6758: DBRev 17.05.00.008
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit cfbcafb7bc665fc3992c24d4e3e6de73cfef0303
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 19 13:20:41 2017 -0300

    Bug 6758: DBIC Schema changes
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 889fee73133d405be55e60c610746cdb7ba85865
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 19 13:13:47 2017 -0300

    Bug 6758: Use 'is' instead of 'ok' in tests
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 5803d746a4cc12402b4b72f8b465f629e23fb3c9
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Aug 4 09:03:43 2017 +0200

    Bug 6758: [QA Follow-up] Typo popular vs populate
    
    Typo popular resolved.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit b57088868ee53bce1ee6dff95cf18d8005b4b34d
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Apr 25 13:27:00 2017 -0400

    Bug 6758: Add new patron column for date of renewal
    
    Test Plan:
    1) Apply this patch
    2) Run updatedatabase
    3) Create a new patron
    4) Note the new column date_renewed is NULL
    5) Renew the patron
    6) Note the date in the column date_renewed is today's date
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 Koha.pm                                            |    2 +-
 Koha/Patron.pm                                     |    4 +-
 Koha/Schema/Result/Borrower.pm                     |   12 ++++-
 Koha/Schema/Result/BorrowerModification.pm         |   12 ++++-
 Koha/Schema/Result/Deletedborrower.pm              |   12 ++++-
 installer/data/mysql/kohastructure.sql             |    3 ++
 installer/data/mysql/updatedatabase.pl             |   24 +++++++++
 .../prog/en/modules/plugins/plugins-home.tt        |    6 +++
 .../opac-tmpl/bootstrap/en/modules/opac-account.tt |   34 ++++++------
 opac/opac-account-pay-return.pl                    |   54 ++++++++++++++++++++
 opac/opac-account-pay.pl                           |   32 +++++++++---
 opac/opac-account.pl                               |   11 ++++
 t/Koha/Plugin/Test.pm                              |   15 ++++++
 t/db_dependent/Koha/Patrons.t                      |    9 +++-
 t/db_dependent/Plugins.t                           |    5 +-
 15 files changed, 203 insertions(+), 32 deletions(-)
 create mode 100755 opac/opac-account-pay-return.pl


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 20 04:14:44 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 20 Sep 2017 02:14:44 +0000
Subject: [koha-commits] main Koha release repository branch 16.05.x updated.
	v16.05.16-31-g8383e75
Message-ID: <E1duUXE-000086-5o@git.koha-community.org>

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  8383e7546495a042f622826c95eee6274765b5d6 (commit)
       via  552af02c9f4e800d49334e3b87f50bb76da7bba8 (commit)
       via  286b6f4e3e8db593fbe218ab08c622e5491ac44d (commit)
       via  65945e30f71fe353c995bab97a5b6a333326b570 (commit)
       via  38cbc453e0cc4a509fe267e32f3903393f449d41 (commit)
       via  a1b569f89eead58d274a6c75d2790bda94fc0c55 (commit)
       via  c8fbb9c58bd72031b77d52327004ba441e71cdb9 (commit)
       via  a53c3efd4c1773a609f2929a61b7324504cc18eb (commit)
       via  99e7f928b1bdd7ca997c6ae403a691f90866eeb4 (commit)
       via  65d5ad70b65189177622c4886f2718a0130cdbae (commit)
       via  9bcd719faa3aa153ebbdbc06d131daab4738d432 (commit)
       via  8c85724700a39832d0e0c97a942dc5cc564d2282 (commit)
       via  55a79b817af6778212290b121d2674e58dec0a0a (commit)
       via  4011f07614ec5223858dd2f7d88376a95d2ad749 (commit)
       via  cc01ff2b91dde32d86306ce5c013b6bd041ec786 (commit)
       via  5af39bac74091095289a6aab44b3cfbefc016629 (commit)
       via  e76959bdbbfa9288523f8a884b82914ad3ae5298 (commit)
       via  19e5f77c5f8c785dd0a1ed3f92af814e18bc147b (commit)
       via  1be172f350150164c5d56e12d2b4614924821920 (commit)
       via  697202c115a58cf3f94d867c5e7ba4ab929e8b7c (commit)
       via  635c5290ab0e24ae72bea4b66cf69af6d2ba7d6c (commit)
       via  8e42db82d9a9e467f9b2f0c9730b3089bfc9ff00 (commit)
       via  f7199ade29131803652e8d8fba7996ed6484383a (commit)
       via  29260299c314bee90980f105baa345072fc35f84 (commit)
       via  40e2970eeebdc8b05ea10b7e0159faa2a3fa80bc (commit)
       via  6977e2200daa8f1a8cf7dd6d2bf2650ee346d313 (commit)
       via  722c26c4ef16074624f0606233a1671509289bd6 (commit)
       via  d0816520fc51991e386b844d8e06c66feb6af1c8 (commit)
       via  827f50fc113029628b21a0801a521aa4db33978b (commit)
       via  be8656fa7f7c0a76a913fb886062b79db5f35360 (commit)
       via  66dde9573ad70a0dfd3c381690668590b70a5449 (commit)
      from  70396650a2c556274ee075fa6d5babc6721edddb (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 8383e7546495a042f622826c95eee6274765b5d6
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Tue Sep 12 14:57:25 2017 +0200

    Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt
    
    Followup correcting a typo of previous patch :
      name="holdingbranch" options = branche
    it is branche[s]
    
    Test plan :
    - Look at 'Current location' in item search
    => Without patch you see only 'All libraries'
    => With patch you see 'All libraries' and each existing library, like in 'Home library'

commit 552af02c9f4e800d49334e3b87f50bb76da7bba8
Author: Marc V?ron <veron at veron.ch>
Date:   Thu Jun 29 15:22:54 2017 +0200

    Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt
    
    This patch removes entries like the following in translations of itemsearch.tt:
    "[%% INCLUDE form_field_select name=\"homebranch\" options = branches "
    "empty_option = \"All libraries\" %%] [%% INCLUDE form_field_select name="
    "\"holdingbranch\" options = branches empty_option = \"All libraries\" %%] %s "
    "[%% INCLUDE form_field_select name=\"location\" options = locations "
    "empty_option = \"All locations\" %%] %s "
    
    New patch on top of Bug 18633 that resolves parts of initial comment.
    
    To test:
    - Verify that in itemsearch.tt no tt directives are splitted by new lines
      (search for [% INCLUDE )
    - Verify that itemsearch.tt works as before
    
    Followed test plan and verified that tt directives are not split by new
    lines, the changes to the fieldset tags in comment 3 have been removed
    and itemtype.tt still works correctly as before
    
    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 286b6f4e3e8db593fbe218ab08c622e5491ac44d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 10 09:10:52 2016 +0100

    Bug 17249: GetKohaAuthorisedValuesFromField - rm GetAuthValCodeFromField
    
    The subroutine GetAuthValCodeFromField was only used from
    GetKohaAuthorisedValuesFromField.
    
    Test plan:
      git grep GetAuthValCodeFromField
    should not return any occurrences.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 65945e30f71fe353c995bab97a5b6a333326b570
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 10 12:10:46 2016 +0100

    Bug 17249: Remove GetKohaAuthorisedValuesFromField
    
    Remove the subroutine, it's no longer in used.
    
    Test plan:
      git grep GetKohaAuthorisedValuesFromField
    should not return any occurrences.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 38cbc453e0cc4a509fe267e32f3903393f449d41
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Sep 5 16:12:56 2016 +0100

    Bug 17249: Remove GetKohaAuthorisedValuesFromField - (follow-up) inventory
    
    Before this patch set, the tests in
    t/db_dependent/Items/GetItemsForInventory.t were executed in 4s. But
    with the previous patch, it was in 45sec(!)
    To make sure decrease this execution time to what it was before, this
    patch introduces a local to avoid the same query to be executed several
    times.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit a1b569f89eead58d274a6c75d2790bda94fc0c55
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 10 12:10:09 2016 +0100

    Bug 17249: Remove GetKohaAuthorisedValuesFromField - inventory
    
    This patch deals with the inventory files calling
    GetKohaAuthorisedValuesFromField.
    
    Test plan:
      prove t/db_dependent/Items/GetItemsForInventory.t
    should still return green
    
    Use the inventory tool, on the result page the AV descriptions should
    correctly replace the codes
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit c8fbb9c58bd72031b77d52327004ba441e71cdb9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 10 11:36:40 2016 +0100

    Bug 17249: Remove GetKohaAuthorisedValuesFromField - Add search_by_marc_field
    
    This patch adds a new Koha::AuthorisedValues->search_by_marc_field
    method.
    It will permit to replace several subroutine from C4::Koha dealing with
    authorised values.
    It also uses this new methods to replace an occurrence of
    GetKohaAuthorisedValuesFromField in C4::Record::marcrecord2csv
    
    Test plan:
      prove t/db_dependent/AuthorisedValues.t
    should return green
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit a53c3efd4c1773a609f2929a61b7324504cc18eb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 10 11:28:40 2016 +0100

    Bug 17249: Remove GetKohaAuthorisedValuesFromField - add tests
    
    This patch adds a few tests to C4::Record::marcrecord2csv
    The subroutine was not covered enough to validate that this patch set
    won't add regressions.
    
    Note that the patch set will fix an issue: If 2 subfields of a field are
    linked to AVs and you want to display them in a CSV, they won't be
    replaced with their descriptions.
    
    Test plan:
    Apply the patch, and make a copy of t/db_dependent/Record/marcrecord2csv.t
    Checkout master and prove marcrecord2csv.t
    Tests should fail
    Checkout the branch with the whole patch set applied
    The tests should pass
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 99e7f928b1bdd7ca997c6ae403a691f90866eeb4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 10 09:07:26 2016 +0100

    Bug 17249: Remove GetKohaAuthorisedValuesFromField - Add classes MarcSubfieldStructure[s]
    
    This patch adds the 2 Koha::Object based classes for the
    marc_subfield_structure table
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 65d5ad70b65189177622c4886f2718a0130cdbae
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 12:57:52 2017 +1200

    Bug 18927: Use fully qualified subroutine names in C4::Items
    
    rebuild_zebra.pl fails in some conditions (perl version?)
    I do not recreate but it has been reported that reindex fails with:
      error retrieving biblio 94540 at /usr/share/koha/bin/migration_tools/rebuild_zebra.pl line 683, <DATA> line 751.
    
    To fix it we can use fully qualified subroutine names for:
      GetMarcFromKohaField
      GetMarcBiblio
      GetBiblionumberFromItemnumber
      TransformKohaToMarc
      GetFrameworkCode
    
    Test plan:
    Confirm the rebuild_zebra script still works correctly after this patch
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit 9bcd719faa3aa153ebbdbc06d131daab4738d432
Author: Alex Sassmannshausen <alex.sassmannshausen at ptfs-europe.com>
Date:   Thu Aug 10 13:00:19 2017 +0200

    Bug 19073: (bug 15758 follow-up) Dereference correct value from Koha::Object.
    
    * tools/modborrowers.pl: Dereference 'branchcode' rather than
      'value'.
    
    Test Plan:
    - Carry out "Batch patron modification" with any number of patrons.
      + Change the library.
      + Hit Save.
    - The library will not have been updated.
    - Apply patch.
    - Run same modification.
    - The library will have been updated
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 8a328a20bf3a74268346104281688b2a81be80e6)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 111ab4e63257410bf7ca34e80e46675603072c36)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 8c85724700a39832d0e0c97a942dc5cc564d2282
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Thu Jul 6 08:48:18 2017 +0200

    Bug 18900: wrong number format in receiving order
    
    Bug 18471 added number formating in order receive.
    
    I found a bug generated by this.
    Koha::Number::Price defines methods to (un)format price depending on CurrencyFormat syspref.
    The bug is that for CurrencyFormat US, some params are not defined in this module so there are retrieved from system locale. If system locale is not en_US, the params will be wrong. For example fr_FR will define ',' as decimal and so saved unit price is divided by 1000.
    
    To recreate:
    - On a server with locale 'fr_FR'
    - With Plack mode
    - Set CurrencyFormat on 'US'
    - Open a basket
    - Place an order for an item
    - Close basket
    - Receive order with changing 'Actual Cost' to '1,234'
    - Note the 'Actual Cost' is now '1.23'
    - Run unit test t/Number/Price.t without and with patch
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 55a79b817af6778212290b121d2674e58dec0a0a
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Aug 9 12:01:17 2017 -0300

    Bug 18900: (QA followup) Make tests conditional to locale existence
    
    It is important to highlight that tests have been skipped instead of having them pass
    on the absence of the required fr_FR.UTF-8 locale installed on the system.
    
    This patch does that check and effectively skips them.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 4011f07614ec5223858dd2f7d88376a95d2ad749
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Thu Jul 6 08:44:51 2017 +0200

    Bug 18900: add UT to Number/Price.t
    
    This patch adds unit tests to t/Number/Price.t in order to valid the problem.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit cc01ff2b91dde32d86306ce5c013b6bd041ec786
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Jul 6 18:10:10 2017 -0300

    Bug 18906: Display all funds the logged in user can use
    
    There are complex conditions to know if a librarian can use a fund, we
    cannot do that with a SQL query, we need to use C4::Budgets::CanUserUseBudget
    
    When this patch is applied then all funds are visible to both
    superlibrarian patrons and patrons with all acq permissions
    
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 19a7b498e1f4355ab1e4ee0adb5db299613f3f5c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit d179da572b1d6bd7066d96f494aa805b86b92ae1)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 5af39bac74091095289a6aab44b3cfbefc016629
Author: David Cook <dcook at prosentient.com.au>
Date:   Thu Jul 27 11:58:28 2017 +1000

    Bug 18898 - Some permissions for Reports can be bypassed
    
    If you manually visit the following links when you only have
    permission to run reports, you'll still be able to access the ability
    to create and edit reports:
    
    /cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL
    /cgi-bin/koha/reports/guided_reports.pl?phase=Edit%20SQL
    
    This patch ties these 2 unaccounted for phases to the create_reports
    permission.
    
    With patch, issue no longer can be reproduced.
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 2fdfbaf0ddbf214c0efb9a3a3c2595a54517f795)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 4b71c9239708cd4d60190ed907fec03d1f8b08bc)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Conflicts:
    	reports/guided_reports.pl

commit e76959bdbbfa9288523f8a884b82914ad3ae5298
Author: Serhij Dubyk {?????? ?????} <serhijdubyk at gmail.com>
Date:   Tue Aug 22 17:19:32 2017 +0300

    Bug 17827 - Untranslatable "by" in MARC21slim2intranetResults.xsl
    
    Signed-off-by: Serhij Dubyk {?????? ?????} <serhijdubyk at gmail.com>
    
    The "by" after the title was not translatable in the result
    lists of the intranet. This patch fixes it by removing
    a comment, that caused a problem with the translation
    scripts.
    
    To test:
    Test:
    
    Before this patch in file en-GB-marc-MARC21.po present next paragraph:
    
    msgid "by "
    msgstr " by "
    
    According string "by " in the file MARC21slim2intranetResults.xsl can not be translated (in other languages).
    
    After applying this patch performed next command:
    cd /usr/share/koha/misc/translator
    sudo env KOHA_CONF=/etc/koha/sites/mykohainstance/koha-conf.xml PERL5LIB=/usr/share/koha/lib perl -I /usr/share/koha/lib "./translate" update
    
    Now in the file en-GB-marc-MARC21.po present the following (modified) paragraph:
    
    msgid "by "
    msgstr " by "
    
    https://bugs.koha-community.org/show_bug.cgi?id=17827
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit d5ea914f4dc41f78dbb3a59f894f6ecbb9a1afa4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit afb2cb0c74b6a137652ec1a2e96fc480a5a50f96)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 19e5f77c5f8c785dd0a1ed3f92af814e18bc147b
Author: Marc V?ron <veron at veron.ch>
Date:   Mon Jun 12 07:48:57 2017 +0200

    Bug 18778 - Translatability: Get rid of tt directive in translation for item-status.inc
    
    The file opac-tmpl/bootstrap/en/includes/item-status.inc exposes a template directive where translators should not be confronted with.
    
    "%s %s [%%#- This include takes two parameters: an item structure and an "
    "optional loan (issue) structure. The issue structure is used by course "
    "reserves pages, which do not use an API to fetch items that populates item."
    "datedue. -%%] %s %s %s %s "
    
    This patch fixes new lines inside a tt directive (comment).
    It is merely a string patch.
    
    To test:
    Verify that the code changes make sense.
    (Bonus test: create a new language 'aa-AA', verify that line above does not
    show up in aa-AA-opac-bootstrap.po)
    
    NOTE: Followed test plan similar to bug 18776 comment 3.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit c8551645d5bdd3e6fb5b7e03280521a2fbaef636)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit b9ff28f719cb17d37e5eaecc4fb09b9032cc38e5)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 1be172f350150164c5d56e12d2b4614924821920
Author: Marc V?ron <veron at veron.ch>
Date:   Tue May 23 17:09:49 2017 +0200

    Bug 18660: Translatability: Get rid of template directives [%% in translation for patroncards-errors.inc
    
    Translation for koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc
    contains a lot of (partial) template directives like:
    %%]%s %sLayout: [%%
    
    This patch fixes it
    
    To test:
    - Verify that code changes make sense
    - Apply patch
    - Create a translation (cd misc/translator , then: perl translate create aa-AA
    - Verify that in po/aa-AA-staff-prog.po contains no fragments like %%] or [%%
      for patroncards-errors.inc
    - Try to get an error: Try a link like
      http://[YOUR SERVER]/cgi-bin/koha/patroncards/create-pdf.pl?batch_id=1&template_id=999&layout_id=999&start_card=1
      ...where template_id and layout_id do not exist
    
    (Amended for comment #2 2017-06-05 mv)
    (Amended for comment #6 2017-08-02 mv)
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 7e39bbc61aedd6383f4d6a1b4728711c6922e877)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 036b317c0c0e96b0eb344d767cca7f87da4fb875)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 697202c115a58cf3f94d867c5e7ba4ab929e8b7c
Author: Marc V?ron <veron at veron.ch>
Date:   Mon May 22 21:09:06 2017 +0200

    Bug 18652: Get rid of tt directive in translation for uncertainprice.tt
    
    Translation tool shows toe following for ncertainprice.tt
    0; url=[% scriptname %]?booksellerid=[% booksellerid %]
    
    This patch fixes it.
    
    To test:
    - Apply patch
    - Verify that code change makes sense
    - Verify that Home > Acquisitions > [vendor] > Uncertain prices for [vendor]
      works as before
    
    - Additional test (for a langunage 'aa-AA')
      perl translate create aa-AA
      verify that line 41 no longer appears in aa-AA-staff-prog.po
    
    Amended to switch from BLOCK to a template variable, see comment #5
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 2ee82801c7a8686523f9c5e95b0f43d44e52e4ab)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 4d427740196bb0a9bcfe80787af8cdf769c06b76)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 635c5290ab0e24ae72bea4b66cf69af6d2ba7d6c
Author: Marc V?ron <veron at veron.ch>
Date:   Fri Aug 4 10:52:13 2017 +0200

    Bug 18649: Translatability: Get rid of tt directive in translation for admin/categories.tt and onboardingstep2.tt
    
    New patch without trailing IF construction in tt directives as
    requested in comment #28
    
    To test: Verify that translation tool no longer shows tt directives as
    described in comment #1
    
    New patch, needs SO.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 79338bde3e01708fe331a54745f45c620c121805)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 0f9175c0b26e9e8d65bf39dab80d99e5d7455346)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 8e42db82d9a9e467f9b2f0c9730b3089bfc9ff00
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jul 10 14:15:09 2017 +0200

    Bug 18921: Resolve a few warnings in C4/XSLT.pm
    
    Resolves warnings like:
    
    Use of uninitialized value in hash element at C4/XSLT.pm line 262.
    Use of uninitialized value in numeric eq (==) at C4/XSLT.pm line 267.
    Use of uninitialized value $status in concatenation (.) or string at C4/XSLT.pm line 300.
    
    Note: Line numbers are not exactly the same anymore.
    
    Test plan:
    [1] Enable XSLT view in OPAC
    [2] Without this patch, you will probably have some of these warnings when
        doing some opac searches.
    [3] Apply this patch. Check the logs again.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 5f989a81dff29db78620057d70ed864b32486bc0)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 1c8287632ea36e6d2a8ade922fe129f5f792d6d3)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit f7199ade29131803652e8d8fba7996ed6484383a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Sep 11 16:08:41 2017 -0300

    Bug 18996: [16.11.x] use Koha::OldIssues instead of Koha::Old::Checkouts

commit 29260299c314bee90980f105baa345072fc35f84
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Aug 2 13:01:47 2017 +0200

    Bug 18996: [16.11.x] [QA Follow-up] Remove global variables from Message.t
    
    As per request of Colin in comment18, this patch makes the use of global
    variables in Message.t no longer needed.
    The three subtests are now completely independent and could well be moved
    to separate test scripts.
    
    Note: Strictly speaking, the use of global (package) variables could
    potentially introduce new bugs (e.g. if the value is modified outside the
    script). This seems not to be the case here, but we are safe now.
    
    Test plan:
    Run the test again.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Conflicts:
    	t/db_dependent/SIP/Message.t

commit 40e2970eeebdc8b05ea10b7e0159faa2a3fa80bc
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Sat Jul 29 13:38:31 2017 +0200

    Bug 18996: [16.11.x] Add checkin subtest in SIP/Message.t
    
    Variable $branch was not used.
    Promoted some global vars to our.
    Shared the branchcode between all three subtests now.
    The third subtest contains all six cases mentioned in the first patch.
    
    Test plan:
    Run t/db_dependent/SIP/Message.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Conflicts:
    	t/db_dependent/SIP/Message.t

commit 6977e2200daa8f1a8cf7dd6d2bf2650ee346d313
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Aug 1 14:10:56 2017 +0200

    Bug 18996: [16.11.x] Resolve an uninitialized warning from ILS/Item.pm
    
    From the syslog call on line 107/108. The field $item->{title} has not
    been initialized. When catching the warns in a test script with Test::Warn,
    I got:
        Use of uninitialized value $args[1] in sprintf at /usr/lib/x86_64-linux-gnu/perl/5.20/Sys/Syslog.pm line 423.
    
    This simply resolves the warning. We might have a closer look to this title
    field on another report though.
    
    Test plan:
    Run Message.t from the next patch without this fix. It will fail since the
    additional warning makes warnings_like return false.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 722c26c4ef16074624f0606233a1671509289bd6
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jul 28 10:29:51 2017 +0200

    Bug 18996: [16.11.x] Handle data corruption from old_issues at SIP checkin
    
    As per bug 18966 AddReturn returns false with a DataCorrupted message
    when the issue_id at hand already occurs in the old_issues table.
    This should be handled when returning an item via SIP too. SIP should
    not pretend that the checkin was successful, since this item needs
    special care.
    
    The following six different situations are handled:
    
    [1] An attempt to checkin an invalid barcode is handled as before. The
    ok flag is false; the screen message shows 'Invalid Item'.
    [2] We receive a DataCorrupted message: the alert type is set to the
    unused 98 code to indicate this new error condition. The ok flag
    is false; the screen message shows 'Checkin failed: data problem'.
    [3] The item checked in was not checked out AND the option checked_in_ok
    is active. The ok flag is set to true; no screen message.
    [4] The item checked in was not checked out AND the option checked_in_ok
    is not active. The ok flag is not changed (normally false); the screen
    message shows 'Item not checked out'.
    [5] (The regular checkin) The item was checked out and AddReturn returned
    true. The ok flag is true; no screen message.
    [6] ("Otherwise") The item was checked out, but AddReturn returned false.
    The ok flag is false; the screen message shows 'Checkin failed'.
    Note: Currently this case only refers to the Wrongbranch and withdrawn
    messages from AddReturn (where doreturn==0).
    
    Note: Situation 1 and 5 are unchanged. Behavior is slightly changed for
    situation 3 and 4; the option is only used when the item was not checked
    out. Situation 2 and situation 6 are changed. After bug 18966 SIP
    returned OK in case of data corruption (while checkin failed). In the
    remaining cases under [6] SIP also returned OK while checkin failed.
    
    Test plan:
    [1] Test all six cases listed above. In order to simulate data corruption
    insert the issue_id at hand in old_issues before you check in.
    In cases 3 and 4 you need to toggle the option in your SIPconfig.xml and
    restart the SIP server.
    Case 6 can be tested by checking out at branch A, adjusting the value
    of pref AllowReturnToBranch and checking in at branch B.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit d0816520fc51991e386b844d8e06c66feb6af1c8
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Aug 2 10:15:10 2017 +1200

    Bug 18046: CAS logout infinite redirect
    
    To test (You need a CAS server and CAS configured in Koha)
    
    1/ Login using CAS in Koha
    2/ Logout in Koha
    3/ Notice you get redirected again and again
    4/ Apply patch
    5/ Login with CAS, then logout
    6/ Notice logout works, but no longer infinitely redirected
    
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Patch has been in production use for several months
    on several instances. Fixes a critical bug.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Looks like a typical workaround, but evidently works.
    Not tested with CAS.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 13ca4962068b184f803b6588e53e39209a77f2b6)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit c87b963818076a58661922116893ff052b2d76a9)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 827f50fc113029628b21a0801a521aa4db33978b
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Wed Jun 7 11:29:46 2017 +0200

    Bug 18741: Fix loading of SQL files in web installer
    
    Test plan:
    1. Start a normal install using the web installer
    2. When asked to select data to load, verify that
       'message_transport_types' is checked, and check some optional data
       files
    3. Continue the install to the end
    4. Verify that message_transport_types is not empty, and that the
       optional data you checked is there
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit be8656fa7f7c0a76a913fb886062b79db5f35360
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Fri May 5 15:00:05 2017 +0200

    Bug 18551 - Hide with CSS dynamic elements in member search
    
    In member search page, the result table is in Ajax so fully managed by Javascript. There is also a yellow dialog message prepared in HTML.
    
    Thoses elements are hidden by JS code : ie $("#patron_list_dialog").hide().
    
    The problem is that the static page is first loaded an displayed then the JS code runs an hides the elements.
    On a low performance computer, this action is visible and looks like there is a blinking yellow message.
    
    I propose to hide with CSS so that thoses elements are not displayed in static page and are there shown in dynamic JS code.
    
    Test plan :
    Check display is unchanged :
    - Go to home page /cgi-bin/koha/members/members-home.pl
    - Perform patron search from header search box
    - Perform patron search by clicking on a letter
    - Perform patron search from filters (left of results table)
    - Select a patron and add it to a list => you see the yellow message
    
    Yellow message does no longer appear with this patch.
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Philippe <philippe.audet-fortin at inlibro.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 5cc536c68b221823f4335b5b5db1108521f88a71)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 66dde9573ad70a0dfd3c381690668590b70a5449
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Aug 7 13:50:32 2017 -0300

    Bug 19053: Keep auto_renew flag if a confirmation is needed
    
    If an item is checked out with the auto renewal flag and a confirmation
    is needed (holds exist, past due date, etc.) the auto renewal flag will
    get lost.
    
    Test plan:
    - Check an item out and specify a past due date
    - Confirm the checkout on the confirmation screen
    => Without this patch the checkout is not marked as auto renewal
    => With this patch applied the auto renewal flag will be set to the
    checkout
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 3808dbc1d22b3adc43a09ba7ce00aaca01f95f5a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 8f3a7d800271cb2611de0cb369e907b16c30fb0b)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

Summary of changes:
 C4/Auth_with_cas.pm                                |    1 +
 C4/Items.pm                                        |   38 ++--
 C4/Koha.pm                                         |   57 +-----
 C4/Record.pm                                       |   11 +-
 C4/SIP/ILS.pm                                      |   37 ++--
 C4/SIP/ILS/Item.pm                                 |    2 +-
 C4/SIP/ILS/Transaction/Checkin.pm                  |    4 +-
 C4/XSLT.pm                                         |    6 +-
 Koha/AuthorisedValues.pm                           |   18 ++
 Koha/{City.pm => MarcSubfieldStructure.pm}         |    6 +-
 ...blioFrameworks.pm => MarcSubfieldStructures.pm} |   10 +-
 Koha/Number/Price.pm                               |    3 +
 admin/aqbudgets.pl                                 |    3 +-
 circ/circulation.pl                                |    1 +
 installer/install.pl                               |    2 +-
 .../prog/en/includes/patroncards-errors.inc        |   58 +++---
 .../prog/en/modules/acqui/uncertainprice.tt        |    3 +-
 .../prog/en/modules/admin/categories.tt            |    6 +-
 .../prog/en/modules/catalogue/itemsearch.tt        |   31 +--
 .../prog/en/modules/circ/circulation.tt            |    1 +
 .../prog/en/modules/members/member.tt              |    4 +-
 .../prog/en/xslt/MARC21slim2intranetResults.xsl    |    2 +-
 .../bootstrap/en/includes/item-status.inc          |   10 +-
 misc/migration_tools/rebuild_zebra.pl              |   10 +-
 reports/guided_reports.pl                          |    2 +-
 t/Number/Price.t                                   |   22 ++-
 t/db_dependent/AuthorisedValues.t                  |   35 +++-
 t/db_dependent/Items/GetItemsForInventory.t        |   12 +-
 t/db_dependent/Koha/MarcSubfieldStructures.t       |   57 ++++++
 t/db_dependent/Record/marcrecord2csv.t             |   42 +++-
 t/db_dependent/SIP/Message.t                       |  208 +++++++++++++++++---
 tools/inventory.pl                                 |    5 +-
 tools/modborrowers.pl                              |    2 +-
 33 files changed, 500 insertions(+), 209 deletions(-)
 copy Koha/{City.pm => MarcSubfieldStructure.pm} (86%)
 copy Koha/{BiblioFrameworks.pm => MarcSubfieldStructures.pm} (80%)
 create mode 100644 t/db_dependent/Koha/MarcSubfieldStructures.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 20 06:05:14 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 20 Sep 2017 04:05:14 +0000
Subject: [koha-commits] main Koha release repository branch 16.05.x updated.
	v16.05.16-60-g8f87903
Message-ID: <E1duWGA-000385-Gp@git.koha-community.org>

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  8f87903968fe19a801dbd14246321bf585c679e6 (commit)
       via  251619575c423b4ac58505ee031533608322d160 (commit)
       via  4b19e4bb6a0582ddeb94fc94bdcfb0c4448ef372 (commit)
       via  3ecc48ed5b01c9d03108cd94b943ade3f535f644 (commit)
       via  644d9e938edb60826be98823068db04e38bb6424 (commit)
       via  e362ade666b7181d9b4b1d89e89968eefb134eb9 (commit)
       via  687946bd9b48ed9e1c9b6663961463ef1913ae88 (commit)
       via  566980bc2744a8067be338f432c3a391db2aae42 (commit)
       via  ffedb03412b100d296f64a3f7e4eeecde3f5680d (commit)
       via  ceb5b6cc82fb32dbb9899ad500fe2cc7a6c6008b (commit)
       via  4d7b768750685ea11554831f7ed7fcb6796b3f7b (commit)
       via  c127306b540cc0ee7cda9f7b14cd2c9bb47b99a1 (commit)
       via  5caf641f7ddfe4d0b924e37dae2d799bdd6f3d8f (commit)
       via  8dc404940d03bb81b1ecfc987484f8bf9781bcca (commit)
       via  280750052a28ae10aa305b9a0fab681983453e86 (commit)
       via  12d677ba88e9387b63a5bad2aa508a6985ed5b4c (commit)
       via  3a1f035038636c57a78350effccbaa903e6b835f (commit)
       via  5ffa9b924cf4bed72f105dc711ca7dd03ee373c5 (commit)
       via  75ca6a17ad080246197ec6664ad19a96785cfbcd (commit)
       via  5a58f35afc6935f714e4724f098af447107e2043 (commit)
       via  8675e0c4679835fdfd31a96ec0a7f63ac4b944a0 (commit)
       via  174f1eda3ba2186f75fccf246cb299256c2d28c9 (commit)
       via  9ce88fb28a7260ea268d6f34d09d740ca63899e7 (commit)
       via  a7bf6705a3b013105f3ce9e48a28e8e9c8912498 (commit)
       via  4c8e2f74d9cc8e4833dd62d9faa60437c97307ec (commit)
       via  0eb03b0817561fc37c77bf551a09d816d41c4117 (commit)
       via  c532e5f0abbe5a84834cfab99d021af03d499afb (commit)
       via  1deab6d87f13ced3da4dc29ef30978867a95145c (commit)
       via  683f9ec507276af1737d6fba4ba653a38557bf78 (commit)
      from  8383e7546495a042f622826c95eee6274765b5d6 (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 8f87903968fe19a801dbd14246321bf585c679e6
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:59:43 2017 +1200

    Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - Add classes MarcSubfieldStructure[s]"
    
    This reverts commit 99e7f928b1bdd7ca997c6ae403a691f90866eeb4.

commit 251619575c423b4ac58505ee031533608322d160
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:59:35 2017 +1200

    Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - add tests"
    
    This reverts commit a53c3efd4c1773a609f2929a61b7324504cc18eb.

commit 4b19e4bb6a0582ddeb94fc94bdcfb0c4448ef372
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:59:27 2017 +1200

    Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - Add search_by_marc_field"
    
    This reverts commit c8fbb9c58bd72031b77d52327004ba441e71cdb9.

commit 3ecc48ed5b01c9d03108cd94b943ade3f535f644
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:59:19 2017 +1200

    Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - inventory"
    
    This reverts commit a1b569f89eead58d274a6c75d2790bda94fc0c55.

commit 644d9e938edb60826be98823068db04e38bb6424
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:59:11 2017 +1200

    Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - (follow-up) inventory"
    
    This reverts commit 38cbc453e0cc4a509fe267e32f3903393f449d41.

commit e362ade666b7181d9b4b1d89e89968eefb134eb9
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:59:04 2017 +1200

    Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField"
    
    This reverts commit 65945e30f71fe353c995bab97a5b6a333326b570.

commit 687946bd9b48ed9e1c9b6663961463ef1913ae88
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:58:54 2017 +1200

    Revert "Bug 17249: GetKohaAuthorisedValuesFromField - rm GetAuthValCodeFromField"
    
    This reverts commit 286b6f4e3e8db593fbe218ab08c622e5491ac44d.

commit 566980bc2744a8067be338f432c3a391db2aae42
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 10:35:10 2017 -0300

    Bug 19128: XSS - admin/authorised_values.tt

commit ffedb03412b100d296f64a3f7e4eeecde3f5680d
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 14:34:17 2017 +0200

    Bug 19128 - XSS - patron-attr-types.tt, authorised_values.tt and categories.tt
    
    Preparation:
    - Add a branch with script in the branch name
    - Add a patron category with script in the category name
    - Add a new authorised value cateogory with script
    - Add a new authroised value for this category with script
      in all possible fields
    
    - Test editing patron categories
    - Test editing patron attribute types
    - Test viewing and editing authorised values
    
    Verify that with this script there is no more script executed
    and everything works fine.
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit ceb5b6cc82fb32dbb9899ad500fe2cc7a6c6008b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 11:21:27 2017 -0300

    Bug 19127: (follow-up) Stored XSS in csv-profiles.pl
    
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 4d7b768750685ea11554831f7ed7fcb6796b3f7b
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Wed Aug 16 17:56:17 2017 +0530

    Bug 19127 - Stored XSS in csv-profiles.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/tools/csv-profiles.pl?op=add_form
    2. Add a text in the field Profile name, Profile description
       and Profile MARC fields that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit c127306b540cc0ee7cda9f7b14cd2c9bb47b99a1
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 12:05:50 2017 +0200

    Bug 19125 - XSS - members.pl
    
    In preparation to test this patch:
    - Add a patron list named <script>alert("patron list")</script>
    - Add a library named <script>alert("library")</script>
    - Add a patron category named <script>alert("patron category")</script>
    
    To test:
    - Access patron search page and do a search
    - Verify that the alerts added above are executed
    - Apply patch
    - Verify that no alerts are displayed
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 5caf641f7ddfe4d0b924e37dae2d799bdd6f3d8f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 11:06:11 2017 -0300

    Bug 19108: (follow-up) Stored XSS in biblio_framework.pl
    
    Prevent software error
    Template process failed: undef error - text: filter not found at
    /home/vagrant/kohaclone/C4/Templates.pm line 121.
    
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 8dc404940d03bb81b1ecfc987484f8bf9781bcca
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 14:37:50 2017 +0530

    Bug 19108 - Stored XSS in biblio_framework.pl and marctagstructure.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/biblio_framework.pl?op=add_form
    2. Add a text in the field Description that contains js
    3. Save the page.
    4. Notice js is execute
    5. Click on Actions -> MARC structure
    6. Apply patch and reload, the js is escaped
    
    Fixed for both the pages biblio_framework.pl and marctagstructure.pl
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 280750052a28ae10aa305b9a0fab681983453e86
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 14:10:43 2017 +0530

    Bug 19108 - Stored XSS in fieldmapping.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/fieldmapping.pl
    2. Add a text in the field Field name that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 12d677ba88e9387b63a5bad2aa508a6985ed5b4c
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 14:06:47 2017 +0530

    Bug 19108 - Stored XSS in authtypes.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/authtypes.pl?op=add_form
    2. Add a text in the field Description that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 3a1f035038636c57a78350effccbaa903e6b835f
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 13:55:45 2017 +0530

    Bug 19108 - Stored XSS in classsources.pl
    
    Fixed for both Classification sources & Classification filing rules
    
    To Test
    1. first case classification source: Hit the page
       /cgi-bin/koha/admin/classsources.pl?op=add_source
       second case classification filing rules:
       Hit the page /cgi-bin/koha/admin/classsources.pl?op=add_sort_rule
    2. Add a text in the field Description that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 5ffa9b924cf4bed72f105dc711ca7dd03ee373c5
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 13:49:10 2017 +0530

    Bug 19108 - Stored XSS in items_search_fields.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/items_search_fields.pl
    2. Add a text in the field Name and Label that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Fixed for new and edit page
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 75ca6a17ad080246197ec6664ad19a96785cfbcd
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 13:33:57 2017 +0530

    Bug 19108 - Stored XSS in oai_sets.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/oai_sets.pl
    2. Click on New set
    3. Add a text in the field setSpec, setName that contains js
    4. Save the page.
    5. Notice js is execute
    6. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 5a58f35afc6935f714e4724f098af447107e2043
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 10:58:24 2017 -0300

    Bug 19103: (follow-up) Stored XSS in itemtypes.pl
    
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 8675e0c4679835fdfd31a96ec0a7f63ac4b944a0
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 10:15:54 2017 +0530

    Bug 19103 - Stored XSS in matching-rules.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/matching-rules.pl
    2. Click on new record matching rule
    3. Add a text in the field Description that contain js.
    4. Save the page.
    5. Notice js is execute
    6. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 174f1eda3ba2186f75fccf246cb299256c2d28c9
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 10:07:45 2017 +0530

    Bug 19103 - Stored XSS in patron-attr-types.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/patron-attr-types.pl
    2. Click on new patron attribute type
    2. Add a text in the field Description that contain js.
    2. Save the page.
    3. Notice js is execute
    4. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 9ce88fb28a7260ea268d6f34d09d740ca63899e7
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 08:52:40 2017 +0530

    Bug 19103 - Stored XSS in itemtypes.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/itemtypes.pl
    2. Add a text in the field Description, Checkin message that contains js
    2. Save the page.
    3. Notice js is execute
    4. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit a7bf6705a3b013105f3ce9e48a28e8e9c8912498
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 13:07:18 2017 +0200

    Bug 19086 - Follow-up - subscription-detail.pl
    
    Add script to the callnumber field on adding a subscription.
    
    Verify script is executed without this patch, but not with it.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit 4c8e2f74d9cc8e4833dd62d9faa60437c97307ec
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 12:59:13 2017 +0200

    Bug 19086 - Follow-up - XSS in supplier.tt
    
    In preparation:
    Make sure you enter <script>alert("sth")</script>
    in all fields of a new vendor that are not validated
    and save.
    
    1) Access vendor summary page.
    2) Verify scripts are executed
    3) Apply patch
    4) Verify scripts are on longer executed
    
    This works in combination with the other patches for XSS
    on this bug.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit 0eb03b0817561fc37c77bf551a09d816d41c4117
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 02:44:11 2017 +0530

    Bug 19086 Stored XSS in subscription-add.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/serials/subscription-add.pl
    2. Add a text in the field Public note and Nonpublic note
       that contains js (Internalnotes, notes)
    2. Save the page.
    3. Notice js is execute
    4. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit c532e5f0abbe5a84834cfab99d021af03d499afb
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 02:33:59 2017 +0530

    Bug 19086 Stored XSS in supplier.pl
    
    1. Hit the page /cgi-bin/koha/acqui/supplier.pl?op=enter
    2. Add a text in the field company_postal, physical, company_fax,
       accountnumber, contactposition, contact_fax, contact_notes, notes that contains java script
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit 1deab6d87f13ced3da4dc29ef30978867a95145c
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date:   Fri Aug 11 19:54:34 2017 +0000

    Bug 19086 Stored XSS in circulation.pl
    
    1/ To test add a message to a borrower that contains js
    2/ hit /cgi-bin/koha/circ/circulation.pl?borrowernumber=[number]
      where number is the borrowernumber of the borrower you set the message
      for
    3/ Notice js is execute
    4/ Apply patch, reload, js is escaped
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 683f9ec507276af1737d6fba4ba653a38557bf78
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date:   Fri Aug 11 19:36:43 2017 +0000

    Bug 19086 XSS in members/member.pl
    
    To test
    1/ hit /cgi-bin/koha/members/member.pl?&searchmember=<script>alert('XSS Payload')</script>
    2/ Notice js is executed
    3/ Apply patch, reload
    4/ js is now escaped
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

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

Summary of changes:
 C4/Koha.pm                                         |   57 +++++++++++++++++++-
 C4/Record.pm                                       |   11 ++--
 Koha/AuthorisedValues.pm                           |   18 -------
 Koha/MarcSubfieldStructure.pm                      |   44 ---------------
 Koha/MarcSubfieldStructures.pm                     |   50 -----------------
 .../en/includes/admin-items-search-field-form.inc  |    4 +-
 .../prog/en/includes/patron-search.inc             |    2 +-
 .../prog/en/includes/patron-toolbar.inc            |    2 +-
 .../prog/en/modules/acqui/supplier.tt              |   32 +++++------
 .../prog/en/modules/admin/authorised_values.tt     |   28 +++++-----
 .../prog/en/modules/admin/authtypes.tt             |    4 +-
 .../prog/en/modules/admin/biblio_framework.tt      |   12 ++---
 .../prog/en/modules/admin/categories.tt            |    4 +-
 .../prog/en/modules/admin/classsources.tt          |    4 +-
 .../prog/en/modules/admin/fieldmapping.tt          |    2 +-
 .../prog/en/modules/admin/items_search_field.tt    |    4 +-
 .../prog/en/modules/admin/items_search_fields.tt   |    6 +--
 .../prog/en/modules/admin/itemtypes.tt             |    4 +-
 .../prog/en/modules/admin/marctagstructure.tt      |   18 +++----
 .../prog/en/modules/admin/matching-rules.tt        |    2 +-
 .../prog/en/modules/admin/oai_set_mappings.tt      |    2 +-
 .../prog/en/modules/admin/oai_sets.tt              |   10 ++--
 .../prog/en/modules/admin/patron-attr-types.tt     |   12 ++---
 .../prog/en/modules/circ/circulation.tt            |    2 +-
 .../prog/en/modules/members/member.tt              |   10 ++--
 .../prog/en/modules/serials/subscription-detail.tt |    6 +--
 .../prog/en/modules/tools/csv-profiles.tt          |   12 ++---
 t/db_dependent/AuthorisedValues.t                  |   35 +-----------
 t/db_dependent/Items/GetItemsForInventory.t        |   12 +----
 t/db_dependent/Koha/MarcSubfieldStructures.t       |   57 --------------------
 t/db_dependent/Record/marcrecord2csv.t             |   42 +--------------
 tools/inventory.pl                                 |    5 +-
 32 files changed, 155 insertions(+), 358 deletions(-)
 delete mode 100644 Koha/MarcSubfieldStructure.pm
 delete mode 100644 Koha/MarcSubfieldStructures.pm
 delete mode 100644 t/db_dependent/Koha/MarcSubfieldStructures.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 20 06:28:22 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 20 Sep 2017 04:28:22 +0000
Subject: [koha-commits] main Koha release repository branch 16.05.x updated.
	v16.05.16-38-g1aee520
Message-ID: <E1duWcY-0003TH-Ps@git.koha-community.org>

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
  discards  8f87903968fe19a801dbd14246321bf585c679e6 (commit)
  discards  251619575c423b4ac58505ee031533608322d160 (commit)
  discards  4b19e4bb6a0582ddeb94fc94bdcfb0c4448ef372 (commit)
  discards  3ecc48ed5b01c9d03108cd94b943ade3f535f644 (commit)
  discards  644d9e938edb60826be98823068db04e38bb6424 (commit)
  discards  e362ade666b7181d9b4b1d89e89968eefb134eb9 (commit)
  discards  687946bd9b48ed9e1c9b6663961463ef1913ae88 (commit)
  discards  566980bc2744a8067be338f432c3a391db2aae42 (commit)
  discards  ffedb03412b100d296f64a3f7e4eeecde3f5680d (commit)
  discards  ceb5b6cc82fb32dbb9899ad500fe2cc7a6c6008b (commit)
  discards  4d7b768750685ea11554831f7ed7fcb6796b3f7b (commit)
  discards  c127306b540cc0ee7cda9f7b14cd2c9bb47b99a1 (commit)
  discards  5caf641f7ddfe4d0b924e37dae2d799bdd6f3d8f (commit)
  discards  8dc404940d03bb81b1ecfc987484f8bf9781bcca (commit)
  discards  280750052a28ae10aa305b9a0fab681983453e86 (commit)
  discards  12d677ba88e9387b63a5bad2aa508a6985ed5b4c (commit)
  discards  3a1f035038636c57a78350effccbaa903e6b835f (commit)
  discards  5ffa9b924cf4bed72f105dc711ca7dd03ee373c5 (commit)
  discards  75ca6a17ad080246197ec6664ad19a96785cfbcd (commit)
  discards  5a58f35afc6935f714e4724f098af447107e2043 (commit)
  discards  8675e0c4679835fdfd31a96ec0a7f63ac4b944a0 (commit)
  discards  174f1eda3ba2186f75fccf246cb299256c2d28c9 (commit)
  discards  9ce88fb28a7260ea268d6f34d09d740ca63899e7 (commit)
  discards  a7bf6705a3b013105f3ce9e48a28e8e9c8912498 (commit)
  discards  4c8e2f74d9cc8e4833dd62d9faa60437c97307ec (commit)
  discards  0eb03b0817561fc37c77bf551a09d816d41c4117 (commit)
  discards  c532e5f0abbe5a84834cfab99d021af03d499afb (commit)
  discards  1deab6d87f13ced3da4dc29ef30978867a95145c (commit)
  discards  683f9ec507276af1737d6fba4ba653a38557bf78 (commit)
       via  1aee520991070cd94117a5e43f73ca51bc3898f3 (commit)
       via  a9b528b0e8ea7a61663f424f63ae4cf726c547b5 (commit)
       via  35fa395740deff928e19f7f8b4676d382370405e (commit)
       via  48909d828e7f08036718e94a7c4112c844311098 (commit)
       via  80b160ae02d43962d01fc2f9180ab4c748037ae5 (commit)
       via  5ae46b8a34f8014fa58ec4ec9a6136933448b23d (commit)
       via  38550b8f2c8c32e1ec23ce7fb3fda3f9df97fc0e (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (8f87903968fe19a801dbd14246321bf585c679e6)
            \
             N -- N -- N (1aee520991070cd94117a5e43f73ca51bc3898f3)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 1aee520991070cd94117a5e43f73ca51bc3898f3
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:59:43 2017 +1200

    Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - Add classes MarcSubfieldStructure[s]"
    
    This reverts commit 99e7f928b1bdd7ca997c6ae403a691f90866eeb4.

commit a9b528b0e8ea7a61663f424f63ae4cf726c547b5
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:59:35 2017 +1200

    Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - add tests"
    
    This reverts commit a53c3efd4c1773a609f2929a61b7324504cc18eb.

commit 35fa395740deff928e19f7f8b4676d382370405e
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:59:27 2017 +1200

    Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - Add search_by_marc_field"
    
    This reverts commit c8fbb9c58bd72031b77d52327004ba441e71cdb9.

commit 48909d828e7f08036718e94a7c4112c844311098
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:59:19 2017 +1200

    Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - inventory"
    
    This reverts commit a1b569f89eead58d274a6c75d2790bda94fc0c55.

commit 80b160ae02d43962d01fc2f9180ab4c748037ae5
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:59:11 2017 +1200

    Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - (follow-up) inventory"
    
    This reverts commit 38cbc453e0cc4a509fe267e32f3903393f449d41.

commit 5ae46b8a34f8014fa58ec4ec9a6136933448b23d
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:59:04 2017 +1200

    Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField"
    
    This reverts commit 65945e30f71fe353c995bab97a5b6a333326b570.

commit 38550b8f2c8c32e1ec23ce7fb3fda3f9df97fc0e
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:58:54 2017 +1200

    Revert "Bug 17249: GetKohaAuthorisedValuesFromField - rm GetAuthValCodeFromField"
    
    This reverts commit 286b6f4e3e8db593fbe218ab08c622e5491ac44d.

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

Summary of changes:
 .../en/includes/admin-items-search-field-form.inc  |    4 +--
 .../prog/en/includes/patron-search.inc             |    2 +-
 .../prog/en/includes/patron-toolbar.inc            |    2 +-
 .../prog/en/modules/acqui/supplier.tt              |   32 ++++++++++----------
 .../prog/en/modules/admin/authorised_values.tt     |   28 ++++++++---------
 .../prog/en/modules/admin/authtypes.tt             |    4 +--
 .../prog/en/modules/admin/biblio_framework.tt      |   12 ++++----
 .../prog/en/modules/admin/categories.tt            |    4 +--
 .../prog/en/modules/admin/classsources.tt          |    4 +--
 .../prog/en/modules/admin/fieldmapping.tt          |    2 +-
 .../prog/en/modules/admin/items_search_field.tt    |    4 +--
 .../prog/en/modules/admin/items_search_fields.tt   |    6 ++--
 .../prog/en/modules/admin/itemtypes.tt             |    4 +--
 .../prog/en/modules/admin/marctagstructure.tt      |   18 +++++------
 .../prog/en/modules/admin/matching-rules.tt        |    2 +-
 .../prog/en/modules/admin/oai_set_mappings.tt      |    2 +-
 .../prog/en/modules/admin/oai_sets.tt              |   10 +++---
 .../prog/en/modules/admin/patron-attr-types.tt     |   12 ++++----
 .../prog/en/modules/circ/circulation.tt            |    2 +-
 .../prog/en/modules/members/member.tt              |   10 +++---
 .../prog/en/modules/serials/subscription-detail.tt |    6 ++--
 .../prog/en/modules/tools/csv-profiles.tt          |   12 ++++----
 22 files changed, 91 insertions(+), 91 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Sep 20 21:15:43 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 20 Sep 2017 19:15:43 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v17.05.00-631-g164b136
Message-ID: <E1dukTH-0002Y5-US@git.koha-community.org>

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, master has been updated
       via  164b13690ab133b499ebeb2a809c8c8649debbfe (commit)
       via  779089a62af26e2566d60340773331d25316a09a (commit)
       via  50a2efdcc1e39c2e2994da637e54150d00b4e419 (commit)
      from  402c7f756707eb3205b1ddc4a2d1f2df54a32daf (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 164b13690ab133b499ebeb2a809c8c8649debbfe
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Sep 20 12:45:24 2017 -0300

    Bug 19119: Remove definitions.t
    
    This patch removes t/db_dependent/api/v1/swagger/definitions.t
    
    Its goal is not simple to achieve, and worth moving into the QA tools instead.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 779089a62af26e2566d60340773331d25316a09a
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Sep 20 09:15:42 2017 -0300

    Bug 18508: Fix t/db_dependent/api/v1/swagger/definitions.t (follow-up of 6758)
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 50a2efdcc1e39c2e2994da637e54150d00b4e419
Author: Lari Taskula <lari.taskula at jns.fi>
Date:   Fri Apr 28 12:33:33 2017 +0000

    Bug 18508: Fix t/db_dependent/api/v1/swagger/definitions.t (follow-up of 18137)
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 api/v1/swagger/definitions/patron.json      |    4 +
 t/db_dependent/api/v1/swagger/definitions.t |  125 ---------------------------
 2 files changed, 4 insertions(+), 125 deletions(-)
 delete mode 100644 t/db_dependent/api/v1/swagger/definitions.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep 21 17:52:55 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 21 Sep 2017 15:52:55 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v17.05.00-644-gb4e525e
Message-ID: <E1dv3mZ-0002xs-AV@git.koha-community.org>

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, master has been updated
       via  b4e525e4f6382a421cb7e77632fca8ecaaf8f3d6 (commit)
       via  256c66752f2817892b03938edb375b234a616fcd (commit)
       via  2bf98402a2d98461b638a584413184b57beaee17 (commit)
       via  47b6026c6a3d57cfc86d90fcb72c0d68266b214c (commit)
       via  fbda925f85ec96651483bd51efed5853b34e8dfb (commit)
       via  6c93ea0be10080817cc84a75f5e99c69655d012e (commit)
       via  2918cc9c2712d5b658a207b15dcd63718b8f952e (commit)
       via  1f9e262ab5d3ac8aa95c771e236693135a2a2c1b (commit)
       via  047508bb8d6f3cedfe50d7be360972cd8df3d68a (commit)
       via  b007919e35c7588b0d95c5257b5334e26a38300b (commit)
       via  915963ba7f1580f8d7aaa0b5563c974b7254874a (commit)
       via  e2fc5247012a99b4242370248a061681d84174f2 (commit)
       via  ea6c6f3026adce1f0eecf58752f7ae01494d60ed (commit)
      from  164b13690ab133b499ebeb2a809c8c8649debbfe (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 b4e525e4f6382a421cb7e77632fca8ecaaf8f3d6
Author: Lari Taskula <lari.taskula at jns.fi>
Date:   Thu Mar 16 13:53:44 2017 +0200

    Bug 18282: operationId must be unique
    
    operationId has the following documentation:
     "Unique string used to identify the operation. The id MUST be unique among all
      operations described in the API."
    
    This patch modifies operationIds to be unique accross our API operations.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 256c66752f2817892b03938edb375b234a616fcd
Author: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
Date:   Fri Mar 17 08:09:05 2017 +0200

    Bug 18290: Fix t/db_dependent/Koha/Object.t, Mojo::JSON::Bool is a JSON::PP::Boolean :)
    
    Mojolicious 7.21 onwards, no longer returns Mojo::JSON::Bool-objects but JSON::PP instead.
    Which might be pretty smart.
    
    This version is required by bug 18137 and so this patch for the tests is
    needed.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Tested along with 18137 and its dependencies (libs).
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 2bf98402a2d98461b638a584413184b57beaee17
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Aug 9 11:11:13 2017 -0300

    Bug 18137: (QA followup) Make sure the session exists and is expired on expiration tests
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Lari Taskula <lari.taskula at jns.fi>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 47b6026c6a3d57cfc86d90fcb72c0d68266b214c
Author: Lari Taskula <lari.taskula at jns.fi>
Date:   Fri Feb 17 13:14:09 2017 +0200

    Bug 18137: List Mojolicious::Plugin::OpenAPI and JSON::Validator as dependencies
    
    Edit (tcohen): I've changed the version numbers to match those Mirko has already
    successfully packaged and are known to work for this patchset.
    
    Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit fbda925f85ec96651483bd51efed5853b34e8dfb
Author: Lari Taskula <lari.taskula at jns.fi>
Date:   Thu Mar 16 14:24:52 2017 +0200

    Bug 18137: (follow-up) Sort definitions.json
    
    Before this file grows, we should sort it alphabetically.
    
    To test:
    1. prove t/db_dependent/api/v1
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 6c93ea0be10080817cc84a75f5e99c69655d012e
Author: Lari Taskula <lari.taskula at jns.fi>
Date:   Tue Mar 7 13:31:04 2017 +0200

    Bug 18137: (QA-follow-up) Fix pod fail
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 2918cc9c2712d5b658a207b15dcd63718b8f952e
Author: Lari Taskula <lari.taskula at jns.fi>
Date:   Tue Mar 7 13:37:09 2017 +0200

    Bug 18137: (follow-up) Fix handling DBIx::Class::Exception messages
    
    - DBIx::Class::Exception should use ->{msg}
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 1f9e262ab5d3ac8aa95c771e236693135a2a2c1b
Author: Lari Taskula <lari.taskula at jns.fi>
Date:   Tue Feb 21 19:55:28 2017 +0200

    Bug 18137: Remove x-mojo-around-action
    
    Mojolicious::Plugin::OpenAPI does not support x-mojo-around action. This patch
    removes it from our specification document.
    
    Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 047508bb8d6f3cedfe50d7be360972cd8df3d68a
Author: Lari Taskula <lari.taskula at jns.fi>
Date:   Mon Feb 20 20:07:26 2017 +0200

    Bug 18137: Make /holds Mojolicious::Plugin::OpenAPI compatible
    
    Also
    - adding some missing and new response definitions into Swagger spec.
    - fixing failing tests due to Bug 17932's change of boolean values
    
    To test:
    1. prove t/db_dependent/api/v1/holds.t
    
    Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit b007919e35c7588b0d95c5257b5334e26a38300b
Author: Lari Taskula <lari.taskula at jns.fi>
Date:   Mon Feb 20 19:58:28 2017 +0200

    Bug 18137: Make /cities Mojolicious::Plugin::OpenAPI compatible
    
    Also:
    - adding some missing and new response definitions into Swagger spec.
    
    To test:
    1. prove t/db_dependent/api/v1/cities.t
    
    Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 915963ba7f1580f8d7aaa0b5563c974b7254874a
Author: Lari Taskula <lari.taskula at jns.fi>
Date:   Fri Feb 17 14:59:24 2017 +0200

    Bug 18137: Make /patrons Mojolicious::Plugin::OpenAPI compatible
    
    Also:
    - adding some missing and new response definitions into Swagger spec.
    - fixing failing test due to Bug 17932's change of boolean values
    
    To test:
    1. prove t/db_dependent/api/v1/patrons.t
    
    Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit e2fc5247012a99b4242370248a061681d84174f2
Author: Lari Taskula <lari.taskula at jns.fi>
Date:   Fri Feb 17 14:36:36 2017 +0200

    Bug 18137: Migrate from Swagger2 to Mojolicious::Plugin::OpenAPI
    
    This patch migrates from Swagger2 to Mojolicious::Plugin::OpenAPI as Swagger2 is
    no longer actively maintained.
    
    This migration involves some minor changes to our Swagger specification documents
    and to controllers. Each operation is migrated in following patches separately.
    Please see Mojolicious::Plugin::OpenAPI and its tutorial for more documentation.
    
    The patch also refactors some API authentication -related code by taking advantage
    of Koha::Exceptions. Authentication is now handled via Mojolicious's "under->to"
    functionality. The actual authentication & authorization checks are moved to
    Koha::REST::V1::Auth. Added a HTTP 503 response for when database update is
    required, instead of returning an authentication failure as before.
    
    To test:
    1. prove t/db_dependent/api/v1/auth.t
    
    Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ea6c6f3026adce1f0eecf58752f7ae01494d60ed
Author: Lari Taskula <lari.taskula at jns.fi>
Date:   Fri Feb 17 14:34:42 2017 +0200

    Bug 18137: Add useful Koha::Exceptions
    
    Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 C4/Installer/PerlDependencies.pm  |   11 +-
 Koha/Exceptions.pm                |    9 ++
 Koha/Exceptions/Authentication.pm |   21 ++++
 Koha/Exceptions/Authorization.pm  |   18 +++
 Koha/REST/V1.pm                   |  248 +------------------------------------
 Koha/REST/{V1.pm => V1/Auth.pm}   |  159 +++++++++++++++---------
 Koha/REST/V1/Cities.pm            |   71 ++++++-----
 Koha/REST/V1/Hold.pm              |   59 +++++----
 Koha/REST/V1/Patron.pm            |   17 ++-
 api/v1/swagger/definitions.json   |   14 +--
 api/v1/swagger/paths/cities.json  |   74 ++++++++---
 api/v1/swagger/paths/holds.json   |   90 +++++++++++++-
 api/v1/swagger/paths/patrons.json |   38 ++++++
 api/v1/swagger/swagger.json       |    1 -
 t/db_dependent/Koha/Object.t      |    4 +-
 t/db_dependent/api/v1/auth.t      |  116 +++++++++++++++++
 t/db_dependent/api/v1/cities.t    |    2 +-
 t/db_dependent/api/v1/patrons.t   |    2 +-
 18 files changed, 555 insertions(+), 399 deletions(-)
 create mode 100644 Koha/Exceptions/Authentication.pm
 create mode 100644 Koha/Exceptions/Authorization.pm
 copy Koha/REST/{V1.pm => V1/Auth.pm} (65%)
 create mode 100644 t/db_dependent/api/v1/auth.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 22 10:11:06 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 22 Sep 2017 08:11:06 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.03-80-gd426333
Message-ID: <E1dvJ3C-0005Kj-Re@git.koha-community.org>

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, 17.05.x has been updated
       via  d4263336057d47a498fdbec76b4d4cc806edd87b (commit)
       via  7ed629c2e203100caf1789e952e6c30b9b45d080 (commit)
       via  521d1e52ef8744011f04aa50e2d55a2ffc2a325b (commit)
       via  8c70da20974469e73b81aa6ef4dce850a0c4bdc0 (commit)
       via  b7856f76af9e0bbef7dca6458c8074710a309ca8 (commit)
       via  f99f0b7a4a81379adbdc84e8fcae7ac1d6af5fd6 (commit)
       via  fcd8e322f5248425c89fe28567d10866d0d76a36 (commit)
       via  d9b21e97906229817fce9ca76e8877d4941d646c (commit)
       via  d6579c70190935801870cfe56a1a09a8d04c2b0e (commit)
       via  9b4777878f59c7a0c3653f54b6a2cff85bb278a8 (commit)
       via  d5c7edc55da6aaf78d25d131ebb35ab659a0084d (commit)
       via  845ee9282472f9a309b3af4aff49403b93091b19 (commit)
       via  83fdc8aea52533dbcb4261fd986d5760e5baa6df (commit)
       via  eccce3e1ba3bbcb73d47defc49b322fe578e5014 (commit)
       via  520388dc1d6f3e0e6ada332cf232784e4e737834 (commit)
       via  64abaa063d578567c18ee84a8e6abc424fa0da97 (commit)
       via  332d705e725a0672eafdeedb88d3848fca4b2a8b (commit)
       via  20b4c81c1a1e1c93ecdc5ebeeddb870a802a7d4a (commit)
       via  fb90eee74c483eb188b8c682a1259ba964f9c2b8 (commit)
       via  6fc53fb6df1e638f5cea70254612f7e60ff4de2f (commit)
       via  e3e035c3ef1f89c416922f6a81fdc2b4596f900e (commit)
       via  4653a5209acf51cdc5977ff082d9b658f9959350 (commit)
       via  c7a6dbca09c3aababf71349a9403b8e1e9e3e2bc (commit)
       via  8b85e835541e650cfa4c867bcd65fc5d03334613 (commit)
       via  2b0bd9add5deae0ab5bee79ee75a6cb769d0dea8 (commit)
       via  b03752fa781695f9fb506be7ea5afd9fb3db4a08 (commit)
       via  13147e7c05daa73a4f562541c3a7f8c98747bc83 (commit)
       via  c4a1eafb5bac265c936567807e94ab22d04a1094 (commit)
       via  46f91605a4044ebbf74f7014305078a1304afcd1 (commit)
       via  0a53a9e7f35855405024d03bde01d49f560f99ee (commit)
       via  44814081a72a995a91f7057d9158b18167c65dca (commit)
      from  ea316ad4ae5b4aea4c255d08d36bfcb0b705c23b (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 d4263336057d47a498fdbec76b4d4cc806edd87b
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Wed Sep 20 15:58:03 2017 +0200

    Increment version for 17.05.04 release
    
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 7ed629c2e203100caf1789e952e6c30b9b45d080
Merge: 8c70da2 521d1e5
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Wed Sep 20 16:04:42 2017 +0200

    Merge remote-tracking branch 'translate/17.05.04-translate-20170920' into rm_170504

commit 521d1e52ef8744011f04aa50e2d55a2ffc2a325b
Author: root <root at translate.koha-community.org>
Date:   Wed Sep 20 11:00:06 2017 -0300

    Translation updates for Koha 17.05.04

commit 8c70da20974469e73b81aa6ef4dce850a0c4bdc0
Author: Koha User <support at biblibre.com>
Date:   Wed Sep 20 15:55:56 2017 +0200

    Update release notes for 17.05.04 release
    
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit b7856f76af9e0bbef7dca6458c8074710a309ca8
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Sep 1 13:16:43 2017 -0400

    Bug 19235: Password entry visible in OPAC Self-registration
    
    The HTML code was "text" instead of "password".
    
    TEST PLAN
    ----------
    1) 'Allow' PatronSelfRegistration system preference
    2) Define the PatronSelfRegistrationDefaultCategory system preference (e.g. PT)
    3) Open OPAC
    4) Click 'Register here' on the right.  (/cgi-bin/koha/opac-memberentry.pl)
    5) Scroll to bottom
    6) enter some passwords
       -- visible
    7) apply this patch
    8) refresh page
    9) repeat 5-6 as needed
       -- passwords should not be visible while entering
    10) run koha qa test tools
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 99e691feee5ef29bbc9d24a916fc4aa2fab6bba6)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit f99f0b7a4a81379adbdc84e8fcae7ac1d6af5fd6
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Sep 8 10:14:10 2017 +0200

    Bug 15438: [QA Follow-up] Moving POD statement for CanBookBeIssued
    
    The statement for head3 NB ('nota bene'?) looks like a hash key
    in the list of possible return values for $needsconfirmation.
    Moved it up and prefixed it with IMPORTANT.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 133e25c56ac79e0b88b89e3b749df338e63a93d0)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit fcd8e322f5248425c89fe28567d10866d0d76a36
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Wed Aug 24 13:52:52 2016 +0100

    Bug 15438 - Checking out an on-hold item sends holder's borrowernumber in AF (screen message) field.
    
    The returns from C4::Circulation::CanBookBeIssued used
    to be structured as a hashref of entries like
       REASON => {
           data => 'foo',
           moredata => 'bar',
       };
    Some entries still are. But many are now
       REASON => 1,
       data   => 'foo',
       moredata => 'bar',
    
    The sip Checkout routine still assumed the former, as it
    reports any causes it was not aware of (to maintain support for
    a changing api) The data fields could leak into the screen message
    field of the response. e.g. the borrowernumber or surname of the
    borrower who has a hold on an issued title. Some real messages were
    getting obscured by this
    
    This patch sanatizes the return from from CanBookBeIssued
    by removing keys which are not all uppercase
    It also fixes a case where the key's data element was used
    for the screen message when we should use the key itself
    
    Updated the documentation of CanBookBeIssued to flag up
    the assumption re case and the fact that 3 elements rather
    than two may be returned
    
    The loop through the returned keys was a bit bogus
    so we now explicitly jump out if noerror is unset
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Tested quite extensively. Test results put on Bugzilla.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 4d223bdc6156fab0667867f3990854fddfab5684)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit d9b21e97906229817fce9ca76e8877d4941d646c
Author: Dobrica Pavlinusic <dpavlin at rot13.org>
Date:   Mon Sep 18 17:37:21 2017 +0200

    Bug 19332 - Basket grouping PDF and CSV exports empty
    
    This bug was introduced in commit 2bf3ce268de6bc8b2386cfb5d768f60b05d75f44
    Bug 17196: [QA Follow-up] Additional fix on acqui/basketgroup
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit d6579c70190935801870cfe56a1a09a8d04c2b0e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 11:21:27 2017 -0300

    Bug 19127: (follow-up) Stored XSS in csv-profiles.pl
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 52b41dfdf0ec03c24dd970b80e4f153f64702e30)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 9b4777878f59c7a0c3653f54b6a2cff85bb278a8
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Wed Aug 16 17:56:17 2017 +0530

    Bug 19127 - Stored XSS in csv-profiles.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/tools/csv-profiles.pl?op=add_form
    2. Add a text in the field Profile name, Profile description
       and Profile MARC fields that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 7a3ee2dd8cb233d083d8a7b8636eca7c6d518b8b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit d5c7edc55da6aaf78d25d131ebb35ab659a0084d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 11:06:11 2017 -0300

    Bug 19108: (follow-up) Stored XSS in biblio_framework.pl
    
    Prevent software error
    Template process failed: undef error - text: filter not found at
    /home/vagrant/kohaclone/C4/Templates.pm line 121.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit f904b019f77cd19ca0373f9635811a634ac73321)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 845ee9282472f9a309b3af4aff49403b93091b19
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 13:52:07 2017 +0200

    Bug 19108 - Follow-up - fieldmapping.tt and items_search_fields.tt
    
    To test:
    - Add a framework with script in the description
    - Access the Keywords to MARC mapping page
    - Add an item search field where both name and label are script
    - Try to edit/delete the added mapping
    
    With the patch no script should be executed and everything
    should still work ok.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 1649be1e9f510543f85b9e3a22af88ae8c6bfb9c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 83fdc8aea52533dbcb4261fd986d5760e5baa6df
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 14:37:50 2017 +0530

    Bug 19108 - Stored XSS in biblio_framework.pl and marctagstructure.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/biblio_framework.pl?op=add_form
    2. Add a text in the field Description that contains js
    3. Save the page.
    4. Notice js is execute
    5. Click on Actions -> MARC structure
    6. Apply patch and reload, the js is escaped
    
    Fixed for both the pages biblio_framework.pl and marctagstructure.pl
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 29ab5517f5c8cfbc86b98c3197846d005007cc12)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit eccce3e1ba3bbcb73d47defc49b322fe578e5014
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 14:10:43 2017 +0530

    Bug 19108 - Stored XSS in fieldmapping.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/fieldmapping.pl
    2. Add a text in the field Field name that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 77ddae74d661fb589d74bd85f5561fdd4131af70)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 520388dc1d6f3e0e6ada332cf232784e4e737834
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 14:06:47 2017 +0530

    Bug 19108 - Stored XSS in authtypes.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/authtypes.pl?op=add_form
    2. Add a text in the field Description that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit bc780f588bc908f8b1d0da8987b20914996d942c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 64abaa063d578567c18ee84a8e6abc424fa0da97
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 13:55:45 2017 +0530

    Bug 19108 - Stored XSS in classsources.pl
    
    Fixed for both Classification sources & Classification filing rules
    
    To Test
    1. first case classification source: Hit the page
       /cgi-bin/koha/admin/classsources.pl?op=add_source
       second case classification filing rules:
       Hit the page /cgi-bin/koha/admin/classsources.pl?op=add_sort_rule
    2. Add a text in the field Description that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 940c8634914b50940cfaf73af3611e6282d5803f)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 332d705e725a0672eafdeedb88d3848fca4b2a8b
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 13:49:10 2017 +0530

    Bug 19108 - Stored XSS in items_search_fields.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/items_search_fields.pl
    2. Add a text in the field Name and Label that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Fixed for new and edit page
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 063fd5e1b9e086c57987fae408b4ce6e51fec2b9)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 20b4c81c1a1e1c93ecdc5ebeeddb870a802a7d4a
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 13:33:57 2017 +0530

    Bug 19108 - Stored XSS in oai_sets.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/oai_sets.pl
    2. Click on New set
    3. Add a text in the field setSpec, setName that contains js
    4. Save the page.
    5. Notice js is execute
    6. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 10d3a8c212f8a45e40cd2644f94d555566a10018)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit fb90eee74c483eb188b8c682a1259ba964f9c2b8
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 10:15:54 2017 +0530

    Bug 19103 - Stored XSS in matching-rules.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/matching-rules.pl
    2. Click on new record matching rule
    3. Add a text in the field Description that contain js.
    4. Save the page.
    5. Notice js is execute
    6. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 9222cd77d282affffba43a40a9ff2f768647501e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 6fc53fb6df1e638f5cea70254612f7e60ff4de2f
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 10:07:45 2017 +0530

    Bug 19103 - Stored XSS in patron-attr-types.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/patron-attr-types.pl
    2. Click on new patron attribute type
    2. Add a text in the field Description that contain js.
    2. Save the page.
    3. Notice js is execute
    4. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit cb0c3da4b6cec991194ce91e6412cf9d50562044)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit e3e035c3ef1f89c416922f6a81fdc2b4596f900e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 10:58:24 2017 -0300

    Bug 19103: (follow-up) Stored XSS in itemtypes.pl
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit c221bc40a330a25d59097e94e962a4afcea011af)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 4653a5209acf51cdc5977ff082d9b658f9959350
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 08:52:40 2017 +0530

    Bug 19103 - Stored XSS in itemtypes.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/itemtypes.pl
    2. Add a text in the field Description, Checkin message that contains js
    2. Save the page.
    3. Notice js is execute
    4. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 18b5d4f1ababf560ff02a258de389f8c34cff9e4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit c7a6dbca09c3aababf71349a9403b8e1e9e3e2bc
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 10:35:10 2017 -0300

    Bug 19128: XSS - admin/authorised_values.tt
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit ad230cdcb5ad69541a89a4edaedcadde9d25b88a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 8b85e835541e650cfa4c867bcd65fc5d03334613
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 14:34:17 2017 +0200

    Bug 19128 - XSS - patron-attr-types.tt, authorised_values.tt and categories.tt
    
    Preparation:
    - Add a branch with script in the branch name
    - Add a patron category with script in the category name
    - Add a new authorised value cateogory with script
    - Add a new authroised value for this category with script
      in all possible fields
    
    - Test editing patron categories
    - Test editing patron attribute types
    - Test viewing and editing authorised values
    
    Verify that with this script there is no more script executed
    and everything works fine.
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 6b7ad77fffd7a6c4b69bce5bf666c6ff4be76c5b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 2b0bd9add5deae0ab5bee79ee75a6cb769d0dea8
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 12:05:50 2017 +0200

    Bug 19125 - XSS - members.pl
    
    In preparation to test this patch:
    - Add a patron list named <script>alert("patron list")</script>
    - Add a library named <script>alert("library")</script>
    - Add a patron category named <script>alert("patron category")</script>
    
    To test:
    - Access patron search page and do a search
    - Verify that the alerts added above are executed
    - Apply patch
    - Verify that no alerts are displayed
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 849eaf73fc419b9a635a1ba4b69ef46a7544e55a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit b03752fa781695f9fb506be7ea5afd9fb3db4a08
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 13:07:18 2017 +0200

    Bug 19086 - Follow-up - subscription-detail.pl
    
    Add script to the callnumber field on adding a subscription.
    
    Verify script is executed without this patch, but not with it.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 3ebcd2475dd35db47c33bcc59d5e75968667b518)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 13147e7c05daa73a4f562541c3a7f8c98747bc83
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 12:59:13 2017 +0200

    Bug 19086 - Follow-up - XSS in supplier.tt
    
    In preparation:
    Make sure you enter <script>alert("sth")</script>
    in all fields of a new vendor that are not validated
    and save.
    
    1) Access vendor summary page.
    2) Verify scripts are executed
    3) Apply patch
    4) Verify scripts are on longer executed
    
    This works in combination with the other patches for XSS
    on this bug.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 14a1aba57cc091a70c527a0d6bd495d21bd87345)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit c4a1eafb5bac265c936567807e94ab22d04a1094
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 02:44:11 2017 +0530

    Bug 19086 Stored XSS in subscription-add.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/serials/subscription-add.pl
    2. Add a text in the field Public note and Nonpublic note
       that contains js (Internalnotes, notes)
    2. Save the page.
    3. Notice js is execute
    4. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit ebf781afc133508eddcb8dc8fb6d7429a72db99b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 46f91605a4044ebbf74f7014305078a1304afcd1
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 02:33:59 2017 +0530

    Bug 19086 Stored XSS in supplier.pl
    
    1. Hit the page /cgi-bin/koha/acqui/supplier.pl?op=enter
    2. Add a text in the field company_postal, physical, company_fax,
       accountnumber, contactposition, contact_fax, contact_notes, notes that contains java script
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 9d0bbf5fa7455e0eb64288652802b0836cf22690)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 0a53a9e7f35855405024d03bde01d49f560f99ee
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date:   Fri Aug 11 19:54:34 2017 +0000

    Bug 19086 Stored XSS in circulation.pl
    
    1/ To test add a message to a borrower that contains js
    2/ hit /cgi-bin/koha/circ/circulation.pl?borrowernumber=[number]
      where number is the borrowernumber of the borrower you set the message
      for
    3/ Notice js is execute
    4/ Apply patch, reload, js is escaped
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 80c93d3499b11f3574fbafe756f94c534b746d5a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 44814081a72a995a91f7057d9158b18167c65dca
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date:   Fri Aug 11 19:36:43 2017 +0000

    Bug 19086 XSS in members/member.pl
    
    To test
    1/ hit /cgi-bin/koha/members/member.pl?&searchmember=<script>alert('XSS Payload')</script>
    2/ Notice js is executed
    3/ Apply patch, reload
    4/ js is now escaped
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 5ae18484b5a47e8a00ce8f1a0fd8b3db471947eb)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/Circulation.pm                                  |    8 +-
 C4/SIP/ILS/Transaction/Checkout.pm                 |   42 +-
 Koha.pm                                            |    2 +-
 acqui/basketgroup.pl                               |    2 +-
 installer/data/mysql/updatedatabase.pl             |    6 +
 .../en/includes/admin-items-search-field-form.inc  |    4 +-
 .../prog/en/includes/html_helpers.inc              |    2 +-
 .../prog/en/includes/patron-search.inc             |    6 +-
 .../prog/en/includes/patron-toolbar.inc            |    4 +-
 .../prog/en/modules/acqui/supplier.tt              |   32 +-
 .../prog/en/modules/admin/authorised_values.tt     |   26 +-
 .../prog/en/modules/admin/authtypes.tt             |    4 +-
 .../prog/en/modules/admin/biblio_framework.tt      |   12 +-
 .../prog/en/modules/admin/categories.tt            |    4 +-
 .../prog/en/modules/admin/classsources.tt          |    4 +-
 .../prog/en/modules/admin/fieldmapping.tt          |    8 +-
 .../prog/en/modules/admin/items_search_field.tt    |    4 +-
 .../prog/en/modules/admin/items_search_fields.tt   |   10 +-
 .../prog/en/modules/admin/itemtypes.tt             |    4 +-
 .../prog/en/modules/admin/marctagstructure.tt      |   18 +-
 .../prog/en/modules/admin/matching-rules.tt        |    2 +-
 .../prog/en/modules/admin/oai_set_mappings.tt      |    2 +-
 .../prog/en/modules/admin/oai_sets.tt              |   10 +-
 .../prog/en/modules/admin/patron-attr-types.tt     |   12 +-
 .../prog/en/modules/circ/circulation.tt            |    2 +-
 .../prog/en/modules/members/member.tt              |   10 +-
 .../prog/en/modules/serials/subscription-detail.tt |    6 +-
 .../prog/en/modules/tools/csv-profiles.tt          |   12 +-
 .../bootstrap/en/modules/opac-memberentry.tt       |    8 +-
 misc/release_notes/release_notes_17_05_04.md       |  315 +++
 misc/translator/po/am-Ethi-marc-MARC21.po          |    3 +-
 misc/translator/po/am-Ethi-marc-NORMARC.po         |    2 +-
 misc/translator/po/am-Ethi-marc-UNIMARC.po         |    2 +-
 misc/translator/po/am-Ethi-opac-bootstrap.po       |   49 +-
 misc/translator/po/am-Ethi-staff-help.po           |    2 +-
 misc/translator/po/am-Ethi-staff-prog.po           | 1349 +++++----
 misc/translator/po/ar-Arab-marc-MARC21.po          |    3 +-
 misc/translator/po/ar-Arab-marc-NORMARC.po         |    2 +-
 misc/translator/po/ar-Arab-marc-UNIMARC.po         |    2 +-
 misc/translator/po/ar-Arab-opac-bootstrap.po       |   74 +-
 misc/translator/po/ar-Arab-staff-help.po           |    2 +-
 misc/translator/po/ar-Arab-staff-prog.po           | 1516 +++++-----
 misc/translator/po/as-IN-marc-MARC21.po            |    3 +-
 misc/translator/po/as-IN-marc-NORMARC.po           |    2 +-
 misc/translator/po/as-IN-marc-UNIMARC.po           |    2 +-
 misc/translator/po/as-IN-opac-bootstrap.po         |   49 +-
 misc/translator/po/as-IN-staff-help.po             |    2 +-
 misc/translator/po/as-IN-staff-prog.po             | 1345 +++++----
 misc/translator/po/az-AZ-marc-MARC21.po            |    3 +-
 misc/translator/po/az-AZ-marc-NORMARC.po           |    2 +-
 misc/translator/po/az-AZ-marc-UNIMARC.po           |    2 +-
 misc/translator/po/az-AZ-opac-bootstrap.po         |   49 +-
 misc/translator/po/az-AZ-staff-help.po             |    2 +-
 misc/translator/po/az-AZ-staff-prog.po             | 1345 +++++----
 misc/translator/po/be-BY-marc-MARC21.po            |    3 +-
 misc/translator/po/be-BY-marc-NORMARC.po           |    2 +-
 misc/translator/po/be-BY-marc-UNIMARC.po           |    2 +-
 misc/translator/po/be-BY-opac-bootstrap.po         |   50 +-
 misc/translator/po/be-BY-staff-help.po             |    2 +-
 misc/translator/po/be-BY-staff-prog.po             | 1375 +++++-----
 misc/translator/po/bg-Cyrl-marc-MARC21.po          |    3 +-
 misc/translator/po/bg-Cyrl-marc-NORMARC.po         |    2 +-
 misc/translator/po/bg-Cyrl-marc-UNIMARC.po         |    2 +-
 misc/translator/po/bg-Cyrl-opac-bootstrap.po       |   49 +-
 misc/translator/po/bg-Cyrl-staff-help.po           |    2 +-
 misc/translator/po/bg-Cyrl-staff-prog.po           | 1349 +++++----
 misc/translator/po/bn-IN-marc-MARC21.po            |    3 +-
 misc/translator/po/bn-IN-marc-NORMARC.po           |    2 +-
 misc/translator/po/bn-IN-marc-UNIMARC.po           |    2 +-
 misc/translator/po/bn-IN-opac-bootstrap.po         |   49 +-
 misc/translator/po/bn-IN-staff-help.po             |    2 +-
 misc/translator/po/bn-IN-staff-prog.po             | 1349 +++++----
 misc/translator/po/ca-ES-marc-MARC21.po            |    3 +-
 misc/translator/po/ca-ES-marc-NORMARC.po           |    2 +-
 misc/translator/po/ca-ES-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ca-ES-opac-bootstrap.po         |   54 +-
 misc/translator/po/ca-ES-staff-help.po             |    2 +-
 misc/translator/po/ca-ES-staff-prog.po             | 1345 +++++----
 misc/translator/po/cs-CZ-marc-MARC21.po            |    3 +-
 misc/translator/po/cs-CZ-marc-NORMARC.po           |    2 +-
 misc/translator/po/cs-CZ-marc-UNIMARC.po           |    2 +-
 misc/translator/po/cs-CZ-opac-bootstrap.po         |   54 +-
 misc/translator/po/cs-CZ-staff-help.po             |    2 +-
 misc/translator/po/cs-CZ-staff-prog.po             | 1446 +++++-----
 misc/translator/po/cy-GB-marc-MARC21.po            |    3 +-
 misc/translator/po/cy-GB-marc-NORMARC.po           |    2 +-
 misc/translator/po/cy-GB-marc-UNIMARC.po           |    2 +-
 misc/translator/po/cy-GB-opac-bootstrap.po         |   49 +-
 misc/translator/po/cy-GB-staff-help.po             |    2 +-
 misc/translator/po/cy-GB-staff-prog.po             | 1345 +++++----
 misc/translator/po/da-DK-marc-MARC21.po            |    3 +-
 misc/translator/po/da-DK-marc-NORMARC.po           |    2 +-
 misc/translator/po/da-DK-marc-UNIMARC.po           |    2 +-
 misc/translator/po/da-DK-opac-bootstrap.po         |   54 +-
 misc/translator/po/da-DK-staff-help.po             |    2 +-
 misc/translator/po/da-DK-staff-prog.po             | 1390 +++++-----
 misc/translator/po/de-CH-marc-MARC21.po            |    3 +-
 misc/translator/po/de-CH-marc-NORMARC.po           |    2 +-
 misc/translator/po/de-CH-marc-UNIMARC.po           |    2 +-
 misc/translator/po/de-CH-opac-bootstrap.po         |   59 +-
 misc/translator/po/de-CH-staff-help.po             |    3 +-
 misc/translator/po/de-CH-staff-prog.po             | 1511 +++++-----
 misc/translator/po/de-DE-marc-MARC21.po            |    3 +-
 misc/translator/po/de-DE-marc-NORMARC.po           |    2 +-
 misc/translator/po/de-DE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/de-DE-opac-bootstrap.po         |   64 +-
 misc/translator/po/de-DE-staff-help.po             |    6 +-
 misc/translator/po/de-DE-staff-prog.po             | 1478 +++++-----
 misc/translator/po/el-GR-marc-MARC21.po            |    3 +-
 misc/translator/po/el-GR-marc-NORMARC.po           |    2 +-
 misc/translator/po/el-GR-marc-UNIMARC.po           |   86 +-
 misc/translator/po/el-GR-opac-bootstrap.po         |   56 +-
 misc/translator/po/el-GR-staff-help.po             |    2 +-
 misc/translator/po/el-GR-staff-prog.po             | 1426 +++++-----
 misc/translator/po/en-GB-marc-MARC21.po            |    3 +-
 misc/translator/po/en-GB-marc-NORMARC.po           |    2 +-
 misc/translator/po/en-GB-marc-UNIMARC.po           |    2 +-
 misc/translator/po/en-GB-opac-bootstrap.po         |   49 +-
 misc/translator/po/en-GB-staff-help.po             |    2 +-
 misc/translator/po/en-GB-staff-prog.po             | 1351 +++++----
 misc/translator/po/en-NZ-marc-MARC21.po            |    3 +-
 misc/translator/po/en-NZ-marc-NORMARC.po           |    2 +-
 misc/translator/po/en-NZ-marc-UNIMARC.po           |    2 +-
 misc/translator/po/en-NZ-opac-bootstrap.po         |   54 +-
 misc/translator/po/en-NZ-staff-help.po             |    2 +-
 misc/translator/po/en-NZ-staff-prog.po             | 1423 +++++-----
 misc/translator/po/eo-marc-MARC21.po               |    3 +-
 misc/translator/po/eo-marc-NORMARC.po              |    2 +-
 misc/translator/po/eo-marc-UNIMARC.po              |    2 +-
 misc/translator/po/eo-opac-bootstrap.po            |   53 +-
 misc/translator/po/eo-staff-help.po                |    2 +-
 misc/translator/po/eo-staff-prog.po                | 1349 +++++----
 misc/translator/po/es-ES-marc-MARC21.po            |   14 +-
 misc/translator/po/es-ES-marc-NORMARC.po           |    2 +-
 misc/translator/po/es-ES-marc-UNIMARC.po           |    2 +-
 misc/translator/po/es-ES-opac-bootstrap.po         |   58 +-
 misc/translator/po/es-ES-staff-help.po             |    2 +-
 misc/translator/po/es-ES-staff-prog.po             | 1455 +++++-----
 misc/translator/po/eu-marc-MARC21.po               |    3 +-
 misc/translator/po/eu-marc-NORMARC.po              |    2 +-
 misc/translator/po/eu-marc-UNIMARC.po              |    2 +-
 misc/translator/po/eu-opac-bootstrap.po            |   54 +-
 misc/translator/po/eu-staff-help.po                |    2 +-
 misc/translator/po/eu-staff-prog.po                | 1349 +++++----
 misc/translator/po/fa-Arab-marc-MARC21.po          |    3 +-
 misc/translator/po/fa-Arab-marc-NORMARC.po         |    2 +-
 misc/translator/po/fa-Arab-marc-UNIMARC.po         |    2 +-
 misc/translator/po/fa-Arab-opac-bootstrap.po       |   54 +-
 misc/translator/po/fa-Arab-staff-help.po           |    2 +-
 misc/translator/po/fa-Arab-staff-prog.po           | 1390 +++++-----
 misc/translator/po/fi-FI-marc-MARC21.po            |    3 +-
 misc/translator/po/fi-FI-marc-NORMARC.po           |    2 +-
 misc/translator/po/fi-FI-marc-UNIMARC.po           |    2 +-
 misc/translator/po/fi-FI-opac-bootstrap.po         |   54 +-
 misc/translator/po/fi-FI-staff-help.po             |    2 +-
 misc/translator/po/fi-FI-staff-prog.po             | 1429 +++++-----
 misc/translator/po/fo-FO-marc-MARC21.po            |    3 +-
 misc/translator/po/fo-FO-marc-NORMARC.po           |    2 +-
 misc/translator/po/fo-FO-marc-UNIMARC.po           |    2 +-
 misc/translator/po/fo-FO-opac-bootstrap.po         |   49 +-
 misc/translator/po/fo-FO-staff-help.po             |    2 +-
 misc/translator/po/fo-FO-staff-prog.po             | 1345 +++++----
 misc/translator/po/fr-CA-marc-MARC21.po            |   83 +-
 misc/translator/po/fr-CA-marc-NORMARC.po           |    2 +-
 misc/translator/po/fr-CA-marc-UNIMARC.po           |    2 +-
 misc/translator/po/fr-CA-opac-bootstrap.po         |  284 +-
 misc/translator/po/fr-CA-pref.po                   |  132 +-
 misc/translator/po/fr-CA-staff-help.po             |   40 +-
 misc/translator/po/fr-CA-staff-prog.po             | 2887 ++++++++++----------
 misc/translator/po/fr-FR-marc-MARC21.po            |    3 +-
 misc/translator/po/fr-FR-marc-NORMARC.po           |    2 +-
 misc/translator/po/fr-FR-marc-UNIMARC.po           |    2 +-
 misc/translator/po/fr-FR-opac-bootstrap.po         |   64 +-
 misc/translator/po/fr-FR-staff-help.po             |    2 +-
 misc/translator/po/fr-FR-staff-prog.po             | 1455 +++++-----
 misc/translator/po/gl-marc-MARC21.po               |    3 +-
 misc/translator/po/gl-marc-NORMARC.po              |    2 +-
 misc/translator/po/gl-marc-UNIMARC.po              |    2 +-
 misc/translator/po/gl-opac-bootstrap.po            |   49 +-
 misc/translator/po/gl-staff-help.po                |    2 +-
 misc/translator/po/gl-staff-prog.po                | 1345 +++++----
 misc/translator/po/he-Hebr-marc-MARC21.po          |    3 +-
 misc/translator/po/he-Hebr-marc-NORMARC.po         |    2 +-
 misc/translator/po/he-Hebr-marc-UNIMARC.po         |    2 +-
 misc/translator/po/he-Hebr-opac-bootstrap.po       |   49 +-
 misc/translator/po/he-Hebr-staff-help.po           |    2 +-
 misc/translator/po/he-Hebr-staff-prog.po           | 1345 +++++----
 misc/translator/po/hi-marc-MARC21.po               |    3 +-
 misc/translator/po/hi-marc-NORMARC.po              |    2 +-
 misc/translator/po/hi-marc-UNIMARC.po              |    2 +-
 misc/translator/po/hi-opac-bootstrap.po            |   53 +-
 misc/translator/po/hi-staff-help.po                |    2 +-
 misc/translator/po/hi-staff-prog.po                | 1420 +++++-----
 misc/translator/po/hr-HR-marc-MARC21.po            |    3 +-
 misc/translator/po/hr-HR-marc-NORMARC.po           |    2 +-
 misc/translator/po/hr-HR-marc-UNIMARC.po           |    2 +-
 misc/translator/po/hr-HR-opac-bootstrap.po         | 1307 ++++-----
 misc/translator/po/hr-HR-staff-help.po             |    2 +-
 misc/translator/po/hr-HR-staff-prog.po             | 1700 ++++++------
 misc/translator/po/hu-HU-marc-MARC21.po            |    3 +-
 misc/translator/po/hu-HU-marc-NORMARC.po           |    2 +-
 misc/translator/po/hu-HU-marc-UNIMARC.po           |    2 +-
 misc/translator/po/hu-HU-opac-bootstrap.po         |   54 +-
 misc/translator/po/hu-HU-staff-help.po             |    2 +-
 misc/translator/po/hu-HU-staff-prog.po             | 1345 +++++----
 misc/translator/po/hy-Armn-marc-MARC21.po          |    3 +-
 misc/translator/po/hy-Armn-marc-NORMARC.po         |    2 +-
 misc/translator/po/hy-Armn-marc-UNIMARC.po         |    2 +-
 misc/translator/po/hy-Armn-opac-bootstrap.po       |   72 +-
 misc/translator/po/hy-Armn-staff-help.po           |    2 +-
 misc/translator/po/hy-Armn-staff-prog.po           | 1536 +++++------
 misc/translator/po/ia-marc-MARC21.po               |    3 +-
 misc/translator/po/ia-marc-NORMARC.po              |    2 +-
 misc/translator/po/ia-marc-UNIMARC.po              |    2 +-
 misc/translator/po/ia-opac-bootstrap.po            |   49 +-
 misc/translator/po/ia-staff-help.po                |    2 +-
 misc/translator/po/ia-staff-prog.po                | 1345 +++++----
 misc/translator/po/id-ID-marc-MARC21.po            |    3 +-
 misc/translator/po/id-ID-marc-NORMARC.po           |    2 +-
 misc/translator/po/id-ID-marc-UNIMARC.po           |    2 +-
 misc/translator/po/id-ID-opac-bootstrap.po         |   50 +-
 misc/translator/po/id-ID-staff-help.po             |    2 +-
 misc/translator/po/id-ID-staff-prog.po             | 1365 +++++----
 misc/translator/po/iq-CA-marc-MARC21.po            |    3 +-
 misc/translator/po/iq-CA-marc-NORMARC.po           |    2 +-
 misc/translator/po/iq-CA-marc-UNIMARC.po           |    2 +-
 misc/translator/po/iq-CA-opac-bootstrap.po         |   49 +-
 misc/translator/po/iq-CA-staff-help.po             |    2 +-
 misc/translator/po/iq-CA-staff-prog.po             | 1345 +++++----
 misc/translator/po/is-IS-marc-MARC21.po            |    3 +-
 misc/translator/po/is-IS-marc-NORMARC.po           |    2 +-
 misc/translator/po/is-IS-marc-UNIMARC.po           |    2 +-
 misc/translator/po/is-IS-opac-bootstrap.po         |   49 +-
 misc/translator/po/is-IS-staff-help.po             |    2 +-
 misc/translator/po/is-IS-staff-prog.po             | 1346 +++++----
 misc/translator/po/it-IT-marc-MARC21.po            |    3 +-
 misc/translator/po/it-IT-marc-NORMARC.po           |    2 +-
 misc/translator/po/it-IT-marc-UNIMARC.po           |    2 +-
 misc/translator/po/it-IT-opac-bootstrap.po         |   72 +-
 misc/translator/po/it-IT-staff-help.po             |    2 +-
 misc/translator/po/it-IT-staff-prog.po             | 1544 +++++------
 misc/translator/po/iu-CA-marc-MARC21.po            |    3 +-
 misc/translator/po/iu-CA-marc-NORMARC.po           |    2 +-
 misc/translator/po/iu-CA-marc-UNIMARC.po           |    2 +-
 misc/translator/po/iu-CA-opac-bootstrap.po         |   49 +-
 misc/translator/po/iu-CA-staff-help.po             |    2 +-
 misc/translator/po/iu-CA-staff-prog.po             | 1345 +++++----
 misc/translator/po/ja-Jpan-JP-marc-MARC21.po       |    3 +-
 misc/translator/po/ja-Jpan-JP-marc-NORMARC.po      |    2 +-
 misc/translator/po/ja-Jpan-JP-marc-UNIMARC.po      |    2 +-
 misc/translator/po/ja-Jpan-JP-opac-bootstrap.po    |   49 +-
 misc/translator/po/ja-Jpan-JP-staff-help.po        |    2 +-
 misc/translator/po/ja-Jpan-JP-staff-prog.po        | 1345 +++++----
 misc/translator/po/ka-marc-MARC21.po               |    3 +-
 misc/translator/po/ka-marc-NORMARC.po              |    2 +-
 misc/translator/po/ka-marc-UNIMARC.po              |    2 +-
 misc/translator/po/ka-opac-bootstrap.po            |   53 +-
 misc/translator/po/ka-staff-help.po                |    2 +-
 misc/translator/po/ka-staff-prog.po                | 1349 +++++----
 misc/translator/po/km-KH-marc-MARC21.po            |    3 +-
 misc/translator/po/km-KH-marc-NORMARC.po           |    2 +-
 misc/translator/po/km-KH-marc-UNIMARC.po           |    2 +-
 misc/translator/po/km-KH-opac-bootstrap.po         |   49 +-
 misc/translator/po/km-KH-staff-help.po             |    2 +-
 misc/translator/po/km-KH-staff-prog.po             | 1349 +++++----
 misc/translator/po/kn-Knda-marc-MARC21.po          |    3 +-
 misc/translator/po/kn-Knda-marc-NORMARC.po         |    2 +-
 misc/translator/po/kn-Knda-marc-UNIMARC.po         |    2 +-
 misc/translator/po/kn-Knda-opac-bootstrap.po       |   49 +-
 misc/translator/po/kn-Knda-staff-help.po           |    2 +-
 misc/translator/po/kn-Knda-staff-prog.po           | 1345 +++++----
 misc/translator/po/ko-Kore-KP-marc-MARC21.po       |    3 +-
 misc/translator/po/ko-Kore-KP-marc-NORMARC.po      |    2 +-
 misc/translator/po/ko-Kore-KP-marc-UNIMARC.po      |    2 +-
 misc/translator/po/ko-Kore-KP-opac-bootstrap.po    |   52 +-
 misc/translator/po/ko-Kore-KP-staff-help.po        |    2 +-
 misc/translator/po/ko-Kore-KP-staff-prog.po        | 1390 +++++-----
 misc/translator/po/ku-Arab-marc-MARC21.po          |    3 +-
 misc/translator/po/ku-Arab-marc-NORMARC.po         |    2 +-
 misc/translator/po/ku-Arab-marc-UNIMARC.po         |    2 +-
 misc/translator/po/ku-Arab-opac-bootstrap.po       |   50 +-
 misc/translator/po/ku-Arab-staff-help.po           |    2 +-
 misc/translator/po/ku-Arab-staff-prog.po           | 1368 +++++-----
 misc/translator/po/lo-Laoo-marc-MARC21.po          |    3 +-
 misc/translator/po/lo-Laoo-marc-NORMARC.po         |    2 +-
 misc/translator/po/lo-Laoo-marc-UNIMARC.po         |    2 +-
 misc/translator/po/lo-Laoo-opac-bootstrap.po       |   50 +-
 misc/translator/po/lo-Laoo-staff-help.po           |    2 +-
 misc/translator/po/lo-Laoo-staff-prog.po           | 1358 +++++----
 misc/translator/po/mi-NZ-marc-MARC21.po            |    3 +-
 misc/translator/po/mi-NZ-marc-NORMARC.po           |    2 +-
 misc/translator/po/mi-NZ-marc-UNIMARC.po           |    2 +-
 misc/translator/po/mi-NZ-opac-bootstrap.po         |   49 +-
 misc/translator/po/mi-NZ-staff-help.po             |    2 +-
 misc/translator/po/mi-NZ-staff-prog.po             | 1345 +++++----
 misc/translator/po/ml-marc-MARC21.po               |    3 +-
 misc/translator/po/ml-marc-NORMARC.po              |    2 +-
 misc/translator/po/ml-marc-UNIMARC.po              |    2 +-
 misc/translator/po/ml-opac-bootstrap.po            |   49 +-
 misc/translator/po/ml-staff-help.po                |    2 +-
 misc/translator/po/ml-staff-prog.po                | 1345 +++++----
 misc/translator/po/mon-marc-MARC21.po              |    3 +-
 misc/translator/po/mon-marc-NORMARC.po             |    2 +-
 misc/translator/po/mon-marc-UNIMARC.po             |    2 +-
 misc/translator/po/mon-opac-bootstrap.po           |   49 +-
 misc/translator/po/mon-staff-help.po               |    2 +-
 misc/translator/po/mon-staff-prog.po               | 1345 +++++----
 misc/translator/po/mr-marc-MARC21.po               |    3 +-
 misc/translator/po/mr-marc-NORMARC.po              |    2 +-
 misc/translator/po/mr-marc-UNIMARC.po              |    2 +-
 misc/translator/po/mr-opac-bootstrap.po            |   49 +-
 misc/translator/po/mr-staff-help.po                |    2 +-
 misc/translator/po/mr-staff-prog.po                | 1358 +++++----
 misc/translator/po/ms-MY-marc-MARC21.po            |    3 +-
 misc/translator/po/ms-MY-marc-NORMARC.po           |    2 +-
 misc/translator/po/ms-MY-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ms-MY-opac-bootstrap.po         |   50 +-
 misc/translator/po/ms-MY-staff-help.po             |    2 +-
 misc/translator/po/ms-MY-staff-prog.po             | 1361 +++++----
 misc/translator/po/my-marc-MARC21.po               |    3 +-
 misc/translator/po/my-marc-NORMARC.po              |    2 +-
 misc/translator/po/my-marc-UNIMARC.po              |    2 +-
 misc/translator/po/my-opac-bootstrap.po            |   49 +-
 misc/translator/po/my-staff-help.po                |    2 +-
 misc/translator/po/my-staff-prog.po                | 1345 +++++----
 misc/translator/po/nb-NO-marc-MARC21.po            |    3 +-
 misc/translator/po/nb-NO-marc-NORMARC.po           |    2 +-
 misc/translator/po/nb-NO-marc-UNIMARC.po           |    2 +-
 misc/translator/po/nb-NO-opac-bootstrap.po         |   54 +-
 misc/translator/po/nb-NO-staff-help.po             |    2 +-
 misc/translator/po/nb-NO-staff-prog.po             | 1415 +++++-----
 misc/translator/po/ne-NE-marc-MARC21.po            |    3 +-
 misc/translator/po/ne-NE-marc-NORMARC.po           |    2 +-
 misc/translator/po/ne-NE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ne-NE-opac-bootstrap.po         |   49 +-
 misc/translator/po/ne-NE-staff-help.po             |    2 +-
 misc/translator/po/ne-NE-staff-prog.po             | 1349 +++++----
 misc/translator/po/nl-BE-marc-MARC21.po            |    3 +-
 misc/translator/po/nl-BE-marc-NORMARC.po           |    2 +-
 misc/translator/po/nl-BE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/nl-BE-opac-bootstrap.po         |   54 +-
 misc/translator/po/nl-BE-staff-help.po             |    2 +-
 misc/translator/po/nl-BE-staff-prog.po             | 1372 +++++-----
 misc/translator/po/nl-NL-marc-MARC21.po            |    3 +-
 misc/translator/po/nl-NL-marc-NORMARC.po           |    2 +-
 misc/translator/po/nl-NL-marc-UNIMARC.po           |    2 +-
 misc/translator/po/nl-NL-opac-bootstrap.po         |   54 +-
 misc/translator/po/nl-NL-staff-help.po             |    2 +-
 misc/translator/po/nl-NL-staff-prog.po             | 1349 +++++----
 misc/translator/po/nn-NO-marc-MARC21.po            |    3 +-
 misc/translator/po/nn-NO-marc-NORMARC.po           |    2 +-
 misc/translator/po/nn-NO-marc-UNIMARC.po           |    2 +-
 misc/translator/po/nn-NO-opac-bootstrap.po         |   49 +-
 misc/translator/po/nn-NO-staff-help.po             |    2 +-
 misc/translator/po/nn-NO-staff-prog.po             | 1345 +++++----
 misc/translator/po/oc-marc-MARC21.po               |    3 +-
 misc/translator/po/oc-marc-NORMARC.po              |    2 +-
 misc/translator/po/oc-marc-UNIMARC.po              |    2 +-
 misc/translator/po/oc-opac-bootstrap.po            |   54 +-
 misc/translator/po/oc-staff-help.po                |    2 +-
 misc/translator/po/oc-staff-prog.po                | 1418 +++++-----
 misc/translator/po/pbr-marc-MARC21.po              |    3 +-
 misc/translator/po/pbr-marc-NORMARC.po             |    2 +-
 misc/translator/po/pbr-marc-UNIMARC.po             |    2 +-
 misc/translator/po/pbr-opac-bootstrap.po           |   49 +-
 misc/translator/po/pbr-staff-help.po               |    2 +-
 misc/translator/po/pbr-staff-prog.po               | 1349 +++++----
 misc/translator/po/pl-PL-marc-MARC21.po            |    3 +-
 misc/translator/po/pl-PL-marc-NORMARC.po           |    2 +-
 misc/translator/po/pl-PL-marc-UNIMARC.po           |    2 +-
 misc/translator/po/pl-PL-opac-bootstrap.po         |   54 +-
 misc/translator/po/pl-PL-staff-help.po             |    2 +-
 misc/translator/po/pl-PL-staff-prog.po             | 1444 +++++-----
 misc/translator/po/prs-marc-MARC21.po              |    3 +-
 misc/translator/po/prs-marc-NORMARC.po             |    2 +-
 misc/translator/po/prs-marc-UNIMARC.po             |    2 +-
 misc/translator/po/prs-opac-bootstrap.po           |   49 +-
 misc/translator/po/prs-staff-help.po               |    2 +-
 misc/translator/po/prs-staff-prog.po               | 1349 +++++----
 misc/translator/po/pt-BR-marc-MARC21.po            |   25 +-
 misc/translator/po/pt-BR-marc-NORMARC.po           |    2 +-
 misc/translator/po/pt-BR-marc-UNIMARC.po           |    2 +-
 misc/translator/po/pt-BR-opac-bootstrap.po         |   62 +-
 misc/translator/po/pt-BR-staff-help.po             |    2 +-
 misc/translator/po/pt-BR-staff-prog.po             | 1420 +++++-----
 misc/translator/po/pt-PT-marc-MARC21.po            |    3 +-
 misc/translator/po/pt-PT-marc-NORMARC.po           |    2 +-
 misc/translator/po/pt-PT-marc-UNIMARC.po           |    2 +-
 misc/translator/po/pt-PT-opac-bootstrap.po         |   74 +-
 misc/translator/po/pt-PT-staff-help.po             |   26 +-
 misc/translator/po/pt-PT-staff-prog.po             | 1574 ++++++-----
 misc/translator/po/ro-RO-marc-MARC21.po            |    3 +-
 misc/translator/po/ro-RO-marc-NORMARC.po           |    2 +-
 misc/translator/po/ro-RO-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ro-RO-opac-bootstrap.po         |   49 +-
 misc/translator/po/ro-RO-staff-help.po             |    2 +-
 misc/translator/po/ro-RO-staff-prog.po             | 1347 +++++----
 misc/translator/po/ru-RU-marc-MARC21.po            |   25 +-
 misc/translator/po/ru-RU-marc-NORMARC.po           |    2 +-
 misc/translator/po/ru-RU-marc-UNIMARC.po           |   28 +-
 misc/translator/po/ru-RU-opac-bootstrap.po         |   55 +-
 misc/translator/po/ru-RU-staff-help.po             |    2 +-
 misc/translator/po/ru-RU-staff-prog.po             | 1446 +++++-----
 misc/translator/po/rw-RW-marc-MARC21.po            |    3 +-
 misc/translator/po/rw-RW-marc-NORMARC.po           |    2 +-
 misc/translator/po/rw-RW-marc-UNIMARC.po           |    2 +-
 misc/translator/po/rw-RW-opac-bootstrap.po         |   49 +-
 misc/translator/po/rw-RW-staff-help.po             |    2 +-
 misc/translator/po/rw-RW-staff-prog.po             | 1345 +++++----
 misc/translator/po/sd-PK-marc-MARC21.po            |    3 +-
 misc/translator/po/sd-PK-marc-NORMARC.po           |    2 +-
 misc/translator/po/sd-PK-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sd-PK-opac-bootstrap.po         |   49 +-
 misc/translator/po/sd-PK-staff-help.po             |    2 +-
 misc/translator/po/sd-PK-staff-prog.po             | 1349 +++++----
 misc/translator/po/sk-SK-marc-MARC21.po            |    3 +-
 misc/translator/po/sk-SK-marc-NORMARC.po           |    2 +-
 misc/translator/po/sk-SK-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sk-SK-opac-bootstrap.po         |   54 +-
 misc/translator/po/sk-SK-staff-help.po             |    2 +-
 misc/translator/po/sk-SK-staff-prog.po             | 1415 +++++-----
 misc/translator/po/sl-SI-marc-MARC21.po            |    3 +-
 misc/translator/po/sl-SI-marc-NORMARC.po           |    2 +-
 misc/translator/po/sl-SI-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sl-SI-opac-bootstrap.po         |   49 +-
 misc/translator/po/sl-SI-staff-help.po             |    2 +-
 misc/translator/po/sl-SI-staff-prog.po             | 1345 +++++----
 misc/translator/po/sq-AL-marc-MARC21.po            |    3 +-
 misc/translator/po/sq-AL-marc-NORMARC.po           |    2 +-
 misc/translator/po/sq-AL-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sq-AL-opac-bootstrap.po         |   54 +-
 misc/translator/po/sq-AL-staff-help.po             |    2 +-
 misc/translator/po/sq-AL-staff-prog.po             | 1355 +++++----
 misc/translator/po/sr-Cyrl-marc-MARC21.po          |    3 +-
 misc/translator/po/sr-Cyrl-marc-NORMARC.po         |    2 +-
 misc/translator/po/sr-Cyrl-marc-UNIMARC.po         |    2 +-
 misc/translator/po/sr-Cyrl-opac-bootstrap.po       |   49 +-
 misc/translator/po/sr-Cyrl-staff-help.po           |    2 +-
 misc/translator/po/sr-Cyrl-staff-prog.po           | 1349 +++++----
 misc/translator/po/sv-SE-marc-MARC21.po            |    3 +-
 misc/translator/po/sv-SE-marc-NORMARC.po           |    2 +-
 misc/translator/po/sv-SE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sv-SE-opac-bootstrap.po         |   54 +-
 misc/translator/po/sv-SE-staff-help.po             |    2 +-
 misc/translator/po/sv-SE-staff-prog.po             | 1471 +++++-----
 misc/translator/po/sw-KE-marc-MARC21.po            |    3 +-
 misc/translator/po/sw-KE-marc-NORMARC.po           |    2 +-
 misc/translator/po/sw-KE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sw-KE-opac-bootstrap.po         |   49 +-
 misc/translator/po/sw-KE-staff-help.po             |    2 +-
 misc/translator/po/sw-KE-staff-prog.po             | 1345 +++++----
 misc/translator/po/ta-LK-marc-MARC21.po            |    3 +-
 misc/translator/po/ta-LK-marc-NORMARC.po           |    2 +-
 misc/translator/po/ta-LK-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ta-LK-opac-bootstrap.po         |   49 +-
 misc/translator/po/ta-LK-staff-help.po             |    2 +-
 misc/translator/po/ta-LK-staff-prog.po             | 1349 +++++----
 misc/translator/po/ta-marc-MARC21.po               |    3 +-
 misc/translator/po/ta-marc-NORMARC.po              |    2 +-
 misc/translator/po/ta-marc-UNIMARC.po              |    2 +-
 misc/translator/po/ta-opac-bootstrap.po            |   49 +-
 misc/translator/po/ta-staff-help.po                |    2 +-
 misc/translator/po/ta-staff-prog.po                | 1347 +++++----
 misc/translator/po/tet-marc-MARC21.po              |    3 +-
 misc/translator/po/tet-marc-NORMARC.po             |    2 +-
 misc/translator/po/tet-marc-UNIMARC.po             |    2 +-
 misc/translator/po/tet-opac-bootstrap.po           |   50 +-
 misc/translator/po/tet-staff-help.po               |    2 +-
 misc/translator/po/tet-staff-prog.po               | 1366 +++++----
 misc/translator/po/th-TH-marc-MARC21.po            |    3 +-
 misc/translator/po/th-TH-marc-NORMARC.po           |    2 +-
 misc/translator/po/th-TH-marc-UNIMARC.po           |    2 +-
 misc/translator/po/th-TH-opac-bootstrap.po         |   49 +-
 misc/translator/po/th-TH-staff-help.po             |    2 +-
 misc/translator/po/th-TH-staff-prog.po             | 1349 +++++----
 misc/translator/po/tl-PH-marc-MARC21.po            |    3 +-
 misc/translator/po/tl-PH-marc-NORMARC.po           |    2 +-
 misc/translator/po/tl-PH-marc-UNIMARC.po           |    2 +-
 misc/translator/po/tl-PH-opac-bootstrap.po         |   49 +-
 misc/translator/po/tl-PH-staff-help.po             |    2 +-
 misc/translator/po/tl-PH-staff-prog.po             | 1349 +++++----
 misc/translator/po/tr-TR-marc-MARC21.po            |    3 +-
 misc/translator/po/tr-TR-marc-NORMARC.po           |    2 +-
 misc/translator/po/tr-TR-marc-UNIMARC.po           |    2 +-
 misc/translator/po/tr-TR-opac-bootstrap.po         |  123 +-
 misc/translator/po/tr-TR-pref.po                   |    6 +-
 misc/translator/po/tr-TR-staff-help.po             |    2 +-
 misc/translator/po/tr-TR-staff-prog.po             | 1648 ++++++-----
 misc/translator/po/uk-UA-marc-MARC21.po            |   69 +-
 misc/translator/po/uk-UA-marc-NORMARC.po           |  292 +-
 misc/translator/po/uk-UA-marc-UNIMARC.po           | 2091 +++++++-------
 misc/translator/po/uk-UA-opac-bootstrap.po         |   62 +-
 misc/translator/po/uk-UA-pref.po                   |    4 +-
 misc/translator/po/uk-UA-staff-help.po             |    2 +-
 misc/translator/po/uk-UA-staff-prog.po             | 1561 ++++++-----
 misc/translator/po/ur-Arab-marc-MARC21.po          |    3 +-
 misc/translator/po/ur-Arab-marc-NORMARC.po         |    2 +-
 misc/translator/po/ur-Arab-marc-UNIMARC.po         |    2 +-
 misc/translator/po/ur-Arab-opac-bootstrap.po       |   49 +-
 misc/translator/po/ur-Arab-staff-help.po           |    2 +-
 misc/translator/po/ur-Arab-staff-prog.po           | 1349 +++++----
 misc/translator/po/vi-VN-marc-MARC21.po            |    3 +-
 misc/translator/po/vi-VN-marc-NORMARC.po           |    2 +-
 misc/translator/po/vi-VN-marc-UNIMARC.po           |    2 +-
 misc/translator/po/vi-VN-opac-bootstrap.po         |   54 +-
 misc/translator/po/vi-VN-staff-help.po             |    2 +-
 misc/translator/po/vi-VN-staff-prog.po             | 1398 +++++-----
 misc/translator/po/zh-Hans-CN-marc-MARC21.po       |    3 +-
 misc/translator/po/zh-Hans-CN-marc-NORMARC.po      |    2 +-
 misc/translator/po/zh-Hans-CN-marc-UNIMARC.po      |    2 +-
 misc/translator/po/zh-Hans-CN-opac-bootstrap.po    |   52 +-
 misc/translator/po/zh-Hans-CN-staff-help.po        |    2 +-
 misc/translator/po/zh-Hans-CN-staff-prog.po        | 1394 +++++-----
 misc/translator/po/zh-Hans-TW-marc-MARC21.po       |    3 +-
 misc/translator/po/zh-Hans-TW-marc-NORMARC.po      |    2 +-
 misc/translator/po/zh-Hans-TW-marc-UNIMARC.po      |    2 +-
 misc/translator/po/zh-Hans-TW-opac-bootstrap.po    |   57 +-
 misc/translator/po/zh-Hans-TW-staff-help.po        |    2 +-
 misc/translator/po/zh-Hans-TW-staff-prog.po        | 1411 +++++-----
 519 files changed, 61115 insertions(+), 63189 deletions(-)
 create mode 100644 misc/release_notes/release_notes_17_05_04.md


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 22 17:11:06 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 22 Sep 2017 15:11:06 +0000
Subject: [koha-commits] main Koha release repository annotated tag v17.05.04
	created. v17.05.04
Message-ID: <E1dvPbe-0001J3-Ki@git.koha-community.org>

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 annotated tag, v17.05.04 has been created
        at  7603cbfae974c4cb469bd6d35ca7acc88c5db0d1 (tag)
   tagging  d4263336057d47a498fdbec76b4d4cc806edd87b (commit)
  replaces  v17.05.03
 tagged by  Fridolin Somers
        on  Wed Sep 20 16:05:47 2017 +0200

- Log -----------------------------------------------------------------
Koha release 17.05.04
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQEcBAABAgAGBQJZwnW7AAoJECvJNkKAZAZugXgH/0oU8BbFHCdV3i8U2T6sTuRz
LC7ELXlZvN8Qg1vO1dZVDeg1s226HtjT2aGbZ1ecCzkzkWOuTNyyCqkZI54/jMcG
GA3oL0WtWbbP9mhM5BFHGGr9xUYL8BkfSKCubiPIvR5r6VMb5I9D7W/5wps4h/We
6UWRkbkyq8+GAQd44W97n01xyXhPFEOgbPHYYthFUwbxqvwFBomLiXkchJlfX3fo
Ik8dAjO4N0rtwGAC0Mr49UyZ7h3XQ1/KKQu9dMNcRvsALgV5TuwmueoMsSUskSMK
BrmWzyILTxpzd7z0X5f86MEHoqXxBgCe97MPCv9cYhvlP5BTEt5es5qgHUJkBJY=
=XS5T
-----END PGP SIGNATURE-----

Aleisha Amohia (2):
      Bug 19194: Check itemtype is defined when receiving an order
      Bug 19214: Prevent crash if ->club or ->patron is called in list context

Alex Sassmannshausen (1):
      Bug 19073: (bug 15758 follow-up) Dereference correct value from Koha::Object.

Amit Gupta (12):
      Bug 19086 Stored XSS in supplier.pl
      Bug 19086 Stored XSS in subscription-add.pl
      Bug 19103 - Stored XSS in itemtypes.pl
      Bug 19103 - Stored XSS in patron-attr-types.pl
      Bug 19103 - Stored XSS in matching-rules.pl
      Bug 19108 - Stored XSS in oai_sets.pl
      Bug 19108 - Stored XSS in items_search_fields.pl
      Bug 19108 - Stored XSS in classsources.pl
      Bug 19108 - Stored XSS in authtypes.pl
      Bug 19108 - Stored XSS in fieldmapping.pl
      Bug 19108 - Stored XSS in biblio_framework.pl and marctagstructure.pl
      Bug 19127 - Stored XSS in csv-profiles.pl

Baptiste Wojtkowski (1):
      Bug 18919: Repair "Transaction branch" in cash_register_stats.pl

Chris Cormack (3):
      Bug 18046: CAS logout infinite redirect
      Bug 19086 XSS in members/member.pl
      Bug 19086 Stored XSS in circulation.pl

Colin Campbell (1):
      Bug 15438 - Checking out an on-hold item sends holder's borrowernumber in AF (screen message) field.

David Cook (1):
      Bug 18898 - Some permissions for Reports can be bypassed

Dobrica Pavlinusic (1):
      Bug 19332 - Basket grouping PDF and CSV exports empty

Fridolin Somers (6):
      Bug 18900: add UT to Number/Price.t
      Bug 18900: wrong number format in receiving order
      Bug 19023 - inventory tool performance
      Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt
      Merge remote-tracking branch 'translate/17.05.04-translate-20170920' into rm_170504
      Increment version for 17.05.04 release

Jonathan Druart (12):
      Bug 18331: Fix CSV export (once and for all!)
      Bug 18331: POST_CHOMP everywhere!
      Bug 18624: Do not return 1 in tests
      Bug 19053: Keep auto_renew flag if a confirmation is needed
      Bug 18906: Display all funds the logged in user can use
      Bug 19067: Test Makefile.PL mapping
      Bug 18927: Use fully qualified subroutine names in C4::Items
      Bug 19214: prevent crash if club_template_field is called in list context
      Bug 19128: XSS - admin/authorised_values.tt
      Bug 19103: (follow-up) Stored XSS in itemtypes.pl
      Bug 19108: (follow-up) Stored XSS in biblio_framework.pl
      Bug 19127: (follow-up) Stored XSS in csv-profiles.pl

Josef Moravec (1):
      Bug 18331: Followup - fix path to orders_by_budget csv header

Katrin Fischer (5):
      Bug 19086 - Follow-up - XSS in supplier.tt
      Bug 19086 - Follow-up - subscription-detail.pl
      Bug 19125 - XSS - members.pl
      Bug 19128 - XSS - patron-attr-types.tt, authorised_values.tt and categories.tt
      Bug 19108 - Follow-up - fieldmapping.tt and items_search_fields.tt

Koha User (1):
      Update release notes for 17.05.04 release

Kyle M Hall (4):
      Bug 18996 [QA Followup] - Fix some minor whitespace issues
      Bug 19049 [QA Followup] - Make plugin name first item in description
      Bug 19205 - Pay selected fine generates 500 error
      Bug 19208 - Pay select option doesn't pay the selected fine

Lee Jamison (1):
      Bug 18331: Followup - Fix CSV export (once and for all!)

Marc V?ron (6):
      Bug 18331: Force tt to insert newline to empty_line.inc
      Bug 18649: Translatability: Get rid of tt directive in translation for admin/categories.tt and onboardingstep2.tt
      Bug 18652: Get rid of tt directive in translation for uncertainprice.tt
      Bug 18660: Translatability: Get rid of template directives [%% in translation for patroncards-errors.inc
      Bug 18778 - Translatability: Get rid of tt directive in translation for item-status.inc
      Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt

Marcel de Rooy (11):
      Bug 18996: Handle data corruption from old_issues at SIP checkin
      Bug 18996: Resolve an uninitialized warning from ILS/Item.pm
      Bug 18996: Add checkin subtest in SIP/Message.t
      Bug 18996: [QA Follow-up] Remove global variables from Message.t
      Bug 19049: Fix regression on stage-marc-import with to_marc plugin
      Bug 19049: Testing RecordsFromMarcPlugin with a to_marc plugin
      Bug 19049: [Follow-up] Make sure that GetPlugins finds the plugin
      Bug 19049: [QA Follow-up] Mock config, default format
      Bug 18921: Resolve a few warnings in C4/XSLT.pm
      Bug 19163: Critical typo in stage-marc-import process
      Bug 15438: [QA Follow-up] Moving POD statement for CanBookBeIssued

Mark Tompsett (1):
      Bug 19235: Password entry visible in OPAC Self-registration

Nick Clemens (3):
      Bug 16976 - Authorities searches with double quotes gives ZOOM error 20003 [Alternate]
      Bug 16976 - Unit tests
      Bug 18624: Run time errors when searching authorities with Elastic search 5.3

Serhij Dubyk {?????? ?????} (1):
      Bug 17827 - Untranslatable "by" in MARC21slim2intranetResults.xsl

Tomas Cohen Arazi (5):
      Bug 18624: Minor refactoring to ease testing
      Bug 18624: Regression test for 'any' vs 'all'
      Bug 18624: (followup) opac-authorities-home.tt uses 'any'
      Bug 18900: (QA followup) Make tests conditional to locale existence
      Bug 19067: Map clubs/ into INTRANET_CGI_DIR in Makefile.PL

root (1):
      Translation updates for Koha 17.05.04

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep 23 03:59:44 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 23 Sep 2017 01:59:44 +0000
Subject: [koha-commits] main Koha release repository branch 16.05.x updated.
	v16.05.16-63-g1210a89
Message-ID: <E1dvZjM-0003Qc-JF@git.koha-community.org>

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
  discards  1aee520991070cd94117a5e43f73ca51bc3898f3 (commit)
  discards  a9b528b0e8ea7a61663f424f63ae4cf726c547b5 (commit)
  discards  35fa395740deff928e19f7f8b4676d382370405e (commit)
  discards  48909d828e7f08036718e94a7c4112c844311098 (commit)
  discards  80b160ae02d43962d01fc2f9180ab4c748037ae5 (commit)
  discards  5ae46b8a34f8014fa58ec4ec9a6136933448b23d (commit)
  discards  38550b8f2c8c32e1ec23ce7fb3fda3f9df97fc0e (commit)
       via  1210a897592f1e213bd49c5a08cd4e8f62973940 (commit)
       via  f294eb6a18f3a1b4f1cbf6cbae2a625f810dc204 (commit)
       via  238d85795f797fc1474792b4e75668580558ce06 (commit)
       via  8f87903968fe19a801dbd14246321bf585c679e6 (commit)
       via  251619575c423b4ac58505ee031533608322d160 (commit)
       via  4b19e4bb6a0582ddeb94fc94bdcfb0c4448ef372 (commit)
       via  3ecc48ed5b01c9d03108cd94b943ade3f535f644 (commit)
       via  644d9e938edb60826be98823068db04e38bb6424 (commit)
       via  e362ade666b7181d9b4b1d89e89968eefb134eb9 (commit)
       via  687946bd9b48ed9e1c9b6663961463ef1913ae88 (commit)
       via  566980bc2744a8067be338f432c3a391db2aae42 (commit)
       via  ffedb03412b100d296f64a3f7e4eeecde3f5680d (commit)
       via  ceb5b6cc82fb32dbb9899ad500fe2cc7a6c6008b (commit)
       via  4d7b768750685ea11554831f7ed7fcb6796b3f7b (commit)
       via  c127306b540cc0ee7cda9f7b14cd2c9bb47b99a1 (commit)
       via  5caf641f7ddfe4d0b924e37dae2d799bdd6f3d8f (commit)
       via  8dc404940d03bb81b1ecfc987484f8bf9781bcca (commit)
       via  280750052a28ae10aa305b9a0fab681983453e86 (commit)
       via  12d677ba88e9387b63a5bad2aa508a6985ed5b4c (commit)
       via  3a1f035038636c57a78350effccbaa903e6b835f (commit)
       via  5ffa9b924cf4bed72f105dc711ca7dd03ee373c5 (commit)
       via  75ca6a17ad080246197ec6664ad19a96785cfbcd (commit)
       via  5a58f35afc6935f714e4724f098af447107e2043 (commit)
       via  8675e0c4679835fdfd31a96ec0a7f63ac4b944a0 (commit)
       via  174f1eda3ba2186f75fccf246cb299256c2d28c9 (commit)
       via  9ce88fb28a7260ea268d6f34d09d740ca63899e7 (commit)
       via  a7bf6705a3b013105f3ce9e48a28e8e9c8912498 (commit)
       via  4c8e2f74d9cc8e4833dd62d9faa60437c97307ec (commit)
       via  0eb03b0817561fc37c77bf551a09d816d41c4117 (commit)
       via  c532e5f0abbe5a84834cfab99d021af03d499afb (commit)
       via  1deab6d87f13ced3da4dc29ef30978867a95145c (commit)
       via  683f9ec507276af1737d6fba4ba653a38557bf78 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (1aee520991070cd94117a5e43f73ca51bc3898f3)
            \
             N -- N -- N (1210a897592f1e213bd49c5a08cd4e8f62973940)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 1210a897592f1e213bd49c5a08cd4e8f62973940
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 18:34:31 2017 +1200

    Increment version for 16.05.17 release

commit f294eb6a18f3a1b4f1cbf6cbae2a625f810dc204
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 18:54:33 2017 +1200

    Add release notes for Koha 16.05.17

commit 238d85795f797fc1474792b4e75668580558ce06
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 18:48:30 2017 +1200

    Translation updates for Koha 16.05.17

commit 8f87903968fe19a801dbd14246321bf585c679e6
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:59:43 2017 +1200

    Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - Add classes MarcSubfieldStructure[s]"
    
    This reverts commit 99e7f928b1bdd7ca997c6ae403a691f90866eeb4.

commit 251619575c423b4ac58505ee031533608322d160
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:59:35 2017 +1200

    Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - add tests"
    
    This reverts commit a53c3efd4c1773a609f2929a61b7324504cc18eb.

commit 4b19e4bb6a0582ddeb94fc94bdcfb0c4448ef372
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:59:27 2017 +1200

    Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - Add search_by_marc_field"
    
    This reverts commit c8fbb9c58bd72031b77d52327004ba441e71cdb9.

commit 3ecc48ed5b01c9d03108cd94b943ade3f535f644
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:59:19 2017 +1200

    Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - inventory"
    
    This reverts commit a1b569f89eead58d274a6c75d2790bda94fc0c55.

commit 644d9e938edb60826be98823068db04e38bb6424
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:59:11 2017 +1200

    Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - (follow-up) inventory"
    
    This reverts commit 38cbc453e0cc4a509fe267e32f3903393f449d41.

commit e362ade666b7181d9b4b1d89e89968eefb134eb9
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:59:04 2017 +1200

    Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField"
    
    This reverts commit 65945e30f71fe353c995bab97a5b6a333326b570.

commit 687946bd9b48ed9e1c9b6663961463ef1913ae88
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Sep 20 15:58:54 2017 +1200

    Revert "Bug 17249: GetKohaAuthorisedValuesFromField - rm GetAuthValCodeFromField"
    
    This reverts commit 286b6f4e3e8db593fbe218ab08c622e5491ac44d.

commit 566980bc2744a8067be338f432c3a391db2aae42
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 10:35:10 2017 -0300

    Bug 19128: XSS - admin/authorised_values.tt

commit ffedb03412b100d296f64a3f7e4eeecde3f5680d
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 14:34:17 2017 +0200

    Bug 19128 - XSS - patron-attr-types.tt, authorised_values.tt and categories.tt
    
    Preparation:
    - Add a branch with script in the branch name
    - Add a patron category with script in the category name
    - Add a new authorised value cateogory with script
    - Add a new authroised value for this category with script
      in all possible fields
    
    - Test editing patron categories
    - Test editing patron attribute types
    - Test viewing and editing authorised values
    
    Verify that with this script there is no more script executed
    and everything works fine.
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit ceb5b6cc82fb32dbb9899ad500fe2cc7a6c6008b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 11:21:27 2017 -0300

    Bug 19127: (follow-up) Stored XSS in csv-profiles.pl
    
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 4d7b768750685ea11554831f7ed7fcb6796b3f7b
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Wed Aug 16 17:56:17 2017 +0530

    Bug 19127 - Stored XSS in csv-profiles.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/tools/csv-profiles.pl?op=add_form
    2. Add a text in the field Profile name, Profile description
       and Profile MARC fields that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit c127306b540cc0ee7cda9f7b14cd2c9bb47b99a1
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 12:05:50 2017 +0200

    Bug 19125 - XSS - members.pl
    
    In preparation to test this patch:
    - Add a patron list named <script>alert("patron list")</script>
    - Add a library named <script>alert("library")</script>
    - Add a patron category named <script>alert("patron category")</script>
    
    To test:
    - Access patron search page and do a search
    - Verify that the alerts added above are executed
    - Apply patch
    - Verify that no alerts are displayed
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 5caf641f7ddfe4d0b924e37dae2d799bdd6f3d8f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 11:06:11 2017 -0300

    Bug 19108: (follow-up) Stored XSS in biblio_framework.pl
    
    Prevent software error
    Template process failed: undef error - text: filter not found at
    /home/vagrant/kohaclone/C4/Templates.pm line 121.
    
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 8dc404940d03bb81b1ecfc987484f8bf9781bcca
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 14:37:50 2017 +0530

    Bug 19108 - Stored XSS in biblio_framework.pl and marctagstructure.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/biblio_framework.pl?op=add_form
    2. Add a text in the field Description that contains js
    3. Save the page.
    4. Notice js is execute
    5. Click on Actions -> MARC structure
    6. Apply patch and reload, the js is escaped
    
    Fixed for both the pages biblio_framework.pl and marctagstructure.pl
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 280750052a28ae10aa305b9a0fab681983453e86
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 14:10:43 2017 +0530

    Bug 19108 - Stored XSS in fieldmapping.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/fieldmapping.pl
    2. Add a text in the field Field name that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 12d677ba88e9387b63a5bad2aa508a6985ed5b4c
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 14:06:47 2017 +0530

    Bug 19108 - Stored XSS in authtypes.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/authtypes.pl?op=add_form
    2. Add a text in the field Description that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 3a1f035038636c57a78350effccbaa903e6b835f
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 13:55:45 2017 +0530

    Bug 19108 - Stored XSS in classsources.pl
    
    Fixed for both Classification sources & Classification filing rules
    
    To Test
    1. first case classification source: Hit the page
       /cgi-bin/koha/admin/classsources.pl?op=add_source
       second case classification filing rules:
       Hit the page /cgi-bin/koha/admin/classsources.pl?op=add_sort_rule
    2. Add a text in the field Description that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 5ffa9b924cf4bed72f105dc711ca7dd03ee373c5
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 13:49:10 2017 +0530

    Bug 19108 - Stored XSS in items_search_fields.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/items_search_fields.pl
    2. Add a text in the field Name and Label that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Fixed for new and edit page
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 75ca6a17ad080246197ec6664ad19a96785cfbcd
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 13:33:57 2017 +0530

    Bug 19108 - Stored XSS in oai_sets.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/oai_sets.pl
    2. Click on New set
    3. Add a text in the field setSpec, setName that contains js
    4. Save the page.
    5. Notice js is execute
    6. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 5a58f35afc6935f714e4724f098af447107e2043
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 10:58:24 2017 -0300

    Bug 19103: (follow-up) Stored XSS in itemtypes.pl
    
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 8675e0c4679835fdfd31a96ec0a7f63ac4b944a0
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 10:15:54 2017 +0530

    Bug 19103 - Stored XSS in matching-rules.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/matching-rules.pl
    2. Click on new record matching rule
    3. Add a text in the field Description that contain js.
    4. Save the page.
    5. Notice js is execute
    6. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 174f1eda3ba2186f75fccf246cb299256c2d28c9
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 10:07:45 2017 +0530

    Bug 19103 - Stored XSS in patron-attr-types.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/patron-attr-types.pl
    2. Click on new patron attribute type
    2. Add a text in the field Description that contain js.
    2. Save the page.
    3. Notice js is execute
    4. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 9ce88fb28a7260ea268d6f34d09d740ca63899e7
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 08:52:40 2017 +0530

    Bug 19103 - Stored XSS in itemtypes.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/itemtypes.pl
    2. Add a text in the field Description, Checkin message that contains js
    2. Save the page.
    3. Notice js is execute
    4. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit a7bf6705a3b013105f3ce9e48a28e8e9c8912498
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 13:07:18 2017 +0200

    Bug 19086 - Follow-up - subscription-detail.pl
    
    Add script to the callnumber field on adding a subscription.
    
    Verify script is executed without this patch, but not with it.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit 4c8e2f74d9cc8e4833dd62d9faa60437c97307ec
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 12:59:13 2017 +0200

    Bug 19086 - Follow-up - XSS in supplier.tt
    
    In preparation:
    Make sure you enter <script>alert("sth")</script>
    in all fields of a new vendor that are not validated
    and save.
    
    1) Access vendor summary page.
    2) Verify scripts are executed
    3) Apply patch
    4) Verify scripts are on longer executed
    
    This works in combination with the other patches for XSS
    on this bug.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit 0eb03b0817561fc37c77bf551a09d816d41c4117
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 02:44:11 2017 +0530

    Bug 19086 Stored XSS in subscription-add.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/serials/subscription-add.pl
    2. Add a text in the field Public note and Nonpublic note
       that contains js (Internalnotes, notes)
    2. Save the page.
    3. Notice js is execute
    4. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit c532e5f0abbe5a84834cfab99d021af03d499afb
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 02:33:59 2017 +0530

    Bug 19086 Stored XSS in supplier.pl
    
    1. Hit the page /cgi-bin/koha/acqui/supplier.pl?op=enter
    2. Add a text in the field company_postal, physical, company_fax,
       accountnumber, contactposition, contact_fax, contact_notes, notes that contains java script
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit 1deab6d87f13ced3da4dc29ef30978867a95145c
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date:   Fri Aug 11 19:54:34 2017 +0000

    Bug 19086 Stored XSS in circulation.pl
    
    1/ To test add a message to a borrower that contains js
    2/ hit /cgi-bin/koha/circ/circulation.pl?borrowernumber=[number]
      where number is the borrowernumber of the borrower you set the message
      for
    3/ Notice js is execute
    4/ Apply patch, reload, js is escaped
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 683f9ec507276af1737d6fba4ba653a38557bf78
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date:   Fri Aug 11 19:36:43 2017 +0000

    Bug 19086 XSS in members/member.pl
    
    To test
    1/ hit /cgi-bin/koha/members/member.pl?&searchmember=<script>alert('XSS Payload')</script>
    2/ Notice js is executed
    3/ Apply patch, reload
    4/ js is now escaped
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

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

Summary of changes:
 Koha.pm                                            |    2 +-
 installer/data/mysql/updatedatabase.pl             |    6 +
 .../en/includes/admin-items-search-field-form.inc  |    4 +-
 .../prog/en/includes/patron-search.inc             |    2 +-
 .../prog/en/includes/patron-toolbar.inc            |    2 +-
 .../prog/en/modules/acqui/supplier.tt              |   32 +-
 .../prog/en/modules/admin/authorised_values.tt     |   28 +-
 .../prog/en/modules/admin/authtypes.tt             |    4 +-
 .../prog/en/modules/admin/biblio_framework.tt      |   12 +-
 .../prog/en/modules/admin/categories.tt            |    4 +-
 .../prog/en/modules/admin/classsources.tt          |    4 +-
 .../prog/en/modules/admin/fieldmapping.tt          |    2 +-
 .../prog/en/modules/admin/items_search_field.tt    |    4 +-
 .../prog/en/modules/admin/items_search_fields.tt   |    6 +-
 .../prog/en/modules/admin/itemtypes.tt             |    4 +-
 .../prog/en/modules/admin/marctagstructure.tt      |   18 +-
 .../prog/en/modules/admin/matching-rules.tt        |    2 +-
 .../prog/en/modules/admin/oai_set_mappings.tt      |    2 +-
 .../prog/en/modules/admin/oai_sets.tt              |   10 +-
 .../prog/en/modules/admin/patron-attr-types.tt     |   12 +-
 .../prog/en/modules/circ/circulation.tt            |    2 +-
 .../prog/en/modules/members/member.tt              |   10 +-
 .../prog/en/modules/serials/subscription-detail.tt |    6 +-
 .../prog/en/modules/tools/csv-profiles.tt          |   12 +-
 ...otes_16_5_8.html => release_notes_16_5_17.html} |  283 ++--
 ...e_notes_16_5_16.md => release_notes_16_5_17.md} |  244 ++--
 misc/translator/po/am-Ethi-marc-MARC21.po          |    2 +-
 misc/translator/po/am-Ethi-marc-NORMARC.po         |    2 +-
 misc/translator/po/am-Ethi-marc-UNIMARC.po         |    2 +-
 misc/translator/po/am-Ethi-opac-bootstrap.po       |   70 +-
 misc/translator/po/am-Ethi-staff-help.po           |    2 +-
 misc/translator/po/am-Ethi-staff-prog.po           | 1366 ++++++++---------
 misc/translator/po/ar-Arab-marc-MARC21.po          |    2 +-
 misc/translator/po/ar-Arab-marc-NORMARC.po         |    2 +-
 misc/translator/po/ar-Arab-marc-UNIMARC.po         |    2 +-
 misc/translator/po/ar-Arab-opac-bootstrap.po       |   79 +-
 misc/translator/po/ar-Arab-staff-help.po           |    2 +-
 misc/translator/po/ar-Arab-staff-prog.po           | 1375 ++++++++---------
 misc/translator/po/as-IN-marc-MARC21.po            |    2 +-
 misc/translator/po/as-IN-marc-NORMARC.po           |    2 +-
 misc/translator/po/as-IN-marc-UNIMARC.po           |    2 +-
 misc/translator/po/as-IN-opac-bootstrap.po         |   70 +-
 misc/translator/po/as-IN-staff-help.po             |    2 +-
 misc/translator/po/as-IN-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/az-AZ-marc-MARC21.po            |    2 +-
 misc/translator/po/az-AZ-marc-NORMARC.po           |    2 +-
 misc/translator/po/az-AZ-marc-UNIMARC.po           |    2 +-
 misc/translator/po/az-AZ-opac-bootstrap.po         |   70 +-
 misc/translator/po/az-AZ-staff-help.po             |    2 +-
 misc/translator/po/az-AZ-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/be-BY-marc-MARC21.po            |    2 +-
 misc/translator/po/be-BY-marc-NORMARC.po           |    2 +-
 misc/translator/po/be-BY-marc-UNIMARC.po           |    2 +-
 misc/translator/po/be-BY-opac-bootstrap.po         |   73 +-
 misc/translator/po/be-BY-staff-help.po             |    2 +-
 misc/translator/po/be-BY-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/bg-Cyrl-marc-MARC21.po          |    2 +-
 misc/translator/po/bg-Cyrl-marc-NORMARC.po         |    2 +-
 misc/translator/po/bg-Cyrl-marc-UNIMARC.po         |    2 +-
 misc/translator/po/bg-Cyrl-opac-bootstrap.po       |   74 +-
 misc/translator/po/bg-Cyrl-staff-help.po           |    2 +-
 misc/translator/po/bg-Cyrl-staff-prog.po           | 1366 ++++++++---------
 misc/translator/po/bn-IN-marc-MARC21.po            |    2 +-
 misc/translator/po/bn-IN-marc-NORMARC.po           |    2 +-
 misc/translator/po/bn-IN-marc-UNIMARC.po           |    2 +-
 misc/translator/po/bn-IN-opac-bootstrap.po         |   70 +-
 misc/translator/po/bn-IN-staff-help.po             |    2 +-
 misc/translator/po/bn-IN-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/cs-CZ-marc-MARC21.po            |    2 +-
 misc/translator/po/cs-CZ-marc-NORMARC.po           |    2 +-
 misc/translator/po/cs-CZ-marc-UNIMARC.po           |    2 +-
 misc/translator/po/cs-CZ-opac-bootstrap.po         |   79 +-
 misc/translator/po/cs-CZ-staff-help.po             |    2 +-
 misc/translator/po/cs-CZ-staff-prog.po             | 1379 ++++++++---------
 misc/translator/po/cy-GB-marc-MARC21.po            |    2 +-
 misc/translator/po/cy-GB-marc-NORMARC.po           |    2 +-
 misc/translator/po/cy-GB-marc-UNIMARC.po           |    2 +-
 misc/translator/po/cy-GB-opac-bootstrap.po         |   70 +-
 misc/translator/po/cy-GB-staff-help.po             |    2 +-
 misc/translator/po/cy-GB-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/da-DK-marc-MARC21.po            |    2 +-
 misc/translator/po/da-DK-marc-NORMARC.po           |    2 +-
 misc/translator/po/da-DK-marc-UNIMARC.po           |    2 +-
 misc/translator/po/da-DK-opac-bootstrap.po         |   73 +-
 misc/translator/po/da-DK-staff-help.po             |    2 +-
 misc/translator/po/da-DK-staff-prog.po             | 1370 ++++++++---------
 misc/translator/po/de-DE-marc-MARC21.po            |    2 +-
 misc/translator/po/de-DE-marc-NORMARC.po           |    2 +-
 misc/translator/po/de-DE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/de-DE-opac-bootstrap.po         |   88 +-
 misc/translator/po/de-DE-pref.po                   |    5 +-
 misc/translator/po/de-DE-staff-help.po             |    4 +-
 misc/translator/po/de-DE-staff-prog.po             | 1392 +++++++++---------
 misc/translator/po/el-GR-marc-MARC21.po            |    2 +-
 misc/translator/po/el-GR-marc-NORMARC.po           |    2 +-
 misc/translator/po/el-GR-marc-UNIMARC.po           |    8 +-
 misc/translator/po/el-GR-opac-bootstrap.po         |   80 +-
 misc/translator/po/el-GR-staff-help.po             |    2 +-
 misc/translator/po/el-GR-staff-prog.po             | 1377 ++++++++---------
 misc/translator/po/eo-marc-MARC21.po               |    2 +-
 misc/translator/po/eo-marc-NORMARC.po              |    2 +-
 misc/translator/po/eo-marc-UNIMARC.po              |    2 +-
 misc/translator/po/eo-opac-bootstrap.po            |   74 +-
 misc/translator/po/eo-staff-help.po                |    2 +-
 misc/translator/po/eo-staff-prog.po                | 1366 ++++++++---------
 misc/translator/po/es-ES-marc-MARC21.po            |    2 +-
 misc/translator/po/es-ES-marc-NORMARC.po           |    2 +-
 misc/translator/po/es-ES-marc-UNIMARC.po           |    2 +-
 misc/translator/po/es-ES-opac-bootstrap.po         |   84 +-
 misc/translator/po/es-ES-pref.po                   |    8 +-
 misc/translator/po/es-ES-staff-help.po             |    6 +-
 misc/translator/po/es-ES-staff-prog.po             | 1398 +++++++++---------
 misc/translator/po/eu-marc-MARC21.po               |    2 +-
 misc/translator/po/eu-marc-NORMARC.po              |    2 +-
 misc/translator/po/eu-marc-UNIMARC.po              |    2 +-
 misc/translator/po/eu-opac-bootstrap.po            |   80 +-
 misc/translator/po/eu-staff-help.po                |    2 +-
 misc/translator/po/eu-staff-prog.po                | 1367 ++++++++---------
 misc/translator/po/fa-Arab-marc-MARC21.po          |    2 +-
 misc/translator/po/fa-Arab-marc-NORMARC.po         |    2 +-
 misc/translator/po/fa-Arab-marc-UNIMARC.po         |    2 +-
 misc/translator/po/fa-Arab-opac-bootstrap.po       |   73 +-
 misc/translator/po/fa-Arab-staff-help.po           |    2 +-
 misc/translator/po/fa-Arab-staff-prog.po           | 1367 ++++++++---------
 misc/translator/po/fi-FI-marc-MARC21.po            |    2 +-
 misc/translator/po/fi-FI-marc-NORMARC.po           |    2 +-
 misc/translator/po/fi-FI-marc-UNIMARC.po           |    2 +-
 misc/translator/po/fi-FI-opac-bootstrap.po         |   79 +-
 misc/translator/po/fi-FI-staff-help.po             |    2 +-
 misc/translator/po/fi-FI-staff-prog.po             | 1377 ++++++++---------
 misc/translator/po/fo-FO-marc-MARC21.po            |    2 +-
 misc/translator/po/fo-FO-marc-NORMARC.po           |    2 +-
 misc/translator/po/fo-FO-marc-UNIMARC.po           |    2 +-
 misc/translator/po/fo-FO-opac-bootstrap.po         |   70 +-
 misc/translator/po/fo-FO-staff-help.po             |    2 +-
 misc/translator/po/fo-FO-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/fr-FR-marc-MARC21.po            |    2 +-
 misc/translator/po/fr-FR-marc-NORMARC.po           |    2 +-
 misc/translator/po/fr-FR-marc-UNIMARC.po           |    2 +-
 misc/translator/po/fr-FR-opac-bootstrap.po         |   80 +-
 misc/translator/po/fr-FR-staff-help.po             |    2 +-
 misc/translator/po/fr-FR-staff-prog.po             | 1377 ++++++++---------
 misc/translator/po/gl-marc-MARC21.po               |    2 +-
 misc/translator/po/gl-marc-NORMARC.po              |    2 +-
 misc/translator/po/gl-marc-UNIMARC.po              |    2 +-
 misc/translator/po/gl-opac-bootstrap.po            |   74 +-
 misc/translator/po/gl-staff-help.po                |    2 +-
 misc/translator/po/gl-staff-prog.po                | 1366 ++++++++---------
 misc/translator/po/he-Hebr-marc-MARC21.po          |    2 +-
 misc/translator/po/he-Hebr-marc-NORMARC.po         |    2 +-
 misc/translator/po/he-Hebr-marc-UNIMARC.po         |    2 +-
 misc/translator/po/he-Hebr-opac-bootstrap.po       |   74 +-
 misc/translator/po/he-Hebr-staff-help.po           |    2 +-
 misc/translator/po/he-Hebr-staff-prog.po           | 1366 ++++++++---------
 misc/translator/po/hi-marc-MARC21.po               |    2 +-
 misc/translator/po/hi-marc-NORMARC.po              |    2 +-
 misc/translator/po/hi-marc-UNIMARC.po              |    2 +-
 misc/translator/po/hi-opac-bootstrap.po            |   79 +-
 misc/translator/po/hi-staff-help.po                |    2 +-
 misc/translator/po/hi-staff-prog.po                | 1379 ++++++++---------
 misc/translator/po/hr-HR-marc-MARC21.po            |    2 +-
 misc/translator/po/hr-HR-marc-NORMARC.po           |    2 +-
 misc/translator/po/hr-HR-marc-UNIMARC.po           |    2 +-
 misc/translator/po/hr-HR-opac-bootstrap.po         |   73 +-
 misc/translator/po/hr-HR-staff-help.po             |    2 +-
 misc/translator/po/hr-HR-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/hu-HU-marc-MARC21.po            |    2 +-
 misc/translator/po/hu-HU-marc-NORMARC.po           |    2 +-
 misc/translator/po/hu-HU-marc-UNIMARC.po           |    2 +-
 misc/translator/po/hu-HU-opac-bootstrap.po         |   71 +-
 misc/translator/po/hu-HU-staff-help.po             |    2 +-
 misc/translator/po/hu-HU-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/hy-Armn-marc-MARC21.po          |    2 +-
 misc/translator/po/hy-Armn-marc-NORMARC.po         |    2 +-
 misc/translator/po/hy-Armn-marc-UNIMARC.po         |    2 +-
 misc/translator/po/hy-Armn-opac-bootstrap.po       |   79 +-
 misc/translator/po/hy-Armn-staff-help.po           |    2 +-
 misc/translator/po/hy-Armn-staff-prog.po           | 1375 ++++++++---------
 misc/translator/po/ia-marc-MARC21.po               |    2 +-
 misc/translator/po/ia-marc-NORMARC.po              |    2 +-
 misc/translator/po/ia-marc-UNIMARC.po              |    2 +-
 misc/translator/po/ia-opac-bootstrap.po            |   70 +-
 misc/translator/po/ia-staff-help.po                |    2 +-
 misc/translator/po/ia-staff-prog.po                | 1366 ++++++++---------
 misc/translator/po/id-ID-marc-MARC21.po            |    2 +-
 misc/translator/po/id-ID-marc-NORMARC.po           |    2 +-
 misc/translator/po/id-ID-marc-UNIMARC.po           |    2 +-
 misc/translator/po/id-ID-opac-bootstrap.po         |   73 +-
 misc/translator/po/id-ID-staff-help.po             |    2 +-
 misc/translator/po/id-ID-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/iq-CA-marc-MARC21.po            |    2 +-
 misc/translator/po/iq-CA-marc-NORMARC.po           |    2 +-
 misc/translator/po/iq-CA-marc-UNIMARC.po           |    2 +-
 misc/translator/po/iq-CA-opac-bootstrap.po         |   70 +-
 misc/translator/po/iq-CA-staff-help.po             |    2 +-
 misc/translator/po/iq-CA-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/is-IS-marc-MARC21.po            |    2 +-
 misc/translator/po/is-IS-marc-NORMARC.po           |    2 +-
 misc/translator/po/is-IS-marc-UNIMARC.po           |    2 +-
 misc/translator/po/is-IS-opac-bootstrap.po         |   70 +-
 misc/translator/po/is-IS-staff-help.po             |    2 +-
 misc/translator/po/is-IS-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/it-IT-marc-MARC21.po            |    2 +-
 misc/translator/po/it-IT-marc-NORMARC.po           |    2 +-
 misc/translator/po/it-IT-marc-UNIMARC.po           |    2 +-
 misc/translator/po/it-IT-opac-bootstrap.po         |  105 +-
 misc/translator/po/it-IT-pref.po                   |    4 +-
 misc/translator/po/it-IT-staff-help.po             |   18 +-
 misc/translator/po/it-IT-staff-prog.po             | 1542 ++++++++++----------
 misc/translator/po/iu-CA-marc-MARC21.po            |    2 +-
 misc/translator/po/iu-CA-marc-NORMARC.po           |    2 +-
 misc/translator/po/iu-CA-marc-UNIMARC.po           |    2 +-
 misc/translator/po/iu-CA-opac-bootstrap.po         |   70 +-
 misc/translator/po/iu-CA-staff-help.po             |    2 +-
 misc/translator/po/iu-CA-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/ja-Jpan-JP-marc-MARC21.po       |    2 +-
 misc/translator/po/ja-Jpan-JP-marc-NORMARC.po      |    2 +-
 misc/translator/po/ja-Jpan-JP-marc-UNIMARC.po      |    2 +-
 misc/translator/po/ja-Jpan-JP-opac-bootstrap.po    |   70 +-
 misc/translator/po/ja-Jpan-JP-staff-help.po        |    2 +-
 misc/translator/po/ja-Jpan-JP-staff-prog.po        | 1366 ++++++++---------
 misc/translator/po/ka-marc-MARC21.po               |    2 +-
 misc/translator/po/ka-marc-NORMARC.po              |    2 +-
 misc/translator/po/ka-marc-UNIMARC.po              |    2 +-
 misc/translator/po/ka-opac-bootstrap.po            |   70 +-
 misc/translator/po/ka-staff-help.po                |    2 +-
 misc/translator/po/ka-staff-prog.po                | 1366 ++++++++---------
 misc/translator/po/km-KH-marc-MARC21.po            |    2 +-
 misc/translator/po/km-KH-marc-NORMARC.po           |    2 +-
 misc/translator/po/km-KH-marc-UNIMARC.po           |    2 +-
 misc/translator/po/km-KH-opac-bootstrap.po         |   70 +-
 misc/translator/po/km-KH-staff-help.po             |    2 +-
 misc/translator/po/km-KH-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/kn-Knda-marc-MARC21.po          |    2 +-
 misc/translator/po/kn-Knda-marc-NORMARC.po         |    2 +-
 misc/translator/po/kn-Knda-marc-UNIMARC.po         |    2 +-
 misc/translator/po/kn-Knda-opac-bootstrap.po       |   70 +-
 misc/translator/po/kn-Knda-staff-help.po           |    2 +-
 misc/translator/po/kn-Knda-staff-prog.po           | 1366 ++++++++---------
 misc/translator/po/ko-Kore-KP-marc-MARC21.po       |    2 +-
 misc/translator/po/ko-Kore-KP-marc-NORMARC.po      |    2 +-
 misc/translator/po/ko-Kore-KP-marc-UNIMARC.po      |    2 +-
 misc/translator/po/ko-Kore-KP-opac-bootstrap.po    |   72 +-
 misc/translator/po/ko-Kore-KP-staff-help.po        |    2 +-
 misc/translator/po/ko-Kore-KP-staff-prog.po        | 1373 ++++++++---------
 misc/translator/po/ku-Arab-marc-MARC21.po          |    2 +-
 misc/translator/po/ku-Arab-marc-NORMARC.po         |    2 +-
 misc/translator/po/ku-Arab-marc-UNIMARC.po         |    2 +-
 misc/translator/po/ku-Arab-opac-bootstrap.po       |   73 +-
 misc/translator/po/ku-Arab-staff-help.po           |    2 +-
 misc/translator/po/ku-Arab-staff-prog.po           | 1366 ++++++++---------
 misc/translator/po/lo-Laoo-marc-MARC21.po          |    2 +-
 misc/translator/po/lo-Laoo-marc-NORMARC.po         |    2 +-
 misc/translator/po/lo-Laoo-marc-UNIMARC.po         |    2 +-
 misc/translator/po/lo-Laoo-opac-bootstrap.po       |   73 +-
 misc/translator/po/lo-Laoo-staff-help.po           |    2 +-
 misc/translator/po/lo-Laoo-staff-prog.po           | 1366 ++++++++---------
 misc/translator/po/mi-NZ-marc-MARC21.po            |    2 +-
 misc/translator/po/mi-NZ-marc-NORMARC.po           |    2 +-
 misc/translator/po/mi-NZ-marc-UNIMARC.po           |    2 +-
 misc/translator/po/mi-NZ-opac-bootstrap.po         |   70 +-
 misc/translator/po/mi-NZ-staff-help.po             |    2 +-
 misc/translator/po/mi-NZ-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/ml-marc-MARC21.po               |    2 +-
 misc/translator/po/ml-marc-NORMARC.po              |    2 +-
 misc/translator/po/ml-marc-UNIMARC.po              |    2 +-
 misc/translator/po/ml-opac-bootstrap.po            |   70 +-
 misc/translator/po/ml-staff-help.po                |    2 +-
 misc/translator/po/ml-staff-prog.po                | 1366 ++++++++---------
 misc/translator/po/mon-marc-MARC21.po              |    2 +-
 misc/translator/po/mon-marc-NORMARC.po             |    2 +-
 misc/translator/po/mon-marc-UNIMARC.po             |    2 +-
 misc/translator/po/mon-opac-bootstrap.po           |   70 +-
 misc/translator/po/mon-staff-help.po               |    2 +-
 misc/translator/po/mon-staff-prog.po               | 1366 ++++++++---------
 misc/translator/po/mr-marc-MARC21.po               |    2 +-
 misc/translator/po/mr-marc-NORMARC.po              |    2 +-
 misc/translator/po/mr-marc-UNIMARC.po              |    2 +-
 misc/translator/po/mr-opac-bootstrap.po            |   74 +-
 misc/translator/po/mr-staff-help.po                |    2 +-
 misc/translator/po/mr-staff-prog.po                | 1366 ++++++++---------
 misc/translator/po/ms-MY-marc-MARC21.po            |    2 +-
 misc/translator/po/ms-MY-marc-NORMARC.po           |    2 +-
 misc/translator/po/ms-MY-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ms-MY-opac-bootstrap.po         |   73 +-
 misc/translator/po/ms-MY-staff-help.po             |    2 +-
 misc/translator/po/ms-MY-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/my-marc-MARC21.po               |    2 +-
 misc/translator/po/my-marc-NORMARC.po              |    2 +-
 misc/translator/po/my-marc-UNIMARC.po              |    2 +-
 misc/translator/po/my-opac-bootstrap.po            |   70 +-
 misc/translator/po/my-staff-help.po                |    2 +-
 misc/translator/po/my-staff-prog.po                | 1366 ++++++++---------
 misc/translator/po/ne-NE-marc-MARC21.po            |    2 +-
 misc/translator/po/ne-NE-marc-NORMARC.po           |    2 +-
 misc/translator/po/ne-NE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ne-NE-opac-bootstrap.po         |   70 +-
 misc/translator/po/ne-NE-staff-help.po             |    2 +-
 misc/translator/po/ne-NE-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/oc-marc-MARC21.po               |    2 +-
 misc/translator/po/oc-marc-NORMARC.po              |    2 +-
 misc/translator/po/oc-marc-UNIMARC.po              |    2 +-
 misc/translator/po/oc-opac-bootstrap.po            |   71 +-
 misc/translator/po/oc-staff-help.po                |    2 +-
 misc/translator/po/oc-staff-prog.po                | 1373 ++++++++---------
 misc/translator/po/pbr-marc-MARC21.po              |    2 +-
 misc/translator/po/pbr-marc-NORMARC.po             |    2 +-
 misc/translator/po/pbr-marc-UNIMARC.po             |    2 +-
 misc/translator/po/pbr-opac-bootstrap.po           |   70 +-
 misc/translator/po/pbr-staff-help.po               |    2 +-
 misc/translator/po/pbr-staff-prog.po               | 1366 ++++++++---------
 misc/translator/po/ro-RO-marc-MARC21.po            |    2 +-
 misc/translator/po/ro-RO-marc-NORMARC.po           |    2 +-
 misc/translator/po/ro-RO-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ro-RO-opac-bootstrap.po         |   70 +-
 misc/translator/po/ro-RO-staff-help.po             |    2 +-
 misc/translator/po/ro-RO-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/ru-RU-marc-MARC21.po            |    2 +-
 misc/translator/po/ru-RU-marc-NORMARC.po           |    2 +-
 misc/translator/po/ru-RU-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ru-RU-opac-bootstrap.po         |   82 +-
 misc/translator/po/ru-RU-staff-help.po             |    2 +-
 misc/translator/po/ru-RU-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/sd-PK-marc-MARC21.po            |    2 +-
 misc/translator/po/sd-PK-marc-NORMARC.po           |    2 +-
 misc/translator/po/sd-PK-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sd-PK-opac-bootstrap.po         |   70 +-
 misc/translator/po/sd-PK-staff-help.po             |    2 +-
 misc/translator/po/sd-PK-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/sk-SK-marc-MARC21.po            |    2 +-
 misc/translator/po/sk-SK-marc-NORMARC.po           |    2 +-
 misc/translator/po/sk-SK-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sk-SK-opac-bootstrap.po         |   79 +-
 misc/translator/po/sk-SK-staff-help.po             |    2 +-
 misc/translator/po/sk-SK-staff-prog.po             | 1375 ++++++++---------
 misc/translator/po/sl-SI-marc-MARC21.po            |    2 +-
 misc/translator/po/sl-SI-marc-NORMARC.po           |    2 +-
 misc/translator/po/sl-SI-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sl-SI-opac-bootstrap.po         |   70 +-
 misc/translator/po/sl-SI-staff-help.po             |    2 +-
 misc/translator/po/sl-SI-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/sq-AL-marc-MARC21.po            |    2 +-
 misc/translator/po/sq-AL-marc-NORMARC.po           |    2 +-
 misc/translator/po/sq-AL-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sq-AL-opac-bootstrap.po         |   80 +-
 misc/translator/po/sq-AL-staff-help.po             |    2 +-
 misc/translator/po/sq-AL-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/sr-Cyrl-marc-MARC21.po          |    2 +-
 misc/translator/po/sr-Cyrl-marc-NORMARC.po         |    2 +-
 misc/translator/po/sr-Cyrl-marc-UNIMARC.po         |    2 +-
 misc/translator/po/sr-Cyrl-opac-bootstrap.po       |   70 +-
 misc/translator/po/sr-Cyrl-staff-help.po           |    2 +-
 misc/translator/po/sr-Cyrl-staff-prog.po           | 1366 ++++++++---------
 misc/translator/po/sv-SE-marc-MARC21.po            |    2 +-
 misc/translator/po/sv-SE-marc-NORMARC.po           |    2 +-
 misc/translator/po/sv-SE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sv-SE-opac-bootstrap.po         |   73 +-
 misc/translator/po/sv-SE-staff-help.po             |    2 +-
 misc/translator/po/sv-SE-staff-prog.po             | 1375 ++++++++---------
 misc/translator/po/sw-KE-marc-MARC21.po            |    2 +-
 misc/translator/po/sw-KE-marc-NORMARC.po           |    2 +-
 misc/translator/po/sw-KE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sw-KE-opac-bootstrap.po         |   70 +-
 misc/translator/po/sw-KE-staff-help.po             |    2 +-
 misc/translator/po/sw-KE-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/ta-marc-MARC21.po               |    2 +-
 misc/translator/po/ta-marc-NORMARC.po              |    2 +-
 misc/translator/po/ta-marc-UNIMARC.po              |    2 +-
 misc/translator/po/ta-opac-bootstrap.po            |   70 +-
 misc/translator/po/ta-staff-help.po                |    2 +-
 misc/translator/po/ta-staff-prog.po                | 1366 ++++++++---------
 misc/translator/po/tet-marc-MARC21.po              |    2 +-
 misc/translator/po/tet-marc-NORMARC.po             |    2 +-
 misc/translator/po/tet-marc-UNIMARC.po             |    2 +-
 misc/translator/po/tet-opac-bootstrap.po           |   73 +-
 misc/translator/po/tet-staff-help.po               |    2 +-
 misc/translator/po/tet-staff-prog.po               | 1374 ++++++++---------
 misc/translator/po/th-TH-marc-MARC21.po            |    2 +-
 misc/translator/po/th-TH-marc-NORMARC.po           |    2 +-
 misc/translator/po/th-TH-marc-UNIMARC.po           |    2 +-
 misc/translator/po/th-TH-opac-bootstrap.po         |   70 +-
 misc/translator/po/th-TH-staff-help.po             |    2 +-
 misc/translator/po/th-TH-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/tl-PH-marc-MARC21.po            |    2 +-
 misc/translator/po/tl-PH-marc-NORMARC.po           |    2 +-
 misc/translator/po/tl-PH-marc-UNIMARC.po           |    2 +-
 misc/translator/po/tl-PH-opac-bootstrap.po         |   70 +-
 misc/translator/po/tl-PH-staff-help.po             |    2 +-
 misc/translator/po/tl-PH-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/tr-TR-marc-MARC21.po            |    2 +-
 misc/translator/po/tr-TR-marc-NORMARC.po           |    2 +-
 misc/translator/po/tr-TR-marc-UNIMARC.po           |    2 +-
 misc/translator/po/tr-TR-opac-bootstrap.po         |  104 +-
 misc/translator/po/tr-TR-pref.po                   |    6 +-
 misc/translator/po/tr-TR-staff-help.po             |   28 +-
 misc/translator/po/tr-TR-staff-prog.po             | 1542 ++++++++++----------
 misc/translator/po/uk-UA-marc-MARC21.po            |    2 +-
 misc/translator/po/uk-UA-marc-NORMARC.po           |    2 +-
 misc/translator/po/uk-UA-marc-UNIMARC.po           |    2 +-
 misc/translator/po/uk-UA-opac-bootstrap.po         |   73 +-
 misc/translator/po/uk-UA-staff-help.po             |    2 +-
 misc/translator/po/uk-UA-staff-prog.po             | 1366 ++++++++---------
 misc/translator/po/ur-Arab-marc-MARC21.po          |    2 +-
 misc/translator/po/ur-Arab-marc-NORMARC.po         |    2 +-
 misc/translator/po/ur-Arab-marc-UNIMARC.po         |    2 +-
 misc/translator/po/ur-Arab-opac-bootstrap.po       |   70 +-
 misc/translator/po/ur-Arab-staff-help.po           |    2 +-
 misc/translator/po/ur-Arab-staff-prog.po           | 1366 ++++++++---------
 misc/translator/po/vi-VN-marc-MARC21.po            |    2 +-
 misc/translator/po/vi-VN-marc-NORMARC.po           |    2 +-
 misc/translator/po/vi-VN-marc-UNIMARC.po           |    2 +-
 misc/translator/po/vi-VN-opac-bootstrap.po         |   73 +-
 misc/translator/po/vi-VN-staff-help.po             |    2 +-
 misc/translator/po/vi-VN-staff-prog.po             | 1367 ++++++++---------
 414 files changed, 47610 insertions(+), 46401 deletions(-)
 copy misc/release_notes/{release_notes_16_5_8.html => release_notes_16_5_17.html} (57%)
 copy misc/release_notes/{release_notes_16_5_16.md => release_notes_16_5_17.md} (50%)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep 23 04:08:55 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 23 Sep 2017 02:08:55 +0000
Subject: [koha-commits] main Koha release repository annotated tag v16.05.17
	created. v16.05.17
Message-ID: <E1dvZsF-00046f-3D@git.koha-community.org>

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 annotated tag, v16.05.17 has been created
        at  bc4c478eed87b072c7a6caca2f9aec4f4245a625 (tag)
   tagging  1210a897592f1e213bd49c5a08cd4e8f62973940 (commit)
  replaces  v16.05.16
 tagged by  Mason James
        on  Sat Sep 23 14:03:29 2017 +1200

- Log -----------------------------------------------------------------
Koha release 16.05.17
-----BEGIN PGP SIGNATURE-----

iQEzBAABCAAdFiEE2268yF0Tpgixmg/yY+yms3JtcHcFAlnFwPEACgkQY+yms3Jt
cHeDrQf/RWhjinCyNuKWXIQsMTIOquguLqV4639f2nYybh4dZqbIjutoOIqHXHoO
JBDbM/9VOovOnzpipUeMrKifHWdNVOoR3M6BycixWr/cLP/ohmDXcganmsx5gxzV
1AcekAOuwcH144CLUVrBS7stXSNF5aUzffn3/l7+e0lTdCqCEZ5dRJ1/89gSe5m4
PUyfch8N7Oz/V1CACI30twH9LNgsI3XP4hBmFzPYiIPD8dmrnCs3TcNkNKNILLQT
RXAyBuzEACQ/ZGjIbu0e4qzyUmKCs3IYlDghx7fW8uwyd0qX9xsSE/ULrqpHmfc3
W14UaHbKKF6Sqnvy/k+M/X9m7Hvyfw==
=/Fbt
-----END PGP SIGNATURE-----

Alex Sassmannshausen (1):
      Bug 19073: (bug 15758 follow-up) Dereference correct value from Koha::Object.

Amit Gupta (12):
      Bug 19086 Stored XSS in supplier.pl
      Bug 19086 Stored XSS in subscription-add.pl
      Bug 19103 - Stored XSS in itemtypes.pl
      Bug 19103 - Stored XSS in patron-attr-types.pl
      Bug 19103 - Stored XSS in matching-rules.pl
      Bug 19108 - Stored XSS in oai_sets.pl
      Bug 19108 - Stored XSS in items_search_fields.pl
      Bug 19108 - Stored XSS in classsources.pl
      Bug 19108 - Stored XSS in authtypes.pl
      Bug 19108 - Stored XSS in fieldmapping.pl
      Bug 19108 - Stored XSS in biblio_framework.pl and marctagstructure.pl
      Bug 19127 - Stored XSS in csv-profiles.pl

Chris Cormack (3):
      Bug 18046: CAS logout infinite redirect
      Bug 19086 XSS in members/member.pl
      Bug 19086 Stored XSS in circulation.pl

David Cook (1):
      Bug 18898 - Some permissions for Reports can be bypassed

Fridolin Somers (4):
      Bug 18551 - Hide with CSS dynamic elements in member search
      Bug 18900: add UT to Number/Price.t
      Bug 18900: wrong number format in receiving order
      Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt

Jonathan Druart (14):
      Bug 19053: Keep auto_renew flag if a confirmation is needed
      Bug 18996: [16.11.x] use Koha::OldIssues instead of Koha::Old::Checkouts
      Bug 18906: Display all funds the logged in user can use
      Bug 17249: Remove GetKohaAuthorisedValuesFromField - Add classes MarcSubfieldStructure[s]
      Bug 17249: Remove GetKohaAuthorisedValuesFromField - add tests
      Bug 17249: Remove GetKohaAuthorisedValuesFromField - Add search_by_marc_field
      Bug 17249: Remove GetKohaAuthorisedValuesFromField - inventory
      Bug 17249: Remove GetKohaAuthorisedValuesFromField - (follow-up) inventory
      Bug 17249: Remove GetKohaAuthorisedValuesFromField
      Bug 17249: GetKohaAuthorisedValuesFromField - rm GetAuthValCodeFromField
      Bug 19103: (follow-up) Stored XSS in itemtypes.pl
      Bug 19108: (follow-up) Stored XSS in biblio_framework.pl
      Bug 19127: (follow-up) Stored XSS in csv-profiles.pl
      Bug 19128: XSS - admin/authorised_values.tt

Julian Maurice (1):
      Bug 18741: Fix loading of SQL files in web installer

Katrin Fischer (4):
      Bug 19086 - Follow-up - XSS in supplier.tt
      Bug 19086 - Follow-up - subscription-detail.pl
      Bug 19125 - XSS - members.pl
      Bug 19128 - XSS - patron-attr-types.tt, authorised_values.tt and categories.tt

Marc V?ron (5):
      Bug 18649: Translatability: Get rid of tt directive in translation for admin/categories.tt and onboardingstep2.tt
      Bug 18652: Get rid of tt directive in translation for uncertainprice.tt
      Bug 18660: Translatability: Get rid of template directives [%% in translation for patroncards-errors.inc
      Bug 18778 - Translatability: Get rid of tt directive in translation for item-status.inc
      Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt

Marcel de Rooy (5):
      Bug 18996: [16.11.x] Handle data corruption from old_issues at SIP checkin
      Bug 18996: [16.11.x] Resolve an uninitialized warning from ILS/Item.pm
      Bug 18996: [16.11.x] Add checkin subtest in SIP/Message.t
      Bug 18996: [16.11.x] [QA Follow-up] Remove global variables from Message.t
      Bug 18921: Resolve a few warnings in C4/XSLT.pm

Mason James (11):
      Bug 18927: Use fully qualified subroutine names in C4::Items
      Revert "Bug 17249: GetKohaAuthorisedValuesFromField - rm GetAuthValCodeFromField"
      Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField"
      Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - (follow-up) inventory"
      Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - inventory"
      Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - Add search_by_marc_field"
      Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - add tests"
      Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - Add classes MarcSubfieldStructure[s]"
      Translation updates for Koha 16.05.17
      Add release notes for Koha 16.05.17
      Increment version for 16.05.17 release

Serhij Dubyk {?????? ?????} (1):
      Bug 17827 - Untranslatable "by" in MARC21slim2intranetResults.xsl

Tomas Cohen Arazi (1):
      Bug 18900: (QA followup) Make tests conditional to locale existence

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 26 07:45:28 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 26 Sep 2017 05:45:28 +0000
Subject: [koha-commits] main Koha release repository branch 16.11.x updated.
	v16.11.11-1-69-ged45b5f
Message-ID: <E1dwigS-0002nb-U6@git.koha-community.org>

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.11.x has been updated
       via  ed45b5f4e4f38c72d1e28ab19b94f1c37bc51d91 (commit)
       via  7d7a166922b934eeddabe5c6025cce0006c6d1ad (commit)
       via  7d03ff0d8c254cf01649cc04b2c7801288764fe2 (commit)
       via  2e7d3eebac29d129f2d25f223859d1662e4d7a5c (commit)
       via  124b65eef5cc0394fcba6398091e3307121332c8 (commit)
       via  2f5aee8a663c8ead0ad3f7dc90028281b13de1e6 (commit)
       via  a9c4abdd0c341bb936799b406e36d26672140f11 (commit)
       via  9dd324767b475162c65a00125eaa676a03a1514d (commit)
       via  aa628f89fd356d6d4d975e68419844cb94d1cb73 (commit)
       via  5950aed63ac3dcb88a64c0b6297dd70c4e7fb61c (commit)
       via  8b61a24479ac84c4c51f4d9828b20725a1c0c7a0 (commit)
       via  556467290849513549d334e00442941a1033e5b4 (commit)
       via  9aae3ca54cb6f390ee8c8cd8b167f6631020e9c6 (commit)
       via  7519003be921cde17f8547fb242635b109bfb0a1 (commit)
       via  543aef4ead52f49cc5804e72165dc6bee5eca6ac (commit)
       via  c092ea7261e310f85298adbd2800e5016585ece8 (commit)
       via  a71269b23b580d68e45e1bf61285f651c64f1edf (commit)
       via  d6369b8e8982077102dace171d3e7923d67037d8 (commit)
       via  4ee823f8687605ee54011e09c5a802da6f928ec0 (commit)
       via  a2e811dafc006db60bcd4223dd7dc7c66f0308e4 (commit)
       via  39145c660954ab6c3451ee73bb0fc24002470bde (commit)
       via  97283ef94bd0ae179c0c13759ecf7495552d28d9 (commit)
       via  cf373de7a8e811032b1d6a9ebac1652bed87a59e (commit)
       via  5e405e8d5da74bfe5ffb6be40a7dbd9937017670 (commit)
       via  026ff59914398022364993ae7d568def17f1ba40 (commit)
       via  f6bb532a9a5448ae1dba1a9b0fdaaa99f1271304 (commit)
       via  2aac25bb7a8d750d6f234b6f076682ae40158e7c (commit)
       via  b9e460f398f573b15daee4d7f9328d08d1418535 (commit)
       via  8ae521da59d5376607c8a7d763a15177fa257444 (commit)
       via  f17be038ebb4c5f05d402a2a93e70c78c306d373 (commit)
      from  42b30105ffd2b6814873fad1cff5cd4d35c140ee (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 ed45b5f4e4f38c72d1e28ab19b94f1c37bc51d91
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Tue Sep 19 22:15:34 2017 +0000

    Add release notes for Koha 16.11.12

commit 7d7a166922b934eeddabe5c6025cce0006c6d1ad
Merge: 2e7d3ee 7d03ff0
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Tue Sep 19 23:34:45 2017 +0200

    Merge remote-tracking branch 'transl/16.11.12-translate-20170919' into 16.11.x

commit 7d03ff0d8c254cf01649cc04b2c7801288764fe2
Author: root <root at translate.koha-community.org>
Date:   Tue Sep 19 18:32:01 2017 -0300

    Translation updates for Koha 16.11.12

commit 2e7d3eebac29d129f2d25f223859d1662e4d7a5c
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Tue Sep 19 23:24:47 2017 +0200

    Increment version for 16.11.12 release

commit 124b65eef5cc0394fcba6398091e3307121332c8
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Sep 1 13:16:43 2017 -0400

    Bug 19235: Password entry visible in OPAC Self-registration
    
    The HTML code was "text" instead of "password".
    
    TEST PLAN
    ----------
    1) 'Allow' PatronSelfRegistration system preference
    2) Define the PatronSelfRegistrationDefaultCategory system preference (e.g. PT)
    3) Open OPAC
    4) Click 'Register here' on the right.  (/cgi-bin/koha/opac-memberentry.pl)
    5) Scroll to bottom
    6) enter some passwords
       -- visible
    7) apply this patch
    8) refresh page
    9) repeat 5-6 as needed
       -- passwords should not be visible while entering
    10) run koha qa test tools
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 99e691feee5ef29bbc9d24a916fc4aa2fab6bba6)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit b7856f76af9e0bbef7dca6458c8074710a309ca8)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 2f5aee8a663c8ead0ad3f7dc90028281b13de1e6
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Sep 8 10:14:10 2017 +0200

    Bug 15438: [QA Follow-up] Moving POD statement for CanBookBeIssued
    
    The statement for head3 NB ('nota bene'?) looks like a hash key
    in the list of possible return values for $needsconfirmation.
    Moved it up and prefixed it with IMPORTANT.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 133e25c56ac79e0b88b89e3b749df338e63a93d0)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit f99f0b7a4a81379adbdc84e8fcae7ac1d6af5fd6)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit a9c4abdd0c341bb936799b406e36d26672140f11
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Wed Aug 24 13:52:52 2016 +0100

    Bug 15438 - Checking out an on-hold item sends holder's borrowernumber in AF (screen message) field.
    
    The returns from C4::Circulation::CanBookBeIssued used
    to be structured as a hashref of entries like
       REASON => {
           data => 'foo',
           moredata => 'bar',
       };
    Some entries still are. But many are now
       REASON => 1,
       data   => 'foo',
       moredata => 'bar',
    
    The sip Checkout routine still assumed the former, as it
    reports any causes it was not aware of (to maintain support for
    a changing api) The data fields could leak into the screen message
    field of the response. e.g. the borrowernumber or surname of the
    borrower who has a hold on an issued title. Some real messages were
    getting obscured by this
    
    This patch sanatizes the return from from CanBookBeIssued
    by removing keys which are not all uppercase
    It also fixes a case where the key's data element was used
    for the screen message when we should use the key itself
    
    Updated the documentation of CanBookBeIssued to flag up
    the assumption re case and the fact that 3 elements rather
    than two may be returned
    
    The loop through the returned keys was a bit bogus
    so we now explicitly jump out if noerror is unset
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Tested quite extensively. Test results put on Bugzilla.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 4d223bdc6156fab0667867f3990854fddfab5684)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit fcd8e322f5248425c89fe28567d10866d0d76a36)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 9dd324767b475162c65a00125eaa676a03a1514d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 11:21:27 2017 -0300

    Bug 19127: (follow-up) Stored XSS in csv-profiles.pl
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 52b41dfdf0ec03c24dd970b80e4f153f64702e30)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit d6579c70190935801870cfe56a1a09a8d04c2b0e)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit aa628f89fd356d6d4d975e68419844cb94d1cb73
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Wed Aug 16 17:56:17 2017 +0530

    Bug 19127 - Stored XSS in csv-profiles.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/tools/csv-profiles.pl?op=add_form
    2. Add a text in the field Profile name, Profile description
       and Profile MARC fields that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 7a3ee2dd8cb233d083d8a7b8636eca7c6d518b8b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 9b4777878f59c7a0c3653f54b6a2cff85bb278a8)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 5950aed63ac3dcb88a64c0b6297dd70c4e7fb61c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 11:06:11 2017 -0300

    Bug 19108: (follow-up) Stored XSS in biblio_framework.pl
    
    Prevent software error
    Template process failed: undef error - text: filter not found at
    /home/vagrant/kohaclone/C4/Templates.pm line 121.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit f904b019f77cd19ca0373f9635811a634ac73321)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit d5c7edc55da6aaf78d25d131ebb35ab659a0084d)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 8b61a24479ac84c4c51f4d9828b20725a1c0c7a0
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 13:52:07 2017 +0200

    Bug 19108 - Follow-up - fieldmapping.tt and items_search_fields.tt
    
    To test:
    - Add a framework with script in the description
    - Access the Keywords to MARC mapping page
    - Add an item search field where both name and label are script
    - Try to edit/delete the added mapping
    
    With the patch no script should be executed and everything
    should still work ok.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 1649be1e9f510543f85b9e3a22af88ae8c6bfb9c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 845ee9282472f9a309b3af4aff49403b93091b19)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 556467290849513549d334e00442941a1033e5b4
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 14:37:50 2017 +0530

    Bug 19108 - Stored XSS in biblio_framework.pl and marctagstructure.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/biblio_framework.pl?op=add_form
    2. Add a text in the field Description that contains js
    3. Save the page.
    4. Notice js is execute
    5. Click on Actions -> MARC structure
    6. Apply patch and reload, the js is escaped
    
    Fixed for both the pages biblio_framework.pl and marctagstructure.pl
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 29ab5517f5c8cfbc86b98c3197846d005007cc12)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 83fdc8aea52533dbcb4261fd986d5760e5baa6df)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 9aae3ca54cb6f390ee8c8cd8b167f6631020e9c6
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 14:10:43 2017 +0530

    Bug 19108 - Stored XSS in fieldmapping.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/fieldmapping.pl
    2. Add a text in the field Field name that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 77ddae74d661fb589d74bd85f5561fdd4131af70)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit eccce3e1ba3bbcb73d47defc49b322fe578e5014)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 7519003be921cde17f8547fb242635b109bfb0a1
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 14:06:47 2017 +0530

    Bug 19108 - Stored XSS in authtypes.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/authtypes.pl?op=add_form
    2. Add a text in the field Description that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit bc780f588bc908f8b1d0da8987b20914996d942c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 520388dc1d6f3e0e6ada332cf232784e4e737834)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 543aef4ead52f49cc5804e72165dc6bee5eca6ac
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 13:55:45 2017 +0530

    Bug 19108 - Stored XSS in classsources.pl
    
    Fixed for both Classification sources & Classification filing rules
    
    To Test
    1. first case classification source: Hit the page
       /cgi-bin/koha/admin/classsources.pl?op=add_source
       second case classification filing rules:
       Hit the page /cgi-bin/koha/admin/classsources.pl?op=add_sort_rule
    2. Add a text in the field Description that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 940c8634914b50940cfaf73af3611e6282d5803f)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 64abaa063d578567c18ee84a8e6abc424fa0da97)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit c092ea7261e310f85298adbd2800e5016585ece8
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 13:49:10 2017 +0530

    Bug 19108 - Stored XSS in items_search_fields.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/items_search_fields.pl
    2. Add a text in the field Name and Label that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Fixed for new and edit page
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 063fd5e1b9e086c57987fae408b4ce6e51fec2b9)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 332d705e725a0672eafdeedb88d3848fca4b2a8b)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit a71269b23b580d68e45e1bf61285f651c64f1edf
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 13:33:57 2017 +0530

    Bug 19108 - Stored XSS in oai_sets.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/oai_sets.pl
    2. Click on New set
    3. Add a text in the field setSpec, setName that contains js
    4. Save the page.
    5. Notice js is execute
    6. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 10d3a8c212f8a45e40cd2644f94d555566a10018)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 20b4c81c1a1e1c93ecdc5ebeeddb870a802a7d4a)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit d6369b8e8982077102dace171d3e7923d67037d8
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 10:15:54 2017 +0530

    Bug 19103 - Stored XSS in matching-rules.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/matching-rules.pl
    2. Click on new record matching rule
    3. Add a text in the field Description that contain js.
    4. Save the page.
    5. Notice js is execute
    6. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 9222cd77d282affffba43a40a9ff2f768647501e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit fb90eee74c483eb188b8c682a1259ba964f9c2b8)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 4ee823f8687605ee54011e09c5a802da6f928ec0
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 10:07:45 2017 +0530

    Bug 19103 - Stored XSS in patron-attr-types.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/patron-attr-types.pl
    2. Click on new patron attribute type
    2. Add a text in the field Description that contain js.
    2. Save the page.
    3. Notice js is execute
    4. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit cb0c3da4b6cec991194ce91e6412cf9d50562044)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 6fc53fb6df1e638f5cea70254612f7e60ff4de2f)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit a2e811dafc006db60bcd4223dd7dc7c66f0308e4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 10:58:24 2017 -0300

    Bug 19103: (follow-up) Stored XSS in itemtypes.pl
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit c221bc40a330a25d59097e94e962a4afcea011af)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit e3e035c3ef1f89c416922f6a81fdc2b4596f900e)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 39145c660954ab6c3451ee73bb0fc24002470bde
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 08:52:40 2017 +0530

    Bug 19103 - Stored XSS in itemtypes.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/itemtypes.pl
    2. Add a text in the field Description, Checkin message that contains js
    2. Save the page.
    3. Notice js is execute
    4. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 18b5d4f1ababf560ff02a258de389f8c34cff9e4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 4653a5209acf51cdc5977ff082d9b658f9959350)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 97283ef94bd0ae179c0c13759ecf7495552d28d9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 10:35:10 2017 -0300

    Bug 19128: XSS - admin/authorised_values.tt
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit ad230cdcb5ad69541a89a4edaedcadde9d25b88a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit c7a6dbca09c3aababf71349a9403b8e1e9e3e2bc)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit cf373de7a8e811032b1d6a9ebac1652bed87a59e
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 14:34:17 2017 +0200

    Bug 19128 - XSS - patron-attr-types.tt, authorised_values.tt and categories.tt
    
    Preparation:
    - Add a branch with script in the branch name
    - Add a patron category with script in the category name
    - Add a new authorised value cateogory with script
    - Add a new authroised value for this category with script
      in all possible fields
    
    - Test editing patron categories
    - Test editing patron attribute types
    - Test viewing and editing authorised values
    
    Verify that with this script there is no more script executed
    and everything works fine.
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 6b7ad77fffd7a6c4b69bce5bf666c6ff4be76c5b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 8b85e835541e650cfa4c867bcd65fc5d03334613)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 5e405e8d5da74bfe5ffb6be40a7dbd9937017670
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 12:05:50 2017 +0200

    Bug 19125 - XSS - members.pl
    
    In preparation to test this patch:
    - Add a patron list named <script>alert("patron list")</script>
    - Add a library named <script>alert("library")</script>
    - Add a patron category named <script>alert("patron category")</script>
    
    To test:
    - Access patron search page and do a search
    - Verify that the alerts added above are executed
    - Apply patch
    - Verify that no alerts are displayed
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 849eaf73fc419b9a635a1ba4b69ef46a7544e55a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 2b0bd9add5deae0ab5bee79ee75a6cb769d0dea8)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 026ff59914398022364993ae7d568def17f1ba40
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 13:07:18 2017 +0200

    Bug 19086 - Follow-up - subscription-detail.pl
    
    Add script to the callnumber field on adding a subscription.
    
    Verify script is executed without this patch, but not with it.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 3ebcd2475dd35db47c33bcc59d5e75968667b518)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit b03752fa781695f9fb506be7ea5afd9fb3db4a08)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit f6bb532a9a5448ae1dba1a9b0fdaaa99f1271304
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 12:59:13 2017 +0200

    Bug 19086 - Follow-up - XSS in supplier.tt
    
    In preparation:
    Make sure you enter <script>alert("sth")</script>
    in all fields of a new vendor that are not validated
    and save.
    
    1) Access vendor summary page.
    2) Verify scripts are executed
    3) Apply patch
    4) Verify scripts are on longer executed
    
    This works in combination with the other patches for XSS
    on this bug.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 14a1aba57cc091a70c527a0d6bd495d21bd87345)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 13147e7c05daa73a4f562541c3a7f8c98747bc83)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 2aac25bb7a8d750d6f234b6f076682ae40158e7c
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 02:44:11 2017 +0530

    Bug 19086 Stored XSS in subscription-add.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/serials/subscription-add.pl
    2. Add a text in the field Public note and Nonpublic note
       that contains js (Internalnotes, notes)
    2. Save the page.
    3. Notice js is execute
    4. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit ebf781afc133508eddcb8dc8fb6d7429a72db99b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit c4a1eafb5bac265c936567807e94ab22d04a1094)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit b9e460f398f573b15daee4d7f9328d08d1418535
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 02:33:59 2017 +0530

    Bug 19086 Stored XSS in supplier.pl
    
    1. Hit the page /cgi-bin/koha/acqui/supplier.pl?op=enter
    2. Add a text in the field company_postal, physical, company_fax,
       accountnumber, contactposition, contact_fax, contact_notes, notes that contains java script
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 9d0bbf5fa7455e0eb64288652802b0836cf22690)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 46f91605a4044ebbf74f7014305078a1304afcd1)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 8ae521da59d5376607c8a7d763a15177fa257444
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date:   Fri Aug 11 19:54:34 2017 +0000

    Bug 19086 Stored XSS in circulation.pl
    
    1/ To test add a message to a borrower that contains js
    2/ hit /cgi-bin/koha/circ/circulation.pl?borrowernumber=[number]
      where number is the borrowernumber of the borrower you set the message
      for
    3/ Notice js is execute
    4/ Apply patch, reload, js is escaped
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 80c93d3499b11f3574fbafe756f94c534b746d5a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 0a53a9e7f35855405024d03bde01d49f560f99ee)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit f17be038ebb4c5f05d402a2a93e70c78c306d373
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date:   Fri Aug 11 19:36:43 2017 +0000

    Bug 19086 XSS in members/member.pl
    
    To test
    1/ hit /cgi-bin/koha/members/member.pl?&searchmember=<script>alert('XSS Payload')</script>
    2/ Notice js is executed
    3/ Apply patch, reload
    4/ js is now escaped
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 5ae18484b5a47e8a00ce8f1a0fd8b3db471947eb)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 44814081a72a995a91f7057d9158b18167c65dca)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

Summary of changes:
 C4/Circulation.pm                                  |    8 +-
 C4/SIP/ILS/Transaction/Checkout.pm                 |   42 +-
 Koha.pm                                            |    2 +-
 installer/data/mysql/updatedatabase.pl             |    6 +
 .../en/includes/admin-items-search-field-form.inc  |    4 +-
 .../prog/en/includes/html_helpers.inc              |    2 +-
 .../prog/en/includes/patron-search.inc             |    6 +-
 .../prog/en/includes/patron-toolbar.inc            |    4 +-
 .../prog/en/modules/acqui/supplier.tt              |   32 +-
 .../prog/en/modules/admin/authorised_values.tt     |   26 +-
 .../prog/en/modules/admin/authtypes.tt             |    4 +-
 .../prog/en/modules/admin/biblio_framework.tt      |   12 +-
 .../prog/en/modules/admin/categories.tt            |    4 +-
 .../prog/en/modules/admin/classsources.tt          |    4 +-
 .../prog/en/modules/admin/fieldmapping.tt          |   12 +-
 .../prog/en/modules/admin/items_search_field.tt    |    4 +-
 .../prog/en/modules/admin/items_search_fields.tt   |   10 +-
 .../prog/en/modules/admin/itemtypes.tt             |    4 +-
 .../prog/en/modules/admin/marctagstructure.tt      |   18 +-
 .../prog/en/modules/admin/matching-rules.tt        |    2 +-
 .../prog/en/modules/admin/oai_set_mappings.tt      |    2 +-
 .../prog/en/modules/admin/oai_sets.tt              |   10 +-
 .../prog/en/modules/admin/patron-attr-types.tt     |   12 +-
 .../prog/en/modules/circ/circulation.tt            |    2 +-
 .../prog/en/modules/members/member.tt              |   10 +-
 .../prog/en/modules/serials/subscription-detail.tt |    6 +-
 .../prog/en/modules/tools/csv-profiles.tt          |   12 +-
 .../bootstrap/en/modules/opac-memberentry.tt       |    8 +-
 ...s_16_11_11.html => release_notes_16_11_12.html} |  235 +--
 misc/release_notes/release_notes_16_11_12.md       |  309 ++++
 misc/translator/po/am-Ethi-marc-MARC21.po          |    3 +-
 misc/translator/po/am-Ethi-marc-NORMARC.po         |    2 +-
 misc/translator/po/am-Ethi-marc-UNIMARC.po         |    2 +-
 misc/translator/po/am-Ethi-opac-bootstrap.po       |   49 +-
 misc/translator/po/am-Ethi-staff-help.po           |    2 +-
 misc/translator/po/am-Ethi-staff-prog.po           | 1282 +++++++++--------
 misc/translator/po/ar-Arab-marc-MARC21.po          |    3 +-
 misc/translator/po/ar-Arab-marc-NORMARC.po         |    2 +-
 misc/translator/po/ar-Arab-marc-UNIMARC.po         |    2 +-
 misc/translator/po/ar-Arab-opac-bootstrap.po       |   53 +-
 misc/translator/po/ar-Arab-staff-help.po           |    2 +-
 misc/translator/po/ar-Arab-staff-prog.po           | 1358 +++++++++---------
 misc/translator/po/as-IN-marc-MARC21.po            |    3 +-
 misc/translator/po/as-IN-marc-NORMARC.po           |    2 +-
 misc/translator/po/as-IN-marc-UNIMARC.po           |    2 +-
 misc/translator/po/as-IN-opac-bootstrap.po         |   49 +-
 misc/translator/po/as-IN-staff-help.po             |    2 +-
 misc/translator/po/as-IN-staff-prog.po             | 1278 +++++++++--------
 misc/translator/po/az-AZ-marc-MARC21.po            |    3 +-
 misc/translator/po/az-AZ-marc-NORMARC.po           |    2 +-
 misc/translator/po/az-AZ-marc-UNIMARC.po           |    2 +-
 misc/translator/po/az-AZ-opac-bootstrap.po         |   49 +-
 misc/translator/po/az-AZ-staff-help.po             |    2 +-
 misc/translator/po/az-AZ-staff-prog.po             | 1278 +++++++++--------
 misc/translator/po/be-BY-marc-MARC21.po            |    3 +-
 misc/translator/po/be-BY-marc-NORMARC.po           |    2 +-
 misc/translator/po/be-BY-marc-UNIMARC.po           |    2 +-
 misc/translator/po/be-BY-opac-bootstrap.po         |   50 +-
 misc/translator/po/be-BY-staff-help.po             |    2 +-
 misc/translator/po/be-BY-staff-prog.po             | 1308 +++++++++--------
 misc/translator/po/bg-Cyrl-marc-MARC21.po          |    3 +-
 misc/translator/po/bg-Cyrl-marc-NORMARC.po         |    2 +-
 misc/translator/po/bg-Cyrl-marc-UNIMARC.po         |    2 +-
 misc/translator/po/bg-Cyrl-opac-bootstrap.po       |   49 +-
 misc/translator/po/bg-Cyrl-staff-help.po           |    2 +-
 misc/translator/po/bg-Cyrl-staff-prog.po           | 1282 +++++++++--------
 misc/translator/po/bn-IN-marc-MARC21.po            |    3 +-
 misc/translator/po/bn-IN-marc-NORMARC.po           |    2 +-
 misc/translator/po/bn-IN-marc-UNIMARC.po           |    2 +-
 misc/translator/po/bn-IN-opac-bootstrap.po         |   49 +-
 misc/translator/po/bn-IN-staff-help.po             |    2 +-
 misc/translator/po/bn-IN-staff-prog.po             | 1282 +++++++++--------
 misc/translator/po/ca-ES-marc-MARC21.po            |    3 +-
 misc/translator/po/ca-ES-marc-NORMARC.po           |    2 +-
 misc/translator/po/ca-ES-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ca-ES-opac-bootstrap.po         |   54 +-
 misc/translator/po/ca-ES-staff-help.po             |    2 +-
 misc/translator/po/ca-ES-staff-prog.po             | 1278 +++++++++--------
 misc/translator/po/cs-CZ-marc-MARC21.po            |    3 +-
 misc/translator/po/cs-CZ-marc-NORMARC.po           |    2 +-
 misc/translator/po/cs-CZ-marc-UNIMARC.po           |    2 +-
 misc/translator/po/cs-CZ-opac-bootstrap.po         |   54 +-
 misc/translator/po/cs-CZ-staff-help.po             |    2 +-
 misc/translator/po/cs-CZ-staff-prog.po             | 1379 +++++++++---------
 misc/translator/po/cy-GB-marc-MARC21.po            |    3 +-
 misc/translator/po/cy-GB-marc-NORMARC.po           |    2 +-
 misc/translator/po/cy-GB-marc-UNIMARC.po           |    2 +-
 misc/translator/po/cy-GB-opac-bootstrap.po         |   49 +-
 misc/translator/po/cy-GB-staff-help.po             |    2 +-
 misc/translator/po/cy-GB-staff-prog.po             | 1278 +++++++++--------
 misc/translator/po/da-DK-marc-MARC21.po            |    3 +-
 misc/translator/po/da-DK-marc-NORMARC.po           |    2 +-
 misc/translator/po/da-DK-marc-UNIMARC.po           |    2 +-
 misc/translator/po/da-DK-opac-bootstrap.po         |   54 +-
 misc/translator/po/da-DK-staff-help.po             |    2 +-
 misc/translator/po/da-DK-staff-prog.po             | 1323 +++++++++--------
 misc/translator/po/de-CH-marc-MARC21.po            |    3 +-
 misc/translator/po/de-CH-marc-NORMARC.po           |    2 +-
 misc/translator/po/de-CH-marc-UNIMARC.po           |    2 +-
 misc/translator/po/de-CH-opac-bootstrap.po         |   59 +-
 misc/translator/po/de-CH-staff-help.po             |    2 +-
 misc/translator/po/de-CH-staff-prog.po             | 1375 +++++++++---------
 misc/translator/po/de-DE-marc-MARC21.po            |    3 +-
 misc/translator/po/de-DE-marc-NORMARC.po           |    2 +-
 misc/translator/po/de-DE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/de-DE-opac-bootstrap.po         |   64 +-
 misc/translator/po/de-DE-staff-help.po             |    6 +-
 misc/translator/po/de-DE-staff-prog.po             | 1405 +++++++++---------
 misc/translator/po/el-GR-marc-MARC21.po            |    3 +-
 misc/translator/po/el-GR-marc-NORMARC.po           |    2 +-
 misc/translator/po/el-GR-marc-UNIMARC.po           |    2 +-
 misc/translator/po/el-GR-opac-bootstrap.po         |   56 +-
 misc/translator/po/el-GR-staff-help.po             |    2 +-
 misc/translator/po/el-GR-staff-prog.po             | 1359 +++++++++---------
 misc/translator/po/en-GB-marc-MARC21.po            |    3 +-
 misc/translator/po/en-GB-marc-NORMARC.po           |    2 +-
 misc/translator/po/en-GB-marc-UNIMARC.po           |    2 +-
 misc/translator/po/en-GB-opac-bootstrap.po         |   49 +-
 misc/translator/po/en-GB-staff-help.po             |    2 +-
 misc/translator/po/en-GB-staff-prog.po             | 1278 +++++++++--------
 misc/translator/po/en-NZ-marc-MARC21.po            |    3 +-
 misc/translator/po/en-NZ-marc-NORMARC.po           |    2 +-
 misc/translator/po/en-NZ-marc-UNIMARC.po           |    2 +-
 misc/translator/po/en-NZ-opac-bootstrap.po         |   54 +-
 misc/translator/po/en-NZ-staff-help.po             |    2 +-
 misc/translator/po/en-NZ-staff-prog.po             | 1356 +++++++++---------
 misc/translator/po/eo-marc-MARC21.po               |    3 +-
 misc/translator/po/eo-marc-NORMARC.po              |    2 +-
 misc/translator/po/eo-marc-UNIMARC.po              |    2 +-
 misc/translator/po/eo-opac-bootstrap.po            |   53 +-
 misc/translator/po/eo-staff-help.po                |    2 +-
 misc/translator/po/eo-staff-prog.po                | 1282 +++++++++--------
 misc/translator/po/es-ES-marc-MARC21.po            |   14 +-
 misc/translator/po/es-ES-marc-NORMARC.po           |    2 +-
 misc/translator/po/es-ES-marc-UNIMARC.po           |    2 +-
 misc/translator/po/es-ES-opac-bootstrap.po         |   58 +-
 misc/translator/po/es-ES-staff-help.po             |    2 +-
 misc/translator/po/es-ES-staff-prog.po             | 1384 +++++++++---------
 misc/translator/po/eu-marc-MARC21.po               |    3 +-
 misc/translator/po/eu-marc-NORMARC.po              |    2 +-
 misc/translator/po/eu-marc-UNIMARC.po              |    2 +-
 misc/translator/po/eu-opac-bootstrap.po            |   54 +-
 misc/translator/po/eu-staff-help.po                |    2 +-
 misc/translator/po/eu-staff-prog.po                | 1282 +++++++++--------
 misc/translator/po/fa-Arab-marc-MARC21.po          |    3 +-
 misc/translator/po/fa-Arab-marc-NORMARC.po         |    2 +-
 misc/translator/po/fa-Arab-marc-UNIMARC.po         |    2 +-
 misc/translator/po/fa-Arab-opac-bootstrap.po       |   54 +-
 misc/translator/po/fa-Arab-staff-help.po           |    2 +-
 misc/translator/po/fa-Arab-staff-prog.po           | 1323 +++++++++--------
 misc/translator/po/fi-FI-marc-MARC21.po            |    3 +-
 misc/translator/po/fi-FI-marc-NORMARC.po           |    2 +-
 misc/translator/po/fi-FI-marc-UNIMARC.po           |    2 +-
 misc/translator/po/fi-FI-opac-bootstrap.po         |   54 +-
 misc/translator/po/fi-FI-staff-help.po             |    2 +-
 misc/translator/po/fi-FI-staff-prog.po             | 1362 +++++++++---------
 misc/translator/po/fo-FO-marc-MARC21.po            |    3 +-
 misc/translator/po/fo-FO-marc-NORMARC.po           |    2 +-
 misc/translator/po/fo-FO-marc-UNIMARC.po           |    2 +-
 misc/translator/po/fo-FO-opac-bootstrap.po         |   49 +-
 misc/translator/po/fo-FO-staff-help.po             |    2 +-
 misc/translator/po/fo-FO-staff-prog.po             | 1278 +++++++++--------
 misc/translator/po/fr-CA-marc-MARC21.po            |    3 +-
 misc/translator/po/fr-CA-marc-NORMARC.po           |    2 +-
 misc/translator/po/fr-CA-marc-UNIMARC.po           |    2 +-
 misc/translator/po/fr-CA-opac-bootstrap.po         |   54 +-
 misc/translator/po/fr-CA-staff-help.po             |    2 +-
 misc/translator/po/fr-CA-staff-prog.po             | 1373 +++++++++---------
 misc/translator/po/fr-FR-marc-MARC21.po            |   11 +-
 misc/translator/po/fr-FR-marc-NORMARC.po           |    2 +-
 misc/translator/po/fr-FR-marc-UNIMARC.po           |    2 +-
 misc/translator/po/fr-FR-opac-bootstrap.po         |   62 +-
 misc/translator/po/fr-FR-staff-help.po             |    2 +-
 misc/translator/po/fr-FR-staff-prog.po             | 1388 +++++++++---------
 misc/translator/po/gl-marc-MARC21.po               |    3 +-
 misc/translator/po/gl-marc-NORMARC.po              |    2 +-
 misc/translator/po/gl-marc-UNIMARC.po              |    2 +-
 misc/translator/po/gl-opac-bootstrap.po            |   49 +-
 misc/translator/po/gl-staff-help.po                |    2 +-
 misc/translator/po/gl-staff-prog.po                | 1278 +++++++++--------
 misc/translator/po/he-Hebr-marc-MARC21.po          |    3 +-
 misc/translator/po/he-Hebr-marc-NORMARC.po         |    2 +-
 misc/translator/po/he-Hebr-marc-UNIMARC.po         |    2 +-
 misc/translator/po/he-Hebr-opac-bootstrap.po       |   49 +-
 misc/translator/po/he-Hebr-staff-help.po           |    2 +-
 misc/translator/po/he-Hebr-staff-prog.po           | 1278 +++++++++--------
 misc/translator/po/hi-marc-MARC21.po               |    3 +-
 misc/translator/po/hi-marc-NORMARC.po              |    2 +-
 misc/translator/po/hi-marc-UNIMARC.po              |    2 +-
 misc/translator/po/hi-opac-bootstrap.po            |   53 +-
 misc/translator/po/hi-staff-help.po                |    2 +-
 misc/translator/po/hi-staff-prog.po                | 1353 +++++++++---------
 misc/translator/po/hr-HR-marc-MARC21.po            |    3 +-
 misc/translator/po/hr-HR-marc-NORMARC.po           |    2 +-
 misc/translator/po/hr-HR-marc-UNIMARC.po           |    2 +-
 misc/translator/po/hr-HR-opac-bootstrap.po         |   54 +-
 misc/translator/po/hr-HR-staff-help.po             |    2 +-
 misc/translator/po/hr-HR-staff-prog.po             | 1296 +++++++++--------
 misc/translator/po/hu-HU-marc-MARC21.po            |    3 +-
 misc/translator/po/hu-HU-marc-NORMARC.po           |    2 +-
 misc/translator/po/hu-HU-marc-UNIMARC.po           |    2 +-
 misc/translator/po/hu-HU-opac-bootstrap.po         |   54 +-
 misc/translator/po/hu-HU-staff-help.po             |    2 +-
 misc/translator/po/hu-HU-staff-prog.po             | 1278 +++++++++--------
 misc/translator/po/hy-Armn-marc-MARC21.po          |    3 +-
 misc/translator/po/hy-Armn-marc-NORMARC.po         |    2 +-
 misc/translator/po/hy-Armn-marc-UNIMARC.po         |    2 +-
 misc/translator/po/hy-Armn-opac-bootstrap.po       |   54 +-
 misc/translator/po/hy-Armn-staff-help.po           |    2 +-
 misc/translator/po/hy-Armn-staff-prog.po           | 1355 +++++++++---------
 misc/translator/po/ia-marc-MARC21.po               |    3 +-
 misc/translator/po/ia-marc-NORMARC.po              |    2 +-
 misc/translator/po/ia-marc-UNIMARC.po              |    2 +-
 misc/translator/po/ia-opac-bootstrap.po            |   49 +-
 misc/translator/po/ia-staff-help.po                |    2 +-
 misc/translator/po/ia-staff-prog.po                | 1278 +++++++++--------
 misc/translator/po/id-ID-marc-MARC21.po            |    3 +-
 misc/translator/po/id-ID-marc-NORMARC.po           |    2 +-
 misc/translator/po/id-ID-marc-UNIMARC.po           |    2 +-
 misc/translator/po/id-ID-opac-bootstrap.po         |   50 +-
 misc/translator/po/id-ID-staff-help.po             |    2 +-
 misc/translator/po/id-ID-staff-prog.po             | 1298 +++++++++--------
 misc/translator/po/iq-CA-marc-MARC21.po            |    3 +-
 misc/translator/po/iq-CA-marc-NORMARC.po           |    2 +-
 misc/translator/po/iq-CA-marc-UNIMARC.po           |    2 +-
 misc/translator/po/iq-CA-opac-bootstrap.po         |   49 +-
 misc/translator/po/iq-CA-staff-help.po             |    2 +-
 misc/translator/po/iq-CA-staff-prog.po             | 1278 +++++++++--------
 misc/translator/po/is-IS-marc-MARC21.po            |    3 +-
 misc/translator/po/is-IS-marc-NORMARC.po           |    2 +-
 misc/translator/po/is-IS-marc-UNIMARC.po           |    2 +-
 misc/translator/po/is-IS-opac-bootstrap.po         |   49 +-
 misc/translator/po/is-IS-staff-help.po             |    2 +-
 misc/translator/po/is-IS-staff-prog.po             | 1279 +++++++++--------
 misc/translator/po/it-IT-marc-MARC21.po            |    3 +-
 misc/translator/po/it-IT-marc-NORMARC.po           |    2 +-
 misc/translator/po/it-IT-marc-UNIMARC.po           |    2 +-
 misc/translator/po/it-IT-opac-bootstrap.po         |   70 +-
 misc/translator/po/it-IT-staff-help.po             |    2 +-
 misc/translator/po/it-IT-staff-prog.po             | 1473 ++++++++++---------
 misc/translator/po/iu-CA-marc-MARC21.po            |    3 +-
 misc/translator/po/iu-CA-marc-NORMARC.po           |    2 +-
 misc/translator/po/iu-CA-marc-UNIMARC.po           |    2 +-
 misc/translator/po/iu-CA-opac-bootstrap.po         |   49 +-
 misc/translator/po/iu-CA-staff-help.po             |    2 +-
 misc/translator/po/iu-CA-staff-prog.po             | 1278 +++++++++--------
 misc/translator/po/ja-Jpan-JP-marc-MARC21.po       |    3 +-
 misc/translator/po/ja-Jpan-JP-marc-NORMARC.po      |    2 +-
 misc/translator/po/ja-Jpan-JP-marc-UNIMARC.po      |    2 +-
 misc/translator/po/ja-Jpan-JP-opac-bootstrap.po    |   49 +-
 misc/translator/po/ja-Jpan-JP-staff-help.po        |    2 +-
 misc/translator/po/ja-Jpan-JP-staff-prog.po        | 1278 +++++++++--------
 misc/translator/po/ka-marc-MARC21.po               |    3 +-
 misc/translator/po/ka-marc-NORMARC.po              |    2 +-
 misc/translator/po/ka-marc-UNIMARC.po              |    2 +-
 misc/translator/po/ka-opac-bootstrap.po            |   53 +-
 misc/translator/po/ka-staff-help.po                |    2 +-
 misc/translator/po/ka-staff-prog.po                | 1282 +++++++++--------
 misc/translator/po/km-KH-marc-MARC21.po            |    3 +-
 misc/translator/po/km-KH-marc-NORMARC.po           |    2 +-
 misc/translator/po/km-KH-marc-UNIMARC.po           |    2 +-
 misc/translator/po/km-KH-opac-bootstrap.po         |   49 +-
 misc/translator/po/km-KH-staff-help.po             |    2 +-
 misc/translator/po/km-KH-staff-prog.po             | 1282 +++++++++--------
 misc/translator/po/kn-Knda-marc-MARC21.po          |    3 +-
 misc/translator/po/kn-Knda-marc-NORMARC.po         |    2 +-
 misc/translator/po/kn-Knda-marc-UNIMARC.po         |    2 +-
 misc/translator/po/kn-Knda-opac-bootstrap.po       |   49 +-
 misc/translator/po/kn-Knda-staff-help.po           |    2 +-
 misc/translator/po/kn-Knda-staff-prog.po           | 1280 +++++++++--------
 misc/translator/po/ko-Kore-KP-marc-MARC21.po       |    3 +-
 misc/translator/po/ko-Kore-KP-marc-NORMARC.po      |    2 +-
 misc/translator/po/ko-Kore-KP-marc-UNIMARC.po      |    2 +-
 misc/translator/po/ko-Kore-KP-opac-bootstrap.po    |   52 +-
 misc/translator/po/ko-Kore-KP-staff-help.po        |    2 +-
 misc/translator/po/ko-Kore-KP-staff-prog.po        | 1323 +++++++++--------
 misc/translator/po/ku-Arab-marc-MARC21.po          |    3 +-
 misc/translator/po/ku-Arab-marc-NORMARC.po         |    2 +-
 misc/translator/po/ku-Arab-marc-UNIMARC.po         |    2 +-
 misc/translator/po/ku-Arab-opac-bootstrap.po       |   50 +-
 misc/translator/po/ku-Arab-staff-help.po           |    2 +-
 misc/translator/po/ku-Arab-staff-prog.po           | 1301 +++++++++--------
 misc/translator/po/lo-Laoo-marc-MARC21.po          |    3 +-
 misc/translator/po/lo-Laoo-marc-NORMARC.po         |    2 +-
 misc/translator/po/lo-Laoo-marc-UNIMARC.po         |    2 +-
 misc/translator/po/lo-Laoo-opac-bootstrap.po       |   50 +-
 misc/translator/po/lo-Laoo-staff-help.po           |    2 +-
 misc/translator/po/lo-Laoo-staff-prog.po           | 1291 +++++++++--------
 misc/translator/po/mi-NZ-marc-MARC21.po            |    3 +-
 misc/translator/po/mi-NZ-marc-NORMARC.po           |    2 +-
 misc/translator/po/mi-NZ-marc-UNIMARC.po           |    2 +-
 misc/translator/po/mi-NZ-opac-bootstrap.po         |   49 +-
 misc/translator/po/mi-NZ-staff-help.po             |    2 +-
 misc/translator/po/mi-NZ-staff-prog.po             | 1278 +++++++++--------
 misc/translator/po/ml-marc-MARC21.po               |    3 +-
 misc/translator/po/ml-marc-NORMARC.po              |    2 +-
 misc/translator/po/ml-marc-UNIMARC.po              |    2 +-
 misc/translator/po/ml-opac-bootstrap.po            |   49 +-
 misc/translator/po/ml-staff-help.po                |    2 +-
 misc/translator/po/ml-staff-prog.po                | 1278 +++++++++--------
 misc/translator/po/mon-marc-MARC21.po              |    3 +-
 misc/translator/po/mon-marc-NORMARC.po             |    2 +-
 misc/translator/po/mon-marc-UNIMARC.po             |    2 +-
 misc/translator/po/mon-opac-bootstrap.po           |   49 +-
 misc/translator/po/mon-staff-help.po               |    2 +-
 misc/translator/po/mon-staff-prog.po               | 1278 +++++++++--------
 misc/translator/po/mr-marc-MARC21.po               |    3 +-
 misc/translator/po/mr-marc-NORMARC.po              |    2 +-
 misc/translator/po/mr-marc-UNIMARC.po              |    2 +-
 misc/translator/po/mr-opac-bootstrap.po            |   49 +-
 misc/translator/po/mr-staff-help.po                |    2 +-
 misc/translator/po/mr-staff-prog.po                | 1291 +++++++++--------
 misc/translator/po/ms-MY-marc-MARC21.po            |    3 +-
 misc/translator/po/ms-MY-marc-NORMARC.po           |    2 +-
 misc/translator/po/ms-MY-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ms-MY-opac-bootstrap.po         |   50 +-
 misc/translator/po/ms-MY-staff-help.po             |    2 +-
 misc/translator/po/ms-MY-staff-prog.po             | 1294 +++++++++--------
 misc/translator/po/my-marc-MARC21.po               |    3 +-
 misc/translator/po/my-marc-NORMARC.po              |    2 +-
 misc/translator/po/my-marc-UNIMARC.po              |    2 +-
 misc/translator/po/my-opac-bootstrap.po            |   49 +-
 misc/translator/po/my-staff-help.po                |    2 +-
 misc/translator/po/my-staff-prog.po                | 1278 +++++++++--------
 misc/translator/po/nb-NO-marc-MARC21.po            |    3 +-
 misc/translator/po/nb-NO-marc-NORMARC.po           |    2 +-
 misc/translator/po/nb-NO-marc-UNIMARC.po           |    2 +-
 misc/translator/po/nb-NO-opac-bootstrap.po         |   54 +-
 misc/translator/po/nb-NO-staff-help.po             |    2 +-
 misc/translator/po/nb-NO-staff-prog.po             | 1348 +++++++++---------
 misc/translator/po/ne-NE-marc-MARC21.po            |    3 +-
 misc/translator/po/ne-NE-marc-NORMARC.po           |    2 +-
 misc/translator/po/ne-NE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ne-NE-opac-bootstrap.po         |   49 +-
 misc/translator/po/ne-NE-staff-help.po             |    2 +-
 misc/translator/po/ne-NE-staff-prog.po             | 1282 +++++++++--------
 misc/translator/po/nl-BE-marc-MARC21.po            |    3 +-
 misc/translator/po/nl-BE-marc-NORMARC.po           |    2 +-
 misc/translator/po/nl-BE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/nl-BE-opac-bootstrap.po         |   54 +-
 misc/translator/po/nl-BE-staff-help.po             |    2 +-
 misc/translator/po/nl-BE-staff-prog.po             | 1305 +++++++++--------
 misc/translator/po/nl-NL-marc-MARC21.po            |    3 +-
 misc/translator/po/nl-NL-marc-NORMARC.po           |    2 +-
 misc/translator/po/nl-NL-marc-UNIMARC.po           |    2 +-
 misc/translator/po/nl-NL-opac-bootstrap.po         |   54 +-
 misc/translator/po/nl-NL-staff-help.po             |    2 +-
 misc/translator/po/nl-NL-staff-prog.po             | 1282 +++++++++--------
 misc/translator/po/nn-NO-marc-MARC21.po            |    3 +-
 misc/translator/po/nn-NO-marc-NORMARC.po           |    2 +-
 misc/translator/po/nn-NO-marc-UNIMARC.po           |    2 +-
 misc/translator/po/nn-NO-opac-bootstrap.po         |   49 +-
 misc/translator/po/nn-NO-staff-help.po             |    2 +-
 misc/translator/po/nn-NO-staff-prog.po             | 1278 +++++++++--------
 misc/translator/po/oc-marc-MARC21.po               |    3 +-
 misc/translator/po/oc-marc-NORMARC.po              |    2 +-
 misc/translator/po/oc-marc-UNIMARC.po              |    2 +-
 misc/translator/po/oc-opac-bootstrap.po            |   54 +-
 misc/translator/po/oc-staff-help.po                |    2 +-
 misc/translator/po/oc-staff-prog.po                | 1351 +++++++++---------
 misc/translator/po/pbr-marc-MARC21.po              |    3 +-
 misc/translator/po/pbr-marc-NORMARC.po             |    2 +-
 misc/translator/po/pbr-marc-UNIMARC.po             |    2 +-
 misc/translator/po/pbr-opac-bootstrap.po           |   49 +-
 misc/translator/po/pbr-staff-help.po               |    2 +-
 misc/translator/po/pbr-staff-prog.po               | 1282 +++++++++--------
 misc/translator/po/pl-PL-marc-MARC21.po            |    3 +-
 misc/translator/po/pl-PL-marc-NORMARC.po           |    2 +-
 misc/translator/po/pl-PL-marc-UNIMARC.po           |    2 +-
 misc/translator/po/pl-PL-opac-bootstrap.po         |   54 +-
 misc/translator/po/pl-PL-staff-help.po             |    2 +-
 misc/translator/po/pl-PL-staff-prog.po             | 1373 +++++++++---------
 misc/translator/po/prs-marc-MARC21.po              |    3 +-
 misc/translator/po/prs-marc-NORMARC.po             |    2 +-
 misc/translator/po/prs-marc-UNIMARC.po             |    2 +-
 misc/translator/po/prs-opac-bootstrap.po           |   49 +-
 misc/translator/po/prs-staff-help.po               |    2 +-
 misc/translator/po/prs-staff-prog.po               | 1282 +++++++++--------
 misc/translator/po/pt-BR-marc-MARC21.po            |    3 +-
 misc/translator/po/pt-BR-marc-NORMARC.po           |    2 +-
 misc/translator/po/pt-BR-marc-UNIMARC.po           |    2 +-
 misc/translator/po/pt-BR-opac-bootstrap.po         |   54 +-
 misc/translator/po/pt-BR-staff-help.po             |    2 +-
 misc/translator/po/pt-BR-staff-prog.po             | 1353 +++++++++---------
 misc/translator/po/pt-PT-marc-MARC21.po            |    9 +-
 misc/translator/po/pt-PT-marc-NORMARC.po           |    2 +-
 misc/translator/po/pt-PT-marc-UNIMARC.po           |    2 +-
 misc/translator/po/pt-PT-opac-bootstrap.po         |   74 +-
 misc/translator/po/pt-PT-staff-help.po             |   26 +-
 misc/translator/po/pt-PT-staff-prog.po             | 1504 ++++++++++----------
 misc/translator/po/ro-RO-marc-MARC21.po            |    3 +-
 misc/translator/po/ro-RO-marc-NORMARC.po           |    2 +-
 misc/translator/po/ro-RO-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ro-RO-opac-bootstrap.po         |   49 +-
 misc/translator/po/ro-RO-staff-help.po             |    2 +-
 misc/translator/po/ro-RO-staff-prog.po             | 1280 +++++++++--------
 misc/translator/po/ru-RU-marc-MARC21.po            |    3 +-
 misc/translator/po/ru-RU-marc-NORMARC.po           |    2 +-
 misc/translator/po/ru-RU-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ru-RU-opac-bootstrap.po         |   55 +-
 misc/translator/po/ru-RU-staff-help.po             |    2 +-
 misc/translator/po/ru-RU-staff-prog.po             | 1308 +++++++++--------
 misc/translator/po/rw-RW-marc-MARC21.po            |    3 +-
 misc/translator/po/rw-RW-marc-NORMARC.po           |    2 +-
 misc/translator/po/rw-RW-marc-UNIMARC.po           |    2 +-
 misc/translator/po/rw-RW-opac-bootstrap.po         |   49 +-
 misc/translator/po/rw-RW-staff-help.po             |    2 +-
 misc/translator/po/rw-RW-staff-prog.po             | 1278 +++++++++--------
 misc/translator/po/sd-PK-marc-MARC21.po            |    3 +-
 misc/translator/po/sd-PK-marc-NORMARC.po           |    2 +-
 misc/translator/po/sd-PK-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sd-PK-opac-bootstrap.po         |   49 +-
 misc/translator/po/sd-PK-staff-help.po             |    2 +-
 misc/translator/po/sd-PK-staff-prog.po             | 1282 +++++++++--------
 misc/translator/po/sk-SK-marc-MARC21.po            |    3 +-
 misc/translator/po/sk-SK-marc-NORMARC.po           |    2 +-
 misc/translator/po/sk-SK-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sk-SK-opac-bootstrap.po         |   54 +-
 misc/translator/po/sk-SK-staff-help.po             |    2 +-
 misc/translator/po/sk-SK-staff-prog.po             | 1348 +++++++++---------
 misc/translator/po/sl-SI-marc-MARC21.po            |    3 +-
 misc/translator/po/sl-SI-marc-NORMARC.po           |    2 +-
 misc/translator/po/sl-SI-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sl-SI-opac-bootstrap.po         |   49 +-
 misc/translator/po/sl-SI-staff-help.po             |    2 +-
 misc/translator/po/sl-SI-staff-prog.po             | 1278 +++++++++--------
 misc/translator/po/sq-AL-marc-MARC21.po            |    3 +-
 misc/translator/po/sq-AL-marc-NORMARC.po           |    2 +-
 misc/translator/po/sq-AL-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sq-AL-opac-bootstrap.po         |   54 +-
 misc/translator/po/sq-AL-staff-help.po             |    2 +-
 misc/translator/po/sq-AL-staff-prog.po             | 1288 +++++++++--------
 misc/translator/po/sr-Cyrl-marc-MARC21.po          |    3 +-
 misc/translator/po/sr-Cyrl-marc-NORMARC.po         |    2 +-
 misc/translator/po/sr-Cyrl-marc-UNIMARC.po         |    2 +-
 misc/translator/po/sr-Cyrl-opac-bootstrap.po       |   49 +-
 misc/translator/po/sr-Cyrl-staff-help.po           |    2 +-
 misc/translator/po/sr-Cyrl-staff-prog.po           | 1282 +++++++++--------
 misc/translator/po/sv-SE-marc-MARC21.po            |    3 +-
 misc/translator/po/sv-SE-marc-NORMARC.po           |    2 +-
 misc/translator/po/sv-SE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sv-SE-opac-bootstrap.po         |   54 +-
 misc/translator/po/sv-SE-staff-help.po             |    2 +-
 misc/translator/po/sv-SE-staff-prog.po             | 1366 +++++++++---------
 misc/translator/po/sw-KE-marc-MARC21.po            |    3 +-
 misc/translator/po/sw-KE-marc-NORMARC.po           |    2 +-
 misc/translator/po/sw-KE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sw-KE-opac-bootstrap.po         |   49 +-
 misc/translator/po/sw-KE-staff-help.po             |    2 +-
 misc/translator/po/sw-KE-staff-prog.po             | 1278 +++++++++--------
 misc/translator/po/ta-LK-marc-MARC21.po            |    3 +-
 misc/translator/po/ta-LK-marc-NORMARC.po           |    2 +-
 misc/translator/po/ta-LK-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ta-LK-opac-bootstrap.po         |   49 +-
 misc/translator/po/ta-LK-staff-help.po             |    2 +-
 misc/translator/po/ta-LK-staff-prog.po             | 1282 +++++++++--------
 misc/translator/po/ta-marc-MARC21.po               |    3 +-
 misc/translator/po/ta-marc-NORMARC.po              |    2 +-
 misc/translator/po/ta-marc-UNIMARC.po              |    2 +-
 misc/translator/po/ta-opac-bootstrap.po            |   49 +-
 misc/translator/po/ta-staff-help.po                |    2 +-
 misc/translator/po/ta-staff-prog.po                | 1282 +++++++++--------
 misc/translator/po/tet-marc-MARC21.po              |    3 +-
 misc/translator/po/tet-marc-NORMARC.po             |    2 +-
 misc/translator/po/tet-marc-UNIMARC.po             |    2 +-
 misc/translator/po/tet-opac-bootstrap.po           |   50 +-
 misc/translator/po/tet-staff-help.po               |    2 +-
 misc/translator/po/tet-staff-prog.po               | 1299 +++++++++--------
 misc/translator/po/th-TH-marc-MARC21.po            |    3 +-
 misc/translator/po/th-TH-marc-NORMARC.po           |    2 +-
 misc/translator/po/th-TH-marc-UNIMARC.po           |    2 +-
 misc/translator/po/th-TH-opac-bootstrap.po         |   49 +-
 misc/translator/po/th-TH-staff-help.po             |    2 +-
 misc/translator/po/th-TH-staff-prog.po             | 1282 +++++++++--------
 misc/translator/po/tl-PH-marc-MARC21.po            |    3 +-
 misc/translator/po/tl-PH-marc-NORMARC.po           |    2 +-
 misc/translator/po/tl-PH-marc-UNIMARC.po           |    2 +-
 misc/translator/po/tl-PH-opac-bootstrap.po         |   49 +-
 misc/translator/po/tl-PH-staff-help.po             |    2 +-
 misc/translator/po/tl-PH-staff-prog.po             | 1282 +++++++++--------
 misc/translator/po/tr-TR-marc-MARC21.po            |    3 +-
 misc/translator/po/tr-TR-marc-NORMARC.po           |    2 +-
 misc/translator/po/tr-TR-marc-UNIMARC.po           |    2 +-
 misc/translator/po/tr-TR-opac-bootstrap.po         |   73 +-
 misc/translator/po/tr-TR-staff-help.po             |    2 +-
 misc/translator/po/tr-TR-staff-prog.po             | 1471 ++++++++++---------
 misc/translator/po/uk-UA-marc-MARC21.po            |    3 +-
 misc/translator/po/uk-UA-marc-NORMARC.po           |    2 +-
 misc/translator/po/uk-UA-marc-UNIMARC.po           |    2 +-
 misc/translator/po/uk-UA-opac-bootstrap.po         |   54 +-
 misc/translator/po/uk-UA-staff-help.po             |    2 +-
 misc/translator/po/uk-UA-staff-prog.po             | 1329 +++++++++--------
 misc/translator/po/ur-Arab-marc-MARC21.po          |    3 +-
 misc/translator/po/ur-Arab-marc-NORMARC.po         |    2 +-
 misc/translator/po/ur-Arab-marc-UNIMARC.po         |    2 +-
 misc/translator/po/ur-Arab-opac-bootstrap.po       |   49 +-
 misc/translator/po/ur-Arab-staff-help.po           |    2 +-
 misc/translator/po/ur-Arab-staff-prog.po           | 1282 +++++++++--------
 misc/translator/po/vi-VN-marc-MARC21.po            |    3 +-
 misc/translator/po/vi-VN-marc-NORMARC.po           |    2 +-
 misc/translator/po/vi-VN-marc-UNIMARC.po           |    2 +-
 misc/translator/po/vi-VN-opac-bootstrap.po         |   54 +-
 misc/translator/po/vi-VN-staff-help.po             |    2 +-
 misc/translator/po/vi-VN-staff-prog.po             | 1331 +++++++++--------
 misc/translator/po/zh-Hans-CN-marc-MARC21.po       |    3 +-
 misc/translator/po/zh-Hans-CN-marc-NORMARC.po      |    2 +-
 misc/translator/po/zh-Hans-CN-marc-UNIMARC.po      |    2 +-
 misc/translator/po/zh-Hans-CN-opac-bootstrap.po    |   52 +-
 misc/translator/po/zh-Hans-CN-staff-help.po        |    2 +-
 misc/translator/po/zh-Hans-CN-staff-prog.po        | 1327 +++++++++--------
 misc/translator/po/zh-Hans-TW-marc-MARC21.po       |    3 +-
 misc/translator/po/zh-Hans-TW-marc-NORMARC.po      |    2 +-
 misc/translator/po/zh-Hans-TW-marc-UNIMARC.po      |    2 +-
 misc/translator/po/zh-Hans-TW-opac-bootstrap.po    |   52 +-
 misc/translator/po/zh-Hans-TW-staff-help.po        |    2 +-
 misc/translator/po/zh-Hans-TW-staff-prog.po        | 1339 +++++++++--------
 516 files changed, 54935 insertions(+), 57260 deletions(-)
 copy misc/release_notes/{release_notes_16_11_11.html => release_notes_16_11_12.html} (63%)
 create mode 100644 misc/release_notes/release_notes_16_11_12.md


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Sep 26 07:48:06 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 26 Sep 2017 05:48:06 +0000
Subject: [koha-commits] main Koha release repository annotated tag v16.11.12
	created. v16.11.12
Message-ID: <E1dwij0-0002xE-M9@git.koha-community.org>

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 annotated tag, v16.11.12 has been created
        at  b11c1bcacf1df3911dd2b5eda8410dd3273d8fb2 (tag)
   tagging  ed45b5f4e4f38c72d1e28ab19b94f1c37bc51d91 (commit)
  replaces  v16.11.11-1
 tagged by  Katrin Fischer
        on  Wed Sep 20 00:16:49 2017 +0200

- Log -----------------------------------------------------------------
Koha release 16.11.12
-----BEGIN PGP SIGNATURE-----

iQIcBAABCAAGBQJZwZdRAAoJEB+uyDM6ADoAqTYP/1U+ivOg9unaTCMRo72+XDNW
swLP4x9BlSuEn5yr0vOP+Hx1kTKHkz21hGpvUX6H3qbsNPFhVJELkw6NAOGcjKsm
hrPMgHQYlzJlbbHaAR79uUvNq6LzO3JIj72yGrrDOyHvjUykVThGYj098nxGegTj
bGKtQU1bXnjniI4UZ44pR22mUBnds8HdcsW2eY+zJuSGX44Ckz60VpZPj9rPsOud
a7cghJ4TUABWENcFmkW6ydd/pkTmRoGfK/JYPHoZojCEYTlXoOpNIRpjFDK0DT+T
cILbJFMvAlPfgIV1lmNpY0FOkVMjwwpYeURa6fwq2x7ewa1rtYzRadUTDLs/QvX7
qKY25b6fcYw28IBM0ygk8eEOESjPNk3S8h2MThQY+xubhmpl6tpgm5M/Sw7di+8T
xa9AAIo26SimW41HSIjJPAT0HrCmFU8tkVhmaNRLxt4kG5wp1gimyhKBjhLObTQx
VncP53wMdVTgjKA+x+Ydmec+SbQAbQtFES7DnwJaAO0Yg/WmSxCTb99jme/TTyVU
6neKVyftMOFxinV7nFicenDRd07qclwFXnxf95pIf1FLhTzf9V05dbRHl8gOT+5E
EK1B/dah099wnU8g8FlaKxIODdsmQur/JQy0Fl69VJCLWaOWPdBa33+YtJTzqE1T
5nKwHPewmTqrAyTMgnVH
=pkxN
-----END PGP SIGNATURE-----

Alex Sassmannshausen (1):
      Bug 19073: (bug 15758 follow-up) Dereference correct value from Koha::Object.

Amit Gupta (12):
      Bug 19086 Stored XSS in supplier.pl
      Bug 19086 Stored XSS in subscription-add.pl
      Bug 19103 - Stored XSS in itemtypes.pl
      Bug 19103 - Stored XSS in patron-attr-types.pl
      Bug 19103 - Stored XSS in matching-rules.pl
      Bug 19108 - Stored XSS in oai_sets.pl
      Bug 19108 - Stored XSS in items_search_fields.pl
      Bug 19108 - Stored XSS in classsources.pl
      Bug 19108 - Stored XSS in authtypes.pl
      Bug 19108 - Stored XSS in fieldmapping.pl
      Bug 19108 - Stored XSS in biblio_framework.pl and marctagstructure.pl
      Bug 19127 - Stored XSS in csv-profiles.pl

Chris Cormack (3):
      Bug 18046: CAS logout infinite redirect
      Bug 19086 XSS in members/member.pl
      Bug 19086 Stored XSS in circulation.pl

Colin Campbell (1):
      Bug 15438 - Checking out an on-hold item sends holder's borrowernumber in AF (screen message) field.

David Cook (1):
      Bug 18898 - Some permissions for Reports can be bypassed

Fridolin Somers (5):
      Bug 18551 - Hide with CSS dynamic elements in member search
      Bug 18900: add UT to Number/Price.t
      Bug 18900: wrong number format in receiving order
      Bug 19023 - inventory tool performance
      Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt

Jonathan Druart (10):
      Bug 18331: Fix CSV export (once and for all!)
      Bug 18331: POST_CHOMP everywhere!
      Bug 19053: Keep auto_renew flag if a confirmation is needed
      Bug 18996: [16.11.x] use Koha::OldIssues instead of Koha::Old::Checkouts
      Bug 18906: Display all funds the logged in user can use
      Bug 18927: Use fully qualified subroutine names in C4::Items
      Bug 19128: XSS - admin/authorised_values.tt
      Bug 19103: (follow-up) Stored XSS in itemtypes.pl
      Bug 19108: (follow-up) Stored XSS in biblio_framework.pl
      Bug 19127: (follow-up) Stored XSS in csv-profiles.pl

Josef Moravec (1):
      Bug 18331: Followup - fix path to orders_by_budget csv header

Julian Maurice (1):
      Bug 18741: Fix loading of SQL files in web installer

Katrin Fischer (8):
      Bug 19086 - Follow-up - XSS in supplier.tt
      Bug 19086 - Follow-up - subscription-detail.pl
      Bug 19125 - XSS - members.pl
      Bug 19128 - XSS - patron-attr-types.tt, authorised_values.tt and categories.tt
      Bug 19108 - Follow-up - fieldmapping.tt and items_search_fields.tt
      Increment version for 16.11.12 release
      Merge remote-tracking branch 'transl/16.11.12-translate-20170919' into 16.11.x
      Add release notes for Koha 16.11.12

Kyle M Hall (1):
      Bug 19049 [QA Followup] - Make plugin name first item in description

Lee Jamison (1):
      Bug 18331: Followup - Fix CSV export (once and for all!)

Marc V?ron (6):
      Bug 18331: Force tt to insert newline to empty_line.inc
      Bug 18649: Translatability: Get rid of tt directive in translation for admin/categories.tt and onboardingstep2.tt
      Bug 18652: Get rid of tt directive in translation for uncertainprice.tt
      Bug 18660: Translatability: Get rid of template directives [%% in translation for patroncards-errors.inc
      Bug 18778 - Translatability: Get rid of tt directive in translation for item-status.inc
      Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt

Marcel de Rooy (11):
      Bug 19049: Fix regression on stage-marc-import with to_marc plugin
      Bug 19049: Testing RecordsFromMarcPlugin with a to_marc plugin
      Bug 19049: [Follow-up] Make sure that GetPlugins finds the plugin
      Bug 19049: [QA Follow-up] Mock config, default format
      Bug 19163: Critical typo in stage-marc-import process
      Bug 18996: [16.11.x] Handle data corruption from old_issues at SIP checkin
      Bug 18996: [16.11.x] Resolve an uninitialized warning from ILS/Item.pm
      Bug 18996: [16.11.x] Add checkin subtest in SIP/Message.t
      Bug 18996: [16.11.x] [QA Follow-up] Remove global variables from Message.t
      Bug 18921: Resolve a few warnings in C4/XSLT.pm
      Bug 15438: [QA Follow-up] Moving POD statement for CanBookBeIssued

Mark Tompsett (1):
      Bug 19235: Password entry visible in OPAC Self-registration

Nick Clemens (2):
      Bug 16976 - Authorities searches with double quotes gives ZOOM error 20003 [Alternate]
      Bug 16976 - Unit tests

Serhij Dubyk {?????? ?????} (1):
      Bug 17827 - Untranslatable "by" in MARC21slim2intranetResults.xsl

Tomas Cohen Arazi (2):
      Bug 18624: Minor refactoring to ease testing
      Bug 18900: (QA followup) Make tests conditional to locale existence

root (1):
      Translation updates for Koha 16.11.12

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Sep 28 20:24:58 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 28 Sep 2017 18:24:58 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v17.05.00-645-gae86b7c
Message-ID: <E1dxdUY-0008OX-KE@git.koha-community.org>

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, master has been updated
       via  ae86b7ca9ea60bba47d3a999ff13d6140cdc5e1c (commit)
      from  b4e525e4f6382a421cb7e77632fca8ecaaf8f3d6 (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 ae86b7ca9ea60bba47d3a999ff13d6140cdc5e1c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Sep 28 14:49:11 2017 -0300

    Bug 19385: Fix random t/Calendar.t failure - clear the cache before
    
    The cache 'exception_holidays' may be populated when we run these tests,
    we need to clear it before the tests are run.
    
    Test plan:
      prove t/db_dependent/Circulation/CalcDateDue.t  t/Calendar.t
    
    Without this patch, t/Calendar will fail with:
      #   Failed test 'Exception holiday is not a closed day test'
      #   at t/Calendar.t line 159.
      #          got: '1'
      #     expected: '0'
      # Looks like you failed 1 test of 38.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 t/Calendar.t |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 10:49:50 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 08:49:50 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-2-g1f19154
Message-ID: <E1dxqzW-0005uC-6S@git.koha-community.org>

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, 17.05.x has been updated
       via  1f19154532f438319aa789d8b7cdabb14f53275a (commit)
       via  b59ce0c61785a317d06eac14fafd16070b21e479 (commit)
      from  d4263336057d47a498fdbec76b4d4cc806edd87b (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 1f19154532f438319aa789d8b7cdabb14f53275a
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Aug 7 11:04:51 2017 -0300

    Bug 19013: (QA followup) Set guarantorid to NULL patron sample data
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0bcf6a79427297c332588317dde749e923c7bbdc)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit b59ce0c61785a317d06eac14fafd16070b21e479
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jul 31 16:12:16 2017 -0300

    Bug 19013: Fix borrowers.guarantorid in sammple_patrons.sql
    
    That breaks randomly tests on Jenkins (Koha/Patrons.t)
    
    It certainly affects data in other languages but I did not find a quick
    and easy way to modify this file (replace all guarantorid values with
    NULL)
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Easy fix
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit b7d291a1ee692d6de71503683a3e61c9311c33d8)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../data/mysql/de-DE/optional/sample_patrons.sql   |   24 ++++++++++----------
 .../data/mysql/en/optional/sample_patrons.sql      |   24 ++++++++++----------
 .../data/mysql/es-ES/optional/sample_patrons.sql   |   24 ++++++++++----------
 .../mysql/nb-NO/2-Valgfritt/sample_patrons.sql     |   24 ++++++++++----------
 .../data/mysql/pl-PL/optional/sample_patrons.sql   |   24 ++++++++++----------
 5 files changed, 60 insertions(+), 60 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 10:58:08 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 08:58:08 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-3-g300a76a
Message-ID: <E1dxr7Y-0006NT-UJ@git.koha-community.org>

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, 17.05.x has been updated
       via  300a76a573673b74ad0863c3b93c6ea3a66eb1ea (commit)
      from  1f19154532f438319aa789d8b7cdabb14f53275a (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 300a76a573673b74ad0863c3b93c6ea3a66eb1ea
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Jun 14 11:32:30 2017 -0300

    Bug 18802: Fix Circulation.t if finesMode ne 'production'
    
    If finesMode is not set to production, only 1 fine will be created (the renewal
    one will not). This is what assumes the tests.
    If set to 'production', the tests will fail because the fines will not
    be deleted (because of the DBIx::Class) warning.
    Now we mock the value before charging.
    
    prove t/db_dependent/Circulation.t
    t/db_dependent/Circulation.t .. 16/95 DBIx::Class::Storage::DBI::select_single(): Query returned more than one row.  SQL that returns multiple rows is DEPRECATED for ->find and ->single at t/db_dependent/Circulation.t line 491
    t/db_dependent/Circulation.t .. 56/95
        #   Failed test 'Can auto renew, OPACFineNoRenewals=10, patron has 10'
        #   at t/db_dependent/Circulation.t line 670.
        #          got: 'auto_too_much_oweing'
        #     expected: 'auto_renew'
        # Looks like you failed 1 test of 6.
    
    Test plan:
      prove t/db_dependent/Circulation.t
    should return green whatever the value of finesMode
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit ae5f5c479929cbfad3193c6ce9471a406a2a41f3)

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

Summary of changes:
 t/db_dependent/Circulation.t |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 11:05:00 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 09:05:00 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-4-g0b44544
Message-ID: <E1dxrEC-0006UA-Tw@git.koha-community.org>

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, 17.05.x has been updated
       via  0b445446018ad23a793f8d75c3be417d85e6c3f6 (commit)
      from  300a76a573673b74ad0863c3b93c6ea3a66eb1ea (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 0b445446018ad23a793f8d75c3be417d85e6c3f6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jul 31 11:18:23 2017 -0300

    Bug 19009: Fix random failures from Circulation.t
    
    From jenkins output:
     Subtest: CanBookBeIssued + Koha::Patron->is_debarred<7c>has_overdues
    1..8
    not ok 1
    [SKIP]
    
    I executed it several times and display the different $error, $alerts and question keys.
    GNA and RESTRICTED were sometimes set, which block the issue.
    Reading the code it seems that some patron's attributes must be removed to avoid the checkin rejection.
    
    Test plan:
    Execute the tests several times and notice that it fails randomly
    With this patch they should always pass.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 4bbec5c382590f881e6d2af62b2608fe9cf9e051)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 t/db_dependent/Circulation.t |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 11:07:55 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 09:07:55 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-8-gd3e6a1a
Message-ID: <E1dxrH1-0006YY-Ts@git.koha-community.org>

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, 17.05.x has been updated
       via  d3e6a1a5fd9246811ef0036c6234c7a2cf11f7b3 (commit)
       via  af0cdbaa24033ff2494a3afc721fb0cf6711020c (commit)
       via  cdfa1b0db7f98be3da503861075fecafeff9e600 (commit)
       via  1416b65e0949deca4a83b41c9ef1df1be5eb433e (commit)
      from  0b445446018ad23a793f8d75c3be417d85e6c3f6 (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 d3e6a1a5fd9246811ef0036c6234c7a2cf11f7b3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 1 11:44:29 2017 -0300

    Bug 17699: Reset time simulation
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0853c4e2b4366a235077a24a873fc81a754afecb)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit af0cdbaa24033ff2494a3afc721fb0cf6711020c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jul 31 11:30:00 2017 -0300

    Bug 17699: Add test descriptions
    
    Test plan:
      prove -v t/db_dependent/Koha/Patrons.t
    
     Subtest: renew_account
        1..30
        ok 1 - 2016-02-29T00:00:00 + 12 months must be 2017-02-28T00:00:00
        ok 2 - 2016-02-29T00:00:00 + 12 months must be 2017-02-28T00:00:00
        ok 3 - With BorrowerLogs, Koha::Patron->renew_account should have logged
        ok 4 - today + 12 months must be 2017-03-31T00:00:00
        ok 5 - today + 12 months must be 2017-03-31T00:00:00
        ok 6 - Without BorrowerLogs, Koha::Patron->renew_account should not have logged
        ok 7 - today + 12 months must be 2017-03-31T00:00:00
        ok 8 - today + 12 months must be 2017-03-31T00:00:00
        ok 9 - 2016-04-30T00:00:00 + 12 months must be 2017-04-30T00:00:00
        ok 10 - 2016-04-30T00:00:00 + 12 months must be 2017-04-30T00:00:00
        ok 11 - 2016-10-30T00:00:00 + 12 months must be 2017-10-30T00:00:00
        ok 12 - 2016-10-30T00:00:00 + 12 months must be 2017-10-30T00:00:00
        ok 13 - With BorrowerLogs, Koha::Patron->renew_account should have logged
        ok 14 - today + 12 months must be 2017-11-30T00:00:00
        ok 15 - today + 12 months must be 2017-11-30T00:00:00
        ok 16 - Without BorrowerLogs, Koha::Patron->renew_account should not have logged
        ok 17 - today + 12 months must be 2017-11-30T00:00:00
        ok 18 - today + 12 months must be 2017-11-30T00:00:00
        ok 19 - 2016-12-30T00:00:00 + 12 months must be 2017-12-30T00:00:00
        ok 20 - 2016-12-30T00:00:00 + 12 months must be 2017-12-30T00:00:00
        ok 21 - 2017-06-30T00:00:00 + 12 months must be 2018-06-30T00:00:00
        ok 22 - 2017-06-30T00:00:00 + 12 months must be 2018-06-30T00:00:00
        ok 23 - With BorrowerLogs, Koha::Patron->renew_account should have logged
        ok 24 - today + 12 months must be 2018-07-31T00:00:00
        ok 25 - today + 12 months must be 2018-07-31T00:00:00
        ok 26 - Without BorrowerLogs, Koha::Patron->renew_account should not have logged
        ok 27 - today + 12 months must be 2018-07-31T00:00:00
        ok 28 - today + 12 months must be 2018-07-31T00:00:00
        ok 29 - 2017-08-31T00:00:00 + 12 months must be 2018-08-31T00:00:00
        ok 30 - 2017-08-31T00:00:00 + 12 months must be 2018-08-31T00:00:00
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit ec9b691de934f82c50057c15fb7d3a1b32717b72)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit cdfa1b0db7f98be3da503861075fecafeff9e600
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jul 31 11:03:37 2017 -0300

    Bug 17699: Use limit as end_of_month
    
    From DateTime::Duration pod:
    ""
    For positive durations, the "end_of_month" parameter defaults to wrap.
    For negative durations, the default is "limit". This should match how
    most people "intuitively" expect datetime math to work.
    """"
    
    We need end_of_month => limit for  positive durations as well.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 24b4006ecbc0a258b09500bdd8f639c7018067c0)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 1416b65e0949deca4a83b41c9ef1df1be5eb433e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jul 31 11:02:42 2017 -0300

    Bug 17699: Add more tests to highlight the problem
    
    Add problematic cases to highlight the problem.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 9512b015662f8ec56d8b8884b4e4bb14d5e563f1)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 Koha/Patron/Category.pm       |    2 +-
 t/db_dependent/Koha/Patrons.t |  149 +++++++++++++++++++++--------------------
 2 files changed, 79 insertions(+), 72 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 11:13:34 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 09:13:34 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-9-g7f06120
Message-ID: <E1dxrMU-0006dm-On@git.koha-community.org>

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, 17.05.x has been updated
       via  7f0612052770654aaa7d5344d18522dbfc8b9aab (commit)
      from  d3e6a1a5fd9246811ef0036c6234c7a2cf11f7b3 (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 7f0612052770654aaa7d5344d18522dbfc8b9aab
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Sat Jul 29 17:06:52 2017 +0200

    Bug 19003: Add a TestBuilder default for borrowers.login_attempts
    
    Bug 18314 causes t/db/SIP/Message.t to fail (quite often) since
    TestBuilder fills login_attempts with a random number. (Note: Only
    when FailedLoginAttempts is non-zero.)
    Trivial fix: TestBuilder should have a zero default for login_attempts.
    
    Test plan:
    Do not yet apply this patch.
    Set pref FailedLoginAttempts to say 3.
    Run t/db_dependent/SIP/Message.t. Might fail on the password test (CQ).
    Apply this patch.
    Run t/db_dependent/SIP/Message.t again. Does not fail anymore.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 5bb56bf336187cde38e1a3b89c792ee6dc231acf)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 t/lib/TestBuilder.pm |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 11:30:00 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 09:30:00 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-11-ga80e585
Message-ID: <E1dxrcO-0007ey-Kg@git.koha-community.org>

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, 17.05.x has been updated
       via  a80e585cf839677ec84748ba23572b63fca73e89 (commit)
       via  9dcaeba3e05e9f5bd9b2c3375edf92b749aa7dfd (commit)
      from  7f0612052770654aaa7d5344d18522dbfc8b9aab (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 a80e585cf839677ec84748ba23572b63fca73e89
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Aug 10 13:15:27 2017 -0300

    Bug 5471: Use uri_escape_utf8 to handle utf8 chars correctly
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 04966a6203646cae79a48a00ef0873c1f6c64b06)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 9dcaeba3e05e9f5bd9b2c3375edf92b749aa7dfd
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Jun 9 12:29:58 2017 +0000

    Bug 5471 - Quotes in tags fail
    
    This patch makes changes to the tag moderation template and JavaScript
    to fix handling of tags with double or single quotes. This patch also
    moves the tags moderation JavaScript out of the template and into a
    separate JS file.
    
    To test you should have multiple tags awaiting moderation, including
    tags which contain double and single quotes.
    
    - Go to Tools -> Tags.
    - In the list of tags pending approval, test approving and rejecting
      tags, including those containing single or double quotes.
      - The state of the "Approve" or "Reject" buttons should correctly
        change according to the action you chose.
      - The label in the status column should update correctly.
    - In the "Check lists" form, submitting approved, rejected, and
      unclassified terms should result in the correct message.
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    Works correctly based on test plan. Tested using single- and
    double-quoted tags. Passes QA Tools.
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit ee6f8e186bc93df9d7943ea38f05615b2e8a813f)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../intranet-tmpl/prog/en/modules/tags/review.tt   |  216 ++++----------------
 .../intranet-tmpl/prog/js/pages/tags-review.js     |  162 +++++++++++++++
 tags/review.pl                                     |    9 +-
 3 files changed, 201 insertions(+), 186 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/js/pages/tags-review.js


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 11:32:48 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 09:32:48 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-13-gd1b5a9f
Message-ID: <E1dxrf6-0007m6-QQ@git.koha-community.org>

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, 17.05.x has been updated
       via  d1b5a9f5bb4a28e86fbd2f3c0ca3127a98d2d4d9 (commit)
       via  306614068eb20cc52dfb6b69227f72e0e37baf1e (commit)
      from  a80e585cf839677ec84748ba23572b63fca73e89 (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 d1b5a9f5bb4a28e86fbd2f3c0ca3127a98d2d4d9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Aug 10 15:02:23 2017 -0300

    Bug 19042: Add mock IndependentBranches=0 for the other test
    
    These tests do not cover correctly getletter, but it is not the goal of
    this patch. Superlibrarian behaviour must be tested as well.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit e3dafbfccd06af8fca45fada449e93e3d0616cd6)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 306614068eb20cc52dfb6b69227f72e0e37baf1e
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Aug 4 14:24:38 2017 -0400

    Bug 19042: Silence warnings t/db_dependent/Letters.t
    
    TEST PLAN
    ---------
    prove t/db_dependent/Letters.t
    -- there will be a message: "C4::Context->userenv not defined!"
    apply this patch
    prove t/db_dependent/Letters.t
    -- there will no longer be that message.
    run qa test tools
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit d01ce104a7711814152e4f8228064f79c8a7f68c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 t/db_dependent/Letters.t |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 11:37:31 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 09:37:31 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-15-g2b903d7
Message-ID: <E1dxrjf-00089m-U7@git.koha-community.org>

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, 17.05.x has been updated
       via  2b903d74acbdefbfb1dd678f23dc57f655262940 (commit)
       via  c22e87282095a3e97c1bdc8c9944464d5ae4d617 (commit)
      from  d1b5a9f5bb4a28e86fbd2f3c0ca3127a98d2d4d9 (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 2b903d74acbdefbfb1dd678f23dc57f655262940
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Aug 10 15:06:39 2017 -0300

    Bug 19047: Fix AddBiblio call in ShelfBrowser.t
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit b4ce1feb1bc6b4f20cf71bd545e018917cf518db)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit c22e87282095a3e97c1bdc8c9944464d5ae4d617
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Aug 7 08:44:43 2017 +0200

    Bug 19047: Fix AddBiblio call in Reserves.t
    
    AddBiblio does not return a title; the biblioitemnumber is stored in the
    title variable.
    The variables for biblioitemnumber are not used and can be removed.
    
    Test plan:
    Run t/db_dependent/Reserves.t
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit c6f8cf69d3943599fa6a0c250ae0e8221ead44ff)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 t/db_dependent/Reserves.t     |    5 ++---
 t/db_dependent/ShelfBrowser.t |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 11:48:23 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 09:48:23 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-16-g000ace2
Message-ID: <E1dxruB-0008SO-N6@git.koha-community.org>

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, 17.05.x has been updated
       via  000ace2df42f01f14c1b39489ec79b5d8cbca550 (commit)
      from  2b903d74acbdefbfb1dd678f23dc57f655262940 (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 000ace2df42f01f14c1b39489ec79b5d8cbca550
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Aug 10 09:04:16 2017 +0200

    Bug 19070: Fix Circulation/Branch.t
    
    Resolve:
    DBD::mysql::db do failed: Cannot delete or update a parent row: a foreign key constraint fails (`koha_master`.`clubs`, CONSTRAINT `clubs_ibfk_2` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`)) [for Statement "DELETE FROM branches"] at t/db_dependent/Circulation/Branch.t line 49.
    
    Resolve:
    not ok 14 - AddReturn respects branch item return policy - noreturn
       Failed test 'AddReturn respects branch item return policy - noreturn'
       at t/db_dependent/Circulation/Branch.t line 279.
              got: 'yqiKrIkX'
         expected: undef
    
    Cause:
    There is a record in clubs. The constraint in clubs on branchcode does not
    include a cascaded delete. The test deletes all branches.
    Test 14 depends on item-level_itypes==1. When you set it to Biblio, it fails.
    
    Test plan:
    Run t/db_dependent/Circulation/Branch.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit d2cceb95b47983b28242819c95e57439958b0da5)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 t/db_dependent/Circulation/Branch.t |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 11:52:39 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 09:52:39 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-18-g3cdea3a
Message-ID: <E1dxryJ-0000Ax-3E@git.koha-community.org>

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, 17.05.x has been updated
       via  3cdea3aaf6194cc9e448a424e2646867e9c3ddd1 (commit)
       via  9f8b896d707905043f75a3a86ab29c3ed2eaffa6 (commit)
      from  000ace2df42f01f14c1b39489ec79b5d8cbca550 (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 3cdea3aaf6194cc9e448a424e2646867e9c3ddd1
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Aug 10 09:24:08 2017 +0200

    Bug 19071: Fix Members/IssueSlip.t
    
    Resolve:
    DBD::mysql::db do failed: Cannot delete or update a parent row: a foreign key constraint fails (`koha_master`.`clubs`, CONSTRAINT `clubs_ibfk_2` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`)) [for Statement "DELETE FROM branches"] at t/db_dependent/Members/IssueSlip.t line 44.
    
    We do not need to delete all branches here.
    
    Note: The test still needs attention for noisy userenv warns, but it should
    pass now.
    
    Test plan:
    Run t/db_dependent/Members/IssueSlip.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 8651016ce8e959b5b6ca19ccddbb3f5342b5d456)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 9f8b896d707905043f75a3a86ab29c3ed2eaffa6
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Aug 10 09:13:44 2017 +0200

    Bug 19071: Fix Circulation/issue.t
    
    Resolve:
    DBD::mysql::db do failed: Cannot delete or update a parent row: a foreign key constraint fails (`koha_master`.`clubs`, CONSTRAINT `clubs_ibfk_2` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`)) [for Statement "DELETE FROM branches"] at t/db_dependent/Circulation/issue.t line 65.
    
    Cause:
    See also bug 19070.
    We do not need to delete all branches here.
    
    Test plan:
    Run t/db_dependent/Circulation/issue.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit b80704aa1b763c7a29c3b95c162dfb12ded8faa2)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 t/db_dependent/Circulation/issue.t |    1 -
 t/db_dependent/Members/IssueSlip.t |    1 -
 2 files changed, 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 11:54:34 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 09:54:34 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-20-g0b83a18
Message-ID: <E1dxs0A-0000Cs-1G@git.koha-community.org>

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, 17.05.x has been updated
       via  0b83a18907c8bcefeaa978d44a62736390e4bcf8 (commit)
       via  e03ae320f7705cbf0a9e8ce872c5218ac901dab7 (commit)
      from  3cdea3aaf6194cc9e448a424e2646867e9c3ddd1 (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 0b83a18907c8bcefeaa978d44a62736390e4bcf8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Aug 10 15:52:35 2017 -0300

    Bug 13012: Add more tests
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 28a979487f3d8c4a5887c484ae71c7c63e7ee03d)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit e03ae320f7705cbf0a9e8ce872c5218ac901dab7
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Jul 19 14:57:26 2017 -0400

    Bug 13012 - suggestion.suggesteddate should be set to NOW if not defined
    
    Test Plan:
    1) Apply this patch
    2) prove t/db_dependent/Koha/Suggestions.t
    
    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: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit b2a8e726fe32d4aae3f279f4142af240c60d7fe5)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 Koha/Suggestion.pm                |   18 ++++++++++++++++++
 t/db_dependent/Koha/Suggestions.t |   23 ++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 11:56:47 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 09:56:47 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-22-g8818b60
Message-ID: <E1dxs2J-0000Gj-KY@git.koha-community.org>

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, 17.05.x has been updated
       via  8818b604696512da7d094101036c8704ba315d96 (commit)
       via  69f0c2ece61abb2b512ba9189369b9fbec22941d (commit)
      from  0b83a18907c8bcefeaa978d44a62736390e4bcf8 (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 8818b604696512da7d094101036c8704ba315d96
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Jul 14 11:25:42 2017 +0000

    Bug 18941 - C4::Budgets GetBudgetByCode should return active budgets over inactive budgets
    
    To test:
    1 - Create an active budget
    2 - Create an inactive budget
    3 - Ensure they each have a fund with the same code
    4 - Set MarcFieldsToOrder to get the budget_code from a marc field
    5 - Stage a file using the duplicated code
    6 - Add to a basket from the staged file
    7 - Add the items
    8 - Note funds are encumbered from the inactive budget
    9 - Apply patch
    10 - Repeat 5-8 with a new basket
    11 - Note the active budget is now used
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0e2c823e8806c35673505d0e2a03081cac00190a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 69f0c2ece61abb2b512ba9189369b9fbec22941d
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Jul 14 11:06:16 2017 +0000

    Bug 18941 - Unit tests
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 22944fb61241239124b4db218d098b8510327276)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/Budgets.pm            |    5 +++--
 t/db_dependent/Budgets.t |   24 +++++++++++++++++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 11:59:04 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 09:59:04 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-23-gbda46fb
Message-ID: <E1dxs4W-0000KV-RT@git.koha-community.org>

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, 17.05.x has been updated
       via  bda46fb9f235e0ba7fff758ca4c243dd5e15484c (commit)
      from  8818b604696512da7d094101036c8704ba315d96 (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 bda46fb9f235e0ba7fff758ca4c243dd5e15484c
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Aug 1 17:07:33 2017 +0000

    Bug 18985 - SQL reports 'Last edit' and 'Last run' columns sort alphabetically, not chronologically
    
    This patch alters the DataTables configuration of the SQL reports list
    so that date columns are identified via class rather than position.
    
    To test, apply the patch and go to Reports -> Use saved.
    
    Test the re-ordering of the creation date, last edit, and last run
    columns. Each should sort correctly based on the date.
    
    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: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 3304c7c4ca49db1b95aa564b3550bacf260b9b4f)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../prog/en/modules/reports/guided_reports_start.tt        |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 12:01:17 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 10:01:17 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-24-g04c76ad
Message-ID: <E1dxs6f-0000Mq-H1@git.koha-community.org>

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, 17.05.x has been updated
       via  04c76ad707e83558fd619d6c73f4a0b9094b8e70 (commit)
      from  bda46fb9f235e0ba7fff758ca4c243dd5e15484c (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 04c76ad707e83558fd619d6c73f4a0b9094b8e70
Author: Marc V?ron <veron at veron.ch>
Date:   Wed Aug 2 18:01:06 2017 +0200

    Bug 19027 - Circulation rules: Better wording for standard rules for all libraries
    
    In Home > Administration > Circulation and fine rules, the standard value for
    "Select a library: All libraries" is confusing and leads to support cases.
    
    Change wording to "Standard rules for all libraries".
    
    To test:
    - Apply patch
    - Go to Home > Administration > Circulation and fine rules
    - Verfiy that text in drop down 'Select a library' makes sense.
    
    Followed test plan which works as intended. I agree with the wording it
    is significantly clearer than previously
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit c140b9129124262db27c9ba17f47134ec3232ada)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 12:10:08 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 10:10:08 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-27-g46721cf
Message-ID: <E1dxsFE-0000VJ-8d@git.koha-community.org>

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, 17.05.x has been updated
       via  46721cf2800bdbdd595b6b124eda9cf0792d885d (commit)
       via  fe71ef1d29a0011efbf3f336e0bbfd8aca4433a3 (commit)
       via  93184241f0d3a0e07ed4407891202c7a184d65d4 (commit)
      from  04c76ad707e83558fd619d6c73f4a0b9094b8e70 (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 46721cf2800bdbdd595b6b124eda9cf0792d885d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 9 13:01:37 2017 -0300

    Bug 18292: Tests do not need to return 1 - xt
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit e03f590fa1080b1c3fbe25c91af08094620609d6)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit fe71ef1d29a0011efbf3f336e0bbfd8aca4433a3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Jun 9 08:59:41 2017 -0300

    Bug 18292: Remove return 1 statements in tests
    
    The test files do not need to return 1
    
    Patch generated with:
    perl -p -i -e "s/^1;\n//xsm" t/**/*.t
    
    Test plan:
      git grep '^1;$' t/**/*.t
    should not return any results
    
    NOTE: does not fix C4/SIP/t, nor xt tests.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit b1ba7fac2c246c2dd52aa4d35884a03d542a26f4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 93184241f0d3a0e07ed4407891202c7a184d65d4
Author: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
Date:   Fri Mar 17 09:05:47 2017 +0200

    Bug 18292 - t/db_dependent/Circulation.t doesn't need to return 1;
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit b57d682edd5040eb342047aefa95b84402f4c3ae)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 t/00-load.t                                             |    1 -
 t/Auth_with_shibboleth.t                                |    1 -
 t/Biblio.t                                              |    1 -
 t/Biblio/TransformHtmlToXml.t                           |    1 -
 t/Boolean.t                                             |    1 -
 t/Calendar.t                                            |    1 -
 t/Charset.t                                             |    2 --
 t/Circulation_barcodedecode.t                           |    1 -
 t/Images.t                                              |    1 -
 t/Koha.t                                                |    1 -
 t/Koha/Config.t                                         |    1 -
 t/Koha/Util/Normalize.t                                 |    1 -
 t/Koha_MetadataRecord.t                                 |    1 -
 t/Koha_Template_Plugin_Koha.t                           |    1 -
 t/Letters.t                                             |    1 -
 t/Logger.t                                              |    1 -
 t/Matcher.t                                             |    1 -
 t/Patron.t                                              |    1 -
 t/SIP/Sip.t                                             |    1 -
 t/SMS.t                                                 |    1 -
 t/Search.t                                              |    1 -
 t/SocialData.t                                          |    1 -
 t/SuggestionEngine_AuthorityFile.t                      |    1 -
 t/XSLT.t                                                |    1 -
 t/db_dependent/Accounts.t                               |    1 -
 t/db_dependent/Auth_with_cas.t                          |    1 -
 t/db_dependent/Auth_with_ldap.t                         |    1 -
 t/db_dependent/Barcodes_ValueBuilder.t                  |    1 -
 t/db_dependent/Biblio.t                                 |    1 -
 t/db_dependent/Circulation.t                            |    2 --
 t/db_dependent/Circulation/Branch.t                     |    1 -
 t/db_dependent/Circulation/CheckIfIssuedToPatron.t      |    1 -
 t/db_dependent/Circulation/CheckValidBarcode.t          |    1 -
 t/db_dependent/Circulation/GetPendingOnSiteCheckouts.t  |    1 -
 t/db_dependent/Circulation/IsItemIssued.t               |    1 -
 t/db_dependent/Circulation/MarkIssueReturned.t          |    1 -
 t/db_dependent/Circulation/NoIssuesChargeGuarantees.t   |    1 -
 t/db_dependent/Circulation/Returns.t                    |    1 -
 t/db_dependent/Circulation/StoreLastBorrower.t          |    1 -
 t/db_dependent/Circulation/SwitchOnSiteCheckouts.t      |    1 -
 t/db_dependent/Circulation/TooMany.t                    |    1 -
 t/db_dependent/Circulation/dateexpiry.t                 |    1 -
 t/db_dependent/Circulation/transfers.t                  |    1 -
 t/db_dependent/Clubs.t                                  |    1 -
 t/db_dependent/Context.t                                |    1 -
 t/db_dependent/DecreaseLoanHighHolds.t                  |    1 -
 t/db_dependent/Exporter/Record.t                        |    1 -
 t/db_dependent/Filter_MARC_ViewPolicy.t                 |    1 -
 t/db_dependent/Hold.t                                   |    1 -
 t/db_dependent/Holidays.t                               |    1 -
 t/db_dependent/ILSDI_Services.t                         |    1 -
 t/db_dependent/Items/MoveItemFromBiblio.t               |    1 -
 t/db_dependent/Items_DelItemCheck.t                     |    1 -
 t/db_dependent/Koha/BiblioUtils.t                       |    1 -
 t/db_dependent/Koha/Biblios.t                           |    1 -
 t/db_dependent/Koha/Checkouts.t                         |    1 -
 t/db_dependent/Koha/Cities.t                            |    1 -
 t/db_dependent/Koha/CsvProfiles.t                       |    1 -
 t/db_dependent/Koha/Filter/EmbedItemsAvailability.t     |    1 -
 t/db_dependent/Koha/IssuingRules.t                      |    1 -
 t/db_dependent/Koha/Item/Transfers.t                    |    1 -
 t/db_dependent/Koha/Items.t                             |    1 -
 t/db_dependent/Koha/Libraries.t                         |    1 -
 t/db_dependent/Koha/MarcSubfieldStructures.t            |    1 -
 t/db_dependent/Koha/News.t                              |    1 -
 t/db_dependent/Koha/Notices.t                           |    1 -
 t/db_dependent/Koha/Objects.t                           |    1 -
 t/db_dependent/Koha/Patron/Attribute/Types.t            |    1 -
 t/db_dependent/Koha/Patron/Attributes.t                 |    1 -
 t/db_dependent/Koha/Patron/Categories.t                 |    1 -
 t/db_dependent/Koha/Patron/Images.t                     |    1 -
 t/db_dependent/Koha/Patron/Messages.t                   |    1 -
 t/db_dependent/Koha/Patron/Modifications.t              |    1 -
 t/db_dependent/Koha/Patrons.t                           |    1 -
 t/db_dependent/Koha/Ratings.t                           |    1 -
 t/db_dependent/Koha/Reviews.t                           |    1 -
 t/db_dependent/Koha/SMS_Providers.t                     |    1 -
 t/db_dependent/Koha/Suggestions.t                       |    1 -
 t/db_dependent/Koha_Elasticsearch.t                     |    2 --
 t/db_dependent/Koha_Elasticsearch_Indexer.t             |    2 --
 t/db_dependent/Koha_Misc_Files.t                        |    1 -
 t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t |    1 -
 t/db_dependent/Labels/t_Layout.t                        |    1 -
 t/db_dependent/Labels/t_Profile.t                       |    1 -
 t/db_dependent/Labels/t_Template.t                      |    1 -
 t/db_dependent/Members/GetAllIssues.t                   |    1 -
 t/db_dependent/Members/GetPendingIssues.t               |    1 -
 t/db_dependent/Members/IssueSlip.t                      |    1 -
 t/db_dependent/Passwordrecovery.t                       |    1 -
 t/db_dependent/Patron/Borrower_Discharge.t              |    1 -
 t/db_dependent/Patron/Borrower_PrevCheckout.t           |    1 -
 t/db_dependent/Patron/Housebound.t                      |    1 -
 t/db_dependent/Patron/HouseboundProfiles.t              |    1 -
 t/db_dependent/Patron/HouseboundRoles.t                 |    1 -
 t/db_dependent/Patron/HouseboundVisits.t                |    1 -
 t/db_dependent/PatronLists.t                            |    1 -
 t/db_dependent/Patrons.t                                |    1 -
 t/db_dependent/QueryParser.t                            |    1 -
 t/db_dependent/RefundLostItemFeeRule.t                  |    1 -
 t/db_dependent/Reserves/GetReserveFee.t                 |    1 -
 t/db_dependent/Reserves/MultiplePerRecord.t             |    1 -
 t/db_dependent/RotatingCollections.t                    |    1 -
 t/db_dependent/SIP/SIPServer.t                          |    1 -
 t/db_dependent/Search.t                                 |    1 -
 t/db_dependent/Serials/ReNewSubscription.t              |    1 -
 t/db_dependent/Template/Plugin/Categories.t             |    1 -
 t/db_dependent/Templates.t                              |    1 -
 t/db_dependent/Utils/Datatables_Members.t               |    1 -
 t/db_dependent/Utils/Datatables_Virtualshelves.t        |    1 -
 t/db_dependent/api/v1/cities.t                          |    1 -
 t/db_dependent/db_structure.t                           |    1 -
 t/db_dependent/www/auth_values_input_www.t              |    1 -
 t/db_dependent/www/batch.t                              |    1 -
 t/db_dependent/www/history.t                            |    1 -
 t/db_dependent/www/search_utf8.t                        |    1 -
 xt/author/icondirectories.t                             |    2 --
 116 files changed, 121 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 12:19:30 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 10:19:30 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-29-gc26108a
Message-ID: <E1dxsOI-0000du-Mq@git.koha-community.org>

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, 17.05.x has been updated
       via  c26108afa776b9de93ebe7c334c0eeff8ea2ed98 (commit)
       via  fec723524cbd972b4788f34e105908697c43ea01 (commit)
      from  46721cf2800bdbdd595b6b124eda9cf0792d885d (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 c26108afa776b9de93ebe7c334c0eeff8ea2ed98
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Jul 7 11:25:24 2017 +0000

    Bug 18469: QA Follow-up
    
    Restore datepicker class
    Use Koha.Preference
    Copy changes to moremember
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit a66c0b1dd76a2fe08ed7ac189ad8a564372ab3a9)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit fec723524cbd972b4788f34e105908697c43ea01
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Apr 21 10:08:27 2017 -0400

    Bug 18469: Suspend all holds when specifying a date to resume hold does not keep date
    
    Name of field had 'datepicker' embedded, this caused variable issue
    
    To test:
     1 - Place several holds for a patron
     2 - Go to holds tab in circulation
     3 - Select a date for suspend all holds until
     4 - Suspend all holds
     5 - Note date is not used, suspended indefinitely
     6 - Apply patch
     7 - Resume all suspended holds
     8 - Select a date for suspend all holds until
     9 - Suspend all holds
    10 - Note date is used
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit a58745d9dbbf98c79f4c1a3e7cd40fb45425fc91)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 circ/circulation.pl                                           |    2 --
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt   |    6 +++---
 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt |    6 +++---
 members/moremember.pl                                         |    2 --
 4 files changed, 6 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 12:22:29 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 10:22:29 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-31-g67462ae
Message-ID: <E1dxsRB-0000hg-EH@git.koha-community.org>

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, 17.05.x has been updated
       via  67462ae8704cd8a41a6939b5ee7c47010d9942e6 (commit)
       via  e4995e5196621f8d9aa76301af68064e39fdac6a (commit)
      from  c26108afa776b9de93ebe7c334c0eeff8ea2ed98 (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 67462ae8704cd8a41a6939b5ee7c47010d9942e6
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Fri Aug 11 15:09:00 2017 -0300

    Bug 9409: (QA followup) Add --dbhost help to koha-create man page
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 7efb871fa31869044045ccef0b37be438ba704ff)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit e4995e5196621f8d9aa76301af68064e39fdac6a
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Jun 23 01:46:50 2017 +0000

    Bug 9409: Add --dbhost parameter and dbhost field
    
    This allows setting the remote db host correctly for
    request-db either with a command-line or passwd file.
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit e4573d709936bbd7f454a26f073e2131aa9c8df3)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 debian/docs/koha-create.xml |   10 +++++++++-
 debian/scripts/koha-create  |   18 ++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 12:39:58 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 10:39:58 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-34-gb3e2933
Message-ID: <E1dxsi6-0001kZ-Gl@git.koha-community.org>

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, 17.05.x has been updated
       via  b3e2933f5c36101784a1780444dd619655ee7ea2 (commit)
       via  b1ec1ff0ecf0d54c00182f5fb44e700d664da039 (commit)
       via  ebd244dcab375fcaebe9ab3d1f7673a6638e2c0b (commit)
      from  67462ae8704cd8a41a6939b5ee7c47010d9942e6 (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 b3e2933f5c36101784a1780444dd619655ee7ea2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Aug 14 16:19:15 2017 -0300

    Bug 18817: Update links manually
    
    Without the anchor it is not possible to retrieve the html page, so
    these occurrences have been updated manually (and yes it was painful)
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit b08913370f77fcc1c574d9c0264f0523b6e2a53b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit b1ec1ff0ecf0d54c00182f5fb44e700d664da039
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Aug 14 15:38:05 2017 -0300

    Bug 18817: Update links with anchor automatically
    
    I generate a mapping files (old anchor > new anchor) from the doc files.
    Here are the links that have been updated automatically
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 674c32a094f0545f54d1d0240a642cc1d5587bc6)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit ebd244dcab375fcaebe9ab3d1f7673a6638e2c0b
Author: Joy Nelson <joy at bywatersolutions.com>
Date:   Mon Jun 19 07:45:16 2017 -0700

    Bug 18817 Correct Manual URL
    
    Corrected the manual url in the help screen for 17.05 onward.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0250fb7b7681aa72ed3d5607c0c896cd5fd6659e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/help/about.tt          |    2 +-
 .../intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt     |    2 +-
 .../prog/en/modules/help/acqui/addorderiso2709.tt              |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt   |    2 +-
 .../intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt    |    3 +--
 .../intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt   |    3 +--
 .../intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt    |    2 +-
 .../intranet-tmpl/prog/en/modules/help/acqui/edifactmsgs.tt    |    2 +-
 .../intranet-tmpl/prog/en/modules/help/acqui/histsearch.tt     |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/invoice.tt  |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/invoices.tt |    2 +-
 .../intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt     |    2 +-
 .../intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt |    2 +-
 .../intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt  |    2 +-
 .../prog/en/modules/help/acqui/newordersubscription.tt         |    2 +-
 .../prog/en/modules/help/acqui/newordersuggestion.tt           |    2 +-
 .../intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt   |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt   |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt  |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt |    2 +-
 .../intranet-tmpl/prog/en/modules/help/acqui/uncertainprice.tt |    2 +-
 .../intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tt   |    2 +-
 .../intranet-tmpl/prog/en/modules/help/admin/admin-home.tt     |    2 +-
 .../prog/en/modules/help/admin/aqbudgetperiods.tt              |    2 +-
 .../intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt      |    2 +-
 .../intranet-tmpl/prog/en/modules/help/admin/aqcontract.tt     |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt   |    2 +-
 .../prog/en/modules/help/admin/auth_subfields_structure.tt     |    2 +-
 .../prog/en/modules/help/admin/auth_tag_structure.tt           |    2 +-
 .../prog/en/modules/help/admin/authorised_values.tt            |    2 +-
 .../intranet-tmpl/prog/en/modules/help/admin/authtypes.tt      |    2 +-
 .../prog/en/modules/help/admin/biblio_framework.tt             |    4 ++--
 .../prog/en/modules/help/admin/branch_transfer_limits.tt       |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/admin/categorie.tt      |    2 +-
 .../intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt      |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt   |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/admin/classsources.tt   |    4 ++--
 .../prog/en/modules/help/admin/columns_settings.tt             |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/admin/didyoumean.tt     |    2 +-
 .../intranet-tmpl/prog/en/modules/help/admin/edi_accounts.tt   |    4 ++--
 .../prog/en/modules/help/admin/edi_ean_accounts.tt             |    2 +-
 .../intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt   |    4 ++--
 .../prog/en/modules/help/admin/item_circulation_alerts.tt      |    2 +-
 .../prog/en/modules/help/admin/items_search_fields.tt          |    2 +-
 .../intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt      |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt |    4 ++--
 .../prog/en/modules/help/admin/marc_subfields_structure.tt     |    2 +-
 .../prog/en/modules/help/admin/marctagstructure.tt             |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt |    2 +-
 .../prog/en/modules/help/admin/oai_set_mappings.tt             |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt |    2 +-
 .../prog/en/modules/help/admin/patron-attr-types.tt            |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/admin/preferences.tt    |    2 +-
 .../intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt    |    2 +-
 .../prog/en/modules/help/admin/systempreferences.tt            |    2 +-
 .../prog/en/modules/help/admin/transport-cost-matrix.tt        |    2 +-
 .../intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt   |    2 +-
 .../prog/en/modules/help/authorities/authorities-home.tt       |    2 +-
 .../prog/en/modules/help/authorities/authorities.tt            |    2 +-
 .../intranet-tmpl/prog/en/modules/help/authorities/detail.tt   |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/authorities/merge.tt    |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/catalogue/detail.tt     |    2 +-
 .../prog/en/modules/help/catalogue/issuehistory.tt             |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/catalogue/itemsearch.tt |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/catalogue/moredetail.tt |    4 ++--
 .../prog/en/modules/help/catalogue/search-history.tt           |    2 +-
 .../intranet-tmpl/prog/en/modules/help/catalogue/search.tt     |    2 +-
 .../prog/en/modules/help/cataloguing/addbiblio.tt              |    2 +-
 .../intranet-tmpl/prog/en/modules/help/cataloguing/addbooks.tt |    3 +--
 .../intranet-tmpl/prog/en/modules/help/cataloguing/additem.tt  |    2 +-
 .../intranet-tmpl/prog/en/modules/help/cataloguing/linkitem.tt |    2 +-
 .../intranet-tmpl/prog/en/modules/help/cataloguing/merge.tt    |    2 +-
 .../intranet-tmpl/prog/en/modules/help/cataloguing/moveitem.tt |    2 +-
 .../intranet-tmpl/prog/en/modules/help/circ/branchoverdues.tt  |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt |    2 +-
 .../prog/en/modules/help/circ/circulation-home.tt              |    2 +-
 .../intranet-tmpl/prog/en/modules/help/circ/circulation.tt     |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/offline.tt   |    4 ++--
 .../prog/en/modules/help/circ/on-site_checkouts.tt             |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/overdue.tt   |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/renew.tt     |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/circ/reserveratios.tt   |    3 +--
 koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt   |    2 +-
 .../prog/en/modules/help/circ/selectbranchprinter.tt           |    4 ++--
 .../prog/en/modules/help/circ/transferstoreceive.tt            |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/circ/waitingreserves.tt |    4 ++--
 .../prog/en/modules/help/course_reserves/add_items.tt          |    2 +-
 .../prog/en/modules/help/course_reserves/course-details.tt     |    2 +-
 .../prog/en/modules/help/course_reserves/course-reserves.tt    |    2 +-
 .../prog/en/modules/help/course_reserves/course.tt             |    2 +-
 .../prog/en/modules/help/labels/label-edit-batch.tt            |    4 ++--
 .../prog/en/modules/help/labels/label-edit-layout.tt           |    4 ++--
 .../prog/en/modules/help/labels/label-edit-profile.tt          |    4 ++--
 .../prog/en/modules/help/labels/label-edit-template.tt         |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/labels/label-home.tt    |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/labels/label-manage.tt  |    8 ++++----
 .../prog/en/modules/help/labels/spinelabel-home.tt             |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/help/mainpage.tt       |    2 +-
 .../intranet-tmpl/prog/en/modules/help/members/boraccount.tt   |    2 +-
 .../intranet-tmpl/prog/en/modules/help/members/discharge.tt    |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/help/members/files.tt  |    2 +-
 .../intranet-tmpl/prog/en/modules/help/members/mancredit.tt    |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/members/maninvoice.tt   |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/members/member-flags.tt |    2 +-
 .../prog/en/modules/help/members/member-password.tt            |    3 +--
 koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/members/memberentry.tt  |    2 +-
 .../intranet-tmpl/prog/en/modules/help/members/members-home.tt |    4 ++--
 .../prog/en/modules/help/members/members-update.tt             |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/members/moremember.tt   |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/members/notices.tt      |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tt    |    2 +-
 .../intranet-tmpl/prog/en/modules/help/members/paycollect.tt   |    2 +-
 .../prog/en/modules/help/members/purchase-suggestions.tt       |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/members/readingrec.tt   |    2 +-
 .../prog/en/modules/help/members/routing-lists.tt              |    2 +-
 .../intranet-tmpl/prog/en/modules/help/members/statistics.tt   |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tt         |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/offline_circ/list.tt    |    2 +-
 .../prog/en/modules/help/offline_circ/process_koc.tt           |    2 +-
 .../intranet-tmpl/prog/en/modules/help/patron_lists/lists.tt   |    4 ++--
 .../prog/en/modules/help/patroncards/edit-batch.tt             |    4 ++--
 .../prog/en/modules/help/patroncards/edit-layout.tt            |    4 ++--
 .../prog/en/modules/help/patroncards/edit-profile.tt           |    4 ++--
 .../prog/en/modules/help/patroncards/edit-template.tt          |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/patroncards/home.tt     |    4 ++--
 .../prog/en/modules/help/patroncards/image-manage.tt           |    2 +-
 .../intranet-tmpl/prog/en/modules/help/patroncards/manage.tt   |    2 +-
 .../intranet-tmpl/prog/en/modules/help/plugins/plugins-home.tt |    4 ++--
 .../prog/en/modules/help/plugins/plugins-upload.tt             |    2 +-
 .../prog/en/modules/help/reports/acquisitions_stats.tt         |    4 ++--
 .../prog/en/modules/help/reports/bor_issues_top.tt             |    4 ++--
 .../prog/en/modules/help/reports/borrowers_out.tt              |    4 ++--
 .../prog/en/modules/help/reports/borrowers_stats.tt            |    3 +--
 .../prog/en/modules/help/reports/cat_issues_top.tt             |    4 ++--
 .../prog/en/modules/help/reports/catalogue_out.tt              |    4 ++--
 .../prog/en/modules/help/reports/catalogue_stats.tt            |    3 +--
 .../intranet-tmpl/prog/en/modules/help/reports/dictionary.tt   |    4 ++--
 .../prog/en/modules/help/reports/guided_reports.tt             |    2 +-
 .../prog/en/modules/help/reports/issues_avg_stats.tt           |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/reports/issues_stats.tt |    2 +-
 .../intranet-tmpl/prog/en/modules/help/reports/itemslost.tt    |    2 +-
 .../intranet-tmpl/prog/en/modules/help/reports/manager.tt      |    2 +-
 .../intranet-tmpl/prog/en/modules/help/reports/reports-home.tt |    2 +-
 .../prog/en/modules/help/reports/reserves_stats.tt             |    4 ++--
 .../prog/en/modules/help/reports/serials_stats.tt              |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/reserve/request.tt      |    2 +-
 .../prog/en/modules/help/reviews/reviewswaiting.tt             |    4 ++--
 .../modules/help/rotating_collections/rotatingCollections.tt   |    4 ++--
 .../prog/en/modules/help/serials/checkexpiration.tt            |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/claims.tt |    3 +--
 .../intranet-tmpl/prog/en/modules/help/serials/routing.tt      |    4 ++--
 .../prog/en/modules/help/serials/serials-collection.tt         |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/serials/serials-edit.tt |    2 +-
 .../intranet-tmpl/prog/en/modules/help/serials/serials-home.tt |    3 +--
 .../prog/en/modules/help/serials/subscription-add.tt           |    3 +--
 .../prog/en/modules/help/serials/subscription-detail.tt        |    4 ++--
 .../prog/en/modules/help/serials/subscription-frequencies.tt   |    4 ++--
 .../en/modules/help/serials/subscription-numberpatterns.tt     |    2 +-
 .../prog/en/modules/help/suggestion/suggestion.tt              |    3 +--
 koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/list.tt      |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/review.tt    |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/batchMod.tt |    4 ++--
 .../prog/en/modules/help/tools/batch_delete_records.tt         |    2 +-
 .../prog/en/modules/help/tools/batch_record_modification.tt    |    2 +-
 .../intranet-tmpl/prog/en/modules/help/tools/cleanborrowers.tt |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/tools/csv-profiles.tt   |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/export.tt   |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt |    3 +--
 .../prog/en/modules/help/tools/import_borrowers.tt             |    2 +-
 .../intranet-tmpl/prog/en/modules/help/tools/inventory.tt      |    2 +-
 .../intranet-tmpl/prog/en/modules/help/tools/koha-news.tt      |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt   |    2 +-
 .../prog/en/modules/help/tools/manage-marc-import.tt           |    3 +--
 .../prog/en/modules/help/tools/marc_modification_templates.tt  |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/tools/modborrowers.tt   |    4 ++--
 .../intranet-tmpl/prog/en/modules/help/tools/overduerules.tt   |    3 +--
 .../intranet-tmpl/prog/en/modules/help/tools/picture-upload.tt |    2 +-
 .../intranet-tmpl/prog/en/modules/help/tools/quotes-upload.tt  |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/quotes.tt   |    2 +-
 .../intranet-tmpl/prog/en/modules/help/tools/scheduler.tt      |    2 +-
 .../prog/en/modules/help/tools/stage-marc-import.tt            |    2 +-
 .../intranet-tmpl/prog/en/modules/help/tools/tools-home.tt     |    4 ++--
 .../prog/en/modules/help/tools/upload-cover-image.tt           |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/viewlog.tt  |    4 ++--
 .../prog/en/modules/help/virtualshelves/shelves.tt             |    2 +-
 190 files changed, 268 insertions(+), 282 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 13:33:10 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 11:33:10 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-35-g9f8cdea
Message-ID: <E1dxtXa-0003Su-Uq@git.koha-community.org>

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, 17.05.x has been updated
       via  9f8cdead6e29f029e01038ecb4fbd6216544e996 (commit)
      from  b3e2933f5c36101784a1780444dd619655ee7ea2 (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 9f8cdead6e29f029e01038ecb4fbd6216544e996
Author: Magnus Enger <magnus at libriotech.no>
Date:   Thu Aug 17 22:48:07 2017 +0200

    Bug 19134: C4::SMS falils on long driver name
    
    Code in C4::SMS takes the part of the SMS::Send-driver that comes after
    SMS::Send and tries to turn it into part of a path to a YAML file
    that can contain additional parameters to SMS::Send. The current
    code works for e.g. SMS::Send::A::B, but if there is one or more
    extra names, it fails to turn :: into /. So we have:
    SMS::Send::A::B    -> SMS/Send/A/B
    SMS::Send::A::B::C -> SMS/Send/A/B::C
    This patch makes sure all occurrences of :: are turned into /, by
    adding a "g" modifier at the end of the regex.
    
    Testing:
    Testing this preperly would take a whole lot of setup for a very
    small change. I would suggest that the following two oneliners
    are enough to demonstrate that the change makes sense:
    $ perl -e '$x = "a::b::c"; $x =~ s|::|/|; print $x, "\n";'
    $ perl -e '$x = "a::b::c"; $x =~ s|::|/|g; print $x, "\n";'
    
    So:
    - Check that the output of these oneliners make sense
    - Check that the patch changes the code in a similar way to the
      change from the first oneliner to the second.
    
    Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit a4237785d9a2bf2bbf4cf988bc98ac4935842e91)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/SMS.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 15:29:27 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 13:29:27 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-39-g81a1771
Message-ID: <E1dxvM7-0006Vp-Ds@git.koha-community.org>

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, 17.05.x has been updated
       via  81a1771fc0809ea51712be69f46a3d46489e4069 (commit)
       via  d4e18fc7d097f7fcbbf63570f1191e1cec04a626 (commit)
       via  36cdd8e0cd0d27b9bcdd5c661d2dbf3e19c8b3f0 (commit)
       via  854a9052f70d9a9b2c3b63fe2c3b35c1d40a5496 (commit)
      from  9f8cdead6e29f029e01038ecb4fbd6216544e996 (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 81a1771fc0809ea51712be69f46a3d46489e4069
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Tue Aug 22 13:11:56 2017 -0300

    Bug 19130: (followup) Controller scripts should preserve behaviour
    
    This patch is a followup to making
    Koha::Acquisition::Booksellers->search work as any other Koha::Objects
    (DBIC) query instead of having a different behaviour hardcoded.
    
    To achieve it, this patch makes the controller scripts add
    wildcard/truncation chars as prefix and sufix for searches, and make the
    default sorting for results be by 'name', ascending.
    
    To test:
    - Just verify the behaviour remains unchanged by this patchset on the
    controller scripts (re. searching).
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit b5d6a1885ed4dcb650e7f9f23733b4ff9ad2b37b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit d4e18fc7d097f7fcbbf63570f1191e1cec04a626
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Tue Aug 22 12:13:19 2017 -0300

    Bug 19130: (followup) Add POD
    
    This patch adds POD to the following files:
    
    - Koha/Acquisition/Bookseller.pm
    - Koha/Acquisition/Booksellers.pm
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit bf630b19745df8caea47669a9a76de26eddbfeee)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 36cdd8e0cd0d27b9bcdd5c661d2dbf3e19c8b3f0
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Tue Aug 22 12:03:37 2017 -0300

    Bug 19130: (followup) Add t/db_dependent/Koha/Acquisition/Booksellers.t
    
    This followup patch adds a proper file in which add tests for
    Koha::Acquisition::Bookseller(s) methods.
    
    All current methods are covered.
    
    To test:
    - Run:
      $ sudo koha-shell kohadev
     k$ cd kohaclone
     k$ prove t/db_dependent/Koha/Acquisition/Booksellers.t
     => SUCCESS: Test pass!
     - Sign off :-D
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 3481b7b9dac8935befe631131570591ec2c84cce)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 854a9052f70d9a9b2c3b63fe2c3b35c1d40a5496
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Tue Aug 22 12:01:24 2017 -0300

    Bug 19130: Remove ->search() overloading and adjust tests
    
    This patch removes the custom ->search() function. Tests are adjusted
    so the results from ->search() calls are not expected to return in the
    previously hardcoded order.
    
    To test:
    - Apply this patch
    - Run:
      $ sudo koha-shell kohadev
     k$ cd kohaclone
     k$ prove t/db_dependent/Bookseller.t
    => SUCCESS: Tests pass
    - Sign off :-D
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 7e4ce56b27025b05ee572100529eaa4f28e0933c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 Koha/Acquisition/Bookseller.pm                |   61 +++++++-
 Koha/Acquisition/Booksellers.pm               |   41 ++++--
 acqui/basketheader.pl                         |    5 +-
 acqui/booksellers.pl                          |    4 +-
 acqui/invoices.pl                             |    2 +-
 acqui/transferorder.pl                        |    4 +-
 serials/acqui-search-result.pl                |    4 +-
 t/db_dependent/Bookseller.t                   |    2 +-
 t/db_dependent/Koha/Acquisition/Booksellers.t |  186 +++++++++++++++++++++++++
 9 files changed, 284 insertions(+), 25 deletions(-)
 create mode 100644 t/db_dependent/Koha/Acquisition/Booksellers.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 15:30:45 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 13:30:45 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-40-g916d564
Message-ID: <E1dxvNN-0006Z1-7Q@git.koha-community.org>

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, 17.05.x has been updated
       via  916d564055502aac3d09e227d90a0f3f6d291cdd (commit)
      from  81a1771fc0809ea51712be69f46a3d46489e4069 (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 916d564055502aac3d09e227d90a0f3f6d291cdd
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Aug 16 13:15:19 2017 +0200

    Bug 19126: Fix Members.t with IndependentBranches set
    
    If you enabled that pref, Members.t fails with:
    t/db_dependent/Members.t .. 63/63 # Looks like you failed 15 tests of 63.
    
    The first one is:
    t/db_dependent/Members.t .. 32/63
       Failed test 'Staff patron not deleted from list'
       at t/db_dependent/Members.t line 304.
    
    Bottle neck is GetBorrowersToExpunge. The results of that sub depend on the
    state of this preference.
    Trivially fixing it here by disabling the pref before the first call.
    
    Test plan:
    [1] Do not apply this patch yet. Enable IndependentBranches.
    [2] Run Members.t and observe that it fails.
    [3] Apply this patch. And run Members.t again. It should pass now.
    
    Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 44a8fc5b9363eb27223f32e1150fb8fff6f55d08)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 t/db_dependent/Members.t |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 15:33:58 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 13:33:58 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-41-g3e9af63
Message-ID: <E1dxvQU-0006hi-0w@git.koha-community.org>

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, 17.05.x has been updated
       via  3e9af632d97f412d44fe4a11e97edd990b0d3ad1 (commit)
      from  916d564055502aac3d09e227d90a0f3f6d291cdd (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 3e9af632d97f412d44fe4a11e97edd990b0d3ad1
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 22:21:37 2017 +0530

    Bug 19118 - Due to wrong variable name passed vendor name is not coming in browser title bar
    
    Test
    
    1. Hit the page /cgi-bin/koha/acqui/supplier.pl?booksellerid=xx
       xx is a booksellerid
    2. Apply the patch and reload the page.
    3. You can see vendor name in browser title bar.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit ea886885d0efa0200cfa166453a4495692afc4d4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 15:37:45 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 13:37:45 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-42-ge73f59c
Message-ID: <E1dxvU9-0006xE-Mi@git.koha-community.org>

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, 17.05.x has been updated
       via  e73f59c607e459dc4ada3632c6dbb1a3aad9a7f6 (commit)
      from  3e9af632d97f412d44fe4a11e97edd990b0d3ad1 (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 e73f59c607e459dc4ada3632c6dbb1a3aad9a7f6
Author: Serhij Dubyk {?????? ?????} <serhijdubyk at gmail.com>
Date:   Wed Aug 23 17:15:17 2017 +0300

    Bug 18537 - Update Ukrainian installer sample files for 17.05
    
    Update and translate sample SQL files of the Ukrainian installer.
    
    To test:
    - Start with an empty database
    - Install uk-UA
    - Run the web installer in uk-UA/Ukrainian
    - Verify all files load without any problems.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit ce2561441c3c6e5bdc5ee7011d250c24a2d49105)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../authorised_values_[CCODE].sql                  |   12 +-
 .../authorised_values_[COUNTRY].sql                |  715 ++++-------
 .../authorised_values_[DAMAGED].sql                |   11 +-
 .../authorised_values_[IND_852].sql                |   41 +-
 .../authorised_values_[IND_852].txt                |    2 +-
 .../authorised_values/authorised_values_[LANG].sql | 1348 +++++++-------------
 .../authorised_values/authorised_values_[LANG].txt |    2 +-
 .../authorised_values/authorised_values_[LOC].sql  |   25 +-
 .../authorised_values/authorised_values_[LOC].txt  |    2 +-
 .../authorised_values/authorised_values_[LOST].sql |   18 +-
 .../authorised_values/authorised_values_[LOST].txt |    2 +-
 .../authorised_values_[NOT_LOAN].sql               |   20 +-
 .../authorised_values_[NOT_LOAN].txt               |    2 +-
 .../authorised_values_[RESTRICTED].sql             |   11 +-
 .../authorised_values_[RESTRICTED].txt             |    2 +-
 .../authorised_values_[STACK].sql                  |    6 +-
 .../authorised_values_[SUGGEST].sql                |   17 +-
 .../authorised_values_[SUGGEST_FORMAT].sql         |   13 +-
 .../authorised_values_[SUPPRESS].sql               |   16 +-
 .../authorised_values_[WITHDRAWN].sql              |    9 +-
 .../authorised_values_[WITHDRAWN].txt              |    2 +-
 .../data/mysql/uk-UA/mandatory/auth_values.sql     |   13 +-
 .../data/mysql/uk-UA/mandatory/class_sources.sql   |  141 +-
 .../uk-UA/mandatory/message_transport_types.sql    |    2 +-
 .../mysql/uk-UA/mandatory/sample_frequencies.sql   |   48 +-
 .../mysql/uk-UA/mandatory/sample_frequencies.txt   |    2 +-
 .../data/mysql/uk-UA/mandatory/sample_notices.sql  |  290 +++--
 .../sample_notices_message_attributes.sql          |   24 +-
 .../sample_notices_message_transports.sql          |   42 +-
 .../uk-UA/mandatory/sample_numberpatterns.sql      |   77 +-
 .../uk-UA/mandatory/sample_numberpatterns.txt      |    2 +-
 installer/data/mysql/uk-UA/mandatory/stopwords.txt |    1 -
 ...m_preferences_full_optimal_for_install_only.sql |   33 -
 ...m_preferences_full_optimal_for_install_only.txt |    1 -
 ...stem_preferences_optimal_values_insert_only.sql |   88 --
 ...stem_preferences_optimal_values_insert_only.txt |    1 -
 .../marc21_authorities_DEFAULT_general.sql         |   38 +-
 .../marc21_bibliographic_DEFAULT_general.sql       |  406 +++++-
 .../marc21_bibliographic_DEFAULT_local.sql         |    4 +-
 .../marcflavour/marc21/optional/fieldmapping.sql   |   13 +-
 .../marc21_authorities_CHRON_TERM_general.sql      |    2 +-
 .../marc21_authorities_CORPO_NAME_general.sql      |    2 +-
 .../marc21_authorities_GENRE-FORM_general.sql      |    2 +-
 .../marc21_authorities_GEOGR_NAME_general.sql      |    2 +-
 .../marc21_authorities_MEETI_NAME_general.sql      |    2 +-
 .../marc21_authorities_PERSO_NAME_general.sql      |    2 +-
 .../marc21_authorities_TOPIC_TERM_general.sql      |    2 +-
 .../marc21_authorities_UNIF_TITLE_general.sql      |    2 +-
 .../optional/marc21_bibliographic_AR_general.sql   |    6 +-
 .../optional/marc21_bibliographic_AR_local.sql     |    4 +-
 .../optional/marc21_bibliographic_BKS_general.sql  |    4 +-
 .../optional/marc21_bibliographic_BKS_local.sql    |    4 +-
 .../optional/marc21_bibliographic_CF_general.sql   |    4 +-
 .../optional/marc21_bibliographic_CF_local.sql     |    4 +-
 .../optional/marc21_bibliographic_FA_general.sql   |   12 +-
 .../optional/marc21_bibliographic_IR_general.sql   |    4 +-
 .../optional/marc21_bibliographic_IR_local.sql     |    4 +-
 .../optional/marc21_bibliographic_KT_general.sql   |    4 +-
 .../optional/marc21_bibliographic_KT_local.sql     |    4 +-
 .../optional/marc21_bibliographic_SER_general.sql  |    4 +-
 .../optional/marc21_bibliographic_SER_local.sql    |    4 +-
 .../optional/marc21_bibliographic_SR_general.sql   |    4 +-
 .../optional/marc21_bibliographic_SR_local.sql     |    4 +-
 .../optional/marc21_bibliographic_VR_general.sql   |    4 +-
 .../optional/marc21_bibliographic_VR_local.sql     |    4 +-
 .../optional/marc21_default_matching_rules.sql     |   14 +-
 .../optional/marc21_default_matching_rules.txt     |    6 +-
 .../unimarc_bibliographic_DEFAULT_general.sql      |  345 ++---
 .../unimarc_bibliographic_DEFAULT_local_995.sql    |  411 ------
 .../unimarc_bibliographic_DEFAULT_local_995.txt    |    1 -
 .../optional/unimarc_authorities_CO_general.sql    |    3 +-
 .../optional/unimarc_authorities_NP_general.sql    |    3 +-
 .../unimarc_authorities_SAUTTIT_general.sql        |    3 +-
 .../optional/unimarc_authorities_SAUT_general.sql  |    3 +-
 .../optional/unimarc_authorities_SCO_general.sql   |    3 +-
 .../optional/unimarc_authorities_SNC_general.sql   |    3 +-
 .../optional/unimarc_authorities_SNG_general.sql   |    3 +-
 .../optional/unimarc_authorities_STU_general.sql   |    3 +-
 .../optional/unimarc_authorities_TU_general.sql    |    3 +-
 .../optional/unimarc_bibliographic_AN_general.sql  |  173 ++-
 .../optional/unimarc_bibliographic_AN_local.sql    |  264 +---
 .../optional/unimarc_bibliographic_AUD_general.sql |   57 +-
 .../optional/unimarc_bibliographic_AUD_local.sql   |  264 +---
 .../unimarc_bibliographic_BOOK_general.sql         |   72 +-
 .../optional/unimarc_bibliographic_BOOK_local.sql  |  264 +---
 ...rc_bibliographic_DEFAULT_local_952_obsolete.sql |  147 ---
 ...rc_bibliographic_DEFAULT_local_952_obsolete.txt |    1 -
 .../optional/unimarc_bibliographic_EL_general.sql  |   61 +-
 .../optional/unimarc_bibliographic_EL_local.sql    |  264 +---
 .../optional/unimarc_bibliographic_MIN_general.sql |   54 +-
 .../optional/unimarc_bibliographic_MIN_local.sql   |  262 +---
 .../unimarc_bibliographic_NOTE_general.sql         |   63 +-
 .../optional/unimarc_bibliographic_NOTE_local.sql  |  264 +---
 .../optional/unimarc_bibliographic_PER_general.sql |  178 ++-
 .../optional/unimarc_bibliographic_PER_local.sql   |  264 +---
 .../unimarc_bibliographic_TECH_general.sql         |   69 +-
 .../optional/unimarc_bibliographic_TECH_local.sql  |  264 +---
 .../optional/unimarc_default_matching_rules.sql    |   20 +-
 .../optional/unimarc_default_matching_rules.txt    |    2 +-
 .../data/mysql/uk-UA/optional/example_branches.sql |   39 -
 .../data/mysql/uk-UA/optional/example_branches.txt |    1 -
 installer/data/mysql/uk-UA/optional/holidays.sql   |   24 -
 installer/data/mysql/uk-UA/optional/holidays.txt   |    1 -
 .../mysql/uk-UA/optional/library_item_types.sql    |  102 --
 .../mysql/uk-UA/optional/library_item_types.txt    |    1 -
 .../data/mysql/uk-UA/optional/patron_atributes.sql |  131 +-
 .../mysql/uk-UA/optional/patron_categories.sql     |  101 +-
 .../mysql/uk-UA/optional/patron_categories.txt     |    2 +-
 .../data/mysql/uk-UA/optional/print_labels.sql     |   24 -
 .../data/mysql/uk-UA/optional/print_labels.txt     |    7 -
 .../data/mysql/uk-UA/optional/sample_cities.sql    |   80 +-
 .../data/mysql/uk-UA/optional/sample_currency.sql  |   17 +-
 .../data/mysql/uk-UA/optional/sample_news.sql      |   58 +-
 .../data/mysql/uk-UA/optional/sample_notices.sql   |   38 -
 .../data/mysql/uk-UA/optional/sample_notices.txt   |    1 -
 .../uk-UA/optional/sample_user_suggestions.sql     |   12 +-
 .../uk-UA/optional/z39-50servers_collection.sql    |   11 -
 .../uk-UA/optional/z39-50servers_collection.txt    |    1 -
 118 files changed, 2801 insertions(+), 5257 deletions(-)
 delete mode 100644 installer/data/mysql/uk-UA/mandatory/stopwords.txt
 delete mode 100644 installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
 delete mode 100644 installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.txt
 delete mode 100644 installer/data/mysql/uk-UA/mandatory/system_preferences_optimal_values_insert_only.sql
 delete mode 100644 installer/data/mysql/uk-UA/mandatory/system_preferences_optimal_values_insert_only.txt
 delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/mandatory/unimarc_bibliographic_DEFAULT_local_995.sql
 delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/mandatory/unimarc_bibliographic_DEFAULT_local_995.txt
 delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_DEFAULT_local_952_obsolete.sql
 delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_DEFAULT_local_952_obsolete.txt
 delete mode 100644 installer/data/mysql/uk-UA/optional/example_branches.sql
 delete mode 100644 installer/data/mysql/uk-UA/optional/example_branches.txt
 delete mode 100644 installer/data/mysql/uk-UA/optional/holidays.sql
 delete mode 100644 installer/data/mysql/uk-UA/optional/holidays.txt
 delete mode 100644 installer/data/mysql/uk-UA/optional/library_item_types.sql
 delete mode 100644 installer/data/mysql/uk-UA/optional/library_item_types.txt
 delete mode 100644 installer/data/mysql/uk-UA/optional/print_labels.sql
 delete mode 100644 installer/data/mysql/uk-UA/optional/print_labels.txt
 delete mode 100644 installer/data/mysql/uk-UA/optional/sample_notices.sql
 delete mode 100644 installer/data/mysql/uk-UA/optional/sample_notices.txt
 delete mode 100644 installer/data/mysql/uk-UA/optional/z39-50servers_collection.sql
 delete mode 100644 installer/data/mysql/uk-UA/optional/z39-50servers_collection.txt


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 15:39:25 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 13:39:25 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-43-gcdcc045
Message-ID: <E1dxvVl-00071X-QS@git.koha-community.org>

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, 17.05.x has been updated
       via  cdcc0458b796aff59a50e0f5d4c7b7140682eacf (commit)
      from  e73f59c607e459dc4ada3632c6dbb1a3aad9a7f6 (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 cdcc0458b796aff59a50e0f5d4c7b7140682eacf
Author: Lee Jamison <ldjamison at marywood.edu>
Date:   Fri Aug 11 18:58:53 2017 +0000

    Bug 19088: plugins-upload causes error log noise
    
    After uploading a plugin the error log indicates
    use of uninitialized value in $op. This patch
    silences the noise.
    
    To test:
    1) Set <enable_plugins> to 1 (one) in koha-conf.xml.
    2) Set the UseKohaPlugins system preference to 'Enable'.
    3) Navigate to Administration -> Manage plugins.
    4) Install the test plugin KPZ file attached to this bug.
    5) Notice the uninitialized value noise in the error log.
    6) Uninstall the plugin (plack restart may be required if plack is
        enabled).
    7) Apply patch.
    8) Install the plugin again.
    9) Notice no noise in the error log.
    10) Run qa tools.
    11) Run prove t/db_dependent/Plugins.t
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 1076a0edf32b621da54c53ea71595885f7e14c38)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 plugins/plugins-upload.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 15:46:08 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 13:46:08 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-44-g9f96a3b
Message-ID: <E1dxvcG-0007EI-Aq@git.koha-community.org>

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, 17.05.x has been updated
       via  9f96a3bb39c8fcb246a3caeeb2d7a24f46da7153 (commit)
      from  cdcc0458b796aff59a50e0f5d4c7b7140682eacf (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 9f96a3bb39c8fcb246a3caeeb2d7a24f46da7153
Author: Marc V?ron <veron at veron.ch>
Date:   Sun May 28 09:34:21 2017 +0200

    Bug 18687: Translatability: abbr tag should not contain lang attribute
    
    In manage-marc-import.tt, we have an abbreviation:
    
    <abbr title="Differences between the original biblio and the imported" lang="en">Diff</abbr>
    
    In translations (e.g. German), the line appears as follows:
    <abbr title="Unterschiede zwischen Originaltitelsatz und importiertem Titelsatz" lang="en">Diff</abbr>
    
    The lang attribute is wrong here, it is still "en".
    The text language is the same as defined at the top of the page - or with other
    words, the lang tag is superfluous.
    
    This patch removes it.
    
    To test:
    Verify that code change makes sense.
    
    Passes QA test and the change is logical
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 03c7f9366c97d6402e1e16182d7a2ddbbe37eccb)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 15:49:42 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 13:49:42 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-46-g78e5271
Message-ID: <E1dxvfi-0007M0-DI@git.koha-community.org>

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, 17.05.x has been updated
       via  78e527129b0b547eff7311c3f25a4b1f679d2a97 (commit)
       via  65e09b28dbbe43772b9104ffcafa1f81441c4d70 (commit)
      from  9f96a3bb39c8fcb246a3caeeb2d7a24f46da7153 (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 78e527129b0b547eff7311c3f25a4b1f679d2a97
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Aug 4 16:44:51 2017 +0200

    Bug 18754: [QA Follow-up] Tiny corrections
    
    Converted one INCLUDE directive to PROCESS; we are not changing variables here. (The PROCESS directive is slightly faster than INCLUDE because it avoids the need to localise (i.e. copy) the variable stash before processing the template.)
    
    Removed one vim inserted letter i.
    
    Error in [% IF ( XISBN.publicationyear ) _ ', ' _ XISBN.publicationyear %][% END %] The concatenation became part of the condition.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit ff591f2c77a2a3c1de4a0e7167ccfeba08c2f128)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 65e09b28dbbe43772b9104ffcafa1f81441c4d70
Author: Marc V?ron <veron at veron.ch>
Date:   Fri Jun 9 15:43:36 2017 +0200

    Bug 18754: Translatability: Get rid of exposed tt directives in opac-detail.tt
    
    The file opac-detail.tt exposes a lot of template directives to translation where translators should not be confronted with.
    
    Some examples from po file are:
    
    $[% SUBFIELD.code %] [% SUBFIELD.value %]
    
    %s [%% INCLUDE \"openlibrary-readapi.inc\" bib = { normalized_isbn => "
    "normalized_isbn, lccn => lccn, normalized_oclc => normalized_oclc } %%]
    
    See: [% IF ( nextTitle ) %][% nextTitle |html %][% ELSE %]next biblio[% END "
    "%]
    
    To test:
    - Apply patch
    - Do a search in OPAC that has more than 1 results
    - Go to the detail page of one of the items found
    - Verify that the details display as before and that you can
      browse the results with Previous and Next
    - In staff client, change OPACXSLTDetailsDisplay from 'default' to
      empty for "no xslt" and repeat steps above
    - In staff client, set HTML5MediaEnabled to 'OPAC' or 'OPAC and staff client'
    - Verify that media catalogued in field 856 still work
    - Create a new translation for a 'language' aa-AA (perl translate create aa-AA)
    - Verify that template directives ar no longer exposed in aa-AA-opac-bootstrap.po
    
    Followed test plan which works as intended
    
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 752aef4593f1aa2d64700bf9738e7e03907eb1cd)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../opac-tmpl/bootstrap/en/modules/opac-detail.tt  |   86 ++++++++++----------
 1 file changed, 42 insertions(+), 44 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 15:54:11 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 13:54:11 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-48-gb17412d
Message-ID: <E1dxvk3-0007TE-OL@git.koha-community.org>

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, 17.05.x has been updated
       via  b17412da1b14dca4d42ed534482abdeff1c2fd2f (commit)
       via  b1bce06e515e22482ca555b85da19f965b475f5f (commit)
      from  78e527129b0b547eff7311c3f25a4b1f679d2a97 (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 b17412da1b14dca4d42ed534482abdeff1c2fd2f
Author: Marc V?ron <veron at veron.ch>
Date:   Sun Jun 11 20:16:46 2017 +0200

    Bug 18777: Translatability: Get rid of exposed tt directives in opac-memberentry.tt
    
    The file opac-memberentry.tt exposes template directives to translation where
    translators should not be confronted with.
    
    Example from po file:
    "%s [%% UNLESS hidden.defined('B_address') && hidden.defined('B_address2') && "
    "hidden.defined('B_city') && hidden.defined('B_state') && hidden."
    "defined('B_zipcode') && hidden.defined('B_country') && hidden."
    "defined('B_phone') && hidden.defined('B_email') && hidden."
    "defined('contactnote') %%] "
    
    To test:
    - Apply patch
    - Verify that advanced search in OPAC the page 'your personal details'
      behaves as before
    - Verify that you can change values and submit an update request
    - Create a new translation for a 'language' aa-AA (perl translate create aa-AA)
    - Verify that template directives ar no longer exposed in aa-AA-opac-bootstrap.p
    
    NOTE: Followed test plan similar to bug 18776 comment 3.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 9ed4bdc87e92506ba4a51f92cc198f3c5ce282eb)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit b1bce06e515e22482ca555b85da19f965b475f5f
Author: Marc V?ron <veron at veron.ch>
Date:   Sun Jun 11 16:54:28 2017 +0200

    Bug 18776: Translatability: Get rid of exposed tt directives in opac-advsearch.tt
    
    The file opac-advsearch.tt exposes template directives to translation where translators should not be confronted with.
    Example in po file:
    "[%% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('itemtype')."
    "size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions and "
    "OpacAdvSearchMoreOptions.grep('itemtype').size > 0 and expanded_options ) ) "
    "%%] "
    
    To test:
    - Apply patch
    - Verify that advanced search in OPAC behaves as before
    - Create a new translation for a 'language' aa-AA (perl translate create aa-AA)
    - Verify that template directives ar no longer exposed in aa-AA-opac-bootstrap.po
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit ae684fc9491102ba0b560ca6f414a325e763b31a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../bootstrap/en/modules/opac-advsearch.tt         |   24 +-
 .../bootstrap/en/modules/opac-memberentry.tt       |  244 ++++++++------------
 2 files changed, 106 insertions(+), 162 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 16:10:06 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 14:10:06 +0000
Subject: [koha-commits] main Koha release repository branch 17.05.x updated.
	v17.05.04-52-ge570915
Message-ID: <E1dxvzS-0008Uo-TQ@git.koha-community.org>

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, 17.05.x has been updated
       via  e570915729b6b8e02e22b0cfdff4440b75815d26 (commit)
       via  861fa8c8db8bd8bbd6281863d5029d55675f359c (commit)
       via  e0adbc10c09c25310f79fec55518fb5df50ad040 (commit)
       via  4dc640244651c584347b01f35f2cb25b6369a638 (commit)
      from  b17412da1b14dca4d42ed534482abdeff1c2fd2f (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 e570915729b6b8e02e22b0cfdff4440b75815d26
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Wed Jun 28 00:40:00 2017 +0000

    Bug 18871: Make patron list name a link to view contents of list
    
    The link is the same as the 'Add patrons' button in Actions dropdown,
    but requires one less click, and makes finding the contents of the list
    more obvious.
    
    To test:
    1) Go to Tools -> Patron lists
    2) Create a patron list if you haven't already
    3) Confirm that clicking the name of the list takes you to the correct
    list and shows the expected content.
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit d51059807690797aa4d16b0c0dd2932235a3b683)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 861fa8c8db8bd8bbd6281863d5029d55675f359c
Author: Marc V?ron <veron at veron.ch>
Date:   Mon Jun 12 09:07:28 2017 +0200

    Bug 18781: Translatability: Get rid of exposed tt directives in openlibrary-readapi.inc
    
    The file koha-tmpl/opac-tmpl/bootstrap/en/includes/openlibrary-readapi.inc
    exposes template directives to translation. The only string that should
    appear in .po from this file is "Open Library: "
    
    To test:
    - Apply patch
    - Verify that code changes make sense
    - Bonus test: create a new language 'aa-AA', verify in aa-AA-opac-bootstrap.po
      that there is only the following string for openlibrary-readapi.inc:
    msgid "Open Library: "
    msgstr ""
    
    NOTE: Followed a test plan similar to bug 18776 comment 3
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 23cc8b39682fea7b0a9150933c65c34ef22d23dd)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit e0adbc10c09c25310f79fec55518fb5df50ad040
Author: Marc V?ron <veron at veron.ch>
Date:   Mon Jun 12 08:41:41 2017 +0200

    Bug 18780: Translatability: Get rid of exposed tt directive in masthead-langmenu.inc
    
    The file opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc exposes following tt directive to translators:
    
    "[%% IF ( ( opaclanguagesdisplay ) && ( ! one_language_enabled ) && "
    "( languages_loop ) && ( OpacLangSelectorMode == 'both' || "
    "OpacLangSelectorMode == 'top') ) %%] "
    
    This patch fixes it.
    
    To test:
    - Apply patch
    - Verify that language selector in OPAC (top of the page) works as expected
    - Bonus test: create a new language 'aa-AA', verify that line above does not
    show up in aa-AA-opac-bootstrap.po
    
    NOTE: Followed a test plan similar to bug 18776 comment 3
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 255cadeb772d63b06f77146c95b8d6e4b31d5836)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 4dc640244651c584347b01f35f2cb25b6369a638
Author: Marc V?ron <veron at veron.ch>
Date:   Mon Jun 12 08:20:56 2017 +0200

    Bug 18779: Translatability: Get rid of exposed tt directives in authorities-search-results.inc (OPAC)
    
    The file opac-tmpl/bootstrap/en/includes/authorities-search-results.inc
    exposes template directives to translation where translators should not
    be confronted with.
    
    Example:
    "[%% PROCESS showreference heading=seeals.heading linkType='seealso' "
    "type=seeals.type authid=seeals.authid %%] "
    
    To test:
    - Apply patch
    - Verify that Authority search in OPAC works as before
    - Bonus test: create a new language 'aa-AA', verify that line above
      does not show up in aa-AA-opac-bootstrap.po
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 331320f93a5ef5293c3bcad80b9554ddea0196b0)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../prog/en/modules/patron_lists/lists.tt          |    2 +-
 .../en/includes/authorities-search-results.inc     |   28 +++++++-------------
 .../bootstrap/en/includes/masthead-langmenu.inc    |    8 ++----
 .../bootstrap/en/includes/openlibrary-readapi.inc  |   10 ++-----
 4 files changed, 15 insertions(+), 33 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 17:49:32 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 15:49:32 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v17.05.00-682-g89528af
Message-ID: <E1dxxXg-0003a0-8d@git.koha-community.org>

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, master has been updated
       via  89528af3b089b2d17e3e7b212ea5608478f0ca84 (commit)
       via  1404654d65baccacb2928f59171ec6f41d9b653b (commit)
       via  632e2ad51d2510a412224ded5e51a9f991d566b4 (commit)
       via  d34fae94995977b730e4bbfc11bdecaa3ce310a8 (commit)
       via  c7b2d9bcf37dcded7cba49b1e520a0234850adf7 (commit)
       via  60a17c1b2b8582620fc94ab9eadd7e8336a5d1fa (commit)
       via  ae02cf97e469a17d3bdc9d5c7db702960fd620c8 (commit)
       via  99f6e1adf3d3236c2a08ad31d4282d429d50974b (commit)
       via  c84d03c582976cb590c62b25d59505b982a71d97 (commit)
       via  12bd6358cfe6c9348cb111d22f04097f7911babf (commit)
       via  f270c4a3b56a8b92554670ae9aceb857b50b897e (commit)
       via  80fd5cd0dbfe8c5612325ca65251d36a97fcfc1c (commit)
       via  a0c73b7bdafd21e19e0c1ba6a7ea222216d70500 (commit)
       via  021d1d3714602be64609b9db82fd92e8bb1b42c0 (commit)
       via  357d51c8c4bd0eeffd83bc04f96b9c3dc66afa02 (commit)
       via  b90662073ff99d25e0f32156924f79981f9d5707 (commit)
       via  914577fdb788b70fdb0979a6ea88ca10e3345796 (commit)
       via  624eb9e1f5f7ca87a6d8fbbaef0bbaa3dea3bc21 (commit)
       via  a482880352c4e9b363402a83358e1c239fbc1d74 (commit)
       via  ec85c6b0a23088e91922c0b095f39bfbca2f4456 (commit)
       via  6a68fd033035491a1e8060d47ca30f8640cd835e (commit)
       via  b09750ca2b1446bdeaf78a5989b4325e41789362 (commit)
       via  bfbba2339f3c39fcf19ec1b12585f15f9ea68993 (commit)
       via  d1aa11c51c0b7312ea08327b57b4adb04f3c7c48 (commit)
       via  ab7b35fe2466bbca5082a315dfb5bd33add3d956 (commit)
       via  233741e937cade658de0181d41fe2d315a7ab993 (commit)
       via  617e2f822141c9a430f87304e6030f3d2fb4a6d7 (commit)
       via  9374c646e164db5f48f88e3a8fcb904a79922013 (commit)
       via  b3734f02e1e76dfe9710b85887df826303feff14 (commit)
       via  b4608887f664ed73d6813375f503b2bebd542adb (commit)
       via  2d308456010745b90bcd99f40d56db0fcd9cad65 (commit)
       via  0bbe968fe57316b8bb28ad02df87c0b97c249904 (commit)
       via  13e65432ce6f78c277835d5a5fe22fe99ed0b20c (commit)
       via  ec86950780e908f5b2a5d53e21cffede6d570b08 (commit)
       via  6d22674da5062cc61b6bd8667f8fb5775f71b05a (commit)
       via  50dcae4b504a4a54a830ae87848ba3fa5161ad57 (commit)
       via  c176b8ceefc8a4b964b8671c4d3198af053b59c8 (commit)
      from  ae86b7ca9ea60bba47d3a999ff13d6140cdc5e1c (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 89528af3b089b2d17e3e7b212ea5608478f0ca84
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Wed Aug 30 23:26:38 2017 +0000

    Bug 16463: Replace discharge link with error message if user has checked out items
    
    To test:
    1) Ensure the useDischarge syspref is enabled
    2) Check out an item to a borrower
    3) Log in to the OPAC as this borrower
    4) Click the 'ask for a discharge' link in the nav
    5) Click the 'Ask for a discharge' link
    6) Notice you cannot be discharged because you have checkouts
    7) Apply the patch, click the 'ask for a discharge' link in the nav
    8) Notice the link has been replaced with an appropriate error message
    9) Attempt to force the discharge URL:
    /cgi-bin/koha/opac-discharge?op=request
    10) Notice the message and you cannot be discharged.
    11) Confirm that when you check in your item, the discharge link shows
    again and works as expected.
    
    Sponsored-by: Catalyst IT
    Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 1404654d65baccacb2928f59171ec6f41d9b653b
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Apr 7 23:09:05 2017 -0400

    Bug 18318: Unicode support for Elasticsearch
    
    You must install the icu plugin for elasticsearch
    https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-icu.html
    
    Once installed, apply this patch
    Reindex your data, deleting the existing indexes
    perl /home/vagrant/kohaclone/misc/search_tools/rebuild_elastic_search.pl
    -d
    Find (or add) some titles with accented characters
    Verify that a search for the exact character or the unaccented version
    works
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 632e2ad51d2510a412224ded5e51a9f991d566b4
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Sep 1 21:23:20 2017 -0400

    Bug 19120: Leave cancelled ordered items alone when reopening basket
    
    TEST PLAN
    ---------
    1) Apply first patch
    2) prove t/db_dependent/Acquisition/close_reopen_basket.t
       -- FAILS
    3) Apply this patch
    4) prove t/db_dependent/Acquisition/close_reopen_basket.t
       -- SUCCESS!
    5) run koha qa test tools
    
    Followed test plan, patch worked as described
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit d34fae94995977b730e4bbfc11bdecaa3ce310a8
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Sep 1 21:21:40 2017 -0400

    Bug 19120: Add tests to reproduce the problem
    
    TEST PLAN
    ---------
    1) apply this patch
    2) prove t/db_dependent/Acquisition/close_reopen_basket.t
       -- FAILS!
       -- This proves the test works.
    3) run koha qa test tools
    
    Followed test plan, patch worked as described
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit c7b2d9bcf37dcded7cba49b1e520a0234850adf7
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Tue Sep 19 07:13:53 2017 +0000

    Bug 19329: Update IntranetSlipPrinterJS system preference description.
    
    Test plan:
    0) Apply the patch
    1) Go to administration -> system preferences -> staff client
    2) Read the description by IntranetSlipPrinterJS and confirm it's right
    
    Signed-off-by: Marc V?ron <veron at veron.ch>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 60a17c1b2b8582620fc94ab9eadd7e8336a5d1fa
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Sep 27 12:54:18 2017 -0300

    Bug 19372: (bug 15801 follow-up) pass selected frameworkcode to the template
    
    Bug 15801 removes the 2 lines that were necessary to retrieve the
    framework selected by the user and pass it to the template.
    All bibliographic records created when adding an order to the basket
    using an external source used the default framework.
    
    Test plan:
    Add an order to a basket from an external source
    Select another framework than the default one
    => Without this patch, whatever the framework you picked, the default
    one is used
    => With this patch applied the framework code you will pick will be used
    
    Signed-off-by: Marijana Glavica <mglavica at ffzg.hr>
    
    Signed-off-by: Marijana Glavica <mglavica at ffzg.hr>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ae02cf97e469a17d3bdc9d5c7db702960fd620c8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Sep 27 13:44:00 2017 -0300

    Bug 19366: Do not block patron's detail update if EmailMustBeUnique
    
    If the pref PatronSelfRegistrationEmailMustBeUnique is set ("consider"),
    a patron is not allowed to register with an existing email address.
    The existing code is wrong and reject a patron that is updating their
    personal details with "This email address already exists in our
    database.", even if the patron did not modify their email address.
    
    This is caused by the query we made, we must search for patron with this
    email address but who is not the current patron.
    
    Test plan:
    - Set PatronSelfRegistrationEmailMustBeUnique to "consider"
    - Register a new patron with an existing email address
    => you should not be allowed
    - Use a non-existent email address
    => You should be allowed
    - Edit your patron details
    - Modify some infos
    => Should pass
    - Modify your email address with an existing one
    => You should not be allowed to do that
    
    Followed test plan, patches worked as described
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 99f6e1adf3d3236c2a08ad31d4282d429d50974b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Sep 21 11:09:57 2017 -0300

    Bug 19357: (bug 18260 follow-up) Remove non-relevant attributes
    
    When created, batch_record_modification.tt has been based on
    batch_delete_records.tt
    These attributes are not used in the template and not set in the pl
    script.
    Since bug 18260, biblio is a Koha::Biblio and calling a non-existent
    method will raise an error.
    
    This patch get rid of the following error:
    batch_record_modification.pl: Template process failed: undef error - The
    method itemnumbers is not covered by tests!
    
    Test plan:
    Modify bibliographic records with the "Batch record modification" tool.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit c84d03c582976cb590c62b25d59505b982a71d97
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 16 15:12:07 2016 +0100

    Bug 15173: Restore SubfieldsToAllowForRestrictedEditing
    
    Bug 7673 introduced SubfieldsToAllowForRestrictedEditing but bug 12176
    broke it assuming that only selects were impacted by this feature.
    
    Test plan:
    Go back on bug 7673 and confirm that
    SubfieldsToAllowForRestrictedEditing is working as expected with this
    patch applied.
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    For clarification, the item fields that are entered in
    SubfieldsToAllowForRestrictedEditing should EXCLUDE the desired
    fields you want to disable.
    
    Test plan (updated to test the scenario in the bug Description):
    1. Create a patron with only the following permissions:
        - catalogue (Required for staff login)
        - editcatalogue -> edit_catalogue
        - editcatalogue -> edit_items
        - editcatalogue -> edit_items_restricted
    2. Navigate to Administration -> Global system preferences -> Cataloging
        -> Record Structure -> SubfieldsToAllowForRestrictedEditing
    3. In the input field for SubfieldsToAllowForRestrictedEditing enter in
        all the 952 fields EXCEPT the ones desired to be disabled. In this
        case, we want to disallow editing of 952$2, 952$a, 952$b, 952$e, 952$h,
        and 952$o so we enter the following into the
        SubfieldsToAllowForRestrictedEditing (without quotes) "952$0 952$1
        952$3 952$4 952$5 952$7 952$8 952$c 952$d 952$f 952$g 952$i 952$j
        952$p 952$t 952$u 952$v 952$w 952$x 952$y 952$z"
    4. Click Save all Cataloging preferences
    5. Login to the staff client as the created restricted editing patron
    6. Edit an item
    7. Note that all fields except for the ones excluded from the syspref
        are editable
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 12bd6358cfe6c9348cb111d22f04097f7911babf
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Fri Sep 15 11:12:01 2017 +0200

    Bug 19323: subscription edit permission issue
    
    If a librarian has edit_subscription but not create_subscription :
    When trying to edit a subscription, after saving permission is denied.
    
    This is because permissions in serials/subscription-add.pl depends on arg 'op' and on edit this arg starts with 'modify' but changes to 'modsubscription' when saving.
    
    Test plan :
    - Create a user with staff access
    - Define its permissions on serials : only edit_subscription
    - Edit a subscription
    - Click 'Next'
    - Click 'Test prediction pattern'
    - Click 'Save subscription'
    => Without patch you get to page serials/subscription-add.pl with permission denied
    => With patch subscription is saved and you get to subscription details page
    
    Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit f270c4a3b56a8b92554670ae9aceb857b50b897e
Author: Dobrica Pavlinusic <dpavlin at rot13.org>
Date:   Mon Sep 18 19:17:35 2017 +0200

    Bug 19334: Circulation history doesn't set biblionumber so left navigation is broken
    
    Navigation on the left (Normal, MARC, etc...) needs biblionumber in
    template variables to work.
    
    Test:
    1. go to checkout history for any biblio
    2. verify that normal, MARC, etc links on the left no longer work
       due to missing biblionumber in URL
    3. apply patch and test it again
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 80fd5cd0dbfe8c5612325ca65251d36a97fcfc1c
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Tue Aug 22 08:58:11 2017 +0000

    Bug 19116: Hold not set to waiting after transfer
    
    Test plan:
    
    0) Do not apply the patch
    1) Place hold on item from another branch
    2) Switch to that branch
    3) Check them in at the other branch to set them into transport status (T)
    4) Switch back to your homebranch
    5) Check items in again, use the different confirm buttons and
        compare: Only "confirm and print" will be set to waiting, "confirm"
        remains in transport.
    6) Apply the patch
    7) Repeat 1-5 - now should work as expected - the hold is marked waiting
    on "confirm" button too
    8) Check the hold from the same branch, to make sure this doesn't add
    regression
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit a0c73b7bdafd21e19e0c1ba6a7ea222216d70500
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Fri Sep 22 08:40:56 2017 +0000

    Bug 19116: (followup) Add tests to highlight the problem in CheckReserves
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 021d1d3714602be64609b9db82fd92e8bb1b42c0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Sep 4 14:14:31 2017 -0300

    Bug 19116: Unit tests
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 357d51c8c4bd0eeffd83bc04f96b9c3dc66afa02
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 11:21:27 2017 -0300

    Bug 19127: (follow-up) Fix Stored XSS in csv-profiles.pl
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit b90662073ff99d25e0f32156924f79981f9d5707
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Wed Aug 16 17:56:17 2017 +0530

    Bug 19127: Fix Stored XSS in csv-profiles.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/tools/csv-profiles.pl?op=add_form
    2. Add a text in the field Profile name, Profile description
       and Profile MARC fields that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 914577fdb788b70fdb0979a6ea88ca10e3345796
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 11:06:11 2017 -0300

    Bug 19108: (follow-up) Fix Stored XSS in biblio_framework.pl
    
    Prevent software error
    Template process failed: undef error - text: filter not found at
    /home/vagrant/kohaclone/C4/Templates.pm line 121.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 624eb9e1f5f7ca87a6d8fbbaef0bbaa3dea3bc21
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 13:52:07 2017 +0200

    Bug 19108: (follow-up) Fix Stored XSS in fieldmapping.pl and items_search_fields.pl
    
    To test:
    - Add a framework with script in the description
    - Access the Keywords to MARC mapping page
    - Add an item search field where both name and label are script
    - Try to edit/delete the added mapping
    
    With the patch no script should be executed and everything
    should still work ok.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit a482880352c4e9b363402a83358e1c239fbc1d74
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 14:37:50 2017 +0530

    Bug 19108: Fix Stored XSS in biblio_framework.pl and marctagstructure.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/biblio_framework.pl?op=add_form
    2. Add a text in the field Description that contains js
    3. Save the page.
    4. Notice js is execute
    5. Click on Actions -> MARC structure
    6. Apply patch and reload, the js is escaped
    
    Fixed for both the pages biblio_framework.pl and marctagstructure.pl
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ec85c6b0a23088e91922c0b095f39bfbca2f4456
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 14:10:43 2017 +0530

    Bug 19108: Fix Stored XSS in fieldmapping.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/fieldmapping.pl
    2. Add a text in the field Field name that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 6a68fd033035491a1e8060d47ca30f8640cd835e
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 14:06:47 2017 +0530

    Bug 19108: Fix Stored XSS in authtypes.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/authtypes.pl?op=add_form
    2. Add a text in the field Description that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit b09750ca2b1446bdeaf78a5989b4325e41789362
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 13:55:45 2017 +0530

    Bug 19108: Fix Stored XSS in classsources.pl
    
    Fixed for both Classification sources & Classification filing rules
    
    To Test
    1. first case classification source: Hit the page
       /cgi-bin/koha/admin/classsources.pl?op=add_source
       second case classification filing rules:
       Hit the page /cgi-bin/koha/admin/classsources.pl?op=add_sort_rule
    2. Add a text in the field Description that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit bfbba2339f3c39fcf19ec1b12585f15f9ea68993
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 13:49:10 2017 +0530

    Bug 19108: Fix Stored XSS in items_search_fields.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/items_search_fields.pl
    2. Add a text in the field Name and Label that contains js
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload, the js is escaped
    
    Fixed for new and edit page
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit d1aa11c51c0b7312ea08327b57b4adb04f3c7c48
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 13:33:57 2017 +0530

    Bug 19108: Fix Stored XSS in oai_sets.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/oai_sets.pl
    2. Click on New set
    3. Add a text in the field setSpec, setName that contains js
    4. Save the page.
    5. Notice js is execute
    6. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ab7b35fe2466bbca5082a315dfb5bd33add3d956
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 10:58:24 2017 -0300

    Bug 19103: (follow-up) Fix Stored XSS in itemtypes.pl
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 233741e937cade658de0181d41fe2d315a7ab993
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 10:15:54 2017 +0530

    Bug 19103: Fix Stored XSS in matching-rules.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/matching-rules.pl
    2. Click on new record matching rule
    3. Add a text in the field Description that contain js.
    4. Save the page.
    5. Notice js is execute
    6. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 617e2f822141c9a430f87304e6030f3d2fb4a6d7
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 10:07:45 2017 +0530

    Bug 19103: Fix Stored XSS in patron-attr-types.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/patron-attr-types.pl
    2. Click on new patron attribute type
    2. Add a text in the field Description that contain js.
    2. Save the page.
    3. Notice js is execute
    4. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 9374c646e164db5f48f88e3a8fcb904a79922013
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 08:52:40 2017 +0530

    Bug 19103: Fix Stored XSS in itemtypes.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/admin/itemtypes.pl
    2. Add a text in the field Description, Checkin message that contains js
    2. Save the page.
    3. Notice js is execute
    4. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit b3734f02e1e76dfe9710b85887df826303feff14
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 12 10:35:10 2017 -0300

    Bug 19128: Fix Stored XSS in admin/authorised_values.pl
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit b4608887f664ed73d6813375f503b2bebd542adb
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 14:34:17 2017 +0200

    Bug 19128: Fix Stored XSS in patron-attr-types.pl, authorised_values.pl and categories.pl
    
    Preparation:
    - Add a branch with script in the branch name
    - Add a patron category with script in the category name
    - Add a new authorised value cateogory with script
    - Add a new authroised value for this category with script
      in all possible fields
    
    - Test editing patron categories
    - Test editing patron attribute types
    - Test viewing and editing authorised values
    
    Verify that with this script there is no more script executed
    and everything works fine.
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 2d308456010745b90bcd99f40d56db0fcd9cad65
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 12:05:50 2017 +0200

    Bug 19125: Fix Stored XSS in members.pl
    
    In preparation to test this patch:
    - Add a patron list named <script>alert("patron list")</script>
    - Add a library named <script>alert("library")</script>
    - Add a patron category named <script>alert("patron category")</script>
    
    To test:
    - Access patron search page and do a search
    - Verify that the alerts added above are executed
    - Apply patch
    - Verify that no alerts are displayed
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 0bbe968fe57316b8bb28ad02df87c0b97c249904
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 13:07:18 2017 +0200

    Bug 19086: Fix Stored XSS in subscription-detail.pl
    
    Add script to the callnumber field on adding a subscription.
    
    Verify script is executed without this patch, but not with it.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 13e65432ce6f78c277835d5a5fe22fe99ed0b20c
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Aug 16 12:59:13 2017 +0200

    Bug 19086: (follow-up) Fix Stored XSS in supplier.pl
    
    In preparation:
    Make sure you enter <script>alert("sth")</script>
    in all fields of a new vendor that are not validated
    and save.
    
    1) Access vendor summary page.
    2) Verify scripts are executed
    3) Apply patch
    4) Verify scripts are on longer executed
    
    This works in combination with the other patches for XSS
    on this bug.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ec86950780e908f5b2a5d53e21cffede6d570b08
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 02:44:11 2017 +0530

    Bug 19086: Fix Stored XSS in subscription-add.pl
    
    To Test
    1. Hit the page /cgi-bin/koha/serials/subscription-add.pl
    2. Add a text in the field Public note and Nonpublic note
       that contains js (Internalnotes, notes)
    2. Save the page.
    3. Notice js is execute
    4. Apply patch and reload, the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 6d22674da5062cc61b6bd8667f8fb5775f71b05a
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Aug 15 02:33:59 2017 +0530

    Bug 19086: Fix Stored XSS in supplier.pl
    
    1. Hit the page /cgi-bin/koha/acqui/supplier.pl?op=enter
    2. Add a text in the field company_postal, physical, company_fax,
       accountnumber, contactposition, contact_fax, contact_notes, notes that contains java script
    3. Save the page.
    4. Notice js is execute
    5. Apply patch and reload the js is escaped
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 50dcae4b504a4a54a830ae87848ba3fa5161ad57
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date:   Fri Aug 11 19:54:34 2017 +0000

    Bug 19086: Fix Stored XSS in circulation.pl
    
    1/ To test add a message to a borrower that contains js
    2/ hit /cgi-bin/koha/circ/circulation.pl?borrowernumber=[number]
      where number is the borrowernumber of the borrower you set the message
      for
    3/ Notice js is execute
    4/ Apply patch, reload, js is escaped
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit c176b8ceefc8a4b964b8671c4d3198af053b59c8
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date:   Fri Aug 11 19:36:43 2017 +0000

    Bug 19086: Fix Stored XSS in members/member.pl
    
    To test
    1/ hit /cgi-bin/koha/members/member.pl?&searchmember=<script>alert('XSS Payload')</script>
    2/ Notice js is executed
    3/ Apply patch, reload
    4/ js is now escaped
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 C4/Acquisition.pm                                  |    2 +-
 C4/Reserves.pm                                     |    6 ++-
 Koha/SearchEngine/Elasticsearch.pm                 |    9 ++--
 acqui/z3950_search.pl                              |    2 +
 catalogue/issuehistory.pl                          |    1 +
 cataloguing/additem.pl                             |   33 ++++++------
 .../en/includes/admin-items-search-field-form.inc  |    4 +-
 .../prog/en/includes/html_helpers.inc              |    2 +-
 .../prog/en/includes/patron-search.inc             |    6 +--
 .../prog/en/includes/patron-toolbar.inc            |    4 +-
 .../prog/en/modules/acqui/supplier.tt              |   32 ++++++------
 .../prog/en/modules/admin/authorised_values.tt     |   26 +++++-----
 .../prog/en/modules/admin/authtypes.tt             |    4 +-
 .../prog/en/modules/admin/biblio_framework.tt      |   12 ++---
 .../prog/en/modules/admin/categories.tt            |    4 +-
 .../prog/en/modules/admin/classsources.tt          |    4 +-
 .../prog/en/modules/admin/fieldmapping.tt          |    8 +--
 .../prog/en/modules/admin/items_search_field.tt    |    4 +-
 .../prog/en/modules/admin/items_search_fields.tt   |   10 ++--
 .../prog/en/modules/admin/itemtypes.tt             |    4 +-
 .../prog/en/modules/admin/marctagstructure.tt      |   18 +++----
 .../prog/en/modules/admin/matching-rules.tt        |    2 +-
 .../prog/en/modules/admin/oai_set_mappings.tt      |    2 +-
 .../prog/en/modules/admin/oai_sets.tt              |   10 ++--
 .../prog/en/modules/admin/patron-attr-types.tt     |   12 ++---
 .../en/modules/admin/preferences/staff_client.pref |    2 +-
 .../prog/en/modules/cataloguing/additem.tt         |   40 ++++++++++-----
 .../prog/en/modules/circ/circulation.tt            |    2 +-
 .../prog/en/modules/members/member.tt              |   10 ++--
 .../prog/en/modules/serials/subscription-detail.tt |    6 +--
 .../en/modules/tools/batch_record_modification.tt  |    2 +-
 .../prog/en/modules/tools/csv-profiles.tt          |   12 ++---
 .../bootstrap/en/modules/opac-discharge.tt         |    7 ++-
 opac/opac-discharge.pl                             |    5 ++
 opac/opac-memberentry.pl                           |   13 ++++-
 serials/subscription-add.pl                        |    3 +-
 t/db_dependent/Acquisition/close_reopen_basket.t   |   12 ++++-
 t/db_dependent/Circulation.t                       |   54 +++++++++++++++++++-
 38 files changed, 249 insertions(+), 140 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Sep 29 22:20:54 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 20:20:54 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v17.05.00-706-ge09d233
Message-ID: <E1dy1mI-00070o-NF@git.koha-community.org>

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, master has been updated
       via  e09d233eee78f1ee401505f15dd62af99103744c (commit)
       via  08b6f7799b2ad06ff4f9ef88e236f5c928c387b5 (commit)
       via  7367274c6230b947b85abf9d4f0463d3c0724171 (commit)
       via  52c677166d5b35dac0e216e24dc0912e56a7fbd4 (commit)
       via  6d52d57fac6094a245a10d4736c4451702cc4c3b (commit)
       via  17764fbe90c93daeb619742312920a50f5402e1e (commit)
       via  269c21d984ef451dadcad2e803035cc1cd052825 (commit)
       via  b6f8cf43698979914704dd08c45f11e6b8e406ee (commit)
       via  995fb8c14f4d78122566588d095ece549c45ffa1 (commit)
       via  5144cee9a9be49dd901dd5afefc6414ce76f6edc (commit)
       via  6d818e13887be22a39d35e849dca86b30b06a61e (commit)
       via  21ee44ff1278ca66a94a9701195da3f6ed7932fe (commit)
       via  5705c13d3805ca8da2a142780d51f364a0d7a4ec (commit)
       via  56a0aabc58a3475912894523cc92757153b967bd (commit)
       via  2f5a319b0a9f93dde7600decae5df989b842ca58 (commit)
       via  1e2e1247c9bcd15514dc395be891a9a3607e5ea5 (commit)
       via  1c328f339455fa41a68c0d96015b37b5cb3b86c6 (commit)
       via  e65ee89aae7802a31e47b5343c77f8a8a62d3a38 (commit)
       via  0aec9e11d5fa355738cb3475ad72c4aad8efeafa (commit)
       via  bb61d5bc384102fe1dc8db4e69bfdb797337b968 (commit)
       via  2b343df13e6d154296cf968cb709aa910c58f336 (commit)
       via  caef98c7f64e02bba996c4da4f862bb55a86171a (commit)
       via  90c5391b349a339b3f1fea1ebfeb044cfa76c8a6 (commit)
       via  776692f31167f32c1621168249a9ebfea2accc96 (commit)
      from  89528af3b089b2d17e3e7b212ea5608478f0ca84 (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 e09d233eee78f1ee401505f15dd62af99103744c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Sep 29 17:08:28 2017 -0300

    Bug 18120: Tidy up
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 08b6f7799b2ad06ff4f9ef88e236f5c928c387b5
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Fri Sep 22 15:37:41 2017 -0300

    Bug 18120: (QA followup) Add POD to controler class
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 7367274c6230b947b85abf9d4f0463d3c0724171
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Thu Aug 24 14:36:07 2017 -0300

    Bug 18120: (QA followup) 'vendors_manage' permission fits better than full acq
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 52c677166d5b35dac0e216e24dc0912e56a7fbd4
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Tue Aug 15 23:58:19 2017 +0200

    Bug 18120: Update field descriptions
    
    Trying to clarify some of the descriptions.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 6d52d57fac6094a245a10d4736c4451702cc4c3b
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Tue Feb 28 09:00:07 2017 -0300

    Bug 18120: Add '/acquisitions/vendors' endpoint
    
    This patch introduces an /acquisitions/vendors endpoint.
    To test:
    - Apply the patch
    - Run:
      $ sudo koha-shell kohadev
     k$ prove t/db_dependent/api/v1/acquisitions_vendors.t
    => SUCCESS: Tests pass
    - Sign off :-D
    
    Sponsored-by: ByWater Solutions
    
    Signed-off-by: Matthias Meusburger <matthias.meusburger at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 17764fbe90c93daeb619742312920a50f5402e1e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Mar 6 16:40:11 2017 -0300

    Bug 18120: /acquisitions/vendors unit tests
    
    This patch introduces unit tests that need to be passed by an
    /acquisitions/vendors/ REST endpoint.
    
    To test:
    - Apply the patch
    - Run:
      $ sudo koha-shell kohadev
     k$ prove t/db_dependent/api/v1/acquisitions_vendors.t
    => FAIL: The endpoint is not present, should fail.
    
    Sponsored-by: ByWater Solutions
    
    Signed-off-by: Matthias Meusburger <matthias.meusburger at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 269c21d984ef451dadcad2e803035cc1cd052825
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Sep 29 16:28:13 2017 -0300

    Bug 19392: Clean-up behind auth_values_input_www.t
    
    The two categories created by this test script are not removed
    
    Test plan:
    without this patch, the two authorised value categories ????? and
    t?mas are not removed when the script finishes.
    Now it does!
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit b6f8cf43698979914704dd08c45f11e6b8e406ee
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Sep 29 16:16:56 2017 -0300

    Bug 19391: (bug 19128 follow-up) Fix failing tests from auth_values_input_www.t
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 995fb8c14f4d78122566588d095ece549c45ffa1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Sep 29 16:49:06 2017 -0300

    Bug 13912: DBRev 17.05.00.010
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 5144cee9a9be49dd901dd5afefc6414ce76f6edc
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Sep 20 10:52:16 2017 -0300

    Bug 13912: (QA followup) Make it explicit that syspref applies to MARC21
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 6d818e13887be22a39d35e849dca86b30b06a61e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Thu Sep 7 16:18:00 2017 -0300

    Bug 13912: (QA followup) Update database
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 21ee44ff1278ca66a94a9701195da3f6ed7932fe
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Thu Mar 26 09:10:13 2015 +0100

    Bug 13912: Fix LOC link
    
    Signed-off-by: m23 <black23 at gmail.com>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 5705c13d3805ca8da2a142780d51f364a0d7a4ec
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Thu Mar 26 08:46:45 2015 +0100

    Bug 13912: Add DefaultCountryField008 syspref
    
    This syspref is going to be used for populating field 008, range 15-17
    with a desired default. It is currently hardcoded to 'xxu'. If not set,
    it will still fallback to 'xxu'.
    
    Signed-off-by: m23 <black23 at gmail.com>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 56a0aabc58a3475912894523cc92757153b967bd
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Fri Sep 29 15:52:50 2017 +0200

    Bug 18422: (QA follow-up) Check if select2 is available before using it
    
    cataloging.js might not always be loaded with select2.js, so we should
    check its availability to prevent JS errors
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 2f5a319b0a9f93dde7600decae5df989b842ca58
Author: Oleg Vasylenko <synapse.ova at gmail.com>
Date:   Wed Apr 12 10:45:48 2017 +0300

    Bug 18422 - Add Select2 to authority editor
    
    Overview:
    Repeat tag fails if authority field has select subfield (for example, UNIMARC 700$8, 800$a)
    This patch adds Select2 to authority editor
    
    Steps to Reproduce:
    In authority editor repeat field that has select subfield
    
    Actual Results:
    Field does not repeat (copy is not created).
    Console shows a js TypeError in cataloging.js: ?$(...).select2 is not a function?
    
    Expected Results:
    Field will repeat (copy is created)
    
    Additional Information:
    Error happens in version 16.11+ after adding Select2 js functions. The easiest way to fix is to add Select2 to authority editor
    
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 1e2e1247c9bcd15514dc395be891a9a3607e5ea5
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Sep 13 12:06:50 2017 +0000

    Bug 19307: Mock the AllowFineOverride preference to ensure expected result
    
    To test:
     1 - Set 'AllowFineOverride' to allow
     2 - prove t/db_dependent/Circulation/NoIssuesChargeGuarantees.t
     3 - 1 test fails
     4 - Apply patch
     5 - prove t/db_dependent/Circulation/NoIssuesChargeGuarantees.t
     6 - All tests pass
     7 - Set 'AllowFineOverride' to 'Don't allow'
     8 - Tests should still pass
    
    Signed-off-by: David Bourgault <david.bourgault at inlibro.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 1c328f339455fa41a68c0d96015b37b5cb3b86c6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Sep 29 16:47:04 2017 -0300

    Bug 19344: DBRev 17.05.00.009
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit e65ee89aae7802a31e47b5343c77f8a8a62d3a38
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 19 13:32:31 2017 -0300

    Bug 19344: Reorder lang and login_attempts in the [deleted]borrowers tables
    
    Due to a bad rebase, the borrowers and deletedborrowers table structure
    may different from a new install and upgraded install
    For new installs, the order was: lang, login_attempts
    For upgraded installs, it was lang, last_seen, login_attempts
    
    After this patch, the order must be:
    - last_seen
    - lang
    - login_attempts
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 0aec9e11d5fa355738cb3475ad72c4aad8efeafa
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Sep 14 10:57:40 2017 -0300

    Bug 19317: (bug 18966 follow-up) Remove leftover
    
    Nothing important here, but this line should have been removed by bug
    18966:
    
    2177         # Update the fines
    2178         $dbh->do(q|UPDATE accountlines SET issue_id = ? WHERE
    issue_id = ?|, undef, $old_checkout->issue_id, $issue->issue_id);
    
    The issue_id is now the same when moved from issues to old_issues. We do
    not need to update the accountlines table.
    
    No test plan here, you need to understand previous changes to validate
    this patch.
    
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit bb61d5bc384102fe1dc8db4e69bfdb797337b968
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Sep 8 12:47:03 2017 -0300

    Bug 19276: (bug 17829 follow-up) Fix Statistic patrons behaviour
    
    Bug 17829 must have been handle this specific case: GetMember set
    category_type, but now $borrower is a Koha::Patron unblessed and does
    not contain the category_type.
    The fix is to call ->category->category_type on the Koha::Patron object
    to be able to know if they are a statistic patrons.
    
    Test plan:
    Run the tests
    
    Tests pass, as does QA test tool
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 2b343df13e6d154296cf968cb709aa910c58f336
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Fri Sep 29 11:29:24 2017 -0300

    Bug 18999: (QA followup) ModReceiveOrder expects a hashref
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit caef98c7f64e02bba996c4da4f862bb55a86171a
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date:   Sat Jul 22 19:19:44 2017 +0000

    Bug 18999: Modified SQL query in GetBudgetSpent() in C4/Budgets.pm
    
    Removed the SQL select condition 'AND closedate IS NOT NULL' because
    this was not returning shippingcost values and it does not exist in the
    SQL query to return the shipping cost in spent.pl
    
    Also removed the retrieval of shipping cost and the associated addition
    of item(s) cost and shipping cost in GetBudgetOrdered() in C4/Budgets.pm
    to prevent the shipping costs being subtracted off the fund total twice
    
    Test plan:
    1. Go to Acquisition and create a currency, budget (make this value of
    100), fund ( make this the value of 50), vendor (if
    neccessary)
    
    2. Create a basket and click 'Add to basket'
    
    3. Add 2 items with the vendor price of 10
    
    4. Click 'Receive shipment' and write in the shipment cost of 6
    
    5. Click 'Finish receiving' and go back to Acquisitions
    
    6. Notice the spent column value is 0.00 but if you click on the value then
    the spent.pl page is displayed and shows that the shipment cost was 6.00
    
    7. On the acquisition page also notice that the ordered column value is 26.00
    
    8. Click on the name of the fund and notice the spent column value is
    0.00 in the fund page table
    
    9. Apply patch
    
    10. Refresh acquisition page and notice that 6.00 is the value in the
    Spent column and 20.00 is the value in the ordered column. Both of which
    match the subtotal of the full-list tables displayed when you click on these
    values
    
    11. Also notice the spent value in the fund page table is 6.00
    
    12 Observe the changes to GetBudgetSpent() and GetBudgetOrdered() C4/Budgets.pm and check they make sense
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 90c5391b349a339b3f1fea1ebfeb044cfa76c8a6
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date:   Sat Sep 16 07:52:25 2017 +0000

    Bug 18999: (QA followup) Minor fixes for tests
    
    Removed unneccessary declaration of $budget and changed
    Koha::Acquisition::Order->new->insert into
    Koha::Acquisition::Order->new->store as requested in tester feedback
    
    Test plan:
    1. Go into your koha-shell
    
    2. set the PERL5LIB variable
    
    3. Run t/db_dependent/Budgets.t
    
    All tests should pass
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 776692f31167f32c1621168249a9ebfea2accc96
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date:   Fri Aug 18 15:16:55 2017 +0000

    Bug 18999: Add regression tests
    
    Added regression test for GetBudgetSpent() and GetBudgetOrdered() into
    the t/db_dependent/Budgets.t
    
    Test plan:
    1. Go into your koha-shell
    
    2. set the PERL5LIB variable
    
    3. Run t/db_dependent/Budgets.t
    
    All tests should pass
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 C4/Budgets.pm                                      |   12 +-
 C4/Circulation.pm                                  |    8 +-
 Koha.pm                                            |    2 +-
 Koha/REST/V1/Acquisitions/Vendors.pm               |  234 +++++++++++
 Koha/Schema/Result/Aqbookseller.pm                 |    7 +
 api/v1/swagger/definitions.json                    |    6 +
 api/v1/swagger/definitions/vendor.json             |  149 +++++++
 api/v1/swagger/parameters.json                     |    3 +
 api/v1/swagger/parameters/vendor.json              |    9 +
 api/v1/swagger/paths.json                          |    6 +
 .../{cities.json => acquisitions_vendors.json}     |  148 ++++---
 api/v1/swagger/x-primitives.json                   |    5 +
 cataloguing/value_builder/marc21_field_008.pl      |    8 +-
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |   25 ++
 .../prog/en/modules/admin/authorised_values.tt     |    4 +-
 .../en/modules/admin/preferences/cataloguing.pref  |    4 +
 .../prog/en/modules/authorities/authorities.tt     |    8 +
 koha-tmpl/intranet-tmpl/prog/js/cataloging.js      |   16 +-
 t/db_dependent/Budgets.t                           |   83 +++-
 t/db_dependent/Circulation.t                       |   44 +++
 .../Circulation/NoIssuesChargeGuarantees.t         |    1 +
 t/db_dependent/api/v1/acquisitions_vendors.t       |  412 ++++++++++++++++++++
 t/db_dependent/www/auth_values_input_www.t         |   31 +-
 24 files changed, 1128 insertions(+), 98 deletions(-)
 create mode 100644 Koha/REST/V1/Acquisitions/Vendors.pm
 create mode 100644 api/v1/swagger/definitions/vendor.json
 create mode 100644 api/v1/swagger/parameters/vendor.json
 copy api/v1/swagger/paths/{cities.json => acquisitions_vendors.json} (57%)
 create mode 100644 t/db_dependent/api/v1/acquisitions_vendors.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Sep 30 00:45:11 2017
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 29 Sep 2017 22:45:11 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v17.05.00-707-g7a60e52
Message-ID: <E1dy41v-0003ej-Ou@git.koha-community.org>

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, master has been updated
       via  7a60e52bd8e04f039f04e8418db42fc563222aa1 (commit)
      from  e09d233eee78f1ee401505f15dd62af99103744c (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 7a60e52bd8e04f039f04e8418db42fc563222aa1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Sep 29 19:39:34 2017 -0300

    Bug 19276: Update the number of tests
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 t/db_dependent/Circulation.t |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository