Koha-FFZG#1517: Actual cost kod zaprimanja je 0 a trebalo bi prepisati Budgeted cost

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / acqui / orderreceive.tt

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..6d0e090 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -1,6 +1,8 @@
+[% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; Receipt summary for : [% name %] [% IF ( invoice ) %]invoice, [% invoice %][% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
+[% INCLUDE 'calendar.inc' %]
 [% INCLUDE 'additem.js.inc' %]
 <script type="text/javascript" src="[% themelang %]/js/additem.js"></script>
 <script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script>
@@ -69,7 +71,9 @@
                             var tds = $("#item_"+itemnumber+" td");
                             for(var i=2; i<tds.length; i++) {
                                 var column = items_columns[i];
-                                $(tds[i]).text(item[column]);
+                                var text = item[column];
+                                if ( text == null ) text = '';
+                                $(tds[i]).text(text);
                             }
                         }
                     );
@@ -178,7 +182,7 @@
                             <th>Location</th>
                             <th>Call number</th>
                             <th>Copy number</th>
-                            <th>Stock number</th>
+                            <th>Inventory number</th>
                             <th>Collection code</th>
                             <th>Item type</th>
                             <th>Materials</th>
@@ -221,7 +225,7 @@
                             <th>Location</th>
                             <th>Call number</th>
                             <th>Copy number</th>
-                            <th>Stock number</th>
+                            <th>Inventory number</th>
                             <th>Collection code</th>
                             <th>Item type</th>
                             <th>Materials</th>
@@ -257,14 +261,16 @@
     <input type="hidden" name="invoiceid" value="[% invoiceid %]" />
     <input type="hidden" name="ordernumber" value="[% ordernumber %]" />
     <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
-    <input type="hidden" name="datereceived" value="[% datereceived_iso %]" />
     <input type="hidden" name="gstrate" value="[% gstrate %]" />
        </div>
        <div class="yui-u">
     <fieldset class="rows">
     <legend>Accounting details</legend>
-       <ol>
-       <li><label for="datereceived">Date received: </label><span> [% datereceived %] </span></li>
+        <ol>
+            <li>
+                <label for="datereceived">Date received: </label>
+                <input type="text" size="10" id="datereceived" name="datereceived" value="[% datereceived | $KohaDates %]" class="datepicker" />
+            </li>
        <li><label for="bookfund">Fund: </label><select id="bookfund" name="bookfund">
             <option value="">Keep current ([% budget_period_description %] - [% bookfund %])</option>
             [% FOREACH period IN budget_loop %]
@@ -324,13 +330,15 @@
         <li><label for="rrp">Replacement cost: </label><input type="text" size="20" name="rrp" id="rrp" value="[% rrp %]" /></li>
         <li><label for="ecost">Budgeted cost: </label><input type="text" size="20" name="ecost" id="ecost" value="[% ecost %]" /></li>
         <li><label for="cost">Actual cost:</label>
-        [% IF ( unitprice ) %]
+        [% IF ( unitprice > 0 ) %]
          <input type="text" size="20" name="cost" id="cost" value="[% unitprice %]" />
         [% ELSE %]
             <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>
+        [% IF order_vendornote %]
+            <li><label for="order_vendornote">Vendor note: </label><span>[% order_vendornote %]</span></li>
+        [% END %]
         </ol>
     </fieldset>