Commit graph

13605 commits

Author SHA1 Message Date
Chris Cormack
dbf6bd4be0 Merge remote branch 'kc/master' into new/enh/bug_5917 2011-03-22 15:06:44 +13:00
Jared Camins-Esakov
0a1f05a5a2 Bug 5390: OPAC loses library selection
This patch ensures that the OPAC library selection masthead will always default
to the branch that is currently being searched. This only applies to systems
with multiple branches and OpacAddMastheadLibraryPulldown turned on.

To test: do a search in the OPAC, limiting by branch. The search results will
still have that branch selected in the masthead dropdown.

This patch also fixes bug 5852 and bug 3778.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-22 14:59:16 +13:00
Chris Cormack
bbdaaec7a5 Merge remote branch 'kc/master' into new/enh/bug_5917 2011-03-22 06:59:55 +13:00
Jared Camins-Esakov
c5ba37bb9a Remove errant Makefile and pm_to_blib from repo
Makefile and pm_to_blib were added to the git repository by commit
ddbedbfc2f. Having those files in the repository
causes problems with updating to Master in dev-mode installs. This patch removes
those two files, since they shouldn't be tracked anyway.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-22 06:59:04 +13:00
Chris Cormack
514f84a6ac Merge remote branch 'kc/master' into new/enh/bug_5917 2011-03-21 21:08:42 +13:00
Jared Camins-Esakov
e158f86d20 Bug 5610: Add --since for setting messaging to default
It is now possible to specify a command line argument --since so that the
borrowers-force-messaging-defaults script only changes patrons created starting
on a certain day. If the optional argument is not specified, the script applies
to all borrowers.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 21:07:09 +13:00
662175571e Bug 5610 Script to force borr transport defaults messaging
If the EnhancedMessagingPreferences syspref is enabled after borrowers
have been created in the DB, those borrowers won't have messaging
transport preferences default values as defined for their borrower
category, even no transport preferences at all. So you would have to
modify each borrower one by one if you would like to send them 'Hold
Filled' notice for example.

I propose this script to create transport preferences for all existing
borrowers and set them to default values defined for the category they
belong to.

[DOC] Should be documented somewhere.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 21:07:05 +13:00
Chris Cormack
01f7ea0d28 Merge remote branch 'kc/master' into new/enh/bug_5917 2011-03-21 20:51:47 +13:00
Katrin Fischer
e1654e1aa1 Bug 5834: Holds link missing when 942$c is not for loan
Adds a check for item-level_itypes system preference. Note that this only
applies to the search results screens.

To test:
1) Set item-level_itypes to 'specific item'
2) Create record and set 942$c to an itype that is marked not for loan
3) Create item with itype not marked 'not for loan'
Current behaviour: Holds link is not shown, sys pref setting doesn't matter

After patch: Holds link is shown
- when item-level_itype is 'specific item'
- when item-level_itype is 'biblio record' and 942$c itype is for loan

Holds link is not shown
- when item-level_itype is 'biblio record' and 942$c is not for loan

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 20:49:17 +13:00
Chris Cormack
c2b666eeb0 Bug 5917 : Catching changes from bug 5065 to templates 2011-03-21 20:40:18 +13:00
Chris Cormack
7a71d2c5e8 Merge remote branch 'kc/master' into new/enh/bug_5917 2011-03-21 20:39:05 +13:00
b9cee99da4 Bug 5065 Add ability to choose framework on import
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 20:36:35 +13:00
Chris Cormack
77b6409802 Bug 5917 : Converted templates 2011-03-21 20:02:15 +13:00
Chris Cormack
03890c90ac Merge remote branch 'kc/master' into new/enh/bug_5917
Conflicts:
	installer/data/mysql/en/mandatory/sysprefs.sql
2011-03-21 19:54:11 +13:00
Colin Campbell
5f9bd8a01e Bug 5466 On new orders get currency from vendor
Previous patch for this bug was ignoring vendor currency on
new orders. In most cases should be the default

Changed variable name from cur to active_currency
Clarity is a virtue!

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 16:51:41 +13:00
Savitra Sirohi
589aac1540 Bug 5466 - Acquisitions - ability to set currency in order screens
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 16:51:40 +13:00
Jesse Weaver
6ba6b2e148 Bug 4878 - Command-line tool for getting and setting sysprefs
New script misc/admin/koha-preferences - Allows getting and setting of
sysprefs one-at-a-time or in bulk. More info:

misc/admin/koha-preferences help

or:

misc/admin/koha-preferences manual

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 16:47:02 +13:00
Chris Cormack
c523ae2d64 Adding 2 more developers to the history 137 now! 2011-03-21 16:42:49 +13:00
Salvador Zaragoza Rubio
0499633a6b Bug 5862 - Incompatibility in ajax.js with "localName" for Internet Explorer
It has been detected an incompatibility with Internet Explorer in the ajax.js
file that cause a javascript error for this browser that prevents proper
operation.
The error occurs because the "localName" is not supported by Internet Explorer
and returns "undefined".

Bug 5862 - Incompatibility in ajax.js with "localName" for Internet Explorer

Fix error on comma for IE

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 12:00:36 +13:00
Paul Poulain
01b6e7a6dd Bug 5892 : opac-user: minor spelling/html changes
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 11:58:32 +13:00
Julian Maurice
03a014aded Bug 5893: Removed duplicate entry in sysprefs.sql
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 11:56:34 +13:00
Julian Maurice
632277e453 Bug 5864: link biblio => serials subscription is wrong
The GetSubscription function can be called with 3 parameters : title,
issn, biblionumber.
In biblio view (both opac & staff interface), the link to jump from the
biblio to the subscription(s) was done using title.

The result was that for a title like "Science", all subscriptions
containing "science" in the title were linked.
That's too much and that's false.

This commit fixes this problem by calling GetSubscription with
biblionumber only where applicable.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 11:54:21 +13:00
Paul Poulain
ddbedbfc2f Bug 4330 : Adding some copyright BibLibre statements 2011-03-21 10:57:20 +13:00
Paul Poulain
528cfd918c Bug 4330 : Fixing copyright and removing unconditional warn chris c mail 2010-12-16 on patches ML 2011-03-21 10:44:42 +13:00
Paul Poulain
04869d0fd0 Bug 4330 : fixing copyright mail from chris c 2010-12-16 on patches ML 2011-03-21 10:39:06 +13:00
975aea1372 Bug 3735: Wrong search results for a few fields in ccl.properties
This patch corrects a syntax error in the definition of bath attributes in
ccl.properties. In particular, it adds the search prefixes 'isbn', 'issn',
'name', and 'notes'. In order to make use of this patch, ccl.properties must be
updated.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 11:17:24 +13:00
1b57668d7e 5622: Improve display of MARC21 773 field in XSLT detail view
Applies change to OPAC and staff detail view.
Chops punctuation. Adds 773g. Strips MARC org code from URL.
Utils code is used as basis for patches #5662 and #5663 too.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 11:05:11 +13:00
Colin Campbell
7f0a326da5 Bug 5890 Correct Mismatched operator in comparison
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 10:47:52 +13:00
Chris Cormack
1a5270bdd0 Merge remote branch 'kc/new/enh/bug_5848' into kcmaster 2011-03-18 10:46:01 +13:00
Julian Maurice
465ff64825 Bug 5848: Remove duplicated tabs in opac details for Unimarc
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 10:45:22 +13:00
Chris Cormack
b61afbee79 Merge remote branch 'kc/new/bug_5879' into kcmaster 2011-03-18 10:38:56 +13:00
Chris Cormack
2ea6fdec15 Merge remote branch 'kc/new/bug_4218' into kcmaster 2011-03-18 10:38:40 +13:00
4b1fe1c9c3 Follow-up fix for Bug 4218 - Staff client detail page doesn't show hold status
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 10:38:07 +13:00
Paul Poulain
620ae78f84 Bug 5879 : Biblio.pm : fix isbd syspref and default location
- the systempreference is isbd, not ISBD
- when preparing the ItemRecord (for acq or serials recieving), there was no default value calculated for location. Fixing that

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 10:35:02 +13:00
Sophie Meynieux
6282f652b2 Bug 5889: Messages name in english for notifications on public interface.
Modification of template to allow multilanguage support. Alsa fixing columns
overflow.

BibLibre bug #5939

Tests: It works. Messages strings can now be extracted and placed in .po file
for translation.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 09:25:08 +13:00
1411a92936 Bug 5646: Translated sql files break messaging
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 09:18:57 +13:00
Paul Poulain
e28e34fbbb Bug 5882 : catalogue/moredetails (minor) changes
MT3288 moredetail.tmpl Lost and Damaged first choice is empty

    First choice was the first value of the authorised value list
    This is not handy for users.
    Rather than showing the first value, inserting a new empty value for users to see what to do

Term "Total Renewals" misleading, change to "Current Renewals"

    In koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl under History,
    there's a Total Renewals entry: seems to indicate a cumulative count of renewals on
    the item, which it is not, contrary to "Total Issues" just below.
    Moved the line up outside "history", and renamed it "Current Renewals".

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 09:15:21 +13:00
Julian Maurice
b1e3b6753e Follow up for bug 5880: Improved unit test
The unit test Koha.t now skip tests of the two subroutines if the insert
query failed.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 09:10:43 +13:00
Julian Maurice
1eb9d9e581 Follow up for bug 5880: Added unit tests for the two new subroutines
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 09:10:40 +13:00
Paul Poulain
d057f65743 Bug 5880 : C4/Koha.pm : adding two functions GetAutorisedValueByCode and GetKohaImageurlFromAuthorisedValues
just for convenience

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:44:38 +13:00
Chris Cormack
c78387b7d0 Merge remote branch 'kc/new/enh/bug_5869' into kcmaster 2011-03-17 14:37:00 +13:00
Katrin Fischer
15126b1108 Bug 5861: items.stocknumber not saved correctly
The field was missing in Items.pm.
It will still act strangely if you enter a stocknumber that
already exists in the database. (see Bug 5860)
Adding/editing items with stocknumbers you have not used before
should work as expected.

[F. Demians] Was able to reproduce the bug on an UNIMARC DB. The patch works.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:36:26 +13:00
Nicole C. Engard
3141202764 Follow Up Bug 5869 Update Report Page Title
The title said Checkout Stats - updated to say Holds Stats

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:33:13 +13:00
Nicole C. Engard
e05bb4ef85 Follow Up Bug 5869 Fix String Errors
This patch fixes all occurences of 'reserves' to 'holds.' It also
added Holds to the menu include and updates capitalization and spacing.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:33:11 +13:00
Chris Cormack
2b1de0948d Bug 5869 - Follow up patch, fixing copyring and s/reserves/holds/
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:33:09 +13:00
Paul Poulain
99b0a074eb Bug 5869 : Adding a reserve report
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:33:08 +13:00
Colin Campbell
5f7b1a58f0 Bug 5485: Add script to run Test::Perl::Critic
Tests are run if TEST_QA environment variable is set
and Test::Perl::Critic is installed
e.g.
TEST_QA=1 prove =l t/00-testcritic.t

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 12:35:58 +13:00
Jared Camins-Esakov
de4619b849 Bug 5816: XSLT doesn't display enhanced contents
This patch corrects and standardizes the display of enhanced contents (MARC 505
with ind2='0').

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 12:32:41 +13:00
6b0a84c26d Bug 5863: Add to Your Cart disappeared if login disabled on opac detail
Resolving an error in ready function by additional conditionals.
Moving a line from ready to html just as in other view templates, correcting the order of menu options at the same time.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 12:28:05 +13:00
Chris Cormack
6f4e7fc971 Merge remote branch 'kc/new/bug_3326' into kcmaster 2011-03-17 09:22:46 +13:00