[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.12-58-g747fcb3

Git repo owner gitmaster at git.koha-community.org
Fri Jun 6 15:13:09 CEST 2014


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, 3.12.x has been updated
       via  747fcb30e52a2020e2bc6b5008d8f65cc52497a2 (commit)
       via  fee8fc3193fba871f4c24f48ba6c8738543c3eea (commit)
       via  1c01f5d502d129dd1b8e376ba06d0b7472191f8b (commit)
       via  0d5c383cb76ee86d89a1977b2f95809896cfbf35 (commit)
       via  d6d851111824d45d74c1a3bf3f196790ac3c6a51 (commit)
       via  e0b916462d597178b85525fb251b8593c6bdbf8e (commit)
       via  7cb38f7f2b441d1bf995ea4d09ef4f0c44712949 (commit)
       via  0cb014fc930aeeed925c799ca91924439728b5ae (commit)
       via  1ceef1b041c3c6740622c4285c92b9426a7c855c (commit)
       via  e867f2c3dcde9eabbd6dea01f5a7b93a3e641bf8 (commit)
       via  3d1598e2ec1eca14173382735f800faa3b30188e (commit)
       via  5e172f3915877dcef54275421dddd0633cc13251 (commit)
       via  232ba54714bc2bf1bb2b890b1dd9ca94aad571b7 (commit)
       via  cb0baa50adf767fb0ae7bfe5d5a6eaa2863b98d6 (commit)
       via  c7a342eaf5bd5dc6804473ba53c84f60caea0e17 (commit)
       via  acc7c4a00bd80b6313d89f91a2668d6588599a49 (commit)
       via  38b7b27ccb19933d2a2eb5cd85a84f67634bde99 (commit)
       via  e54da1edf342749bea7ebb2f8b65e21a9f262f62 (commit)
       via  0f16b95511f17a6597a156b3ef94c4c1a3b84b45 (commit)
       via  c5fed4c392c5c3a4dcca0487b3453b8aac045e4d (commit)
       via  9084d24d1d8a9adaa87b84bc691c820f056d7f46 (commit)
       via  da69efc6c58ef881525391addbe90572ff2862e0 (commit)
       via  0df48cb1318a87a1f355c2c1969c898fe7290222 (commit)
       via  26719fc3db61d8bf70a53878d850f90fb29586ef (commit)
       via  4b7f4e8916657e553a77b825fb2e88be175a1a2e (commit)
       via  c154bc548b8ce0915cf0f7a5dd7f692e28c3e527 (commit)
       via  4b0feb1a0f05f539e792e4e5e9e669fec7efcab7 (commit)
       via  02095ae19a4b2dd79e09c48f01500728fdcb0caa (commit)
       via  254bd580ace37b434dfd1b7acc7766b86f79eabb (commit)
       via  e2f4b2e01f50071f6b812bdfdcdd8b7a03b40070 (commit)
       via  4fbc168e448f26548700604383666f3ad798c178 (commit)
       via  1c0be23f5d174950fd8fc0c16d6a1ddc2a1e8c49 (commit)
       via  26a85e954f9bc2872e2de42b3787afea53cdd25b (commit)
       via  9208b5714759d5cb468f430cf718380cd4137015 (commit)
       via  2d7362031e9153e8787bee880f8fa61996ede898 (commit)
       via  81ade5377795ad372089d7110e7cc4f4694df747 (commit)
       via  2c9f29d164ae09ee057a7d7960a56c07e42641e3 (commit)
       via  2ba96de44c2f3bb0406363cdf13ed4bf9aef4ff5 (commit)
       via  033d4c04472b6d63ad0869c7f5686ffa432e9708 (commit)
       via  f9ba7383dcdddd878433c939cc5a1078f8ef350b (commit)
       via  ac3224557f8b4596994fbf884fbaf37e6f713821 (commit)
       via  b71734f8468d970d145b189a7f3701fbdf23218c (commit)
       via  3740ba2c755e9759896b1fbb439259403bff722f (commit)
       via  b33256e090247b65da68435c151de33b77d44e32 (commit)
       via  ab4687aa3d349a07d56815984303205f718c1ca6 (commit)
       via  dbaee59717725e959da89d664ff3eb8e6cadf075 (commit)
       via  1a45cf730ee7229e775345fb8469ccb26052420b (commit)
       via  d4b3dedfdfa536aae22bf4b9c26ab455e3cef696 (commit)
       via  160079b627f48017d9a65ccc4a8ecefa4861c517 (commit)
       via  a8985d6a2f33ab99037d9a89c5acb74781829f1c (commit)
       via  6a430244b61ddbbe02e71b129760440eecfea85b (commit)
      from  967c31308da29004028e2d77cc8de3a5d269e16d (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 747fcb30e52a2020e2bc6b5008d8f65cc52497a2
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Wed Feb 26 16:45:09 2014 +0000

    Bug 11459: use drop-down to set OrderPdfFormat syspref
    
    This patch converts the OrderPdfFormat to a choice.
    
    To test:
    
    [1] Look at OrderPdfFormat in the system preferences editor. Verify
        that there is a drop-down giving a choice among the three PDF
        basketgroup printing formats.
    [2] Change the OrderPdfFormat setting and print a basketgroup.  Verify
        that the chosen template is used.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    
    I followed the test plan. Patch behaves as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Improves usability of the OrderPdfFormat system preference.
    Works as described, only changes YAML file.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 3b7349e59005696094d5f7019583211140a355f0)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit f1e42752cb265cecd4e29b1ee64a79d33d10f2b4)

commit fee8fc3193fba871f4c24f48ba6c8738543c3eea
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Feb 24 11:35:52 2014 -0500

    Bug 11832: fix JavaScript error on staff client place hold screen if record has no items
    
    If a hold operation is blocked because the title has no items attached
    the patron search autocomplete JavaScript triggers an error. This patch
    modifies the template so that the JS is loaded only when items are
    present.
    
    To test, find a title which has no items attached. View the holds page
    for that title. There should be no JavaScript error. Patron search
    autocomplete should still work correctly for titles which have items
    attached.
    
    Deleted all items from a biblio record. Clicked the holds tab and
    confirmed using firebug Javascript error occurs. Applied patch,
    confirmed that the Javascript error described in comment 1 no
    longer happens. Went to another biblio with items, and confirmed
    patron auto-complete still functions.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 0b5b8cef348b61761305dd0bbc574699404c7c69)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 07dc616de5a7483f4fe061c046c55ae7d880c7cb)

commit 1c01f5d502d129dd1b8e376ba06d0b7472191f8b
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Feb 25 15:55:03 2014 -0500

    Bug 11833 - fix filtering on saved report subgroup
    
    Filtering the list of saved reports by subgroup doesn't work because the
    filtering JavaScript was not updated when the table columns changed with
    Bug 3134. This patch corrects the target column for filtering.
    
    To test you must have multiple saved reports within one group, and at
    least one of those in a subgroup.
    
    - Apply the patch and go to Reports -> Use saved.
    - Click the tab for the group which contains your reports.
    - Choose the subgroup you want to filter on from the subgroup dropdown.
    
    The list of reports should be correctly filtered by your subgroup.
    
    NOTE: It seems weird to have the number of columns displayed change
          when filtered, but this patch does correct the filtering.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works as described, passes all tests and QA script.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 0039eee40c6f70023bfb93e8d3d011b47da6867a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit aa9ab3336653d079dab10f16c08ba4f4fa713f6a)

commit 0d5c383cb76ee86d89a1977b2f95809896cfbf35
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Mar 9 05:10:29 2014 -0600

    Bug 11918 : Fix typo on authorized values page
    
    This is a small string patch. On Authorized values this patch fixes
    the wording next to the library limit.
    
    To test:
    
    Visit Authorized Values
    Click 'Add new' or 'Edit' next to a value
    Make sure that the text next to the library filter is right
    
    Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Text change, works as described.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 2f0aac89709fec329436f15e259d49dd6072c6c1)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 78decc11a1b57413b5b531552ef9957100120958)

commit d6d851111824d45d74c1a3bf3f196790ac3c6a51
Author: Jesse Maseto <jesse at bywatersolutions.com>
Date:   Mon Mar 10 09:39:22 2014 -0400

    Bug 11695 - Fixed typo in marc21_field_008.xml
    
    "Tree-character alphabetic code", to "Three-character alphabetic code"
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Trees are nice, but Three is better here.
    String change, works as described.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 1c794eaeca3877c8af32ea0b1cce7354541fdba7)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit e0b916462d597178b85525fb251b8593c6bdbf8e
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Feb 21 10:35:40 2014 -0500

    Bug 11809: don't display 'Clear date' on OPAC patron details form if date of birth is required
    
    On the OPAC's patron details form, if the date of birth field is
    required we shouldn't offer the user a "clear date." This patch removes
    the "clear date" link if the field is required.
    
    To test, configure the BorrowerMandatoryField system preference to
    require dateofbirth. Enable the OPACPatronDetails system preference and
    log in to the OPAC. View the "personal details" form and confirm that
    there is no "clear date" link next to the required date of birth field.
    
    Remove dateofbirth from the BorrowerMandatoryField system preference and
    re-test. The "clear date" link should appear.
    
    Test in both prog and Bootstrap themes.
    
    I tested with prog and bootstrap themes, adding/removing field 'dateofbirth'
    in sys pref PatronSelfRegistrationBorrowerMandatoryField.
    Patch behaves as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works as expected, passes all tests and QA script.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 234560a690c78ef7723f15c0cb31f0497d073988)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit d10087c9765997fdf6db9ed8608a780f175cdda0)

commit 7cb38f7f2b441d1bf995ea4d09ef4f0c44712949
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Feb 18 20:59:56 2014 +0000

    Bug 11772: (follow-up) make warning about no active currency a link to currency setup page
    
    This patch standardizes the name of the currency and exchange rates
    administration page (although I note that the breadcrumbs on that
    page are inconsistent) and makes it a link.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 4b4839e752d88c1ccba5f8c9a1296302747c0c6b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit e8037d8d040a45673996162d07bc71fb2dfd4d69)

commit 0cb014fc930aeeed925c799ca91924439728b5ae
Author: Marc Véron <veron at veron.ch>
Date:   Sat Feb 15 16:19:04 2014 +0100

    Bug 11772: Show warning on About page:System information if no active currency is defined
    
    This patch displays a warning on the About page when no active currency
    is defined.
    
    Test plan:
    1)
    Make sure that no currency is defined as active
    (Home › Administration › Currencies & Exchange rates › Currencies)
    2)
    Go to Home › About Koha > System information
    Result: No warning issued.
    3)
    Apply patch and reload About page
    Result: Warning issued.
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 9e01b7c1d6c32dfd9ae0af4e708ca598303fbcf1)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit e741435e351b7298ee79d51df32203efa135a582)

commit 1ceef1b041c3c6740622c4285c92b9426a7c855c
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Feb 21 15:27:41 2014 -0500

    Bug 11821: disable catalog edit menu items and provide explanations when actions cannot be done
    
    Biblio edit menu items which are disabled should trigger a tooltip
    on hover and an alert on click with explanations. This patch implements
    this for the relevent menu items.
    
    To test, apply the patch for Bug 11829 if necessary. Find a record which
    has no items attached. Test the following views:
    
    - Normal
    - MARC
    - Labeled MARC
    - ISBD
    - Items
    
    Test these Edit menu items:
    
    - Edit items in a batch
    - Delete items in a batch
    - Delete all items
    
    Hovering over these menu items should trigger an explanatory tooltip.
    Clicking the menu items should trigger a similar alert.
    
    Next, locate a title with items attached. On the same pages above, test
    the Edit -> Delete record menu item. Hovering should trigger an
    explanatory tooltip. Clicking it should trigger a similar alert.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes all tests and QA script, works nicely.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 5c1691a8013bd38d6bae8b00a8950e1417695176)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 204d01187d697a2e95584d135bacfecc892fb7b3)

commit e867f2c3dcde9eabbd6dea01f5a7b93a3e641bf8
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Wed Aug 14 16:21:26 2013 +0100

    Bug 10729: Add phrases configuration for ICU
    
    Add a separate phrases-icu.xml for phrase indexes
    The file is based on that distributed with zebra
    with a couple of additions to reflect Koha usage
    
    This patch adds a separate tokenizer variable
    for phrase indexes so that default.idx is
    correctly rewritten for sites using icu
    indexing
    
    Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    - Applied patch
    - perl Makefile.PL --prev-install-log ../koha-dev/misc/koha-install-log
    - make upgrade
    - Restarted Zebra server
    - Did a full reindex of bibliographic and authorities
    - Checked various searches
    - Links records to authorities
    - Checked created links work correctly
    
    I couldn't find a regression with this patch.
    Passes all tests and QA script.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 735381b371b128fed13b8b34c97746af21a17282)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit c0adc32d23651ae89489b37db227a05a68ab8d6d)

commit 3d1598e2ec1eca14173382735f800faa3b30188e
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Feb 4 12:15:42 2014 +0100

    Bug 11675: check allocated total correctly when editing a fund that has a parent fund
    
    The sth was created before the query.
    The query was modified after the sth creation and an error was raised.
    
    Test plan:
    0/ Don't apply the patch
    1/ Create a budget A (amount=1000)
    2/ Create a fund A1 (amount=1000)
    3/ Create a child fund A11 (amount=1000)
    4/ Edit A11 and change the amount to 2000
    You are able to do it, an error appears in the Koha log:
      "check_parent_total.pl: DBD::mysql::st execute failed: called with 2 bind
      variables when 1 are needed"
    5/ Apply the patch, edit A11 and save. You get an error
    6/ Edit A11 and change the amount to <=1000
    7/ Verify that there is no regression on adding/removing/editing budgets
    and funds.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes all tests and QA script.
    Works as described, no regressions found.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 331ca7df3ec351a83982496bed7f103050e89af5)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 098ffcdd9ad10307ab63ea49b05c474263561992)

commit 5e172f3915877dcef54275421dddd0633cc13251
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Mon Dec 23 09:58:30 2013 +0100

    Bug 10837: make it possible to export serial claims as CSV even when no notice defined
    
    On the serial claims page, it is possible to export (using a CSV
    profile) or claim 1+ serials.
    The checkboxes are not shown if the claiming notice is not defined.
    So it is not possible to export claims.
    
    Test plan:
    - delete your notice "claimissues"
    - go on the serial claims page
    - verify that you are able to export them as CSV
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    This works as described and enables use of the export
    funtionality even if you are not using the email notifications.
    Exporting the serials will also set the claim date.
    Passes QA script and tests.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 88c052b0919142c9ff0c8d1e7ce4411c0fb1649e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit fbe55ec2abd474e21c0001cdc22b893fc2bbe771)

commit 232ba54714bc2bf1bb2b890b1dd9ca94aad571b7
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Mar 11 14:57:26 2014 +0000

    Bug 10777: (follow-up) improve CSS3 for Zebra-striping report email output
    
    This patch improves the CSS used to attempt to Zebra-stripe the
    output of emailed reports.  This will work with some email clients,
    but other email clients (e.g., Gmail) don't handle style elements in the
    body or head element.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 26cdaaae777dd21314df90177fe070730575fb85)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit d726bf355cc7daec12ac10adfad1f06be4fcc568)

commit cb0baa50adf767fb0ae7bfe5d5a6eaa2863b98d6
Author: Nicholas van Oudtshoorn <vanoudt at gmail.com>
Date:   Thu Aug 22 16:56:25 2013 +0800

    Bug 10777: email HTML reports with the proper Content-Type
    
    The misc/cronjobs/runreport.pl allows for sending html reports
    via email. The problem is that the Content-Type isn't set to
    text/html, which means that the generated html email isn't
    displayed properly.
    
    This patch set the Content-Type, and also adds a tiny bit of
    CSS to potentially alternate row colours (just to make long
    reports a bit easier on the eye!)
    
    TEST PLAN
    ----------
    1. Run the script similar to this:
        ./misc/cronjobs/runreport.pl --format=html --to=YOUREMAIL --subject="Bad Formatting!" REPORTNUMBER
    2. Look at the email - the html code should by visible and ugly.
    3. apply the patch
    4. Run the script again.
    5. Look at the email - the data should look nicer now.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 25076dec54f06b6a7938f4a6cda0a80a1d3d51e4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit eedb9c0e6743aa8739fc01a68145be5a605a7f3e)

commit c7a342eaf5bd5dc6804473ba53c84f60caea0e17
Author: Jesse Maseto <jesse at bywatersolutions.com>
Date:   Mon Mar 10 09:14:44 2014 -0400

    Bug 11731 - Fixed typo in message_transport_types.txt file.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    String change, all good.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit b648425aee8d23bfedf53b09593f5978ae667d7b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit e83b77985ed0e6c06747a169ed449ef355edd6e7)

commit acc7c4a00bd80b6313d89f91a2668d6588599a49
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Feb 21 14:52:22 2014 -0500

    Bug 11819 - Don't show catalog edit menu if user has no edit permissions
    
    Currently if the logged in user lacks any cataloging permissions the
    bibliographic detail page (catalogue/detail.pl) still shows the Edit
    button, but with an empty dropdown menu. This patch corrects the toolbar
    include so that the button will not appear at all.
    
    To test, view the biblio detail page as a user with various combinations
    of the following permissions:
    
    - edit_items
    - edit_catalogue
    - items_batchmod
    - items_batchdel
    
    The edit button should appear with the correct set of links when the
    user has any combination of the above permissions. If user has none the
    button should not appear.
    
    Followed test plan, patch behaves as expected
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works as expected, passes all tests and QA script.
    Template only change.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit a8ebfa4702e2492388b6f60a11921a8ab69d677b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 257923800cdc7e87b2ae29a1e98b502fe7b8b3c6)

commit 38b7b27ccb19933d2a2eb5cd85a84f67634bde99
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Fri Feb 7 10:13:39 2014 +0100

    Bug 11707: fix editing additional attributes for patron whose category code includes a space
    
    When editing additional attributes of a patron of a category with a
    code with space (ie "CAT 3"), the Javascript is broken and Additional
    attributes are not displayed.
    
    This patch corrects by adding simple quotes around category code in JS
    code.
    
    Test plan :
    - Create an patron additional attribute
    - Create a new patron category with a space in code. ie "CAT 3"
    - Create a new patron of this category : /cgi-bin/koha/members/memberentry.pl?op=add&categorycode=CAT 3
    => Without patch the JS is broken (Syntax error, unrecognized expression:
       [data-category_code=CAT 3]) and additional attributes are not
       displayed.
    => With patch the JS is not broken and additional attributes are
       displayed and can be edited.
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    In current Koha version it is not possible to create category codes
    with blanks.
    
    To test, I changed an existing category code directly in the database.
    Then I followed the Test plan.
    Without patch, attribute types were not displayed.
    With patch, they were displayed as expected.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    I recommend not using codes with spaces and fix existing ones.
    Koha doesn't allow you to add category codes with spaces, so the only way
    to do it is via SQL.
    This patch fixes a problem and passes all tests.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 521d7173720b4acbf4ecf40ed114520d500c5f6a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit d56d855914fbb6fc512fdffe86961822680176b6)

commit e54da1edf342749bea7ebb2f8b65e21a9f262f62
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Feb 21 09:22:50 2014 -0500

    Bug 10751: standardize validation of title in staff purchase suggestions form
    
    The form for adding a new purchase suggestion in the staff client
    indicates that the title field is required but does nothing to enforce
    this rule. This can be handled client-side with HTML5 validation
    attributes and Koha's built-in validation plugin. This patch implements
    this.
    
    To test, apply the patch and go to Acquisitions ->
    Suggestions -> New purchase suggestion. Try submitting the form without
    entering a title. Doing so should trigger a validation warning.
    
    Submission of the form with valid data should work correctly. Editing an
    existing suggestion should also work correctly.
    
    The patch displays a message 'Required' near the title field.
    After submitting a empty title it changes to 'This field is required'
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    The title field is required since commit
    d565fb02e9fca2ac9c506e4e7d44fd8b0d66f06a
    This one makes it more consistent with formatting. It makes sense.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 59b9078a3f7cf240bd814ee611e8f553d043491e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Conflicts:
    	koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 0092cd702e706a3564bcfd1dcdc1457615c09bb1)

commit 0f16b95511f17a6597a156b3ef94c4c1a3b84b45
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Feb 20 19:39:10 2014 +0100

    Bug 11803: use $dbh consistently in _koha_modify_item
    
    This is just some code cleanup, no behavior change expected.
    Also replacing errstr with err in testing the results. (See DBI.)
    
    Test plan:
    Modify an item and save it.
    
    Followed test plan. No problems found.
    Signed-off-by: Marc Véron <veron at veron.ch>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    
    (cherry picked from commit a07b32f4f9090ba0c50c3e510f0be56b8805faeb)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit c9057046766fc695385449766d29e011d08de574)

commit c5fed4c392c5c3a4dcca0487b3453b8aac045e4d
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Feb 18 15:07:38 2014 +0100

    Bug 11471: Display the currency for baskets in a basketgroup
    
    On editing a basketgroup, the currency for baskets in a basketgroup is
    always '0'.
    
    With this patch, the currency is correctly displayed.
    
    TEST PLAN
    =========
     1) Log into staff client
     2) Acquisitions
     3) Click 'Search' in the 'Manage orders' box
     4) Click '+ New basket' because a vendor name
     5) Type 'Test Basket' into basket name
     6) Click 'Save'
     7) Click 'Add to basket'
     8) Click 'From an external source'
     9) Type 'Green Eggs and Ham' into the Title text box
    10) Click 'Search'
    11) Click 'Order' on any one of the results
    12) Click 'Add Item' in the 'Item' box
    13) Select a Fund from the dropdown in the
         'Accounting details' box
    14) Click 'Save'
    15) Click 'Close the basket'
    16) Click 'Yes, close (Y)' without checking attach to a
         basket group
    17) Click the 'Basket groups' tab
    18) Click '+ New basket group'
    19) Notice the listing in the 'Ungrouped baskets'.
    20) Drag and drop the entry into the 'Baskets in this group'
         text area
    21) Click 'Save'
    22) Click 'Edit'
    23) Notice it displays incorrectly. (e.g. Total: 0 0)
    24) Apply the patch (git bz apply 11471)
    25) Refresh the page
    26) Notice it displays the currency correctly. (e.g. Total: 0 USD)
        NOTE: If there is a space issue, see Bug 9654.
              This can be applied separately from that bug.
    27) Run the Koha QA Tool: (~/qa-test-tools/koha-qa.pl -v 2 -c 1)
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 7a2dec05eddc979b5a957a651e393838c13560c4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Conflicts:
    	acqui/basketgroup.pl
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit f5e8df8e4b60ab70ab524c6dab2ec4c7d55539f8)

commit 9084d24d1d8a9adaa87b84bc691c820f056d7f46
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Feb 20 12:54:32 2014 +0100

    Bug 11799: Housekeeping: Remove _biblionumber_sth from VirtualShelves.pm
    
    This routine is no longer used.
    
    Test plan:
    Do a grep on the name.
    (Bonus points:) Verify if you can perform some actions on lists.
    
    No more occurences of _biblionumber_sth found
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 5e0d450875f24d1f9ef6620b033b5179633589da)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 84a9b3192e82484dba6cbe041028b0c8818eb41b)

commit da69efc6c58ef881525391addbe90572ff2862e0
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Fri Feb 21 17:38:42 2014 +0000

    Bug 10580: (follow-up) tweak wording about looking for zebrasrv & zebraidx
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 1d276d58099fa60666bccc13c7b9d839946946c1)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 8d988dbdcaebfe3d1cc325e5342951dbc0e3ed1b)

commit 0df48cb1318a87a1f355c2c1969c898fe7290222
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Fri Jan 24 10:40:03 2014 -0300

    Bug 10580: adjust Makefile.PL to reflect that Zebra no longer optional in Koha setup
    
    Running Makefile.PL asks the user whether to install the Zebra
    configuration files and different texts relate to the user having
    chosen to use Zebra.
    
    This patch removes references to choosing to use Zebra and removes
    the related variables from the code.
    
    To test:
    - Apply the patch
    - Go through the different install modes
    - Verify that nothing nothing is broken
    
    Sponsored-by: Universidad Nacional de Cordoba
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 0b989fe0b2097d747da1fd6d04aa8aecc5652d06)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 996060aa92aa091a991ebe25cd2cd255b0d9d694)

commit 26719fc3db61d8bf70a53878d850f90fb29586ef
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Jan 24 09:47:53 2014 -0600

    Bug 11272 - add second submit button to inventory form
    
    The inventory tool allows for 2 ways of processing files. The first
    is to upload a file. The second is to generate the shelf list.
    Most libraries think they have to fill in all fields because the
    submit button is at the bottom of the second option. They do not.
    This patch adds a second submit button under the first method to
    make this clearer.
    
    To test:
    
    * Generate a file of barcodes for inventorying
    * Before applying the patch use the file upload method to mark as seen
    * Apply the patch
    * Use the file upload method to mark as seen using the new submit
    * Repeat the above for the shelf list method
    * Confirm that inventory still works as expected with 2 buttons
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 40ba1763afc40cd47b23892a3248fd877dc8edce)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit fdeb2a0cad0b686617d8376842408bb437fa26c4)

commit 4b7f4e8916657e553a77b825fb2e88be175a1a2e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Feb 19 15:26:24 2014 -0500

    Bug 11796: fix display of search result facets if facet happens to have exactly six entries
    
    If a search gives results with 6 facets, one of those facets won't be
    displayed. This is due to a bug in the code that only considers great
    than 6 facets in one area, and less than 6 in another.
    
    Test Plan:
    1) Perform a search that should give results for 6 different libraries
    2) Note you only see 5 libraries in the facets with no option to expand
    3) Apply this patch
    4) Repeat step 1
    5) Note you now have the option to expand the facets list
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    This patch should provide a regression test but I really don't know how
    to write it.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit e7286e05137276f0a916f06d60a13c22c93294b2)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit dc842baa70e5dcf232f15cff232409fdcd833014)

commit c154bc548b8ce0915cf0f7a5dd7f692e28c3e527
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Feb 18 12:13:39 2014 -0500

    Bug 11785 - Use validation plugin when uploading local cover images
    
    When uploading local cover images the form should not be submitted if
    no file has been selected. The existing form validation script doesn't
    work. This patch adds HTML5 validation attributes and use of Koha's
    built-in form validation plugin.
    
    To test, apply the patch and go to Tools -> Upload local cover image.
    Try to submit the form without selecting a file to upload. You should be
    prevented from doing so. Choose a file and confirm that the upload
    completes correctly.
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 7faff33c8b9bd670cf7813f4cefb7aee38709ebb)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit fc50362c231ceb9a410dcbcbce94b8124db1aa13)

commit 4b0feb1a0f05f539e792e4e5e9e669fec7efcab7
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Feb 19 15:06:36 2014 -0500

    Bug 10714 [Follow-up] Redirect to list contents view upon cancel after initiating edit from list contents view (staff)
    
    This follow-up corrects the "cancel" action on list edit actions based
    on whether the edit was initiated from the list of lists or the list
    contents view.
    
    To test, view the list of lists and click the edit link next to one of
    them. Click the cancel link. You should return to the list of lists you
    were just viewing.
    
    View the contents of a list. Choose "Edit list" from the edit menu.
    Click the cancel link on the edit screen. You should return to the list
    contents view from which you initiated the edit action.
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 6a323ce4ce914e757d5c1c999237ad2c0efc15e9)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 7d40a4c9081d50b15652f80a0d65d8a60f7a57b5)

commit 02095ae19a4b2dd79e09c48f01500728fdcb0caa
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Aug 12 15:30:16 2013 -0400

    Bug 10714: Redirect to list contents view upon save after initiating edit from list contents view (staff)
    
    In the staff client, if you initiate a list edit from the list contents
    view you should be redirected to that same view after saving your
    changes. The OPAC already works this way.
    
    To test, view the contents of an existing list. Click the "Edit list"
    item under the "Edit" menu. Click save on the list edit form and you
    should be redirected back to the contents view of that list.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit daa98e73f8baf178f2b0f32b4988d2414519ea4b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 3ef4918dc7afcc58ea180d40768344a558799931)

commit 254bd580ace37b434dfd1b7acc7766b86f79eabb
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Jan 30 12:39:19 2014 -0500

    Bug 11644: fix occasional failure to update fund amount due to floating-point math
    
    When attempting to update a fund, if the amount unalloccated for the
    fund is equal to the total, you can be prevented from saving. This is
    due to imprecise floating point number comparison in
    check_parent_total.pl
    
    Test Plan:
    1) Create a fund where the amount unallocated is equal to the amount
       unallocated for the budget period
    2) Edit the fund, attempt to change the name of the fund
    3) Note you recieve an error and cannot save
    4) Apply this patch
    5) Repeat step 2
    6) Note you can now update the fund
    
    Signed-off-by: Sean McGarvey <smcgarvey at pascocountyfl.net>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit ba689152e431217c8dd02d6ce0b8d14ae8d9f5da)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 984758cd3c76276366be05149324df6a17916cad)

commit e2f4b2e01f50071f6b812bdfdcdd8b7a03b40070
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Wed Feb 19 16:40:06 2014 +0000

    Bug 11779: (follow-up) improve GetLoggedInBranchcode() and add test cases
    
    This patch adjusts the new GetLoggedInBranchcode() template function so
    that it returns the empty string rather than undef if there is no
    active user environment.  That way, there won't be lots of undefined
    value warnings if/when this function gets used in the OPAC.
    
    This patch also adds test cases.
    
    To test:
    
    [1] Verify that there are no regressions in the main test
        plan for this bug.
    [2] Verify that prove -v t/db_dependent/Koha_template_plugin_Branches.t
        passes.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 065a3a5efa9b90723460a607ac85591c17945b00)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 1b02c031a34e7e3e3caabbe0184fb5fe71447d95 )

commit 4fbc168e448f26548700604383666f3ad798c178
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Feb 18 07:43:44 2014 -0500

    Bug 11779: fix unexpected change in logged-in library when changing overdue notice triggers
    
    Steps to reproduce:
    1) Log into staff intranet
    2) Set logged in branch
    3) Browse to tools/overdue notice triggers
    4) Select a branch from the pulldown that is not your logged in branch
    5) use the "Check out" bar at the top of the page to search for a patron
    to check out to
    6) Once you have landed here, click the "check out" tab link again, or
       the Edit button ( any action really )
    7) Note your logged in branch has now changed to the once selected
       when editing the notice/status triggers
    
    This is due to the way the patron search passes the branchcode to be
    used via the form. This form assumes the branchcode variable is
    always the currently logged in branch, which may not and is not
    always the case.
    
    Test Plan:
    1) Apply this patch
    2) Repeat the steps to reproduce above
    3) Note your logged in branch does not change
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Funny bug :) This patch fixes the described issue and should not
    introduce regression.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 858083c8e907bde4efa6842cd45ff91bf1f6e24f)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit f08154588cb07d8d85b25d13a566c2c689148577)

commit 1c0be23f5d174950fd8fc0c16d6a1ddc2a1e8c49
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Feb 14 08:48:46 2014 -0500

    Bug 11756: improve default sorting on hold ratios report
    
    The DataTables plugin doesn't by default take multiple columns into
    account when sorting. The hold ratios report presents a situation where
    it makes sense to sort by default based on two columns: hold count and
    title, since there are likely to be many titles with the same hold
    count.
    
    This patch adds sorting by default on holds (descending) and title
    (ascending). It also modifies the configuration of the title sort to
    exclude articles when sorting.
    
    To test, view the hold ratios report. If necessary use the filter form
    to reduce the minimum hold ratio and generate more results. Confirm that
    the correct columns can be sorted.
    
    Note that by default one can manually trigger sorting on two columns by
    shift-clicking the second column header.
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 7514dc897cc49683915112229667ec1f654873ae)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit ca668451a71b178dbb37539c329af1de9726513e)

commit 26a85e954f9bc2872e2de42b3787afea53cdd25b
Author: Stéphane Delaune <stephane.delaune at biblibre.com>
Date:   Mon Feb 10 10:52:59 2014 +0100

    Bug 11730: ensure that C4::Charset loads C4::Context
    
    C4::Charset::SetMarcUnicodeFlag() fetches system preference
    values, so since it invokes routines in C4::Context, it should
    load the module.
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit b9d2a832db6d2a75d6466a349b769e8285d1f0c8)
    
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit acec28bc4c9319da4490eb940ef54d0875c97c48)

commit 9208b5714759d5cb468f430cf718380cd4137015
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Feb 18 16:04:46 2014 +0100

    Bug 10789: Follow-up: Fix typo "infermation"
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 201af593f885ecb11c76d02baa6e27ef5e744e30)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit b1e4073208ceb902e391820c650b7f89111a4ab8)

commit 2d7362031e9153e8787bee880f8fa61996ede898
Author: Marc Véron <veron at veron.ch>
Date:   Sat Feb 15 17:07:55 2014 +0100

    Bug 11773: fix crash in sco-main.pl if no active currency is set
    
    If no currency is defined as active and a patron with debts tries to
    check out in welf checkout moduel, sco-main.pl crashes with:
    
    Software error:
    Can't use an undefined value as a HASH reference at /usr/share/kohaclone/opac/sco/sco-main.pl line 190.
    
    This patch tests for active currency and simply does not display a
    currency symbol if appropriate.
    
    Test plan:
    
    1) Make sure you have a patron with debts and no currency defined as
       active.  (Home › Administration › Currencies & Exchange rates
       › Currencies )
    2) Go to Self checkout module and try to checkout an item to this patron
       Result: Crash with error message "Can't use an undefined value as a
       HASH..."
    3) Apply patch
    4) Reload and try to checkout again
       Expected result: Message "You owe the library..." without currency
       symbol
    5) Define a currency as active and try to checkout again
       Expected result: Message "You owe..." with currency symbol
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 1db56c834b297eb7fd968691f66ef3517771cba5)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 0e0b39deafed3376bc65af9bf9ee7ec678c60d35)

commit 81ade5377795ad372089d7110e7cc4f4694df747
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Fri Feb 14 00:24:56 2014 +0000

    Bug 11757: remove dependency on POE
    
    The last use of the POE family of Perl modules went away with
    the removal of zebraqueue_daemon.pl per bug 9001.  Consequently,
    this patch removes POE as a dependency.
    
    To test:
    
    [1] Verify that "git grep POE" and "git grep libpoe" report
        nothing.
    [2] Verify that koha_perl_deps.pl -a does not report POE
        as a dependency.
    [3] (extra credit) verify that Debian packages can be built
        that do not list libpoe-perl as a dependency.
    
    This patch also updates some distro-specific installation
    instructions and scripts, but makes no representations about
    whether those instructions currently work.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit b67dac81cceaab356486001292cff40977682fff)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit ab85f0c5d03df5cbdeecac94cc9ae5e4b327a083)

commit 2c9f29d164ae09ee057a7d7960a56c07e42641e3
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Thu Feb 6 17:30:24 2014 -0300

    Bug 11704: Make */svc/report print the correct headers
    
    To test:
    1 - Go through the first comments instructions to reproduce
        and verify the bug is present (OPAC and STAFF)
    2 - Apply the patch
    3 - Repeat step 1 and notice
       * characters are not broken anymore
       * the header is correct
    4 - Sign off
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit aace5d436dbab1f13e2e1c06d0b4ed5f1ec13ced)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit a47eb5ea549b63d8fb410f966124c7ef0fdc3227)

commit 2ba96de44c2f3bb0406363cdf13ed4bf9aef4ff5
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Feb 5 10:39:26 2014 +0100

    Bug 11687: remove disused script statecollection.pl
    
    It can be removed.
    
    Test plan:
      git grep statecollection
    returns no occurrence.
    
    Signed-off-by: Holger Meissner <h.meissner.82 at web.de>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit b2d08f8359c187f92e1df46ad29b83852fb03079)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 6162e63b2223101210724572da5b8af6365c6990)

commit 033d4c04472b6d63ad0869c7f5686ffa432e9708
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon Mar 10 22:48:03 2014 +0000

    Bug 10611: (follow-up) cache DBMS driver code in context object
    
    Rather than use a package-level variable, use an object-level
    one.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 7d39b3c72ea2422b09e3411bef974d87aecdabf9)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Conflicts:
    	C4/Context.pm
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 1de3d85574568b8eef769dc5d16af879b920b65f)

commit f9ba7383dcdddd878433c939cc5a1078f8ef350b
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Jul 16 11:53:47 2013 +0200

    Bug 10611: Use mysql_auto_reconnect instead of ping
    
    DBD::Mysql provides a mysql_auto_reconnect flag. Using it avoids
    the time required to do a $dbh->ping().
    
    Benchmarks:
    
    use Modern::Perl;
    use C4::Context;
    for ( 1 .. 1000 ) {
        $dbh = C4::Context->dbh;
    }
    
    * without this patch on a local DB:
    perl t.pl  0,49s user 0,02s system 98% cpu 0,525 total
    * without this patch on a remote DB:
    perl t.pl  0,52s user 0,05s system 1% cpu 37,358 total
    * with this patch on a local DB:
    perl t.pl  0,46s user 0,04s system 99% cpu 0,509 total
    * with this patch on a remote DB:
    perl t.pl  0,49s user 0,02s system 56% cpu 0,892 total
    
    Testing the auto reconnect:
    use Modern::Perl;
    use C4::Context;
    my $ping = $dbh->ping;
    say $ping;
    $dbh->disconnect;
    $ping = $dbh->ping;
    say $ping;
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Comment: Real improvement. No koha-qa errors
    
    prove t/db_dependent/Circulation_issuingrules.t produces no error
    prove t/db_dependent/Context.t produces no error
    
    Test
    1) dumped Koha DB, load it on a non-local server
    2) run sample script whit and without patch, local and remote
    
    use Modern::Perl;
    use C4::Context;
    for ( 1 .. 100000 ) {
        my $dbh = C4::Context->dbh;
    }
    
    Main difference I note is with remote server
    a) without patch
    real    0m16.357s
    user    0m2.592s
    sys     0m2.132s
    
    b) with patch
    real    0m0.259s
    user    0m0.240s
    sys     0m0.012s
    
    I think this could be good for DBs placed on
    remote servers
    
    Bug 10611: add a "new" parameter to C4::Context->dbh
    
    When dbh->disconnect is called and the mysql_auto_reconnect flag is set,
    the dbh is not recreated: the old one is used.
    
    Adding a new flag, we can now force the C4::Context->dbh method to
    return a new dbh.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Bug 10611: Followup: remove useless calls to dbh->disconnect
    
    These 3 calls to disconnect are done at the end of the script, they are
    useless.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 4ae3665ad8afb5d283d989c4622a91690e1c4f8a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Conflicts:
    	C4/Context.pm
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 82f5b527d8cb79e8d1309b42faa461bcea12924d)

commit ac3224557f8b4596994fbf884fbaf37e6f713821
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Mar 5 13:44:49 2014 +0100

    Bug 11493: Revert "Bug 6869 Batch item modification fails whit accented characters"
    
    This reverts commit c9905750e53e2e1615842ac696d5eeb0a8ac07fc.
    
    Test plan:
    1/ Open a bib record with more than 1 item ,
    2/ Select all items
    3/ Chose Modify selected items
    4/ put you "ق ك و" in notes
    5/ Verify the items have been updated correctly
    6/ put you "éàç" in notes
    7/ Verify the items have been updated correctly
    8/ put you "ق ك و éàç" in notes
    9/ Verify the items have been updated correctly
    
    Patch behaves as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Confirmed bug on master and that the patch fixes it.
    Passes all tests and the QA script.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit e55d89be20acb58deb45a30c113bf0f07170fd33)
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 1bf1dacc7b2ec64b9b17d9b3947209918b3ba02f)

commit b71734f8468d970d145b189a7f3701fbdf23218c
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Jan 24 16:07:08 2014 +0100

    Bug 11608: Delete unused commented lines in template
    
    On the way, these lines are commented and can be deleted safely.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Removes an HTML comment with unused code.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit fb8e159daad8556832d45c9581e32b76aee02e1c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 6f9e61df9a9fec128fda5c264d6a99d2451e839d)

commit 3740ba2c755e9759896b1fbb439259403bff722f
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Jan 24 08:34:27 2014 -0600

    Bug 11608: Remove the word 'library' from funds list
    
    The list of funds on the main acq page shows the library's name
    followed by the word 'library'. I don't think this word is necessary
    as most libraries have the word 'library' in their names. Even
    if they don't they probably just want their library name to show
    without extra words.
    
    To test:
    
    * Visit the acquisitions module before applying
    * See the library's name + 'library' above the funds list
    * Apply patch
    * Look again at funds list and 'library' should be gone
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Amended patch: remove a space
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works as described.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit b865e1a024331fbbb76570f84afc9302a7340f7d)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 740bd016a035d4e8b2fcfc385c10dbbe979ec227)

commit b33256e090247b65da68435c151de33b77d44e32
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date:   Sat Nov 23 11:04:00 2013 +1300

    Bug 11290: fix display of patron home page for certain translations
    
    To test
    1) In a fresh Koha, generate translation into XX
    2) Select XX for the staff interface (i.e. enable it, and choose it)
    3) Go to the Patrons page
    4) Everything looks fine
    5) In the admin page, create a patron category with any non-ASCII
       character.
    6) Go back to the Patrons page, everything is broken
    7) Apply patch
    8) regenerate translation
    9) Go back to the Patrons page, everything looks fine
    10) Switch to english it still looks fine
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    Tried with ru-RU and fixes the problem.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes all tests and QA script.
    Problem is also visible on untranslated templates changing
    one of the sample category descriptions to include diacritics.
    
    [RM note: I wasn't able to reproduce this on an unstranslated
     template -- I tried using Arabic, Cyrllic, and Spanish characters]
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 3e1b781adc253722209e46385fb3248ae8d668f9)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 923657526c2d7ac6d39ce5fd998c8249f43e3f51)

commit ab4687aa3d349a07d56815984303205f718c1ca6
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Fri Jan 31 16:21:05 2014 +0000

    Bug 11513: (follow-up) format enrollment end date consistently
    
    The previous patch added use of the KohaDates TT plugin, so this
    patch makes sure that it gets used to format the display of all
    occurrences of the enrollment end date.
    
    To test:
    
    [1] Create a patron category with a fixed end date.
    [2] Bring up the list of all categories and verify that the date
        is displayed based on the dateformat value.
    [3] Delete the category, and verify that the confirmation dialog
        formats the date correctly.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 6b6377316eb49d94476e9442728389cc4c9297ff)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 1448ee66b6dff5d9fd4caa0789fe49d83906f0c8)

commit dbaee59717725e959da89d664ff3eb8e6cadf075
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Jan 10 00:06:21 2014 -0500

    Bug 11513 - Warnings in Patron categories
    
    Just going to the patron categories page triggered errors.
    Running through all the plain options also triggered other
    warnings. This fix silences them.
    
    Discovered tabs I had not corrected by running qa test tool.
    
    Some errors which I could not trigger were also fixed, such
    as line 248 shown by Merllissia Manueli.
    
    TEST PLAN
    ---------
     1) Log in to staff client
     2) Click 'Administration'
     3) Click 'Patron categories'
     4) Click '+ New category'
     5) Enter a dummy category and click 'Save'
     6) Click 'Edit' for the dummy category.
     7) Change a value and click 'Save'
     8) Click 'Delete' for the dummy category.
     9) Confirm to delete.
    10) Review error log, several new warnings
    11) Apply patch
    12) Run the koha qa test tool.
    13) Click 'Home'
    14) Click 'Administration'
    15) Click 'Patron categories'
    16) Click '+ New category'
    17) Enter a dummy category and click 'Save'
    18) Click 'Edit' for the dummy category.
    19) Change a value and click 'Save'
    20) Click 'Delete' for the dummy category.
    21) Confirm to delete.
    22) Review error log, no new warnings
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Followed test plan, saw no errors in the log after applying the patch.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Tested various dates and enrollment periods with different settings of
    dateformat pref. Works as advertised. No warnings.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 1a45cf730ee7229e775345fb8469ccb26052420b
Author: Liz Rea <liz at catalyst.net.nz>
Date:   Fri Oct 25 16:40:03 2013 +1300

    Bug 11138 - auto_unsuspend_holds cronjob not in default cron jobs.
    
    to test:
    Install the packages with this patch, observe the /etc/cron.daily/koha-common file - auto_unsuspend_holds should now be in the default list.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit d4b3dedfdfa536aae22bf4b9c26ab455e3cef696
Author: Liz Rea <liz at catalyst.net.nz>
Date:   Thu Nov 14 14:52:28 2013 +1300

    Bug 11138 - Add auto_unsuspend_reserves to crontab.example
    
    To test:
    
    Set up and run the cronjobs from crontab.example with a hold set to unsuspend today.
    The hold should be unsuspended.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 160079b627f48017d9a65ccc4a8ecefa4861c517
Author: Roman Amor <romanwilton at gmail.com>
Date:   Thu Jan 16 15:55:03 2014 +1300

    Bug 11363 - Label printer profile units are not translatable
    
    Changed the unit names form an import to a switch case so that it is in
    the .tt so that it can be translated
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit a8985d6a2f33ab99037d9a89c5acb74781829f1c
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Wed Sep 18 11:33:07 2013 -0300

    Bug 10691: 5xx not properly linked by authid in authority search result list
    
    This patch changes the URL and data used to show the 'see also' links
    on the OPAC's authority search results page.
    
    Bonus points: makes some strings translatable.
    
    To test:
    - On your dev setup (master) create some authority records (i created personal name authorities).
    - Pick one of them and link 400$a to another one, do the same with 500$a
    - Add some other 400$a and 500$a without linking (i.e. plain text)
    - Make sure zebra is running and changes got indexed.
    - In the OPAC search for the authority that is linked to the others.
    - Check the 'see also:' link points to an authority search
    - Apply the patch
    - Reload/re-do the search
    - Check the 'see also:' link points to the authority id in the case of linked authorities,
      and to an authority search in the case of plain text names.
    
    Regards
    To+
    
    Sponsored-by: Universidad Nacional de Cordoba
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Work as described. No errors
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>

commit 6a430244b61ddbbe02e71b129760440eecfea85b
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Wed Sep 18 12:18:20 2013 -0300

    Bug 10691: 5xx not properly linked by authid in authority search result list [Staff]
    
    This patch changes the URL and data used to show the 'see also' links
    on the Staff's authority search results page.
    
    Bonus points: makes some strings translatable.
    
    To test:
    - On your dev setup (master) create some authority records (i created personal name authorities).
    - Pick one of them and link 400$a to another one, do the same with 500$a
    - Add some other 400$a and 500$a entries with plain text (i.e. no linking)
    - Make sure zebra is running and changes got indexed.
    - In the staff interface search for the authority that is linked to the others.
    - Check the 'see also:' link points to an authority search
    - Apply the patch
    - Reload/re-do the search
    - Check the 'see also:' link points to the authority id for linked authorities,
      and to an authority search result in the case of plain text entries.
    - Check that the authority search from the cataloguing interface still works as usual.
    
    Regards
    To+
    
    Sponsored-by: Universidad Nacional de Cordoba
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Work as described. No errors
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>

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

Summary of changes:
 C4/Acquisition.pm                                  |    2 +-
 C4/Charset.pm                                      |    1 +
 C4/Context.pm                                      |   18 +-
 C4/Installer/PerlDependencies.pm                   |    5 -
 C4/Items.pm                                        |    6 +-
 C4/Search.pm                                       |    4 +-
 C4/VirtualShelves.pm                               |   11 -
 INSTALL.fedora7                                    |    1 -
 INSTALL.opensuse                                   |    1 -
 Koha/Template/Plugin/Branches.pm                   |    9 +
 Makefile.PL                                        |  239 +++++++++-----------
 about.pl                                           |    3 +
 acqui/basketgroup.pl                               |    6 +-
 admin/categorie.pl                                 |   35 ++-
 admin/check_parent_total.pl                        |   15 +-
 debian/control                                     |    2 -
 debian/koha-common.cron.daily                      |    1 +
 etc/zebradb/etc/default.idx                        |    2 +-
 etc/zebradb/etc/{words-icu.xml => phrases-icu.xml} |    4 +-
 install_misc/debian.packages                       |    1 -
 install_misc/ubuntu.10.04.packages                 |    1 -
 install_misc/ubuntu.12.04.packages                 |    1 -
 install_misc/ubuntu.packages                       |    1 -
 .../mysql/en/mandatory/message_transport_types.txt |    2 +-
 installer/install.pl                               |    2 -
 .../en/includes/authorities-search-results.inc     |   96 +++++---
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |   44 +++-
 .../prog/en/includes/patron-search-box.inc         |    6 +-
 .../prog/en/includes/patron-search.inc             |    4 +-
 .../prog/en/includes/virtualshelves-toolbar.inc    |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    7 +-
 .../prog/en/modules/acqui/acqui-home.tt            |    7 +-
 .../prog/en/modules/admin/authorised_values.tt     |    3 +-
 .../prog/en/modules/admin/categorie.tt             |    7 +-
 .../en/modules/admin/preferences/acquisitions.pref |    8 +-
 .../en/modules/authorities/searchresultlist.tt     |    2 +-
 .../cataloguing/value_builder/marc21_field_008.xml |   14 +-
 .../prog/en/modules/circ/reserveratios.tt          |   12 +
 .../prog/en/modules/labels/label-edit-profile.tt   |   13 +-
 .../prog/en/modules/members/memberentrygen.tt      |    2 +-
 .../en/modules/reports/guided_reports_start.tt     |    8 +-
 .../prog/en/modules/reserve/request.tt             |    2 +-
 .../prog/en/modules/serials/claims.tt              |   10 +-
 .../prog/en/modules/suggestion/suggestion.tt       |    8 +-
 .../prog/en/modules/tools/inventory.tt             |    6 +
 .../prog/en/modules/tools/upload-images.tt         |   21 +-
 .../prog/en/modules/virtualshelves/shelves.tt      |   11 +-
 .../en/includes/authorities-search-results.inc     |   60 +++--
 .../en/modules/opac-authoritiessearchresultlist.tt |   58 ++---
 .../opac-tmpl/prog/en/modules/opac-memberentry.tt  |    4 +-
 misc/cronjobs/crontab.example                      |    3 +
 misc/cronjobs/j2a.pl                               |    1 -
 misc/cronjobs/runreport.pl                         |   25 +-
 opac/sco/sco-main.pl                               |    8 +-
 opac/svc/report                                    |    5 +-
 rewrite-config.PL                                  |    2 +-
 serials/statecollection.pl                         |   97 --------
 sms/sms_listen.pl                                  |    1 -
 svc/report                                         |    5 +-
 t/db_dependent/Context.t                           |    5 +-
 tools/batchMod.pl                                  |    1 -
 61 files changed, 488 insertions(+), 453 deletions(-)
 copy etc/zebradb/etc/{words-icu.xml => phrases-icu.xml} (62%)
 delete mode 100755 serials/statecollection.pl


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list