[koha-commits] main Koha release repository branch 3.6.x updated. v3.06.00-32-g604216a
Git repo owner
gitmaster at git.koha-community.org
Wed Nov 16 14:50:48 CET 2011
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 604216acf6f173d7576a47395aceeebc87b0d493 (commit)
via 05f1a92c21fbce96dedc7ba3706d738561f426c0 (commit)
via 9aba4077c217093436f732c676c066ab9dc8b16b (commit)
via 9e5da38f7cc5958d825d730f1db602c5f34b8220 (commit)
via 0f2500bd59100a3f6322f16b3e1e6ec4d8a49860 (commit)
via 093d5bb24de6d9a8bd47da9f5c42ccbcdac4fe0d (commit)
via b207487bbb4d5bdc9d70c78101a8558677268b85 (commit)
via 01c462ff28c6f3ae27118dd3074c171ddbed6dc4 (commit)
via 598c008fa3155645059800d01d72458733ecd5fe (commit)
via edcbd0cde07d496ceb7b01e60ee7f21995b37274 (commit)
via a6b7a1432ab6339d0589f8104da2d7ebb21cea85 (commit)
via 73139544c87b6dc16dba7a0e15659c8a6c4eeb2f (commit)
via 916e103dfc56b28b7111f8099e96106a95e8e487 (commit)
via fe0afd350654000eec0a67b82893c2e6cc4d99df (commit)
via 99147d26033d2fbd4f7e265f6f1074d7c928ce3a (commit)
via cf9fca42c38f165c0ee43637ce34b971bd59414c (commit)
via 5c2398c005548ebe3dbbc0b1f54863b9ff30e8b4 (commit)
via 7622bedd306ea4424ada3614c79e94fa8b827666 (commit)
via 224d0ca8190f86c6ceb68a9d263124cc9fcdce91 (commit)
via ca21067cb4adace7e494a30e2f5ea1b058ddb2e5 (commit)
via 9452c84a9a3df786233dfad3ff7df912d3bfdf82 (commit)
via 0ec00cd1cbcad11a7860e031bfd21bc90794373d (commit)
via da2dfd0dce1975c4b5451113af607ebce7d1c8e8 (commit)
via d6e27f5cee7c016ee09662d441d922b89a1c6174 (commit)
via 12070db7d8c4e2878665345f2139ae9793964fc7 (commit)
via 2f36d9b45f26a7032c4a43a8324545123b4542fb (commit)
via f9af3fc79bbbfb2cd6fa71052ea1de44f1da456f (commit)
via 6eb4a7f5831ca63ebee8b9756b8db8e7137051af (commit)
via 75586d7ea73626705724623973c1e1aa222a6e6f (commit)
via b8c840734f24a88a41267d7ff336bcbe20cb570a (commit)
via 3024ac0b41794016362c552844260b232334dd1e (commit)
via 6a0be282843a89dd3e3bc44c768f9b22e64e3bcf (commit)
from 52c666edce4261a1acafaa34b2c8a2431589ac0c (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 604216acf6f173d7576a47395aceeebc87b0d493
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Fri Nov 4 06:26:01 2011 -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 at biblibre.com>
(cherry picked from commit c3abbedebedd34948b664a4d2a6b34dc4863802d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 05f1a92c21fbce96dedc7ba3706d738561f426c0
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Thu Nov 3 00:44:36 2011 +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 at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 7a3dc5102e82bbb4c0c8487a0f128c20d4fe8248)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 9aba4077c217093436f732c676c066ab9dc8b16b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Mon Oct 31 20:57:19 2011 +1300
Bug 6679: Fixing admin/aqplain :encoding(UTF-8) gives strict validation
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
tested with diacritics, no changes before and after the patch
(cherry picked from commit ee0627f20bee5df234ab284d1fdacebb857de57f)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 9e5da38f7cc5958d825d730f1db602c5f34b8220
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Wed Nov 2 16:27:48 2011 +1300
Bug 6679 : Tidying changed parts of file
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 3b0474950c791bbf0367f6c819203180205f7aa8)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 0f2500bd59100a3f6322f16b3e1e6ec4d8a49860
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Wed Nov 2 16:24:05 2011 +1300
Bug 6679 : Don't declare variables in conditionals
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 21e4d79be8b0a7204dd592528e20f5b8e29553ee)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 093d5bb24de6d9a8bd47da9f5c42ccbcdac4fe0d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Wed Nov 2 16:19:36 2011 +1300
Bug 6679 : Not using strict .. bad script, no cookie for you!
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit e8ea58270dc08aac8c1eaccc59e17d96daf56860)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit b207487bbb4d5bdc9d70c78101a8558677268b85
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Wed Nov 2 16:13:20 2011 +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 at biblibre.com>
(cherry picked from commit 607b5449bd5cb79dd8964e46bb970c3975497969)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 01c462ff28c6f3ae27118dd3074c171ddbed6dc4
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Wed Nov 2 16:00:01 2011 +1300
Bug 6679 : Declare variables outside of conditionals
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 6bb73a04c4c67e5b14eb209ec56ae6585547c593)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 598c008fa3155645059800d01d72458733ecd5fe
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Tue Oct 18 16:13:15 2011 -0400
Bug 6390 Followup: Basket's authorisedby might not be a borrowernumber
aqbasket.authorisedby is not foreign key constrainted to borrowers.borrowernumber,
so if it's anything other than that, vendor search breaks by using an undefined value
(GetMember() on an invalid borrowernumber) as a HASH ref.
This patch sets the branchcode (the desired value from GetMember) to a blank value, then only
changes it if GetMember is defined. In the case where the authorisedby librarian has been deleted,
or the value is otherwise invalid, and AcqViewBaskets is set to 'branch', the basket will not appear
except to superlibrarians
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Invalid borrowernumber in aqbasket.authorisedby no longer breaks search.
(cherry picked from commit 58bdfdb08883eb52777321f883491eaff1493857)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit edcbd0cde07d496ceb7b01e60ee7f21995b37274
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Sat Sep 17 00:58:41 2011 +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 at gmail.com>
commit a6b7a1432ab6339d0589f8104da2d7ebb21cea85
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Sun Nov 6 14:14:40 2011 +0530
Bug 7185: Fix updatedatabase message for 3.6.0 release
Signed-off-by: François Charbonnier <francois.charbonnier at biblibre.com>
(cherry picked from commit e228f233e4638fdbeb77495fafb8453045d43302)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 73139544c87b6dc16dba7a0e15659c8a6c4eeb2f
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Sun Nov 6 09:36:52 2011 +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 at gmail.com>
commit 916e103dfc56b28b7111f8099e96106a95e8e487
Author: Liz Rea <lrea at nekls.org>
Date: Tue Nov 1 14:01:17 2011 -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 at 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 at myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 4ccb8649f88abaf9012f1bbec06fc840046cb7ff)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit fe0afd350654000eec0a67b82893c2e6cc4d99df
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Oct 24 20:59:57 2011 +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 at nekls.org>
Verified A and B.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 488f4be86537211214ede7e0e703128c0cc4c92f)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 99147d26033d2fbd4f7e265f6f1074d7c928ce3a
Author: Frédérick Capovilla <frederick.capovilla at libeo.com>
Date: Wed Oct 5 15:12:04 2011 -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 at myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
works perfectly with date formatted DD/MM/YYYY as well
(cherry picked from commit e676e117fccfaa8208742c17a08cb92056286f95)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit cf9fca42c38f165c0ee43637ce34b971bd59414c
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Tue Sep 20 09:22:46 2011 -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 at bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 0ea8ff7c4c81c183ba8da64d7939b041c7de8301)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 5c2398c005548ebe3dbbc0b1f54863b9ff30e8b4
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Oct 25 10:16:02 2011 -0400
Fix for Bug 7085 - Problems with searching for orders in acquisitions
Changing "if ( defined $input )" to "if ( $input )" in the section
of the script which builds the order search query seems to give
successful searches where they didn't exist before. Searches from
the advanced order search screen work with title, author, vendor,
basket number, date, etc.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Searches for date ranges, title and author keywords give
me the correct results now.
(cherry picked from commit 0c0ddf92113b4a5df6833f75ba5b7ad7527c5f48)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 7622bedd306ea4424ada3614c79e94fa8b827666
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Oct 31 01:06:17 2011 +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 at biblibre.com>
(cherry picked from commit e660cef0e2f0ab4a64f8f1b4b0b4ad612255c03b)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 224d0ca8190f86c6ceb68a9d263124cc9fcdce91
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Nov 3 13:41:24 2011 +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 at biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 7ee0565f5ce75fac16de2dc06c170bc06a171e56)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit ca21067cb4adace7e494a30e2f5ea1b058ddb2e5
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Nov 4 14:56:50 2011 -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 at gmail.com>
commit 9452c84a9a3df786233dfad3ff7df912d3bfdf82
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Tue Oct 18 20:17:17 2011 -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 at bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 36d8e5df96d17df3d19a4693fff2ba52504fae51)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 0ec00cd1cbcad11a7860e031bfd21bc90794373d
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Sat Oct 8 15:30:59 2011 +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 at bagno.be>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit d998166ea30e9d798c97d457afe39c748eed38ae)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit da2dfd0dce1975c4b5451113af607ebce7d1c8e8
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Wed Dec 15 14:05:04 2010 +0100
Bug 5885 : UNIMARC XSLT changes
dealing with some BNF/SUDOC invalid utf-8 (in title, the removed fields are used to mark non-sorted words)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
I can't test this works ok for UNIMARC, but it does not cause any
problems with the translation scripts or MARC21 so signing off
(cherry picked from commit cc6c1acb38b8797f71f37ebfd7b26ebcac6806ef)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit d6e27f5cee7c016ee09662d441d922b89a1c6174
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Fri Oct 21 11:43:17 2011 -0400
Bug 7076: Lists render OPAC XSLT on staff side
Adds a small check in C4::VirtualShelves::Page::shelfpage to only render
OPACResultsXSLT if the $type is 'opac'. Since parsing the XML is such an expensive
thing, and the resulting XSLTBloc is not used on the staff side, this will increase
performance for Lists in the intranet
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit a0a9368beccd1748e720966f25869259a30e68f2)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 12070db7d8c4e2878665345f2139ae9793964fc7
Author: Frédérick Capovilla <frederick.capovilla at libeo.com>
Date: Mon Oct 17 16:01:29 2011 -0400
Follow-up patch : use the subfield associated with items.barcode
Instead of using the 'p' subfield directly, use the subfield letter
associated with the items.barcode column.
http://bugs.koha-community.org/show_bug.cgi?id=6963
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Test cases tested:
- 1 item, barcode empty
- 2 items, barcodes both empty
- 1 item, existing barcode
- 1 item, new barcode
- 2 items, one barcode empty, one existing
All test cases worked nicely and gave correct error messages.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 61e1eeee84083f835a85d43128f4b6cbeef636dd)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 2f36d9b45f26a7032c4a43a8324545123b4542fb
Author: Frédérick Capovilla <frederick.capovilla at libeo.com>
Date: Mon Oct 3 15:00:05 2011 -0400
Bug 6963: Corrects a problem when a new order is created with a duplicate barcode.
If the AcqCreateItem preference is set to "ordering" and the barcode for
the new item is already in use, no error is returned, but an invalid
itemnumber is saved in the aqorders_items table and the item is never
created.
This patch adds a duplicate barcode verification in neworderempty.pl
_koha_add_item is also modified so it won't return an invalid ID when
an item can't be added.
http://bugs.koha-community.org/show_bug.cgi?id=6963
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Test plan on second patch.
(cherry picked from commit 327be442bd6e63e5ff8c0a5e2461ae836e8deffb)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit f9af3fc79bbbfb2cd6fa71052ea1de44f1da456f
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Wed Oct 5 16:39:08 2011 +1300
Bug 6895 : First attempt at fixing the diacritics bug
This is a fairly hacky solution, a counter patch would be more than
welcome
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Updated, translated and installed German po files after applying this patch.
No problems found.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit afaf7eaffa2b7e18675eb5d5a9fdd00fd31c5685)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 6eb4a7f5831ca63ebee8b9756b8db8e7137051af
Author: Maxime Pelletier <maxime.pelletier at libeo.com>
Date: Wed Oct 19 15:28:16 2011 -0400
Bug 7069: Put strings in "" instead of '' to fix the javascript not working when the translated string has a ' in it.
http://bugs.koha-community.org/show_bug.cgi?id=7069
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Patch changes '' to "" to make it work for strings which contain '.
Patch does NOT add new strings to the po files.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 7ff9d9d03cc0efd07a8667b093927af4a9c3fb29)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 75586d7ea73626705724623973c1e1aa222a6e6f
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Oct 3 08:59:18 2011 -0400
Fix for Bug 6955, Toolbar on reading history broken
Table sorter script causes error if there is no <tbody> to sort.
JS errors cause the YUI toolbar js to abort, causing the problem
observed. When there are no results the whole table should be
omitted and a message displayed in its place.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
To test:
- check toolbar on top of patron reading history with no entries
- check toolbar on top of patron reading history after a few checkouts
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 54226b60f3e31ba52d6be88eeebcaf534ada296f)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit b8c840734f24a88a41267d7ff336bcbe20cb570a
Author: Maxime Pelletier <maxime.pelletier at libeo.com>
Date: Wed Sep 21 14:15:39 2011 -0400
Use unitprice in neworder so that the value is saved in the database and so it will be the same field used as to receive shipments
http://bugs.koha-community.org/show_bug.cgi?id=6414
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed off with a note: this doesn't fix everything mentioned in the bug.
It also might clash with bug 4831 and should be tested with that patch.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 0faf91c591cf8bd02f5e70cc14caeb5257f4d1c5)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 3024ac0b41794016362c552844260b232334dd1e
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Fri Nov 4 19:46:45 2011 +1300
Sorry pushed this by mistake when trying to fix Pauls permissions
Revert "Fix for Bug 5974 - Bogus auth check for "StaffMember" role"
This reverts commit a867bfcff7201a7fa3b56bee4dd484a49ece35e3.
(cherry picked from commit 7a82e508f020aed3691222e08695a0f7cfd86b48)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 6a0be282843a89dd3e3bc44c768f9b22e64e3bcf
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Mar 28 14:08:00 2011 -0400
Fix for Bug 5974 - Bogus auth check for "StaffMember" role
Also removing some YAHOO.widget.Button declarations which
are redundant.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit a867bfcff7201a7fa3b56bee4dd484a49ece35e3)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 12 +-
C4/Biblio.pm | 18 ++-
C4/Category.pm | 13 +-
C4/Context.pm | 9 +-
C4/Items.pm | 8 +-
C4/SQLHelper.pm | 3 -
C4/VirtualShelves/Page.pm | 2 +-
acqui/basketgroup.pl | 2 +-
acqui/booksellers.pl | 6 +-
.../check_duplicate_barcode_ajax.pl | 44 ++++---
acqui/neworderbiblio.pl | 18 +++-
acqui/neworderempty.pl | 5 +
admin/aqplan.pl | 2 +-
cataloguing/value_builder/dateaccessioned.pl | 4 +-
cataloguing/value_builder/macles.pl | 123 ++++++++++++--------
cataloguing/value_builder/unimarc_field_4XX.pl | 15 ++-
installer/data/mysql/updatedatabase.pl | 2 +-
.../en/includes/acquisitions-add-to-basket.inc | 2 +-
.../prog/en/modules/acqui/neworderempty.tt | 52 ++++++++-
.../prog/en/modules/acqui/supplier.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 2 +-
.../en/modules/cataloguing/value_builder/macles.tt | 2 +-
.../prog/en/modules/circ/view_holdsqueue.tt | 10 ++
.../prog/en/modules/installer/auth.tt | 2 +-
.../prog/en/modules/members/readingrec.tt | 5 +-
.../prog/en/modules/serials/claims.tt | 2 +-
.../intranet-tmpl/prog/en/modules/tags/review.tt | 10 +-
.../prog/en/xslt/UNIMARCslim2intranetDetail.xsl | 2 +-
.../prog/en/xslt/UNIMARCslimUtils.xsl | 8 ++
koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt | 22 ++--
koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 6 +
labels/label-create-pdf.pl | 10 +-
labels/label-create-xml.pl | 27 ++++-
labels/label-edit-batch.pl | 9 +-
labels/label-print.pl | 15 ++-
members/member.pl | 2 +-
misc/translator/xgettext.pl | 2 +-
opac/opac-user.pl | 21 ++++
suggestion/suggestion.pl | 2 +-
39 files changed, 341 insertions(+), 160 deletions(-)
copy tools/upload-file-progress.pl => acqui/check_duplicate_barcode_ajax.pl (51%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list