Chris Cormack [Thu, 7 Apr 2011 19:12:06 +0000 (07:12 +1200)]
Merge remote branch 'kc/master' into new/enh/bug_5917
Conflicts:
installer/data/mysql/updatedatabase.pl
Tomas Cohen Arazi [Thu, 7 Apr 2011 08:46:16 +0000 (10:46 +0200)]
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>
Tomas Cohen Arazi [Thu, 7 Apr 2011 08:46:15 +0000 (10:46 +0200)]
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>
Alex Arnaud [Thu, 7 Apr 2011 09:24:34 +0000 (11:24 +0200)]
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>
Galen Charlton [Thu, 7 Apr 2011 07:57:45 +0000 (09:57 +0200)]
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>
Stéphane Delaune [Thu, 7 Apr 2011 08:21:17 +0000 (10:21 +0200)]
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>
Sophie Meynieux [Thu, 7 Apr 2011 08:21:16 +0000 (10:21 +0200)]
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>
Paul Poulain [Tue, 5 Apr 2011 12:43:23 +0000 (14:43 +0200)]
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>
Paul POULAIN [Tue, 5 Apr 2011 14:26:16 +0000 (16:26 +0200)]
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>
Paul Poulain [Tue, 5 Apr 2011 09:04:42 +0000 (11:04 +0200)]
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>
Chris Cormack [Thu, 7 Apr 2011 04:31:48 +0000 (16:31 +1200)]
Bumping database version
Marcel de Rooy [Wed, 6 Apr 2011 11:35:37 +0000 (11:35 +0000)]
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>
Julian Maurice [Tue, 5 Apr 2011 08:40:15 +0000 (10:40 +0200)]
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>
Henri-Damien LAURENT [Tue, 5 Apr 2011 08:40:14 +0000 (10:40 +0200)]
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>
Chris Cormack [Thu, 7 Apr 2011 04:07:58 +0000 (16:07 +1200)]
Merge remote branch 'kc/new/bug_5957' into kcmaster
Jared Camins-Esakov [Tue, 5 Apr 2011 15:49:35 +0000 (17:49 +0200)]
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>
Chris Cormack [Thu, 7 Apr 2011 03:55:33 +0000 (15:55 +1200)]
Removing conflict markers
Henri-Damien LAURENT [Tue, 5 Apr 2011 12:13:51 +0000 (14:13 +0200)]
(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>
Chris Nighswonger [Tue, 5 Apr 2011 09:50:48 +0000 (11:50 +0200)]
Bug 5213 - Suffix number sequence not resetting properly in hmyymmincr barcode autogen pattern
Two things are happening.
First, the SELECT does not account for a branchcode greater than 2 chars.
This is fixed by just selecting the final four digits representing the
incremental suffix from the barcode field.
Second, the incremental suffix (4 digits) is not rolling back over to zero when
reaching 9999.
This pattern probably needs help. It should allow for cataloging of 10000 items
per month as is. I would not recommend doing barcode numbering this way, but
need to support it since it is in use in at least one library.
This patch also impliments strict and warnings per Bug 2505
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Paul Poulain [Wed, 6 Apr 2011 08:02:31 +0000 (10:02 +0200)]
Bug 6077: qty not incremented for AcqCreateItem=recieve
When you want to create items on order recieve, the qty was not incremented
when the librarian adds an item with the +
This was because the js was expecting the qty field to be id=quantity
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Alex Arnaud [Fri, 14 May 2010 15:07:55 +0000 (17:07 +0200)]
Bug 5946 : (MT1177) aqplan.pl, fix the problem of calculating the total remaining.
Bug 5946 followup : (MT1236) aqplan.pl - Fixe the problem of unrounded sums
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Wed, 6 Apr 2011 09:27:11 +0000 (11:27 +0200)]
Fix for Bug 5156, JavaScript error when adding list
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Matthias Meusburger [Wed, 6 Apr 2011 14:39:36 +0000 (16:39 +0200)]
Bug 6028 : MT3815: Quickfix for CSV export (9999 rows limitation)
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Koustubha Kale [Sat, 2 Apr 2011 16:53:06 +0000 (22:23 +0530)]
This patch fixes the broken pagination in members-search.pl
Small patch to fix Error 404 which comes up when we click on pagination links after searching in Patron Card creator.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Jared Camins-Esakov [Wed, 6 Apr 2011 18:00:47 +0000 (14:00 -0400)]
Bug 6100: request.pl should check maxreserves exists
Adds a check to confirm that the maxreserves syspref actually has a value before
using it. Also fixes an off-by-one error in the maxreserves calculation that
would allow librarians to place maxreserves + 1 holds for patrons.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Robin Sheat [Wed, 6 Apr 2011 23:18:32 +0000 (11:18 +1200)]
Bug 6032: Increase zebra biblio register stores
This keeps the package versions of the zebra configuration in sync with
the makefile-installed ones.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Jared Camins-Esakov [Wed, 6 Apr 2011 18:28:49 +0000 (14:28 -0400)]
Bug 6032: Give biblio register and shadow sane default max sizes
The out-of-the-box maximum size for the biblio register and shadow stores is
4GB, which is much too small for even medium sized libraries. This makes the
default maximum 20GB, which should be enough for even most large libraries.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Frédéric Demians [Wed, 6 Apr 2011 08:14:29 +0000 (10:14 +0200)]
Bug 4374 Improve biblio data entry form regarding hidden/mandatory fields
Biblio framework has 3 entry points controlling if input box are
displayed by default in data entry form:
- 'mandatory' flag at field level
- 'mandatory' flag at subfield level
- 'hidden' flag at subfield level
It doesn't work as it should (?):
- All subfields are expanded (shown) if their field is mandatory
- A subfield containing anything is always expanded whatever it contains
- A mandatory subfield is always expanded
- An hidden subfield isn't expanded.
Default framework having 0 in all marc_subfield_structure.hidden, by default
all subfields will be expanded.
TO BE INTEGRATED IN RELEASE NOTES:
Koha sysadmin should have to edit its frameworks to add hidden=1 in
appropriate subfields.
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Thu, 7 Apr 2011 01:16:26 +0000 (13:16 +1200)]
Bug 6014 : Removing a leftover warn
Henri-Damien LAURENT [Wed, 6 Apr 2011 15:28:45 +0000 (17:28 +0200)]
Bug 6014 : MT3138 Adding some permission management to viewlog
If user can not access reports, then form to search the logs is not displayed.
It also improves the presentation.
C4/Log.pm
- adds the fact that we can enter multiple actions
- fixes the fact that user information was truncated
circ-menu.inc:
Fixing information passed to the viewlog from circ-menu
Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Wed, 6 Apr 2011 22:41:37 +0000 (10:41 +1200)]
Merge remote branch 'kc/new/bug_4276' into kcmaster
Jared Camins-Esakov [Wed, 6 Apr 2011 20:00:43 +0000 (16:00 -0400)]
Bug 4276 follow-up: quote strings with curly braces
Previous fix used the wrong characters for quoting. I should have used curly
braces instead of double quotes. Some searches using double quotes will fail
(the problem seems to be punctuation, although there may be other circumstances
where double quotes fail as well).
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Wed, 6 Apr 2011 07:51:45 +0000 (09:51 +0200)]
Partial fix for Bug 4870, Damaged status does not prevent items from being selected for reserves
This patch changes the holds queue build process in order to
require that items not be damaged in order to appear in the
holds queue report.
Revision adds a check for the AllowHoldsOnDamagedItems preference to
determine whether a damaged item should be included in the holds
queue report.
Signed-off-by: Christophe Croullebois <christophe.croullebois@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Jared Camins-Esakov [Tue, 5 Apr 2011 09:19:01 +0000 (11:19 +0200)]
Bug 5868: Subject indexes do not search 6xx fields
Prior to this change, the named Zebra Subject phrase index did not include the
600, 610, 611, 630, 654, 655, 656, and 657 fields. This could be seen in
searches such as: "su:Bible and su:N.T. and su:Matthew and su:Textbooks", which
should return a result with the following field:
=630 00$aBible.$pN.T.$pMatthew$vTextbooks.
This did not formerly work.
This patch modifies etc/zebradb/marc_defs/marc21/biblios/records.abs. This file
must be installed and biblios reindexed in Zebra for the changes made here to
affect records already in the catalog.
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Wed, 6 Apr 2011 07:49:55 +0000 (19:49 +1200)]
Merge remote branch 'kc/new/bug_5555' into kcmaster
Janusz Kaczmarek [Wed, 6 Apr 2011 07:36:22 +0000 (09:36 +0200)]
Bug5555 Corrected search for ISBN / ISSN
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Henri-Damien LAURENT [Tue, 5 Apr 2011 12:18:16 +0000 (14:18 +0200)]
Bug 5924 : C4::AuthoritiesMarc.pm search enhancement
Heading Main is defined in unimarc record.abs
re enabling that feature
Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Nicole Engard [Tue, 5 Apr 2011 13:30:07 +0000 (15:30 +0200)]
bug 4837 make circ print page show item type description
Signed-off-by: Guillaume Hatt <guillaume.hatt@€nc.sorbonne.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
fdurand [Tue, 5 Apr 2011 15:07:31 +0000 (17:07 +0200)]
Bug 4196 -Followup : Defintion of popularity index into Unimarc setup
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
fdurand [Tue, 5 Apr 2011 15:07:30 +0000 (17:07 +0200)]
Bug 4196 - Defintion of popularity index into Unimarc setup
Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Wed, 6 Apr 2011 07:28:54 +0000 (19:28 +1200)]
Merge remote branch 'kc/new/bug_6009' into kcmaster
Frédérick Capovilla [Tue, 5 Apr 2011 08:08:12 +0000 (10:08 +0200)]
Bug 5410 : Adds "do-not-truncate" in the search queries of Heading.pm
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Alex Arnaud [Tue, 5 Apr 2011 07:54:11 +0000 (09:54 +0200)]
Bug 5941 : (MT4425) Replace search 'an' by 'an, phr' in searchresultlist.tmpl
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Tue, 5 Apr 2011 09:32:41 +0000 (11:32 +0200)]
Bug 6040 : Adding some error handling to the opac export
Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Wed, 6 Apr 2011 04:16:30 +0000 (16:16 +1200)]
Merge remote branch 'kc/new/bug_6065' into kcmaster
Sophie Meynieux [Tue, 5 Apr 2011 12:44:07 +0000 (14:44 +0200)]
Bug 6047: Remove check on subfield 3 that prevents biblios from BNF to create corresponding authorities
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Paul Poulain [Tue, 5 Apr 2011 12:54:48 +0000 (14:54 +0200)]
BZ6065: confirmation when deleting an order
when clicking on "delete order", there is no confirmation box, the order line is
deleted without any question !
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Wed, 6 Apr 2011 03:35:28 +0000 (15:35 +1200)]
Merge remote branch 'kc/new/bug_6058' into kcmaster
Chris Cormack [Wed, 6 Apr 2011 03:35:25 +0000 (15:35 +1200)]
Merge remote branch 'kc/new/bug_6056' into kcmaster
Chris Cormack [Wed, 6 Apr 2011 03:35:16 +0000 (15:35 +1200)]
Merge remote branch 'kc/new/bug_5942' into kcmaster
Chris Cormack [Wed, 6 Apr 2011 03:35:11 +0000 (15:35 +1200)]
Merge remote branch 'kc/new/bug_5914' into kcmaster
Chris Cormack [Wed, 6 Apr 2011 03:34:56 +0000 (15:34 +1200)]
Merge remote branch 'kc/new/bug_5651' into kcmaster
Jared Camins-Esakov [Tue, 5 Apr 2011 13:48:03 +0000 (15:48 +0200)]
Bug 5651: Question marks break searches w/ICU
When a user is doing a simple keyword search, they should not be expected to
deal with the magical behavior of question marks in Zebra. This fix escapes
question marks, and reduces the number of false positives for identifying a
"simple keyword search."
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Stéphane Delaune [Mon, 4 Apr 2011 13:22:37 +0000 (15:22 +0200)]
Bug 5942, sql for UNIMARC Authorities
(MT #4339) init default UNIMARC sql structure
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Tue, 5 Apr 2011 08:50:42 +0000 (10:50 +0200)]
Bug 5914 : BuildUnimarchierarchies can go into an infinite loop Squashed commit of the following:
commit
58e18dfa4109fcdde3c71675ff07ed6aae86b258
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date: Tue May 18 16:54:49 2010 +0200
Bug 5914 : followup BuildUnimarchierarchies fixing infinite loop
commit
bbbcb7fcb0ff36eb8a072d9b0442996e71ebb247
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date: Tue May 18 13:11:44 2010 +0200
Bug 5914 : BuildUnimarcHierarchies : Fixing infinite loop
When referenced authority in 5XX$3 would be the same as the current authid, the script would get into infinite loop
Conflicts solved: C4/AuthoritiesMarc.pm
commit
3581021997bc8965af807738c47d5fd27f2fd97f
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date: Wed Apr 7 15:15:59 2010 +0200
Bug 5914 : BuildUnimarcHierarchies : Fixing infinite loop
When referenced authority in 5XX$3 would be the same as the current authid, the script would get into infinite loop
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Tue, 5 Apr 2011 11:42:57 +0000 (13:42 +0200)]
Bug 6056: Notes were not shown when modifying order line
To test:
- add a new order in acquisitions with some content in the notes field
- save order
- modify order - Notes field will be shown as empty
The template variable for notes is missing from the template.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Paul Poulain [Tue, 5 Apr 2011 12:05:57 +0000 (14:05 +0200)]
BZ6058: uncertain price can't be unchecked
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Alex Arnaud [Tue, 5 Apr 2011 12:11:00 +0000 (14:11 +0200)]
Bug #6044 - Authority is deleted when mergeto and mergefrom are the same
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Tue, 5 Apr 2011 07:56:12 +0000 (19:56 +1200)]
Updating database version number
Chris Cormack [Tue, 5 Apr 2011 07:27:15 +0000 (19:27 +1200)]
Updating history
Chris Cormack [Tue, 5 Apr 2011 04:50:36 +0000 (16:50 +1200)]
Bug 5917 using_https should be a global
Chris Cormack [Tue, 5 Apr 2011 04:45:16 +0000 (16:45 +1200)]
Bug 5917 : Scoping issues
Chris Cormack [Tue, 5 Apr 2011 04:36:31 +0000 (16:36 +1200)]
Bug 5917 : Whole pile of scoping for opac search results
Chris Cormack [Tue, 5 Apr 2011 04:36:30 +0000 (16:36 +1200)]
Bug 5917 : Scoping issue
Chris Cormack [Tue, 5 Apr 2011 03:58:53 +0000 (15:58 +1200)]
Bug 5917 : More template file changes for scoping
Chris Cormack [Tue, 5 Apr 2011 03:48:32 +0000 (15:48 +1200)]
Bug 5917 : Fixing catalogue detail.tt
Chris Cormack [Tue, 5 Apr 2011 03:44:06 +0000 (15:44 +1200)]
Bug 5917 tracking template changes
Chris Cormack [Tue, 5 Apr 2011 03:43:28 +0000 (15:43 +1200)]
Tracking new help files
Chris Cormack [Tue, 5 Apr 2011 03:39:12 +0000 (15:39 +1200)]
Merge remote branch 'kc/master' into new/enh/bug_5917
Conflicts:
installer/data/mysql/updatedatabase.pl
Chris Cormack [Tue, 5 Apr 2011 03:35:44 +0000 (15:35 +1200)]
Bug 5917 : Scoping
Katrin Fischer [Mon, 4 Apr 2011 15:03:43 +0000 (17:03 +0200)]
Bug 5970: Follow-up, freedeliveryplace was missing in kohastructure
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Matthias Meusburger [Mon, 28 Mar 2011 11:39:46 +0000 (13:39 +0200)]
Bug 5970: Adds the ability to use a free delivery address for basket
When editing a basket group, user can choose a library for delivery
place, or enter address of his choice in a text field.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Will send a follow-up for missing change in kohastructure.sql
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Fri, 7 Jan 2011 16:15:18 +0000 (11:15 -0500)]
Fix for Bug 5593, Change cart markup to allow for easier icon styling
Replacing inline cart image with a span with a unique ID. Adding
styling to the deafult CSS to give that span a background of the
same cart image as before. Custom CSS can override this with a
different image.
Example for OPACUserCSS preference:
background-image : url("/opac-tmpl/prog/famfamfam/silk/basket.png");
width:16px;
height:16px;
}
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
background-image: url("/opac-tmpl/prog/famfamfam/silk/basket.png");
}
Will also change the cart image in opac detail view.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Tue, 5 Apr 2011 02:57:13 +0000 (14:57 +1200)]
Incrementing database version
Srdjan Jankovic [Mon, 4 Apr 2011 12:25:27 +0000 (14:25 +0200)]
wr76595 (bug 4157): Control barcode display with a borrower attribute
Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Srdjan Jankovic [Mon, 4 Apr 2011 12:25:26 +0000 (14:25 +0200)]
Bug 4157: Display of barcode in checked out items in OPAC
wr76595: barcode display
Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Tue, 5 Apr 2011 02:50:58 +0000 (14:50 +1200)]
Merge remote branch 'kc/new/enh/bug_5839' into kcmaster
Marcel de Rooy [Mon, 4 Apr 2011 10:38:42 +0000 (10:38 +0000)]
Follow up fix for 5839 (items stocknumber)
New installer file for norway was not yet included. Tested with mysql.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Christophe Croullebois [Mon, 4 Apr 2011 09:44:06 +0000 (11:44 +0200)]
Bug 5963 : Add the ability to filter budgets using the active column
(MT #4717) Add the capability to have a filter by active budget
the sub GetBudgetHierarchy return aqbudgetperiods.budget_period_active to have acces to a new filtering way,
more the neworderempty.pl page have a check box "shox all".
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Bug 5963: Modify GetBudgetsHierarchy to returns all funds
GetBudgetHierarchy now returns all funds, not only those that are part
of an active budget.
Fixed a layout problem.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Christophe Croullebois [Mon, 4 Apr 2011 10:29:36 +0000 (12:29 +0200)]
Bug 5949 : Popup alert when deleting items from basket, also change planning value to statistics
(MT #2391) : acqui/neworderempty.pl
Multiple fixes in neworderempty.pl, mainly about Modify order line page, link to edit catalog, user can delete items with popup information and can't add items also with popup explanation.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- changed the the link from 'Edit Catalog' to 'Edit record' (like on result list)
- changed position of 'Edit record' to be shown behind the label 'Catalog details' instead of showing behind the Title.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Alex Arnaud [Mon, 4 Apr 2011 15:17:35 +0000 (17:17 +0200)]
Bug 5947 Suggestions : add date to the search query
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes searching by dates, like 'Suggested on:'
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Marcel de Rooy [Mon, 4 Apr 2011 10:04:30 +0000 (12:04 +0200)]
Bug 3628: opacSerialDefaultTab
This partial fix makes this existing pref visible in the interface.
It should work for UNIMARC. Some work still needs to be done at the MARC side.
Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Christophe Croullebois [Mon, 4 Apr 2011 12:28:19 +0000 (14:28 +0200)]
Bug 5962 : Budgets showing when they shouldn't (MT #4717) Bug in Koha 3.2 on acqui-home.pl
In the screen all the budgets with budget_branchcode=NULL were displayed even if the budget_owner_id was not NULL. This patch fixes the bug
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
1) Add a new fund, leave library empty, owned by yourself
2) Go into the database and change aqbudgets.budget_branchcode to be NULL
3) Check acq home. Before patch the fund will not show up, although it's owned by you.
After patch it will.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Mon, 4 Apr 2011 14:13:33 +0000 (16:13 +0200)]
Fix for Bug 5991 - Javascript error on purchase suggestion pages
Rebased on master 2011-04-04
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Mon, 4 Apr 2011 22:06:02 +0000 (10:06 +1200)]
Merge branch 'new/bug_5307' into kcmaster
Frédérick Capovilla [Wed, 30 Mar 2011 16:12:19 +0000 (12:12 -0400)]
Corrects an error when showing a suggestion linked to a deleted budget.
If a suggestion is associated to a budget that was deleted, an error was
returned because we try to get the name of a budget that doesn't exist.
With this fix, the page is shown without errors.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Paul Poulain [Mon, 4 Apr 2011 13:53:19 +0000 (15:53 +0200)]
Bug 6046: suggestedby list on she filter was not created properly
The suggestedby patron list contained empty lines. This was because retrieving patron name was not correct
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Paul Poulain [Mon, 4 Apr 2011 13:19:32 +0000 (15:19 +0200)]
Bug 6043: SQL error when IndependantBranches=ON on suggestion
On suggestion page, when IndependantBranch=ON, the SQL built is wrong:
branchcode is ambiguous
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Paul Poulain [Mon, 4 Apr 2011 14:28:44 +0000 (16:28 +0200)]
Bug 6045: Accepted by is empty when accepting from list
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Mon, 4 Apr 2011 21:21:49 +0000 (09:21 +1200)]
Updating database version
Katrin Fischer [Mon, 4 Apr 2011 11:20:20 +0000 (11:20 +0000)]
Bug 5860: Adding duplicate stocknumber fails silently
When adding a duplicate stocknumber the duplicate was not saved to the database.
This happened, because the field stocknumber in table items was declared to be unique.
Discussion on bug suggests to lift this restriction.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested. Corrected typo in updatedatabase script. Version 3.01.00.095 introduced the index with double s, although structure had only one s in index name.
Unaware of this bug, I entered the more general bug 6041 for similar problems with modifying items.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Mon, 4 Apr 2011 10:25:55 +0000 (12:25 +0200)]
Fix for Bug 5989 - Funds filter does not remember library choice
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
koha-preprod [Mon, 7 Feb 2011 16:12:49 +0000 (11:12 -0500)]
Adding a javascript function to check the validation of a record with a budget.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Christophe Croullebois [Mon, 4 Apr 2011 09:21:18 +0000 (11:21 +0200)]
Bug 5948 : Creation of a quantity column in receipt summary
In receipt summary the quantity did'nt appear in already received table, this patch fixes the omission
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch tested on current master. Works like advertised.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Tue, 29 Mar 2011 21:48:46 +0000 (23:48 +0200)]
Bug 5839: Add mapping for items.stocknumber to MARC21
This patch adds 953$i 'Inventory number' to the frameworks.
952$i inventory number is not repeatable, not mandatory and mapped to items.stocknumber.
In a later patch a search index will be added to make inventory number/stocknumber searchable.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Mon, 4 Apr 2011 08:38:02 +0000 (08:38 +0000)]
Bug 5839: Add index stocknumber on 952$i
This patch adds a new index for stocknumber on field 952$i.
Note: For testing you have to copy over the changed files
from kohaclone/etc/zebradb/ to your koha-dev/etc/zebradb folders.
Reindex.
To test:
1) Add 952$i to your frameworks
2) Add an item with 952$i
3) Search for your 952$i value in keyword search
4) Search for stocknumber, using stocknumber:<your 952$i value> or inv:<...
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Mon, 4 Apr 2011 05:07:07 +0000 (17:07 +1200)]
Bug 5917 : Yet more scoping
Chris Cormack [Mon, 4 Apr 2011 05:00:06 +0000 (17:00 +1200)]
Bug 5917 : Variable scoping
Chris Cormack [Mon, 4 Apr 2011 04:47:20 +0000 (16:47 +1200)]
Bug 5917 More wrongly scoped globals
Chris Cormack [Mon, 4 Apr 2011 04:47:19 +0000 (16:47 +1200)]
Bug 5917 : Adding new globals to be escaped by the converter