]> git.koha-community.org Git - koha.git/log
koha.git
12 years agoBug 7325 - Editing a list generates errors in the log
Owen Leonard [Tue, 6 Dec 2011 21:03:31 +0000 (16:03 -0500)]
Bug 7325 - Editing a list generates errors in the log

Checking for variables before trying to use them in
building the pagination menu

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 17df078261b9054b45f87c42f34d9a9e82fba138)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit ab27da89a9707558f40c3ea38e66da7043f6da80)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7323 - Javascript error when editing list
Owen Leonard [Tue, 6 Dec 2011 16:43:10 +0000 (11:43 -0500)]
Bug 7323 - Javascript error when editing list

Correcting check for empty shelf name to prevent
javascript error.

Also correcting unescaped ampersand.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2cfb3398cf567c72473a98224a2cb0387e1f7fea)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit bd13bb32d88036c867a315ba2d25112dc08457e0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7321: Silence some warns in Koha.pm
Katrin Fischer [Mon, 5 Dec 2011 20:52:44 +0000 (21:52 +0100)]
Bug 7321: Silence some warns in Koha.pm

While testing bug 7013 I noticed a lot of warns in the koha error log.
This patch is silencing them.

To test:
Add or edit an authorised value and check your log files before and after
applying the patch.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d831a03fdefc56b5462df08cbe626887291c01c8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit d3bac2e323a08f31426c768ebd237feb6e4c963b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7313: Untranslatable strings in 'Search to hold' feature
Katrin Fischer [Sat, 3 Dec 2011 08:55:44 +0000 (09:55 +0100)]
Bug 7313: Untranslatable strings in 'Search to hold' feature

Changed the javascript to include markup for translation _(...) in result
list and detail page tool bars.

Also changed the text shown for each result to match the text in the toolbar
to make things more consistent.

To test:
- Apply patch
- Run "perl translate update <your language code>"
- Open .po file for staff and check for "Place hold on" and "Forget"
- Translate those
- Run "perl translate install <your language code>"
- Activate "Search for hold" feature in patron account
- Do a search and check tool bar on top of result list
- Check link text shown in result list
- Check detail page

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8374ecbcd68fc0f6f9bc13ed7b45448920490bba)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit e50d6e28150286023e28bdc75f33d7d215086a17)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoRevert "Bug 5327: Added unit test for C4/SIP/ILS/Transaction/RenewAll.pm"
Paul Poulain [Thu, 15 Dec 2011 15:14:35 +0000 (16:14 +0100)]
Revert "Bug 5327: Added unit test for C4/SIP/ILS/Transaction/RenewAll.pm"

This reverts commit 06c822c37ce91e5936542990d7e3299e14271bd3.
(cherry picked from commit 8df873c1a298d9c7e4283372201466d28fa1a784)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 2f95419c362d17cd4df30df11d6aabc1aaabc824)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoRevert "Bug 5327: Patch removes unneeded self=shift from TTParser::unshift_token"
Paul Poulain [Thu, 15 Dec 2011 15:11:47 +0000 (16:11 +0100)]
Revert "Bug 5327: Patch removes unneeded self=shift from TTParser::unshift_token"

This reverts commit 18bb9c22100ba810944a1341a891bc5b2e765255.
(cherry picked from commit 746deb51279c01176442220a21f7174dc65ff77d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 9741b6331458e66c97e357e565b793d23815a894)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327: Added unit test for C4/SIP/ILS/Transaction/RenewAll.pm
Duncan Tyler [Wed, 14 Dec 2011 03:42:30 +0000 (16:42 +1300)]
Bug 5327: Added unit test for C4/SIP/ILS/Transaction/RenewAll.pm

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test requires a database installed using the sample data.
All tests pass.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 06c822c37ce91e5936542990d7e3299e14271bd3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit caf02e8dca65de45bd9e761fc6e1ab8a0cf32177)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdded missing reference case to Boolean.t and corrected count
Chris Hall [Wed, 7 Dec 2011 20:34:36 +0000 (09:34 +1300)]
Added missing reference case to Boolean.t and corrected count

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 64a9c641003f865690956436e27d2a71d9044f1f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 31efcea6ca5e07dba7a522cf6d11d9c8f6262c4f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agowelcome to Duncan Tyler, developer 166 !
Paul Poulain [Thu, 15 Dec 2011 12:45:21 +0000 (13:45 +0100)]
welcome to Duncan Tyler, developer 166 !
(cherry picked from commit e60e1cba00ae406942ecdfb6975dd30242420480)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 261b6a09d098d14fe77a8a6c340de43c155e22b9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdded missing reference case to Boolean.t and corrected count
Chris Hall [Wed, 7 Dec 2011 20:34:36 +0000 (09:34 +1300)]
Added missing reference case to Boolean.t and corrected count

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit dfa4b73737ff32b10fd01fb53937b137d898c770)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit c8f04b8e7b95f07db79d134d21a9ead5a6c02d7b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327: Patch removes unneeded self=shift from TTParser::unshift_token
Chris Hall [Thu, 8 Dec 2011 22:04:19 +0000 (11:04 +1300)]
Bug 5327: Patch removes unneeded self=shift from TTParser::unshift_token

Removed  unneeded self=shift from unshift_token
(as peek and next do not take a self, makes interface more consistent)

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 18bb9c22100ba810944a1341a891bc5b2e765255)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit eb8f99c37938bc2106843e589f3cce80602a33b8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdded unit tests for Scrubber
Duncan Tyler [Thu, 8 Dec 2011 21:19:14 +0000 (10:19 +1300)]
Added unit tests for Scrubber

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 47b514cf565f5eaccbefd256f24f82f38b5b4765)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit fc2a6415a9185f52f63521376123ff7d5ccf82bc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdded unit test for AuthoritiesMarc/UNIMARC.pm
Duncan Tyler [Thu, 8 Dec 2011 19:52:34 +0000 (08:52 +1300)]
Added unit test for AuthoritiesMarc/UNIMARC.pm

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit bb79d37b8754114ec670b5806150b61340b99e7c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit b418a166235d2a78237c214cffb7f59ec7ecccbd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdded unit tests for Sip Checksum.pm
Duncan Tyler [Thu, 8 Dec 2011 01:38:28 +0000 (14:38 +1300)]
Added unit tests for Sip Checksum.pm

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 7876d4fa8dcc67ec54448edb7c4cd9d454dcf52a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 3aa19f21868644b9989031ff06a22134064b5842)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7309 - Add NORMARCslim2intranetDetail.xsl for detail view in intranet
Magnus Enger [Fri, 2 Dec 2011 16:08:44 +0000 (16:08 +0000)]
Bug 7309 - Add NORMARCslim2intranetDetail.xsl for detail view in intranet

Adds two files, to enable XSLT for the detail view in the intranet:
koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl

To test:
- Set sysprefs: marcflavour = NORMARC and XSLTDetailsDisplay = "using XSLT stylesheet"
- Make sure OPACBaseURL is set correctly
- Check that detail display looks ok
- Check that automatic links for author, subjects etc work
- Check that the "Open in new window" link works as expected
- Empty the OPACBaseURL syspref and check that "Open in new window" does not display

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Great test plan, could reproduce problem and can confirm patch fixes it.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit e4c6f1fc20f6d2f658fd5cf56da77708fd9a9c26)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7287 : Fix overdue notification if a branch given as parameter does not have...
Sophie Meynieux [Fri, 2 Dec 2011 09:04:25 +0000 (10:04 +0100)]
Bug 7287 : Fix overdue notification if a branch given as parameter does not have rules

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a1e3174668181c06baea11161466a1f7bf3a84c4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7275 - Pagination lost when click in the option "Show more" of facets column
Juan Romay Sieira [Tue, 29 Nov 2011 09:17:26 +0000 (10:17 +0100)]
Bug 7275 - Pagination lost when click in the option "Show more" of facets column

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 9b9093d2256b18cc0b813894064e527fbc411998)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7270: Removing double itemtype on shelve contents page when no icon is shown
Marcel de Rooy [Wed, 30 Nov 2011 15:42:19 +0000 (16:42 +0100)]
Bug 7270: Removing double itemtype on shelve contents page when no icon is shown

Just adding a check on imageurl in the template.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a8ddf6acaee4ce7661d8fd4e9027fca1e56de1ae)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7262 - No calendar present in holidays module when there are quotes in title...
Juan Romay Sieira [Thu, 24 Nov 2011 17:01:05 +0000 (18:01 +0100)]
Bug 7262 - No calendar present in holidays module when there are quotes in title or description

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Nice patch, making use of the Template::Toolkit filters

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a8f3860149cd6b61cc87cb1d4da147359e5b2e43)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 7239 fix to avoid error being thrown even though a record is created
Chris Hall [Tue, 6 Dec 2011 03:03:59 +0000 (16:03 +1300)]
bug 7239 fix to avoid error being thrown even though a record is created

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
When creating an item in acquisitions while ordering and not filling out
any fields, there is no longer shown a perl error message.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 48f25fec431322d8ce47d62793985a5b498ab22a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 7227, "Delete all items" action should redirect to the detail view
Owen Leonard [Tue, 15 Nov 2011 16:50:40 +0000 (11:50 -0500)]
Fix for Bug 7227, "Delete all items" action should redirect to the detail view

Using the delete all items function should now redirect back to the
biblio view specified in the BiblioDefaultView system preference.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8121f5581ff0f39a31302edace0fc2cf66d65e71)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7135 - in addbiblio, make save button floating to have it on always on screen
Owen Leonard [Tue, 13 Dec 2011 19:37:32 +0000 (14:37 -0500)]
Bug 7135 - in addbiblio, make save button floating to have it on always on screen

Follow-up fix corrects z-index of toolbar so that "More" menu
is not hidden behind it.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit edd8e5767d29bbbf28eb88591c00a2e419f4b14f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7202 - z39.50 search on bib edit not working
Owen Leonard [Fri, 2 Dec 2011 20:14:58 +0000 (15:14 -0500)]
Bug 7202 - z39.50 search on bib edit not working

The pop-up menu's "Import" link did not correctly pick
up the existing record's biblionumber, if present.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
1) Searched for a record in your catalog
2) Edit > Edit record
3) Start Z39.50 search
4) Pick a new record with different title for import
- using the import link at the end of the table line
- using the pop up menu's import link
5) Save and check if a duplicate was created

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 7fd5098b98007e3a25e6694a5b31ef0828ce4997)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7197 - add a Spanish readme file to the packages
Robin Sheat [Wed, 23 Nov 2011 05:39:25 +0000 (18:39 +1300)]
Bug 7197 - add a Spanish readme file to the packages

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
I don't speak spanish, so my signoff is just a technical view of the patch
(cherry picked from commit 373e49576d023c24e1b649f0a5c2a2570f4bb80f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7164 follow-up history.txt and perlcritic compliance
Paul Poulain [Wed, 14 Dec 2011 14:10:28 +0000 (15:10 +0100)]
Bug 7164 follow-up history.txt and perlcritic compliance

* in history.txt, added a tab for Stephane Delaune, for display consistency
* fixed a small mistake in about.pl that was resulted in a perlcritic failure
(cherry picked from commit 82ed4696321df9b3f4e16b759b1e1a083a5c5e28)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7164 minor follow-up
Paul Poulain [Wed, 14 Dec 2011 13:49:22 +0000 (14:49 +0100)]
Bug 7164 minor follow-up

tab for Stephane Delaune, for display consistency

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7164 - add Koha history timeline tab to 'About' page
Mason James [Sat, 5 Nov 2011 10:28:48 +0000 (23:28 +1300)]
Bug 7164 - add Koha history timeline tab to 'About' page

Includes follow up by Chris Cormack fixing formatting in docs/history.txt

[MINOR EDIT] Added html filter to output for validity's sake

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
(cherry picked from commit 6bc414a3d418cd5255a178271207121f3cb9878a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7160: paying fines throws error
Ian Walls [Sat, 5 Nov 2011 03:28:31 +0000 (23:28 -0400)]
Bug 7160: paying fines throws error

The call to ReturnLostItem in C4/Accounts was not properly namespaced to
come from C4::Circulation.  That prefix is added to the call.

To test:

Pay a fine, and confirm the error disappears (and the fines is still paid)

Signed-off-by: Brendan <brendan@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit afd2098f3c82812af7ab7366035e18b953662dab)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7143: Follow up patch for Updating about.tt
Brendan [Wed, 2 Nov 2011 10:04:58 +0000 (03:04 -0700)]
Bug 7143: Follow up patch for Updating about.tt

I had a typo where I put Ian Walls as Release Manager - I have fixed to QA.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I put in another missing space for Colin Campbell.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 04f8dfec9b7de782d206f61650160b2113e12ccd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7143: Updating About.tt for Ian Walls, Chris Nighswonger and Paul Poulain
Brendan [Wed, 2 Nov 2011 09:59:41 +0000 (02:59 -0700)]
Bug 7143: Updating About.tt for Ian Walls, Chris Nighswonger and Paul Poulain

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit c3494eaaed4cdb45d7b9f80251fa096a57af143b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7139 : Log addition and deletion of circulation messages
Chris Cormack [Wed, 2 Nov 2011 01:43:45 +0000 (14:43 +1300)]
Bug 7139 : Log addition and deletion of circulation messages

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Changed the two action names into caps no-spaces.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 288c1a768db4f578900de904ce39bc9a2f64378f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 7135: Save button options
Owen Leonard [Thu, 3 Nov 2011 18:54:39 +0000 (14:54 -0400)]
Fix for Bug 7135: Save button options

This patch adds a jQuery plugin which will cause
an element to remain "fixed" at the top of the
screen if it would otherwise scroll up out of
view.

The license of this plugin is "This plugin is as free as fresh
air. Feel free to use it anywhere.".

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
I tested this on Chrome OSX
saving works
changing framework works
scrolling works, obviously.
tabbing through the records works
z39 button works as expected

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
updated patch comment about licensing of the plugin
(cherry picked from commit da916a368c98e7f2599cf3a52126d53ee0ecfcd1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAlternate fix for Bug 2534 - Viewing items table on item edit screen requires horizon...
Owen Leonard [Mon, 22 Aug 2011 15:33:59 +0000 (11:33 -0400)]
Alternate fix for Bug 2534 - Viewing items table on item edit screen requires horizontal scrolling

This patch doesn't eliminate horizontal scrolling, but simplifies
the situation:

- The left-hand sidebar has been moved below the table of items.
- The "overflow:scroll" style has been removed from the table of items.
  Having overflow set meant that it was often necessary to scroll twice
  to reach data in the table: once using the scrollbars on the table
  and again using the page's scrollbars.

The NEKLS catalogers also extend their thanks for this fix.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Backporting to 3.4.x

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 7121 - remove comma on items info
Owen Leonard [Fri, 11 Nov 2011 16:43:27 +0000 (11:43 -0500)]
Fix for Bug 7121 - remove comma on items info

Because I can't just take out one comma, I reworked
the way moredetail.pl fetches and outputs biblio
data based on the way it does in detail.pl. This
allows for simpler output in the template.  In the
process I've added subtitle information to the
template.

Revision adds line break for readability

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Backported to 3.4.x

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7093: placeholds for suggestion table not working in notices
Ian Walls [Wed, 7 Dec 2011 16:43:20 +0000 (11:43 -0500)]
Bug 7093: placeholds for suggestion table not working in notices

In parseletter_sth, the suggestions table was defined twice.  The first time (which
is the only definition to get called, as it matches first then exists), defined the
primary search keys as borrowernumber and biblionumber.  This is incorrect; the only
usage of the suggestions table tokens is with suggestionid as the key.  This is defined
further down the if/then chain.

This patch removes the erroneous sth query definition.

To test:

1.  Place a suggestion with a patron account with a configured email you can access
2.  Approve or reject it
3.  Verify the message you receive contains suggestion tokens (like title, author and reason)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Suggestion mails for accepted, rejected and ordered look good now.
I couldn't test the suggestion mail AVAILABLE (bug 7096), but
assuming this would work too.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6716 Update biblio & deletedbiblio tables
Nicole C. Engard [Thu, 20 Oct 2011 10:47:54 +0000 (06:47 -0400)]
Bug 6716 Update biblio & deletedbiblio tables

The comments on the biblio and deletedbiblio table
didn't mention the MARC21 subfields. This patch adds
that documentation in.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agowelcome Fabio, you're 165th !
Paul Poulain [Tue, 13 Dec 2011 13:43:41 +0000 (14:43 +0100)]
welcome Fabio, you're 165th !

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 7123 - barcode should be one word
Owen Leonard [Tue, 1 Nov 2011 13:21:51 +0000 (09:21 -0400)]
Fix for Bug 7123 - barcode should be one word

Other fixes thrown in for good measure:

- Adding data to the results table to match output of returns
- Better checking of error codes in the script to control
  output of error messages (don't show error box when there
  are no errors).
- Move some errors/messages from the right column onto the
  top of the page to match Koha's established pattern.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit fff32393cf19fb5ef0a22979bb84a47fa27cc949)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6935: Correct XISBNDailyLimit for new installations
Katrin Fischer [Wed, 30 Nov 2011 07:04:27 +0000 (08:04 +0100)]
Bug 6935: Correct XISBNDailyLimit for new installations

This corrects the value of XISBNDailyLimit in the system preferences
installation file to 999 instead of 499.

The file was missed in an earlier update, so new installations
have different values than older installations that were updated.

Another patch with a database update is needed. Sending this patch first,
until it's clear how database updates will work for 3.8.

To test:
1) Recreate your database from scratch
2) Check your system preference XISBNDailyLimit shows 999 instead of 499,
matching the description of the system preference.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 61102d16d13a704f27a776350aa6d5582344b7e3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 6917 Dates filters doesn't work when they are not selected on row or column
Alex Arnaud [Mon, 26 Sep 2011 10:21:58 +0000 (12:21 +0200)]
bug 6917 Dates filters doesn't work when they are not selected on row or column

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 9855b834b66bf4b3dc1edb36e1347997d5aded86)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6865 - Replace image-based gradient backgrounds with CSS3 gradients
Owen Leonard [Tue, 13 Sep 2011 12:16:13 +0000 (08:16 -0400)]
Bug 6865 - Replace image-based gradient backgrounds with CSS3 gradients

Replaces image-based gradients in:

OPAC search bar
OPAC submit buttons
OPAC lists menu background
OPAC alert and message boxes
OPAC user menu tabs
Staff client alert and message boxes
Staff client side menu tabs

Removes obsoleted background image files.

Cross-browser background-gradients created using:
http://www.colorzilla.com/gradient-editor/

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit da6c532074adb20158658fab9515bc4af60e8a48)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6803: Replacing remote XSL include
Marcel de Rooy [Wed, 12 Oct 2011 12:00:54 +0000 (14:00 +0200)]
Bug 6803: Replacing remote XSL include

Replacing remote include by local one.
This resolves possible connectivity issues (see Bugzilla comments).
Should theoretically be safer and faster too.

December 7, 2011: Rebased and included nbsp entity definition (bug 7141).

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 5db33970410d5fb43bb1934513ec7d2741b18b3d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6716 : Categories table
Nicole C. Engard [Mon, 10 Oct 2011 10:50:23 +0000 (06:50 -0400)]
Bug 6716 : Categories table

This patch documents the patron categories table in Koha.
There are a couple fields marked unused and a couple that aren't
documented because I wasn't sure:

* dateofbirthrequired
* bulk

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 3aa00f63131fdccba4bb57870bc86c93329d5050)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6716: Document biblioitems and deletedbiblioitems
Nicole C. Engard [Sun, 2 Oct 2011 14:04:37 +0000 (10:04 -0400)]
Bug 6716: Document biblioitems and deletedbiblioitems

This patch documents the biblioitems and the deletedbiblioitems
tables.  There are many fields left undocumented because I didn't see
information in them, but this is enough of a start to be helpful to
those writing reports.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 66b5175aa5b38fd793db64f725fa927bc113e8c4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6716 Document deleteditems table
Nicole C. Engard [Sun, 2 Oct 2011 06:16:44 +0000 (02:16 -0400)]
Bug 6716 Document deleteditems table

This patch documents the deleted items table. Some fields were left
undocumented because I was unsure of what data was stored there:

stack - might be linked to shelving number, but need confirmation
paidfor - pretty sure this is unused, but don't want to document it that way

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit c9441f48955360829ef7f8e97a54afa7aa31fc5b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6716 - Document Items Table
Nicole C. Engard [Sun, 2 Oct 2011 06:11:06 +0000 (02:11 -0400)]
Bug 6716 - Document Items Table

This patch documents the items table. Some fields were left
undocumented because I was unsure of what data was stored there:

stack - might be linked to shelving number, but need confirmation
paidfor - pretty sure this is unused, but don't want to document it that way

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 12031f5b8cfc9e294f121135a7eb83449f1c2b63)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug6716: documenting reserves and old_reserves tables
Nicole C. Engard [Wed, 28 Sep 2011 10:19:33 +0000 (06:19 -0400)]
bug6716: documenting reserves and old_reserves tables

This patch documents the reserves and the old_reserves table.
Note that a few fields are marked unused: notificationdate and
reminderdate. Also two fields are left undocumented: lowestPriority
which never seems to be anything other than 0 and constrainttype which
is either 'a' or 0, but there doesn't appear to be any explanation
as to what each stands for.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 156f45fe2158ebfb8eeced2614a212f7bcb6aa7b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6663: Features for holidays.pl with datepicker
Christophe Croullebois [Fri, 2 Dec 2011 15:03:19 +0000 (16:03 +0100)]
Bug 6663: Features for holidays.pl with datepicker

Allow to select a range between 2 dates and in one "submit" creates holidays only on these days.
I have added also Holidays repeated yearly on a range.
On suggestions I have added a datepicker for "To Date".

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 806fac60f466b79d9c60023df4425b134040bfdc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7245 Tables population with mandatory data for italian installation
Frédéric Demians [Sun, 20 Nov 2011 12:13:28 +0000 (13:13 +0100)]
Bug 7245 Tables population with mandatory data for italian installation

Formatted patch from Fabio Tiana <fabio.tian@gmail.com>

While installing italian and UNIMARC version of Koha via web installer, two
errors occur: ERROR 1136 (21S01) and ERROR 1064 (42000). Some tables can't be
populated with mandatory data.

Errors are related to files sample_itemtypes.sql and unimarc_framework.sql
(/usr/share/koha/intranet/cgi-bin/installer/data/mysql/it-IT/ and
subdirectories).

Signed-off-by: koha <koha@kohabase.l.i>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a5241093b3cfd564f69b26a76b52ef04eaa5719e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7215 : The Module changed, but the tests weren't updated to reflect that
Chris Cormack [Tue, 13 Dec 2011 08:18:37 +0000 (21:18 +1300)]
Bug 7215 : The Module changed, but the tests weren't updated to reflect that

Updating the test

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 9c66c427642b9b8add00c389e0c33ddc3ecac622)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7082: Template improvements for better translatability
Katrin Fischer [Mon, 24 Oct 2011 14:09:35 +0000 (16:09 +0200)]
Bug 7082: Template improvements for better translatability

Problem:
/cgi-bin/koha/admin/aqbudgets.pl
<label for="show_mine">Show my<br /> funds only</label>

This gets broken into 2 strings for translation which makes it very hard for
translators to make sense of it.
Patch removes the line break.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
This patch removes the linebreak and has no ill effects that I can see, even
on a small screen. I'll attach before and after screenshots in Bugzilla.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 57800f2af22e496ecc113672c64de0b25c497bbf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7336 - memberentry.pl generates an error in the log
Owen Leonard [Thu, 8 Dec 2011 16:10:20 +0000 (11:10 -0500)]
Bug 7336 - memberentry.pl generates an error in the log

Adding check for the existence of a variable in
order to quiet errors in the log.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7215 - changed callnumber PRESET field to itemcallnumber
Brendan [Fri, 11 Nov 2011 17:25:15 +0000 (09:25 -0800)]
Bug 7215 - changed callnumber PRESET field to itemcallnumber

Fixes problem with creating new labels - before it populated with callnumber and not itemcallnumber

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit b255d091fdbfecf1dd82475052ad966546a76e7f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 7198: show patron name in overdue list even if name column is null
Galen Charlton [Wed, 9 Nov 2011 01:44:25 +0000 (20:44 -0500)]
bug 7198: show patron name in overdue list even if name column is null

If the surname or firstname of a patron is NULL, the MySQL concat()
function (properly) returns NULL, leading to the patron name not
displaying in the overdue report.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 18e06ecf0bfeeefd08575d0512891bea52bc1bde)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7159 - Add branchcode to circulation.pl search (take two, revising with Owen...
Liz Rea [Fri, 4 Nov 2011 19:37:11 +0000 (14:37 -0500)]
Bug 7159 - Add branchcode to circulation.pl search (take two, revising with Owen's suggestion)

I know there's talk of getting rid of this patron search method, but I had a
request for this and so here it is.

To test:
verify that branchcode is displayed on patron search results from
circulation.pl.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 4fad65cc269b049043da2841b491b3c0132ff0e6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoUpdating distro specific install files
Chris Cormack [Fri, 21 Oct 2011 20:12:15 +0000 (09:12 +1300)]
Updating distro specific install files
(cherry picked from commit d89eb95b0be7d1b3d58555b1af305bb717e34822)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoUpdating main INSTALL instructions
Chris Cormack [Fri, 21 Oct 2011 20:04:19 +0000 (09:04 +1300)]
Updating main INSTALL instructions
(cherry picked from commit 55306b9267f3ec9a2fec29e2ae1679ce69e25240)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6923 : Fixing a bug introduced by 6755 - was blocking help being used or edited
Chris Cormack [Mon, 26 Sep 2011 22:14:06 +0000 (11:14 +1300)]
Bug 6923 : Fixing a bug introduced by 6755 - was blocking help being used or edited
(cherry picked from commit b9808b86dfb8363406bc1ffe46f9a663e1813327)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7316 - Missing escaping in search results
Frère Sébastien Marie [Sun, 4 Dec 2011 17:14:09 +0000 (18:14 +0100)]
Bug 7316 - Missing escaping in search results

Two parameters are now escaped in title (html element):
 - query_desc
 - limit_desc

This is a security correction against XSS.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 48173560ba583da4fe6d3f2ba2f071573b4b927e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoRelease Notes for 3.04.07.000 07 Dec 2011 19:43:11 Z
Chris Nighswonger [Wed, 7 Dec 2011 19:43:11 +0000 (14:43 -0500)]
Release Notes for 3.04.07.000 07 Dec 2011 19:43:11 Z

12 years agoUpdating Version Number to 3.04.07.000 v3.04.07
Chris Nighswonger [Wed, 7 Dec 2011 17:43:47 +0000 (12:43 -0500)]
Updating Version Number to 3.04.07.000

12 years ago3.4.7 Translation Update
Frédéric Demians [Wed, 7 Dec 2011 17:16:20 +0000 (18:16 +0100)]
3.4.7 Translation Update
(cherry picked from commit d26c11e97b599b018495880e71b7e5fac98e3a5b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoRelease Notes for 3.04.07.000 07 Dec 2011 16:48:02 Z
Chris Nighswonger [Wed, 7 Dec 2011 16:48:03 +0000 (11:48 -0500)]
Release Notes for 3.04.07.000 07 Dec 2011 16:48:02 Z

12 years agoAdding a git mailmap file to allow standardizing of commit author's names/email
Chris Nighswonger [Mon, 5 Dec 2011 02:07:49 +0000 (21:07 -0500)]
Adding a git mailmap file to allow standardizing of commit author's names/email
(cherry picked from commit 5dc48be361fd66db512f8c4caaa022535efa3485)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdding template for autogeneration of 3.4.x release notes
Chris Nighswonger [Mon, 5 Dec 2011 02:27:30 +0000 (21:27 -0500)]
Adding template for autogeneration of 3.4.x release notes

12 years agoBug 6629 fix for vulnerability
Chris Cormack [Fri, 25 Nov 2011 07:38:35 +0000 (20:38 +1300)]
Bug 6629 fix for vulnerability

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6628 fixing security vulnerability
Chris Cormack [Fri, 25 Nov 2011 18:39:51 +0000 (07:39 +1300)]
Bug 6628 fixing security vulnerability

Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
 - patch taken from master
 - I also corrected two invalid calls to themelanguage (tests are not possible else)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoJoy nelson was already in history.txt, removing the entry
Paul Poulain [Fri, 18 Nov 2011 22:28:38 +0000 (23:28 +0100)]
Joy nelson was already in history.txt, removing the entry
(cherry picked from commit 9c5d3ea3aa28b71f0fb4148b8fdf9f2a002f79f5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6799 rebuild_zebra.pl -x produces invalid XML records
Frédéric Demians [Sat, 27 Aug 2011 11:32:08 +0000 (13:32 +0200)]
Bug 6799 rebuild_zebra.pl -x produces invalid XML records

This patch allow to handle properly items containing extended characters and
send valid XML records to zebraidx

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 4ce57a102b1c0404bc4ae67032bcb1cbbc769fc7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7095: Fixing cut and paste error and removing the use of diag() as this does...
Chris Nighswonger [Wed, 26 Oct 2011 15:14:05 +0000 (11:14 -0400)]
Bug 7095: Fixing cut and paste error and removing the use of diag() as this does not produce output when the test is run in a harness

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a340ded2ca5b95b1ae4f14423cab3fda107ed597)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6977: Follow-up patch : catch CloneSubfield errors
Frédérick Capovilla [Fri, 21 Oct 2011 16:04:03 +0000 (12:04 -0400)]
Bug 6977: Follow-up patch : catch CloneSubfield errors

A javascript error could occur if the CloneSubfield function failed for
any reason. This would prevent the popup from disappearing.

Example : Importing informations of a UNIF_TITLE authority with multiple
$x subfields in the biblio's 440 field. 440$x isn't repeatable, so an
error occurs when trying to clone it.

http://bugs.koha-community.org/show_bug.cgi?id=6977
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6dac7273fbc2eff7805d2a9bda1eb9a275962c00)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6475 - Edit it's not possible in subfield "0" in MARC framework
Salvador Zaragoza Rubio [Wed, 22 Jun 2011 16:18:40 +0000 (18:18 +0200)]
Bug 6475 - Edit it's not possible in subfield "0" in MARC framework

When trying to modify the subfield "0" on a field in the
MARC subfield structure admin -> Tag xxx Subfield Constraints,
the boolean condition on liblibrarian fails for the initial "0" value.
Modified condition to allow the value "0"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 042f89e939984b2b9e568622e0b99c95db09750e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7134: patron records getting corrupted birthdates
Ian Walls [Thu, 17 Nov 2011 15:27:47 +0000 (10:27 -0500)]
Bug 7134: patron records getting corrupted birthdates

If no date of birth is provided in a new member form, the borrower gets the birthdate of "00/02/0", which
is obviously incorrect (the result of passing 0 to the database directly)

The fix is to remove a conditional check buried deep in C4::SQLHelper.  This is in a helper subroutine that was changed
for the Unified Member Search dev (bug 6253).  Reverting this small change to the conditional does not seem to break
search, but testing will be required.

To test:
1. apply patch, and create a new patron with blank birthdate.  The new patron should now have a blank birthdate instead of '00/02/0'
2. search for a borrower by 1 part surname, confirm search works
3. search for a borrower by 2 part surname, confirm search works
4. search for a borrower across firstname AND surname; confirm
5. search for a borrower and include categorycode/branchcode filters

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
I confirm all working tests 1-5
1. Created patron with blank birthdate - birthdate was blank
2. Searched for patron "henry james acevedo III" by using "acevedo" - result was correct
3. Searched for mr. acevedo using "Acevedo III" - result was correct
4. Searched for Henry James Acevedo III, Henry Acevedo and James Acevedo - results were correct
5. Searched for Mr Acevedo with the branch he was not in, with the branch he is in, with a category he was not, and a category he was. All results were correct.

also noted: inner searching seems to be working now? Example: Henry James (firstname) Acevedo III (surname) - searching James Acevedo brings back the correct patron.
Not complaining, just noting. :)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 440c0f21ee59664bfbd2238c638f84a6af3d9d80)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoupdating history.txt : 3.6.0 & 3.4.6 & KohaCon11 & Joy Nelson 160th
Paul Poulain [Thu, 17 Nov 2011 15:50:54 +0000 (16:50 +0100)]
updating history.txt : 3.6.0 & 3.4.6 & KohaCon11 & Joy Nelson 160th
(cherry picked from commit 2216cd4371a72d95491dc51455d1ae7a6c783147)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoMake all strings translatable in marc21_field_007.tt
Frédérick Capovilla [Fri, 14 Oct 2011 19:52:30 +0000 (15:52 -0400)]
Make all strings translatable in marc21_field_007.tt

http://bugs.koha-community.org/show_bug.cgi?id=7033

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan:
- apply patch
- update po files using 'perl translate update <language-code>
- check po files for new strings from 007 plugin
- translate some / all of them
- update templates with changed po files 'perl translate install <language-code>
- verify 007 still works and got translated
(cherry picked from commit 8fde30912ec89c8855a7b4d468f5e48e7b886e85)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7221: C4/Biblio.pm documentation is incorrect.
Joy Nelson [Mon, 14 Nov 2011 22:23:49 +0000 (17:23 -0500)]
Bug 7221: C4/Biblio.pm documentation is incorrect.

$dbh is not a valid first parameter.  Removed $dbh from line 392 to show correct syntax.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit 1d0192b85ceabca3dbb0add7df218a4d768ea104)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7084 - Re-arranging results_summary for tags so that it applies where it is suppo...
Liz Rea [Mon, 24 Oct 2011 20:26:32 +0000 (15:26 -0500)]
Bug 7084 - Re-arranging results_summary for tags so that it applies where it is supposed to

To test:
Verify that New Tag text is the same size as all of the other surrounding text.
Verify that it is consistent in size with results that have existing tags.

See screenshot for what it looked like before:
http://screencast.com/t/hnt15kpS7SH9
Notice that the Add button and New tag text were slightly larger than the
similar constructions for results with existing tags. This patch should fix
that.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
I made sure I had a results list with on record with tags and one without.
Before applying the patch the "New tag" text and "Add" button were
inconsistent for the two records, after applying it they look the same. Nice!

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1d42be9e7670a3489be681494a8b782c855d52fb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7207 - Reverting a portion of commit 607b5449bd5cb which breaks the label export...
Chris Nighswonger [Wed, 9 Nov 2011 19:51:01 +0000 (14:51 -0500)]
Bug 7207 - Reverting a portion of commit 607b5449bd5cb which breaks the label export script.

squashed chris_n's two patches. Label export works again. Also changed the pattern for the item_number to the known working, critic friendly pattern.

Don't change $_ in a list context

Changed the 3rd bit to the critic friendly pattern chris_n suggests in the previous two lines.

Signed-off-by: Brendan <brendan@bywatersolutions.com>
(cherry picked from commit 7824a1bc8da020b11fa9473f09fb7c6429390034)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago(bug #4518) enhance 2.2 to 3.0 scripts
Nahuel ANGELINETTI [Mon, 17 May 2010 13:43:37 +0000 (15:43 +0200)]
(bug #4518) enhance 2.2 to 3.0 scripts

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e0b029a4f5ff378291e86fa55e07841297d611e7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 4161: Preselect active currency for new vendors
Katrin Fischer [Mon, 24 Oct 2011 15:48:29 +0000 (17:48 +0200)]
Bug 4161: Preselect active currency for new vendors

Currently when creating a new vendor in acquisitions the alphabetical first
currency will be preselected. For better usability and less mistakes the
active curency should be preselected.

To test:
Check your currency settings in administration.
Your active currency should not be the first in the list.

1) Create a new vendor
Verify the active currency is selected for list and invoice prices.

2) Check vendor summary page
Verify the correct currencies from the vendor record are shown here.

3) Edit vendor
Verify the correct currencies from the vendor record  are shown here.

Signed-off-by: Liz Rea <lrea@nekls.org>
Verified with tests 1, 2, and 3.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 5d5a04798449d1725042adb872d4acf51af672f8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 2629: Add diacritic support for Ů (U with ring)
Ian Walls [Mon, 26 Sep 2011 20:38:39 +0000 (16:38 -0400)]
Bug 2629: Add diacritic support for Ů (U with ring)

Adds Ů and ů support to word-phrase-utf.chr.  These characters are used in
Czech, for example the author Martinů, Bohuslav (1890-1959)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1e2f697e3bca3c9068e1864db63d0b112b4273a4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5945: email not searchable in patron search
Ian Walls [Fri, 4 Nov 2011 10:26:01 +0000 (06:26 -0400)]
Bug 5945: email not searchable in patron search

Adds 'email' to valid search parameters in members/member.pl

To test:
1. give a patron a unique email address in your test database
2. search on the full email; should work
3. search on the part of the email before the domain; should work

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit c3abbedebedd34948b664a4d2a6b34dc4863802d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7138: Can't print basket group order pdf
Katrin Fischer [Wed, 2 Nov 2011 23:44:36 +0000 (00:44 +0100)]
Bug 7138: Can't print basket group order pdf

PDF print of basket groups is broken.

To test:

1) Make sure OrderPdfFormat is set to pdfformat::layout2pages or pdfformat::layout3pages
2) Create a basket with orders
3) Close the basket and create a basket group checking the checkbox
4) Print the basket group as PDF

Before patch the file is broken and when opened in an editor contains an error message.
After the patch the PDF should be generated correctly again.

Thx to Chris for helping me to fix the problem.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 7a3dc5102e82bbb4c0c8487a0f128c20d4fe8248)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6679: Fixing admin/aqplain :encoding(UTF-8) gives strict validation
Chris Cormack [Mon, 31 Oct 2011 07:57:19 +0000 (20:57 +1300)]
Bug 6679: Fixing admin/aqplain :encoding(UTF-8) gives strict validation

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
tested with diacritics, no changes before and after the patch
(cherry picked from commit ee0627f20bee5df234ab284d1fdacebb857de57f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6679 : Tidying changed parts of file
Chris Cormack [Wed, 2 Nov 2011 03:27:48 +0000 (16:27 +1300)]
Bug 6679 : Tidying changed parts of file

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 3b0474950c791bbf0367f6c819203180205f7aa8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6679 : Don't declare variables in conditionals
Chris Cormack [Wed, 2 Nov 2011 03:24:05 +0000 (16:24 +1300)]
Bug 6679 : Don't declare variables in conditionals

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 21e4d79be8b0a7204dd592528e20f5b8e29553ee)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6679 : Not using strict .. bad script, no cookie for you!
Chris Cormack [Wed, 2 Nov 2011 03:19:36 +0000 (16:19 +1300)]
Bug 6679 : Not using strict .. bad script, no cookie for you!

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit e8ea58270dc08aac8c1eaccc59e17d96daf56860)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6679 : Don't declare variables in conditionals Don't change $_ in a list context...
Chris Cormack [Wed, 2 Nov 2011 03:13:20 +0000 (16:13 +1300)]
Bug 6679 : Don't declare variables in conditionals Don't change $_ in a list context http://search.cpan.org/~elliotjs/Perl-Critic-1.116/lib/Perl/Critic/Policy/ControlStructures/ProhibitMutatingListFunctions.pm

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 607b5449bd5cb79dd8964e46bb970c3975497969)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6679 : Declare variables outside of conditionals
Chris Cormack [Wed, 2 Nov 2011 03:00:01 +0000 (16:00 +1300)]
Bug 6679 : Declare variables outside of conditionals

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6bb73a04c4c67e5b14eb209ec56ae6585547c593)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7188: C4::Context::db_scheme2dbi does case-insensitive grep
Paul Poulain [Fri, 16 Sep 2011 22:58:41 +0000 (00:58 +0200)]
Bug 7188: C4::Context::db_scheme2dbi does case-insensitive grep

Checking NYTProf in C4::Context, it appears that the /i flag is highly time-consumming
As we don't support anything outside from mysql, returning directly mysql directly

If in a future version PostgresSQL works, then we will have to update this sub. But if an ORM is introduced, this code will be removed completly anyway

Testing note:
Drops execution time of the line from 300ms to 20 microseconds (in my testing).
(cherry picked from commit 0f8db0c53866afaf5171869359c558d1e9f4325e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7184 raise mySQL error if debug is set
Paul Poulain [Sun, 6 Nov 2011 08:36:52 +0000 (09:36 +0100)]
Bug 7184 raise mySQL error if debug is set

Before this patch, if a mySQL occured in Koha (any error), then the user was seeing nothing.
With this patch, if DEBUG is set in Koha VirtualHost, any mySQL error will make Koha die and display the SQL error

Step to test:
=== BEFORE PATCH ===
go anywhere, and change a mySQL statement to make it invalid.
Launch a page using the SQL you've made wrong, you'll see nothing, except you won't see the expected results

=== AFTER PATCH ===
Modify koha-httpd.conf, and add the following line, in the virtualhost (if it does not already exist)
SetEnv DEBUG 1
restart/reload Apache
Launch the same page, you'll get a Perl statement saying something like:

DBD::mysql::st execute failed: <<blablabla SQL error>> at <<where the error was raised line <<error line>>
(cherry picked from commit 016e66c6f25fbe3b648bcb8dad8d59f80d11b992)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7128 - adding some ID's to make styling opac-main.tt a bit easier
Liz Rea [Tue, 1 Nov 2011 19:01:17 +0000 (14:01 -0500)]
Bug 7128 - adding some ID's to make styling opac-main.tt a bit easier

To test:
verify that the loggedin id is added when user is logged in
verify that the notloggedin id is evident when no user is logged in.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 7128 : Follow up, adding the id to the case when a user is not logged in

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 4ccb8649f88abaf9012f1bbec06fc840046cb7ff)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6994: Wrong 'no budget defined' alert
Katrin Fischer [Mon, 24 Oct 2011 18:59:57 +0000 (20:59 +0200)]
Bug 6994: Wrong 'no budget defined' alert

When ordering from an existing record the 'no budgets and funds defined' error
message was shown below the result list.

To test:
A) No budgets defined for this user and library
Basket summary page shows a warning instead of the link for creation
of orders.

B) Budgets and funds are properly defined for this user and library
Basket summary page shows links for order creation.
Before patch: A search for an existing record had the alert at the bottom
of the search result list.
After patch: The links for creation of orders are shown instead.

Signed-off-by: Liz Rea <lrea@nekls.org>
Verified A and B.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 488f4be86537211214ede7e0e703128c0cc4c92f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoNotify the user on his account page when his account is almost expired
Frédérick Capovilla [Wed, 5 Oct 2011 19:12:04 +0000 (15:12 -0400)]
Notify the user on his account page when his account is almost expired

New feature : If the "NotifyBorrowerDeparture" system preference is defined, a
notification appears in the user's account page if his subscription is almost
expired.

http://bugs.koha-community.org/show_bug.cgi?id=6978
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
works perfectly with date formatted DD/MM/YYYY as well
(cherry picked from commit e676e117fccfaa8208742c17a08cb92056286f95)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6471: add tablesorter to Holds Queue
Ian Walls [Tue, 20 Sep 2011 13:22:46 +0000 (09:22 -0400)]
Bug 6471: add tablesorter to Holds Queue

This patch adds the table sorter to Holds Queue.  Sponsored by Farmington Public Library.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0ea8ff7c4c81c183ba8da64d7939b041c7de8301)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7117: Bug 7117 - Small display problems when organising suggestion tabs by name
Katrin Fischer [Mon, 31 Oct 2011 00:06:17 +0000 (01:06 +0100)]
Bug 7117: Bug 7117 - Small display problems when organising suggestion tabs by name

To test:
1) Add some suggestions
2) Go to suggestions in staff
3) Choose from filters 'suggested by' or 'managed by'
4) Compare names shown on tabs with names in list of suggestions

Before patch: tab name has the wrong order, while list name is correct.
After patch: all names should be consistent and correct.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit e660cef0e2f0ab4a64f8f1b4b0b4ad612255c03b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago7146 (Update timestamps when deleting a biblio)
Marcel de Rooy [Thu, 3 Nov 2011 12:41:24 +0000 (13:41 +0100)]
7146 (Update timestamps when deleting a biblio)

Currently, when you delete an item, the timestamp column in deleteditems is
updated with current time. (This comes from an [unintentional] additional
update statement in DelItem.) It makes deletion time visible.
In the past, the marcxml was updated too at that moment, resulting in an
updated timestamp in biblioitems too. The timestamp in biblio was not touched.

If you delete a biblio however, the timestamps in deletedbiblio and
deletedbiblioitems do not reflect time of deletion. They still show the time of
last update before the record was deleted. This last update can be extracted
from MARC field 005 too.

This behavior is not consistent nor logical. I would suggest to add a statement
in DelBiblio to force updating the timestamp in deletedbiblio(items) too. It
makes the time of deletion visible in the record too. The time of deletion of a
biblio can be very useful for e.g. synchronizing purposes.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 7ee0565f5ce75fac16de2dc06c170bc06a171e56)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFollow-up fix for Bug 3958, Standardize vendor/supplier/bookseller terminology
Owen Leonard [Fri, 4 Nov 2011 18:56:50 +0000 (14:56 -0400)]
Follow-up fix for Bug 3958, Standardize vendor/supplier/bookseller terminology

Fixing two stray instances of "supplier."
(cherry picked from commit 0038b0df15a838468bf7c23a389c260075dfd1c4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7061: unnecessary global variables declared in C4::SQLHelper
Ian Walls [Wed, 19 Oct 2011 00:17:17 +0000 (20:17 -0400)]
Bug 7061: unnecessary global variables declared in C4::SQLHelper

Removes $tablename and $hash from global scope of C4/SQLHelper.pm.  They are never used;
all instances of $table are locally scoped to the subroutines, and $hash is never used.

This may help with persistance; if not, it's at least a bit of trivial cleanup.

To test:

1.  Search for a patron
2.  Create a Contract in Acquisitions
3.  Modify that Contract
4.  Delete that Contract

All instances should return error free.  This checks the subroutines of SQLHelper

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 36d8e5df96d17df3d19a4693fff2ba52504fae51)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6989 Patron categories not properly displayed if not pure ASCII
Frédéric Demians [Sat, 8 Oct 2011 13:30:59 +0000 (15:30 +0200)]
Bug 6989 Patron categories not properly displayed if not pure ASCII

C4::Category module returns badly encoded patron categories when they are
containing non pure-ASCII characters.

To reproduce this bug:

  - Go in Administration > Patron Categories
  - Add a new category. Give it this code for example:
    Café
  - Click on Patrons link on top menu
  - Click on New button

    => You get 'Café' displayed without accent

Signed-off-by: Piotr Wejman <ropuch@bagno.be>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d998166ea30e9d798c97d457afe39c748eed38ae)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>