Owen Leonard [Mon, 26 Nov 2012 14:24:28 +0000 (09:24 -0500)]
Bug 9140 - Untranslatable strings in item circulation history
This patch removes the text of a message from the script
to the template. The lastmove sub now returns either the date
or 0, and the template displays the "no transfers" message
if the date doesn't exist.
To test, view the circulation history for items which
do and do not have a transfer history. A date should be displayed
for items which have a transfer history. A messages should
be displayed for those which do not.
This patch also adds a <span> around the text "Never" which
was not getting picked up by the translation script. To test
this change, run "perl translate update <lang>" from misc/translator,
then check if the string shows up in the po file. (Thanks kf!)
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Robin Sheat [Fri, 5 Oct 2012 03:04:23 +0000 (16:04 +1300)]
Bug 8878 - a command to provide a shell with the koha environment
This command behaves something like su(1), but provides you with a shell
as the koha user, and with the environment pointing to the right places.
Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
SIGNED-OFF] bug 8382: It is not possible to cancel an order on a filtered page in parcel.pl
Because in parcel.pl page the filter (on the left) makes a table using jscript and
a very different workflow, the "cancel" link does nothing just asking for cancelling.
Principaly due to the use of the "filter" js function that call the parcel.pl page
and does all the job in a separate block with a separate perl function
(SearchOrder) that sends all to js, that constructs html to finally append it to table.
So I have decided to rebuild entirely the filter.
I have choosen to overload the function "GetPendingOrders" to enable it to accept new arguments.
To test : when you are in "parcel.pl" ready to receive orders, simply select a filter on the left
and on the filtered page try to cancel a line.
You'll have the warning message but no more, the line will be not canceled.
Owen Leonard [Wed, 21 Nov 2012 20:08:45 +0000 (15:08 -0500)]
Bug 8843 [3.8.x] Cannot export bibliographic records by call number
Reworked for 3.8.x: When building the query for exports by call
number the script has the logic reversed. It tries to select
records with call numbers less than the starting call number and
greater than the ending call number. This should be reversed.
To test, test an export in an unpatched system. An export by
call number will return an empty file. After applying the patch
an export by call number should give valid results.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Wed, 21 Nov 2012 17:31:41 +0000 (12:31 -0500)]
Bug 8588 [3.8.x] Duplicate field IDs cause problems with SQL report parameter entry
Reimplemented for 3.8.x: Changes to markup and script to
enable unique ids on form fields. These changes allow for
working label+input pairs on one or more text and select
inputs and multiple working datepickers.
To test, create a report with more than one date parameter,
at least one text parameter, and one or more authorised
value parameters. The datepickers should each work properly,
and labels should by clickable.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Bug 9135: updatedatabase.pl fails when DEBUG is set
When the DEBUG environment variable is set to a true value, all DBI
errors are treated as fatal. Unfortunately, duplicate keys are
incredibly common in updatedatabase.pl, since sysprefs are often added
in testing, then re-added once the patches have been pushed to master
(or added when on a maintenance branch, and then re-added when the
system is upgraded to either a newer maintenance branch or master).
This patch disables fatal errors for the updatedatabase.pl script.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and perlcritic pass.
To test, run from command line:
export DEBUG=1
installer/data/mysql/updatedatabase.pl
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
If a query causes an error, the script continues as expected. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Wed, 21 Nov 2012 19:38:12 +0000 (14:38 -0500)]
Bug 8820 [3.8.x] Don't show orders table if there are no orders
Reworkd for 3.8.x: Patch removes the "basket empty" message in
favor of hiding the orders table altogether when a basket has
no orders.
Other textual changes:
- Correcting capitalization according to coding guidelines
- Replacing the "Order Details" heading with the more
succinct "Orders"
Signed-off-by: Melia Meggs <melia@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass, template change only.
To test:
1) Create a new basket - verify 'basket empty' shows up
2) Create order line - verfiy table heading is 'Order Details'
3) Close basket, check capitalization on basket group dialog
Repeat with patch applied.
- 'basket empty' is gone
- Heading is now 'Orders'
- Capitalization on basket group dialog is correct
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Fridolyn SOMERS [Wed, 21 Nov 2012 10:05:05 +0000 (11:05 +0100)]
Bug 9123: Authorities search ordered by authid does not work
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested with Zebra, marc21, grs1.
Discovered that paging through auth search results does no longer work, but that is not related to these changes.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with Zebra, marc21, dom.
All tests pass. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Bug 8781: hiding of transfer page when it's useless
The transfer page is only useful when the system
preference "IndependantBranches" is Off of when the user
is a superlibrarian. Otherwise it can be hidden.
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and perlcritic pass.
TEST PLAN :
It's about testing the display of the "Transfer" link on "circulation-home.pl".
The link needs to appear if IndependantBranches is off or if the user is a superlibrarian.
1) IndependantBranches = Off, user is superlibrarian : link appears
2) IndependantBranches = Off, user is not superlibrarian : link appears
3) IndependantBranches = On, user is superlibrarian : link appears
4) IndependantBranches = On, user is not superlibrarian : link does not appear Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Jonathan Druart [Fri, 23 Nov 2012 13:38:03 +0000 (14:38 +0100)]
Bug 9134: There is no previous link on the second page of the search results page
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass.
Checked paging forwards, backwards, using 'Previous', 'Next'
and page numbers works correctly in staff and OPAC. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Conflicts:
koha-tmpl/opac-tmpl/prog/en/includes/page-numbers.inc
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Mathieu Saby [Thu, 18 Oct 2012 21:21:25 +0000 (23:21 +0200)]
Bug 8946: corrections in inc files for UNIMARC coded fields advanced search
In subtypes_unimarc.inc files for opac and staff interface, this patch
- fix 1 wrong code (Frequency-code:i = Other should be z)
- fix the label "Feschrift Ind." to "Literary genre"
- add some values for Material-type index (s, t), Literature-Code (i), ctype (v, w), Type-Of-Serial (e,f,g)
- fix a few typos
- change the order of some values (u values)
To test, check if the new values are visible in the opac and staff interface.
Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
On 3.8.x, it was possible for multiple automatically generated
authorities to be linked to a single heading. This patch deletes
previous links from headings prior to linking them to
automatically-generated headings. This patch also corrects a
potential problem wherein multiple authorities might be generated if
a record is edited repeatedly in quick succession. The latter problem
exists on Master and 3.6.x as well, and the code that corrects the
multiple linkages is equally applicable if seemingly unnecessary.
This patch adds a missing routine to C4::AuthoritiesMarc that should
have been in the 3.8.x version of the patch for bug 8823.
To test:
1) Turn on BiblioAddsAuthorities and AutoCreateAuthorities.
2) Create a new record or edit an existing one, and add an
authority-controlled heading (for example, MARC21 1xx or 6xx or
UNIMARC 6xx or 7xx) which does not currently exist in your authority
file.
3) If you don't get a software error, it worked.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
For 2) you can also download a record over Z39.50.
Passes all tests.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
David Cook [Mon, 29 Oct 2012 22:06:45 +0000 (09:06 +1100)]
Bug 8981 - Remove Nonpublic General Note from OPAC authorities display
Currently, the MARC21 667 Nonpublic General Note field is appearing on the opac-authoritiesdetail.pl page.
Since it is a nonpublic note, it makes sense to remove it from this view.
This patch adds in an extra condition that checks authority records for MARC21 667 fields before displaying them in this opac screen.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Does what it says, with no side effects
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Kyle M Hall [Mon, 1 Oct 2012 19:16:29 +0000 (15:16 -0400)]
Bug 5801 - C4::Circulation::_GetCircControlBranch wrongly used in opac-reserve.pl
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and perlcritic pass.
Tests done:
holds policy vs. circulation rules seemed to make the difference for me,
I am not totally sure why that is, but see no reason to fail this patch as
results are ok.
System preferences
- CircControlBranch = the library the item is from
- ReservesControlBranch = patron's home library
Circulation rules
- Library A - Holds policy: Books can not be put on hold.
- Library B - Holds policy: Books can be put on hold. (no special setting needed)
Catalog data
- A record with an item for library B, itemtype Books.
Test without patch:
1) Patron A (home library A) places a hold in OPAC on an item from library B.
Should be: hold is NOT allowed.
Before patch: hold IS allowed.
After patch: hold is NOT allowed.
OK
2) ReserveControlbranch = item's home library
Patron A (home library A) places a hold in OPAC on an item from library B.
Should be: hold is allowed.
Before patch: hold is allowed.
After patch: hold is allowed.
OK
3) ReservesControlBranch = patron's home library
Circulation rules: Remove hold policy for library B.
Library A: no holds allowed for books using 'Holds allowed (count)' = 0
Library B: 5 holds allowed for books using 'Holds allowed (count)' = 5
Patron A (home library A) places a hold in OPAC on an item from library B.
Should be: hold is NOT allowed
Before patch: hold is NOT allowed
After patch: hold is NOT allowed
OK
4) ReserveControlbranch = item's home library
Should be: hold is allowed
Before patch: hold is allowed
After patch: hold is allowed
OK Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Owen Leonard [Mon, 26 Nov 2012 15:49:22 +0000 (10:49 -0500)]
Bug 9137 - Focus when editing/adding new itemtypes/authorised values
This patch adds the "focus" class to the relevant inputs so
that the global staff client JS will move the focus to those fields.
Logic in the authorised_values template puts the focus on the
correct field whether you're adding a new category, a new value,
or performing an edit.
To test, try the following operations:
- add an itemtype
- edit an itemtype
- add an authorised value category
- add an authorised value value
- edit an authorised value value
In all cases the focus should automatically be in the first
form field.
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass and works nicely. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Works well in 3.10.x Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Works well in 3.8.x
Owen Leonard [Mon, 19 Nov 2012 16:00:15 +0000 (11:00 -0500)]
Bug 9106 - Filtering list of uncertain price list by owner empties order information
The form which filters the list of orders with uncertain prices
includes a parameter which tells the script to modify the orders,
resulting in order information being lost. This patch removes
the unnecessary form field.
To test you must have orders with uncertain prices, preferably from
more than one user. Go to the uncertain prices page. Before applying
this patch, submitting the "orders from" form would cause the page
to refresh with no results. This is because the script cleared the
orders of price, quantity, etc. information.
After applying this patch the uncertain prices list should refresh
and show the correct results, either your orders ("me") or all
("Everyone").
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Tue, 13 Nov 2012 15:08:48 +0000 (10:08 -0500)]
Bug 8614 [3.8.x] Icon for scores on OPAC detail page broken
At some point some famfamfam icons were moved out of the
theme director into the lib directory in opac-tmpl. When
this was done the path to the directory was changed accordingly
in most cases. However, not all famfamfam icons were moved,
and some image paths were not corrected.
This patch completes the move of the famfamfam icon set
to opac-tmpl/lib and corrects the path to the icons on
the OPAC XSL detail page and the OPAC holds page.
To test, view those pages and confirm that the images work.
View records with a variety of material types.
Edit: Rebased on origin/3.8.x Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Follow up to Bug 6680: tiny up download lists formats
Explains what uses RIS, and replaces iso2709 with 'MARC'.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Simply change, all tests pass. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Robin Sheat [Wed, 7 Sep 2011 06:54:42 +0000 (18:54 +1200)]
Bug 6680 - simple tidy-up of cart download format descriptions
Explains what uses RIS, and replaces iso2709 with 'MARC'.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Simple change, all tests pass. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Lyon3 Team [Mon, 19 Nov 2012 10:39:12 +0000 (11:39 +0100)]
Bug 9098 Replace tabulations by spaces in opac-user.pl
There was a bunch of tabulations from line 157 and followings
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
The following command show us there is no change:
git show HEAD --ignore-all-space Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Debian stable's version of Test::More is older than the one I used on my
12.04 dev box, and doesn't support subtests, which I used to avoid side
effects between different test scenarios.
This patch removes that subtest definition.
Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
All tests passing in 3.10.x
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
All tests passing in 3.8.x
Owen Leonard [Fri, 2 Nov 2012 16:40:08 +0000 (12:40 -0400)]
Bug 8515 - OPAC password change does not obey OpacPasswordChange
The OPAC change password template enforces the OpacPasswordChange
preference by preventing the form from appearing. However, the
script doesn't contain any check for OpacPasswordChange so it is
vulnerable to someone submitting data to it by some other means.
This patch adds a check for OpacPasswordChange to the script and
revises the template logic in order to show the right warning
in all circumstances.
To test, turn off OpacPasswordChange and navigate manually to
opac-passwd.pl. You should see a warning that you can't change
your password.
Turn on OpacPasswordChange load the change password page and
save the page to your desktop. Turn off OpacPasswordChange and
submit a password change via the saved page. Without the patch
this would result in a password change. After the patch it
should not.
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed bug and made sure patch fixes it.
Passes all tests and perlcritic. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Tue, 20 Nov 2012 17:27:25 +0000 (12:27 -0500)]
Bug 9073 - Download option from the cart should match the menu button in lists
This patch moves the staff client Cart download choices into a toolbar
menu button instead of requiring that the user make the choice via a form
in the pop-up window.
To test, add items to Cart in the staff client. Open the cart and
choose a download option from the Download menu. Your download
should complete correctly without the page changing or reloading.
Unrelated edit: Eliminating duplicate document.ready() block by
consolidating a couple of lines of JavaScript.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked all export formats can be selected and downloaded, including
CSV profiles.
All tests and perlcritic pass. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Tue, 20 Nov 2012 14:49:19 +0000 (09:49 -0500)]
Bug 9115 - basket window should close automatically when placing a hold
If you choose to place a hold from the Cart pop-up, the entire
holds process (possibly including login) takes place in the cart
window. Upon completion of the operation you're left with a second
window which has lost its context as the Cart.
This patch revises the hold process so that when you click the
hold link in the cart the operation is moved to the main window
and the Cart window closes.
Since the holdSel() function doesn't require interaction with
template variables I have moved it to basket.js along with the
described changes.
To test, put items in your Cart and open it. Select items to
place on hold and click the "Place hold" link. The cart
should close, and the items you selected should appear on the
place hold screen in the main window.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked in Firefox and Chromium in Ubuntu, works nicely.
All tests pass. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Tue, 30 Oct 2012 14:53:39 +0000 (10:53 -0400)]
Bug 5521 - item edit form appears if no items found
This patch changes the template so that if no items are
found the page doesn't show "The following barcodes were found"
and doesn't show the item edit form.
To test, submit a batch which contains no valid barcodes.
Compare to a batch which contains some or all valid barcodes.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All tests succeed.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Fri, 2 Nov 2012 18:48:25 +0000 (14:48 -0400)]
Bug 8546 - Error in description of OPAC Advanced Search Publication date range search
The publication date range search description in the OPAC suggests
that a search like "-1987" or "2008-" is not inclusive when it
actually is. This patch corrects the description.
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com> Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Fridolyn SOMERS [Tue, 30 Oct 2012 10:20:05 +0000 (11:20 +0100)]
Bug 8983: Typo in UNIMARCslim2OPACResults.xsl
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Tue, 29 May 2012 19:07:32 +0000 (15:07 -0400)]
Bug 8163: Click to populate XSLT preferences with "default" or empty values
This patch adds markup and JavaScript to the system preferences
interface so that the user can click "default" or "empty" to populate
an XSLT-related pref with those vaules.
To test, open system preferences for the OPAC or staff client. In
the description for an XSLT-related preference click the "default"
link to populate the field with "default." Click the "leave empty"
link to empty the field.
Revised according to Julian Maurice's suggestion for a more
generic, flexible way to implement it.
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com> Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Fixing the holiday exceptions arised a problem with how the test data was constructed.
This made several tests fail.
This patch fixes the add_holiday function. Tests should pass now.
Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 9078 - is_holiday should honour holiday exceptions
Make is_holiday return 0 for holiday exceptions.
Note: This patch makes several current ok tests fail. My first guess is test data is not
constructed ok. More on this later.
Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
useDaysMode=Datedue wasn't used as advertised in the docs. Added
next_open_day and prev_open_day subs to Koha::Calendar and some tests for them.
- Koha::Calendar->addDate was rewritten in a more sane way (also split into
addHours and addDays for convenience).
- Fixed a bug introduced in Bug 8966 regarding dt truncation and dtSets->contains
- Minor docs typos
- Use the passed Calendar mode or default to 'Calendar' in Koha::Calendar->_mockinit.
- Tests
I'm writing some db-dependent tests for is_holiday, and hopefully for CalcDateDue so any
rewrite/followup doesn't break things.
Regards
To+
Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Conflicts:
t/Calendar.t
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Mathieu Saby [Thu, 8 Nov 2012 23:49:49 +0000 (00:49 +0100)]
Bug 8954: Make languages list in advanced search translatable (revision 1)
In opac-search.pl and search.pl, this patch moves the $lang variable from the end to the begining of the script, and use it as a parameter for getAllLanguages.
In Languages.pm, getAllLanguages function is modified :
- if no parameter is passed to the function, it returns english languages names
- if a $lang parameter conforming to RFC4646 syntax is passed :
-- the function returns languages names translated in $lang if possible
-- if a language name is not translated in $lang in database, the function returns english language name
To test, set your opac and staff interface in english and in other languages and check search.pl and opac-search.pl :
- If language names in your languages_description table are translated in the same language you use for your GUI, the language names in dropdown list will be translated in this language (+native name).
- If your GUI is in english, or in a language into whitch languages names are not translated in languages_description, the dropdown list will stay in english (+native name).
Signed-off-by: Marc Veron <veron@veron.ch>
Patch behaves as expected.
With Opac language set to French I got all languages with French language name.
With German (de-DE), I got only a few with German language names (and all other with English ones),
this was due to missing entries for de-DE in table language_descriptions.
This behaviour is consistent with the description above.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested language list in OPAC and staff advanced search is translated
properly after applying the patch. Checked that language switcher still
works like it should.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Fixed typo in POD.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Wed, 14 Nov 2012 17:31:47 +0000 (12:31 -0500)]
Bug 9077 [3.8.x] OPAC Social media links broken by fix for Bug 8973
This patch returns the structure of the social media icons
markup to the state it was in before the application of the
patch for Bug 8973 and adds the missing filters which would
have been added by that patch.
To test, view any OPAC detail page in origin/3.8.x. After
applying this patch the social media icons should appear
normally.
Signed-off-by: Srikanth Dhondi <srikanth@catalyst.net.nz> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Wed, 7 Nov 2012 15:04:06 +0000 (16:04 +0100)]
Bug 9024: Add missing sample data to existing files
Adds missing authorised values (enhancement)
Adds missing slip notice templates (bug fix)
Koha will complain if you try to print a slip and there is no notice
defined for them, so this is not really an improvement, but kind of a bug fix.
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 9070: [SIGNED-OFF] authority searches in auth_finder error out
When using authority records imported into Koha from elsewhere, you
can get an error like:
Can't use string ("HASH(0xbc6c{30)") as a HASH ref while "strict refs" in use at /usr/share/koha/lib/C4/AuthoritiesMarc.pm line 363.
in authorities/auth_finder.pl. This patch fixes that error.
To test:
1) You will need records imported from elsewhere.
2) Use the authority control plugin in a bib record to search for one of
those headings.
3) Observe you get a nasty error.
4) Apply patch.
5) Repeat step 2.
6) Observe the error is gone.
7) Sign off.
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised. No warning about "defined(%hash) is deprecated"
under perl v5.10.1.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Conflicts:
C4/AuthoritiesMarc.pm
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Magnus Enger [Mon, 12 Nov 2012 11:16:48 +0000 (12:16 +0100)]
Bug 9058 - Norwegian default for CalendarFirstDayOfWeek
Sets a sensible default for CalendarFirstDayOfWeek in
installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql
To test:
- Do a complete web install in Norwegian
OR
- Load installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql
into MySQL from the command line
- Check that CalendarFirstDayOfWeek is set to 'Monday' and that
calendars display Monday as the first day of the week.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This is due to raising all db errors combined with the fact that attempts
to make selections from a non-existent systempreferences table raises db errors.
The installer should run even with DEBUG set, otherwise dropping and recreating
a development database becomes somewhat of a chore. This patch adds code to
check for the existence of the systempreferece table. If the table exists, then
RaiseError is enabled on the database handle. Otherwise it is disabled to allow
the installer to run without throwing an error.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
The installer can now be run both with and without DEBUG set.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Frédéric Demians [Thu, 25 Oct 2012 08:07:54 +0000 (10:07 +0200)]
Bug 8968 "Add to cart" translatable on OPAC result page
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Fridolyn SOMERS [Wed, 31 Oct 2012 15:45:14 +0000 (16:45 +0100)]
Bug 8996: In result page items with negative notforloan are available
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Passed-QA-by: Marcel de Rooy <M.de.Rooy@rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Fridolyn SOMERS [Wed, 31 Oct 2012 13:26:31 +0000 (14:26 +0100)]
Bug 7921: Software error while placing order
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Fridolyn SOMERS [Tue, 30 Oct 2012 16:12:33 +0000 (17:12 +0100)]
Bug 8988: item status uses authorized value description for intranet
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Passed-QA-by: Marcel de Rooy <M.de.Rooy@rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Magnus Enger [Wed, 31 Oct 2012 08:06:31 +0000 (09:06 +0100)]
Bug 8805 - Add a biblio-zebra-indexdefs.xsl for NORMARC
This is required in order for Koha to support DOM indexing of the
NORMARC dialect, cf Bug "Bug 7818 - support DOM mode for Zebra
indexing of bibliographic records".
The two files in this patch were generated from the NORMARC
record.abs by doing the steps suggested at the bottom here:
http://wiki.koha-community.org/wiki/Switching_to_dom_indexing
No manual editing was involved.
To test:
- Do a fresh install, choosing NORMARC as the MARC dialect
- Run rebuild_zebra.pl and check it does not complain about missing
files or other things
- Check that search works as expected. Using MARC21 records for
the testing should be OK.
2012-10-31: New patch after an update to Bug 8665 Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Marcel de Rooy [Thu, 4 Oct 2012 11:34:51 +0000 (13:34 +0200)]
Bug 8872: Changes for intranet showmarc
Simplifies template (eliminating intranet-bottom include).
Makes encoding for card view more consistent with approach in Templates module.
Rearranges a few lines in script for consistency and performance.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Passed-QA-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Marcel de Rooy [Thu, 4 Oct 2012 11:40:51 +0000 (13:40 +0200)]
Bug 8872: Changes for opac-showmarc
Simplifies template (eliminating opac-bottom include).
Makes encoding for card and html view more consistent with approach in Templates module.
Rearranges a few lines in script for consistency and performance.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Passed-QA-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Marcel de Rooy [Thu, 4 Oct 2012 10:05:10 +0000 (12:05 +0200)]
Bug 8872 Add UTF-8 encoding to opac xslt files
Does also fix head and body tags in MARC21slim2OPACMARCdetail.xsl.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Passed-QA-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Marcel de Rooy [Thu, 4 Oct 2012 10:00:28 +0000 (12:00 +0200)]
Bug 8872: Add UTF-8 encoding to intranet xslt files
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Passed-QA-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Mark Tompsett [Thu, 27 Sep 2012 06:52:14 +0000 (14:52 +0800)]
Bug 8826 - Initialization of hash triggers error log entries.
Changed:
our %renew_failed = {};
To:
our %renew_failed = ();
This prevents an error log about Reference found where
even-sized list expected.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Fridolyn SOMERS [Wed, 17 Oct 2012 08:53:29 +0000 (10:53 +0200)]
Bug 8936: Search RSS feeds does not show there items when subscribing in Firefox
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Conflicts:
koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tt
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Fridolyn SOMERS [Fri, 26 Oct 2012 08:50:58 +0000 (10:50 +0200)]
Bug 8973: HTML and URL escape missing in OPAC templates
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Conflicts:
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
The DOM transformer was missing a line from a previous development,
resulting in the MARC21 authorities DOM indexing stylesheet being
regenerated with a missing line. This patch readds the missing line
to the transformer, and provides the corrected authority-zebra-indexdefs.
Signed-off-by: Elliott Davis <elliott@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Conflicts:
etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 8665: DOM indexing fails to index some bib records
Use a user-specified field for z:id.
This patch also fixes an excess space before the index in the MARC21
biblio index definitions, which someone fixed in the generated file
but not in the source file it should have been fixed in.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>
Conflicts:
etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Maxime Pelletier [Wed, 24 Oct 2012 21:22:02 +0000 (17:22 -0400)]
Bug 8966 Koha::Calendar::is_holiday truncates the date
* Create a local copy of the date instead of calling truncate directly on the date
* Add a test to properly test that the issue is fixed
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Mark Tompsett [Wed, 19 Sep 2012 07:11:48 +0000 (15:11 +0800)]
Bug 8749 - Missing Ubuntu library files in ubuntu.*.packages
Added
libtemplate-plugin-htmltotext-perl install
into the ubuntu.*.packages files. The missing library exists in
the debian.koha-community.org repository.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Magnus Enger [Thu, 18 Oct 2012 09:56:47 +0000 (11:56 +0200)]
Bug 8941 - Make title display properly for NORMARC OPAC detail view
Authors and materialtype were displayed to the right of the title.
This patch simly adds class="title" to the h1 that holds the title.
To test:
- Set marcflavour = NORMARC
- Check a detail view in the OPAC and see that the display is wrong
- Apply the patch
- Check that the detail view now looks good
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 8823: CatalogModuleRelink Creates Multiple Links between Bib and Auth record
On 3.8.x, it was possible for multiple automatically generated
authorities to be linked to a single heading. This patch deletes
previous links from headings prior to linking them to
automatically-generated headings. This patch also corrects a
potential problem wherein multiple authorities might be generated if
a record is edited repeatedly in quick succession. The latter problem
exists on Master and 3.6.x as well, and the code that corrects the
multiple linkages is equally applicable if seemingly unnecessary.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Kyle M Hall [Thu, 4 Oct 2012 14:34:49 +0000 (10:34 -0400)]
Bug 8253 - fix fine doubling, when upgrading from 3.6 to 3.8 - Add de-duplication script
This script will remove these duplicate fines. To use, repeatably run this
script until there are no more duplicates in the database.
(fix_accountlines_rmdupfines_bug8253.pl)
Duplicate fines would happen if you upgraded to a 3.8 version that does not have the
bug8253 patch, and the misc/cronjobs/fines.pl is run. In 3.8 an upgrade to a more
granular date/time was not addressed for pre-existing fine entries and this script
removes the resulting duplicates. It also intelligently preserves the amount outstanding
for payments already applied. If your version already had the bug8253 patch at the time
of the upgrade, duplicate fines should not have been generatd.
Signed-off-by: wajasu <matted-34813@mypacks.net> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Mason James [Tue, 2 Oct 2012 22:09:41 +0000 (11:09 +1300)]
Bug 8253 - Fine doubling
Provides a fix that during database upgrade, fines are correclty
formatted. Once the misc/cronjobs/fines.pl is run in the
upgraded database, it will not result in duplicate fines being
generated.
Signed-off-by: wajasu <matted-34813@mypacks.net> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Robert Williams [Thu, 18 Oct 2012 00:58:23 +0000 (13:58 +1300)]
Bug 8939 : Fines being charged during the grace period
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Lyon3 Team [Mon, 8 Oct 2012 17:06:04 +0000 (19:06 +0200)]
Bug 8888 : Question marks in series title facet links
When series title include a question or exclamation mark, theese must be removed
to prevent search failure.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Before the patch: Series facet links with ! or ? return no results.
After the patch the same links return valid results.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Mark Tompsett [Fri, 12 Oct 2012 06:29:59 +0000 (14:29 +0800)]
Bug 8910 - silent warnings triggered in about.pl
In order to detect the apache version, there are multiple
commands used. These may not all exist, which triggers error log
entries. By simply adding " 2> /dev/null", the errors are no
longer generated.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Mark Tompsett [Thu, 27 Sep 2012 06:12:00 +0000 (14:12 +0800)]
Bug 8834 - Call to C4::Context::preference fails to pass $self in Circulation.pm
Changed:
my $circcontrol = C4::Context::preference('CircControl');
To:
my $circcontrol = C4::Context->preference('CircControl');
This will pass $self and 'CircControl' which will then prevent
a "Use of uninitialized value" error log entry.
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Magnus Enger [Sun, 30 Sep 2012 07:57:37 +0000 (09:57 +0200)]
Bug 8568 - Fix some errors in docs for scripts provided by the Debian packages
1. Create a page for koha-run-backups
2. Fix the synopsis for koha-foreach
3. Add koha-create and koha-run-backups to koha-common
To test
- Convert the changed xml files to man pages with
$ xsltproc /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl koha-x.xml
- View generated pages with e.g.
$ man -l koha-x.8"
(Replace x with the names of the changed files)
- Check that the changes make sense
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Works as described. I was able to produce the 3 man files, load them with man
command, and see the added information properly formated.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Fri, 28 Sep 2012 10:48:18 +0000 (11:48 +0100)]
Bug 8841 Duedate should be set to end of expiry day
When reducing duedate to patron's expiry date
it should be set to end of that day not 00:00
take account of the fact that the borrower
expiry date will have no hours/minutes
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Jonathan Druart [Wed, 19 Sep 2012 07:59:59 +0000 (09:59 +0200)]
But 8787: don't load the page if OpacMaintenance is ON
If the syspref OpacMaintenance is ON, it is useless to loaded the
requested page.
To test:
- switch on the syspref OpacMaintenace
- check in your apache access log, zebra log, etc. the requested page is
not loaded (i.e. on the opac-search.pl page)
Signed-off-by: Marc Veron <veron@veron.ch>
Checked by watching other_vhosts_access.log
Works as expected
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Mark Tompsett [Mon, 1 Oct 2012 08:29:22 +0000 (16:29 +0800)]
Bug 8849 - Error log generated when not a demo system
Changed two lines similar to:
unless (C4::Context->config('demo') == 1) {
into lines similar to:
unless (C4::Context->config('demo')) {
By removing the == 1, undefined = false without an error. The
value of demo is supposedly set by a koha-conf.xml variable,
but there is very little documentation on this "demo mode"
beyond the set it to 1 in koha conf for demo mode. Also, demo
doesn't exist in the default koha-conf.xml file generated.
So anyone who knows to create it, will likely create it the
proper way and with the proper value.
Signed-off-by: wajasu <matted-34813@mypacks.net> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
1. parametars from CGI are not encoded in utf-8, so when they are
compared with utf-8 strings from database every field with
utf-8 characters will be reported in e-mail as changed
2. when sending e-mail, wide characters are passed to Mail::Sendmail
which results in software error if edited field has utf-8 characters
(because of first point, this happend if ANY fields has utf-8 chars)
3. when declaring encoding for outgoing e-mail utf-8 is more correct
than just utf8
Test scenario:
1. open opac-userupdate and edit user which has utf-8 characters in
at least one field (firstname and surname are common examples)
2. edit one of other fields and add utf-8 character to it
3. verify that e-mail with changes arrived with just edited field
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Fri, 12 Oct 2012 14:27:46 +0000 (10:27 -0400)]
Bug 8912 - Remove unused hold-menu.inc
hold-menu.inc is not used on any page in Koha and
can be safely removed.
To confirm, search the Koha source for "hold-menu.inc." No
instances should be found.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Wed, 10 Oct 2012 18:33:04 +0000 (14:33 -0400)]
Bug 8898 - Remove unused mainmenu include and related styles in the staff client
This patch removes the mainmenu and additem-menu includes and #navigation
references in staff-global.css which were used by those includes.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
It works: (1) merging's still effective, and (2) two new error messages appear
in staff .po file after update it.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Conflicts:
projects / koha.git / log