Revisions to instructions for saving invoices.

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

diff --git a/acq/acq-invoices.xml b/acq/acq-invoices.xml
index 61edd0b..da0d67c 100644 (file)
--- a/acq/acq-invoices.xml
+++ b/acq/acq-invoices.xml
@@ -95,11 +95,11 @@ invoices.</para>
 </step>\r
 \r
 <step>\r
-<para>For information on linking additional line items to the invoice see <link linkend="populate-invoice">populating invoices</link>.</para>\r
+<para>For information on linking additional line items to the invoice see <link linkend="populate-invoice">Populating Invoices</link>.</para>\r
 </step>\r
 \r
 <step>\r
-<para>For information on adding charges to the invoice see <link linkend="add-charges-invoice">adding charges</link>.</para>\r
+<para>For information on adding charges to the invoice see <link linkend="add-charges-invoice">Add Charges to an Invoice</link>.</para>\r
 </step>\r
 \r
 <step>\r
@@ -166,7 +166,7 @@ to each line item.</para>
 </informalfigure>\r
 \r
 <note>\r
-<para>Title Details include:</para>\r
+<para><guilabel>Title Details</guilabel> includes:</para>\r
 \r
 <itemizedlist>\r
 <listitem>\r
@@ -265,11 +265,11 @@ to each line item.</para>
 </step>\r
 \r
 <step>\r
-<para>For information on linking additional line items to the invoice see <link linkend="populate-invoice">populating invoices</link>.</para>\r
+<para>For information on linking additional line items to the invoice see <link linkend="populate-invoice">Populating Invoices</link>.</para>\r
 </step>\r
 \r
 <step>\r
-<para>For information on adding charges to the invoice see <link linkend="add-charges-invoice">adding charges</link>.</para>\r
+<para>For information on adding charges to the invoice see <link linkend="add-charges-invoice">Add Charges to an Invoice</link>.</para>\r
 </step>\r
 \r
 <step>\r
@@ -288,7 +288,7 @@ to each line item.</para>
 <simplesect xml:id="create-invoice-line-items">\r
 <title>Create an Invoice From Multiple Line Items</title>\r
 \r
-<para>You can create an invoice from mulitple line items on a purchase order.  You can then link additional line items from the same or \r
+<para>You can create an invoice from multiple line items on a purchase order.  You can then link additional line items from the same or \r
 different purchase orders to this invoice.</para>\r
 \r
 <procedure>\r
@@ -347,7 +347,7 @@ to each line item.</para>
 </informalfigure>\r
 \r
 <note>\r
-<para>Title Details include:</para>\r
+<para><guilabel>Title Details</guilabel> includes:</para>\r
 \r
 <itemizedlist>\r
 <listitem>\r
@@ -446,11 +446,11 @@ to each line item.</para>
 </step>\r
 \r
 <step>\r
-<para>For information on linking additional line items to the invoice see <link linkend="populate-invoice">populating invoices</link>.</para>\r
+<para>For information on linking additional line items to the invoice see <link linkend="populate-invoice">Populating Invoices</link>.</para>\r
 </step>\r
 \r
 <step>\r
-<para>For information on adding charges to the invoice see <link linkend="add-charges-invoice">adding charges</link>.</para>\r
+<para>For information on adding charges to the invoice see <link linkend="add-charges-invoice">Add Charges to an Invoice</link>.</para>\r
 </step>\r
 \r
 <step>\r
@@ -523,7 +523,7 @@ to that line item.</para>
 </informalfigure>\r
 \r
 <note>\r
-<para>Title Details includes:</para>\r
+<para><guilabel>Title Details</guilabel> includes:</para>\r
 \r
 <itemizedlist>\r
 <listitem>\r
@@ -621,11 +621,11 @@ to that line item.</para>
 </step>\r
 \r
 <step>\r
-<para>For information on linking additional line items to the invoice see <link linkend="populate-invoice">populating invoices</link>.</para>\r
+<para>For information on linking additional line items to the invoice see <link linkend="populate-invoice">Populating Invoices</link>.</para>\r
 </step>\r
 \r
 <step>\r
-<para>For information on adding charges to the invoice see <link linkend="add-charges-invoice">adding charges</link>.</para>\r
+<para>For information on adding charges to the invoice see <link linkend="add-charges-invoice">Add Charges to an Invoice</link>.</para>\r
 </step>\r
 \r
 <step>\r
@@ -729,7 +729,7 @@ to that line item.</para>
 \r
 <listitem>\r
 <informalfigure>\r
-<para>Note</para>\r
+<para><guilabel>Note</guilabel></para>\r
 <para>This is an optional field that can be used as needed.</para>\r
 <para><mediaobject>\r
 <alt>screenshot of invoicing</alt>\r
@@ -744,8 +744,8 @@ to that line item.</para>
 <listitem>\r
 <informalfigure>\r
 <para><guilabel>Payment Method</guilabel></para>\r
-<para>Available payment methods display in a drop down menu. Additional payment methods can be requested by \r
-<link linkend="guidelines-submit-default">submitting a suggestion</link>.</para>\r
+<para>Available payment methods display in a drop down menu. Additional payment methods can be requested.  See \r
+<link linkend="guidelines-submit-default">Guidelines for Submitting Suggestions for New Defaults</link>.</para>\r
 <para><emphasis>This is a required field.</emphasis></para>\r
 <para><mediaobject>\r
 <alt>screenshot of invoicing</alt>\r
@@ -929,7 +929,7 @@ purchase order #2 you simply link the purchase order to the invoice.</para>
       <title>Link a Single Line Item to an Existing Invoice</title>\r
      <para>Use the <guilabel>Link to Invoice</guilabel> menu option to link a line item to an invoice that already exists in Evergreen.</para>\r
 <para>For example, an invoice may be made up of items from multiple purchase orders.  In this circumstance, you can create an invoice for your\r
-first item and then link a line items from another purchase orders onto that invoice.</para> \r
+first item and then link a line item from another purchase orders onto that invoice.</para> \r
 \r
 <procedure>\r
 <step>\r
@@ -1033,7 +1033,7 @@ first item and then link a line items from another purchase orders onto that inv
 <step>\r
 <informalfigure>\r
 <para>Using the main <guilabel>Actions</guilabel> menu, select \r
-<menuchoice><guimenu>Actions</guimenu><guimenuitem>Create Invoice From Selected Lineitems</guimenuitem></menuchoice>.</para>\r
+<menuchoice><guimenu>Actions</guimenu><guimenuitem>Link To Invoice for Selected Lineitems</guimenuitem></menuchoice>.</para>\r
 <para><mediaobject>\r
 <alt>screenshot of invoicing</alt>\r
 \r
@@ -1090,7 +1090,7 @@ first item and then link a line items from another purchase orders onto that inv
 <alt>screenshot of invoicing</alt>\r
 \r
 <imageobject>\r
-<imagedata fileref="media/link-invoice-lineitem-5.png" scalefit="0"></imagedata>\r
+<imagedata fileref="media/link-invoice-multiple-5.png" scalefit="0"></imagedata>\r
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
@@ -1104,6 +1104,16 @@ first item and then link a line items from another purchase orders onto that inv
 <simplesect xml:id="link-search-lineitem">\r
 <title>Search for Line Items from an Invoice</title>\r
 \r
+ <legalnotice>\r
+         <para><emphasis role="bold">Adapted with permission from original material by the <link\r
+                  xlink:title="http://www.esilibrary.com/esi/docs/?p=1405"\r
+                  xlink:href="http://www.esilibrary.com/esi/docs/?p=1405">Evergreen\r
+                  Community</link></emphasis></para>\r
+      </legalnotice>\r
+\r
+\r
+<para>You can use the new <guilabel>Search</guilabel> tab to search for and add line items to an invoice from within the invoice.</para>\r
+\r
 <procedure>\r
 \r
 <step>\r
@@ -1126,7 +1136,7 @@ first item and then link a line items from another purchase orders onto that inv
 <step>\r
 <informalfigure>\r
 <para>Select your search criteria from the drop down menu.</para>\r
-<para>See <link linkend="lineitem-search">Searching for Line Items</link> for searching tips.</para>\r
+<para>See <link linkend="lineitem-search">Searching for Line Items</link> for general searching tips.</para>\r
 <para><mediaobject>\r
 <alt>screenshot of invoicing</alt>\r
 \r
@@ -1167,7 +1177,11 @@ first item and then link a line items from another purchase orders onto that inv
 \r
 <step>\r
 <informalfigure>\r
-<para>Click <guilabel>Search</guilabel>.</para>\r
+<para>Click <guilabel>Search</guilabel> or press <guibutton>Enter</guibutton> on your keyboard.</para>\r
+<note><para><guibutton>Search</guibutton> will start a new search while <guibutton>Enter</guibutton> will build on your current search.</para>\r
+<para>For example, choose LIA-ISBN as your search field, type in the ISBN of your first book and press <guibutton>Enter</guibutton>.  The line item will appear in the \r
+results list.  Then, type your next ISBN into the search box and press <guibutton>Enter</guibutton>.  Both line items will now appear in the results list.  Continue\r
+building your list.</para></note>\r
 <para><mediaobject>\r
 <alt>screenshot of invoicing</alt>\r
 \r
@@ -1235,7 +1249,7 @@ first item and then link a line items from another purchase orders onto that inv
 are purchased without a purchase order, such as a bulk book buy at a local bookstore.  See <link linkend="invoice-item-default">Invoice Item Type</link> \r
 for a list of the charge types available.</para>\r
 \r
-<para>Some charge types, such as taxes, are proratable.  This means when <guilabel>Save and Prorate</guilabel> is clicked the system divides the amount being charged \r
+<para>Some charge types, such as taxes, are proratable.  This means when <guilabel>Prorate</guilabel> is clicked the system divides the amount being charged \r
 proportionally among the funds in use on the invoice based on how much is being spent out of each fund.</para>\r
 \r
 <para><link linkend="add-charges-invoice">Add Charges to an Invoice</link></para>\r
@@ -1318,7 +1332,7 @@ proportionally among the funds in use on the invoice based on how much is being
 \r
 <step>\r
 <informalfigure>\r
-<para>There are three options for saving an invoice:</para>  \r
+<para>There are two options for saving an invoice:</para>  \r
 <para><mediaobject>\r
 <alt>screenshot of invoicing</alt>\r
 \r
@@ -1329,9 +1343,7 @@ proportionally among the funds in use on the invoice based on how much is being
 </informalfigure>\r
 \r
 <para>Click <guibutton>Save</guibutton> to save the changes you have made and keep the invoice open.</para>\r
-<para>Click <guibutton>Save and Prorate</guibutton> to save the invoice and prorate any additional changes, such as taxes across funds if multiple funds are used to \r
-pay the invoice.</para>\r
-<para>Click <guibutton>Save and Close</guibutton> to close the invoice when you have completed it.</para>\r
+<para>Click <guibutton>Save and Clear</guibutton> to save the invoice and open a blank invoice.</para>\r
 <note><para>Invoices can be re-opened at a later date if adjustments are required.  See <link linkend="reopen-invoice">Re-Open an Invoice</link>.</para></note>\r
 </step>\r
 \r
@@ -1392,7 +1404,7 @@ See <link linkend="reopen-invoice">Re-Open an Invoice</link>.</para>
 \r
 <step>\r
 <informalfigure>\r
-<para>There are three options for saving an invoice:</para>  \r
+<para>There are two options for saving an invoice:</para>  \r
 <para><mediaobject>\r
 <alt>screenshot of invoicing</alt>\r
 \r
@@ -1403,9 +1415,7 @@ See <link linkend="reopen-invoice">Re-Open an Invoice</link>.</para>
 </informalfigure>\r
 \r
 <para>Click <guibutton>Save</guibutton> to save the changes you have made and keep the invoice open.</para>\r
-<para>Click <guibutton>Save and Prorate</guibutton> to save the invoice and prorate any additional changes, such as taxes across funds if multiple funds are used to \r
-pay the invoice.</para>\r
-<para>Click <guibutton>Save and Close</guibutton> to close the invoice when you have completed it.</para>\r
+<para>Click <guibutton>Save and Clear</guibutton> to save the invoice and open a blank invoice.</para>\r
 <note><para>Invoices can be re-opened at a later date if adjustments are required.  See <link linkend="reopen-invoice">Re-Open an Invoice</link>.</para></note>\r
 </step>\r
 \r

diff --git a/acq/acq-receive.xml b/acq/acq-receive.xml
index 6ff4df7..9b19676 100644 (file)
--- a/acq/acq-receive.xml
+++ b/acq/acq-receive.xml
@@ -453,7 +453,7 @@ un-receive that copy. Copies must have a status of <guilabel>received</guilabel>
 \r
 <step>\r
 <informalfigure>\r
-<para>When your invoice is complete use one of the three <guibutton>Save</guibutton> options.</para>\r
+<para>When your invoice is complete use one of the two <guibutton>Save</guibutton> options.</para>\r
 <para><mediaobject>\r
 <alt>screenshot of invoicing</alt>\r
 \r
@@ -462,10 +462,9 @@ un-receive that copy. Copies must have a status of <guilabel>received</guilabel>
 </imageobject>\r
 </mediaobject></para>\r
 </informalfigure>\r
+\r
 <para>Click <guibutton>Save</guibutton> to save the changes you have made and keep the invoice open.</para>\r
-<para>Click <guibutton>Save and Prorate</guibutton> to save the invoice and prorate any additional changes, such as taxes across funds if multiple funds are used to \r
-pay the invoice.</para>\r
-<para>Click <guibutton>Save and Close</guibutton> to close the invoice when you have completed it.</para>\r
+<para>Click <guibutton>Save and Clear</guibutton> to save the invoice and open a blank invoice.</para>\r
 <note><para>Invoices can be re-opened at a later date if adjustments are required.  See <link linkend="reopen-invoice">Re-Open an Invoice</link>.</para></note>\r
 </step>\r
 \r