Updates to activating, cancelling, receiving, and un-receiving in the Purchase Order...

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

diff --git a/acq/acq-purchase-orders.xml b/acq/acq-purchase-orders.xml
index 5f083e4..a122909 100644 (file)
--- a/acq/acq-purchase-orders.xml
+++ b/acq/acq-purchase-orders.xml
@@ -805,24 +805,11 @@ fund must be applied to the purchase order.</para>
 <simplesect xml:id="activation-purchase-order">\r
 <title>Activate a Purchase Order</title>\r
 \r
-<para>When the above criteria have been met, proceed with the following:</para>\r
+<para>When the above criteria have been met the <guilabel>Activate Order</guilabel> button will appear and you can proceed with the following:</para>\r
 \r
 <procedure>\r
 <step>\r
 <informalfigure>\r
-<para>The <guilabel>Activate Order</guilabel> button will appear beside <guilabel>Activatable?</guilabel>.</para>\r
-<para><mediaobject>\r
-<alt>screenshot of line item status</alt>\r
-\r
-<imageobject>\r
-<imagedata fileref="media/activate-purchaseorder-3.png" scalefit="0"></imagedata>\r
-</imageobject>\r
-</mediaobject></para>\r
-</informalfigure>\r
-</step>\r
-\r
-<step>\r
-<informalfigure>\r
 <para>Click the button <guibutton>Activate Order</guibutton>.</para>\r
 <para><mediaobject>\r
 <alt>screenshot of activate order</alt>\r
@@ -941,7 +928,7 @@ screen.</para>
 \r
 <section xml:id="cansup-purchase-order">\r
 <title>Cancelling and Suspending Purchase Orders</title>\r
-<para>You can cancel or suspend purchase orders that are in a state of pending or on-order.</para>\r
+<para>You can cancel or suspend purchase orders where all line items are in a state of on-order.</para>\r
 <para>Certain cancel reasons are used to suspend purchase orders.  These cancel reasons are set to keep the debits when the purchase order is cancelled. For \r
 example, a cancel reason such as Publication Postponed, for which debits are kept, indicates that the item will still be purchased when published. The funds\r
 remain encumbered for the purchase while the purchase order has the status of cancelled.</para>\r
@@ -954,7 +941,7 @@ remain encumbered for the purchase while the purchase order has the status of ca
 \r
 <procedure>\r
 <step>\r
-<para>Open your purchase order.</para>\r
+<para>Open the purchase order.</para>\r
 </step>\r
 \r
 <step>\r
@@ -1031,7 +1018,7 @@ remain encumbered for the purchase while the purchase order has the status of ca
 \r
 <procedure>\r
 <step>\r
-<para>Open your purchase order.</para>\r
+<para>Open the purchase order.</para>\r
 </step>\r
 \r
 <step>\r
@@ -1132,16 +1119,7 @@ on the printed purchase order.</para>
 </step>\r
 \r
 <step>\r
-<informalfigure>\r
 <para>Depending on your computer you may or may not need to select your printer and click <guibutton>OK</guibutton>.</para>\r
-<para><mediaobject>\r
-<alt>screenshot of print order</alt>\r
-\r
-<imageobject>\r
-<imagedata fileref="media/print-purchaseorder-2.png" scalefit="0"></imagedata>\r
-</imageobject>\r
-</mediaobject></para>\r
-</informalfigure>\r
 </step>\r
 </procedure>\r
 \r
@@ -1201,8 +1179,21 @@ on the printed purchase order.</para>
 \r
 <step>\r
 <informalfigure>\r
+<para>Click the checkmark to select all items on the purchase order.</para>\r
+<para><mediaobject>\r
+<alt>screenshot of receiving</alt>\r
+\r
+<imageobject>\r
+<imagedata fileref="media/purchaseorder-receive-0.png" scalefit="0"></imagedata>\r
+</imageobject>\r
+</mediaobject></para>\r
+</informalfigure>\r
+</step>\r
+\r
+<step>\r
+<informalfigure>\r
 <para>Using the main <guilabel>Actions</guilabel> menu, select \r
-<menuchoice><guimenu>Actions</guimenu><guimenuitem>Mark Purchase Order as Received</guimenuitem></menuchoice>.</para>\r
+<menuchoice><guimenu>Actions</guimenu><guimenuitem>Mark Selected Line Items as Received</guimenuitem></menuchoice>.</para>\r
 <para><mediaobject>\r
 <alt>screenshot of receiving</alt>\r
 \r
@@ -1253,8 +1244,21 @@ un-receive the purchase order. The purchase order must have the status of <guila
 \r
 <step>\r
 <informalfigure>\r
+<para>Click the checkmark to select all items on the purchase order.</para>\r
+<para><mediaobject>\r
+<alt>screenshot of receiving</alt>\r
+\r
+<imageobject>\r
+<imagedata fileref="media/purchaseorder-receive-0.png" scalefit="0"></imagedata>\r
+</imageobject>\r
+</mediaobject></para>\r
+</informalfigure>\r
+</step>\r
+\r
+<step>\r
+<informalfigure>\r
 <para>Using the main <guilabel>Actions</guilabel> menu, select \r
-<menuchoice><guimenu>Actions</guimenu><guimenuitem>Un-Receive Purchase Order</guimenuitem></menuchoice>.</para>\r
+<menuchoice><guimenu>Actions</guimenu><guimenuitem>Un-Receive Selected Line Items</guimenuitem></menuchoice>.</para>\r
 <para><mediaobject>\r
 <alt>screenshot of receiving</alt>\r
 \r