Commit graph

14272 commits

Author SHA1 Message Date
Colin Campbell
5444413a4f Bug 5415 More consistent returns from SimpleSearch
SimpleSearch returns a 3 element array the first pf which is an error
indication. If an error is returned the other elements are
undefined. If error is undef the other elements are defined
This restores the consistency of the interface as it was before
the addition of zebra

Signed-off-by: Christophe Croullebois <christophe.croullebois@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:52:56 +12:00
Colin Campbell
9210aac8cf Bug 3803 Show ISSN in orderline of basket display
Where an item possesses an ISSN is may be of equal or greater
importance to acquisitions staff as the ISBN so include it in
the display

Sponsered by UNFAO, Rome

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:40:44 +12:00
Srdjan Jankovic
c5762df823 Bug 6024 : Show "Run report" link after sql update as wel
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:33:43 +12:00
Srdjan Jankovic
b390c657b8 Bug 6024 : add "Run report" link on the new report creation success page
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:29:58 +12:00
Katrin Fischer
44fe3559bb Bug 5895: Translation error in German fast add framework
Fixes description of 952$1.

Signed-off-by: Mark Gavillet <mark.gavillet@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:25:50 +12:00
Alex Arnaud
0b96414ce3 Bug 6095: Add UTF8 encoding in template
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:23:53 +12:00
Chris Cormack
36efd0d4d0 Merge remote branch 'kc/new/bug_5949' into kcmaster 2011-04-08 13:22:54 +12:00
Katrin Fischer
760babcf4c Bug 5949: Hide 'Edit record' link when creating new order
The 'Edit record' link only makes sense, when you want to modify
an order after creating it. Before there is no biblionumber the link
can link to. Patch adds check for existing biblionumber so link is
only shown when there is an existing record to be edited.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:21:29 +12:00
4747f5adb2 Bug 4189 : Searching z39.50 without selecting any servers results in error message
This patch makes z3950_search.pl handle the situation properly, and z3950_search.tmpl
show a proper message instead of a program error. All this, in case the javascript
checks that alert the user (that at least one target has to be chosen)  are by-passed.

Regards
To+

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed small translation problem in javascript alert message.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:19:20 +12:00
Paul Poulain
65c21fa52f Bug 6088: remove Perl warning
caused by use warnings;

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:17:22 +12:00
Paul Poulain
c0ecd7df4f Bug 6072: fixing permission inconsistencies MT5306
In large libraries, some librarian may have permission only
to recieve shipments This patch fixes some permission :
* booksellers page = accessible to anyone that has at least 1 acq permission
* parcels = accessible to anyone with order_recieve
* supplier detail = accessible to anyone that has at least 1 acq permission,
  but modifying accessible only if vendor_manage

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:10:12 +12:00
bd4bf5485c Fix for Bug 6109, Hey!
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:04:20 +12:00
Chris Cormack
f098258e8c Merge remote branch 'kc/new/bug_4912' into kcmaster 2011-04-08 13:02:55 +12:00
d269389839 Bug 4912: Follow-up fix for Bug 4912, redirect user to correct lists
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 13:01:49 +12:00
Alex Arnaud
913d520be7 Bug #6112 - Missing fields in overdues csv file
Signed-off-by: Christophe Croullebois <christophe.croullebois@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 12:56:57 +12:00
Alex Arnaud
52ff3ca6ec Bug #6107 - Problems when duplicate a patron on memberentry.pl
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 12:23:15 +12:00
Jonathan Druart
6de105084e Bug 6099: error in report pagination when GROUP BY
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 12:15:32 +12:00
Paul Poulain
b67375b3d2 Bug 5903 : French authorised values fixed
country codes must be in capital letters

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 12:07:40 +12:00
Paul Poulain
f0de62e4cc Bug 5275: enable switching back to default biblio framework
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 12:05:23 +12:00
a079522f54 Fix for Bug 6114 - Conflicting warnings about Koha to MARC links
Removing incorrect message from marc_subfields_structure.tmpl and
moving the correct message from marctagstucture.tmpl into its place.

Also correcting the help file for marc_subfields_structure.mpl

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 11:35:18 +12:00
Stéphane Delaune
a59b1d23bb Fix for Bug 6037, Invalid markup, missing breadcrumbs on Keyword to MARC Mapping page
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 11:32:32 +12:00
Chris Cormack
7d63594b81 Merge remote branch 'kc/new/bug_3072' into kcmaster 2011-04-08 11:22:57 +12:00
6e58529bdd Bug 3072: Search for Heading-Main in authorities
Includes Heading-Main in authorities bib1 attribute set.
Also includes Any in authorities bib1 (was still missing).
Also removes temporary fix in AuthoritiesMarc.pm.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Rebased after pushed fix for #5924.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 11:22:02 +12:00
Colin Campbell
c0655aabe4 Bug 6096 Correctly return arrayref from GetAllShelves
Follow on from bug 5529 GetAllShelves was also vaguely stuffing
an arrayref into an array
Some signs of cut and paste (unnecessary @params variable)
Calling code now does not have to shuffle the return about
to get the reference. Also removed a debug warn

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 11:17:04 +12:00
Colin Campbell
0cf2eccfe9 Bug 5529 Absence or Presence of lists not being reliably returned
C4::VirtualShelves::GetRecentShelves contained some rather confused
code The contents of the requested list are returned in an arrayref
which was in its turn being wrapped needlessly in an array
As a result the returned array always consisted of a single element
irrespective of the number of lists.
Made the routine return the arrayref, which can now be tested directly
Unfortunately rather than fixing this we had previously coded around it
assuming it to be a "design" decision. Have amended other calls of
the subroutine resulting in some hopefully less obscure code

Fixed logic error in the results template which displayed new list
within a test for the presence of lists

Removed the offset parameter from the sql in the routine as it was hardcoded
to 0 i.e. the default value

Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 10:51:47 +12:00
Alex Arnaud
22dc04e24c Bug #6082 - On aqbudgets.pl bug on the Statistic's combobox
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 10:45:02 +12:00
Paul Poulain
e5ff05857e Bug 6106: add item not respecting framework in acq The PrepareItemrecordDisplay sub builds an item framework for later use in ACQ Some cases were missing : item subfield connected to a plugin, hidden subfield, long size subfield.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 10:34:09 +12:00
Alex Arnaud
2950fc5596 Bug #6110 - fix Callnumber index mistake
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 10:25:45 +12:00
Chris Cormack
2a489184c0 New developer to the history 2011-04-08 08:43:06 +12:00
Chris Cormack
9a54047b6d Merge remote branch 'kc/new/enh/bug_5547' into kcmaster 2011-04-08 08:39:14 +12:00
Mark Gavillet
0ee5b38b1c Bug: 5547 - corrected insert to database
Inserting a new category failed because only 10 bind variables were present and 11 were required.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-08 08:37:54 +12:00
Chris Cormack
1c9ef0f9ae Bug 5917 : Tracking template changes 2011-04-08 07:12:27 +12:00
Chris Cormack
fe331a0209 Merge remote branch 'kc/master' into new/enh/bug_5917
Conflicts:
	installer/data/mysql/updatedatabase.pl
2011-04-08 07:12:06 +12:00
69d4d8f1cc Bug 6084: Follow up - fix more translation markers
grep -R 'alert("' *

was not enough. I needed

grep -R "alert('"

too!.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 21:46:47 +12:00
33c7b21cde Bug 6084: Missing translation markers in javascript alert messages
I ommited commented lines and "if $debug" lines too.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 21:46:45 +12:00
Alex Arnaud
2ca3edc690 Bug 6105 - Fix a problem when cancel a reserve from moremember.pl
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 21:42:21 +12:00
46041a8fdc bug 4903: enable OAI-DC output when install done in standard mode
Based on patch by Tomás Cohen Arazi <tomascohen@gmail.com>,
revised to work regardless of the installation mode.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 21:38:53 +12:00
Stéphane Delaune
c03f31479c bug6064 adding forgotten news version in kohaversion
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 21:33:42 +12:00
Sophie Meynieux
141a52ac30 Bug #6064 Improvement of default value usage in overdue
Change default value in overduerules table for delayn (NULL instead of 0) and fix GetBranchcodesWithOverdueRules function

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 21:33:40 +12:00
Paul Poulain
311e81810a Bug 6062: ordering basketgroups
When you have many basketgroups, you get the oldest one on top. Usually, you
have something to do on recent ones, so it's better to have basket groups
ordered DESC

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 16:49:24 +12:00
Paul POULAIN
aaa6ecf2b6 Bug 5951 : consistency change: s/planning/statistic/
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 16:45:05 +12:00
Paul Poulain
c9def93286 Bug 5915 : C4::AuthoritiesMarc AddAuthority
Fixing 100$a simple error: Sometimes, language is encoded fre50 and not
frey50.
This patch adds check for that problem

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 16:33:50 +12:00
Chris Cormack
3974ac63c9 Bumping database version 2011-04-07 16:31:48 +12:00
6a73fe511a 5936: Remove some obsolete db columns from aqbooksellers and aqbudgets if needed
Removes obsolete columns from aqbooksellers and aqbudgets if needed.
aqbooksellers: deliverydays followupdays followupscancel invoicedisc nocalc
specialty
aqbudgets: budget_description

These columns should not exist in a fresh install from kohastructure.sql, but
originate from older 3.0 versions.
One line in acqui/updatesupplier.pl referring to one of these columns is
removed too.

This patch therefore does not change functionality, but only keeps your db in
shape.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

Rebased April 6.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 16:30:16 +12:00
Julian Maurice
9dc9f73bfe Bug 5923 : Removed link from variable $summary
Variable $summary contained <a> and <b> tag. They have been deleted.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 16:25:22 +12:00
Henri-Damien LAURENT
21404359d4 Bug 5923 : Authorities list :removing link on Summary
removing the link to authority details on authority List directly from summary
And adding a generic link to details

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 16:25:18 +12:00
Chris Cormack
f76b9fb42e Merge remote branch 'kc/new/bug_5957' into kcmaster 2011-04-07 16:07:58 +12:00
Jared Camins-Esakov
07f16fc52e Bug 5957 follow-up: use comparison operator in if
The patch for bug 5957 used an assignment operator instead of a comparison
operator. Replace the assignment operator with the string comparison that was
desired.

Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 16:05:53 +12:00
Chris Cormack
c649ed9257 Removing conflict markers 2011-04-07 15:55:33 +12:00
Henri-Damien LAURENT
700de9664d (Bug 4049) Searching itemtypes returning noise
Fix the problem of searching on partial itemtypes strings
for instance, itemtype="ARTICLE DE PERIODIQUE", itemtype="PERIODIQUE"
searching on itemtype="PERIODIQUE" would also get "ARTICLE DE PERIODIQUE"

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 15:54:00 +12:00