Merge remote branch 'kc/new/bug2567' into kcmaster

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl
index d137111..9dddccb 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl
@@ -131,7 +131,7 @@
         </tr>
         <tr>
                 <td><label for="f1821">18-21 Illustrations</label> </td>
-               <td>(auto-filled from 300)<input type="hidden" name="f1821" id="f1821" size="4"  maxlength="4" value="<!-- TMPL_VAR NAME="f1821" -->"/></td>
+               <td><input type="text" name="f1821" id="f1821" size="4"  maxlength="4" value="<!-- TMPL_VAR NAME="f1821" -->"/></td>
         </tr>
        <tr>
                 <!-- 22 Target Audience -->
@@ -264,8 +264,8 @@
        </tr>
        <tr>
                 <td><label for="f2427">24-27 Nature of contents</label> </td>
-                <td>(Derived value)
-                        <input type="hidden" name="f2427" id="f2427" size="4" maxlength="4" value="<!-- TMPL_VAR NAME="f2427" -->"/>                </td>
+                <td>
+                        <input type="text" name="f2427" id="f2427" size="4" maxlength="4" value="<!-- TMPL_VAR NAME="f2427" -->"/>                </td>
         </tr>
         <tr>
                 <td><label for="f28">28- Government Publication</label></td>
@@ -636,10 +636,10 @@ function report() {
                        // }
                        //MR
                        (document.f_pop.f1517.value+"   ").substr(0,3)+
-                       document.f_pop.f1821.value+
+                       (document.f_pop.f1821.value+"    ").substr(0,4)+
                        document.f_pop.f22.value+
                        document.f_pop.f23.value+
-                       document.f_pop.f2427.value+
+                       (document.f_pop.f2427.value+"    ").substr(0,4)+
                        document.f_pop.f28.value+
                        document.f_pop.f29.value+
                        document.f_pop.f30.value+
@@ -656,4 +656,4 @@ function report() {
        //]]>
 </script>
 
-<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->