]> git.koha-community.org Git - koha.git/log
koha.git
8 years agoBug 16511: Making contracts actions buttons
Aleisha [Fri, 13 May 2016 00:46:40 +0000 (00:46 +0000)]
Bug 16511: Making contracts actions buttons

To test:
1) Go to Acqui -> find a vendor
2) On Vendor details page (supplier.pl) confirm that Contracts table now
   has one column called Actions
3) Confirm that Edit and Delete show as buttons
4) Confirm that buttons don't wrap on a narrower browser
5) Click Contracts tab
6) Confirm Actions column, Edit and Delete buttons, and button's don't
   wrap

Sponsored-by: Catalyst IT
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 23c8dc0e6384779c0eaf8441d598b60ac6aea46e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 16524: Use floating toolbar on item search
Aleisha [Tue, 17 May 2016 00:22:09 +0000 (00:22 +0000)]
Bug 16524: Use floating toolbar on item search

To test:
1) Go to item search
2) Confirm toolbar at top of page with Search button, goes down page as
   you scroll
3) Confirm search button has been removed from final output fieldset
4) Confirm everything works as expected

Sponsored-by: Catalyst IT
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 2afff4e8502d724f4f9e46bd406e1f00263b2b21)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 16525: Have cancel button when adding new aq budget
Aleisha [Mon, 16 May 2016 01:10:43 +0000 (01:10 +0000)]
Bug 16525: Have cancel button when adding new aq budget

At the moment you only see the cancel button on the form if editing an
existing budget. This patch adds a cancel button to the form which adds
a budget. Also changes the wording of the save button from 'Save
changes' to just 'Save' so it makes more sense when adding a new budget

To test:
1) Go to Admin -> Budgets -> New budget
2) Notice 'Save changes' button and no cancel
3) Apply patch and refresh page
4) Notice 'Save' button and 'cancel' link
5) Click 'cancel' - should be taken to Budgets administration page
6) Edit an existing budget
7) Click 'cancel' - should be taken to the funds page for that budget

Sponsored-by: Catalyst IT
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Sabine Liebmann <Liebmann@dipf.de>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Still an issue: If edit a budget fron aqbudgets.pl, then cancel, you get
aqbudgets.pl?budget_period_id=XX. But existed before this patch.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit c4f17a6eb3e5688b1d1f3c4b578f17ae80e46f8f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 16001 - Use standard message dialog when there are no cities to list
Owen Leonard [Mon, 7 Mar 2016 17:12:40 +0000 (12:12 -0500)]
Bug 16001 - Use standard message dialog when there are no cities to list

If there are no existing cities in Administration -> Cities and Towns,
the message saying so should be in the standard message dialog.

Another minor change: Edit the message to say "There are no cities
defined," which I think reads better in English.

To test you must have no cities and towns defined.

Apply this patch and go to Administration -> Cities and Towns. You
should see a message displayed in a standard "message" style dialog.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Better view, no errors

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 89b41ede653227c5b4f777d6a4b30422ab473153)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 16532: Groups showing empty tables if no groups defined
Aleisha [Tue, 17 May 2016 05:04:08 +0000 (05:04 +0000)]
Bug 16532: Groups showing empty tables if no groups defined

EDIT: Same change for libraries

To test:
1) Go to Admin -> Libraries and Groups
2) Notice empty tables if nothing defined
3) Apply patch and refresh page
4) Empty tables should not show
5) Add a new group
6) Confirm table shows correctly

Sponsored-by: Catalyst IT
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit ca36a74c868f25217e0db0900f043b4403aa9e01)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoDBRev up for Bug 16200 - 'Hold waiting too long' fee has a translation
Brendan Gallagher [Tue, 31 May 2016 08:56:42 +0000 (08:56 +0000)]
DBRev up for Bug 16200 - 'Hold waiting too long' fee has a translation
problem

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit bae0eb9ab702f3fe4351e7b3b23a332a998ed6b1)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 16200: Convert all existing expired holds accounttype to HE
Lari Taskula [Tue, 17 May 2016 11:44:45 +0000 (14:44 +0300)]
Bug 16200: Convert all existing expired holds accounttype to HE

Before Bug 16200 expired holds have used accounttype F which is also used by
other type of fines. This patch updates all existing expired holds to new
accounttype HE (Hold Expired).

To test:
-1. Make sure you translated the string in previous patch of this buug
1. Find a Patron with "Hold waiting too long" fines and go to his Fines tab
2. Change Koha's language to some other than English
3. Observe that "Hold waiting too long" is still in English
4. Apply patch and run database update
5. Go back to Patron's Fines tab
6. Observe that "Hold waiting too long" is now translated

Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti@jns.fi>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 09de19c427c1e99d7e921210ed39cb6a19737317)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 16200: Make 'Hold waiting too long' translatable and give it an unique accounttype
Lari Taskula [Tue, 17 May 2016 11:33:57 +0000 (14:33 +0300)]
Bug 16200: Make 'Hold waiting too long' translatable and give it an unique accounttype

Holds that have expired have been untranslatable in Patron's Fines-tab. Also, they are
mixed with other type of fines with accounttype "F". This patch gives expired holds an
own accounttype "HE" (Hold Expired) and modifies the boraccount to recognize this new
accounttype in order to make it translatable.

To test:
1. Make a hold and let it expire
2. Go to Patron's Fines tab
3. Change Koha's language to some other than English
4. Observe that there is a "Hold waiting too long" fine described in English
5. Apply patch
6. Make another hold and let it expire
7. Update translations
8. Find "Hold waiting too long" from your .po file
9. Translate it and install translations
10. Go back to Fines tab and observe that the new expired hold is translated

Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti@jns.fi>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 7163fcfeea382e1e042a47a76d384155e8c69bc0)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 16619 - installer stuck in infinite loop
Liz [Mon, 30 May 2016 23:21:49 +0000 (23:21 +0000)]
Bug 16619 - installer stuck in infinite loop

To test: run the web installer on master, it should not get stuck in an infinite loop.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 3311ab44cfffcd152e7de4652637eb95a265308e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 16617 - fix issues with debian/control
Robin Sheat [Wed, 25 May 2016 14:19:09 +0000 (16:19 +0200)]
Bug 16617 - fix issues with debian/control

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit e604538283ef3531aaa769dee70c83cdec942656)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 16548 - All libraries selected on Tools -> Export Data screen
Owen Leonard [Wed, 18 May 2016 23:45:27 +0000 (19:45 -0400)]
Bug 16548 - All libraries selected on Tools -> Export Data screen

This patch adds "select all" and "select none" links to the display of
libraries in the export bibliographic records form.

Also modified: call number range and accession date fields have been
grouped in their own fieldsets in the hopes that this is more readable.
Page title and breadcrumbs have been corrected to read "Export data"
instead of "MARC export," matching menu items.

To test, apply the patch and go to Tools -> Export data.

- Test the select all/select none links and confirm that they work as
  expected.
- Confirm that the structural changes to the form look okay.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Post sign-off revision: Use the standard "Clear all" instead of "Select
none."

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 06b9194cdd178f14347b8f9090657dbf5b712450)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 16569 - Message box for "too many checked out" is empty if AllowTooManyOverride...
Kyle M Hall [Mon, 23 May 2016 14:28:10 +0000 (14:28 +0000)]
Bug 16569 - Message box for "too many checked out" is empty if AllowTooManyOverride is not enabled

If the limit for number of items checked out is reached, the message box
shows up but is empty.

Test Plan:
1) Disable AllowTooManyOverride
2) Check out items to a patron until the patron has reached the limit
   of checkouts he or she can have
3) Try to check out one more item
4) Note the empty message box
5) Apply this patch
6) Try to check out one more item again
7) Note the message is now visible

Signed-off-by: Nicolas Legrand <nicolas.legrand@bulac.fr>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit af43f91335b2258ea39b40247a1492ca41dafe2a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
8 years agoBug 16597: Fix XSS in shelves.pl
Jonathan Druart [Thu, 26 May 2016 10:07:47 +0000 (11:07 +0100)]
Bug 16597: Fix XSS in shelves.pl

Reported by
Alex Middleton at Dionach

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoBug 16597: Fix XSS in opac-shareshelf
Chris Cormack [Thu, 26 May 2016 09:33:33 +0000 (21:33 +1200)]
Bug 16597: Fix XSS in opac-shareshelf

To test
1/ Go to /cgi-bin/koha/opac-shareshelf.pl?op="><script>alert('XSS')</script>&shelfnumber=5
2/ Notice you see a js alert
3/ Apply patch
4/ It is gone

Reported by
Alex Middleton at Dionach

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoBug 16597: Fix XSS in opac-shelves.pl
Chris Cormack [Thu, 26 May 2016 09:06:18 +0000 (21:06 +1200)]
Bug 16597: Fix XSS in opac-shelves.pl

To test
1/ Hit /cgi-bin/koha/opac-shelves.pl?shelfnumber=5&category=1&op=edit_form&referer="><script>alert('XSS')</SCRIPT>
2/ Notice JS is executed
3/ Apply patch
4/ Notice it's fixed

This bug reported by

Alex Middleton at Dionach

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoBug 16599: Fix other potentials XSS for shelfname
Jonathan Druart [Thu, 26 May 2016 11:08:30 +0000 (12:08 +0100)]
Bug 16599: Fix other potentials XSS for shelfname

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoBug 16599: Fix XSS in opac-shareshelf.pl
Jonathan Druart [Thu, 26 May 2016 11:03:55 +0000 (12:03 +0100)]
Bug 16599: Fix XSS in opac-shareshelf.pl

Test plan:
- Create a list with the name "<script>alert(1)</script>"
- On the shelf list, click on share
=> Without this patch you will see the JS alert
=> With this patch applied you won't see it

Reported by Kaybee at Dionach

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoUpdating the DBrev for a new dev track (unstable).
Brendan Gallagher [Mon, 30 May 2016 10:02:31 +0000 (10:02 +0000)]
Updating the DBrev for a new dev track (unstable).

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoRelease Notes for 16.05.00 v16.05.00
Brendan Gallagher [Thu, 26 May 2016 19:09:36 +0000 (19:09 +0000)]
Release Notes for 16.05.00

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoFinal DBRev for the 3.23 dev to 16.05
Brendan Gallagher [Thu, 26 May 2016 03:14:05 +0000 (03:14 +0000)]
Final DBRev for the 3.23 dev to 16.05

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoTranslation updates for Koha 16.05.00 release
Bernardo Gonzalez Kriegel [Thu, 26 May 2016 01:48:22 +0000 (22:48 -0300)]
Translation updates for Koha 16.05.00 release

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoBug 15333: [QA Follow-up] Add few tests
Marcel de Rooy [Fri, 20 May 2016 08:14:28 +0000 (10:14 +0200)]
Bug 15333: [QA Follow-up] Add few tests

This report had no test plan and no unit tests.
Adding some lines to Holidays.t.
Added a trivial line move in Calendar.pm.

Test plan:
Run t/db_dependent/Holidays.t with and without cache.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested with memcached, Cache::Memory and no cache (edit Cache.pm).

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoBug 15333: Use Koha::Cache to cache exception_holidays instead of a package variable
Jonathan Druart [Wed, 4 May 2016 19:35:39 +0000 (20:35 +0100)]
Bug 15333: Use Koha::Cache to cache exception_holidays instead of a package variable

On the same way as bug 14522, we should use Koha::Cache to cache
exception_holidays.
It's not safe to use a package variable if running under Plack.

There is not test plan, just make sure the changes make sense.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoBug 16587: Same fixes for the staff interface
Jonathan Druart [Wed, 25 May 2016 16:05:58 +0000 (17:05 +0100)]
Bug 16587: Same fixes for the staff interface

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoBug 16587 opac-sendshelf.pl is vulnerable to XSS
Chris Cormack [Wed, 25 May 2016 14:06:28 +0000 (14:06 +0000)]
Bug 16587 opac-sendshelf.pl is vulnerable to XSS

To test
1/ Hit a url like
http://localhost:8080/cgi-bin/koha/opac-sendshelf.pl?email=%3Cscript%3Ealert(%27XSS%27)%3C%2Fscript%3Ezz%40zz&comment=tes&shelfid=4
2/ Notice you get a js alert
3/ Apply patch
4/ Notice the js is now escaped

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoBug 16587 - opac-sendbasket.pl is open to XSS
Chris Cormack [Wed, 25 May 2016 14:01:41 +0000 (14:01 +0000)]
Bug 16587 - opac-sendbasket.pl is open to XSS

To test
1/ Hit a url like
http://localhost:8080/cgi-bin/koha/opac-sendbasket.pl?email_add=%3Cscript%3Ealert(%27XSS%27)%3C%2Fscript%3Ezz%40zz&comment=tes&bib_list=3

Where bib_list is a valid basket number
2/ Notice you get a javascript alert showing
3/ Apply patch
4/ Notice the text is now escaped

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoUpdating the Debian/control
Brendan Gallagher [Wed, 25 May 2016 20:25:23 +0000 (20:25 +0000)]
Updating the Debian/control

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
8 years agoBug 13669: followup to add DBIx::RunSQL dependency
Bernardo Gonzalez Kriegel [Tue, 24 May 2016 13:37:01 +0000 (10:37 -0300)]
Bug 13669: followup to add DBIx::RunSQL dependency

Just that

To test:
1) run koha_perl_deps and check it show up

The module appears now on the About page.
Signed-off-by: Marc Véron <veron@veron.ch>
Ammended patch, only change is DBIx::RunSQL version,
now 0.14 :)

Module's author kindly accept to upgrade it, in particular
this makes Bug 16572 innecesary and is not needed to install
without problems.

Tested install on Ubuntu 14.04/Mysql 5.5.49, marc21 + all sample

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 15878 [QA Followup]
Kyle M Hall [Mon, 23 May 2016 17:49:02 +0000 (17:49 +0000)]
Bug 15878 [QA Followup]

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 15878 - C4::Barcodes::hbyymmincr inccorectly calculates max and should warn when...
Nick Clemens [Fri, 13 May 2016 18:03:37 +0000 (14:03 -0400)]
Bug 15878 - C4::Barcodes::hbyymmincr inccorectly calculates max and should warn when no branchcode present

Test plan:

1 - prove t/db_dependent/Barcodes.t
2 - All should pass
3 - Apply first patch (unit tests update)
    4 - Tests should fail on values and warnings
    5 - Apply second patch
    6 - All tests should now pass

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described
Removed tab on line 47 of C4/Barcodes/hbyymmincr.pm
No more qa errors

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 15878 - Updated unit tests for hbyymmincr barcodes
Nick Clemens [Fri, 13 May 2016 18:02:33 +0000 (14:02 -0400)]
Bug 15878 - Updated unit tests for hbyymmincr barcodes

Test plan in second patch

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Bug 15878 - QA Followup

* Remove debug statment
* Move transcation start
* Remove unused testbuilder object

Rebased on top of 16561

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16516: Define the showListsUpdate JS function at the OPAC
Jonathan Druart [Fri, 13 May 2016 18:21:47 +0000 (19:21 +0100)]
Bug 16516: Define the showListsUpdate JS function at the OPAC

Bug 12233 removes the declaration of the showListsUpdate JS function for
the OPAC.
It results in a JS error (ReferenceError: showListsUpdate is not
defined) when a user tries to add selected titles to a list if no title
is selected.

Test plan:
Launch a catalogue search
Select a list in the "Select titles to" dropdown list
=> Without this patch you will get the JS error
=> With this patch you will get a JS alert "No item was selected"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16550: Clean the tests
Jonathan Druart [Fri, 20 May 2016 16:32:30 +0000 (17:32 +0100)]
Bug 16550: Clean the tests

- replace ok with is
- remove diag
- replace $dbh->prepare->execute->fetchrow with $dbh->selectrow_array

And remove unecessary force to scalar context in pl

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16550: Add test to NewsChannels.t
Marc Véron [Fri, 20 May 2016 12:42:08 +0000 (14:42 +0200)]
Bug 16550: Add test to NewsChannels.t

To test: Run t/db_dependent/NewsChannels.t

Tests adding and retreiving a news item without expiration date.
This test should fail without patch for Bug 16550 and pass OK with patch.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16550: Can't set opac news expiration date to NULL, it reverts to today
Marc Véron [Fri, 20 May 2016 10:19:36 +0000 (12:19 +0200)]
Bug 16550: Can't set opac news expiration date to NULL, it reverts to today

This patch fixes an issue with the expiration dates for news always reverting to today if empty.

To test:
- Apply patch
- Go to Home > Tools > News
- Create a news item, do not set expiration date
- Verify that expiration date stays empty
- Edit this news item
- Do not set expiration date
- Verify that expiration date stays empty
- Do the same with expiration dates
- Verify that they are saved properly

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16499 [QA Followup] - Improve readability
Kyle M Hall [Mon, 23 May 2016 17:34:29 +0000 (17:34 +0000)]
Bug 16499 [QA Followup] - Improve readability

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16499: Remove "Use of uninitialized value" warnings in circulation.pl
Jonathan Druart [Wed, 11 May 2016 14:05:59 +0000 (15:05 +0100)]
Bug 16499: Remove "Use of uninitialized value" warnings in circulation.pl

If you search for a patron in the circulation module, you get:

Use of uninitialized value $barcode in string eq at
/home/koha/src/circ/circulation.pl line 84.
Use of uninitialized value $restoreduedatespec in string eq at
/home/koha/src/circ/circulation.pl line 170.

Test plan:
- Search for a patron and confirm the warnings are not displayed anymore
- Make sure this patch does not introduce regression on bug 14015

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16505: Make sure $as_xml will not be used later
Jonathan Druart [Sat, 21 May 2016 09:23:46 +0000 (10:23 +0100)]
Bug 16505: Make sure $as_xml will not be used later

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16506: Remove warning for UNIMARC installs
Jonathan Druart [Sat, 21 May 2016 09:20:55 +0000 (10:20 +0100)]
Bug 16506: Remove warning for UNIMARC installs

Use of uninitialized value in numeric eq (==)

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16506: (followup) Fix wrong option switch warning message
Tomas Cohen Arazi [Mon, 16 May 2016 19:09:13 +0000 (16:09 -0300)]
Bug 16506: (followup) Fix wrong option switch warning message

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16506: (Followup) remove warnings
Tomas Cohen Arazi [Mon, 16 May 2016 15:15:06 +0000 (12:15 -0300)]
Bug 16506: (Followup) remove warnings

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16506: Make rebuild_zebra.pl use XML as default
Tomas Cohen Arazi [Mon, 16 May 2016 14:30:35 +0000 (11:30 -0300)]
Bug 16506: Make rebuild_zebra.pl use XML as default

This patch deprecates the -x switch, making XML the default serialization format
used by rebuild_zebra.pl. It doesn't remove the option switch, but raises a warning
for the end user about the deprecation so they fix their cronjobs. Later we could remove it.

To test:
- Disable all indexing (daemon/cronjob)
- Create 2 records
- Edit one of them, delete the other one
- Verify they are queued for updates in zebraqueue
- sudo koha-mysql kohadev
  > SELECT * FROM zebraqueue WHERE done=0
...
| 265 |                265 | specialUpdate | biblioserver |    1 | 2016-05-13 14:23:45 |
| 266 |                  1 | recordDelete  | biblioserver |    1 | 2016-05-16 14:14:33 |
| 267 |                  2 | specialUpdate | biblioserver |    1 | 2016-05-16 14:15:06 |
+-----+--------------------+---------------+--------------+------+---------------------+
- Now go to koha-shell
  $ sudo koha-shell kohadev ; cd kohaclone
- Run:
  $ misc/migration_tools/rebuild_zebra.pl -k -b -z

  You will get something similar to this:
NOTHING cleaned : the export /tmp/jI0OeHy6Tn has been kept.
You can re-run this script with the -s  and -d /tmp/jI0OeHy6Tn parameters
if you just want to rebuild zebra after changing the record.abs
or another zebra config file
- Verify
  * less /tmp/jI0OeHy6Tn/del_biblio/exported_records
  * less /tmp/jI0OeHy6Tn/upd_biblio/exported_records
=> FAIL: They contain the records you added/modified/deleted but they are in
         USMARC format
- Apply the patch
- Mark your records for indexing (in koha-mysql kohadev)
  > UPDATE zebraqueue SET done=0 WHERE id > 264
- Run:
  $ misc/migration_tools/rebuild_zebra.pl -k -b -z

  You will get something similar to this:
<WARNINGS> [1]
NOTHING cleaned : the export /tmp/jI0OeHy6Tn has been kept.
You can re-run this script with the -s  and -d /tmp/jI0OeHy6Tn parameters
if you just want to rebuild zebra after changing the record.abs
or another zebra config file
- Verify
  * less /tmp/jI0OeHy6Tn/del_biblio/exported_records
  * less /tmp/jI0OeHy6Tn/upd_biblio/exported_records
=> SUCCESS: Data is correctly in XML format
- Run:
  $ misc/migration_tools/rebuild_zebra.pl -k -b -z -noxml

  You will get something similar to this:
<WARNINGS> [1]
NOTHING cleaned : the export /tmp/jI0OeHy6Tn has been kept.
You can re-run this script with the -s  and -d /tmp/jI0OeHy6Tn parameters
if you just want to rebuild zebra after changing the record.abs
or another zebra config file
- Verify
  * less /tmp/jI0OeHy6Tn/del_biblio/exported_records
  * less /tmp/jI0OeHy6Tn/upd_biblio/exported_records
=> SUCCESS: Data is correctly in USMARC format
- Sign off :-D

[1] Warnings covered by a followup

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
On top of Bug 16505
Work as described following test plan, usmarc default pre patch,
post patch xml default and usmarc on request.
No errors (all patchset)

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16484 - Virtualshelves: Using no XSLTResultsDisplay breaks content display in...
Nick Clemens [Tue, 10 May 2016 00:33:15 +0000 (20:33 -0400)]
Bug 16484 - Virtualshelves: Using no XSLTResultsDisplay breaks content display in intranet

To test:
1 - Create a list in staff client
2 - Set XSLTResultsDisplay to blank
3 - View list, titles don't display
4 - Apply patch
5 - View list, titles display
6 - Set XSLTResultsDisplay to default
7 - View list, titles display as before patch

Signed-off-by: Marc Veron <veron@veron.ch>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16343: 7XX XSLT subfields displaying out of order
Hector Castro [Thu, 28 Apr 2016 19:34:13 +0000 (13:34 -0600)]
Bug 16343: 7XX XSLT subfields displaying out of order

This patch respect previous css classes
.authordates and .relatorcode but also include .titleportion

.authordates {display: none;}
.titleportion {display: none;}
.relatorcode {display: none;}

To test:
- Stage the two record attached with titles:
  - Surface & coatings technology.
  - Women crime writers.
- Reindex zebra (necessary to Opac and Itranet results)
- Leave empty the OPACUserCSS and IntranetUserCSS sysprefs
- Go to the new records in OPAC and Intranet detail page
- See the wrong display of dates
- Apply patch and refresh the page
- Test in OPACUserCSS and IntranetUserCSS the css stated before
- Play deleting or adding the classes
- Test with multiple records with 700 (with and without dates, etc;
  710 and 711)

NOTE: dates in 710 and 711 can be hidden with .titleportion class;
dates in this kind of heading go with another data for example:
Catholic Church. Plenary Council of Baltimore (2nd : 1866)
Patch rebased some typos fixed in comments

Signed-off-by: Dani Elder <danielle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16478: Fix checkout history tabs - intranet
Jonathan Druart [Mon, 9 May 2016 16:59:52 +0000 (17:59 +0100)]
Bug 16478: Fix checkout history tabs - intranet

Test plan:
Same as before for the intranet.
And please retest the OPAC => I have changed the filter's values to
match OPAC/intranet

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16478: Translation breaks display of Checkout history in tab Checks / On-site...
Marc Véron [Mon, 9 May 2016 16:30:27 +0000 (18:30 +0200)]
Bug 16478: Translation breaks display of Checkout history in tab Checks / On-site-checkouts

To test:
- Make sure that syspref OnsiteCheckouts is enabled
- Log in to OPAC as a patron who has checkouts, online checkouts and checkout history enabled
- Go to 'your reading history' (in English)
- Display all three tabs
- Apply patch
- Reload page, display oll three tabs again, there should be no difference
- Examine source code changes to verify that the words 'checkout' and 'onsite' no longer
  will be exposed to translation.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16553 - Incorrect path to jQueryUI file in help template
Owen Leonard [Thu, 19 May 2016 13:02:59 +0000 (09:02 -0400)]
Bug 16553 - Incorrect path to jQueryUI file in help template

This patch corrects an incorrect path to the jQueryUI library file in
the help system header include.

To test, apply the patch and open any help file in the staff client.
Your browser's JavaScript console should report no errors.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
No more console errors
No qa errors

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16517: Do not crash when creating a list with an existing name
Jonathan Druart [Fri, 13 May 2016 19:21:12 +0000 (20:21 +0100)]
Bug 16517: Do not crash when creating a list with an existing name

A typo has been made during a merge conflict when rebasing bug 16517.

it should be
  eval { Koha::Object->new->store; };
instead of
  eval { Koha::Object->new; }->store;

Test plan:
From the result list (intranet side), check some entries and add them to
a new list
Use an existing list's name
=> Without this patch you will get a server error (exception 'Duplicate shelf
object' raised by Koha::Virtualshelf->new->store)
=> With this patch you must get a friendly error message

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16505: <collection> is missing the marc namespace and updates fail if -x is passed
Tomas Cohen Arazi [Fri, 13 May 2016 14:51:54 +0000 (11:51 -0300)]
Bug 16505: <collection> is missing the marc namespace and updates fail if -x is passed

Using rebuild_zerba.pl with the -x option switch, produces an incorrect output in
terms of what our XSLTs expect for indexing. This patch introduces the right namespace information
on the exported records so indexing succeeds.

To test:
- On current master, have some records on your db
- Run:
  $ sudo koha-shell kohadev
  $ cd kohaclone
  $ misc/migration_tools/rebuild_zebra.pl -r -b -k -x
=> you will get a message like this:

NOTHING cleaned : the export /tmp/NL5ufjUfpp has been kept.

- Run
  $ less /tmp/NL5ufjUfpp/biblio/exported_records
=> FAIL: The first line looks like this

<?xml version="1.0" encoding="UTF-8"?><collection><record

- Now run:
  $ xsltproc \
     /etc/koha/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl \
     /tmp/NL5ufjUfpp/biblio/exported_records
=> FAIL: No output
- Apply the patch
- Run:
  $ misc/migration_tools/rebuild_zebra.pl -r -b -k -x
- Take a look at the result file:
  $ less /tmp/asdiouqwiue/biblio/exported_records
=> SUCCESS: The start of the file looks like this:
<?xml version="1.0" encoding="UTF-8"?><collection xmlns="http://www.loc.gov/MARC21/slim">

- Run:
  $ xsltproc \
     /etc/koha/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl \
     /tmp/asdiouqwiue/biblio/exported_records
=> SUCCESS: There is actually indexing data :-D
- Sign off :-D

Edit: I changed qq{} for q{} as suggested by Jonathan.

Sponsored-by: American Numismatic Society
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works as described following test plan
No errors

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16561 - Bug 15877 followup to fix tests
Nick Clemens [Sat, 21 May 2016 23:59:07 +0000 (19:59 -0400)]
Bug 16561 - Bug 15877 followup to fix tests

When I altered the tests to avoid accidental deletion of all items, I
didn't rollback the transaction, hence the tests now delete all items
from a db when run.

This patch rollsback the transaction so items are not deleted from your db

To test:
1 - Backup your db
2 - prove -v t/db_dependent/Barcodes.t
3 - Note that all items and issues are deleted from the DB
4 - Restore your DB
5 - Apply this patch
6 - prove -v t/db_dependent/Barcodes.t
7 - Your DB should eb unchanged

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16539: Add tests
Jonathan Druart [Wed, 18 May 2016 14:01:03 +0000 (15:01 +0100)]
Bug 16539: Add tests

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16539 - Koha::Cache is incorrectly caching single holidays
Nick Clemens [Tue, 17 May 2016 18:39:49 +0000 (14:39 -0400)]
Bug 16539 - Koha::Cache is incorrectly caching single holidays

This makes the loop add holidays for each bracnh instead of the calling
branch

To test:
I used memcached-tools to view the cache, clear the cache, and wait for
holidays to regnerate

Have a branches with different holidays
Clear the cache
Do a checkout
View the cache - one libraries holidays are repeated for all branches
Apply patch
Clear the cache
Do a checkout
Library holidays are correctly cached

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 13669: Catch the errors to have them to the logs
Jonathan Druart [Sat, 21 May 2016 08:04:27 +0000 (09:04 +0100)]
Bug 13669: Catch the errors to have them to the logs

This patch redirect STDERR to a variable to retrieve the errors raised
by the DBMS when loading a sql file, it could be useful to debug errors.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
It's better of course, trying to load a failed fiel
it outputs mysl errors
DBD::mysql::st execute failed: You have an error in your SQL syntax...
No errors

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 13669: Re-adds error handling to load_sql
Bernardo Gonzalez Kriegel [Fri, 20 May 2016 17:26:14 +0000 (14:26 -0300)]
Bug 13669: Re-adds error handling to load_sql

This patch prevents crashing in case an
error is detected when loading a file

To test:
1) Apply patch
2) Mangle kohastructure.sql or any sample
file adding and invalid SQL line
3) Run webinstaller and check that the error
is handled gracefully

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 13669: (alternative) use DBIx::RunSQL
Bernardo Gonzalez Kriegel [Wed, 18 May 2016 19:25:25 +0000 (16:25 -0300)]
Bug 13669: (alternative) use DBIx::RunSQL

Alternative POC solution, on top of
previous patches, feel free to obsolte.

This patch use DBIx::RunSQL->run_sql_file
to procees each sql file.

To test:
1) Apply all patches
2) Same test plan of patch 1

Timing test running web installer, marc21,
all sample data, time in seconds

a) without patch
structure   data
59.7        66.5
58.6        66.0

b) SQL::SplitStatement (patch 1+2)
59.4        101
59.7        102

c) DBIx::RunSQL (patch 3)
60.7        66.8
59.4        66.2

Tomas' version is a bit slower loading sample data,
all give similar results processing kohastructure.

New dependency to package: DBIx::RunSQL

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 13669: (followup) Fix kohastructure.sql so FK dependencies are sorted
Tomas Cohen Arazi [Wed, 18 May 2016 20:34:06 +0000 (17:34 -0300)]
Bug 13669: (followup) Fix kohastructure.sql so FK dependencies are sorted

The current table creation order is left to mysql's strategy, which is not
suitable for parsing the SQL files and passing one statement at a time in
the current order.

This patch just moves table creation statements around so FK constraints are
defined for previously created tables.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 13669: Use perl to load SQL statements from sample data
Tomas Cohen Arazi [Wed, 18 May 2016 16:23:25 +0000 (13:23 -0300)]
Bug 13669: Use perl to load SQL statements from sample data

This patch changes C4::Installer::load_sql so it uses File::Slurp [1] to read
the SQL files, and SQL::SplitStatement to extract the statements from the full SQL
file so they can be passed to $dbh->do.

To test:
- On Mysql 5.5, run the webinstaller
=> SUCCESS: Everything works as expected
- Apply the patch
- Run
  $ mysql -uroot
  > DROP DATABASE koha_kohadev ; CREATE DATABASE koha_kohadev;
- Run the webinstaller
=> SUCCESS: Everything works as expected
- On Mysql 5.6+ (5.7 is implied)
- Run
  $ mysql -uroot
  > DROP DATABASE koha_kohadev ; CREATE DATABASE koha_kohadev;
- Run the webinstaller
=> FAIL: It cannot load the sql files due to a password-in-command-line error
- Apply the patch
- Make sure everything is clean (it should):
  $ mysql -uroot
  > DROP DATABASE koha_kohadev ; CREATE DATABASE koha_kohadev;
- Run the webinstaller
=> SUCCESS: EVerything works as expected
- Sign off :-D

[1] Note: This is a POC patch, in the sense that it does the job, fixes a nasty problem
but using File::Slurp to load the SQL files in memory comes with a big runtime penalty.
You will notice the install procedure is now much slower, for instance.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16470: Update MARC21 es-ES frameworks to Update 22 (April 2016) v16.05.00-beta
Bernardo Gonzalez Kriegel [Fri, 6 May 2016 18:26:59 +0000 (15:26 -0300)]
Bug 16470: Update MARC21 es-ES frameworks to Update 22 (April 2016)

Same test plan of Bug 16460

To test:
1) Remove all your frameworks
2) Check mandatory bibliographic and authority files load without problem, for es-ES files
3) Check new fields/subfields

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
es-ES frameworks updated

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16460: Update MARC21 frameworks to Update No. 22 (April 2016)
Bernardo Gonzalez Kriegel [Fri, 6 May 2016 13:31:35 +0000 (10:31 -0300)]
Bug 16460: Update MARC21 frameworks to Update No. 22 (April 2016)

Update No. 22
Bibliographic
    New 382$r, 382$t, 753$0, 753$2
    Modified 382$e

Authority
    New 382$r, 382$t
    Modified 382$e

Also added final 'S' on 654 description

To test:
1) Remove all your frameworks
2) Check mandatory bibliographic and authority files load without problem
3) Check new fields/subfields

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
For comparison:
https://www.loc.gov/marc/bibliographic/bdapndxg.html
https://www.loc.gov/marc/authority/adapndxf.html

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16382: Update German web installer sample files for 16.05
Katrin Fischer [Tue, 10 May 2016 22:35:39 +0000 (00:35 +0200)]
Bug 16382: Update German web installer sample files for 16.05

Easy this time, only sample notices have been changed:
- Changed discharge to match the English sample notice.
- Translated new PASSWORD_RESET e-mail

To test:
- Start with an empty database
- Install de-DE
- Run the web installer in de-DE/German
- Verify all files, especially sample notices, load
  without any problems.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Tested removing all from letter table and loading file.
File loads Ok, notices look good.
No errors

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16501: Remove some unneeded warns in Upload.t
Marcel de Rooy [Wed, 11 May 2016 14:17:47 +0000 (16:17 +0200)]
Bug 16501: Remove some unneeded warns in Upload.t

At some point I saw some gain in warning about a missing config line.
But these warns are actually not needed here.
Removing them here.

Test plan:
Run t/db_dependent/Upload.t while having upload_path in your koha-conf and
also without it.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16471: Translatability: Fix issues in opac-password-recovery.tt
Marc Véron [Sat, 7 May 2016 12:03:27 +0000 (14:03 +0200)]
Bug 16471: Translatability: Fix issues in opac-password-recovery.tt

This patch fixes issues with the translatability of opac-password-recovery.tt

To test:
- Apply patch
- Verify that text changes make sense.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16454: Remove another occurrence in comment
Jonathan Druart [Mon, 16 May 2016 11:10:56 +0000 (12:10 +0100)]
Bug 16454: Remove another occurrence in comment

Note that few other occurrences exist in DB.

This patch also replaces a tab with 4 spaces.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16454: Use 'inventory' instead of 'inventory/stocktaking'
Aleisha [Thu, 12 May 2016 04:46:54 +0000 (04:46 +0000)]
Bug 16454: Use 'inventory' instead of 'inventory/stocktaking'

To test:
1) Go to the tools home page. Confirm it says 'Inventory' instead of
   'Inventory/stocktaking' in heading and in description
2) Click Inventory. Confirm heading now says 'Inventory' instead of
   'Inventory/stocktaking'
3) Confirm that it now says 'Inventory' instead of
   'Inventory/stocktaking' in the tools menu along the left of the page
4) Click Help in top right corner. Confirm help heading now says
   'Inventory' instead of 'Inventory/stocktaking'
5) Go to user account page, go to Set Permissions
6) Expand Tools option and confirm it says 'inventory' instead of
   'inventory (stocktaking)'

Sponsored-by: Catalyst IT
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16385: Fix breadcrumbs when ordering from subscription
Katrin Fischer [Fri, 29 Apr 2016 00:39:15 +0000 (02:39 +0200)]
Bug 16385: Fix breadcrumbs when ordering from subscription

- Rephrase removing 'Shopping'
- Fix link to vendor

To test:
- Create a subscription for vendor X
- Create a baskest for vendor X
- Choose: order from subscription
- Check breadcrumbs:
  - Link to vendor works
  - 'Shopping' is gone, Basket remains

Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 15086 - DBRev 3.23.00.064
Kyle M Hall [Mon, 16 May 2016 17:34:57 +0000 (17:34 +0000)]
Bug 15086 - DBRev 3.23.00.064

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 15086: Creators layout and template sql has warnings
Mark Tompsett [Thu, 29 Oct 2015 22:23:20 +0000 (18:23 -0400)]
Bug 15086: Creators layout and template sql has warnings

When doing a hacked install off the master branch:
use ... {koha database name}
truncate creator_layouts;
truncate creator_templates;
truncate printers_profiles;
source installer/data/mysql/... {name of a sample_labels type file}
Warnings are generated, which may not be visible in the UI.

Most of the warnings were triggered by:
-/*!40000 ALTER TABLE `creator_layouts` DISABLE KEYS */;
-/*!40000 ALTER TABLE `creator_layouts` ENABLE KEYS */;
http://dev.mysql.com/doc/refman/5.7/en/error-messages-server.html#error_er_illegal_ha

In the Russian, the layout_name was truncated, because the layout_name was only 20. An atomic update sql and kohastructure.sql update were provided to widen it to 25.
http://dev.mysql.com/doc/refman/5.7/en/error-messages-server.html#error_warn_data_truncated

Also fr-FR, ru-RU, and uk-UA were slightly different in structure, so the structure was made the same as the other files.

See comment #1 for the test plan.

NOTE: pl-PL is likely very out of date, but is not affected in this regard.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works, no more warnings
mysql> show warnings;
Empty set (0.01 sec)

No errors

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16481 - Report menu has unexpected issues
Owen Leonard [Mon, 9 May 2016 18:23:34 +0000 (14:23 -0400)]
Bug 16481 - Report menu has unexpected issues

This patch corrects a problem with the reports toolbar include file
which can cause a problem with the "duplicate" button. The duplicate
button passes the entire report SQL as a URL parameter, but the template
variable was not escaped as a URL variable.

This patch also adds the "uri" filter to the report name and notes
fields just to be safe.

To reproduce the bug, create a new SQL report using the SQL in the bug
report. When you run the report you should see a broken "Duplicate"
button.

Apply the patch and run the report again. The duplicate button should
look correct and work correctly.

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16259: Replace CGI->param with CGI->multi_param in list context - part 2
Jonathan Druart [Fri, 15 Apr 2016 08:00:28 +0000 (09:00 +0100)]
Bug 16259: Replace CGI->param with CGI->multi_param in list context - part 2

This patch is a follow-up of bug 16154.

It removes the warning "CGI::param called in list context" in the
following scripts:
admin/branches.pl
admin/categories.pl
admin/patron-attr-types.pl
admin/preferences.pl
catalogue/image.pl
circ/circulation.pl
patroncards/add_user_search.pl
serials/add_user_search.pl
tools/marc_modification_templates.pl
virtualshelves/shelves.pl

Note that the warning from catalogue/itemsearch.pl still exists (the
call to CGI->param is done from the template).

Test plan:
- Add/modify a library, patron category, patron attr type
- Update a syspref
- Set localcoverimage and call catalogue/image.pl?biblionumber=XXX
- Search for patrons in the patron cards or serials module
- Add a marc modification templates
- Add a list (shelves)

You should not get the warning in the log after all these actions.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 1859: Do not display <<>> if an entry without value is selected
Jonathan Druart [Fri, 13 May 2016 21:03:08 +0000 (22:03 +0100)]
Bug 1859: Do not display <<>> if an entry without value is selected

For instance there are ---TABLES--- to delimite fields' tables, if
selected we do not want to add "<<>>" to the letter.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 1859 - Notice fields: can't select multiple fields at once
Owen Leonard [Fri, 13 May 2016 00:35:01 +0000 (20:35 -0400)]
Bug 1859 - Notice fields: can't select multiple fields at once

When selecting database fields to appear in a notice, selecting multiple
fields at once doesn't work correctly. The selected fields are grouped
together between << and >> instead of each being bracketed separately.

This patch corrects this problem. Also changed: Removal of 'onclick';
Conversion of 'insert' button to a Bootstrap buttons styled with a Font
Awesome icon; HTML validation error fixes.

To test, apply the patch and go to Tools -> Notices & Slips.

- Edit any notice.
- Select a notice version to edit (Email, Print, etc.).
- Confirm that the "Insert" button looks correct.
- Using ctrl+click, select multiple database fields to add to the
  notice. Confirm that clicking the "Insert" button adds the fields
  correctly.
- Confirm that there are no HTML validation errors.

Signed-off-by: Nicole C Engard <nengard@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16288: (QA followup) Remove the syspref INSERT line
Tomas Cohen Arazi [Fri, 13 May 2016 13:07:02 +0000 (10:07 -0300)]
Bug 16288: (QA followup) Remove the syspref INSERT line

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16288: Remove unused EDI Shipping Budget syspref
Colin Campbell [Fri, 13 May 2016 09:18:30 +0000 (10:18 +0100)]
Bug 16288: Remove unused EDI Shipping Budget syspref

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16288: Remove Reference to obsolete EAN syspref
Colin Campbell [Fri, 13 May 2016 08:57:23 +0000 (09:57 +0100)]
Bug 16288: Remove Reference to obsolete EAN syspref

Remove reference to obsolete syspref EDIfactEAN
which was present in earlier test version of
EDI code but should not now be used

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16476: Do not call CGI->param in list context, some more
Jonathan Druart [Mon, 9 May 2016 14:03:12 +0000 (15:03 +0100)]
Bug 16476: Do not call CGI->param in list context, some more

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16402 - DBRev 3.23.00.063
Kyle M Hall [Mon, 16 May 2016 17:09:53 +0000 (17:09 +0000)]
Bug 16402 - DBRev 3.23.00.063

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16402: (QA followup)
Tomas Cohen Arazi [Mon, 16 May 2016 15:36:56 +0000 (12:36 -0300)]
Bug 16402: (QA followup)

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16402: Fix fox existing installations
Jonathan Druart [Mon, 9 May 2016 14:08:56 +0000 (15:08 +0100)]
Bug 16402: Fix fox existing installations

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16402: Make kohastructure.sql valid for MySQL v5.7
Jonathan Druart [Thu, 5 May 2016 14:14:51 +0000 (15:14 +0100)]
Bug 16402: Make kohastructure.sql valid for MySQL v5.7

A primary key should not contain null value, and MySQL v5.7 is now more
strict and won't accept our errors in the DB structure.

Test plan:
  mysql < installer/data/mysql/kohastructure.sql
should work using MySQL v5.7

QA:
- letter.branchcode should not be NULL, the default (all) is an empty
string
- permissions.code should not be NULL, it's always a string

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Clean install of Ubuntu 16.05, MySQL 5.7.11
kohastructure.sql loads ok, just one warning
No errors

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 15816: Redirect back to correct page after login
Jesse Weaver [Fri, 6 May 2016 19:52:46 +0000 (13:52 -0600)]
Bug 15816: Redirect back to correct page after login

This uses a hacky but simple method to get the correct script name under
proxied packaged Plack.

Test plan:
  1) Log out of both the OPAC and staff side.
  2) Try to access a page that requires login (opac-reserve.pl is a
good one for the OPAC), then log in.
  3) You will be redirected back to mainpage.pl or opac-user.pl.
  4) Repeat above for both staff side and OPAC.
  5) Apply patch.
  6) Repeat steps 1-4; you should be redirected back to the original
     page you were on.
  7) Repeat the above for both a traditional CGI and kohadevbox/package
     Plack installation.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16473: Fix typo "an problem" vs "a problem"
Jonathan Druart [Wed, 11 May 2016 11:21:36 +0000 (12:21 +0100)]
Bug 16473: Fix typo "an problem" vs "a problem"

Test plan:
Confirm the wording is correct

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
8 years agoBug 16480: Unclosed tag <span> in shelves line 332 on intranet
Hector Castro [Mon, 9 May 2016 17:31:29 +0000 (11:31 -0600)]
Bug 16480: Unclosed tag <span> in shelves line 332 on intranet

Unclosed tag <span> in shelves line 332 on intranet when translating
<span>An error occurred when creating this list./span>
This error was introduced by bug 15403

To test: Verify the template in line 332 to see the unclosed tag fixed
or follow test plan for bug 15403

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
8 years agoBug 16474: Standardize spelling of EDIFACT
Katrin Fischer [Sun, 8 May 2016 14:47:09 +0000 (16:47 +0200)]
Bug 16474: Standardize spelling of EDIFACT

Some templates use Edifact and edifact. As EDIFACT
is an abbreviation, we should spell it like one.

To test:
- Check templates for occurrences of EDIFACT
  - acquisitions navigation menu
  - basket page
  - basketgroup page
  - EDIFACT messages page
- Verify changes are correct

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Changes are correct

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
8 years agoBug 16412: Cache undef in L1 only
Marcel de Rooy [Mon, 2 May 2016 10:26:44 +0000 (12:26 +0200)]
Bug 16412: Cache undef in L1 only

No need to cache undef in L2.
Prevent numerous warnings like:
Use of uninitialized value in subroutine entry at /usr/share/koha/masterclone/Koha/Cache.pm line 284

Test plan:
Run t/Cache.t
Run t/db_dependent/sysprefs.t

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch: remove trailing space char and replace 'you' with 'we' to
match existing wordings.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
8 years agoBug 16412: Make sure Koha::Cache->set_in_cache will not warn anymore
Jonathan Druart [Mon, 2 May 2016 11:39:29 +0000 (12:39 +0100)]
Bug 16412: Make sure Koha::Cache->set_in_cache will not warn anymore

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
8 years agoBug 16489: ES code incorrectly refers to Moose
Tomas Cohen Arazi [Tue, 10 May 2016 14:00:43 +0000 (11:00 -0300)]
Bug 16489: ES code incorrectly refers to Moose

Probably a leftover from the original SolR code, there are unused references to Moose in the new Elasticsearch code.

To test:
- Run:
  $ git grep Moose
=> FAIL: There are unneeded references to Moose:
Koha/SearchEngine/Zebra/QueryBuilder.pm:use Moose::Role;
Koha/SearchEngine/Zebra/Search.pm:#use Moose::Role;
- Apply the patch
- Run:
  $ git grep Moose
=> SUCCESS: No references to Moose
- Run:
  $ prove t/Search* t/db_dependent/Search*
=> SUCCESS: Tests pass
- Sign off

Signed-off-by: Jacek Ablewicz <abl@biblos.pk.edu.pl>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
8 years agoBug 13871: [QA Follow-up] Fix small regression on AF with branchcode in Patron Info...
Marcel de Rooy [Wed, 11 May 2016 12:42:33 +0000 (14:42 +0200)]
Bug 13871: [QA Follow-up] Fix small regression on AF with branchcode in Patron Info request

If you enable send_patron_home_library_in_af in your sip account, you
want a separate AF field for the home branch.

Test plan:
Send a 63 (Patron Info) and verify that you have an extra AF.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested Patron Status and Patron Info.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16496: Add test
Jonathan Druart [Wed, 11 May 2016 09:24:13 +0000 (10:24 +0100)]
Bug 16496: Add test

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16496 - accountlines.issue_id not set when new overdue is processed
Kyle M Hall [Tue, 10 May 2016 19:05:00 +0000 (19:05 +0000)]
Bug 16496 - accountlines.issue_id not set when new overdue is processed

It appears that somehow the adding of issue_id to accountlines for new
fines was missed! This is incredibly important, otherwise UpdateFine
will always create a new fine!

Test Plan:
1) Create a new overdue checkout
2) Run fines.pl to generate an accountline for it
3) Note it has no issue_id
4) Apply this patch
5) Repeat steps 1 and 2
6) Note it now has an issue_id!

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 16414 - Update Schema
Kyle M Hall [Fri, 6 May 2016 18:08:27 +0000 (18:08 +0000)]
Bug 16414 - Update Schema

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoMerges translations for Koha 16.05
Kyle M Hall [Fri, 6 May 2016 10:42:39 +0000 (10:42 +0000)]
Merges translations for Koha 16.05

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
8 years agoBug 13041 - Can't add user as manager of basket if name includes a single quote
Owen Leonard [Wed, 4 May 2016 13:34:46 +0000 (09:34 -0400)]
Bug 13041 - Can't add user as manager of basket if name includes a single quote

If you are trying to add a user as a manager of a basket in
acquisitions, a JavaScript error will be triggered if that user has a
single quote in their name (e.g. "O'Neil"). This patch corrects the
issue by removing the "onclick" attribute and using the JS change made
in Bug 16386.

Also changed by this patch: Increased the size of the patron search
popup and made a correction to some invalid HTML.

To test you should have a patron whose name contains a single quote who
is also a user with permission to manage acquisitions.

- Apply the patch and go to Acquisitions.
- Locate an open basket and view the details for that basket.
- In the "Managed by" section, click the "Add user" button to trigger
  the patron search popup.
- Search for the patron described above and click the "Add" button.
- In the parent window, the patron you chose should have been added to
  the "Managed by" section.

Tested on top of Bug 16383, behaves as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoBug 16386 - Replace the use of "onclick" from patron card creator templates
Owen Leonard [Fri, 29 Apr 2016 00:52:40 +0000 (20:52 -0400)]
Bug 16386 - Replace the use of "onclick" from patron card creator templates

This patch removes the use of "onclick" from several patron card creator
templates. Events are defined instead in JavaScript.

Also changed:

- Patron search pop-up window is now slightly larger because I found it
  never quite large enough to prevent horizontal scrolling.
- Replaced "Borrower" with "Patron" in a couple of places.
- "Add" link in patron search pop-up is now styled as a Bootstrap
  button.
- Removed Bootstrap styles from some submit buttons.
- Some Font Awesome icons were made using the invalid element
  <icon></icon> instead of <i></i>. These are corrected.
- Fixed some other HTML validation errors.

To test, apply the patch and go to Tools -> Patron card creator.

- Choose New -> Card batch.
  - Click "Add patrons" and perform a search for patrons in the pop-up
    window.
  - Click the "Add" button. The corresponding borrowernumber should be
    added to the textarea in the parent window, and a message should
    appear at the top of the pop-up window confirming that the patron
    has been added. (Note: This patch fixes a version of Bug 13041 which
    prevented the "add" button from working on patrons whose name
    include an apostrophe).
  - In the parent page, in the list of patrons you added to the batch,
    confirm that clicking the "Delete" link triggers a confirmation
    dialog. Test both confirming and canceling.
  - Confirm that clicking the "Export" button next to an individual
    patron triggers a modal window.
    - In the export window, confirm that the "Cancel" link works to
      close the modal.
    - Click the "Export" button again and then the "Export" button in
      the modal.
      - Test that the "Done" button works to close the modal.
- Choose Manage -> Card batches.
  - Test the "Delete" and "Export" buttons as described above.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
All works, no errors.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoBug 15823: Redirect opac-discharge.pl to 404 page
Marc Véron [Thu, 5 May 2016 06:13:53 +0000 (08:13 +0200)]
Bug 15823: Redirect opac-discharge.pl to 404 page

See comment #17: Redirect to 404 in opac-discharge.pl and remove
message in template because with the redirect it will never be
reached.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoBug 15823: Can still access patron discharge slip without having the syspref on
Aleisha [Tue, 23 Feb 2016 04:06:30 +0000 (04:06 +0000)]
Bug 15823: Can still access patron discharge slip without having the syspref on

EDIT: Fix for OPAC side
EDIT: Comment 10
EDIT: Merge conflicts

To test:
1) Ensure syspref useDischarge is disabled
2) Go to /cgi-bin/koha/members/discharge.pl?borrowernumber=X&discharge=1
3) Validate that you are still able to generate a discharge slip for this patron
4) Apply patch and refresh page
5) Confirm that you are redirected to the circulation.pl page for the user and that an error message is there.
OPAC SIDE
6) Go to the OPAC
7) Go to /cgi-bin/koha/opac-discharge.pl
8) Confirm you get a message saying discharges are disabled
9) Go to /cgi-bin/koha/opac-discharge.pl?op=request
10) Confirm you see same message

Sponsored-by: Catalyst IT
Followed test plan, works as expected (both staff client and OPAC).
Re-tested, works OK.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoMerge branch 'master' of git://git.koha-community.org/koha
Brendan Gallagher [Fri, 6 May 2016 04:08:51 +0000 (21:08 -0700)]
Merge branch 'master' of git://git.koha-community.org/koha

8 years agoBug 15919: Batch checkout - Display the due date
Jonathan Druart [Mon, 2 May 2016 19:19:05 +0000 (20:19 +0100)]
Bug 15919: Batch checkout - Display the due date

When an item has been checked out in a batch, the due date will now be
displayed in the information column.

Test plan:
Use the batch checkout to check some items out
Confirm that the due date is displayed if the items have been checked
out.

Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoDBRev Bug 16414 - aqorders.budgetgroup_id has never been used and can be
Brendan Gallagher [Fri, 6 May 2016 04:06:56 +0000 (04:06 +0000)]
DBRev Bug 16414 - aqorders.budgetgroup_id has never been used and can be
removed

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoBug 16414: Follow-up - change to kohastructure.sql
Katrin Fischer [Thu, 5 May 2016 22:33:47 +0000 (00:33 +0200)]
Bug 16414: Follow-up - change to kohastructure.sql

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
8 years agoBug 16414: Drop aqorders.budgetgroup_id
Jonathan Druart [Mon, 2 May 2016 14:55:01 +0000 (15:55 +0100)]
Bug 16414: Drop aqorders.budgetgroup_id

This column has never been used and can be removed.

Test plan:
1/ update the schema
2/ prove t/db_dependent/Acquisition.t
should return green

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Test green pre & post patch
No errors

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>