From 3731406592418b17c38a4c1a49858474ddd26352 Mon Sep 17 00:00:00 2001
From: toins <toins>
Date: Tue, 31 Jul 2007 16:06:21 +0000
Subject: [PATCH] plugin rewrited to works with addbiblio. NOTE : Unimarc
 plugins has been fully tested but not MARC21 one. Unimarc plugins respect the
 norme now.

---
 cataloguing/value_builder/marc21_field_003.pl |   3 +-
 cataloguing/value_builder/marc21_field_005.pl |   7 +-
 cataloguing/value_builder/marc21_field_006.pl |   6 +-
 cataloguing/value_builder/marc21_field_007.pl |   7 +-
 cataloguing/value_builder/marc21_field_008.pl |   9 +-
 .../marc21_field_008_authorities.pl           |   9 +-
 .../value_builder/marc21_field_040c.pl        |   5 +-
 .../value_builder/marc21_field_040d.pl        |   5 +-
 cataloguing/value_builder/marc21_leader.pl    |  18 +-
 .../marc21_leader_authorities.pl              |   4 +-
 .../value_builder/marc21_leader_book.pl       |   6 +-
 .../marc21_leader_computerfile.pl             |   6 +-
 .../value_builder/marc21_leader_video.pl      |   4 +-
 .../value_builder/unimarc_field_100.pl        |  40 +-
 .../value_builder/unimarc_field_105.pl        |  84 +--
 .../value_builder/unimarc_field_106.pl        |  13 +-
 .../value_builder/unimarc_field_110.pl        |  64 +-
 .../value_builder/unimarc_field_115a.pl       | 156 ++--
 .../value_builder/unimarc_field_115b.pl       | 109 +--
 .../value_builder/unimarc_field_116.pl        | 114 +--
 .../value_builder/unimarc_field_117.pl        |  13 +-
 .../value_builder/unimarc_field_120.pl        |   6 +-
 .../value_builder/unimarc_field_121a.pl       |   6 +-
 .../value_builder/unimarc_field_121b.pl       |   6 +-
 .../value_builder/unimarc_field_122.pl        |   7 +-
 .../value_builder/unimarc_field_123a.pl       |  10 +-
 .../value_builder/unimarc_field_123d.pl       |   6 +-
 .../value_builder/unimarc_field_123e.pl       |   6 +-
 .../value_builder/unimarc_field_123f.pl       |   6 +-
 .../value_builder/unimarc_field_123g.pl       |   6 +-
 .../value_builder/unimarc_field_123i.pl       |   6 +-
 .../value_builder/unimarc_field_123j.pl       |  57 +-
 .../value_builder/unimarc_field_124.pl        |   6 +-
 .../value_builder/unimarc_field_124a.pl       |   6 +-
 .../value_builder/unimarc_field_124b.pl       |   6 +-
 .../value_builder/unimarc_field_124c.pl       |   7 +-
 .../value_builder/unimarc_field_124d.pl       |   6 +-
 .../value_builder/unimarc_field_124e.pl       |   6 +-
 .../value_builder/unimarc_field_124f.pl       |   6 +-
 .../value_builder/unimarc_field_124g.pl       |   6 +-
 .../value_builder/unimarc_field_125.pl        |   6 +-
 .../value_builder/unimarc_field_125a.pl       |  26 +-
 .../value_builder/unimarc_field_125b.pl       |   6 +-
 .../value_builder/unimarc_field_126.pl        |   6 +-
 .../value_builder/unimarc_field_126a.pl       |   6 +-
 .../value_builder/unimarc_field_126b.pl       |   6 +-
 .../value_builder/unimarc_field_127.pl        |   6 +-
 .../value_builder/unimarc_field_128a.pl       |   6 +-
 .../value_builder/unimarc_field_128b.pl       |   6 +-
 .../value_builder/unimarc_field_128c.pl       |   7 +-
 .../value_builder/unimarc_field_130.pl        |   7 +-
 .../value_builder/unimarc_field_135a.pl       |   6 +-
 .../value_builder/unimarc_field_140.pl        |   7 +-
 .../value_builder/unimarc_field_141.pl        |   6 +-
 .../value_builder/unimarc_field_210c.pl       |   4 +-
 .../value_builder/unimarc_field_225a.pl       | 231 +++---
 .../value_builder/unimarc_field_4XX.pl        | 678 +++++++++++-------
 .../value_builder/unimarc_field_60X.pl        | 168 +++--
 .../value_builder/unimarc_field_700-4.pl      |   4 +-
 .../unimarc_field_700_701_702.pl              |   6 +-
 cataloguing/value_builder/unimarc_leader.pl   |  92 +--
 .../value_builder/unimarc_field_100.tmpl      | 456 ++++++------
 .../value_builder/unimarc_field_105.tmpl      | 331 ++++-----
 .../value_builder/unimarc_field_106.tmpl      |  20 +-
 .../value_builder/unimarc_field_110.tmpl      | 179 ++---
 .../value_builder/unimarc_field_115a.tmpl     | 348 +++------
 .../value_builder/unimarc_field_115b.tmpl     | 145 ++--
 .../value_builder/unimarc_field_116.tmpl      | 321 +++++----
 .../value_builder/unimarc_field_117.tmpl      |  73 +-
 .../value_builder/unimarc_field_120.tmpl      | 156 +---
 .../value_builder/unimarc_field_121a.tmpl     |  90 +--
 .../value_builder/unimarc_field_121b.tmpl     |  46 +-
 .../value_builder/unimarc_field_122.tmpl      |  85 +--
 .../value_builder/unimarc_field_123a.tmpl     |  18 +-
 .../value_builder/unimarc_field_123d.tmpl     |  33 +-
 .../value_builder/unimarc_field_123e.tmpl     |  33 +-
 .../value_builder/unimarc_field_123f.tmpl     |  37 +-
 .../value_builder/unimarc_field_123g.tmpl     |  32 +-
 .../value_builder/unimarc_field_124a.tmpl     |  18 +-
 .../value_builder/unimarc_field_124b.tmpl     |  19 +-
 .../value_builder/unimarc_field_124c.tmpl     |  18 +-
 .../value_builder/unimarc_field_124d.tmpl     |  17 +-
 .../value_builder/unimarc_field_124e.tmpl     |  20 +-
 .../value_builder/unimarc_field_124f.tmpl     |  17 +-
 .../value_builder/unimarc_field_124g.tmpl     |  18 +-
 .../value_builder/unimarc_field_125a.tmpl     |  25 +-
 .../value_builder/unimarc_field_125b.tmpl     |  19 +-
 .../value_builder/unimarc_field_126a.tmpl     | 100 +--
 .../value_builder/unimarc_field_126b.tmpl     |  22 +-
 .../value_builder/unimarc_field_127.tmpl      |   5 +-
 .../value_builder/unimarc_field_128a.tmpl     |  21 +-
 .../value_builder/unimarc_field_128b.tmpl     |  16 +-
 .../value_builder/unimarc_field_128c.tmpl     |  18 +-
 .../value_builder/unimarc_field_130.tmpl      |  58 +-
 .../value_builder/unimarc_field_135a.tmpl     |  17 +-
 .../value_builder/unimarc_field_140.tmpl      | 164 +++--
 .../value_builder/unimarc_field_141.tmpl      |  71 +-
 .../value_builder/unimarc_field_210c.tmpl     |   6 +-
 .../value_builder/unimarc_field_225a.tmpl     |  39 +-
 .../value_builder/unimarc_field_4XX.tmpl      | 332 ++++-----
 .../value_builder/unimarc_field_60X.tmpl      |  34 +-
 .../value_builder/unimarc_field_700-4.tmpl    |   9 +-
 .../value_builder/unimarc_leader.tmpl         |  90 ++-
 103 files changed, 2714 insertions(+), 3005 deletions(-)

diff --git a/cataloguing/value_builder/marc21_field_003.pl b/cataloguing/value_builder/marc21_field_003.pl
index 84ace02941..53780b8be7 100755
--- a/cataloguing/value_builder/marc21_field_003.pl
+++ b/cataloguing/value_builder/marc21_field_003.pl
@@ -55,7 +55,7 @@ the 3 scripts are inserted after the <input> in the html code
 =cut
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "003".(int(rand(100000))+1);
+my $function_name= $field_number;
 
 # find today's date
 my $org = C4::Context->preference('MARCOrgCode');
@@ -66,6 +66,7 @@ function Blur$function_name(index) {
 }
 
 function Focus$function_name(subfield_managed) {
+    // TODO FIXME :: HTML code has changed
 	for (i=0 ; i<document.f.field_value.length ; i++) {
                 if (document.f.tag[i].value == '003') {
                         document.f.field_value[i].value = '$org';
diff --git a/cataloguing/value_builder/marc21_field_005.pl b/cataloguing/value_builder/marc21_field_005.pl
index 8d48c4bd67..a8ffbce835 100755
--- a/cataloguing/value_builder/marc21_field_005.pl
+++ b/cataloguing/value_builder/marc21_field_005.pl
@@ -56,11 +56,10 @@ the 3 scripts are inserted after the <input> in the html code
 =cut
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "210c".(int(rand(100000))+1);
+my $function_name= $field_number;
 
 # find today's date
-my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
-                                                               localtime(time);
+my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
 $year +=1900;
 $mon +=1;
 if (length($mon)==1) {
@@ -88,6 +87,8 @@ function Blur$function_name(index) {
 }
 
 function Focus$function_name(subfield_managed) {
+        // TODO FIXME :: HTML code has changed
+
 	for (i=0 ; i<document.f.field_value.length ; i++) {
                 if (document.f.tag[i].value == '005') {
                         document.f.field_value[i].value = '$date';
diff --git a/cataloguing/value_builder/marc21_field_006.pl b/cataloguing/value_builder/marc21_field_006.pl
index b0caf9801f..307f3db458 100755
--- a/cataloguing/value_builder/marc21_field_006.pl
+++ b/cataloguing/value_builder/marc21_field_006.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_field_006.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_field_006.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/marc21_field_007.pl b/cataloguing/value_builder/marc21_field_007.pl
index 2aaec6f5c1..ad3ca89908 100755
--- a/cataloguing/value_builder/marc21_field_007.pl
+++ b/cataloguing/value_builder/marc21_field_007.pl
@@ -33,6 +33,7 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
@@ -40,7 +41,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -52,8 +53,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_field_007.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_field_007.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/marc21_field_008.pl b/cataloguing/value_builder/marc21_field_008.pl
index 546e78f4a7..b2705ea4f8 100755
--- a/cataloguing/value_builder/marc21_field_008.pl
+++ b/cataloguing/value_builder/marc21_field_008.pl
@@ -33,6 +33,7 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 # find today's date
 my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time); 
 
@@ -45,10 +46,12 @@ sub plugin_parameters {
 
 sub plugin_javascript {
 	my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-	my $function_name= "100".(int(rand(100000))+1);
+	my $function_name= $field_number;
 	my $res="
 <script>
 function Focus$function_name(subfield_managed) {
+    // TODO FIXME :: HTML code has changed
+
     for (i=0 ; i<document.f.field_value.length ; i++) {
         if (document.f.tag[i].value == '008') {
             if (!document.f.field_value[i].value) {
@@ -64,8 +67,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_field_008.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_field_008.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/marc21_field_008_authorities.pl b/cataloguing/value_builder/marc21_field_008_authorities.pl
index d7839cb1d4..0c53434c11 100755
--- a/cataloguing/value_builder/marc21_field_008_authorities.pl
+++ b/cataloguing/value_builder/marc21_field_008_authorities.pl
@@ -33,8 +33,7 @@ plugin_parameters : other parameters added when the plugin is called by the dopo
 
 =cut
 # find today's date
-my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
-                                                               localtime(time);
+my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
 $year = substr($year,1,2);
 $mon +=1;
 my $date = "$year-$mon-$mday";
@@ -53,7 +52,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -65,8 +64,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms[0].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_field_008_authorities.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_field_008_authorities.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/marc21_field_040c.pl b/cataloguing/value_builder/marc21_field_040c.pl
index 46b14f069c..adf68fbddf 100755
--- a/cataloguing/value_builder/marc21_field_040c.pl
+++ b/cataloguing/value_builder/marc21_field_040c.pl
@@ -35,6 +35,7 @@ use C4::Koha;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
@@ -56,7 +57,7 @@ the 3 scripts are inserted after the <input> in the html code
 =cut
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "003".(int(rand(100000))+1);
+my $function_name= $field_number;
 
 # find today's date
 my $org = C4::Context->preference('MARCOrgCode');
@@ -67,6 +68,8 @@ function Blur$function_name(index) {
 }
 
 function Focus$function_name(subfield_managed) {
+        // TODO FIXME :: HTML code has changed
+
 	for (i=0 ; i<document.f.field_value.length ; i++) {
                 if (document.f.tag[i].value == '040' && document.f.subfield[i].value == 'c') {
                         document.f.field_value[i].value = '$org';
diff --git a/cataloguing/value_builder/marc21_field_040d.pl b/cataloguing/value_builder/marc21_field_040d.pl
index 8317b534e9..7dae78bf6a 100755
--- a/cataloguing/value_builder/marc21_field_040d.pl
+++ b/cataloguing/value_builder/marc21_field_040d.pl
@@ -35,6 +35,7 @@ use C4::Koha;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
@@ -56,7 +57,7 @@ the 3 scripts are inserted after the <input> in the html code
 =cut
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "003".(int(rand(100000))+1);
+my $function_name= $field_number;
 
 # find today's date
 my $org = C4::Context->preference('MARCOrgCode');
@@ -67,6 +68,8 @@ function Blur$function_name(index) {
 }
 
 function Focus$function_name(subfield_managed) {
+        // TODO FIXME :: HTML code has changed
+
 	for (i=0 ; i<document.f.field_value.length ; i++) {
                 if (document.f.tag[i].value == '040' && document.f.subfield[i].value == 'd') {
                         document.f.field_value[i].value = '$org';
diff --git a/cataloguing/value_builder/marc21_leader.pl b/cataloguing/value_builder/marc21_leader.pl
index 698be723d1..6ded994f47 100755
--- a/cataloguing/value_builder/marc21_leader.pl
+++ b/cataloguing/value_builder/marc21_leader.pl
@@ -40,18 +40,14 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
+my $function_name= $field_number
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
-    for (i=0 ; i<document.f.field_value.length ; i++) {
-		if (document.f.tag[i].value == '000') {
-			if (!document.f.field_value[i].value) {
-				document.f.field_value[i].value = '     nam a22     7a 4500';
-			}
-		}
-	}
-return 1;
+    if(!document.getElementById(\"$field_number\").value){
+        document.getElementById(\"$field_number\").value = '     nam a22     7a 4500';
+    }
+    return 1;
 }
 
 function Blur$function_name(subfield_managed) {
@@ -59,8 +55,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_leader.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_leader.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/marc21_leader_authorities.pl b/cataloguing/value_builder/marc21_leader_authorities.pl
index beb655a3f2..7784f8edf4 100755
--- a/cataloguing/value_builder/marc21_leader_authorities.pl
+++ b/cataloguing/value_builder/marc21_leader_authorities.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,7 +51,7 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms[0].field_value[i].value;
+	defaultvalue=document.getElementById(\"$field_number\").value;
 	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_leader_authorities.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
diff --git a/cataloguing/value_builder/marc21_leader_book.pl b/cataloguing/value_builder/marc21_leader_book.pl
index fdeef59fbc..20f66491f2 100755
--- a/cataloguing/value_builder/marc21_leader_book.pl
+++ b/cataloguing/value_builder/marc21_leader_book.pl
@@ -40,7 +40,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -52,8 +52,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms[0].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_leader.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_leader.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/marc21_leader_computerfile.pl b/cataloguing/value_builder/marc21_leader_computerfile.pl
index 669a87bdf6..81df209016 100755
--- a/cataloguing/value_builder/marc21_leader_computerfile.pl
+++ b/cataloguing/value_builder/marc21_leader_computerfile.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms[0].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_leader.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_leader.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/marc21_leader_video.pl b/cataloguing/value_builder/marc21_leader_video.pl
index c5d03121d7..6be559f245 100755
--- a/cataloguing/value_builder/marc21_leader_video.pl
+++ b/cataloguing/value_builder/marc21_leader_video.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,7 +51,7 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms[0].field_value[i].value;
+	defaultvalue=document.getElementById(\"$field_number\").value;
 	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_leader.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
diff --git a/cataloguing/value_builder/unimarc_field_100.pl b/cataloguing/value_builder/unimarc_field_100.pl
index 85dd5bf9bd..80187f2c94 100755
--- a/cataloguing/value_builder/unimarc_field_100.pl
+++ b/cataloguing/value_builder/unimarc_field_100.pl
@@ -25,8 +25,6 @@ use C4::Auth;
 use CGI;
 use C4::Context;
 
-use C4::Search;
-use C4::Output;
 
 =head1
 
@@ -41,26 +39,30 @@ sub plugin_parameters {
 
 sub plugin_javascript {
     my ( $dbh, $record, $tagslib, $field_number, $tabloop ) = @_;
-    my $function_name = "100" . ( int( rand(100000) ) + 1 );
     my $res           = "
-<script>
-function Focus$function_name(subfield_managed) {
-return 1;
-}
-
-function Blur$function_name(subfield_managed) {
-    return 1;
-}
-
-function Clic$function_name(i) {
-    defaultvalue=document.forms['f'].field_value[i].value;
-    newin=window.open(\"../cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
-
-}
-</script>
+        <script type='text/javascript'>
+            function Focus$field_number() {
+                return 1;
+            }
+            
+            function Blur$field_number() {
+                return 1;
+            }
+            
+            function Clic$field_number(i) {
+                var defaultvalue;
+                try {
+                    defaultvalue = document.getElementById(i).value;
+                } catch(e) {
+                    alert('error when getting '+i);
+                    return;
+                }
+                window.open(\"/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
+            }
+        </script>
 ";
 
-    return ( $function_name, $res );
+    return ( $field_number, $res );
 }
 
 sub plugin {
diff --git a/cataloguing/value_builder/unimarc_field_105.pl b/cataloguing/value_builder/unimarc_field_105.pl
index 332d60c171..2f29e11d1d 100755
--- a/cataloguing/value_builder/unimarc_field_105.pl
+++ b/cataloguing/value_builder/unimarc_field_105.pl
@@ -32,42 +32,43 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
+    my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
+    return "";
 }
 
 sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "105".(int(rand(100000))+1);
-my $res="
-<script>
-function Focus$function_name(subfield_managed) {
-return 1;
-}
-
-function Blur$function_name(subfield_managed) {
-	return 1;
+    my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
+    my $res="
+    <script type='text/javascript'>
+        function Focus$field_number() {
+            return 1;
+        }
+        
+        function Blur$field_number() {
+                return 1;
+        }
+        
+        function Clic$field_number() {
+                defaultvalue=document.getElementById(\"$field_number\").value;
+                window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_105.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 105\",'width=1200,height=400,toolbar=false,scrollbars=yes');
+        
+        }
+    </script>
+    ";
+    
+    return ($field_number,$res);
 }
 
-function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_105.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 105\",'width=1200,height=400,toolbar=false,scrollbars=yes');
-
-}
-</script>
-";
-
-return ($function_name,$res);
-}
 sub plugin {
-my ($input) = @_;
-	my $index= $input->param('index');
-	my $result= $input->param('result');
+    my ($input) = @_;
+    my $index= $input->param('index');
+    my $result= $input->param('result');
 
 
-	my $dbh = C4::Context->dbh;
-my ($template, $loggedinuser, $cookie)
+    my $dbh = C4::Context->dbh;
+    my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_105.tmpl",
 			     query => $input,
 			     type => "intranet",
@@ -90,21 +91,22 @@ my ($template, $loggedinuser, $cookie)
         my $f11 = substr($result,10,1);
         my $f12 = substr($result,11,1);
         my $f13 = substr($result,12,1);
+        
 	$template->param(index => $index,
-							"f1$f1" => 1,
-							"f2$f2" => 1,
-							"f3$f3" => 1,
-							"f4$f4" => 1,
-							"f5$f5" => 1,
-							"f6$f6" => 1,
-							"f7$f7" => 1,
-							"f8$f8" => 1,
-			                "f9$f9" => 1,
-							"f10$f10" => 1,
-							"f11$f11" => 1,
-							"f12$f12" => 1,
-							"f13$f13" => 1
- );
+                        "f1$f1" => 1,
+                        "f2$f2" => 1,
+                        "f3$f3" => 1,
+                        "f4$f4" => 1,
+                        "f5$f5" => 1,
+                        "f6$f6" => 1,
+                        "f7$f7" => 1,
+                        "f8$f8" => 1,
+                        "f9$f9" => 1,
+                        "f10$f10" => 1,
+                        "f11$f11" => 1,
+                        "f12$f12" => 1,
+                        "f13$f13" => 1
+        );
         output_html_with_http_headers $input, $cookie, $template->output;
 }
 
diff --git a/cataloguing/value_builder/unimarc_field_106.pl b/cataloguing/value_builder/unimarc_field_106.pl
index 174c99af4e..5723db977d 100755
--- a/cataloguing/value_builder/unimarc_field_106.pl
+++ b/cataloguing/value_builder/unimarc_field_106.pl
@@ -42,30 +42,29 @@ my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
 my $function_name= "106".(int(rand(100000))+1);
 my $res="
 <script>
-function Focus$function_name(subfield_managed) {
+function Focus$field_number() {
 return 1;
 }
 
-function Blur$function_name(subfield_managed) {
+function Blur$field_number() {
 	return 1;
 }
 
-function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_106.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 106\",'width=500,height=400,toolbar=false,scrollbars=yes');
+function Clic$field_number() {
+        defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_106.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 106\",'width=500,height=400,toolbar=false,scrollbars=yes');
 
 }
 </script>
 ";
 
-return ($function_name,$res);
+return ($field_number,$res);
 }
 sub plugin {
 my ($input) = @_;
 	my $index= $input->param('index');
 	my $result= $input->param('result');
 
-warn ("Je suis quand meme ici\n");
 	my $dbh = C4::Context->dbh;
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_106.tmpl",
diff --git a/cataloguing/value_builder/unimarc_field_110.pl b/cataloguing/value_builder/unimarc_field_110.pl
index cc6643854b..21f9641748 100755
--- a/cataloguing/value_builder/unimarc_field_110.pl
+++ b/cataloguing/value_builder/unimarc_field_110.pl
@@ -32,33 +32,33 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
+    my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
+    return "";
 }
 
 sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "110".(int(rand(100000))+1);
-my $res="
-<script>
-function Focus$function_name(subfield_managed) {
-return 1;
-}
-
-function Blur$function_name(subfield_managed) {
-	return 1;
-}
-
-function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_110.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 110\",'width=700,height=600,toolbar=false,scrollbars=yes');
-
-}
-</script>
-";
-
-return ($function_name,$res);
+    my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
+    my $res="
+    <script type='text/javascript'>
+    function Focus$field_number() {
+        return 1;
+    }
+    
+    function Blur$field_number() {
+            return 1;
+    }
+    
+    function Clic$field_number() {
+            defaultvalue=document.getElementById(\"$field_number\").value;
+            window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_110.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 110\",'width=700,height=600,toolbar=false,scrollbars=yes');
+    
+    }
+    </script>
+    ";
+    
+    return ($field_number,$res);
 }
 sub plugin {
 my ($input) = @_;
@@ -85,15 +85,15 @@ my ($template, $loggedinuser, $cookie)
  	my $f9 = substr($result,10,1);
 
 	$template->param(index => $index,
-							"f1$f1" => 1,
-							"f2$f2" => 1,
-							"f3$f3" => 1,
-							"f4$f4" => 1,
-							 f5 => $f5,
-							"f6$f6" => 1,
-							"f7$f7" => 1,
-							"f8$f8" => 1,
-							"f9$f9" => 1
+                        "f1$f1" => 1,
+                        "f2$f2" => 1,
+                        "f3$f3" => 1,
+                        "f4$f4" => 1,
+                            f5 => $f5,
+                        "f6$f6" => 1,
+                        "f7$f7" => 1,
+                        "f8$f8" => 1,
+                        "f9$f9" => 1
  );
         output_html_with_http_headers $input, $cookie, $template->output;
 }
diff --git a/cataloguing/value_builder/unimarc_field_115a.pl b/cataloguing/value_builder/unimarc_field_115a.pl
index ecf7674cef..30e448e120 100755
--- a/cataloguing/value_builder/unimarc_field_115a.pl
+++ b/cataloguing/value_builder/unimarc_field_115a.pl
@@ -32,88 +32,100 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
+    my ( $dbh, $record, $tagslib, $i, $tabloop ) = @_;
+    return "";
 }
 
 sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "115a".(int(rand(100000))+1);
-my $res="
-<script>
-function Focus$function_name(subfield_managed) {
-return 1;
-}
+    my ( $dbh, $record, $tagslib, $field_number, $tabloop ) = @_;
+    my $res = "
+    <script type=\"text/javascript\">
+    function Focus$field_number() {
+        return 1;
+    }
 
-function Blur$function_name(subfield_managed) {
-	return 1;
-}
+    function Blur$field_number() {
+        return 1;
+    }
 
-function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_115a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 115a\",'width=1200,height=600,toolbar=false,scrollbars=yes');
+    function Clic$field_number(i) {
+        var defaultvalue;
+        try {
+            defaultvalue = document.getElementById(i).value;
+        } catch(e) {
+            alert('error when getting '+i);
+            return;
+        }
+    	window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_115a.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 115a\",'width=1200,height=600,toolbar=false,scrollbars=yes');
+    }
 
-}
-</script>
-";
+    </script>
+    ";
 
-return ($function_name,$res);
+    return ( $field_number, $res );
 }
+
 sub plugin {
-my ($input) = @_;
-	my $index= $input->param('index');
-	my $result= $input->param('result');
-
-	my $dbh = C4::Context->dbh;
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_115a.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {editcatalogue => 1},
-			     debug => 1,
-			     });
- 	my $f1 = substr($result,0,1);
- 	my $f2 = substr($result,1,3);
- 	my $f3 = substr($result,4,1);
- 	my $f4 = substr($result,5,1);
- 	my $f5 = substr($result,6,1);
- 	my $f6 = substr($result,7,1);
- 	my $f7 = substr($result,8,1);
- 	my $f8 = substr($result,9,1);
- 	my $f9 = substr($result,10,1);
- 	my $f10 = substr($result,11,1);
- 	my $f11 = substr($result,12,1);
- 	my $f12 = substr($result,13,1);
- 	my $f13 = substr($result,14,1);
- 	my $f14 = substr($result,15,1);
- 	my $f15 = substr($result,16,1);
- 	my $f16 = substr($result,17,1);
- 	my $f17 = substr($result,18,1);
- 	my $f18 = substr($result,19,1);
-
-	$template->param(index => $index,
-							"f1$f1" => 1,
-							"f2" => $f2,
-							"f3$f3" => 1,
-							"f4$f4" => 1,
-							"f5$f5" => 1,
-							"f6$f6" => 1,
-							"f7$f7" => 1,
-							"f8$f8" => 1,
- 							"f9$f9" => 1,
- 							"f10$f10" => 1,
- 							"f11$f11" => 1,
- 							"f12$f12" => 1,
- 							"f13$f13" => 1,
- 							"f14$f14" => 1,
- 							"f15$f15" => 1,
- 							"f16$f16" => 1,
- 							"f17$f17" => 1,
- 							"f18$f18" => 1
- );
-        output_html_with_http_headers $input, $cookie, $template->output;
+    my ($input) = @_;
+    my $index   = $input->param('index');
+    my $result  = $input->param('result');
+
+    my $dbh = C4::Context->dbh;
+    my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+        {
+            template_name =>
+              "cataloguing/value_builder/unimarc_field_115a.tmpl",
+            query           => $input,
+            type            => "intranet",
+            authnotrequired => 0,
+            flagsrequired   => { editcatalogue => 1 },
+            debug           => 1,
+        }
+    );
+    my $f1  = substr( $result, 0,  1 );
+    my $f2  = substr( $result, 1,  3 );
+    my $f3  = substr( $result, 4,  1 );
+    my $f4  = substr( $result, 5,  1 );
+    my $f5  = substr( $result, 6,  1 );
+    my $f6  = substr( $result, 7,  1 );
+    my $f7  = substr( $result, 8,  1 );
+    my $f8  = substr( $result, 9,  1 );
+    my $f9  = substr( $result, 10, 1 );
+    my $f10 = substr( $result, 11, 1 );
+    my $f11 = substr( $result, 12, 1 );
+    my $f12 = substr( $result, 13, 1 );
+    my $f13 = substr( $result, 14, 1 );
+    my $f14 = substr( $result, 15, 1 );
+    my $f15 = substr( $result, 16, 1 );
+    my $f16 = substr( $result, 17, 1 );
+    my $f17 = substr( $result, 18, 1 );
+    my $f18 = substr( $result, 19, 1 );
+
+    $template->param(
+        index     => $index,
+        "f1$f1"   => 1,
+        "f2"      => $f2,
+        "f3$f3"   => 1,
+        "f4$f4"   => 1,
+        "f5$f5"   => 1,
+        "f6$f6"   => 1,
+        "f7$f7"   => 1,
+        "f8$f8"   => 1,
+        "f9$f9"   => 1,
+        "f10$f10" => 1,
+        "f11$f11" => 1,
+        "f12$f12" => 1,
+        "f13$f13" => 1,
+        "f14$f14" => 1,
+        "f15$f15" => 1,
+        "f16$f16" => 1,
+        "f17$f17" => 1,
+        "f18$f18" => 1
+    );
+
+    output_html_with_http_headers $input, $cookie, $template->output;
 }
 
 1;
diff --git a/cataloguing/value_builder/unimarc_field_115b.pl b/cataloguing/value_builder/unimarc_field_115b.pl
index 562adcca6f..7d03bfdaaa 100755
--- a/cataloguing/value_builder/unimarc_field_115b.pl
+++ b/cataloguing/value_builder/unimarc_field_115b.pl
@@ -32,74 +32,79 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
+    my ( $dbh, $record, $tagslib, $i, $tabloop ) = @_;
+    return "";
 }
 
 sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "115b".(int(rand(100000))+1);
-my $res="
-<script>
-function Focus$function_name(subfield_managed) {
-return 1;
+    my ( $dbh, $record, $tagslib, $field_number, $tabloop ) = @_;
+    my $res = "
+<script type=\"text/javascript\"> 
+function Focus$field_number(subfield_managed) {
+    return 1;
 }
 
-function Blur$function_name(subfield_managed) {
+function Blur$field_number(subfield_managed) {
 	return 1;
 }
 
-function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_115b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 115b\",'width=1200,height=600,toolbar=false,scrollbars=yes');
+function Clic$field_number() {
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_115b.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 115b\",'width=1200,height=600,toolbar=false,scrollbars=yes');
 
 }
 </script>
 ";
 
-return ($function_name,$res);
+    return ( $field_number, $res );
 }
+
 sub plugin {
-my ($input) = @_;
-	my $index= $input->param('index');
-	my $result= $input->param('result');
-
-	my $dbh = C4::Context->dbh;
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_115b.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {editcatalogue => 1},
-			     debug => 1,
-			     });
- 	my $f1 = substr($result,0,1);
- 	my $f2 = substr($result,1,1);
- 	my $f3 = substr($result,2,1);
- 	my $f4 = substr($result,3,1);
- 	my $f5 = substr($result,4,1);
- 	my $f6 = substr($result,5,1);
- 	my $f7 = substr($result,6,1);
- 	my $f8 = substr($result,7,1);
- 	my $f9 = substr($result,8,1);
- 	my $f10 = substr($result,9,4);
- 	my $f11 = substr($result,13,2);
-
-	$template->param(index => $index,
-							"f1$f1" => 1,
-							"f2$f2" => 1,
-							"f3$f3" => 1,
-							"f4$f4" => 1,
-							"f5$f5" => 1,
-							"f6$f6" => 1,
-							"f7$f7" => 1,
-							"f8$f8" => 1,
- 							"f9$f9" => 1,
- 							"f10" => $f10,
- 							"f11" => $f11
- );
-        output_html_with_http_headers $input, $cookie, $template->output;
+    my ($input) = @_;
+    my $index   = $input->param('index');
+    my $result  = $input->param('result');
+
+    my $dbh = C4::Context->dbh;
+    my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+        {
+            template_name =>
+              "cataloguing/value_builder/unimarc_field_115b.tmpl",
+            query           => $input,
+            type            => "intranet",
+            authnotrequired => 0,
+            flagsrequired   => { editcatalogue => 1 },
+            debug           => 1,
+        }
+    );
+    my $f1  = substr( $result, 0,  1 );
+    my $f2  = substr( $result, 1,  1 );
+    my $f3  = substr( $result, 2,  1 );
+    my $f4  = substr( $result, 3,  1 );
+    my $f5  = substr( $result, 4,  1 );
+    my $f6  = substr( $result, 5,  1 );
+    my $f7  = substr( $result, 6,  1 );
+    my $f8  = substr( $result, 7,  1 );
+    my $f9  = substr( $result, 8,  1 );
+    my $f10 = substr( $result, 9,  4 );
+    my $f11 = substr( $result, 13, 2 );
+
+    $template->param(
+        index   => $index,
+        "f1$f1" => 1,
+        "f2$f2" => 1,
+        "f3$f3" => 1,
+        "f4$f4" => 1,
+        "f5$f5" => 1,
+        "f6$f6" => 1,
+        "f7$f7" => 1,
+        "f8$f8" => 1,
+        "f9$f9" => 1,
+        "f10"   => $f10,
+        "f11"   => $f11
+    );
+    output_html_with_http_headers $input, $cookie, $template->output;
 }
 
 1;
diff --git a/cataloguing/value_builder/unimarc_field_116.pl b/cataloguing/value_builder/unimarc_field_116.pl
index e088a35265..b011e6dfe5 100755
--- a/cataloguing/value_builder/unimarc_field_116.pl
+++ b/cataloguing/value_builder/unimarc_field_116.pl
@@ -32,77 +32,81 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
+    my ( $dbh, $record, $tagslib, $i, $tabloop ) = @_;
+    return "";
 }
 
 sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "116".(int(rand(100000))+1);
-my $res="
+    my ( $dbh, $record, $tagslib, $field_number, $tabloop ) = @_;
+    my $res = "
 <script>
-function Focus$function_name(subfield_managed) {
-return 1;
+function Focus$field_number(subfield_managed) {
+    return 1;
 }
 
-function Blur$function_name(subfield_managed) {
-	return 1;
+function Blur$field_number(subfield_managed) {
+    return 1;
 }
 
-function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_116.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 116\",'width=1200,height=600,toolbar=false,scrollbars=yes');
+function Clic$field_number(i) {
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_116.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 116\",'width=1200,height=600,toolbar=false,scrollbars=yes');
 
 }
 </script>
 ";
 
-return ($function_name,$res);
+    return ( $field_number, $res );
 }
+
 sub plugin {
-my ($input) = @_;
-	my $index= $input->param('index');
-	my $result= $input->param('result');
-
-	my $dbh = C4::Context->dbh;
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_116.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {editcatalogue => 1},
-			     debug => 1,
-			     });
- 	my $f1 = substr($result,0,1);
- 	my $f2 = substr($result,1,1);
- 	my $f3 = substr($result,2,1);
- 	my $f4 = substr($result,3,1);
-
- 	my $f5 = substr($result,4,2);
- 	my $f6 = substr($result,6,2);
- 	my $f7 = substr($result,8,2);
-
- 	my $f8 = substr($result,10,2);
- 	my $f9 = substr($result,12,2);
- 	my $f10 = substr($result,14,2);
-
- 	my $f11 = substr($result,16,2);
-
-	$template->param(index => $index,
-							"f1$f1" => 1,
-							"f2$f2" => 1,
-							"f3$f3" => 1,
-							"f4$f4" => 1,
-							"f5$f5" => 1,
-							"f6$f6" => 1,
-							"f7$f7" => 1,
-							"f8$f8" => 1,
- 							"f9$f9" => 1,
- 							"f10$f10" => 1,
- 							"f11$f11" => 1
- );
-        output_html_with_http_headers $input, $cookie, $template->output;
+    my ($input) = @_;
+    my $index   = $input->param('index');
+    my $result  = $input->param('result');
+
+    my $dbh = C4::Context->dbh;
+    my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+        {
+            template_name => "cataloguing/value_builder/unimarc_field_116.tmpl",
+            query         => $input,
+            type          => "intranet",
+            authnotrequired => 0,
+            flagsrequired   => { editcatalogue => 1 },
+            debug           => 1,
+        }
+    );
+    my $f1 = substr( $result, 0, 1 );
+    my $f2 = substr( $result, 1, 1 );
+    my $f3 = substr( $result, 2, 1 );
+    my $f4 = substr( $result, 3, 1 );
+
+    my $f5 = substr( $result, 4, 2 );
+    my $f6 = substr( $result, 6, 2 );
+    my $f7 = substr( $result, 8, 2 );
+
+    my $f8  = substr( $result, 10, 2 );
+    my $f9  = substr( $result, 12, 2 );
+    my $f10 = substr( $result, 14, 2 );
+
+    my $f11 = substr( $result, 16, 2 );
+
+    $template->param(
+        index     => $index,
+        "f1$f1"   => 1,
+        "f2$f2"   => 1,
+        "f3$f3"   => 1,
+        "f4$f4"   => 1,
+        "f5$f5"   => 1,
+        "f6$f6"   => 1,
+        "f7$f7"   => 1,
+        "f8$f8"   => 1,
+        "f9$f9"   => 1,
+        "f10$f10" => 1,
+        "f11$f11" => 1
+    );
+    output_html_with_http_headers $input, $cookie, $template->output;
 }
 
 1;
diff --git a/cataloguing/value_builder/unimarc_field_117.pl b/cataloguing/value_builder/unimarc_field_117.pl
index 1ba6c394d4..1bc50ef20d 100755
--- a/cataloguing/value_builder/unimarc_field_117.pl
+++ b/cataloguing/value_builder/unimarc_field_117.pl
@@ -39,26 +39,25 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "117".(int(rand(100000))+1);
 my $res="
 <script>
-function Focus$function_name(subfield_managed) {
+function Focus$field_number(subfield_managed) {
 return 1;
 }
 
-function Blur$function_name(subfield_managed) {
+function Blur$field_number(subfield_managed) {
 	return 1;
 }
 
-function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_117.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 117\",'width=600,height=225,toolbar=false,scrollbars=yes');
+function Clic$field_number(i) {
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_117.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 117\",'width=600,height=225,toolbar=false,scrollbars=yes');
 
 }
 </script>
 ";
 
-return ($function_name,$res);
+return ($field_number,$res);
 }
 sub plugin {
 my ($input) = @_;
diff --git a/cataloguing/value_builder/unimarc_field_120.pl b/cataloguing/value_builder/unimarc_field_120.pl
index e8cc56c680..e7242d0741 100755
--- a/cataloguing/value_builder/unimarc_field_120.pl
+++ b/cataloguing/value_builder/unimarc_field_120.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "120".(int(rand(100000))+1);
+my $function_name=$field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms[0].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_120.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 120\",'width=1200,height=750,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_120.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 120\",'width=1200,height=750,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_121a.pl b/cataloguing/value_builder/unimarc_field_121a.pl
index 696ceee978..512a80ada2 100755
--- a/cataloguing/value_builder/unimarc_field_121a.pl
+++ b/cataloguing/value_builder/unimarc_field_121a.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "121a".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_121a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 121a\",'width=1210,height=750,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_121a.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 121a\",'width=1210,height=750,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_121b.pl b/cataloguing/value_builder/unimarc_field_121b.pl
index 7b325a9fa1..627b2c566a 100755
--- a/cataloguing/value_builder/unimarc_field_121b.pl
+++ b/cataloguing/value_builder/unimarc_field_121b.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "121b".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms[0].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_121b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 121b\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_121b.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 121b\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_122.pl b/cataloguing/value_builder/unimarc_field_122.pl
index 8957fae5bb..ccc6e5f9a0 100755
--- a/cataloguing/value_builder/unimarc_field_122.pl
+++ b/cataloguing/value_builder/unimarc_field_122.pl
@@ -32,6 +32,7 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
@@ -39,7 +40,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "122".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +52,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_122.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 122\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_122.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 122\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_123a.pl b/cataloguing/value_builder/unimarc_field_123a.pl
index 919301e05f..535f874501 100755
--- a/cataloguing/value_builder/unimarc_field_123a.pl
+++ b/cataloguing/value_builder/unimarc_field_123a.pl
@@ -39,20 +39,20 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "123a".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
-return 1;
+    return 1;
 }
 
 function Blur$function_name(subfield_managed) {
-	return 1;
+    return 1;
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_123a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_123a.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 123a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_123d.pl b/cataloguing/value_builder/unimarc_field_123d.pl
index e5dd90ad00..12367c06f9 100755
--- a/cataloguing/value_builder/unimarc_field_123d.pl
+++ b/cataloguing/value_builder/unimarc_field_123d.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "123g".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 123g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_123e.pl b/cataloguing/value_builder/unimarc_field_123e.pl
index 514f0e3904..12367c06f9 100755
--- a/cataloguing/value_builder/unimarc_field_123e.pl
+++ b/cataloguing/value_builder/unimarc_field_123e.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "123g".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms[0].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 123g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_123f.pl b/cataloguing/value_builder/unimarc_field_123f.pl
index 318df0594b..0e6a0faeb8 100755
--- a/cataloguing/value_builder/unimarc_field_123f.pl
+++ b/cataloguing/value_builder/unimarc_field_123f.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "123g".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 123g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_123g.pl b/cataloguing/value_builder/unimarc_field_123g.pl
index e5dd90ad00..12367c06f9 100755
--- a/cataloguing/value_builder/unimarc_field_123g.pl
+++ b/cataloguing/value_builder/unimarc_field_123g.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "123g".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 123g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_123i.pl b/cataloguing/value_builder/unimarc_field_123i.pl
index 627b99e172..71ca35976d 100755
--- a/cataloguing/value_builder/unimarc_field_123i.pl
+++ b/cataloguing/value_builder/unimarc_field_123i.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "123i".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_123i.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123i\",'width=800,height=400,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_123i.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 123i\",'width=800,height=400,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_123j.pl b/cataloguing/value_builder/unimarc_field_123j.pl
index 331495f774..d8c5c1c0b1 100755
--- a/cataloguing/value_builder/unimarc_field_123j.pl
+++ b/cataloguing/value_builder/unimarc_field_123j.pl
@@ -32,50 +32,55 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
+	my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
+	return "";
 }
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "123j".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
-<script>
-function Focus$function_name(subfield_managed) {
-return 1;
-}
+    <script>
+        function Focus$function_name(subfield_managed) {
+        	return 1;
+        }
 
-function Blur$function_name(subfield_managed) {
-	return 1;
-}
+        function Blur$function_name(subfield_managed) {
+        	return 1;
+        }
 
-function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_123j.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123j\",'width=800,height=400,toolbar=false,scrollbars=yes');
+        function Clic$function_name(i) {
+        	defaultvalue=document.getElementById(\"$field_number\").value;
+        	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_123j.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 123j\",'width=800,height=400,toolbar=false,scrollbars=yes');
 
-}
-</script>
-";
+        }
+    </script>
+    ";
 
-return ($function_name,$res);
+	return ($function_name,$res);
 }
+
 sub plugin {
-my ($input) = @_;
+	my ($input) = @_;
 	my $index= $input->param('index');
 	my $result= $input->param('result');
 
 
 	my $dbh = C4::Context->dbh;
 
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_123j.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {editcatalogue => 1},
-			     debug => 1,
-			     });
+	my ($template, $loggedinuser, $cookie)
+    = get_template_and_user(
+    	{
+    		template_name => "cataloguing/value_builder/unimarc_field_123j.tmpl",
+			query => $input,
+			type => "intranet",
+			authnotrequired => 0,
+			flagsrequired => {editcatalogue => 1},
+			debug => 1,
+		}
+	);
 	my $f1 = substr($result,0,1);
 	my $f2 = substr($result,1,3);
 	my $f3 = substr($result,4,2);
diff --git a/cataloguing/value_builder/unimarc_field_124.pl b/cataloguing/value_builder/unimarc_field_124.pl
index 20eaf78cd2..38ac7e3729 100755
--- a/cataloguing/value_builder/unimarc_field_124.pl
+++ b/cataloguing/value_builder/unimarc_field_124.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=500,height=400,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=500,height=400,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_124a.pl b/cataloguing/value_builder/unimarc_field_124a.pl
index aab5d013fd..5b06ea9a8c 100755
--- a/cataloguing/value_builder/unimarc_field_124a.pl
+++ b/cataloguing/value_builder/unimarc_field_124a.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "124a".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_124a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_124a.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 124a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_124b.pl b/cataloguing/value_builder/unimarc_field_124b.pl
index 585ec74f1d..d6e3e0df1f 100755
--- a/cataloguing/value_builder/unimarc_field_124b.pl
+++ b/cataloguing/value_builder/unimarc_field_124b.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "124b".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_124b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124b\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_124b.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 124b\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_124c.pl b/cataloguing/value_builder/unimarc_field_124c.pl
index c9e49b7014..81ce4e9cdb 100755
--- a/cataloguing/value_builder/unimarc_field_124c.pl
+++ b/cataloguing/value_builder/unimarc_field_124c.pl
@@ -32,6 +32,7 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
@@ -39,7 +40,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "124c".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +52,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_124c.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124c\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_124c.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124c\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_124d.pl b/cataloguing/value_builder/unimarc_field_124d.pl
index 2a9ab6911a..df7e720130 100755
--- a/cataloguing/value_builder/unimarc_field_124d.pl
+++ b/cataloguing/value_builder/unimarc_field_124d.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "124d".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_124d.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124d\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_124d.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124d\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_124e.pl b/cataloguing/value_builder/unimarc_field_124e.pl
index 6d1eb205e7..d72bc14f9e 100755
--- a/cataloguing/value_builder/unimarc_field_124e.pl
+++ b/cataloguing/value_builder/unimarc_field_124e.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "124e".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_124e.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124e\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_124e.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124e\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_124f.pl b/cataloguing/value_builder/unimarc_field_124f.pl
index 91e30dc3f4..e812439dff 100755
--- a/cataloguing/value_builder/unimarc_field_124f.pl
+++ b/cataloguing/value_builder/unimarc_field_124f.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "124f".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_124f.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124f\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_124f.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 124f\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_124g.pl b/cataloguing/value_builder/unimarc_field_124g.pl
index ff1041cb1e..9af10d612b 100755
--- a/cataloguing/value_builder/unimarc_field_124g.pl
+++ b/cataloguing/value_builder/unimarc_field_124g.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "124g".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_124g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_124g.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 124g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_125.pl b/cataloguing/value_builder/unimarc_field_125.pl
index 20eaf78cd2..38ac7e3729 100755
--- a/cataloguing/value_builder/unimarc_field_125.pl
+++ b/cataloguing/value_builder/unimarc_field_125.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=500,height=400,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=500,height=400,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_125a.pl b/cataloguing/value_builder/unimarc_field_125a.pl
index 5c83ffc0d1..83c8736dd1 100755
--- a/cataloguing/value_builder/unimarc_field_125a.pl
+++ b/cataloguing/value_builder/unimarc_field_125a.pl
@@ -39,23 +39,23 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "125a".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
-<script>
-function Focus$function_name(subfield_managed) {
-return 1;
-}
+    <script>
+    function Focus$function_name(subfield_managed) {
+    	return 1;
+    }
 
-function Blur$function_name(subfield_managed) {
-	return 1;
-}
+    function Blur$function_name(subfield_managed) {
+    	return 1;
+    }
 
-function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_125a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 125a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+    function Clic$function_name(i) {
+    	defaultvalue=document.getElementById(\"$field_number\").value;
+    	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_125a.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 125a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
-}
-</script>
+    }
+    </script>
 ";
 
 return ($function_name,$res);
diff --git a/cataloguing/value_builder/unimarc_field_125b.pl b/cataloguing/value_builder/unimarc_field_125b.pl
index e5f24bfcbb..0c8ada7e64 100755
--- a/cataloguing/value_builder/unimarc_field_125b.pl
+++ b/cataloguing/value_builder/unimarc_field_125b.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "125b".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_125b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 125b\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_125b.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 125b\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_126.pl b/cataloguing/value_builder/unimarc_field_126.pl
index c37e5cc642..38ac7e3729 100755
--- a/cataloguing/value_builder/unimarc_field_126.pl
+++ b/cataloguing/value_builder/unimarc_field_126.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms[0].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=500,height=400,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=500,height=400,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_126a.pl b/cataloguing/value_builder/unimarc_field_126a.pl
index c1f4d880b7..a324caff35 100755
--- a/cataloguing/value_builder/unimarc_field_126a.pl
+++ b/cataloguing/value_builder/unimarc_field_126a.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "126a".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_126a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 126a\",'width=1000,height=575,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_126a.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 126a\",'width=1000,height=575,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_126b.pl b/cataloguing/value_builder/unimarc_field_126b.pl
index 54dbb2c4f7..b611a0a26f 100755
--- a/cataloguing/value_builder/unimarc_field_126b.pl
+++ b/cataloguing/value_builder/unimarc_field_126b.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "126b".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_126b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 126b\",'width=1000,height=575,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_126b.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 126b\",'width=1000,height=575,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_127.pl b/cataloguing/value_builder/unimarc_field_127.pl
index 48303b5ab0..f9dc6a5670 100755
--- a/cataloguing/value_builder/unimarc_field_127.pl
+++ b/cataloguing/value_builder/unimarc_field_127.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "127".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_127.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 127\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_127.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 127\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_128a.pl b/cataloguing/value_builder/unimarc_field_128a.pl
index 4a00e2cff8..1ccf664845 100755
--- a/cataloguing/value_builder/unimarc_field_128a.pl
+++ b/cataloguing/value_builder/unimarc_field_128a.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "128a".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_128a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_128a.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 128a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_128b.pl b/cataloguing/value_builder/unimarc_field_128b.pl
index 1d5a39d239..60e1293876 100755
--- a/cataloguing/value_builder/unimarc_field_128b.pl
+++ b/cataloguing/value_builder/unimarc_field_128b.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "128b".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_128b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128b\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_128b.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 128b\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_128c.pl b/cataloguing/value_builder/unimarc_field_128c.pl
index 967e9208c5..a29f46eb42 100755
--- a/cataloguing/value_builder/unimarc_field_128c.pl
+++ b/cataloguing/value_builder/unimarc_field_128c.pl
@@ -32,6 +32,7 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
@@ -39,7 +40,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "128c".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +52,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_128c.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128c\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_128c.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 128c\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_130.pl b/cataloguing/value_builder/unimarc_field_130.pl
index bcf6034390..7f59bc5060 100755
--- a/cataloguing/value_builder/unimarc_field_130.pl
+++ b/cataloguing/value_builder/unimarc_field_130.pl
@@ -32,6 +32,7 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
@@ -39,7 +40,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "130".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +52,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_130.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 130\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_130.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 130\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_135a.pl b/cataloguing/value_builder/unimarc_field_135a.pl
index 38d693d60e..b05b9e7118 100755
--- a/cataloguing/value_builder/unimarc_field_135a.pl
+++ b/cataloguing/value_builder/unimarc_field_135a.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "135a".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_135a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 135a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
+ 	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_135a.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 135a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_140.pl b/cataloguing/value_builder/unimarc_field_140.pl
index 26d4cd7c46..31d125344b 100755
--- a/cataloguing/value_builder/unimarc_field_140.pl
+++ b/cataloguing/value_builder/unimarc_field_140.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "140".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_140.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 140\",'width=1000,height=575,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_140.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 140\",'width=1000,height=575,toolbar=false,scrollbars=yes');
 
 }
 </script>
@@ -98,7 +98,6 @@ my ($template, $loggedinuser, $cookie)
 	my $f20 = substr($result,24,1);
 	my $f21 = substr($result,25 ,1);
 
-warn "Dans ce cas clea nous fait un f17 => $f17\n";
 
 	$template->param(index => $index,
 			 "f1$f1" => 1,
diff --git a/cataloguing/value_builder/unimarc_field_141.pl b/cataloguing/value_builder/unimarc_field_141.pl
index 8abd5649be..d057a85952 100755
--- a/cataloguing/value_builder/unimarc_field_141.pl
+++ b/cataloguing/value_builder/unimarc_field_141.pl
@@ -39,7 +39,7 @@ return "";
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "141".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -51,8 +51,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_141.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 141\",'width=1000,height=575,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_141.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 141\",'width=1000,height=575,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_210c.pl b/cataloguing/value_builder/unimarc_field_210c.pl
index 34fea240cd..ec318faa2c 100755
--- a/cataloguing/value_builder/unimarc_field_210c.pl
+++ b/cataloguing/value_builder/unimarc_field_210c.pl
@@ -56,7 +56,7 @@ the 3 scripts are inserted after the <input> in the html code
 =cut
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "210c".(int(rand(100000))+1);
+my $function_name= $field_number;
 #---- build editors list.
 #---- the editor list is built from the "EDITORS" thesaurus
 #---- this thesaurus category must be filled as follow :
@@ -115,7 +115,7 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(subfield_managed) {
-    defaultvalue=escape(document.forms['f'].field_value[subfield_managed].value);
+    defaultvalue=escape(document.getElementById(\"$field_number\").value);
     newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_210c.pl&index=\"+subfield_managed,\"unimarc 225a\",'width=500,height=600,toolbar=false,scrollbars=yes');
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_field_225a.pl b/cataloguing/value_builder/unimarc_field_225a.pl
index 16ca2868c0..d8b449300f 100755
--- a/cataloguing/value_builder/unimarc_field_225a.pl
+++ b/cataloguing/value_builder/unimarc_field_225a.pl
@@ -18,6 +18,7 @@
 # You should have received a copy of the GNU General Public License along with
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
+
 =head1 SYNOPSIS
 
 This plugin is used to map isbn/editor with collection.
@@ -27,11 +28,11 @@ It need :
   isbn separator editor separator collection.
   for example :
   2204 -- Cerf -- Cogitatio fidei
-  2204 -- Cerf -- Le Magist�re de l'Eglise
+  2204 -- Cerf -- Le Magistere de l'Eglise
   2204 -- Cerf -- Lectio divina
   2204 -- Cerf -- Lire la Bible
   2204 -- Cerf -- Pour lire
-  2204 -- Cerf -- Sources chr�tiennes
+  2204 -- Cerf -- Sources chretiennes
 
   when the user clic on ... on 225a line, the popup shows the list of collections from the selected editor
   if the biblio has no isbn, then the search if done on editor only
@@ -54,105 +55,151 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
+    my ( $dbh, $record, $tagslib, $i, $tabloop ) = @_;
+    return "";
 }
 
 sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
-my $res="
-<script>
-function Focus$function_name(subfield_managed) {
-return 1;
-}
-
-function Blur$function_name(subfield_managed) {
-	return 1;
-}
-
-function Clic$function_name(index) {
-// find the 010a value and the 210c. it will be used in the popup to find possibles collections
-	var isbn_found;
-	for (i=0 ; i<document.f.field_value.length ; i++) {
-		if (document.f.tag[i].value == '010' && document.f.subfield[i].value == 'a') {
-			isbn_found=document.f.field_value[i].value;
-		}
-	}
-	var editor_found;
-	for (i=0 ; i<document.f.field_value.length ; i++) {
-		if (document.f.tag[i].value == '210' && document.f.subfield[i].value == 'c') {
-			editor_found=document.f.field_value[i].value;
-		}
-	}
-
-	defaultvalue=document.f.field_value[index].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_225a.pl&index=\"+index+\"&result=\"+defaultvalue+\"&isbn_found=\"+isbn_found+\"&editor_found=\"+editor_found,\"unimarc 225a\",'width=500,height=200,toolbar=false,scrollbars=no');
-
-}
-</script>
+    my ( $dbh, $record, $tagslib, $field_number, $tabloop ) = @_;
+    my $function_name = $field_number;
+    my $res = "
+    <script type=\"text/javascript\">
+        function Focus$function_name(subfield_managed) {
+            return 1;
+        }
+    
+        function Blur$function_name(subfield_managed) {
+            return 1;
+        }
+    
+        function Clic$function_name(index) {
+        // find the 010a value and the 210c. it will be used in the popup to find possibles collections
+            var isbn_found   = 0;
+            var editor_found = 0;
+            
+            var re1 = /'tag_010_subfield_a_.*'/;
+            var re2 = /'tag_210_subfield_c_.*'/;
+            
+            var inputs = document.getElementsByTagName('input');
+            
+            for(var i=0 , len=inputs.length ; i \< len ; i++ ){
+                if(inputs[i].id.match(re1)){
+                    isbn_found = inputs[i].value;
+                }
+                if(inputs[i].id.match(re2)){
+                    editor_found = inputs[i].value;
+                }
+                if(editor_found && isbn_found){
+                    break;
+                }
+            }
+                    
+            defaultvalue = document.getElementById(\"$field_number\").value;
+            window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_225a.pl&index=\"+index+\"&result=\"+defaultvalue+\"&isbn_found=\"+isbn_found+\"&editor_found=\"+editor_found,\"unimarc 225a\",'width=500,height=200,toolbar=false,scrollbars=no');
+    
+        }
+    </script>
 ";
 
-return ($function_name,$res);
+    return ( $function_name, $res );
 }
+
 sub plugin {
-my ($input) = @_;
-	my $index= $input->param('index');
-	my $result= $input->param('result');
-	my $editor_found = $input->param('editor_found');
-	my $isbn_found = $input->param('isbn_found');
-	my $dbh = C4::Context->dbh;
-	my $authoritysep = C4::Context->preference("authoritysep");
-	my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_225a.tmpl",
-					query => $input,
-					type => "intranet",
-					authnotrequired => 0,
-					flagsrequired => {editcatalogue => 1},
-					debug => 1,
-					});
+    my ($input)      = @_;
+    my $index        = $input->param('index');
+    my $result       = $input->param('result');
+    my $editor_found = $input->param('editor_found');
+    my $isbn_found   = $input->param('isbn_found');
+    my $dbh          = C4::Context->dbh;
+    my $authoritysep = C4::Context->preference("authoritysep");
+    my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+        {
+            template_name =>
+              "cataloguing/value_builder/unimarc_field_225a.tmpl",
+            query           => $input,
+            type            => "intranet",
+            authnotrequired => 0,
+            flagsrequired   => { editcatalogue => 1 },
+            debug           => 1,
+        }
+    );
+
 # builds collection list : search isbn and editor, in parent, then load collections from bibliothesaurus table
-	# if there is an isbn, complete search
-		my @collections;
-		if ($isbn_found) {
-			my $sth = $dbh->prepare("select auth_subfield_table.authid,subfieldvalue from auth_subfield_table 
-							left join auth_header on auth_subfield_table.authid=auth_header.authid 
-							where authtypecode='EDITORS' and tag='200' and subfieldcode='a' and subfieldvalue=?");
-			my $sth2 = $dbh->prepare("select subfieldvalue from auth_subfield_table where tag='200' and subfieldcode='c' and authid=? order by subfieldvalue");
-			my @splited = split //, $isbn_found;
-			my $isbn_rebuild='';
-			foreach my $x (@splited) {
-				$isbn_rebuild.=$x;
-				$sth->execute($isbn_rebuild);
-				my ($authid) = $sth->fetchrow;
-				$sth2->execute($authid);
-				while (my ($line)= $sth2->fetchrow) {
-					push @collections,$line;
-				}
-			}
-		} else {
-			my $sth = $dbh->prepare("select auth_subfield_table.authid,subfieldvalue from auth_subfield_table 
-							left join auth_header on auth_subfield_table.authid=auth_header.authid 
-							where authtypecode='EDITORS' and tag='200' and subfieldcode='b' and subfieldvalue=?");
-			my $sth2 = $dbh->prepare("select subfieldvalue from auth_subfield_table where tag='200' and subfieldcode='c' and authid=? order by subfieldvalue");
-			$sth->execute($editor_found);
-			my ($authid) = $sth->fetchrow;
-			$sth2->execute($authid);
-			while (my ($line)= $sth2->fetchrow) {
-				push @collections,$line;
-			}
-		}
-#	my @collections = ["test"];
-	my $collection =CGI::scrolling_list(-name=>'f1',
-												-values=> \@collections,
-												-default=>"$result",
-												-size=>1,
-												-multiple=>0,
-												);
-	$template->param(index => $index,
-							collection => $collection);
-        output_html_with_http_headers $input, $cookie, $template->output;
+# if there is an isbn, complete search
+    my @collections;
+    if ($isbn_found) {
+        my $sth = $dbh->prepare(
+            "SELECT auth_subfield_table.authid,subfieldvalue
+            FROM   auth_subfield_table
+            LEFT JOIN auth_header ON auth_subfield_table.authid = auth_header.authid 
+	    WHERE authtypecode='EDITORS' 
+               AND tag='200'
+               AND subfieldcode='a'
+               AND subfieldvalue=?"
+        );
+        my $sth2 =
+          $dbh->prepare(
+            "SELECT subfieldvalue
+             FROM auth_subfield_table 
+             WHERE tag='200'
+             AND subfieldcode='c'
+             AND authid=?
+             ORDER BY subfieldvalue"
+          );
+        my @splited = split //, $isbn_found;
+        my $isbn_rebuild = '';
+        foreach my $x (@splited) {
+            $isbn_rebuild .= $x;
+            $sth->execute($isbn_rebuild);
+            my ($authid) = $sth->fetchrow;
+            $sth2->execute($authid);
+            while ( my ($line) = $sth2->fetchrow ) {
+                push @collections, $line;
+            }
+        }
+    }
+    else {
+        my $sth = $dbh->prepare(
+            "SELECT auth_subfield_table.authid,subfieldvalue
+             FROM auth_subfield_table
+             LEFT JOIN auth_header ON auth_subfield_table.authid = auth_header.authid 
+	     WHERE authtypecode='EDITORS'
+               AND tag='200'
+               AND subfieldcode='b'
+               AND subfieldvalue=?"
+        );
+        my $sth2 =
+          $dbh->prepare(
+            "SELECT subfieldvalue
+             FROM auth_subfield_table
+             WHERE tag='200'
+                AND subfieldcode='c'
+                AND authid=?
+             ORDER BY subfieldvalue"
+          );
+        $sth->execute($editor_found);
+        my ($authid) = $sth->fetchrow;
+        $sth2->execute($authid);
+        while ( my ($line) = $sth2->fetchrow ) {
+            push @collections, $line;
+        }
+    }
+
+    #	my @collections = ["test"];
+    my $collection = CGI::scrolling_list(
+        -name     => 'f1',
+        -values   => \@collections,
+        -default  => "$result",
+        -size     => 1,
+        -multiple => 0,
+    );
+    $template->param(
+        index      => $index,
+        collection => $collection
+    );
+    output_html_with_http_headers $input, $cookie, $template->output;
 }
 
 1;
diff --git a/cataloguing/value_builder/unimarc_field_4XX.pl b/cataloguing/value_builder/unimarc_field_4XX.pl
index 9f90665a2f..cb409212b0 100755
--- a/cataloguing/value_builder/unimarc_field_4XX.pl
+++ b/cataloguing/value_builder/unimarc_field_4XX.pl
@@ -17,6 +17,8 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
+# $Id$
+
 use strict;
 require Exporter;
 use CGI;
@@ -29,355 +31,493 @@ use C4::Output;
 use C4::Biblio;
 use C4::Koha;
 use MARC::Record;
-use C4::Branch; # GetBranches
+use C4::Branch;    # GetBranches
 
 sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
+    my ( $dbh, $record, $tagslib, $i, $tabloop ) = @_;
+    return "";
 }
 
 sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "4XX".(int(rand(100000))+1);
-my $res="
-<script>
-function Focus$function_name(subfield_managed) {
-return 1;
-}
+    my ( $dbh, $record, $tagslib, $field_number, $tabloop ) = @_;
+    my $function_name = $field_number;
+    my $res           = "
+    <script type='text/javascript'>
+        function Focus$function_name(subfield_managed) {
+            return 1;
+        }
 
-function Blur$function_name(subfield_managed) {
-    return 1;
-}
+        function Blur$function_name(subfield_managed) {
+            return 1;
+        }
 
-function Clic$function_name(i) {
-    defaultvalue=document.f.field_value[i].value;
-    newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 4\"+i+\"\",'width=700,height=700,toolbar=false,scrollbars=yes');
+        function Clic$function_name(i) {
+            defaultvalue=document.getElementById(\"$field_number\").value;
+            window.open(\"/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 4\"+i+\"\",'width=900,height=700,toolbar=false,scrollbars=yes');
 
-}
-</script>
-";
+        }
+    </script>
+    ";
 
-return ($function_name,$res);
+    return ( $function_name, $res );
 }
 
+# sub plugin
+#
+# input arg : 
+# -- op could be equals to
+# * fillinput : 
+# * do_search : 
+# 
+
 sub plugin {
-    my ($input) = @_;
-    my $dbh=C4::Context->dbh;
-    my $query = new CGI;
-    my $op = $query->param('op');
-    my $type=$query->param('type');
-#     warn "operation  ".$op;
-    my $startfrom=$query->param('startfrom');
-    $startfrom=0 if(!defined $startfrom);
-    my ($template, $loggedinuser, $cookie);
+    my ($input)   = @_;
+    my $dbh       = C4::Context->dbh;
+    my $query     = new CGI;
+    my $op        = $query->param('op');
+    my $type      = $query->param('type');
+    my $startfrom = $query->param('startfrom');
+    $startfrom = 0 if ( !defined $startfrom );
+    my ( $template, $loggedinuser, $cookie );
     my $resultsperpage;
     my $searchdesc;
-    
-    if ($op eq "fillinput"){
+
+    if ( $op eq "fillinput" ) {
         my $bibnum = $query->param('bibnum');
-        my $index = $query->param('index');
+        my $index  = $query->param('index');
         my $marcrecord;
-# open template
-        ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_4XX.tmpl",
-                 query => $query,
-                 type => "intranet",
-                 authnotrequired => 0,
-                 flagsrequired => {editcatalogue => 1},
-                 debug => 1,
-                });
+
+        # open template
+        ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+            {
+                template_name =>
+                  "cataloguing/value_builder/unimarc_field_4XX.tmpl",
+                query           => $query,
+                type            => "intranet",
+                authnotrequired => 0,
+                flagsrequired   => { editcatalogue => 1 },
+                debug           => 1,
+            }
+        );
 
         #get marc record
         $marcrecord = GetMarcBiblio($bibnum);
 
-        my $subfield_value_9=$bibnum;
+        my $subfield_value_9 = $bibnum;
         my $subfield_value_0;
-        $subfield_value_0=$marcrecord->field('001')->data if $marcrecord->field('001');
+        $subfield_value_0 = $marcrecord->field('001')->data
+          if $marcrecord->field('001');
         my $subfield_value_a;
-        if ($marcrecord->field('700')){
-            $subfield_value_a=$marcrecord->field('700')->subfield("a");
-            $subfield_value_a.=", ".$marcrecord->subfield('700',"b") if $marcrecord->subfield('700','b');
-            $subfield_value_a.=" ".$marcrecord->subfield('700',"d") if $marcrecord->subfield('700','d');
-            $subfield_value_a.=" (".$marcrecord->subfield('700','c')." - " if $marcrecord->subfield('700','c');
-            $subfield_value_a.=" (" if ($marcrecord->subfield('700','f') and not( $marcrecord->subfield('700','c')));
-            $subfield_value_a.=$marcrecord->subfield('700','f') if ($marcrecord->subfield('700','f'));
-            $subfield_value_a.=")" if ($marcrecord->subfield('701','f') or $marcrecord->subfield('701','c'));
-        } elsif ($marcrecord->field('702')){
-            $subfield_value_a=$marcrecord->subfield('702','a');
-            $subfield_value_a.=", ".$marcrecord->subfield('702','b') if $marcrecord->subfield('702','b');
-            $subfield_value_a.=" ".$marcrecord->subfield('702','d') if $marcrecord->subfield('702','d');
-            $subfield_value_a.=" (".$marcrecord->subfield('702','c')."; " if $marcrecord->subfield('702','c');
-            $subfield_value_a.=" (" if $marcrecord->subfield('702','f') and not $marcrecord->subfield('702','c');
-            $subfield_value_a.=$marcrecord->subfield('702','f') if $marcrecord->subfield('702','f');
-            $subfield_value_a.=")" if $marcrecord->subfield('702','f') or $marcrecord->subfield('702','c');
-        } elsif ($marcrecord->field('710')){
-            $subfield_value_a=$marcrecord->subfield('710','d')." " if $marcrecord->subfield('710','d');
-            $subfield_value_a.=$marcrecord->subfield('710','a') if $marcrecord->subfield('710','a');
-            $subfield_value_a.=", ".$marcrecord->subfield('710','b') if $marcrecord->subfield('710');
-            $subfield_value_a.=" (".$marcrecord->subfield('710','f')." - " if $marcrecord->subfield('710','f');
-            $subfield_value_a.=" (" if $marcrecord->subfield('710','e') and not $marcrecord->subfield('710','f');
-            $subfield_value_a.=$marcrecord->subfield('710','e') if $marcrecord->subfield('710','e');
-            $subfield_value_a.=")" if $marcrecord->subfield('710','e') or $marcrecord->subfield('710','f');
-        } elsif ($marcrecord->field('701')){
-            $subfield_value_a=$marcrecord->subfield('701','a');
-            $subfield_value_a.=", ".$marcrecord->subfield('701','b') if $marcrecord->subfield('701','b');
-            $subfield_value_a.=" ".$marcrecord->subfield('701','d',) if $marcrecord->subfield('701','d');
-            $subfield_value_a.=" (".$marcrecord->subfield('701','c')." - " if $marcrecord->subfield('701','c');
-            $subfield_value_a.=" (" if $marcrecord->subfield('701','f') and not( $marcrecord->subfield('701','c'));
-            $subfield_value_a.=$marcrecord->subfield('701','f') if $marcrecord->subfield('701','f');
-            $subfield_value_a.=")" if $marcrecord->subfield('701','f') or $marcrecord->subfield('701','c');
-        } elsif ($marcrecord->field('712')){
-            $subfield_value_a=$marcrecord->subfield('712','d')." " if $marcrecord->subfield('712','d');
-            $subfield_value_a.=$marcrecord->subfield('712','a') if $marcrecord->subfield('712','a');
-            $subfield_value_a.=", ".$marcrecord->subfield('712','b') if $marcrecord->subfield('712','b');
-            $subfield_value_a.=" (".$marcrecord->subfield('712','f')." - " if $marcrecord->subfield('712','f');
-            $subfield_value_a.=" (" if $marcrecord->field('712',"e") and not $marcrecord->subfield('712','f');
-            $subfield_value_a.=$marcrecord->subfield('712','e') if $marcrecord->subfield('712','e');
-            $subfield_value_a.=")" if $marcrecord->subfield('712','e') or $marcrecord->subfield('712','f');
-        } elsif ($marcrecord->field('200')){
-            $subfield_value_a=$marcrecord->subfield('200','f');
+        if ( $marcrecord->field('700') ) {
+            $subfield_value_a = $marcrecord->field('700')->subfield("a");
+            $subfield_value_a .= ", " . $marcrecord->subfield( '700', "b" )
+              if $marcrecord->subfield( '700', 'b' );
+            $subfield_value_a .= " " . $marcrecord->subfield( '700', "d" )
+              if $marcrecord->subfield( '700', 'd' );
+            $subfield_value_a .=
+              " (" . $marcrecord->subfield( '700', 'c' ) . " - "
+              if $marcrecord->subfield( '700',     'c' );
+            $subfield_value_a .= " ("
+              if ( $marcrecord->subfield( '700', 'f' )
+                and not( $marcrecord->subfield( '700', 'c' ) ) );
+            $subfield_value_a .= $marcrecord->subfield( '700', 'f' )
+              if ( $marcrecord->subfield( '700', 'f' ) );
+            $subfield_value_a .= ")"
+              if ( $marcrecord->subfield( '701', 'f' )
+                or $marcrecord->subfield( '701', 'c' ) );
+        }
+        elsif ( $marcrecord->field('702') ) {
+            $subfield_value_a = $marcrecord->subfield( '702', 'a' );
+            $subfield_value_a .= ", " . $marcrecord->subfield( '702', 'b' )
+              if $marcrecord->subfield( '702', 'b' );
+            $subfield_value_a .= " " . $marcrecord->subfield( '702', 'd' )
+              if $marcrecord->subfield( '702', 'd' );
+            $subfield_value_a .=
+              " (" . $marcrecord->subfield( '702', 'c' ) . "; "
+              if $marcrecord->subfield( '702',     'c' );
+            $subfield_value_a .= " ("
+              if $marcrecord->subfield( '702', 'f' )
+              and not $marcrecord->subfield( '702', 'c' );
+            $subfield_value_a .= $marcrecord->subfield( '702', 'f' )
+              if $marcrecord->subfield( '702', 'f' );
+            $subfield_value_a .= ")"
+              if $marcrecord->subfield( '702', 'f' )
+              or $marcrecord->subfield( '702', 'c' );
         }
-        my $subfield_value_c = $marcrecord->field('210')->subfield("a") if ($marcrecord->field('210'));
-        my $subfield_value_d = $marcrecord->field('210')->subfield("d") if ($marcrecord->field('210'));
-    
-        my $subfield_value_e= $marcrecord->field('205')->subfield("a") if ($marcrecord->field('205'));
-    
+        elsif ( $marcrecord->field('710') ) {
+            $subfield_value_a = $marcrecord->subfield( '710', 'd' ) . " "
+              if $marcrecord->subfield( '710', 'd' );
+            $subfield_value_a .= $marcrecord->subfield( '710', 'a' )
+              if $marcrecord->subfield( '710', 'a' );
+            $subfield_value_a .= ", " . $marcrecord->subfield( '710', 'b' )
+              if $marcrecord->subfield('710');
+            $subfield_value_a .=
+              " (" . $marcrecord->subfield( '710', 'f' ) . " - "
+              if $marcrecord->subfield( '710',     'f' );
+            $subfield_value_a .= " ("
+              if $marcrecord->subfield( '710', 'e' )
+              and not $marcrecord->subfield( '710', 'f' );
+            $subfield_value_a .= $marcrecord->subfield( '710', 'e' )
+              if $marcrecord->subfield( '710', 'e' );
+            $subfield_value_a .= ")"
+              if $marcrecord->subfield( '710', 'e' )
+              or $marcrecord->subfield( '710', 'f' );
+        }
+        elsif ( $marcrecord->field('701') ) {
+            $subfield_value_a = $marcrecord->subfield( '701', 'a' );
+            $subfield_value_a .= ", " . $marcrecord->subfield( '701', 'b' )
+              if $marcrecord->subfield( '701', 'b' );
+            $subfield_value_a .= " " . $marcrecord->subfield( '701', 'd', )
+              if $marcrecord->subfield( '701', 'd' );
+            $subfield_value_a .=
+              " (" . $marcrecord->subfield( '701', 'c' ) . " - "
+              if $marcrecord->subfield( '701',     'c' );
+            $subfield_value_a .= " ("
+              if $marcrecord->subfield( '701', 'f' )
+              and not( $marcrecord->subfield( '701', 'c' ) );
+            $subfield_value_a .= $marcrecord->subfield( '701', 'f' )
+              if $marcrecord->subfield( '701', 'f' );
+            $subfield_value_a .= ")"
+              if $marcrecord->subfield( '701', 'f' )
+              or $marcrecord->subfield( '701', 'c' );
+        }
+        elsif ( $marcrecord->field('712') ) {
+            $subfield_value_a = $marcrecord->subfield( '712', 'd' ) . " "
+              if $marcrecord->subfield( '712', 'd' );
+            $subfield_value_a .= $marcrecord->subfield( '712', 'a' )
+              if $marcrecord->subfield( '712', 'a' );
+            $subfield_value_a .= ", " . $marcrecord->subfield( '712', 'b' )
+              if $marcrecord->subfield( '712', 'b' );
+            $subfield_value_a .=
+              " (" . $marcrecord->subfield( '712', 'f' ) . " - "
+              if $marcrecord->subfield( '712',     'f' );
+            $subfield_value_a .= " ("
+              if $marcrecord->field( '712', "e" )
+              and not $marcrecord->subfield( '712', 'f' );
+            $subfield_value_a .= $marcrecord->subfield( '712', 'e' )
+              if $marcrecord->subfield( '712', 'e' );
+            $subfield_value_a .= ")"
+              if $marcrecord->subfield( '712', 'e' )
+              or $marcrecord->subfield( '712', 'f' );
+        }
+        elsif ( $marcrecord->field('200') ) {
+            $subfield_value_a = $marcrecord->subfield( '200', 'f' );
+        }
+        my $subfield_value_c = $marcrecord->field('210')->subfield("a")
+          if ( $marcrecord->field('210') );
+        my $subfield_value_d = $marcrecord->field('210')->subfield("d")
+          if ( $marcrecord->field('210') );
+
+        my $subfield_value_e = $marcrecord->field('205')->subfield("a")
+          if ( $marcrecord->field('205') );
+
         my $subfield_value_h;
-        if (($marcrecord->field('200')) && ($marcrecord->field('200')->subfield("h"))){
-            $subfield_value_h = $marcrecord->field('200')->subfield("h") ;
-        } elsif (($marcrecord->field('225')) && ($marcrecord->field('225')->subfield("h"))) {
-            $subfield_value_h = $marcrecord->field('225')->subfield("h") ;
-        } elsif (($marcrecord->field('500')) && ($marcrecord->field('500')->subfield("h"))) {
-            $subfield_value_h = $marcrecord->field('500')->subfield("h") ;
+        if (   ( $marcrecord->field('200') )
+            && ( $marcrecord->field('200')->subfield("h") ) )
+        {
+            $subfield_value_h = $marcrecord->field('200')->subfield("h");
+        }
+        elsif (( $marcrecord->field('225') )
+            && ( $marcrecord->field('225')->subfield("h") ) )
+        {
+            $subfield_value_h = $marcrecord->field('225')->subfield("h");
+        }
+        elsif (( $marcrecord->field('500') )
+            && ( $marcrecord->field('500')->subfield("h") ) )
+        {
+            $subfield_value_h = $marcrecord->field('500')->subfield("h");
         }
-    
+
         my $subfield_value_i;
-        if (($marcrecord->field('200')) && ($marcrecord->field('200')->subfield("i"))){
-            $subfield_value_i = $marcrecord->field('200')->subfield("i") ;
-        } elsif (($marcrecord->field('225')) && ($marcrecord->field('225')->subfield("i"))) {
-            $subfield_value_i = $marcrecord->field('225')->subfield("i") ;
-        } elsif (($marcrecord->field('500')) && ($marcrecord->field('500')->subfield("i"))) {
-            $subfield_value_i = $marcrecord->field('500')->subfield("i") ;
+        if (   ( $marcrecord->field('200') )
+            && ( $marcrecord->field('200')->subfield("i") ) )
+        {
+            $subfield_value_i = $marcrecord->field('200')->subfield("i");
+        }
+        elsif (( $marcrecord->field('225') )
+            && ( $marcrecord->field('225')->subfield("i") ) )
+        {
+            $subfield_value_i = $marcrecord->field('225')->subfield("i");
         }
+        elsif (( $marcrecord->field('500') )
+            && ( $marcrecord->field('500')->subfield("i") ) )
+        {
+            $subfield_value_i = $marcrecord->field('500')->subfield("i");
+        }
+
+        my $subfield_value_p = $marcrecord->field('215')->subfield("a")
+          if ( $marcrecord->field('215') );
 
-        my $subfield_value_p = $marcrecord->field('215')->subfield("a") if ($marcrecord->field('215'));
-    
         my $subfield_value_t;
-        if (($marcrecord->field('200')) && ($marcrecord->field('200')->subfield("a"))){
-            $subfield_value_t = $marcrecord->field('200')->subfield("a") ;
-        } elsif (($marcrecord->field('225')) && ($marcrecord->field('225')->subfield("a"))) {
-            $subfield_value_t = $marcrecord->field('225')->subfield("a") ;
-        } elsif (($marcrecord->field('500')) && ($marcrecord->field('500')->subfield("a"))) {
-            $subfield_value_t = $marcrecord->field('500')->subfield("a") ;
+        if (   ( $marcrecord->field('200') )
+            && ( $marcrecord->field('200')->subfield("a") ) )
+        {
+            $subfield_value_t = $marcrecord->field('200')->subfield("a");
         }
-    
-        my $subfield_value_u = $marcrecord->field('856')->subfield("u") if ($marcrecord->field('856'));
-    
+        elsif (( $marcrecord->field('225') )
+            && ( $marcrecord->field('225')->subfield("a") ) )
+        {
+            $subfield_value_t = $marcrecord->field('225')->subfield("a");
+        }
+        elsif (( $marcrecord->field('500') )
+            && ( $marcrecord->field('500')->subfield("a") ) )
+        {
+            $subfield_value_t = $marcrecord->field('500')->subfield("a");
+        }
+
+        my $subfield_value_u = $marcrecord->field('856')->subfield("u")
+          if ( $marcrecord->field('856') );
+
         my $subfield_value_v;
-        if (($marcrecord->field('225')) && ($marcrecord->field('225')->subfield("v"))){
-            $subfield_value_v = $marcrecord->field('225')->subfield("v") ;
-        } elsif (($marcrecord->field('200')) && ($marcrecord->field('200')->subfield("h"))) {
-            $subfield_value_v = $marcrecord->field('200')->subfield("h") ;
+        if (   ( $marcrecord->field('225') )
+            && ( $marcrecord->field('225')->subfield("v") ) )
+        {
+            $subfield_value_v = $marcrecord->field('225')->subfield("v");
         }
-        my $subfield_value_x = $marcrecord->field('011')->subfield("a") if ($marcrecord->field('011') and not (($marcrecord->field('011')->subfield("y")) or ($marcrecord->field('011')->subfield("z"))));
-        my $subfield_value_y = $marcrecord->field('013')->subfield("a") if ($marcrecord->field('013'));
-        if ($marcrecord->field('010')){
+        elsif (( $marcrecord->field('200') )
+            && ( $marcrecord->field('200')->subfield("h") ) )
+        {
+            $subfield_value_v = $marcrecord->field('200')->subfield("h");
+        }
+        my $subfield_value_x = $marcrecord->field('011')->subfield("a")
+          if (
+            $marcrecord->field('011')
+            and not( ( $marcrecord->field('011')->subfield("y") )
+                or ( $marcrecord->field('011')->subfield("z") ) )
+          );
+        my $subfield_value_y = $marcrecord->field('013')->subfield("a")
+          if ( $marcrecord->field('013') );
+        if   ( $marcrecord->field('010') ) {
             $subfield_value_y = $marcrecord->field('010')->subfield("a");
         }
-        $template->param(fillinput => 1,
-                        index => $query->param('index')."",
-                        biblionumber=>$bibnum?$bibnum:"",
-                        subfield_value_9=>$subfield_value_9,
-                        subfield_value_0=>$subfield_value_0,
-                        subfield_value_a=>$subfield_value_a,
-                        subfield_value_c=>$subfield_value_c,
-                        subfield_value_d=>$subfield_value_d,
-                        subfield_value_e=>$subfield_value_e,
-                        subfield_value_h=>$subfield_value_h,
-                        subfield_value_i=>$subfield_value_i,
-                        subfield_value_p=>$subfield_value_p,
-                        subfield_value_t=>$subfield_value_t,
-                        subfield_value_u=>$subfield_value_u,
-                        subfield_value_v=>$subfield_value_v,
-                        subfield_value_x=>$subfield_value_x,
-                        subfield_value_y=>$subfield_value_y,
-                        );
-###############################################################    
-    }elsif ($op eq "do_search") {
-        my $search = $query->param('search');
-        my $startfrom = $query->param('startfrom');
+        $template->param(
+            fillinput        => 1,
+            index            => $query->param('index') . "",
+            biblionumber     => $bibnum ? $bibnum : "",
+            subfield_value_9 => $subfield_value_9,
+            subfield_value_0 => $subfield_value_0,
+            subfield_value_a => $subfield_value_a,
+            subfield_value_c => $subfield_value_c,
+            subfield_value_d => $subfield_value_d,
+            subfield_value_e => $subfield_value_e,
+            subfield_value_h => $subfield_value_h,
+            subfield_value_i => $subfield_value_i,
+            subfield_value_p => $subfield_value_p,
+            subfield_value_t => $subfield_value_t,
+            subfield_value_u => $subfield_value_u,
+            subfield_value_v => $subfield_value_v,
+            subfield_value_x => $subfield_value_x,
+            subfield_value_y => $subfield_value_y,
+        );
+###############################################################
+    }
+    elsif ( $op eq "do_search" ) {
+        my $search         = $query->param('search');
+        my $startfrom      = $query->param('startfrom');
         my $resultsperpage = $query->param('resultsperpage');
         my $orderby;
-        my ($errors,$results) = SimpleSearch($search);
-        my $total=scalar(@$results);
-        $resultsperpage=20 unless $resultsperpage;
-#        warn " biblio count : ".$total;
-    
-        ($template, $loggedinuser, $cookie)
-            = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_4XX.tmpl",
-                    query => $query,
-                    type => 'intranet',
-                    authnotrequired => 1,
-                    debug => 1,
-                    });
-    
+        my ( $errors, $results ) = SimpleSearch($search);
+        my $total = scalar(@$results);
+        $resultsperpage = 20 unless $resultsperpage;
+
+        #        warn " biblio count : ".$total;
+
+        ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+            {
+                template_name =>
+                  "cataloguing/value_builder/unimarc_field_4XX.tmpl",
+                query           => $query,
+                type            => 'intranet',
+                authnotrequired => 1,
+                debug           => 1,
+            }
+        );
+
         # multi page display gestion
-        my $displaynext=0;
-        my $displayprev=$startfrom;
-        if(($total - (($startfrom+1)*($resultsperpage))) > 0 ){
+        my $displaynext = 0;
+        my $displayprev = $startfrom;
+        if ( ( $total - ( ( $startfrom + 1 ) * ($resultsperpage) ) ) > 0 ) {
             $displaynext = 1;
         }
         my @arrayresults;
         my @field_data = ($search);
-        for (my $i=$startfrom; $i<=(($startfrom+$resultsperpage)<scalar(@$results)?($startfrom+$resultsperpage):scalar(@$results));$i++){
-            my $record=MARC::Record::new_from_usmarc( $results->[$i] );
-            my $rechash=TransformMarcToKoha($dbh,$record);
+        for (
+            my $i = $startfrom ;
+            $i <= (
+                  ( $startfrom + $resultsperpage ) < scalar(@$results)
+                ? ( $startfrom + $resultsperpage )
+                : scalar(@$results)
+            ) ;
+            $i++
+          )
+        {
+            my $record = MARC::Record::new_from_usmarc( $results->[$i] );
+            my $rechash = TransformMarcToKoha( $dbh, $record );
             my $pos;
-            my $countitems=1 if ($rechash->{itemnumber});
-            while (index($rechash->{itemnumber},'|',$pos)>0){
-              $countitems+=1;
-              $pos=index($rechash->{itemnumber},'|',$pos)+1;
+            my $countitems = 1 if ( $rechash->{itemnumber} );
+            while ( index( $rechash->{itemnumber}, '|', $pos ) > 0 ) {
+                $countitems += 1;
+                $pos = index( $rechash->{itemnumber}, '|', $pos ) + 1;
             }
-            $rechash->{totitem}=$countitems;
-            my @holdingbranches=split /\|/,$rechash->{holdingbranch};
-            my @itemcallnumbers=split /\|/,$rechash->{itemcallnumber};
+            $rechash->{totitem} = $countitems;
+            my @holdingbranches = split /\|/, $rechash->{holdingbranch};
+            my @itemcallnumbers = split /\|/, $rechash->{itemcallnumber};
             my $CN;
-            for (my $i=0;$i<@holdingbranches;$i++){
-              $CN.= $holdingbranches[$i]." ( ".$itemcallnumbers[$i]." ) |"
+            for ( my $i = 0 ; $i < @holdingbranches ; $i++ ) {
+                $CN .=
+                  $holdingbranches[$i] . " ( " . $itemcallnumbers[$i] . " ) |";
             }
-            $CN=~s/ \|$//;
-            $rechash->{CN}=$CN;
-            push @arrayresults,$rechash;
+            $CN =~ s/ \|$//;
+            $rechash->{CN} = $CN;
+            push @arrayresults, $rechash;
         }
-        
-#         for(my $i = 0 ; $i <= $#marclist ; $i++)
-#         {
-#             push @field_data, { term => "marclist", val=>$marclist[$i] };
-#             push @field_data, { term => "and_or", val=>$and_or[$i] };
-#             push @field_data, { term => "excluding", val=>$excluding[$i] };
-#             push @field_data, { term => "operator", val=>$operator[$i] };
-#             push @field_data, { term => "value", val=>$value[$i] };
-#         }
-    
+
+   #         for(my $i = 0 ; $i <= $#marclist ; $i++)
+   #         {
+   #             push @field_data, { term => "marclist", val=>$marclist[$i] };
+   #             push @field_data, { term => "and_or", val=>$and_or[$i] };
+   #             push @field_data, { term => "excluding", val=>$excluding[$i] };
+   #             push @field_data, { term => "operator", val=>$operator[$i] };
+   #             push @field_data, { term => "value", val=>$value[$i] };
+   #         }
+
         my @numbers = ();
-    
-        if ($total>$resultsperpage)
-        {
-            for (my $i=1; $i<$total/$resultsperpage+1; $i++)
-            {
-                if ($i<16)
-                {
-                    my $highlight=0;
-                    ($startfrom==($i-1)) && ($highlight=1);
-                    push @numbers, { number => $i,
-                        highlight => $highlight ,
-                        searchdata=> \@field_data,
-                        startfrom => ($i-1)};
+
+        if ( $total > $resultsperpage ) {
+            for ( my $i = 1 ; $i < $total / $resultsperpage + 1 ; $i++ ) {
+                if ( $i < 16 ) {
+                    my $highlight = 0;
+                    ( $startfrom == ( $i - 1 ) ) && ( $highlight = 1 );
+                    push @numbers,
+                      {
+                        number     => $i,
+                        highlight  => $highlight,
+                        searchdata => \@field_data,
+                        startfrom  => ( $i - 1 )
+                      };
                 }
             }
         }
-    
-        my $from = $startfrom*$resultsperpage+1;
+
+        my $from = $startfrom * $resultsperpage + 1;
         my $to;
-    
-        if($total < (($startfrom+1)*$resultsperpage))
-        {
+
+        if ( $total < ( ( $startfrom + 1 ) * $resultsperpage ) ) {
             $to = $total;
-        } else {
-            $to = (($startfrom+1)*$resultsperpage);
         }
-        my $defaultview = 'BiblioDefaultView'.C4::Context->preference('BiblioDefaultView');
-        $template->param(result => \@arrayresults,
-                        index => $query->param('index')."",
-                                startfrom=> $startfrom,
-                                displaynext=> $displaynext,
-                                displayprev=> $displayprev,
-                                resultsperpage => $resultsperpage,
-                                orderby => $orderby,
-                                startfromnext => $startfrom+1,
-                                startfromprev => $startfrom-1,
-                                searchdata=>\@field_data,
-                                total=>$total,
-                                from=>$from,
-                                to=>$to,
-                                numbers=>\@numbers,
-                                search=> $search,
-                                $defaultview => 1,
-                                Search =>0
-                                );
-    
-    } else {
-        ($template, $loggedinuser, $cookie)
-            = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_4XX.tmpl",
-                        query => $query,
-                        type => "intranet",
-                        authnotrequired => 1,
-                    });
-    
-    
-        my $sth=$dbh->prepare("Select itemtype,description from itemtypes order by description");
+        else {
+            $to = ( ( $startfrom + 1 ) * $resultsperpage );
+        }
+        my $defaultview =
+          'BiblioDefaultView' . C4::Context->preference('BiblioDefaultView');
+        $template->param(
+            result         => \@arrayresults,
+            index          => $query->param('index') . "",
+            startfrom      => $startfrom,
+            displaynext    => $displaynext,
+            displayprev    => $displayprev,
+            resultsperpage => $resultsperpage,
+            orderby        => $orderby,
+            startfromnext  => $startfrom + 1,
+            startfromprev  => $startfrom - 1,
+            searchdata     => \@field_data,
+            total          => $total,
+            from           => $from,
+            to             => $to,
+            numbers        => \@numbers,
+            search         => $search,
+            $defaultview   => 1,
+            Search         => 0
+        );
+
+    }
+    else {
+        ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+            {
+                template_name =>
+                  "cataloguing/value_builder/unimarc_field_4XX.tmpl",
+                query           => $query,
+                type            => "intranet",
+                authnotrequired => 1,
+            }
+        );
+
+        my $sth =
+          $dbh->prepare(
+            "Select itemtype,description from itemtypes order by description");
         $sth->execute;
-        my  @itemtype;
+        my @itemtype;
         my %itemtypes;
         push @itemtype, "";
         $itemtypes{''} = "";
-        while (my ($value,$lib) = $sth->fetchrow_array) {
+        while ( my ( $value, $lib ) = $sth->fetchrow_array ) {
             push @itemtype, $value;
-            $itemtypes{$value}=$lib;
+            $itemtypes{$value} = $lib;
         }
-    
-        my $CGIitemtype=CGI::scrolling_list( -name     => 'value',
-                    -values   => \@itemtype,
-                    -labels   => \%itemtypes,
-                    -size     => 1,
-                    -multiple => 0 );
+
+        my $CGIitemtype = CGI::scrolling_list(
+            -name     => 'value',
+            -values   => \@itemtype,
+            -labels   => \%itemtypes,
+            -size     => 1,
+            -multiple => 0
+        );
         $sth->finish;
-    
+
         my @branchloop;
         my @select_branch;
         my %select_branches;
-        my $branches=GetBranches;
+        my $branches = GetBranches;
         push @select_branch, "";
         $select_branches{''} = "";
-        foreach my $thisbranch (keys %$branches){
+        foreach my $thisbranch ( keys %$branches ) {
             push @select_branch, $branches->{$thisbranch}->{'branchcode'};
-            $select_branches{$branches->{$thisbranch}->{'branchcode'}} = $branches->{$thisbranch}->{'branchname'};
+            $select_branches{ $branches->{$thisbranch}->{'branchcode'} } =
+              $branches->{$thisbranch}->{'branchname'};
         }
-        my $CGIbranch=CGI::scrolling_list( -name     => 'value',
-                    -values   => \@select_branch,
-                    -labels   => \%select_branches,
-                    -size     => 1,
-                    -multiple => 0 );
+        my $CGIbranch = CGI::scrolling_list(
+            -name     => 'value',
+            -values   => \@select_branch,
+            -labels   => \%select_branches,
+            -size     => 1,
+            -multiple => 0
+        );
         $sth->finish;
-    
-        my $req = $dbh->prepare("select distinctrow left(publishercode,45) from biblioitems order by publishercode");
+
+        my $req =
+          $dbh->prepare(
+"select distinctrow left(publishercode,45) from biblioitems order by publishercode"
+          );
         $req->execute;
         my @select;
-        push @select,"";
-        while (my ($value) =$req->fetchrow) {
+        push @select, "";
+        while ( my ($value) = $req->fetchrow ) {
             push @select, $value;
         }
-        my $CGIpublisher=CGI::scrolling_list( -name     => 'value',
-                    -id => 'publisher',
-                    -values   => \@select,
-                    -size     => 1,
-                    -multiple => 0 );
-    
+        my $CGIpublisher = CGI::scrolling_list(
+            -name     => 'value',
+            -id       => 'publisher',
+            -values   => \@select,
+            -size     => 1,
+            -multiple => 0
+        );
+
 #         my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
 #         $sth->execute;
 #         while (my ($description,$itemtype) = $sth->fetchrow) {
 #             $classlist.="<option value=\"$itemtype\">$description</option>\n";
 #         }
 #         $sth->finish;
-    
-        $template->param(#classlist => $classlist,
-                        CGIitemtype => $CGIitemtype,
-                        CGIbranch => $CGIbranch,
-                        CGIPublisher => $CGIpublisher,
-                        index=>$query->param('index'),
-                        Search =>1,
+
+        $template->param(    #classlist => $classlist,
+            CGIitemtype  => $CGIitemtype,
+            CGIbranch    => $CGIbranch,
+            CGIPublisher => $CGIpublisher,
+            index        => $query->param('index'),
+            Search       => 1,
         );
     }
-    output_html_with_http_headers $query, $cookie, $template->output ;
+    output_html_with_http_headers $query, $cookie, $template->output;
 }
 
 1;
diff --git a/cataloguing/value_builder/unimarc_field_60X.pl b/cataloguing/value_builder/unimarc_field_60X.pl
index 3889e2faba..189923cdba 100755
--- a/cataloguing/value_builder/unimarc_field_60X.pl
+++ b/cataloguing/value_builder/unimarc_field_60X.pl
@@ -29,89 +29,105 @@ use C4::Output;
 use C4::Authorities;
 
 sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
-my $res="
-<script>
-function Focus$function_name(subfield_managed) {
-return 1;
-}
+    my ( $dbh, $record, $tagslib, $field_number, $tabloop ) = @_;
+    my $function_name = $field_number;
+    my $res           = "
+        <script type=\"text/javascript\">
+            function Focus$function_name(subfield_managed) {
+    	        return 1;
+            }
 
-function Blur$function_name(subfield_managed) {
-	return 1;
-}
+            function Blur$function_name(subfield_managed) {
+            	return 1;
+            }
 
-function Clic$function_name(index) {
-	defaultvalue=document.f.field_value[index].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&index=\"+index+\"&result=\"+defaultvalue,\"unimarc 700\",'width=700,height=300,toolbar=false,scrollbars=yes');
+            function Clic$function_name(index) {
+            	defaultvalue=document.getElementById(\"$field_number\").value;
+            	window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&index=$field_number&result=\"+defaultvalue,\"unimarc 600\",'width=700,height=300,toolbar=false,scrollbars=yes');
 
-}
-</script>
-";
+            }
+        </script>
+    ";
 
-return ($function_name,$res);
+    return ( $function_name, $res );
 }
+
 sub plugin {
-	my ($input) = @_;
-	my $dbh = C4::Context->dbh;
-	my $index= $input->param('index');
-	my $result= $input->param('result');
-	my $search_string= $input->param('search_string');
-	my $op = $input->param('op');
-	my $id = $input->param('id');
-	my $insert = $input->param('insert');
-	my %stdlib;
-	my $select_list;
-	if ($op eq "add") {
-		newauthority($dbh,'NC',$insert,$insert,'',1,'');
-		$search_string=$insert;
-	}
-	if ($op eq "select") {
-		my $sti = $dbh->prepare("select stdlib from bibliothesaurus where id=?");
-		$sti->execute($id);
-		my ($freelib_text) = $sti->fetchrow_array;
-		$result = $freelib_text;
-	}
-	my $Rsearch_string="$search_string%";
-	my $authoritysep = C4::Context->preference('authoritysep');
-	my @splitted = /$authoritysep/,$search_string;
-	my $level = $#splitted+1;
-	my $sti;
-	if ($search_string) { # if no search pattern, returns only the 50 1st top level values
-		$sti=$dbh->prepare("select distinct freelib,father,level from bibliothesaurus where category='NC' and freelib like ? order by father,freelib");
-	} else {
-		$sti=$dbh->prepare("select distinct freelib,father,level from bibliothesaurus where category='NC' and level=0 and freelib like ? order by father,freelib limit 0,50");
-	}
-	$sti->execute($Rsearch_string);
-	my @results;
-	while (my ($freelib,$father,$level)=$sti->fetchrow) {
-		my %line;
-		if ($father) {
-			$line{value} = "$father $freelib";
-		} else {
-			$line{value} = "$freelib";
-		}
-		$line{level} = $level+1;
-		$line{father} = $father;
-		push @results, \%line;
-	}
-	my @DeeperResults = SearchDeeper('NC',$search_string);
-	my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_60X.tmpl",
-					query => $input,
-					type => "intranet",
-					authnotrequired => 0,
-					flagsrequired => {editcatalogue => 1},
-					debug => 1,
-					});
+    my ($input)       = @_;
+    my $dbh           = C4::Context->dbh;
+    my $index         = $input->param('index');
+    my $result        = $input->param('result');
+    my $search_string = $input->param('search_string');
+    my $op            = $input->param('op');
+    my $id            = $input->param('id');
+    my $insert        = $input->param('insert');
+    my %stdlib;
+    my $select_list;
+
+    if ( $op eq "add" ) {
+        newauthority( $dbh, 'NC', $insert, $insert, '', 1, '' );
+        $search_string = $insert;
+    }
+    if ( $op eq "select" ) {
+        my $sti =
+          $dbh->prepare("select stdlib from bibliothesaurus where id=?");
+        $sti->execute($id);
+        my ($freelib_text) = $sti->fetchrow_array;
+        $result = $freelib_text;
+    }
+    my $Rsearch_string = "$search_string%";
+    my $authoritysep   = C4::Context->preference('authoritysep');
+    my @splitted       = /$authoritysep/, $search_string;
+    my $level          = $#splitted + 1;
+    my $sti;
+    if ($search_string)
+    {    # if no search pattern, returns only the 50 1st top level values
+        $sti =
+          $dbh->prepare(
+"select distinct freelib,father,level from bibliothesaurus where category='NC' and freelib like ? order by father,freelib"
+          );
+    }
+    else {
+        $sti =
+          $dbh->prepare(
+"select distinct freelib,father,level from bibliothesaurus where category='NC' and level=0 and freelib like ? order by father,freelib limit 0,50"
+          );
+    }
+    $sti->execute($Rsearch_string);
+    my @results;
+    while ( my ( $freelib, $father, $level ) = $sti->fetchrow ) {
+        my %line;
+        if ($father) {
+            $line{value} = "$father $freelib";
+        }
+        else {
+            $line{value} = "$freelib";
+        }
+        $line{level}  = $level + 1;
+        $line{father} = $father;
+        push @results, \%line;
+    }
+    my @DeeperResults = SearchDeeper( 'NC', $search_string );
+    my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+        {
+            template_name => "cataloguing/value_builder/unimarc_field_60X.tmpl",
+            query         => $input,
+            type          => "intranet",
+            authnotrequired => 0,
+            flagsrequired   => { editcatalogue => 1 },
+            debug           => 1,
+        }
+    );
+
 # builds collection list : search isbn and editor, in parent, then load collections from bibliothesaurus table
-	$template->param(index => $index,
-							result =>$result,
-							search_string => $search_string?$search_string:$result,
-							results => \@results,
-							deeper => \@DeeperResults,
-				);
-        output_html_with_http_headers $input, $cookie, $template->output;
+    $template->param(
+        index         => $index,
+        result        => $result,
+        search_string => $search_string ? $search_string : $result,
+        results       => \@results,
+        deeper        => \@DeeperResults,
+    );
+    output_html_with_http_headers $input, $cookie, $template->output;
 }
 
 1;
diff --git a/cataloguing/value_builder/unimarc_field_700-4.pl b/cataloguing/value_builder/unimarc_field_700-4.pl
index a970f710b5..224f3273fb 100755
--- a/cataloguing/value_builder/unimarc_field_700-4.pl
+++ b/cataloguing/value_builder/unimarc_field_700-4.pl
@@ -45,7 +45,7 @@ This plug-in deals with unimarc field 700-4 (
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "7004".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res  = "
 <script>
 function Focus$function_name(index) {
@@ -57,7 +57,7 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(subfield_managed) {
-	defaultvalue=document.forms['f'].field_value[1].value;
+	defaultvalue=document.getElementById(\"$field_number\").value;
 	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_700-4.pl&result=\"+defaultvalue+\"&index=$field_number\",\"value builder\",'width=500,height=400,toolbar=false,scrollbars=yes');
 
 }
diff --git a/cataloguing/value_builder/unimarc_field_700_701_702.pl b/cataloguing/value_builder/unimarc_field_700_701_702.pl
index a4662dcfeb..cf5d0d0cb9 100755
--- a/cataloguing/value_builder/unimarc_field_700_701_702.pl
+++ b/cataloguing/value_builder/unimarc_field_700_701_702.pl
@@ -30,7 +30,7 @@ use C4::Authorities;
 
 sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
+my $function_name= $field_number;
 my $res="
 <script>
 function Focus$function_name(subfield_managed) {
@@ -42,8 +42,8 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(index) {
-	defaultvalue=document.f.field_value[index].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_700_701_702.pl&index=\"+index+\"&result=\"+defaultvalue,\"unimarc 700\",'width=700,height=300,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_field_700_701_702.pl&index=$field_number&result=\"+defaultvalue,\"unimarc 700\",'width=700,height=300,toolbar=false,scrollbars=yes');
 
 }
 </script>
diff --git a/cataloguing/value_builder/unimarc_leader.pl b/cataloguing/value_builder/unimarc_leader.pl
index 74500aa199..05a0a5e5c8 100755
--- a/cataloguing/value_builder/unimarc_leader.pl
+++ b/cataloguing/value_builder/unimarc_leader.pl
@@ -32,72 +32,78 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
+    my ( $dbh, $record, $tagslib, $i, $tabloop ) = @_;
+    return "";
 }
 
 sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
-my $res="
+    my ( $dbh, $record, $tagslib, $field_number, $tabloop ) = @_;
+    my $function_name = $field_number;
+    my $res           = "
 <script>
 function Focus$function_name(subfield_managed) {
 return 1;
 }
 
 function Blur$function_name(subfield_managed) {
-    if (document.forms['f'].field_value[subfield_managed].value.length != 25) {
-        alert(_('leader has an incorrect size: ' + document.forms['f'].field_value[subfield_managed].value.length + ' instead of 25 chars'));
+	var leader_lenght = document.getElementById(\"$field_number\").value.length;
+    if (leader_lenght != 25) {
+        alert(_('leader has an incorrect size: ' + leader_lenght + ' instead of 25 chars'));
     }
     return 1;
 }
 
 function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_leader.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
+	defaultvalue=document.getElementById(\"$field_number\").value;
+	newin=window.open(\"plugin_launcher.pl?plugin_name=unimarc_leader.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
 </script>
 ";
 
-return ($function_name,$res);
+    return ( $function_name, $res );
 }
+
 sub plugin {
     my ($input) = @_;
-    my $index= $input->param('index');
-    my $result= $input->param('result');
-    my $dbh = C4::Context->dbh;
-
-    my ($template, $loggedinuser, $cookie)
-        = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_leader.tmpl",
-                            query => $input,
-                            type => "intranet",
-                            authnotrequired => 0,
-                            flagsrequired => {editcatalogue => 1},
-                            debug => 1,
-                            });
-        $result = "     nam         3       " unless $result;
-        my $f5 = substr($result,5,1);
-        my $f6 = substr($result,6,1);
-        my $f7 = substr($result,7,1);
-        my $f8 = substr($result,8,1);
-        my $f9 = substr($result,9,1);
-        my $f17 = substr($result,17,1);
-        my $f18 = substr($result,18,1);
-        my $f19 = substr($result,19,1);
-
-        $template->param(index => $index,
-                        "f5$f5" => 1,
-                        "f6$f6" => 1,
-                        "f7$f7" => 1,
-                        "f8$f8" => 1,
-                        "f9$f9" => 1,
-                        "f17$f17" => 1,
-                        "f18$f18" => 1,
-                        "f19$f19" => 1,
-        );
-        output_html_with_http_headers $input, $cookie, $template->output;
+    my $index   = $input->param('index');
+    my $result  = $input->param('result');
+    my $dbh     = C4::Context->dbh;
+
+    my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+        {
+            template_name   => "cataloguing/value_builder/unimarc_leader.tmpl",
+            query           => $input,
+            type            => "intranet",
+            authnotrequired => 0,
+            flagsrequired   => { editcatalogue => 1 },
+            debug           => 1,
+        }
+    );
+    $result = "     nam         3       " unless $result;
+    my $f5  = substr( $result, 5,  1 );
+    my $f6  = substr( $result, 6,  1 );
+    my $f7  = substr( $result, 7,  1 );
+    my $f8  = substr( $result, 8,  1 );
+    my $f9  = substr( $result, 9,  1 );
+    my $f17 = substr( $result, 17, 1 );
+    my $f18 = substr( $result, 18, 1 );
+    my $f19 = substr( $result, 19, 1 );
+
+    $template->param(
+        index     => $index,
+        "f5$f5"   => 1,
+        "f6$f6"   => 1,
+        "f7$f7"   => 1,
+        "f8$f8"   => 1,
+        "f9$f9"   => 1,
+        "f17$f17" => 1,
+        "f18$f18" => 1,
+        "f19$f19" => 1,
+    );
+    output_html_with_http_headers $input, $cookie, $template->output;
 }
 
 1;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_100.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_100.tmpl
index 1e5028fb23..72fc2690f1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_100.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_100.tmpl
@@ -17,13 +17,12 @@
         <td>Code de date de publication </td>
         <td>
             <select name="f2" size="1">
-        <!-- TMPL_IF name="f2 " -->
-              <option value=" " SELECTED>None</option>
-                 <!-- TMPL_ELSE -->
-                    <option value=" ">None</option>
-
+            <!-- TMPL_IF name="f2 " -->
+                <option value=" " SELECTED>Valeur non requise</option>
+            <!-- TMPL_ELSE -->
+                <option value=" ">valeur non requise</option>
             <!-- /TMPL_IF -->
-
+            
             <!-- TMPL_IF name="f2a" -->
                 <option value="a" SELECTED>Periodique
                 en cours</option>
@@ -72,7 +71,6 @@
                 publication s'etend sur plus d'un an</option>
             <!-- /TMPL_IF -->
     
-    
             <!-- TMPL_IF name="f2h" -->
                 <option value="h"
                 SELECTED>monographie ayant a la fois
@@ -113,67 +111,65 @@
     </tr>
     <tr>
     <td>Deuxieme date de publication</td>
-    <td><input id="pubdate2" type="text" name="f4" maxlength=4 size=5
-        value="<!-- TMPL_VAR name="f4" -->"></td>
-        
+    <td><input id="pubdate2" type="text" name="f4" maxlength=4 size=5 value="<!-- TMPL_VAR name="f4" -->"></td>
     </tr>
     <tr>
         <td>Niveau intellectuel ou public destinataire 1</td>
         <td>
             <select name="f5" size="1">
-        <!-- TMPL_IF name="f5 " -->
-              <option value=" " SELECTED>None</option>
-                 <!-- TMPL_ELSE -->
-                    <option value=" ">None</option>
-
+            <!-- TMPL_IF name="f5|" -->
+                <option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+                <option value="|">|- Caractère de remplissage</option>
             <!-- /TMPL_IF -->
+            
             <!-- TMPL_IF name="f5a" -->
-                <option value="a" SELECTED>Jeunesse en
+                <option value="a" SELECTED>a- Jeunesse en
     general </option>
             <!-- TMPL_ELSE -->
-                <option value="a">Jeunesse en general</option>
+                <option value="a">a- Jeunesse en general</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f5b" -->
                 <option value="b"
     SELECTED>Pre-scolaire</option>
             <!-- TMPL_ELSE -->
-                <option value="b">Pre-scolaire</option>
+                <option value="b">b- Pre-scolaire</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f5c" -->
-                <option value="c" SELECTED>scolaire</option>
+                <option value="c" SELECTED>c- scolaire</option>
             <!-- TMPL_ELSE -->
-                <option value="c">scolaire</option>
+                <option value="c">c- scolaire</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f5d" -->
-                <option value="d" SELECTED>enfant</option>
+                <option value="d" SELECTED>d- enfant</option>
             <!-- TMPL_ELSE -->
-                <option value="d">enfant</option>
+                <option value="d">d- enfant</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f5e" -->
-                <option value="e" SELECTED>jeune adulte</option>
+                <option value="e" SELECTED>e- jeune adulte</option>
             <!-- TMPL_ELSE -->
-                <option value="e">jeune adulte</option>
+                <option value="e">e- jeune adulte</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f5k" -->
                 <option value="k"
-                SELECTED>adulte, haut niveau</option>
+                SELECTED>k- adulte, haut niveau</option>
             <!-- TMPL_ELSE -->
-                <option value="k">adulte, haut niveau</option>
+                <option value="k">k- adulte, haut niveau</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f5m" -->
                 <option value="m"
-                SELECTED>fiction ou vulg adulte</option>
+                SELECTED>m- Adulte, grand public</option>
             <!-- TMPL_ELSE -->
-                <option value="m">fiction ou vulg adulte</option>
+                <option value="m">m- Adulte, grand public</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f5u" -->
                 <option value="u"
-                SELECTED>inconnu</option>
+                SELECTED>u- inconnu</option>
             <!-- TMPL_ELSE -->
-                <option value="u">inconnu</option>
+                <option value="u">u- inconnu</option>
             <!-- /TMPL_IF -->
             </select>
         </td>
@@ -182,59 +178,58 @@
         <td>Niveau intellectuel ou public destinataire 2</td>
         <td>
             <select name="f6" size="1">
-        <!-- TMPL_IF name="f6 " -->
-              <option value=" " SELECTED>None</option>
-                 <!-- TMPL_ELSE -->
-                    <option value=" ">None</option>
-
+            
+            <!-- TMPL_IF name="f6|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
             <!-- /TMPL_IF -->
+            
             <!-- TMPL_IF name="f6a" -->
-                <option value="a" SELECTED>Jeunesse en
-    general </option>
+                <option value="a" SELECTED>a- Jeunesse en general </option>
             <!-- TMPL_ELSE -->
-                <option value="a">Jeunesse en general</option>
+                <option value="a">a- Jeunesse en general</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f6b" -->
-                <option value="b"
-    SELECTED>Pre-scolaire</option>
+                <option value="b"  SELECTED>b- Pre-scolaire</option>
             <!-- TMPL_ELSE -->
-                <option value="b">Pre-scolaire</option>
+                <option value="b">b- Pre-scolaire</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f6c" -->
-                <option value="c" SELECTED>scolaire</option>
+                <option value="c" SELECTED>c- scolaire</option>
             <!-- TMPL_ELSE -->
-                <option value="c">scolaire</option>
+                <option value="c">c- scolaire</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f6d" -->
-                <option value="d" SELECTED>enfant</option>
+                <option value="d" SELECTED>d- enfant</option>
             <!-- TMPL_ELSE -->
-                <option value="d">enfant</option>
+                <option value="d">d- enfant</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f6e" -->
-                <option value="e" SELECTED>jeune adulte</option>
+                <option value="e" SELECTED>e- jeune adulte</option>
             <!-- TMPL_ELSE -->
-                <option value="e">jeune adulte</option>
+                <option value="e">e- jeune adulte</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f6k" -->
                 <option value="k"
-                SELECTED>adulte, haut niveau</option>
+                SELECTED>k- adulte, haut niveau</option>
             <!-- TMPL_ELSE -->
-                <option value="k">adulte, haut niveau</option>
+                <option value="k">k- adulte, haut niveau</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f6m" -->
                 <option value="m"
-                SELECTED>fiction ou vulg adulte</option>
+                SELECTED>m- fiction ou vulg adulte</option>
             <!-- TMPL_ELSE -->
-                <option value="m">fiction ou vulg adulte</option>
+                <option value="m">m- fiction ou vulg adulte</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f6u" -->
                 <option value="u"
-                SELECTED>inconnu</option>
+                SELECTED>u- inconnu</option>
             <!-- TMPL_ELSE -->
-                <option value="u">inconnu</option>
+                <option value="u">u- inconnu</option>
             <!-- /TMPL_IF -->
             </select>
         </td>
@@ -243,59 +238,59 @@
         <td>Niveau intellectuel ou public destinataire 3</td>
         <td>
             <select name="f7" size="1">
-        <!-- TMPL_IF name="f7 " -->
-              <option value=" " SELECTED>None</option>
-                 <!-- TMPL_ELSE -->
-                    <option value=" ">None</option>
-
+            <!-- TMPL_IF name="f7|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
             <!-- /TMPL_IF -->
+            
             <!-- TMPL_IF name="f7a" -->
-                <option value="a" SELECTED>Jeunesse en
+                <option value="a" SELECTED>a- Jeunesse en
     general </option>
             <!-- TMPL_ELSE -->
-                <option value="a">Jeunesse en general</option>
+                <option value="a">a- Jeunesse en general</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f7b" -->
                 <option value="b"
-    SELECTED>Pre-scolaire</option>
+    SELECTED>b- Pre-scolaire</option>
             <!-- TMPL_ELSE -->
-                <option value="b">Pre-scolaire</option>
+                <option value="b">b- Pre-scolaire</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f7c" -->
-                <option value="c" SELECTED>scolaire</option>
+                <option value="c" SELECTED>c- scolaire</option>
             <!-- TMPL_ELSE -->
-                <option value="c">scolaire</option>
+                <option value="c">c- scolaire</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f7d" -->
-                <option value="d" SELECTED>enfant</option>
+                <option value="d" SELECTED>d- enfant</option>
             <!-- TMPL_ELSE -->
-                <option value="d">enfant</option>
+                <option value="d">d- enfant</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f7e" -->
-                <option value="e" SELECTED>jeune adulte</option>
+                <option value="e" SELECTED>e- jeune adulte</option>
             <!-- TMPL_ELSE -->
-                <option value="e">jeune adulte</option>
+                <option value="e">e- jeune adulte</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f7k" -->
                 <option value="k"
-                SELECTED>adulte, haut niveau</option>
+                SELECTED>k- adulte, haut niveau</option>
             <!-- TMPL_ELSE -->
-                <option value="k">adulte, haut niveau</option>
+                <option value="k">k- adulte, haut niveau</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f7m" -->
                 <option value="m"
-                SELECTED>fiction ou vulg adulte</option>
+                SELECTED>m- fiction ou vulg adulte</option>
             <!-- TMPL_ELSE -->
-                <option value="m">fiction ou vulg adulte</option>
+                <option value="m">m- fiction ou vulg adulte</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f7u" -->
                 <option value="u"
-                SELECTED>inconnu</option>
+                SELECTED>u- inconnu</option>
             <!-- TMPL_ELSE -->
-                <option value="u">inconnu</option>
+                <option value="u">u- inconnu</option>
             <!-- /TMPL_IF -->
             </select>
         </td>
@@ -304,81 +299,82 @@
         <td>Publication officielle</td>
         <td>
             <select name="f8" size="1">
-                   <!-- TMPL_IF name="f8 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
-        <!-- TMPL_IF name="f8a" -->
-                <option value="a" SELECTED>Federal/national</option>
+            
+            <!-- TMPL_IF name="f8u" -->
+            	<option value="u" SELECTED>u- Date de publication inconnu</option>
+            <!-- TMPL_ELSE -->
+                <option value="u">u- Date de publication inconnu</option>
+            <!-- /TMPL_IF -->
+       		<!-- TMPL_IF name="f8a" -->
+                <option value="a" SELECTED>a- Federal/national</option>
             <!-- TMPL_ELSE -->
-                <option value="a">Federal/national</option>
+                <option value="a">a- Federal/national</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8b" -->
-                <option value="b" SELECTED>etat/province</option>
+                <option value="b" SELECTED>b- etat/province</option>
             <!-- TMPL_ELSE -->
-                <option value="b">etat/province</option>
+                <option value="b">b- etat/province</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8c" -->
-                <option value="c" SELECTED>compte/department</option>
+                <option value="c" SELECTED>c- comté/departement</option>
             <!-- TMPL_ELSE -->
-                <option value="c">compte/department</option>
+                <option value="c">c- comté/departement</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8d" -->
                 <option value="d"
-                SELECTED>local(municipal, etc.)</option>
+                SELECTED>d- local(municipal, etc.)</option>
             <!-- TMPL_ELSE -->
-                <option value="d">local(municipal, etc.)</option>
+                <option value="d">d- local(municipal, etc.)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8e" -->
                 <option value="e"
-                SELECTED>multi-local(inter-departmental,
+                SELECTED>e- multi-local(inter-departmental,
                 etc. sous le niveau national)</option>
             <!-- TMPL_ELSE -->
-                <option value="e">multi-local(inter-departmental,
+                <option value="e">e- multi-local(inter-departmental,
                 etc. sous le niveau national)</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f8f" -->
                 <option value="f"
-                SELECTED>Inter-gouvernemental</option>
+                SELECTED>f- Inter-gouvernemental</option>
             <!-- TMPL_ELSE -->
-                <option value="f">Inter-gouvernemental</option>
+                <option value="f">f- Inter-gouvernemental</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f8g" -->
                 <option value="g"
-                SELECTED>gouvernement en exil ou clandestin</option>
+                SELECTED>g- gouvernement en exil ou clandestin</option>
             <!-- TMPL_ELSE -->
-                <option value="g">gouvernement en exil
+                <option value="g">g- gouvernement en exil
                 ou clandestin</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f8h" -->
                 <option value="h"
-                SELECTED>Niveau indetermine</option>
+                SELECTED>h- Niveau indetermine</option>
             <!-- TMPL_ELSE -->
-                <option value="h">Niveau indetermine</option>
+                <option value="h">h- Niveau indetermine</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8u" -->
                 <option value="u"
-                SELECTED>inconnu</option>
+                SELECTED>u- inconnu</option>
             <!-- TMPL_ELSE -->
-                <option value="u">inconnu</option>
+                <option value="u">u- inconnu</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8y" -->
                 <option value="y"
-                SELECTED>il ne s'agit pas d'une
+                SELECTED>y- il ne s'agit pas d'une
                 publication officielle</option>
             <!-- TMPL_ELSE -->
-                <option value="y">il ne s'agit pas
+                <option value="y">y- il ne s'agit pas
                 d'une publication officielle</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8z" -->
                 <option value="z"
-                SELECTED>Autre instance officielle</option>
+                SELECTED>z- Autre instance officielle</option>
             <!-- TMPL_ELSE -->
-                <option value="z">Autre instance officielle</option>
+                <option value="z">z- Autre instance officielle</option>
             <!-- /TMPL_IF -->
             </select>
         </td>
@@ -388,21 +384,16 @@
         <td>Code de modification de la notice</td>
         <td>
             <select name="f9" size="1">
-                      <!-- TMPL_IF name="f9 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
-
+            
             <!-- TMPL_IF name="f90" -->
-                <option value="0" SELECTED>Notice non modifiee</option>
+                <option value="0" SELECTED>0- Notice non modifiee</option>
             <!-- TMPL_ELSE -->
-                <option value="0">Notice non modifiee</option>
+                <option value="0">0- Notice non modifiee</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f91" -->
-                <option value="1" SELECTED>notice modifiee</option>
+                <option value="1" SELECTED>1- notice modifiee</option>
             <!-- TMPL_ELSE -->
-                <option value="1">notice modifiee</option>
+                <option value="1">1- notice modifiee</option>
             <!-- /TMPL_IF -->
             </select>
         </td>
@@ -413,279 +404,306 @@
     <td>Langue de catalogage (obligatoire)</td>
     <td><input type="text" name="f10" maxlength=3 size=4
         value="<!-- TMPL_VAR name="f10" -->"></td>
-        
     </tr>
 
-
-
     <tr>
         <td>Code de transliteration</td>
         <td>
             <select name="f11" size="1">
-                      <!-- TMPL_IF name="f11 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
-
+            
             <!-- TMPL_IF name="f11a" -->
-                <option value="a" SELECTED>Norme ISO
+                <option value="a" SELECTED>a- Norme ISO
         pour la translitteration</option>
             <!-- TMPL_ELSE -->
-                <option value="a">Norme ISO
+                <option value="a">a- Norme ISO
         pour la translitteration</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f11b" -->
-                <option value="b" SELECTED>autre</option>
+                <option value="b" SELECTED>b- autre</option>
             <!-- TMPL_ELSE -->
-                <option value="b">autre</option>
+                <option value="b">b- autre</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f11c" -->
                 <option value="c"
-        SELECTED>Translitterations multiples : ISO et autres regles</option>
+        SELECTED>c- Translitterations multiples : ISO et autres regles</option>
             <!-- TMPL_ELSE -->
-                <option value="c">Translitterations multiples : ISO et autres regles</option>
+                <option value="c">c- Translitterations multiples : ISO et autres regles</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f11y" -->
-                <option value="y" SELECTED>Sans regles
+                <option value="y" SELECTED>y- Sans regles
         de translitteration</option>
             <!-- TMPL_ELSE -->
-                <option value="y">Sans regles
+                <option value="y">y- Sans regles
         de translitteration</option>
             <!-- /TMPL_IF -->
             </select>
         </td>
     </tr>
-
     <tr>
     <td>Jeux de caracteres (obligatoire) 1 </td>
         <td>
             <select name="f12" size="1">
-              <!-- TMPL_IF name="f12  " -->
-                                <option value="  " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value="  ">None</option>
-                        <!-- /TMPL_IF -->
-
+            
             <!-- TMPL_IF name="f1201" -->
-                <option value="01" SELECTED>ISO 646,
+                <option value="01" SELECTED>01- ISO 646,
     version IRV (caracteres latins de base)</option>
             <!-- TMPL_ELSE -->
-                <option value="01">ISO 646,
+                <option value="01">01- ISO 646,
     version IRV (caracteres latins de base)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1202" -->
-                <option value="02" SELECTED>Registre
+                <option value="02" SELECTED>02- Registre
     ISO #37 (caracteres cyrilliques de base)</option>
             <!-- TMPL_ELSE -->
-                <option value="02">Registre
+                <option value="02">02- Registre
     ISO #37 (caracteres cyrilliques de base)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1203" -->
                 <option value="03"
-        SELECTED>ISO 5426 (jeu de caractere latin etendu)</option>
+        SELECTED>03- ISO 5426 (jeu de caractere latin etendu)</option>
             <!-- TMPL_ELSE -->
-                <option value="03">ISO 5426 (jeu de caractere latin etendu)</option>
+                <option value="03">03- ISO 5426 (jeu de caractere latin etendu)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1204" -->
-                <option value="04" SELECTED>ISO DIS
+                <option value="04" SELECTED>04- ISO DIS
     5427 (jeu de caracteres cyrilliques etendu)</option>
             <!-- TMPL_ELSE -->
-                <option value="04">ISO DIS
+                <option value="04">04- ISO DIS
     5427 (jeu de caracteres cyrilliques etendu)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1205" -->
-                <option value="05" SELECTED>ISO  5428
+                <option value="05" SELECTED>05- ISO  5428
     (caracteres grecs)</option>
             <!-- TMPL_ELSE -->
-                <option value="05">ISO  5428
+                <option value="05">05- ISO  5428
     (caracteres grecs)</option>
             <!-- /TMPL_IF -->
+            
             <!-- TMPL_IF name="f1206" -->
-                <option value="06" SELECTED>ISO 6438
+                <option value="06" SELECTED>06- ISO 6438
     (caracteres africains codes)</option>
             <!-- TMPL_ELSE -->
-                <option value="06">ISO 6438
+                <option value="06">06- ISO 6438
     (caracteres africains codes)</option>
             <!-- /TMPL_IF -->
+            
+             <!-- TMPL_IF name="f1207" -->
+                <option value="07" SELECTED>07- ISO 10586
+    (caracteres grégoriens)</option>
+            <!-- TMPL_ELSE -->
+                <option value="07">07- ISO 10586
+    (caracteres grégoriens)</option>
+            <!-- /TMPL_IF -->
+
+             <!-- TMPL_IF name="f1208" -->
+                <option value="08" SELECTED>08- ISO 8957
+    (caracteres hébreux) table 1</option>
+            <!-- TMPL_ELSE -->
+                <option value="08">08- ISO 8957
+    (caracteres hébreux table 1</option>
+            <!-- /TMPL_IF -->
+
+             <!-- TMPL_IF name="f1209" -->
+                <option value="09" SELECTED>09- ISO 8957
+    (caracteres hébreux) table 2</option>
+            <!-- TMPL_ELSE -->
+                <option value="09">09- ISO 8957
+    (caracteres hébreux table 2</option>
+            <!-- /TMPL_IF -->
+            
+             <!-- TMPL_IF name="f1211 -->
+                <option value="11"  SELECTED>11- ISO 5426-2
+    (caractères latins utilisés dans des langues européennes mineures ou une typographie ancienne)</option>
+            <!-- TMPL_ELSE -->
+                <option value="11">11- ISO 6438
+    (caracteres africains codes)</option>
+            <!-- /TMPL_IF -->
+            
             <!-- TMPL_IF name="f1250" -->
-                <option value="50" SELECTED>ISO 10646
+                <option value="50" SELECTED>50- ISO 10646
                     (UNICODE)
                 </option>
             <!-- TMPL_ELSE -->
-                <option value="50">ISO 10646
+                <option value="50">50- ISO 10646
                     (UNICODE)
                 </option>
             <!-- /TMPL_IF -->
             </select>
         </td>
 
-        
     </tr>
     <tr>
     <td>Jeux de caracteres (obligatoire) 2</td>
         <td>
             <select name="f13" size="1">
+            
             <!-- TMPL_IF name="f13  " -->
-                                <option value="  " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value="  ">None</option>
-                        <!-- /TMPL_IF -->
+                    <option value="  " SELECTED>valeur non requise</option>
+            <!-- TMPL_ELSE -->
+                    <option value="  ">valeur non requise</option>
+            <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f1301" -->
-                <option value="01" SELECTED>ISO 646,
+                <option value="01" SELECTED>01- ISO 646,
     version IRV (caracteres latins de base)</option>
             <!-- TMPL_ELSE -->
                 <option value="01">ISO 646,
     version IRV (caracteres latins de base)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1302" -->
-                <option value="02" SELECTED>Registre
+                <option value="02" SELECTED>02- Registre
     ISO #37 (caracteres cyrilliques de base)</option>
             <!-- TMPL_ELSE -->
-                <option value="02">Registre
+                <option value="02">02- Registre
     ISO #37 (caracteres cyrilliques de base)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1303" -->
                 <option value="03"
-        SELECTED>ISO 5426 (jeu de caractere latin etendu)</option>
+        SELECTED>03- ISO 5426 (jeu de caractere latin etendu)</option>
             <!-- TMPL_ELSE -->
-                <option value="03">ISO 5426 (jeu de caractere latin etendu)</option>
+                <option value="03">03- ISO 5426 (jeu de caractere latin etendu)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1304" -->
-                <option value="04" SELECTED>ISO DIS
+                <option value="04" SELECTED>04- ISO DIS
     5427 (jeu de caracteres cyrilliques etendu)</option>
             <!-- TMPL_ELSE -->
-                <option value="04">ISO DIS
+                <option value="04">04- ISO DIS
     5427 (jeu de caracteres cyrilliques etendu)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1305" -->
-                <option value="05" SELECTED>ISO  5428
+                <option value="05" SELECTED>05- ISO  5428
     (caracteres grecs)</option>
             <!-- TMPL_ELSE -->
-                <option value="05">ISO  5428
+                <option value="05">05- ISO  5428
     (caracteres grecs)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1306" -->
-                <option value="06" SELECTED>ISO 6438
+                <option value="06" SELECTED>06- ISO 6438
     (caracteres africains codes)</option>
             <!-- TMPL_ELSE -->
-                <option value="06">ISO 6438
+                <option value="06">06- ISO 6438
     (caracteres africains codes)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1250" -->
-                <option value="50" SELECTED>ISO 10646
+                <option value="50" SELECTED>50- ISO 10646
                     (UNICODE)
                 </option>
             <!-- TMPL_ELSE -->
-                <option value="50">ISO 10646
+                <option value="50">50- ISO 10646
                     (UNICODE)
                 </option>
             <!-- /TMPL_IF -->
             </select>
         </td>
-
-        
     </tr>
 
     <tr>
-    <td>Jeu de caracteres additionnels</td>
-    <td><input type="text" name="f14" maxlength=4 size=5
-        value="<!-- TMPL_VAR name="f14" -->"></td>
-        
+        <td>Jeu de caracteres additionnels</td>
+        <td>
+            <input type="text" name="f14" maxlength=4 size=5 value="<!-- TMPL_VAR name="f14" -->">
+        </td>
     </tr>
 
     <tr>
     <td>Alphabet du titre</td>
     <td>
     <select name="f15" size="1">
-       <!-- TMPL_IF name="f15  " -->
-                                <option value="  " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value="  ">None</option>
-                        <!-- /TMPL_IF -->
-
-    <!-- TMPL_IF name="f15ba" -->
-                <option value="ba" SELECTED>Latin</option>
+            <!-- TMPL_IF name="f15 " -->
+                    <option value=" " SELECTED>Valeur non requise</option>
             <!-- TMPL_ELSE -->
-                <option value="ba">Latin</option>
+                    <option value=" ">valeur non requise</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF name="f15ba" -->
+                <option value="ba" SELECTED>ba- Latin</option>
+            <!-- TMPL_ELSE -->
+                <option value="ba">ba- Latin</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f15ca" -->
-                <option value="ca" SELECTED>Cyrillique</option>
+                <option value="ca" SELECTED>ca- Cyrillique</option>
             <!-- TMPL_ELSE -->
-                <option value="ca">Cyrillique</option>
+                <option value="ca">ca- Cyrillique</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f15da" -->
-                <option value="da" SELECTED>Japonais -
+                <option value="da" SELECTED>da- Japonais -
                 alphabet non precise</option>
             <!-- TMPL_ELSE -->
-                <option value="da">Japonais non precise</option>
+                <option value="da">da- Japonais non precise</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f15db" -->
-                <option value="db" SELECTED>Japonais -
+                <option value="db" SELECTED>db- Japonais -
                 Kanji</option>
             <!-- TMPL_ELSE -->
-                <option value="db">Japonais - Kanji</option>
+                <option value="db">db- Japonais - Kanji</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f15dc" -->
-                <option value="dc" SELECTED>Japonais -
+                <option value="dc" SELECTED>dc- Japonais -
                 Kana</option>
             <!-- TMPL_ELSE -->
-                <option value="dc">Japonais - Kana</option>
+                <option value="dc">dc- Japonais - Kana</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f15ea" -->
-                <option value="ea" SELECTED>Chinois</option>
+                <option value="ea" SELECTED>ea- Chinois</option>
             <!-- TMPL_ELSE -->
-                <option value="ea">Chinois</option>
+                <option value="ea">ea- Chinois</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f15fa" -->
-                <option value="fa" SELECTED>Arabe</option>
+                <option value="fa" SELECTED>fa- Arabe</option>
             <!-- TMPL_ELSE -->
-                <option value="fa">Arabe</option>
+                <option value="fa">fa- Arabe</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f15ga" -->
-                <option value="ga" SELECTED>Grec</option>
+                <option value="ga" SELECTED>ga- Grec</option>
             <!-- TMPL_ELSE -->
-                <option value="ga">Grec</option>
+                <option value="ga">ga- Grec</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f15ha" -->
-                <option value="ha" SELECTED>Hebreu</option>
+                <option value="ha" SELECTED>ha- Hebreu</option>
             <!-- TMPL_ELSE -->
-                <option value="ha">Hebreu</option>
+                <option value="ha">ha- Hebreu</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f15ia" -->
-                <option value="ia" SELECTED>Thai</option>
+                <option value="ia" SELECTED>ia- Thai</option>
             <!-- TMPL_ELSE -->
-                <option value="ia">Thai</option>
+                <option value="ia">ia- Thai</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f15ja" -->
-                <option value="ja" SELECTED>Devanagari</option>
+                <option value="ja" SELECTED>ja- Devanagari</option>
             <!-- TMPL_ELSE -->
-                <option value="ja">Devanagari</option>
+                <option value="ja">ja- Devanagari</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f15ka" -->
-                <option value="ka" SELECTED>Coreen</option>
+                <option value="ka" SELECTED>ka- Coreen</option>
             <!-- TMPL_ELSE -->
-                <option value="ka">Coreen</option>
+                <option value="ka">ka- Coreen</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f15la" -->
-                <option value="la" SELECTED>Tamil</option>
+                <option value="la" SELECTED>la- Tamoul</option>
             <!-- TMPL_ELSE -->
-                <option value="la">Tamil</option>
+                <option value="la">la- Tamoul</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f15zz" -->
-                <option value="zz" SELECTED>autres</option>
+                <option value="zz" SELECTED>zz- autres</option>
+            <!-- TMPL_ELSE -->
+                <option value="zz">zz- autres</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF name="f15ma" -->
+                <option value="ma" SELECTED>ma- grégorien</option>
             <!-- TMPL_ELSE -->
-                <option value="zz">autres</option>
+                <option value="ma">ma- grégorien</option>
             <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF name="f15mb" -->
+                <option value="mb" SELECTED>mb- arménien</option>
+            <!-- TMPL_ELSE -->
+                <option value="mb">mb- arménien</option>
+            <!-- /TMPL_IF -->                        
             </select>
-
-
     </td>
-        
     </tr>
     
     <tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
@@ -693,13 +711,6 @@
 </form>
 <script type="text/javascript" language="javascript">
 
-   /********************
-    * Global variables *
-    ********************/
-    var doc             = opener.document; 
-    var fields          = doc.f.field_value;
-    var NbFields        = fields.length;
-
 //     GetPublicationDate(); // running directly.
 // 
 //     /**
@@ -738,7 +749,9 @@
 //     }
     
     function report() {
-
+        var doc   = opener.document;
+        var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        
         document.f_pop.f1.value=document.f_pop.f1.value+'        ';
         document.f_pop.f3.value=document.f_pop.f3.value+'    ';
         document.f_pop.f4.value=document.f_pop.f4.value+'    ';
@@ -751,8 +764,7 @@
         document.f_pop.f10.value=document.f_pop.f10.value.substring(0,3);
         document.f_pop.f14.value=document.f_pop.f14.value.substring(0,4);
 
-        doc.f.field_value[<!-- TMPL_VAR
-        name="index" -->].value= document.f_pop.f1.value +
+        field.value= document.f_pop.f1.value +
         document.f_pop.f2.value +document.f_pop.f3.value
         +document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value+document.f_pop.f12.value+document.f_pop.f13.value+document.f_pop.f14.value+document.f_pop.f15.value;
         
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_105.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_105.tmpl
index b0bfb700fe..2450570086 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_105.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_105.tmpl
@@ -13,10 +13,16 @@
 		<td>Illustration 1:</td>
 		<td>
 			<select name="f1" size="1">
+			<!-- TMPL_IF name="f1|" -->
+            	           <option value="|" SELECTED>|- Caractère de remplissage</option>
+                        <!-- TMPL_ELSE -->
+            	           <option value="|">|- Caractère de remplissage</option>
+                        <!-- /TMPL_IF -->
+            
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -38,16 +44,13 @@
 			<!-- TMPL_ELSE -->
 				<option value="d">cartes marines</option>
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f1e" -->
 				<option value="e" SELECTED>plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">plans</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>plans</option>
-			<!-- TMPL_ELSE -->
-				<option value="e">plans</option>
-			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f1f" -->
 				<option value="f" SELECTED>Planches</option>
 			<!-- TMPL_ELSE -->
@@ -109,10 +112,16 @@
 		<td>Illustration 2:</td>
 		<td>
 			<select name="f2" size="1">
+			<!-- TMPL_IF name="f2|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                        <!-- TMPL_ELSE -->
+                            <option value="|">|- Caractère de remplissage</option>
+                        <!-- /TMPL_IF -->
+            
 			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -205,10 +214,16 @@
 		<td>Illustration 3:</td>
 		<td>
 			<select name="f3" size="1">
+			<!-- TMPL_IF name="f3|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                        <!-- TMPL_ELSE -->
+                            <option value="|">|- Caractère de remplissage</option>
+                        <!-- /TMPL_IF -->
+            
 			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -301,10 +316,16 @@
 		<td>Illustration 4:</td>
 		<td>
 			<select name="f4" size="1">
+			<!-- TMPL_IF name="f4|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
+            
 			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -398,10 +419,16 @@
 	<tr>		<td>Type d'ouvrage de reference 1:</td>
 		<td>
 			<select name="f5" size="1">
+                        <!-- TMPL_IF name="f5|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                        <!-- TMPL_ELSE -->
+                            <option value="|">|- Caractère de remplissage</option>
+                        <!-- /TMPL_IF -->
+            
 			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
 				<option value="a" SELECTED>Bibliographie</option>
@@ -478,32 +505,18 @@
 				<option value="n">Lois et decrets</option>
 			<!-- /TMPL_IF -->
 
-
-
-
 			<!-- TMPL_IF name="f5o" -->
 				<option value="o" SELECTED>Table numerique</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">Table numerique</option>
 			<!-- /TMPL_IF -->
 
-
-
-
-
-
-
 			<!-- TMPL_IF name="f5p" -->
 				<option value="p" SELECTED>Rapport technique</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">Rapport techique</option>
 			<!-- /TMPL_IF -->
 
-
-
-
-
-
 			<!-- TMPL_IF name="f5q" -->
 				<option value="q" SELECTED>Sujet d'examen</option>
 			<!-- TMPL_ELSE -->
@@ -519,10 +532,17 @@
 			<!-- TMPL_ELSE -->
 				<option value="s">Traite</option>
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f5t" -->
-				<option value="t" SELECTED>Bande dessinee</option>
+				<option value="t" SELECTED>Bande déssinée</option>
 			<!-- TMPL_ELSE -->
-				<option value="t">Bande dessinee</option>
+				<option value="t">Bande déssinée</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f5v" -->
+				<option value="v" SELECTED>Mémoires ou thèses reproduits</option>
+			<!-- TMPL_ELSE -->
+				<option value="v">Mémoires ou thèses reproduits</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5z" -->
@@ -531,13 +551,20 @@
 				<option value="z">Autres</option>
 			<!-- /TMPL_IF -->
 			</select>
-		</td>		<td>Type d'ouvrage de reference 2:</td>
+		</td>
+		<td>Type d'ouvrage de reference 2:</td>
 		<td>
 			<select name="f6" size="1">
-	<!-- TMPL_IF name="f6 " -->
-										<option value=" " SELECTED>None</option>
+			<!-- TMPL_IF name="f6|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                        <!-- TMPL_ELSE -->
+                            <option value="|">|- Caractère de remplissage</option>
+                        <!-- /TMPL_IF -->
+            
+			<!-- TMPL_IF name="f6 " -->
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6a" -->
@@ -615,32 +642,18 @@
 				<option value="n">Lois et decrets</option>
 			<!-- /TMPL_IF -->
 
-
-
-
 			<!-- TMPL_IF name="f6o" -->
 				<option value="o" SELECTED>Table numerique</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">Table numerique</option>
 			<!-- /TMPL_IF -->
 
-
-
-
-
-
-
 			<!-- TMPL_IF name="f6p" -->
 				<option value="p" SELECTED>Rapport technique</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">Rapport techique</option>
 			<!-- /TMPL_IF -->
 
-
-
-
-
-
 			<!-- TMPL_IF name="f6q" -->
 				<option value="q" SELECTED>Sujet d'examen</option>
 			<!-- TMPL_ELSE -->
@@ -671,10 +684,16 @@
 		</td></tr><tr>		<td>Type d'ouvrage de reference 3:</td>
 		<td>
 			<select name="f7" size="1">
+			<!-- TMPL_IF name="f7|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                        <!-- TMPL_ELSE -->
+                            <option value="|">|- Caractère de remplissage</option>
+                        <!-- /TMPL_IF -->
+            
 			<!-- TMPL_IF name="f7 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7a" -->
 				<option value="a" SELECTED>Bibliographie</option>
@@ -751,32 +770,18 @@
 				<option value="n">Lois et decrets</option>
 			<!-- /TMPL_IF -->
 
-
-
-
 			<!-- TMPL_IF name="f7o" -->
 				<option value="o" SELECTED>Table numerique</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">Table numerique</option>
 			<!-- /TMPL_IF -->
 
-
-
-
-
-
-
 			<!-- TMPL_IF name="f7p" -->
 				<option value="p" SELECTED>Rapport technique</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">Rapport techique</option>
 			<!-- /TMPL_IF -->
 
-
-
-
-
-
 			<!-- TMPL_IF name="f7q" -->
 				<option value="q" SELECTED>Sujet d'examen</option>
 			<!-- TMPL_ELSE -->
@@ -804,14 +809,22 @@
 				<option value="z">Autres</option>
 			<!-- /TMPL_IF -->
 			</select>
-		</td>		<td>Type d'ouvrage de reference 4:</td>
+		</td>
+                  <td>Type d'ouvrage de reference 4:</td>
 		<td>
 			<select name="f8" size="1">
-			<!-- TMPL_IF name="f8 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f8|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                        <!-- TMPL_ELSE -->
+                            <option value="|">|- Caractère de remplissage</option>
+                        <!-- /TMPL_IF -->
+                        
+                        <!-- TMPL_IF name="f8 " -->
+                            <option value=" " SELECTED>valeur non requise</option>
+                        <!-- TMPL_ELSE -->
+                            <option value=" ">valeur non requise</option>
+                        <!-- /TMPL_IF -->
+                        
 			<!-- TMPL_IF name="f8a" -->
 				<option value="a" SELECTED>Bibliographie</option>
 			<!-- TMPL_ELSE -->
@@ -887,32 +900,18 @@
 				<option value="n">Lois et decrets</option>
 			<!-- /TMPL_IF -->
 
-
-
-
 			<!-- TMPL_IF name="f8o" -->
 				<option value="o" SELECTED>Table numerique</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">Table numerique</option>
 			<!-- /TMPL_IF -->
 
-
-
-
-
-
-
 			<!-- TMPL_IF name="f8p" -->
 				<option value="p" SELECTED>Rapport technique</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">Rapport techique</option>
 			<!-- /TMPL_IF -->
 
-
-
-
-
-
 			<!-- TMPL_IF name="f8q" -->
 				<option value="q" SELECTED>Sujet d'examen</option>
 			<!-- TMPL_ELSE -->
@@ -945,111 +944,84 @@
   <tr>
         <td>Colloque ou congres:</td>
                 <td>
-                        <select name="f9" size="1">
-	                        <!-- TMPL_IF name="f9 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
-
-                        <!-- TMPL_IF name="f90" -->
-                                <option value="0"
-				SELECTED>Le document n'est pas un
-				colloque ou un congres</optio\
-n>
-                        <!-- TMPL_ELSE -->
-                                <option
-				value="0">Le document n'est pas un
-				colloque ou un congres</option>
-                        <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="f91" -->
-                                <option value="1"
-				SELECTED>Le document est un colloque
-				ou un congres</option>
-                        <!-- TMPL_ELSE -->
-                                <option value="1">Le document est un
-				colloque ou un congres</option>
-                        <!-- /TMPL_IF -->
-
+                <select name="f9" size="1">
+               	<!-- TMPL_IF name="f1|" -->
+            		<option value="|" SELECTED>|- Caractère de remplissage</option>
+	            <!-- TMPL_ELSE -->
+    	        	<option value="|">|- Caractère de remplissage</option>
+        	    <!-- /TMPL_IF -->
+        	    
+	            <!-- TMPL_IF name="f90" -->
+    	            <option value="0" SELECTED>0- Le document n'est pas un colloque ou un congres</option>
+        	    <!-- TMPL_ELSE -->
+                    <option value="0">0- Le document n'est pas un colloque ou un congres</option>
+                <!-- /TMPL_IF -->
+                
+                <!-- TMPL_IF name="f91" -->
+                    <option value="1" SELECTED>1- Le document est un colloque	ou un congres</option>
+                <!-- TMPL_ELSE -->
+                    <option value="1">1- Le document est un colloque ou un congres</option>
+                <!-- /TMPL_IF -->
         </tr>
-  <tr>
+        
+	    <tr>
+	    
         <td>Melanges</td>
                 <td>
-                        <select name="f10" size="1">
-                        <!-- TMPL_IF name="f10 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="f100" -->
-                                <option value="0"
-				SELECTED>Document pas constitue de melanges</optio\
-n>
-                        <!-- TMPL_ELSE -->
-                                <option
-				value="0">Document pas constitue de melanges</option>
-                        <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="f101" -->
-                                <option value="1"
-				SELECTED>Le document est constitue de melanges</option>
-                        <!-- TMPL_ELSE -->
-                                <option value="1">Le document est
-  constitue de melanges</option>
-                        <!-- /TMPL_IF -->
-
+                <select name="f10" size="1">
+                <!-- TMPL_IF name="f10|" -->
+                    <option value="|" SELECTED>|- Caractère de remplissage</option>
+                <!-- TMPL_ELSE -->
+                    <option value="|">|- Caractère de remplissage</option>
+                <!-- /TMPL_IF -->
+                        
+                <!-- TMPL_IF name="f100" -->
+                        <option value="0" SELECTED>Document pas constitue de melanges</option>
+                <!-- TMPL_ELSE -->
+                        <option	value="0">Document pas constitue de melanges</option>
+                <!-- /TMPL_IF -->
+                
+                <!-- TMPL_IF name="f101" -->
+                        <option value="1" SELECTED>Le document est constitue de melanges</option>
+                <!-- TMPL_ELSE -->
+                        <option value="1">Le document est constitue de melanges</option>
+                <!-- /TMPL_IF -->
         </tr>
-
-
   <tr>
         <td>Index</td>
                 <td>
                         <select name="f11" size="1">
-                        <!-- TMPL_IF name="f11 " -->
-                                <option value=" " SELECTED>None</option>
+                        <!-- TMPL_IF name="f11|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
+                            <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
-
+                        
                         <!-- TMPL_IF name="f110" -->
-                                <option value="0"
-				SELECTED>Document qui ne contient pas d'index</optio\
-n>
+                                <option value="0"SELECTED>Document qui ne contient pas d'index</option>
                         <!-- TMPL_ELSE -->
-                                <option
-				value="0">Document qui ne contient pas
-        d'index</option>
+                                <option	value="0">Document qui ne contient pas d'index</option>
                         <!-- /TMPL_IF -->
+                        
                         <!-- TMPL_IF name="f111" -->
-                                <option value="1"
-				SELECTED>Le document contient un index</option>
+                                <option value="1" SELECTED>Le document contient un index</option>
                         <!-- TMPL_ELSE -->
-                                <option value="1">Le document contient
-        un index</option>
+                                <option value="1">Le document contient un index</option>
                         <!-- /TMPL_IF -->
-
         </tr>
-
-
-
-
-
-
   <tr>
         <td>Genre litteraire</td>
                 <td>
                         <select name="f12" size="1">
-                        <!-- TMPL_IF name="f12 " -->
-                                <option value=" " SELECTED>None</option>
+                        <!-- TMPL_IF name="f12|" -->
+                        <option value="|" SELECTED>|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
+                            <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
-
                         <!-- TMPL_IF name="f12a" -->
-                                <option value="a"
-				SELECTED>fiction, roman</option>
+                                <option value="a" SELECTED>fiction, roman</option>
                         <!-- TMPL_ELSE -->
-                                <option
-				value="a">fiction, roman</option>
+                                <option	value="a">fiction, roman</option>
                         <!-- /TMPL_IF -->
 
                         <!-- TMPL_IF name="f12b" -->
@@ -1100,20 +1072,19 @@ n>
                        <option value="z">formes variees ou
                        autres formes litteraires</option>
                         <!-- /TMPL_IF -->
-			
-
         </tr>
 
   <tr>
         <td>Biographie</td>
                 <td>
-
                         <select name="f13" size="1">
-                        <!-- TMPL_IF name="f13 " -->
-                                <option value=" " SELECTED>None</option>
+                        
+                        <!-- TMPL_IF name="f13|" -->
+                        <option value="|" SELECTED>|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
+                            <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
+                        
                         <!-- TMPL_IF name="f13y" -->
                                 <option value="y"
 				SELECTED>C'est pas une biographie</option>
@@ -1149,23 +1120,19 @@ n>
                                 <option value="d">Contient des
                                 informations biographiques</option>
                         <!-- /TMPL_IF -->
-
-
-
-
         </tr>
 
-
-
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value +document.f_pop.f8.value +document.f_pop.f9.value +document.f_pop.f10.value +document.f_pop.f11.value +document.f_pop.f12.value +document.f_pop.f13.value;
-		self.close();
-		return false;
+            var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        
+            field.value = document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value +document.f_pop.f8.value +document.f_pop.f9.value +document.f_pop.f10.value +document.f_pop.f11.value +document.f_pop.f12.value +document.f_pop.f13.value;
+            window.close();
+            return false;
 	}
 </script>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_106.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_106.tmpl
index 0895dbacc5..fd6ab0547a 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_106.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_106.tmpl
@@ -13,12 +13,7 @@
 		<td>Texte presentation physique</td>
 		<td>
 			<select name="f1" size="1">
-	                        <!-- TMPL_IF name="f1 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
-
+            
 			<!-- TMPL_IF name="f1r" -->
 				<option value="r" SELECTED>Impression normale</option>
 			<!-- TMPL_ELSE -->
@@ -34,10 +29,8 @@
 				<option value="e" SELECTED>Journal</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Journal</option>
-	
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f1f" -->
 				<option value="f" SELECTED>Caractere braille et moon</option>
 			<!-- TMPL_ELSE -->
@@ -83,11 +76,12 @@
 </form>
 <script>
 	function report() {
-
-		opener.document.f.field_value[<!-- TMPL_VAR
-		name="index" -->].value= document.f_pop.f1.value;
-		self.close();
-		return false;
+        var doc   = opener.document; 
+        var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+    
+        field.value = document.f_pop.f1.value;
+        self.close();
+        return false;
 	}
 </script>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_110.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_110.tmpl
index 9d913e2f66..d8df360154 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_110.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_110.tmpl
@@ -4,7 +4,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 106 builder</title>
+<title>UNIMARC_Field 110 builder</title>
 </head>
 <body>
 <form name="f_pop">
@@ -13,12 +13,12 @@
 		<td>Type de publication en serie</td>
 		<td>
 			<select name="f1" size="1">
-                        <!-- TMPL_IF name="f1 " -->
-                                <option value=" " SELECTED>None</option>
+			<!-- TMPL_IF name="f1|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
+                            <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
-
+            
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Periodique</option>
 			<!-- TMPL_ELSE -->
@@ -33,32 +33,27 @@
 				<option value="c" SELECTED>Journal</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">Journal</option>
-	
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f1z" -->
 				<option value="z" SELECTED>autres</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">autres</option>
-
 			<!-- /TMPL_IF -->
 				</select>
 		</td>
 	</tr>
 
-
-
 	<tr>
 		<td>Periodicite</td>
 		<td>
 			<select name="f2" size="1">
-                        <!-- TMPL_IF name="f2 " -->
-                                <option value=" " SELECTED>None</option>
+			<!-- TMPL_IF name="f2|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
+                            <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
-
+            
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Quotidien</option>
 			<!-- TMPL_ELSE -->
@@ -73,134 +68,106 @@
 				<option value="c" SELECTED>Hebdomadaire</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">Hebdomadaire</option>
-	
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f2d" -->
 				<option value="d" SELECTED>Toutes les deux semaines</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">Toutes les deux semaines</option>
-
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f2e" -->
 				<option value="e" SELECTED>Deux fois par mois</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Deux fois par mois</option>
-
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f2f" -->
 				<option value="f" SELECTED>Mensuel</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Mensuel</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f2g" -->
 				<option value="g" SELECTED>Bimestriel</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Bimestriel</option>
-
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f2h" -->
 				<option value="h" SELECTED>Trimestriel</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">Trimestriel</option>
-
 			<!-- /TMPL_IF -->
 
-
  			<!-- TMPL_IF name="f2i" -->
 				<option value="i" SELECTED>Trois fois par an</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">Trois fois par an</option>
-
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f2j" -->
 				<option value="j" SELECTED>Semestriel</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Semestriel</option>
-
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2k" -->
 				<option value="k" SELECTED>Annuel</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">Annuel</option>
-
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2l" -->
 				<option value="l" SELECTED>Bisanuel</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">Bisanuel</option>
-
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2m" -->
 				<option value="m" SELECTED>Triennal</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">Triennal</option>
-
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2n" -->
 				<option value="n" SELECTED>Trois fois par semaine</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">Trois fois par semaine</option>
-
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2o" -->
 				<option value="o" SELECTED>Trois fois par mois</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">Trois fois par mois</option>
-
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2u" -->
 				<option value="u" SELECTED>Inconnue</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">Inconnue</option>
-
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2y" -->
 				<option value="y" SELECTED>Sans periodicite</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">Sans periodicite</option>
-
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2i" -->
 				<option value="i" SELECTED>Autre</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">Autre</option>
-
 			<!-- /TMPL_IF -->
-
-
 				</select>
 		</td>
 	</tr>
-
-
 	<tr>
 		<td>Regularite</td>
 		<td>
 			<select name="f3" size="1">
-                        <!-- TMPL_IF name="f3 " -->
-                                <option value=" " SELECTED>None</option>
+			<!-- TMPL_IF name="f3|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
+                            <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
-
+            
 			<!-- TMPL_IF name="f3u" -->
 				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">Inconnu</option>
-	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3a" -->
@@ -219,22 +186,26 @@
 				<option value="y" SELECTED>Irregulier</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">Irregulier</option>
-
 			<!-- /TMPL_IF -->
 				</select>
 		</td>
 	</tr>
 
-
 	<tr>
 		<td>Type d'ouvrage de reference</td>
 		<td>
 			<select name="f4" size="1">
-	                        <!-- TMPL_IF name="f4 " -->
-                                <option value=" " SELECTED>None</option>
+			<!-- TMPL_IF name="f4|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
+                            <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
+            
+                    <!-- TMPL_IF name="f4 " -->
+                        <option value=" " SELECTED>valeur non requise</option>
+                        <!-- TMPL_ELSE -->
+                        <option value=" ">valeur non requise</option>
+                    <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>Bibliographie</option>
@@ -259,128 +230,96 @@
 				<option value="d" SELECTED>Resume ou extraits</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">Resume ou extraits</option>
-
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4e" -->
 				<option value="e" SELECTED>Dictionnaire</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Dictionnaire</option>
-
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f4f" -->
 				<option value="f" SELECTED>Encyclopedie</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Encyclopedie</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f4g" -->
 				<option value="g" SELECTED>Repertoire</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Repertoire</option>
-
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f4h" -->
 				<option value="h" SELECTED>Annuaire</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">Annuaire</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f4i" -->
 				<option value="i" SELECTED>Statistiques</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">Statistiques</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f4j" -->
 				<option value="j" SELECTED>Manuel d'enseignement programme</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Manuel d'enseignement programme</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f4k" -->
 				<option value="k" SELECTED>Revue critique</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">Revue critique</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f4l" -->
 				<option value="l" SELECTED>Journal officiel</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">Journal officiel</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f4m" -->
 				<option value="m" SELECTED>Jurisprudence</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">Jurisprudence</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f4n" -->
 				<option value="n" SELECTED>Article juridique</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">Article juridique</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f4o" -->
-				<option value="o" SELECTED>Affaire et note juridique</option>
+				<option value="o" SELECTED>Procès et compte rendu judiciaire</option>
 			<!-- TMPL_ELSE -->
-				<option value="o">Affaire et note juridique</option>
-
+				<option value="o">Procès et compte rendu judiciaire</option>
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f4p" -->
 				<option value="p" SELECTED>Biographie</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">Biographie</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f4r" -->
 				<option value="r" SELECTED>Synthese bibliographique</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">Synthese bibliographique</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f4t" -->
 				<option value="t" SELECTED>Dessin humoristique ou B.D.</option>
 			<!-- TMPL_ELSE -->
 				<option value="t">Dessin humoristique ou B.D.</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f4z" -->
 				<option value="z" SELECTED>Autre forme de contenu</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">Autre forme de contenu</option>
-
 			<!-- /TMPL_IF -->
 
 				</select>
@@ -389,20 +328,19 @@
         </tr>
    <tr>
                 <td>Nature du contenu</td>
-                <td><input type="text" name="f5" maxlength=3 size=4 value="<!--
- TMPL_VAR name="f5" -->"></td>
+                <td><input type="text" name="f5" maxlength=3 size=4 value="<!-- TMPL_VAR name="f5" -->"></td>
 
 	</tr>
 	<tr>
 		<td>Colloque ou congres</td>
 		<td>
 			<select name="f6" size="1">
-	                        <!-- TMPL_IF name="f6 " -->
-                                <option value=" " SELECTED>None</option>
+			<!-- TMPL_IF name="f6|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
+                            <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
-
+                        
 			<!-- TMPL_IF name="f60" -->
 				<option value="0" SELECTED>Il ne s'agit pas d'une publication de congres</option>
 			<!-- TMPL_ELSE -->
@@ -417,16 +355,15 @@
 		</td>
 	</tr>
 
-
-			<td>Existence d'un index</td>
+			<td>existence de la page de titre</td>
 		<td>
 			<select name="f7" size="1">
-	                        <!-- TMPL_IF name="f7 " -->
-                                <option value=" " SELECTED>None</option>
+			<!-- TMPL_IF name="f7|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
+                            <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
-x
+                        
 			<!-- TMPL_IF name="f7a" -->
 				<option value="a" SELECTED>Dans le dernier fascicule - volante</option>
 			<!-- TMPL_ELSE -->
@@ -460,8 +397,6 @@ x
 				<option value="e">Editee separement - gratuitement, sur commande</option>
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f7f" -->
 				<option value="f" SELECTED>Editee separement - gratuitement, envoi automatique</option>
 			<!-- TMPL_ELSE -->
@@ -507,12 +442,12 @@ x
 		<td>Existence d'un index</td>
 		<td>
 			<select name="f8" size="1">
-                        <!-- TMPL_IF name="f8 " -->
-                                <option value=" " SELECTED>None</option>
+			<!-- TMPL_IF name="f8|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
+                            <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
-
+            
 			<!-- TMPL_IF name="f8a" -->
 				<option value="a" SELECTED>Chaque fascicule contient son propre index - volant</option>
 			<!-- TMPL_ELSE -->
@@ -556,9 +491,9 @@ x
 				
 
 			<!-- TMPL_IF name="f8g" -->
-				<option value="g" SELECTED>Dans le dernier fascicule - relie</option>
+				<option value="g" SELECTED>dans le premier fascicule relié</option>
 			<!-- TMPL_ELSE -->
-				<option value="g">Dans le dernier fascicule - relie</option>
+				<option value="g">dans le premier fascicule relié/option>
 			<!-- /TMPL_IF -->
 				
 
@@ -637,12 +572,12 @@ x
 		<td>Existence d'un index cumulatif</td>
 		<td>
 			<select name="f9" size="1">
-	       <!-- TMPL_IF name="f9 " -->
-                                <option value=" " SELECTED>None</option>
+			<!-- TMPL_IF name="f9|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
+                            <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
-
+            
 			<!-- TMPL_IF name="f90" -->
 				<option value="0" SELECTED>Pas d'index cumulatif ou de table des matieres</option>
 			<!-- TMPL_ELSE -->
@@ -657,25 +592,19 @@ x
 		</td>
 	</tr>
 
-
-	
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
-	function report() {
-document.f_pop.f5.value=document.f_pop.f5.value+'   ';
-
-
-
-document.f_pop.f5.value=document.f_pop.f5.value.substring(0,3);
-
-
-		opener.document.f.field_value[<!-- TMPL_VAR
-		name="index" -->].value= document.f_pop.f1.value +document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value;
-		self.close();
-		return false;
-	}
+<script type="text/javascript">
+    function report() {
+        document.f_pop.f5.value=document.f_pop.f5.value+'   ';
+        document.f_pop.f5.value=document.f_pop.f5.value.substring(0,3);
+        var doc   = opener.document; 
+        var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        field.value =  document.f_pop.f1.value +document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value;
+        self.close();
+        return false;
+    }
 </script>
 </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_115a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_115a.tmpl
index d419f2b5d7..de7fe31f68 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_115a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_115a.tmpl
@@ -13,11 +13,11 @@
 		<td>Type de document</td>
 		<td>
 			<select name="f1" size="1">
-   <!-- TMPL_IF name="f1 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Film</option>
@@ -42,8 +42,7 @@
 
    <tr>
                 <td>Longueur</td>
-                <td><input type="text" name="f2" maxlength=3 size=4 value="<!--
- TMPL_VAR name="f2" -->"></td>
+                <td><input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->"></td>
 
 	</tr>
 
@@ -52,11 +51,11 @@
 		<td>Couleur</td>
 		<td>
 	<select name="f3" size="1">
-   <!-- TMPL_IF name="f3 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3a" -->
 				<option value="a" SELECTED>Noir et blanc</option>
@@ -70,8 +69,6 @@
 				<option value="b">Couleur</option>
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f3c" -->
 				<option value="c" SELECTED>Combinaison de noir et blanc et de couleur</option>
 			<!-- TMPL_ELSE -->
@@ -79,8 +76,6 @@
 	
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f3u" -->
 				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
@@ -88,7 +83,6 @@
 	
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f3z" -->
 				<option value="z" SELECTED>Autre (sepia, colorie)</option>
 			<!-- TMPL_ELSE -->
@@ -96,23 +90,20 @@
 	
 			<!-- /TMPL_IF -->
 
-
 				</select>
 		</td>
 	</tr>
 
-
 	<tr>
 		<td>Son</td>
 		<td>
 			<select name="f4" size="1">
-   <!-- TMPL_IF name="f4 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
-
-			<!-- TMPL_IF name="f4a" -->
+			<!-- TMPL_IF name="f4|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
+                	<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>Son sur le document</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Son sur le document</option>
@@ -146,12 +137,11 @@
 		<td>Support son</td>
 		<td>
 			<select name="f5" size="1">
-   <!-- TMPL_IF name="f5 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
-
+			<!-- TMPL_IF name="f5|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
 				<option value="a" SELECTED>Piste son optique sur le film</option>
 			<!-- TMPL_ELSE -->
@@ -184,9 +174,7 @@
 				<option value="g">Piste son optique et magnetique sur le film</option>
 
 			<!-- /TMPL_IF -->
-
-
-
+			
 			<!-- TMPL_IF name="f5h" -->
 				<option value="h" SELECTED>Bande video</option>
 			<!-- TMPL_ELSE -->
@@ -194,7 +182,6 @@
 
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f5i" -->
 				<option value="i" SELECTED>Videodisque</option>
 			<!-- TMPL_ELSE -->
@@ -202,8 +189,6 @@
 
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f5u" -->
 				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
@@ -211,7 +196,6 @@
 
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f5e" -->
 				<option value="e" SELECTED>Bande magnetique audio en bobine</option>
 			<!-- TMPL_ELSE -->
@@ -219,7 +203,6 @@
 
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f5f" -->
 				<option value="f" SELECTED>Bande magnetique audio en cassette</option>
 			<!-- TMPL_ELSE -->
@@ -240,29 +223,22 @@
 			<!-- /TMPL_IF -->
 				</select>
 		</td>
-
         </tr>
 
-
-
-
-
-
 	<tr>
 		<td>Largeur ou dimension</td>
 		<td>
 			<select name="f6" size="1">
-   <!-- TMPL_IF name="f6 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6a" -->
 				<option value="a" SELECTED>Films et bandes de film => 8 mm</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Films et bandes de film => 8mm</option>
-	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6b" -->
@@ -281,160 +257,122 @@
 				<option value="d" SELECTED>Films et bandes de film => 16 mm</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">Films et bandes de film => 16 mm</option>
-
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6e" -->
 				<option value="e" SELECTED>Films et bandes de film => 28 mm</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Films et bandes de film => 28 mm</option>
-
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f6f" -->
 				<option value="f" SELECTED>Films et bandes de film => 35 mm</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Films et bandes de film => 35 mm</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f6g" -->
 				<option value="g" SELECTED>Films et bandes de film => 70 mm</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Films et bandes de film => 70 mm</option>
-
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f6k" -->
 				<option value="k" SELECTED>Diapositives (5.5*5.5 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">Diapositives (5.5*5.5 cm)</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f6l" -->
 				<option value="l" SELECTED>Diapositives (5*5 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">Diapositives (5*5 cm)</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f6m" -->
 				<option value="m" SELECTED>Bandes video 3/4 de pouce (2 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">Bandes video 3/4 de pouce (2 cm)</option>
-
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f6n" -->
 				<option value="n" SELECTED>Bandes video 1/4 de pouce (1/2 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">Bandes video 1/4 de pouce (1/2 cm)</option>
-
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6o" -->
 				<option value="o" SELECTED>Bandes video 2 pouces (1 cm 1/3) </option>
 			<!-- TMPL_ELSE -->
 				<option value="o">Bandes video 2 pouces (1 cm 1/3)</option>
-
 			<!-- /TMPL_IF -->
 
-
-
-
 			<!-- TMPL_IF name="f6p" -->
 				<option value="p" SELECTED>Bandes video 1 pouce (2 cm 1/2)</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">Bandes video 1 pouce (2 cm 1/2)</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f6q" -->
 				<option value="q" SELECTED>Bandes video 2 pouces (5 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="q">Bandes video 2 pouces (5 cm)</option>
-
 			<!-- /TMPL_IF -->
 
-
-
-
 			<!-- TMPL_IF name="f6r" -->
 				<option value="r" SELECTED>Transparents 8 * 10 pouces (20 * 25 cm)</option>
 			<!-- TMPL_ELSE -->
-				<option value="r">Transparents 8 * 10 pouces (20 * 25 cm)
-</option>
-
+				<option value="r">Transparents 8 * 10 pouces (20 * 25 cm)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6s" -->
 				<option value="s" SELECTED>Transparents 4 * 5 pouces (10 * 12.5 cm)</option>
 			<!-- TMPL_ELSE -->
-				<option value="s">Transparents 4 * 5 pouces (10 * 12.5 cm)
-</option>
+				<option value="s">Transparents 4 * 5 pouces (10 * 12.5 cm)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6t" -->
 				<option value="t" SELECTED>Transparents 5 * 7 pouces (12.5 * 17.5 cm)</option>
 			<!-- TMPL_ELSE -->
-				<option value="t">Transparents 5 * 7 pouces (12.5 * 17.5 cm)
-</option>
+				<option value="t">Transparents 5 * 7 pouces (12.5 * 17.5 cm)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6u" -->
 				<option value="u" SELECTED>Transparents 7 * 7 pouces (17.5 * 17.5 cm)</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Transparents 7 * 7 pouces (17.5 * 17.5 cm)
-</option>
+				<option value="u">Transparents 7 * 7 pouces (17.5 * 17.5 cm)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6v" -->
 				<option value="v" SELECTED>Transparents 8 * 8 pouces (20 * 20 cm)</option>
 			<!-- TMPL_ELSE -->
-				<option value="v">Transparents 8 * 8 pouces (20 * 20 cm)
-</option>
+				<option value="v">Transparents 8 * 8 pouces (20 * 20 cm)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6w" -->
 				<option value="w" SELECTED>Transparents 9 * 9 pouces (22.5 * 22.5 cm)</option>
 			<!-- TMPL_ELSE -->
-				<option value="w">Transparents 8 * 10 pouces (20 * 25 cm)
-</option>
+				<option value="w">Transparents 8 * 10 pouces (20 * 25 cm)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6x" -->
 				<option value="x" SELECTED>Transparents 10 * 10 pouces (25 * 25 cm)</option>
 			<!-- TMPL_ELSE -->
-				<option value="x">Transparents 10 * 10 pouces (25 * 25 cm)
-</option>
-
+				<option value="x">Transparents 10 * 10 pouces (25 * 25 cm)</option>
 			<!-- /TMPL_IF -->
-
-
 				</select>
 		</td>
-
         </tr>
 
-
 	<tr>
 		<td>Presentation materielle</td>
 		<td>
 			<select name="f7" size="1">
-   <!-- TMPL_IF name="f7 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
-
+			<!-- TMPL_IF name="f7|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7a" -->
 				<option value="a" SELECTED>Film en bobine</option>
 			<!-- TMPL_ELSE -->
@@ -468,41 +406,30 @@
 
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f7h" -->
 				<option value="h" SELECTED>Film en courtes bandes</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">Films en courtes bandes</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f7i" -->
 				<option value="i" SELECTED>Autres types de films fixes</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">Autres types de films fixes</option>
-
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f7j" -->
 				<option value="j" SELECTED>Film fixe en rouleau</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Film fixe en rouleau</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f7k" -->
 				<option value="k" SELECTED>Diapositives, jeu de diapositives, vues stereoscopiques</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">Diapositives, jeu de diapositives, vues stereoscopiques</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f7l" -->
 				<option value="l" SELECTED>Transparents</option>
 			<!-- TMPL_ELSE -->
@@ -513,47 +440,37 @@
 				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">Inconnu</option>
-
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7x" -->
 				<option value="x" SELECTED>Ce n'est pas un film ou un document projetable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">Ce n'est pas un film ou un document projetable</option>
-
 			<!-- /TMPL_IF -->
 
-
-
-
 			<!-- TMPL_IF name="f7z" -->
 				<option value="z" SELECTED>Autres presentations materielles</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">Autres presentations materielles</option>
-
 			<!-- /TMPL_IF -->
-
 				</select>
 		</td>
-
         </tr>
 
-
 	<tr>
 		<td>Technique: video, film</td>
 		<td>
-			<select name="f8" size="1">
-   <!-- TMPL_IF name="f8 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
+		<select name="f8" size="1">
+			<!-- TMPL_IF name="f8|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8a" -->
 				<option value="a" SELECTED>Animation</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Animation</option>
-	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8b" -->
@@ -598,17 +515,16 @@
 		<td>Format du film</td>
 		<td>
 			<select name="f9" size="1">
-   <!-- TMPL_IF name="f9 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f9|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9a" -->
 				<option value="a" SELECTED>Format normalise avec son (format reduit)</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Format normalise avec son (format reduit)</option>
-	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9b" -->
@@ -627,58 +543,45 @@
 				<option value="d" SELECTED>Anamorphose (ecran panoramique)</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">Anamorphose (ecran panoramique)</option>
-
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9e" -->
 				<option value="e" SELECTED>Format normalise muet</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Format normalise muet</option>
-
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9f" -->
 				<option value="f" SELECTED>Autre format en grand ecran</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Autre format en grand ecran</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f9x" -->
 				<option value="x" SELECTED>Ce n'est pas un film</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">Ce n'es pas un film</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f9u" -->
 				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">Inconnu</option>
-
 			<!-- /TMPL_IF -->
 
 				</select>
 		</td>
-
         </tr>
 
-
-
-
-
-
 	<tr>
 		<td>Materiel d'accompagnement 1</td>
 		<td>
 			<select name="f10" size="1">
-   <!-- TMPL_IF name="f10 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f10|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10a" -->
 				<option value="a" SELECTED>Cliche tire du film</option>
@@ -720,15 +623,12 @@
 
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f10g" -->
 				<option value="g" SELECTED>Partition ou autre presentation de musique</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Partition ou autre presentation de musique</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f10h" -->
 				<option value="h" SELECTED>Esquisse ou projet de costumes</option>
 			<!-- TMPL_ELSE -->
@@ -739,7 +639,6 @@
 				<option value="z" SELECTED>Autres materiels d'accompagnement</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">Autres materiels d'accompagnement</option>
-
 			<!-- /TMPL_IF -->
 
 				</select>
@@ -747,17 +646,16 @@
 		<td>Materiel d'accompagnement 2</td>
 		<td>
 			<select name="f11" size="1">
-   <!-- TMPL_IF name="f11 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
-
+			<!-- TMPL_IF name="f11|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
+            
 			<!-- TMPL_IF name="f11a" -->
 				<option value="a" SELECTED>Cliche tire du film</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Cliche tire du film</option>
-	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11b" -->
@@ -776,7 +674,6 @@
 				<option value="d" SELECTED>Programme et pressbook</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">Programme et pressbook</option>
-
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11e" -->
@@ -790,18 +687,14 @@
 				<option value="f" SELECTED>Manuel d'instruction</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Manuel d'instruction</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f11g" -->
 				<option value="g" SELECTED>Partition ou autre presentation de musique</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Partition ou autre presentation de musique</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f11h" -->
 				<option value="h" SELECTED>Esquisse ou projet de costumes</option>
 			<!-- TMPL_ELSE -->
@@ -817,25 +710,22 @@
 
 				</select>
 		</td>
-
         </tr>
 
-
 	<tr>
 		<td>Materiel d'accompagnement 3</td>
 		<td>
 			<select name="f12" size="1">
-   <!-- TMPL_IF name="f12 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f12|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f12a" -->
 				<option value="a" SELECTED>Cliche tire du film</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Cliche tire du film</option>
-	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f12b" -->
@@ -868,18 +758,14 @@
 				<option value="f" SELECTED>Manuel d'instruction</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Manuel d'instruction</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f12g" -->
 				<option value="g" SELECTED>Partition ou autre presentation de musique</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Partition ou autre presentation de musique</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f12h" -->
 				<option value="h" SELECTED>Esquisse ou projet de costumes</option>
 			<!-- TMPL_ELSE -->
@@ -890,7 +776,6 @@
 				<option value="z" SELECTED>Autres materiels d'accompagnement</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">Autres materiels d'accompagnement</option>
-
 			<!-- /TMPL_IF -->
 
 				</select>
@@ -898,17 +783,16 @@
 		<td>Materiel d'accompagnement 4</td>
 		<td>
 			<select name="f13" size="1">
-   <!-- TMPL_IF name="f13 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f13|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f13a" -->
 				<option value="a" SELECTED>Cliche tire du film</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Cliche tire du film</option>
-	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f13b" -->
@@ -974,17 +858,16 @@
 <tr>		<td>Presentation materielle: video</td>
 		<td>
 			<select name="f14" size="1">
-   <!-- TMPL_IF name="f14 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f14|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f14a" -->
 				<option value="a" SELECTED>Cartouche video</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Cartouche video</option>
-	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f14b" -->
@@ -1003,7 +886,6 @@
 				<option value="d" SELECTED>bobine video</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">bobine video</option>
-
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f14e" -->
@@ -1017,15 +899,12 @@
 				<option value="x" SELECTED>Ce n'est pas une video</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">Ce n'est pas une video</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f14z" -->
 				<option value="z" SELECTED>Autre type de video</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">Autre type de video</option>
-
 			<!-- /TMPL_IF -->
 				</select>
 		</td>
@@ -1033,17 +912,16 @@
 <tr>		<td>Format : video</td>
 		<td>
 			<select name="f15" size="1">
-   <!-- TMPL_IF name="f15 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f15a" -->
 				<option value="a" SELECTED>Beta</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Beta</option>
-	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f15b" -->
@@ -1076,7 +954,6 @@
 				<option value="f" SELECTED>Quadruplex</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Quadruplex</option>
-
 			<!-- /TMPL_IF -->
 
 
@@ -1120,7 +997,6 @@
 				<option value="z" SELECTED>Autre</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">Autre</option>
-
 			<!-- /TMPL_IF -->
 				</select>
 		</td>
@@ -1128,18 +1004,17 @@
 <tr>		<td>Support de l'emulsion</td>
 		<td>
 			<select name="f16" size="1">
-      <!-- TMPL_IF name="f16 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
-
-			<!-- TMPL_IF name="f16a" -->
-				<option value="a" SELECTED>Film de securite</option>
-			<!-- TMPL_ELSE -->
-				<option value="a">Film de securite</option>
-	
-			<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f16|" -->
+            		<option value="|" SELECTED>|- Caractère de remplissage</option>
+	            <!-- TMPL_ELSE -->
+    	        	<option value="|">|- Caractère de remplissage</option>
+        	    <!-- /TMPL_IF -->
+
+				<!-- TMPL_IF name="f16a" -->
+					<option value="a" SELECTED>Film de securite</option>
+				<!-- TMPL_ELSE -->
+					<option value="a">Film de securite</option>
+				<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f16b" -->
 				<option value="b" SELECTED>Support film autre que film de securite</option>
@@ -1187,12 +1062,12 @@
 <tr>		<td>Support secondaire</td>
 		<td>
 			<select name="f17" size="1">
-			<!-- TMPL_IF name="f17 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-	
-			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f17|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f17a" -->
 				<option value="a" SELECTED>Carton</option>
 			<!-- TMPL_ELSE -->
@@ -1264,12 +1139,11 @@
 <tr>		<td>Normes de diffusion des enregistrements video</td>
 		<td>
 			<select name="f18" size="1">
-			<!-- TMPL_IF name="f18 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-	
-			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f18|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f18a" -->
 				<option value="a" SELECTED>405 lignes</option>
 			<!-- TMPL_ELSE -->
@@ -1309,13 +1183,15 @@
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-document.f_pop.f2.value=document.f_pop.f2.value+'   ';
-document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
+        document.f_pop.f2.value=document.f_pop.f2.value+'   ';
+        document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
 
-		opener.document.f.field_value[<!-- TMPL_VAR
-		name="index" -->].value= document.f_pop.f1.value +document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value+document.f_pop.f12.value+document.f_pop.f13.value+document.f_pop.f14.value+document.f_pop.f15.value+document.f_pop.f16.value+document.f_pop.f17.value+document.f_pop.f18.value;
+        var doc   = opener.document; 
+        var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        
+        field.value =  document.f_pop.f1.value +document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value+document.f_pop.f12.value+document.f_pop.f13.value+document.f_pop.f14.value+document.f_pop.f15.value+document.f_pop.f16.value+document.f_pop.f17.value+document.f_pop.f18.value;
 		self.close();
 		return false;
 	}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_115b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_115b.tmpl
index 274cfcd81e..cc8ddc09ea 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_115b.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_115b.tmpl
@@ -13,11 +13,11 @@
 		<td>Copie (generation)</td>
 		<td>
 			<select name="f1" size="1">
-   <!-- TMPL_IF name="f1 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Original</option>
 			<!-- TMPL_ELSE -->
@@ -66,11 +66,12 @@
 		<td>Elements de production (montage)</td>
 		<td>
 			<select name="f2" size="1">
-   <!-- TMPL_IF name="f2 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
+            
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Epreuve</option>
 			<!-- TMPL_ELSE -->
@@ -134,17 +135,15 @@
 		</td>
 	</tr>
 
-
-
 	<tr>
 		<td>Categories fines de couleurs (films)</td>
 		<td>
 	<select name="f3" size="1">
-   <!-- TMPL_IF name="f3 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f3|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3a" -->
 				<option value="a" SELECTED>Trois couches de pigment</option>
@@ -158,25 +157,18 @@
 				<option value="b">Deux couleurs, simple bande</option>
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f3c" -->
 				<option value="c" SELECTED>Indeterminee, 2 couleurs</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">Indeterminee, 2 couleurs</option>
-	
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f3d" -->
 				<option value="d" SELECTED>Indeterminee, 3 couleurs</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">Indeterminee, 3 couleurs</option>
-	
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f3e" -->
 				<option value="e" SELECTED>Trois bandes de couleur</option>
 			<!-- TMPL_ELSE -->
@@ -283,10 +275,7 @@
 				<option value="z" SELECTED>Autre</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">Autre</option>
-	
 			<!-- /TMPL_IF -->
-
-
 				</select>
 		</td>
 	</tr>
@@ -296,11 +285,12 @@
 		<td>Emulsion (polarite)</td>
 		<td>
 			<select name="f4" size="1">
-   <!-- TMPL_IF name="f4 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f4|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>Positif</option>
 			<!-- TMPL_ELSE -->
@@ -330,28 +320,24 @@
 				<option value="z" SELECTED>Autre</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">Autre</option>
-
 			<!-- /TMPL_IF -->
 				</select>
 		</td>
 	</tr>
 
-
 	<tr>
 		<td>Support de film</td>
 		<td>
 			<select name="f5" size="1">
-   <!-- TMPL_IF name="f5 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
-
+			<!-- TMPL_IF name="f5|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
 				<option value="a" SELECTED>Securite (triacetate)</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Securite (triacetate)</option>
-	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5b" -->
@@ -380,8 +366,6 @@
 
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f5x" -->
 				<option value="x" SELECTED>Support composite</option>
 			<!-- TMPL_ELSE -->
@@ -389,7 +373,6 @@
 
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f5z" -->
 				<option value="z" SELECTED>Autre</option>
 			<!-- TMPL_ELSE -->
@@ -398,23 +381,17 @@
 			<!-- /TMPL_IF -->
 				</select>
 		</td>
-
         </tr>
 
-
-
-
-
-
 	<tr>
 		<td>Type de sonorisation</td>
 		<td>
 			<select name="f6" size="1">
-   <!-- TMPL_IF name="f6 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6a" -->
 				<option value="a" SELECTED>Monaural</option>
@@ -449,8 +426,6 @@
 
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f6x" -->
 				<option value="x" SELECTED>Non applicable</option>
 			<!-- TMPL_ELSE -->
@@ -476,11 +451,11 @@
 		<td>Type de film ou d'epreuve (tirage)</td>
 		<td>
 			<select name="f7" size="1">
-   <!-- TMPL_IF name="f7 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7a" -->
 				<option value="a" SELECTED>Procede par imbibition</option>
@@ -515,8 +490,6 @@
 
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f7x" -->
 				<option value="x" SELECTED>Non applicable</option>
 			<!-- TMPL_ELSE -->
@@ -524,7 +497,6 @@
 
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f7z" -->
 				<option value="z" SELECTED>Autres</option>
 			<!-- TMPL_ELSE -->
@@ -536,16 +508,15 @@
 
         </tr>
 
-
 	<tr>
 		<td>Etat de la copie (deterioration)</td>
 		<td>
 			<select name="f8" size="1">
-   <!-- TMPL_IF name="f8 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8a" -->
 				<option value="a" SELECTED>Nitrate - odeur suspecte</option>
@@ -625,11 +596,11 @@
 		<td>Etat de la version (completude)</td>
 		<td>
 			<select name="f9" size="1">
-   <!-- TMPL_IF name="f9 " -->
-                                <option value=" " SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f9|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9a" -->
 				<option value="a" SELECTED>Incomplet</option>
@@ -658,13 +629,9 @@
 			<!-- /TMPL_IF -->
 				</select>
 		</td>
-
         </tr>
 
-
-
-
-   <tr>
+   		<tr>
                 <td>Date d'enregistrement</td>
                 <td>Annee <input type="text" name="f10" maxlength=4 size=5 value="<!-- TMPL_VAR name="f10" -->"></td>
                 <td>mois <input type="text" name="f11" maxlength=2 size=3 value="<!-- TMPL_VAR name="f11" -->"></td>
@@ -673,14 +640,16 @@
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-document.f_pop.f10.value=document.f_pop.f10.value+'    ';
-document.f_pop.f10.value=document.f_pop.f10.value.substring(0,4);
-document.f_pop.f11.value=document.f_pop.f11.value+'  ';
-document.f_pop.f11.value=document.f_pop.f11.value.substring(0,2);
-
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value +document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value;
+            document.f_pop.f10.value=document.f_pop.f10.value+'    ';
+            document.f_pop.f10.value=document.f_pop.f10.value.substring(0,4);
+            document.f_pop.f11.value=document.f_pop.f11.value+'  ';
+            document.f_pop.f11.value=document.f_pop.f11.value.substring(0,2);
+
+	    var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+            field.value =  document.f_pop.f1.value +document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value;
 		self.close();
 		return false;
 	}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_116.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_116.tmpl
index cd1b0ce97e..f9e0e0e33a 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_116.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_116.tmpl
@@ -13,67 +13,74 @@
 		<td>Presentation materielle</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                        <!-- TMPL_ELSE -->
+                            <option value="|">|- Caractère de remplissage</option>
+                        <!-- /TMPL_IF -->
+            
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>Collage</option>
+				<option value="a" SELECTED>a- Collage</option>
 			<!-- TMPL_ELSE -->
-				<option value="a">Collage</option>
+				<option value="a">a- Collage</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>Dessin</option>
+				<option value="b" SELECTED>b- Dessin</option>
 			<!-- TMPL_ELSE -->
-				<option value="b">Dessin</option>
+				<option value="b">b- Dessin</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>Peinture</option>
+				<option value="c" SELECTED>c- Peinture</option>
 			<!-- TMPL_ELSE -->
-				<option value="c">Peinture</option>
+				<option value="c">c- Peinture</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>Reproduction photomecanique</option>
+				<option value="d" SELECTED>d- Reproduction photomecanique</option>
 			<!-- TMPL_ELSE -->
-				<option value="d">Reproduction photomecanique</option>
+				<option value="d">d- Reproduction photomecanique</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>Negatif photo</option>
+				<option value="e" SELECTED>e- Negatif photo</option>
 			<!-- TMPL_ELSE -->
-				<option value="e">Negatif photo</option>
+				<option value="e">e- Negatif photo</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1f" -->
-				<option value="f" SELECTED>Tirage photographique</option>
+				<option value="f" SELECTED>f- Tirage photographique</option>
 			<!-- TMPL_ELSE -->
-				<option value="f">Tirage photographique</option>
+				<option value="f">f- Tirage photographique</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1h" -->
-				<option value="h" SELECTED>Image</option>
+				<option value="h" SELECTED>h- Image</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">Image</option>
+				<option value="h">h- Image</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1i" -->
-				<option value="i" SELECTED>Gravure</option>
+				<option value="i" SELECTED>i- Gravure</option>
 			<!-- TMPL_ELSE -->
-				<option value="i">Gravure</option>
-	
+				<option value="i">i- Gravure</option>
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f1k" -->
-				<option value="k" SELECTED>Dessin technique</option>
+				<option value="k" SELECTED>k- Dessin technique</option>
 			<!-- TMPL_ELSE -->
-				<option value="k">Dessin technique</option>
-	
+				<option value="k">k- Dessin technique</option>
 			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f1m" -->
+				<option value="m" SELECTED>m- Master</option>
+			<!-- TMPL_ELSE -->
+				<option value="m">m- Master/option>
+			<!-- /TMPL_IF -->			
+			
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>Autres types de document graphique non projetable</option>
+				<option value="z" SELECTED>z- Autres types de document graphique non projetable</option>
 			<!-- TMPL_ELSE -->
-				<option value="z">Autres types de documents graphique non projetable</option>
+				<option value="z">z- Autres types de documents graphique non projetable</option>
 	
 			<!-- /TMPL_IF -->
 
@@ -84,11 +91,12 @@
 		<td>Support primaire</td>
 		<td>
 			<select name="f2" size="1">
-			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                        <!-- TMPL_ELSE -->
+                            <option value="|">|- Caractère de remplissage</option>
+                        <!-- /TMPL_IF -->
+            
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Toile</option>
 			<!-- TMPL_ELSE -->
@@ -200,17 +208,12 @@
 		<td>Support secondaire</td>
 		<td>
 	<select name="f3" size="1">
-			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f3|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 
-			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>Default</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">Default</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3y" -->
 				<option value="y" SELECTED>Pas de support secondaire</option>
 			<!-- TMPL_ELSE -->
@@ -225,11 +228,11 @@
 		<td>Couleur:</td>
 		<td>
 			<select name="f4" size="1">
-			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f4|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>Une couleur, monochrome</option>
@@ -278,28 +281,29 @@
 				<option value="z" SELECTED>Autre</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">Autre</option>
-
 			<!-- /TMPL_IF -->
 				</select>
 		</td>
 	</tr>
 
-
 	<tr>
 		<td>Technique (dessins, peinture) 1</td>
 		<td>
 			<select name="f5" size="1">
-			<!-- TMPL_IF name="f5  " -->
-				<option value="  " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
-			<!-- /TMPL_IF -->
-
+			<!-- TMPL_IF name="f5|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                        <!-- TMPL_ELSE -->
+                            <option value="|">|- Caractère de remplissage</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f5  " -->
+                                <option value="  " SELECTED>valeur non requise</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="  ">valeur non requise</option>
+                        <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5aa" -->
 				<option value="aa" SELECTED>Crayon</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">Crayon</option>
-	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5ab" -->
@@ -318,23 +322,18 @@
 				<option value="ad" SELECTED>Encre de chine</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">Encre de chine</option>
-
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5ae" -->
 				<option value="ae" SELECTED>Lavis</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">Lavis</option>
-
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f5af" -->
 				<option value="af" SELECTED>Charbon</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">Charbon</option>
-
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5ag" -->
 				<option value="ag" SELECTED>Craie</option>
@@ -483,16 +482,20 @@
 
 				</select>
 		</td>
-
         </tr>
 	<tr>
 		<td>Technique (dessins, peinture) 2</td>
 		<td>
 			<select name="f6" size="1">
+			<!-- TMPL_IF name="f6|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6  " -->
-				<option value="  " SELECTED>None</option>
+				<option value="  " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
+				<option value="  ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6aa" -->
 				<option value="aa" SELECTED>Crayon</option>
@@ -527,8 +530,6 @@
 
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f6af" -->
 				<option value="af" SELECTED>Charbon</option>
 			<!-- TMPL_ELSE -->
@@ -682,16 +683,20 @@
 
 				</select>
 		</td>
-
         </tr>
 	<tr>
 		<td>Technique (dessins, peinture) 3</td>
 		<td>
 			<select name="f7" size="1">
+			<!-- TMPL_IF name="f7|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7  " -->
-				<option value="  " SELECTED>None</option>
+				<option value="  " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
+				<option value="  ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7aa" -->
@@ -727,8 +732,6 @@
 
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f7af" -->
 				<option value="af" SELECTED>Charbon</option>
 			<!-- TMPL_ELSE -->
@@ -885,25 +888,24 @@
 
         </tr>
 
-
-
-
-
-
 	<tr>
 		<td>Technique (gravure) 1</td>
 		<td>
 			<select name="f8" size="1">
-			<!-- TMPL_IF name="f8  " -->
-				<option value="  " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
-			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f8  " -->
+                                <option value="  " SELECTED>valeur non requise</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="  ">valeur non requise</option>
+                        <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ba" -->
 				<option value="ba" SELECTED>Gravure sur bois</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">Gravure sur bois</option>
-	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bb" -->
@@ -922,23 +924,18 @@
 				<option value="bd" SELECTED>Camaieu</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">Camaieu</option>
-
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8be" -->
 				<option value="be" SELECTED>Heliogravure</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">Heliogravure</option>
-
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f8bf" -->
 				<option value="bf" SELECTED>Chromolithographie</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">Chromolithographie</option>
-
 			<!-- /TMPL_IF -->
 
 
@@ -1078,7 +1075,6 @@
 				<option value="zz" SELECTED>Autre</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">Autre</option>
-
 			<!-- /TMPL_IF -->
 
 				</select>
@@ -1089,10 +1085,16 @@
 		<td>Technique (gravure) 2</td>
 		<td>
 			<select name="f9" size="1">
+			<!-- TMPL_IF name="f9|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
+            
 			<!-- TMPL_IF name="f9  " -->
-				<option value="  " SELECTED>None</option>
+				<option value="  " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
+				<option value="  ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ba" -->
 				<option value="ba" SELECTED>Gravure sur bois</option>
@@ -1127,8 +1129,6 @@
 
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f9bf" -->
 				<option value="bf" SELECTED>Chromolithographie</option>
 			<!-- TMPL_ELSE -->
@@ -1136,7 +1136,6 @@
 
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f9bg" -->
 				<option value="bg" SELECTED>Linoleum</option>
 			<!-- TMPL_ELSE -->
@@ -1273,21 +1272,25 @@
 				<option value="zz" SELECTED>Autre</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">Autre</option>
-
 			<!-- /TMPL_IF -->
 
 				</select>
 		</td>
-
         </tr>
 	<tr>
 		<td>Technique (gravure) 3</td>
 		<td>
 			<select name="f10" size="1">
+			<!-- TMPL_IF name="f10|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
+            
 			<!-- TMPL_IF name="f10  " -->
-				<option value="  " SELECTED>None</option>
+				<option value="  " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
+				<option value="  ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ba" -->
 				<option value="ba" SELECTED>Gravure sur bois</option>
@@ -1312,26 +1315,20 @@
 				<option value="bd" SELECTED>Camaieu</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">Camaieu</option>
-
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10be" -->
 				<option value="be" SELECTED>Heliogravure</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">Heliogravure</option>
-
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f10bf" -->
 				<option value="bf" SELECTED>Chromolithographie</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">Chromolithographie</option>
-
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f10bg" -->
 				<option value="bg" SELECTED>Linoleum</option>
 			<!-- TMPL_ELSE -->
@@ -1468,126 +1465,136 @@
 				<option value="zz" SELECTED>Autre</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">Autre</option>
-
 			<!-- /TMPL_IF -->
 
 				</select>
 		</td>
-
         </tr>
 
-
 	<tr>
 		<td>Fonction du document graphique</td>
 		<td>
 			<select name="f11" size="1">
-			<!-- TMPL_IF name="f11  " -->
-				<option value="  " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
-			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f11|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                        <!-- TMPL_ELSE -->
+                            <option value="|">|- Caractère de remplissage</option>
+                        <!-- /TMPL_IF -->
+                        
 			<!-- TMPL_IF name="f11aa" -->
-				<option value="aa" SELECTED>Dessin architectural</option>
+				<option value="aa" SELECTED>aa- Dessin architectural</option>
 			<!-- TMPL_ELSE -->
-				<option value="aa">Dessin architectural</option>
-	
+				<option value="aa">aa- Dessin architectural</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11ab" -->
-				<option value="ab" SELECTED>Couverture d'un document</option>
+				<option value="ab" SELECTED>ab- Couverture d'un document</option>
 			<!-- TMPL_ELSE -->
-				<option value="ab">Couverture d'un document</option>
+				<option value="ab">ab- Couverture d'un document</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11ac" -->
-				<option value="ac" SELECTED>Adhesif</option>
+				<option value="ac" SELECTED>ac- Adhesif</option>
 			<!-- TMPL_ELSE -->
-				<option value="ac">Adhesif</option>
+				<option value="ac">ac- Adhesif</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11ad" -->
-				<option value="ad" SELECTED>Affiche</option>
+				<option value="ad" SELECTED>ad- Affiche</option>
 			<!-- TMPL_ELSE -->
-				<option value="ad">Affiche</option>
-
+				<option value="ad">ad- Affiche</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11ae" -->
-				<option value="ae" SELECTED>Carte postale</option>
+				<option value="ae" SELECTED>ae- Carte postale</option>
 			<!-- TMPL_ELSE -->
-				<option value="ae">Carte postale</option>
-
+				<option value="ae">ae- Carte postale</option>
 			<!-- /TMPL_IF -->
 
-
-
 			<!-- TMPL_IF name="f11af" -->
-				<option value="af" SELECTED>Carte de voeux</option>
+				<option value="af" SELECTED>af- Carte de voeux</option>
 			<!-- TMPL_ELSE -->
-				<option value="af">Carte de voeux</option>
-
+				<option value="af">af- Carte de voeux</option>
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f11ag" -->
-				<option value="ag" SELECTED>Diagramme</option>
+				<option value="ag" SELECTED>ag- Diagramme</option>
 			<!-- TMPL_ELSE -->
-				<option value="ag">Diagramme</option>
-
+				<option value="ag">ag- Diagramme</option>
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f11ah" -->
-				<option value="ah" SELECTED>Carte a jouer</option>
+				<option value="ah" SELECTED>ah- Carte a jouer</option>
 			<!-- TMPL_ELSE -->
-				<option value="ah">Carte a jouer</option>
-
+				<option value="ah">ah- Carte a jouer</option>
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f11ai" -->
-				<option value="ai" SELECTED>Carte eclair</option>
+				<option value="ai" SELECTED>ai- Carte eclair</option>
 			<!-- TMPL_ELSE -->
-				<option value="ai">Carte eclair</option>
-
+				<option value="ai">ai- Carte eclair</option>
 			<!-- /TMPL_IF -->
+		
 			<!-- TMPL_IF name="f11aj" -->
-				<option value="aj" SELECTED>Ephemera</option>
+				<option value="aj" SELECTED>aj- Ephemera</option>
 			<!-- TMPL_ELSE -->
-				<option value="aj">Ephemera</option>
-
+				<option value="aj">aj- Ephemera</option>
 			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f11an" -->
+				<option value="an" SELECTED>an- calendrier</option>
+			<!-- TMPL_ELSE -->
+				<option value="an">an- calendrier</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f11as" -->
+				<option value="as" SELECTED>as- Cartes de réservation</option>
+			<!-- TMPL_ELSE -->
+				<option value="as">as- Cartes de réservation</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f11au" -->
+				<option value="au" SELECTED>au- image pieuse</option>
+			<!-- TMPL_ELSE -->
+				<option value="au">au- image pieuse</option>
+			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f11uu" -->
-				<option value="uu" SELECTED>Inconnu</option>
+				<option value="uu" SELECTED>uu- Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="uu">Inconnu</option>
-
+				<option value="uu">uu- Inconnu</option>
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f11vv" -->
-				<option value="vv" SELECTED>Composite</option>
+				<option value="vv" SELECTED>vv- Composite</option>
 			<!-- TMPL_ELSE -->
-				<option value="vv">Composite</option>
-
+				<option value="vv">vv- Composite</option>
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f11xx" -->
-				<option value="xx" SELECTED>Non applicable</option>
+				<option value="xx" SELECTED>xx- Non applicable</option>
 			<!-- TMPL_ELSE -->
-				<option value="xx">Non applicable</option>
-
+				<option value="xx">xx- Non applicable</option>
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f11zz" -->
-				<option value="zz" SELECTED>Autre</option>
+				<option value="zz" SELECTED>zz- Autre</option>
 			<!-- TMPL_ELSE -->
-				<option value="zz">Autre</option>
-
+				<option value="zz">zz- Autre</option>
 			<!-- /TMPL_IF -->
+			
 				</select>
 		</td>
-
         </tr>
 	
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value +document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value;
+	    var doc   = opener.document; 
+        var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        field.value =  document.f_pop.f1.value +document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value;
 		self.close();
 		return false;
 	}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_117.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_117.tmpl
index f1529fef72..c33c01b97c 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_117.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_117.tmpl
@@ -13,11 +13,12 @@
 		<td>Presentation materielle</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1  " -->
-				<option value="  " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
-			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1|" -->
+            	           <option value="|" SELECTED>|- Caractère de remplissage</option>
+                        <!-- TMPL_ELSE -->
+                            <option value="|">|- Caractère de remplissage</option>
+                        <!-- /TMPL_IF -->
+            
 			<!-- TMPL_IF name="f1aa" -->
 				<option value="aa" SELECTED>Trousse pedagogique</option>
 			<!-- TMPL_ELSE -->
@@ -67,11 +68,9 @@
 			<!-- TMPL_IF name="f1ai" -->
 				<option value="ai" SELECTED>Outils et equipements</option>
 			<!-- TMPL_ELSE -->
-				<option value="ai">Outils et equipements</option>
-	
+				<option value="ai">Outils et equipements</option>	
 			<!-- /TMPL_IF -->
 
-
 			<!-- TMPL_IF name="f1aj" -->
 				<option value="aj" SELECTED>Armes</option>
 			<!-- TMPL_ELSE -->
@@ -224,10 +223,16 @@
 		<td>Materiau 1</td>
 		<td>
 			<select name="f2" size="1">
+			<!-- TMPL_IF name="f2|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                        <!-- TMPL_ELSE -->
+                            <option value="|">|- Caractère de remplissage</option>
+                        <!-- /TMPL_IF -->
+            
 			<!-- TMPL_IF name="f2  " -->
-				<option value="  " SELECTED>None</option>
+				<option value="  " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
+				<option value="  ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2aa" -->
 				<option value="aa" SELECTED>Terre cuite</option>
@@ -397,10 +402,16 @@
 		<td>Materiau 2</td>
 		<td>
 			<select name="f3" size="1">
+			<!-- TMPL_IF name="f3|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                        <!-- TMPL_ELSE -->
+                            <option value="|">|- Caractère de remplissage</option>
+                        <!-- /TMPL_IF -->
+            
 			<!-- TMPL_IF name="f3  " -->
-				<option value="  " SELECTED>None</option>
+				<option value="  " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
+				<option value="  ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3aa" -->
@@ -571,11 +582,16 @@
 		<td>Materiau 3</td>
 		<td>
 			<select name="f4" size="1">
-			<!-- TMPL_IF name="f4  " -->
-				<option value="  " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
-			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f4|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                        <!-- TMPL_ELSE -->
+                            <option value="|">|- Caractère de remplissage</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f4  " -->
+                                <option value="  " SELECTED>valeur non requise</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="  ">valeur non requise</option>
+                        <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4aa" -->
 				<option value="aa" SELECTED>Terre cuite</option>
 			<!-- TMPL_ELSE -->
@@ -734,24 +750,21 @@
 				<option value="zz" SELECTED>Autre</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">Autre</option>
-	
 			<!-- /TMPL_IF -->
 
 				</select>
 		</td>
 	</tr>
 
-
-
 	<tr>
 		<td>Couleur</td>
 		<td>
 	<select name="f5" size="1">
-			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f5|" -->
+                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                        <!-- TMPL_ELSE -->
+                            <option value="|">|- Caractère de remplissage</option>
+                        <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5a" -->
 				<option value="a" SELECTED>Monochrome</option>
@@ -799,11 +812,13 @@
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value +document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value;
-		self.close();
-		return false;
+	    var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+            field.value =  document.f_pop.f1.value +document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value;
+	    self.close();
+	    return false;
 	}
 </script>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_120.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_120.tmpl
index 61edaec4b8..476456a728 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_120.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_120.tmpl
@@ -13,11 +13,6 @@
 		<td>Indicateur de couleur:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Monochrome</option>
 			<!-- TMPL_ELSE -->
@@ -33,11 +28,6 @@
 		<td>Indicateur d'index:</td>
 		<td>
 			<select name="f2" size="1">
-			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Index ou
 				liste present dans le document
@@ -75,11 +65,7 @@
 		<td>Indicateur de texte:</td>
 		<td>
 			<select name="f3" size="1">
-			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f3a" -->
 				<option value="a" SELECTED>Texte sur
 				le document meme</option>
@@ -107,9 +93,9 @@
 		<td>
 			<select name="f4" size="1">
 			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>Courbes de niveau</option>
@@ -192,9 +178,9 @@
 		<td>
 			<select name="f5" size="1">
 			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
 				<option value="a" SELECTED>Courbes de niveau</option>
@@ -276,11 +262,13 @@
 		<td>Code de representation du relief 3:</td>
 		<td>
 			<select name="f6" size="1">
-			<!-- TMPL_IF name="f6 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+                        
+                        <!-- TMPL_IF name="f6 " -->
+                                <option value=" " SELECTED>valeur non requise</option>
+                        <!-- TMPL_ELSE -->
+                                <option value=" ">valeur non requise</option>
+                        <!-- /TMPL_IF -->
+                        
 			<!-- TMPL_IF name="f6a" -->
 				<option value="a" SELECTED>Courbes de niveau</option>
 			<!-- TMPL_ELSE -->
@@ -361,11 +349,12 @@
 		<td>Code de representation du relief 4:</td>
 		<td>
 			<select name="f7" size="1">
-			<!-- TMPL_IF name="f7 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f7 " -->
+                                <option value=" " SELECTED>valeur non requise</option>
+                        <!-- TMPL_ELSE -->
+                                <option value=" ">valeur non requise</option>
+                        <!-- /TMPL_IF -->
+                        
 			<!-- TMPL_IF name="f7a" -->
 				<option value="a" SELECTED>Courbes de niveau</option>
 			<!-- TMPL_ELSE -->
@@ -446,11 +435,7 @@
 	<tr>		<td>Projection:</td>
 		<td>
 			<select name="f8" size="1">
-			<!-- TMPL_IF name="f8  " -->
-				<option value="  " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f8aa" -->
 				<option value="aa" SELECTED>Aitoff</option>
 			<!-- TMPL_ELSE -->
@@ -534,21 +519,12 @@
 				Lambert</option>
 			<!-- /TMPL_IF -->
 
-
-
-
 			<!-- TMPL_IF name="f8cd" -->
 				<option value="cd" SELECTED>Conique (simple)</option>
 			<!-- TMPL_ELSE -->
 				<option value="cd">Conique (simple)</option>
 			<!-- /TMPL_IF -->
 
-
-
-
-
-
-
 			<!-- TMPL_IF name="f8ce" -->
 				<option value="ce" SELECTED>Bipolaire
 				de Miller</option>
@@ -556,11 +532,6 @@
 				<option value="ce">Bipolaire de Miller</option>
 			<!-- /TMPL_IF -->
 
-
-
-
-
-
 			<!-- TMPL_IF name="f8cf" -->
 				<option value="cf" SELECTED>De Lisle</option>
 			<!-- TMPL_ELSE -->
@@ -768,21 +739,15 @@
 				<option value="zz">Autre type connu</option>
 			<!-- /TMPL_IF -->
 
-
-
-
 			</select>
 
-
-
-
-		</td></tr><tr>		<td>Meridien de reference 1:</td>
+		</td></tr><tr><td>Meridien de reference 1:</td>
 		<td>
 			<select name="f9" size="1">
-	<!-- TMPL_IF name="f9  " -->
-										<option value="  " SELECTED>None</option>
+			<!-- TMPL_IF name="f9  " -->
+				<option value="  " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
+				<option value="  ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9aa" -->
@@ -863,32 +828,18 @@
 				<option value="an">Ile de Fer (Iles Canaries)</option>
 			<!-- /TMPL_IF -->
 
-
-
-
 			<!-- TMPL_IF name="f9ao" -->
 				<option value="ao" SELECTED>Helsinky (Finlande)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ao">Helsinky (Finlande)</option>
 			<!-- /TMPL_IF -->
 
-
-
-
-
-
-
 			<!-- TMPL_IF name="f9ap" -->
 				<option value="ap" SELECTED>Istambul (Turquie)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ap">Istambul (Turquie)</option>
 			<!-- /TMPL_IF -->
 
-
-
-
-
-
 			<!-- TMPL_IF name="f9aq" -->
 				<option value="aq"
 				SELECTED>Julianehaab (Groenland)</option>
@@ -911,9 +862,6 @@
 				<option value="at">Madras (Inde)</option>
 			<!-- /TMPL_IF -->
 
-
-
-
 			<!-- TMPL_IF name="f9ba" -->
 				<option value="ba" SELECTED>Madrid (Espagne)</option>
 			<!-- TMPL_ELSE -->
@@ -1040,24 +988,16 @@
 				<option value="zz">Autre</option>
 			<!-- /TMPL_IF -->
 
-
-
-
-
-
-
-
 			</select>
 
-
-
 		</td></tr><tr>		<td>Meridien de reference 2:</td>
 		<td>
 			<select name="f10" size="1">
-	<!-- TMPL_IF name="f10  " -->
-										<option value="  " SELECTED>None</option>
+            
+			<!-- TMPL_IF name="f10  " -->
+				<option value="  " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10aa" -->
@@ -1138,32 +1078,18 @@
 				<option value="an">Ile de Fer (Iles Canaries)</option>
 			<!-- /TMPL_IF -->
 
-
-
-
 			<!-- TMPL_IF name="f10ao" -->
 				<option value="ao" SELECTED>Helsinky (Finlande)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ao">Helsinky (Finlande)</option>
 			<!-- /TMPL_IF -->
 
-
-
-
-
-
-
 			<!-- TMPL_IF name="f10ap" -->
 				<option value="ap" SELECTED>Istambul (Turquie)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ap">Istambul (Turquie)</option>
 			<!-- /TMPL_IF -->
-
-
-
-
-
-
+			
 			<!-- TMPL_IF name="f10aq" -->
 				<option value="aq"
 				SELECTED>Julianehaab (Groenland)</option>
@@ -1186,9 +1112,6 @@
 				<option value="at">Madras (Inde)</option>
 			<!-- /TMPL_IF -->
 
-
-
-
 			<!-- TMPL_IF name="f10ba" -->
 				<option value="ba" SELECTED>Madrid (Espagne)</option>
 			<!-- TMPL_ELSE -->
@@ -1314,30 +1237,19 @@
 			<!-- TMPL_ELSE -->
 				<option value="zz">Autre</option>
 			<!-- /TMPL_IF -->
-
-
-
-
-
-
-
-
 			</select>
-
-
-
 		</td></tr>
 
-
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value +document.f_pop.f8.value +document.f_pop.f9.value +document.f_pop.f10.value;
-		self.close();
-		return false;
+	    var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+            field.value =  document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value +document.f_pop.f8.value +document.f_pop.f9.value +document.f_pop.f10.value;
+	    self.close();
+	    return false;
 	}
 </script>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_121a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_121a.tmpl
index 311c35ce01..01bb0b1d29 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_121a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_121a.tmpl
@@ -13,11 +13,7 @@
 		<td>Dimensions physiques:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Bi-dimensionnel</option>
 			<!-- TMPL_ELSE -->
@@ -33,10 +29,11 @@
 		<td>Image cartographique originale 1:</td>
 		<td>
 			<select name="f2" size="1">
+            
 			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Manuelle et
@@ -69,14 +66,15 @@
 				teledetection passive</option>
 			<!-- /TMPL_IF -->
 			</select>
-		</td>		<td>Image cartographique originale 2:</td>
+		</td><td>Image cartographique originale 2:</td>
 		<td>
 			<select name="f3" size="1">
-			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f3 " -->
+                                <option value=" " SELECTED>valeur non requise</option>
+                        <!-- TMPL_ELSE -->
+                                <option value=" ">valeur non requise</option>
+                        <!-- /TMPL_IF -->
+                        
 			<!-- TMPL_IF name="f3a" -->
 				<option value="a" SELECTED>Manuelle et
 				par releve</option>
@@ -94,29 +92,20 @@
 				<option value="c">Par ordinateur</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3d" -->
-				<option value="d" SELECTED>Par
-				technique de teledetection active</option>
+				<option value="d" SELECTED>Par technique de teledetection active</option>
 			<!-- TMPL_ELSE -->
-				<option value="d">Par technique de
-				teledetection active</option>
+				<option value="d">Par technique de teledetection active</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3e" -->
-				<option value="e" SELECTED>Par
-				technique de teledetection passive</option>
+				<option value="e" SELECTED>Par technique de teledetection passive</option>
 			<!-- TMPL_ELSE -->
-				<option value="e">Par technique de
-				teledetection passive</option>
+				<option value="e">Par technique de teledetection passive</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>
 		<td>Support physique:</td>
 		<td>
 			<select name="f4" size="1">
-			<!-- TMPL_IF name="f4  " -->
-				<option value="  " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4aa" -->
 				<option value="aa" SELECTED>Papier</option>
 			<!-- TMPL_ELSE -->
@@ -230,11 +219,6 @@
 		<td>Mode de realisation technique:</td>
 		<td>
 			<select name="f5" size="1">
-			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
 				<option value="a" SELECTED>Manuscrit</option>
 			<!-- TMPL_ELSE -->
@@ -246,9 +230,9 @@
 				<option value="b">Imprime</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5c" -->
-				<option value="c" SELECTED>Photographie</option>
+				<option value="c" SELECTED>c- Photocopie</option>
 			<!-- TMPL_ELSE -->
-				<option value="c">Photographie</option>
+				<option value="c">c- Photocopie</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5d" -->
 				<option value="d" SELECTED>Microphotographie</option>
@@ -278,11 +262,6 @@
 		<td>Forme de reproduction:</td>
 		<td>
 			<select name="f6" size="1">
-			<!-- TMPL_IF name="f6 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6a" -->
 				<option value="a" SELECTED>Manuscrit</option>
 			<!-- TMPL_ELSE -->
@@ -316,34 +295,25 @@
 		<td>Reperes geodesiques:</td>
 		<td>
 			<select name="f7" size="1">
-			<!-- TMPL_IF name="f7 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7a" -->
-				<option value="a" SELECTED>Pas de repere</option>
+				<option value="a" SELECTED>a- Pas de repère</option>
 			<!-- TMPL_ELSE -->
-				<option value="a">Pas de repere</option>
+				<option value="a">a- Pas de repère</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7b" -->
-				<option value="b" SELECTED>Repere mais
-				sans systeme de coordonnees</option>
+				<option value="b" SELECTED>b- Repere mais sans système de coordonnées</option>
 			<!-- TMPL_ELSE -->
-				<option value="b">Repere mais sans
-				systeme de coordonnees</option>
+				<option value="b">b- Repere mais sans système de coordonnées</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7c" -->
-				<option value="c" SELECTED>Repere avec
-				systeme de coordonnees</option>
+				<option value="c" SELECTED>c- Repère avec système de coordonnées</option>
 			<!-- TMPL_ELSE -->
-				<option value="c">Repere avec systeme
-				de coordonnees</option>
+				<option value="c">c- Repere avec systeme de coordonnees</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7x" -->
-				<option value="x" SELECTED>Non applicable</option>
+				<option value="x" SELECTED>x- Non applicable</option>
 			<!-- TMPL_ELSE -->
-				<option value="x">Non applicable</option>
+				<option value="x">x- Non applicable</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
@@ -352,11 +322,6 @@
 		<td>Forme materielle d'edition:</td>
 		<td>
 			<select name="f8" size="1">
-			<!-- TMPL_IF name="f8 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8a" -->
 				<option value="a" SELECTED>Publication
 				autonome</option>
@@ -403,7 +368,10 @@
 <script>
 	function report() {
 
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value +document.f_pop.f8.value;
+            var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        
+            field.value =  document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value +document.f_pop.f8.value;
 		self.close();
 		return false;
 	}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_121b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_121b.tmpl
index 3fd7eb1ad0..1c522ec6cb 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_121b.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_121b.tmpl
@@ -13,11 +13,6 @@
 		<td>Altitude du capteur:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Terrestre</option>
 			<!-- TMPL_ELSE -->
@@ -38,11 +33,7 @@
 		<td>Orientation du capteur :</td>
 		<td>
 			<select name="f2" size="1">
-			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+                        
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Oblique faible</option>
 			<!-- TMPL_ELSE -->
@@ -67,11 +58,7 @@
 		<td>Qualite de l'image:</td>
 		<td>
 			<select name="f4" size="1">
-			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>Faible</option>
 			<!-- TMPL_ELSE -->
@@ -97,11 +84,7 @@
 		<td>Couverture nuageuse exprimee en huitieme:</td>
 		<td>
 			<select name="f5" size="1">
-			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f51" -->
 				<option value="1" SELECTED>1/8</option>
 			<!-- TMPL_ELSE -->
@@ -148,21 +131,14 @@
 		       <td>Qualite de l'image:</td>
                 <td>
                         <select name="f6" size="1">
-                        <!-- TMPL_IF name="f6 " -->
-                                <option value=" "
-                SELECTED>None</option>
-                        <!-- TMPL_ELSE -->
-                                <option value=" ">None</option>
-                        <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f6-" -->
-                                <option value="-"
-                SELECTED>Inferieure au cm</option>
+                                <option value="-" SELECTED>Inferieure au cm</option>
                         <!-- TMPL_ELSE -->
                                 <option value="-">Inferieure au cm</option>
                         <!-- /TMPL_IF -->
+                        
                         <!-- TMPL_IF name="f61" -->
-                                <option value="1"
-                SELECTED>1</option>
+                                <option value="1" SELECTED>1</option>
                         <!-- TMPL_ELSE -->
                                 <option value="1">1</option>
                         <!-- /TMPL_IF -->
@@ -229,11 +205,7 @@
                         </select>
                 
 			<select name="f7" size="1">
-			<!-- TMPL_IF name="f7 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f7c" -->
 				<option value="c" SELECTED>Centimetres</option>
 			<!-- TMPL_ELSE -->
@@ -286,7 +258,9 @@ document.f_pop.f3.value=document.f_pop.f3.value+'  ';
 document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
 
 
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value;
+	    var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+            field.value =  document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value;
 		self.close();
 		return false;
 	}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_122.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_122.tmpl
index c179f86376..1f152b36f2 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_122.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_122.tmpl
@@ -12,34 +12,24 @@
 	<tr>
 		<td>Ere code:</td>
 		<td>
-			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>La date
-				tombe avant l'an 1 du calendrier gregorien</option>
-			<!-- TMPL_ELSE -->
-				<option value="c">La date tombe avant
-				l'an 1 du calendrier gregorien</option>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>La date
-				tombe apres l'an 1</option>
-			<!-- TMPL_ELSE -->
-				<option value="d">La date tombe apres
-				l'an 1</option>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>Spatiale</option>
-			<!-- TMPL_ELSE -->
-				<option value="c">Spatiale</option>
-			<!-- /TMPL_IF -->
-			</select>
-		</td></tr>
-<tr>		<td>Annee:</td>
+		<select name="f1" size="1">
+                    <!-- TMPL_IF name="f1c" -->
+                            <option value="c" SELECTED>La date
+                            tombe avant l'an 1 du calendrier gregorien</option>
+                    <!-- TMPL_ELSE -->
+                            <option value="c">La date tombe avant l'an 1 du calendrier gregorien</option>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="f1d" -->
+                            <option value="d" SELECTED>La date tombe apres l'an 1</option>
+                    <!-- TMPL_ELSE -->
+                            <option value="d">La date tombe apres l'an 1</option>
+                    <!-- /TMPL_IF -->
+
+                </select>
+		</td>
+                </tr>
+                <tr>
+                <td>Annee:</td>
 		   <td><input type="text" name="f2" maxlength=4 size=5
 		   value="<!-- TMPL_VAR name="f2" -->">
 		</td>
@@ -57,32 +47,29 @@
 		         <td><input type="text" name="f5" maxlength=2
 		         size=3
                    value="<!-- TMPL_VAR name="f5" -->"></td>
-
 		</tr>
 
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
+	<tr><td colspan=2><input type="button" value="OK"  onclick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
-	function report() {
-
-document.f_pop.f2.value=document.f_pop.f2.value+'    ';
-document.f_pop.f3.value=document.f_pop.f3.value+'  ';
-document.f_pop.f4.value=document.f_pop.f4.value+'  ';
-document.f_pop.f5.value=document.f_pop.f5.value+'  ';
-
-
-
-document.f_pop.f2.value=document.f_pop.f2.value.substring(0,4);
-document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
-document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
-document.f_pop.f5.value=document.f_pop.f5.value.substring(0,2);
-
+<script type="text/javascript">
+    function report() {
+        document.f_pop.f2.value=document.f_pop.f2.value+'    ';
+        document.f_pop.f3.value=document.f_pop.f3.value+'  ';
+        document.f_pop.f4.value=document.f_pop.f4.value+'  ';
+        document.f_pop.f5.value=document.f_pop.f5.value+'  ';
+        document.f_pop.f2.value=document.f_pop.f2.value.substring(0,4);
+        document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
+        document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
+        document.f_pop.f5.value=document.f_pop.f5.value.substring(0,2);
 
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value ;
-		self.close();
-		return false;
-	}
+        var doc   = opener.document; 
+        var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+    
+        field.value =  document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value ;
+        window.close();
+        return false;
+}
 </script>
 </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123a.tmpl
index 4af5d5378b..94ff448c97 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123a.tmpl
@@ -13,11 +13,6 @@
 		<td>Type d'echelle:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Echelle lineaire</option>
 			<!-- TMPL_ELSE -->
@@ -36,15 +31,16 @@
 			</select>
 		</td></tr>
 
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
+	<tr><td colspan=2><input type="button" value="OK"  onclick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
-		self.close();
-		return false;
+	    var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+            field.value =  document.f_pop.f1.value;
+	    self.close();
+	    return false;
 	}
 </script>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123d.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123d.tmpl
index b6564ddda6..683f6a589a 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123d.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123d.tmpl
@@ -13,11 +13,7 @@
 		<td>Hemisphere:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f1w" -->
 				<option value="w" SELECTED>Ouest</option>
 			<!-- TMPL_ELSE -->
@@ -61,22 +57,21 @@
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-document.f_pop.f2.value=document.f_pop.f2.value+'   ';
-document.f_pop.f3.value=document.f_pop.f3.value+'  ';
-document.f_pop.f4.value=document.f_pop.f4.value+'  ';
-
-
-
-document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
-document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
-document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
-
+            document.f_pop.f2.value=document.f_pop.f2.value+'   ';
+            document.f_pop.f3.value=document.f_pop.f3.value+'  ';
+            document.f_pop.f4.value=document.f_pop.f4.value+'  ';
+            document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
+            document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
+            document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
 
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
-		self.close();
-		return false;
+            var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        
+            field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
+	    window.close();
+	    return false;
 	}
 </script>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123e.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123e.tmpl
index ff1a982516..177af4eaba 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123e.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123e.tmpl
@@ -13,11 +13,7 @@
 		<td>Hemisphere:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+            
 			<!-- TMPL_IF name="f1w" -->
 				<option value="w" SELECTED>Ouest</option>
 			<!-- TMPL_ELSE -->
@@ -61,22 +57,21 @@
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-document.f_pop.f2.value=document.f_pop.f2.value+'   ';
-document.f_pop.f3.value=document.f_pop.f3.value+'  ';
-document.f_pop.f4.value=document.f_pop.f4.value+'  ';
-
-
-
-document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
-document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
-document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
-
+            document.f_pop.f2.value=document.f_pop.f2.value+'   ';
+            document.f_pop.f3.value=document.f_pop.f3.value+'  ';
+            document.f_pop.f4.value=document.f_pop.f4.value+'  ';
+            document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
+            document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
+            document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
 
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
-		self.close();
-		return false;
+            var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        
+            field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
+	    window.close();
+	    return false;
 	}
 </script>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123f.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123f.tmpl
index b38a5e97d8..58673d8b9e 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123f.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123f.tmpl
@@ -12,12 +12,7 @@
 	<tr>
 		<td>Hemisphere:</td>
 		<td>
-			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+			<select name="f1" size="1">            
 			<!-- TMPL_IF name="f1w" -->
 				<option value="w" SELECTED>Ouest</option>
 			<!-- TMPL_ELSE -->
@@ -59,23 +54,21 @@
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
-	function report() {
-document.f_pop.f2.value=document.f_pop.f2.value+'   ';
-document.f_pop.f3.value=document.f_pop.f3.value+'  ';
-document.f_pop.f4.value=document.f_pop.f4.value+'  ';
-
-
-
-document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
-document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
-document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
-
+<script type="text/javascript">
+    function report() {
+        document.f_pop.f2.value=document.f_pop.f2.value+'   ';
+        document.f_pop.f3.value=document.f_pop.f3.value+'  ';
+        document.f_pop.f4.value=document.f_pop.f4.value+'  ';
+        document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
+        document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
+        document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
 
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
-		self.close();
-		return false;
-	}
+        var doc   = opener.document; 
+        var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
+        window.close();
+        return false;
+    }
 </script>
 </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123g.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123g.tmpl
index 7afdfdc6f1..c1657583f6 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123g.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_123g.tmpl
@@ -13,11 +13,7 @@
 		<td>Hemisphere:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f1w" -->
 				<option value="w" SELECTED>Ouest</option>
 			<!-- TMPL_ELSE -->
@@ -61,22 +57,20 @@
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascritp">
 	function report() {
-document.f_pop.f2.value=document.f_pop.f2.value+'   ';
-document.f_pop.f3.value=document.f_pop.f3.value+'  ';
-document.f_pop.f4.value=document.f_pop.f4.value+'  ';
-
-
-
-document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
-document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
-document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
-
+            document.f_pop.f2.value=document.f_pop.f2.value+'   ';
+            document.f_pop.f3.value=document.f_pop.f3.value+'  ';
+            document.f_pop.f4.value=document.f_pop.f4.value+'  ';
+            document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
+            document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
+            document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
 
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
-		self.close();
-		return false;
+            var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+            field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
+	    window.close();
+	    return false;
 	}
 </script>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124a.tmpl
index cceba5c7f4..c4e24700f1 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124a.tmpl
@@ -13,11 +13,6 @@
 		<td>Origine de l'image:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Image non-photographique</option>
 			<!-- TMPL_ELSE -->
@@ -38,13 +33,14 @@
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-
-
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
-		self.close();
-		return false;
+            var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        
+            field.value =  document.f_pop.f1.value;
+	    self.close();
+	    return false;
 	}
 </script>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124b.tmpl
index 1827d6bd6e..1c51b72679 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124b.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124b.tmpl
@@ -13,11 +13,7 @@
 		<td>Forme du document cartographique:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+            
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Atlas</option>
 			<!-- TMPL_ELSE -->
@@ -78,13 +74,14 @@
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-
-
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
-		self.close();
-		return false;
+            var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        
+            field.value =  document.f_pop.f1.value;
+	    self.close();
+	    return false;
 	}
 </script>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124c.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124c.tmpl
index 5f121fd8b0..f7a56570fe 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124c.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124c.tmpl
@@ -13,11 +13,7 @@
 		<td>Presentation technique dans le cas d'images photographiques ou non photographiques:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1  " -->
-				<option value="  " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f1aa" -->
 				<option value="aa" SELECTED>Anaglyphique</option>
 			<!-- TMPL_ELSE -->
@@ -133,13 +129,13 @@
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-
-
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
-		self.close();
-		return false;
+            var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+            field.value =  document.f_pop.f1.value;
+	    window.close();
+	    return false;
 	}
 </script>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124d.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124d.tmpl
index 9ef12184e9..75cc447f77 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124d.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124d.tmpl
@@ -13,11 +13,6 @@
 		<td>Position de la base pour les images photographiques ou de teledetection:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Terrestre</option>
 			<!-- TMPL_ELSE -->
@@ -38,13 +33,13 @@
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-
-
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
-		self.close();
-		return false;
+            var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+            field.value =  document.f_pop.f1.value;
+	    window.close();
+	    return false;
 	}
 </script>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124e.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124e.tmpl
index ca473bc56a..cc569019a6 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124e.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124e.tmpl
@@ -13,11 +13,7 @@
 		<td>Categorie du satellite pour la teledetection:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Meteorologique</option>
 			<!-- TMPL_ELSE -->
@@ -35,16 +31,16 @@
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
+	<tr><td colspan=2><input type="button" value="OK"  onclick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-
-
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
-		self.close();
-		return false;
+	    var doc     = opener.document; 
+            var field   = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+            field.value =  document.f_pop.f1.value;
+	    window.close();
+	    return false;
 	}
 </script>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124f.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124f.tmpl
index 6e9d46d451..c3d7598e1b 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124f.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124f.tmpl
@@ -13,11 +13,6 @@
 		<td>Nom du satellite pour la teledetection:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1  " -->
-				<option value="  " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1aa" -->
 				<option value="aa" SELECTED>Tiros</option>
 			<!-- TMPL_ELSE -->
@@ -113,13 +108,13 @@
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-
-
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
-		self.close();
-		return false;
+            var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+            field.value =  document.f_pop.f1.value;
+	    self.close();
+	    return false;
 	}
 </script>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124g.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124g.tmpl
index 2bc247f54b..21f9e03bfe 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124g.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_124g.tmpl
@@ -13,11 +13,7 @@
 		<td>Technique d'enregistrement pour les images de teledetection:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1  " -->
-				<option value="  " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f1aa" -->
 				<option value="aa" SELECTED>Enregistrement video</option>
 			<!-- TMPL_ELSE -->
@@ -73,13 +69,13 @@
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-
-
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
-		self.close();
-		return false;
+            var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+            field.value =  document.f_pop.f1.value;
+	    window.close();
+	    return false;
 	}
 </script>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_125a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_125a.tmpl
index 4eb652a7bf..61be994da9 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_125a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_125a.tmpl
@@ -13,11 +13,6 @@
 		<td>Type de partition:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Partition d'orchestre</option>
 			<!-- TMPL_ELSE -->
@@ -74,11 +69,7 @@
 		<td>Indicateur de parties:</td>
 		<td>
 			<select name="f2" size="1">
-			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Parties existantes</option>
 			<!-- TMPL_ELSE -->
@@ -104,14 +95,16 @@
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
-	function report() {
-
 
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value;
-		self.close();
-		return false;
+<script type="text/javascript">
+	function report() {
+            var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+            field.value =  document.f_pop.f1.value+document.f_pop.f2.value;
+	    window.close();
+	    return false;
 	}
 </script>
+
 </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_125b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_125b.tmpl
index a557737e01..dd96b3c4b1 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_125b.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_125b.tmpl
@@ -10,13 +10,13 @@
 <form name="f_pop">
 <table>
 	<tr>
-		<td>Forme du document cartographique:</td>
+		<td>Type de texte écrit:</td>
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Poesie</option>
@@ -128,13 +128,14 @@
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-
-
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
-		self.close();
-		return false;
+            var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        
+            field.value =  document.f_pop.f1.value;
+	    window.close();
+	    return false;
 	}
 </script>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_126a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_126a.tmpl
index 3d6dd8cf78..c3de60b7ef 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_126a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_126a.tmpl
@@ -13,11 +13,7 @@
 		<td>Presentation materielle:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Disque</option>
 			<!-- TMPL_ELSE -->
@@ -69,11 +65,6 @@
 		<td>Vitesse:</td>
 		<td>
 			<select name="f2" size="1">
-			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2u" -->
 				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
@@ -175,11 +166,6 @@
 		<td>Type de son:</td>
 		<td>
 			<select name="f3" size="1">
-			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3a" -->
 				<option value="a" SELECTED>Monaural</option>
 			<!-- TMPL_ELSE -->
@@ -211,11 +197,6 @@
 		<td>Largeur du sillon:</td>
 		<td>
 			<select name="f4" size="1">
-			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>Large/standard</option>
 			<!-- TMPL_ELSE -->
@@ -247,11 +228,6 @@
 		<td>Dimension materielle:</td>
 		<td>
 			<select name="f5" size="1">
-			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
 				<option value="a" SELECTED>7.62cm ou 3 pouces</option>
 			<!-- TMPL_ELSE -->
@@ -328,11 +304,7 @@
 		<td>Largeur de la bande:</td>
 		<td>
 			<select name="f6" size="1">
-			<!-- TMPL_IF name="f6 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f6a" -->
 				<option value="a" SELECTED>1/4 de pouce</option>
 			<!-- TMPL_ELSE -->
@@ -384,11 +356,7 @@
 		<td>Specifications de la bande magnetique:</td>
 		<td>
 			<select name="f7" size="1">
-			<!-- TMPL_IF name="f7 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f7a" -->
 				<option value="a" SELECTED>Pleine piste</option>
 			<!-- TMPL_ELSE -->
@@ -451,9 +419,9 @@
 		<td>
 			<select name="f8" size="1">
 			<!-- TMPL_IF name="f8 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8a" -->
 				<option value="a" SELECTED>Discographie</option>
@@ -536,10 +504,11 @@
 		<td>Texte d'accompagnement 2:</td>
 		<td>
 			<select name="f9" size="1">
+			
 			<!-- TMPL_IF name="f9 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9a" -->
 				<option value="a" SELECTED>Discographie</option>
@@ -622,10 +591,11 @@
 		<td>Texte d'accompagnement 3:</td>
 		<td>
 			<select name="f10" size="1">
+			
 			<!-- TMPL_IF name="f10 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10a" -->
 				<option value="a" SELECTED>Discographie</option>
@@ -708,10 +678,11 @@
 		<td>Texte d'accompagnement 4:</td>
 		<td>
 			<select name="f11" size="1">
+			
 			<!-- TMPL_IF name="f11 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11a" -->
 				<option value="a" SELECTED>Discographie</option>
@@ -794,11 +765,11 @@
 		<td>Texte d'accompagnement 5:</td>
 		<td>
 			<select name="f12" size="1">
-			<!-- TMPL_IF name="f12 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+                        <!-- TMPL_IF NAME="f12 "-->
+                            <option value=" " SELECTED>valeur non requise</option>
+                        <!-- TMPL_ELSE -->
+                            <option value=" ">valeur non requise</option>
+                        <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12a" -->
 				<option value="a" SELECTED>Discographie</option>
 			<!-- TMPL_ELSE -->
@@ -880,11 +851,12 @@
 		<td>Texte d'accompagnement 6:</td>
 		<td>
 			<select name="f13" size="1">
-			<!-- TMPL_IF name="f13 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+                        <!-- TMPL_IF NAME="f13 "-->
+                            <option value=" " SELECTED>valeur non requise</option>
+                        <!-- TMPL_ELSE -->
+                            <option value=" ">valeur non requise</option>
+                        <!-- /TMPL_IF -->
+                        
 			<!-- TMPL_IF name="f13a" -->
 				<option value="a" SELECTED>Discographie</option>
 			<!-- TMPL_ELSE -->
@@ -966,11 +938,6 @@
 		<td>Technique d'enregistrement:</td>
 		<td>
 			<select name="f14" size="1">
-			<!-- TMPL_IF name="f14 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14a" -->
 				<option value="a" SELECTED>Acoustique</option>
 			<!-- TMPL_ELSE -->
@@ -1002,11 +969,6 @@
 		<td>Technique de reproduction:</td>
 		<td>
 			<select name="f15" size="1">
-			<!-- TMPL_IF name="f15 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15a" -->
 				<option value="a" SELECTED>Norme NAB</option>
 			<!-- TMPL_ELSE -->
@@ -1067,13 +1029,13 @@
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-
-
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value+document.f_pop.f12.value+document.f_pop.f13.value+document.f_pop.f14.value+document.f_pop.f15.value ;
-		self.close();
-		return false;
+            var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+            field.value = document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value+document.f_pop.f12.value+document.f_pop.f13.value+document.f_pop.f14.value+document.f_pop.f15.value ;
+	    window.close();
+	    return false;
 	}
 </script>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_126b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_126b.tmpl
index b654a23095..47d952b124 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_126b.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_126b.tmpl
@@ -13,11 +13,7 @@
 		<td>Type de disque, cylindre ou bande magnetique:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Gravure directe</option>
 			<!-- TMPL_ELSE -->
@@ -74,11 +70,7 @@
 		<td>Type de document:</td>
 		<td>
 			<select name="f2" size="1">
-			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f2u" -->
 				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
@@ -155,11 +147,6 @@
 		<td>Type de gravure:</td>
 		<td>
 			<select name="f3" size="1">
-			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3a" -->
 				<option value="a" SELECTED>Gravure laterale ou combinee</option>
 			<!-- TMPL_ELSE -->
@@ -189,7 +176,10 @@
 	function report() {
 
 
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value ;
+		var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        
+            field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value ;
 		self.close();
 		return false;
 	}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_127.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_127.tmpl
index 21ff7f6062..e6267b0375 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_127.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_127.tmpl
@@ -41,7 +41,10 @@ document.f_pop.f2.value=document.f_pop.f2.value.substring(0,2);
 document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
 
 
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value;
+		var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        
+            field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value;
 		self.close();
 		return false;
 	}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_128a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_128a.tmpl
index 1398c416cf..e4b6b9380c 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_128a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_128a.tmpl
@@ -13,11 +13,6 @@
 		<td>Forme de la composition:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1  " -->
-				<option value="  " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ai" -->
 				<option value="ai" SELECTED>Airs</option>
 			<!-- TMPL_ELSE -->
@@ -373,14 +368,14 @@
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
-	function report() {
-
-
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
-		self.close();
-		return false;
-	}
+<script type="text/javascript">
+    function report() {
+        var doc   = opener.document; 
+        var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        field.value =  document.f_pop.f1.value;
+        window.close();
+        return false;
+    }
 </script>
 </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_128b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_128b.tmpl
index e357b0c658..59dd3febb5 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_128b.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_128b.tmpl
@@ -13,11 +13,12 @@
 		<td>Instruments ou voix dans un ensemble:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1  " -->
-				<option value="  " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
-			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f1ba" -->
 				<option value="ba" SELECTED>Cor</option>
 			<!-- TMPL_ELSE -->
@@ -467,7 +468,10 @@
 	function report() {
 
 
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
+		var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        
+            field.value =  document.f_pop.f1.value;
 		self.close();
 		return false;
 	}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_128c.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_128c.tmpl
index cc01ae6edf..3b0e2cad08 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_128c.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_128c.tmpl
@@ -13,11 +13,7 @@
 		<td>Instruments ou voix dans un ensemble:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1  " -->
-				<option value="  " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
-			<!-- /TMPL_IF -->
+	
 			<!-- TMPL_IF name="f1ba" -->
 				<option value="ba" SELECTED>Cor</option>
 			<!-- TMPL_ELSE -->
@@ -463,13 +459,13 @@
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-
-
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
-		self.close();
-		return false;
+            var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+            field.value =  document.f_pop.f1.value;
+	    window.close();
+	    return false;
 	}
 </script>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_130.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_130.tmpl
index e2ae282598..d19a806baa 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_130.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_130.tmpl
@@ -13,11 +13,6 @@
 		<td>Presentation materielle:</td>
 		<td>
 			<select name="f1" size="1">
-			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Carte a fenetre</option>
 			<!-- TMPL_ELSE -->
@@ -69,11 +64,7 @@
 		<td>Polarite:</td>
 		<td>
 			<select name="f2" size="1">
-			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Positif</option>
 			<!-- TMPL_ELSE -->
@@ -100,10 +91,11 @@
 		<td>Dimensions:</td>
 		<td>
 			<select name="f3" size="1">
+
 			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3a" -->
 				<option value="a" SELECTED>8 mm (microfilm)</option>
@@ -165,12 +157,7 @@
 	<tr>
 		<td>Rapport de reduction:</td>
 		<td>
-			<select name="f4" size="1">
-			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+			<select name="f4" size="1">		
 			<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>Faible reduction</option>
 			<!-- TMPL_ELSE -->
@@ -219,11 +206,6 @@ value="<!-- TMPL_VAR name="f5" -->"></td>
 		<td>Couleur:</td>
 		<td>
 			<select name="f6" size="1">
-			<!-- TMPL_IF name="f6 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6a" -->
 				<option value="a" SELECTED>Monochrome</option>
 			<!-- TMPL_ELSE -->
@@ -250,11 +232,6 @@ value="<!-- TMPL_VAR name="f5" -->"></td>
 		<td>Emulsion:</td>
 		<td>
 			<select name="f7" size="1">
-			<!-- TMPL_IF name="f7 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7a" -->
 				<option value="a" SELECTED>Sel d'argent</option>
 			<!-- TMPL_ELSE -->
@@ -296,11 +273,6 @@ value="<!-- TMPL_VAR name="f5" -->"></td>
 		<td>Generation (copies):</td>
 		<td>
 			<select name="f8" size="1">
-			<!-- TMPL_IF name="f8 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8a" -->
 				<option value="a" SELECTED>Premiere generation (master)</option>
 			<!-- TMPL_ELSE -->
@@ -332,11 +304,6 @@ value="<!-- TMPL_VAR name="f5" -->"></td>
 		<td>Support de film:</td>
 		<td>
 			<select name="f9" size="1">
-			<!-- TMPL_IF name="f9 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9a" -->
 				<option value="a" SELECTED>Support de securite</option>
 			<!-- TMPL_ELSE -->
@@ -362,18 +329,15 @@ value="<!-- TMPL_VAR name="f5" -->"></td>
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-
 	    document.f_pop.f5.value=document.f_pop.f5.value+'   ';
-
-
-
 	    document.f_pop.f5.value=document.f_pop.f5.value.substring(0,3);
-
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value ;
-		self.close();
-		return false;
+	    var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+            field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value ;
+	    window.close();
+	    return false;
 	}
 </script>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_135a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_135a.tmpl
index f173ec5d46..1140c884a0 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_135a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_135a.tmpl
@@ -13,10 +13,11 @@
 		<td>Type de fichier informatique:</td>
 		<td>
 			<select name="f1" size="1">
+            
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Donnees numeriques</option>
@@ -57,12 +58,14 @@
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
+<script type="text/javascript">
 	function report() {
-
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
-		self.close();
-		return false;
+            var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+            
+            field.value =  document.f_pop.f1.value;
+            window.close();
+            return false;
 	}
 </script>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_140.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_140.tmpl
index 07b98ac2be..c895786051 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_140.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_140.tmpl
@@ -14,9 +14,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -59,9 +59,9 @@
 				<option value="h">Portrait</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1i" -->
-				<option value="i" SELECTED>Vedute</option>
+				<option value="i" SELECTED>Vue panoramique</option>
 			<!-- TMPL_ELSE -->
-				<option value="i">Vedute</option>
+				<option value="i">Vue panoramique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1j" -->
 				<option value="j" SELECTED>Carte</option>
@@ -108,9 +108,9 @@
 		<td>
 			<select name="f2" size="1">
 			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -153,9 +153,9 @@
 				<option value="h">Portrait</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2i" -->
-				<option value="i" SELECTED>Vedute</option>
+				<option value="i" SELECTED>Vue panoramique</option>
 			<!-- TMPL_ELSE -->
-				<option value="i">Vedute</option>
+				<option value="i">Vue panoramique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2j" -->
 				<option value="j" SELECTED>Carte</option>
@@ -202,9 +202,9 @@
 		<td>
 			<select name="f3" size="1">
 			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -247,9 +247,9 @@
 				<option value="h">Portrait</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3i" -->
-				<option value="i" SELECTED>Vedute</option>
+				<option value="i" SELECTED>Vue panoramique</option>
 			<!-- TMPL_ELSE -->
-				<option value="i">Vedute</option>
+				<option value="i">Vue panoramique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3j" -->
 				<option value="j" SELECTED>Carte</option>
@@ -295,10 +295,11 @@
 		<td>Illustration dans le texte 4:</td>
 		<td>
 			<select name="f4" size="1">
+            
 			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -341,9 +342,9 @@
 				<option value="h">Portrait</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4i" -->
-				<option value="i" SELECTED>Vedute</option>
+				<option value="i" SELECTED>Vue panoramique</option>
 			<!-- TMPL_ELSE -->
-				<option value="i">Vedute</option>
+				<option value="i">Vue panoramique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4j" -->
 				<option value="j" SELECTED>Carte</option>
@@ -390,10 +391,11 @@
 		<td>Illustration hors texte 1:</td>
 		<td>
 			<select name="f5" size="1">
+            
 			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -428,7 +430,7 @@
 			<!-- TMPL_IF name="f5l" -->
 				<option value="l" SELECTED>Plans</option>
 			<!-- TMPL_ELSE -->
-				<option value="l">Plans/option>
+				<option value="l">plans>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5m" -->
 				<option value="m" SELECTED>Musique</option>
@@ -459,10 +461,11 @@
 		<td>Illustration hors texte 2:</td>
 		<td>
 			<select name="f6" size="1">
+            
 			<!-- TMPL_IF name="f6 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -497,7 +500,7 @@
 			<!-- TMPL_IF name="f6l" -->
 				<option value="l" SELECTED>Plans</option>
 			<!-- TMPL_ELSE -->
-				<option value="l">Plans/option>
+				<option value="l">Plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6m" -->
 				<option value="m" SELECTED>Musique</option>
@@ -529,10 +532,11 @@
 		<td>Illustration hors texte 3:</td>
 		<td>
 			<select name="f7" size="1">
+            
 			<!-- TMPL_IF name="f7 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -567,7 +571,7 @@
 			<!-- TMPL_IF name="f7l" -->
 				<option value="l" SELECTED>Plans</option>
 			<!-- TMPL_ELSE -->
-				<option value="l">Plans/option>
+				<option value="l">Plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7m" -->
 				<option value="m" SELECTED>Musique</option>
@@ -598,10 +602,11 @@
 		<td>Illustration hors texte 4:</td>
 		<td>
 			<select name="f8" size="1">
+            
 			<!-- TMPL_IF name="f8 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -636,7 +641,7 @@
 			<!-- TMPL_IF name="f8l" -->
 				<option value="l" SELECTED>Plans</option>
 			<!-- TMPL_ELSE -->
-				<option value="l">Plans/option>
+				<option value="l">Plans/</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8m" -->
 				<option value="m" SELECTED>Musique</option>
@@ -667,15 +672,16 @@
 <tr>		<td>Illustration technique:</td>
 		<td>
 			<select name="f9" size="1">
+            
 			<!-- TMPL_IF name="f9 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9a" -->
-				<option value="a" SELECTED>Gravure</option>
+				<option value="a" SELECTED>Gravure sur bois</option>
 			<!-- TMPL_ELSE -->
-				<option value="a">Gravure</option>
+				<option value="a">Gravure sur bois</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9b" -->
 				<option value="b" SELECTED>Litographie</option>
@@ -716,10 +722,11 @@
 <tr>		<td>Type d'ouvrage de reference 1:</td>
 		<td>
 			<select name="f10" size="1">
+            
 			<!-- TMPL_IF name="f10  " -->
-				<option value="  " SELECTED>None</option>
+				<option value="  " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
+				<option value="  ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10aa" -->
 				<option value="aa" SELECTED>Ouvrage religieux</option>
@@ -870,10 +877,11 @@
 <tr>		<td>Type d'ouvrage de reference 2:</td>
 		<td>
 			<select name="f11" size="1">
+            
 			<!-- TMPL_IF name="f11  " -->
-				<option value="  " SELECTED>None</option>
+				<option value="  " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
+				<option value="  ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11aa" -->
 				<option value="aa" SELECTED>Ouvrage religieux</option>
@@ -1024,10 +1032,11 @@
 <tr>		<td>Type d'ouvrage de reference 3:</td>
 		<td>
 			<select name="f12" size="1">
+            
 			<!-- TMPL_IF name="f12  " -->
-				<option value="  " SELECTED>None</option>
+				<option value="  " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
+				<option value="  ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12aa" -->
 				<option value="aa" SELECTED>Ouvrage religieux</option>
@@ -1178,10 +1187,11 @@
 <tr>		<td>Type d'ouvrage de reference 4:</td>
 		<td>
 			<select name="f13" size="1">
+            
 			<!-- TMPL_IF name="f13  " -->
-				<option value="  " SELECTED>None</option>
+				<option value="  " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
+				<option value="  ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13aa" -->
 				<option value="aa" SELECTED>Ouvrage religieux</option>
@@ -1332,10 +1342,11 @@
 <tr>		<td>Genre litteraire:</td>
 		<td>
 			<select name="f14" size="1">
+
 			<!-- TMPL_IF name="f14  " -->
-				<option value="  " SELECTED>None</option>
+				<option value="  " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">None</option>
+				<option value="  ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14aa" -->
 				<option value="aa" SELECTED>Poesie</option>
@@ -1382,11 +1393,19 @@
 			<!-- TMPL_ELSE -->
 				<option value="ef">Conte de fee</option>
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f14eg" -->
 				<option value="eg" SELECTED>Allegorie</option>
 			<!-- TMPL_ELSE -->
 				<option value="eg">Allegorie</option>
 			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f14eh" -->
+				<option value="eh" SELECTED>légende</option>
+			<!-- TMPL_ELSE -->
+				<option value="eh">légende</option>
+			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f14ei" -->
 				<option value="ei" SELECTED>Parabole</option>
 			<!-- TMPL_ELSE -->
@@ -1463,9 +1482,9 @@
 				<option value="lg">Recit de voyage</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14lh" -->
-				<option value="lh" SELECTED>Erotica</option>
+				<option value="lh" SELECTED>littérature érotique</option>
 			<!-- TMPL_ELSE -->
-				<option value="lh">Erotica</option>
+				<option value="lh">littérature érotique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14li" -->
 				<option value="li" SELECTED>Litterature mystique</option>
@@ -1492,10 +1511,11 @@
 		<td>Biographie:</td>
 		<td>
 			<select name="f15" size="1">
+
 			<!-- TMPL_IF name="f15 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15a" -->
 				<option value="a" SELECTED>Autobiographie</option>
@@ -1534,10 +1554,11 @@
 		<td>Support materiel - livre:</td>
 		<td>
 			<select name="f16" size="1">
+
 			<!-- TMPL_IF name="f16 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f16a" -->
 				<option value="a" SELECTED>Papier, en general</option>
@@ -1576,11 +1597,13 @@
 		<td>Support materiel - Planche:</td>
 		<td>
 			<select name="f17" size="1">
-			<!-- TMPL_IF name="f17 " -->
-				<option value=" " SELECTED>None</option>
+
+         		<!-- TMPL_IF name="f17" -->
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f17a" -->
 				<option value="a" SELECTED>Papier, en general</option>
 			<!-- TMPL_ELSE -->
@@ -1618,11 +1641,7 @@
 		<td>Filigrane:</td>
 		<td>
 			<select name="f18" size="1">
-			<!-- TMPL_IF name="f18 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f180" -->
 				<option value="0" SELECTED>Pas de filigrane</option>
 			<!-- TMPL_ELSE -->
@@ -1640,11 +1659,7 @@
 		<td>Marque d'imprimeur:</td>
 		<td>
 			<select name="f19" size="1">
-			<!-- TMPL_IF name="f19 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f190" -->
 				<option value="0" SELECTED>Pas de marque d'imprimeur</option>
 			<!-- TMPL_ELSE -->
@@ -1662,11 +1677,7 @@
 		<td>Marque d'editeur:</td>
 		<td>
 			<select name="f20" size="1">
-			<!-- TMPL_IF name="f20 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f200" -->
 				<option value="0" SELECTED>Pas de marque d'editeur</option>
 			<!-- TMPL_ELSE -->
@@ -1684,11 +1695,7 @@
 		<td>Marque decorative:</td>
 		<td>
 			<select name="f21" size="1">
-			<!-- TMPL_IF name="f21 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f210" -->
 				<option value="0" SELECTED>Pas de marque decorative</option>
 			<!-- TMPL_ELSE -->
@@ -1705,13 +1712,14 @@
 	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
-	function report() {
-
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value+document.f_pop.f12.value+document.f_pop.f13.value+document.f_pop.f14.value+document.f_pop.f15.value+document.f_pop.f16.value+document.f_pop.f17.value+document.f_pop.f18.value+document.f_pop.f19.value+document.f_pop.f20.value+document.f_pop.f21.value;
-		self.close();
-		return false;
-	}
+<script type="text/javascript">
+    function report() {
+        var doc = opener.document; 
+        var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value+document.f_pop.f12.value+document.f_pop.f13.value+document.f_pop.f14.value+document.f_pop.f15.value+document.f_pop.f16.value+document.f_pop.f17.value+document.f_pop.f18.value+document.f_pop.f19.value+document.f_pop.f20.value+document.f_pop.f21.value;
+        self.close();
+        return false;
+    }
 </script>
 </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_141.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_141.tmpl
index b4fc4d325f..35d96df527 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_141.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_141.tmpl
@@ -13,10 +13,11 @@
 		<td>Materiau de reliure 1:</td>
 		<td>
 			<select name="f1" size="1">
+            
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Parchemin, velin</option>
@@ -68,10 +69,11 @@
 		<td>Materiau de reliure 2:</td>
 		<td>
 			<select name="f2" size="1">
+            
 			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>None</option>
+				<option value=" " SELECTED>valeur non requise</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
+				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Parchemin, velin</option>
@@ -119,15 +121,16 @@
 				<option value="z">Autre</option>
 			<!-- /TMPL_IF -->
 	</select>
-		</td></tr>	<tr>
+		</td></tr>
+                <tr>
 		<td>Materiau de reliure 3:</td>
 		<td>
 			<select name="f3" size="1">
-			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f3 " -->
+                                <option value=" " SELECTED>valeur non requise</option>
+                        <!-- TMPL_ELSE -->
+                                <option value=" ">valeur non requise</option>
+                        <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3a" -->
 				<option value="a" SELECTED>Parchemin, velin</option>
 			<!-- TMPL_ELSE -->
@@ -178,11 +181,7 @@
 		<td>Type de reliure:</td>
 		<td>
 			<select name="f4" size="1">
-			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>Originale</option>
 			<!-- TMPL_ELSE -->
@@ -227,11 +226,7 @@
 		<td>Relie avec:</td>
 		<td>
 			<select name="f5" size="1">
-			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f50" -->
 				<option value="0" SELECTED>Relie seul</option>
 			<!-- TMPL_ELSE -->
@@ -246,11 +241,7 @@
 	<td>Etat de conservation - reliure:</td>
 		<td>
 			<select name="f6" size="1">
-			<!-- TMPL_IF name="f6 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f6a" -->
 				<option value="a" SELECTED>Excellent</option>
 			<!-- TMPL_ELSE -->
@@ -290,11 +281,7 @@
 	<td>Etat de conservation - livre 1 :</td>
 		<td>
 			<select name="f7" size="1">
-			<!-- TMPL_IF name="f7 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f7a" -->
 				<option value="a" SELECTED>Excellent</option>
 			<!-- TMPL_ELSE -->
@@ -334,11 +321,7 @@
 	<td>Etat de conservation - livre 2 :</td>
 		<td>
 			<select name="f8" size="1">
-			<!-- TMPL_IF name="f8 " -->
-				<option value=" " SELECTED>None</option>
-			<!-- TMPL_ELSE -->
-				<option value=" ">None</option>
-			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF name="f8a" -->
 				<option value="a" SELECTED>Excellent</option>
 			<!-- TMPL_ELSE -->
@@ -375,16 +358,18 @@
 				<option value="z">Autre</option>
 			<!-- /TMPL_IF -->
 </td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
+	<tr><td colspan=2><input type="button" value="OK"  onclick="javascript:report()"></td></tr>
 </table>
 </form>
-<script>
-	function report() {
-
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value;
-		self.close();
-		return false;
-	}
+<script type="text/javascript">
+    function report() {
+        var doc   = opener.document; 
+        var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+    
+        field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value;
+        self.close();
+        return false;
+    }
 </script>
 </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_210c.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_210c.tmpl
index 6497a268be..25eec12df8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_210c.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_210c.tmpl
@@ -1,7 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<!-- TMPL_INCLUDE NAME="auth-search-top.inc" -->
 <div id="mainbloc">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <h1 class="authority">Authority search results</h1>
@@ -110,7 +109,10 @@ function report(index,summary)
 {    
     var regexp= /(\d* -+ *)(.*)/;
     var result=summary.match(regexp);
-    opener.document.f.field_value[index].value=result[2];
+    var doc   = opener.document; 
+    var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+
+    field.value = result[2];
     self.close();
 }
 </script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_225a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_225a.tmpl
index aed2c5072b..19ffb5a114 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_225a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_225a.tmpl
@@ -1,23 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<!-- TMPL_INCLUDE name="auth-search-top.inc" -->
-<title>UNIMARC_Field 225a builder</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>UNIMARC_Field 225a builder</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 </head>
 <body>
-<div id="mainbloc">
-	<form name="f_pop" onSubmit="javascript:report()">
-		<h2 class="authority">Collection</h2>
-		<p><label>Select a collection</label><!-- TMPL_VAR name="collection" --></p>
-		<input type="submit" value="OK" class="button authority"></p>
-	</form>
-</div>
-<script>
-	function report() {
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
-		self.close();
-		return false;
-	}
-</script>
-<!-- TMPL_INCLUDE name="auth-search-bottom.inc" -->
+    <div id="mainbloc">
+        <form name="f_pop" onSubmit="javascript:report()">
+            <h2 class="authority">Collection</h2>
+            <p><label>Select a collection</label><!-- TMPL_VAR name="collection" --></p>
+            <input type="submit" value="OK" class="button authority"></p>
+        </form>
+    </div>
+    
+    <script type="text/javascript">
+        function report() {
+            var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+            field.value =  document.f_pop.f1.value;
+            window.close();
+            return false;
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_4XX.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_4XX.tmpl
index 9ef1058c10..addd0bb2c8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_4XX.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_4XX.tmpl
@@ -1,190 +1,103 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- TMPL_IF Name="fillinput"-->
-</head>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Koha &rsaquo; Cataloging &rsaquo; 4XX plugin</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_IF NAME='fillinput' -->
 	<body>
-		<script language="JavaScript" type="text/javascript">
-		
-			function go() {
-			var index_start = <!-- TMPL_VAR NAME="index" -->;
-			var whichfield = opener.opener.document.f.tag[index_start].value;
-			i=index_start
-			// go forward, until reaching the end of the field.
-			while (i<opener.opener.document.f.field_value.length) {
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '9') {
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_9" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '0') {
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_0" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'a') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_a" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'c') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_c" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'd') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_d" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'e') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_e" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'h') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_h" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'i') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_i" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'p') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_p" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 't') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_t" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'u') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_u" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'v') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_v" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'x') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_x" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'y') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_y" -->";
-				}
-				if (opener.opener.document.f.tag[i].value != whichfield) {
-					i=opener.opener.document.f.field_value.length;
-				}
-				i++;
-			}
-			// go backward until the beginning of the field
-			i=index_start
-			while (i>=0) {
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '0') {
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_0">";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '9') {
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_9">";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'a') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_a" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'c') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_c" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'd') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_d" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'e') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_e" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'h') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_h" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'i') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_i" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'p') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_p" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 't') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_t" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'u') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_u" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'v') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_v" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'x') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_x" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'y') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_y" -->";
-				}
-				if (opener.opener.document.f.tag[i].value != whichfield) {
-					i=0;
-				}
-				i--;
-			}
-				return false;
-			}
-		</script>
-		<script language="javascript" type="text/javascript">
-			window.onload = go();
-			opener.close();
-			self.close();
-		</script>
+        <script language="javascript" type="text/javascript">
+
+            function go() {
+
+                var index_start = "<!-- TMPL_VAR NAME='index' -->";
+                var whichfield;
+                try {
+                        whichfield = opener.opener.document.getElementById(index_start);
+                } catch(e) {
+                        return;
+                }
+                
+                // browse all its subfields
+
+                var subfields = whichfield.parentNode.getElementsByTagName('input');
+
+                var re = /^tag_\d*_code_/;
+                for(var i=0, len = subfields.length ; i< len ; i++) {
+                    if(subfields[i].getAttribute('name').match(re)){ // it s a subfield
+                        var code     = subfields[i];
+                        var subfield = subfields[i+1];
+                        
+                        if(code.value == '9'){
+                                subfield.value = '<!-- TMPL_VAR NAME="subfield_value_9" -->';
+                        }
+                        if(code.value == '0'){
+                                subfield.value = '<!-- TMPL_VAR NAME="subfield_value_0" -->';
+                        }
+                        if(code.value == 'a'){
+                                subfield.value = '<!-- TMPL_VAR NAME="subfield_value_a" -->';
+                        }
+                        if(code.value == 'c'){
+                                subfield.value = '<!-- TMPL_VAR NAME="subfield_value_c" -->';
+                        }
+                        if(code.value == 'd'){
+                                subfield.value = '<!-- TMPL_VAR NAME="subfield_value_d" -->';
+                        }
+                        if(code.value == 'e'){
+                                subfield.value = '<!-- TMPL_VAR NAME="subfield_value_e" -->';
+                        }
+                        if(code.value == 'h'){
+                                subfield.value = '<!-- TMPL_VAR NAME="subfield_value_h" -->';
+                        }
+                        if(code.value == 'i'){
+                                subfield.value = '<!-- TMPL_VAR NAME="subfield_value_i" -->';
+                        }
+                        if(code.value == 'p'){
+                                subfield.value = '<!-- TMPL_VAR NAME="subfield_value_p" -->';
+                        }
+                        if(code.value == 't'){
+                                subfield.value = '<!-- TMPL_VAR NAME="subfield_value_t" -->';
+                        }
+                        if(code.value == 'u'){
+                                subfield.value = '<!-- TMPL_VAR NAME="subfield_value_u" -->';
+                        }
+                        if(code.value == 'v'){
+                                subfield.value = '<!-- TMPL_VAR NAME="subfield_value_v" -->';
+                        }
+                        if(code.value == 'x'){
+                                subfield.value = '<!-- TMPL_VAR NAME="subfield_value_x" -->';
+                        }
+                        if(code.value == 'y'){
+                                subfield.value = '<!-- TMPL_VAR NAME="subfield_value_y" -->';
+                        }
+                    }
+                }
+                    return false;
+            }
+                
+            window.onload = go();
+            opener.close();
+            window.close();
+        </script>
 	</body>
 <!-- TMPL_ELSE -->
-		<title>KOHA:INTRANET_:_Biblio_Search</title>
-	
-	<script language="JavaScript" type="text/javascript">
-	function Help() {
-		newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
-	}
-	
-	</script>
-	
-	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/intranet.css">
-	</head>
-	
 	<body>
-		<script>
+		<script type="text/javascript">
+			
+// 			document.getElementById('searchbox').focus();
+		
 			function report(value2report) {
-				if (document.f_pop.result.value.length==0) {
-					document.f_pop.result.value = value2report;
-				} else {
-					document.f_pop.result.value = document.f_pop.result.value+'|'+value2report;
-				}
-				return true;
+                            if (document.f_pop.result.value.length==0) {
+                                    document.f_pop.result.value = value2report;
+                            } else {
+                                    document.f_pop.result.value = document.f_pop.result.value+'|'+value2report;
+                            }
+                            return true;
 			}
-		</script>
-		<script>
 			function finish() {
-				opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.result.value;
-				self.close();
-				return false;
+                            opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.result.value;
+                            self.close();
+                            return false;
 			}
 		</script>
-	<!-- MENUS -->
-	<!-- TMPL_IF NAME="loggedinusername" -->
-		<p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
-	<!-- TMPL_ELSE -->
-		<p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
-	<!-- /TMPL_IF -->
     </head>
-	<div id="main">
 	<h1>KOHA : INTRANET : Catalogue </h1>
 	<!--TMPL_IF Name = "Search"-->
 		<div id="unimarc_field_4XX_search">
@@ -196,8 +109,8 @@
 				<input type="hidden" name="index" value="<!--TMPL_VAR Name="index" -->">
 				<input type="hidden" name="result" value="unimarc field 4 <!--TMPL_VAR Name="index" -->">
 				<input type="hidden" name="op" value="do_search">
-				<label class="label100" for="keyword">Any word</label>
-				<input type="text" name="search" id="keyword" size="35">
+				<label class="label100" for="searchbox">Any word</label>
+				<input type="text" name="search" id="searchbox" size="35">
 			</p>
 			<p>
 				<input type="submit" value="Start search">
@@ -225,18 +138,18 @@
 				</tr>
 				<!-- TMPL_LOOP NAME="result" -->
 				<tr>
-					<td<!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
-								<!-- TMPL_IF name="MARC_ON" -->
-									<a_class="transparent resultlist" href="/cgi-bin/koha/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" ESCAPE="HTML"--></a>
-								<!-- TMPL_ELSE -->
-									<a_class="transparent resultlist" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" ESCAPE="HTML" --></a>				<!-- /TMPL_IF -->
-							<p><!-- TMPL_VAR NAME="author" -->
-							<!-- TMPL_IF NAME="publishercode" -->- <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
-							<!-- TMPL_IF NAME="place" --> ; <!-- TMPL_VAR NAME="place" --><!-- /TMPL_IF -->
-							<!-- TMPL_IF NAME="pages" --> - <!-- TMPL_VAR NAME="pages" --><!-- /TMPL_IF -->
-							<!-- TMPL_IF NAME="notes" --> : <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF -->
-							<!-- TMPL_IF NAME="size" --> ; <!-- TMPL_VAR NAME="size" --><!-- /TMPL_IF -->
-						</p>
+                                    <td<!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
+                                                            <!-- TMPL_IF name="MARC_ON" -->
+                                                                    <a_class="transparent resultlist" href="/cgi-bin/koha/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" ESCAPE="HTML"--></a>
+                                                            <!-- TMPL_ELSE -->
+                                                                    <a_class="transparent resultlist" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" ESCAPE="HTML" --></a>				<!-- /TMPL_IF -->
+                                                    <p><!-- TMPL_VAR NAME="author" -->
+                                                    <!-- TMPL_IF NAME="publishercode" -->- <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
+                                                    <!-- TMPL_IF NAME="place" --> ; <!-- TMPL_VAR NAME="place" --><!-- /TMPL_IF -->
+                                                    <!-- TMPL_IF NAME="pages" --> - <!-- TMPL_VAR NAME="pages" --><!-- /TMPL_IF -->
+                                                    <!-- TMPL_IF NAME="notes" --> : <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF -->
+                                                    <!-- TMPL_IF NAME="size" --> ; <!-- TMPL_VAR NAME="size" --><!-- /TMPL_IF -->
+                                            </p>
 					</td>
 					<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
 						<!-- TMPL_VAR NAME="totitem" -->
@@ -251,26 +164,47 @@
 						<a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&index=<!--TMPL_VAR Name="index"-->&bibnum=<!--TMPL_VAR Name="biblionumber"-->&type=intranet&op=fillinput')">Clear Field</a>
                       <!--/TMPL_IF-->
 					</td>
-	
 				</tr>
 				<!-- /TMPL_LOOP -->
 			</table>
 		</div>
 		<div id="resultnumber">
-			<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&lt;&lt;Previous</a><!-- /TMPL_IF -->
-				<!-- TMPL_LOOP NAME="numbers" --><!-- TMPL_IF NAME="highlight" --> <span class="highlight"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE --> <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a><!-- /TMPL_IF --><!-- /TMPL_LOOP --> <!-- TMPL_IF NAME="displaynext" --><a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">Next&gt;&gt;</a><!-- /TMPL_IF --></p>
+			<p>
+				<!-- TMPL_IF NAME="displayprev" -->
+				<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+					&lt;&lt;Previous
+				</a>
+				<!-- /TMPL_IF -->
+
+				<!-- TMPL_LOOP NAME="numbers" -->
+					<!-- TMPL_IF NAME="highlight" -->
+						<span class="highlight">
+							<!-- TMPL_VAR NAME="number" -->
+						</span>
+					<!-- TMPL_ELSE -->
+						<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+							<!-- TMPL_VAR NAME="number" -->
+						</a>
+					<!-- /TMPL_IF -->
+				<!-- /TMPL_LOOP -->
+
+				<!-- TMPL_IF NAME="displaynext" -->
+				<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+					Next&gt;&gt;
+				</a>
+				<!-- /TMPL_IF -->
+			</p>
 		</div>
 	
 		<script language="JavaScript" type="text/javascript">
 		
-		function jumpfull(page)
-		{	
+		function jumpfull(page){	
 			window.open(page,'','fullscreen,scrollbars');
 		}
 		</script>
 		
 	<!--/TMPL_IF-->
-	</div>
-	</body>
-<!--/TMPL_IF -->
+
+</body>
+<!-- /TMPL_IF -->
 </html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_60X.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_60X.tmpl
index ecf0b7d4f5..bf51d7a119 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_60X.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_60X.tmpl
@@ -7,22 +7,24 @@
 	<title>Thesaurus_search</title>
 </head>
 <body>
-	<script>
-		function report(value2report) {
-			if (document.f_pop.result.value.length==0) {
-				document.f_pop.result.value = value2report;
-			} else {
-				document.f_pop.result.value = document.f_pop.result.value+'|'+value2report;
-			}
-			return true;
-		}
-	</script>
-	<script>
-		function finish() {
-			opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.result.value;
-			self.close();
-			return false;
-		}
+	<script type="text/javascript">
+            function report(value2report) {
+                //alert('report');
+                if (document.f_pop.result.value.length==0) {
+                        document.f_pop.result.value = value2report;
+                } else {
+                        document.f_pop.result.value = document.f_pop.result.value+'|'+value2report;
+                }
+                return true;
+            }
+
+            function finish() {
+                //alert(opener.document.getElementById("<!-- TMPL_VAR name="index" -->").value);
+                //alert(document.f_pop.result.value);
+                opener.document.getElementById("<!-- TMPL_VAR name="index" -->").value = document.f_pop.result.value;
+                window.close();
+                return false;
+            }
 	</script>
 	<form name="f_pop" action="cataloguing/plugin_launcher.pl" method="post">
 		<input type="hidden" name="plugin_name" value="unimarc_field_60X.pl">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_700-4.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_700-4.tmpl
index 5c88b2454f..188248aad5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_700-4.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_700-4.tmpl
@@ -7,7 +7,7 @@
 <title>UNIMARC_constructeur champ 700-4</title>
 </head>
 <body>
-<p>Sélectionnez la valeur pour le champ 700 $4. Elle sera automatiquement reportée dans la zone 700 $8 qui suit.</p>
+<p>Sélectionnez la valeur pour le champ 700 $4. Elle sera automatiquement reportée dans la zone 700 $8 qui suit.</p>
 <form name="f_pop" onSubmit="javascript:report()">
 <table>
 	<tr>
@@ -15,7 +15,7 @@
 		<option value="075 - postface" <!-- TMPL_IF name="f1_075" -->SELECTED<!-- /TMPL_IF -->>postface</option>
 			<option value="651 - dir. de publication" <!-- TMPL_IF name="f1_651" -->SELECTED<!-- /TMPL_IF -->>dir. de publication</option>
 			<option value="440 - illustrateur" <!-- TMPL_IF name="f1_440" -->SELECTED<!-- /TMPL_IF -->>illustrateur</option>
-			<option value="080 - préface, notes" <!-- TMPL_IF name="f1_080" -->SELECTED<!-- /TMPL_IF -->>préface, notes</option>
+			<option value="080 - préface, notes" <!-- TMPL_IF name="f1_080" -->SELECTED<!-- /TMPL_IF -->>préface, notes</option>
 			<option value="730 - traducteur" <!-- TMPL_IF name="f1_730" -->SELECTED<!-- /TMPL_IF -->>traducteur</option>
 			</select>
 		</td>
@@ -26,7 +26,10 @@
 <script>
 	function report() {
 		x = document.f_pop.f1.value.split(' - ');
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= x[0];
+		var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        
+            field.value =  x[0];
 		if (<!-- TMPL_VAR name="index2" -->>0) {
 			opener.document.f.field_value[<!-- TMPL_VAR name="index2" -->].value= x[1];
 		}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_leader.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_leader.tmpl
index d293028b44..8e9e6a3073 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_leader.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_leader.tmpl
@@ -17,6 +17,12 @@
 		<td>5- Etat de la notice</td>
 		<td>
 			<select name="f5" size="1">
+			<!-- TMPL_IF name="f5|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
+            
 			<!-- TMPL_IF name="f5c" -->
 				<option value="c" SELECTED>c- Notice corrigée</option>
 			<!-- TMPL_ELSE -->
@@ -49,66 +55,90 @@
 		<td>6- Type de document</td>
 		<td>
 			<select name="f6" size="1">
+			<!-- TMPL_IF name="f6|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
+            
 			<!-- TMPL_IF name="f6a" -->
 				<option value="a" SELECTED>a- Texte imprimé</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">a- Texte imprimé</option>
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f6b" -->
 				<option value="b" SELECTED>b- Texte manuscrit</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">b- Texte manuscrit</option>
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f6c" -->
 				<option value="c" SELECTED>c- Partition musicale imprimée</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">c- Partition musicale imprimée</option>
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f6d" -->
 				<option value="d" SELECTED>d- Partition musicale manuscrite</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">d- Partition musicale manuscrite</option>
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f6e" -->
 				<option value="e" SELECTED>e- doc cartographique imprimé</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">e- doc cartographique imprimé</option>
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f6f" -->
 				<option value="f" SELECTED>f - doc cartographique manuscrit</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">f - doc cartographique manuscrit</option>
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f6g" -->
 				<option value="g" SELECTED>g - doc projeté ou vidéo</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">g - doc projeté ou vidéo</option>
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f6i" -->
 				<option value="i" SELECTED>i - enreg sonore non musical</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">i - enreg sonore non musical</option>
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f6j" -->
 				<option value="j" SELECTED>j - enreg sonore musical</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">j - enreg sonore musical</option>
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f6k" -->
 				<option value="k" SELECTED>k - doc graphique 2 dimensions</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">k - doc graphique 2 dimensions</option>
 			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f6l" -->
+				<option value="l" SELECTED>l - support électronique</option>
+			<!-- TMPL_ELSE -->
+				<option value="l">l - support électronique</option>
+			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f6m" -->
 				<option value="m" SELECTED>m - doc multimédia</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">m - doc multimédia</option>
 			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f6r" -->
 				<option value="r" SELECTED>r - Objet à 3 dimension, artefact</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">r - Objet à 3 dimension, artefact</option>
 			<!-- /TMPL_IF -->
+			
 			</select>
 		</td>
 	</tr>
@@ -116,6 +146,12 @@
 		<td>7- Type de la notice</td>
 		<td>
 			<select name="f7" size="1">
+			<!-- TMPL_IF name="f7|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
+            
 				<!-- TMPL_IF name="f7a" -->
 					<option value="a" SELECTED>a- Analytique (partie composante)</option>
 				<!-- TMPL_ELSE -->
@@ -141,29 +177,39 @@
 	</tr>
 	
 	<tr>
-		<td>8- Niveau hi�rarchique</td>
+		<td>8- Niveau hiérarchique</td>
 		<td>
 			<select name="f8" size="1">
+			<!-- TMPL_IF name="f8|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
+            
 				<!-- TMPL_IF name="f8 " -->
-					<option value=" " SELECTED>Non défini</option>
+					<option value=" " SELECTED> - Relation hiérachique non définie</option>
 				<!-- TMPL_ELSE -->
-					<option value=" ">Non défini</option>
+					<option value=" "> - Relation hiérachique non définie</option>
 				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="f81" -->
-					<option value="1" SELECTED>1- Pas de relation hiérarchique</option>
+				
+				<!-- TMPL_IF name="f80" -->
+					<option value="0" SELECTED>0- Pas de relation hiérarchique</option>
 				<!-- TMPL_ELSE -->
-					<option value="1">1- Pas de relation hiérarchique</option>
+					<option value="0">0- Pas de relation hiérarchique</option>
 				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="f82" -->
-					<option value="2" SELECTED>2- Notice de niveau le + élevé</option>
+				
+				<!-- TMPL_IF name="f81" -->
+					<option value="1" SELECTED>1- Notice de niveau le + élevé (notice mère)</option>
 				<!-- TMPL_ELSE -->
-					<option value="2">a- Notice de niveau le + élevé</option>
+					<option value="1">1- Notice de niveau le + élevé (notice mère)</option>
 				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="f83" -->
-					<option value="3" SELECTED>3- Notice fille</option>
+				
+				<!-- TMPL_IF name='f82' -->
+					<option value="2" SELECTED>2- Notice de niveau inférieur au niveau le plus élevé (notice fille)</option>
 				<!-- TMPL_ELSE -->
-					<option value="3">3- Notice fille</option>
+					<option value="2">2- Notice de niveau inférieur au niveau le plus élevé (notice fille)</option>
 				<!-- /TMPL_IF -->
+				
 			</select>
 		</td>
 	</tr>
@@ -175,6 +221,12 @@
 		<td>17- Niveau de catalogage</td>
 		<td>
 			<select name="f17" size="1">
+			<!-- TMPL_IF name="f17|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
+            
 				<!-- TMPL_IF name="f17 " -->
 					<option value=" " SELECTED>Rédigée "document en mains"</option>
 				<!-- TMPL_ELSE -->
@@ -203,6 +255,12 @@
 		<td>18 - Descriptive cataloging form</td>
 		<td>
 			<select name="f18" size="1">
+			<!-- TMPL_IF name="f18|" -->
+            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            <!-- TMPL_ELSE -->
+            	<option value="|">|- Caractère de remplissage</option>
+            <!-- /TMPL_IF -->
+            
 				<!-- TMPL_IF name="f18 " -->
 					<option value=" " SELECTED> conforme ISBD</option>
 				<!-- TMPL_ELSE -->
@@ -232,12 +290,14 @@
 </form>
 <script>
 function report() {
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value = 
-			'     '+document.f_pop.f5.value +
+	    var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        
+            field.value =  '     '+document.f_pop.f5.value +
 			document.f_pop.f6.value+ document.f_pop.f7.value+
 			document.f_pop.f8.value+ '        '+
 			document.f_pop.f17.value+ document.f_pop.f18.value+' 450  ';
-		self.close();
+		window.close();
 		return false;
 	}
 </script>
-- 
2.20.1