Commit Graph

12825 Commits

Author SHA1 Message Date
Owen Leonard 335fbe5da7 Alternate fix for Bug 2981, removing onclick redirect
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c4ea43f3db)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:45:52 -05:00
Robin Sheat 0e08862064 bug 5033: Add a reference to xml_sax to the Makefile.PL
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9c8f934a2c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:44:58 -05:00
Chris Cormack 54fb32b521 Fix for intranet-tmpl had one /TMPL_IF to many
(cherry picked from commit e83beb0482)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:44:42 -05:00
Ian Walls a39f706f09 Fixes bug 5125: Default focus on circulation-home page
Fix created by Owen Leonard, related over IRC chat (rather than a patch file).

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 34155975fc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:44:28 -05:00
Owen Leonard fb468b5629 Possible fix for Bug 2307, Calendar widget cannot be translated
This patch copies the calendar's language strings from a stand-
alone javascript file into calendar.inc where they can be
translated along with other strings.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 21c516601c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:44:12 -05:00
Katrin Fischer 253ddbc50a Bug 2965: Allow due date in the past - small template fix
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 872529cb11)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:43:45 -05:00
Robin Sheat d39aef7de1 Bug 5084 - hide funds that are part of an inactive budget
Prevents inactive funds from showing in the aquisitions module, they
still show in the administration.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 00dd0ae627)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:40:46 -05:00
Srdjan Jankovic 0b32d910d7 Bug 2965: Allow due date in the past
Raise warning rather than disallowing
Remove due date js validation when checking out

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed small error in circulation.tmpl
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4d1762f5ec)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:40:30 -05:00
Owen Leonard 3c5b2bef89 Fix for Bug 5000, Uncertain prices misses option to choose display language
- Adding missing footer include for language chooser
- Correcting markup and structure errors

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 21cdd2feb4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:40:09 -05:00
Colin Campbell 08c2668ee2 Variable redeclared in same scope
lexical variable declared twice causing run time warnings

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 51dc5b060b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:39:52 -05:00
Nicole Engard 59814b0cec bug 5255 change 'document type' to 'item type'
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 40e2b5421a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:39:36 -05:00
Nicole Engard 8dab9b4771 bug 4252 add authorites permission to menus
Added to more menu and to the main intranet page

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a6799f95fb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:39:14 -05:00
Colin Campbell a7ed940172 Bug 2170 Supplementary Fix Wrap link in permissions check
Found an edit item link not subject to edit_items permission check

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c53c96fa57)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:38:57 -05:00
Owen Leonard 4da3829b0d Updated fix for Bug 2170, Adding 'edititems' user-permission
This patch follows up on the addition of the 'edititems'
permission by adding a check of the new permission to places
in the interface which link to the edit item screen.

The catalogue toolbar had to be extensively re-worked in
order to ensure that the "New" and "Edit" menus would appear
(or not) whether or not edit_catalogue, edit_items, or
create_subscription permissions are on.

Revised for current HEAD

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bd7cca935b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:37:23 -05:00
Chris Cormack 2e9910ce67 Bug 5484 - Handling bad borrower categories in serial routing lists more gracefully
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 96330a7b07)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:37:04 -05:00
Nicole Engard 86c0f0ee8c bug 5150 change issuing to circ & fine rules
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1b36fafe8c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:36:28 -05:00
Owen Leonard 937752bcf7 Fix for Bug 5208, Language chooser missing on Batch item deletion/modification
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2b53b14bac)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:36:10 -05:00
Robin Sheat f5f7455c02 Bug 5228 - make rebuild_zebra handle fixing the zebra dirs
If the zebra server directories don't exist, zebra will spit the dummy.
This makes rebuild_zebra.pl smart enough to create them if they're not
there. If that fails, it'll scream loudly so you know zebra isn't
reindexing.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8de1ef7e94)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:35:53 -05:00
Robin Sheat 825aba2cdb Bug 5313 - allow creation of libraries with hyphens
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4f4c4eceb3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:35:37 -05:00
Owen Leonard 15f32df3f8 Fix for Bug 5416, Template syntax error in moredetails.tmpl
Credit for finding this bug and patching it goes to Fridolyn Somers,
but the patch in Bugzilla didn't apply for me so I duplicated the
changes and reformatted.
--
Owen

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 554b6ad340)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:35:24 -05:00
Frédéric Demians 3970e42a72 Bug 5041 Allow to delete non-repeatable field
Minus links wasn't displayed as it should in order to allow cataloger to
delete (empty all subfields) a non repeatable subfield.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 565b780bec)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:35:08 -05:00
Katrin Fischer acdd08a538 Bug 4218: Fixes display problem introduced by last patch
Adds back missing <!-- /TMPL_IF -->.
Without navigation tabs and holdigns are not displayed in staff detail.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bd26d05628)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:34:19 -05:00
Chris Nighswonger 1ff0bd7a49 Updating Version Number to 3.02.01.003 2010-12-14 00:05:29 -05:00
Katrin Fischer 9ded7c9f72 Bug 3381 - Add an IntranetUserCSS system preference
Add an IntranetUserCSS sys pref that works like OPACUserCSS in OPAC only for intranet.

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-13 23:01:49 -05:00
Nahuel ANGELINETTI 02bc0fac65 (bug #3575) fix opac-detail.pl
This delete an useless "use C4::Serials"(there are 2).

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 38a1526a74)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-13 22:36:30 -05:00
Nahuel ANGELINETTI 7c31f430d0 (bug #5154) fix most checkouts report
Ignore null/deleted borrowers

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 666cc03bd3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-13 22:36:29 -05:00
Owen Leonard aff782b4d5 Fix for Bug 4218 - Staff client detail page does not show item hold status
Showing "on hold" in the holdings list (as we used to do) is misleading
if it is a bibilo-level hold. However seeing that a title has holds
is important information for this view. This patch adds a line to the
biblio-level information display with a count of the title's outstanding
holds.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6466ac847f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-13 22:35:46 -05:00
Robin Sheat f70170d95f Update Debian changelog for 3.2.1 release
This adds the required changelog changes to keep it current for the
3.2.1 release. It is intended to go straight into 3.2.x, and probably
should go into master also.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit eaddd603e4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-13 22:35:46 -05:00
Owen Leonard 8f48822aa4 Fix for Bug 5443, Inaccurate highlighting of fields in patron update email
- email was incorrectly named emailaddress
- string processing was being done to address and B_address
  which didn't seem to be serving a purpose

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4095d45eaf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-13 22:34:49 -05:00
Owen Leonard 77b824a00d Fix for Bug 4173 - Statuses not appearing in the OPAC
This adds display of "Use restrictions" authorized values
to the OPAC and the staff client for available and
not-for-loan items.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bdf4dd13af)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-13 22:34:30 -05:00
Chris Nighswonger f8230678e0 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>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-13 22:34:02 -05:00
Chris Nighswonger ecd2cefea6 Updating Version Number to 3.02.01.002 2010-12-13 22:16:12 -05:00
Katrin Fischer 00f560980c 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>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-13 22:10:18 -05:00
Chris Cormack 5acb8a2c60 Adding another developer to the Koha history, 120 now!
(cherry picked from commit 4fc888572b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-12 14:27:54 -05:00
Marcel de Rooy fdc9905e35 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>
(cherry picked from commit 434c1d6483)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-12 14:27:53 -05:00
Robin Sheat 0fc64a62ef Bug 5479 - Update package building scripts
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8b3a2ecebd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-12 14:27:53 -05:00
Liz Rea d4ccf67231 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>
(cherry picked from commit 61957d07ce)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-12 14:27:53 -05:00
Chris Cormack 0a44de48d8 Updating test for systprefs to give more useful output
(cherry picked from commit 423138606e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-12 14:27:53 -05:00
Owen Leonard 5665a3d4b0 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>
(cherry picked from commit e29a123a9b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-12 14:26:53 -05:00
Frédéric Demians e1cf24e89c 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>
(cherry picked from commit 37a17d8fad)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-12 14:26:53 -05:00
Jean-André Santoni 8ad55cbdcf 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>
(cherry picked from commit fefd158f42)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-12 14:26:52 -05:00
Robin Sheat ddac69c1e8 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>
(cherry picked from commit 692786b519)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-12 14:26:52 -05:00
Colin Campbell 5ce340e8ba 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>
(cherry picked from commit aa6ce934d9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-12 14:26:51 -05:00
Owen Leonard 02f21b98fc 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>
(cherry picked from commit c9f3f2872f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-11 21:22:18 -05:00
Katrin Fischer 9c2231b935 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>
(cherry picked from commit 5633b423e3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-11 21:22:18 -05:00
f.demians at tamil.fr 00dd132acd 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>
(cherry picked from commit 76264638cc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-11 21:22:17 -05:00
Katrin Fischer ff14e53c02 Add BSZ to Koha's About page
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 27828231d4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-11 21:22:17 -05:00
Owen Leonard d941d85712 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>
(cherry picked from commit e54169ba0f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-06 17:19:13 -05:00
Ian Walls 7f8130e433 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>
(cherry picked from commit b112ec8ff4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-06 17:19:13 -05:00
Ian Walls f86e6f5d24 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>
(cherry picked from commit 31622bc6b3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-06 17:19:12 -05:00