adding screenshots -> finalize blanket order

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>

diff --git a/acq/acq-invoices.xml b/acq/acq-invoices.xml
index 755297f..43557f0 100644 (file)
--- a/acq/acq-invoices.xml
+++ b/acq/acq-invoices.xml
@@ -861,7 +861,7 @@ move between purchase orders until you change the information.</para></note>
 \r
 <step>\r
 <informalfigure>\r
-<para>The invoice will open in the same tab and the line items will added to the invoice.</para>\r
+<para>The invoice will open in the same tab with the selected line items attached.</para>\r
 <para><mediaobject>\r
 <alt>screenshot of invoicing</alt>\r
 \r
@@ -871,6 +871,7 @@ move between purchase orders until you change the information.</para></note>
 </mediaobject></para>\r
 </informalfigure>\r
 </step>\r
+   <step><para>Click <guilabel>Save.</guilabel></para></step>\r
 \r
 </procedure>\r
 \r
@@ -1018,7 +1019,8 @@ building your list.</para></note>
    <section xml:id="invoice-blanket-order">\r
       <title>Invoice and Receive Blanket Orders</title>\r
       <para>Blanket orders allow staff to invoice an encumbered amount multiple times, paying off the charge over a period of time.</para>\r
-      <para>You must first <link linkend="create-blanket-order">Create a Blanket Purchase Order</link> the following instructions are for <guilabel>Invoicing and Receiving</guilabel> Blanket Order items.</para>\r
+      <para>The following instructions are for <guilabel>Invoicing and Receiving</guilabel> Blanket Order items.</para> \r
+      <para>You must <link linkend="create-blanket-order">Create a Blanket Purchase Order</link>before you create an invoice for Blanket order items. </para>\r
          \r
 <note><para>Invoices for <guilabel>Blanket Order</guilabel>items must be created from the <guilabel>Purchase Order Interface</guilabel></para></note>\r
       \r
@@ -1050,7 +1052,7 @@ building your list.</para></note>
          </step>\r
          <step>\r
             <informalfigure>\r
-               <para>Click on the hyperlinked Purchase Order <guilabel>Name</guilabel> to open the Blanket Order.</para>\r
+               <para>Click the hyperlinked Purchase Order <guilabel>Name</guilabel> to open the Blanket Order.</para>\r
                <para><mediaobject>\r
                   <alt>screenshot of purchase order</alt>\r
                   \r
@@ -1082,13 +1084,15 @@ building your list.</para></note>
                   </imageobject>\r
                </mediaobject></para>\r
             </informalfigure>\r
-         </step>  \r
-         <step>\r
-               <para>The <guilabel>Fund</guilabel> will have auto-populated with the <guilabel>Fund</guilabel> used on the <guilabel>Purchase Order.</guilabel></para>\r
-         </step>  \r
+         </step>   \r
          <step>\r
             <informalfigure>\r
                <para>Enter the amount billed into the <guilabel>Billed</guilabel> field. The <guilabel>Paid</guilabel> field will auto-fill to match.</para>\r
+               <itemizedlist>\r
+                  <listitem>\r
+                     <para>The <guilabel>Fund</guilabel> will have auto-populated with the <guilabel>Fund</guilabel> used on the <guilabel>Purchase Order.</guilabel></para>\r
+                  </listitem>\r
+               </itemizedlist>\r
                <para><mediaobject>\r
                   <alt>screenshot of invoice</alt>\r
                   <imageobject>\r
@@ -1112,26 +1116,47 @@ building your list.</para></note>
          </step>\r
          <step><para>Click <guilabel>Close</guilabel> to close the invoice. Funds will change from encumbered to spent.</para></step>\r
       </procedure>\r
-<note><para>Blanket Order items do not need to be <guilabel>Marked as Received</guilabel>as these charges are not linked to Acquisitions line items.</para></note>         \r
+<note><para>Blanket Order items do not need to be <guilabel>Marked as Received</guilabel> as these charges\r
+            are not linked to Acquisitions line items.</para></note>         \r
          \r
      \r
       <simplesect xml:id="complete-blanket-order-invoice">\r
          <title>Finalize Blanket Order</title>\r
-         <para>When the final shipment arrives, staff select the <guilabel>Final Invoice for Blanket Order</guilabel> option on the invoice screen to mark the PO as received and drop any remaining encumbrances to $0.00.</para>\r
+         <para>When the final shipment arrives, <link linkend="invoice-blanket-order">Create an invoice</link>. Select the\r
+               <guilabel>Final Invoice for Blanket Order</guilabel> checkbox to mark the Blanket\r
+            Purchase Order as <guilabel>Received</guilabel> and drop any remaining encumbrances to $0.00.</para>\r
          \r
          <procedure>\r
+            <step><para><link linkend="invoice-blanket-order">Create an invoice from the Blanket Order PO</link></para></step>\r
+            <step><para><link linkend="invoice-details">Complete the Invoice Details</link></para></step>\r
             <step>\r
                <informalfigure>\r
-                  <para>Select <menuchoice><guimenu>Acquisitions</guimenu><guimenuitem>Open Invoices</guimenuitem></menuchoice>.</para>\r
+                  <para>Check the<guilabel>Final Invoice for Blanket Order</guilabel> checkbox.</para>\r
                   <para><mediaobject>\r
                      <alt>screenshot of invoice</alt>\r
                      \r
                      <imageobject>\r
-                        <imagedata fileref="media/blanket.png" width="100%" scalefit="1"></imagedata>\r
+                        <imagedata fileref="media/invoice-blanketorder-finalized.png" width="100%" scalefit="1"></imagedata>\r
                      </imageobject>\r
                   </mediaobject></para>\r
                </informalfigure>\r
             </step>\r
+            <step> <para>Enter the amount billed into the <guilabel>Billed</guilabel> field. The <guilabel>Paid</guilabel> field will auto-fill to match.</para></step>\r
+              <step><para>Click <guilabel>Save</guilabel> to save the changes you have made.</para></step>\r
+            <step>\r
+               <informalfigure>\r
+                  <para>Click <guilabel>Close</guilabel> to close the invoice. The Purchase Order will be marked as received and any remaining encumbrances set to $0.00.</para>\r
+                  <para><mediaobject>\r
+                     <alt>screenshot of invoice</alt>\r
+                     \r
+                     <imageobject>\r
+                        <imagedata fileref="media/invoice-blanketorder-poreceived.png" width="100%" scalefit="1"></imagedata>\r
+                     </imageobject>\r
+                  </mediaobject></para>\r
+               </informalfigure>\r
+            </step>\r
+           \r
+         \r
          </procedure>\r
       </simplesect>\r
    </section>\r

diff --git a/acq/acq-purchase-orders.xml b/acq/acq-purchase-orders.xml
index 44052cb..33d6e9f 100644 (file)
--- a/acq/acq-purchase-orders.xml
+++ b/acq/acq-purchase-orders.xml
@@ -569,21 +569,26 @@ when bringing records in via their <link linkend="catalog-record-ids">Catalog Re
 </mediaobject></para>\r
 </informalfigure>\r
 </step>\r
-   <step><para>A pop up window will appear</para></step>\r
-   <step>\r
+   <step><para>A pop up window will appear</para>\r
+   <para><itemizedlist>\r
+      <listitem>\r
+         <para>Verify the correct<guilabel>Ordering Agency</guilabel> is selected.</para>\r
+      </listitem>\r
+      <listitem>\r
+         <para>Enter a Purchase Order <guilabel>Name</guilabel>.</para>\r
+      </listitem>\r
+   <listitem>\r
+      <para>Enter the<guilabel>Provider</guilabel>.</para></listitem>\r
+   </itemizedlist>\r
       <informalfigure>\r
-         <para>Verify <guilabel>Ordering Agency,</guilabel> enter a Purchase Order\r
-                        <guilabel>Name</guilabel> (optional) and choose the\r
-                        <guilabel>Provider</guilabel>.</para>\r
          <para><mediaobject>\r
             <alt>screenshot of purchase order</alt>\r
-            \r
             <imageobject>\r
                <imagedata fileref="media/blanketorder-1.png" scalefit="0"></imagedata>\r
             </imageobject>\r
          </mediaobject></para>\r
       </informalfigure>\r
-   </step>  \r
+   </para></step>\r
    <step><para>Click <guilabel>Save</guilabel>.</para></step>\r
    <step>\r
       <informalfigure>\r
@@ -633,7 +638,7 @@ when bringing records in via their <link linkend="catalog-record-ids">Catalog Re
    <step><para>Click <guibutton>Save New Charges</guibutton></para></step>\r
    <step>\r
       <informalfigure>\r
-         <para>Click <guibutton>Activate</guibutton></para>\r
+         <para>Click <guibutton>Activate Order</guibutton></para>\r
          <para><mediaobject>\r
             <alt>screenshot of blanket purchase order</alt>           \r
             <imageobject>\r
@@ -679,7 +684,18 @@ when bringing records in via their <link linkend="catalog-record-ids">Catalog Re
          </mediaobject></para>\r
       </informalfigure>\r
    </step>\r
-   <step><para>Click the Purchase Order <guilabel>Name</guilabel> from the search results.</para></step>\r
+   <step>\r
+      <informalfigure>\r
+         <para>Click the hyperlinked Purchase Order <guilabel>Name</guilabel> in the search results.</para>\r
+         <para><mediaobject>\r
+            <alt>screenshot of purchase order search results</alt>\r
+            \r
+            <imageobject>\r
+               <imagedata fileref="media/invoice-blanketorder-posearch-1.png" width="100%" scalefit="1"></imagedata>\r
+            </imageobject>\r
+         </mediaobject></para>\r
+      </informalfigure>\r
+   </step> \r
    <step>\r
       <informalfigure>\r
          <para>The Purchase Order will be displayed on screen.</para>\r

diff --git a/acq/media/invoice-blanketorder-finalized.png b/acq/media/invoice-blanketorder-finalized.png
new file mode 100644 (file)
index 0000000..385607c
Binary files /dev/null and b/acq/media/invoice-blanketorder-finalized.png differ

diff --git a/acq/media/invoice-blanketorder-poreceived.png b/acq/media/invoice-blanketorder-poreceived.png
new file mode 100644 (file)
index 0000000..aa1702f
Binary files /dev/null and b/acq/media/invoice-blanketorder-poreceived.png differ

diff --git a/acq/media/purchase-search-2.png b/acq/media/purchase-search-2.png
index ae4f732..03692e7 100644 (file)
Binary files a/acq/media/purchase-search-2.png and b/acq/media/purchase-search-2.png differ