[koha-commits] main Koha release repository branch master updated. v18.05.00-367-gba8155f

Git repo owner gitmaster at git.koha-community.org
Mon Jul 23 17:46:29 CEST 2018


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  ba8155f7d011a3829d2d736d79c9036362191bd5 (commit)
       via  2f94da74c5f48ca3f7253b3de3a4a5ee8fa70b5e (commit)
       via  b8a2365a3455a70ef8bdcb99e74b419bc4572b96 (commit)
       via  1ea7d9790d31ecf52dcf6d9070650b4cab77b17b (commit)
       via  d90ff21454ed1d2f9682cbbfa7e07c87381a3257 (commit)
       via  419470d3cd9513e7e210dd893d69ec5bb9c45f94 (commit)
       via  ac00c7a30d7a741184440938081902af170dca14 (commit)
       via  1434d0aad0b41ff6cf7d931a5310698468ef1f85 (commit)
       via  de56e9d68af748f5038da79656863bab28219a76 (commit)
       via  9789477e7560c49c73fb9e56a46960286130f984 (commit)
       via  ac4014d21b102fdc45bcca53330b87668fd31770 (commit)
       via  cd4d46882ffd728264d3345eed36b7a03db855fe (commit)
       via  4e722eda4597acdcfe766bc01206d8b3080cc19a (commit)
       via  4a3eaf02e2be743536681a0151b86296ff299026 (commit)
       via  9eec98d31853737cbb755636c0acb2888e2b2f74 (commit)
       via  2898b580891e271c102d592c5040122007ee7a73 (commit)
       via  601b49e88fdb7079cf24113b99fa66929fd988c2 (commit)
       via  a503abb3db48bb60a87ee0e24fc80a3aecbc71a6 (commit)
       via  a495ba861d8aa37f273a4f94f3a3e36fca30d2c3 (commit)
       via  9e2e965936492a6068c4451a2d4848dc1856e822 (commit)
       via  16ddb155f17d72b0145665361015acdb44020ba1 (commit)
       via  db4beb014b17a1097d2e642dc913ce2046c53e00 (commit)
       via  fb6da950a73a1cb03f1df4f10843b0d708d60391 (commit)
       via  49772c96129cc07b3c38287657448a2619fe2292 (commit)
       via  b5e60f15478a998f945ebc59b2c13ce9d37b8818 (commit)
       via  516e8e80675c8a9cfbfebaf1c7c96d892fbf54ae (commit)
       via  12e18f91be2a26501fba502d5f1106d66b06caee (commit)
       via  12b505f2b797d77e800a17830f71a9c054cd076b (commit)
       via  15b865c6ee558ef278f911ba3693c38c024c7f11 (commit)
       via  a49a7f08d6dbaf992d70420dae744c75c2ad8aae (commit)
       via  d15185025a146656a1ad0d7d5a8eb261581c0f1e (commit)
      from  574cc2f787d0456ddd035dc5911be9192b09f758 (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 ba8155f7d011a3829d2d736d79c9036362191bd5
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Jul 23 14:58:05 2018 +0000

    Bug 11911: DBRev 18.06.00.012
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 2f94da74c5f48ca3f7253b3de3a4a5ee8fa70b5e
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Mon May 28 23:56:51 2018 +0200

    Bug 11911: (follow-up) Hide suggestion box on acq start page if no permission
    
    When the user is not superlibrarian or has the manage_suggestions
    permission, the suggestion box on the left of the acq start page
    needs to be hidden.
    
    Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit b8a2365a3455a70ef8bdcb99e74b419bc4572b96
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Fri May 18 10:40:21 2018 +0000

    Bug 11911: Add a separate permission for managing suggestions
    
    Without this patch only catalogue permission was required
    for managing suggestions. This patch adds a new permission
    in the acquisition module do manage suggestions and updates
    staff user permissions accordingly.
    
    To test:
    - Make sure there is a pending suggestion
    - Create a few users with different permission sets:
      - User 1: only catalogue
      - User 2: any acquisition permission
      - User 3: cataloguing permission
    - Check all of them can access: /cgi-bin/koha/suggestion/suggestion.pl
    - Apply the patch
    - Verify all of them now have the suggestions_manage permission
    - Verify everything displays correctly on:
      - intranet start page
      - patron account in staff
      - acquisition start page
      - suggestion page (try to access by URL too)
    - Remove suggestions_manage for a staff user
    - Repeat tests above, access should be denied/links not visible
    
    Bonus:
    - Fixes the link on the acquisition start page for late orders
      to mage the permissions of the page itself: order_receive
    
    Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 1ea7d9790d31ecf52dcf6d9070650b4cab77b17b
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Jul 23 15:18:01 2018 +0000

    Bug 17698: DBRev 18.06.00.011
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit d90ff21454ed1d2f9682cbbfa7e07c87381a3257
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Jun 13 10:52:33 2018 -0300

    Bug 17698: Do not send pending_checkout_notes from all circ scripts
    
    It's safer to send what we need from C4::Auth it's needed from a whole
    module.
    The SELECT COUNT(*) query will only be done when needed (so not made
    from scripts outside of circ)
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 419470d3cd9513e7e210dd893d69ec5bb9c45f94
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Jun 13 10:18:17 2018 -0300

    Bug 17698: (QA follow-up) few more things
    
    1. body tag was missing
    2. make "Date" column sortable correctly
    3. remove CDATA and type="text/javascript"
    4. Handle server-side errors
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit ac00c7a30d7a741184440938081902af170dca14
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Tue Jun 12 23:10:24 2018 +0000

    Bug 17698: (follow-up) Fixing things in Comment 57
    
    3. In the JS console: "ReferenceError: $ is not defined", I did not
    investigate it.
    
    Where do you see this in the console? I cannot recreate on opac-user.pl
    or on circ/checkout-notes.pl.
    
    5. The alert id=error is displayed then hide in JS, but it's then
    displayed half a second. We should hide it by default (css)
    
    Fixed in this patch
    
    6. I would move the "mark seen" and "mark not seen" buttons at the
    top of the table
    
    Fixed in this patch
    
    8. Cursor on "Select all" and "Clear all" links must be adjusted
    
    Fixed in this patch
    
    9. $(".btn-xs").click(function(event){
    The selector should be $("button.seen, button.notseen"), you
    do not want to apply this function to all other btn-xs on
    the page (maybe there are only two for now, but who knows
    later?)
    
    Fixed in this patch
    
    12. Important: When a note is updated, it's still marked as
    seen. Is it the expected behavior?
    
    I don't see this behaviour. When a note is updated it is
    marked as not seen.
    opav/svc/checkout_notes:79: $issue->set({ notedate =>
    dt_from_string(), note => $clean_note, noteseen => 0
    })->store;
    
    13. What will happen when hundred of notes will be on this
    table? Not blocker but we will need a "hide seen" buttons to
    filters the already seen notes.
    
    Added in this patch
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 1434d0aad0b41ff6cf7d931a5310698468ef1f85
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Jun 12 17:02:30 2018 -0300

    Bug 17698: (QA follow-up) Fix minors design issues
    
    This patch includes some changes required on comment 57:
    
    1. Bad resolution conflict, permission self_checkout is re-add
    
    2. The IGNORE modifier is missing in the INSERT statement
    
    4. When I hit /circ/checkout-notes.pl from the side bar, the page displays "Checkout notes", nothing else. We should add "There is no checkout notes".
    
    7. I would display the table on the confirmation screen as well
    
    10. html filters are missing
    
    11. span element should surround translatable string, to help translators
    
    14. patron-title.inc must be used to display patron's info
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit de56e9d68af748f5038da79656863bab28219a76
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Jul 23 13:50:33 2018 +0000

    Bug 17698: (follow-up) Rebase
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 9789477e7560c49c73fb9e56a46960286130f984
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Sun Apr 15 13:51:55 2018 +0200

    Bug 17698: (QA follow-up) Changes to use Asset TT plugin (bug 20538)
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit ac4014d21b102fdc45bcca53330b87668fd31770
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Thu Apr 12 04:04:48 2018 +0000

    Bug 17698: (follow-up) Fixing some small issues
    
    Fixing the comments in Comment 42
    
    Ready to test
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit cd4d46882ffd728264d3345eed36b7a03db855fe
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Thu Jul 6 01:28:06 2017 +0000

    Bug 17698: (follow-up) Koha Objects, access borrower through patron sub
    
    See Comment 27
    This is ready to be tested.
    
    Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 4e722eda4597acdcfe766bc01206d8b3080cc19a
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Mon Jun 26 23:31:17 2017 +0000

    Bug 17698: (follow-up) Changing to Koha Objects style, adding circ sidebar
    
    Marcel, can you please have a look at this patch. I tried to implement
    the change
    my @notes = $schema->resultset('Issue')->search({ 'me.note' => { '!=', undef } }, { prefetch => [ 'borrower', { item => 'biblionumber' } ] });
    to
    my @notes = Koha::Checkouts->search({ 'me.note' => { '!=', undef } }, { prefetch => [ 'borrower', { item => 'biblionumber' } ] });
    but am having problems on the template side. I can access the item and
    biblio information about the issue, but not the borrower information,
    even though the query is definitely pulling it correctly. Any
    suggestions or ideas as to why this breaks?
    
    This patch also adds the implementation of the circSidebar.
    
    Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 4a3eaf02e2be743536681a0151b86296ff299026
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Thu Dec 1 00:54:07 2016 +0000

    Bug 17698: Make patron notes show up on staff dashboard
    
    This patch adds a user permission for managing issue notes, and a 'noteseen'
    column to the issues table.
    
    To test:
    1) Apply Bug 14224 first
    2) Apply this patch, update database, rebuild schema.
    3) Restart koha-common and memcached
    4) Turn on AllowCheckoutNotes syspref if haven't already
    5) Issue two items to two different users (one item each)
    6) Log into the OPAC as one of the users and add an issue note to their
    issue
    7) Log out and log back into the OPAC as the other user
    8) Disable Javascript
    9) Refresh opac-user.pl
    10) Leave a checkout note on their issue
    11) Enable javascript and log into the Staff Client as a superlibrarian
    user
    12) Go to your user's account and edit their permissions to have
    everything ticked EXCEPT circulate->manage checkout notes.
    13) Go to main intranet page. There should be no message saying
    'checkout notes pending'.
    14) Go to circulation home page. There should be no link to Checkout notes.
    15) Go back to user's permissions and tick circulate->manage checkout notes.
    16) Go back to main intranet page. There should now be a message at the
    bottom saying 'Checkout notes pending: 2'
    17) Go to circulation home page. There should be a link to Checkout notes
    with a 2 next to it. Click this link
    18) Attempt to mark an checkout note as seen. This should update the status
    of the checkout note to 'seen' and disable to 'mark as seen' button while
    enabling the 'mark as not seen' button.
    19) Test both buttons with both issues.
    20) Test select all and clear all buttons
    21) Confirm that buttons at the bottom are only enabled if a checkbox is
    checked
    22) Try selecting both issues and using the buttons at the bottom to
    mark multiple issue notes at once.
    23) Confirm the barcode link to the item works as expected.
    24) Confirm the cardnumber link to the user works as expected.
    25) Confirm all table details show correctly.
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Followed test plan, works as expected
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Amended patch: Remove self-checkout permissions
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 9eec98d31853737cbb755636c0acb2888e2b2f74
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jul 23 11:02:02 2018 -0300

    Bug 20757: Add pod for ->capture
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 2898b580891e271c102d592c5040122007ee7a73
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri May 11 16:58:07 2018 -0300

    Bug 20757: Capture and upload screenshot on selenium errors
    
    It is a real pain to debug selenium errors, especially when it is
    not reproducible locally.
    
    This patch capture a screenshot when an error occurred and upload it
    using the excellent lut.im service provided by framasoft
    (We could host our own later).
    
    Test plan:
    Modify a selenium script to make it fails (search for find_element)
    You will see a stack trace followed by a link to framapic.org
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 601b49e88fdb7079cf24113b99fa66929fd988c2
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Jul 23 13:28:13 2018 +0000

    Bug 19191: DBRev 18.06.00.010
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit a503abb3db48bb60a87ee0e24fc80a3aecbc71a6
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date:   Fri May 4 15:17:51 2018 -0400

    Bug 19191: (QA follow-up) Remove double fetches from database
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit a495ba861d8aa37f273a4f94f3a3e36fca30d2c3
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Apr 20 12:42:15 2018 +0000

    Bug 19191: Add syspref to control use of email receipts, defaulting to disabled
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 9e2e965936492a6068c4451a2d4848dc1856e822
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date:   Wed Apr 18 07:23:05 2018 -0400

    Bug 19191: Add non-english notices
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 16ddb155f17d72b0145665361015acdb44020ba1
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date:   Wed Apr 18 07:14:09 2018 -0400

    Bug 19191: Fix capitalization of notice titles
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit db4beb014b17a1097d2e642dc913ce2046c53e00
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Apr 12 14:12:29 2018 +0000

    Bug 19191: Add correct unit tests
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit fb6da950a73a1cb03f1df4f10843b0d708d60391
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Mar 2 15:04:10 2018 +0000

    Bug 19191: Remove need for bug 19966
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 49772c96129cc07b3c38287657448a2619fe2292
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date:   Fri Jan 12 10:46:24 2018 -0500

    Bug 19191: Add ability to email receipts for account payments and write-offs
    
    Some libraries are paperless and require all payment receipts to be emailed. Koha should give libraries the option to send email receipts if a patron has an email address. If a notice for the type of "credit" exists ( payment or writeoff ), then an email receipt will be sent.
    
    These notices only support Template Toolkit syntax.
    
    Test Plan:
    1) Apply this patch and dependencies
    2) Add the two new notices, you can find them in installer/data/mysql/en/mandatory/sample_notices.sql
    3) Note two new notices exist in the notices editor, ACCOUNT_PAYMENT and ACCOUNT_WRITEOFF
    4) Find or create a patron with an email address that owes some amount of money
    5) Make a payment for one or more fees
    6) Note a new email is queued for the patron
    7) Make a writeoff for one or more fees
    8) Note a new new email is queued for the patron
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit b5e60f15478a998f945ebc59b2c13ce9d37b8818
Author: Chris Nighswonger <cnighswonger at foundations.edu>
Date:   Wed Jul 4 11:23:11 2018 -0400

    Bug 8604: Patron cards made for patrons which don't have patron images use preceding card's image
    
    This patch corrects referential problems which caused the script to
    "re-use" images as well as other sorts of bad image behaviour.
    
    To test:
    
    1. Ensure that you can reproduce the original bug or some variation thereof
    using the steps described in either of these two comments:
    
        https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8604#c0
    
        https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8604#c6
    
        NOTE: This is not an easy bug to reproduce.
    
    2. Once you can reproduce the bug, apply this patch and follow the same steps
    used to reproduce the bug.
    
    3. Observe that the symptoms are corrected.
    
    Signed-off-by: Chris Nighswonger <cnighswonger at foundations.edu>
    Signed-off-by: Christian Stelzenmüller <christian.stelzenmueller at bsz-bw.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Reproduced the bug and resolved it with this patch.
    Code is hard to read; exact cause of the problem was not fully uncovered.
    
    Fixed spelling 'Destory' => 'Destroy'
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 516e8e80675c8a9cfbfebaf1c7c96d892fbf54ae
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Jul 20 02:06:24 2018 +0000

    Bug 21095: Add ccode facets info to tests
    
    To test:
    1 - prove -v t/db_dependent/Search.t
    2 - Koha asks "Why am I getting these crazy facets!?!"
    3 - Apply patch
    4 - prove -v t/db_dependent/Search.t
    5 - Koha purrs (tests pass)
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 12e18f91be2a26501fba502d5f1106d66b06caee
Author: David Cook <dcook at prosentient.com.au>
Date:   Fri Jul 20 18:13:49 2018 +1000

    Bug 21097: Missing optgroup closing tag in orderreceive.tt
    
    There is a missing optgroup closing tag in orderreceive.tt. It doesn't
    actually cause any display issues (at least in modern browsers), but
    it's invalid markup, so this patch fixes it.
    
    _TEST PLAN_
    0. Add a budget and add a fund
    1. Add a vendor
    2. Add a basket
    3. Add an order to a basket
    4. Close the basket
    5. Receive the order
    6. Make sure the budget and fund both display when selecting the fund
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 12b505f2b797d77e800a17830f71a9c054cd076b
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Jul 23 12:23:07 2018 +0000

    Bug 20811: (RM follow-up) fix check for matching
    
    Notice should only be triggered if both settings are false
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 15b865c6ee558ef278f911ba3693c38c024c7f11
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jul 20 11:46:58 2018 +0200

    Bug 20811: (QA follow-up) Prevent calling AddItemBatchFromMarc and ModBiblioMarc without biblionumber
    
    If you use -update but do not find matches (or did not want to match), you
    should not call those routines. We should warn and skip this record.
    
    Adding a warn at the start that the choice of options may not be smart.
    Note that this needs further attention somewhere else. You could mix
    -update with -insert for instance and still see some problems. (May depend
    on items with unique barcode etc.)
    
    Test plan:
    Run -update without match or isbn.
    Or run -update -isbn with a non-matching ISBN.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit a49a7f08d6dbaf992d70420dae744c75c2ad8aae
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jul 20 11:21:11 2018 +0200

    Bug 20811: (QA follow-up) Make the isbn check work
    
    The following code was never reached, since $isbn was not filled.
        if (!$biblionumber && $isbn_check && $isbn) {
            $sth_isbn->execute($isbn);
            ($biblionumber,$biblioitemnumber) = $sth_isbn->fetchrow;
        }
    Solution: Fix the code with two $isbn declarations. Move the checkisbn
    condition a level deeper.
    
    Test plan:
    Run misc/migration_tools/bulkmarcimport.pl -file bib726.utf8 --update -isbn
    Since you do not match on biblionumber, the ISBN should match.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit d15185025a146656a1ad0d7d5a8eb261581c0f1e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon May 28 15:19:09 2018 -0300

    Bug 20811: Fix wrong usage of ModBiblio
    
    Since
      commit cefa7c21e28b88351ee8ae0dfefb80a515323df9
      Bug 5635: bulkmarcimport new parameters & features
    
    AddBiblio call has been replaced with ModBiblio, but the return values
    are different. We should not replace the value of $biblionumber with
    what returns this subroutine.
    
    Test plan:
    If you are familiar with bulkmarcimport.pl you should know what to test,
    I am not.
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

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

Summary of changes:
 C4/Auth.pm                                         |    4 +-
 Koha.pm                                            |    2 +-
 Koha/Account.pm                                    |   32 ++++
 Koha/Schema/Result/Issue.pm                        |   11 +-
 Koha/Schema/Result/OldIssue.pm                     |   11 +-
 circ/branchtransfers.pl                            |    3 +-
 .../checkout-notes.pl                              |   59 +++---
 circ/circulation-home.pl                           |    2 +-
 circ/on-site_checkouts.pl                          |    1 -
 circ/transferstoreceive.pl                         |    4 +-
 circ/view_holdsqueue.pl                            |    1 -
 circ/waitingreserves.pl                            |    1 +
 .../data/mysql/de-DE/mandatory/sample_notices.sql  |    5 +
 .../data/mysql/en/mandatory/sample_notices.sql     |    5 +
 .../data/mysql/es-ES/mandatory/sample_notices.sql  |    5 +
 .../mysql/fr-CA/obligatoire/sample_notices.sql     |    5 +
 .../mysql/fr-FR/1-Obligatoire/sample_notices.sql   |    5 +
 installer/data/mysql/it-IT/necessari/notices.sql   |    5 +
 installer/data/mysql/kohastructure.sql             |    2 +
 .../mysql/nb-NO/1-Obligatorisk/sample_notices.sql  |    5 +
 .../data/mysql/pl-PL/mandatory/sample_notices.sql  |    5 +
 .../data/mysql/ru-RU/mandatory/sample_notices.sql  |    5 +
 installer/data/mysql/sysprefs.sql                  |    1 +
 .../data/mysql/uk-UA/mandatory/sample_notices.sql  |    4 +
 installer/data/mysql/updatedatabase.pl             |   42 +++-
 installer/data/mysql/userpermissions.sql           |    2 +
 .../prog/en/includes/acquisitions-menu.inc         |    6 +-
 .../intranet-tmpl/prog/en/includes/circ-menu.inc   |    2 +-
 .../intranet-tmpl/prog/en/includes/circ-nav.inc    |    3 +
 .../intranet-tmpl/prog/en/includes/permissions.inc |   10 +-
 .../prog/en/modules/acqui/acqui-home.tt            |    2 +-
 .../prog/en/modules/acqui/orderreceive.tt          |    1 +
 .../prog/en/modules/admin/preferences/patrons.pref |    6 +
 .../prog/en/modules/circ/checkout-notes.tt         |  201 ++++++++++++++++++++
 .../prog/en/modules/circ/circulation-home.tt       |    5 +
 .../intranet-tmpl/prog/en/modules/intranet-main.tt |   11 +-
 members/purchase-suggestions.pl                    |    2 +-
 misc/migration_tools/bulkmarcimport.pl             |   13 +-
 opac/opac-issue-note.pl                            |    2 +-
 opac/svc/checkout_notes                            |    2 +-
 patroncards/create-pdf.pl                          |   57 +++---
 suggestion/suggestion.pl                           |    2 +-
 svc/checkout_notes                                 |   63 ++++++
 t/db_dependent/Accounts.t                          |   62 +++++-
 t/db_dependent/Search.t                            |    4 +
 t/lib/Selenium.pm                                  |   24 ++-
 46 files changed, 612 insertions(+), 93 deletions(-)
 copy rotating_collections/transferCollection.pl => circ/checkout-notes.pl (51%)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
 create mode 100755 svc/checkout_notes


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list