]> git.koha-community.org Git - koha.git/log
koha.git
10 years agoBug 12312 - correctly upgrade under Apache 2.2
Robin Sheat [Mon, 26 May 2014 01:28:00 +0000 (13:28 +1200)]
Bug 12312 - correctly upgrade under Apache 2.2

As the way we need to reference Apache instance names has now changed
between 2.2 and 2.4, we need to try it out both ways to make sure we get
it right.

This also allows koha-create/koha-disable to try the .conf version of
the name if the first one doesn't work.

To test:
* Create an instance on an Apache 2.2 system with koha < 3.16
* Upgrade to 3.16 with this patch, saying 'yes' to the renaming question
** Make sure you don't see the warning: Warning: problem enabling $site
   in Apache
* Do a 'service apache2 restart'
* Make sure you can still access the instance
* Make sure that /etc/apache2/sites-enabled/instance.conf exists as a link
  to /etc/apache2/sites-available/instance.conf
* Check that koha-create and koha-remove behave like you'd expect.

Note:
* If you need to make debconf forget that it asked you the question
  about renaming so that it'll do it again, then run:
  echo "unregister koha-common/rename-apache-vhost-files" | sudo debconf-communicate koha-common
* 'debconf-show koha-common' will show you the current debconf
  configuration.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11629: DBRev 3.17.00.007
Galen Charlton [Mon, 26 May 2014 03:28:46 +0000 (03:28 +0000)]
Bug 11629: DBRev 3.17.00.007

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11629: (follow-up) fix message displayed when item is made available
Kyle M Hall [Thu, 17 Apr 2014 13:47:59 +0000 (09:47 -0400)]
Bug 11629: (follow-up) fix message displayed when item is made available

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11629: (folllow-up) fix various issues
Kyle M Hall [Thu, 17 Apr 2014 11:08:55 +0000 (07:08 -0400)]
Bug 11629: (folllow-up) fix various issues

Changed the syspref.sql file to remove one of the doubled
up UNIMARCAuthrityField100 that slipped in with an earlier
patch on this bug.

Passes all tests and QA script, also t/db_dependent/Circulation_issue.t

Tested with items that had
- no notforloan value set
- notforloan value not used in updateNotforLoanStatusOnCheckin
- the notforloan value defined in UpdateNotForLoanStatusOnCheckin

Also verified it works the same, when the item was checked out or
not checked out on return.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11629: (follow-up) remove <strong> tags to ease translation
Kyle M Hall [Mon, 24 Feb 2014 13:46:18 +0000 (08:46 -0500)]
Bug 11629: (follow-up) remove <strong> tags to ease translation

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11629: (follow-up) add unit tests
Kyle M Hall [Mon, 24 Feb 2014 13:39:16 +0000 (08:39 -0500)]
Bug 11629: (follow-up) add unit tests

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11629: (follow-up) Add message for librarian that status was updated
Kyle M Hall [Fri, 31 Jan 2014 18:56:47 +0000 (13:56 -0500)]
Bug 11629: (follow-up) Add message for librarian that status was updated

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11629 - Add ability to update not for loan status on checkin
Kyle M Hall [Tue, 28 Jan 2014 16:43:50 +0000 (11:43 -0500)]
Bug 11629 - Add ability to update not for loan status on checkin

Some libraries would like to streamline the cataloging process my
automatically updating notforloan values on checkin. For example, an
item is set to notforloan of -1 ( ordered ). The item, is received,
processed, and checked in for the first time before being shelved.
The checkin automatically changes the nfl value from -1 to 0. The
same workflow could be used for damaged items as well.

Test Plan:
1) Apply this patch
2) Run updatedatabase.pl
3) Set the new system preference UpdateNotForLoanStatusOnCheckin
   to the following:
-1: 0
0: 1
4) Create an item, set its notforloan value to -1
5) Check in the item, note its not for loan value is now 0
6) Check in the item again, note its not for loan value is now 1
7) Check in the item again, note its not for loan value reamins 1

Signed-off-by: Havilah Lyon <havilah@aflibrary.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Testing notes on last patch.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 7720: (follow-up) restore CSS selectors for the current/home location columns
Galen Charlton [Mon, 26 May 2014 02:53:58 +0000 (02:53 +0000)]
Bug 7720: (follow-up) restore CSS selectors for the current/home location columns

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 7720: (follow-up) fix issues in Bootstrap theme
Galen Charlton [Mon, 26 May 2014 02:48:41 +0000 (02:48 +0000)]
Bug 7720: (follow-up) fix issues in Bootstrap theme

- Fix breakage of tablesorting when OpacLocationBranchToDisplay
  is set to both.
- When displaying the home library, ensure that its correct
  name and URL are displayed
- Remove the attempt to display the "opac_info" tooltip for
  the home library, as it is not currently retrieved.

RM NOTE: Rather than add a GetOpacInfo function or the like
to the TT Branches plugin, simpler would be adding a
plugin function that fetches a DBIC result object for
a given branchcode, thereby allowing any column in the
branches table to be fetched into the template.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 7720: DBRev 3.17.00.006
Galen Charlton [Mon, 26 May 2014 02:22:33 +0000 (02:22 +0000)]
Bug 7720: DBRev 3.17.00.006

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 7720: (follow-up) revert change to GetItemsInfo
Galen Charlton [Mon, 26 May 2014 02:20:01 +0000 (02:20 +0000)]
Bug 7720: (follow-up) revert change to GetItemsInfo

The QA follow-up which adds GetURL to the TT branches
plugin means that GetItemsInfo no longer needs to be changed.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 7720: (follow-up) update Bootstrap theme
Kyle M Hall [Mon, 12 May 2014 11:37:00 +0000 (07:37 -0400)]
Bug 7720: (follow-up) update Bootstrap theme

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 7720: (follow-up) fix various issues
Kyle M Hall [Mon, 12 May 2014 10:58:34 +0000 (06:58 -0400)]
Bug 7720: (follow-up) fix various issues

[1] Fix capitalization
[2] Move logic for getting the home library name URL to the
    Branches TT plugin

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 7720: add options for controlling display of an item's home and/or holdings location
Kyle M Hall [Mon, 11 Feb 2013 14:12:07 +0000 (09:12 -0500)]
Bug 7720: add options for controlling display of an item's home and/or holdings location

Currently, in opac-detail.pl, there exists a column named 'Location'.
This column lists the name of the holding branch, and the item's
location description. This can cause confusion to borrowers, as
they may assume that the holding branch is the *owning* branch
(homebranch) of an item.

This could cause a situation where a borrower waits for an
item to be returned to his or her library, only to find that
the library never owned that item, and it was transferred back
to its homebranch. It could also lead a borrower to falsely
assume that his or her home library does not own a copy of a
particular item because the borrower does not see an his or her
home library listed for any of the items on the record.

In addition, even when the holding branch is different
than the home branch, the item's shelving location is displayed,
even though that branch may not use that location.

This commit makes the item details table equivalent to the intranet
details page by adding a "Home Library" column, which displays the
item's home library, as well as the shelving location.

If singleBranchMode is enabled, this column disappears and the
"Location" column displays the shelving location only.

This commit adds two new system preferences:

OpacLocationBranchToDisplay, which defines whether
to display the holding library, the home library,
or both for the opac details page.

OpacLocationBranchToDisplayShelving, which defines
where the shelving location should be displayed,
under the home library, the holding library, or both.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. Tested all variations.
No koha-qa errors.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12230: (follow-up) improve unit tests
Galen Charlton [Mon, 26 May 2014 02:01:51 +0000 (02:01 +0000)]
Bug 12230: (follow-up) improve unit tests

[1] Clear holidays first to avoid throwing off the
    calculations
[2] Add descriptions for the tests

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12230: (follow-up) update DBIC classes
Galen Charlton [Mon, 26 May 2014 01:43:18 +0000 (01:43 +0000)]
Bug 12230: (follow-up) update DBIC classes

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12230: DBRev 3.17.00.005
Galen Charlton [Mon, 26 May 2014 01:41:46 +0000 (01:41 +0000)]
Bug 12230: DBRev 3.17.00.005

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12230: (follow-up) maxsuspensiondays should be set to NULL if not set
Jonathan Druart [Mon, 12 May 2014 10:54:24 +0000 (12:54 +0200)]
Bug 12230: (follow-up) maxsuspensiondays should be set to NULL if not set

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12230: DB changes - add issuingrules.maxsuspensiondays
Jonathan Druart [Mon, 12 May 2014 10:40:05 +0000 (12:40 +0200)]
Bug 12230: DB changes - add issuingrules.maxsuspensiondays

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12230: Set a maximum suspension days as a new issuing rule
Jonathan Druart [Mon, 12 May 2014 10:31:11 +0000 (12:31 +0200)]
Bug 12230: Set a maximum suspension days as a new issuing rule

This patch adds a new issuing rule: maxsuspensiondays.

A new column "Max. suspension duration (day)" appears in the main table
of the issuing rules.

If this value is filled, on returning an item, a patron won't be
suspended longer than this cap.

Test plan:
1/ Set "suspension in days" to 2.
2/ Check an item out to a patron and specify a due date to today - 10
days.
3/ Check the item in and verify the patron is suspended until today + 10
* 2 days.
4/ Remove the suspension.
5/ Set "Max. suspension duration" to 10.
6/ Check an item out to a patron and specify a due date to today - 10
days.
7/ Check the item in and verify the patron is suspended until today + 10
days.

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 6254: (follow-up) update DBIC classes using newer version of DBIx::Class::Schema...
Galen Charlton [Mon, 26 May 2014 01:26:43 +0000 (01:26 +0000)]
Bug 6254: (follow-up) update DBIC classes using newer version of DBIx::Class::Schema::Loader

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 6254: DBrev 3.17.00.004
Galen Charlton [Mon, 26 May 2014 01:24:13 +0000 (01:24 +0000)]
Bug 6254: DBrev 3.17.00.004

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 6254: (follow-up) tidy admin/categorie.pl ( whitespace changes only )
Kyle M Hall [Wed, 7 May 2014 17:49:03 +0000 (13:49 -0400)]
Bug 6254: (follow-up) tidy admin/categorie.pl ( whitespace changes only )

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 6254: (follow-up) update DBIC classes
Kyle M Hall [Wed, 7 May 2014 16:15:57 +0000 (12:15 -0400)]
Bug 6254: (follow-up) update DBIC classes

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 6254: make it possible to set default privacy setting for new patrons
Kyle M Hall [Thu, 5 Dec 2013 12:35:00 +0000 (07:35 -0500)]
Bug 6254: make it possible to set default privacy setting for new patrons

There is currently no way to set the privacy setting for newly created
patrons. This patch adds a new field "default privacy" to the patron
categories such that each patron category may have a different default
privacy setting.

Test Plan:
1) Apply this patch
2) Edit a patron category, change the default privacy to "forever"
3) Create a new patron of that category
4) Log into the catalog as that patron, verify the privacy setting
   is set to "forever"
5) Repeat steps 2-4 with the settings "never" and "default"

Signed-off-by: Joel Sasse <jsasse@plumcreeklibrary.net>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Bug 6254 [QA Followup 1] - can't set patron privacy by default

* Adds default privacy column to summary table
* Adds default privacy to delete category summary
* Adds "AFTER categorycode" to the database update
* Whitespace cleanup and formatting for affected code blocks
* Switch basic DBI queries to DBIx::Class to simplify code
* Adds reference to misc/cronjobs/batch_anonymise.pl to description

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Bug 6254 [QA Followup 2] - can't set patron privacy by default

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Bug 6254: QA FIX: remove trailing whitespaces

This patch removes trailing whitespaces/tab and fix the fields order in
the updatedb entry (according to the kohastructure.pl).

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 7825: DBrev 3.17.00.003
Galen Charlton [Mon, 26 May 2014 01:02:45 +0000 (01:02 +0000)]
Bug 7825: DBrev 3.17.00.003

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 7825: (follow-up) do not preselect item when OpacItemHolds is 'force' - bootstrap
Jonathan Druart [Mon, 20 Jan 2014 10:36:48 +0000 (11:36 +0100)]
Bug 7825: (follow-up) do not preselect item when OpacItemHolds is 'force' - bootstrap

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Retested with all 3 themes, works as expected.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 7825: (follow-up) do not preselect item when OpacItemHolds is 'force'
Jonathan Druart [Mon, 20 Jan 2014 10:36:33 +0000 (11:36 +0100)]
Bug 7825: (follow-up) do not preselect item when OpacItemHolds is 'force'

This patch changes the default behavior for the 'force' value.
If the pref is set to force, no item is preselected and the item list is
shown.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 7825: (follow-up) fix the force value for the bootstrap theme
Jonathan Druart [Tue, 14 Jan 2014 08:38:32 +0000 (09:38 +0100)]
Bug 7825: (follow-up) fix the force value for the bootstrap theme

If the pref was set to 'force', the item selection was not shown.
.copiesrow should be hidden before showing specific #copiesrow_ID

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.

Works on template level, tested with Boostrap and Prog theme
with all 3 possible seetings of OPACItemHolds:

1) no = offer only title level holds
2) yes = offer both title and item level holds
3) force = offer only item level holds

Also ran some additional tests on the Boostrap theme with
deactivated Javascript.

Note: I like this, but I think when "force" is selected the
item list needs to be shown by default. I am also not happy about
preselecting the first item.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 7825: (follow-up) clarify the yes and no values
Jonathan Druart [Mon, 13 Jan 2014 08:41:22 +0000 (09:41 +0100)]
Bug 7825: (follow-up) clarify the yes and no values

The value of the pref should be '1' (for yes) or '0' (for no).
The options could be kept as 'yes' and 'no': since the ImplicitTyping is
set, yes/no would become '1/0'. But I think it is preferable not to use
the yes/no value in order not to introduce a bug here if ImplicitTyping
is unset later.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 7825: Changed OPACItemHolds syspref to be no|yes|force choice - bootstrap
Jonathan Druart [Wed, 18 Dec 2013 13:48:53 +0000 (14:48 +0100)]
Bug 7825: Changed OPACItemHolds syspref to be no|yes|force choice - bootstrap

Same test plan as previous patch but with the bootstrap theme set.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 7825: Changed OPACItemHolds syspref to be no|yes|force choice
Jonathan Druart [Mon, 26 Mar 2012 08:34:34 +0000 (21:34 +1300)]
Bug 7825: Changed OPACItemHolds syspref to be no|yes|force choice

Currently, the Koha system preference OPACItemHolds allows a library
system to choose to allow patrons to place bib and item level holds from
the OPAC, or to allow patrons only to place bib level holds only from
the OPAC.

This patch set adds a third option, "force", which *requires* that
patrons place item level holds from the opac, with no option of making a
bib level hold.

This patch modifies the system preference OPACItemHolds to be of the
type "Choice", with the choices being "no", "yes", "force". The patch
does not alter the currently set value of OPACItemHolds for database
updates, only adding the additional option.

Test Plan:
1) Set OPACItemHolds to "no". Check that OPAC holds behave as it is now
(no "Place On" column, no "Select a specific copy" table, making a
reserve is successful)
2) Set OPACItemHolds to "yes". Check that OPAC holds behave as it is now
( "Place On" column is there, "Select a specific copy" table shows when
"A specific copy" is selected, making a reserve is successful)
3) Set OPACItemHolds to "force". Check that OPAC holds behave as follows:
  -  no "Place On" column is present
  -  "Select a specific copy" table is opened
  -  making a reserve is successful

This patch is a squashed patch of the 3 following patches:

Amended opac-reserve.tt accordingly

Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>
Bug 7825: Followup prevent submission without choosing an item

+ Fix some ergonomic issues in opac-reserve

Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>
Bug 7825: Updatedatabase should only change the type and options values.

The value field should not be changed. We have to keep '1' for 'yes' and ''
for 'no'.

Original patch is from Srdjan Jankovic.

Signed-off-by: Koha team AMU <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Testing notes on 4th patch.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 8970 - fix MARC import under plack
Robin Sheat [Tue, 29 Apr 2014 06:17:59 +0000 (18:17 +1200)]
Bug 8970 - fix MARC import under plack

There were database handles being shared between a parent and a child
process, which is a big no-no, and was leading to crazy crashes. Fine
under CGI, but not in a persistent environment. This causes the child to
make a new database handle to use. Also some small cleanups.

To test:
* In a plack environment,
* Tools -> stage MARC records for import
* Use a reasonable size file (but not too big as it all goes into RAM -
  I made one about 40MB.)
* Make sure that it works, and that the progress bars progress.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Tested with a 55M file, I reproduced the error and I confirm this patch
fixes it.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 3050: (follow-up) update DBIC schema classes
Galen Charlton [Sun, 25 May 2014 21:17:39 +0000 (21:17 +0000)]
Bug 3050: (follow-up) update DBIC schema classes

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 3050: DBRev 3.17.00.002
Galen Charlton [Sun, 25 May 2014 21:16:05 +0000 (21:16 +0000)]
Bug 3050: DBRev 3.17.00.002

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 3050: QA follow-up
Jonathan Druart [Wed, 21 May 2014 10:08:00 +0000 (12:08 +0200)]
Bug 3050: QA follow-up

1/ Use the usual way for ordering dates in table
2/ Add a confirmation dialog box on deleting a file
3/ Add some UTs

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 3050 - Add an option to upload scanned invoices #3/3
Jacek Ablewicz [Fri, 9 May 2014 09:47:16 +0000 (11:47 +0200)]
Bug 3050 - Add an option to upload scanned invoices #3/3

(part #3: DB updates + new syspref)

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 3050 - Add an option to upload scanned invoices #2/3
Jacek Ablewicz [Fri, 9 May 2014 09:45:29 +0000 (11:45 +0200)]
Bug 3050 - Add an option to upload scanned invoices #2/3

(part #2: changes to existing acqui scripts & templates)

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 3050 - Add an option to upload scanned invoices #1/3
Jacek Ablewicz [Fri, 9 May 2014 09:30:28 +0000 (11:30 +0200)]
Bug 3050 - Add an option to upload scanned invoices #1/3

(part #1: new module w/ UT + script + template)

New feature, adds an ability to attach arbitrary files to
acquisition records (currently: to the invoices - but it can
be extended to baskets, basketgroups, budgets etc.).

Note: this code is (heavily) based on "Bug 8130 - attach PDF
files to a patron record" by Kale M Hall, main difference being
that new table (misc_files) and new module (Koha/Misc/Files.pm)
are intended to be a little more generic solution - they allow to
store and manage files associated with great many kinds of records,
from arbitrary tables.

Test plan:
1) Apply patch[es]
2) Run installer/data/mysql/updatedatabase.pl
3) Enable system preference 'AcqEnableFiles' in acquisition
4) New option 'Manage invoice files' appears in the invoice
detail page
5) Upload/view/download/delete some files for some invoices
6) Try to delete invoice with files attached (files should
get deleted as well)
7) Try to merge 2+ invoices with files attached; after merge,
all files previously attached to individual invoices being
merged should be attached to resulting invoice (merge destination)
8) prove t/db_dependent/Koha_Misc_Files.t
9) Ensure there are no regressions of any kind in invoice detail
page (acqui/invoice.pl).

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12110: (follow-up) improve whitespace
Galen Charlton [Sun, 25 May 2014 15:20:57 +0000 (15:20 +0000)]
Bug 12110: (follow-up) improve whitespace

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12110: (follow-up) add French and German translation
Mathieu Saby [Sun, 18 May 2014 19:30:53 +0000 (21:30 +0200)]
Bug 12110: (follow-up) add French and German translation

This followup
- translates "vendor note" in French and German.
- replaces "Notes for vendor" with "Note for vendor" in English template
  (as there can only be 1 note)
- fixes a typo in French template (Qte => Qté, for "Quantité")

Test plan :
[1] set OrderPdfFormat preference to "French 3-pages"
[2] Print a basketgroup containing an order with a vendornote, and check
    the note is displayed and introduced by "Notes pour le fournisseur"
[3] set OrderPdfFormat preference to "German 2-pages"
[4] Print a basketgroup containing an order with a vendornote, and check
    the note is displayed and introduced by "Lieferantennotiz"

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12110: Display the order vendor note in basket and basketgroup CSV and PDF
Mathieu Saby [Sat, 19 Apr 2014 18:21:59 +0000 (20:21 +0200)]
Bug 12110: Display the order vendor note in basket and basketgroup CSV and PDF

This bug adds the "vendor note" for each order in the PDF for
basketgroups.  The note is displayed only if it exists, just under the
bibliographic information.

I added a separation line "--------" between bibliographic information
and the note, so that it could be visible at 1st glance.

It also replaces the internal note with the vendor in the CSV for basket
and basketgroup.  It is more logical and useful for libraries to export
the note made for vendor, as those files are destined to be sent to the
vendor.

Test plan :
- fill a basket with some orders, some with internal notes, some with
  vendor notes
- export the basket in CSV : only the vendor notes should be present
- put the basket in a basketgroup
- export the basketgroup in CSV : only the vendor notes should be
  present
- Select "English-2 pages" template for basketgroups in Sysprefs
- export the basket in PDF : the vendor notes should be present under
  the bibliographic information
- Select "English-3 pages" template for basketgroups in Sysprefs
- export the basket in PDF : the vendor notes should be present under
  the bibliographic information

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 9088: if there is only one active order, pre-select it when creating new orderings
Marcel de Rooy [Thu, 3 Apr 2014 12:15:11 +0000 (14:15 +0200)]
Bug 9088: if there is only one active order, pre-select it when creating new orderings

This patch makes the following changes to the template:

[1] If you add an order line, and you have one active fund (and zero or
    more inactive funds), the only active fund is preselected.
[2] If you modify an order line while its fund is inactive, it now shows
    the label (inactive) behind the fund name. (Note that other inactive funds
    may come up when clicking 'Show all' as they did before.)
[3] Corrected some indentation in this template part.

Test plan:

[1] Add an order line while having one active fund. Is it selected?
[2] Add an order line while having two or more active funds. No fund
    should be preselected.
[3] Modify an order line with an active fund. Is it still selected?
[4] Modify an order line with an inactive fund F2 (while having one active
    fund F1; note that this test explicitly wants F1 to be before F2).
    Check if F2 is selected and is labeled inactive.
[5] (Bonus points:) Modify an order line that refers to a deleted fund.
    If you edit this order, the fund combo should say: Select a fund.
    (Note: if you delete a fund, the budget_id in aqorders remains.)

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
I test against master 3.15.00.051
I test against all the three options of the AcqCreateItem:
placing an order
receiving an order
cataloging the record
All is OK.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12238: (follow-up) tweak descriptions of the ID list
Galen Charlton [Fri, 23 May 2014 15:53:21 +0000 (15:53 +0000)]
Bug 12238: (follow-up) tweak descriptions of the ID list

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12238: (follow-up) PATH does not need to be absolute
Kyle M Hall [Fri, 23 May 2014 11:31:19 +0000 (07:31 -0400)]
Bug 12238: (follow-up) PATH does not need to be absolute

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12238: Add option to supply list of record IDs to MARC export tool
Stéphane Delaune [Fri, 16 May 2014 09:36:16 +0000 (11:36 +0200)]
Bug 12238: Add option to supply list of record IDs to MARC export tool

The MARC export tool now includes the option to specify a file
containing record IDs to export.  When run on the command line,
this is specified using the --id_list_file switch.

Note that the list of IDs acts as a filter on other criteria
for selecting records to import.  For example, if you export
all bibs belong to a given library and also specify an ID file,
the bibs must both belong to the library and be in the ID file.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described. No errors

Tested writing txt file with biblionumbers, loading in tools and exporting

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12229: when exporting MARC records (as ISO2709), refuse to output records that...
Stéphane Delaune [Mon, 12 May 2014 14:58:14 +0000 (16:58 +0200)]
Bug 12229: when exporting MARC records (as ISO2709), refuse to output records that would be longer than the MARC limit

Test:
1. Edit a bib record, add 100.000 chars text to 500a
2. Go to Tools -> Export data (or run tools/export.pl on
   the command line)
3. Verify that exporting as XML includes the record
4. Verify that exporting as MARC does not include the record,
   and that you get the following warning:

export.pl: record (number 2025) length 102668 is larger than the MARC spec allows (99999 bytes) at...

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described. No errors

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12207: fix TTparser's handling of TT directives that contain "]"
Pasi Kallinen [Wed, 7 May 2014 06:49:01 +0000 (09:49 +0300)]
Bug 12207: fix TTparser's handling of TT directives that contain "]"

This piece of TT code:

  [% SWITCH lang %]
   [% CASE ['en', 'eng'] %]English
   [% CASE ['fr', 'fre'] %]French
   [% CASE ['it', 'ita'] %]Italian
    ...
   [% CASE %][% lang %]
  [% END %]

is parsed by the TTparser.pm wrong. In the po-files, it shows up as:

   ...

All the "CASE [ ... ]" codes are shown as "ERROR".
This happens if any TT statement contains a ']' in it - the TTParser
looks for anything that starts with [% and ends with ].

This patch fixes it so that it expects TT directives to end
with '%]'.

To test:

1)  cd misc/translator/
2)  perl translate update xx-YY
3)  for x in po/xx-YY-*.po; do cp "$x" "${x/.po/.po.bak}"; done
4)  apply patch
5)  perl translate update xx-YY
6)  for x in po/xx-YY-*.po; do diff -Nurd "$x" "${x/.po/.po.bak}"; done
      the only changed lines should be those that apply to msgid's with
      ERROR-parameters.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described. No errors

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11392: (follow-up) fix syntax error in template
Galen Charlton [Fri, 23 May 2014 15:02:27 +0000 (15:02 +0000)]
Bug 11392: (follow-up) fix syntax error in template

In the two FOREACH loops introduced by the patch, wrap
the module and action names with quotes.  This fixes a
problem where parsing the template crashes with the following
error:

  Template process failed: file error - parse error - .../viewlog.tt line 83: unexpected token (RETURN)
    [% FOREACH actx IN [ ADD DELETE MODIFY ISSUE RETURN CREATE ] %] at .../C4/Templates.pm line 132.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11392: Allow translating the viewlog module and action names
Pasi Kallinen [Fri, 9 May 2014 10:40:14 +0000 (13:40 +0300)]
Bug 11392: Allow translating the viewlog module and action names

When viewing the logs, the user can see module and action,
such as "SYSTEMPREFERENCE", "MEMBERS" or "CREATE", "MODIFY", etc.
These texts are not translatable.

This patch allows translating those. It also adds the missing "CREATE"
action to the pulldown.

To test:

1) Go browse the system logs. Note the contents of the "Action" and
"Module" -pulldowns, and the contents of those columns in the log table.
2) Apply patch
3) Go browse the system logs again. The pull-downs should work, and
show the same values as before (plus "Create" for Action), and the
Action and Module -columns in the log table should not be in ALL CAPS.
4) cd misc/translator
5) perl translate update xx-YY
6) Check that the po/xx-YY-i-staff-t-prog-v-3006000.po contains the
values for the pull-downs in it. (Look for eg. "System prefs")

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11365: (follow-up) trim whitespace in the translate_card_element block
Galen Charlton [Fri, 23 May 2014 14:46:54 +0000 (14:46 +0000)]
Bug 11365: (follow-up) trim whitespace in the translate_card_element block

Trim leading and trailing whitespace in the text generated
by the translate_card_element block to avoid generating
unescaped multi-line strings, which breaks the JavaScript

To test:

[1] Test actions in the patron card creator that generate
    JavaScript alerts, such as hitting the delete button
    without first selecting a batch or profile.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11365: make label card element title texts translatable
Pasi Kallinen [Tue, 6 May 2014 08:49:39 +0000 (11:49 +0300)]
Bug 11365: make label card element title texts translatable

To test:

1) cd misc/translator
2) perl translate update xx-YY
3) check that there's no msgid that contains the patron card label
   element title texts in po/xx-YY-i-staff-t-prog-v-3006000.po
4) apply patch
5) perl translate update xx-YY
6) check po/xx-YY-i-staff-t-prog-v-3006000.po that it contains the
   msgid. (search for "BLOCK translate_card_element")

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described. Tested updating po file, translating and installing
language, checked on tools page.
No errors

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11856: Add confirm option to POD in advance_notices.pl
Marcel de Rooy [Thu, 17 Apr 2014 09:59:55 +0000 (11:59 +0200)]
Bug 11856: Add confirm option to POD in advance_notices.pl

Also removes a commented line that changed the value of $confirm.
If it would default to 1, we do not need it at all.
I am not saying that we need it, but just documenting that we have it.

Signed-off-by: Marc Véron <veron@veron.ch>
Small change in documentation.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12165: (follow-up) display record title
Jonathan Druart [Thu, 8 May 2014 14:55:49 +0000 (16:55 +0200)]
Bug 12165: (follow-up) display record title

The code introduced by bug 2546 uses an undefined variable (line.title).
It should be ACCOUNT_LINE.title.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12165: Add descriptions of charges (bug 2546) to Bootstrap Opac theme
Katrin Fischer [Wed, 30 Apr 2014 19:14:50 +0000 (21:14 +0200)]
Bug 12165: Add descriptions of charges (bug 2546) to Bootstrap Opac theme

1) Create an account with lots of different charges, fines, fees, etc.
2) Look at the accounts tab in the prog OPAC theme
3) Compare the page to bootstrap theme
4) Verify display is now the same

In my tests I found some things that could still be improved,
but for the goal is to make all OPAC themes behave the same.

Signed-off-by: Marc Véron <veron@veron.ch>
Tested by changing accounttype in table accountlines to all possible
values like Pay, Pay00, Pay01 etc.  Both themes display the same values,
e.g. "Payment, thanks (cash via SIP2)" for Pay00

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12147: Convert action links on invoices pages to a menu
Owen Leonard [Mon, 12 May 2014 08:25:38 +0000 (10:25 +0200)]
Bug 12147: Convert action links on invoices pages to a menu

Prior to this patch, the column for displaying the action links
was too narrow, leading to an ugly display.  This patch groups
"action" links into a menu as was done with Bug 11763.

This patch also converts the date column sorting configuration to use
header class instead of an index.

This patch also corrects a couple of HTML markup errors: An
improperly-closed <input> and an improperly closed <option>.

To test, view the invoices page and confirm that the "Actions" menu
button works corectly. Test the functionality of each menu options:
Details, Close, Reopen, and Delete. Confirm that sorting by billing date
still works correctly.

Much nicer user interface. Followed test plan. Works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 10330: DBRev 3.17.00.001
Galen Charlton [Fri, 23 May 2014 13:29:39 +0000 (13:29 +0000)]
Bug 10330: DBRev 3.17.00.001

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 10330: (follow-up) fix missed case of authoritysep
Mark Tompsett [Thu, 10 Apr 2014 04:13:29 +0000 (00:13 -0400)]
Bug 10330: (follow-up) fix missed case of authoritysep

$ git grep authoritysep
This showed:
1) the updatedatabase.pl script, as expected,
2) lots of po files,
3) a test file that was missed.

TEST PLAN
---------
1) prove -v t/db_dependent/Search.t
2) Run koha QA test tools

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work (both patches). Test pass. No koha-qa errors

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 10330 - Rename system preference authoritysep to AuthoritySeperator
Kyle M Hall [Fri, 24 May 2013 11:54:42 +0000 (07:54 -0400)]
Bug 10330 - Rename system preference authoritysep to AuthoritySeperator

Test Plan:
1) Apply patch
2) Run updatedatabase.pl
3) View some records with authorities
4) Note your previously set authority separator should still be in use

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12023: (follow-up) fix redirect to step 3
Jonathan Druart [Thu, 22 May 2014 11:00:07 +0000 (13:00 +0200)]
Bug 12023: (follow-up) fix redirect to step 3

This patch fixes the redirection to step 3.

If you go on installer/install.pl and Koha is already installed,
you should be redirected to the step 3. Without this patch, the
script raised an internal error (500).

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12023 - move InstallAuth.pm to be in C4
Robin Sheat [Wed, 2 Apr 2014 04:20:08 +0000 (17:20 +1300)]
Bug 12023 - move InstallAuth.pm to be in C4

InstallAuth was in the installer directory, which meant that Plack was
unable to find it, and so running the webinstaller would fail. This
moves it into C4,

Test plan:
* Make sure the web installer runs under plack
* Make sure the web installer runs under non-plack

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12190: fold the "Creators" system preference tab into "Tools"
Galen Charlton [Tue, 6 May 2014 20:24:52 +0000 (20:24 +0000)]
Bug 12190: fold the "Creators" system preference tab into "Tools"

The "Creators" tab in the system preferences editor had only one
preference.  In order to consolidate the display as well as to
address the issue that "creators" doesn't have much of a connection
to "patron cards", the ImageLimit system preference is moved to
the Tools tab by this patch.

To test:

[1] Verify that the ImageLimit preference now shows up in the
    Tools tab in the system preference editor (along with an
    existing Tools preference, MaxItemsForBatch.
[2] Verify that the sysprefs editor no longer has a "Creators"
    tab.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 10936: (prog theme) remove duplicate 'Standard number' option in Advanced search
Marc Véron [Thu, 10 Apr 2014 06:42:46 +0000 (08:42 +0200)]
Bug 10936: (prog theme) remove duplicate 'Standard number' option in Advanced search

TEST PLAN
---------
1) Set opacthemes system preference to prog
2) In OPAC, click 'Advanced search'
3) Click 'More options'
4) Check the Keywords dropdown for duplicate 'Standard number'
5) Apply patch
6) Refresh page, and make sure 'More options' is clicked still
7) Check the Keywords dropdown for duplicate 'Standard number'
   -- it's not this time

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described on prog theme, no more duplicate.
No koha-qa errors

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 10936: remove duplicate 'Standard number' option in Advanced search
Jesse Maseto [Fri, 28 Mar 2014 15:02:18 +0000 (11:02 -0400)]
Bug 10936: remove duplicate 'Standard number' option in Advanced search

This patch removes the duplicate 'Standard number' option
under the more options of the OPAC advanced search correctly
following updates from Katrin.

TEST PLAN
---------
1) Set opacthemes system preference to bootstrap
2) In OPAC, click 'Advanced search'
3) Click 'More options'
4) Check the Keywords dropdown for duplicate 'Standard number'
5) Apply patch
6) Refresh page, and make sure 'More options' is clicked still
7) Check the Keywords dropdown for duplicate 'Standard number'
   -- it's not this time.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12211: fix wrong home link in bootstrap public catalog login page
Fridolin Somers [Wed, 7 May 2014 15:58:45 +0000 (17:58 +0200)]
Bug 12211: fix wrong home link in bootstrap public catalog login page

In bootstrap opac-auth.tt, the link to "Home" in breadcrumbs leads
to #, it should lead to opac-main.pl like in all other pages.

Test plan :
 - Use boostrap opac theme
 - Go to cgi-bin/koha/opac-user.pl when not logged
=> without patch, clicking on Home does not change the page
=> with patch, clicking on Home leads to opac-main.pl

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12106: fix capitalization: "Patron Attributes" on tools/patron import
Owen Leonard [Fri, 2 May 2014 18:33:54 +0000 (14:33 -0400)]
Bug 12106: fix capitalization: "Patron Attributes" on tools/patron import

There are three instances of incorrectly-capitalized "Patron Attributes"
on the patron import page. This patch corrects them.

To test, view the patron import page (Tools -> Import patrons). Confirm
that instances of the phrase "patron attributes" in the bottom-most
fieldset are correctly capitalized.

Followed test plan, works
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12184: fix typo "retricted" on checkin page
Galen Charlton [Tue, 6 May 2014 17:52:35 +0000 (17:52 +0000)]
Bug 12184: fix typo "retricted" on checkin page

To test:

[1] Check an item that belongs to a restricted patron and
    specify a non-default return date.
[2] Verify that the warning message contains "restricted"
    rather than "retricted".

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Magnus Enger <digitalutvikling@gmail.com>
Patch applies and makes sense. (I have not checked the actual UI,
but that should not be necessary for such a simple typo correction.)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoDBRev 3.17.00.000: ever onward
Galen Charlton [Thu, 22 May 2014 21:08:20 +0000 (21:08 +0000)]
DBRev 3.17.00.000: ever onward

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agostamp Koha 3.16.0 v3.16.00
Galen Charlton [Thu, 22 May 2014 20:28:23 +0000 (20:28 +0000)]
stamp Koha 3.16.0

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoupdate release notes for 3.16.0 (human)
Galen Charlton [Thu, 22 May 2014 20:16:25 +0000 (20:16 +0000)]
update release notes for 3.16.0 (human)

Manual edit of the release notes to hopefully make
them more useful.  Also added reminder about the
deprecation of the prog and CCSR public catalog
themes.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoupdate of release notes for 3.16.0 (automatic)
Galen Charlton [Thu, 22 May 2014 17:11:19 +0000 (17:11 +0000)]
update of release notes for 3.16.0 (automatic)

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12292: ensure that patrons are not displayed as restricted even when the last...
Jonathan Druart [Tue, 20 May 2014 14:07:17 +0000 (16:07 +0200)]
Bug 12292: ensure that patrons are not displayed as restricted even when the last restriction has expired

This is the same issue as bug 12134, but for the patron deatils page.

Test Plan:
1) Add a manual restriction to a patron and wait until the
   expiration date of the restriction has passed.  This can be
   simulated by modifying borrowers.debarred for a borrower and
   setting the date in the past.
2) Go on the detail page for a patron (members/moremember.pl)
3) Note the warning message
    "Patron is restricted until XX/XX/XXXX View restrictions"
4) Apply this patch
5) Repeat step 2
6) Note the warning message does not appear anymore

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described, no errors.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoTranslation updates for 3.16.00 final release
Bernardo Gonzalez Kriegel [Thu, 22 May 2014 12:39:57 +0000 (09:39 -0300)]
Translation updates for 3.16.00 final release

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12274: Invoice detail: don't crash on certain billing dates
Jonathan Druart [Tue, 20 May 2014 11:39:26 +0000 (13:39 +0200)]
Bug 12274: Invoice detail: don't crash on certain billing dates

Bug 10613 sent the billingdate as a string. The template wants a DateTime
object.

To reproduce:
1/ Go on a invoice detail page
2/ Select a billing date
3/ Boom without the patch
[Tue May 20 13:39:18 2014] invoice.pl: Template process failed: undef
error - The 'day' parameter ("2014") to DateTime::new did not pass the
'an integer which is a possible valid day of month' callback.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Not all dates will make it go 'boom' but 31/07/2014 did.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12274: handle closed invoices properly on invoice details page
Jacek Ablewicz [Sat, 17 May 2014 08:30:15 +0000 (10:30 +0200)]
Bug 12274: handle closed invoices properly on invoice details page

Trivial fix for small regression (closed invoices are displayed as
"Open" on details page, and it's not possible to reopen the closed
invoice using "Save" button) introduced by bug 10613.

Test plan:

1) Create and close some invoices
2) Note that closed invoices are erroneously displayed as "Open"
on individual invoice[s] details page
3) Apply patch
4) Check previously closed invoices; their status on details page
should now be properly displayed as "Closed on ..." (and an option
for reopening would reappear as well)
5) Ensure that "Close" / "Reopen" checkboxes followed by "Save" button
do work as expected for individual open / closed invoices respectivelly.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12282: fix RESERVESLIP in German sample notices
Katrin Fischer [Sun, 18 May 2014 22:28:25 +0000 (00:28 +0200)]
Bug 12282: fix RESERVESLIP in German sample notices

Accidentally the ISSUESLIP got copied to the RESERVESLIP.
This adds the correct text and formatting to the RESERVESLIP.

To test:
- Run the German web installer on an empty database
- Check that the ISSUESLIP and RESERVESLIP notices are different
  and display correctly

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Tested using webinstaller, all optionals, all ok.
ISSUESLIP(Ausleihquittung) longer than RESERVESLIP(Vormerkung)
No errors

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoDBRev 3.15.00.052: mark Koha 3.16 RC v3.16.00-rc
Galen Charlton [Mon, 19 May 2014 23:16:06 +0000 (23:16 +0000)]
DBRev 3.15.00.052: mark Koha 3.16 RC

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoupdate release notes for Koha 3.16.0-rc
Galen Charlton [Mon, 19 May 2014 23:14:31 +0000 (23:14 +0000)]
update release notes for Koha 3.16.0-rc

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 10964: Update German default bibliographic and authority frameworks
Katrin Fischer [Sat, 17 May 2014 13:35:42 +0000 (15:35 +0200)]
Bug 10964: Update German default bibliographic and authority frameworks

This updates the German default frameworks for bibliographic records
and authorities using the files created from the po files on Pootle.

To test:
- Run the web installer, make sure all mandatory data is selected
- Verify there are no SQL errors
- Check cataloguing behaves normally
- Check adding authorities behaves normally

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Tested using webinstaller.
No errors

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 10964: Update German simple and fast add frameworks
Katrin Fischer [Sun, 18 May 2014 07:58:48 +0000 (09:58 +0200)]
Bug 10964: Update German simple and fast add frameworks

This updates the German simple and fast add frameworks
using the files created from the po files on Pootle.

To test:
- Run the web installer, make sure all mandatory data is selected
- Verify there are no SQL errors
- Check cataloguing behaves normally
- Check adding authorities behaves normally

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Tested using webinstaller
Checked
No errors

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12113: Update German web installer for 3.16
Katrin Fischer [Sat, 17 May 2014 10:36:07 +0000 (12:36 +0200)]
Bug 12113: Update German web installer for 3.16

Changes:
- Translates new notices SHARE_ACCEPT und SHARE_INVITE
- Copies subtag_registry.sql from en as after applying patch
  from bug 12275 - so 'Laotisch' will show up correctly
- Rephrases and corrects spelling for user permissions
- Translates new authorized value SIP_MEDIA_TYPE
- Improves translations of creator sample data
- Improves translations of sample patron categories
  - translations in po files were changed accordingly

To test:
- Run the web installer, install all mandatory and optional
  sample data
- Check everything is installed without errors
- Verify changes listed above in the interface

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Installer works ok, values ok
No errors

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12275: Small corrections to English web installer
Katrin Fischer [Sat, 17 May 2014 10:23:53 +0000 (12:23 +0200)]
Bug 12275: Small corrections to English web installer

- Corrects the German translation for 'Laotisch'
- Adds an icon to the reference item type
- Corrects capitalization for user permissions

To test:
- Run English web installer, make sure to select
  the sample item types and all mandatory data
- Check user permissions appear correctly
- Check icon for REF itemtype is shown correctly
- Check that languages in Advanced Search appear
  as normal
- Install German and check in language list on
  advanced search 'Laotisch' now appears

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works well following test plan.
No errors

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12168: (follow-up) correct typos in test descriptions
Galen Charlton [Mon, 19 May 2014 22:04:45 +0000 (22:04 +0000)]
Bug 12168: (follow-up) correct typos in test descriptions

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12168: Add unit tests for GetBudgetHierarchySpent & GetBudgetHierarchyOrdered
Jonathan Druart [Thu, 1 May 2014 12:23:51 +0000 (14:23 +0200)]
Bug 12168: Add unit tests for GetBudgetHierarchySpent & GetBudgetHierarchyOrdered

Test plan:
prove t/db_dependent/Budgets.t

Note: This addition may sound overkill but I found this bug developing
bug 12164 and I will reuse all of that.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12168: fix spent and ordered budget values are wrong when depth >= 2
Jonathan Druart [Thu, 1 May 2014 12:12:18 +0000 (14:12 +0200)]
Bug 12168: fix spent and ordered budget values are wrong when depth >= 2

A really weird (and old) code process the calculation for the spent and
ordered sublevel funds.

It only takes into account the direct children.

So if you have:
fund1 (spent=100) parent of fund11 (spent=10) parent of fund111 (spent=1),
you get:

fund     | base-level | total spent
fund1    | 100        | 110
fund11   | 10         | 11
fund111  | 1          | 1

which is wrong, it should be

fund     | base-level | total spent
fund1    | 100        | 111
fund11   | 10         | 11
fund111  | 1          | 1

Test plan:
- Create 1 budget and 3 funds with the same structure as above.
- Create some orders and receive them (not all).
- Go on the fund list view and verify the values are correct.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11404: (follow-up) only ask user if there are instances needing upgrading
Robin Sheat [Tue, 13 May 2014 01:39:04 +0000 (13:39 +1200)]
Bug 11404: (follow-up) only ask user if there are instances needing upgrading

There's no point asking the user if they want their Apache Koha
configuration updated if there's no configuration needing updated.

This also fixes a case where the updating would have failed when running
on Apache 2.4.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
I agree with adding that checks, and the conditions rewrite seems cleaner
than my first approach. So, I sign it.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11404: Make the install process aware of the changes
Tomas Cohen Arazi [Tue, 6 May 2014 18:13:19 +0000 (15:13 -0300)]
Bug 11404: Make the install process aware of the changes

This patch makes the install scripts take care of the new file
and prompt for user confirmation on the apache file renaming step.

Both prompt and the renaming actions depend on the fact that there
are instances with their files missing the .conf appendix.

Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11404: koha-functions.sh introduced for reuse
Tomas Cohen Arazi [Mon, 5 May 2014 14:50:55 +0000 (11:50 -0300)]
Bug 11404: koha-functions.sh introduced for reuse

As asked by Robin, a bash lib of functions is introduced with the common
functions to be reused. Most of the scripts are modified (reduced) to
include this file and the repeated functions cleaned.

No noticeable change in behaviour should be noticed.

As I've been todl in #debian-mentors, it is used that files for inclusion
should be installed at the apps directory (i.e. /usr/share/koha/) so this
patch makes the install script put the file in the bin/ directory.

All koha-* scripts assume the file is there already (and fail otherwise).

Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11404: add support for Apache 2.4's config file convention
Tomas Cohen Arazi [Mon, 16 Dec 2013 17:32:40 +0000 (14:32 -0300)]
Bug 11404: add support for Apache 2.4's config file convention

Apache 2.4 expects the sites definition files use the sufix '.conf'

To reproduce:
- Install the 'koha-common' package on Debian 7 or Ubuntu 13.10+
  (both known to include Apache 2.4).
- Create an instance (for example testlibrary) using the supplied
  commands:
 $ koha-create --create-db testlibrary
> FAIL: apache reports an error like this:
"ERROR: Site testlibrary does not exist!"

This patch adds a test on the Apache version and appends the ".conf"
sufix if needed.

To test:

1st step: koha-create gets fixed:

-- The hard way --
- Apply the patch, and build the koha-common package on top of this
  commit.
- Install the built package on an Apache 2.4 Debian-based distro (Debian 7
  or Ubuntu 13.10 will work)
- Create a test instance:
 $ koha-create --create-db testlibrary
> SUCCESS: no more apache sites related error.

-- The easy way --
- Apply the patch, and copy the koha-create into an Apache 2.4
  Debian-based distro
- Create a test instance using the koha-create script you just
  copied:
 $ ./koha-create --create-db testlibrary
> SUCCESS: no more apache sites related error.

2nd step: the rest of the touched scripts keep working as usual

koha-disable
koha-dump
koha-enable
koha-list
koha-remove
koha-restart-zebra
koha-stop-zebra
koha-start-zebra

They should all keep working. Can be tested "the easy way" too.

Note: there might be another issues regarding Apache 2.4 deployments
like the need for

 $ a2enmod access_compat

and perhaps some directory permissions tweak, which I think should be
properly documented on the install instructions.

Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12288: (follow-up) test for defined values
Galen Charlton [Mon, 19 May 2014 19:56:14 +0000 (19:56 +0000)]
Bug 12288: (follow-up) test for defined values

This patch adjusts the test so that if an "ISBN" is not
defined (because the source string did not specify a valid
ISBN), it doesn't result in a warning once the warnings
stricture is enabled in C4::Koha.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12288: fix search errors with AggressiveMatchOnISBN turned on
Kyle M Hall [Mon, 19 May 2014 12:37:28 +0000 (08:37 -0400)]
Bug 12288: fix search errors with AggressiveMatchOnISBN turned on

This patch fixes a problem where search errors like this in the logs when
running a stage import with the AggressiveMatchOnISBN syspref turned on:

search failed (isbn,phr=978-0-7517-9745-9 or isbn,phr=0-7517-9745-6 or
isbn,phr=978-0-7517-9745-9 or isbn,phr=0751797456 or
isbn,phr=9780751797459 or isbn,phr=978-0-7517-9759-6 or
isbn,phr=0-7517-9759-6 or isbn,phr=978-0-7517-9759-6 or
isbn,phr=0751797596 or isbn,phr=9780751797596 or isbn,phr= or
isbn,phr= or isbn,phr= or isbn,phr= or isbn,phr=) CCL parsing
error (10014) Search word expected ZOOM at
/usr/share/koha/lib/C4/Matcher.pm line 688.

This is most easily seen when running the script from command line
/misc/stage_file.pl.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12288: add regression test
Galen Charlton [Mon, 19 May 2014 19:29:44 +0000 (19:29 +0000)]
Bug 12288: add regression test

To test:

[1] Run prove -v t/Koha.t.  The last test should fail.
[2] Apply the main patch for this bug.
[3] Run prove -v t/Koha.t again.  This time, all tests should pass.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoTranslation update for 3.16.00 release
Bernardo Gonzalez Kriegel [Mon, 19 May 2014 18:40:50 +0000 (15:40 -0300)]
Translation update for 3.16.00 release

New languages:

Belarusian be-BY
Faroese fo-FO
Rwandan rw-RW
Swahili sw-KE

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12244 - followup to fix tabs
Bernardo Gonzalez Kriegel [Tue, 13 May 2014 22:47:02 +0000 (19:47 -0300)]
Bug 12244 - followup to fix tabs

Only tab removing

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12244 - Update Acq Help for 3.16
Nicole C. Engard [Tue, 13 May 2014 13:48:52 +0000 (08:48 -0500)]
Bug 12244 - Update Acq Help for 3.16

This updates the basket help.

To test:

* Open a basket
* Click help and confirm it's right and there

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Help ok

Final comment: koha-qa complains about tabs, removed in followup

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12244 - Update Admin Help for 3.16
Nicole C. Engard [Tue, 13 May 2014 13:37:17 +0000 (08:37 -0500)]
Bug 12244 - Update Admin Help for 3.16

This patch updates 3 help files.

To test:

* Visit Administration > Patron Categories
* Click help
* Confirm it's there and right
* Visit Administration > Currencies
* Click help
* Confirm it's there and right
* Visit Administration > Circ Rules
* Click help
* Confirm it's there and right

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Help ok. One comment: on circ rules, I think that "you're" can
be correct, but I prefer "you are"

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12244 - Update authorized values help for 3.16
Nicole C. Engard [Tue, 13 May 2014 13:27:17 +0000 (08:27 -0500)]
Bug 12244 - Update authorized values help for 3.16

This patch adds a few new values to the authorized values help

To test:

* Visit Administration > Authorized Values
* Click help
* Confirm help is there and correct

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
New values ok

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12244 - Update Notices Help Files
Nicole C. Engard [Tue, 13 May 2014 13:19:56 +0000 (08:19 -0500)]
Bug 12244 - Update Notices Help Files

Updates the 2 notices help files with new info.

To test:

* Visit Tools > Notices & Slips
* Click help and confirm it's there and right
* Visit Tools > Overdue notices/status triggers
* Click help and confirm it's there and right

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Long help ok

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 12244 - Update Search Help for 3.16
Nicole C. Engard [Tue, 13 May 2014 12:52:48 +0000 (07:52 -0500)]
Bug 12244 - Update Search Help for 3.16

This patch updates the search help file.

To test:

* Visit Search
* Click help
* Confirm help is there and correct

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Help ok

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>