Bug 5917 : Catching changes from bug 5065 to templates

diff --git a/koha-tt/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tt/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index 0239dca..b3a6367 100644 (file)
--- a/koha-tt/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -143,7 +143,7 @@ ff.submit();
         <input type="hidden" name="biblioitemnumber" value="[% biblioitemnumber %]" />
         <input type="hidden" name="discount" value="[% discount %]" />
         <input type="hidden" name="listinc" value="[% listincgst %]" />
-        <input type="hidden" name="currency" value="[% currency %]" />
+<!--        <input type="hidden" name="currency" value="[% currency %]" />-->
         <input type="hidden" name="applygst" value="[% gstreg %]" />
         <input type="hidden" name="invoiceincgst" value="[% invoiceincgst %]" />
         <input type="hidden" name="gstrate" value="[% gstrate %]" />
@@ -151,7 +151,7 @@ ff.submit();
         <input type="hidden" name="import_batch_id" value="[% import_batch_id %]" />
 
         [% FOREACH loop_currencie IN loop_currencies %]
-            <input type="hidden" name="[% loop_currencie.currency %]" value="[% loop_currencie.rate %]" />
+            <input type="hidden" id="[% loop_currencie.currcode %]"  name="[% loop_currencie.currcode %]" value="[% loop_currencie.rate %]" />
         [% END %]
         <ol><li>
             [% IF ( biblionumber ) %]
@@ -279,14 +279,25 @@ ff.submit();
                 </select>
                 [% END %]
             </li>
+               <li>
+                [% IF ( close ) %]
+                       <span class="label">Currency: </span>
+                       <input type="hidden" size="10" name="currency" id="currency" value="[% currency %]" />[% currency %]
+                [% ELSE %]
+                       <label for="currency">Currency:</label>
+                       <select name="currency" id="currency" onchange="calcNeworderTotal();">
+                       [% FOREACH loop_currencie IN loop_currencies %]
+                       [% IF ( loop_currencie.selected ) %]<option value="[% loop_currencie.currcode %]" selected="selected">[% loop_currencie.currcode %]</option>[% ELSE %]<option value="[% loop_currencie.currcode %]">[% loop_currencie.currcode %]</option>[% END %][% END %]
+                       </select>
+               [% END %]
+                </li>
             <li>
                 [% IF ( close ) %]
             <span class="label">Vendor price: </span>
                     <input type="hidden" size="20" 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="calcNeworderTotal()" /> (entered as [% currency %])
-
+                    <input type="text" size="20" name="listprice" id="listprice" value="[% listprice %]" onchange="calcNeworderTotal()" />
                 [% END %]
             </li>
             [% UNLESS ( close ) %]

diff --git a/koha-tt/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tt/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
index 99ed64b..526f8c9 100644 (file)
--- a/koha-tt/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
@@ -150,7 +150,19 @@ $(document).ready(function(){
     <input type="hidden" name="runinbackground" value="" />
     <input type="hidden" name="completedJobID" value="" />
     <input type="hidden" name="import_batch_id" value="[% import_batch_id %]" />
-    <fieldset class="action"><input type="submit" class="button" name="mainformsubmit" value="Import this batch into the catalog" onclick="return submitBackgroundJob(this.form);" /></fieldset>
+    <fieldset class="action">
+    <input type="submit" class="button" name="mainformsubmit" value="Import this batch into the catalog" onclick="return submitBackgroundJob(this.form);" />
+    <br/>
+    Add new bibliographic records into this framework:
+    <select name="framework" id="frameworks">
+      <option value="">Default</option>
+      [% FOREACH framework IN frameworks %]
+      <option value="[% framework.value %]" [% framework.selected %]>
+      [% framework.label %]
+      </option>
+      [% END %]
+    </select>
+    </fieldset>
   </form>
   <div id="jobpanel"><div id="jobstatus">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
      <div id="jobfailed"></div></div>