Commit graph

890 commits

Author SHA1 Message Date
Chris Cormack
88601b74ac Bumping Koha version 2011-01-21 11:12:16 +13:00
Robin Sheat
1bf3dd45df Bug 5551 - allow shelf browser filters to be changed
This adds three system preferences: ShelfBrowserUsesLocation,
ShelfBrowserUsesHomeBranch, and ShelfBrowserUsesCcode. These can be
toggled to determine whether the shelf browser will ensure that the
items being show will match against location, homebranch, or collection
code, respectively.

Note that this also involves a bit of a refactor to clean up the shelf
browser code.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-21 11:08:42 +13:00
Chris Cormack
ce5bf27254 Bug 4289: Updating other sysprefs until we change the installer, we need to do this 2011-01-19 20:55:33 +13:00
Chris Cormack
d5c0b2a4be Bug 4289: Bumping version number up 2011-01-19 14:31:58 +13:00
b63a2ae03f Bug 4289 Followup: Add syspref default value and in opac.pref
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-19 14:30:37 +13:00
Mason James
f46b03cf2d Bug 4289: 'OpacPublic' feature
applied to git tag 'v3.02.00-rc'

Frédéric Demians:

  - Rebased this patch to HEAD
  - Solved a merge conflict
  - The patch works as described here:
    http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=4289

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-19 14:30:34 +13:00
Chris Cormack
aa4c36d328 Bug 2142 : Bumping database version 2011-01-12 08:47:57 +13:00
Ian Walls
58d7321469 Bug 2142: reinstate maxItemInSearchResults systempreference
Reinstates the deleted maxItemsInSearchResults system preference, which was erroneously thought to no longer be utilized.
It's removal has led to bug 4430

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-12 08:47:44 +13:00
Chris Cormack
574f613a1d Merge remote branch 'kc/new/bug_5186' into kcmaster 2011-01-11 08:10:52 +13:00
a8869ea0c2 Bug 5186: Follow-up - Fixing wrong database number
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-11 08:08:31 +13:00
Chris Cormack
c0441ebbfb Merge remote branch 'kc/new/bug_5186' into kcmaster 2011-01-10 09:14:22 +13:00
Chris Cormack
75020285d8 Bumping database version to 3.03.00.010 2011-01-02 09:30:23 +13:00
Nicole Engard
9abcfa44e6 bug 5040 fix misspelling of distance in marc21 framework
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-02 09:29:29 +13:00
Chris Cormack
2124887428 Bug 5531: adding some missing sysprefs 2010-12-22 15:06:51 +13:00
Chris Cormack
0482e53451 Bug 5531: Updated Polish, Ukranian and Russian syspref files
Retrieved from
http://git.koha-community.org/gitweb/?p=wip/koha-chris_n.git;a=commit;h=f23969c7e1cb87d4bd9552e3d6bc85cc948dedd9
2010-12-22 14:59:11 +13:00
Chris Cormack
c9db18bf0b Bug 5531: further fix for fr-FR files 2010-12-22 14:44:33 +13:00
Henri-Damien LAURENT
409dcdfe6a Based on Chris Nighswonger french unimarc_standard_sysprefs.sql 2010-12-22 00:21:07 +01:00
Chris Cormack
2814b535e6 Bug 5331, fixing Italian sysprefs.sql 2010-12-21 23:01:30 +13:00
Chris Cormack
e20895a9a7 Bug 5531: Fixing german sysprefs file 2010-12-21 22:47:05 +13:00
Nicole Engard
a45eb8fb78 bug 5035 remove default opaccolorstylesheet value for new installs
Per the bug, the color.css file is blank and so this preference
should have no value by default. This patch only fixes this for
new installs. There is no way to know if people have added values
to the color.css file in existing installs, so removing that value
in those cases might break things.

This patch does not remove the blank color.css file, it only
edits the default system preference.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-21 16:48:14 +13:00
Robin Sheat
8e5ee007db Bug 5186 - allow tax rates to be set to zero (master)
This allows the tax rate for a vendor to be set to zero. Previously, a
zero meant that the system default was used. Now, zero means no tax, and
to have it be the default the field should simply be left empty.
Additionally:
* this will now show on the vendor display if the tax value is from the
  system default
* this includes a database update that changes all the existing 0.00 tax
  settings to be NULL, which preserves existing behaviour.
* this now saves the tax value supplied for new vendors

Note: this patch applies against master

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-21 14:34:05 +13:00
Serhij Dubyk {Сергій Дубик}
bd8f379d70 Deleted old sample budget sql-data for Ukrainian and Russian
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 06:52:18 +13:00
Chris Cormack
718473bdd2 Merge remote branch 'colin/QA/bug_4506' into new/enh/bug_4506 2010-12-14 21:07:15 +13:00
Katrin Fischer
6b33299f8f Add missing bracket to updatedatabase.pl
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 19:31:47 +13:00
Chris Cormack
2b25835464 Merge remote branch 'katrin/3381_intranetusercss' into new/enh/bug_3381
Conflicts:
	installer/data/mysql/it-IT/necessari/sysprefs.sql
	kohaversion.pl

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 12:24:59 +13:00
Katrin Fischer
ddde74e10e Bug 1997: new OPACNoResultsFound pref
This patch is a follow up - adding new system preference to all translated sql files.
2010-12-13 20:03:30 +13:00
Katrin Fischer
c6a9141413 Bug 3381 - Add an IntranetUserCSS system preference
Add an IntranetUserCSS sys pref that works like OPACUserCSS in OPAC only for intranet.
2010-12-13 08:01:41 +01:00
Nicole Engard
817b133838 Bug 1997: new OPACNoResultsFound pref
This patch adds a new preference to allow librarians to
add content to the no results found page if they want.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Changed surrounding <p> in template to <div id="noresultsfound">
Will send follow up patch adding sys pref to translated sql files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 10:20:51 +13:00
Amit Gupta
f164902761 Bug 5464 Suggestions - adding more acq fields to staff interface
More acq fields in staff interface - price, quantity, currency and totals

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 09:22:05 +13:00
Katrin Fischer
289eb6caa5 Bug 5423: Deleted Patrons are no longer saved in table deletedborrowers
Tested with HEAD
> Should also apply to 3.2.x
( Not tested with 3.2.x)

Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 09:09:55 +13:00
Chris Cormack
b133918d0a Bumping version number 2010-12-12 20:42:43 +13:00
Koustubha Kale
e4cbc4f421 Bug 5418: Rev-5 patch new itemBarcodeInputFilter for libsuite8 style barcodes
In India a ILS product called Libsuite8 prints barcodes like b0007432. The barcode is not stored anywhere in libsuite8's database. Neither is barcode available in any of the reports generated by the software.

The barcode 'b0007432' when scanned into the libsuite8 software is de-constructed like 'b' which is the itemtype i.e. Book in this instance, and '7432' which is the 'Accession Number'. The software then takes the logged in staff's branchcode and does a join on three tables 'Location', 'Media_Type', and 'Books' to retrieve the particular record from the database.

There is no possibility of recreating the barcodes for insertion in Koha while doing a retrospective conversion, because of arbitrary length of the barcode string AND arbitrary number of zeros in the numeric part of the printed barcode AND the fact that there are no reports available from the software which contain barcodes AND the fact that the barcode is not stored in the database.
But most importantly due to the simple fact that printed barcodes are duplicated among branches.

Therefore this patch emulates the functionality of Libsuite8 software of converting the scanned barcode into one stored in Koha using the itemBarcodeInputFilter system preference.

To use this new itemBarcodeInputFilter systempreference choice called 'libsuite8', the barcodes stored in Koha must match the pattern of <branchcode>-<itemtype_code>-<accession_number>. This is easy to achieve while doing retrospective conversion from Libsuite8 to Koha.

As expected the itemBarcodeInputFilter will return unmodified barcode if presented with a barcode of pattern <branchcode>-<itemtype_code>-<accession_number>

This revision corrects the way updatedatabase.pl is changed in order to correctly update version and insert the libsuite8 option in the database. Also kohaversion.pl is changed in the recommended format of 3.0X.0X.XXX to reflect database has changed.

This revision also changes the erronorous itemBarcodeInputFilter description in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref from 'scanned patron barcodes' to 'scanned item barcodes' there by eliminating need for a separate patch for bug 5417.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>

1) applied patch to HEAD
2) set next database number in kohaversion.pl and updatedatabase.pl
3) webinstaller kicked in, update ok
4) typed the barcodes from test cases into check-in

Barcodes used my local branch code, everything seemed ok to me.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 20:39:20 +13:00
Katrin Fischer
a1a8acf4e2 BUG 4506: Add 8xx $w subfields to MARC-Frameworks de-DE
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:09 +00:00
Katrin Fischer
813325c753 BUG 4506: Add 8xx $w subfields to MARC-Frameworks pl-PL
ru-RU and uk-UA have no files for MARC21

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:09 +00:00
Katrin Fischer
5d8694b59c BUG 4506: Add 8xx $w subfields to MARC-Frameworks en, fr-FR
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:08 +00:00
Ian Walls
b112ec8ff4 Bug 5460: AutoEmailPrimaryAddress set to invalid value in sysprefs.sql
Fixes de-DE, en, fr-FR, pl-PL, ru-RU and uk-UA default install values for this system preference (changing from '0'
to 'OFF', the preferred value).

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-07 09:07:30 +13:00
Chris Cormack
110c36bbfc bug 5217 incrementing db version number 2010-11-30 06:57:09 +13:00
3111360890 bug 5127: database update to add the suggestion notification templates
Being especially careful to not scribble over any ones
that the library might have already defined.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-11-30 06:47:52 +13:00
7fd45b9861 bug 5127: sample notice templates for suggestions
* supply default suggestion status change email
  templates.
* remove the deprecated mail_suggestion_*.tmpl files

There are a couple suggestion statuses referred to
in the code and suggestion management page that currently
do not have notice templates defined: ASK and CHECKED.  These
seem to be internal, so perhaps default message templates
are not needed for these.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-11-30 06:47:52 +13:00
Chris Cormack
9ec8a89e51 Removing merge commit 2010-11-14 05:40:55 +13:00
8663778b8e Bug 5396: New system preference UseTablesortForCirc
This system preference allows the librarian to toggle on or off whether the JQuery tablesort is used on the
circ/circulation.pl page.  For patrons with many checkouts, this sort may cause very slow page loading (and
therefore slow circulation transaction time), depending on the browser and local machine used.  Staff can
still see a sortable list of current checkouts on the members/moremember.pl page.

My revision prevents the template from including *any* tablesorter code if the
preference is feature is turned off: both the circulation list and
the holds list will have no jQuery tablesorter.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-13 19:53:12 +13:00
Andrew Elwell
efa66f1f55 Bug 5385: POD Cleanups (part 2)
More podchecker cleanups to eliminate warnings / errors

Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-12 10:06:56 +13:00
Andrew Elwell
9fa574f609 Bug 5385: POD Cleanups (part 1)
working through the master branch to eliminate all
podchecker warnings/errors

Actual improvement to the quality of the POD will
come later (hopefully with assistance of others)

Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-12 10:06:55 +13:00
Katrin Fischer
6df634855c Bug 5370: Fix all the references to koha.org
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-08 09:41:49 +13:00
Katrin Fischer
35cf30ef15 Bug 5370: Fix references to koha.org and other old websites
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-07 19:50:52 +13:00
Chris Cormack
414b2ace4f Merge remote branch 'kc/new/signoffs' into kcmaster
Conflicts:
	installer/data/mysql/updatedatabase.pl

Updated updatedatabase.pl to handle new version number
2010-11-04 20:14:28 +13:00
be997f924e bug 4141: fix upgrade of OPAC XSLT parameters from 3.0.x
Note that OPACXSLTResultsDisplay and OPACXSLTDetailsDisplay
are boolean parameters in 3.2.x, not string parameters.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-04 06:54:04 +13:00
Chris Cormack
47391d4e5a Updating version number and fixing the xxx in updatedatabase ... my bad 2010-11-04 06:28:24 +13:00
Chris Cormack
e5bdc1e9ab Merge remote branch 'kc/new/bug_5308' into kcmaster 2010-11-03 16:52:21 +13:00
dev2
433b77b750 Bug 5192 Enhancement to add new index for 658 curriculum field
Creates new curriculum index for 658 subfields a,b,c and search option in Advanced search (under More Options).  Also modifies the installer files to make 658abc display (they were hidden in the frameworks) and to create the new indexes.

The 658 already displays as part of the staff/OPAC subject display line.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 21:02:12 +13:00