From gitmaster at git.koha-community.org Mon Jun 5 15:59:48 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 05 Jun 2017 13:59:48 +0000 Subject: [koha-commits] main Koha release repository branch 16.11.x updated. v16.11.08-35-g477ce13 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 16.11.x has been updated via 477ce133588931d3529196771b40e59a23efa60e (commit) via 49743040503e1d0bc690752de93287e43bdeb699 (commit) via 20472eec42c8a92a10b536a22ec2ac80c0613487 (commit) via bf5dfd2e0aaed6c82197c7ba0633bf93d44f976f (commit) via 7a0dea4a7bd1eab568bd99f3fa28fdda3997179c (commit) via f83e96c7ae62eb16b3764e3bf36083dd35e6263d (commit) via 5c7bee6c4b924ee2d169b7e9b3045701b63e425a (commit) via 7bd3424847c7d4c922a623417636837ab11a6ca2 (commit) via 1607b2a18ba7b5ce9accfc673718f3d633e26edd (commit) via 9ce77e80a9dc82c0abaa82ccb35f2331c2d3f965 (commit) via cb82ca95ec579b6ad05b24163673e68039f56520 (commit) via 122fa4c82af978b3d074ae4bafb2b0f49a3e4592 (commit) via ba18e8e3bf173b07c4179cb1559fabc72b05f60a (commit) via 26977379950beb656e818b7f91cf86eff1af141f (commit) via a4e1c502726a23c31f7c2084577b30aa376b3124 (commit) via 1f2bf282bf29bbc1fd4ed8f15e9217573543dc0e (commit) via bebe91bafbb84381fea8b920665df117536e4651 (commit) via dfc043a6495e6426a950a2779bf688c5f95aabe5 (commit) via fac99c82ccbbc3462d0a8bead681ab9d1c19fa57 (commit) via ed4946ad4027e5a0da62e7f67387bd446d75d920 (commit) via 134554f448b4a09210edbb65520d7d95163ccde5 (commit) via d4a7949c0466c3bd6900a93aa61c69e0e3469ec8 (commit) via ae368a3eaaa70cf3f677ba49d5cb5ad21b72cafa (commit) via bb9df1e552996eccb4e3fd650e7cc214a7b55720 (commit) via d88b51691bd3225f909cee961299807495d873a4 (commit) via b74de73f5521bb416edea9b7123eb3088f5e7e04 (commit) via ae71ae912e7e8b714e7bf23130fb3acf492048d2 (commit) via 873aca09ae4bb96fd4dd44e1a8034701a43aedb9 (commit) via 8ebbefed7323b303407dc972098a5ef1bd69c518 (commit) via df74913f2e9cb5c2cb533f15c1ac4575054cdc57 (commit) via 00549f22cd049817ee6ef996d430fc04190ac1a3 (commit) via 54d42d3465c42d4c72a64336a162f31c79d35a9f (commit) via 21d8f726fa205b4b31f9a3b7f17227688a6b3449 (commit) via ed66ddc018d0b8286e9b339b3e253f940f172c59 (commit) from 5c7ca2ef433e94c8fae59467c7d73dad4dbee2e1 (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 477ce133588931d3529196771b40e59a23efa60e Author: Katrin Fischer Date: Mon Jun 5 15:54:52 2017 +0200 Revert "Bug 18551 - Hide with CSS dynamic elements in member search" This reverts commit 243c75430c97df727c4f6a51228d95c401face88. commit 49743040503e1d0bc690752de93287e43bdeb699 Author: Katrin Fischer Date: Mon Jun 5 15:54:38 2017 +0200 Revert "Bug 18551: followup - hide advanced filters in header, move hidding to css file" This reverts commit 50f10a39280d741945e501f7de8c12a34429cd5b. commit 20472eec42c8a92a10b536a22ec2ac80c0613487 Author: Nick Clemens Date: Mon Mar 20 07:22:41 2017 -0400 Bug 18264 - (QA Followup) Remove use of GetBiblioFromItemNumber Replace with (blank) Signed-off-by: Jonathan Druart Signed-off-by: Brendan A Gallagher (cherry picked from commit 0d239e4e6f3c7095173773252dc9ce38b48c0799) Signed-off-by: Katrin Fischer commit bf5dfd2e0aaed6c82197c7ba0633bf93d44f976f Author: Nick Clemens Date: Tue Mar 14 14:16:09 2017 +0000 Bug 18264 - Course reserves - use itemnumber for editing existing reserve items This patch alters the crouse reserves module to use itemnumber as the lookup method for existing reserves as opposed to barcode To test: 1 - Apply patch 2 - Add some items to a course reserves - all should work as expected 3 - Delete the barcode for an item on reserve 4 - Note the edit link still resolves to the correct item Followed test plan, works as expected. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Brendan A Gallagher (cherry picked from commit 2ead301181c33f42d3c88abffa8d18b8a416b40a) Signed-off-by: Katrin Fischer commit 7a0dea4a7bd1eab568bd99f3fa28fdda3997179c Author: Nick Clemens Date: Thu Feb 16 11:04:11 2017 +0000 Bug 17974 (QA Followup) Use the $biblio_rs variable In case of Koha::Object you can call new_from_dbic directly, however, it fails for Koha::Objects so using an intermediary variable should be done for consistency Signed-off-by: Kyle M Hall (cherry picked from commit 236dbdf5f1922f98305df8b4c3aee040c0086b05) Signed-off-by: Katrin Fischer commit f83e96c7ae62eb16b3764e3bf36083dd35e6263d Author: Jonathan Druart Date: Sat Jan 21 16:45:34 2017 +0100 Bug 17974: Add the Koha::Item->biblio method Test plan: prove t/db_dependent/Koha/Items.t should return green Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit c614342f2743b1076b6a7a6740ea6586acf547ac) Signed-off-by: Katrin Fischer commit 5c7bee6c4b924ee2d169b7e9b3045701b63e425a Author: Nick Clemens Date: Wed May 17 12:54:44 2017 -0400 Bug 18478 - Some notices sent via SMS gateway fail It seems that for HOLD and DUE (and maybe more) notices we rely on C4::Letters::SendQueuedMessages to populate the correct address. This patch adjust that subroutine to correctly populate the field and/or fail messages if no SMS provider available To test: 1 - Define a messaging prefs for a patron to recieve hold notices via SMS 2 - Ensure you have defined an SMS message for 'HOLD' letter 3 - Set an SMS alert number for patron 4 - Set the SMS::Send driver to 'Email' 5 - Fill a hold for the patron 6 - Check the db and note the address is null 7 - run process_message_queue.pl 8 - Check db - address is null and message pending 9 - Apply patch 10 - run process_message_queue 11 - Message to_address should be populated and message sent Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall (cherry picked from commit 4fa3df9462eaa4a6a2399af4d7036d2f3ee990ce) Signed-off-by: Katrin Fischer commit 7bd3424847c7d4c922a623417636837ab11a6ca2 Author: Olivier Crouzet Date: Sat Apr 22 18:20:48 2017 +0200 Bug 18482 False duplicates detected on adding a batch-[16.11.x] For applying on 16.11.x When adding a batch from a stage file with defaut matching on title/author, if a duplicate is detected, all following records treated in the batch are discarded from import even if they are not duplicates Signed-off-by: Alex Buckley Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer commit 1607b2a18ba7b5ce9accfc673718f3d633e26edd Author: Jonathan Druart Date: Tue May 2 17:27:48 2017 -0300 Bug 18512: Add tests 16.11.X version Remove use of build_object Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer commit 9ce77e80a9dc82c0abaa82ccb35f2331c2d3f965 Author: Nick Clemens Date: Fri Apr 28 14:11:00 2017 -0400 Bug 18512 - GetAuthorisedValues.GetByCode Template plguin should return code (not empty string) if value not found To test: 1 - Create or edit a borrower with info in Sort1 and Sort2 field, not mapped to authorized values 2 - Note this info does not display on moremember.tt 3 - Apply patch 4 - Note value is passed through Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit 62c337065590a0eca51db37d286bcb04fa7971ff) Signed-off-by: Katrin Fischer commit cb82ca95ec579b6ad05b24163673e68039f56520 Author: Marcel de Rooy Date: Wed Apr 12 16:06:29 2017 +0200 Bug 14399: Results form also needs a few interface changes Currently, the value of compareinv2barcd is used to determine if the Seen column, the Select/Clear all buttons and the Mark seen buttons are displayed. But if we scanned barcodes, we already marked items as seen. So we should only display these buttons when we did not upload barcodes. Test plan: [1] Upload a barcode file. Check that the result form does not show the buttons. [2] Generate an inventory list, so do not upload a barcode file. Verify that you still see the buttons. Signed-off-by: Marcel de Rooy Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall (cherry picked from commit af89df12e72ea51010039a2206bb942bcc4c4b50) Signed-off-by: Katrin Fischer commit 122fa4c82af978b3d074ae4bafb2b0f49a3e4592 Author: Marcel de Rooy Date: Wed Apr 5 15:12:31 2017 +0200 Bug 14399: Interface changes A part of the confusion around the inventory script may arise from the fact that the form offers several options that are only used under certain conditions. This patch hopefully rearranges a few options more logically and only offers options when appropriate. The barcode fieldset now also contains Compare barcodes and Do not check in checkboxes. These are meaningful when a barcode file is uploaded. The fieldset Item location filters (new name) contains fields that are always used. Same for tne only control left under Additional options, Export to CSV. The fieldset Optional filters depends on the status of the barcode file and the Compare checkbox. It is now shown or hidden depending on what you select: if you do not upload a file, it is shown; or if you upload a file and check Compare, it is shown. Otherwise we hide it, since the script will not look at these values. Under this fieldset last inventory date and Skip items on loan are added, since their behavior is the same as the various item statuses. Test plan: In this test plan we test both the script changes from the previous patch and the interface changes here. We follow the three main scenario's as mentioned in the previous patch. [1] First we prepare a few test items. Pick two biblios A, B and create five items say A1,A2,B1,B2,B3. Pick a not-existing callnumber range you want to test and move these five items there. Add barcodes too (say A1..B3). Edit one item A1 to a not-existing notforloan status (doing this on the mysql command line is fastest). Like: update items set notforloan = '9' where barcode='A1'; Now simulate that we did not add/edit these items today: update items set datelastseen='2017-01-01' where barcode in ('A1','A2','B1','B2','B3'); Note: We need this when comparing with last inventory date in the last scenario. Scenario 1 (no barcodes uploaded) [2] Enter the callnumber range on inventory form. Verify that "Set inventory date", Compare barcodes and "Do not check in" are disabled on the form. Check that you see the Optional filters box. Submit the form. Verify that you see all five items. Do the same. Check Export to CSV. Check result file contents. Scenario 2 (upload barcodes, do not compare) [3] Create a barcode file with the barcodes of A1, A2 and B1. Add another existing barcode outside the test callnumber range. After uploading this file, verify that "Set inventory date", Compare and "Do not check in" are enabled. The Optional filters should be hidden. Leave "Set inventory date" to today. Enter the callnumber range again. Submit the form. What do we expect? Four items should have been updated (alert). We should see barcode A1 with problem Unknown status. We should see also the barcode from the other range (Found in wrong place). Repeat this step with the same file. But now export to CSV. Verify that you see two barcodes with problems again in the csv file. Scenario 3 (upload barcodes, compare) [4] Create another barcode file with barcodes of B2 and one existing barcode outside the test callnumber range. After uploading this file, check the Compare checkbox. Verify now that the Optional filters box is displayed again. Leave "Set inventory date" to today. Enter the callnumber range again. Also set "Last inventory date" to today (important!). Submit the form. What do we expect now? Two items should be updated (see alert). We should see barcode B3 with problem Missing. We should also see the barcode from the other range (wrong place). Signed-off-by: Marcel de Rooy Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall (cherry picked from commit 35b73aa3c6fb163f1389d30f0c175bec19696698) Signed-off-by: Katrin Fischer commit ba18e8e3bf173b07c4179cb1559fabc72b05f60a Author: Marcel de Rooy Date: Mon Apr 3 15:16:42 2017 +0200 Bug 14399: Numerous small refinements to the inventory script This patch contains the following changes: [01] Label "Inventory date" reworded to "Last inventory date", adding a small explanation for its purpose. [02] Restructured the results: it was an array with items and possible error messages. Multiple messages duplicated individual items. Now the results are in a hash, pulling all error messages for one item together. At the end of the script they are copied to an array. (A helper sub additemtoresults is added in this regard.) We no longer use array @items_with_problems. [03] Both datepickers are no longer connected to the same class. This prevents changing the set date by filling the last inventory date. [04] Input markseen in the template and $markseen in the script are no longer needed. [05] The paragraph before the detail link in the results table in the Title column has been removed. Same for problems column. This makes vertical spacing consistent. [06] Problem status 'missingitem' is no longer used; the missing items are marked as 'not_scanned'. Two additional statuses are: no_barcode and checkedout. [07] Removed unused $itemtype, $totalrecords and $count. We use variable $moddatecount to report a count to the template. [08] The script updated scanned items twice. The first time with ModItem and the second time with ModDateLastSeen. The second call is removed. [09] If a book is checked in, we do no longer return an error message when the checkin is successful (ERR_ONLOAN_RET). The updated datelastseen is passed to the results. [10] $wrongplacelist is renamed to $rightplacelist. It is only built when we need it. (Same for inventorylist now.) [11] Datelastseen (last inventory date) is always used for building the inventory list. It allows you to process partial barcode lists or make a list of items not seen after some date. We do no longer use variable $paramdatelastseen. [12] The section where items.datelastseen was compared with the inventory date has been removed. Scanned items were already updated; to get items seen before some date, you can now use last inventory date without passing barcodes. The form can mainly be used for the following three cases: [1] Prepare an inventory list or csv file; we do not upload barcodes. [2] Update items for uploaded barcodes without comparing to inventory. Last inventory date is useless in this case. Errors wrongplace, checkedout and changestatus are reported. Use this scenario for partial scanned barcode lists (all but last). [3] Update items for uploaded barcodes and compare to inventory, filtered by an optional last inventory date. Apart from the errors mentioned under [2], this also reports not_scanned ("missing") and no_barcode. Use this scenario too for the last partial barcode file (together with inventory date). Test plan: See next patch ("Interface changes"). Signed-off-by: Marcel de Rooy Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall (cherry picked from commit 6da97c7c8713bb16cbf6cf079df18534c3661414) Signed-off-by: Katrin Fischer commit 26977379950beb656e818b7f91cf86eff1af141f Author: Marcel de Rooy Date: Mon Apr 3 13:05:13 2017 +0200 Bug 14399: Prevent display of double zero notforloan status On bug 12913 a zero status is added on the inventory form. This prevents a lot of false warnings for a wrong notforloan status. The zero status is not included in the default setup. But if you would add one, the status will display here twice now. This patch checks if the status already exists. Test plan: [1] Add a zero NOTFORLOAN status if it does not yet exist in Authorized values. [2] Check that you do not see two "For loan" statuses on inventory form. Signed-off-by: Marcel de Rooy Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Kyle M Hall (cherry picked from commit e162c4d526e042c4b382629a7aec880dcfced346) Signed-off-by: Katrin Fischer commit a4e1c502726a23c31f7c2084577b30aa376b3124 Author: Mark Tompsett Date: Wed May 24 01:54:02 2017 -0400 Bug 5395: Update C4::Acquisition::SearchOrders POD Comparing the perldoc to the function: - basketname - basketgroupname - budget_id Were missing. This adds them. Also, a description of ordernumber and search were added, as they are not self-evident by their name alone. There are no code changes, so all tests should pass or fail identically before and after patch. Signed-off-by: Katrin Fischer Fixed typo basetgroupname Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall (cherry picked from commit 8ed599113c7592ec2e2227e3a7265a7e9cc9ca0e) Signed-off-by: Katrin Fischer commit 1f2bf282bf29bbc1fd4ed8f15e9217573543dc0e Author: David Cook Date: Thu May 25 14:37:21 2017 +1000 Bug 18669 - RewriteCond affecting wrong rule in koha-httpd.conf One of the RewriteCond directives in koha-httpd.conf was affecting the wrong RewriteRule after its original RewriteRule was commented out years ago. _TEST PLAN_ 0) Before applying patch, build Koha from source *) make *) make install (or make upgrade) *) Copy or symlink etc/koha-httpd.conf to your Apache vhost directory (and enable if you're on a Debian based system) *) Restart Apache 1) Make sure that you have at least 1 bibliographic record in Koha (URL like this http://server:port/cgi-bin/koha/opac-detail.pl?biblionumber=1) 2) Go to http://server:port/bib/1 3) Note that you get a 404 error 4) Apply the patch 5) Rebuild Koha from source as per step 0 6) Go to http://server:port/bib/1 7) Note that you now see the same page as you would if you went to http://server:port/cgi-bin/koha/opac-detail.pl?biblionumber=1 Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall (cherry picked from commit 9026169a235aa8133660ef649d98d8cedc5a4692) Signed-off-by: Katrin Fischer commit bebe91bafbb84381fea8b920665df117536e4651 Author: Marcel de Rooy Date: Fri May 26 10:25:10 2017 +0200 Bug 18611: [QA Follow-up] Add unit test for GetItemNumbersFromImportBatch Test plan: Run t/db_dependent/ImportBatch.t Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall (cherry picked from commit 01e7523dfb1ec9789f38dd6d7819cb5e3d7d7cc2) Signed-off-by: Katrin Fischer commit dfc043a6495e6426a950a2779bf688c5f95aabe5 Author: Marcel de Rooy Date: Fri May 26 10:20:00 2017 +0200 Bug 18611: [QA Follow-up] Make SQL query more readable Make it more explicit by adding join statements. Test plan: See next patch for adding a unit test. Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall (cherry picked from commit b37df275b85114ccd23986d94af7ed21544269e6) Signed-off-by: Katrin Fischer commit fac99c82ccbbc3462d0a8bead681ab9d1c19fa57 Author: Josef Moravec Date: Tue May 23 11:03:04 2017 +0000 Bug 18611 - Followup, remove tabs to make qa tools happy Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall (cherry picked from commit 092f02d227417ac9786e23651ab13fbd566589c8) Signed-off-by: Katrin Fischer commit ed4946ad4027e5a0da62e7f67387bd446d75d920 Author: Nick Clemens Date: Tue May 16 05:40:28 2017 -0400 Bug 18611 - Create labels action fails in manage-marc-import.pl if an item has been deleted from the import batch. To test: 1 - Import a batch with some items 2 - Delete one of the imported items 3 - Browse to Tools->Staged MARC record management 4 - Click (Create label batch) for the batch you imported 5 - Recieve an error 6 - Apply patch 7 - Click (Create label batch) 8 - Batch is created with remaning items from the import Signed-off-by: Josef Moravec Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall (cherry picked from commit 7249351f120f3bd02d7f7829af10bd89cae490dc) Signed-off-by: Katrin Fischer commit 134554f448b4a09210edbb65520d7d95163ccde5 Author: Katrin Fischer Date: Mon Jun 5 14:38:20 2017 +0200 Bug 18600 - DBRev 16.11.00.002 commit d4a7949c0466c3bd6900a93aa61c69e0e3469ec8 Author: Jonathan Druart Date: Tue May 23 16:16:39 2017 -0300 Bug 18600: Add pref TalkingTechItivaPhoneNotification if missing Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall (cherry picked from commit ec4b976289d68b4122f081f05ff7a7a023a32580) Signed-off-by: Katrin Fischer commit ae368a3eaaa70cf3f677ba49d5cb5ad21b72cafa Author: LeireDiez Date: Thu May 11 17:09:22 2017 +0200 Bug 18204 - Authority searches are not saved in Search history When you search an authority in Authority search, this search is not saved in Search history. EnableOpacSearchHistory is enabled Steps to test: 1- Login your account (opac) 2- Search an authority in Authority search 3- Go to Search history -> Authority 4- It says "Your authority search history is empty" Signed-off-by: Katrin Fischer Signed-off-by: Julian Maurice Signed-off-by: Kyle M Hall (cherry picked from commit d4e3e6af9fd054dc64844be49e8d1a0f28b545bd) Signed-off-by: Katrin Fischer commit bb9df1e552996eccb4e3fd650e7cc214a7b55720 Author: Jonathan Druart Date: Tue May 23 14:10:20 2017 -0300 Bug 16295: Fix access to MMT admin page There was a typo in the permission code Test plan: Try to access the marc modification templates admin page with the marc_modification_templates permission (and not all tools permissions) Signed-off-by: Josef Moravec Signed-off-by: Julian Maurice Signed-off-by: Kyle M Hall (cherry picked from commit d046474805b065f7419fefb06902d6ae18a0cd29) Signed-off-by: Katrin Fischer commit d88b51691bd3225f909cee961299807495d873a4 Author: Katrin Fischer Date: Mon Jun 5 14:26:35 2017 +0200 Bug 18663 - DBRev 16.11.00.001 commit b74de73f5521bb416edea9b7123eb3088f5e7e04 Author: Jonathan Druart Date: Tue May 23 16:16:17 2017 -0300 Bug 18663: Add pref ExportRemoveFields if missing Signed-off-by: Josef Moravec Signed-off-by: Julian Maurice Signed-off-by: Kyle M Hall (cherry picked from commit 6f29c775d92d72bd03188efea4a41b3fbb49e928) Signed-off-by: Katrin Fischer commit ae71ae912e7e8b714e7bf23130fb3acf492048d2 Author: Jonathan Druart Date: Fri May 26 11:45:31 2017 -0300 Bug 15465: Fix typo in bugs.k-c.org (cherry picked from commit 0b7c517bfe9c76b0e40f25f1fa5b1f3cf7a00dd3) Signed-off-by: Katrin Fischer commit 873aca09ae4bb96fd4dd44e1a8034701a43aedb9 Author: Josef Moravec Date: Fri May 5 10:23:23 2017 +0000 Bug 18548: Print usage when missing instance name in koha-create script Test plan: 1. Run: debian/scripts/koha-create --request-db -> Without patch you see the getent error message -> With patch you see usage and "Missing instance name" message Signed-off-by: Dilan Johnpulle Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit d2ed4fadc59260372baedab038d16bd7cb169b1c) Signed-off-by: Katrin Fischer commit 8ebbefed7323b303407dc972098a5ef1bd69c518 Author: Nick Clemens Date: Fri May 12 09:38:37 2017 -0400 Bug 18569 - Quick add patron will not copy over details from cities and towns pull down into patron details Followed test plan and the city value updates in the quick add form correctly. Signed-off-by: Dilan Johnpulle Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit e609679eb278383f573eda78048f8fa107ae159b) Signed-off-by: Katrin Fischer commit df74913f2e9cb5c2cb533f15c1ac4575054cdc57 Author: Nick Clemens Date: Thu May 18 22:00:44 2017 -0400 Bug 18598 - Quick add form doesn't clear values when switching To test: 1 - Fill out some fields in quick add 2 - Switch to full form and clear fields 3 - Switch back and fields are still populated 4 - Fill a field in long form 5 - Switch to quick add and clear it 6 - Save 7 - Value set in 4 is saved 8 - Apply patch 9 - Repeat 1-6 - values should be cleared and not saved Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit c762cd827e0a80960f3b23513981a382025b3bee) Signed-off-by: Katrin Fischer commit 00549f22cd049817ee6ef996d430fc04190ac1a3 Author: Nick Clemens Date: Fri May 12 09:18:45 2017 -0400 Bug 18596 - Quick add form duplicating password confirm To test: 1 - Add password to BorrowerMandatoryField 2 - View quick add form 3 - See confirm password twice 4 - Apply patch 5 - See confirm password once 6 - Add password to QuickAddFields 7 - Confirm one confirm field 8 - Remove password form BorrowerMandatory field 9 - Confirm there is one confirm field and password fields are not required Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit 3e5dbef9ef18e0eaadfff9c7d7b5838aec75fb36) Signed-off-by: Katrin Fischer commit 54d42d3465c42d4c72a64336a162f31c79d35a9f Author: Marcel de Rooy Date: Tue May 23 14:31:01 2017 +0200 Bug 18647: Resolve internal server error on category_type See bug 18552. When we resolved the housebound_role bug, the hash got filled correctly again. And this revealed that the (second) call to Koha::Patrons->find was not appropriate. It can be removed, as Jonathan explained on the report. Note: Commit 95429af6855e8ed37945b681dc466bf360deffb added this call, but it was hidden until the template variable hash got fixed. Test plan: Restart Plack and go to patron details again. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit 87bb59304e53755d7b4565c517578a838e1f0041) Signed-off-by: Katrin Fischer commit 21d8f726fa205b4b31f9a3b7f17227688a6b3449 Author: Marcel de Rooy Date: Fri May 19 12:22:03 2017 +0200 Bug 18552: [16.11.X] [QA Follow-up] Resolve warnings Like: Problem = a value of AutoResumeSuspendedHolds has been passed to param without key at /usr/share/koha/masterclone/C4/Templates.pm line 137. Problem = a value of relatives_borrowernumbers has been passed to param without key at /usr/share/koha/masterclone/C4/Templates.pm line 137. Problem is functions returning undef in list context (in this case housebound_role). No need to call Patrons::find a second time. Note: The call of GetDebarments in the first patch suffered from this too. It is in a fine place now too. But strictly speaking, should not have been moved. Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer commit ed66ddc018d0b8286e9b339b3e253f940f172c59 Author: Aleisha Amohia Date: Thu May 18 23:10:13 2017 +0000 Bug 18552: [16.11.X] Borrower debarments not showing on member detail page To test: 1) Go to a borrowers details page and create a manual restriction 2) Notice the restriction shows at the top of the page but the restriction tab says the member is currently unrestricted 3) Apply patch and refresh page 4) Restrictions tab should now correctly show debarments and correct number is shown 5) Confirming deleting and adding restrictions still works as expected Sponsored-by: Catalyst IT Followed test plan, works as expected Signed-off-by: Marc V?ron Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 9 +- C4/ImportBatch.pm | 25 ++- C4/Letters.pm | 8 + Koha.pm | 2 +- Koha/Item.pm | 14 ++ Koha/Template/Plugin/AuthorisedValues.pm | 2 +- README.md | 2 +- acqui/addorderiso2709.pl | 7 +- course_reserves/add_items.pl | 19 +- debian/scripts/koha-create | 2 + etc/koha-httpd.conf | 6 +- installer/data/mysql/updatedatabase.pl | 22 +++ koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 6 - .../prog/en/includes/patron-search.inc | 9 +- .../en/modules/course_reserves/add_items-step2.tt | 4 +- .../en/modules/course_reserves/course-details.tt | 2 +- .../prog/en/modules/members/member.tt | 4 +- .../prog/en/modules/members/memberentrygen.tt | 8 +- .../prog/en/modules/tools/inventory.tt | 115 +++++++---- koha-tmpl/intranet-tmpl/prog/js/members.js | 13 +- members/moremember.pl | 17 +- opac/opac-authorities-home.pl | 2 +- t/db_dependent/ImportBatch.t | 29 ++- t/db_dependent/Koha/Items.t | 10 +- t/db_dependent/Template/Plugin/AuthorisedValues.t | 71 +++++++ tools/inventory.pl | 204 +++++++++----------- tools/marc_modification_templates.pl | 2 +- 27 files changed, 397 insertions(+), 217 deletions(-) create mode 100644 t/db_dependent/Template/Plugin/AuthorisedValues.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 5 16:55:49 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 05 Jun 2017 14:55:49 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-15-g281e125 Message-ID: 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 281e1253777d2bd635610075fe610bedb2d47360 (commit) via cbb5096934907ec56df27d6ee3e77d752cd5e401 (commit) via c470b3e38486e3c6040a10f6b0bf90af069f4566 (commit) via c59e395b749132080fefb81e5b12f8c0b6654665 (commit) via 60b31a7a2219dea16f124684bd21e6d12a35c05a (commit) via 151cdcd133d8618a3faf9b47723d66ac3dc71b4e (commit) via cc91ce5997fab0e186e75945f3df87ce413ce4fd (commit) via cf5a1d5e5905664cd1a73691a75ecca40e575b99 (commit) via 8e7718ee655fd9846b2a44ad436995b9ea9a1f90 (commit) via f466a856a99f3109985e3867296d9b7467f32e58 (commit) via e0acd9bdf8500aa3cc2e5aeccbd1631f0b841040 (commit) via ef6211b319b58b4c35e8cb8555e1caa4da9b2a8f (commit) via cc54b596c3bb225f45ca0443728452444b807d4e (commit) via bb22703dcaa53400c17674b8bb7ba1cf76dffac8 (commit) via fe22e9d99c99881077cc5abf837125b8e1c107c3 (commit) from 5d94ff751379c9922ce5e197516a915f471b298a (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 281e1253777d2bd635610075fe610bedb2d47360 Author: Owen Leonard Date: Sat Apr 29 17:14:10 2017 +0000 Bug 13913 - Renewal error message in OPAC is confusing This patch adds some formatting to the error message a patron receives when there are renewal failures in the OPAC. This is pretty much the least which could be done to address this problem. However, I don't think the issue can be fixed without re-thinking how renewals are processed. Sending error messages back to opac-user.pl via URL parameter isn't flexible enough. To test, apply the patch and attempt to renew multiple items in the OPAC which cannot be renewed for some reason, for instance because they have been renewed too many times. The error messages should appear in a list rather than strung together in one long block of text. Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit cbb5096934907ec56df27d6ee3e77d752cd5e401 Author: Katrin Fischer Date: Tue May 2 01:08:02 2017 +0200 Bug 11122: Follow up - Fix some display issues and typos This patch fixes the display of copyrightdate for MARC21 installations. As MARC21 already requires you to add punctuation in cataloguing, there is usually no need for punctutation in the templates. Also fixes a template variable name typo and the basket summary page. To test (all 3 patches): - Add several order lines to an order, one should be uncertain - Verify that the publisher and publication year are displayed - Check the uncertain price page - Verify that the publisher code and publication year are displayed - Fix uncertain price and close your order - Basket summary: Verify... (you know what) - Cancel one of your orders - Verify... for cancelled orders - Receive shipment - Verify... for unreceived orders - Receive order - Verify ... for received orders - Finish receiving - Verify ... on the invoice summary page Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart commit c470b3e38486e3c6040a10f6b0bf90af069f4566 Author: Mark Tompsett Date: Sun Apr 19 20:28:21 2015 -0400 Bug 11122: Address MARC21 vs. UNIMARC issue In comment #6 and comment #17, Katrin pointed out the discrepancy between UNIMARC (using publisheryear) vs. Other MARC installations (using copyrightdate). This was dealt with in invoice.tt already. This patch does similar logic for the other 3 template files. Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart commit c59e395b749132080fefb81e5b12f8c0b6654665 Author: Fridolyn SOMERS Date: Wed Oct 23 12:05:23 2013 +0200 Bug 11122 - publisher code and publication year not fetched in acq orders In acquisition, several templates try to display publisher code and publication year : invoice.tt, parcel.tt, transferorder.tt. Thoses pages use C4::Acquisition methods GetPendingOrders or GetInvoiceDetails. The bug is that in the SQL query of those methods, biblioitems.publishercode and biblioitems.publicationyear. In uncertainprice.pl those datas are fetch using GetBiblioData. It whould be better to fetch them in GetPendingOrders and GetInvoiceDetails. This patch changes SQL queries to fetch wanted datas : aqorders.*,biblio.title,biblio.author,biblioitems.isbn,biblioitems.publishercode,biblioitems.publicationyear. GetInvoiceDetails also needs : biblio.seriestitle,biblioitems.volume. This patch also unifies the way biblio datas are displayed : [title] by [author] – [isbn] Publisher: [publishercode], [publicationyear] Test plan : - Choose a biblio record containing a data in : biblio.title, biblio.author, biblioitems.isbn, biblioitems.publishercode, biblioitems.publicationyear, biblio.seriestitle, biblioitems.volume. - Create an order using this biblio. - Look at this order in pages : parcel.pl, transferorder.pl, uncertainprice.pl => You see publisher code and publication year - Look at this order in page : invoice.pl => You see publisher code, publication year, series title and volume Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart commit 60b31a7a2219dea16f124684bd21e6d12a35c05a Author: Colin Campbell Date: Tue May 30 15:17:58 2017 +0100 Bug 18700 Fix grammar (data cannot be pluralized) data is a mass noun or plural of datum - datas is ungrammatical and jarring for a native speaker. Split the awkward sounding sentence into two for more clarity, thanks to Marc V?ron for the suggestion. Signed-off-by: Marc V?ron Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 151cdcd133d8618a3faf9b47723d66ac3dc71b4e Author: Marc V?ron Date: Thu May 25 23:04:14 2017 +0200 Bug 18673: News author does not display on staff client home page News authors do not display on staff client homepage, independently of syspref 'NewsAuthorDisplay'. This patch fixes the issue. To verify: - Create news with display location 'All' - Set syspref NewsAuthorDisplay to 'Staff client only' or 'Both OPAC and staff client' - Go to staff client - Verify that news author does not appear (but it should) To test: - Applly patch - Verify that news author is displayed as expected Followed test plan works as intended Signed-off-by: Alex Buckley Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit cc91ce5997fab0e186e75945f3df87ce413ce4fd Author: Marc V?ron Date: Sat May 20 11:46:00 2017 +0200 Bug 18643: Remove dead code in reports/statistics 'Till reconciliation' File koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt contains a link to /cgi-bin/koha/reports/stats.screen.pl with label 'Till reconciliation' that is commented out since years. Remove this link and the related files: cgi-bin/koha/reports/stats.screen.pl koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tt To test: - Apply patch - Verify that Koha > Reports still display the same - Verify that two files stats.screen.pl and stats_screen.tt are gone and thet they are not used anywhere in the Koha codebase Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit cf5a1d5e5905664cd1a73691a75ecca40e575b99 Author: Marcel de Rooy Date: Fri Jun 2 10:27:26 2017 +0200 Bug 18279: [QA Follow-up] Correct @EXPORT Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 8e7718ee655fd9846b2a44ad436995b9ea9a1f90 Author: Jonathan Druart Date: Wed Mar 15 17:47:13 2017 -0300 Bug 18279: Remove C4::Items::GetLostItems The JOIN done by this subroutine are not always useful (depending on item-level_itypes). They also search with LIKE when it is not needed. Since we have now Koha::Items, we can replace this subroutine with a call to Koha::Items->search with the correct parameters. A change in previous behaviours can happen: If a items.itemlost contains a value that is not defined as a LOST authorised value, the item will not be displayed. I think it's the expected behaviour, even if it should not happen in correctly configured installations. Test plan: To test with item-level_itypes set to item and biblio: List the lost items you have on your system, using the different filters available. The result table should contain the correct item's info. Followed test plan, works as expected. Signed-off-by: Marc V?ron Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit f466a856a99f3109985e3867296d9b7467f32e58 Author: Jonathan Druart Date: Wed Mar 15 19:02:21 2017 -0300 Bug 18295: C4::Items - Remove get_itemnumbers_of The code from scripts and subroutines using this subroutine was not very elegant. Most of the time the code was unnecessarily complex. This patch removes this subroutine and adapt the code to use Koha::Items instead. 1. C4::Items::get_hostitemnumbers_of I did not understand why the code was so complicated, it seems that we only want to know if a given item has a given biblionumber 2. cataloguing/merge.pl We want to retrieve the itemnumber for a given biblio. We could also have done that with: Koha::Biblios->find( $biblionumber )->items; 3. labels/label-item-search.pl We want to loop over the items for a given biblio, no need to use get_itemnumbers_of and GetItemInfosOf. We just need to use: Koha::Items->search({ biblionumber => $biblionumber }) 4. reserve/request.pl We want to retrieve the itemnumbers of the biblio's items We could also have done that with: Koha::Biblios->find( $biblionumber )->items->get_column('itemnumber'); Test plan: 1.You need to create analytical record relationships ( EasyAnalyticalRecords needs to be set). Link an item to a biblio using the 'Edit > Link to host item' menu from the biblio detail page. From the staff interface place a hold on the biblio. You should see the items from the biblio and the one you just linked 2. Merge two bibliographic records (with items), the resulting record should contain items from both original records 3. Create a new label batch, edit it. Add items to this batch ('Add items' button). Fill the input with a barcode. You should see all the items of a biblio. Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit e0acd9bdf8500aa3cc2e5aeccbd1631f0b841040 Author: Jonathan Druart Date: Wed Mar 15 17:14:56 2017 -0300 Bug 18278: C4::Items - Remove GetItemLocation This subroutine is no longer in used. It was previously call from serials/serials-recieve.pl, which was not used and has been removed by commit 65b7ad030cd5cd0e3148fbbd1496d31b5cf149f7 Bug 13423: Remove unused serials-recieve Test plan: git grep GetItemLocation Signed-off-by: Marc V?ron Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit ef6211b319b58b4c35e8cb8555e1caa4da9b2a8f Author: Nick Clemens Date: Tue May 30 16:55:19 2017 -0400 Bug 18704 - File types limit in tools/export.pl is causing issues with csv files generated by MS/Excel To test: 1 - Save a csv of biblionumber from MS/Excel 2 - Attempt to export records using this file 3 - It fails (mimetype is appliction/vnd.ms-excel) 4 - Apply patch 5 - Try again 6 - It succeeds! Signed-off-by: Jason Palmer Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit cc54b596c3bb225f45ca0443728452444b807d4e Author: Nick Clemens Date: Fri Apr 28 12:11:28 2017 -0400 Bug 18179: Update 1 occurrence in booksellers.pl To test: 1 - Load http://localhost:8081/cgi-bin/koha/acqui/booksellers.pl?booksellerid=1 2 - Should get internal server erro 3 - Apply patch 4 - Reload 5 - Should not get error Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart commit bb22703dcaa53400c17674b8bb7ba1cf76dffac8 Author: Jonathan Druart Date: Tue Apr 18 13:50:36 2017 -0300 Bug 18179: Update existing calls This patch updates the existing occurrences of ->find called in a list context. There are certainly others that are not easy to catch with git grep. Test plan: Confirm that the 4 modified scripts still works as expected. We need this one ASAP in master to make sure we will not get other side-effects of this kind and to catch possible uncaught occurrences before the release. Tested scripts changed by this patch, they work as expected. Signed-off-by: Marc V?ron Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart commit fe22e9d99c99881077cc5abf837125b8e1c107c3 Author: Jonathan Druart Date: Wed May 31 15:35:15 2017 -0300 Koha 17.06 - unstable (start of a new dev cycle) ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 3 + C4/Items.pm | 201 +-------------- Koha.pm | 2 +- acqui/booksellers.pl | 2 +- acqui/uncertainprice.pl | 20 +- cataloguing/merge.pl | 13 +- installer/data/mysql/updatedatabase.pl | 6 + .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 6 +- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 10 +- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 14 +- .../prog/en/modules/acqui/transferorder.tt | 7 +- .../prog/en/modules/acqui/uncertainprice.tt | 19 +- .../prog/en/modules/admin/admin-home.tt | 2 +- .../intranet-tmpl/prog/en/modules/intranet-main.tt | 1 + .../prog/en/modules/reports/itemslost.tt | 36 +-- .../prog/en/modules/reports/reports-home.tt | 1 - .../prog/en/modules/reports/stats_screen.tt | 131 ---------- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 24 +- labels/label-item-search.pl | 34 ++- members/memberentry.pl | 2 +- members/pay.pl | 4 +- opac/opac-user.pl | 2 +- reports/itemslost.pl | 50 ++-- reports/stats.screen.pl | 265 -------------------- reserve/request.pl | 6 +- tools/export.pl | 2 +- 26 files changed, 146 insertions(+), 717 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tt delete mode 100755 reports/stats.screen.pl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 5 17:02:16 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 05 Jun 2017 15:02:16 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-18-gfbade9e Message-ID: 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 fbade9e587b349449a50e6d6ba78309533268e51 (commit) via 6d76f61a6b0b6b429246c5a9398ec55f97d98027 (commit) via db3ebe47e859e85659b1a2565a03bcb6b59df0ff (commit) from 281e1253777d2bd635610075fe610bedb2d47360 (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 fbade9e587b349449a50e6d6ba78309533268e51 Author: Nick Clemens Date: Thu Apr 13 12:34:06 2017 -0400 Bug 18430 - Plugins page should have a link to viewing other types To test: Go to the plugins page from Reports->Report plugins Tools->Tool plugins Admin->Manage plugins Ensure that you have a 'View plugins by class button' Ensure the button does what you would expect Signed-off-by: Christopher Brannon Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 6d76f61a6b0b6b429246c5a9398ec55f97d98027 Author: Jonathan Druart Date: Tue May 9 15:56:32 2017 -0300 Bug 17944: QA follow-up - Remove an unused use statement - Fix pod - Use snake_case - Fix test "An itemtype cannot be deleted if and only if there is biblioitem linked with it" Signed-off-by: Jonathan Druart Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit db3ebe47e859e85659b1a2565a03bcb6b59df0ff Author: Alex Buckley Date: Sun Jan 22 01:52:50 2017 +0000 Bug 17944 - Add Koha::ItemType->can_be_deleted and use it from admin/itemtypes.pl Removed the sql code from Itemtypes.pm and replaced it with DBIx database query in the itemtypes.pl administrative script Test plan: 1. In the staff interface, stage and manage MARC records for import 2. Try to delete an itemtype. If there are items of that itemtype in the database then a message telling you the number of items of that itemtype there are will be displayed. 3. Record that number 4. View the admin/itemtpes.pl script and confirm that there is sql code written in this file. 5. Apply this patch 6. View the admin/itemtypes.pl script and observe that there is no sql in this file. There is however DBIx code, for example $schema->resultset('Item')->search({ 'itype' => $itemtype_code} ); which is searching for items with the itype value matching $itemtype_code value. 7. In the staff interface try to delete the same itemtype 8. Record the number of items there are with that itemtype in the resulting message 9. The numbers recorded in steps 3 and 8 should match showing that the DBIx code is working as intended Signed-off-by: Jonathan Druart Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: Koha/ItemType.pm | 17 ++++++++++++++ admin/itemtypes.pl | 24 +++++++------------- .../prog/en/modules/admin/itemtypes.tt | 2 +- .../prog/en/modules/plugins/plugins-home.tt | 9 +++++++- t/db_dependent/Koha/ItemTypes.t | 20 +++++++++++++++- 5 files changed, 53 insertions(+), 19 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 5 18:00:37 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 05 Jun 2017 16:00:37 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-28-geddf975 Message-ID: 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 eddf975cf0244c731f987c64af5126090f73f9f2 (commit) via 5f6e1e00c265a552cf6faa7b7fa30db725204eb6 (commit) via 6e40ced5c27fa704b48ff4e1a226bb2693192545 (commit) via e3519f15382351d04827b1d64e413f4ffbae0637 (commit) via 273659cc031b9be0c79fe199f4ec76c7bb44ac26 (commit) via 7e111f1b3f1056e1cf75c5805dd2f85958ef9484 (commit) via 9ca8275862e5730595fdd99d90295c90ba708e15 (commit) via 23e0db00784a3de3642e87dbff3d858cb92b5a74 (commit) via 7457f278af685eb3f71eed57db2ff333c1c32814 (commit) via 3c83e117869e501275fffc88ac10c9e1aee92160 (commit) from fbade9e587b349449a50e6d6ba78309533268e51 (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 eddf975cf0244c731f987c64af5126090f73f9f2 Author: Marc V?ron Date: Tue May 23 07:08:41 2017 +0200 Bug 18653: Possible privacy breach with OPAC password recovery OPAC password recovery allows to find out which email address belongs to an account. An attacker could systematically guess login names. If they hit an existing one, OPAC displays a message like: An email has been sent to "xxx at yyy.zz". Having a combination of login name and email, attackers could use the information e.g. for phishing or other personalized actions. To reproduce: - Enable OPAC password recovery (syspref OpacResetPassword) - 'Guess' a login name e.g. by using a common pattern like ptester for Peter Tester - If such account exists, you get to know the related email address This patch removes the email address from the success message. Additionaly, it changes wording to address Bug 18570 ('will be sent' instead of 'has been sent') Signed-off-by: Marcel de Rooy Simplified the wording. "Will be sent shortly" is used elsewhere too. Signed-off-by: Jonathan Druart commit 5f6e1e00c265a552cf6faa7b7fa30db725204eb6 Author: Jonathan Druart Date: Mon Jun 5 12:55:36 2017 -0300 Bug 8612: Update installer files for late_issues Signed-off-by: Jonathan Druart commit 6e40ced5c27fa704b48ff4e1a226bb2693192545 Author: Jonathan Druart Date: Mon Jun 5 12:27:12 2017 -0300 Bug 8612: DBRev 17.06.00.001 Signed-off-by: Jonathan Druart commit e3519f15382351d04827b1d64e413f4ffbae0637 Author: Jonathan Druart Date: Mon Jun 5 12:35:10 2017 -0300 Bug 8612: Remove warnings from tests Signed-off-by: Jonathan Druart commit 273659cc031b9be0c79fe199f4ec76c7bb44ac26 Author: Marcel de Rooy Date: Fri Jun 2 08:08:57 2017 +0200 Bug 8612: [QA Follow-up] Remove two newlines from template output When using the Default profile from the basket form, the resulting csv file has an additional newline after the headers and at the end. This patch removes them. Unit test adjusted accordingly. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 7e111f1b3f1056e1cf75c5805dd2f85958ef9484 Author: Josef Moravec Date: Mon Mar 20 09:05:13 2017 +0000 Bug 8612: [Follow-up] Fix unit test GetBasketAsCSV.t Test plan: Run t/db_dependent/Acquisition/GetBasketAsCSV.t Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 9ca8275862e5730595fdd99d90295c90ba708e15 Author: Josef Moravec Date: Thu May 4 07:43:27 2017 +0000 Bug 8612: [Follow-up] Fix regular expression Fix regular expression to do what is described in the comment Make header in CSV profile definition optional Strip white chars from csv profile definition Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 23e0db00784a3de3642e87dbff3d858cb92b5a74 Author: Josef Moravec Date: Mon Mar 20 11:13:47 2017 +0000 Bug 8612: [Followup] Update DBIx schema Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 7457f278af685eb3f71eed57db2ff333c1c32814 Author: Josef Moravec Date: Mon Mar 20 11:12:54 2017 +0000 Bug 8612: [Follow-up] Make usage and type different columns in table Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 3c83e117869e501275fffc88ac10c9e1aee92160 Author: Blou Date: Thu Mar 26 16:07:44 2015 -0400 Bug 8612: Use CSV profile for exporting basket This patch allows the user to use a CSV export profile to create the fields to export the basket as CSV in a basket page. Test plan: 1) Apply the patch 2) Go to Tools ? CSV export profiles and create a profile of type "SQL for basket export in acquisition" example: biblionumber=biblio.biblionumber|auteur=biblio.author|titre=biblio.title|date=biblioitems.copyrightdate|editeur=biblioitems.publishercode|isbn=biblioitems.isbn|quantite=aqorders.quantity|prix=aqorders.rrp|panier=aqorders.basketno 3) In acquisition module, create a new basket and add an order to the basket 4) On basket detail page, there should be the split button labelled "Export to CSV" 5) Try to use the button and export CSV with your CSV profile you defined in step 2 6) Validate the CSV file. 7) Repeat 4-6 with a closed basket. a) close the basket b) View the basket c) validate that there is an export button d) test it with an export 8) prove t/db_dependent/Acquisition/GetBasketAsCSV.t t/db_dependent/Koha/CsvProfiles.t Initial work: Sponsored by: CCSR Signed-off-by: Josef Moravec Signed-off-by: mehdi Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 124 ++++++++++++++------ Koha.pm | 2 +- Koha/Schema/Result/ExportFormat.pm | 18 ++- acqui/basket.pl | 9 +- basket/basket.pl | 2 +- basket/downloadcart.pl | 2 +- .../data/mysql/de-DE/optional/csv_profiles.sql | 4 +- installer/data/mysql/en/optional/csv_profiles.sql | 4 +- .../data/mysql/fr-CA/facultatif/csv_profiles.sql | 4 +- .../data/mysql/it-IT/necessari/csv_profiles.sql | 4 +- installer/data/mysql/kohastructure.sql | 1 + installer/data/mysql/updatedatabase.pl | 13 ++ .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 39 +++++- .../prog/en/modules/acqui/csv/basket.tt | 5 +- .../prog/en/modules/tools/csv-profiles.tt | 71 ++++++++--- .../bootstrap/en/modules/opac-password-recovery.tt | 2 +- opac/opac-downloadcart.pl | 2 +- opac/opac-downloadshelf.pl | 2 +- serials/claims.pl | 2 +- t/db_dependent/Acquisition/GetBasketAsCSV.t | 83 +++++++++++++ t/db_dependent/Koha/CsvProfiles.t | 5 +- tools/csv-profiles.pl | 6 + tools/export.pl | 2 +- virtualshelves/downloadshelf.pl | 2 +- virtualshelves/shelves.pl | 2 +- 25 files changed, 331 insertions(+), 79 deletions(-) create mode 100644 t/db_dependent/Acquisition/GetBasketAsCSV.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 5 22:21:08 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 05 Jun 2017 20:21:08 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-40-gdd9da3e Message-ID: 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 dd9da3e8f64ac4eb8fde5a1a58e0d692542ce2e6 (commit) via 279126d710233f7925432ab1f8fa6ae9f947889e (commit) via 880c2e19c3c5f10f110fd80a44f0d111b9d05472 (commit) via 1c8c84f4be8665d95ededf5174c406e1a63d6529 (commit) via c5726913774ed25c4125e65a12054a00c2f7dd76 (commit) via 0ee3249438b85cb47aa9ff623bac4f405df7161f (commit) via 5a30dea05b158fd6a77b0495ee047310865072eb (commit) via 953504a0769a38a60f379a2e9c72bf7b71814fd0 (commit) via 1a023a670c1bf0faffe51faefc42fdd6407c2320 (commit) via 17fd5a4ffb6fa92e1ce522ac8f8cf5fdeb343868 (commit) via 00d3a883b5e4d2ff1f5badef3c5dc33d7913bebe (commit) via 16307c40343cdb0ed4ff69c9c001fc4d9e1a459f (commit) from eddf975cf0244c731f987c64af5126090f73f9f2 (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 dd9da3e8f64ac4eb8fde5a1a58e0d692542ce2e6 Author: Marc V?ron Date: Fri May 26 11:06:56 2017 +0200 Bug 18675: Translatability: Get rid of [%% in translation for csv-profiles.tt Translation tool for file csv-profiles.tt picks following line: %s [%% IF csv_profile.encoding == encoding OR NOT csv_profile AND encoding == 'utf8' %%] It is is due to a line break inside a template directive. This patch removes it. To test: - Verify that code change makes sense - Apply patch - Verify that csv exports behave as before Signed-off-by: Jonathan Druart commit 279126d710233f7925432ab1f8fa6ae9f947889e Author: Marc V?ron Date: Mon May 29 20:13:03 2017 +0200 Bug 18690 - Typos in Koha database description (Table "borrowers") This string patch fixes typos in kohastructure.sql as described in initial comment. To test: - Carefully verify that string changes make sense Signed-off-by: Jonathan Druart commit 880c2e19c3c5f10f110fd80a44f0d111b9d05472 Author: Marc V?ron Date: Tue May 30 09:37:02 2017 +0200 Bug 18681 - (followup) Remove on more [%% in translation for about.tt Test plan same as in previous patch Run QA tools in newest version (test for line breaks in tt directives) Signed-off-by: Jonathan Druart commit 1c8c84f4be8665d95ededf5174c406e1a63d6529 Author: Marc V?ron Date: Fri May 26 19:11:59 2017 +0200 Bug 18681: Translatability: Get rid of [%% in translation for about.tt Translation tool picks a line %s [%% IF warnPrefBiblioAddsAuthorities || warnPrefEasyAnalyticalRecords || ...due to a line break inside a template directive. This patch fixes it. To test: - Update QA tools (see https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18675#c2) - Verify that code change makes sense - Apply patch - Run QA tools Followed test plan and everything was as intended Signed-off-by: Alex Buckley Signed-off-by: Alex Buckley Signed-off-by: Jonathan Druart commit c5726913774ed25c4125e65a12054a00c2f7dd76 Author: Marc V?ron Date: Tue May 30 10:47:48 2017 +0200 Bug 18695: Translatability: Get rid of [%% INCLUDE in translation for circulation.tt The file circ/circulation.tt exposes the following line to translation: %s %s [%% INCLUDE 'blocked-fines.inc' fines = chargesamount %%] %s %s Translators should not be confronted with code internals. This patch fixes it by removing a line break. To test: - Verify that code change makes sense - Run QA tools in newest version (check for line breaks in tt directives) - Bonus test: Create a "language" aa-AA (perl translate create aa-AA from folder misc/translator, verify that line mentioned above do no longer appear in aa-AA-staff-prog.po ) Signed-off-by: Jonathan Druart commit 0ee3249438b85cb47aa9ff623bac4f405df7161f Author: Marc V?ron Date: Tue May 30 07:13:31 2017 +0200 Bug 18693: Translatability: Get rid of exposing a [%% FOREACH loop in translation for branch-selector.inc The file branch-selector.inc exposes the following line to translation (due to newlines insied a tt directive): %s %s [%% FOREACH branch IN branches; IF branch.selected; selectall = 0; END; END %%] Additionally, export.tt exposes the following line to translation: [%% INCLUDE 'branch-selector.inc' branches = libraries %%] To test: - Apply patch - In Staff client, go to Home > Tools > Export data - Verify that library selection behaves as before - Bonus test: Create a "language" aa-AA (perl translate create aa-AA from folder misc/translator, verify that lines mentioned above do no longer appear in aa-AA-staff-prog.po - Run QA tools (newest version with test for newlines in tt directives) Signed-off-by: Jonathan Druart commit 5a30dea05b158fd6a77b0495ee047310865072eb Author: Marc V?ron Date: Tue May 30 11:23:20 2017 +0200 Bug 18644: Translatability: Get rid of pure template directives in translation for memberentrygen.tt Translation for memberentrygen.tt exposes a lot of template directives like the following: [% UNLESS opduplicate %][% othernames | html %][% END %] Translators should not be confronted with such code internals. To test: - Review code changes - Verify that creating / editing patrons works as before - Bonus test: Create a "language" aa-AA (perl translate create aa-AA from folder misc/translator, verify that lines like mentioned above do no longer appear in aa-AA-staff-prog.po Signed-off-by: Jonathan Druart commit 953504a0769a38a60f379a2e9c72bf7b71814fd0 Author: Marc V?ron Date: Tue May 30 14:27:56 2017 +0200 Bug 18682 - Translatability: Get rid of [%% in translation for 2 files av-build-dropbox.inc Two files av-build-dropbox.inc has linebreaks inside template directives, exposing internals (comments and tt code) to translations as mentioned in initial comment. Translators should not be confronted with such interal code. This patch fixes it. To test - Verify, that code changes make sense and have no more line breaks insied tt directives. - Run QA tools in newest version (checking for line breaks inside tt directives) - Bonus test: Create a "language" aa-AA (perl translate create aa-AA from folder misc/translator, verify that lines mentioned above do no longer appear in aa-AA-staff-prog.po and in aa-AA-opac-bootstrap.po Signed-off-by: Jonathan Druart commit 1a023a670c1bf0faffe51faefc42fdd6407c2320 Author: Marc V?ron Date: Tue May 30 17:50:57 2017 +0200 Bug 18701: Translatability: Get rid of exposed tt directives in matching-rules.tt Translation for file matching-rules.tt exposes a lot of template directives. Translators should not be confronted with internal code like the following: [%% PROCESS norms_select selected_norm=\"none\" id=\"mc_1_src_c_1_n_1_norm\" "name=\"mc_1_src_c_1_n_1_norm\" %%] To test: - Apply patch - Verify that code changes make sense (removes line breaks in directives) - Run QA tools in newset version (tests for line breaks in tt) - Bonus test: create a new translation e.g. fpr language 'aa-AA', verify that such lines no longer appear in po/aa-AA-staff-prog.po (for matching-rules.tt) Signed-off-by: Jonathan Druart commit 17fd5a4ffb6fa92e1ce522ac8f8cf5fdeb343868 Author: Marc V?ron Date: Tue May 30 18:50:16 2017 +0200 Bug 18702: Translatability: Get rid of exposed if statement in tt for translated onboardingstep2.tt The file onboardingstep2.tt exposes the following to translations: "[%% IF (categories && categories.count > 1 ) # This if statement checks if " "the categories variable handed to this template # by onboarding.pl has data " "in it. If the categories variable does have data # in it this means that the " "user has previously imported sample patron category # data and so we do not " "need to show them the create patron category screen 1, #instead we can " "display a screen with ubtton redirecting the user to step 3 %%] " Translators should not be confronted with such internals. This patch removes it To test: - Verify that code change makes sense - Run QA tools - Bonus test: Create a new "language" aa-AA and verify that the lines above are no longer exposed. Signed-off-by: Jonathan Druart commit 00d3a883b5e4d2ff1f5badef3c5dc33d7913bebe Author: Marc V?ron Date: Tue May 30 21:10:32 2017 +0200 Bug 18648: Translatability: Get rid of tt directives in translation for macles.tt koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt contains template directives inside a div tag: This is exposed in translation tool. To test: - Carefully examine code changes - Apply patch, verify that the directive is no longer exposed (picked for po files), e.g. by creating a new "language" aa-AA and examing aa-AA-staff-prog.po - If you know where / how this macles is used, verify that it behaves as before (Note: New patch, needs new sign off) Signed-off-by: Jonathan Druart commit 16307c40343cdb0ed4ff69c9c001fc4d9e1a459f Author: Marc V?ron Date: Sun Jun 4 22:09:14 2017 +0200 Bug 13747: Fix problems with frequency descriptions containing quotes If a serial frequency description contains quotes or is surrounded by quotes, the description is empty ("TEST" > empty) or shown without the quotes part (TEST "sth" > TEST) on editing the frequency. To verify: - Create a new frequency with description: "Test" - Modify frequency - Verify the description field is empty To test: - Apply patch - Try to recreate, verify that the description field is correctly filled when editing - Test also with a name like: 'A "souble quoted" name' Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/kohastructure.sql | 30 +++++------ .../prog/en/includes/av-build-dropbox.inc | 21 +++----- .../prog/en/includes/branch-selector.inc | 10 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 6 +-- .../prog/en/modules/admin/matching-rules.tt | 57 +++++--------------- .../en/modules/cataloguing/value_builder/macles.tt | 3 +- .../prog/en/modules/circ/circulation.tt | 4 +- .../prog/en/modules/members/memberentrygen.tt | 20 +++---- .../prog/en/modules/onboarding/onboardingstep2.tt | 12 ++--- .../en/modules/serials/subscription-frequencies.tt | 2 +- .../prog/en/modules/tools/csv-profiles.tt | 3 +- .../intranet-tmpl/prog/en/modules/tools/export.tt | 3 +- .../bootstrap/en/includes/av-build-dropbox.inc | 19 +++---- 13 files changed, 71 insertions(+), 119 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 5 22:32:45 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 05 Jun 2017 20:32:45 +0000 Subject: [koha-commits] main Koha release repository branch 16.11.x updated. v16.11.08-37-g1da486d Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 16.11.x has been updated via 1da486da8987ce92299b2fdc8dd43bb1963ed6c4 (commit) via 056b895223fff8454407f249f496321a9e291874 (commit) from 477ce133588931d3529196771b40e59a23efa60e (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 1da486da8987ce92299b2fdc8dd43bb1963ed6c4 Author: Nick Clemens Date: Tue May 23 16:11:06 2017 -0400 Bug 18478 - QA Followup Make sure to build necessary letters Fix awkward construction Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer commit 056b895223fff8454407f249f496321a9e291874 Author: Nick Clemens Date: Wed May 17 12:58:09 2017 -0400 Bug 18478 - Unit tests Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer ----------------------------------------------------------------------- Summary of changes: C4/Letters.pm | 2 +- t/db_dependent/Letters.t | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 5 22:57:52 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 05 Jun 2017 20:57:52 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-54-g61f556d Message-ID: 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 61f556d47d37e677411200ed29e12118d73f482c (commit) via 5abcef4f54269a0c39eb6852795d4b6350ad30f1 (commit) via b237b4f34785286e844cc7aedf82dfbebb5c3438 (commit) via 92c0ea7d76323b03d1fc089e8770b604eeccbcb6 (commit) via 57469b3b19d23ac5b8e6c67a72278c505eeba1b4 (commit) via c1f42859b54dfbfb06316826375b4608bdc3fefb (commit) via 8bf72439c0e20c5fa8f3f735ebc36b04ec6a749f (commit) via 617988a7c10d5807f1d2be3b026a30466adb0b33 (commit) via 1985e6e4b3bd5fafe685b1a1e4874ea239f44261 (commit) via fb3654077ff7331c71c033ddcedfe576fd8d7e28 (commit) via 70ae3a9dc26bb0af8567431c3e0e5d236a527103 (commit) via 71c75f4773015ffe36811b6d5de6b995ccf7a2f3 (commit) via b5b1d3282e52427b16f1133742908ed27b28ea80 (commit) via 149d8a6ec2413fc59a8bb51d520adec49b46bbe5 (commit) from dd9da3e8f64ac4eb8fde5a1a58e0d692542ce2e6 (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 61f556d47d37e677411200ed29e12118d73f482c Author: Olli-Antti Kivilahti Date: Thu Mar 16 21:28:08 2017 +0200 Bug 18289 - Fix t/Prices.t having a Test::DBIx::Class cache issue REPLICATE ISSUE: perl t/Prices.t -> fails AFTER THIS PATCH AND DEPENDENCIES: perl t/Prices.t -> OK Signed-off-by: Jonathan Druart commit 5abcef4f54269a0c39eb6852795d4b6350ad30f1 Author: Olli-Antti Kivilahti Date: Thu Mar 16 21:26:36 2017 +0200 Bug 18288 - Fix t/SocialData.t having a Test::DBIx::Class cache issue REPLICATE ISSUE: perl t/SocialData.t -> fails AFTER THIS PATCH AND DEPENDENCIES: perl t/SocialData.t -> OK Signed-off-by: Jonathan Druart commit b237b4f34785286e844cc7aedf82dfbebb5c3438 Author: Olli-Antti Kivilahti Date: Thu Mar 16 21:17:24 2017 +0200 Bug 18287 - Fix t/Koha.t having a Test::DBIx::Class cache issue REPLICATE ISSUE: perl t/Koha.t -> fails AFTER THIS PATCH AND DEPENDENCIES: perl t/Koha.t -> OK Signed-off-by: Jonathan Druart commit 92c0ea7d76323b03d1fc089e8770b604eeccbcb6 Author: Jonathan Druart Date: Mon Jun 5 17:32:43 2017 -0300 Bug 18226: Perltidy + license Signed-off-by: Jonathan Druart commit 57469b3b19d23ac5b8e6c67a72278c505eeba1b4 Author: Marcel de Rooy Date: Wed May 24 14:14:50 2017 +0200 Bug 18226: [QA Follow-up] Remove verbose Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit c1f42859b54dfbfb06316826375b4608bdc3fefb Author: Marcel de Rooy Date: Wed May 24 14:10:29 2017 +0200 Bug 18226: [QA Follow-up] Remove further assumptions on branch count See also follow-up on bug 18286. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 8bf72439c0e20c5fa8f3f735ebc36b04ec6a749f Author: Olli-Antti Kivilahti Date: Tue Mar 7 18:56:29 2017 +0200 Bug 18226 - Remove "use Test::DBIx::Class" instantiations' dangerous code duplication Is 'instantiations' even a word? Use a Test::DBIx::Class defaults instead. Save your keyboard and prevent horrible bugs from emerging from rampant code duplication. This change doesn't seem to have any impact on the speed of executing those tests. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 617988a7c10d5807f1d2be3b026a30466adb0b33 Author: Olli-Antti Kivilahti Date: Wed Mar 8 17:34:28 2017 +0200 Bug 18226 - Remove "use Test::DBIx::Class" instantiations' dangerous code duplication. Replace mock_dbh 2 Couldn't make the tests pass using Test::DBIx::Class, so reverted to the "usual way" since these tests are in db_dependent anyway. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 1985e6e4b3bd5fafe685b1a1e4874ea239f44261 Author: Olli-Antti Kivilahti Date: Tue Mar 7 19:19:52 2017 +0200 Bug 18226 - Remove "use Test::DBIx::Class" instantiations' dangerous code duplication. Replace mock_dbh 1 t/00-load.t already checks if all of the perl modules can be compiled. The tests deleted in this commit do a duplicate test with t/00-load.t Hence they have become unnecessary. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit fb3654077ff7331c71c033ddcedfe576fd8d7e28 Author: Marcel de Rooy Date: Tue May 2 16:18:41 2017 +0200 Bug 18286: [Follow-up] Remove assumption on branch count A test in db_dependent should not make assumptions on the number of branches in the database. If you need one, create one. Removing the assumption of a non-zero count. Removing the library count statement outside the subtest. Replacing C4::Context by Koha::Database. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 70ae3a9dc26bb0af8567431c3e0e5d236a527103 Author: Marcel de Rooy Date: Tue May 2 15:46:08 2017 +0200 Bug 18286: [QA Follow-up] Fix some warnings from qa tools [1] Resolve warning on variable assignment before use strict. [2] Remove unused $schema variable. [3] Remove eval expression construction. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 71c75f4773015ffe36811b6d5de6b995ccf7a2f3 Author: Marcel de Rooy Date: Tue May 2 15:44:47 2017 +0200 Bug 18286: [Follow-up] Add t/etc/schema.pl We need this file here already. Copied from bug 18226 and adjusted in order to keep qa tools quiet. Test plan: Run t/db_dependent/01-test_dbic.t again. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit b5b1d3282e52427b16f1133742908ed27b28ea80 Author: Olli-Antti Kivilahti Date: Thu Mar 16 21:08:31 2017 +0200 Bug 18286: Test::DBIx::Class connection/schema is shadowed by a cached connection/schema If Koha::Database->schema gets called before use Test::DBIx::Class The DB connection from $KOHA_CONF is cached. This happens most of the time because when C4::Context and friends are loaded (in compile-time?), they already access the DB. After Test::DBIx::Class is instantiated and hooks put in place to overload Koha::Schema connection, those hooks are never called due to getting the old connection from cache. This feature introduces a test case to replicate the behaviour and shows how flushing the connection cache solves the problem. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart commit 149d8a6ec2413fc59a8bb51d520adec49b46bbe5 Author: Olli-Antti Kivilahti Date: Thu Mar 16 20:59:35 2017 +0200 Bug 18285: Koha::Database schema cache accessors Safe way of getting and flushing the $database->{schema} -cache. This is needed by Test::DBIx::Class to overcome pre-initialization connection caching from C4::Context and others. See Bug 18286. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: Koha/Database.pm | 17 +++++ t/00-load.t | 2 +- t/Auth_with_shibboleth.t | 2 +- t/Biblio.t | 8 +-- t/Breeding.t | 28 -------- t/Calendar.t | 7 +- t/Images.t | 7 +- t/Koha.t | 8 +-- t/Letters.t | 7 +- t/Matcher.t | 7 +- t/Members/cardnumber.t | 2 +- t/Members_AttributeTypes.t | 7 +- t/Message.t | 29 -------- t/NorwegianPatronDB.t | 7 +- t/Overdues.t | 29 -------- t/Patron.t | 2 +- t/Prices.t | 8 +-- t/RotatingCollections.t | 29 -------- t/Search.t | 2 +- t/SocialData.t | 8 +-- t/SuggestionEngine_AuthorityFile.t | 2 +- t/XSLT.t | 15 +--- t/db_dependent/01-test_dbic.t | 110 ++++++++++++++++++++++++++++++ t/db_dependent/Circulation/CalcDateDue.t | 40 +++++------ t/db_dependent/Context.t | 2 +- t/db_dependent/Sitemapper.t | 7 +- t/etc/schema.pl | 9 +++ t/lib/Mocks.pm | 9 --- 28 files changed, 177 insertions(+), 233 deletions(-) delete mode 100755 t/Breeding.t delete mode 100755 t/Message.t delete mode 100755 t/Overdues.t delete mode 100755 t/RotatingCollections.t create mode 100644 t/db_dependent/01-test_dbic.t create mode 100644 t/etc/schema.pl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 6 21:01:59 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 06 Jun 2017 19:01:59 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-55-g023b089 Message-ID: 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 023b0890a25d1420a0f4ecb28d54c08a06e6479e (commit) from 61f556d47d37e677411200ed29e12118d73f482c (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 023b0890a25d1420a0f4ecb28d54c08a06e6479e Author: Jonathan Druart Date: Tue Jun 6 11:06:29 2017 -0300 Bug 18648: Fix syntax 'unexpected end of input' ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/cataloguing/value_builder/macles.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jun 7 16:33:16 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 07 Jun 2017 14:33:16 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-56-g88e50b6 Message-ID: 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 88e50b6a68a9b433c55cea2d2c8d525edc1887ea (commit) from 023b0890a25d1420a0f4ecb28d54c08a06e6479e (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 88e50b6a68a9b433c55cea2d2c8d525edc1887ea Author: Jonathan Druart Date: Wed Mar 15 19:50:18 2017 -0300 Bug 18296: C4::Items - Remove GetItemInfosOf At this point this subroutine is only used once, from reserve/request.pl. Since we already have the items, it's easy to populate the different hashes as the rest of the code is expecting it. Test plan: You need to create analytical record relationships ( EasyAnalyticalRecords needs to be set). Link an item to a biblio using the 'Edit > Link to host item' menu from the biblio detail page. From the staff interface place a hold on the biblio. You should see the items from the biblio and the one you just linked Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy ----------------------------------------------------------------------- Summary of changes: C4/Items.pm | 21 --------------------- labels/label-item-search.pl | 1 - reserve/request.pl | 20 +++++++++++--------- 3 files changed, 11 insertions(+), 31 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jun 8 17:02:52 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 08 Jun 2017 15:02:52 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-57-gb5b0465 Message-ID: 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 b5b046599b6604c6cfd681d8392c560b3df738d2 (commit) from 88e50b6a68a9b433c55cea2d2c8d525edc1887ea (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 b5b046599b6604c6cfd681d8392c560b3df738d2 Author: Jonathan Druart Date: Thu Jun 8 11:59:38 2017 -0300 Bug 18296: Remove perlcritic error (request.pl) "$itemnumbers_of_biblioitem" is declared but not used at line 314, column 5. Unused variables clutter code and make it harder to read. (Severity: 3) Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: reserve/request.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jun 8 17:16:21 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 08 Jun 2017 15:16:21 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-58-g9a55f57 Message-ID: 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 9a55f5783c91b92cb8518f423ab23bd9727051ee (commit) from b5b046599b6604c6cfd681d8392c560b3df738d2 (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 9a55f5783c91b92cb8518f423ab23bd9727051ee Author: Jonathan Druart Date: Thu Jun 8 11:54:18 2017 -0300 Bug 18759: Try to fix random failure from Circulation.t Circulation.t is failing randomly on our CI https://jenkins.koha-community.org/job/Koha_Master_D8/192/console # Failed test at t/db_dependent/Circulation.t line 1147. # got: '1' # expected: '0' # Failed test at t/db_dependent/Circulation.t line 1152. # got: '1' # expected: '0' # Failed test at t/db_dependent/Circulation.t line 1156. # got: '1' # expected: '0' # Failed test at t/db_dependent/Circulation.t line 1170. # got: '1' # expected: '0' # Failed test at t/db_dependent/Circulation.t line 1184. # got: '1' # expected: '0' # Looks like you failed 5 tests of 23. Sometimes one of the alert or impossible flags is set. This patch guesses that it's because of the 'restricted' value of the item that is evaluated to 1. If it is not fixed by this patch, we will have more info next time (at least know if alert or impossible is set). Signed-off-by: Tomas Cohen Arazi The fix is trivial. Using random data will lead to this situations. The good thing is that it lets us spot places in which tests need more fine-grained data. ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Circulation.t | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jun 8 22:04:56 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 08 Jun 2017 20:04:56 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x created. v17.05.00 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 17.05.x has been created at 5d94ff751379c9922ce5e197516a915f471b298a (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 9 12:45:52 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 09 Jun 2017 10:45:52 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.00-2-gd89f00f Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 17.05.x has been updated via d89f00f3fdb3149776880f143d0a1ca6597b155f (commit) via 36dc4d8527e923c6a1f1c7160e7d5ad3ddf70aa3 (commit) from 5d94ff751379c9922ce5e197516a915f471b298a (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 d89f00f3fdb3149776880f143d0a1ca6597b155f Author: Nick Clemens Date: Fri Apr 28 12:11:28 2017 -0400 Bug 18179: Update 1 occurrence in booksellers.pl To test: 1 - Load http://localhost:8081/cgi-bin/koha/acqui/booksellers.pl?booksellerid=1 2 - Should get internal server erro 3 - Apply patch 4 - Reload 5 - Should not get error Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit cc54b596c3bb225f45ca0443728452444b807d4e) Signed-off-by: Fridolin Somers commit 36dc4d8527e923c6a1f1c7160e7d5ad3ddf70aa3 Author: Jonathan Druart Date: Tue Apr 18 13:50:36 2017 -0300 Bug 18179: Update existing calls This patch updates the existing occurrences of ->find called in a list context. There are certainly others that are not easy to catch with git grep. Test plan: Confirm that the 4 modified scripts still works as expected. We need this one ASAP in master to make sure we will not get other side-effects of this kind and to catch possible uncaught occurrences before the release. Tested scripts changed by this patch, they work as expected. Signed-off-by: Marc V?ron Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit bb22703dcaa53400c17674b8bb7ba1cf76dffac8) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: acqui/booksellers.pl | 2 +- members/memberentry.pl | 2 +- members/pay.pl | 4 ++-- opac/opac-user.pl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 9 12:56:27 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 09 Jun 2017 10:56:27 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.00-3-g283ccd4 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 17.05.x has been updated via 283ccd4da55ce950cf7ace02688daf0db7c0e494 (commit) from d89f00f3fdb3149776880f143d0a1ca6597b155f (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 283ccd4da55ce950cf7ace02688daf0db7c0e494 Author: Nick Clemens Date: Tue May 30 16:55:19 2017 -0400 Bug 18704 - File types limit in tools/export.pl is causing issues with csv files generated by MS/Excel To test: 1 - Save a csv of biblionumber from MS/Excel 2 - Attempt to export records using this file 3 - It fails (mimetype is appliction/vnd.ms-excel) 4 - Apply patch 5 - Try again 6 - It succeeds! Signed-off-by: Jason Palmer Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit ef6211b319b58b4c35e8cb8555e1caa4da9b2a8f) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: tools/export.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 9 14:12:25 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 09 Jun 2017 12:12:25 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.00-4-g80775d9 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 17.05.x has been updated via 80775d9494fe383a1463e0b1f2564ce9f2a7b74d (commit) from 283ccd4da55ce950cf7ace02688daf0db7c0e494 (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 80775d9494fe383a1463e0b1f2564ce9f2a7b74d Author: Jonathan Druart Date: Wed Mar 15 17:14:56 2017 -0300 Bug 18278: C4::Items - Remove GetItemLocation This subroutine is no longer in used. It was previously call from serials/serials-recieve.pl, which was not used and has been removed by commit 65b7ad030cd5cd0e3148fbbd1496d31b5cf149f7 Bug 13423: Remove unused serials-recieve Test plan: git grep GetItemLocation Signed-off-by: Marc V?ron Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit e0acd9bdf8500aa3cc2e5aeccbd1631f0b841040) ----------------------------------------------------------------------- Summary of changes: C4/Items.pm | 86 ----------------------------------------------------------- 1 file changed, 86 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 9 14:44:01 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 09 Jun 2017 12:44:01 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.00-6-g9a9dd32 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 17.05.x has been updated via 9a9dd3268db3845ac2e76f8f1dbc2e0e11e6b032 (commit) via 42a73053001dc033ea50bd386496b28021906148 (commit) from 80775d9494fe383a1463e0b1f2564ce9f2a7b74d (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 9a9dd3268db3845ac2e76f8f1dbc2e0e11e6b032 Author: Marc V?ron Date: Thu May 25 23:04:14 2017 +0200 Bug 18673: News author does not display on staff client home page News authors do not display on staff client homepage, independently of syspref 'NewsAuthorDisplay'. This patch fixes the issue. To verify: - Create news with display location 'All' - Set syspref NewsAuthorDisplay to 'Staff client only' or 'Both OPAC and staff client' - Go to staff client - Verify that news author does not appear (but it should) To test: - Applly patch - Verify that news author is displayed as expected Followed test plan works as intended Signed-off-by: Alex Buckley Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 151cdcd133d8618a3faf9b47723d66ac3dc71b4e) Signed-off-by: Fridolin Somers commit 42a73053001dc033ea50bd386496b28021906148 Author: Jonathan Druart Date: Wed Mar 15 19:02:21 2017 -0300 Bug 18295: C4::Items - Remove get_itemnumbers_of The code from scripts and subroutines using this subroutine was not very elegant. Most of the time the code was unnecessarily complex. This patch removes this subroutine and adapt the code to use Koha::Items instead. 1. C4::Items::get_hostitemnumbers_of I did not understand why the code was so complicated, it seems that we only want to know if a given item has a given biblionumber 2. cataloguing/merge.pl We want to retrieve the itemnumber for a given biblio. We could also have done that with: Koha::Biblios->find( $biblionumber )->items; 3. labels/label-item-search.pl We want to loop over the items for a given biblio, no need to use get_itemnumbers_of and GetItemInfosOf. We just need to use: Koha::Items->search({ biblionumber => $biblionumber }) 4. reserve/request.pl We want to retrieve the itemnumbers of the biblio's items We could also have done that with: Koha::Biblios->find( $biblionumber )->items->get_column('itemnumber'); Test plan: 1.You need to create analytical record relationships ( EasyAnalyticalRecords needs to be set). Link an item to a biblio using the 'Edit > Link to host item' menu from the biblio detail page. From the staff interface place a hold on the biblio. You should see the items from the biblio and the one you just linked 2. Merge two bibliographic records (with items), the resulting record should contain items from both original records 3. Create a new label batch, edit it. Add items to this batch ('Add items' button). Fill the input with a barcode. You should see all the items of a biblio. Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit f466a856a99f3109985e3867296d9b7467f32e58) ----------------------------------------------------------------------- Summary of changes: C4/Items.pm | 51 ++------------------ cataloguing/merge.pl | 13 ++--- .../intranet-tmpl/prog/en/modules/intranet-main.tt | 1 + labels/label-item-search.pl | 34 ++++++------- reserve/request.pl | 6 +-- 5 files changed, 27 insertions(+), 78 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 9 15:03:46 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 09 Jun 2017 13:03:46 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.00-7-gad741d2 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 17.05.x has been updated via ad741d2512e23746ceb009b2c0a7f57403ab3bb5 (commit) from 9a9dd3268db3845ac2e76f8f1dbc2e0e11e6b032 (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 ad741d2512e23746ceb009b2c0a7f57403ab3bb5 Author: Colin Campbell Date: Tue May 30 15:17:58 2017 +0100 Bug 18700 Fix grammar (data cannot be pluralized) data is a mass noun or plural of datum - datas is ungrammatical and jarring for a native speaker. Split the awkward sounding sentence into two for more clarity, thanks to Marc V?ron for the suggestion. Signed-off-by: Marc V?ron Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 60b31a7a2219dea16f124684bd21e6d12a35c05a) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 9 15:06:02 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 09 Jun 2017 13:06:02 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-59-g78b30ba Message-ID: 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 78b30baf3fa975ab9eabc58733a2252b08d22f25 (commit) from 9a55f5783c91b92cb8518f423ab23bd9727051ee (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 78b30baf3fa975ab9eabc58733a2252b08d22f25 Author: Marc V?ron Date: Sat May 20 09:18:10 2017 +0200 Bug 18641 - Translatability: Get rid of template directives in translations for *reserves.tt files Template directives should not be exposed in translation, but lines like the following pop up in the translation tool: Cancel [% IF TransferWhenCancelAllWaitingHolds %]and Transfer [% END %] All This patch fixes it. To test: - Apply patch - Verify that code changes make sense - Verify that submit buttons of pendingreserves.tt and waitingreserves.tt still work and display the same string as before Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy Bug 18641: (RM-followup) for waitingreserves.tt Code changed for waitingreserves.tt as asked for in comment #7 Bug 18641: Followup for pendingreserves.tt (less %s) Change as of comment #13 to reduce %s After creating a new translation for a "language" aa-AA, we have the following in the file aa-AA-staff-prog.po msgid "" "(Inclusive, default is %s days ago to %s days ahead. Set other date ranges " "as needed.)" msgstr "" msgid "" "(Inclusive, default is %s days ago to today. Set other date ranges as " "needed.)" msgstr "" Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 8 +++++++- .../intranet-tmpl/prog/en/modules/circ/waitingreserves.tt | 7 +++++-- 2 files changed, 12 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 9 15:13:03 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 09 Jun 2017 13:13:03 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-60-g1577460 Message-ID: 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 1577460c713e3ac7e602dce81738f974e86ddf9d (commit) from 78b30baf3fa975ab9eabc58733a2252b08d22f25 (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 1577460c713e3ac7e602dce81738f974e86ddf9d Author: Jonathan Druart Date: Fri Jun 9 10:08:37 2017 -0300 Bug 18759: (follow-up) Try to fix random failure from Circulation.t If IndependentBranches, CanBookBeRenewed will set ITEMNOTSAMEBRANCH or BORRNOTSAMEBRANCH flags, if the branches do not match. ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Circulation.t | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 9 15:24:18 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 09 Jun 2017 13:24:18 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-62-gfcec2c7 Message-ID: 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 fcec2c71b4e362ffa7e1a443cdff9ace91761b9d (commit) via 89d36585bb3483ac46c87224391b6867ae8468bb (commit) from 1577460c713e3ac7e602dce81738f974e86ddf9d (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 fcec2c71b4e362ffa7e1a443cdff9ace91761b9d Author: Jonathan Druart Date: Fri Jun 9 10:21:33 2017 -0300 Bug 18746: Add license and remove diag Signed-off-by: Jonathan Druart commit 89d36585bb3483ac46c87224391b6867ae8468bb Author: Mark Tompsett Date: Wed Jun 7 18:07:13 2017 -0400 Bug 18746: Text_CSV_Various parse failures While it might be an idea to just delete it, this patch attempts to catch everything and make it clear that Text::CSV::Unicode (binary) is the parser that should be used. Signed-off-by: Lee Jamison Running 'prove xt/author/Text_CSV_Various.t' passes Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: xt/author/Text_CSV_Various.t | 59 ++++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 14 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 9 15:34:25 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 09 Jun 2017 13:34:25 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.00-10-g428467a Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 17.05.x has been updated via 428467a0228429ba78020e9097ede7c43ad6d04e (commit) via 003e52896eeb74ca8c9d9ea253eff4f6022e52c0 (commit) via 44a80fe0665c0d375faf6b5bded8a2fe96b5ff24 (commit) from ad741d2512e23746ceb009b2c0a7f57403ab3bb5 (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 428467a0228429ba78020e9097ede7c43ad6d04e Author: Katrin Fischer Date: Tue May 2 01:08:02 2017 +0200 Bug 11122: Follow up - Fix some display issues and typos This patch fixes the display of copyrightdate for MARC21 installations. As MARC21 already requires you to add punctuation in cataloguing, there is usually no need for punctutation in the templates. Also fixes a template variable name typo and the basket summary page. To test (all 3 patches): - Add several order lines to an order, one should be uncertain - Verify that the publisher and publication year are displayed - Check the uncertain price page - Verify that the publisher code and publication year are displayed - Fix uncertain price and close your order - Basket summary: Verify... (you know what) - Cancel one of your orders - Verify... for cancelled orders - Receive shipment - Verify... for unreceived orders - Receive order - Verify ... for received orders - Finish receiving - Verify ... on the invoice summary page Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit cbb5096934907ec56df27d6ee3e77d752cd5e401) Signed-off-by: Fridolin Somers commit 003e52896eeb74ca8c9d9ea253eff4f6022e52c0 Author: Mark Tompsett Date: Sun Apr 19 20:28:21 2015 -0400 Bug 11122: Address MARC21 vs. UNIMARC issue In comment #6 and comment #17, Katrin pointed out the discrepancy between UNIMARC (using publisheryear) vs. Other MARC installations (using copyrightdate). This was dealt with in invoice.tt already. This patch does similar logic for the other 3 template files. Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit c470b3e38486e3c6040a10f6b0bf90af069f4566) Signed-off-by: Fridolin Somers commit 44a80fe0665c0d375faf6b5bded8a2fe96b5ff24 Author: Fridolyn SOMERS Date: Wed Oct 23 12:05:23 2013 +0200 Bug 11122 - publisher code and publication year not fetched in acq orders In acquisition, several templates try to display publisher code and publication year : invoice.tt, parcel.tt, transferorder.tt. Thoses pages use C4::Acquisition methods GetPendingOrders or GetInvoiceDetails. The bug is that in the SQL query of those methods, biblioitems.publishercode and biblioitems.publicationyear. In uncertainprice.pl those datas are fetch using GetBiblioData. It whould be better to fetch them in GetPendingOrders and GetInvoiceDetails. This patch changes SQL queries to fetch wanted datas : aqorders.*,biblio.title,biblio.author,biblioitems.isbn,biblioitems.publishercode,biblioitems.publicationyear. GetInvoiceDetails also needs : biblio.seriestitle,biblioitems.volume. This patch also unifies the way biblio datas are displayed : [title] by [author] – [isbn] Publisher: [publishercode], [publicationyear] Test plan : - Choose a biblio record containing a data in : biblio.title, biblio.author, biblioitems.isbn, biblioitems.publishercode, biblioitems.publicationyear, biblio.seriestitle, biblioitems.volume. - Create an order using this biblio. - Look at this order in pages : parcel.pl, transferorder.pl, uncertainprice.pl => You see publisher code and publication year - Look at this order in page : invoice.pl => You see publisher code, publication year, series title and volume Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit c59e395b749132080fefb81e5b12f8c0b6654665) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 3 +++ acqui/uncertainprice.pl | 20 ++------------------ .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 6 ++++-- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 10 ++++------ .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 14 ++++++++++++-- .../prog/en/modules/acqui/transferorder.tt | 7 ++++++- .../prog/en/modules/acqui/uncertainprice.tt | 19 ++++++++++++++----- 7 files changed, 45 insertions(+), 34 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 9 15:56:22 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 09 Jun 2017 13:56:22 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-63-ge426da4 Message-ID: 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 e426da4e009ce63c10923eaddd1ca271dca8005e (commit) from fcec2c71b4e362ffa7e1a443cdff9ace91761b9d (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 e426da4e009ce63c10923eaddd1ca271dca8005e Author: Tomas Cohen Arazi Date: Fri Jun 9 10:46:49 2017 -0300 Bug 18766: Remove itemtype-related warnings from ArticleRequests.t This patch fixes a small mistake on that test file (itype vs. itemtype in itemtypes table) To test: - Run: $ sudo koha-shell kohadev k$ cd kohaclone k$ prove t/db_dependent/ArticleRequests.t => FAIL: itemtype-related warning displayed - Apply the patch - Run k$ prove t/db_dependent/ArticleRequests.t => SUCCESS: No warnings, YAY! - Sign off :-D Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart ----------------------------------------------------------------------- Summary of changes: t/db_dependent/ArticleRequests.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 9 16:19:42 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 09 Jun 2017 14:19:42 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.00-11-g14e8f5b Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 17.05.x has been updated via 14e8f5bb713bd4f45a85f028e0c9b5738f3eefd5 (commit) from 428467a0228429ba78020e9097ede7c43ad6d04e (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 14e8f5bb713bd4f45a85f028e0c9b5738f3eefd5 Author: Owen Leonard Date: Sat Apr 29 17:14:10 2017 +0000 Bug 13913 - Renewal error message in OPAC is confusing This patch adds some formatting to the error message a patron receives when there are renewal failures in the OPAC. This is pretty much the least which could be done to address this problem. However, I don't think the issue can be fixed without re-thinking how renewals are processed. Sending error messages back to opac-user.pl via URL parameter isn't flexible enough. To test, apply the patch and attempt to renew multiple items in the OPAC which cannot be renewed for some reason, for instance because they have been renewed too many times. The error messages should appear in a list rather than strung together in one long block of text. Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 281e1253777d2bd635610075fe610bedb2d47360) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 9 16:30:59 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 09 Jun 2017 14:30:59 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.00-13-g14e84e4 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 17.05.x has been updated via 14e84e422ee5c454e2bce341a124330b047deb63 (commit) via c31db771b38053867369fd5833f0b4f1ee7e9b0d (commit) from 14e8f5bb713bd4f45a85f028e0c9b5738f3eefd5 (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 14e84e422ee5c454e2bce341a124330b047deb63 Author: Jonathan Druart Date: Tue May 9 15:56:32 2017 -0300 Bug 17944: QA follow-up - Remove an unused use statement - Fix pod - Use snake_case - Fix test "An itemtype cannot be deleted if and only if there is biblioitem linked with it" Signed-off-by: Jonathan Druart Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 6d76f61a6b0b6b429246c5a9398ec55f97d98027) Signed-off-by: Fridolin Somers commit c31db771b38053867369fd5833f0b4f1ee7e9b0d Author: Alex Buckley Date: Sun Jan 22 01:52:50 2017 +0000 Bug 17944 - Add Koha::ItemType->can_be_deleted and use it from admin/itemtypes.pl Removed the sql code from Itemtypes.pm and replaced it with DBIx database query in the itemtypes.pl administrative script Test plan: 1. In the staff interface, stage and manage MARC records for import 2. Try to delete an itemtype. If there are items of that itemtype in the database then a message telling you the number of items of that itemtype there are will be displayed. 3. Record that number 4. View the admin/itemtpes.pl script and confirm that there is sql code written in this file. 5. Apply this patch 6. View the admin/itemtypes.pl script and observe that there is no sql in this file. There is however DBIx code, for example $schema->resultset('Item')->search({ 'itype' => $itemtype_code} ); which is searching for items with the itype value matching $itemtype_code value. 7. In the staff interface try to delete the same itemtype 8. Record the number of items there are with that itemtype in the resulting message 9. The numbers recorded in steps 3 and 8 should match showing that the DBIx code is working as intended Signed-off-by: Jonathan Druart Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit db3ebe47e859e85659b1a2565a03bcb6b59df0ff) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: Koha/ItemType.pm | 17 ++++++++++++++ admin/itemtypes.pl | 24 +++++++------------- .../prog/en/modules/admin/itemtypes.tt | 2 +- t/db_dependent/Koha/ItemTypes.t | 20 +++++++++++++++- 4 files changed, 45 insertions(+), 18 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 9 16:42:53 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 09 Jun 2017 14:42:53 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.00-14-g2d1dad1 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 17.05.x has been updated via 2d1dad1a4afa1bfaa14715b7953ed8265dbdb398 (commit) from 14e84e422ee5c454e2bce341a124330b047deb63 (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 2d1dad1a4afa1bfaa14715b7953ed8265dbdb398 Author: Marc V?ron Date: Tue May 23 07:08:41 2017 +0200 Bug 18653: Possible privacy breach with OPAC password recovery OPAC password recovery allows to find out which email address belongs to an account. An attacker could systematically guess login names. If they hit an existing one, OPAC displays a message like: An email has been sent to "xxx at yyy.zz". Having a combination of login name and email, attackers could use the information e.g. for phishing or other personalized actions. To reproduce: - Enable OPAC password recovery (syspref OpacResetPassword) - 'Guess' a login name e.g. by using a common pattern like ptester for Peter Tester - If such account exists, you get to know the related email address This patch removes the email address from the success message. Additionaly, it changes wording to address Bug 18570 ('will be sent' instead of 'has been sent') Signed-off-by: Marcel de Rooy Simplified the wording. "Will be sent shortly" is used elsewhere too. Signed-off-by: Jonathan Druart (cherry picked from commit eddf975cf0244c731f987c64af5126090f73f9f2) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 9 16:50:52 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 09 Jun 2017 14:50:52 +0000 Subject: [koha-commits] main Koha release repository branch 17.05.x updated. v17.05.00-15-g17df245 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 17.05.x has been updated via 17df2459ddc294eb2499fce6d9f6f32d20e6db67 (commit) from 2d1dad1a4afa1bfaa14715b7953ed8265dbdb398 (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 17df2459ddc294eb2499fce6d9f6f32d20e6db67 Author: Marc V?ron Date: Sun Jun 4 22:09:14 2017 +0200 Bug 13747: Fix problems with frequency descriptions containing quotes If a serial frequency description contains quotes or is surrounded by quotes, the description is empty ("TEST" > empty) or shown without the quotes part (TEST "sth" > TEST) on editing the frequency. To verify: - Create a new frequency with description: "Test" - Modify frequency - Verify the description field is empty To test: - Apply patch - Try to recreate, verify that the description field is correctly filled when editing - Test also with a name like: 'A "souble quoted" name' Signed-off-by: Jonathan Druart (cherry picked from commit 16307c40343cdb0ed4ff69c9c001fc4d9e1a459f) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/serials/subscription-frequencies.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 9 17:48:07 2017 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 09 Jun 2017 15:48:07 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v17.05.00-72-g8d22702 Message-ID: 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 8d2270254187b7d876d466860a76fd231b9549c2 (commit) via 6bb4a0405abe0d03be3915644c6a05e2e3ee1e9f (commit) via 7c9273be169ca4da47059aa152f8c6ea11137a52 (commit) via c35932923407e9ec088957f877e8607289b6b914 (commit) via 78a9f39f9a97179af3e3a38cf8cb17b3f043d88a (commit) via 6e7c125a56be8971ec9c9bb52373bff5004a936a (commit) via f1d90f205e3dc8177c0d524b208d9d4a367cf56e (commit) via 6a2ef935ac63c67a4b31d8c3eb9bcb8d974d844e (commit) via eb0a67ea10c9210dbfb42f810c280b7515b04a16 (commit) from e426da4e009ce63c10923eaddd1ca271dca8005e (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 8d2270254187b7d876d466860a76fd231b9549c2 Author: Julian Maurice Date: Wed Jun 7 11:29:46 2017 +0200 Bug 18741: Fix loading of SQL files in web installer Test plan: 1. Start a normal install using the web installer 2. When asked to select data to load, verify that 'message_transport_types' is checked, and check some optional data files 3. Continue the install to the end 4. Verify that message_transport_types is not empty, and that the optional data you checked is there Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart commit 6bb4a0405abe0d03be3915644c6a05e2e3ee1e9f Author: Fridolin Somers Date: Wed May 31 16:10:41 2017 +0200 Bug 18706 - Remove useless Javascript Whe checking a subfield to be deleted, the code $(this).val($(this).siblings("[name='subfield']").val()); is useless, the checkbox already contains the subfield code : Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit 7c9273be169ca4da47059aa152f8c6ea11137a52 Author: Fridolin Somers Date: Wed May 31 16:02:44 2017 +0200 Bug 18706 - subfields to delete not disabled anymore in batch item modification In Tools > Batch item modification, one can click a checkbox to delete a subfield. This click use to disable the input to change the field value. This comes from the patch : Bug 13501: Move "Required" and checkbox after input/select Because input is found using JQuery next(). This patch replaces with $(this).parent().find("[name='field_value']"). Test plan : - Go to Tools > Batch item modification - Enter a barcode and submit - Click on a checkbox on a non-mandatory subfield => Without patch the input or select is not disabled => With patch the input or select is disabled - Submit => Check that subfield is deleted Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit c35932923407e9ec088957f877e8607289b6b914 Author: Tomas Cohen Arazi Date: Thu Jun 1 23:52:07 2017 -0300 Bug 18716: Remove CGI::param warns from updatesupplier.pl This script floods the logs with this kind of warnings. To test: - Run: $ koha-plack-err - Edit a vendor in the acquisitions module - Save => FAIL: Logs show lots of warnings that look like: CGI::param called in list context from package CGI::Compile::ROOT::home_vagrant_kohaclone_acqui_updatesupplier_2epl - Apply this patch - Run: $ restart_all $ koha-plack-err - Edit a vendor, add/delete vendor contacts => SUCESS: No more warnings - Verify editing and storing vendor contacts works as expected. - Sign off :-D Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart commit 78a9f39f9a97179af3e3a38cf8cb17b3f043d88a Author: Tomas Cohen Arazi Date: Fri Jun 9 11:16:08 2017 -0300 Bug 18767: Remove useless diags from GetDailyQuote.t This tests print useless debugging info. To test: - Run: $ sudo koha-shell kohadev k$ cd kohaclone k$ prove t/db_dependent/Koha/GetDailyQuote.t => FAIL: Some output telling what is doing on each step is printed. - Apply the patch - Run k$ prove t/db_dependent/Koha/GetDailyQuote.t => SUCCESS: No output, YAY! - Sign off :-D Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart commit 6e7c125a56be8971ec9c9bb52373bff5004a936a Author: Marc V?ron Date: Mon Jun 5 06:52:58 2017 +0200 Bug 18727: System preferences loose part of values because of double quotes System preferences do not display values of text fields properly if they contain doulbe quotes. To recreate: - Go to Home > Administration > System preferences , then tab Acquisitions - Enter values to both system preferences like proposed in the example (o=5|a="bar foo" and o=5|a="foo bar") - Save - Click on tab Acquisitions to reload - Wrong result: Both preferences show a value of: o=5|a= (parts with double quotes are truncated) - Edit any of the email addresses (Bug 9814): KohaAdminEmailAddress, NoticeBcc, ReplytoDefault, PayPalUser - Set value to: "The Library" - Search for this email address syspref to re-display it - Wrong result: Use [ ] " autocomplete="off" /> as the email address for the administrator of Koha. To test: - Apply patch - Try to recreate issues above - Additionally, edit other system preferences that could contain double quotes, e.g. LibraryName or UsageStatsLibraryName - Set value to: Bibliothek "Zur Leseratte" (Note: patch contains a tiny fix for a typo in acquisitions.pref) Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart commit f1d90f205e3dc8177c0d524b208d9d4a367cf56e Author: Marc V?ron Date: Sun Jun 4 18:04:00 2017 +0200 Bug 18689: calendar error with double quotes in title or description of holiday This patch fixes the calendar display with holidays having double qoutes in title or description. To test: - Apply patch - Go to Home > Tools > Calendar - Create new holidays of each type (Day only, repeated wekly/yearly, range, yearly repeated range and enter double qoutes in their titles and descriptions - Verify that calendar displays and works as expected - Verify that you can edit the holidays Signed-off-by: Lee Jamison Signed-off-by: Jonathan Druart commit 6a2ef935ac63c67a4b31d8c3eb9bcb8d974d844e Author: Josef Moravec Date: Mon Jun 5 11:20:18 2017 +0000 Bug 18722: Fund name is not shown in received orders fund subtotals Test plan: 1) Go to acquisition and receive some orders 2) Show the receive summary for invoice --> without patch, the fund name in subtotal is not shown --> with patch the name is shown as expected Signed-off-by: Michael Cabus Signed-off-by: Jonathan Druart commit eb0a67ea10c9210dbfb42f810c280b7515b04a16 Author: Mark Tompsett Date: Mon Jun 5 12:24:07 2017 -0400 Bug 18730: Batch Mod Edit