[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.11-29-gecf0610

Git repo owner gitmaster at git.koha-community.org
Fri Oct 30 00:05:48 CET 2015


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.18.x has been updated
       via  ecf0610705af0ca22ab1b7c6c1affab9f3fc2eec (commit)
       via  4a3f5c47979d9772c82f37475eb32766ad91e073 (commit)
       via  3363aa62287d9f161507f3f02c0f2fbbbef2fb29 (commit)
       via  d08be44641d9732e0c2fd1b5bffa746e8abc361c (commit)
       via  67a3dc23f4688cbc3cd1f8daf997406ea7bda577 (commit)
       via  30a3ba393f6e6d8db2ca2399b6c19b7fd4314bdf (commit)
       via  d1bc1a039f6e09672bb6c74446c1ee5504214d3e (commit)
       via  932453598567be072b77085d11676bf074dcbcaf (commit)
       via  d2ce611bf60b919347de69bd3f9cb43f3bb1caab (commit)
       via  7f83431fb8267f9da3da6937ddaaf7a477404f0c (commit)
       via  51efc8fc59ccf24f80d92cf7947a8122baa0ea14 (commit)
       via  5aa88679696329ac2fae34225c8461f7b1e055d6 (commit)
       via  5f6d48c25e5e268a46754d2dd9aff83aee195d98 (commit)
       via  f4002fb9b4c139dbf346fbe4629cd0f14e05b34f (commit)
       via  6bc08252b4753b31cd73558bf492c03294a83592 (commit)
       via  2c46810e7ba7ae5a7924e116dcdfbcc7af2ea849 (commit)
       via  62839fc4865ea7fd9a5ba48860bc46d0e463b6df (commit)
       via  b66cf0d486db2eb5b9183342286be54fed9cfc6a (commit)
       via  5affdbacb15bcd89a721a296c940a785dfd1a942 (commit)
      from  c44e419be77351ae50db77ab437952cdb95c2730 (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 ecf0610705af0ca22ab1b7c6c1affab9f3fc2eec
Author: Magnus Enger <magnus at libriotech.no>
Date:   Wed Oct 21 13:11:28 2015 +0200

    Bug 15042: Barcode hbyymmincr does not work when receiving serials
    
    To test:
    - Set autoBarcode = <branchcode>yymm0001
    - Make sure you have a serial that is set to "create an item record
      when receiving this serial"
    - Receive an issue
    - Click in the barcode field - nothing happens
    - Apply patch and reload page
    - Receive an issue
    - Click in the barcode field - a barcode conforming to the
      hbyymmincr setting appears
    
    Patch works as advertised.
    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: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 55127d50fb0a00f70d5de06dee76ddfad54bd094)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 2067f598760848cbef6b56d26d97ec9d44d566fe)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 4a3f5c47979d9772c82f37475eb32766ad91e073
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Oct 14 13:45:24 2015 +0000

    Bug 15012: use sudo instead of su in koha-shell
    
    Not sure this is the best way to fix it but it looks to work.
    
    Test plan:
      sudo koha-shell kohadev
    should not return any error
    Without this patch, you should get
      bash: cannot set terminal process group (-1): Inappropriate ioctl for device
      bash: no job control in this shell
    
    Confirm that other options work as before
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Works as expected. Tested on kohadevbox:ansible.
    KOHA_CONF and PERL5LIB are correctly set on the child shell.
    Bonus point: koha-shell doesn't die if the user issues Ctrl+C to abort an execution.
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 0e9e51db94abdabe6e603d98a05bf315c8d3fa91)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    (cherry picked from commit fb546fa7ac5d572d722aa4dcc79edb56976b517b)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 3363aa62287d9f161507f3f02c0f2fbbbef2fb29
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Wed May 6 09:14:42 2015 +0200

    Bug 14154: 608$9 defined twice in UNIMARC biblio-koha-indexdefs.xml
    
    In DOM config file :
    etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml, the 608$9 is
    defined a second time instead of 610$9.  Just a type I think.
    
    Test plan :
    - Apply patch
    - Install a UNIMARC + DOM instance
    - Define in a framework 610 using a thesaurus
    - Create a new biblio
    - Create a new authority (same type as the thesaurus defined above)
    - Index : rebuild_zebra.pl -a -b -x -z
    - Link the field 610 to the new authority
    - Index : rebuild_zebra.pl -a -b -x -z
    - In authorities search, search for the new authority
    => You see Use in 1 Records(s)
    
    Signed-off-by: Frederic Demians <f.demians at tamil.fr>
      I confirm the typo.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit aaf3ff3fec54011b30ba302e0c13e3ec5e41a142)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    (cherry picked from commit 28940870e2393603ab7e68a26404c411a25f94d3)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit d08be44641d9732e0c2fd1b5bffa746e8abc361c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Oct 19 16:17:31 2015 +0100

    Bug 15029: Make the IssueSlip tests pass even if launched after 23:00
    
    Prior to this patch, the tests did not pass if they were launched after
    23:00.
    DateTime complains if you ask for creating a date with hour => 24 (which
    is logical so far).
    
    Test plan:
    0/ Don't apply this patch
    1/ sudo date -s "2015-10-19 23:50:00";prove
    t/db_dependent/Members/IssueSlip.t
    2/ Apply this patch and repeat 1.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 00a4e802edf999ffbd16b15704eeb5fca4a73f84)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    (cherry picked from commit 719f116ac9a59cd9b9f186686ed032b94bbe01ba)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 67a3dc23f4688cbc3cd1f8daf997406ea7bda577
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Oct 1 12:59:26 2015 -0400

    Bug 14937: Expiration date for holds based onReservesMaxPickUpDelay should not require ExpireReservesMaxPickUpDelay
    
    C4::Letters::_parseletter will replace reserves.expirationdate with the
    date a hold will be marked as problematic ( holds over ) if both
    ReservesMaxPickUpDelay and ExpireReservesMaxPickUpDelay are enabled.
    There is no reason this feature needs to rely on
    ExpireReservesMaxPickUpDelay as there are many libraries that would like
    to send the last day to pick up a hold in notices, but would rather deal
    with the expired waiting holds manually rather than have Koha cancel
    them automatically.
    
    Test Plan:
    1) Apply this patch
    2) Set ReservesMaxPickUpDelay to 7
    3) Disable ExpireReservesMaxPickUpDelay
    4) Add reserves.expirationdate to your HOLD notice
    5) Fill a hold for a patron
    6) View the message, not that reserves.expirationdate is replaced
       with the date the hold will be marked as problematic
    
    Signed-off-by: Karl Holton <kholten at switchinc.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit c6d0202569146f52898363eda621f771b61cc918)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    (cherry picked from commit 77aedf1f7faf1bded9ed4de41d628e2a2fc8ba7d)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 30a3ba393f6e6d8db2ca2399b6c19b7fd4314bdf
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 4 16:33:00 2015 +0100

    Bug 11298: Don't force the renew time to 23:59
    
    If you try to renew an item using the "Renewal due date" at the bottom
    of the checkouts table, the time will be hardcoded to 23:59 no matter
    what the user has chosen.
    
    Test plan:
    Check an item out to a patron
    renew the item and specify a due date using the datetime picker plugin
    at the bottom of the table
    Confirm the time you have chosen is correctly used.
    
    Followed test plan. It works as advertised.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit a011cbd2e2658598e4c2eac7377b9b1edb9dd720)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    (cherry picked from commit 7f39c6a00c2647107f2da5b2385567a953113f51)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit d1bc1a039f6e09672bb6c74446c1ee5504214d3e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Oct 9 09:14:33 2015 +0100

    Bug 14990: Format the date template-side for moremember
    
    Test plan:
    print slip and show the member detail page, the 3 dates date of birth,
    date enrolled and date of expiry should be displayed correctly.
    
    Followed test pan, works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 6506ddd1e859c3afbb9519d6a956495c06d628ce)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    
    Conflicts:
    	members/moremember.pl
    
    (cherry picked from commit 09602496882c4202abd2de7b53d1f76ba36536f2)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 932453598567be072b77085d11676bf074dcbcaf
Author: Rafal Kopaczka <rkk0 at poczta.onet.pl>
Date:   Tue Oct 6 14:57:52 2015 +0200

    Bug 14966: Table header broken at detail.tt
    
    For user without item edit permission, table at catalogue/detail.pl is
    corrupted.
    
    Test plan:
    1) Log in as staff member, without edit item permission.
    2) Go to biblio view, with items attached:
    /cgi-bin/koha/catalogue/detail.pl?biblionumber=X. Confirm that table
    does not display correctly.
    3) Apply patch.
    4) Repeat steps 1 and 2. Confirm patch works.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 390233a10c789a241f948f0f41df92fda3e51052)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    (cherry picked from commit bacb9773170cf3c37c3e2e0b21ee23c78b6ce502)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit d2ce611bf60b919347de69bd3f9cb43f3bb1caab
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Fri Oct 2 09:25:18 2015 +0200

    Bug 14940: Fix sorting in opac-topissues.pl
    
    There is hidden text in "Checkouts" cells that prevent DataTables to
    sort numerically.
    This patch adds the 'title-numeric' sort plugin and use it in
    opac-topissues.pl
    
    Column 'Checkouts' in Home > Most popular items sorts as expected
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 2f0e409f471fe4527defee41798a80b1e354ce3e)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    (cherry picked from commit e14557ecd97aa46adb4739b0a5cc3e70b5023616)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 7f83431fb8267f9da3da6937ddaaf7a477404f0c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Sep 14 09:50:39 2015 +0100

    Bug 14812: Display the help in the correct language
    
    If opaclanguages != language, the language of the help page is the
    default one (en).
    
    Test plan:
    1/ Set language to en, fr-FR, ar-Arab and opaclanguages to en, fr-FR
    2/ Translate the fr-FR and ar-Arab templates.
    3/ Go on the mainpage, switch to ar-Arab, go to the help page.
    The help page content should be in Arabian, not English.
    
    Signed-off-by: Magnus Enger <magnus at libriotech.no>
    Set language = en, sv-SE, nb-NO. opaclanguage = en, nb-NO
    Went to the intranet main page, selected Swedish and clicked on help
    Without the patch, help was displayed in English
    With the patch, help was displayed in Swedish. Yay!
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit a4ee9151c195a89fe70de792a36f327baa6939f2)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    (cherry picked from commit 006a44cc6cc4a25f95d1344318600f8a79f31b5f)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 51efc8fc59ccf24f80d92cf7947a8122baa0ea14
Author: David Cook <dcook at prosentient.com.au>
Date:   Tue Oct 6 11:42:04 2015 +1100

    Bug 14861: Accession date comparison does not work in advanced search
    
    _Test plan_
    
    Prerequisites: Make sure that you have an item with a valid dateaccessioned,
    and that the bib is indexed in zebra.
    
    For the purposes of explanation, I'm going to use the date '2011-09-07'
    
    1) Go to advanced search in the staff client and choose 'Acquisition date (yyyy-mm-dd)'
    2) Enter 2011-09-07 (or the date of your choice).
    3) Click the search button - you should get your item in the search results.
    4) Return to the advanced search screen and select Acquisition date again.
    5) Enter a start and end date in the text field separated by ' - '.
    
    For example:
    
    2011-09-01 - 2011-09-30
    
    6) Click the search button -- this will return no results.
    7) Apply the patch and copy etc/zebradb/ccl.properties to whatever directory is specified
    by the koha-conf.xml referenced by $KOHA_CONF.
    8) Try the search again -- this will return the expected results
    
    Signed-off-by: Barton Chittenden <barton at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 5a9b8d9359424a3f0316f89348038fbb290e722b)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    (cherry picked from commit 257950686466e169dacbd0e6e93db8b0e16005a2)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 5aa88679696329ac2fae34225c8461f7b1e055d6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 22 11:55:55 2015 +0100

    Bug 14141: Fix copy action
    
    Test plan:
    Try to copy a letter to a library which already have this letter (same
    letter_code) defined.
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 51aad946c6411a484ffde6934d541b9bb1dd2aa3)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    (cherry picked from commit 2943112a2844f7106de0139bb449c3b3ef27fb02)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 5f6d48c25e5e268a46754d2dd9aff83aee195d98
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Jul 14 12:00:33 2015 +0100

    Bug 14141: Do not let edit the branch when updating/copying notice
    
    If a user modify the library when he's updating a notice, the notice
    will be duplicated, instead of modified.
    
    To reproduce:
    1/ Go on the notice & slips tools (tools/letter.pl)
    2/ Create a notice A for library L1
    3/ Edit this notice and update the library with L2
    4/ On the list view, you will observe that 2 notices A now exist, one
    for L1 and one for L2.
    
    The code in tools/letters.pl should be rebuilt completely, it becomes a
    house of cards. To prevent this bug, I suggest to not let the user
    modify the library value on editing a notice.
    It cans be done by copying the notice to another library and remove the
    original one.
    Counter patch welcomed.
    
    Test plan:
    1/ Go on the notice & slips tools (tools/letter.pl).
    2/ Create a notice A for library L1.
    3/ Edit this notice: you are not able to modify the library anymore.
    4/ Copy the notice to library L2. You are not able to modify the library
    neither.
    
    Works ok.
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 605f42a721b3a534d01b8f7c73502cfa810147ad)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    (cherry picked from commit 54cf2cc340e7f2abe96cdcfcb8aa4bb82031df79)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit f4002fb9b4c139dbf346fbe4629cd0f14e05b34f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Sep 14 16:01:48 2015 +0100

    Bug 14811: Don't update permanent_location with CART or PROC
    
    The permanent_location should not be set to CART or PROC when the item
    is edited.
    Otherwise we lost an important info.
    
    Test plan:
    0/ Set the ReturnToShelvingCart pref
    1/ Create an item with location "on_my_shelf"
    2/ Check the item in and out
    3/ Look at the DB values, location should be "CART" and
    permanent_location unchanged (on_my_shelf)
    4/ Edit the item, add a note for instance
    5/ Without this patch, the permanent_location is erased with 'CART' and
    you have definitely lost the info.
    With this patch, the permanent_location is unchanged.
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 2a319e7ae2a7e0d10450a6ca791eabbee01c0787)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Conflicts:
    	t/db_dependent/Items.t

commit 6bc08252b4753b31cd73558bf492c03294a83592
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Fri Oct 2 14:30:14 2015 -0300

    Bug 14820: DBRev 3.18.11.001
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit b8f0a595344d28d85383007138715d7db131f136)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    
    Conflicts:
    	Koha.pm (3.18 does not have)
    	installer/data/mysql/updatedatabase.pl (routine version updates)

commit 2c46810e7ba7ae5a7924e116dcdfbcc7af2ea849
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 15 10:36:44 2015 +0100

    Bug 14820: Add missing prefs SMSSendUsername and SMSSendPassword
    
    These 2 system preferences are missing from the sysprefs.sql file.
    
    Test plan:
    Execute the updatedatabase script and confirm that the 2 prefs are now
    in the systempreferences table.
    Search for "sms" in the system preferences search box, you should see
    the 3 prefs.
    
    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: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 39dc8b5a9da902f9f90850421dc2815e448222e5)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 27e58d8a204b5977d6ca64567a79f1ee90df9e6f)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 62839fc4865ea7fd9a5ba48860bc46d0e463b6df
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Sep 28 10:58:16 2015 +0100

    Bug 14910: Redirect to the circulation module after a renew
    
    iIf a patron is renewed from the circulation module, the librarian
    should be redirected to the circulation module.
    This works correctly if the renew is done from the patron module
    (members).
    
    This is caused by a typo in the template: desintation vs destination.
    
    This patch also removes the cardnumber parameter to the setstatus.pl
    script, it is not needed given that borrowernumber is always passed.
    
    This has a good side-effect, it will fix bug 14691. The cardnumber does
    not exist anymore, so no need to escape it :)
    
    Test plan:
    0/ Do not apply this patch
    1/ Create a patron with a cardnumber with a quote (rm'me) and another
    one without a quote (rmme)
    2/ Go on the checkouts page (circ/circulation.pl)
    3/ Renew the 2 patrons
    => With rm'me you are redirected to the circ module - ok
    => With rmme you are redirected to the member module - nok
    4/ Go on the patron detail page (members/moremember.pl)
    5/ Renew the 2 patrons
    => you are redirected to the member module - ok
    6/ Delete the patrons
    => Nothing happend with rm'me, there is a JS error on the page - nok
    => rmme is deleted - ok
    
    7/ Apply the patch and recreate rmme
    8/ Repeat 2, 3, 4, 5
    => You are redirected to the correct module
    9/ Delete the patrons
    => They are successfully deleted
    
    Signed-off-by: Magnus Enger <magnus at libriotech.no>
    Followed the test plan, works as advertised. (I did have some problems
    initially, but that was caused by me not using the interface in
    English...)
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 653d305452a27d19d929e2acff71643845686af3)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit dcd54915d0ce56acd900de313715be416ddc9c7e)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit b66cf0d486db2eb5b9183342286be54fed9cfc6a
Author: Marc Véron <veron at veron.ch>
Date:   Thu Oct 1 10:51:18 2015 +0200

    Bug 14929: Fix missing display of help page in contract management
    
    This patch renames / moves  the file
    koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt
    to
    koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqcontract.tt
    
    To test:
    - Go to Home > Acquisition > [Vendor] > Contracts
      (/cgi-bin/koha/admin/aqcontract.pl?booksellerid=XXXX)
    - Verify that Help displays as appropriate.
    
    Signed-off-by: Magnus Enger <magnus at libriotech.no>
    Works as advertised. All the tabs similar to "Contracts" have
    working help pages.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 4a43c3820555574ad7c83807b6b7a7db2032d340)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 7f1efe089871ab23f8fc4a738fb79601786b907d)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 5affdbacb15bcd89a721a296c940a785dfd1a942
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 15 11:44:32 2015 +0100

    Bug 12311: Do not return a lost item if modified in a batch
    
    If a item is lost and issued, and you modify it in a batch, the item
    will be marked as returned. It should only be returned if the item is
    marked as lost.
    
    Test plan:
    1/ Check an item out and mark it as lost
    2/ Edit it in a batch (tools/batchMod.pl) and edit a field (notes for
    instance)
    3/ The item should still be issued to the patron
    4/ Edit it in a batch and edit the lost value, marked it as not lost
    5/ The item should still be issued to the patron
    6/ Edit it in a batch and edit the lost value, marked it as lost
    7/ The item should have been returned.
    
    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
    Works as advertised. Just one comment, lost status can be changed only if you change default framework to another framework then edit the item. If you change it in Item menu at left side of screen this will remove the item from patron’s checkouts and patron charged for lost item.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    For testing purposes the lost item field can be set to visible
    in the framework used. That will allow changing it without
    returning it at the same time.
    The other option is using the longoverdues.pl script.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    (cherry picked from commit ca268ad877a6712aa07cb7c873c918d6fdfac52d)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 6709813a022de5e2cc53730e0299259ed9dc53bd)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

Summary of changes:
 C4/Barcodes/ValueBuilder.pm                        |    3 ++
 C4/Items.pm                                        |    6 +++-
 C4/Letters.pm                                      |    5 ++--
 debian/scripts/koha-shell                          |   10 +++----
 etc/zebradb/ccl.properties                         |    2 +-
 .../unimarc/biblios/biblio-koha-indexdefs.xml      |    2 +-
 .../unimarc/biblios/biblio-zebra-indexdefs.xsl     |    2 ++
 help.pl                                            |    4 +++
 installer/data/mysql/sysprefs.sql                  |    2 ++
 installer/data/mysql/updatedatabase.pl             |   29 ++++++++++++++++++++
 .../prog/en/includes/members-toolbar.inc           |    4 +--
 .../prog/en/modules/admin/preferences/patrons.pref |    4 +++
 .../prog/en/modules/catalogue/detail.tt            |    2 --
 .../prog/en/modules/circ/circulation.tt            |    4 +--
 .../{acqui/acqcontract.tt => admin/aqcontract.tt}  |    0
 .../prog/en/modules/members/moremember-brief.tt    |    9 +++---
 .../prog/en/modules/members/moremember.tt          |   10 +++----
 .../intranet-tmpl/prog/en/modules/tools/letter.tt  |   24 ++++++++++------
 .../bootstrap/en/modules/opac-topissues.tt         |    4 +--
 koha-tmpl/opac-tmpl/bootstrap/js/datatables.js     |   26 ++++++++++++++++++
 members/moremember.pl                              |   16 +++++------
 members/setstatus.pl                               |   17 ++++++------
 svc/renew                                          |    2 --
 t/db_dependent/Members/IssueSlip.t                 |   19 +++++++------
 tools/batchMod.pl                                  |    2 +-
 tools/letter.pl                                    |    1 +
 26 files changed, 143 insertions(+), 66 deletions(-)
 rename koha-tmpl/intranet-tmpl/prog/en/modules/help/{acqui/acqcontract.tt => admin/aqcontract.tt} (100%)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list