From: Christine Date: Mon, 12 Jan 2015 05:16:25 +0000 (-0800) Subject: Merge branch 'Acq26' X-Git-Url: https://git.sitka.bclibraries.ca/gitweb/?p=sitka%2Fdoc%2Facquisitions.git;a=commitdiff_plain;h=bf2c64a6ef612fd77be7359aba35acd5ddedff2a;hp=-c Merge branch 'Acq26' Conflicts: intro/acq-new-features.xml Signed-off-by: Christine --- bf2c64a6ef612fd77be7359aba35acd5ddedff2a diff --combined intro/acq-new-features.xml index 4bfc4d4,cd30fec..ff58cb8 --- a/intro/acq-new-features.xml +++ b/intro/acq-new-features.xml @@@ -22,85 -22,29 +22,100 @@@
Support PO activation without requiring items + <<<<<<< HEAD + A new Activate PO Without Loading Items option in the Purchase Order + allows staff to activate the PO without loading copies into the catalog. + + + + + + + + ++======= ++<<<<<<< HEAD + A new Activate PO Without Loading Items option in the PO allows staff to activate the PO without loading copies into the catalogue. + ======= + A new Activate PO Without Loading Items option in the PO allows staff to activate the PO without loading copies into the catalog. + >>>>>>> sitka_2_6 ++>>>>>>> Acq26
Differentiate between cancelled and "delayed" lineitems +It is now more clear to users when a lineitem has been fully cancelled or if it has been + cancelled temporarily "delayed". + + + A line item that has been fully cancelled has a white background + + + + + + + + + A line item that has been temporarily cancelled has a blue background + + + + + + + + + + The line item cancel reason (label) is written next to the non-title attributes in + the line item list display + + + + + + + + +
-Opportunistic Acquisitions In-Process Copy Overlay +Auto-Overlay In Process Acquisitions Copies + Improves existing acquisitions copy overlay code by adding broader matching criteria. By selecting the new option, Auto Overlay In-process Acquisitions Copies, the system will potentially overlay copies which: + + have associated lineitem details (that is, they were created by the acquisitions process), + that lineitem detail has the same owning_lib as the incoming copy’s owning_lib, and, + the current copy associated with that lineitem detail is In process. + + + + + + + +
Printing PO Names on Purchase Orders + <<<<<<< HEAD + The Print Purchase Order option now prints the PO Name in addition to the PO ID. + ======= The Print Purchase Order option now prints the PO Name in addition to the PO ID. ++<<<<<<< HEAD + + + + + + + + ++======= + >>>>>>> sitka_2_6 ++>>>>>>> Acq26