projects / koha.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Bug 9238 - make fund pull down say 'select fund', not 'select budget'
[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / acqui / neworderempty.tt
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 47ee262..da8f88a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -6,6 +6,7 @@
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
 [% INCLUDE 'additem.js.inc' %]
 <script type="text/javascript" src="[% themelang %]/js/additem.js"></script>
+<script type="text/javascript" src="[% themelang %]/js/cataloging.js"></script>
 <script type="text/javascript" src="[% themelang %]/js/prevent_submit.js"></script>
 <script type="text/javascript">
 //<![CDATA[
@@ -39,7 +40,7 @@ function Check(ff) {
     
     if(isNull(ff.budget_id,1)){
                ok=1;
-                                       _alertString += "\n- "+ _("You must select a budget");
+        _alertString += "\n- "+ _("You must select a fund");
     }
 
     if (!(isNum(ff.quantity,0)) || ff.quantity.value == 0){
@@ -64,13 +65,7 @@ function Check(ff) {
     }
 
     if ( ff.field_value ) {
-        var empty_item_mandatory = 0;
-        for (i = 0; i < ff.field_value.length; i++) {
-            //alert("i = " + i + " => " + ff.kohafield[i] );
-            if (ff.field_value[i].value.length == 0 && ff.mandatory[i].value == 1) {
-                empty_item_mandatory++;
-            }
-        }
+        var empty_item_mandatory = CheckMandatorySubfields(ff);
         if (empty_item_mandatory > 0) {
             ok = 1;
             _alertString +=
@@ -241,7 +236,7 @@ $(document).ready(function()
         <ol><li>
             [% IF ( biblionumber ) %]
             <span class="label">Title</span>
-                <input type="hidden" size="50" name="title" value="[% title |html %]" /> <span class="title">[% title |html %]</span>
+                <input type="hidden" name="title" value="[% title |html %]" /> <span class="title">[% title |html %]</span>
             [% ELSE %]
             <label for="entertitle" class="required">Title: </label>
                 <input type="text" id="entertitle" size="50" name="title" value="[% title |html %]" />
@@ -250,7 +245,7 @@ $(document).ready(function()
         <li>
             [% IF ( biblionumber ) %]
             <span class="label">Author: </span>
-                <input type="hidden" size="50" name="author" id="author" value="[% author %]" />[% author %]
+                <input type="hidden" name="author" id="author" value="[% author %]" />[% author %]
             [% ELSE %]
             <label for="author">Author: </label>
                 <input type="text" size="50" name="author" id="author" value="[% author %]" />
@@ -259,7 +254,7 @@ $(document).ready(function()
         <li>
             [% IF ( biblionumber ) %]
             <span class="label">Publisher: </span>
-                <input type="hidden" size="50" name="publishercode" id="publishercode" value="[% publishercode %]" />[% publishercode %]
+                <input type="hidden" name="publishercode" id="publishercode" value="[% publishercode %]" />[% publishercode %]
             [% ELSE %]
             <label for="publishercode"> Publisher: </label>
                 <input type="text" size="50" name="publishercode" id="publishercode" value="[% publishercode %]" />
@@ -268,7 +263,7 @@ $(document).ready(function()
         <li>
             [% IF ( biblionumber ) %]
             <span class="label">Edition: </span>
-                <input type="hidden" size="20" name="editionstatement" id="editionstatement" value="[% editionstatement %]" />[% editionstatement %]
+                <input type="hidden" name="editionstatement" id="editionstatement" value="[% editionstatement %]" />[% editionstatement %]
 
             [% ELSE %]
             <label for="editionstatement">Edition: </label>
@@ -278,7 +273,7 @@ $(document).ready(function()
         <li>
             [% IF ( biblionumber ) %]
             <span class="label">Publication year: </span>
-                <input type="hidden" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />[% publicationyear %]
+                <input type="hidden" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />[% publicationyear %]
             [% ELSE %]
             <label for="publicationyear">Publication year: </label>
                 <input type="text" size="10" name="publicationyear" id="publicationyear" value="[% publicationyear %]" />
@@ -287,7 +282,7 @@ $(document).ready(function()
         <li>
             [% IF ( biblionumber ) %]
             <span class="label">ISBN: </span>
-                <input type="hidden" size="50" name="isbn" id="ISBN" value="[% isbn %]" />[% isbn %]
+                <input type="hidden" name="isbn" id="ISBN" value="[% isbn %]" />[% isbn %]
             [% ELSE %]
             <label for="ISBN">ISBN: </label>
                 <input type="text" size="50" name="isbn" id="ISBN" value="[% isbn %]" />
@@ -297,7 +292,7 @@ $(document).ready(function()
         <li>
             [% IF ( biblionumber ) %]
             <span class="label">EAN: </span>
-                <input type="hidden" size="20" name="ean" id="EAN" value="[% ean %]" />[% ean %]
+                <input type="hidden" name="ean" id="EAN" value="[% ean %]" />[% ean %]
             [% ELSE %]
             <label for="EAN">EAN: </label>
                 <input type="text" size="20" name="ean" id="EAN" value="[% ean %]" />
@@ -307,12 +302,11 @@ $(document).ready(function()
         <li>
             [% IF ( biblionumber ) %]
             <span class="label">Series: </span>
-                <input type="hidden" size="50" name="series" id="series" value="[% seriestitle %]" />[% seriestitle %]
+                <input type="hidden" name="series" id="series" value="[% seriestitle %]" />[% seriestitle %]
             [% ELSE %]
             <label for="series">Series: </label>
                 <input type="text" size="50" name="series" id="series" value="[% seriestitle %]" />
             [% END %]
-        </li>
         </li>
             [% UNLESS ( biblionumber ) %]
             [% IF ( itemtypeloop ) %]
@@ -389,12 +383,12 @@ $(document).ready(function()
       [% END %][%# UNLESS subscriptionid %]
     [% END %][%# IF (AcqCreateItemOrdering) %]
     <fieldset class="rows">
-        <legend>Accounting Details</legend>
+        <legend>Accounting details</legend>
         <ol>
             <li>
                 [% IF ( close ) %]
             <span class="label required">Quantity: </span>
-                    <input type="hidden" size="20" name="quantity" value="[% quantity %]" />[% quantity %]
+                    <input type="hidden" name="quantity" value="[% quantity %]" />[% quantity %]
                 [% ELSE %]
                     <label class="required" for="quantity">Quantity: </label>
                     [% IF (AcqCreateItemOrdering) %]
@@ -417,11 +411,11 @@ $(document).ready(function()
             <li>
                 [% IF ( close ) %]
             <span class="label required">Fund: </span>
-                    <input type="hidden" size="20" name="budget_id" id="budget_id" value="[% budget_id %]" />[% Budget_name %]
+                    <input type="hidden" name="budget_id" id="budget_id" value="[% budget_id %]" />[% Budget_name %]
                 [% ELSE %]
                 <label class="required" for="budget_id">Fund: </label>
                 <select id="budget_id" onchange="fetchSortDropbox(this.form)" size="1" name="budget_id">
-                        <option value="">Select a budget</option>
+                        <option value="">Select a fund</option>
                 [% FOREACH budget_loo IN budget_loop %]
                     [% IF ( budget_loo.b_sel ) %]
                         <option value="[% budget_loo.b_id %]" selected="selected">[% budget_loo.b_txt %]</option>
@@ -439,7 +433,7 @@ $(document).ready(function()
                <li>
                 [% IF ( close ) %]
                        <span class="label">Currency: </span>
-                       <input type="hidden" size="10" name="currency" id="currency" value="[% currency %]" />[% currency %]
+            <input type="hidden" name="currency" id="currency" value="[% currency %]" />[% currency %]
                 [% ELSE %]
                        <label for="currency">Currency:</label>
                        <select name="currency" id="currency" onchange="updateCosts();">
@@ -451,7 +445,7 @@ $(document).ready(function()
             <li>
                 [% IF ( close ) %]
                     <span class="label">Vendor price: </span>
-                    <input type="hidden" size="20" name="listprice" id="listprice" value="[% listprice %]" />[% listprice %]
+                    <input type="hidden" name="listprice" id="listprice" value="[% listprice %]" />[% listprice %]
                 [% ELSE %]
                 <label for="listprice">Vendor price: </label>
                     <input type="text" size="20" name="listprice" id="listprice" value="[% listprice %]" onchange="updateCosts()" />
@@ -471,9 +465,9 @@ $(document).ready(function()
                 <li>
                     [% IF ( close ) %]
                         <span class="label">Tax rate: </span>
-                        <input type="hidden" size="20" name="gstrate" id="gstrate" value="[% gstrate %]" />[% gstrate %]%
+                        <input type="hidden" name="gstrate" id="gstrate" value="[% gstrate %]" />[% gstrate %]%
                     [% ELSE %]
-                        <label for="gst">Tax rate: </label>
+                        <label for="gstrate">Tax rate: </label>
                         <select name="gstrate" id="gstrate" onchange="updateCosts();">
                         [% FOREACH gst IN gst_values %]
                           [% IF ( gst.option == gstrate ) %]
@@ -507,7 +501,7 @@ $(document).ready(function()
             <li>
                 [% IF ( close ) %]
                     <span class="label">Replacement cost: </span>
-                    <input type="hidden" size="20" name="rrp" id="rrp" value="[% rrp %]" />[% rrp %]
+                    <input type="hidden" name="rrp" id="rrp" value="[% rrp %]" />[% rrp %]
                 [% ELSE %]
                     <label for="rrp">Replacement cost: </label>
                     <input type="text" size="20" name="rrp" id="rrp" value="[% rrp %]" /> (adjusted for [% cur_active %])
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git