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 Merge branch 'Acq26' Conflicts: intro/acq-new-features.xml Signed-off-by: Christine --- bf2c64a6ef612fd77be7359aba35acd5ddedff2a diff --cc intro/acq-new-features.xml index 4bfc4d4,cd30fec..ff58cb8 --- a/intro/acq-new-features.xml +++ b/intro/acq-new-features.xml @@@ -22,16 -22,11 +22,24 @@@
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
@@@ -91,16 -39,12 +99,23 @@@
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