Commit graph

2782 commits

Author SHA1 Message Date
4bfeac67ed Fix for Bug 4436, reserve should say 'hold'
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 10:09:29 -04:00
Garry Collum
84dada43d3 Bug 2889: Added zebra striping to the table in dictionary.tmpl.
Also fixed a couple of minor XHTML errors.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 09:24:03 -04:00
Colin Campbell
cb031bace9 Bug 2889 Remove toggle in boraccount display
Also remove the reverse column if no contents to be displayed
( otherwise looks like a markup error )
Rationalize the main loop now toggle not required

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 09:20:50 -04:00
Michael Hafen
ea0c76af7f on checkout ask for confirmation if borrower from different branch
With IndependantBranches on check that the borrower is from the same branch as
the librarian.  If not then ask for confirmation.  This check is skipped for
SuperLibrarians.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 09:17:19 -04:00
d08cd6bfc0 Merge branch 'bug4036' of git://git.librarypolice.com/git/koha-galen into to-push 2010-05-03 07:46:33 -04:00
d575278cba bug 4036, 4405: overdue and fine day block improvements
* Adopted wording suggested by Kyle Hall for the
  USERBLOCKEDREMAINING and USERBLOCKEDOVERDUE circulation blocks
* Updated IsMemberBlocked so that if a patron has accrued
  fine days, that will be tested for first before testing
  to see if the patron has current overdue items; this solves
  a problem introduced in the patch series for bug 4505 where
  accrued fine days would be ignored if (a) the patron has
  current overdue items but (b) the library has chosen to
  set the OverduesBlockCirc syspref to noblock.
* Now correctly assigns the USERBLOCKEDREMAINING and USERBLOCKEDOVERDUE
  blocks; prior to this patch, they had been swapped.

FIXME: IsMemberBlock ought to be split into two functions

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:46:26 -04:00
7bfd0461d4 bug 4396: remove reerences to bi_notforloan
These were causing the OPAC details place hold button to disappear
in circumstances where a bib-level item type was set to a non-loanable
item type even when item-level_itypes was on.

This change does mean that if item-level_itypes is not turned on,
the hold button will now appear for bibs whose bib-level item type
has its not-for-loan flag set; however, if this is a problem, a
better long-term fix would be to use CanBookBeReserved() instead.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:45:19 -04:00
Garry Collum
caec9fae40 Bug 4432: Fixes XHTML in serials-edit.tmpl.
Replaces a reference to an undefined variable, num, with a defined variable to create unique ids.

Also adds zebra striping to the table.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:35:41 -04:00
Garry Collum
d2d2acd4a6 Bug 4200: Fixes adding a member to a routing list after filtering results.
Adds a hidden field for subscriptionid to the filter form.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:35:40 -04:00
b7a5bbefe8 bug 4505 followup - template changes
* fix syntax error
* adjust wording - "patron" instead of "borrower"
* handle case where overdue items should require
  confirmation of loan by operator
* fix typo in system preference template

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 10:59:05 -04:00
Chris Cormack
86fbe2ec21 Bug 4405 - Overdues block check out
[Documentation note by RM:

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

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

]

Squashed commit of the following:

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

    Tidy up ready to send patch

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

    Bug 4405 - tidy up

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

    Bug 4405 - Overdues block checkout

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 10:39:11 -04:00
Henri-Damien LAURENT
208b835310 MT3499 : cataloguing authid not reported
authid would not be correctly updated in bibliorecord.
Biblio record would not receive the correct authid in subfield 9
but some erroneous data

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 09:11:47 -04:00
Garry Collum
d85f607a6a Bug 4428: fixes minor XHTML errors in shelves.tmpl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 09:06:46 -04:00
3691a134e6 Fix for Bug 4409, I18N/L10N tab not highlighted
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 17:05:43 -04:00
23b52df1d7 Markup corrections to fix for Bug 4248
- Missing "=" in attribute
- TMPL_IF nested in HTML tag, which breaks translation script

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 17:05:41 -04:00
Matthias Meusburger
b0cd6429b0 Adds missing hint for upload-type syspref
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 06:50:26 -04:00
Sébastien Hinderer
343cc42eea Fix typo admin/in brnaches template.
The branch notes were not displayed because the variable was called
branchnotesl rather than branchnotes

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 06:47:46 -04:00
Nahuel ANGELINETTI
ad01b57bcc (bug #3798) fix changing request branch
a variable was wrong in template.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 05:54:04 -04:00
Nicole Engard
50375be1f2 BUG 3715 added state to label
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 00:15:31 -04:00
Nicole Engard
f316cdc28f bug 3981 follow up change GST to 'Tax Rate' in EN-US
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:53:19 -04:00
Nicole Engard
8172699831 bug 4170 updated overdue rules
I added a note that this tool should not be used for
advanced notices. The fact that the Delay is required
is actually true based on the tests we did - which
is another bug.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:51:46 -04:00
Jean-André Santoni
a5273d7ebb Added "ordered" column in acqui-home budget display
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:47:31 -04:00
Paul Poulain
4ebf32b970 MT2588: minor changes in column order & display
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:32:40 -04:00
Matthias Meusburger
1da207acf6 MT2345 : Changes on contracts
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:26:55 -04:00
Jean-André Santoni
06bd4fcae5 Hide basket actions if no basket
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:26:52 -04:00
Jean-André Santoni
5546383f70 New contract button
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:25:25 -04:00
04cafc1427 Improve OAI Server MARC21 and UNIMARC XSL
Dublin Core schema name space was repeated for each field
as attribute rather than at <oai_dc:dc> level. This reduces
significantly the size of OAI server responses.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:09:04 -04:00
Henri-Damien LAURENT
47805da9ac Fixing members order when string searched
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:59:02 -04:00
Garry Collum
8fd9eed2fc Bug 4285: Intranet bib display links to opac-search.pl, instead of catalogue/search.pl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:46:34 -04:00
Kyle M Hall
9a989c9e58 Circulation - Disable Barcode Field If Item Needs Confirmation
When issuing items, if a confirmation screen comes up,
another item can still be scanned into the barcode field.

If a librarian does not notice the confirmation dialog,
he or she may continue scanning items without confirming
the issue and thus give a patron an item without it actually
being issued to the patron.

This patch disables the barcode field until the confirmation
question is answered.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:44:49 -04:00
Matthias Meusburger
6532f712b7 MT2621 : Fix simple barcodes display
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:42:10 -04:00
4d50b4f4f0 Fix for Bug 4271, Offer choice of destination for save biblio operation
A follow-up to the fix for Bug 4121, the user should be able to control whether
the action of saving a bibliographic record takes them to the add item screen
or the detail screen, independently of whether they are adding or modifying the
record.

The addition of a "split button" would leave the default action in place if the
user clicked the "main" part of the button. Clicking on the menu would give the
user specific choices.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:39:10 -04:00
Matthias Meusburger
99a84a6ee0 MT 2553 : Adds a Cancel button
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:30:07 -04:00
Katrin Fischer
ac037be307 Bug 4404: Untranslated strings in staff search result page
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:23:49 -04:00
Colin Campbell
e7bdbd0583 Bug 4248 Rework Cities dropdown for members entry
Garry Collum's patch correctly identified the core flaw in operation
looking closer revealed some other flaws (2 "blank" options, some vars
and documentation belonging to a superceded version, etc.
Changed GetCities to return a structure rather than the messy two returns
Let the template do the concatenation and removed the CGI::Popup

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:20:36 -04:00
Nicole Engard
977db7c45e update circ/fine rules help file
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:16:19 -04:00
Henri-Damien LAURENT
e40728f4d5 MT2464 : branch_transfer_limit.pl usability change
Adds branchnames along with branchcodes for display

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:01:27 -04:00
Matthias Meusburger
c8bf22893e MT 2553 : Adds background job for items batch modification
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:57:04 -04:00
Matthias Meusburger
7f3df2735d MT 2269, Follow-up : Granular permissions for items batch modification and deletion
Change of permissions names
Change of branch title in guided reports
Add a "Select All / Clean All" on items selection
Add a link to item when a given item cannot be deleted

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:55:39 -04:00
Matthias Meusburger
4dd2086deb MT 2269 : Do not display all the items if there is a large amount of items
Also fix the barcode not found problem (due to empty lines)

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:52:15 -04:00
Nahuel ANGELINETTI
67f9ea0264 (MT #3007) update hold transfer slip datas
This patch add information to hold transfer slip:
 * itemcallnumber
 * location
 * waiting date

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:42:43 -04:00
Jane Wagner
ffd8c7602b Bug 4353 Add div tags to staff advanced search page
This patch adds div tags to every section of the page, to allow jquery to find them.

Divs added:  basiclimits, language, pubrange, subtype, availability, itemtypelist, currently-avail, select-libs, and sortby

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:34:43 -04:00
Alex Arnaud
4907f5806c (BUG #4357) Closing a basket and creating baskets group
when closing a basket without creating a basketgroup, the group is still created => corrected
+ replace "create a basketgroup?" by "create a purchase order now?" in confirmation step.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:25:55 -04:00
Alex Arnaud
e42e92b42e (BUG #4355) Basket.pl: withdrawal of the "can not close the basket" button
Basket.pl: withdrawal of the "can not close the basket"button. only Uncerain
prices button is displayed. And removing the "??" in the price columns,
replaced by "uncertain" in rrp column

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:25:13 -04:00
Alex Arnaud
2f67f7c610 (BUG #4352) Adding a popup at removing of a basket
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:25:11 -04:00
Alex Arnaud
97f6e49020 (BUG #4351) The save button don't really save. Renaming in Next button
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:25:10 -04:00
Alex Arnaud
911eb24b16 (BUG #4350) parcel.tmpl: add Translatable text
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:25:09 -04:00
Alex Arnaud
a2007e1f48 (BUG #4349) In parcel.pl: replaces All x items are displayed by x items are displayed
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:25:06 -04:00
Alex Arnaud
c496327edc (BUG #4348) parcel.pl: list with duplicates orders after a clearfilter
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:25:05 -04:00
Alex Arnaud
c35d6e6bd4 (BUG #4344) Basket.pl - remove the line "contract number"
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:25:02 -04:00