Commit Graph

15116 Commits

Author SHA1 Message Date
Owen Leonard df5cfbcb37 Bug 7135 - in addbiblio, make save button floating to have it on always on screen
Follow-up fix corrects z-index of toolbar so that "More" menu
is not hidden behind it.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit edd8e5767d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-14 12:45:25 -05:00
Owen Leonard fdc0ad7b92 Bug 7202 - z39.50 search on bib edit not working
The pop-up menu's "Import" link did not correctly pick
up the existing record's biblionumber, if present.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
1) Searched for a record in your catalog
2) Edit > Edit record
3) Start Z39.50 search
4) Pick a new record with different title for import
- using the import link at the end of the table line
- using the pop up menu's import link
5) Save and check if a duplicate was created

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 7fd5098b98)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-14 12:45:11 -05:00
Robin Sheat 26d5974b49 Bug 7197 - add a Spanish readme file to the packages
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
I don't speak spanish, so my signoff is just a technical view of the patch
(cherry picked from commit 373e49576d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-14 12:44:57 -05:00
Paul Poulain 27042032c0 Bug 7164 follow-up history.txt and perlcritic compliance
* in history.txt, added a tab for Stephane Delaune, for display consistency
* fixed a small mistake in about.pl that was resulted in a perlcritic failure
(cherry picked from commit 82ed469632)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-14 12:44:39 -05:00
Paul Poulain 766ee688f7 Bug 7164 minor follow-up
tab for Stephane Delaune, for display consistency

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-14 12:44:17 -05:00
Mason James 80ef7efa4a Bug 7164 - add Koha history timeline tab to 'About' page
Includes follow up by Chris Cormack fixing formatting in docs/history.txt

[MINOR EDIT] Added html filter to output for validity's sake

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
(cherry picked from commit 6bc414a3d4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-14 12:42:51 -05:00
Ian Walls 665133b10a Bug 7160: paying fines throws error
The call to ReturnLostItem in C4/Accounts was not properly namespaced to
come from C4::Circulation.  That prefix is added to the call.

To test:

Pay a fine, and confirm the error disappears (and the fines is still paid)

Signed-off-by: Brendan <brendan@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit afd2098f3c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-14 12:42:31 -05:00
Brendan beede5bf60 Bug 7143: Follow up patch for Updating about.tt
I had a typo where I put Ian Walls as Release Manager - I have fixed to QA.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I put in another missing space for Colin Campbell.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 04f8dfec9b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-14 12:42:15 -05:00
Brendan 432179b5cd Bug 7143: Updating About.tt for Ian Walls, Chris Nighswonger and Paul Poulain
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit c3494eaaed)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-14 12:42:00 -05:00
Chris Nighswonger 3235e0a127 Release Notes for 3.06.02.000 13 Dec 2011 20:00:36 Z 2011-12-13 15:00:36 -05:00
Chris Cormack e6e7757f98 Bug 7139 : Log addition and deletion of circulation messages
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Changed the two action names into caps no-spaces.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 288c1a768d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 15:00:12 -05:00
Owen Leonard f66250b7ee Fix for Bug 7135: Save button options
This patch adds a jQuery plugin which will cause
an element to remain "fixed" at the top of the
screen if it would otherwise scroll up out of
view.

The license of this plugin is "This plugin is as free as fresh
air. Feel free to use it anywhere.".

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
I tested this on Chrome OSX
saving works
changing framework works
scrolling works, obviously.
tabbing through the records works
z39 button works as expected

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
updated patch comment about licensing of the plugin
(cherry picked from commit da916a368c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 14:59:53 -05:00
Owen Leonard dc50e463b7 Fix for Bug 7123 - barcode should be one word
Other fixes thrown in for good measure:

- Adding data to the results table to match output of returns
- Better checking of error codes in the script to control
  output of error messages (don't show error box when there
  are no errors).
- Move some errors/messages from the right column onto the
  top of the page to match Koha's established pattern.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit fff32393cf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 14:59:10 -05:00
Owen Leonard 4de9ab33eb Fix for Bug 7121 - remove comma on items info
Because I can't just take out one comma, I reworked
the way moredetail.pl fetches and outputs biblio
data based on the way it does in detail.pl. This
allows for simpler output in the template.  In the
process I've added subtitle information to the
template.

Revision adds line break for readability

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit e65dc43af7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 14:58:51 -05:00
Ian Walls c49e42103c Bug 7093: placeholds for suggestion table not working in notices
In parseletter_sth, the suggestions table was defined twice.  The first time (which
is the only definition to get called, as it matches first then exists), defined the
primary search keys as borrowernumber and biblionumber.  This is incorrect; the only
usage of the suggestions table tokens is with suggestionid as the key.  This is defined
further down the if/then chain.

This patch removes the erroneous sth query definition.

To test:

1.  Place a suggestion with a patron account with a configured email you can access
2.  Approve or reject it
3.  Verify the message you receive contains suggestion tokens (like title, author and reason)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Suggestion mails for accepted, rejected and ordered look good now.
I couldn't test the suggestion mail AVAILABLE (bug 7096), but
assuming this would work too.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6e497471e3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 14:58:29 -05:00
Katrin Fischer 41c5937615 Bug 6935: Correct XISBNDailyLimit for new installations
This corrects the value of XISBNDailyLimit in the system preferences
installation file to 999 instead of 499.

The file was missed in an earlier update, so new installations
have different values than older installations that were updated.

Another patch with a database update is needed. Sending this patch first,
until it's clear how database updates will work for 3.8.

To test:
1) Recreate your database from scratch
2) Check your system preference XISBNDailyLimit shows 999 instead of 499,
matching the description of the system preference.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 61102d16d1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 14:58:10 -05:00
Alex Arnaud f901dc3a45 bug 6917 Dates filters doesn't work when they are not selected on row or column
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 9855b834b6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 11:42:49 -05:00
Owen Leonard 21c34e5712 Bug 6865 - Replace image-based gradient backgrounds with CSS3 gradients
Replaces image-based gradients in:

OPAC search bar
OPAC submit buttons
OPAC lists menu background
OPAC alert and message boxes
OPAC user menu tabs
Staff client alert and message boxes
Staff client side menu tabs

Removes obsoleted background image files.

Cross-browser background-gradients created using:
http://www.colorzilla.com/gradient-editor/

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit da6c532074)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 11:42:31 -05:00
Marcel de Rooy 6d241c8732 Bug 6803: Replacing remote XSL include
Replacing remote include by local one.
This resolves possible connectivity issues (see Bugzilla comments).
Should theoretically be safer and faster too.

December 7, 2011: Rebased and included nbsp entity definition (bug 7141).

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 5db3397041)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 11:42:13 -05:00
Nicole C. Engard 189ccf555d Bug 6716 Update biblio & deletedbiblio tables
The comments on the biblio and deletedbiblio table
didn't mention the MARC21 subfields. This patch adds
that documentation in.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit c30f0e8e89)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 11:41:55 -05:00
Nicole C. Engard b87c3d08eb Bug 6716 : Categories table
This patch documents the patron categories table in Koha.
There are a couple fields marked unused and a couple that aren't
documented because I wasn't sure:

* dateofbirthrequired
* bulk

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 3aa00f6313)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 11:41:39 -05:00
Nicole C. Engard 9a1344c135 Bug 6716: Document biblioitems and deletedbiblioitems
This patch documents the biblioitems and the deletedbiblioitems
tables.  There are many fields left undocumented because I didn't see
information in them, but this is enough of a start to be helpful to
those writing reports.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 66b5175aa5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 11:41:24 -05:00
Nicole C. Engard ebb653b27f Bug 6716 Document deleteditems table
This patch documents the deleted items table. Some fields were left
undocumented because I was unsure of what data was stored there:

stack - might be linked to shelving number, but need confirmation
paidfor - pretty sure this is unused, but don't want to document it that way

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit c9441f4895)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 11:41:09 -05:00
Nicole C. Engard 4afb0d058b Bug 6716 - Document Items Table
This patch documents the items table. Some fields were left
undocumented because I was unsure of what data was stored there:

stack - might be linked to shelving number, but need confirmation
paidfor - pretty sure this is unused, but don't want to document it that way

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 12031f5b8c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 11:40:50 -05:00
Nicole C. Engard 354c953ab5 bug6716: documenting reserves and old_reserves tables
This patch documents the reserves and the old_reserves table.
Note that a few fields are marked unused: notificationdate and
reminderdate. Also two fields are left undocumented: lowestPriority
which never seems to be anything other than 0 and constrainttype which
is either 'a' or 0, but there doesn't appear to be any explanation
as to what each stands for.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 156f45fe21)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 11:40:34 -05:00
Christophe Croullebois c70c748d03 Bug 6663: Features for holidays.pl with datepicker
Allow to select a range between 2 dates and in one "submit" creates holidays only on these days.
I have added also Holidays repeated yearly on a range.
On suggestions I have added a datepicker for "To Date".

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 806fac60f4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 09:40:41 -05:00
Paul Poulain 1b88fabf01 welcome Fabio, you're 165th !
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 09:39:21 -05:00
Frédéric Demians 3a3bf0c020 Bug 7245 Tables population with mandatory data for italian installation
Formatted patch from Fabio Tiana <fabio.tian@gmail.com>

While installing italian and UNIMARC version of Koha via web installer, two
errors occur: ERROR 1136 (21S01) and ERROR 1064 (42000). Some tables can't be
populated with mandatory data.

Errors are related to files sample_itemtypes.sql and unimarc_framework.sql
(/usr/share/koha/intranet/cgi-bin/installer/data/mysql/it-IT/ and
subdirectories).

Signed-off-by: koha <koha@kohabase.l.i>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a5241093b3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 09:37:45 -05:00
Chris Cormack 5e57830a18 Bug 7215 : The Module changed, but the tests weren't updated to reflect that
Updating the test

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 9c66c42764)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 09:37:26 -05:00
Brendan eb4d2a19d1 Bug 7215 - changed callnumber PRESET field to itemcallnumber
Fixes problem with creating new labels - before it populated with callnumber and not itemcallnumber

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit b255d091fd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 09:35:30 -05:00
Katrin Fischer 8a6fdae865 Bug 7082: Template improvements for better translatability
Problem:
/cgi-bin/koha/admin/aqbudgets.pl
<label for="show_mine">Show my<br /> funds only</label>

This gets broken into 2 strings for translation which makes it very hard for
translators to make sense of it.
Patch removes the line break.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
This patch removes the linebreak and has no ill effects that I can see, even
on a small screen. I'll attach before and after screenshots in Bugzilla.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 57800f2af2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 09:30:09 -05:00
Galen Charlton fbe94b0314 bug 7198: show patron name in overdue list even if name column is null
If the surname or firstname of a patron is NULL, the MySQL concat()
function (properly) returns NULL, leading to the patron name not
displaying in the overdue report.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 18e06ecf0b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 09:09:50 -05:00
Liz Rea 3af67c1df4 Bug 7159 - Add branchcode to circulation.pl search (take two, revising with Owen's suggestion)
I know there's talk of getting rid of this patron search method, but I had a
request for this and so here it is.

To test:
verify that branchcode is displayed on patron search results from
circulation.pl.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 4fad65cc26)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 09:09:27 -05:00
Owen Leonard 43733e7e64 Fix for Bug 7124 - back to search wrapping in lower resolutions
Maybe not a complete fix, but hopefully an improvement. I couldn't
prevent it from wrapping at smaller browser widths, but I was
able to change the style so that when it does wrap it's a little
more readable.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a98219dc34)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-13 09:08:57 -05:00
Frère Sébastien Marie a94573f58d Bug 7316 - Missing escaping in search results
Two parameters are now escaped in title (html element):
 - query_desc
 - limit_desc

This is a security correction against XSS.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 48173560ba)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-09 10:10:39 -05:00
Owen Leonard d9d9cdbad0 Fix for Bug 6818 - acquisitions basket groups could use some design work
I've made changes to the basket grouping interface to bring it
in line with other interfaces in Koha. I think it's better to
keep things following a consistent pattern.

On the page which lists basket groups:

- Basket groups listed in a table instead of as custom-styled lists
- Buttons use standard style
- Tabs are generated by jQuery

On the page for managing baskets in a group:

- Markup has been revised to be more consistent with established
  patterns.
- Corrections have been made for validity

On the basket view page:

- Display of data has been streamlined a little bit
- An option has been added to the "Basket group" dropdown
  for adding a new group
- Markup has been corrected for validity and consistency

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
1) Basket group page
The blue is gone and the new buttons  are much better
readable than before.

2) Basket grouping page
Works.

3) Basket view page
I like the new option to create a new group from here.
Nice improvement to the workflow!
I removed a spare 'td' from line 264.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c1dbd7bbbf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-09 09:52:10 -05:00
Paul Poulain 92c5d9ade4 Bug 6679: fix missing use strict
The 3 files had use strict missing. The patch add the use strict and modify what's needed to work with it
4XX.pl also has some perlcritic fixes:
Variable declared in conditional statement at line XXX, column 9.  Declare variables outside of the condition.  (Severity: 5)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-09 09:51:55 -05:00
Robin Sheat 8ff49436fa Bug 7028 - updated the koha-conf.xml template
Now it more closely matches the one that's distributed in /etc

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(not tested. I confirm the code is clean, and tests are not broken)
(cherry picked from commit 038a2cf5d6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-09 09:51:27 -05:00
Chris Nighswonger 950924bc3e Release Notes for 3.06.02.000 08 Dec 2011 19:48:55 Z 2011-12-08 14:48:55 -05:00
Chris Cormack cbc13b7070 Bug 7141 : Changing test to match new formatting of xsl style sheet
http://bugs.koha-community.org/show_bug.cgi?id=7141
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
verified tests pass

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit ce59911932)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-08 14:46:32 -05:00
Chris Cormack 12ea57b606 Bug 6679 : Adding license statement and stopping declaring variables in a conditional
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-08 14:43:05 -05:00
Chris Cormack c5e6163efb Bug 6679 : cataloguing/ now passing critic tests
Declare variables outside of conditionals
Don't use prototypes http://www.modernperlbooks.com/mt/2009/08/the-problem-with-prototypes.html
Use ":encoding(UTF-8)" to get strict validation.

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-08 14:43:05 -05:00
Chris Cormack a8274cdfde Bug 6679: catalogue/ now passing perl critic tests
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-08 14:43:04 -05:00
Chris Cormack 9c3bbbea56 Bug 5604 : Follow up for missing image
When doing icons, there is a test for them please run

perl xt/author/icondirectories.t

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
see jenkins complaining: http://jenkins.koha-community.org/job/Koha_master/lastUnstableBuild/#showFailuresLink
(cherry picked from commit e615516952)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-08 13:56:00 -05:00
Chris Nighswonger 3ba8234c63 Release Notes for 3.06.02.000 08 Dec 2011 16:17:37 Z 2011-12-08 11:18:04 -05:00
Owen Leonard b99e530e1a Bug 7259 - Show a count of items pending approval on staff client home and tools pages
- Correcting permissions checks on the home page
- Adding default parameter (1)  to numberofreviews subroutine

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8f0c10ef1b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-08 11:13:29 -05:00
Owen Leonard 93e5a0b292 Bug 7259 - Show a count of items pending approval on staff client home and tools pages
This patch adds count indicators on the staff client home page and
the tools page for the number of items pending approval. On the
home page this includes suggestions, comments, and tags. On the tools
page a count of pending comments and tags is shown.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Counts appear for all types of actionable items listed, all are clickable through to the proper place.

Nice work!
(cherry picked from commit d3c02c6bb6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-08 11:13:29 -05:00
Katrin Fischer 87aa43162d Bug 7116: White space on item form for bulk ordering from staged file
Same fix that was done for normal order page and receive page.
Moving the style element for hiding the subfield into the li tag.

AcqCreateItem = on order

To recreate:
1) stage a marc file with 1 - many records
2) make sure you have an acq framework with hidden fields in 952
3) create new basket
4) order from your marc file
5) check item form below the record list for white space

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Followed the steps outlined by Katrin above. Before the patch there are gaping
holes left by the hidden fields. After the patch the holes are gone.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 5d6f770c18)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-08 11:13:16 -05:00
Jon Aker 9c5ba4fbe0 Bug 7020 Items with no checkouts report does not output call number, barcode or item details
When running the Items with no checkouts report and outputting to
screen, the results do not include any identifying information for
the items. The only information listed is the item count and the
branch location.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 90ddf1b254)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-08 11:13:10 -05:00
Colin Campbell 5bb0afe169 Bug 6987 Make return from Overdues::GetFine consistent
If there is not a fine amount return zero not
undefined or other undefined behaviour

Use more meaningful var names for readability

Signed-off-by: Sophie Meynieux <sophie.meynieux@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d39262e61d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-12-08 11:13:08 -05:00