evergreen:rel_2_3

Last commit made on 2013-12-16
Get this branch:
git clone -b rel_2_3 https://git.launchpad.net/evergreen

Branch merges

Branch information

Name:
rel_2_3
Repository:
lp:evergreen

Recent commits

6b25950... by Angela Kilsdonk

Documentation for Sorting Billing Columns

Docs for sorting money columns in billing interface. In ersions 2.3-2.5.

Signed-off-by: Angela Kilsdonk <email address hidden>

8a45ff6... by Bill Erickson

Forward port 2.3.11->2.3.12 DB upgrade

Signed-off-by: Bill Erickson <email address hidden>

f68328d... by Mike Rylander

Push 0848 into the baseline schema

Signed-off-by: Mike Rylander <email address hidden>

5064c87... by Mike Rylander

Re-apply the changes provided by 0802 for backport

Preserve record order of subfields for authority heading extraction

When extracting headings from authority records we currently read the
subfields of a tag in configuration order. We should, instead, read
them in record order, to preserve the desired sorting properties that
the cataloger has encoded in the record.

Signed-off-by: Mike Rylander <email address hidden>

8c62b77... by Bill Erickson

LP#1254146 gracefully handle custom trees sans entries

Avoid references to custom tree entries when no tree entries for a
custom tree exist. Prevents:

egweb: template error: undef error - Can't call method "org_unit" on an
undefined value at
/usr/local/share/perl/5.10.1/OpenILS/WWW/EGCatLoader/Util.pm line 185.\n

Signed-off-by: Bill Erickson <email address hidden>
Signed-off-by: Ben Shum <email address hidden>

72d3d9a... by Dan Wells

Relax MFHD subfield 'a' requirement for caption/patterns

If going by the book, every caption/pattern field would have a
subfield 'a', since the data from subfield 'i' would be moved to
'a' if 'a' was empty. Since that is arcane, and our own wizards
used to bend this rule, let's make some minor adjustments to our
expectations:

1) When calculating date progression, don't expect there to be an 'a'
subfield which needs to be "carried" into.
2) When determining whether a field is 'open-ended', check the first
availabile enum/chron subfield rather than hard-coding the check to
'a'.

These changes do not affect the display formatters, so strings
generated from 'a'-less caption/pattern combos are not exactly right,
but they suffice.

Signed-off-by: Dan Wells <email address hidden>
Signed-off-by: Lebbeous Fogle-Weekley <email address hidden>

9d1320e... by Dan Wells

Forward-port upgrade scripts from recent releases

In accordance with LP #894052.

berick: 2_3 script only

Signed-off-by: Dan Wells <email address hidden>
Signed-off-by: Bill Erickson <email address hidden>

11396ae... by Jason Etheridge <email address hidden>

lp1010187 eliminate redundant/unnecessary calls

Particularly invocations of open-ils.circ.stat_cat.asset.retrieve.all in the
Item Attribute Editor

To test:

    login with a BR1 workstation
    load a pristine (non-stat-cat-laden) BR1 item with the editor
    there should be no call to open-ils.circ.stat_cat.asset.retrieve.all
    change the Circ Lib on the item to BR4
    reload the item in the editor
    there should be a call to open-ils.circ.stat_cat.asset.retrieve.all
    reload the item in the editor
    there should be no call to open-ils.circ.stat_cat.asset.retrieve.all
    assign the item a stat cat entry owned by CONS
    reload the item in the editor
    there should be no call to open-ils.circ.stat_cat.asset.retrieve.all

Signed-off-by: Jason Etheridge <email address hidden>
Signed-off-by: Jason Stephenson <email address hidden>

1a5ee06... by Mark Cooper

LP#1058321: Acq: Possible to receive a pending purchase order

Revised to allow a cancelled PO to be received, as this is needed under
certain conditions (note - bib/items are not restored in this case).
Added po_state variable to avoid repeated PO.state() function invocations.

Signed-off-by: Mark Cooper <email address hidden>
Signed-off-by: Kathy Lussier <email address hidden>
Signed-off-by: Jason Stephenson <email address hidden>

818ed4d... by Mark Cooper

LP#1058321: Possible to receive a pending purchase order

Restrict 'Mark purchase order as received' to on-order state
purchase orders, and 'Un-Receive Purchase Order' to 'received'
POs. Otherwise inconsistencies easily occur ...

Signed-off-by: Mark Cooper <email address hidden>
Signed-off-by: Kathy Lussier <email address hidden>
Signed-off-by: Jason Stephenson <email address hidden>