Maxime Pelletier [Tue, 21 Aug 2012 22:02:31 +0000 (18:02 -0400)]
Bug 8659 Remove and readd the inactive funds in javascript to make it work in all browsers
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Fridolyn SOMERS [Tue, 18 Sep 2012 13:59:37 +0000 (15:59 +0200)]
Bug 8702: System preferences search does not allow accented letters
This bug enables accented/diacritic system preference text to be matched
when searching for sysprefs.
Signed-off-by: wajasu <matted-34813@mypacks.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mark Tompsett [Tue, 18 Sep 2012 05:15:18 +0000 (13:15 +0800)]
Bug 8780 - Lower dependency version for DateTime::TimeZone
The fresh install of Debian, with the debian.koha-community.org
repository, only has version 1.20 by default. As only the most
basic functionality is being used, this version number should be
lowered from 1.26 to 1.20 in ./C4/Installer/PerlDependencies.pm
to make git installations cleaner.
Signed-off-by: wajasu <matted-34813@mypacks.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Mon, 24 Sep 2012 19:32:48 +0000 (21:32 +0200)]
Bug 5356 follow-up DBRev number
Jonathan Druart [Fri, 21 Sep 2012 08:30:34 +0000 (10:30 +0200)]
Bug 5356: Followup: remove useless code
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Jonathan Druart [Tue, 4 Sep 2012 08:03:27 +0000 (10:03 +0200)]
Bug 5356: Followup: Add basket billing and delivery place on export pdf (layout3pages)
Jonathan Druart [Wed, 25 Jul 2012 08:25:16 +0000 (10:25 +0200)]
Bug 5356: delivery place and billing place centralised in basket management
- adding 2 select option in basdketheader.tmpl (delivery and billing
place)
- adding 2 more fields in basket csv export
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested together with patches for bug 7302.
Paul Poulain [Fri, 21 Sep 2012 14:37:25 +0000 (16:37 +0200)]
Merge remote-tracking branch 'origin/new/bug_8523'
Conflicts:
kohaversion.pl
Paul Poulain [Fri, 21 Sep 2012 14:35:20 +0000 (16:35 +0200)]
Bug 8523 follow-up OPAC styles for ccsr theme
Paul Poulain [Fri, 21 Sep 2012 14:30:36 +0000 (16:30 +0200)]
Bug 8523 follow-up fixing perlcritic
Paul Poulain [Fri, 21 Sep 2012 13:16:30 +0000 (15:16 +0200)]
Bug 8523 follow-up DBRev number
Jared Camins-Esakov [Wed, 1 Aug 2012 19:12:30 +0000 (15:12 -0400)]
Bug 8523: Display auth hierarchies w/all marcflavours
This commit adds support for displaying authority hierarchies for all
flavours of MARC, not just UNIMARC. Display now uses the jQuery
jstree plugin, selected with the help of Owen Leonard, resulting in a
much faster experience for users.
Be aware that the jstree file uses tabs rather than 4-space indentation,
which I left as-is so as to make it easier to integrate upstream
releases in the future.
To test:
1) Enable the AuthDisplayHierarchy syspref
2) Create authority records with a hierarchy of see also fields
(in MARC21/NORMARC, you'll be using 5xx fields for this, with a
subfield $w=g for broader terms and subfield $w=h for narrower
terms)
3) View the authorities in the OPAC, noting the hierarchical view at
the top of the page.
This initial patch does not create bidirection linkages from
unidirectional links in MARC21 authorities. This means that when moving
up the authority hierarchy, lower levels will disappear. This is
intentional, as the first patch is intended merely to ensure that
AuthDisplayHierarchy functions the same for all marcflavours. A future
patch will add a cron job to generate the bidirectional linkages, once
we are sure that the hierarchy functionality for UNIMARC and
MARC21/NORMARC coexists peaceably.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Resolved conflicts in updatedatabase.pl, sysprefs.sql and in one of
the CSS files.
Test plan:
1) Run t/AuthoritiesMarc.t
New tests complete without any errors.
2) Make sure updatedatabase works correctly.
Update works nicely, new system preference is also added to syspref.sql
3) Make sure new terms are translatable.
Created new po files for de-DE and checked for new terms.
All translations appear correctly.
4) Make sure everything works with AuthDisplayHieararchy OFF
- Add authority
- Edit authority
- Delete authority
5) Test feature with AuthDisplayHieararchy ON
- Add authority
- Edit authority
- Delete authority
6) Add a couple of hierarchically linked authorities
Note: links have to be created in both directions
Example:
151 $aGermany
551 $a Baden-Württemberg $w h
151 $aBaden-Württemberg
551 $a Konstanz $w h
551 $a Germany $w g
151 $aKonstanz
551 $a Baden-Württemberg $w g
551 $a Fürstenberg $w h
551 $a Paradies $w h
151 $a Fürstenberg
551 $a Konstanz $w g
151 $a Paradies
551 $a Konstanz $w g
Tree shows up nicely above the authority record
- in staff
- in OPAC
- on the normal view tab
- on the MARC view tab
7) Checking the logs for warnings
- no Javascript errors or warnings
- no warnings or errors in log files
Paul Poulain [Fri, 21 Sep 2012 08:36:56 +0000 (10:36 +0200)]
Bug 5335 follow-up DBRev number
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Fri, 21 Sep 2012 08:36:56 +0000 (10:36 +0200)]
Bug 5335 follow-up DBRev number
Jonathan Druart [Fri, 24 Feb 2012 15:24:05 +0000 (16:24 +0100)]
Bug 5335 - More granular VAT
Signed-off-by: Pierre Angot <tredok.pierre@gmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Larry Baerveldt <larry@bywatersolutions.com>
Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Thu, 20 Sep 2012 12:58:39 +0000 (14:58 +0200)]
Merge remote-tracking branch 'origin/new/bug_8606'
Paul Poulain [Thu, 20 Sep 2012 12:49:18 +0000 (14:49 +0200)]
Revert "Bug 6679 - [SIGNED-OFF] fix 2 perlcritic violations in C4/Installer/PerlModules.pm"
This reverts commit
afff4e8d6a427d231746b024a0d6f98438e7f2c6.
Kyle M Hall [Wed, 19 Sep 2012 15:54:52 +0000 (11:54 -0400)]
Bug 8606 - Talking Tech broken by user-configurable slips feature - QA Followup
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(not tested it actually fixes talking tech, trusting signoff & sounds
logical)
Koha user [Tue, 7 Aug 2012 12:09:19 +0000 (08:09 -0400)]
Bug 8606 - Talking Tech broken by Bug 7001
The patches for bug 7001 removed the parseletter subroutine from
C4::Letters without updating the talking tech script to use the
new alternative. This patch rectifies that situation.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Fridolyn SOMERS [Mon, 27 Aug 2012 12:50:32 +0000 (14:50 +0200)]
Bug 8692: Authorities search form does not correspond to current search query
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
The correct tab is now visible on load. The problem with authtypecode
showing up in the search box is specific to UNIMARC, so I could not
check that it was gone, but I am comfortable signing off on this.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Thu, 20 Sep 2012 11:29:59 +0000 (13:29 +0200)]
Revert "Bug 6679 - [SIGNED-OFF] fix 9 perlcritic violations in C4/TmplTokenType.pm"
This reverts commit
48d5f30226c75b260ddfa6b85ee8f87878902e0e.
Mason James [Tue, 26 Jun 2012 16:54:11 +0000 (04:54 +1200)]
Bug 6679 - fix 3 perlcritic violations in C4/Auth.pm, and enabled warnings
Subroutine prototypes used at line 561, column 1. See page 194 of PBP. (Severity: 5)
Bareword file handle opened at line 606, column 5. See pages 202,204 of PBP. (Severity: 5)
Two-argument "open" used at line 606, column 5. See page 207 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
This patch reintroduces 'use warnings' in C4/Auth.pm.
Keep attentive to new warning messages in your log
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 17:02:00 +0000 (05:02 +1200)]
Bug 6679 - [SIGNED-OFF] fix 2 perlcritic violations in C4/Print.pm
Bareword file handle opened at line 80, column 9. See pages 202,204 of PBP. (Severity: 5)
Two-argument "open" used at line 80, column 9. See page 207 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
http://perldoc.perl.org/functions/open.html
For three or more arguments if MODE is |- , the filename is interpreted
as a command to which output is to be piped, and if MODE is -| , the
filename is interpreted as a command that pipes output to us. I
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 14:28:26 +0000 (02:28 +1200)]
Bug 6679 - [SIGNED-OFF] fix 4 perlcritic violations in C4/Creators/PDF.pm
- "return" statement with explicit "undef" at line 171, column 8. See page 199 of PBP. (Severity: 5)
- "return" statement with explicit "undef" at line 201, column 8. See page 199 of PBP. (Severity: 5)
- Bareword file handle opened at line 212, column 11. See pages 202,204 of PBP. (Severity: 5)
- Two-argument "open" used at line 212, column 11. See page 207 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Mason James [Tue, 26 Jun 2012 14:20:58 +0000 (02:20 +1200)]
Bug 6679 - [SIGNED-OFF] fix 4 perlcritic violations in C4/Installer.pm
- Bareword file handle opened at line 157, column 13. See pages 202,204 of
PBP. (Severity: 5)
- I/O layer ":utf8" used at line 157, column 13. Use ":encoding(UTF-8)" to get strict validation. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
http://perldoc.perl.org/functions/open.html
open(my $fh, "<:encoding(UTF-8)", "filename")
|| die "can't open UTF-8 encoded filename: $!";
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 17:09:10 +0000 (05:09 +1200)]
Bug 6679 - [SIGNED-OFF] fix 2 perlcritic violations in C4/BackgroundJob.pm
"return" statement with explicit "undef" at line 234, column 5. See page 199 of PBP. (Severity: 5)
"return" statement with explicit "undef" at line 256, column 9. See page 199 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 17:07:46 +0000 (05:07 +1200)]
Bug 6679 - [SIGNED-OFF] fix 2 perlcritic violations in C4/Installer/PerlModules.pm
Expression form of "eval" at line 71, column 9. See page 161 of PBP. (Severity: 5)
Expression form of "eval" at line 85, column 13. See page 161 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 17:04:49 +0000 (05:04 +1200)]
Bug 6679 - [SIGNED-OFF] fix 2 perlcritic violations in C4/ItemCirculationAlertPreference.pm
"return" statement with explicit "undef" at line 170, column 13. See page 199 of PBP. (Severity: 5)
"return" statement with explicit "undef" at line 407, column 9. See page 199 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 16:57:58 +0000 (04:57 +1200)]
Bug 6679 - [SIGNED-OFF] fix 2 perlcritic violations in C4/Utils.pm
Subroutine prototypes used at line 38, column 1. See page 194 of PBP. (Severity: 5)
Subroutine prototypes used at line 43, column 1. See page 194 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 14:50:50 +0000 (02:50 +1200)]
Bug 6679 - [SIGNED-OFF] fix 3 perlcritic violations in C4/Items.pm
"return" statement with explicit "undef" at line 508, column 44. See page 199 of PBP. (Severity: 5)
"return" statement with explicit "undef" at line 2267, column 5. See page 199 of PBP. (Severity: 5)
Variable declared in conditional statement at line 2642, column 21. Declare variables outside of the condition. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 14:48:25 +0000 (02:48 +1200)]
Bug 6679 - [SIGNED-OFF] fix 3 perlcritic violations in C4/Message.pm
"return" statement with explicit "undef" at line 109, column 9. See page 199 of PBP. (Severity: 5)
"return" statement with explicit "undef" at line 145, column 9. See page 199 of PBP. (Severity: 5)
"return" statement with explicit "undef" at line 319, column 9. See page 199 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 14:44:47 +0000 (02:44 +1200)]
Bug 6679 - [SIGNED-OFF] fix 3 perlcritic violations in C4/Output.pm
"return" statement with explicit "undef" at line 128, column 74. See page 199 of PBP. (Severity: 5)
Subroutine prototypes used at line 270, column 1. See page 194 of PBP. (Severity: 5)
Subroutine prototypes used at line 308, column 1. See page 194 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Mason James [Tue, 26 Jun 2012 14:37:09 +0000 (02:37 +1200)]
Bug 6679 - [SIGNED-OFF] fix 3 perlcritic violations in C4/SQLHelper.pm
Subroutine prototypes used at line 251, column 1. See page 194 of PBP. (Severity: 5)
Subroutine prototypes used at line 287, column 1. See page 194 of PBP. (Severity: 5)
Subroutine prototypes used at line 317, column 1. See page 194 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 14:31:06 +0000 (02:31 +1200)]
Bug 6679 - [SIGNED-OFF] fix 4 perlcritic violations in C4/Branch.pm
Subroutine prototypes used at line 157, column 1. See page 194 of PBP. (Severity: 5)
Subroutine prototypes used at line 375, column 1. See page 194 of PBP. (Severity: 5)
Subroutine prototypes used at line 385, column 1. See page 194 of PBP. (Severity: 5)
Subroutine prototypes used at line 418, column 1. See page 194 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 14:10:11 +0000 (02:10 +1200)]
Bug 6679 - [SIGNED-OFF] fix 4 perlcritic violations in C4/ShelfBrowser.pm
- Variable declared in conditional statement at line 183, column 5. Declare variables outside of the condition. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 14:02:26 +0000 (02:02 +1200)]
Bug 6679 - [SIGNED-OFF] fix 5 perlcritic violations in C4/Serials.pm
- Subroutine prototypes used at line 161, column 1. See page 194 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 13:53:05 +0000 (01:53 +1200)]
Bug 6679 - [SIGNED-OFF] fix 6 perlcritic violations in C4/Barcodes/hbyymmincr.pm
- Subroutine prototypes used at line 45, column 1. See page 194 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 13:30:33 +0000 (01:30 +1200)]
Bug 6679 - [SIGNED-OFF] fix 7 perlcritic violations in C4/Biblio.pm
- Expression form of "eval" at line 492, column 12. See page 161 of PBP. (Severity: 5)
- "return" statement with explicit "undef" at line 891, column 5. See page 199 of PBP. (Severity: 5)
- Subroutine prototypes used at line 1148, column 1. See page 194 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 13:22:21 +0000 (01:22 +1200)]
Bug 6679 - [SIGNED-OFF] fix 8 perlcritic violations in C4/Barcodes.pm
- "return" statement with explicit "undef" at line 57, column 2. See page 199 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 13:20:37 +0000 (01:20 +1200)]
Bug 6679 - [SIGNED-OFF] fix 8 perlcritic violations in C4/Circulation.pm
- "return" statement with explicit "undef" at line 994, column 39. See page 199 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 13:12:24 +0000 (01:12 +1200)]
Bug 6679 - [SIGNED-OFF] fix 9 perlcritic violations in C4/Koha.pm
- Subroutine prototypes used at line 115, column 1. See page 194 of PBP. (Severity: 5)
- "return" statement with explicit "undef" at line 1112, column 4. See page 199 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 13:08:34 +0000 (01:08 +1200)]
Bug 6679 - [SIGNED-OFF] fix 9 perlcritic violations in C4/TmplTokenType.pm
- Subroutine prototypes used at line 86, column 1. See page 194 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 04:39:27 +0000 (16:39 +1200)]
Bug 6679 - [SIGNED-OFF] fix 15 perlcritic violations in C4/ImportExportFramework.pm
Bareword file handle opened at line 558, column 17. See pages 202,204 of PBP. (Severity: 5)
Two-argument "open" used at line 558, column 17. See page 207 of PBP. (Severity: 5)
http://bugs.koha-community.org/show_bug.cgi?id=6679
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 03:55:46 +0000 (15:55 +1200)]
Bug 6679 - [SIGNED-OFF]fixing 23 '"return" statement with explicit "undef"' violations in C4/Tags.pm
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 12:34:43 +0000 (00:34 +1200)]
Bug 6679 -[SIGNED-OFF] fix 12 perlcritic violations in C4/Context.pm
"return" statement with explicit "undef" at line 486, column 5. See page 199 of PBP. (Severity: 5)
Subroutine prototypes used at line 548, column 1. See page 194 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 12:38:42 +0000 (00:38 +1200)]
Bug 6679 - [SIGNED-OFF] fix 12 perlcritic violations in C4/Auth_with_ldap.pm
Subroutine prototypes used at line 73, column 1. See page 194 of PBP. (Severity: 5)
"return" statement with explicit "undef" at line 74, column 24. See page 199 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mason James [Tue, 26 Jun 2012 12:43:07 +0000 (00:43 +1200)]
Bug 6679 - fix 12 perlcritic violations in C4/External/BakerTaylor.pm
Subroutine prototypes used at line 82, column 1. See page 194 of PBP. (Severity: 5)
"return" statement with explicit "undef" at line 83, column 22. See page 199 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Thu, 20 Sep 2012 08:19:44 +0000 (10:19 +0200)]
Merge remote-tracking branch 'origin/new/bug_5339'
Paul Poulain [Thu, 20 Sep 2012 08:19:19 +0000 (10:19 +0200)]
Bug 5339 follow-up
* fix english error
* if the invoice is closed, don't display a "finish receiving" link, but a "view invoice" one
Julian Maurice [Wed, 19 Sep 2012 13:02:49 +0000 (15:02 +0200)]
Bug 5339: Unit tests for invoices related subroutines
These tests use DBD::Mock to check if SQL queries are correctly built.
Actually, we only check bound parameters.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Julian Maurice [Wed, 19 Sep 2012 12:08:28 +0000 (14:08 +0200)]
Bug 5339: ergonomic changes
- "Finish receive" on parcel.pl now redirect to acqui/invoice.pl,
allowing the librarian to modify invoice informations (freight,
billing date, ...) and close invoice.
- The librarian can now close (or reopen) the invoice and modify invoice
informations in 1 operation (instead of 2)
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Julian Maurice [Thu, 20 Sep 2012 07:11:58 +0000 (09:11 +0200)]
Bug 5339: Fix t/db_dependant/Acquisition.t
Paul Poulain [Wed, 19 Sep 2012 16:47:58 +0000 (18:47 +0200)]
Merge remote-tracking branch 'origin/new/bug_8185'
Colin Campbell [Wed, 19 Sep 2012 16:23:27 +0000 (17:23 +0100)]
Bug 6679 Avoid critic failure caused by ambiguous code
If countitems not set to 1 it was not being declared
but is referred to outside this scope, generating
runtime warnings and test failure
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Wed, 19 Sep 2012 15:25:19 +0000 (17:25 +0200)]
Bug 2060 follow-up DBRev & updatedatabase
Jared Camins-Esakov [Fri, 14 Sep 2012 12:46:04 +0000 (08:46 -0400)]
Bug 2060 follow-up: add support for UNIMARCAUTH
The staged MARC management script was not correctly informing
the decoder ring that we had UNIMARC authorities, and the decoder
ring was dutifully trying to turn the authority records into a
bibliographic box of cereal.
Jared Camins-Esakov [Mon, 25 Jun 2012 15:38:19 +0000 (11:38 -0400)]
Bug 2060: Update command line MARC import scripts
Expose authority import functionality to the command line import
scripts, and rename them from commit_biblios_file.pl and
stage_biblios_file.pl to commit_file.pl and stage_file.pl.
To test (note that these instructions assume you have a MARC21
installation and are using the provided sample file):
1. Find a file of authorities (a sample file with MARC21 authorities
is attached to bug 7475) and download it to your server
2. Stage the file using the following command (replace <filename> with
the name of the file you saved in step 1):
> misc/stage_file.pl --file <filename> --authorities
3. Note the batch number the script assigns to your batch
4. Commit the records using the following command (replace <batchnumber>
with the batch number you made note of in step 3):
> misc/commit_file.pl --batch-number <batchnumber>
5. Index the authorities Zebraqueue (or wait)
6. Confirm that the new authorities appear.
7. Create a matching rule with the following settings:
Code: AUTHTEST
Description: Personal name main entry
Match threshold: 999
Record type: Authority record
Search index: Heading-main
Score: 1000
Tag: 100
Subfields: a
Offset: 0
Length: 0
(note the ID of this matching rule)
8. Stage the authority file again, this time using the following
command:
> misc/stage_file.pl --file <filename> --authorities \
--match <matchingrule>
7. Revert the import with the following command:
> misc/commit_file.pl --batch-number <batchnumber> --revert
8. Index the authorities Zebraqueue (or wait)
9. Confirm that the records have been removed
10. Import an authority record with the Stage MARC/Manage staged MARC
tools in exactly the way you would for a bibliographic record,
but choose "Authority" instead of "Bibliographic" for the record
type.
Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>
Testing plan delivers as it should.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on latest master 11 September 2012
Jared Camins-Esakov [Mon, 25 Jun 2012 15:34:59 +0000 (11:34 -0400)]
Bug 7475: Teach matching rules to handle authorities
* Add the code necessary to handle authorities with matching rules and
import batches.
* Update all the scripts that use the matcher and import batch code
to use the new API.
* Add authority records to the matching rules interface in the staff
client.
http://bugs.koha-community.org/show_bug.cgi?id=2060
Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on latest master 11 September 2012
Jared Camins-Esakov [Mon, 25 Jun 2012 16:36:45 +0000 (12:36 -0400)]
Bug 7475: Update configuration
In order to make matching rules more useful for MARC21 authorities,
this patch adds special indexes on previous see-from headings and
LCCN. This patch does not change UNIMARC authority configuration in
any way. Also modifies the Koha schema in preparation for adding
authority import and matching to the Staging tools.
To install:
1. Run installer/data/mysql/atomicupdate/importauthorities.pl
2. Update the following four files in your koha-dev:
etc/zebradb/authorities/etc/bib1.att
etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml
etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl
etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl
3. Reindex your authorities:
misc/migration_tools/rebuild_zebra.pl -a -r -v
NOTE TO RM: this patch adds an atomicupdate file that needs to be
incorporated into updatedatabase.pl if bug 7167 is not pushed.
http://bugs.koha-community.org/show_bug.cgi?id=2060
Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on master 1 August 2012
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on master 11 September 2012
Paul Poulain [Wed, 19 Sep 2012 15:02:14 +0000 (17:02 +0200)]
A follow-up will be added though, because we understood why I had some javascript error and jonathan didn't. It's because I've plack + debug
Bug 8117 follow-up: explicitely list tables to dataTable
debug panel in plack adds a lot of <table> (without any id)
thus, when you call
$("table").dataTable(...)
there's a javacscript error because datatable can't handle the plack <table> !
The solution has been to explicitely name the tables to dataTable (which is a good thing anyway)
$("#activeperiodst,#inactiveperiodst").dataTable($.extend(true, {}, dataTablesDefaults, {
Paul Poulain [Wed, 19 Sep 2012 14:29:46 +0000 (16:29 +0200)]
Bug 8117 follow-up remove perl warning
first & last were already defined, removing my
Jonathan Druart [Fri, 3 Aug 2012 12:18:27 +0000 (14:18 +0200)]
Bug 8117: Followup: remove h3 title (duplicate infos)
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Jonathan Druart [Fri, 20 Jul 2012 14:21:17 +0000 (16:21 +0200)]
Bug 8117: Divide budget periods into two tabs
Budget periods are now divided into two tabs : active and inactive
budget periods.
The original author of this patch is Julian Maurice
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Michael Davis <m.r.davis@cranfield.ac.uk>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Paul Poulain [Wed, 19 Sep 2012 14:12:23 +0000 (16:12 +0200)]
Merge remote-tracking branch 'origin/new/bug_6448'
Dobrica Pavlinusic [Fri, 3 Aug 2012 22:03:11 +0000 (00:03 +0200)]
Bug 6448 - carp on invalid barcode
This is consistent with implementation of other barcode types
which all carp instead of die on invalid barcodes.
Mirko Tietgen [Sat, 11 Aug 2012 19:47:05 +0000 (21:47 +0200)]
Bug 8185: Change some more strings from Italian to English
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Two additional corrections
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Zeno Tajoli [Fri, 3 Aug 2012 13:03:59 +0000 (15:03 +0200)]
Bug 8185: plugin for linking records in MARC21
This plugin works like the unimarc plugin unimarc_field_4XX. It
insert: $9 -> biblionumber $w -> 001 $t -> 245$a (title )
$x -> 022$a (ISSN) $z -> 020$a (ISBN) The search is done on
'any' index. Data are inserted only in the working record.
To insert data in the connected record, you need to open
the other record.
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Mon, 13 Aug 2012 00:50:28 +0000 (20:50 -0400)]
Bug 8624: Move famfamfam out of theme directory
The patch moves the famfamfam image set out of the
koha-tmpl/opac-tmpl/prog/famfamfam into koha-tmpl/opac-tmpl/famfamfam
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Owen Leonard [Fri, 14 Sep 2012 18:48:37 +0000 (14:48 -0400)]
Bug 6689 [Follow-up] Improve styling of table pager
Small correction to add non-vendor-prefixed border
radius declaration to make style consistent on
newer browsers.
To test, view a page with a sorted table and pager controls,
like members/readingrec.pl. The pager controls "box" should
show rounded corners in Firefox 15+
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Kyle M Hall [Thu, 16 Feb 2012 17:09:44 +0000 (12:09 -0500)]
Bug 7401 - Shelving Location facet
This patch enables the shelving location facet as an
alternative to the branches fact in two situations:
A) SingleBranchMode is enabled
B) There is only one branch in the branches table
Test Plan:
1) Catalog multiple items with different shelving locations.
2) Test enable by enabling SingleBranchMode
3) Test enable by deleting all but one branch
Based on initial patch by Ian Walls.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested cases 2) and 3) successfully in OPAC and staff client
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Wed, 19 Sep 2012 10:13:02 +0000 (12:13 +0200)]
Merge remote-tracking branch 'origin/new/bug_7993'
Paul Poulain [Wed, 19 Sep 2012 10:12:43 +0000 (12:12 +0200)]
Bug 7993 follow-up to fix POD DOC
Paul Poulain [Wed, 19 Sep 2012 10:01:11 +0000 (12:01 +0200)]
Bug 7751 follow-up adding updatedatabase for sysprefs decreateLoanHighHolds*
See http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7751#c31 to c34
Paul Poulain [Wed, 19 Sep 2012 09:43:04 +0000 (11:43 +0200)]
Merge remote-tracking branch 'origin/new/bug_8597'
Paul Poulain [Wed, 19 Sep 2012 09:42:41 +0000 (11:42 +0200)]
Bug 8597 follow-up translation issues
Replacing 2 french terms by the english one
Paul Poulain [Wed, 19 Sep 2012 09:36:51 +0000 (11:36 +0200)]
Merge remote-tracking branch 'origin/new/bug_8597'
Jared Camins-Esakov [Mon, 27 Aug 2012 22:20:08 +0000 (18:20 -0400)]
Bug 8597 follow-up: add missing lib files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Wed, 19 Sep 2012 09:13:36 +0000 (11:13 +0200)]
Bug 5339 follow-up DBRev
Julian Maurice [Mon, 13 Aug 2012 07:53:37 +0000 (09:53 +0200)]
Bug 5339: perltidy on added files
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Julian Maurice [Fri, 6 Jan 2012 15:51:57 +0000 (16:51 +0100)]
Bug 5339: Invoices management improvement
- New pages:
- invoices.pl: allow to search in invoices on several criteria
- invoice.pl: permit to view and modify invoice details
- shipment date
- billing date
- shipment cost and budget used for shipment cost
Invoice informations are now stored in their own sql table and aqorders
have a link to it
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Katrin Fischer [Sat, 25 Aug 2012 21:18:08 +0000 (23:18 +0200)]
Bug 5357: Follow-up - layout and EAN search
1) EAN search should be hidden if marcflavour is not UNIMARC
2) Fixes layout to match the advanced search in acquisitions
- labels in front of the fields instead of separate lines
- adds a legend to the form and moves the toggle for the search form to it
To test:
- EAN search field should only show up when marcflavour system preference
is set to UNIMARC
- Check layout is consistent and you like it
- Check toggle for advanced search still behaves the same
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Jonathan Druart [Fri, 9 Mar 2012 09:05:38 +0000 (10:05 +0100)]
Bug 5357: Adds a new page for searching subscriptions
Test plan:
- go on the serial module
- click on the 'Advanced search' link (right of subscriptions search in
the header)
- Search subscriptions (by ISSN, title, EAN, Publisher, Supplier and/or
Branch)
- Check results are correct
Signed-off-by: Corinne HAYET <corinne.hayet@bulac.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Colin Campbell [Fri, 17 Aug 2012 16:25:47 +0000 (17:25 +0100)]
Bug 7751: Decrease Loans for Items in Demand for Holds
Rebase and merge based on Mark Gavillet's patch to reduce
the loan period given to items on renewal when they are
in high demand for holds
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Paul Poulain [Tue, 18 Sep 2012 16:08:12 +0000 (18:08 +0200)]
Bug 7993 follow-up DBRev number
Srdjan [Mon, 10 Sep 2012 01:14:01 +0000 (13:14 +1200)]
Bug 7993: Save reports with Group/Subgroup hierarchy
This should make saved reports more manageable.
Group/Subgroup hierarchy is stored in authorised_values,
categories REPORT_GROUP and REPORT_SUBGROUP, connected by
REPORT_SUBGROUP.lib_opac -> REPORT_GROUP.authorised_value
Database changes:
* authorised_values: expanded category to 16 chars
* created default set of REPORT_GROUP authorised values to match
hardcoded report areas
* reports_dictionary: replaced area int with report_area text, converted
values
* saved_sql: added report_area, report_group and report_subgroup;
report_area is not currently used, saved for the record
C4/Reports/Guided.pm:
* Replaced Area numeric values with the mnemonic codes
* get_report_areas(): returns hardcoded areas list
* created get_report_areas(): returns full hierarchy (groups with belonging
subgroups)
* save_report(): changed iterface, accepts fields hashref as input
* update_sql(): changed iterface, accepts id and fields hashref as input
* get_saved_reports():]
- join to authorised_values to pick group and subgroup name
- accept group and subgroup filter params
* get_saved_report():
- changed iterface, return record hashref
- join to authorised_values to pick group and subgroup name
* build_authorised_value_list(): new sub, moved code from
reports/guided_reports.pl
* Updated interfaces in:
cronjobs/runreport.pl, svc/report, opac/svc/report: get_saved_report()
reports/dictionary.pl: get_report_areas()
reports/guided_reports.pl
reports/guided_reports_start.tt:
* Reports list:
- added group/subgroup filter
- display area/group/subgroup for the reports
* Create report wizard:
- carry area to the end
- select group and subgroup when saving the report; group defaults to area,
useful when report groups match areas
* Update report and Create from SQL: added group/subgroup
* Amended reports/guided_reports.pl accordingly
Conflicts:
C4/Reports/Guided.pm
admin/authorised_values.pl
installer/data/mysql/kohastructure.sql
installer/data/mysql/updatedatabase.pl
koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
misc/cronjobs/runreport.pl
reports/dictionary.pl
reports/guided_reports.pl
Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Julian Maurice [Mon, 13 Aug 2012 19:34:51 +0000 (15:34 -0400)]
Bug 8210: add links to authorities in normal mode headings
Cherry-picked from BibLibre's work on bug 5888:
opac-detail subject/author links improvements
Added a link to opac-authoritiesdetail.pl when possible.
Only affects 'Normal view'. Does not affect XSLT display.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Jared Camins-Esakov [Sat, 4 Aug 2012 17:38:59 +0000 (13:38 -0400)]
Bug 8210: add links to authorities to headings in OPAC
At the moment, there is no way to get to an authority record from a bib
record that uses it other than doing a new search on the authority file.
This patch adds a link (a cute little magnifying glass) to linked
authority records on the OPAC detail view for MARC21 and NORMARC
with XSLT enabled. A follow-up patch will add the link to regular mode.
Because UNIMARC handles authorities differently, the link is not added
to the XSLT.
Test plan:
1) Set OPACXSLTDetailsDisplay to 'default'
2) View a record that has some headings that are linked to authority
records in the OPAC (easiest way to find a record like that is to
edit a record and add some headings using the thesaurus plugin)
3) Observe the cute little magnifying glass links to the authority.
Revised version of the patch adds a space between the heading and the
magnifying glass.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch works nicely.
If a library does not like to see the
magnifying glass/link to the authority, it's easy to disable it
by adding the line .authlink {display:none;} to OpacUserCSS.
Jared Camins-Esakov [Thu, 23 Aug 2012 23:35:22 +0000 (19:35 -0400)]
Bug 8211: Add exploded search options
When working with hierarchical subject headings, it is sometimes helpful
to do a search for all records with a specific subject, plus
broader/narrower/related subjects. This patch adds support for these
"exploded" subject searches to Koha.
To test:
1) Make sure you have a bunch of hierarchical subjects. I created
geographical subjects for "Arizona," "United States," and "Phoenix,"
and linked them together using 551s, and made sure I had a half
dozen records linking to each (but not all to all three).
2) Do a search for su-br:Arizona (or choose "Subject and broader terms"
on the advanced search screen with "more options" displayed), and
check that you get the records with the subject "Arizona" and the
records with the subject "United States"
3) Do a search for su-na:Arizona (or choose "Subject and narrower terms"
on the advanced search screen with "more options" displayed), and
check that you get the records with the subject "Arizona" and the
records with the subject "Phoenix"
4) Do a search for su-rl:Arizona (or choose "Subject and related terms"
on the advanced search screen with "more options" displayed), and
check that you get the records with the subject "Arizona," the
records with the subject "United States," and the records with the
subject "Phoenix"
5) Ensure that other searches still work (keyword, subject, ccl,
whatever)
6) Sign off
Technical details:
This patch adds a shim in front of C4::Search::buildQuery in order to
preprocess the query and call the _handle_exploding_search callback.
This shim will allow us to gradually offload query parsing to a new
query parser module.
Signed-off-by: wajasu <matted-34813@mypacks.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Tue, 18 Sep 2012 13:14:32 +0000 (15:14 +0200)]
Merge remote-tracking branch 'origin/new/bug_6151'
Paul Poulain [Tue, 18 Sep 2012 13:14:00 +0000 (15:14 +0200)]
Bug 6151 follow-up fix POD
Fixing POD, problem detected by jenkins (thanks jenkins !)
Paul Poulain [Tue, 18 Sep 2012 12:39:00 +0000 (14:39 +0200)]
Bug 8597 follow-up DBRev number
Frédérick [Mon, 13 Aug 2012 16:29:35 +0000 (12:29 -0400)]
Bug 8597: Add system preferences to configure the mobile view.
This patch adds the following system preferences:
* OpacMainUserBlockMobile - alternate content for the MainUserBlock for
mobile
* OPACMobileUserCSS - custom CSS for mobile views only
* OpacShowFiltersPulldownMobile - whether or not to show the index
dropdown on the mobile view
* OpacShowLibrariesPulldownMobile - whether or not to show the library
dropdown on the mobile view
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Mon, 13 Aug 2012 00:04:19 +0000 (20:04 -0400)]
Bug 8597: Add CSS, JS, and images to ccsr theme
In order for themes to work, they must include all CSS, Javascript, and
image assets that they use. This patch adds all CSS, Javascript, and
images from the prog theme to ccsr, EXCEPT for the famfamfam image set,
which needs to be moved outside of the theme directories, per bug 8624.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Jared Camins-Esakov [Sun, 12 Aug 2012 23:24:07 +0000 (19:24 -0400)]
Bug 8597: fix hardcoded references to prog in ccsr
There were a few hardcoded references to the prog theme in the new
ccsr theme's files.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Frederick Capovilla [Sun, 12 Aug 2012 22:32:45 +0000 (18:32 -0400)]
Bug 8597: Add mobile functionality to ccsr theme
This patch adds the promised media query-based mobile view to the
ccsr theme. You can try the mobile view by resizing your browser window
until it is phone-sized.
Sponsored-by: Centre collégial des services regroupés (CCSR)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
All work was originally done by Frederick, but I converted his
modifications to the prog template into a new template called ccsr.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Frederick Capovilla [Sun, 12 Aug 2012 22:28:02 +0000 (18:28 -0400)]
Bug 8597: Create new CCSR theme
Creates a new theme for the OPAC called "ccsr." The new theme has a much
cleaner, more modern look than the prog theme, and is designed from the
ground up to work on mobile devices using media queries. A later patch
will include the mobile view.
In order to activate the theme, change the opacthemes syspref to 'ccsr'
and make sure that your opaccolorstylesheet is set to 'colors.css.'
Sponsored-by: Centre collégial des services regroupés (CCSR)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
All work was originally done by Frederick, but I converted his
modifications to the prog template into a new template called ccsr.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Frederick Capovilla [Mon, 13 Aug 2012 00:06:30 +0000 (20:06 -0400)]
Bug 8597: Improve template markup to prepare for mobile
The templates were missing classes on a number of elements that
will need classes in order for a mobile view to function.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Marcel de Rooy [Mon, 13 Aug 2012 08:57:36 +0000 (10:57 +0200)]
8627 Followup for removing tabs
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Marcel de Rooy [Mon, 13 Aug 2012 08:28:45 +0000 (10:28 +0200)]
8627 Fixing pipe values in controlfield 008 authorities
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Owen Leonard [Tue, 28 Aug 2012 13:25:52 +0000 (09:25 -0400)]
Bug 8693 - Sort biblio checkout history by checkout date instead of patron name
Adding a default sort on checkout date.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>