Bug 12111: (follow-up) ensure that vendor note is not editable during order receiving

This patch removes the ability of finishreceive.pl to change the vendor
note of an order.  It also uses a normal span rather than a disabled
textarea to display the vendor note on the receiving page, to emphasize
that it cannot be changed.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl
index fa68078..1723520 100755 (executable)
--- a/acqui/finishreceive.pl
+++ b/acqui/finishreceive.pl
@@ -54,7 +54,6 @@ my $cnt              = 0;
 my $ecost            = $input->param('ecost');
 my $rrp              = $input->param('rrp');
 my $order_internalnote = $input->param("order_internalnote");
-my $order_vendornote = $input->param("order_vendornote");
 my $bookfund         = $input->param("bookfund");
 my $order            = GetOrder($ordernumber);
 my $new_ordernumber  = $ordernumber;
@@ -114,7 +113,6 @@ if ($quantityrec > $origquantityrec ) {
               datereceived     => $datereceived,
               received_items   => \@received_items,
               order_internalnote  => $order_internalnote,
-              order_vendornote    => $order_vendornote,
         } );
     }
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
index 9ecae04..422a4a3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -330,7 +330,7 @@
             <input type="text" size="20" name="cost" id="cost" value="[% ecost %]" />
         [% END %]</li>
         <li><label for="order_internalnote">Internal note: </label><textarea name="order_internalnote" width="40" rows="8" >[% order_internalnote %]</textarea></li>
-        <li><label for="order_vendornote">Vendor note: </label><textarea name="order_vendornote" width="40" rows="8" readonly="readonly">[% order_vendornote %]</textarea></li>
+        <li><label for="order_vendornote">Vendor note: </label><span>[% order_vendornote %]</span></li>
         </ol>
     </fieldset>