Screenshots and updates for backported features.

Signed-off-by: Jennifer Pringle <jpringle@sitka.bclibraries.ca>

diff --git a/acq/acq-purchase-orders.xml b/acq/acq-purchase-orders.xml
index 409893d..4cc7b96 100644 (file)
--- a/acq/acq-purchase-orders.xml
+++ b/acq/acq-purchase-orders.xml
@@ -729,8 +729,13 @@ parentheses next to this field. Click the hyperlinked number.</para>
 <para>Before you can activate a purchase order, the following criteria must be met:</para>\r
 <itemizedlist>\r
 <listitem>\r
-<para>Each line must have at least one copy attached to it.  See <link linkend="add-copies-lineitem">Add a Copy to a Line Item</link> for instructions.</para>\r
-<note><para> Copies should not be added to line items after a purchase order is activated.</para></note>\r
+<para>Each line must have at least one copy attached to it. If there is no copy the <guilabel>Activate Order?</guilabel> field will read, \r
+<guilabel>Activatable? No: The lineitem has no attached copies (ACQ_LINEITEM_NO_COPIES) (lineitemID)</guilabel>. Simply attach a copy to the line item. \r
+See <link linkend="add-copies-lineitem">Add a Copy to a Line Item</link> for instructions.</para>\r
+\r
+<para>In instances where a line item should not have any copies the <guilabel>Allow activation with zero-copy lineitems</guilabel> check box may be used.</para>\r
+\r
+<caution><para> Copies should not be added to line items after a purchase order is activated.</para></caution>\r
 </listitem>\r
 <listitem>\r
 <informalfigure>\r

diff --git a/acq/media/activate-purchaseorder-0.png b/acq/media/activate-purchaseorder-0.png
new file mode 100644 (file)
index 0000000..347510c
Binary files /dev/null and b/acq/media/activate-purchaseorder-0.png differ

diff --git a/acq/media/activate-purchaseorder-00.png b/acq/media/activate-purchaseorder-00.png
new file mode 100644 (file)
index 0000000..81f1b26
Binary files /dev/null and b/acq/media/activate-purchaseorder-00.png differ

diff --git a/acq/media/focus-1.png b/acq/media/focus-1.png
new file mode 100644 (file)
index 0000000..bc77ffd
Binary files /dev/null and b/acq/media/focus-1.png differ

diff --git a/admin/admin-acq-yearend.xml b/admin/admin-acq-yearend.xml
index b6ab61a..6dca50b 100644 (file)
--- a/admin/admin-acq-yearend.xml
+++ b/admin/admin-acq-yearend.xml
@@ -100,6 +100,11 @@ See <link linkend="update-funds-batch">Update Funds to Copies via Batch Updates
 \r
 </section>\r
 \r
+<section xml:id="yearend-dry-run">\r
+<title>Year End Dry Run</title>\r
+\r
+</section>\r
+\r
 <section xml:id="yearend-propagation">\r
 <title>Year End Propagation</title>\r
 \r

diff --git a/admin/media/year-end-dry-run-1.png b/admin/media/year-end-dry-run-1.png
new file mode 100644 (file)
index 0000000..5676142
Binary files /dev/null and b/admin/media/year-end-dry-run-1.png differ

diff --git a/admin/media/year-end-run-1.png b/admin/media/year-end-run-1.png
new file mode 100644 (file)
index 0000000..ec41931
Binary files /dev/null and b/admin/media/year-end-run-1.png differ

diff --git a/admin/media/year-end-run-2.png b/admin/media/year-end-run-2.png
new file mode 100644 (file)
index 0000000..24b87a7
Binary files /dev/null and b/admin/media/year-end-run-2.png differ

diff --git a/admin/media/year-end-run-3.png b/admin/media/year-end-run-3.png
new file mode 100644 (file)
index 0000000..fa04e2e
Binary files /dev/null and b/admin/media/year-end-run-3.png differ

diff --git a/intro/acq-new-backports-2-3.xml b/intro/acq-new-backports-2-3.xml
index c4c8436..b9a280f 100644 (file)
--- a/intro/acq-new-backports-2-3.xml
+++ b/intro/acq-new-backports-2-3.xml
@@ -25,10 +25,16 @@
 \r
 <para>Four acquisitions features have been backported from 2.3 into Sitka's 2.2 Production environment.</para>\r
 \r
-<simplesect xml:id="backport-focus">\r
-<title>Recover Focus</title>\r
+<simplesect xml:id="backport-navigate">\r
+<title>Navigating Acquisitions</title>\r
 \r
-<para> </para>\r
+<para>Two new features should make navigating acquisitions simpler and faster.</para>\r
+\r
+<para><emphasis role="bold">Recover Focus</emphasis></para>\r
+\r
+<para>When navigating through acquisitions the system will now focus on the line item you are returning to</para>\r
+\r
+<para><emphasis role="bold">Return Buttons</emphasis></para>\r
 \r
 </simplesect>\r
 \r