Merge branch 'acq-po-ui-improvements' into senator-masslnc-acq-integrate

Conflicts:
	Open-ILS/src/templates/conify/global/acq/distribution_formula.tt2

diff --cc Open-ILS/src/templates/conify/global/acq/distribution_formula.tt2
index 2132d9f,d80e29e..68f536e
--- 1/Open-ILS/src/templates/conify/global/acq/distribution_formula.tt2
--- 2/Open-ILS/src/templates/conify/global/acq/distribution_formula.tt2
+++ b/Open-ILS/src/templates/conify/global/acq/distribution_formula.tt2
@@@ -49,10 -49,7 +49,10 @@@
              <tr>
                  <th></th>
                  <th>[% l('Owning Library') %]</th>
-                 <th>[% l('Shelving Location') %]</th>
+                 <th>[% l('Copy Location') %]</th>
 +                <th>[% l('Fund') %]</th>
 +                <th>[% l('Circ Modifier') %]</th>
 +                <th>[% l('Collection Code') %]</th>
                  <th>[% l('Item Count') %]</th>
                  <th></th>
              </tr>