Bug 4438: incorrect "Budget total exceeds period allocation" error when editing fund

The process in check_parent_total for period allocation was not good.
It took all the children of a period.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for Bug 5006 - Invalid XHTML in record matching rules template

- Rework JavaScript clone routines to use jQuery, to take
  label "for" into account, to handle incrementing label,
  and to properly place cloned blocks at the bottom of the group
- Rework JavaScript delete routines to use jQuery, to take
  block label numbers into account, and to show the "add"
  link if you have deleted the last block.
- Correcting markup which nests <div> inside <fieldset>
- Ensuring labels' "for" attribute matches input IDs
- Adding "required" style to required fields

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

(bug #3743) fix acquisition stats ordering

This patch fix ordering in acquisition stats to order by month number.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5611: Simple typo fix in the comments
(cherry picked from commit be37db49fb329f8911dabb0d12d2a6e09bb9dc91)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Typo fix for history file
(cherry picked from commit 3153abe61b441ee8b4088c9b13f2954c63546cab)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Adding release info, and missing meetings to the history
(cherry picked from commit 31993509b21b61f8b0546dd6b71cfa6d9801dc9e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Adding new developers to the history

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5611 Tidy up C4::Scrubber

Remove the unneeded package variables
Remove unnecessary variables
Removed some cargo-cult programming
Tidied the indentation from mix of tabs & spaces
Add a Test that we actually return the required class
of object

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5611 INIT block causes failure with mod perl

Per module INIT Blocks are not run in mod_perl so their
variables are not visible. A lexical var is adequate
for this purpose

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5601 :: Add tests for bugfix

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0d5029ec5b3b95a3e38b67aa1aa1be6196e19dfb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5601 Fix processing of DueDate return

item duedate is not a datetime entity but a string retrieved
direct from the db that only needs restructuring
checkout was doing so but item_info was pretending it was in secs
(actually Item.pm manipulated then overwrote it!!)
assume the date in the db is correct (otherwise madness ensues)
dont try to second guess it
As duedates do not yet include a time element assume end of day
as a safety first

[F. Demians] I confirm Joe Atzberger diagnostic. That's a bug reported by a
library. I've tested Colin Campell solution. It fixes the bug.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d4842d45601bd0f9c1bd33bf7978586ae746888f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5055 Use standard file paths in crontab.example

This is a revised patch, removing the lines pertaining to logrotate.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug 4131 have subscription so edit routing if one exists

Changes the template variable checked in serials-menu.inc for determining where to
show 'Create Routing List' or 'Edit Routing List' to hasRouting.

Also adds the $hasRouting variable to serials/routing.pl and serials/routing-preview.pl,
for completeness.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug 5486 remove note about HomeOrHoldingBranch being removed soon

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5603: advance_notice.pl uninitialized element in hash

Changings one of the LEFT JOINS in C4::Members::Messaging::GetMessagingPreferences
to a JOIN to prevent NULL message_transport_types from being returned

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug 5492 update import patrons page title

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>
(cherry picked from commit 4173f2221fd0387e670c40bd4da18223e79f2244)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug 5604 additional icons in the Seshat icon set

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for Bug 4945 - Patron search is limited by default to the currently logged-in library

I couldn't figure out how (or whether) GetBranchesLoop could be
convinced to return a list of branches without selecting one, so
I swapped GetBranchesLoop with GetBranches. This will preselect
a branch only if a branch has been submitted as part of a query.

This does NOT preselect the correct branch when IndependantBranches
is turned on.

I also added a template variable which is true if a query has
been submitted with a branch or a category so that the extra
form fields can be displayed, reminding the user that they
added limiters to their query.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

(bug #3737) fix title search in order history

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 15334926adf722083f03553eed575d056e907ad1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5589: Remove duplicated Exports in Suggestions.pm

Rather bizarrely Suggestions.pm was setting up @EXPORT, @ISA
and $VERSION twice. Have removed one invocation

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for Bug 4984, Invalid XHTML in staff client search results

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Additional fix for Bug 3550, Use GetRecordValue to get the subtitle

- Adding subtitle to Hold Ratio report output
- Sorting by default on ratio, descending
- Adding author
- Removing description

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Follow up on fix for Bug 5570, item types not showing on other editions

Fix for the staff client.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for Bug 5570 - item types not showing on other editions

The item type which shows on other editions is the biblio-level
itemtype. XISBN.pm had some item-handling code, but I'm
removing it because it is unused. The editions tab should
now display item type only if item-level itemtypes are not
enabled.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5480 Some usual UNIMARC cataloguing plugins doesn't work anymore

[3.2] To be applied

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5583 Rename fieldnumber to blocknumber

Variable fieldnumber does not refer to a field
It is the ISBD block number
Rename to blocknumber
Say what we mean adds to maintainability

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5582 Pass tag nums as a string to Doc Popup

Add quotes around tag number when calling doc popup
Otherwise numbers with leading zeroes are interpreted
as octal e.g. 020 returns doc for 016

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug 5585: fix display of current date on receipts and slips

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 80641597e548d3757c8b5c9274b85cc75059415b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Removing OPACNoResultsFound Enhancement Syspref

This pref was accidentally added during non-English syspref updates.
It is properly a part of enh bug 1997 which will not be included in
the 3.2.x branch.

Fix for Bug 3347 - Inconsistencies with tables in opac-shelves.tmpl

Changes to list contents view to make it consistent with search results

My intention is to make the OPAC more consistent in the way it displays
lists of items, whether it be in search results, lists, etc. This patch
adds data to the list contents output and reformats it to that end.

The other significant change is the removal of jQuery table sorting.
Since list contents are both sorted and paginated on the server
side. Adding a client-side sort to one page of many doesn't make sense.

Other changes include:

- Change "Your lists" to "Your private lists"
- Remove "sort by" column because it seems unnecessary
- Adding logic to control display of count (item or items
  rather than item(s)
- Styling pagination bar and placing at the bottom of the page,
  consistent with other instances of pagination navigation

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for Bug 4950 - checkbox should be removed when can't place a hold

- Hiding form controls for titles which can't be placed on hold
- Highlighting hold blocked message for better visibility
- Showing table of blocked holds even if none can be placed on
  hold: hiding the table hides the messages explaining why
  titles can't be placed on hold
- Removing an unused line from the script which was leaving errors
  in the error log
- Consolidating error messages into one box which were displaying
  in two.
- Correcting link to unused opac-userdetails.pl

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for Bug 5571 - tags as bulleted list too long

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug 5419: make reason checkouts blocked stand out

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f379638c9d1921e8663e2c8c5bfabe27af42a666)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug 5497: make all library fields available to circ receipt/slips

This allows the receipt template to be more readily customized
to include the library's address, phone number, email address, etc.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4daef50c7a554e6ef2b83e29ac877a70366bddfa)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for Bug 3918 - Add to order lists inconsistent

- Added new include to contain add to basket options
- Minor markup corrections

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5375 (Update date/time last transaction (MARC 005) when saving authority record)

Update 005 date/time when saving authority record for MARC21 and UNIMARC.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5374 (update transaction date when saving biblio) RESENT with small fix

Currently, the plugin marc21_field_005 and its unimarc opponent fill field 005
when this field gets focus. This implies that updating a record without
touching this field does not update 005.
At the same time, a user could accidentally delete a character in the 005 when
having focus. This mutilated field value will be saved however.

I would suggest to add a few lines to ModBiblioMarc in Biblio.pm to ascertain
that adding or updating a record always updates 005 in marc21 as well as
unimarc.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug 5562 change 'issues' to read 'checkouts'

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c71a36fd27ece805705161149bb885aa3e4decdd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug 5563 change note about cover images on enhanced content

on the enhanced content tab of system
preferences it says that Koha will pick
the first cover image - but in fact it
shows them all - that note needs to be
updated to properly warn of the expected
behavior.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 606f9784199722bd661d60be1944aa97c6a8971c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Reimplemented fix for bug 5556, OPAC does not display the type of authority

Formatting Janusz's suggested changes as a patch.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Reimplement fix for bug 5557 - Link to logs for user with view_system_logs permission

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Updating Version Number to 3.02.02.001

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>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug 4942 - add validation to patron administration

This validation requires an enrollment period or a date to be provided
before the form will save, which will prevent invalid dates getting into
the system.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug 5045 - Help works even when the referrer is being stripped

This fix puts the URL of the source page as a parameter to help.pl,
which will override the referrer value, if it's provided. This deals
with people sitting behind proxies that strip the referrer information
out.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5550 - correct filename referenced in docs

Spotted by Reed Wade.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5526: Follow up patch removing a warn statement
(cherry picked from commit c5b55d1c40a967ed3676f9e85a6ec002074d13e7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for Bug 5526, List of lists should be in alphabetical order by list name

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit cdbf872bd5dcc99b6e93ab920a0ef17a7592c8c9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5542: Availability code commented out - Uncommenting

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for bug 5451, can add tags with userlogin turned off

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(Corrected to apply to 3.2.x)

Bug 5531: adding some missing sysprefs
(cherry picked from commit 2124887428afc6c9198404241a1afd93c456dc8f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

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
(cherry picked from commit 0482e534519dafb2ff37177f117534d77bc4cbeb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5531: further fix for fr-FR files
(cherry picked from commit c9db18bf0b084136451ee078cab7c9fffd53f615)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Based on Chris Nighswonger french unimarc_standard_sysprefs.sql
(cherry picked from commit 409dcdfe6aaf3a6d2d90918f54a48c2c326f5f85)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 4473: Making a change to TmplTokenizer.pm to stop translation error
(cherry picked from commit f5e65148ace51060f739fce4c26b772d09f35ba6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5143: Help file revisions per Owen Leonard

Nice changes, thanks. :)

LR

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5489: Send hold email to branch email address if it exists instead of koha email address

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for Bug 3262 - OPAC needs syspref to show homebranch on detail page

Revised version of Liz Rea's fix adding homebranch by default. This
revision displays the homebranch name instead of branchcode.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5446 Fix a bug introduces by previous patch

When AcqCreateItem was set to 'cataloguing' there was no items fields in the
acq web form to validate in JS...

Alert commented.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9a048e2b12e2004fad51b5b0db3187a8eb6c2a04)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 4286 Allow receiving if subscription enddate not set

HasSubscriptionExpired is not a boolean return it may also
return that a valid subscription enddate is not set
This should not block receipting of issues

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for Bug 5518 - Add to shelf icon doesn't appear in OPAC results page

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Follow-up patch for Bug 4908, show patron's home library in OPAC

Adding home library to list of details when OPACPatronDetails pref
is set to "don't allow"

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for Bug 5470 - improvements to results display in the staff client

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug4891 - sort facets in search sidebar (OPAC and staff client)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for Bug 3987 - New Sys Prefs Branch - Alphabetize prefs in sections

Adding jquery tablesorter, sorting on sys pref variable by default

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5510: prepend output with system name

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Deleted old sample budget sql-data for Ukrainian and Russian

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for Bug 4997, More searches menu not on OPAC MARC and ISBD detail pages

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for Bug 4946 - hold warning needs rewording

This patch improves the phrasing of several messages by
breaking the message variable into distinct parts for more
natural-sounding warnings when:

- Checking out an item on hold for another patron
- Checking out an item which is waiting for another patron
- Checking out an item which is checked out to another patron
- Checking out an item which is checked out to this patron
- Checking out to a patron who has too many checked out

I would appreciate special attention to my changes to the
TooMany function in Circulation.pm to make sure I handled
it correctly.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for Bug 3859, Attach item clarification

- Modifies hint text
- Adds handling for BiblioDefaultView preference
- Markup and CSS tweaks

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5294 - Unescape vendor name when pushing back

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 750a8a8dae8a445d678f6645b6cbd3405e27924d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug 5398: make additional pages in staff interface obey noItemTypeImages

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0560aa768cc1b128891259982a25ee2450470e79)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug 4826 change 'add basket' to 'new basket'

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Updating Version Number to 3.02.02.00

Updating version number for 3.2.2 release.

Bug 5506 Shorten .po file comment lines

In opac/staff templates .po files, we have comment lines contextualizing
extracted text in templates. Path to template are absolute. For example, we can
have:

  #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/...
     modules/cataloguing/addbiblio.tmpl:585

The first part of the pathname is useless. With this patch, we just keep
relative path to tempalte from Koha template main directory. The above example
becomes:

  #: intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl:585

To be applied on [3.2]

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5331, fixing Italian sysprefs.sql
(cherry picked from commit 2814b535e6672e972d954e823f611378393f624b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5531: Fixing german sysprefs file
(cherry picked from commit e20895a9a783eca7a1b8892da291dceac90a6f85)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

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>
(cherry picked from commit a45eb8fb7864ed2c41abb449b1671cf715cab3a7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Adding Translations Updated to Release Notes for 3.02.02.000

Updated .po files for 3.2.2 inclusion
(cherry picked from commit 072f03b2c1399d559c45d89218b68150d71f02d2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Beginning of Release Notes for 3.02.02.000

Bug 2965: Follow up - fixing problem with barcode field

The scanned barcode stayed in the checkout field instead of being
deleted after checkout or confirmation.

This patch reverts the template change, so the barcode is deleted.

Please test!

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Add .packages file for Ubuntu 10.10

Ubuntu 10.10 has all of Koha's Perl dependencies packaged (aside from a
couple small version issues); add a dpkg --set-selections compatible
file to reflect that.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 88d3d09897aa8624b20ad5762b0c06699caa766e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 5506 Improve translation script

[1] Update all .po files in once with this command:

    translate update

[2] For sysprefs, quoted text wasn't properly retrieved from .po file and so
    quoted strings wasn't translatable.

[3] The install process (translate -p install de-DE) was rewriting syspref
    .po file which isn't required anymore.

MUST be applied to [3.2] to get all syspref proper translation.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for 5143, now with IE debug removed

Need to set up keyword to marc mappings for subtitle, parts, numbers for this to work

adds:
 - the subtitles into the title link (originally Chris Cormack)
 - barcodes for every listed hold
 - denoted which items were only item and which could be filled by any item on that bib.
 - added id's to every column for ease of jquery suppression of data (example: publication data or patron column could be suppressed)

[EDIT]: Added missing template variable
[EDIT]: Converted table cell IDs to classes. Having multiple identical IDs is invalid.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 3789 Set off shelving location in staff and OPAC title display

Koha puts the shelving location immediately after the library name in the
"Location" column of the title display.  If the library name and/or shelving
location is wordy, the two can run together and a user can overlook the
shelving location.  I've added a new span class to the staff and OPAC .css
files and applied it to shelving location in both templates.  This puts the
shelving location on a separate line and in italics, to make it stand out from
the library name.

[Edit] Re-implemented some changes which wouldn't merge after so long

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 4937: Fixes XHTML in the pagination links of a saved report.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

bug 4977 add missing order links to 'no results found' page

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Revert "Ergonomy improvement in smart rule management"

This reverts commit fefd158f424939fc473f54a2ffe4ee0e39ffba08.

This was causing quite major errors, read the details at bug 5496
(cherry picked from commit 3705965cd71bc30ed4ba325cde115764fa1afe44)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

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 c4ea43f3dbe1f8d36086944d95c67a20c9caa894)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

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 9c8f934a2c2c3808a2a5502c839b9cb087231ec5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Fix for intranet-tmpl had one /TMPL_IF to many
(cherry picked from commit e83beb048201fdc3be9286006173973eb73d6ce0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

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 34155975fc805059635f520c6cedfe927b9fd7fa)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

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 21c516601cf1bba2ae22a3448898a2efed159b8a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

Bug 2965: Allow due date in the past - small template fix

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

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 00dd0ae6276e9ea9d744d42b3871a4d35a70a1d7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

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 4d1762f5ec451729d74e3fa6282e1726a0a74969)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

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 21cdd2feb45406728faa395cd457670c4aef2bb3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

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 51dc5b060beb4243b364da9b3df81c9454107175)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

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 40e2b5421a478ec2e9251798b34858eefa2ef114)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>