]> git.evergreen-ils.org Git - working/Evergreen.git/log
working/Evergreen.git
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Fri, 20 May 2011 14:43:44 +0000 (10:43 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoFix a problem with open-ils.circ.holds.retrieve_all_from_title user/senator/fix-all-rec-holds
Lebbeous Fogle-Weekley [Fri, 20 May 2011 14:17:05 +0000 (10:17 -0400)]
Fix a problem with open-ils.circ.holds.retrieve_all_from_title

Anoop Atre spotted this bug that's triggered by selecting "View Holds"
from "Actions for Selected Record" in the catalog seen through the staff
client.

Said method would error out like this:

[2011-05-20 10:04:03] open-ils.circ [ERR
:31866:CStoreEditor.pm:109:13058333633194115] editor[0|1] request error
open-ils.cstore.direct.serial.issuance.id_list.atomic :
{"subscription":[]} : Exception:
OpenSRF::DomainObject::oilsMethodException 2011-05-20T10:04:03
OpenILS::Utils::CStoreEditor
/openils/lib/perl5/OpenILS/Utils/CStoreEditor.pm:412 <500>  Severe query
error -- see error log for more details

because when trying to gather issuance-type holds, it didn't properly test
whether there actually were any subscriptions and issuances related to
the bib record in question.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoRevert "When placing holds on a bib with monographic part, require selection of a...
Mike Rylander [Fri, 20 May 2011 13:12:22 +0000 (09:12 -0400)]
Revert "When placing holds on a bib with monographic part, require selection of a specific part"

This reverts commit 3e63a898c53f6100d678f263e5dde5b9f678692d.

We must not force P-type holds as not all copies may not use parts.  Imagine a situation where
only one library breaks up a season of Seinfeld by using a part per DVD, and all others leave
them bound and therefore need no part designations.

Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoWhen placing holds on a bib with monographic part, require selection of a specific...
Jason Etheridge [Fri, 20 May 2011 06:40:24 +0000 (02:40 -0400)]
When placing holds on a bib with monographic part, require selection of a specific part

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoorder any monograph parts by sort key when placing holds
Jason Etheridge [Fri, 20 May 2011 02:54:30 +0000 (22:54 -0400)]
order any monograph parts by sort key when placing holds

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoCN prefix/suffix columns in xul-based hold interfaces
Jason Etheridge [Fri, 20 May 2011 02:25:16 +0000 (22:25 -0400)]
CN prefix/suffix columns in xul-based hold interfaces

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agolabel consistency in vol/item creator
Jason Etheridge [Fri, 20 May 2011 01:24:24 +0000 (21:24 -0400)]
label consistency in vol/item creator

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoadd missing upgrade step to create staging schema
Galen Charlton [Fri, 20 May 2011 01:28:50 +0000 (21:28 -0400)]
add missing upgrade step to create staging schema

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Thu, 19 May 2011 16:59:22 +0000 (12:59 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoThe term "foreign" has undesirable implied meaning, so we will dub these "conjoined"
Mike Rylander [Thu, 19 May 2011 16:56:57 +0000 (12:56 -0400)]
The term "foreign" has undesirable implied meaning, so we will dub these "conjoined"

Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoMerge branch 'user/senator/lp-784062' of git.evergreen-ils.org:working/Evergreen
Lebbeous Fogle-Weekley [Thu, 19 May 2011 14:49:44 +0000 (10:49 -0400)]
Merge branch 'user/senator/lp-784062' of git.evergreen-ils.org:working/Evergreen

12 years agoMake DATE_FORMAT macro check inputs
Thomas Berezansky [Thu, 19 May 2011 12:51:47 +0000 (08:51 -0400)]
Make DATE_FORMAT macro check inputs

Specifically, if no date and no format (empty replaces?) replace with empty string.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoAdd Shelf Expire Time to hold slip, date formatter
Thomas Berezansky [Wed, 18 May 2011 23:12:42 +0000 (19:12 -0400)]
Add Shelf Expire Time to hold slip, date formatter

Date formatter would work like so:
%DATE_FORMAT(date,format)%

For example:
%DATE_FORMAT(%shelf_expire_time%,%m/%d)%

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Thu, 19 May 2011 13:52:07 +0000 (09:52 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoAdd permission checking for updating and deleting volumes. user/senator/lp-784062
Lebbeous Fogle-Weekley [Wed, 18 May 2011 21:26:58 +0000 (17:26 -0400)]
Add permission checking for updating and deleting volumes.

This addresses LP #784062 reported by Ben Shum, and I think others?

Creating volumes was already covered.  The ability to delete volumes
without permission would be less often an issue in practice since you
would need permission to delete the volume's copies before you could
delete the volume itself.

Anyway, this should square things.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agotrival whitespace changes
Galen Charlton [Wed, 18 May 2011 20:36:10 +0000 (16:36 -0400)]
trival whitespace changes

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Wed, 18 May 2011 19:36:00 +0000 (15:36 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoprovide hint to sysadmin if memcached issue is preventing auth
Galen Charlton [Wed, 18 May 2011 18:05:51 +0000 (14:05 -0400)]
provide hint to sysadmin if memcached issue is preventing auth

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Dan Scott <dan@coffeecode.net>
12 years agoMake Perl 'make check' work without 'make all'
Dan Scott [Wed, 18 May 2011 17:18:14 +0000 (13:18 -0400)]
Make Perl 'make check' work without 'make all'

Factor the build of Build from Build.PL into its own
make target and then make that target a prereq for the
other make targets so that we make Build from Build.PL
when we build Makefile from Makefile.am and run 'make check'

Clear?

Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Wed, 18 May 2011 16:41:10 +0000 (12:41 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoWe need to update config.upgrade_log
Mike Rylander [Wed, 18 May 2011 16:39:31 +0000 (12:39 -0400)]
We need to update config.upgrade_log

Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoRecord the current upgrade version number in the baseline schema
Mike Rylander [Wed, 18 May 2011 16:26:53 +0000 (12:26 -0400)]
Record the current upgrade version number in the baseline schema

Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoFix the definition of some of the tracking functions
Mike Rylander [Wed, 18 May 2011 15:33:07 +0000 (11:33 -0400)]
Fix the definition of some of the tracking functions

Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoavoid error when generating fines on checkin
Galen Charlton [Wed, 18 May 2011 15:13:16 +0000 (11:13 -0400)]
avoid error when generating fines on checkin

Prevents "No active transaction to commit" error when checking
in overdue loans.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoLet's have this upgrade script not use that upgrade_deps_block_check()...
senator [Wed, 18 May 2011 14:17:16 +0000 (10:17 -0400)]
Let's have this upgrade script not use that upgrade_deps_block_check()...

...function quite yet

12 years agouse correct name of upgrade check function
Galen Charlton [Wed, 18 May 2011 14:51:20 +0000 (10:51 -0400)]
use correct name of upgrade check function

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
12 years agoMore make-db-patch goodness: wrap existing
Thomas Berezansky [Wed, 18 May 2011 12:21:53 +0000 (08:21 -0400)]
More make-db-patch goodness: wrap existing

--wrap option will take an existing file and wrap it properly.
When --wrap is specified --from is ignored.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Wed, 18 May 2011 13:28:17 +0000 (09:28 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agofix CN prefix/suffix display in XUL interfaces so we can handle any affix we come...
Jason Etheridge [Wed, 18 May 2011 06:14:52 +0000 (02:14 -0400)]
fix CN prefix/suffix display in XUL interfaces so we can handle any affix we come across

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoInclude call number prefix/suffix in display and sorting of holds for Print Full...
Jason Etheridge [Wed, 18 May 2011 05:05:17 +0000 (01:05 -0400)]
Include call number prefix/suffix in display and sorting of holds for Print Full Pull List (Alternate strategy).  Also fix things so that we're sorting on the label_sortkey for call number, and not the label.  So, for this interface, the hard-wired sort order is Copy Location Order (as defined by Admin -> Local Administration -> Copy Location Order), Call Number Prefix, Call Number Label, Call Number Suffix, and Hold Request time.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agohave the call number checkbox for pocket labels include prefix/suffix. A %call_numbe...
Jason Etheridge [Wed, 18 May 2011 02:27:07 +0000 (22:27 -0400)]
have the call number checkbox for pocket labels include prefix/suffix.  A %call_number% macro is still available for the bare call number label without affixes

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoCan't use encodeURI and decodeURI for everything with persist_helper (in particular...
Jason Etheridge [Wed, 18 May 2011 02:24:21 +0000 (22:24 -0400)]
Can't use encodeURI and decodeURI for everything with persist_helper (in particular, something like "%macro1% %macro2%" as a custom entry in the label interface), so try/catch them and fall back to the original behavior.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoonly use the label to initialize call number browse
Galen Charlton [Tue, 17 May 2011 22:06:38 +0000 (18:06 -0400)]
only use the label to initialize call number browse

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
12 years agoadd a bit of context to upgrade SQL hints
Galen Charlton [Tue, 17 May 2011 19:09:51 +0000 (15:09 -0400)]
add a bit of context to upgrade SQL hints

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Tue, 17 May 2011 19:02:00 +0000 (15:02 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoImprovements to make-db-patch.pl
Thomas Berezansky [Tue, 17 May 2011 17:50:44 +0000 (13:50 -0400)]
Improvements to make-db-patch.pl

Grab all changes to base sql files into the upgrade script
Based on HEAD (uncommitted changes) or --from=refspec

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
12 years agoMerge branch 'template-toolkit-opac' of git+ssh://yeti.esilibrary.com/home/evergreen...
Mike Rylander [Tue, 17 May 2011 18:11:05 +0000 (14:11 -0400)]
Merge branch 'template-toolkit-opac' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into template-toolkit-opac

12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Tue, 17 May 2011 18:11:04 +0000 (14:11 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoConvert/move SQL script for Lazy Circ
Mike Rylander [Tue, 17 May 2011 17:44:35 +0000 (13:44 -0400)]
Convert/move SQL script for Lazy Circ

Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoLazy Circ (AKA partial barcode lookup)
Thomas Berezansky [Fri, 13 May 2011 19:43:52 +0000 (15:43 -0400)]
Lazy Circ (AKA partial barcode lookup)

Database tables/access functions for prefix/suffix info

    Table: config.barcode_completion

    Function: evergreen.get_barcodes
        Takes org unit, context, and input barcode
        Context is a string and can contain:
            asset - asset.copy barcodes
            serial - serial.unit barcodes
            actor - actor.usr (via actor.card) barcodes
            booking - booking.resource barcodes
        Special case: asset and serial both in context
            Returns non-serial asset entries as asset
            Returns serial entries as serial
    Type for function return: evergreen.barcode_set

    With editing interface: Admin->Local Admin->Barcode Completion

    OpenSRF Call: open-ils.actor.get_barcodes
        Basically a passthrough to the database function
        Checks for permissions:
            STAFF_LOGIN - To do anything
            VIEW_USER - At home_ou of the user owning the returned
                        barcode when in actor context

Add get_barcode to menu.js and to xulG in a number of places
    Takes a window handle, a context, and an input barcode
    Passes the current OU, the context, and the input barcode to the db
    If multiple results come back it pops up a dialog
    Returns boolean false on no results
    Returns "user_false" on dialog cancel
    Returns an object with type, id, barcode on success
    If dialog was brought up, returns data used to populate button

Add option for looking up actors at checkout
    Org unit setting: Load patron from Checkout. Default: Don't.

Call sites for get_barcode:
    Lookup Patron By Barcode (actor only)
    OPAC's Staff Client Place Hold (actor only)
    Checkout (asset only by default, with actor if above option set)
    Checkin (asset only)
    Item Status (asset only)

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agocleanup:
senator [Tue, 17 May 2011 15:59:36 +0000 (11:59 -0400)]
cleanup:

1) fix broken INCLUDE statements in circ and hold histories

2) move an opac "part" to the parts directory

12 years agoempty cases for fines
senator [Tue, 17 May 2011 15:51:04 +0000 (11:51 -0400)]
empty cases for fines

12 years agoMerge branch 'template-toolkit-opac' of ssh://yeti.esilibrary.com/home/evergreen...
senator [Tue, 17 May 2011 15:32:00 +0000 (11:32 -0400)]
Merge branch 'template-toolkit-opac' of ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into template-toolkit-opac

12 years agoEmailing receipts working, some tweaks to payment history page
senator [Tue, 17 May 2011 15:31:08 +0000 (11:31 -0400)]
Emailing receipts working, some tweaks to payment history page

12 years agoMerge branch 'template-toolkit-opac' of git+ssh://yeti.esilibrary.com/home/evergreen...
Mike Rylander [Tue, 17 May 2011 14:19:10 +0000 (10:19 -0400)]
Merge branch 'template-toolkit-opac' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into template-toolkit-opac

12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Tue, 17 May 2011 14:19:09 +0000 (10:19 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoLP#783486: Improve authority lookup performance
Dan Scott [Tue, 17 May 2011 04:29:47 +0000 (00:29 -0400)]
LP#783486: Improve authority lookup performance

Testing showed that the two indexes added herein improve
authority lookup performance radically; on a 16 GB RAM
database server with 1.1M records, lookup times decreased
from 5500 ms to 0.223 ms. Recommended, would EXPLAIN ANALYZE
again.

Signed-off-by: Dan Scott <dan@coffeecode.net>
12 years agostop hold permit check from crashing if age protection in effect
Galen Charlton [Tue, 17 May 2011 04:40:02 +0000 (00:40 -0400)]
stop hold permit check from crashing if age protection in effect

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
12 years agoMerge branch 'template-toolkit-opac' of ssh://yeti.esilibrary.com/home/evergreen...
senator [Mon, 16 May 2011 22:40:16 +0000 (18:40 -0400)]
Merge branch 'template-toolkit-opac' of ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into template-toolkit-opac

12 years agoReceipt printing also from payment history
senator [Mon, 16 May 2011 22:39:32 +0000 (18:39 -0400)]
Receipt printing also from payment history

12 years agoMerge branch 'template-toolkit-opac' of git+ssh://yeti.esilibrary.com/home/evergreen...
Mike Rylander [Mon, 16 May 2011 22:26:41 +0000 (18:26 -0400)]
Merge branch 'template-toolkit-opac' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into template-toolkit-opac

12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Mon, 16 May 2011 22:26:40 +0000 (18:26 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoIgnore "deleted" authority records when using the tag-validation method
Mike Rylander [Mon, 16 May 2011 22:17:30 +0000 (18:17 -0400)]
Ignore "deleted" authority records when using the tag-validation method

Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoMerge branch 'template-toolkit-opac' of ssh://yeti.esilibrary.com/home/evergreen...
senator [Mon, 16 May 2011 21:04:30 +0000 (17:04 -0400)]
Merge branch 'template-toolkit-opac' of ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into template-toolkit-opac

12 years agoMerge branch 'master' of ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox...
senator [Mon, 16 May 2011 20:22:58 +0000 (16:22 -0400)]
Merge branch 'master' of ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into template-toolkit-opac

12 years agoMerge branch 'template-toolkit-opac' of git+ssh://yeti.esilibrary.com/home/evergreen...
Mike Rylander [Mon, 16 May 2011 20:20:45 +0000 (16:20 -0400)]
Merge branch 'template-toolkit-opac' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into template-toolkit-opac

12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Mon, 16 May 2011 20:20:43 +0000 (16:20 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoBorrow on_or_after() from MFHD/Caption.pm in MFHD/Date.pm
Dan Wells [Mon, 16 May 2011 19:23:10 +0000 (15:23 -0400)]
Borrow on_or_after() from MFHD/Caption.pm in MFHD/Date.pm

Signed-off-by: Dan Wells <dbw2@calvin.edu>
12 years agoMerge branch 'template-toolkit-opac' of ssh://yeti.esilibrary.com/home/evergreen...
senator [Mon, 16 May 2011 18:39:31 +0000 (14:39 -0400)]
Merge branch 'template-toolkit-opac' of ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into template-toolkit-opac

12 years agoCredit card payments working with printable receipts
senator [Mon, 16 May 2011 18:14:57 +0000 (14:14 -0400)]
Credit card payments working with printable receipts

Could still use e-mailed receipts

12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen
Galen Charlton [Mon, 16 May 2011 17:29:32 +0000 (13:29 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen

12 years agostandardize name of 2.0-2.1 upgrade script
Galen Charlton [Mon, 16 May 2011 17:29:10 +0000 (13:29 -0400)]
standardize name of 2.0-2.1 upgrade script

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
12 years agopersist partial changes to new copies in vol/copy editor has new copies are gathered.
Jason Etheridge [Mon, 16 May 2011 16:12:40 +0000 (12:12 -0400)]
persist partial changes to new copies in vol/copy editor has new copies are gathered.

In other words, you can do something like enter 5 in the "# of Copies" field, enter the first barcode (say b1), edit an attribute (say, set Circulate = No), and then enter a second barcode (b2).  Previously, the changes made to b1 would be lost as b2 was entered (or as other movement around the barcode entry textboxes happened) and both copies would get a Circulate = Yes, but now in this scenario, you would see 1 copy set to No and 1 copy set to Yes for the Circulate attribute.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agosimpler language, and the behavior of this action is configurable
Jason Etheridge [Mon, 16 May 2011 15:56:58 +0000 (11:56 -0400)]
simpler language, and the behavior of this action is configurable

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agofirst pass at 2.0 to 2.1 upgrade script
Galen Charlton [Mon, 16 May 2011 15:33:42 +0000 (11:33 -0400)]
first pass at 2.0 to 2.1 upgrade script

Tested so far on an upgrade from 2.0.1; goes up
to DB patch 0533.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Mon, 16 May 2011 15:12:40 +0000 (11:12 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Sun, 15 May 2011 21:52:04 +0000 (17:52 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agousability tweak
Jason Etheridge [Sun, 15 May 2011 20:35:05 +0000 (16:35 -0400)]
usability tweak

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agodefault the label class according to library setting during vol creation
Jason Etheridge [Sun, 15 May 2011 20:15:30 +0000 (16:15 -0400)]
default the label class according to library setting during vol creation

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoremove this comment, testing the repo & email
Jason Etheridge [Sun, 15 May 2011 20:02:32 +0000 (16:02 -0400)]
remove this comment, testing the repo & email

12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Sun, 15 May 2011 17:42:15 +0000 (13:42 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoNuke one more Trunk reference: windowssetup.nsi
Thomas Berezansky [Sat, 14 May 2011 22:22:01 +0000 (18:22 -0400)]
Nuke one more Trunk reference: windowssetup.nsi

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Sat, 14 May 2011 21:31:18 +0000 (17:31 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoMore SVN to Git rigging
Thomas Berezansky [Sat, 14 May 2011 19:57:27 +0000 (15:57 -0400)]
More SVN to Git rigging

Staff client Makefile can no longer build based on SVN.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
12 years agoremove references to SVN now that we're using Git
Galen Charlton [Sat, 14 May 2011 20:19:36 +0000 (16:19 -0400)]
remove references to SVN now that we're using Git

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
12 years agoTrivial whitespace change
Galen Charlton [Sat, 14 May 2011 19:39:03 +0000 (15:39 -0400)]
Trivial whitespace change

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
12 years agoMerge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...
Mike Rylander [Sat, 14 May 2011 12:39:10 +0000 (08:39 -0400)]
Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into template-toolkit-opac

12 years agoadd missing update script for change to circ age stored procedure
gmc [Fri, 13 May 2011 20:57:59 +0000 (20:57 +0000)]
add missing update script for change to circ age stored procedure

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20475 dcc99617-32d9-48b4-a31d-7c20da2025e4

12 years agoMerge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...
Mike Rylander [Fri, 13 May 2011 17:33:52 +0000 (13:33 -0400)]
Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into template-toolkit-opac

12 years agoPatch from Ben Ostrowsky (LP#782268) to simplify seed/example permission setup and...
miker [Fri, 13 May 2011 17:30:47 +0000 (17:30 +0000)]
Patch from Ben Ostrowsky (LP#782268) to simplify seed/example permission setup and move one step towards being able to rid ourselves of permission.perm_list.id

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20473 dcc99617-32d9-48b4-a31d-7c20da2025e4

12 years agoMerge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...
Mike Rylander [Fri, 13 May 2011 17:20:12 +0000 (13:20 -0400)]
Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into template-toolkit-opac

12 years agoA bevy of MFHD bug fixes (and test cases)
dbwells [Fri, 13 May 2011 16:01:04 +0000 (16:01 +0000)]
A bevy of MFHD bug fixes (and test cases)

1) Remove hard-coded 'gap' text from format_part()
2) Honor $ypm## for chron_to_date() for annuals
3) Removed overly simple check on $w as digit
4) Allow for combined chronologies other than 2nd level
5) Make calendar changes trump $u counts
6) Honor issue restarts at calendar changes
7) Rudimentary support of $u counts for non-restarting issue numbering
8) Special interpretation of $yps for early winters (i.e. winter is the first season of the calendar year)
9) Teach chron_to_date() about early winters

The last two points deserve some special attention.  A large number of journals consider 'Winter' to be the first season of the year, so Winter 2011 means (roughly) January 2011, not December 2011.  However, there is no explicit way to indicate this in the standard, and also the code relies in many ways on the fact that 24 (chronology code for winter) is greater than 21 (code for spring).  To work around this, we are interpreting a certain ambiguous pattern in a particular way.  Specifically, if you set $w to a digit, then set $y to 'ps24,21,22,23' (or some variation with '24' as the first value), you will get this winter-first behavior.  Also, the season is treated internally as '20' then converted to '24' when processing is completed.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20470 dcc99617-32d9-48b4-a31d-7c20da2025e4

12 years agofix query in various copy count functions
gmc [Fri, 13 May 2011 15:41:10 +0000 (15:41 +0000)]
fix query in various copy count functions

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20468 dcc99617-32d9-48b4-a31d-7c20da2025e4

12 years agoMerge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...
Mike Rylander [Fri, 13 May 2011 15:30:21 +0000 (11:30 -0400)]
Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into template-toolkit-opac

12 years agofor upgrade, let prefix and suffix in audit be null
gmc [Fri, 13 May 2011 13:25:27 +0000 (13:25 +0000)]
for upgrade, let prefix and suffix in audit be null

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20466 dcc99617-32d9-48b4-a31d-7c20da2025e4

12 years agoadd affix columns to acn auditor table
gmc [Fri, 13 May 2011 13:07:59 +0000 (13:07 +0000)]
add affix columns to acn auditor table

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20464 dcc99617-32d9-48b4-a31d-7c20da2025e4

12 years agobegin a sub to process payment
senator [Thu, 12 May 2011 20:53:54 +0000 (16:53 -0400)]
begin a sub to process payment

12 years agoMerge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...
Mike Rylander [Thu, 12 May 2011 19:57:55 +0000 (15:57 -0400)]
Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into template-toolkit-opac

12 years agoPatch from James Fournie addressing LP#781803: Multiple renewal fails on MAX_FINES...
miker [Thu, 12 May 2011 19:50:55 +0000 (19:50 +0000)]
Patch from James Fournie addressing LP#781803: Multiple renewal fails on MAX_FINES circs

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20461 dcc99617-32d9-48b4-a31d-7c20da2025e4

12 years agoMerge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...
Mike Rylander [Thu, 12 May 2011 19:25:28 +0000 (15:25 -0400)]
Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into template-toolkit-opac

12 years agoWrap proximity refreshing in a transaction to avoid timespans where there is no such...
miker [Thu, 12 May 2011 19:22:42 +0000 (19:22 +0000)]
Wrap proximity refreshing in a transaction to avoid timespans where there is no such information

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20455 dcc99617-32d9-48b4-a31d-7c20da2025e4

12 years agoAddress LP#779975; Status of Available (0) not honored because 0==false -- use ternar...
miker [Thu, 12 May 2011 15:17:50 +0000 (15:17 +0000)]
Address LP#779975; Status of Available (0) not honored because 0==false -- use ternary op with defined() instead

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20452 dcc99617-32d9-48b4-a31d-7c20da2025e4

12 years agoMerge branch 'template-toolkit-opac' of git+ssh://yeti.esilibrary.com/home/evergreen...
Mike Rylander [Thu, 12 May 2011 14:30:04 +0000 (10:30 -0400)]
Merge branch 'template-toolkit-opac' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into template-toolkit-opac

12 years agoMerge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...
Mike Rylander [Thu, 12 May 2011 14:30:01 +0000 (10:30 -0400)]
Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into template-toolkit-opac

12 years agoAdd missing permission checks to Serial.pm
dbwells [Thu, 12 May 2011 14:23:30 +0000 (14:23 +0000)]
Add missing permission checks to Serial.pm

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20449 dcc99617-32d9-48b4-a31d-7c20da2025e4

12 years agodoh, it's history not location.history
senator [Thu, 12 May 2011 14:19:35 +0000 (10:19 -0400)]
doh, it's history not location.history

12 years agoremove in-template fine-totaling: mod_perl code was already doing the same
senator [Thu, 12 May 2011 14:15:41 +0000 (10:15 -0400)]
remove in-template fine-totaling: mod_perl code was already doing the same

also:
    make that fine-totaling not use floating point math.
    don't provide payment form for <= 0 totals (we're not issuing refunds)
    last copyright date in footer always current year, not hardcoded

12 years agosupport paying all fines at once
senator [Wed, 11 May 2011 21:45:58 +0000 (17:45 -0400)]
support paying all fines at once

12 years agoPayment for mostly done. Still needs:
senator [Wed, 11 May 2011 20:02:12 +0000 (16:02 -0400)]
Payment for mostly done. Still needs:

1) to be able to handle the upper "Pay Fines" button that will mean "all
my fines"

2) to use fixed point fine totaling math and bail on total <= 0

3) ... anything else?

12 years agostart on cc payments
senator [Tue, 10 May 2011 21:54:59 +0000 (17:54 -0400)]
start on cc payments