[koha-commits] main Koha release repository branch 3.6.x updated. v3.06.02-64-g5ab88df
Git repo owner
gitmaster at git.koha-community.org
Mon Jan 16 22:31:40 CET 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, 3.6.x has been updated
via 5ab88df697756745ffc0aaea22326129f1e7d518 (commit)
via 29043d5660df7b7131aca70f64b077c1f795da7e (commit)
via a220304a8d354603e0c5c67b8eadf9fe0cc223bf (commit)
via 3b8e95ddf1a4c6693e4e41886dce7134c9bc0176 (commit)
via 4709e7e17725c8910c96a1494c9f0958658deeae (commit)
via 7a54bc53f6fcc8e1002e5397203cbc584dc31cb2 (commit)
via 5c1621bf8355b130f0aafa268e4182c1132f6bd5 (commit)
via 0942a21db2a82c002c75f5d303561b9c39a24914 (commit)
via 6790357243223ff21bd58ea8d8d88b81f92e2b34 (commit)
via fa6b504e4cd6494e9caae8fb8141ce4f33f467cb (commit)
via 95a44070fdc746b3ede17296650852747ef067c4 (commit)
via 0b9c0b752856965eba654d5affdb86c4091363a5 (commit)
via 5481461e07393bd079b15f6a060a67f27a409232 (commit)
via 33af36ff94f9b7a02d65055916f28a58b15c1c8a (commit)
via 06689631249df6dbf001063954458536d1fb3578 (commit)
via 93cb222de2b9cc33fb78c30ff17ebd3b5f3dd759 (commit)
via b05389689590fe1c135b3a6762b899df493a836d (commit)
via f2adf05026fc9532efa9bf2144d7abcf3b04eb3d (commit)
via 12c4cdb24405368d06f16df7e02a3dc9426099fa (commit)
via 0ff647b6e482126a84b49c716e88a370de4cc099 (commit)
via bad8eea9e10641dafb2004355a8e06df1915636f (commit)
via 19c705957344c7ed1861c44eaa1c26f1f0fd9dbd (commit)
via c7047cadd9615bc73770bf360a642c5cc387b1d1 (commit)
via df6f4d0c348b41882fdca8a5037870934c80f664 (commit)
via 28c00dd146187013b4db3f3014cef41911dd5b62 (commit)
via ec259212b385b718b82526121d9ff6fb144db56e (commit)
via 9a314c90b1f389b71bed2a15961c1e82624efb58 (commit)
via f955b70a67b88478764142f8b1dfd9574b4813e0 (commit)
via 4d0d49d7c76deab08c83d923775c4c18beef35b5 (commit)
via 00abf91befa469a025ed351d69863bced1f535aa (commit)
via d415484470c57c02779dda1e96f4cd1c02f8c943 (commit)
via d3e191b9c66806797bce4271a82897780346e8d7 (commit)
via 4d9220623ff6a5a969766a722721b01e9b158b0a (commit)
via a7ef90ff87ae06e4e1555194b22de155d96fe955 (commit)
via f497930d66b18bcbb6676ca698d5f10c4b32fbcc (commit)
via 7d9ca3f1e450f75f6f85ee80f09d22089c82a87b (commit)
via da99978777281452b16551ee10e7c86d1578337f (commit)
via b5fddf5ceef15b56bbfd83c93da39d567a9a36b5 (commit)
via 7e34d437cc884166cd8f6be5615bb48381341d4a (commit)
via 4e64d147002ce4e463985ac2253ce9a6c76875cf (commit)
via c183f0a661a893390c2cf1b3dab80d88d3c52690 (commit)
via 3d0e8cf5064f11a505d0c358ce4d17a437a9f2d3 (commit)
via 7a14823fa34225f672854a0bb3c8fd39116e5d0e (commit)
via 9ed382a203fc755e09225a518a43102ada2dbf73 (commit)
via a284baee174d55b8b24e48166da47289da55aca7 (commit)
via 436e55447c137420cfbe98fc962c44ea4577e65d (commit)
via 3a42ff5d671b933c651936d76e685da296d95c80 (commit)
via 7d2b4a835fc47d885d3af337fd25b7bceed18ae7 (commit)
via bedb6bfa961b0d81b829469b29ef33a3fbdb2863 (commit)
via 5133a9df2118289566e6a361eededf4de9415c18 (commit)
via ab27da89a9707558f40c3ea38e66da7043f6da80 (commit)
via bd13bb32d88036c867a315ba2d25112dc08457e0 (commit)
via d3bac2e323a08f31426c768ebd237feb6e4c963b (commit)
via e50d6e28150286023e28bdc75f33d7d215086a17 (commit)
via 2f95419c362d17cd4df30df11d6aabc1aaabc824 (commit)
via 9741b6331458e66c97e357e565b793d23815a894 (commit)
via caf02e8dca65de45bd9e761fc6e1ab8a0cf32177 (commit)
via 31efcea6ca5e07dba7a522cf6d11d9c8f6262c4f (commit)
via 261b6a09d098d14fe77a8a6c340de43c155e22b9 (commit)
via c8f04b8e7b95f07db79d134d21a9ead5a6c02d7b (commit)
via eb8f99c37938bc2106843e589f3cce80602a33b8 (commit)
via fc2a6415a9185f52f63521376123ff7d5ccf82bc (commit)
via b418a166235d2a78237c214cffb7f59ec7ecccbd (commit)
via 3aa19f21868644b9989031ff06a22134064b5842 (commit)
from 3d877b4d3299faa84498b617fe13fb16f63e6b3d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5ab88df697756745ffc0aaea22326129f1e7d518
Author: Christophe Croullebois <christophe.croullebois at biblibre.com>
Date: Tue May 17 10:16:07 2011 +1200
Bug 6147 : Correcting invalid RSS
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Feed validates using http://feed1.w3.org/ with the following recommendations:
This feed is valid, but interoperability with the widest range of feed readers could be improved by implementing the following recommendations.
line 12, column 149: Relative href value on self link: /cgi-bin/koha/opac-search.pl?idx=kw&q=some&sort_by=acqdate_dsc&format=rss2 [help]
... p;sort_by=acqdate_dsc&format=rss2"/>
^
line 12, column 149: Self reference doesn't match document location [help]
... p;sort_by=acqdate_dsc&format=rss2"/>
^
line 20, column 158: Unregistered link relationship: search (10 occurrences) [help]
... _by=&format=opensearchdescription"/>
^
line 40, column 9: description should not contain relative URL references: /cgi-bin/koha/opac-reserve.pl?biblionumber=10 (10 occurrences) [help]
]]></description>
^
line 22, column 5: Misplaced Item (9 occurrences) [help]
<item>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit a0a57b9526c244771aac57ad3ac3dee5dec1a16e)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 29043d5660df7b7131aca70f64b077c1f795da7e
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Fri Jan 6 14:22:59 2012 +0100
Bug 6627 follow-up
in installer, some lines where forgotten, and can also be commented
(cherry picked from commit a60101bea074fdd81434c8f047ed7d3a0de8ebce)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit a220304a8d354603e0c5c67b8eadf9fe0cc223bf
Author: Duncan Tyler <duncan at catalyst.net.nz>
Date: Wed Dec 21 14:59:21 2011 +1300
Bug 6627 [Signed Off] - Update to improve security in specified log files - bug 6627
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Verified sessionlog file is not written to /tmp when patch is applied. Also verified original bug - logging in did in fact log to /tmp.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 00290e86197bbd0129a4fc943a957f823235210d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 3b8e95ddf1a4c6693e4e41886dce7134c9bc0176
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Thu Jan 5 08:09:03 2012 +0100
Bug 5369: Follow up fixing quotes
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Confirm that this works. My only remark would be that " could have been used.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 6d2ca576e25242015711c33ac114e87db9757639)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 4709e7e17725c8910c96a1494c9f0958658deeae
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Thu Dec 1 19:35:43 2011 -0500
Bug 5369: Make series tracings use phrase indexes
By definition, series tracings should search for other records in the same
series, i.e., those with the exact same series title. This patch forces the
tracings to use phrase indexes for series tracings.
Note that this patch DOES NOT respect TraceCompleteSubfields. While that may be
desirable, it is outside the scope of the current patch. An additional follow-up
patch could be written to add support for TraceCompleteSubfields, if community
concensus is that series tracings should obey TraceCompleteSubfields.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Thx for the follow up and sign off Jared :)
(cherry picked from commit 9b3e1552c4cfb41f1d85b346515f15450760d7bf)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 7a54bc53f6fcc8e1002e5397203cbc584dc31cb2
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Nov 28 07:25:37 2011 +0100
Bug 5369: se queries with paranthesis fail
This patch does several things to make the search work better:
1) Adding "" around search terms for queries on index se.
2) Make links for 8xx obey the UseControlNumber system preference
3) Fix the indexing for 8xx fields, as they were not included in the se index before
Note: Make sure you copy the new record.abs into your koha-dev directory and reindex
before testing.
To test:
1) Add records using the following fields:
440$a
490$a ind. 1 = empty or 0
490$a ind. 1 = 1
800$a, 810$a, 811$a or 830$a
Example value taken form bug description, should only work after applying the patch:
DHEW publication no. (HSM) 73-1804
Please also test with other examples.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 4cd81a8d0f2eeccc71d2b1409f35c8ee57314b8a)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 5c1621bf8355b130f0aafa268e4182c1132f6bd5
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Thu Dec 29 10:51:15 2011 +0100
Bug 929: Follow up - showing fund code instead of internal number
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 71d2d81e346846f455e2f673d8983ffd9d00310e)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 0942a21db2a82c002c75f5d303561b9c39a24914
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Thu Dec 29 21:46:51 2011 +1300
Bug 929 : Followup fixing date formatting
This patch introduces a Filter (KohaDates) for use in templates
[% USE KohaDates %]
[% somevariable | $KohaDates %]
This will format the date in the format specified by the systempreference
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
(cherry picked from commit 01875b565d7c04b3b00ba1986f824cae7d1fb2a9)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 6790357243223ff21bd58ea8d8d88b81f92e2b34
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Thu Dec 29 09:08:40 2011 +1300
Bug 929 : Last follow up, implementing the last of Katrins suggestions
Date formatting
Links
Nomenclature changes
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
(cherry picked from commit ddb6883b578830c75a4d73ca84d630998f89ee6c)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit fa6b504e4cd6494e9caae8fb8141ce4f33f467cb
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Wed Dec 28 15:43:47 2011 +1300
Bug 929 : Follow up, making some improvements to the spent page More to come
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
(cherry picked from commit c64322e48de53ed64d65f8c86160848a492ea792)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 95a44070fdc746b3ede17296650852747ef067c4
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Wed Dec 28 09:47:56 2011 +1300
Bug 929 : Reinstating the breakdown of budgets
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
(cherry picked from commit 9638053a25a89040c21a38196dc6c4bb09e6010a)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 0b9c0b752856965eba654d5affdb86c4091363a5
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Fri Oct 28 15:54:53 2011 +0200
Bug 3184: Show creator and budget on order receive page
Reimplementing 3.0.x patch from
Nahuel ANGELINETTI <nahuel.angelinetti at biblibre.com>
To test:
1) Create basket
2) Order something, note your fund
3) Receive title
> Verify your name and selected fund display correctly
Additional tests:
1) Set borrowernumber in aqbasket.authorisedby to a nonexistant borrowernumber (like something really big)
> Created by should show "No name"
2) Set borrowernumber to NULL / empty
> Created by should show "No name"
Signed-off-by: Duncan Tyler <duncan at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 37e1f05e8f8617883c02ff1b57f36a4fff3a39ae)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 5481461e07393bd079b15f6a060a67f27a409232
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Jan 3 19:57:41 2012 +1300
Bug 7394 : Fixing scoping issue with XSLT processing. Also bailing out early for 404 inestead of doing unnessecary processing
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
I can confirm the bug and the solution.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Second sign-off from me, patch fixes display of detail page
for last record on a result page.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit fa1a90fd4f6fcb709bc2bd6ad57e75154ecb63f9)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 33af36ff94f9b7a02d65055916f28a58b15c1c8a
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Wed Dec 7 08:46:21 2011 +0100
Bug 7328 Expanded options in advanced search
In OPAC and intra advanced search, more search options are displayed
depending on expandedSearchOption syspres and user choice. This doesn't
work anymore in HEAD.
This patch restore this functionnality.
To test:
- enable/disable expandedSearchOption.
- Load advanced search page. Limited seach options version is always
displayed
- Apply this patch and see how it works...
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
The problem only appeared in the staff client for me.
Tested both OPAC and staff with patch applied.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 1730e180cdbe11a7878ddfab54cec7291d12f430)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 06689631249df6dbf001063954458536d1fb3578
Author: Liz Rea <wizzyrea at gmail.com>
Date: Thu Dec 15 10:21:36 2011 -0600
Bug 7333 - Fixing up db_dependent/Search.t to use sample data Thanks to Chris N. for helping figure out that it was because there were no French stopwords in the DB that the test was failing.
Patch changes the French string (with French stopwords) to an English string with English stopwords, as only English stopwords are installed in the default data.
This patch will allow Search.t to run on the database attached to this bug.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 3c12d5f2f63ac06ac8f71c1a5598bc01c82e5802)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 93cb222de2b9cc33fb78c30ff17ebd3b5f3dd759
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Fri Apr 8 14:02:19 2011 +0200
Bug #6142 - Delete sub CanBookBeReserved and delete function's reference on @EXPORT
Original-Author: Alex Arnaud <alex.arnaud at biblibre.com>, Stéphane Delaune <stephane.delaune at biblibre.com>
Original-Signed-off-by: MJ Ray <mjr at phonecoop.coop>
Correct use statement bug found by Ian Walls
Backporting to 3.6.x
Author: MJ Ray <mjr at phonecoop.coop>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit b05389689590fe1c135b3a6762b899df493a836d
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Tue Sep 27 18:35:33 2011 +0200
Bug 5729 - Add CoinS to intranet
This patch adds CoinS support to biblio displays in staff interface.
librarians can now use zotero on the staff interface
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Modified by: Ian Walls <ian.walls at bywatersolutions.com>
GetCOinSBiblio has changed interface, requiring a $record object instead
of looking one up by biblionumber. Calls in ISBDdetail.pl, MARCdetail.pl
and detail.pl updated.
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
(cherry picked from commit c96a52a4a0eeda52b219ba29a86685337265ab56)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit f2adf05026fc9532efa9bf2144d7abcf3b04eb3d
Author: Sophie Meynieux <sophie.meynieux at biblibre.com>
Date: Mon Dec 19 12:31:21 2011 +0100
BUG 5607 : Adds parsing of issues fields in overdue letters
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Patch makes it possible to add fields from the issues table to overdue notices.
Template used for testing:
<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> , Checkout date: <<issues.issuedate>>, Due date: <<issues.date_due>> Fine: <fine>GBP</fine> Checkout date from items: <<items.onloan>></item>
Possible improvements:
- Dates are not formatted according to dateformat system preference
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 940652a6c7ac45b255d4d9b89bf90ccfca568ccd)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 12c4cdb24405368d06f16df7e02a3dc9426099fa
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Fri Dec 31 07:35:29 2010 +0100
Bug 5565 UNIMARC to DC XSL tidy up
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 34e99cf478010e886ea75ccad6d8026ca547fe03)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 0ff647b6e482126a84b49c716e88a370de4cc099
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Fri Dec 31 07:32:41 2010 +0100
Bug 5565 Default OAI UNIMARC to Dublin Core XSL adds superfluous blanks
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit a6eb50747575acec333a76ff08fa04cc9a85656d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit bad8eea9e10641dafb2004355a8e06df1915636f
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Nov 28 08:35:21 2011 -0500
Bug 1623 - Provide view of approved comments
This patch creates two tabs on the comments administration page:
one for approved comments and one for unapproved comments. Each
display is paginated according to the numSearchResults preference.
The list of approved comments has, instead of a link to approve,
a link to unapprove.
The JavaScript table sorter has been removed since it doesn't make
sense to sort individual pages of a multi-page result set.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit bc2a1d18e246b024e93a88df140281eebeb53a48)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 19c705957344c7ed1861c44eaa1c26f1f0fd9dbd
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Thu Dec 22 08:27:09 2011 +1300
Bug 7370 : Missing use call
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 525c7bc4af45b548e548c2fe6f69c4d22ec1d472)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit c7047cadd9615bc73770bf360a642c5cc387b1d1
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Fri Dec 2 15:24:42 2011 +0100
Bug 7311: Only run analytics code if analytics are enabled
With the addition of the code from Bug 5528 (easy analytic record workflows),
UNIMARC 461$0 and MARC21/NORMARC 773$0 have special meanings. When you import
a record that uses those subfields for different data, you will get an error
in /cataloguing/additem.pl. A check should be added to be sure that
EasyAnalyticalRecords is enabled before trying to handle the 461$0/773$0 as
bib numbers for analytics.
Thanks to Frère Sébastien Marie for spotting this issue.
Signed-off-by: Frère Sébastien Marie <semarie-koha at latrappe.fr>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 97caccbd0fea3245e3f1c701de7ba2a4e46726d8)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit df6f4d0c348b41882fdca8a5037870934c80f664
Author: Frédérick Capovilla <frederick.capovilla at libeo.com>
Date: Thu Oct 20 12:05:02 2011 -0400
Use MARCAuthorityControlField008 in AddAuthority for empty 008s
The old default value for field 008 didn't have the correct length,
which could potentially cause data corruptions.
Uses the MARCAuthorityControlField008 preference added by BUG4839.
http://bugs.koha-community.org/show_bug.cgi?id=7072
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 6408547cc0d396c8b9d29e1f7617637d9c12a9a6)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 28c00dd146187013b4db3f3014cef41911dd5b62
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date: Mon Aug 8 23:45:00 2011 +0200
Test to check for XXX in kohaversion.pl or updatedatabase.pl
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Works as advertised.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Amended the original patch of Chris to add two exceptions for a line in SetVersion and TransferToNum.
http://bugs.koha-community.org/show_bug.cgi?id=6700
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit bb92ac1ee01a9b781ca2a7adab4beec28e6edeaa)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit ec259212b385b718b82526121d9ff6fb144db56e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jun 30 09:34:23 2011 +0200
6700: Better handling of version numbers in updatedatabase
Contains a few lines of code for updatedatabase routines SetVersion and TransformToNum in order to facilitate testing new db revisions which are still marked XXX.
Currently, the XXX as added in a proposed patch generates an error in the version compare. Additionally, running SetVersion while testing the upgrade is annoying and not needed. In testing stage you would like to keep your version number as is. The version number should of course be incremented when the patch is pushed. A simple test accomplishes that.
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit c8982e1ab41ef54ba66afd3ed313e81cde307004)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 9a314c90b1f389b71bed2a15961c1e82624efb58
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Thu Apr 14 14:40:21 2011 -0300
Bug 6193 - Use memcached cache koha-conf.xml configuration variables
Basically I add some code to Context.pm so it stores koha-conf.xml config vars
in memcached server. It is arguable whether this is an improvement or not,
tests are needed to conclude something about this.
Error handling was an issue with Cache::Memcached, I tried to do it the
simplest I could.
Note: As it was pointless to read the xml file to get the memcached
server info for accessing them for retreiving the info in the koha-conf.xml
file... I passed those values through apache's SetEnv. These variables
are set acordingly through the install scripts and commented out if koha
was setup not to use it.
Bug 6193 - Properly comment the code
Required by slef.
Regards
To+
Signed-off-by: Federico Rinaudo <frinaudo at infocpt.com.ar>
Signed-off-by: MJ Ray <mjr at phonecoop.coop>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 22dca58cbad64841fb12a6e48afa50500c1a5c60)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit f955b70a67b88478764142f8b1dfd9574b4813e0
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Oct 26 14:17:52 2011 -0400
Bug 6880- Reason for suggestions do not save
The fix for Bug 1883 seems to have lacked the necessary
update to the database to add the "patronreason" column
to the suggestions table. This patch does so.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Patch adds database update and change to kohastructure.
After this patch is applied, the patron's reason for
making a suggestion (form in opac) is saved to the database
correctly. The reason is also shown in the detail view
of the suggestion.
Backporting to 3.6.x
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 4d0d49d7c76deab08c83d923775c4c18beef35b5
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Aug 23 15:33:34 2011 -0400
Fix for Bug 3431 - Catalog by itemtype report pulling from holdingbranch
Plus several other fixes for this report no one uses:
- Clarifying titles and breadcrumbs
- Correcting terminology: branch -> library
- Sorting library select field by library name
- Displaying library name instead of code on output
- Sorting results by itemtype description
- Adding tablesorter to results
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 396efb90c73099e1f87a5a4593b4c5c1020c69c3)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 00abf91befa469a025ed351d69863bced1f535aa
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Dec 6 11:09:46 2011 -0500
Bug 2307 - Calendar widget cannot be translated
Implementing the same fix in the OPAC which we now
use in the staff client.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 873ac768b0d557315e3e6067032db78defa4377a)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit d415484470c57c02779dda1e96f4cd1c02f8c943
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Dec 6 09:53:05 2011 -0500
Bug 7226 - can't add tags on list
Incorrect check for TagsInputOnList was preventing the
right JavaScript from being triggered, and markup was
nested inside the wrong logic for the confirmation
message to be displayed consistently.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 0b9d4902def55a6ce7c9b0c006a6210b3f7abe97)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit d3e191b9c66806797bce4271a82897780346e8d7
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Dec 14 15:54:22 2011 +0100
6302 follow up
Updates to_address in message queue when sending an email (when needed).
Signed-off-by: Koustubha Kale <kmkale at anantcorp.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 2ab11c4892f87c054df02763804e34f070d931e1)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 4d9220623ff6a5a969766a722721b01e9b158b0a
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Fri Dec 2 07:53:18 2011 +0100
Bug 6302: Separate AutoEmailPrimaryAdress and AutoEmailOpacUser
AutoEmailPrimaryAddress is not only used for the patron account mails, but
also for overdues and other email notices to patrons.
This patch separates the system preferences in the system preference editor.
To test:
- Check Patrons tab shows both system preferences separated
- Check you can still change the settings
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Koustubha Kale <kmkale at anantcorp.com>
(cherry picked from commit a5a8d78f0d54acd7606477774d5e94cfcac66e9a)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit a7ef90ff87ae06e4e1555194b22de155d96fe955
Author: Sophie Meynieux <sophie.meynieux at biblibre.com>
Date: Tue Aug 30 16:54:42 2011 +0200
Bug 6292 : Followup 2. several letters where generated if a borrower had overdues with different due_date triggering the same level
This patch fixes the SQL request giving the list of borrowers
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 1be4678a57200ba895b73e3b3d38f331a9b8cbb4)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit f497930d66b18bcbb6676ca698d5f10c4b32fbcc
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue May 3 12:13:28 2011 +1200
Bug 6292 : Overdue notices not being generated when borrower had an overdue older than the max value of the notice triggers
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
(cherry picked from commit 410975a7f777123d255854ecf3d31541b86ff848)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 7d9ca3f1e450f75f6f85ee80f09d22089c82a87b
Author: Sophie Meynieux <sophie.meynieux at biblibre.com>
Date: Fri Aug 12 16:04:13 2011 +0200
Bug 6292 followup
selection of items to be listed in an overdue notice included
both limits (upper and lower). So items with an overdue equal
to a limit appeared on both notices. This patch fix this,
including lower limit and excluding upper limit for the selection.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
(cherry picked from commit d86d62adba7f898db26dc58e909f2b91db3248b0)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit da99978777281452b16551ee10e7c86d1578337f
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date: Thu Oct 13 16:57:41 2011 +1300
bug_2830: Remove reserve when checking out if the borrower is not the first one in the reserve queue
To test:
Create 4 holds on a bib, for patrons A, B, C, and D,
Check in the item to mark hold as waiting for patron A
Check out the item to patron B -> reserve for patron B should be removed
Check in the item to mark hold as waiting for patron A
Check out the item to Patron A, hold should complete normally
Check in the item to mark hold as waiting for patron C
Check out the item to patron D -> reserve for patron D should be removed.
Check in the item to mark hold as waiting for patron C
Check out the item to patron C, hold should complete normally
Check in the item -> there should be no more reserves.
We also tested:
Created 4 holds on a bib with two items, for patrons A, B, C, and D
All worked as expected.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 6e07fd7b004b5cb16ea0bec764993c1e9ffe153c)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit b5fddf5ceef15b56bbfd83c93da39d567a9a36b5
Author: Duncan Tyler <duncan at catalyst.net.nz>
Date: Thu Dec 15 13:51:21 2011 +1300
Bug 7361 Fix default option in encoding dropdown
http://bugs.koha-community.org/show_bug.cgi?id=7361
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
This patch changes the pull down for encodings in staged marc import.
Before patch:
- Character encoding preselected was 'Default'
- 'Default' broke diacritics in utf-8 encoded files and was reported
to not work correctly
- Selecting 'UTF-8' from the drop down worked
After patch:
- Character encoding preselected is 'UTF-8 (Default)'
- There is no longer a 'Default' option and no separate 'UTF-8'
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 86d6e6d3de0a8d935802abe843f7ec407af1c759)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 7e34d437cc884166cd8f6be5615bb48381341d4a
Author: Adrien Saurat <adrien.saurat at biblibre.com>
Date: Tue Dec 13 16:01:45 2011 +0100
Bug 7349: corrects sort order for Patron search
Sorting by cardnumber now works (removed a client-side
sort, the server-side sort is enough).
Signed-off-by: Koustubha Kale <kmkale at anantcorp.com>
1) Verified that before applying this patch, when searching patrons with cardnumber as order by preference, patrons are sorted ny name.
2) Verified that after applying this patch, when searching with cardnumber as order by preference, patrons are correctly sorted by cardnumber.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 1de55f6f088f174431896d33fbe6d94152921758)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 4e64d147002ce4e463985ac2253ce9a6c76875cf
Author: Duncan Tyler <duncan at catalyst.net.nz>
Date: Wed Dec 14 16:42:30 2011 +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 at web.de>
Test requires a database installed using the sample data.
All tests pass.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 3ae23cd6cf97ffbab6080f255e942f2ba73dcd07)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit c183f0a661a893390c2cf1b3dab80d88d3c52690
Author: Frère Sébastien Marie <semarie-koha at latrappe.fr>
Date: Thu Dec 1 19:02:11 2011 +0100
Bug 7282 - invalid language selection
- ensure that without cookie, language selection is based on browser
preferences
- refactor function to obtain langugage for stem in search (opac + intranet)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
To reproduce the bug:
- Activate en and fr-FR for OPAC
- Clear your browser cookies
- Select your language preference in your browser: fr, fr-fr, en
- Load OPAC main page
- OPAC is displayed in English, rather than French as asked by browser
preferences
Apply the patch and test:
- Clear your browser cookies
- Load OPAC main page
- Pages are displayed in French
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 0ad7e76cb7cebf16310a95377f88047f09b66d24)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 3d0e8cf5064f11a505d0c358ce4d17a437a9f2d3
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Dec 5 09:32:07 2011 -0500
Bug 7319 - Improving title and breadcrumbs on acquisitions Z39.50 search pages
Changing title and breadcrumbs so that they correctly reflect
the curent stage of the process.
To test: Add to an order from an external source. When filling
out the Z39.50 search form the title and breadcrumbs should read
"Order from external sources." After searching they should read
"Order from external sources -> Search results"
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 8a87f15605b23c44a8dac71cd4a3f209add98556)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 7a14823fa34225f672854a0bb3c8fd39116e5d0e
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Tue Dec 6 18:45:33 2011 +0100
Bug 7324: Show alternate email as mailto: / hide labels when field is empty
UPDATE 2011-12-15
Fixed wrong div that broke the patron account display.
Thank you Paul for catching this!
Changes made to the patron detail tab:
- alternate email shows as mailto: link
- labels for following fields only show when field is filled
- initials
- date of birth
- gender
- country (alternate address)
- email (alternate address)
- state (alternative contact)
- country (alternative contact)
- phone (alternative contact)
To test:
1) Add new patron with minimal data and check the labels don't show
2) Change patron to have data in changed fields and check labels show
3) Check all email addresses are shown as mailto: links now
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Verified tests 1-3, looks good to me.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 52dca0f4337b83bff4ff2de457f21b8b7ab70134)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 9ed382a203fc755e09225a518a43102ada2dbf73
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Thu Dec 15 18:37:39 2011 +0100
welcome to Marc Balmer, #167
(cherry picked from commit 42d6b17851626c547481438138ebc592177c4e75)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit a284baee174d55b8b24e48166da47289da55aca7
Author: Marc Balmer <marc at msys.ch>
Date: Sun Dec 11 15:40:55 2011 +0100
Bail out early if an invalid language is used.
Signed-off-by: Marc Balmer <marc at msys.ch>
http://bugs.koha-community.org/show_bug.cgi?id=7346
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit d9f7922ad77406939a5f57a22e9a6474e4c328d3)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 436e55447c137420cfbe98fc962c44ea4577e65d
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Thu Dec 8 07:19:05 2011 +0100
Bug 7334: Improve 'no address stored' and similar messages in patron account
- 'no address stored' is now only displayed when first and second line
of the address are empty
- added id's to all 3 possible messages so people can change or hide
them
To test:
1) Check 'no address stored' shows only up when address fields are both
empty
2) Check address is still correctly displayed
Note: make sure you check the 'checkouts' and other tabs, because there
are 2 different include files used here.
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
I confirm the bug and the solution. Text messages identification for
customization with JavaScript is a plus.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit ac139f8f63c87123aa6ba50759eed44f0016d81b)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 3a42ff5d671b933c651936d76e685da296d95c80
Author: Liz Rea <wizzyrea at gmail.com>
Date: Wed Dec 7 16:32:11 2011 -0600
Bug 7333 - modifying Members.t to use a branchcode that exists in the sample data
To test:
Create a fresh koha db with all of the sample data (if you have one that has the sample branches in it, that will work too)
run the test: prove t/db_dependent/Members.t
All subtests should complete.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
All tests complete successfully with my database created from
sample data and with the database provided on the bug.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit b955692c8494a81d46a72efaca9385f980cfd1b1)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 7d2b4a835fc47d885d3af337fd25b7bceed18ae7
Author: Duncan Tyler <duncan at duncan-SoT.wgtn.cat-it.co.nz>
Date: Thu Dec 8 14:11:43 2011 +1300
Bug 7331 - Circulation.pl generates errors in the log
Fixed error in C4::Dates causing unneeded warnings
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit c2bba3ffc89ffae78635bf271eaccce7c60c22df)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit bedb6bfa961b0d81b829469b29ef33a3fbdb2863
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Dec 7 10:50:06 2011 -0500
Bug 7330 - System preferences editor generates errors in the log with each search
Adding a check for an empty value in a couple of places
which seem to always get one.
As far as I can tell these places in the script are looping
over ALL the data in the pref files, and sometimes an empty
value comes through. I wonder if this is because of a minor
syntax error in the pref file?
My correction is a stab in the dark since I haven't determined
where the empty value is actually coming from. This change
quiets the errors in the log and doesn't seem to affect
preference search results.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
No more messages in the logs. Yay!
Ran unit tests on this (t, xt/author, xt, t/db_dependent)- nothing out of the ordinary in any.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 081790295661662f3d1f22673b1c44eee030fddb)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 5133a9df2118289566e6a361eededf4de9415c18
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Tue Dec 6 19:12:04 2011 -0500
Bug 7326: longoverdue.pl hardcoded to 366 days maximum
Adds --maxdays command line flag to longoverdue.pl to allow the user to specify
their own $endrange value. Because sometimes 366 isn't enough!
Also adds help documentation for both --quiet and --maxdays params
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Simple change, works well
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 1f5f4981c098a7aa2a4323107dd98379a52a4c6e)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit ab27da89a9707558f40c3ea38e66da7043f6da80
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Dec 6 16:03:31 2011 -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 at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 17df078261b9054b45f87c42f34d9a9e82fba138)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit bd13bb32d88036c867a315ba2d25112dc08457e0
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Dec 6 11:43:10 2011 -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 at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 2cfb3398cf567c72473a98224a2cb0387e1f7fea)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit d3bac2e323a08f31426c768ebd237feb6e4c963b
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Dec 5 21:52:44 2011 +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 at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit d831a03fdefc56b5462df08cbe626887291c01c8)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit e50d6e28150286023e28bdc75f33d7d215086a17
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Dec 3 09:55:44 2011 +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 at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 8374ecbcd68fc0f6f9bc13ed7b45448920490bba)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 2f95419c362d17cd4df30df11d6aabc1aaabc824
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Thu Dec 15 16:14:35 2011 +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 at gmail.com>
commit 9741b6331458e66c97e357e565b793d23815a894
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Thu Dec 15 16:11:47 2011 +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 at gmail.com>
commit caf02e8dca65de45bd9e761fc6e1ab8a0cf32177
Author: Duncan Tyler <duncan at catalyst.net.nz>
Date: Wed Dec 14 16:42:30 2011 +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 at web.de>
Test requires a database installed using the sample data.
All tests pass.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 06c822c37ce91e5936542990d7e3299e14271bd3)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 31efcea6ca5e07dba7a522cf6d11d9c8f6262c4f
Author: Chris Hall <chrish at catalyst.net.nz>
Date: Thu Dec 8 09:34:36 2011 +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 at web.de>
Test passes.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 64a9c641003f865690956436e27d2a71d9044f1f)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 261b6a09d098d14fe77a8a6c340de43c155e22b9
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Thu Dec 15 13:45:21 2011 +0100
welcome to Duncan Tyler, developer 166 !
(cherry picked from commit e60e1cba00ae406942ecdfb6975dd30242420480)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit c8f04b8e7b95f07db79d134d21a9ead5a6c02d7b
Author: Chris Hall <chrish at catalyst.net.nz>
Date: Thu Dec 8 09:34:36 2011 +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 at web.de>
Test passes.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit dfa4b73737ff32b10fd01fb53937b137d898c770)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit eb8f99c37938bc2106843e589f3cce80602a33b8
Author: Chris Hall <chrish at catalyst.net.nz>
Date: Fri Dec 9 11:04:19 2011 +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 at web.de>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 18bb9c22100ba810944a1341a891bc5b2e765255)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit fc2a6415a9185f52f63521376123ff7d5ccf82bc
Author: Duncan Tyler <duncan at duncan-SoT.wgtn.cat-it.co.nz>
Date: Fri Dec 9 10:19:14 2011 +1300
Added unit tests for Scrubber
http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Test passes.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 47b514cf565f5eaccbefd256f24f82f38b5b4765)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit b418a166235d2a78237c214cffb7f59ec7ecccbd
Author: Duncan Tyler <duncan at duncan-SoT.wgtn.cat-it.co.nz>
Date: Fri Dec 9 08:52:34 2011 +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 at web.de>
Test passes.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit bb79d37b8754114ec670b5806150b61340b99e7c)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 3aa19f21868644b9989031ff06a22134064b5842
Author: Duncan Tyler <duncan at duncan-SoT.wgtn.cat-it.co.nz>
Date: Thu Dec 8 14:38:28 2011 +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 at web.de>
Test passes.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 7876d4fa8dcc67ec54448edb7c4cd9d454dcf52a)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 8 +-
C4/AuthoritiesMarc.pm | 13 +-
C4/Circulation.pm | 42 +--
C4/Context.pm | 43 +++-
C4/Dates.pm | 2 +-
C4/ILSDI/Utility.pm | 54 +---
C4/Items.pm | 2 +-
C4/Koha.pm | 3 +-
C4/Letters.pm | 8 +-
C4/Print.pm | 10 +-
C4/Reserves.pm | 67 +++-
C4/Review.pm | 23 ++-
C4/Search.pm | 4 +-
C4/Templates.pm | 54 ++--
C4/VirtualShelves/Page.pm | 4 +-
C4/XSLT.pm | 4 +-
.../Template/Plugin/KohaDates.pm | 27 +-
acqui/ordered.pl | 109 ++++++
acqui/orderreceive.pl | 15 +-
acqui/spent.pl | 112 ++++++
admin/preferences.pl | 3 +-
catalogue/ISBDdetail.pl | 4 +-
catalogue/MARCdetail.pl | 1 +
catalogue/detail.pl | 1 +
catalogue/search.pl | 16 +-
cataloguing/additem.pl | 44 ++--
circ/circulation.pl | 2 +-
docs/history.txt | 2 +
etc/koha-httpd.conf | 4 +
etc/zebradb/marc_defs/marc21/biblios/record.abs | 16 +-
installer/InstallAuth.pm | 21 +-
installer/data/mysql/kohastructure.sql | 3 +-
installer/data/mysql/updatedatabase.pl | 15 +-
.../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 6 +-
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 20 +-
.../intranet-tmpl/prog/en/includes/circ-menu.tt | 21 +-
.../prog/en/modules/acqui/acqui-home.tt | 8 +-
.../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 91 +++++
.../prog/en/modules/acqui/orderreceive.tt | 4 +-
.../intranet-tmpl/prog/en/modules/acqui/spent.tt | 107 ++++++
.../prog/en/modules/acqui/z3950_search.tt | 8 +-
.../prog/en/modules/admin/preferences/patrons.pref | 6 +-
.../prog/en/modules/catalogue/ISBDdetail.tt | 5 +-
.../prog/en/modules/catalogue/MARCdetail.tt | 4 +
.../prog/en/modules/catalogue/detail.tt | 5 +
.../prog/en/modules/catalogue/results.tt | 10 +-
.../prog/en/modules/members/member.tt | 10 -
.../prog/en/modules/members/moremember.tt | 19 +-
.../prog/en/modules/reports/itemtypes.tt | 38 ++-
.../prog/en/modules/reviews/reviewswaiting.tt | 35 +--
.../prog/en/modules/tools/stage-marc-import.tt | 2 +-
.../prog/en/modules/virtualshelves/shelves.tt | 4 +-
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 12 +-
.../prog/en/xslt/UNIMARCslim2OAIDC.xsl | 356 ++++++++++----------
koha-tmpl/opac-tmpl/prog/en/includes/calendar.inc | 62 ++++-
.../opac-tmpl/prog/en/modules/opac-opensearch.tt | 20 +-
.../opac-tmpl/prog/en/modules/opac-shelves.tt | 26 +-
.../prog/en/xslt/MARC21slim2OPACDetail.xsl | 8 +-
kohaversion.pl | 2 +-
misc/cronjobs/longoverdue.pl | 9 +-
misc/cronjobs/overdue_notices.pl | 20 +-
misc/translator/translate | 4 +
opac/opac-detail.pl | 28 +-
opac/opac-search.pl | 2 +-
opac/opac-user.pl | 2 +-
reports/itemtypes.plugin | 20 +-
reviews/reviewswaiting.pl | 17 +-
t/00-checkdatabase-version.t | 55 +++
t/AuthoritiesMarc_UNIMARC.t | 4 +-
t/Boolean.t | 3 +-
t/SIP_ILS.t | 16 -
t/SIP_Sip.t | 18 +-
t/Scrubber.t | 24 ++-
t/db_dependent/Members.t | 2 +-
t/db_dependent/Reserves.t | 6 +-
t/db_dependent/SIP_ILS.t | 29 ++
t/db_dependent/Search.t | 2 +-
t/db_dependent/lib/KohaTest/Reserves.pm | 1 +
78 files changed, 1306 insertions(+), 581 deletions(-)
copy misc/cronjobs/holds/cancel_expired_holds.pl => Koha/Template/Plugin/KohaDates.pm (68%)
mode change 100755 => 100644
create mode 100755 acqui/ordered.pl
create mode 100755 acqui/spent.pl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
create mode 100644 t/00-checkdatabase-version.t
delete mode 100755 t/SIP_ILS.t
create mode 100755 t/db_dependent/SIP_ILS.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list