Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Apr 28, 2010
  1. Merge branch 'Bug3478' into ptfs-master

    J. David Bavousett authored
    Conflicts:
    
    	koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
    	koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
    	members/member.pl
  2. Merge branch 'Bug3507' into ptfs-master

    J. David Bavousett authored
Commits on Apr 23, 2010
  1. Merge commit 'ptfs-master/Bug3496' into Bug3496

    J. David Bavousett authored
    Conflicts:
    
    	circ/circulation.pl
    	koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
    	koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
Commits on Apr 5, 2010
  1. Merge commit 'hall/Circulation_Rules' into Bug3507

    J. David Bavousett authored
    Conflicts:
    
    	installer/data/mysql/en/mandatory/sysprefs.sql
    	installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
Commits on Apr 2, 2010
  1. @pianohacker

    Allow staff to use a temporary override login

    pianohacker authored J. David Bavousett committed
  2. Merge commit 'campbell/GranularPermissionsMaster' into Bug3500

    J. David Bavousett authored
    Conflicts:
    
    	C4/Circulation.pm
    	circ/circulation.pl
    	circ/returns.pl
    	koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
    	koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc
    	koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
    	koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
    	koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
    	koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
    	koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
    	koha-tmpl/intranet-tmpl/prog/en/modules/members/messaging.tmpl
    	koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
    	koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
    	labels/label-item-search.pl
    	members/maninvoice.pl
    	members/member-flags.pl
    	members/moremember.pl
    	reserve/request.pl
Commits on Oct 15, 2009
  1. @dlbptfs
Commits on Sep 15, 2009
  1. @colinsc @gmcharlt

    Avoid unnecessary warnings in reserve/modrequest.pl

    colinsc authored gmcharlt committed
    Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Commits on Sep 6, 2009
  1. @oleonard @gmcharlt

    Changes to make checkouts/holds display the same on circulation and p…

    oleonard authored gmcharlt committed
    …atron detail screens (Bug 3106)
    
    Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Commits on Aug 23, 2009
  1. @ranginui @gmcharlt

    Bug 3539, Adding a systempreference to hide borrowers name on the cat…

    ranginui authored gmcharlt committed
    …alogue detail page, and holds page
    
    Squashed commit of the following:
    
    commit e9dd6e1dee03fe3503f7995b57510f9edfe6b333
    Author: Chris Cormack <chrisc@catalyst.net.nz>
    Date:   Wed Aug 19 08:14:53 2009 +0000
    
        Version number
    
    commit df3ee5473e79b760a91c62b96d7ce19229e0fd27
    Author: Chris Cormack <chrisc@catalyst.net.nz>
    Date:   Wed Aug 19 08:08:11 2009 +0000
    
        French systempref
    
    commit c4b036e4e43947d7d1fb9f2e18e460788cb4e1ec
    Author: Chris Cormack <chrisc@catalyst.net.nz>
    Date:   Wed Aug 19 00:25:33 2009 +0000
    
        Code to update the database, and updating the sysprefs.sql
    
    commit f74b942c24d5e9c33a4ec0e5ac706a0e347eb1a7
    Author: Chris Cormack <chrisc@catalyst.net.nz>
    Date:   Tue Aug 18 02:07:22 2009 +0000
    
        Now hides the name on the detail screen too
    
    commit 53c80dbef88e360a4bbb78ecff3a6ca6ec401398
    Author: Chris Cormack <chrisc@catalyst.net.nz>
    Date:   Tue Aug 18 01:35:19 2009 +0000
    
        Allowing the librarians to choose to hide the borrowers name on holds
    
    Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Commits on Aug 11, 2009
  1. @gmcharlt

    Allow the reserve date to be set on holds

    Michael Hafen authored gmcharlt committed
    This adds to the interface and code the ability to set the reserve date when
    requesting a hold.
    
    Resubmit.  Sorry, I formatted it from the wrong branch.
    
    Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Commits on Aug 1, 2009
  1. @gmcharlt

    bug 2505: cleanup warnings in reserve/request.pl

    gmcharlt authored
    Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
  2. @gcollum @gmcharlt

    Bug 2553: Additional patch for the branch drop-down in Existing Holds.

    gcollum authored gmcharlt committed
    Improves previous patch through the use of GetBranchesLoop. Also adds highlighting to the Existing holds table.
    
    Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Commits on Jul 21, 2009
  1. @gcollum

    Bug 2553: Alphabetizes the drop-down lists of libraries in the Existi…

    gcollum authored Galen Charlton committed
    …ng Holds view of request.pl.
    
    Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Commits on Jul 13, 2009
  1. 1-13 Limit Shelf Holds Per Day

    PTFS authored
    Staff has the ability to set a limit on the number of Shelf Holds a Borrower can place on items on the same day.
    Set using system pref MaxShelfHoldsPerDay
    
    System pref MaxShelfHoldsPerDay is an Integer type pref where the value is the number of holds per day a borrower may place.
Commits on Jul 8, 2009
  1. 1-8 and 1-9 Max Fees/Fines/Holds in Circ Rules & Checkout Prompts

    PTFS authored
    Maximum fees/fines outstanding - circulation staff should have the ability to set maximum fines/fees, holds, etc by item type and borrower type, not just a system-wide setting. KH
    Checkout prompts - Koha should not prompt to confirm checkout if amount owed is less than the maximum amount of fines allowed. This unneeded prompt adds unnecessary steps to checkout and slows down checkout process. Provide ability to turn off this prompt. (ie, borrower had no fines, max fine to block cko set to $5, but in order to cko 2 dvds with fee of $2 must answer prompt after 1st "please confirm cko, patron has debt of $2 - yes/no, must answer for every cko afterwards, even books)
    
    Added fields for max fine and max holds per itemtype/borrowertype. Added syspref to turn off checkout prompts for fines less than the max fine.
    
    Use sysprefs UseGranularMaxFines and UseGranularMaxHolds for former, WarnOnlyOnMaxFine for latter.
    
    If UseGranularMaxHolds is enabled, holds are limited by issuingrules.max_holds
Commits on May 28, 2009
  1. @PaulPoulain

    fix for 2997 : superlibrarian's ability to edit item/patron home bran…

    PaulPoulain authored Galen Charlton committed
    …ch affected if all other privileges are selected
    
    Before this patch, we used to test for flags == 1, which was wrong when patron had all privileges.
    This patch just adds a %2 to check that patron has superlibrarian privilege, and maybe something else we don't care.
    
    I think I fixed it everywhere except in acquisition, that will be addressed by BibLibre new acquisition module.
    
    Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
  2. bug 3263: Staff Search Results Interface Changes

    Galen Charlton authored
    Coding by Rick Welykochy <rick@praxis.com.au>
    
    [1] Three new system preferences to enable particular
    bib record views in the staff interface:
    
    viewMARC
    viewLabeledMARC
    viewISBD
    
    Implements enhancement 2642.
    
    [2] New button in the regular and cataloging search results
       pages in the staff interface to allow the operator to redo
       the search against Z39.50 targets instead of the Koha database.
    
    [3] Added copyright date and edition to cataloging and Z39.50 search results.
        Implements enhancement 2640.
    
    Feature sponsored by MassCat.
    
    Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Commits on May 21, 2009
  1. @colinsc

    Squashed commit of the following:

    colinsc authored
        Ensure Granular Permissions enabled in all fine transactions
        Propagate Granular Permissions for editcatalogue functions
        Add an editcatalogue_view and editcatalogue_delete_bibliographic permissions
        Add new add_holds Granular Permission
        Enable renewals beyond max from item list if user has appropriate permission
        Enable Granular Permissions in Entry to reserve/renewscript.pl
        Check on non_circ was wrong way round
Commits on May 14, 2009
  1. @colinsc

    Squashed commit of the following:

    colinsc authored
        Add Granular Permission restricting change due date on a per user basis
        Only allow holds to be reordered with the appropriate granular permission
        Add Granular permission to hide user name in checkin
        Add a granular permission allowing the writeoff of fines/fees
        Restrict user permission to set lost status
          The cataloguing_edit_items overrides this allowing a user to set lost directly
          in the holdings tag of the MARC record
        Add Granular Permissions covering patron notes
        Add the required circulation overrides
          This is probably not the final word on these
          The circulation permissions should be more consistent in their implications
        Allow access to dropbox mode and checkin exempt from fines by user permissions
        Do not allow payment from checkout if user does not have accept_payment permission
        Add granular permission governing accept payment
        Add basic charges Granular Permissions
        Make memberentry.pl check Granular Permissions
        Add basic holds granular permissions
        Add Add Edit and Delete permissions for borrowers
        Fix editcatalogue permissions for cataloguing screen
        Entries in the New and Edit buttons now covered by granular permissions
        Add Granular permission for add bibliographic (2-1)
Commits on Apr 24, 2009
  1. bug 3093: Enhance placing of holds in the staff interface.

    Stephen Edwards authored Galen Charlton committed
    This patch allows staff users to request reserves on multiple
    items at one time.
    
    Added checkboxes, select-all, clear-all, and place-hold button to
    staff search results page.  Place-hold button will only appear if
    the user has permission to place holds for others.  Item-level
    Place-Hold button will not appear for multiple holds, nor will
    the vertical detail menu.
    
    Patron input page now shows multiple items, if applicable.
    
    Hold confirmation page shows results for multiple items, if
    applicable.  Those which cannot be reserved are highlighted and
    are excluded from the reservation.  The reservation is placed at
    the biblio number (i.e. next available) level.
    
    Fixed display of item type.
    
    Removed side menu for multiple items; removed item-oriented button for multiple items.
    
    Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Commits on Apr 1, 2009
  1. @oleonard

    Adding patron address to select patron form.

    oleonard authored Galen Charlton committed
    Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Commits on Feb 9, 2009
  1. Adding warnings to request/ files

    Joshua Ferraro authored Galen Charlton committed
    Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Commits on Jan 16, 2009
  1. followup to holds policies - fix itype

    Galen Charlton authored
    Overriding items.itype from biblioitems.itemtype
    is needed only with item-level_itypes is OFF.
    
    [LL bug 321]
    
    Signed-off-by: Daniel Sweeney <daniel.sweeney@liblime.com>
    Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
  2. Add holds policies

    Jesse Weaver authored Galen Charlton committed
    This adds holds policy creation support to smart rules and read support to
    C4/Circulation.pm, and the two reservation pages. It also adds a system
    preference, AllowHoldPolicyOverride, to control whether the staff can override
    these policies.
    
    Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
    Signed-off-by: Daniel Sweeney <daniel.sweeney@liblime.com>
    Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Commits on Oct 23, 2008
  1. Allow renewal limits to be overridden

    Michael Hafen authored Galen Charlton committed
    Originally by Jesse Weaver <jesse.weaver@liblime.com>
    
    This patch creates a new system preference, AllowRenewalLimitOverride,
    that, if YES, allows the renewal limit to be manually overridden. It
    updates C4::Circulation and reserve/renewscript.pl to obey this.
    
    Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Commits on Aug 21, 2008
  1. fix for bug 1771: Template errors with remote itemtype image

    Jesse Weaver authored Galen Charlton committed
    This adds a new function, getitemtypeimagelocation, that returns the image
    unmodified for absolute urls and returns the proper intranet or opac path
    otherwise. It also updates all of the relevant files to use that function.
    
    Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Commits on Aug 18, 2008
  1. bug 2502: correctly check patron account expiration

    Galen Charlton authored
    When placing a hold request from the staff interface,
    now correctly indicate if the patron account has expired.
    Prior to this patch, would warn that the account
    had expired even when the expiry date is in the future,
    and vice versa.
    
    Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
  2. bug 2520: don't change item-level requests to bib-level

    Galen Charlton authored
    Prior to this fix, changing the priority of any hold requests
    in the queue of requests for a bib would convert
    all item-level requests to title-level requests.
    
    As part of this fix, improved display of the holds queue
    so that item-level and bib-level requests can be more
    clearly distinguished.
    
    Documentation note: new screenshot of list of requests for
    a bib in the staff interface.
    
    Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Commits on Aug 8, 2008
  1. Fix to prevent crash on null dateexpiry.

    Joe Atzberger authored Joshua Ferraro committed
    Error was:
        Usage: Date::Calc::Date_to_Days(year, month, day)
    
    Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Commits on Jul 18, 2008
  1. fix for bug 2359: Returning an item from moremember.pl...

    Jesse Weaver authored Joshua Ferraro committed
    Adds a 'forgive fines' checkbox to moremember.pl that defaults to off, and removes the hardcoded $exemptfine = 1 argument to AddReturn in reserves/renewscript.pl. Also, cleans up a little inline CSS.
    
    Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Commits on Jun 20, 2008
  1. bug 1710 and 1739: availability for item-level holds

    Galen Charlton authored Joshua Ferraro committed
    Fixed rules for determining whether an item is
    available for an item-level hold request.  Create a
    new function in C4::Reserves, IsAvailableForItemRequest(),
    that checks whether an item is potentially available for
    an item-level hold request.
    
    An item is considered available if:
    
    * it is not lost AND,
    * it is not marked not for loan AND,
    * it is not withdrawn AND,
    * it is not damaged (unless the AllowHoldsOnDamagedItems syspref is ON), AND
    * it is not on loan (unless the AllowOnShelfHolds syspref is ON)
    
    Preventing a hold request on withdrawn items is bug 1739, as is
    the new preference on whether to allow holds on damaged items.
    
    Removing the condition that an item cannot be requested if
    it has already been requested by another patron is the topic of bug 1710.
    
    Note that this patch does not change the behavior where if
    independent branches is on and the canreservefromotherbranches
    syspref is off, a staff operator is prevented from placing
    an item-level hold request on an item from a different branch.
    
    Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Commits on Mar 25, 2008
  1. Report borrower's home library on reserves library mismatch.

    Ryan Higgins authored Joshua Ferraro committed
    Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Commits on Mar 15, 2008
  1. fix errors with using today's date and format_date

    Galen Charlton authored Joshua Ferraro committed
    This patch should reduce the occurrence of the following
    message in the error log:
    
    Illegal Date '2008-3-14' does not match 'iso' format: yyyy-mm-dd
    
    Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Something went wrong with that request. Please try again.