Commit graph

239 commits

Author SHA1 Message Date
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
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
Chris Cormack
f0c5d74f06 Bumping db version 2010-12-13 10:24:46 +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
Chris Cormack
110c36bbfc bug 5217 incrementing db version number 2010-11-30 06:57:09 +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
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
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
Chris Cormack
47391d4e5a Updating version number and fixing the xxx in updatedatabase ... my bad 2010-11-04 06:28:24 +13:00
9db75fee05 DB revision 3.02.00.004 - general release of Koha 3.2.0
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-22 01:46:44 -04:00
7a72f49ecf standardize name of ILS-DI:AuthorizedIPs syspref
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-22 00:17:18 -04:00
dcbcf8815c bug 3881: remove unused OpacPrivacy syspref
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-21 22:21:24 -04:00
e54910dfe2 bug 3756: remove disused system preference from database
This leaves a few system preferences displayed on the
local use tab in the syspref editor that should be displayed
elsewhere, but all of the ones left are actually in use.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-21 21:53:13 -04:00
Henri-Damien LAURENT
45604b8d17 (bug 3536) fix homeorholdingbranch on return
this patch create a new systempreference "homeorholdingbranch"-like used only for returns.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

An additional edit was made to circ/returns.pl by Ian Walls of ByWater Solutions to force the dialog message for the return to
use the branch specified by the new HomeOrHoldingBranchReturn system preference, rather than always Homebranch.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-21 20:04:30 -04:00
6f3d93bd41 mark 3.2.0 release candidate - DBrev 3.01.00.999
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 21:26:58 -04:00
572670d377 bug 4989: set DB rev to 145
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-22 19:27:44 -04:00
Andrew Chilton
ebdbfc7fad bug 5007: fixing the syspref for IntranetBiblioDefaultView
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-19 10:29:07 -04:00
efc9e3a331 bug 4139: set DBrev to 143
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-06 08:24:29 -04:00
de4eeac2af Bug 4139 - Adding some indexes to deal with a performance issue with overdue reports
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-06 08:23:35 -04:00
25c895db01 bug 2434: set DBrev to 142
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-01 19:37:30 -04:00
858ca174af bug 2434: assign to DBrev 141
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-25 05:32:33 -04:00
d4aace67fd bug 4312: DBrev = 140
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-24 20:55:49 -04:00
0abb62be46 set DBversion to 139
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 09:03:45 -04:00
Katrin Fischer
c7e421d995 Bug 3682: change message_attributes.message_name from varchar(20) to varchar(40)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 09:03:19 -04:00
0700a8b732 bug 4896: granular permissions now always on (DB rev 138)
Per the following koha-devel thread, the use of
staff user subpermissions, AKA granular permissions, is
now the default behavior in Koha.  This patch removes
the GranularPermissions system preference.

[1] http://lists.koha-community.org/pipermail/koha-devel/2010-February/033670.html

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:56:03 -04:00
Chris Cormack
b3feb54ee0 Cherry-picked onto master, fixing conflicts: MT 1816: Granular permissions for the serials module
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>

Conflicts:

	installer/data/mysql/en/mandatory/userpermissions.sql
	installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
	installer/data/mysql/updatedatabase30.pl
	koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
	koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
	serials/member-search.pl
	serials/serials-edit.pl
	serials/subscription-add.pl
	serials/subscription-bib-search.pl
	serials/subscription-detail.pl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:23:46 -04:00
72fb44ce26 set DBrev to 136 for previous patch to add edit_items
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 21:04:17 -04:00
411bfaabb8 bug 4377: ensure HOLD_PRINT letter added during installation and upgrade (DBrev 135)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 12:54:45 -04:00
0be1783f2e DB rev 134: DisplayMultiPlaceHold syspref
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-11 07:45:28 -04:00
Chris Cormack
86fbe2ec21 Bug 4405 - Overdues block check out
[Documentation note by RM:

This patch adds a new system preference, OverduesBlockCirc,
that can take one of three values:

  - noblock:      checkouts permitted even if patrons
                  have overdue items (default)
  - confirmation: circ operator asked to confirm checkout
  - block:        checkouts to patrons who have overdue
                  items are forbidden

]

Squashed commit of the following:

commit 6a1f66e0686a14d8a89abfc3fe5978dabd0b7af7
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Mon Apr 26 10:27:39 2010 +1200

    Tidy up ready to send patch

commit 4d1398df18dcce4fd888cf17a0e2955fdf6ee1e4
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Mon Apr 26 10:26:15 2010 +1200

    Bug 4405 - tidy up

commit 3daeb71bc6b690e18dda96aa3c767c2bb0521038
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Mon Apr 26 10:02:04 2010 +1200

    Bug 4405 - Overdues block checkout

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 10:39:11 -04:00
Henri-Damien LAURENT
1ee67a5d19 Performance enhancing DBRev:132
Adding an index on language_descriptions table in order to boost searches

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 09:50:35 -04:00
Henri-Damien LAURENT
2aca9f26e3 Transport_type print missing
This type is quite important for all the print notices

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 09:11:56 -04:00
1cd4f42ae4 bug 1532: ensure that empty hold request expiration is represented as NULL
Fixes bug reported by Colin Campbell where reserves.expiratedate
was defaulting to '0000-00-00' instead of NULL.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 09:51:16 -04:00
Matthias Meusburger
7f3df2735d MT 2269, Follow-up : Granular permissions for items batch modification and deletion
Change of permissions names
Change of branch title in guided reports
Add a "Select All / Clean All" on items selection
Add a link to item when a given item cannot be deleted

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:55:39 -04:00
Colin Campbell
ea67f3e81a Bug 4331 Index aqorders by budget_id
Calculation of budget spent and encumbered is done by
queries on aqorders by budget_id
Index budget_id to speed these queries

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 11:14:26 -04:00
Koha
d60383e0b9 Bug 4190: messages in patron account did not work with branchcodes >4
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:58:54 -04:00
e195e18a2c bump DBrev to 126
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:40:22 -04:00
66c693d96b bump up DBrev to 125
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:03:44 -04:00
d82bc5f0ce bug 3242: insert new HOLDPLACED letter template (DBrev 124)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-19 05:47:50 -05:00
c411928b12 bump to DBrev 123
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-19 05:13:45 -05:00
3559d48bed bump DBrev to 122
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 23:05:28 -05:00
52fe58dd95 bug 1532: tweak new reserves columns and add to init SQL (DB rev 121)
Changed type of lowestpriority from BOOL to tinyint(1) - BOOL was likely
OK, but made it tinyint(1) to match the rest of the flag columns.  We
should look into converting those to BOOL en masse in 3.4.

Also made expirationdate nullable.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 22:49:47 -05:00
effad33113 bug 1080: finish work for soundon syspref (DBrev 120)
Tweaked wording of the soundon syspref, added it to the non-English
SQL scripts, and created a DBrev.  Thanks to Nahuel and Eric
for the French translation.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 09:25:25 -05:00
44967351ef set Locale::Currency::Format dep test as DBrev 119
Also fixed bug that prevented updatedatabase.pl
from compiling if Locale::Currency::Format wasn't
already installed.  To test to see if module is present,
do

eval{require Locale::Currency::Format};

not

eval{use Locale::Currency::Format};

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-17 06:39:22 -05:00
d746d80199 bug 4203: add display column to aqbudgets_planning if needed (DBrev 118)
Had not been included in kohastructure.sql

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-17 05:32:38 -05:00
Chris Cormack
461b61ad8a Fix for Bug 3730 - Wrong ISO 639-2 Language Code for Portuguese in database
[Patch originally by Ricardo Dias Marques]

Bug 3730 - Wrong ISO 639-2 Language Code for Portuguese in database
http://bugs.koha.org/cgi-bin/bugzilla3/show_bug.cgi?id=3730

For 3.0.x head of the Git branch, the ISO 639-2 Language Code for
Portuguese in Koha database is wrong.

Specifically, in the table "language_rfc4646_to_iso639", when the
field "rfc4646_subtag" has the value "pt", the field "iso639_2_code"
should have the value of "por" and NOT the current one of "pol"
("pol" refers to "Polish" as correctly also appears for the code "pl",
in the row above the "pt" one).

In my test setups, this showed some serious sequences for people
that choose the Portuguese language in the Web Installer, namely:
- very weird look of Staff client with missing Header and Footer,
that renders the Staff client unusable
- Portuguese translation apparently not getting updated for the OPAC
(for people that do an Upgrade from a previous version)

This patch is for the 3.0.x branch (I tested it with that branch).

For the master branch, I don't have a database setup to create and
test a similar patch but Chris Cormack nicely volunteered to do that.
Thanks Chris!

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 12:03:58 -05:00
0f5cba428d DB rev 116 - finish fixing default value of OrderPdfFormat
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-08 21:14:12 -05:00