Commit Graph

47735 Commits

Author SHA1 Message Date
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
Chris Nighswonger 0448a6d014 Bug 5391 - can't add multiples to batch
This was due to the use of an OR which seems to have caused the
param method to be called in a scalar context thus returning only
the first of multiple repeated cgi params.

This patch retains the intent of the OR by replacing it with a
conditional.

Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 09:13:16 +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 4fc888572b Adding another developer to the Koha history, 120 now! 2010-12-12 22:57:28 +13:00
Marcel de Rooy 434c1d6483 bug5455 (Fix uninitialized-warnings on authorities.pl)
Fix warnings for uninitialized authtypecode on lines 646, 653.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 22:50:01 +13:00
Robin Sheat 8b3a2ecebd Bug 5479 - Update package building scripts
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 22:45:42 +13:00
Chris Cormack abee9fee61 Merge remote branch 'kc/new/bug_4935' into kcmaster 2010-12-12 21:08:19 +13:00
Liz Rea 61957d07ce Bug 4935: fix for allowing authorized values to be "unset"
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 21:07:28 +13:00
Chris Cormack 423138606e Updating test for systprefs to give more useful output 2010-12-12 20:48:56 +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
Owen Leonard e29a123a9b Fix for Bug 2808, Hold queue not alphabetizing
White space in the biblio-default-view include and in the page
template caused sorting on title or patron to be incorrect.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 20:30:06 +13:00
Frédéric Demians 37a17d8fad Bug 5475 Wrong messages date formating on Check Out page
On the Check Out page, messages related to the borrower are displayed on the
right side. Message text is preceded by a date and library code. The date is
displayed in US format (mm/dd/YYY). Is should be displayed formated depending
on 'dateformat' syspref.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 20:24:42 +13:00
Jean-André Santoni fefd158f42 Ergonomy improvement in smart rule management
Added a jQuery table filter, usefull when you have a lot of rows. This filter works on the entire row and allows you for exemple to type "Adul Perio 5".
Indentation cleaning.
Added tabs to filter colums on 4 axes: All, Issues, Fines and Reserves.
Moved the table filter to the right of the tabs.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 20:23:18 +13:00
Robin Sheat 692786b519 Bug 4500 - remove commas from price formatting
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 20:16:06 +13:00
Colin Campbell aa6ce934d9 Bug 5022 Supplements were not saved correctly
No subscription id was set
Also entered a default arrived date on the supplement
And removed errors due to bad dates returned from GetSerials

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 20:13:59 +13:00
Owen Leonard c9f3f2872f Fix for 4832 - Re-editing a suggestion changes the item type
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 08:00:44 +13:00
Katrin Fischer 5633b423e3 Bug 5467: Kits shown wrong as visual material in XSLT displays
- reused icon for mixed materials for kits
- fixed missing icon for mixed materials

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 07:53:50 +13:00
f.demians at tamil.fr 76264638cc Bug 5446 Item creation in Acquisition module doesn't control mandatory field
Add some JS validing form, so saving an order is blocked if any item mandatory
field is empty.

Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
2010-12-12 07:50:27 +13:00
Katrin Fischer 27828231d4 Add BSZ to Koha's About page
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 07:47:21 +13:00
Christopher Hall 1ad2bf5cb2 make sure to close that file 2010-12-10 13:34:21 +13:00
Christopher Hall 0d6b7290cb tidied up code, fixed indentation, unused variables, etc 2010-12-10 11:17:49 +13:00
Colin Campbell f707e6c82b Remove some whitespace from earlier commit 2010-12-08 12:54:58 +00:00
Katrin Fischer 68cb4af4af Bug 4506: Correct wrong links in intranet
Set links in intranet were opac links.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:10 +00:00
Katrin Fischer 0800ab6fda Bug 4506: Add rcn links to host item entry = 773
Add links using control number in $w to host item entry.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:10 +00:00
Katrin Fischer bc4512a600 Bug 4506: Add rcn links to 780 and 785
Add links using control number in $w to preceeding and succeeding entry.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:10 +00:00
Katrin Fischer d035a581a8 Bug 4506: Add link to volumes of traced series to series record
Changed link to volumes of sets to work for traced series too.
Now if the user finds a series or set record in the database,
there is always a link to search for the associated recos with items.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:10 +00:00
Katrin Fischer 0f83daddd8 Bug 4506: Traced series
Add separate display of traced series.
Use $w and index rcn for link if $w exists, else show text link.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:10 +00:00
Katrin Fischer 26fa2de914 Bug 4506: Add links to other editions, some minor corrections
A new label 'Other editions:' is added with links to other editions.
The link starts a search for control number from 775$w in index control number.

A check for existence of $w/001 is added to always provide a fallback to a search for the link text.

Take care of repeated 773 fields.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:10 +00:00
Katrin Fischer bfbf10e8e9 Bug 4506: Add volume > set link
A new label 'Set:' is added with a link to the set.
The link starts a search for control number from 773$w in index control number.
A syspref UseControlNumber will be added later, to provide a fallback to a search by 245$a, which is also the title of the set.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:10 +00:00
Katrin Fischer 43d0860e55 Bug 4506: Add set > volume link
A new label 'Volumes:' is added with a link 'Show volumes'.
The link starts a search fcontrol number from 001 in index rcn = Record control number.
A syspref UseControlNumber will be added later, to provide a fallback to a search by title.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:09 +00:00
Katrin Fischer b705902c38 Bug 4506: New icon for sets
Show an own icon for sets - LDR 19 = a

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:09 +00: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 d3605d9ae8 Bug 4506: Some work on article to serial links
- changes search links to use Title index
- show article icon in intranet like in opac

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
Katrin Fischer baf3f605ec Bug 4506: Add index Record-control-number = rcn for indexing of $w subfields
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:08 +00:00
Christopher Hall 7c3ddf1675 forgot to account for fullstop in pattern 2010-12-07 14:32:27 +13:00
Christopher Hall 287478fcb4 fixed loop variable patterns to handle scope 2010-12-07 14:15:07 +13:00
Christopher Hall 9c816a9ab3 script with fixed scoping 2010-12-07 11:34:15 +13:00
Owen Leonard e54169ba0f Incremental fix for Bug 3285 - Location on Add Subscription should be pull down
- Adds location dropdown to subscription edit form
- Pulls authorised value for display on subscription detail page
- Adds function for pulling authorised value description based
  on category and value

This patch does NOT implement automatic preselection of the shelving
location form field on the serial add item screen. This must be
worked out in order for the bug to be closed.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-07 09:29:05 +13: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
Ian Walls 31622bc6b3 Bug 5457: gather_print_notices.pl requires explicit stylesheet
Adds a conditional around the opening and closing of STYLESHEET, testing on whether the $stylesheet variable is set
or not.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-07 08:57:28 +13:00
Christopher Hall 78ef7daadf fixed elseif vs elsif bug 2010-12-06 16:02:39 +13:00
Galen Charlton 02524213b3 bug 5397: display renew count consistently
Display the renewal count for loans consistently; in particular,
for loans that have never been renewed, display 0.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-03 12:56:34 +13:00
Chris Cormack b36befa821 Merge remote branch 'kc/new/enh/bug_4983' into kcmaster 2010-12-03 12:55:25 +13:00
Chris Cormack 836e0d2c03 Merge remote branch 'kc/new/bug_4851' into kcmaster 2010-12-03 12:55:20 +13:00
Owen Leonard 05dd542ceb Fix for Bug 4983 - Add edit record / edit item links to search results
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-03 12:48:53 +13:00
Owen Leonard e6ebf10bba Fix for Bug 4851 - Batch delete shouldn't show delete button if no items were found
- Adding template flag to indicate valid results (hidden or not)
 - Clarifying warning messages based on various outcomes

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-03 12:47:12 +13:00
Galen Charlton bb032138e7 bug 4908: rename temlate variable to branchname
Using branchname is more accurate and could avoid
a bug if/when the patron update function is made more
sophisticated.

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