Merge branch 'Acq26'

Conflicts:
	intro/acq-new-features.xml

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

diff --git a/admin/admin-acqdefaults.xml b/admin/admin-acqdefaults.xml
index 78706b0..a751b4c 100644 (file)
--- a/admin/admin-acqdefaults.xml
+++ b/admin/admin-acqdefaults.xml
@@ -425,6 +425,9 @@ to the amount being spent by each fund on the invoice.</para>
 <para>Provincial Sales Tax (t)</para>\r
 </listitem>\r
 <listitem>\r
+<para>PST (No Prorate) (f)</para>\r
+</listitem>\r
+<listitem>\r
 <para>Serial Subscription (f)</para>\r
 </listitem>\r
 <listitem>\r

diff --git a/intro/acq-new-features.xml b/intro/acq-new-features.xml
index 4bfc4d4..ff58cb8 100644 (file)
--- a/intro/acq-new-features.xml
+++ b/intro/acq-new-features.xml
@@ -22,6 +22,7 @@
    \r
 <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
@@ -32,6 +33,13 @@
          </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
+>>>>>>> Acq26
 </section>\r
 \r
 <section xml:id="new-features-2">\r
@@ -91,8 +99,12 @@
 \r
 <section xml:id="new-features-4">\r
 <title>Printing PO Names on Purchase Orders</title>\r
+<<<<<<< HEAD
+<para>The <guilabel>Print Purchase Order</guilabel> option now prints the PO Name in 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
@@ -101,6 +113,9 @@
          </imageobject>\r
       </mediaobject></para>\r
    </informalfigure>\r
+=======
+>>>>>>> sitka_2_6
+>>>>>>> Acq26
 </section>\r
    \r
 </chapter>\r