X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Facqui%2Fneworderempty.tt;h=861db56f2a61c38357e01b94dfd54abee89ee12e;hb=1b4b52fd25f8310e03555bd431c9d485b70c50aa;hp=df96f1a52e87a4e978d982b951435aa850798655;hpb=2782a039aa7883107c74ab6e446aa51b9f555683;p=koha-ffzg.git

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index df96f1a52e..861db56f2a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -15,7 +15,36 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'acquisitions-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% name | html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketno | html %]</a> &rsaquo; [% IF ( ordernumber ) %]Modify order details (line #[% ordernumber | html %])[% ELSE %]New order[% END %]</div>
+<nav aria-label="Breadcrumb" class="breadcrumb">
+    <ol>
+        <li>
+            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
+        </li>
+        <li>
+            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
+        </li>
+        <li>
+            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a>
+        </li>
+        <li>
+            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
+        </li>
+
+    [% IF ( ordernumber ) %]
+    <li>
+        <a href="#" aria-current="page">
+            Modify order details (line #[% ordernumber | html %])
+        </a>
+    </li>
+    [% ELSE %]
+    <li>
+        <a href="#" aria-current="page">
+            New order
+        </a>
+    </li>
+    [% END %]
+    </ol>
+</nav>
 
 [% INCLUDE 'blocking_errors.inc' %]
 
@@ -253,12 +282,12 @@
       [% IF (AcqCreateItemOrdering) %]
 
       <div id="items_list" style="display:none">
-          <p><b>Items list</b></p>
+          <p><strong>Items list</strong></p>
           <div style="width:100%;overflow:auto;">
               <table>
                   <thead>
                       <tr>
-                          <th>Actions</th>
+                          <th class="noExport">Actions</th>
                           <th>Barcode</th>
                           <th>Home library</th>
                           <th>Holding library</th>
@@ -268,7 +297,7 @@
                           <th>Call number</th>
                           <th>Copy number</th>
                           <th>Inventory number</th>
-                          <th>Collection code</th>
+                          <th>Collection</th>
                           <th>Item type</th>
                           <th>Materials</th>
                           <th>Notes</th>
@@ -299,28 +328,23 @@
         <legend>Accounting details</legend>
         <ol>
             <li>
-                [% IF ( close ) %]
-                    <span class="label required">Quantity: </span>
-                    <input type="hidden" name="quantity" value="[% quantity | html %]" />[% quantity | html %]
+                <label class="required" for="quantity">Quantity: </label>
+                [% IF subscriptionid %]
+                    <input type="text" size="20" id="quantity" name="quantity" value="1" onchange="updateCosts();" />
+                [% ELSIF AcqCreateItemOrdering %]
+                    [% IF basket.is_standing %]
+                        <input type="text" readonly="readonly" size="20" id="quantity" name="quantity" value="1" />
+                    [% ELSE %]
+                        <input type="text" readonly="readonly" size="20" id="quantity" name="quantity" value="0" />
+                    [% END %]
                 [% ELSE %]
-                    <label class="required" for="quantity">Quantity: </label>
-                    [% IF subscriptionid %]
-                        <input type="text" size="20" id="quantity" name="quantity" value="1" onchange="updateCosts();" />
-                    [% ELSIF AcqCreateItemOrdering %]
-                        [% IF basket.is_standing %]
-                            <input type="text" readonly="readonly" size="20" id="quantity" name="quantity" value="1" />
-                        [% ELSE %]
-                            <input type="text" readonly="readonly" size="20" id="quantity" name="quantity" value="0" />
-                        [% END %]
+                    [% IF basket.is_standing %]
+                        <input type="text" readonly="readonly" size="20" id="quantity" name="quantity" value="1" />
                     [% ELSE %]
-                        [% IF basket.is_standing %]
-                            <input type="text" readonly="readonly" size="20" id="quantity" name="quantity" value="1" />
-                        [% ELSE %]
-                            <input type="text" size="20" id="quantity" name="quantity" value="[% quantityrec | html %]" onchange="updateCosts();" />
-                        [% END %]
+                        <input type="text" size="20" id="quantity" name="quantity" value="[% quantityrec | html %]" onchange="updateCosts();" />
                     [% END %]
-                    <span class="required">Required</span>
                 [% END %]
+                <span class="required">Required</span>
                 <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, useful when receiveing an order -->
                 <input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" />
 
@@ -335,10 +359,6 @@
                 [% END %]
             </li>
             <li>
-                [% IF ( close ) %]
-            <span class="label required">Fund: </span>
-                    <input type="hidden" name="budget_id" id="budget_id" value="[% budget_id | html %]" />[% Budget_name | html %]
-                [% ELSE %]
                 <label class="required" for="budget_id">Fund: </label>
                 [% active_count = 0 %]
                 [% IF !ordernumber %]
@@ -364,20 +384,15 @@
                                 style="padding-left:[% budget_loo.b_level | html %]em;"
                         >
                     [% END %]
-                    [% budget_loo.b_txt | html %][% IF !budget_loo.b_active %] (inactive)[% END %]
+                        [% budget_loo.b_txt | html %][% IF !budget_loo.b_active %] (inactive)[% END %]
                     </option>
                 [% END %]
                 </select>
                 <span class="required">Required</span>
                 <label for="showallbudgets" style="float:none;">&nbsp;Show inactive:</label>
                 <input type="checkbox" id="showallbudgets" />
-                [% END %]
             </li>
 		<li>
-                [% IF ( close ) %]
-			<span class="label">Currency: </span>
-            <input type="hidden" name="currency" id="currency" value="[% currency | html %]" />[% currency | html %]
-                [% ELSE %]
 			<label for="currency">Currency:</label>
             <select name="currency" id="currency" onchange="updateCosts();">
                 [% FOREACH c IN currencies %]
@@ -388,18 +403,11 @@
                     [% END %]
                 [% END %]
             </select>
-		[% END %]
                 </li>
             <li>
-                [% IF ( close ) %]
-                    <span class="label">Vendor price: </span>
-                    <input type="hidden" name="listprice" id="listprice" value="[% listprice | html %]" />[% listprice | html %] [% IF (listincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]
-                [% ELSE %]
                 <label for="listprice">Vendor price: </label>
                     <input type="text" size="20" name="listprice" id="listprice" value="[% listprice | html %]" onchange="updateCosts()" /> [% IF (listincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]
-                [% END %]
             </li>
-            [% UNLESS ( close ) %]
             <li>
                     <label for="uncertainprice">Uncertain price: </label>
                     [% IF ( uncertainprice ) %]
@@ -408,52 +416,41 @@
                     <input type="checkbox" name="uncertainprice" id="uncertainprice" value="1" />
                 [% END %]
             </li>
-            [% END %]
             [% IF ( gst_values ) %]
                 <li>
-                    [% IF ( close ) %]
-                        <span class="label">Tax rate: </span>
-                        <input type="hidden" name="tax_rate" id="tax_rate" value="[% tax_rate | html %]" />[% tax_rate | html %]%
-                    [% ELSE %]
-                        <label for="tax_rate">Tax rate: </label>
-                        <select name="tax_rate" id="tax_rate" onchange="updateCosts();">
+                    <label for="tax_rate">Tax rate: </label>
+                    <select name="tax_rate" id="tax_rate" onchange="updateCosts();">
+                        [% SET gst_found = 0 %]
                         [% FOREACH gst IN gst_values %]
                           [% IF ( gst.option == tax_rate ) %]
                             <option value="[% gst.option | html %]" selected="selected">[% gst.option * 100 | html %]%</option>
+                            [% SET gst_found = 1 %]
                           [% ELSE %]
                             <option value="[% gst.option | html %]">[% gst.option * 100 | html %]%</option>
                           [% END %]
                         [% END %]
-                        </select>
-                    [% END %]
-                [% ELSE %]
+
+                        [% IF !gst_found %]
+                            <option value="[% tax_rate | html %]" selected="selected">[% tax_rate * 100 | html %]%</option>
+                        [% END %]
+                    </select>
+
+                    [% IF !gst_found %]<span class="required">Tax rate not defined in system preference TaxRates!</span>[% END %]
+            [% ELSE %]
                     <input type="hidden" name="tax_rate" value="0" />
                 </li>
             [% END %]
             <li>
                 <label for="discount">Discount: </label>
-                [% IF ( close ) %]
-                    [% IF ( orderdiscount ) %]
-                        <input type="hidden" name="discount" id="discount" value="[% orderdiscount | html %]" />[% orderdiscount_2dp | html %]%
-                    [% ELSE %]
-                        <input type="hidden" name="discount" id="discount" value="[% discount | html %]" />[% discount_2dp | html %]%
-                    [% END %]
+                [% IF ( orderdiscount ) %]
+                    <input type="text" size="6" name="discount" id="discount" value="[% orderdiscount | html %]" onchange="updateCosts();" />%
                 [% ELSE %]
-                    [% IF ( orderdiscount ) %]
-                        <input type="text" size="6" name="discount" id="discount" value="[% orderdiscount | html %]" onchange="updateCosts();" />%
-                    [% ELSE %]
-                        <input type="text" size="6" name="discount" id="discount" value="[% discount | html %]" onchange="updateCosts();" />%
-                    [% END %]
+                    <input type="text" size="6" name="discount" id="discount" value="[% discount | html %]" onchange="updateCosts();" />%
                 [% END %]
             </li>
             <li>
-                [% IF ( close ) %]
-                    <span class="label">Retail price: </span>
-                    <input type="hidden" name="rrp" id="rrp" value="[% rrp | html %]" />[% rrp | html %]  (adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %])
-                [% ELSE %]
-                    <label for="rrp">Retail price: </label>
-                    <input type="text" size="20" name="rrp" id="rrp" value="[% rrp | html %]" /> (adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %])
-                [% END %]
+                <label for="rrp">Retail price: </label>
+                <input type="text" size="20" name="rrp" id="rrp" value="[% rrp | html %]" /> (adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %])
             </li>
             <li>
                 <label for="replacementprice">Replacement cost: </label>
@@ -467,6 +464,11 @@
                 <label for="total">Total: </label>
                 <input type="text" id="total" size="20" name="total" value="[% total | html %]" readonly="readonly" /> (budgeted cost * quantity)
             </li>
+            <li class="ordering_unitprice">
+                <label for="unitprice">Actual cost: </label>
+                <input type="text" id="unitprice" size="20" name="unitprice" value="[% unitprice | html %]" />
+                [% IF (invoiceincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]
+            </li>
             <li>
                 <label for="order_internalnote">Internal note: </label>
                 <textarea id="order_internalnote" cols="30" rows="3" name="order_internalnote" >[% IF ( order_internalnote ) %][% order_internalnote | html %][% END %]</textarea>
@@ -513,7 +515,7 @@
     <div class="modal-dialog">
     <div class="modal-content">
     <h3>Invalid number of copies</h3>
-    <p>Please enter a <b>number</b>, greater than or equal to 1</p>
+    <p>Please enter a <strong>number</strong>, greater than or equal to 1</p>
     </div>
     </div>
 </div>
@@ -531,9 +533,9 @@
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/acquisitions-menu.js") | $raw %]
     [% Asset.js("js/acq.js") | $raw %]
-    [% INCLUDE 'additem.js.inc' %]
     [% Asset.js("js/additem.js") | $raw %]
     [% Asset.js("js/cataloging.js") | $raw %]
+    [% INCLUDE 'calendar.inc' %]
     <script>
         actTotal = "";