Merge branch 'Acq26'

[sitka/doc/acquisitions.git] / intro / acq-new-features.xml

diff --git a/intro/acq-new-features.xml b/intro/acq-new-features.xml
index cd30fec..ff58cb8 100644 (file)
--- a/intro/acq-new-features.xml
+++ b/intro/acq-new-features.xml
@@ -23,18 +23,78 @@
 <section xml:id="new-features-1">\r
 <title>Support PO activation without requiring items</title>\r
 <<<<<<< HEAD
 <section xml:id="new-features-1">\r
 <title>Support PO activation without requiring items</title>\r
 <<<<<<< HEAD

+   <para>A new <guilabel>Activate PO Without Loading Items</guilabel> option in the Purchase Order\r
+         allows staff to activate the PO without loading copies into the catalog.</para>\r
+   \r
+   <informalfigure>\r
+      <para><mediaobject>\r
+         <imageobject>\r
+            <imagedata scalefit="0" fileref="media/activate.png"/>\r
+         </imageobject>\r
+      </mediaobject></para>\r
+   </informalfigure>\r
+=======
+<<<<<<< HEAD

 <para>A new <guilabel>Activate PO Without Loading Items</guilabel> option in the PO allows staff to activate the PO without loading copies into the catalogue.</para>\r
 =======
    <para>A new <guilabel>Activate PO Without Loading Items</guilabel> option in the PO allows staff to activate the PO without loading copies into the catalog.</para>\r
 >>>>>>> sitka_2_6
 <para>A new <guilabel>Activate PO Without Loading Items</guilabel> option in the PO allows staff to activate the PO without loading copies into the catalogue.</para>\r
 =======
    <para>A new <guilabel>Activate PO Without Loading Items</guilabel> option in the PO allows staff to activate the PO without loading copies into the catalog.</para>\r
 >>>>>>> sitka_2_6

+>>>>>>> Acq26

 </section>\r
 \r
 <section xml:id="new-features-2">\r
 <title>Differentiate between cancelled and "delayed" lineitems</title>\r
 </section>\r
 \r
 <section xml:id="new-features-2">\r
 <title>Differentiate between cancelled and "delayed" lineitems</title>\r

+<para>It is now more clear to users when a lineitem has been fully cancelled or if it has been\r
+         cancelled temporarily "delayed".</para>\r
+   <itemizedlist>\r
+      <listitem>\r
+   <para>A line item that has been fully cancelled has a white background</para>\r
+   <informalfigure>\r
+      <para><mediaobject>\r
+         <imageobject>\r
+            <imagedata scalefit="0" fileref="media/cxldline.png"/>\r
+         </imageobject>\r
+      </mediaobject></para>\r
+   </informalfigure></listitem>\r
+   \r
+      <listitem><para>A line item that has been temporarily cancelled has a blue background</para>\r
+   <informalfigure>\r
+      <para><mediaobject>\r
+         <imageobject>\r
+            <imagedata scalefit="0" fileref="media/cxldline2.png"/>\r
+         </imageobject>\r
+      </mediaobject></para>\r
+   </informalfigure></listitem>\r
+   \r
+   <listitem>\r
+            <para>The line item cancel reason (label) is written next to the non-title attributes in\r
+               the line item list display</para>\r
+   <informalfigure>\r
+      <para><mediaobject>\r
+         <imageobject>\r
+            <imagedata scalefit="0" fileref="media/cxldline1.png"/>\r
+         </imageobject>\r
+      </mediaobject></para>\r
+   </informalfigure></listitem>\r
+   </itemizedlist>\r
+\r

 </section>\r
 \r
 <section xml:id="new-features-3">\r
 </section>\r
 \r
 <section xml:id="new-features-3">\r

-<title>Opportunistic Acquisitions In-Process Copy Overlay</title>\r
+<title>Auto-Overlay In Process Acquisitions Copies</title>\r
+   <para>Improves existing acquisitions copy overlay code by adding broader matching criteria. By selecting the new option, <guilabel>Auto Overlay In-process Acquisitions Copies</guilabel>, the system will potentially overlay copies which:</para>\r
+<itemizedlist>\r
+   <listitem><para>have associated lineitem details (that is, they were created by the acquisitions process),</para></listitem>\r
+   <listitem><para>that lineitem detail has the same owning_lib as the incoming copy’s owning_lib, and,</para></listitem>\r
+   <listitem><para>the current copy associated with that lineitem detail is <guilabel>In process.</guilabel></para></listitem>\r
+</itemizedlist>\r
+   <informalfigure>\r
+      <para><mediaobject>\r
+         <imageobject>\r
+            <imagedata scalefit="1" fileref="media/marcbatch.png"/>\r
+         </imageobject>\r
+      </mediaobject></para>\r
+   </informalfigure>\r

 </section>\r
 \r
 <section xml:id="new-features-4">\r
 </section>\r
 \r
 <section xml:id="new-features-4">\r


@@ -44,7 +104,18 @@
 =======
    <para>The <guilabel>Print Purchase Order</guilabel> option now prints the PO Name in\r
          addition to the PO ID.</para>\r
 =======
    <para>The <guilabel>Print Purchase Order</guilabel> option now prints the PO Name in\r
          addition to the PO ID.</para>\r

+<<<<<<< HEAD
+   \r
+   <informalfigure>\r
+      <para><mediaobject>\r
+         <imageobject>\r
+            <imagedata scalefit="0" fileref="media/printedpo.png"/>\r
+         </imageobject>\r
+      </mediaobject></para>\r
+   </informalfigure>\r
+=======

 >>>>>>> sitka_2_6
 >>>>>>> sitka_2_6

+>>>>>>> Acq26

 </section>\r
    \r
 </chapter>\r
 </section>\r
    \r
 </chapter>\r