From 5b41a8e2622f5e921b9061646f3155ce5352bfdc Mon Sep 17 00:00:00 2001
From: tgarip1957 <tgarip1957>
Date: Mon, 11 Sep 2006 17:41:54 +0000
Subject: [PATCH] New XML API

---
 admin/aqbookfund.pl                           |   88 +-
 admin/branches.pl                             |    2 +-
 catalogue/ISBDdetail.pl                       |   19 +-
 catalogue/catalogue-search.pl                 |   22 +-
 catalogue/moredetail.pl                       |    3 +-
 export/export.pl                              |   34 -
 export/marc.pl                                |  116 --
 import/breeding.pl                            |  204 ---
 .../prog/en/admin/admin-home.tmpl             |   94 +-
 .../prog/en/admin/aqbookfund.tmpl             |  268 ++--
 .../intranet-tmpl/prog/en/admin/aqbudget.tmpl |    8 +-
 .../en/admin/auth_subfields_structure.tmpl    |    7 +-
 .../prog/en/admin/biblios_framework.tmpl      |  131 ++
 .../en/admin/biblios_subfields_structure.tmpl |  134 ++
 .../prog/en/admin/bibliostagstructure.tmpl    |  207 +++
 .../prog/en/admin/checkmarc.tmpl              |  108 +-
 .../admin/holdings_subfields_structure.tmpl   |  131 ++
 .../prog/en/admin/holdingstagstructure.tmpl   |  205 +++
 .../prog/en/admin/institutions-careers.tmpl   |  126 ++
 .../prog/en/admin/koha-electronic.tmpl        |  113 ++
 .../prog/en/admin/koha_attr.tmpl              |  194 +++
 .../prog/en/admin/stopwords.tmpl              |  233 ++--
 .../prog/en/admin/systempreferences.tmpl      |    9 +
 .../prog/en/admin/thesaurus.tmpl              |   44 +-
 .../intranet-tmpl/prog/en/admin/viewlog.tmpl  |   90 +-
 .../prog/en/authorities/auth_finder.tmpl      |   54 +
 .../prog/en/authorities/authorities-home.tmpl |  145 +--
 .../prog/en/authorities/authorities.tmpl      |  357 ++++--
 .../blinddetail-biblio-search.tmpl            |   41 +
 .../en/authorities/blinddetail-linker.tmpl    |   40 +-
 .../prog/en/authorities/detail.tmpl           |   77 +-
 .../en/authorities/linkresultlist-auth.tmpl   |   22 +-
 .../en/authorities/searchresultlist-auth.tmpl |   95 ++
 .../prog/en/authorities/searchresultlist.tmpl |  154 ++-
 .../prog/en/catalogue/ISBDdetail.tmpl         |   68 +-
 .../prog/en/catalogue/MARCdetail.tmpl         |  603 ++++-----
 .../prog/en/catalogue/catalogue_search.tmpl   |  162 +++
 .../en/catalogue/catalogue_searchresults.tmpl |  235 ++++
 .../prog/en/catalogue/detail.tmpl             |  283 ++---
 .../prog/en/catalogue/detailprint.tmpl        |   43 +
 .../prog/en/catalogue/moredetail.tmpl         |   87 ++
 .../prog/en/circ/branchtransfers.tmpl         |   67 +-
 .../prog/en/circ/circulation.tmpl             | 1024 ++++-----------
 .../intranet-tmpl/prog/en/circ/returns.tmpl   |   95 +-
 .../prog/en/help/admin/aqbookfund.tmpl        |    4 +-
 .../help/admin/auth_subfields_structure.tmpl  |    3 +-
 .../prog/en/help/admin/authorised_values.tmpl |    4 +-
 .../prog/en/help/admin/authtypes.tmpl         |    4 +-
 ..._framework.tmpl => biblios_framework.tmpl} |    4 +-
 .../prog/en/help/admin/branches.tmpl          |    4 +-
 .../prog/en/help/admin/categorie.tmpl         |    4 +-
 .../prog/en/help/admin/checkmarc.tmpl         |    4 +-
 .../prog/en/help/admin/currency.tmpl          |    4 +-
 .../admin/holdings_subfields_structure.tmpl   |   33 +
 .../en/help/admin/holdingstagstructure.tmpl   |   26 +
 .../prog/en/help/admin/issuingrules.tmpl      |    4 +-
 .../prog/en/help/admin/itemtypes.tmpl         |    4 +-
 .../prog/en/help/admin/koha2marclinks.tmpl    |    4 +-
 .../help/admin/marc_subfields_structure.tmpl  |   33 +-
 .../prog/en/help/admin/marctagstructure.tmpl  |    4 +-
 .../prog/en/help/admin/printers.tmpl          |    4 +-
 .../prog/en/help/admin/stopwords.tmpl         |    4 +-
 .../prog/en/help/admin/systempreferences.tmpl |    6 +-
 .../prog/en/help/admin/z3950servers.tmpl      |    4 +-
 .../prog/en/serials/acqui-search-result.tmpl  |    2 +-
 .../prog/en/serials/acqui-search.tmpl         |    4 +-
 .../intranet-tmpl/prog/en/serials/claims.tmpl |    6 +-
 .../prog/en/serials/distributedto.tmpl        |    7 +-
 .../prog/en/serials/lateissues.tmpl           |    4 +-
 .../prog/en/serials/printlist.tmpl            |    4 +-
 .../en/serials/receipt-search-result.tmpl     |    6 +-
 .../intranet-tmpl/prog/en/serials/result.tmpl |   86 ++
 .../prog/en/serials/routing-preview.tmpl      |    7 +-
 .../prog/en/serials/routing.tmpl              |   10 +-
 .../prog/en/serials/serial-issues-full.tmpl   |   12 +-
 .../prog/en/serials/serial-issues.tmpl        |   25 +-
 .../prog/en/serials/serials-home.tmpl         |   70 +-
 .../prog/en/serials/serials-receive.tmpl      |  187 +++
 .../prog/en/serials/subscription-add.tmpl     |  923 ++++++++++++--
 .../en/serials/subscription-bib-search.tmpl   |   97 +-
 .../prog/en/serials/subscription-detail.tmpl  |  426 +++++--
 .../prog/en/serials/subscription-renew.tmpl   |    2 +-
 .../prog/en/serials/viewalerts.tmpl           |   28 +
 .../intranet-tmpl/prog/en/tools/export.tmpl   |   39 +-
 .../prog/en/tools/koha-news.tmpl              |  204 +--
 .../en/value_builder/marc21_008_holdings.tmpl |  688 ++++++++++
 .../en/value_builder/marc21_field_006.tmpl    |  449 +++++++
 .../en/value_builder/marc21_field_007.tmpl    |   79 ++
 .../en/value_builder/marc21_field_008.tmpl    |  634 ++++++++++
 .../prog/en/value_builder/marc21_leader.tmpl  |  328 +++++
 .../marc21_leader_authorities.tmpl            |  117 ++
 .../value_builder/marc21_leader_holdings.tmpl |  177 +++
 .../prog/en/z3950/searchresult.tmpl           |   80 +-
 reports/acquisitions_stats.pl                 | 1116 +++++++----------
 reports/bor_issues_top.pl                     |   87 +-
 reports/borrowers_out.pl                      |   56 +-
 reports/borrowers_stats.pl                    |   44 +-
 reports/borrowers_stats.plugin                |  183 +++
 reports/cat_issues_top.pl                     |   84 +-
 reports/catalogue_out.pl                      |   60 +-
 reports/catalogue_stats.pl                    |  249 ++--
 reports/inventory.pl                          |   95 +-
 reports/issues_avg_stats.pl                   |   10 +-
 reports/issues_by_borrower_category.plugin    |    9 +-
 reports/issues_stats.pl                       |   44 +-
 reports/itemtypes.plugin                      |   16 +-
 reports/manager.pl                            |    9 +-
 reports/overdue.pl                            |   83 +-
 reports/reports-home.pl                       |    4 -
 reports/reservereport.pl                      |   88 +-
 reports/stats.pl                              |   46 +-
 reports/stats.print.pl                        |   25 +-
 reports/stats.screen.pl                       |  170 +--
 reports/transfers.plugin                      |  105 ++
 reserve/modrequest.pl                         |    8 +-
 reserve/placerequest.pl                       |   77 +-
 reserve/renewscript.pl                        |   69 -
 reserve/request.pl                            |  484 ++-----
 serials/serials-receive.pl                    |    1 -
 tools/export.pl                               |  101 +-
 tools/holidays.pl                             |   38 +-
 tools/import.pl                               |  335 +----
 tools/koha-news.pl                            |    2 +-
 tools/newHolidays.pl                          |    8 +-
 tools/overduerules.pl                         |    7 +-
 125 files changed, 9244 insertions(+), 5573 deletions(-)
 delete mode 100755 export/export.pl
 delete mode 100755 export/marc.pl
 delete mode 100755 import/breeding.pl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/admin/biblios_framework.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/admin/biblios_subfields_structure.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/admin/bibliostagstructure.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/admin/holdings_subfields_structure.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/admin/holdingstagstructure.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/admin/institutions-careers.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/admin/koha-electronic.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/admin/koha_attr.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/authorities/auth_finder.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/catalogue/catalogue_search.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/catalogue/catalogue_searchresults.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/catalogue/detailprint.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl
 rename koha-tmpl/intranet-tmpl/prog/en/help/admin/{biblio_framework.tmpl => biblios_framework.tmpl} (91%)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/help/admin/holdings_subfields_structure.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/help/admin/holdingstagstructure.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/serials/result.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/serials/serials-receive.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/serials/viewalerts.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_008_holdings.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_field_006.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_field_007.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_field_008.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_leader.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_leader_authorities.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_leader_holdings.tmpl
 create mode 100644 reports/borrowers_stats.plugin
 create mode 100644 reports/transfers.plugin
 delete mode 100755 reserve/renewscript.pl

diff --git a/admin/aqbookfund.pl b/admin/aqbookfund.pl
index 21de612ab6..bb2a297b31 100755
--- a/admin/aqbookfund.pl
+++ b/admin/aqbookfund.pl
@@ -41,22 +41,41 @@ use strict;
 use CGI;
 use C4::Auth;
 use C4::Context;
-use C4::Output;
+use C4::Acquisition;
+use C4::Koha;
 use C4::Interface::CGI::Output;
 use C4::Search;
 use C4::Date;
 
+
 sub StringSearch  {
-	my ($env,$searchstring,$type)=@_;
+	my ($env,$searchstring,%branches)=@_;
 	my $dbh = C4::Context->dbh;
 	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
+	my @data=split(' ',$searchstring) if ($searchstring ne "");
 	my $count=@data;
-	my $sth=$dbh->prepare("select bookfundid,bookfundname,bookfundgroup from aqbookfund where (bookfundname like ?) order by bookfundid");
-	$sth->execute("%$data[0]%");
+	my $strsth= "select bookfundid,bookfundname,bookfundgroup,branchcode from aqbookfund where 1 ";
+	$strsth.=" AND bookfundname like ? " if ($searchstring ne "");
+	if (%branches){
+		$strsth.= "AND (aqbookfund.branchcode is null " ;
+		foreach my $branchcode (keys %branches){
+			$strsth .= "or aqbookfund.branchcode = '".$branchcode."' "; 
+		}
+		$strsth .= ") ";
+	}
+	$strsth.= "order by aqbookfund.bookfundid";
+#	warn "chaine de recherche : ".$strsth;
+	
+	my $sth=$dbh->prepare($strsth);
+	if ($searchstring){
+		$sth->execute("%$data[0]%");
+	} else {
+		$sth->execute;
+	}
 	my @results;
 	while (my $data=$sth->fetchrow_hashref){
 		push(@results,$data);
+#		warn "id ".$data->{bookfundid}." name ".$data->{bookfundname}." branchcode ".$data->{branchcode};
 	}
 	#  $sth->execute;
 	$sth->finish;
@@ -91,6 +110,26 @@ $template->param(script_name => $script_name,
 $template->param(action => $script_name);
 
 
+my @select_branch;
+my %select_branches;
+my ($branches)=GetBranches();
+
+push @select_branch,"";
+$select_branches{""}="";
+
+my $homebranch=C4::Context->userenv->{branch};
+foreach my $brnch (keys %$branches){
+	push @select_branch, $branches->{$brnch}->{'branchcode'};#
+	$select_branches{$branches->{$brnch}->{'branchcode'}} = $branches->{$brnch}->{'branchname'};
+}
+
+my $CGIbranch=CGI::scrolling_list( -name     => 'branchcode',
+			-values   => \@select_branch,
+			-labels   => \%select_branches,
+			-size     => 1,
+			-multiple => 0 );
+$template->param(CGIbranch => $CGIbranch);
+
 ################## ADD_FORM ##################################
 # called by default. Used to create form to add or  modify a record
 if ($op eq 'add_form') {
@@ -130,9 +169,15 @@ if ($op eq 'add_form') {
 	my $sth=$dbh->prepare("delete from aqbookfund where bookfundid =?");
 	$sth->execute($bookfundid);
 	$sth->finish;
-	my $sth=$dbh->prepare("replace aqbookfund (bookfundid,bookfundname) values (?,?)");
-	$sth->execute($input->param('bookfundid'),$input->param('bookfundname'));
-	$sth->finish;
+	if ($input->param('branchcode') ne ""){
+		my $sth=$dbh->prepare("replace aqbookfund (bookfundid,bookfundname,branchcode) values (?,?,?)");
+		$sth->execute($input->param('bookfundid'),$input->param('bookfundname'),$input->param('branchcode'));
+		$sth->finish;
+	} else {
+		my $sth=$dbh->prepare("replace aqbookfund (bookfundid,bookfundname) values (?,?)");
+		$sth->execute($input->param('bookfundid'),$input->param('bookfundname'));
+		$sth->finish;
+	}
 	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=aqbookfund.pl\"></html>";
 	exit;
 			
@@ -168,29 +213,50 @@ if ($op eq 'add_form') {
 		$template->param(searchfield => $searchfield);
 	}
 	my $env;
-	my ($count,$results)=StringSearch($env,$searchfield,'web');
+	my ($count,$results)=StringSearch($env,$searchfield,%select_branches);
 	my $toggle="white";
 	my @loop_data =();
 	my $dbh = C4::Context->dbh;
-	my $sth2 = $dbh->prepare("Select aqbudgetid,startdate,enddate,budgetamount from aqbudget where bookfundid = ? order by bookfundid");
 	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
+# 		warn "i ".$i." offset".$offset." pagesize ".$pagesize." id ".$results->[$i]{bookfundid}." name ".$results->[$i]{bookfundname}." branchcode ".$results->[$i]{branchcode};
 		my %row_data;
 		$row_data{bookfundid} =$results->[$i]{'bookfundid'};
 		$row_data{bookfundname} = $results->[$i]{'bookfundname'};
+#  		warn "".$results->[$i]{'bookfundid'}." ".$results->[$i]{'bookfundname'}." ".$results->[$i]{'branchcode'};
+		$row_data{branchname} = $select_branches{$results->[$i]{'branchcode'}};
+		my $strsth2="Select aqbudgetid,startdate,enddate,budgetamount from aqbudget where aqbudget.bookfundid = ?";
+# 		my $strsth2="Select aqbudgetid,startdate,enddate,budgetamount,branchcode from aqbudget where aqbudget.bookfundid = ?";
+# 		if ($homebranch){
+# 			$strsth2 .= " AND ((aqbudget.branchcode is null) OR (aqbudget.branchcode='') OR (aqbudget.branchcode= ".$dbh->quote($homebranch).")) " ;
+# 		} else {
+# 			$strsth2 .= " AND (aqbudget.branchcode='') " if ((C4::Context->userenv) && (C4::Context->userenv->{flags}>1));
+# 		}
+		$strsth2 .= " order by aqbudgetid";
+#  		warn "".$strsth2;
+		my $sth2 = $dbh->prepare($strsth2);
 		$sth2->execute($row_data{bookfundid});
 		my @budget_loop;
+# 		while (my ($aqbudgetid,$startdate,$enddate,$budgetamount,$branchcode) = $sth2->fetchrow) {
 		while (my ($aqbudgetid,$startdate,$enddate,$budgetamount) = $sth2->fetchrow) {
 			my %budgetrow_data;
 			$budgetrow_data{aqbudgetid} = $aqbudgetid;
 			$budgetrow_data{startdate} = format_date($startdate);
 			$budgetrow_data{enddate} = format_date($enddate);
 			$budgetrow_data{budgetamount} = $budgetamount;
+# 			$budgetrow_data{branchcode} = $branchcode;
 			push @budget_loop,\%budgetrow_data;
 		}
 		$row_data{budget} = \@budget_loop;
 		push @loop_data,\%row_data;
 	}
+	$template->param(max => (($count>$offset+$pagesize)?$offset+$pagesize:$count));
+	$template->param(min => ($offset?$offset:1));
+	$template->param(nbresults => $count);
+	$template->param(Next => ($count>$offset+$pagesize)) if ($count>$offset+$pagesize);
 	$template->param(bookfund => \@loop_data);
 } #---- END $OP eq DEFAULT
-
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+		IntranetNav => C4::Context->preference("IntranetNav"),
+		);
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/admin/branches.pl b/admin/branches.pl
index 47322cab0c..98f1dd6b15 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -29,7 +29,7 @@ use C4::Search;
 # Fixed variables
 my $linecolor1='#ffffcc';
 my $linecolor2='white';
-my $backgroundimage="/images/background-mem.gif";
+
 my $script_name="/cgi-bin/koha/admin/branches.pl";
 my $pagesize=20;
 
diff --git a/catalogue/ISBDdetail.pl b/catalogue/ISBDdetail.pl
index 681e48071d..e6b39e1078 100755
--- a/catalogue/ISBDdetail.pl
+++ b/catalogue/ISBDdetail.pl
@@ -43,18 +43,24 @@ use C4::Context;
 use C4::Output;
 use C4::Interface::CGI::Output;
 use CGI;
-use C4::Koha;
+use C4::Search;
+use MARC::Record;
 use C4::Biblio;
+use C4::Acquisition;
+use HTML::Template;
 
 my $query=new CGI;
 
 my $dbh=C4::Context->dbh;
 
-my $biblionumber=$query->param('biblionumber');
-my $itemtype = &MARCfind_frameworkcode($dbh,$biblionumber);
+my $biblionumber=$query->param('bib');
+my $bibid = $query->param('bibid');
+$bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless $bibid;
+$biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless $biblionumber;
+my $itemtype = &MARCfind_frameworkcode($dbh,$bibid);
 my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
 
-my $record =MARCgetbiblio($dbh,$biblionumber);
+my $record =MARCgetbiblio($dbh,$bibid);
 # open template
 my ($template, $loggedinuser, $cookie)
 		= get_template_and_user({template_name => "catalogue/ISBDdetail.tmpl",
@@ -129,13 +135,12 @@ sub get_authorised_value_desc ($$$$$) {
 
    #---- branch
     if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
-       return getbranchdetail($value)->{branchname};
+       return getbranchname($value);
     }
 
    #---- itemtypes
    if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
-   		my $itemtypedef = getitemtypeinfo($itemtype);
-       return $itemtypedef->{description};
+       return ItemType($value);
     }
 
    #---- "true" authorized value
diff --git a/catalogue/catalogue-search.pl b/catalogue/catalogue-search.pl
index a583d78b22..0a5d9807a6 100644
--- a/catalogue/catalogue-search.pl
+++ b/catalogue/catalogue-search.pl
@@ -1,8 +1,7 @@
 #!/usr/bin/perl
 use strict;
-require Exporter;
+
 use CGI;
-#use C4::Interface::CGI::KOHACGI;
 use C4::Search;
 use C4::Auth;
 use C4::Interface::CGI::Output;
@@ -12,7 +11,7 @@ use POSIX qw(ceil floor);
 
 my $query = new CGI;
 my $dbh = C4::Context->dbh;
-$query->charset('UTF8');
+
 my $op = $query->param('op'); #show the search form or execute the search
 
 my $format=$query->param('MARC');
@@ -28,12 +27,29 @@ my $reorder=$query->param('reorder');
 my $number_of_results=$query->param('number_of_results');
 my $zoom=$query->param('zoom');
 my $ascend=$query->param('asc');
+
+my @marclist = $query->param('marclist');
 # collect all the fields ...
 my %search;
 my @forminputs;		#this is for the links to navigate among the results
 my (@searchdesc, %hashdesc); 	#this is to show the description of the current search
 my @fields = ('value', 'kohafield', 'and_or', 'relation','order','barcode','biblionumber','itemnumber','asc','from');
 
+###Collect all the marclist values coming from old Koha MARCdetails
+## Although we can not search on all marc fields- if any is matched in Zebra we can use it it
+my $sth=$dbh->prepare("Select marctokoha from koha_attr where tagfield=? and tagsubfield=? and intrashow=1");
+foreach my $marc (@marclist) {
+		if ($marc) {
+		$sth->execute(substr($marc,0,3),substr($marc,3,1));
+			if ((my $kohafield)=$sth->fetchrow){
+			push @kohafield,$kohafield;
+			push @and_or,"\@or";
+			push @value,@value[0] if @kohafield>1;
+			push @relation ,"\@attr 5=1";
+			}
+		}
+}
+#### Now   normal search routine
 foreach my $field (@fields) {
 	$search{$field} = $query->param($field);
 	if ($search{$field}) {
diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl
index e9975f8ab4..cbf800e608 100755
--- a/catalogue/moredetail.pl
+++ b/catalogue/moredetail.pl
@@ -26,7 +26,6 @@ use C4::Koha;
 use CGI;
 use C4::Search;
 use C4::Acquisition;
-use C4::Output; # contains gettemplate
 use C4::Auth;
 use C4::Interface::CGI::Output;
 use C4::Date;
@@ -34,7 +33,7 @@ use C4::Context;
 use C4::Biblio;
 use C4::Accounts2;
 use C4::Circulation::Circ2;
-use MARC::Record;
+
 my $dbh=C4::Context->dbh;
 my $query=new CGI;
 
diff --git a/export/export.pl b/export/export.pl
deleted file mode 100755
index 9ac7c83c5b..0000000000
--- a/export/export.pl
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/perl
-## This script allows you to export a rel_2_2 bibliographic db in 
-#MARC21 format from the command line.
-#
-use HTML::Template;
-use strict;
-require Exporter;
-use C4::Database;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Output;  # contains gettemplate
-use C4::Biblio;
-use CGI;
-use C4::Auth;
-my $outfile = $ARGV[0];
-open(OUT,">$outfile") or die $!;
-my $query = new CGI;
-	my $start_bib = $query->param("start_bib");
-	my $end_bib = $query->param("end_bib");
-	my $dbh=C4::Context->dbh;
-	my $sth;
-	if ($start_bib && $end_bib) {
-		$sth=$dbh->prepare("select bibid from marc_biblio where bibid >=? and bibid <=? order by bibid");
-		$sth->execute($start_bib,$end_bib);
-	} else {
-		$sth=$dbh->prepare("select bibid from marc_biblio order by bibid");
-		$sth->execute();
-	}
-	while (my ($bibid) = $sth->fetchrow) {
-		my $record = MARCgetbiblio($dbh,$bibid);
-
-		print OUT $record->as_usmarc();
-	}
-close(OUT);
diff --git a/export/marc.pl b/export/marc.pl
deleted file mode 100755
index da8e8ee7ef..0000000000
--- a/export/marc.pl
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/bin/perl
-use HTML::Template;
-use strict;
-require Exporter;
-use C4::Database;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Output;  # contains gettemplate
-use C4::Biblio;
-use CGI;
-use C4::Koha;
-
-my $query = new CGI;
-my $op=$query->param("op");
-my $dbh=C4::Context->dbh;
-
-if ($op eq "export") {
-	print $query->header(	-type => 'application/octet-stream',
-				-attachment=>'koha.mrc');
-	my $start_bib = $query->param("start_bib");
-	my $end_bib = $query->param("end_bib");
-	my $format = $query->param("format");
-	my $branch = $query->param("branch");
-	my $start_callnumber = $query->param("start_callnumber");
-	my $end_callnumber = $query->param("end_callnumber");
-	my $limit = $query->param("limit");
-	my $strsth;
-	$strsth="select bibid from marc_biblio ";
-	if ($start_bib && $end_bib) {
-		$strsth.=" where biblionumber>=$start_bib and biblionumber<=$end_bib ";
-	}elsif ($format) {
-		if ($strsth=~/ where/){
-			$strsth=~s/ where (.*)/,biblioitems where biblioitems.biblionumber=marc_biblio.biblionumber and biblioitems.itemtype=\'$format\' and $1/;
-		}else {
-			$strsth.=",biblioitems where biblioitems.biblionumber=marc_biblio.biblionumber and biblioitems.itemtype=\'$format\'";
-		}
-	} elsif ($branch) {
-		if ($strsth=~/ where/){
-			$strsth=~s/ where (.*)/,items where items.biblionumber=marc_biblio.biblionumber and items.homebranch=\'$branch\' and $1/;
-		}else {
-			$strsth.=",items where items.biblionumber=marc_biblio.biblionumber and items.homebranch=\'$branch\'";
-		}
-	} elsif ($start_callnumber && $end_callnumber) {
-		$start_callnumber=~s/\*/\%/g;
-		$start_callnumber=~s/\?/\_/g;
-		$end_callnumber=~s/\*/\%/g;
-		$end_callnumber=~s/\?/\_/g;
-		if ($strsth=~/,items/){
-			$strsth.=" and items.itemcallnumber between \'$start_callnumber\' and \'$end_callnumber\'";
-		} else {
-			if ($strsth=~/ where/){
-				$strsth=~s/ where (.*)/,items where items.biblionumber=marc_biblio.biblionumber and items.itemcallnumber between \'$start_callnumber\' and \'$end_callnumber\' and $1/;
-			}else {
-				$strsth=~",items where items.biblionumber=marc_biblio.biblionumber and items.itemcallnumber between \'$start_callnumber\' and \'$end_callnumber\' ";
-			}
-		}
-	}
-	$strsth.=" order by marc_biblio.biblionumber ";
-	$strsth.= "LIMIT 0,$limit " if ($limit);
-	warn "requête marc.pl : ".$strsth;
-	my $req=$dbh->prepare($strsth);
-	$req->execute;
-	while (my ($bibid) = $req->fetchrow) {
-		my $record = MARCgetbiblio($dbh,$bibid);
-
-		print $record->as_usmarc();
-	}
-} else {
-	my $sth=$dbh->prepare("Select itemtype,description from itemtypes order by description");
-	$sth->execute;
-	my  @itemtype;
-	my %itemtypes;
-	push @itemtype, "";
-	$itemtypes{''} = "";
-	while (my ($value,$lib) = $sth->fetchrow_array) {
-			push @itemtype, $value;
-			$itemtypes{$value}=$lib;
-	}
-	
-	my $CGIitemtype=CGI::scrolling_list( -name     => 'format',
-							-values   => \@itemtype,
-							-default  => '',
-							-labels   => \%itemtypes,
-							-size     => 1,
-				 			-tabindex=>'',
-							-multiple => 0 );
-	$sth->finish;
-	
-	my $branches = getallbranches;
-	my @branchloop;
-	foreach my $thisbranch (keys %$branches) {
-# 			my $selected = 1 if $thisbranch eq $branch;
-			my %row =(value => $thisbranch,
-# 									selected => $selected,
-									branchname => $branches->{$thisbranch}->{'branchname'},
-							);
-			push @branchloop, \%row;
-	}
-	
-	my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "export/marc.tmpl",
-					query => $query,
-					type => "intranet",
-					authnotrequired => 0,
-					flagsrequired => {parameters => 1, management => 1, tools => 1},
-					debug => 1,
-					});
-	$template->param(branchloop=>\@branchloop,
-			CGIitemtype=>$CGIitemtype,
-			intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-			);
-	output_html_with_http_headers $query, $cookie, $template->output;
-}
-
diff --git a/import/breeding.pl b/import/breeding.pl
deleted file mode 100755
index 97c2d6b9b0..0000000000
--- a/import/breeding.pl
+++ /dev/null
@@ -1,204 +0,0 @@
-#!/usr/bin/perl
-
-# $Id$
-
-# Script for handling import of MARC data into Koha db
-#   and Z39.50 lookups
-
-# Koha library project  www.koha.org
-
-# Licensed under the GPL
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# 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
-
-use strict;
-
-# standard or CPAN modules used
-use CGI;
-
-# Koha modules used
-use C4::Context;
-use C4::Interface::CGI::Output;
-use C4::Input;
-use C4::Biblio;
-use C4::Output;
-use C4::Auth;
-use C4::Breeding;
-
-#------------------
-# Constants
-
-
-
-# HTML colors for alternating lines
-my $lc1='#dddddd';
-my $lc2='#ddaaaa';
-
-#-------------
-#-------------
-# Initialize
-
-my $userid=$ENV{'REMOTE_USER'};
-
-my $input = new CGI;
-my $dbh = C4::Context->dbh;
-
-my $uploadmarc=$input->param('uploadmarc');
-my $overwrite_biblio = $input->param('overwrite_biblio');
-my $filename = $input->param('filename');
-my $syntax = $input->param('syntax');
-my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "import/breeding.tmpl",
-					query => $input,
-					type => "intranet",
-					authnotrequired => 0,
-					flagsrequired => {parameters => 1, management => 1, tools => 1},
-					debug => 1,
-					});
-
-$template->param(SCRIPT_NAME => $ENV{'SCRIPT_NAME'},
-						uploadmarc => $uploadmarc);
-if ($uploadmarc && length($uploadmarc)>0) {
-	my $marcrecord='';
-	while (<$uploadmarc>) {
-		$marcrecord.=$_;
-	}
-	my ($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported) = ImportBreeding($marcrecord,$overwrite_biblio,$filename,$syntax,"");
-
-	$template->param(imported => $imported,
-							alreadyindb => $alreadyindb,
-							alreadyinfarm => $alreadyinfarm,
-							notmarcrecord => $notmarcrecord,
-							total => $imported+$alreadyindb+$alreadyinfarm+$notmarcrecord,
-							);
-
-}
-
-output_html_with_http_headers $input, $cookie, $template->output;
-my $menu;
-my $file;
-
-
-#---------------
-# log cleared, as marcimport is (almost) rewritten from scratch.
-# $Log$
-# Revision 1.6  2006/09/06 16:21:04  tgarip1957
-# Clean up before final commits
-#
-# Revision 1.2.4.1  2005/04/07 10:10:52  tipaul
-# copying processz3950queue from 2.0 branch. The 2.2 version misses an important fix
-#
-# Revision 1.2  2003/10/06 09:10:38  slef
-# Removing config info from z3950*sh and using C4::Context in processz3950queue (Fixed bug 39)
-#
-# Revision 1.1  2003/06/04 13:46:25  tipaul
-# moving breeding farm import to parameters page (GUI) and to new import/ directory (code structure)
-#
-# Revision 1.33  2003/04/29 16:48:36  tipaul
-# really proud of this commit :-)
-# z3950 search and import seems to works fine.
-# Let me explain how :
-# * a "search z3950" button is added in the addbiblio template.
-# * when clicked, a popup appears and z3950/search.pl is called
-# * z3950/search.pl calls addz3950search in the DB
-# * the z3950 daemon retrieve the records and stores them in z3950results AND in marc_breeding table.
-# * as long as there as searches pending, the popup auto refresh every 2 seconds, and says how many searches are pending.
-# * when the user clicks on a z3950 result => the parent popup is called with the requested biblio, and auto-filled
-#
-# Note :
-# * character encoding support : (It's a nightmare...) In the z3950servers table, a "encoding" column has been added. You can put "UNIMARC" or "USMARC" in this column. Depending on this, the char_decode in C4::Biblio.pm replaces marc-char-encode by an iso 8859-1 encoding. Note that in the breeding import this value has been added too, for a better support.
-# * the marc_breeding and z3950* tables have been modified : they have an encoding column and the random z3950 number is stored too for convenience => it's the key I use to list only requested biblios in the popup.
-#
-# Revision 1.32  2003/04/22 12:22:54  tipaul
-# 1st draft for z3950 client import.
-# moving Breeding farm script to a perl package C4/Breeding.pm
-#
-# Revision 1.31  2003/02/19 01:01:07  wolfpac444
-# Removed the unecessary $dbh argument from being passed.
-# Resolved a few minor FIXMEs.
-#
-# Revision 1.30  2003/02/02 07:18:38  acli
-# Moved C4/Charset.pm to C4/Interface/CGI/Output.pm
-#
-# Create output_html_with_http_headers function to contain the "print $query
-# ->header(-type => guesstype...),..." call. This is in preparation for
-# non-HTML output (e.g., text/xml) and charset conversion before output in
-# the future.
-#
-# Created C4/Interface/CGI/Template.pm to hold convenience functions specific
-# to the CGI interface using HTML::Template
-#
-# Modified moremembers.pl to make the "sex" field localizable for languages
-# where M and F doesn't make sense
-#
-# Revision 1.29  2003/01/28 15:28:31  tipaul
-# removing use MARC::Charset
-# Was a buggy test
-#
-# Revision 1.28  2003/01/28 15:00:31  tipaul
-# user can now search in breeding farm with isbn/issn or title. Title/name are stored in breeding farm and showed when a search is done
-#
-# Revision 1.27  2003/01/26 23:21:49  acli
-# Handle non-latin1 charsets
-#
-# Revision 1.26  2003/01/23 12:26:41  tipaul
-# upgrading import in breeding farm (you can now search on ISBN or on title) AND character encoding.
-#
-# Revision 1.25  2003/01/21 08:13:50  tipaul
-# character encoding ISO646 => 8859-1, first draft
-#
-# Revision 1.24  2003/01/14 16:41:17  tipaul
-# bugfix : use gettemplate_and_user instead of gettemplate.
-# fix a blank screen in 1.3.3 in "import in breeding farm"
-#
-# Revision 1.23  2003/01/06 13:06:28  tipaul
-# removing trailing #
-#
-# Revision 1.22  2002/11/12 15:58:43  tipaul
-# road to 1.3.2 :
-# * many bugfixes
-# * adding value_builder : you can map a subfield in the marc_subfield_structure to a sub stored in "value_builder" directory. In this directory you can create screen used to build values with any method. In this commit is a 1st draft of the builder for 100$a unimarc french subfield, which is composed of 35 digits, with 12 differents values (only the 4th first are provided for instance)
-#
-# Revision 1.21  2002/10/22 15:50:23  tipaul
-# road to 1.3.2 : adding a biblio in MARC format.
-# seems to work a few.
-# still to do :
-# * manage html checks (mandatory subfields...)
-# * add list of acceptable values (authorities)
-# * manage ## in MARC format
-# * manage correctly repeatable fields
-# and probably a LOT of bugfixes
-#
-# Revision 1.20  2002/10/16 12:46:19  arensb
-# Added a FIXME comment.
-#
-# Revision 1.19  2002/10/15 10:14:44  tipaul
-# road to 1.3.2. Full rewrite of marcimport.pl.
-# The acquisition system in MARC version will work like this :
-# * marcimport will put marc records into a "breeding farm" table.
-# * when the user want to add a biblio, he enters first the ISBN/ISSN of the biblio. koha searches into breeding farm and if the record exists, it is shown to the user to help him adding the biblio. When the biblio is added, it's deleted from the breeding farm.
-#
-# This commit :
-# * modify acqui.simple home page  (addbooks.pl)
-# * adds import into breeding farm
-#
-# Please note that :
-# * z3950 functionnality is dropped from "marcimport" will be added somewhere else.
-# * templates are in a new acqui.simple sub directory, and the marcimport template directory will become obsolete soon.I think this is more logic
-#
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl
index 40a2db0c67..115428f732 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl
@@ -3,8 +3,9 @@
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
-<h1>Koha Administration</h1>
-
+<div id="main">
+<h1>NEULIS Administration</h1>
+<div class="menu">
 <table>
 <caption>System Preferences</caption>
 <tr>
@@ -15,7 +16,27 @@
 <table>
 <caption>System parameters </caption>
 <tr>
-<th colspan="2">For best results, configure these parameters in the order they appear</th>
+<th class="header" colspan="2">For best results, configure these parameters in the order they appear</th>
+</tr>
+<tr>
+	<th><a href="/cgi-bin/koha/admin/koha-news.pl">OPAC news</a></th>
+	<td>Manage the news in the OPAC main page.</td>
+</tr>
+<tr>
+	<th><a href="/cgi-bin/koha/admin/opac-electronic.pl">OPAC electronic</a></th>
+	<td>Manage the online OPAC databases.</td>
+</tr>
+	<tr>
+	<th><a href="/cgi-bin/koha/admin/institutions-careers.pl">Faculties-courses</a></th>
+	<td>Add courses to faculties.</td>
+</tr>
+<tr>
+	<th><a href="/cgi-bin/koha/admin/viewlog.pl">View Logs</a></th>
+	<td>View Logs.</td>
+</tr>
+<tr>
+	<th><a href="/cgi-bin/koha/holidays/holidays.pl?branch=MAIN">Holiday Management</a></th>
+	<td>Set the days library is closed for circulation purposes.</td>
 </tr>
 <tr>
 	<th><a href="/cgi-bin/koha/admin/branches.pl">Library branches</a></th>
@@ -37,15 +58,6 @@
 	<th><a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a></th>
 	<td>Define the categories of borrowers.</td>
 </tr>
-<tr>
-	<th><a href="/cgi-bin/koha/admin/cities.pl">City</a></th>
-	<td>Define citie</td>
-</tr>	
-<tr>
-	<th><a href="/cgi-bin/koha/admin/roadtype.pl" >Road Type</a>
-	</th>
-	<td>Define road type</td>
-</tr>
 <tr>
 	<th><a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a></th>
 	<td>Define issuing rules for branches / borrowers / item types (nb of issues, duration, cost...)</td>
@@ -55,23 +67,27 @@
 	<td>Define categories and authorised values for them. Authorised values are used in MARC form to limit and help editing MARC biblios.</td>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus Structure</a></th>
+	<th><a href="/cgi-bin/koha/admin/authtypes.pl">Authorities Structure</a></th>
 	<td>Define categories and thesaurus/authority MARC structure.</td>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio framework (MARC structure)</a></th>
+	<th><a href="/cgi-bin/koha/admin/biblios_framework.pl">Biblio framework (MARC structure)</a></th>
 	<td>the frameworks defined for the MARC editor. Create frameworks, then define the MARC structure (fields &amp; subfields)</td>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links Koha - MARC DB</a></th>
-	<td>Define links between the Koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage.</td>
+	<th><a href="/cgi-bin/koha/admin/holdingstagstructure.pl">Holdings framework (MARC structure)</a></th>
+	<td>the frameworks defined for theholdings MARC editor. (Complements the Biblios framework)</td>
+</tr>
+<tr>
+	<th><a href="/cgi-bin/koha/admin/koha_attr.pl">Links MARC - ZEBRA</a></th>
+	<td>Define links between the ZEBRA DB and the MARC one. </td>
 </tr>
 <tr>
 	<th><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a></th>
 	<td>Checks the MARC structure. USE IT before working with real data. It will show mistakes that can BREAK Koha's database!</td></tr>
 
 <tr>
-<th colspan="2">Various parameters</th>
+<th colspan="2" class="header">Various parameters</th>
 </tr>
 <tr>
 	<th><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></th>
@@ -90,38 +106,52 @@
 <table>
 	<caption>Tools</caption>
 	<tr>
-	<th colspan="2">Export</th>
+	<th colspan="2" class="header">Facult members credit</th>
+	</tr>
+	<tr>
+		<th><a href="/cgi-bin/koha/members/manualcredit.pl">Faculty members credit</a></th>
+		<td> Clears the debts of all faculty members</td>
+	</tr>
+	<tr>
+	<th colspan="2" class="header">ZEBRA Queue</th>
+	</tr>
+	<tr>
+		<th><a href="/cgi-bin/koha/z3950/zebraqueue_windows_start.pl">ZEBRA queue starter</a></th>
+		<td> Starts Zebra queue if stopped or system restarted. ZEBRA queue is required for the system to update ZEBRA</td>
 	</tr>
 	<tr>
-		<th><a href="/cgi-bin/koha/tools/export.pl">MARC biblio export</a></th>
+	<th colspan="2" class="header">Export</th>
+	</tr>
+	<tr>
+		<th><a href="/cgi-bin/koha/export/marc.pl">MARC biblio export</a></th>
 		<td> Exporting in MARC format.</td>
 	</tr>
 	<tr>
-	<th colspan="2">Import</th>
+		<th><a href="/cgi-bin/koha/export/marc-time.pl">MARC biblio export by date</a></th>
+		<td> Exporting in MARC format by date.</td>
+	</tr>
+	<tr>
+	<th colspan="2" class="header">Import</th>
 	</tr>
 	<tr>
-		<th><a href="/cgi-bin/koha/tools/import.pl">Upload MARC records to the reservoir</a></th>
+		<th><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records to the reservoir</a></th>
 		<td>The reservoir is a table where imported MARC records are stored. A MARC record is stored in the reservoir as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the reservoir. If it is found, the biblio is added to Koha active table.
 		</td>
 	</tr>
-	<th colspan="2">Barcode generator</th>
+	<th colspan="2" class="header">Barcode generator</th>
 	</tr>
 	<tr>
-		<th><a href="/cgi-bin/koha/tools/barcodes.pl">Generate barcodes</a></th>
+		<th><a href="/cgi-bin/koha/barcodes/barcodes.pl">Generate barcodes</a></th>
 		<td>the barcode generator deals with generating barcodes for items you acquire
 		</td>
 	</tr>
-	
-	<tr>
-		<th><a href="/cgi-bin/koha/tools/holidays.pl">Holidays</a></th>
-		<td>Holidays (closed days for the library)
+	<tr><th colspan="2" class="header">Membership Cards</th></tr>
+		<tr>
+		<th><a href="/cgi-bin/koha/barcodes/cbarcodes.pl">Membership cards</a></th>
+		<td>create membership cards from member cardnumbers
 		</td>
 	</tr>
-	<tr>
-		<th><a href="/cgi-bin/koha/tools/koha-news.pl">Basic news system</a></th>
-		<td>A basic news system to put news on OPAC or library staff</td>
-	</tr>
 </table>
-
+</div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/aqbookfund.tmpl
index 3e1a3e3ee3..7ab1870e16 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/aqbookfund.tmpl
@@ -1,98 +1,66 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-Koha -- System Administration: Book Funds
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF name="else" -->Book Funds<!-- /TMPL_IF -->
+<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="header" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="add_validate" -->Data Recorded<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Fund '<!-- TMPL_VAR name="bookfundname" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
-
 <!-- TMPL_IF name="else" -->
 <h1>Book Fund Administration</h1>
-  <!-- TMPL_IF NAME="bookfund" -->
-<table>
-  <tr>
-    <th>Code</th>
-    <th>Name</th>
-    <th>Branch</th>
-    <th>Actions</th>
-  </tr>
+<!-- TMPL_IF NAME="bookfund" --><form action="<!-- TMPL_VAR name=scriptname -->" method="post">
+<input type="text" name="searchfield" value="" /> <input type="submit" name="search" value="Search" class="submit" /></form>
+<!-- TMPL_IF name="search" -->
+	<div id="results">You Searched for <span class="ex"><!-- TMPL_VAR name="searchfield" --></span></div>
+<!-- /TMPL_IF -->
 
+<table>
+<tr>
+	<th>Book Fund</th>
+	<th>Name</th>
+	<th>Branch</th>
+	<th>Edit</th>
+	<th>Delete</th>
+	</tr>
+<!-- TMPL_LOOP name="bookfund" -->
+	<tr>
+		<td><a href="<!-- TMPL_VAR name="action" -->?op=add_form&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" --> "><!-- TMPL_VAR name="bookfundid" --></a></td>
+		<td><!-- TMPL_VAR name="bookfundname" --></td>
+		<td><!--TMPL_VAR Name="branchname"--></td>
+		<td><form action="<!-- TMPL_VAR name="action" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" class="submit" value="Edit" /></form></td>
+		<td><form action="<!-- TMPL_VAR name="action" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" class="delete" value="Delete" /></form></td>
+	</tr>
+		<tr>
+		<td>&nbsp;</td>
+		<td><b>Budget</b></td>
+		<td>Branch</td>
+		<td><form action="aqbudget.pl" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" class="submit" value="Add Budget" /></form></td>
+		<td></td>
+	</tr>
+	<!-- TMPL_LOOP name="budget" -->
+		<tr>
+			<td>&nbsp;</td>
+			<td>
+				<!-- TMPL_VAR name="startdate" --> - <!-- TMPL_VAR name="enddate" --> : <b><!-- TMPL_VAR name="budgetamount" --></b>
+			</td>
+			<td>
+				<!--TMPL_IF Name="branchcode"-->
+				 	<!--TMPL_VAR Name="branchcode"-->
+				<!--TMPL_ELSE -->
+					&nbsp;
+				<!--/TMPL_IF-->
+				</td>
+			<td><form action="/cgi-bin/koha/admin/aqbudget.pl" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR name="aqbudgetid" -->" /><input type="submit" class="submit" value="Edit" /></form></td>
+			<td><form action="/cgi-bin/koha/admin/aqbudget.pl" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR name="aqbudgetid" -->" /><input type="submit" class="delete" value="Delete" /></form></td>
+
+		</tr>
+	<!-- /TMPL_LOOP -->
+<!-- /TMPL_LOOP -->
+</table><!-- /TMPL_IF -->
 <form action="<!-- TMPL_VAR name="scriptname" -->" method="post">
-  <tr class="filter">
-    <td>
-      <select name="filter_bookfundid">
-        <option value="">----</option>
-    <!-- TMPL_LOOP name="filter_bookfundids" -->
-      <!-- TMPL_IF NAME="selected" -->
-        <option value="<!-- TMPL_VAR name="bookfundid" -->" selected="selected"><!-- TMPL_VAR name="bookfundid" --></option>
-      <!-- TMPL_ELSE -->
-        <option value="<!-- TMPL_VAR name="bookfundid" -->"><!-- TMPL_VAR name="bookfundid" --></option>
-      <!-- /TMPL_IF -->
-    <!-- /TMPL_LOOP -->
-      </select>
-    </td>
-    <td>
-      <input type="text" name="filter_bookfundname" value="<!-- TMPL_VAR name="filter_bookfundname" -->" />
-    </td>
-    <td>
-      <select name="filter_branchcode">
-        <option value="">----</option>
-    <!-- TMPL_LOOP name="filter_branches" -->
-      <!-- TMPL_IF NAME="selected" -->
-        <option value="<!-- TMPL_VAR name="code" -->" selected="selected"><!-- TMPL_VAR name="name" --></option>
-      <!-- TMPL_ELSE -->
-        <option value="<!-- TMPL_VAR name="code" -->"><!-- TMPL_VAR name="name" --></option>
-      <!-- /TMPL_IF -->
-    <!-- /TMPL_LOOP -->
-      </select>
-    </td>
-    <td>
-      <input type="submit" name="filter" value="Filter" />
-    </td>
-  </tr>
-</form>
-
-<form action="aqbudget.pl" method="post">
-    <!-- TMPL_LOOP name="bookfund" -->
-      <!-- TMPL_IF NAME="toggle" -->
-  <tr class="highlight">
-      <!-- TMPL_ELSE -->
-  <tr>
-      <!-- /TMPL_IF -->
-    <td>
-      <!-- TMPL_VAR name="bookfundid" -->
-    </td>
-    <td>
-      <!-- TMPL_VAR name="bookfundname" -->
-    </td>
-    <td>
-      <!-- TMPL_IF NAME="branchname" -->
-      <!-- TMPL_VAR name="branchname" -->
-      <!-- TMPL_ELSE -->
-      None
-      <!-- /TMPL_IF -->
-    </td>
-    <td>
-      <a href="<!-- TMPL_VAR name="scriptname" -->?op=add_form&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" -->">Edit</a>
-      <a href="<!-- TMPL_VAR name="scriptname" -->?op=delete_confirm&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" -->">Delete</a>
-      <a href="aqbudget.pl?op=add_form&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" -->">Add budget</a>
-      <!-- TMPL_IF NAME="has_budgets" -->
-      <a href="aqbudget.pl?filter_bookfundid=<!-- TMPL_VAR name="bookfundid" -->">Show budgets</a>
-      <!-- /TMPL_IF -->
-    </td>
-  </tr>
-
-    <!-- /TMPL_LOOP --> <!-- bookfund -->
-</table>
-
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
-  <!-- /TMPL_IF --> <!-- bookfund -->
-
-<p>
-  <a href="<!-- TMPL_VAR name=scriptname -->?op=add_form">Add bookfund</a>
-  <a href="aqbudget.pl">Show all budgets</a>
-</p>
-
-</form>
-<!-- /TMPL_IF --> <!-- else -->
+	<p><input type="hidden" name="op" value="add_form" /></p>
+<input type="submit" value="Add bookfund" class="submit" /></form>
+<!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="add_form" -->
 <script>
@@ -147,112 +115,46 @@ Koha -- System Administration: Book Funds
 			alert(alertString2);
 		}
 	}
-	</script>
-
+	</SCRIPT>
 <form action="<!-- TMPL_VAR name="action" -->" name="Aform" method="post">
-  <input type="hidden" name="op" value="add_validate" />
-  <input type="hidden" name="checked" value="0" />
-
-  <table>
-    <caption><!-- TMPL_VAR name="header" --></caption>
-    
-  <!-- TMPL_IF name="add_or_modify" -->
-    <tr>
-      <th>Book fund</th>
-      <td>
-        <input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" />
-        <!-- TMPL_VAR name="bookfundid" -->
-      </td>
-    </tr>
-  <!-- TMPL_ELSE -->
-    <tr>
-      <th>Book fund</th>
-      <td>
-        <input type="text" name="bookfundid" size="5" maxlength="5" onblur="toUC(this)" />
-      </td>
-    </tr>
-  <!-- /TMPL_IF --> <!-- add_or_modify -->
-    
-    <tr>
-      <th>Name</th>
-      <td>
-        <input type="text"
-               name="bookfundname"
-               size="40"
-          maxlength="80"
-              value="<!-- TMPL_VAR name="bookfundname" escape="HTML" -->"
-        />
-      </td>
-    </tr>
-
-    <tr>
-      <th>Branch</th>
-      <td>
-        <select name="branchcode">
-          <option value="">None</option>
-  <!-- TMPL_LOOP NAME="branches" -->
-    <!-- TMPL_IF NAME="selected" -->
-          <option value="<!-- TMPL_VAR NAME="branchcode" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
-    <!-- TMPL_ELSE -->
-          <option value="<!-- TMPL_VAR NAME="branchcode" -->"><!-- TMPL_VAR NAME="branchname" --></option>
-    <!-- /TMPL_IF -->
-  <!-- /TMPL_LOOP -->
-      </td>
-    </tr>
-    
-  </table>
-
-  <p>
-    <input type="button" value="Submit" onclick="Check(this.form); return false;" />
-    <input type="reset" value="Reset" />
-  </p>
+<input type="hidden" name="op" value="add_validate" />
+<input type="hidden" name="checked" value="0" />
+<div class="data">
+<table>
+<caption><!-- TMPL_VAR name="header" --></caption>
+<!-- TMPL_IF name="add_or_modify" -->
+<tr><th>Book fund</th><td><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><!-- TMPL_VAR name="bookfundid" --></td></tr>
+<!-- TMPL_ELSE -->
+<tr><th>Book fund</th><td><input type="text" name="bookfundid" size="5" maxlength="5" onblur="toUC(this)" /></td></tr>
+<!-- /TMPL_IF -->
+<tr><th>Name</th><td><input type="text" name="bookfundname" size="40" maxlength="80" value="<!-- TMPL_VAR name="bookfundname" escape="HTML" -->" /></td></tr>
+<tr><th><label>Branch</label></th><td><!-- TMPL_VAR NAME="CGIbranch"-->	Select one if budget is branch-specific, otherwise, leave it blank.</td></tr>
+</table>
+</div>
+<p><input type="button" value="<!-- TMPL_VAR name="header" -->" onclick="Check(this.form); return false;" class="submit" /> <input type="submit" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR name="action" -->'; return false;" /></p>
 </form>
-<!-- /TMPL_IF --> <!-- add_form -->
+<!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="add_validate" -->
 <h3>Data Recorded</h3>
-
-<p>
-  <a href="<!-- TMPL_VAR name="action" -->">Return to fund list</a>
-</p>
+<form action="<!-- TMPL_VAR name="action" -->" method="post">
+<input type="submit" value="OK" class="submit" />
+</form></td></tr></table>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="delete_confirm" -->
 <h3>Confirm Deletion of Fund <em><!-- TMPL_VAR name="bookfundid" --></em></h3>
-<table>
-  <tr>
-    <th>Book fund</th>
-    <td><!-- TMPL_VAR name="bookfundid" --></td>
-  </tr>
-  <tr>
-    <th>Name</th>
-    <td><!-- TMPL_VAR name="bookfundname" --></td>
-  </tr>
-  <tr>
-    <th>Group</th>
-    <td><!-- TMPL_VAR name="bookfundgroup" --></td>
-  </tr>
-</table>
-
-<form action="<!-- TMPL_VAR name="action" -->" method="post">
-  <input type="hidden" name="op" value="delete_confirmed" />
-  <input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" />
-
-  <div id="action">
-    <input type="submit" value="Delete this Fund" />
-  </div>
-</form>
-
-<form action="<!-- TMPL_VAR name="action" -->" method="post">
-  <input type="submit" value="Do not Delete" />
-</form>
-<!-- /TMPL_IF --> <!-- delete_confirm -->
+<div class="data"><table>
+<tr><th>Book fund</th><td><!-- TMPL_VAR name="bookfundid" --></td></tr>
+<tr><th>Name</th><td><!-- TMPL_VAR name="bookfundname" --></td></tr><tr><th>Group</th><td><!-- TMPL_VAR name="bookfundgroup" --></td></tr>
+</table></div><div class="tabitem"><form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" value="Delete this Fund" class="cancel" /></form> <form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="submit" value="Do not Delete" class="submit" /></form></div>
+<!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="delete_confirmed" -->
 <h3>Data Deleted</h3>
-<form action="<!-- TMPL_VAR name="action" -->" method="post">
-  <input type="submit" value="OK" />
-</form>
-<!-- /TMPL_IF --> <!-- delete_confirmed -->
+<div class="form"><form action="<!-- TMPL_VAR name="action" -->" method="post">
+<input type="submit" value="OK" class="submit" /></form></div>
+<!-- /TMPL_IF -->
+
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/aqbudget.tmpl
index 23371440dd..74ba3d8f3b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/aqbudget.tmpl
@@ -87,7 +87,7 @@ Koha -- System Administration: Budgets
         Calendar.setup(
           {
             inputField : "filter_startdate",
-            ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+            ifFormat : "%Y-%m-%d",,
             button : "filter_startdate_button"
           }
         );
@@ -119,7 +119,7 @@ Koha -- System Administration: Budgets
         Calendar.setup(
           {
             inputField : "filter_enddate",
-            ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+            ifFormat :"%Y-%m-%d",
             button : "filter_enddate_button"
           }
         );
@@ -256,7 +256,7 @@ Koha -- System Administration: Budgets
             Calendar.setup(
               {
                 inputField : "startdate",
-                ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+                ifFormat : "%Y-%m-%d",
                 button : "startdate_button"
               }
             );
@@ -274,7 +274,7 @@ Koha -- System Administration: Budgets
             Calendar.setup(
               {
                 inputField : "enddate",
-                ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+                ifFormat : "%Y-%m-%d",
                 button : "enddate_button"
               }
             );
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl
index 91c9b44e21..87ee6f2e16 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl
@@ -3,8 +3,7 @@
 
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
-
-!-- TMPL_IF NAME="add_form" -->
+<!-- TMPL_IF NAME="add_form" -->
 
 	<h1><!-- TMPL_IF NAME="use-heading-flags-p" -->
 	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints<!-- /TMPL_IF -->
@@ -19,7 +18,6 @@
 	<tr><th><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable:</label></th><td><!-- TMPL_VAR NAME="repeatable" --></td></tr>
 	<tr><th><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory:</label></th><td><!-- TMPL_VAR NAME="mandatory" --> </td></tr>
 	<tr><th><label for="seealso<!-- TMPL_VAR NAME="row" -->">Search also:</label></th><td><input type="text" id="seealso<!-- TMPL_VAR NAME="row" -->" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" /> (example for 200a: '200c','200d','200e'...)</td></tr>
-	<tr><th><label for="kohafield<!-- TMPL_VAR NAME="row" -->">Koha link:</label></th><td><!-- TMPL_VAR NAME="kohafield" --></td></tr>
 			</table>
 	<table>
 	<caption>Editor constaints</caption>
@@ -81,7 +79,6 @@
 <!-- TMPL_IF NAME="else" -->
 <h1>Authority MARC subfield structure admin for <!-- TMPL_VAR NAME="tagfield" --> (authority: <!--TMPL_VAR NAME="authtypecode" -->)</h1>
 <p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>
-<p>The column <b>Koha field</b> shows that the subfield is linked with a Koha field. Koha can manage a MARC interface, and a Koha interface. This link ensures that both DB are synchronized</p>
 
 <table>
 <tr>
@@ -104,7 +101,6 @@
 			<i>subfield ignored</i>
 		<!-- TMPL_ELSE -->
 			<strong>Tab:</strong><!-- TMPL_VAR NAME="tab" -->,
-			<!-- TMPL_IF NAME="kohafield" --> | <strong>Koha field:</strong> <!-- TMPL_VAR NAME="kohafield" -->, <!--/TMPL_IF -->
 			<!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
 			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
 			<!-- TMPL_IF NAME="seealso" --> | <strong>See Also:</strong> <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
@@ -132,5 +128,4 @@
 <!-- /TMPL_IF -->
 
 
-
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/biblios_framework.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/biblios_framework.tmpl
new file mode 100644
index 0000000000..bafec42ccd
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/biblios_framework.tmpl
@@ -0,0 +1,131 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+
+<script language="javascript" type="text/javascript">
+function _(s) { return s } // dummy function for gettext
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+function isNotNull(f,noalert) {
+	if (f.value.length ==0) {
+		return false;
+	}
+	return true;
+}
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+function toUC(f) {
+	var x=f.value.toUpperCase();
+	f.value=x;
+	return true;
+}
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+function isNum(v,maybenull) {
+var n = new Number(v.value);
+if (isNaN(n)) {
+	return false;
+	}
+if (maybenull==0 && v.value=='') {
+	return false;
+}
+return true;
+}
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+function isDate(f) {
+	var t = Date.parse(f.value);
+	if (isNaN(t)) {
+		return false;
+	}
+}
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+function Check(f) {
+	var ok=1;
+	var _alertString="";
+	var alertString2;
+	if (f.frameworkcode.value.length==0) {
+		_alertString += "\n- " + _("Framework code missing");
+	}
+	if (!(isNotNull(window.document.Aform.frameworktext,1))) {
+		_alertString += "\n- " + _("Description missing");
+	}
+	if (_alertString.length==0) {
+		document.Aform.submit();
+	} else {
+		alertString2  = _("Form not submitted because of the following problem(s)");
+		alertString2 += "\n------------------------------------------------------------------------------------\n";
+		alertString2 += _alertString;
+		alert(alertString2);
+	}
+}
+</script>
+
+<!-- TMPL_IF NAME="add_form" -->
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+		<input type="hidden" name="op" value="add_validate" />
+		<input type="hidden" name="checked" value="0" />
+	<table>
+	<caption><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --></caption>
+	<tr>
+			<!-- TMPL_IF NAME="frameworkcode" -->
+				<td><label for="frameworkcode">Framework Code<label></td><td><input type="hidden" id="frameworkcode" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><!-- TMPL_VAR NAME="frameworkcode" --></td>
+			<!-- TMPL_ELSE -->
+				<td><label for="frameworkcode">Framework Code<label></td><td><input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" onblur="toUC(this)" /></td>
+			<!-- /TMPL_IF -->
+			</tr>
+			<tr>
+				<td><label for="description">Description</label></td><td>
+				<input type="text" name="frameworktext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="frameworktext" escape=HTML -->" /></td>
+</tr></table>
+			<p>	<input type="button" value="Submit"class="submit" onclick="Check(this.form)" /></p>
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirm" -->
+<h3>Delete framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?</h3>
+	<!-- TMPL_IF NAME="total" -->
+		<div class="error">This framework is used <!-- TMPL_VAR NAME="total" --> times</div>
+	<!-- /TMPL_IF -->
+	<p>
+		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" value="Yes, Delete this Framework!" class="cancel" />
+		</form>
+		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do not Delete!" class="submit" /></form>
+	</p>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="else" -->
+<h1>Biblio framework</h1>
+<p>Framework name, then go to MARC biblio to set MARC editor parameters</p>
+<table>
+	<tr>
+		<th>Code</th>
+		<th>Description</th>
+		<th>&nbsp;</th>
+		<th>Edit</th>
+		<th>Delete</th>
+	</tr>
+	<tr>
+		<td>&nbsp;</td>
+		<td>Default framework</td>
+		<td><a href="bibliostagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">MARC structure</td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+	</tr>
+	
+	<!-- TMPL_LOOP NAME="loop" -->
+		<tr>
+			<td><!-- TMPL_VAR name="frameworkcode" --></td>
+			<td><!-- TMPL_VAR name="frameworktext" --></td>
+			<td><a href="bibliostagstructure.pl?frameworkcode=<!-- TMPL_VAR name="frameworkcode" -->" >MARC structure</a></td>
+			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;frameworkcode=<!-- TMPL_VAR name="frameworkcode" escape="HTML" -->">Edit</a></td>
+			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=delete_confirm&amp;frameworkcode=<!-- TMPL_VAR name="frameworkcode" escape="HTML" -->">Delete</a></td>
+		</tr>
+	<!-- /TMPL_LOOP -->
+</table>
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<input type="hidden" name="op" value="add_form" />
+	<input type="submit" class="submit" value="Add framework" />
+	<td><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --></td>
+	<td><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF --></td>
+</form>
+<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/biblios_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/biblios_subfields_structure.tmpl
new file mode 100644
index 0000000000..a0f73046f9
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/biblios_subfields_structure.tmpl
@@ -0,0 +1,134 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
+<!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="modify" -->Modify system preference '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add a system preference<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="add_validate" -->Data Added<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Parameter '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" -->Parameter Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Preferences<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menu.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+
+
+<!-- TMPL_IF NAME="add_form" -->
+
+	<h1><!-- TMPL_IF NAME="use-heading-flags-p" -->
+	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints<!-- /TMPL_IF -->
+	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></h1>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+	<input type="hidden" name="op" value="add_validate" />
+	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+	<!-- TMPL_LOOP NAME="loop" -->
+	<div class="data <!-- TMPL_VAR NAME="toggle" -->"><h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
+	<table>
+	<caption>MARC constraints</caption>
+	<tr><th><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable:</label></th><td><!-- TMPL_VAR NAME="repeatable" --></td></tr>
+	<tr><th><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory:</label></th><td><!-- TMPL_VAR NAME="mandatory" --> </td></tr>
+	<tr><th><label for="seealso<!-- TMPL_VAR NAME="row" -->">Search also:</label></th><td><input type="text" id="seealso<!-- TMPL_VAR NAME="row" -->" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" /> (example for 200a: '200c','200d','200e'...)</td></tr>
+			</table>
+	<table>
+	<caption>Editor constaints</caption>
+	<tr><th><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for librarian:</label></th><td><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></td></tr>
+	<tr><th><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC:</label></th><td><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></td></tr>
+	<tr><th><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab:</label></th><td><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</td></tr>
+
+	<tr><th><label for="hidden<!-- TMPL_VAR NAME="row" -->">Hidden:</label></th><td> Opac:<!-- TMPL_VAR name="ohidden" -->  Intranet:<!-- TMPL_VAR name="ihidden" --> Editor:<!-- TMPL_VAR name="ehidden" --> (see online help)</td></tr>
+
+	<tr><th><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL: </label></th><td><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is an URL and can be clicked</td></tr>
+<tr><th><label>Default Options: <p>(choose one)</p></label></th><td>
+<ul>
+	<li>Authorized Value: <!-- TMPL_VAR NAME="authorised_value" --></li>
+	<li>Thesaurus: <!-- TMPL_VAR NAME="authtypes" --></li>
+	<li>Plugin: <!-- TMPL_VAR NAME="value_builder" --></li>
+	<li>Link: <input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5" /> (exemple:200b)</li>
+</ul>
+</td></tr>	 
+		</table>
+		</div>
+	<!-- /TMPL_LOOP -->
+	<input type="submit" class="submit" value="Save Changes" />
+	<p>Note: in the last column, you can choose:
+	<ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
+	<li>A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table.</li>
+	<li>A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.</li>
+	</ul>
+	</p>
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirm" -->
+
+<div class="data"><table>
+<caption>Confirm Deletion of Subfield <span class="ex"><!-- TMPL_VAR NAME="tagsubfield" -->?</span></caption>
+	<tr>
+		<th>Subfield</th>
+		<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
+	</tr>
+	<tr><th>Description</th><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
+</table></div>
+			<form class="inline" action="<!-- TMPL_VAR NAME="delete_link" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" />
+				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+				<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" /><input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" class="cancel" value="Yes, Delete this Subfield" />
+			</form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">	<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />	<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />	<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />	<input type="submit" class="submit" value="No, Do Not Delete" />
+			</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirmed" -->
+
+	Data deleted
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
+	<input type="submit" class="submit" value="OK" />
+	</form>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF NAME="else" -->
+<h1>MARC subfield structure admin for <!-- TMPL_VAR NAME="tagfield" --> (framework <!--TMPL_VAR NAME="frameworkcode" -->)</h1>
+<p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>
+
+
+<table>
+<tr>
+	<th>Subfield</th>
+	<th>Text</th>
+	<th>Constraints</th>
+	<th>Delete</th>
+<!-- TMPL_LOOP NAME="loop" -->
+<!-- TMPL_IF NAME="toggle" --><tr class="highlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
+	<td>
+		<!-- TMPL_IF NAME="subfield_ignored" -->
+			<i><!-- TMPL_VAR NAME="liblibrarian" --></i>
+		<!-- TMPL_ELSE -->
+			<!-- TMPL_VAR NAME="liblibrarian" -->
+		<!-- /TMPL_IF -->
+	</td>
+	<td>
+		<!-- TMPL_IF NAME="subfield_ignored" -->
+			<i>subfield ignored</i>
+		<!-- TMPL_ELSE -->
+			<strong>Tab:</strong><!-- TMPL_VAR NAME="tab" -->,
+			<!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="seealso" --> | <strong>See Also:</strong> <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="authorised_value" --> | <strong>Auth value:</strong><!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="authtypecode" --> | <strong>Authority:</strong><!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="value_builder" --> | <strong>Plugin:</strong><!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="link" --> | <strong>Link:</strong><!-- TMPL_VAR NAME="link" -->,<!-- /TMPL_IF -->
+		<!-- /TMPL_IF -->
+	</td>
+	<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
+</tr>
+<!-- /TMPL_LOOP -->
+</table>
+<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="edit_tagfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="edit_frameworkcode" -->" /><input type="submit" class="submit" value="Edit Subfields" /></form> <form class="inline" action="bibliostagstructure.pl" method="get"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="tagfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" class="submit" value="Return to Marc Structure" /></form>
+<!-- TMPL_IF NAME="previous" -->
+	<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0" >
+	</a><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="next" -->
+	<!-- TMPL_VAR NAME="next" -->
+		<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0" />
+	</a>
+<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/bibliostagstructure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/bibliostagstructure.tmpl
new file mode 100644
index 0000000000..b98b45a9f0
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/bibliostagstructure.tmpl
@@ -0,0 +1,207 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
+<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Tag '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->MARC tag Structure<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menu.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+
+
+<h1>MARC tag structure admin for <!-- TMPL_IF NAME="frameworkcode" --><!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)<!-- TMPL_ELSE -->default MARC framework<!-- /TMPL_IF --></h1>
+<script language="javascript" type="text/javascript">
+	function _(s) { return s } // dummy function for gettext
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function isNotNull(f,noalert) {
+		if (f.value.length ==0) {
+   return false;
+		}
+		return true;
+	}
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function toUC(f) {
+		var x=f.value.toUpperCase();
+		f.value=x;
+		return true;
+	}
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function isNum(v,maybenull) {
+	var n = new Number(v.value);
+	if (isNaN(n)) {
+		return false;
+		}
+	if (maybenull==0 && v.value=='') {
+		return false;
+	}
+	return true;
+	}
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function isDate(f) {
+		var t = Date.parse(f.value);
+		if (isNaN(t)) {
+			return false;
+		}
+	}
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function Check(f) {
+		var ok=1;
+		var _alertString="";
+		var alertString2;
+		if (f.tagfield.value.length==0) {
+			_alertString += "\n- " + _("tag number missing");
+		}
+		if (_alertString.length==0) {
+			document.Aform.submit();
+		} else {
+			alertString2  = _("Form not submitted because of the following problem(s)");
+			alertString2 += "\n------------------------------------------------------------------------------------\n";
+			alertString2 += _alertString;
+			alert(alertString2);
+		}
+	}
+	</script>
+
+<!-- TMPL_IF NAME="add_form" -->
+<!-- ------------------------------------------------------------------------ -->
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+		<input type="hidden" name="op" value="add_validate" />
+		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+	<div class="data"><table>
+		<caption><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF --><!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></caption>
+	<tr><th><label>Tag<label></th><td><!-- TMPL_VAR NAME="searchfield" --></td></tr>
+	<tr><th><label for="liblibrarian">Tag Label in Intranet</label></th><td><input type="text" id="liblibrarian" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
+	<tr><th><label for="libopac">Tag Label in OPAC</label></th><td><input type="text" id="libopac" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100" /></td></tr>
+	<tr><th><label for="repeatable">Repeatable</label></th><td><!-- TMPL_VAR NAME="repeatable" --></td></tr>
+	<tr><th><label for="mandatory">Mandatory</label></th><td><!-- TMPL_VAR NAME="mandatory" --></td></tr>
+	<tr><th><label for="authorised_value">Authorized value</label></th><td><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</td></tr>
+	</table></div>
+		<p><input type="submit" value="Save Changes" class="submit" onclick="Check(this.form)" /></p>
+	<p><input type="submit" value="Cancel and Return to MARC Tag Structure" class="cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->'; return false;" /></p>
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirm" -->
+<!-- ------------------------------------------------------------------------ -->
+<div class="data"><table>
+<caption>Confirm Deletion of Tag <em><!-- TMPL_VAR NAME="searchfield" --></em>?</caption>
+	<tr><th>Tag: </th><td><!-- TMPL_VAR NAME="searchfield" --></td></tr>
+	<tr><th>Description: </th><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
+	</table></div>
+	<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />	<input type="submit" class="cancel" value="Yes, Delete this Tag" /></form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" class="submit" value="No, Do Not Delete" /></form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirmed" -->
+<!-- ------------------------------------------------------------------------ -->
+	<div class="details"><h3>Tag Deleted</h3>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+	<input type="submit" class="submit" value="Return to MARC Tag Structure" />
+	</form></div>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="framework_create" -->
+<!-- ------------------------------------------------------------------------ -->
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="framework_create_confirm" />
+		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+		Create framework for <!-- TMPL_VAR NAME="frameworkcode" --> (<!-- TMPL_VAR NAME="frameworktext" -->) using
+		<select name="existingframeworkcode">
+			<option value="">Default</option>
+		<!-- TMPL_LOOP NAME="existingframeworkloop" -->
+			<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
+		<!-- /TMPL_LOOP -->
+		</select>
+		<input type="submit" value="OK" class="submit" />
+	</form>
+<!-- /TMPL_IF -->
+<!-- ------------------------------------------------------------------------ -->
+<!-- TMPL_IF NAME="else" -->
+	<form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><label for="frameworkcode">Select a framework: </label>
+		<select name="frameworkcode" id="frameworkcode">
+			<option value="">Default</option>
+		<!-- TMPL_LOOP NAME="frameworkloop" -->
+			<!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="value" -->"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="frameworktext" --></option>
+		<!-- /TMPL_LOOP -->
+		</select>
+		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" size="5" />
+		<input type="submit" value="Tag Search" class="submit" />
+		<p><!-- TMPL_IF Name="select_display"-->
+				<label for="onlyused">Display only used Tags/Subfields</label><input type="checkbox" name="select_display" id="onlyused" value="True" checked="checked" onchange="document.f.submit()" />
+			<!-- TMPL_ELSE -->
+				<label for="onlyused">Display only used Tags/Subfields</label><input type="checkbox" name="select_display"  id="onlyused" value="True" onchange="document.f.submit()" />
+			<!--/TMPL_IF --> 
+		</p>
+	</form>
+	<div class="help">NOTE : Framework consists of 2 parts biblio & holdings. This is for BIBLIOGRAPHIC definitions, and main framework definer</div>
+
+	<div class="data">
+	<table>
+		<tr>
+			<th scope="col">Tag</th>
+			<th scope="col">Label</th>
+			<th scope="col">Repeatable</th>
+			<th scope="col">Mandatory</th>
+			<th scope="col">Authorized value</th>
+			<th scope="col">Subfields</th>
+			<th scope="col">&nbsp;</th>
+		</tr>
+	<!-- TMPL_IF NAME="select_display" -->
+		<!-- TMPL_LOOP NAME="loop" -->
+		<tr class="highlight">
+			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
+			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
+			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->">Edit Subfields</a></td>
+			<td><a class="edit" href="<!-- TMPL_VAR NAME="edit" -->">Edit Tag</a> <a class="delete" href="<!-- TMPL_VAR NAME="delete" -->">Delete Tag</a></td>
+		</tr>
+		<tr>
+			<td>
+				&nbsp;
+			</td>
+			<td colspan="6">
+				<ul>
+				<!-- TMPL_LOOP NAME="subfields" -->
+					<li>Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
+							<!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
+					</li>
+				<!-- /TMPL_LOOP -->
+				</ul>
+			</td>
+		</tr>
+		<!-- /TMPL_LOOP -->
+	<!-- TMPL_ELSE -->
+		<!-- TMPL_LOOP NAME="loop" -->
+		<!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
+			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
+			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->">View Subfields</a></td>
+			<td><a class="edit" href="<!-- TMPL_VAR NAME="edit" -->">Edit Tag</a> <a class="delete" href="<!-- TMPL_VAR NAME="delete" -->">Delete Tag</a></td>
+		</tr>
+		<!-- /TMPL_LOOP -->
+	<!--/TMPL_IF -->
+	</table>
+	<div class="tabitem">
+		<!-- TMPL_IF NAME="isprevpage" -->
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
+		<input type="hidden" value="<!-- TMPL_VAR NAME="prevpage" -->" name="offset" /><input type="hidden" value="<!-- TMPL_VAR NAME="searchfield" -->" name="searchfield" /><input type="hidden" value="<!-- TMPL_VAR NAME="frameworkcode" -->" name="frameworkcode" /><!--TMPL_IF Name="select_display"--><input type="hidden" value="select_display" name="True" /><!--/TMPL_IF --><input type="submit" value="&lt;&lt; Previous Page" class="submit" /></form>
+		<!-- /TMPL_IF -->	
+		
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="add_form" />
+	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+		<input type="submit" value="Add New MARC Tag" class="submit" /></form>
+		
+		<!-- TMPL_IF NAME="nextpage" -->
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextpage" -->" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><!--TMPL_IF Name="select_display"--><input type="hidden" name="select_display" value="True" /><!--/TMPL_IF --><input type="submit" class="submit" value="Next Page &gt;&gt;" /></form>
+		<!-- /TMPL_IF -->
+</div>
+</div>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl
index c540746604..d68857c2ec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl
@@ -1,76 +1,87 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: MARC Check: 
 <!-- TMPL_IF name="total" --><!-- TMPL_VAR name="total" --> errors found<!-- TMPL_ELSE -->Configuration OK!<!-- /TMPL_IF -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
-
 <h1>MARC Checks</h1>
 <table>
 	<tr>
 		<th>Test</th>
 		<th>Result</th>
 	</tr>
-<!-- -->
-<!-- TMPL_IF name="itemnum" -->
+<!-- TMPL_IF name="biblionumber" -->
+	<tr>
+		<td> biblionumber</td>
+		<td>The biblio.biblionumber  and items.biblionumber fields MUST :
+			<ul><li>each be mapped to a MARC field/subfield,</li>
+			</ul></td>
+	</tr>
+<!-- TMPL_ELSE -->
+	<tr>
+		<td>OK</td>
+		<td>biblionumber  mapped correctly</td>
+	</tr>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF name="itemnumber" -->
 	<tr>
 		<td>itemnum</td>
-		<td><ul><li>The field itemnum MUST be mapped </li>
-			<li>The correspounding subfield MUST be in with -1 (ignore) tab</li></ul></td>
+		<td><ul><li>The field itemnumber MUST be mapped </li>
+			<li>The corresponding fileld or subfield MUST be in tab 10 and may be hidden</li></ul></td>
 	</tr>
 <!-- TMPL_ELSE -->
 	<tr>
 		<td>OK</td>
-		<td>itemnum : the field itemnumber is mapped to a field in tab -1</td>
+		<td>The field itemnumber is mapped to a  MARC field </td>
 	</tr>
 <!-- /TMPL_IF -->
-<!-- -->
-<!-- TMPL_IF name="itemfields" -->
+
+<!-- TMPL_IF name="barcode" -->
 	<tr>
-		<td>item fields</td>
-		<td>ALL items fields MUST :<br />
-			<ul><li>be mapped to the same tag,</li>
-			<li>and they must all be in the 10 (items) tab</li></ul></td>
+		<td>itemnum</td>
+		<td><ul><li>The field barcodde MUST be mapped </li>
+			<li>The corresponding field or subfield MUST be in tab 10 and may be hidden</li></ul></td>
 	</tr>
 <!-- TMPL_ELSE -->
 	<tr>
 		<td>OK</td>
-		<td>All item fields are in the same tag and in item tab</td>
+		<td>The field barcode is mapped to a  MARC field </td>
 	</tr>
 <!-- /TMPL_IF -->
-<!-- -->
-	<!-- TMPL_IF NAME="itemtags" -->
-		<tr>
-			<td>Item tag</td>
-			<td>There is more than 1 MARC tag related to items tab (10) : <!-- TMPL_VAR name="itemtags" --></td>
-		</tr>
-	<!-- TMPL_ELSE -->
-		<tr>
-			<td>OK</td>
-			<td><i>Only 1 MARC tag mapped to items</i></td>
-		</tr>
-	<!-- /TMPL_IF -->
-	<!--  -->
+<!-- TMPL_IF name="isbn" -->
+	<tr>
+		<td>ISBN NOT mapped</td>
+		<td>isbn  MUST :<br />
+			<ul><li>be mapped to a MARC subfield,</li>
+		 </ul></td>
+	</tr>
+<!-- TMPL_ELSE -->
+	<tr>
+		<td>OK</td>
+		<td>ISBN defined</td>
+	</tr>
+<!-- /TMPL_IF -->
+
+
 <!-- TMPL_IF name="itemtype" -->
 	<tr>
 		<td>itemtype NOT mapped</td>
-		<td>the biblioitems.itemtype field MUST :<br />
+		<td>itemtype field MUST :<br />
 			<ul><li>be mapped to a MARC subfield, </li>
 			<li>the correspounding subfield MUST have authorised_value=itemtype</li></ul></td>
 	</tr>
 <!-- TMPL_ELSE -->
 	<tr>
 		<td>OK</td>
-		<td>biblioitems.itemtype defined</td>
+		<td>itemtype mapped</td>
 	</tr>
 <!-- /TMPL_IF -->
 <!-- -->
 <!-- TMPL_IF name="branch" -->
 	<tr>
 		<td>homebranch NOT mapped</td>
-		<td>the items.homebranch field MUST :<br />
+		<td>homebranch  MUST :<br />
 			<ul><li>be mapped to a MARC subfield,</li>
-			<li>the correspounding subfield MUST have authorised value=branches</li></ul></td>
+		 </ul></td>
 	</tr>
 <!-- TMPL_ELSE -->
 	<tr>
@@ -82,7 +93,7 @@
 <!-- TMPL_IF name="holdingbranch" -->
 	<tr>
 		<td>holdingbranch NOT mapped</td>
-		<td>the items.holdingbranch field MUST :<br />
+		<td>the holdingbranch  MUST :<br />
 			<ul><li>be mapped to a MARC subfield, </li>
 			<li>the correspounding subfield MUST have authorised value=branches</li></ul></td>
 	</tr>
@@ -93,35 +104,6 @@
 	</tr>
 <!-- /TMPL_IF -->
 <!-- -->
-<!-- TMPL_IF name="biblionumber" -->
-	<tr>
-		<td>biblio and biblionumber</td>
-		<td>The biblio.biblionumber and biblioitems.biblioitemnumber fields MUST :
-			<ul><li>be mapped to a MARC subfield,</li>
-			<li>be in the SAME tag (for example : 090$a and 090$b)</li>
-			<li>be in tab -1</li></ul></td>
-	</tr>
-<!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td>biblionumber and biblioitemnumber mapped correctly</td>
-	</tr>
-<!-- /TMPL_IF -->
-
-	<!-- TMPL_IF NAME="frameworknull" -->
-		<tr>
-			<td>framework values</td>
-			<td>there is a null value in a frameworkcode. Check the following tables<br/>
-				<li>select * from marc_subfield_structure where frameworkcode is NULL</li>
-				<li>select * from marc_tag_structure where frameworkcode is NULL</li>
-				<li>select * from marc_biblio where frameworkcode is NULL</li></td>
-		</tr>
-	<!-- TMPL_ELSE -->
-		<tr>
-			<td>OK</td>
-			<td><i>no NULL value in frameworkcode</i></td>
-		</tr>
-	<!-- /TMPL_IF -->
 
 <!-- -->
 <!-- TMPL_IF name="total" -->
@@ -132,7 +114,7 @@
 </table>
 <!-- TMPL_ELSE -->
 	</table>
-		<p>Configuration OK, you don't have errors in your MARC parameters table</p>
+		<p>Configuration OK, you don't have errors in your MARC parameters </p>
 <!-- /TMPL_IF -->
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/holdings_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/holdings_subfields_structure.tmpl
new file mode 100644
index 0000000000..f9b41659e5
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/holdings_subfields_structure.tmpl
@@ -0,0 +1,131 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
+<!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="modify" -->Modify system preference '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add a system preference<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="add_validate" -->Data Added<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Parameter '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" -->Parameter Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Preferences<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menu.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<!-- TMPL_IF NAME="add_form" -->
+
+	<h1><!-- TMPL_IF NAME="use-heading-flags-p" -->
+	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints<!-- /TMPL_IF -->
+	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></h1>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+	<input type="hidden" name="op" value="add_validate" />
+	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+	<!-- TMPL_LOOP NAME="loop" -->
+	<div class="data <!-- TMPL_VAR NAME="toggle" -->"><h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
+	<table>
+	<caption>MARC constraints</caption>
+	<tr><th><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable:</label></th><td><!-- TMPL_VAR NAME="repeatable" --></td></tr>
+	<tr><th><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory:</label></th><td><!-- TMPL_VAR NAME="mandatory" --> </td></tr>
+	<tr><th><label for="seealso<!-- TMPL_VAR NAME="row" -->">Search also:</label></th><td><input type="text" id="seealso<!-- TMPL_VAR NAME="row" -->" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" /> (example for 200a: '200c','200d','200e'...)</td></tr>
+			</table>
+	<table>
+	<caption>Editor constaints</caption>
+	<tr><th><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for librarian:</label></th><td><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></td></tr>
+	<tr><th><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC:</label></th><td><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></td></tr>
+	<tr><th><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab:</label></th><td><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</td></tr>
+
+	<tr><th><label for="hidden<!-- TMPL_VAR NAME="row" -->">Hidden:</label></th><td> Opac:<!-- TMPL_VAR name="ohidden" -->  Intranet:<!-- TMPL_VAR name="ihidden" --> Editor:<!-- TMPL_VAR name="ehidden" --> (see online help)</td></tr>
+
+	<tr><th><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL: </label></th><td><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is an URL and can be clicked</td></tr>
+<tr><th><label>Default Options: <p>(choose one)</p></label></th><td>
+<ul>
+	<li>Authorized Value: <!-- TMPL_VAR NAME="authorised_value" --></li>
+	<li>Thesaurus: <!-- TMPL_VAR NAME="authtypes" --></li>
+	<li>Plugin: <!-- TMPL_VAR NAME="value_builder" --></li>
+	<li>Link: <input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5" /> (exemple:200b)</li>
+</ul>
+</td></tr>	 
+		</table>
+		</div>
+	<!-- /TMPL_LOOP -->
+	<input type="submit" class="submit" value="Save Changes" />
+	<p>Note: in the last column, you can choose:
+	<ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
+	<li>A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table.</li>
+	<li>A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.</li>
+	</ul>
+	</p>
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirm" -->
+
+<div class="data"><table>
+<caption>Confirm Deletion of Subfield <span class="ex"><!-- TMPL_VAR NAME="tagsubfield" -->?</span></caption>
+	<tr>
+		<th>Subfield</th>
+		<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
+	</tr>
+	<tr><th>Description</th><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
+</table></div>
+			<form class="inline" action="<!-- TMPL_VAR NAME="delete_link" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" />
+				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+				<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" /><input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" class="cancel" value="Yes, Delete this Subfield" />
+			</form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">	<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />	<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />	<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />	<input type="submit" class="submit" value="No, Do Not Delete" />
+			</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirmed" -->
+
+	Data deleted
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
+	<input type="submit" class="submit" value="OK" />
+	</form>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF NAME="else" -->
+<h1>Holdings MARC subfield structure admin for <!-- TMPL_VAR NAME="tagfield" --> (framework <!--TMPL_VAR NAME="frameworkcode" -->)</h1>
+<p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>
+
+<table>
+<tr>
+	<th>Subfield</th>
+	<th>Text</th>
+	<th>Constraints</th>
+	<th>Delete</th>
+<!-- TMPL_LOOP NAME="loop" -->
+<!-- TMPL_IF NAME="toggle" --><tr class="highlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
+	<td>
+		<!-- TMPL_IF NAME="subfield_ignored" -->
+			<i><!-- TMPL_VAR NAME="liblibrarian" --></i>
+		<!-- TMPL_ELSE -->
+			<!-- TMPL_VAR NAME="liblibrarian" -->
+		<!-- /TMPL_IF -->
+	</td>
+	<td>
+		<!-- TMPL_IF NAME="subfield_ignored" -->
+			<i>subfield ignored</i>
+		<!-- TMPL_ELSE -->
+			<strong>Tab:</strong><!-- TMPL_VAR NAME="tab" -->,
+			<!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="seealso" --> | <strong>See Also:</strong> <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="authorised_value" --> | <strong>Auth value:</strong><!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="authtypecode" --> | <strong>Authority:</strong><!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="value_builder" --> | <strong>Plugin:</strong><!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="link" --> | <strong>Link:</strong><!-- TMPL_VAR NAME="link" -->,<!-- /TMPL_IF -->
+		<!-- /TMPL_IF -->
+	</td>
+	<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
+</tr>
+<!-- /TMPL_LOOP -->
+</table>
+<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="edit_tagfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="edit_frameworkcode" -->" /><input type="submit" class="submit" value="Edit Subfields" /></form> <form class="inline" action="holdingstagstructure.pl" method="get"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="tagfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" class="submit" value="Return to Marc Structure" /></form>
+<!-- TMPL_IF NAME="previous" -->
+	<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0" >
+	</a><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="next" -->
+	<!-- TMPL_VAR NAME="next" -->
+		<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0" />
+	</a>
+<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/holdingstagstructure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/holdingstagstructure.tmpl
new file mode 100644
index 0000000000..4226a50293
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/holdingstagstructure.tmpl
@@ -0,0 +1,205 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
+<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Tag '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->MARC tag Structure<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menu.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<h1>Holdings MARC tag structure admin for <!-- TMPL_IF NAME="frameworkcode" --><!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)<!-- TMPL_ELSE -->default MARC framework<!-- /TMPL_IF --></h1>
+<script language="javascript" type="text/javascript">
+	function _(s) { return s } // dummy function for gettext
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function isNotNull(f,noalert) {
+		if (f.value.length ==0) {
+   return false;
+		}
+		return true;
+	}
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function toUC(f) {
+		var x=f.value.toUpperCase();
+		f.value=x;
+		return true;
+	}
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function isNum(v,maybenull) {
+	var n = new Number(v.value);
+	if (isNaN(n)) {
+		return false;
+		}
+	if (maybenull==0 && v.value=='') {
+		return false;
+	}
+	return true;
+	}
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function isDate(f) {
+		var t = Date.parse(f.value);
+		if (isNaN(t)) {
+			return false;
+		}
+	}
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function Check(f) {
+		var ok=1;
+		var _alertString="";
+		var alertString2;
+		if (f.tagfield.value.length==0) {
+			_alertString += "\n- " + _("tag number missing");
+		}
+		if (_alertString.length==0) {
+			document.Aform.submit();
+		} else {
+			alertString2  = _("Form not submitted because of the following problem(s)");
+			alertString2 += "\n------------------------------------------------------------------------------------\n";
+			alertString2 += _alertString;
+			alert(alertString2);
+		}
+	}
+	</script>
+
+<!-- TMPL_IF NAME="add_form" -->
+<!-- ------------------------------------------------------------------------ -->
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+		<input type="hidden" name="op" value="add_validate" />
+		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+	<div class="data"><table>
+		<caption><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF --><!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></caption>
+	<tr><th><label>Tag<label></th><td><!-- TMPL_VAR NAME="searchfield" --></td></tr>
+	<tr><th><label for="liblibrarian">Tag Label in Intranet</label></th><td><input type="text" id="liblibrarian" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
+	<tr><th><label for="libopac">Tag Label in OPAC</label></th><td><input type="text" id="libopac" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100" /></td></tr>
+	<tr><th><label for="repeatable">Repeatable</label></th><td><!-- TMPL_VAR NAME="repeatable" --></td></tr>
+	<tr><th><label for="mandatory">Mandatory</label></th><td><!-- TMPL_VAR NAME="mandatory" --></td></tr>
+	<tr><th><label for="authorised_value">Authorized value</label></th><td><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</td></tr>
+	</table></div>
+		<p><input type="submit" value="Save Changes" class="submit" onclick="Check(this.form)" /></p>
+	<p><input type="submit" value="Cancel and Return to MARC Tag Structure" class="cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->'; return false;" /></p>
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirm" -->
+<!-- ------------------------------------------------------------------------ -->
+<div class="data"><table>
+<caption>Confirm Deletion of Tag <em><!-- TMPL_VAR NAME="searchfield" --></em>?</caption>
+	<tr><th>Tag: </th><td><!-- TMPL_VAR NAME="searchfield" --></td></tr>
+	<tr><th>Description: </th><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
+	</table></div>
+	<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />	<input type="submit" class="cancel" value="Yes, Delete this Tag" /></form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" class="submit" value="No, Do Not Delete" /></form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirmed" -->
+<!-- ------------------------------------------------------------------------ -->
+	<div class="details"><h3>Tag Deleted</h3>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+	<input type="submit" class="submit" value="Return to MARC Tag Structure" />
+	</form></div>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="framework_create" -->
+<!-- ------------------------------------------------------------------------ -->
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="framework_create_confirm" />
+		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+		Create framework for <!-- TMPL_VAR NAME="frameworkcode" --> (<!-- TMPL_VAR NAME="frameworktext" -->) using
+		<select name="existingframeworkcode">
+			<option value="">Default</option>
+		<!-- TMPL_LOOP NAME="existingframeworkloop" -->
+			<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
+		<!-- /TMPL_LOOP -->
+		</select>
+		<input type="submit" value="OK" class="submit" />
+	</form>
+<!-- /TMPL_IF -->
+<!-- ------------------------------------------------------------------------ -->
+<!-- TMPL_IF NAME="else" -->
+	<form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><label for="frameworkcode">Select a framework: </label>
+		<select name="frameworkcode" id="frameworkcode">
+			<option value="">Default</option>
+		<!-- TMPL_LOOP NAME="frameworkloop" -->
+			<!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="value" -->"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="frameworktext" --></option>
+		<!-- /TMPL_LOOP -->
+		</select>
+		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" size="5" />
+		<input type="submit" value="Tag Search" class="submit" />
+		<p><!-- TMPL_IF Name="select_display"-->
+				<label for="onlyused">Display only used Tags/Subfields</label><input type="checkbox" name="select_display" id="onlyused" value="True" checked="checked" onchange="document.f.submit()" />
+			<!-- TMPL_ELSE -->
+				<label for="onlyused">Display only used Tags/Subfields</label><input type="checkbox" name="select_display"  id="onlyused" value="True" onchange="document.f.submit()" />
+			<!--/TMPL_IF --> 
+		</p>
+	</form>
+	<div class="help">NOTE : Framework consists of 2 parts biblio & holdings. This is for HOLDINGS definition.</div>
+
+	<div class="data">
+	<table>
+		<tr>
+			<th scope="col">Tag</th>
+			<th scope="col">Label</th>
+			<th scope="col">Repeatable</th>
+			<th scope="col">Mandatory</th>
+			<th scope="col">Authorized value</th>
+			<th scope="col">Subfields</th>
+			<th scope="col">&nbsp;</th>
+		</tr>
+	<!-- TMPL_IF NAME="select_display" -->
+		<!-- TMPL_LOOP NAME="loop" -->
+		<tr class="highlight">
+			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
+			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
+			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->">Edit Subfields</a></td>
+			<td><a class="edit" href="<!-- TMPL_VAR NAME="edit" -->">Edit Tag</a> <a class="delete" href="<!-- TMPL_VAR NAME="delete" -->">Delete Tag</a></td>
+		</tr>
+		<tr>
+			<td>
+				&nbsp;
+			</td>
+			<td colspan="6">
+				<ul>
+				<!-- TMPL_LOOP NAME="subfields" -->
+					<li>Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
+							<!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
+					</li>
+				<!-- /TMPL_LOOP -->
+				</ul>
+			</td>
+		</tr>
+		<!-- /TMPL_LOOP -->
+	<!-- TMPL_ELSE -->
+		<!-- TMPL_LOOP NAME="loop" -->
+		<!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
+			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
+			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->">View Subfields</a></td>
+			<td><a class="edit" href="<!-- TMPL_VAR NAME="edit" -->">Edit Tag</a> <a class="delete" href="<!-- TMPL_VAR NAME="delete" -->">Delete Tag</a></td>
+		</tr>
+		<!-- /TMPL_LOOP -->
+	<!--/TMPL_IF -->
+	</table>
+	<div class="tabitem">
+		<!-- TMPL_IF NAME="isprevpage" -->
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
+		<input type="hidden" value="<!-- TMPL_VAR NAME="prevpage" -->" name="offset" /><input type="hidden" value="<!-- TMPL_VAR NAME="searchfield" -->" name="searchfield" /><input type="hidden" value="<!-- TMPL_VAR NAME="frameworkcode" -->" name="frameworkcode" /><!--TMPL_IF Name="select_display"--><input type="hidden" value="select_display" name="True" /><!--/TMPL_IF --><input type="submit" value="&lt;&lt; Previous Page" class="submit" /></form>
+		<!-- /TMPL_IF -->	
+		
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="add_form" />
+	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+		<input type="submit" value="Add New MARC Tag" class="submit" /></form>
+		
+		<!-- TMPL_IF NAME="nextpage" -->
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextpage" -->" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><!--TMPL_IF Name="select_display"--><input type="hidden" name="select_display" value="True" /><!--/TMPL_IF --><input type="submit" class="submit" value="Next Page &gt;&gt;" /></form>
+		<!-- /TMPL_IF -->
+</div>
+</div>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/institutions-careers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/institutions-careers.tmpl
new file mode 100644
index 0000000000..b19e17c4a5
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/institutions-careers.tmpl
@@ -0,0 +1,126 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+<script language="JavaScript" type="text/javascript">
+
+function confirm_delete_career(id_career) {
+	if (confirm('Are you sure you want to delete the selected career/curse?')) {
+	
+		document.location.href = "/cgi-bin/koha/admin/admin-careers.pl?op=del&id_career=" + id_career;
+	}
+	
+}
+
+function confirm_delete(id_institution) {
+	if (confirm('Are you sure you want to delete the selected educational institution?')) {
+
+		document.location.href = "/cgi-bin/koha/admin/institutions-careers.pl?op=del&id_institution=" + id_institution;
+	}
+
+}
+
+more = 0;
+less = 0;
+
+	function preloadImages() {
+		more = new Image();
+		more.src = "<!-- TMPL_VAR NAME="themelang" -->/images/more.gif";
+		less = new Image();
+		less.src = "<!-- TMPL_VAR NAME="themelang" -->/images/less.gif";
+	}
+
+	function show(element, img) {
+	    var block = document.getElementById(element);
+		if (block.style.display == 'none') {
+		    block.style.display = 'inline';
+		    img.src = less.src;
+		} else {
+			block.style.display = 'none';
+			img.src = more.src;
+		}
+	}
+	
+	preloadImages();
+
+</script>
+
+<div id="main">
+	<h1>Educational institutions (Courses)</h1>
+	
+	<!-- TMPL_IF NAME="add_form" -->
+	
+	    <form action="/cgi-bin/koha/admin/institutions-careers.pl">
+	        <input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->">
+	        <input type="hidden" name="id_institution" value="<!-- TMPL_VAR NAME="id_institution" -->">
+			Educational institution name:&nbsp;&nbsp;
+			<input size="50" type="text" name="institution_name" value="<!-- TMPL_VAR NAME="institution_name" -->"
+	        <br><br>
+	        <input type="submit" class="button" value="Save">
+	        <input type="button" class="button" value="Cancel" onclick="document.location.href='/cgi-bin/koha/admin/institutions-careers.pl'">
+	    </form>
+	
+	
+	<!-- TMPL_ELSE -->
+	
+	<table border="0" cellspacing="0" cellpadding="3">
+
+		<!-- TMPL_LOOP NAME="institutions" -->
+			<tr>
+			    <td class="hilighted" width="5%">
+					<a href="/cgi-bin/koha/admin/institutions-careers.pl?op=add_form&id_institution=<!-- TMPL_VAR NAME="id_institution" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" border="0"></a>
+				</td>
+				<td class="hilighted" width="5%">
+					<a href="javascript:confirm_delete(<!-- TMPL_VAR NAME="id_institution" -->)" ><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" border="0"></a>
+				</td>
+				<td align="center" class="hilighted"><b><!-- TMPL_VAR NAME="institution_name" --></b></td>
+				<td class="hilighted" align="center" width="15%">
+				    <a class="button" id="small" href="/cgi-bin/koha/admin/admin-careers.pl?op=add_form&id_institution=<!-- TMPL_VAR NAME="id_institution" -->">Add course</a>
+				</td>
+			</tr>
+			
+			<tr>
+			    <td colspan="3" style="font-size:13px">
+			        <img style="cursor:hand" class="relative" onclick="show('<!-- TMPL_VAR NAME="id_institution" -->', this)" src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif"> Courses
+			    </td>
+			    <td colspan="1">
+			    </td>
+			</tr>
+			
+			<tr>
+			    <td colspan="4">
+			        <table  id="<!-- TMPL_VAR NAME="id_institution" -->" style="border-spacing:5px;border-collapse:separate;border:0;display:none">
+						<tr>
+							<td colspan="3">
+								<hr>
+							</td>
+						</tr>
+			        <!-- TMPL_LOOP NAME="careers" -->
+			            <tr>
+			                <td>
+			                    <!-- TMPL_VAR NAME="career_name" -->
+			                </td>
+			                <td width="5%">
+                                <a class="button" id="small" href="/cgi-bin/koha/admin/admin-careers.pl?op=add_form&id_career=<!-- TMPL_VAR NAME="id_career" -->&id_institution=<!-- TMPL_VAR NAME="id_institution" -->">Edit</a>
+			                </td>
+			                <td width="5%">
+                                <input class="button" id="small" type="button" onclick="confirm_delete_career(<!-- TMPL_VAR NAME="id_career" -->)" value="Delete">
+			                </td>
+						</tr>
+						<tr>
+			                <td colspan="3">
+								<hr>
+							</td>
+			            </tr>
+			        <!-- /TMPL_LOOP -->
+			        </table>
+			    </td>
+			</tr>
+		<!-- /TMPL_LOOP -->
+	</table>
+	<br>
+    <a class="button" href="/cgi-bin/koha/admin/institutions-careers.pl?op=add_form">Add educational institution</a>
+
+	<!-- /TMPL_IF -->
+
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/koha-electronic.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/koha-electronic.tmpl
new file mode 100644
index 0000000000..dd39f2c3da
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/koha-electronic.tmpl
@@ -0,0 +1,113 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
+<div id="main">
+	<h1> OPAC Online Databases</h1>
+	<!-- TMPL_IF name="add_form" -->
+
+		<form name="add_form" method="post" action="/cgi-bin/koha/admin/koha-electronic.pl" >
+			<input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->">
+			<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->">
+			<table style="border:0" cellspacing="0" cellpadding="2">
+			    <tr>
+			        <td>Language
+			       
+						<select name="lang">
+			    			<option value="tr" <!-- TMPL_IF name="tr" -->selected<!-- /TMPL_IF --> > Türkçe</option>
+			    			<option value="en" <!-- TMPL_IF name="en" -->selected<!-- /TMPL_IF -->>English</option>
+						</select>
+					</td><td></td>
+					<td>Section
+						<select name="section">
+						<option value="affiliated" <!-- TMPL_IF name="affiliated" -->selected<!-- /TMPL_IF --> >Affiliated</option>
+			    			<option value="trial" <!-- TMPL_IF name="trial" -->selected<!-- /TMPL_IF --> >Trial</option>
+			    			<option value="economy" <!-- TMPL_IF name="economy" -->selected<!-- /TMPL_IF --> >Economy & Politics</option>
+			    			<option value="social" <!-- TMPL_IF name="social" -->selected<!-- /TMPL_IF -->>Social Sciences</option>
+						<option value="computer" <!-- TMPL_IF name="computer" -->selected<!-- /TMPL_IF --> >Computer Sciences</option>
+			    			<option value="health" <!-- TMPL_IF name="health" -->selected<!-- /TMPL_IF -->>Health & Medicine</option>
+						<option value="general" <!-- TMPL_IF name="general" -->selected<!-- /TMPL_IF --> > Interdiciplinary</option>
+			    			<option value="maths" <!-- TMPL_IF name="maths" -->selected<!-- /TMPL_IF -->>Maths,Physics,Chemistry</option>
+						<option value="other" <!-- TMPL_IF name="other" -->selected<!-- /TMPL_IF --> > Other Subjects</option>
+			    			</select>
+					</td>
+			    </tr>
+				<tr>
+					<td>Title:
+					<input size="30" type="text" name="title" value="<!-- TMPL_VAR NAME="title" -->"></td>
+					<td>URL:
+					<input size="30" type="text" name="href" value="<!-- TMPL_VAR NAME="href" -->"></td>
+					<td>Resim:
+					<input size="20" type="text" name="image" value="<!-- TMPL_VAR NAME="image" -->"></td>
+				</tr>
+				<tr>
+					<td>Text</td>
+					<td><textarea name="edata" cols="35" rows="4"><!-- TMPL_VAR NAME="edata" --></textarea></td>
+				</tr>
+				<tr>
+					<td  colspan="2">
+						<input class="button" type="submit" value="Save">
+						<input class="button" type="button" value="Cancel" onclick="window.location.href='/cgi-bin/koha/admin/opac-electronic.pl'">
+					</td>
+				</tr>
+			</table>
+		</form>
+
+
+	<!-- TMPL_ELSE -->
+
+		<!-- TMPL_IF NAME="opac_electronic_count" -->
+
+            <form name="add_form" method="post" action="/cgi-bin/koha/admin/koha-electronic.pl" >
+			Language:
+			<select name="lang">
+			    <option value="">All</option>
+			    <option value="tr" <!-- TMPL_IF name="tr" -->selected<!-- /TMPL_IF --> >Türkçe</option>
+			    <option value="en" <!-- TMPL_IF name="en" -->selected<!-- /TMPL_IF -->>English</option>
+			</select>
+			<input type="submit" class="button" value="Filter">
+			</form>
+
+			<form name="del_form" method="post" action="/cgi-bin/koha/admin/opac-electronic.pl" onsubmit="return confirm("Are you sure you want to delete the selected database?')">
+				<table border="0" cellspacing="0" cellpadding="3">
+					<tr bgcolor="#99cc33">
+						<th></td>
+						<th style="padding-left:3px;padding-right:3px">Language</th>
+						<th>image</th>
+						<th>URL</th>
+						<th  width="20%">Title</th>
+						<th>Text</th>
+						<th></th>
+					</tr>
+
+					<!-- TMPL_LOOP NAME="opac_electronic" -->
+						<tr>
+							<td width="5%"><input type="checkbox" name="ids" value="<!-- TMPL_VAR NAME="idelectronic" -->"</td>
+							<td align="center"><!-- TMPL_VAR NAME="lang" --></td>
+							<td><!-- TMPL_VAR NAME="image" --></td>
+							<td><!-- TMPL_VAR NAME="href" --></td>
+							<td align="center"><!-- TMPL_VAR NAME="title" --></td>
+							<td><!-- TMPL_VAR NAME="edata" --></td>
+							<td width="5%">
+								<a href="/cgi-bin/koha/admin/koha-electronic.pl?op=add_form&id=<!-- TMPL_VAR NAME="idelectronic" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" border="0"></a>
+							</td>
+						</tr>
+					<!-- /TMPL_LOOP -->
+
+				</table>
+					<input type="hidden" name="op" value="del">
+					<input type="submit" class="button" value="Delete selected">
+			</form>
+		<!-- TMPL_ELSE -->
+			<h5>No databases loaded</h5>
+		<!-- /TMPL_IF -->
+
+		<form name="add_form" method="post" action="/cgi-bin/koha/admin/koha-electronic.pl">
+			<input type="hidden" name="op" value="add_form">
+			<input type="submit" class="button" value="Add OPAC databases">
+		</form>
+	
+	
+	<!-- /TMPL_IF -->
+
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/koha_attr.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/koha_attr.tmpl
new file mode 100644
index 0000000000..268403af37
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/koha_attr.tmpl
@@ -0,0 +1,194 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
+<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of attribute '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->MARC tag Structure<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menu.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<h1>KOHA attr matching for biblios,holdings and authorities XML & MARC records</h1>
+<script language="javascript" type="text/javascript">
+	function _(s) { return s } // dummy function for gettext
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function isNotNull(f,noalert) {
+		if (f.value.length ==0) {
+   return false;
+		}
+		return true;
+	}
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function toUC(f) {
+		var x=f.value.toUpperCase();
+		f.value=x;
+		return true;
+	}
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function isNum(v,maybenull) {
+	var n = new Number(v.value);
+	if (isNaN(n)) {
+		return false;
+		}
+	if (maybenull==0 && v.value=='') {
+		return false;
+	}
+	return true;
+	}
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function isDate(f) {
+		var t = Date.parse(f.value);
+		if (isNaN(t)) {
+			return false;
+		}
+	}
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function Check(f) {
+		var ok=1;
+		var _alertString="";
+		var alertString2;
+		if (f.marctokoha.value.length==0) {
+			_alertString += "\n- " + _("field name missing");
+		}
+		if (_alertString.length==0) {
+			document.Aform.submit();
+		} else {
+			alertString2  = _("Form not submitted because of the following problem(s)");
+			alertString2 += "\n------------------------------------------------------------------------------------\n";
+			alertString2 += _alertString;
+			alert(alertString2);
+		}
+	}
+	</script>
+
+<!-- TMPL_IF NAME="add_form" -->
+<!-- ------------------------------------------------------------------------ -->
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+		<input type="hidden" name="op" value="add_validate" />
+		<input type="hidden" name="id" value='<!-- TMPL_VAR NAME="id" -->' />
+	<div class="data"><table>
+		<caption><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF --><!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></caption>
+	<tr><th><label>Kohafield<label></th><td><!-- TMPL_VAR NAME="searchfield" --></td></tr>
+	<tr><th><label for="liblibrarian">Field description</label></th><td><input type="text" id="liblibrarian" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
+	<tr><th><label for="attr">Bib1 or other defined attribute</label></th><td><input type="text" id="attr" name="attr" value="<!-- TMPL_VAR NAME="attr" escape="HTML" -->" size="40" maxlength="80" />Add all common attributes to field</td></tr>
+	<tr><th><label for="taglist">MARC tag for this field</label></th><td><!-- TMPL_VAR NAME="tagfield"  --></td></tr>
+	<tr><th><label for="tagsublist">MARC subfieldcode for this field</label></th><td><!-- TMPL_VAR NAME="tagsubfield"  --></td></tr>
+	<tr><th><label for="sorts">Sorts on this field</label></th><td><!-- TMPL_VAR NAME="sorts" --></td></tr>
+	<tr><th><label for="opacshow">Shows in librarian searches</label></th><td><!-- TMPL_VAR NAME="intrashow" --><label for="opacshow">Shows in opac search</label><!-- TMPL_VAR NAME="opacshow" --></td></tr>
+	<tr><th><label for="serverlist">Record type for this field</label></th><td><!-- TMPL_VAR NAME="recordtype"  --></td></tr>
+	
+	
+	</table></div>
+		<p><input type="submit" value="Save Changes" class="submit" onclick=Check(this.form) /></p>
+	<p><input type="submit" value="Cancel and Return to Koha attr Structure" class="cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" /></p>
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirm" -->
+<!-- ------------------------------------------------------------------------ -->
+<div class="data"><table>
+<caption>Confirm Deletion of Field <em><!-- TMPL_VAR NAME="searchfield" --></em>?</caption>
+	<tr><th>Kohafield: </th><td><!-- TMPL_VAR NAME="searchfield" --></td></tr>
+	<tr><th>Description: </th><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
+	</table></div>
+	<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"/><input type="hidden" name="id" value='<!-- TMPL_VAR NAME="id" -->' />	<input type="submit" class="cancel" value="Yes, Delete this Tag" /></form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" class="submit" value="No, Do Not Delete" /></form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirmed" -->
+<!-- ------------------------------------------------------------------------ -->
+	<div class="details"><h3>Field Deleted</h3>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<input type="submit" class="submit" value="Return to Koha attributes Structure" />
+	</form></div>
+<!-- /TMPL_IF -->
+
+
+<!-- ------------------------------------------------------------------------ -->
+<!-- TMPL_IF NAME="else" -->
+	<form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		
+		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" size="60" />
+		<input type="submit" value="Kohafield Search" class="submit" />
+		<p><!-- TMPL_IF Name="select_display"-->
+				<label for="onlyused">Display only used Tags/Subfields</label><input type="checkbox" name="select_display" id="onlyused" value="True" checked="checked" onchange="document.f.submit()" />
+			<!-- TMPL_ELSE -->
+				<label for="onlyused">Display only used Tags/Subfields</label><input type="checkbox" name="select_display"  id="onlyused" value="True" onchange="document.f.submit()" />
+			<!--/TMPL_IF --> 
+		</p>
+	</form>
+	<div class="help">NOTE : if you change the link between a KOHA field and a Z39.50 attribute, ask your administrator to reindex ZEBRA with these attributes.</div>
+
+	<div class="data">
+	<table>
+		<tr>
+			<th scope="col">Koha field</th>
+			<th scope="col">Attribute</th>
+			<th scope="col">MARC tag/sub</th>
+			<th scope="col">Label</th>
+			<th scope="col">Sorts</th>
+			<th scope="col">Intra Show</th>
+			<th scope="col">Opac Show</th>
+			<th scope="col">Related record</th>
+			
+			
+			<th scope="col">&nbsp;</th>
+		</tr>
+	<!-- TMPL_IF NAME="select_display" -->
+		<!-- TMPL_LOOP NAME="loop" -->
+		<input type="hidden" value="<!-- TMPL_VAR NAME="attr" -->" />
+		<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
+		<tr class="highlight">
+			<td><b><!-- TMPL_VAR NAME="marctokoha" --></b></td>
+			<td><!-- TMPL_VAR NAME="attr" --></td>
+			<td><!-- TMPL_VAR NAME="tagfield" --><!-- TMPL_VAR NAME="tagsubfield" --></td>
+			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+			<td><!-- TMPL_IF NAME="sorts" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_IF NAME="intrashow" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_IF NAME="opacshow" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_VAR NAME="recordtype" --></td>
+			<td><a class="edit" href="<!-- TMPL_VAR NAME="edit" -->">Edit Tag</a> <a class="delete" href="<!-- TMPL_VAR NAME="delete" -->">Delete Tag</a></td>
+		</tr>
+		<tr>
+			<td>
+				&nbsp;
+			</td>
+			
+		</tr>
+		<!-- /TMPL_LOOP -->
+	<!-- TMPL_ELSE -->
+		<!-- TMPL_LOOP NAME="loop" -->
+	<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
+		<!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+			<td><b><!-- TMPL_VAR NAME="marctokoha" --></b></td>
+			<td><!-- TMPL_VAR NAME="attr" --></td>
+			<td><!-- TMPL_VAR NAME="tagfield" --><!-- TMPL_VAR NAME="tagsubfield" --></td>
+			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+			<td><!-- TMPL_IF NAME="sorts" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_IF NAME="intrashow" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_IF NAME="opacshow" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_VAR NAME="recordtype" --></td>
+			<td><a class="edit" href="<!-- TMPL_VAR NAME="edit" -->">Edit Tag</a> <a class="delete" href="<!-- TMPL_VAR NAME="delete" -->">Delete Tag</a></td>
+		</tr>
+		<!-- /TMPL_LOOP -->
+	<!--/TMPL_IF -->
+	</table>
+	<div class="tabitem">
+		<!-- TMPL_IF NAME="isprevpage" -->
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
+		<input type="hidden" value="<!-- TMPL_VAR NAME="prevpage" -->" name="offset" /><input type="hidden" value="<!-- TMPL_VAR NAME="searchfield" -->" name="searchfield" /><!--TMPL_IF Name="select_display"--><input type="hidden" value="select_display" name="True" /><!--/TMPL_IF --><input type="submit" value="&lt;&lt; Previous Page" class="submit" /></form>
+		<!-- /TMPL_IF -->	
+		
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="add_form" />
+	
+	
+		<input type="submit" value="Add Koha atrribute" class="submit" /></form>
+		
+		<!-- TMPL_IF NAME="nextpage" -->
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextpage" -->" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+		<!--TMPL_IF Name="select_display"--><input type="hidden" name="select_display" value="True" /><!--/TMPL_IF --><input type="submit" class="submit" value="Next Page &gt;&gt;" /></form>
+		<!-- /TMPL_IF -->
+</div>
+</div>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/stopwords.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/stopwords.tmpl
index e998666bcf..d1b48cd5f0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/stopwords.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/stopwords.tmpl
@@ -1,97 +1,160 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-Koha -- System Administration: Stop Words Administration
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
+<!-- TMPL_IF NAME="else" -->Stop Words Administration<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify Stop Word<!-- TMPL_ELSE -->Add Stop Word<!-- /TMPL_IF --><!-- /TMPL_IF --> 
+<!-- TMPL_IF NAME="add_validate" -->Stop Word Added<!-- /TMPL_IF --> 
+<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Stop Word '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF --> 
+<!-- TMPL_IF NAME="delete_confirmed" -->Stop Word Deleted<!-- /TMPL_IF --> 
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+
+<div id="main">
+<!-- TMPL_IF NAME="add_form" -->
+        <script>
+        //
+        function isNotNull(f,noalert) {
+                if (f.value.length ==0) {
+   return false;
+                }
+                return true;
+        }
+        //
+        function toUC(f) {
+                var x=f.value.toUpperCase();
+                f.value=x;
+                return true;
+        }
+        //
+        function isNum(v,maybenull) {
+        var n = new Number(v.value);
+        if (isNaN(n)) {
+                return false;
+                }
+        if (maybenull==0 && v.value=="") {
+                return false;
+        }
+        return true;
+        }
+        //
+        function isDate(f) {
+                var t = Date.parse(f.value);
+                if (isNaN(t)) {
+                        return false;
+                }
+        }
+        //
+        function Check(f) {
+                var ok=1;
+                var _alertString="";
+                var alertString2;
+                if (f.word.value.length==0) {
+                        _alertString += "- word missing\n";
+                }
+                if (_alertString.length==0) {
+                        document.Aform.submit();
+                } else {
+                        alertString2 = "Form not submitted because of the following problem(s)\n";
+                        alertString2 += "------------------------------------------------------------------------------------\n\n";
+                        alertString2 += _alertString;
+                        alert(alertString2);
+                }
+        }
+        </SCRIPT>
+
+
+
+        <form action="<!-- TMPL_VAR NAME=script_name -->" name="Aform" method="post">
+        <input type="hidden" name="op" value="add_validate" />
+<!-- TMPL_IF NAME="searchfield" -->
+                <h1>Modify Stop Word</h1>
+        <!-- TMPL_ELSE -->
+                <h1>Add Stop Word</h1>
+        <!-- /TMPL_IF -->         
+<table>
+        <!-- TMPL_IF NAME="searchfield" -->
+                <tr>
+                        <td>Stop Word</td>
+                        <td><input type="hidden" name="word" value="<!-- TMPL_VAR NAME=searchfield -->" /><!-- TMPL_VAR NAME="searchfield" -->
+                        </td>
+                </tr>
+        <!-- TMPL_ELSE -->
+                <tr>
+                        <td>Stop Word: </td>
+                        <td>
+                                <input type="text" name="word" size="50" maxlength="250" onblur="toUC(this);" />
+                        </td>
+                </tr>
+        <!-- /TMPL_IF -->
+        </table><p><input type="button" value="<!-- TMPL_IF NAME="searchfield" -->Update Stop Word<!-- TMPL_ELSE -->Add Stop Word <!-- /TMPL_IF -->" onclick="Check(this.form);" class="submit" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->';" /></p>
+        </form>
+<!-- /TMPL_IF -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
-
-<script>
-  function toUC(f) {
-    var x=f.value.toUpperCase();
-    f.value=x;
-    return true;
-  }
-</script>
-
-<h1>Stop Words Administration</h1>
-
-<ul id="admin_stopwords_informations">
-<!-- TMPL_IF NAME="stopword_added" -->
-  <li>Stop Words Added</li>
-<!-- /TMPL_IF --> <!-- stopword_added -->
-
-<!-- TMPL_IF NAME="delete_confirmed" -->
-  <li>Stop Words Deleted</li>
-<!-- /TMPL_IF --> <!-- delete_confirmed -->
-</ul>
-
-<form action="<!-- TMPL_VAR NAME=script_name -->" method="post">
+<!-- TMPL_IF NAME="add_validate" -->
+<h3>Stop Word Added</h3>
+<div class="form"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <input type="submit" value="OK" class="submit" />
+        </form></div>
+<!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirm" -->
-  <fieldset id="admin_stopwords_confirmation">
-    <legend>Confirm</legend>
-
-    <p>Confirm Deletion of the following Stop Words:</p>
-    <ul>
-  <!-- TMPL_LOOP NAME="stopwords_to_delete" -->
-      <li>
-        <!-- TMPL_VAR NAME="word" -->
-        <input type="hidden" name="confirmed_stopwords[]" value="<!-- TMPL_VAR NAME="word" -->" />
-      </li>
-  <!-- /TMPL_LOOP -->
-    </ul>
-
-    <p id="action">
-      <input type="submit" name="confirmDeletion" value="Confirm Deletion" />
-      <input type="submit" name="doNotConfirmDeletion" value="Do Not Confirm" />
-    </p>
-  </fieldset>
+ <h3>Confirm Deletion of Stop Word <em><!-- TMPL_VAR NAME="searchfield" --></em></h3>                       <table>
+                <tr>
+                        <td>Stop Word: </td>
+                        <td><!-- TMPL_VAR NAME="searchfield" --></td>
+                </tr>
+	</table><div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                        <input type="hidden" name="op" value="delete_confirmed" />
+                        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="submit" value="Delete this Stop Word" class="cancel" />
+                                </form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                                        <input type="submit" value="Do Not Delete" class="submit" />
+                                </form></div>
 <!-- /TMPL_IF -->
 
-  <fieldset id="admin_stopwords_add">
-    <legend>Add Stop Words</legend>
-
-    <table>
-      <tr>
-        <th>Stop Words</th>
-        <td>
-          <input type="text" name="word" size="50" maxlength="250" onblur="toUC(this);" />
-        </td>
-      </tr>
-    </table>
-
-    <p id="action">
-      <input type="submit" name="add" value="Add Stop Words" />
-      <input type="reset" value="Reset" />
-    </p>
-  </fieldset>
-
-  <fieldset id="admin_stopwords_select">
-    <legend>Stop Words selection</legend>
+<!-- TMPL_IF NAME="delete_confirmed" -->
+<h3>Stop Word Deleted</h3>
+<div class="form"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                <input type="submit" value="OK" class="submit" />
+</form></div>
+<!-- /TMPL_IF -->
 
-    <p>
-      <input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-      <input type="submit" name="filter" value="Filter" />
-    </p>
+<!-- TMPL_IF NAME="else" -->
+ <h3>Stop Words Administration</h3>
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                <input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+                <input type="submit" name="submit" value="Search" class="submit" />
+        </form>
+<div id="results">        <!-- TMPL_IF NAME="searchfield" -->
+                You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
+        <!-- /TMPL_IF --></div>
+<!-- TMPL_IF NAME="loop" -->
+<table>
+                <tr>
+                        <th>Word</th>
+                        <th>&nbsp;</th>
+                </tr>
+                <!-- TMPL_LOOP NAME="loop" -->
+                <tr>
+                        <td><!-- TMPL_VAR NAME="word" --></td>
+                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="word" -->">Delete</a></td>
+                </tr>
+                <!-- /TMPL_LOOP -->
+        </table>
+<!-- /TMPL_IF -->
+<div class="tabitem"><!-- TMPL_IF NAME="offsetgtzero" -->
+               <form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevpage" -->" /><input type="submit" class="submit" value="&lt;&lt; Prev" /></form>
+        <!-- /TMPL_IF --> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <input type="hidden" name="op" value="add_form" /><input type="submit" value="Add Word" class="submit" />
+        </form> <!-- TMPL_IF NAME="ltcount" -->
+                <form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="next_page" -->" /><input type="submit" class="submit" value="Next &gt;&gt;" /></form>
+        <!-- /TMPL_iF --></div>
+        
 
-    <ul>
-<!-- TMPL_LOOP NAME="loop" -->
-      <li style="display: inline;">
-        <label>
-          <input type="checkbox" name="stopwords[]" value="<!-- TMPL_VAR NAME="word" -->" />
-          <!-- TMPL_VAR NAME="word" -->
-        </label>
-      </li>
-<!-- /TMPL_LOOP -->
-    </ul>
+        
 
-    <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+        
 
-    <p id="action">
-      <input type="submit" name="deleteSelected" value="Delete selected Stop Words" />
-      <input type="reset" value="Reset" />
-    </p>
-  </fieldset>
-</form>
+<!-- /TMPL_IF -->
 
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl
index 3e54134dff..64eaeaeeda 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl
@@ -169,6 +169,15 @@
 					</a>
 				<!--/TMPL_IF-->
 			</li>
+			<li>
+				<!--TMPL_IF Name="Librarian"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet" class="here">Intranet
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet">Intranet
+					</a>
+				<!--/TMPL_IF-->
+			</li>
 			<li>
 				<!--TMPL_IF Name="Catalogue"-->
 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue" class="here">Catalogue
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/thesaurus.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/thesaurus.tmpl
index a814c62d19..0bdfec6be6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/thesaurus.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/thesaurus.tmpl
@@ -1,17 +1,19 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: Thesaurus Management
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
-
+<div id="main">
 <!-- TMPL_IF name="detail_form" -->
-<table>
-	<caption>Thesaurus management</caption>
+	<!-- -->
+	<h1>Thesaurus management</h1><table>
+	<tr><td>&nbsp;</td></tr>
 	<tr>
-		<td>Values related to <!-- TMPL_VAR name="stdlib" --> (<!-- TMPL_VAR name="category" -->)</td>
+		<td><b>Values related to <!-- TMPL_VAR name="stdlib" --> (<!-- TMPL_VAR name="category" -->)</b></td>
 	</tr>
 	</table>
-
+	<br/><br/>
 	<table>
 	<tr>
 		<th>Other forms</th>
@@ -32,7 +34,7 @@
 	<input type="hidden" name="op" value="add_form" />
 	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->" />
 	<input type="hidden" name="stdlib" value="<!-- TMPL_VAR name="stdlib" -->" />
-	<input type="submit" value="Add thesaurus entry" />
+	<br><input type="submit" value="Add thesaurus entry" /><br>
 	</form>
 <!-- /TMPL_IF -->
 
@@ -68,7 +70,7 @@
 			<input type="hidden" name="search_category" value="<!-- TMPL_VAR name="search_category" -->" />
 			<input type="hidden" name="searchstring" value="<!-- TMPL_VAR name="searchstring" escape="HTML" -->" />
 			<input type="hidden" name="offset" value="<!-- TMPL_VAR name="offset" -->" />
-			<input type="submit" value="<!-- TMPL_IF name="search_category" -->Add<!-- TMPL_ELSE -->Modify<!-- /TMPL_IF --> Value" /></p></form>
+			<input type="submit" class="submit" value="<!-- TMPL_IF name="search_category" -->Add<!-- TMPL_ELSE -->Modify<!-- /TMPL_IF --> Value" /></p></form>
 <!-- /TMPL_IF -->
 
 
@@ -76,8 +78,8 @@
 <!-- -->
 		<table>
 		<tr>
-			<td>lib</td>
-			<td><!-- TMPL_VAR name="search_category" --></td>
+			<td><b>lib</b></td>
+			<td><b><!-- TMPL_VAR name="search_category" --></b></td>
 		</tr>
 		<tr><td>Value</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
 		<tr><td>
@@ -86,7 +88,7 @@
 				<input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
 				<input type="hidden" name="search_category" value="<!-- TMPL_VAR name="search_category" -->" />
 		</tr></td>
-		<tr><td colspan="2">CONFIRM DELETION of this entry and all entries depending on this one</td></tr>
+		<tr><td colspan=2 align=center>CONFIRM DELETION of this entry <b>and all entries depending on this one</b></td></tr>
 		<tr><td><input type="submit" value="YES" /></form></td>
 				<td><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="NO" /></form></td></tr>
 	</table>
@@ -97,14 +99,14 @@
 <h1>Thesaurus management</h1>
 	<p>Manages thesaurus and authorities files.</p>
 	<ul>
-		<li>Dig: see data dependent on this one</li>
-		<li>Related: see other forms of this authority entry</li>
+		<li><b>Dig</b>: see data dependent on this one</li>
+		<li><b>Related</b>: see other forms of this authority entry</li>
 	</ul>
-	<form action="/cgi-bin/koha/admin/thesaurus.pl" method="post">
+<div class="tabitem">	<form action="/cgi-bin/koha/admin/thesaurus.pl" method="post">
 		<!-- TMPL_VAR name="tab_list" -->
 		<input type="text" name="searchstring" value="<!-- TMPL_VAR name="searchstring" -->" />
-		<input type="submit" value="OK" /></form>
-	<form action="/cgi-bin/koha/admin/thesaurus.pl" method="get"><input type="hidden" value="add_form" name="op" /><input type="submit" value="New Category" /></form>
+		<input type="submit" value="OK" class="submit" /></form>
+	<form action="/cgi-bin/koha/admin/thesaurus.pl" method="get"><input type="hidden" value="add_form" name="op" /><input type="submit" class="submit" value="New Category" /></form></div>
 	
 	<!-- TMPL_LOOP name="hierarchy_loop" -->
 		<a href="thesaurus.pl?branch=<!-- TMPL_VAR name="branch" -->&search_category=<!-- TMPL_VAR name="category" -->"><!-- TMPL_VAR name="string" --></a><br />
@@ -128,8 +130,8 @@
 		<td><!-- TMPL_VAR name="father" --> <!-- TMPL_VAR name="stdlib" --></td>
 		<td><!-- TMPL_VAR name="dig" -->Dig</a></td>
 		<td><!-- TMPL_VAR name="related" -->Related</a></td>
-		<td><a href="<!-- TMPL_VAR name="edit" -->">Edit</a></td>
-		<td><a href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
+		<td><a href="<!-- TMPL_VAR name="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0" /></a></td>
+		<td><a href="<!-- TMPL_VAR name="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0" /></a></td>
 	</tr>
 	<!-- /TMPL_LOOP -->
 	</table>
@@ -142,10 +144,10 @@
 	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->" />
 	<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" />
 	<input type="hidden" name="father" value="<!-- TMPL_VAR name="father" -->" />
-	<input type="submit"  value="Add Thesaurus entry" />
+	<input type="submit" class="submit"  value="Add Thesaurus entry" />
 	</form></p>
 <!-- TMPL_VAR name="previous" --> <!-- TMPL_VAR name="next" -->
 <!-- /TMPL_IF -->
-
+</div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/viewlog.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/viewlog.tmpl
index 83da23b99e..8cea2c5dcb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/viewlog.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/viewlog.tmpl
@@ -1,14 +1,15 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Log viewer<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->System Administration<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+<div id="main" >
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 <!-- TMPL_IF NAME="do_it" -->
 <script language="JavaScript" type="text/javascript">
 function Dopop(link) {
 	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
 }
 </script>
-		<h1>Koha : LogView for <!-- TMPL_VAR NAME="modulename"--> </h1>
+		<h1 class="parameters">Koha :  <!-- TMPL_VAR NAME="modulename"--> için yapılan işlemler cetveli. Toplam:<!-- TMPL_VAR NAME="counter"--></h1>
 		<!-- TMPL_IF NAME="loopfilter"-->
 			<p>Filtered on</p>
 			<!-- TMPL_LOOP NAME="loopfilter" -->
@@ -16,58 +17,50 @@ function Dopop(link) {
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_IF NAME="loopfilter"-->
 		<br>
-		<table>
+		<table border="1">
 			<!-- TMPL_IF NAME="catalogue" -->
 				<tr >
-							<th>Timestamp
+							<th class="parameters">Modified on
 							</th>
-							<th>Firstname
+							<th class="parameters">Title
 							</th>
-							<th>Surname
+							<th class="parameters">Librarian
 							</th>
-							<th>Action
+							<th class="parameters">Action
 							</th>
-							<th>Info
-							</th>
-							<th>Title
-							</th>
-							<th>Author
+							<th class="parameters">Info
 							</th>
 				</tr>
 				<!-- TMPL_LOOP NAME="looprow" -->
 					<!-- TMPL_IF NAME="hilighted" --><tr class="higlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-						<td><!-- TMPL_IF NAME="timestamp" --><!-- TMPL_VAR NAME="timestamp" --><!-- /TMPL_IF -->
+						<td><!-- TMPL_VAR NAME="day" --><br/>(<!-- TMPL_VAR NAME="timestamp" -->)
 						</td>
-						<td><!-- TMPL_IF NAME="firstname" --><!-- TMPL_VAR NAME="firstname" --><!-- /TMPL_IF -->
+						<td><!-- TMPL_VAR NAME="title" -->, <!-- TMPL_VAR NAME="author" -->
 						</td>
-						<td><!-- TMPL_IF NAME="surname" --><!-- TMPL_VAR NAME="surname" --><!-- /TMPL_IF -->
+						<td><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->
 						</td>
 						<td><!-- TMPL_IF NAME="action" --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
 						</td>
 						<td><!-- TMPL_IF NAME="info" --><!-- TMPL_VAR NAME="info" --><!-- /TMPL_IF -->
 						</td>
-						<td><!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF -->
-						</td>
-						<td><!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
-						</td>
 					</tr>
 				<!-- /TMPL_LOOP -->
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF NAME="acqui" -->
 				<tr >
-							<th>Timestamp
+							<th class="parameters">Timestamp
 							</th>
-							<th>Firstname
+							<th class="parameters">Firstname
 							</th>
-							<th>Surname
+							<th class="parameters">Surname
 							</th>
-							<th>Action
+							<th class="parameters">Action
 							</th>
-							<th>Info
+							<th class="parameters">Info
 							</th>
-							<th>Title
+							<th class="parameters">Title
 							</th>
-							<th>Author
+							<th class="parameters">Author
 							</th>
 				</tr>
 				<!-- TMPL_LOOP NAME="looprow" -->
@@ -89,19 +82,19 @@ function Dopop(link) {
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF NAME="members" -->
 				<tr >
-							<th>Timestamp
+							<th class="parameters">Timestamp
 							</th>
-							<th>Firstname
+							<th class="parameters">Firstname
 							</th>
-							<th>Surname
+							<th class="parameters">Surname
 							</th>
-							<th>Action
+							<th class="parameters">Action
 							</th>
-							<th>Info
+							<th class="parameters">Info
 							</th>
-							<th>Title
+							<th class="parameters">Title
 							</th>
-							<th>Author
+							<th class="parameters">Author
 							</th>
 				</tr>
 				<!-- TMPL_LOOP NAME="looprow" -->
@@ -133,18 +126,18 @@ function Dopop(link) {
 	<table>
 		<thead>
 			<tr>
-			<th>On Module</th>
-			<th>User/Action Filters</th>
-			<th>Object Filter</th>
+			<th class="parameters">On Module</th>
+			<th class="parameters">User/Action Filters</th>
+			<th class="parameters">Object Filter</th>
 			</tr>
 		</thead>
 		<tbody>
 			<tr>
 				<td>
 					<select name="module">
-						<option value ="catalogue" checked>Catalogue</option>
-						<option value ="members">Borrowers</option>
-						<option value ="acqui">Acquisitions</option>
+						<option value ="catalogue" checked>Eser kaydı</option>
+						<option value ="members">Üyeler</option>
+						<option value ="acqui">Satın alma</option>
 					</select>
 				</td>
 				<td>
@@ -152,10 +145,10 @@ function Dopop(link) {
 					Koha User : <input type="text" name="user" value="">
 				</p>
 				<p>	Action type : <select name="action">
-						<option value ="">All</option>
-						<option value ="add">Add</option>
-						<option value ="del">Delete</option>
-						<option value ="mod">Modify</option>
+						<option value ="">Tümü</option>
+						<option value ="add">Ekleme</option>
+						<option value ="del">Sılme</option>
+						<option value ="modify">Değişme</option>
 					</select>
 				</p>
 				<p> From <input type="text" readonly="readonly" size="10" id="from" name="from" >
@@ -220,8 +213,8 @@ function Dopop(link) {
 			</tr>
 	</table>
 	
-	<div>
-		<h3>Output</h3>
+	<div id="bloc25">
+		<h3 class="parameters"> Output </h3>
 		<input type="radio" checked name="output" value="screen" > To screen into the browser
 		<br>
 		<input type="radio" name="output" value="file"> To file <input type="text" name="basename" value="Export"> into an application  
@@ -237,6 +230,3 @@ function Dopop(link) {
 <!-- /TMPL_IF -->
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
-
-
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/auth_finder.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/auth_finder.tmpl
new file mode 100644
index 0000000000..1f7aa55ce3
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/auth_finder.tmpl
@@ -0,0 +1,54 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
+
+
+<div id="main">
+
+<h1>Authority search</h1>
+
+<form name="f" method="post">
+	<input type="hidden" name="nonav" value="<!-- TMPL_VAR NAME="nonav" -->">
+	<input type="hidden" name="op" value="do_search">
+	<input type="hidden" name="type" value="author">
+	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
+	<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+	<div id="bloc25">
+		<h2 class="authority">Search on</h2>
+		<p>
+			<label class="label100">Authority type</label>
+			<!-- TMPL_VAR NAME="authtypecode" -->
+			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
+		</p>
+		<p>
+			<label class="label100">Main heading(a)</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
+			<input type="hidden" name="marclist" value="mainentry">
+			<input type="hidden" name="and_or" value="and">
+			<input type="hidden" name="excluding" value="">
+			<select name="operator">
+				<option value="all">All words</option>
+				<option value="phrase">Phrase</option>
+			</select>
+			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+		</p>
+		<p>
+			<label class="label100">Sub heading</label><input type="text" name="value">
+			<input type="hidden" name="marclist" value="">
+			<input type="hidden" name="and_or" value="and">
+			<input type="hidden" name="excluding" value="">
+			<select name="operator">
+				<option value="all">All words</option>
+				<option value="phrase">Phrase</option>
+			</select>
+			
+		</p>
+		<p>
+			<input type="submit" value="Start search" class="button authority">
+		</p>
+	</div>
+</form>
+</div>
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl
index a31895149f..ea4478aa24 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl
@@ -1,105 +1,44 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-Koha -- Authorities
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+
+<div id="main">
+
+<form name="f" method="post">
+	<input type="hidden" name="op" value="do_search" />
+	<input type="hidden" name="type" value="intranet" />
+	<input type="hidden" name="stype" value="author" />
+	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
+<div class="data"><table>
+<caption>Authority search</caption>
+<tr><th><label for="authtypecode">Authority type</label></th><td><select id="authtypecode" name="authtypecode"  >
+			<!-- TMPL_LOOP NAME="authtypesloop" -->
+				<option value="<!-- TMPL_VAR NAME="value" -->" >
+					<!-- TMPL_VAR NAME="authtypetext" -->
+				</option>
+			<!-- /TMPL_LOOP -->
+			</select></td></tr>
+<tr><th><label id="mainentry">Main entry</label></th><td><select name="operator" id="mainentry">
+				<option value="all">All words</option>
+				<option value="phrase">Phrase</option>
+			</select> <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
+			<input type="hidden" name="marclist" value="mainentry" />
+			
+			</td></tr>			
+<tr><th><label for="anywhere">Anywhere</label></th><td><select name="operator" id="anywhere">
+				<option value="all">All words</option>
+				<option value="phrase">Phrase</option>
+			</select> <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+			<input type="hidden" name="marclist" value="">
+			
+			</td></tr></table></div>
+		<p>
+			<input type="submit" value="Start search" class="submit">
+		</p>
+</form>
+</div>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
-
-<fieldset id="authorities_authorities_home_search">
-  <legend>Authority search</legend>
-
-  <form name="f" action="/cgi-bin/koha/authorities/authorities-home.pl" method="post">
-    <input type="hidden" name="op" value="do_search">
-    <input type="hidden" name="type" value="intranet">
-    <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
-
-    <table>
-      <tr>
-        <th>
-          <label for="authtypecode">Search on</label>
-        </th>
-        <td colspan="2">
-          <select id="authtypecode" name="authtypecode">
-<!-- TMPL_LOOP NAME="authtypesloop" -->
-  <!-- TMPL_IF name="selected" -->
-            <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="authtypetext" --></option>
-  <!-- TMPL_ELSE -->
-            <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="authtypetext" --></option>
-  <!-- /TMPL_IF -->
-<!-- /TMPL_LOOP -->
-          </select>
-        </td>
-      </tr>
-      <tr>
-        <th>
-          <label for="value_mainentry">Main entry</label>
-          <input type="hidden" name="marclist" value="mainentry">
-          <input type="hidden" name="and_or" value="and">
-          <input type="hidden" name="excluding" value="">
-        </th>
-        <td>
-          <select name="operator">
-	    <option value="contains">contains</option>
-	    <option value="start">start by</option>
-	  </select>
-        </td>
-        <td>
-          <input id="value_mainentry" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
-        </td>
-      </tr>
-
-      <tr>
-        <th>
-          <label for="value_anywhere">Anywhere</label>
-          <input type="hidden" name="marclist" value="">
-          <input type="hidden" name="and_or" value="and">
-          <input type="hidden" name="excluding" value="">
-        </th>
-        <td>
-          <select name="operator">
-            <option value="contains">contains</option>
-            <option value="start">start by</option>
-          </select>
-        </td>
-        <td>
-          <input id="value_anywhere" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
-        </td>
-      </tr>
-    </table>
-    
-    <div id="action">
-      <input type="submit" value="Start search">
-    </div>
-  </form>
-</fieldset>
-    
-<fieldset id="authorities_authorities_home_add">
-  <legend>Add authority</legend>
-
-  <form name="f2" method="post" action="authorities.pl">
-    <table>
-      <tr>
-        <th>
-          <label for="add_authtypecode">Authority type</label>
-        </th>
-        <td>
-          <select id="add_authtypecode" name="authtypecode">
-<!-- TMPL_LOOP name="authtypesloop" -->
-  <!-- TMPL_IF name="selected" -->
-            <option value="<!-- TMPL_VAR name="value" -->" selected="selected"><!-- TMPL_VAR name="authtypetext" --></option>
-  <!-- TMPL_ELSE -->
-            <option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="authtypetext" --></option>
-  <!-- /TMPL_IF -->
-<!-- /TMPL_LOOP -->
-          </select>
-        </td>
-      </tr>
-    </table>
-
-    <div id="action">
-      <input type="submit" value="Add" class="button authority">
-    </div>
-  </form>
-</fieldset>
-
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl
index 803b89a13f..2cb0d1c313 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl
@@ -1,107 +1,183 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-Koha -- Authority details
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Authorities
+<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
+<!--TMPL_UNLESS NAME="nonav"--><!-- TMPL_INCLUDE NAME="masthead.inc" --><!--/TMPL_UNLESS-->
+<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
+<!--TMPL_UNLESS NAME="nonav"--><!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" --><!--/TMPL_UNLESS-->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
 
-<fieldset id="authorities_authorities_add_or_modify">
-<!-- TMPL_IF name="authid" -->
-  <legend>Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</legend>
-<!-- TMPL_ELSE -->
-  <legend>Adding authority (<!-- TMPL_VAR name="authtypetext" -->)</legend>
-<!-- /TMPL_IF -->  
-  <form method="post" name="f">
-    <input type="hidden" name="op" value="add">
-    <input type="hidden" name="addfield_field">
-    <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
-    <input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
-
-    <div id="action">
-<!-- TMPL_IF name="authid" -->
-      <input type="button" value="Save" onClick="Check(this.form)" accesskey="w">
-<!-- TMPL_ELSE -->
-      <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
+<div id="main">
+<!-- TMPL_IF name="error" -->
+			<div class="error">
+				<!--TMPL_IF NAME="xmlerror"-->
+				<ul>
+					<li>Non UTF-8 characters present or malformed XML</li>
+					<li>Please correct and save.</li>
+				</ul>
+				<!--/TMPL_IF-->
+			</div>
 <!-- /TMPL_IF -->
-    </div>
-
-<!-- TMPL_IF name="duplicateauthid" -->
-	<div class="problem">
-		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
-		<p>You must either :</p>
-		<ul>
-			<p><input type="checkbox" value=1 name="confirm_not_duplicate">confirm it's not a duplicate (and click on <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
-			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
-		</ul>
+<form method="post" name="f" id="f" action="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->&nonav=<!-- TMPL_VAR NAME="nonav" -->&linkid="+document.form.f.linkid.value >
+	
+<div class="tabitem">
+	<h1>Authority number <!-- TMPL_VAR NAME="authid" --></h1>
+	<p><input type="hidden" name="nonav" value="<!-- TMPL_VAR NAME="nonav" -->"><input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+		<input type="hidden" name="op" value="add">
+		<input type="hidden" name="addfield_field">
+		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
+		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
+	<input type="hidden" name="linkid" id="linkid" value="0000">
+		<!-- TMPL_IF name="authid" -->
+			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="button authority">
+		<!-- TMPL_ELSE -->
+			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority">
+		<!-- /TMPL_IF -->
+	</p>
+</div>
+<br>
+	<div class="tabs">
+        <!-- TMPL_LOOP name="BIG_LOOP" -->
+            <a href="#" onclick="active(<!-- TMPL_VAR name="number"-->); return false;" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
+        <!--  /TMPL_LOOP -->
 	</div>
-<!-- /TMPL_IF -->
 
-<!-- TMPL_LOOP NAME="0XX" -->
-<!-- TMPL_IF name="tag" -->
-<p class="MARCtag">
-	<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-	<!-- TMPL_UNLESS name="hide_marc" --><a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a>
-	<input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffffff;'" type="text" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> -
+
+<! -- RESET PAGINATION -->
+<!-- TMPL_LOOP name="BIG_LOOP" -->
+<!-- hide every tab except the 1st -->
+<!-- TMPL_IF name="number" -->
+    <div name="<!-- TMPL_VAR name="number" -->XX" id="<!-- TMPL_VAR name="number" -->XX" class="tab" style="visibility:hidden">
 <!-- TMPL_ELSE -->
-<input tabindex="1" type="hidden" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->"><!-- /TMPL_UNLESS -->
-	<!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_VAR NAME="tag_lib" --><!-- /TMPL_UNLESS -->
-	<!-- TMPL_IF name="repeatable" --><a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a><!-- /TMPL_IF -->
-</p>
+    <div name="<!-- TMPL_VAR name="number" -->XX" id="<!-- TMPL_VAR name="number" -->XX" class="tab" style="visibility:visible">
 <!-- /TMPL_IF -->
-<div><!-- TMPL_LOOP NAME="subfield_loop" -->
-<!-- TMPL_IF NAME="visibility" -->
-<a tabindex="1" style="color: grey; font-size: 80%; cursor: se-resize;" id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')"><!-- TMPL_VAR NAME="subfield" --></a>
-<!-- /TMPL_IF -->
-<div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->"><!-- TMPL_UNLESS NAME="advancedMARCEditor" --><label <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> class="labelsubfield"> <!-- /TMPL_UNLESS --><!-- TMPL_UNLESS name="hide_marc" --><img <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/><input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
-<!-- TMPL_ELSE --><input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->"/><!-- /TMPL_UNLESS -->
-<!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label><!-- /TMPL_UNLESS -->
-<!-- TMPL_VAR NAME="marc_value" --><!-- TMPL_IF NAME="repeatable" --><a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a><!-- /TMPL_IF -->
-<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->"/>
-<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1"/>
-<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"/>
-<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->"/>
-<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
-</div><!-- /TMPL_LOOP --></div>
+<!-- TMPL_UNLESS name="number" -->
+    <!-- show duplicate warning on tab 0 only -->
+<!-- TMPL_IF name="duplicateauthid" -->
+			<div class="error">
+				<p>Is this a duplicate of <a href="detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&nonav=<!-- TMPL_VAR name="nonav" -->" onclick="openWindow('detail.pl?nonav=<!-- TMPL_VAR name="nonav" -->&authid=<!-- TMPL_VAR name="duplicateauthid" -->&popup=1', ''; return false;)"><!-- TMPL_VAR name="duplicateauthvalue" --></a>?</p>
+				
+				<ul>
+					
+					<li>If not, click to <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" /> <a href="#" onclick="confirmnotdup(); return false;">Confirm it's not a duplicate</a></li>
+				</ul>
+			</div>
+		<!-- /TMPL_IF -->
+  <!-- /TMPL_UNLESS -->
+    <!-- TMPL_LOOP NAME="innerloop" -->
+		<div style=";" id="tag<!-- TMPL_VAR name="tag"-->">
+        <!-- TMPL_IF name="tag" -->
+        <p class="MARCtag">
+            <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
+            <!-- TMPL_UNLESS name="hide_marc" -->
+                <a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a>
+                <input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffff00;'" type="text" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> -
+            <!-- TMPL_ELSE -->
+                <input tabindex="1" type="hidden" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
+            <!-- /TMPL_UNLESS -->
+            <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
+            <!-- TMPL_VAR NAME="tag_lib" -->
+            <!-- /TMPL_UNLESS -->
+            <!-- TMPL_IF name="repeatable" --><a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a><!-- /TMPL_IF -->
+        </p>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_LOOP NAME="subfield_loop" -->
+            <!-- TMPL_IF NAME="visibility" -->
+                <a tabindex="1" style="color: grey; font-size: 80%; cursor: se-resize;" id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')">
+                    <!-- TMPL_VAR NAME="subfield" -->
+                </a>
+            <!-- /TMPL_IF -->
+            <div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->">
+                <p>
+                <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
+                    <label <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> class="labelsubfield">
+                <!-- /TMPL_UNLESS -->
+                <!-- TMPL_UNLESS name="hide_marc" -->
+                    <img style="cursor: crosshair; color: grey; font-size: 80%;" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/>
+                        <input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
+                <!-- TMPL_ELSE -->
+                    <input type="hidden" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->" value="<!-- TMPL_VAR NAME="subfield" -->"/>
+                <!-- /TMPL_UNLESS -->
+                <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
+                    <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
+                    <!-- TMPL_VAR NAME="marc_lib" -->
+                    <!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
+                    </label>
+                <!-- /TMPL_UNLESS -->
+                <!-- TMPL_VAR NAME="marc_value" -->
+                <!-- TMPL_IF NAME="repeatable" -->
+                    <a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a>
+                <!-- /TMPL_IF -->
+                <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" --><!--TMPL_VAR NAME="id"-->"/>
+                <input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1"/>
+                <input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"/>
+                <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
+                </p>
+            </div>
+        <!-- /TMPL_LOOP -->
+        </div>
+    <!-- /TMPL_LOOP -->
+    </div>
 <!-- /TMPL_LOOP -->
-</div>	
 		<div name="hidden" id="hidden" class="tab">
 		<!-- TMPL_LOOP NAME="hidden_loop" -->
 				<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
-				<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
+				<input type="hidden" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->" value="<!-- TMPL_VAR NAME="subfield" -->">
 				<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->">
-				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
 				<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
 		<!-- /TMPL_LOOP -->
 		</div>
 		<!-- TMPL_IF name="oldauthnumtagfield" -->
 			<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldauthnumtagfield" -->">
-			<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="oldauthnumtagsubfield" -->">
+			<input type="hidden" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->" value="<!-- TMPL_VAR NAME="oldauthnumtagsubfield" -->">
 			<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="authid" -->">
 			<input type="hidden" name="mandatory" value="0">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
 			<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
 			<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldauthtypetagfield" -->">
-			<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="oldauthtypetagsubfield" -->">
+			<input type="hidden" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->" value="<!-- TMPL_VAR NAME="oldauthtypetagsubfield" -->">
 			<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="authtypecode" -->">
+			<input type="hidden" name="mandatory" value="0">
+			<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
+
 		<!-- /TMPL_IF -->
 	</form>
-</fieldset>
-
 <script language="JavaScript" type="text/javascript">
 function _(s) { return s } // dummy function for gettext
+function confirmnotdup(){
+	document.getElementById("confirm_not_duplicate").value = 1;
+	var checkform =	document.getElementById("f");
+	Check(checkform);
+}
 function active(numlayer)
 {
-	for (i=0; i < 10 ; i++ ) {
+	for (i=0; i <= 9 ; i++ ) {
 		ong = i+"XX";
 		link = "link"+i;
 		if (numlayer==i) {
-			document.getElementById(ong).style.visibility="visible";
+			with(document){
+			if (document.getElementById(ong)){
+				document.getElementById(ong).style.visibility="visible";
+			}
+			if(document.getElementById(link)){
+				document.getElementById(link).style.color="#000066";
+				document.getElementById(link).style.backgroundColor="#FFFFCC";
+			}
+			}
 		} else {
-			document.getElementById(ong).style.visibility="hidden";
+			with(document){
+			if (document.getElementById(ong)){
+				document.getElementById(ong).style.visibility="hidden";
+			}
+			if (document.getElementById(link)) {
+				document.getElementById(link).style.color="#669999";
+				document.getElementById(link).style.backgroundColor="#D8DEB8";
+			}
+			}
 		}
 	}
 }
+active(0);
 function Check(f) {
+	document.body.style.cursor ="wait";
 	// Scan for nonempty fields
 	var field_is_nonempty_p = new Array();
 	for (i=0 ; i<f.field_value.length ; i++) {
@@ -115,31 +191,50 @@ function Check(f) {
 
 	// Scan for missing mandatory subfields
 	var total_missing_mandatory_subfields = 0;
+	var missing_mandatory_subfields = new Array();
 	for (i=0 ; i<f.field_value.length-2 ; i++) {
 		if (f.field_value[i].value.length==0 && f.mandatory[i].value==1) {
 		    // We should not flag an error unless the tag is also
 		    // mandatory, or if something else in the tag is entered
 
 		    if (f.tag_mandatory[i].value == 1 || field_is_nonempty_p[f.tag[i].value]) {
-			document.getElementById("error"+i).style.backgroundColor="#FF0000";
-			total_missing_mandatory_subfields++;
-		    }
+				f.field_value[i].style.backgroundColor="#FF0000";
+				total_missing_mandatory_subfields++;
+			if (f.field_value[i].parentNode.tagName == "B")
+			{
+				missing_mandatory_subfields.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.parentNode.id.substr(0,1) + ")");
+			}
+			else
+			{
+				missing_mandatory_subfields.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.id.substr(0,1) + ")");
+			}
+
+			}
 		} else {
-			document.getElementById("error"+i).style.backgroundColor="#FFFFFF";
+			f.field_value[i].style.backgroundColor="#FFFFFF";
 		}
 	}
 
 	// Scan for missing mandatory tags
 	var total_missing_mandatory_tags = 0;
 	var seen_mandatory_tag_p = new Array();
+	var missing_mandatory_tags = new Array();
 	for (i=0 ; i<f.field_value.length ; i++) {
 	    var j = f.tag[i].value;
 	    if (!field_is_nonempty_p[j] && f.tag_mandatory[i].value == 1) {
 		if (seen_mandatory_tag_p[j] != 1) {
 		    seen_mandatory_tag_p[j] = 1;
 		    total_missing_mandatory_tags++;
+ 		    if (f.field_value[i].parentNode.tagName == "B")
+		    {
+				missing_mandatory_tags.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.parentNode.id.substr(0,1) + ")");
+		    }
+		    else
+		    {
+				missing_mandatory_tags.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.id.substr(0,1) + ")");
+			}
 		}
-		document.getElementById("error"+i).style.backgroundColor="#ffff00";
+		f.field_value[i].style.backgroundColor="#FFFF00";
 	    }
 	}
 
@@ -149,57 +244,97 @@ function Check(f) {
 		alertString2  = _("Form not submitted because of the following problem(s)");
 		alertString2 += "\n------------------------------------------------------------------------------------\n";
 		alertString2 += "\n- "+ total_missing_mandatory_tags +_(" mandatory tags empty");
-		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" mandatory fields empty (see bold subfields)");
+		for (i=0; i<missing_mandatory_tags.length; i++)
+		{
+			alertString2 += "\n--->"+ missing_mandatory_tags[i];
+		}
+  		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" mandatory fields empty (see bold subfields)");
+		for (i=0; i<missing_mandatory_subfields.length; i++)
+		{
+			alertString2 += "\n--->"+ missing_mandatory_subfields[i];
+		}
 		alert(alertString2);
 	} else {
-		document.forms[0].submit();
+		document.forms['f'].submit();
 	}
 }
-function Dopop(link,i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes');
-}
-
-function PopupZ3950() {
-    var strQuery="";
-	for (i=0 ; i<document.forms['f'].field_value.length ; i++) {
-		if (document.forms['f'].kohafield[i].value == "biblioitems.isbn" && document.forms['f'].field_value[i].value.length>0) {
-		    strQuery += "&isbn="+document.forms['f'].field_value[i].value;
-		}
-		if (document.forms['f'].kohafield[i].value == "biblio.title" && document.forms['f'].field_value[i].value.length>0) {
-		    strQuery += "&title="+document.forms['f'].field_value[i].value;
-		}
-		if (document.forms['f'].kohafield[i].value == "biblio.author" &&document.forms['f'].field_value[i].value.length>0) {
-		    strQuery += "&author="+document.forms['f'].field_value[i].value;
-		}
-		if (document.forms['f'].kohafield[i].value == "biblioitems.issn" && document.forms['f'].field_value[i].value.length>0) {
-		    strQuery += "&issn="+document.forms['f'].field_value[i].value;
+function Dopop(link,id) {
+ var subf=document.getElementsByName('subfield'+id);
+var fields=document.getElementsByName('field_value'+id);
+var defaultvalue="";
+	for (var s=0; s<fields.length; s++){
+		if (subf.item(s).value == 'a'){
+		defaultvalue=fields.item(s).value;
 		}
 	}
-	newin=window.open("../z3950/search.pl?bibid=<!-- TMPL_VAR NAME="bibid" -->"+strQuery,"z3950search",'width=500,height=400,toolbar=false,scrollbars=yes');
+
+	newin=window.open(link+"&result="+defaultvalue,"",'width=550,height=550,toolbar=false,scrollbars=yes');
+
 }
 
+
 function AddField(field) {
-	document.forms[1].op.value = "addfield";
-	document.forms[1].addfield_field.value=field;
+	document.forms['f'].op.value = "addfield";
+	document.forms['f'].addfield_field.value=field;
 	document.f.submit();
 }
 
+function cloneSubfield(index) {
+ var original = document.getElementById(index);
+ var clone = original.cloneNode(true);
+ clone.setAttribute("id", index + index); 
+// orginput : the value of the original field (in [0] if hide_marc=1, otherwise in [1]
+// image : the up button. don't exist is hide_marc=1
+ <!-- TMPL_IF name="hide_marc" -->
+	var orginput = original.getElementsByTagName('input')[0];
+ <!-- TMPL_ELSE -->
+ 	var orginput = original.getElementsByTagName('input')[1];
+	image = clone.getElementsByTagName('img')[0];
+	image.setAttribute("onclick","upSubfield('" + index + index + "')");
+ <!-- /TMPL_IF -->
+ trigger = original.getElementsByTagName('a')[0];
+ if (trigger) {
+ 	trigger.parentNode.removeChild(trigger);
+ }
+ clonetrigger = clone.getElementsByTagName('a')[0];
+ clonetrigger.setAttribute("onclick","cloneSubfield('" + index + index + "')");
+ clone.setAttribute("tabindex","1");
+ orginput.value = '';
+ original.parentNode.insertBefore( clone, original); 
+}
+
 function upSubfield(index) {
-	temp = document.forms['f'].field_value[index-1].value;
-	document.forms['f'].field_value[index-1].value=document.forms['f'].field_value[index].value;
-	document.forms['f'].field_value[index].value= temp;
-	temp = document.forms['f'].subfield[index-1].value;
-	document.forms['f'].subfield[index-1].value=document.forms['f'].subfield[index].value;
-	document.forms['f'].subfield[index].value = temp;
-	temp = document.forms['f'].mandatory[index-1].value;
-	document.forms['f'].mandatory[index-1].value=document.forms['f'].mandatory[index].value;
-	document.forms['f'].mandatory[index].value = temp;
-	temp = document.forms['f'].kohafield[index-1].value;
-	document.forms['f'].kohafield[index-1].value=document.forms['f'].kohafield[index].value;
-	document.forms['f'].kohafield[index].value = temp;
+	try{
+		var line = document.getElementById(index); // get the line where the user has clicked.
+	} catch(e) {
+		return;
+	}
+	var tag = line.parentNode; // get the dad of this line. (should be "<div tag=XXX>")
+	
+	// getting all subfields for this tag
+	var subfields = tag.getElementsByTagName('div');
+	var subfieldsLength = subfields.length;
+	if(subfieldsLength<=1) return; // nothing to do if there is just one subfield.
+	// among all subfields 
+	for(var i=0;i<subfieldsLength;i++){ 
+		if(subfields[i].getAttribute('id') == index){ //looking for the subfield which is clicked :
+			if(i==0){ // if the clicked subfield is on the top
+				tag.appendChild(subfields[0]);
+				return;
+			}else{
+				var lineAbove = subfields[i-1];
+				tag.insertBefore(line,lineAbove);
+				return;
+			}
+		}
+	}
 }
 
+function unHideSubfield(index,labelindex) {
+	subfield = document.getElementById(index);
+	subfield.style.display = 'block';
+	label = document.getElementById(labelindex);
+	label.style.display='none';	
+}
 </script>
-
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl
new file mode 100644
index 0000000000..addbf938a9
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<html>
+<body>
+
+<script language="JavaScript" type="text/javascript">
+
+function goforward()
+{
+var start = <!-- TMPL_VAR NAME="index">;
+var subfields=opener.opener.document.getElementsByName('subfield'+start);
+var fields=opener.opener.document.getElementsByName('field_value'+start);
+// go forward, until reaching the end of the field.
+for  (var i=0; i<fields.length; i++) {
+	if ( subfields.item(i).value == '<!-- TMPL_VAR NAME="linkidsubfield">') {
+		fields.item(i).value = "<!-- TMPL_VAR NAME="authid">";
+	}
+	<!-- TMPL_LOOP NAME="0XX" -->
+		<!-- TMPL_LOOP NAME="subfield" -->
+			if (subfields.item(i).value == '<!-- TMPL_VAR NAME="marc_subfield" -->') 
+			{
+				fields.item(i).value = "<!-- TMPL_VAR NAME="marc_value" -->";
+			}
+		<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
+}
+
+	opener.close();
+	self.close();
+	return false;
+
+
+}
+</script>
+<script language="javascript" type="text/javascript">
+window.onload=goforward();
+</script>
+
+
+</body>
+</html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-linker.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-linker.tmpl
index 1fa973319e..f2d23a6949 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-linker.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-linker.tmpl
@@ -13,46 +13,8 @@ i=index_start
 //opener.opener.document.f.linkid.value="<!-- TMPL_VAR NAME="authid"-->";
 
 // go forward, until reaching the end of the field.
-while (i<=opener.opener.document.f.field_value.length) {
-	
-	<!-- TMPL_LOOP NAME="0XX" -->
-		<!-- TMPL_LOOP NAME="subfield" -->
-			if (opener.opener.document.f.tag[i].value == <!--TMPL_VAR NAME="linkidfield"--> && opener.opener.document.f.subfield[i].value == '<!-- TMPL_VAR NAME="linkidsubfield" -->') 
-			{
 				opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="authid" -->";
-			}
-			if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '<!-- TMPL_VAR NAME="marc_subfield" -->') 
-			{
-				opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="marc_value" -->";
-			}
-		<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-	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) {
-	
-	<!-- TMPL_LOOP NAME="0XX" -->
-		<!-- TMPL_LOOP NAME="subfield" -->
-			if (opener.opener.document.f.tag[i].value == <!--TMPL_VAR NAME="linkidfield"--> && opener.opener.document.f.subfield[i].value == '<!-- TMPL_VAR NAME="linkidsubfield" -->') 
-			{
-				opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="authid" -->";
-			}
-			if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '<!-- TMPL_VAR NAME="marc_subfield" -->') 
-			{
-				opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="marc_value" -->";
-			}
-		<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-	if (opener.opener.document.f.tag[i].value != whichfield) {
-		i=0;
-	}
-	i--;
-}
+
 	opener.close();
 	self.close();
 	return false;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl
index bdb0e8334c..ab0b7f19cc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl
@@ -1,53 +1,54 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-Koha -- Authority details
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities 
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
-
-<h1 class="authority">Authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
-
-<div id="authorities_detail_actions">
-  <ul>
-    <li><a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">Edit</a></li>
-
-<!-- TMPL_UNLESS name="count" -->
-    <li><a href="javascript:confirm_deletion()">Delete</a></li>
-<!-- /TMPL_UNLESS -->
-
-    <li><a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->')" class="button authority">Print</a></li>
-
-    <li><a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button authority"><!-- TMPL_VAR name="count" --> biblios</li>
-  </ul>
+<!--TMPL_UNLESS NAME="nonav"--><!-- TMPL_INCLUDE NAME="masthead.inc" --><!--/TMPL_UNLESS-->
+<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
+<!--TMPL_UNLESS NAME="nonav"--><!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" --><!--/TMPL_UNLESS-->
+
+
+<div id="main">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
+<div class="tabbed"><input type="hidden" name="nonav" value="<!-- TMPL_VAR NAME="nonav" -->">
+	<h1>Authority number : <!-- TMPL_VAR NAME="authid" --> in <!-- TMPL_VAR NAME="authtypetext" --></h1>
+	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->&nonav=<!-- TMPL_VAR NAME="nonav" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" -->"">
+		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
+	</a>
+	<!--TMPL_UNLESS NAME="nonav"--><a href="javascript:confirm_deletion()">
+		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png">
+	</a>
+	<a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->')" class="button authority">
+		Print
+	</a><!--/TMPL_UNLESS--><!--TMPL_IF NAME="count"-->&nbsp;<a href="/cgi-bin/koha/catalogue/catalogue-search.pl?value=<!-- TMPL_VAR NAME="authid" -->&kohafield=auth_authid&amp;op=do_search&amp;zoom=1" class="button authority">Used in <!-- TMPL_VAR NAME="count" --> biblio(s)</a><!--/TMPL_IF-->
 </div>
 
-<div id="authorities_detail_details">
-<!-- TMPL_LOOP NAME="0XX" -->
-  <table>
-    <tr>
-      <th colspan="2"><!-- TMPL_VAR NAME="tag" --></th>
-    </tr>
-  <!-- TMPL_LOOP NAME="subfield" -->
-    <tr>
-      <td><!-- TMPL_VAR NAME="marc_subfield" --> <!-- TMPL_VAR NAME="marc_lib" --></td>
-      <td><!-- TMPL_VAR NAME="marc_value" --></td>
-    </tr>
-  <!-- /TMPL_LOOP --> <!-- subfield -->
-  </table>
-<!-- /TMPL_LOOP --> <!-- tag -->
+<div name="0XX" id="0XX" class="tab" style="visibility:visible">
+	<!-- TMPL_LOOP NAME="0XX" -->
+			<p class="MARCtag">
+				<!-- TMPL_VAR NAME="tag" -->
+			</p>
+		<!-- TMPL_LOOP NAME="subfield" -->
+			<p>
+				<label class="labelsubfield">
+				<a href="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->&marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&and_or=and&excluding=&operator=all&stype=author&value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15">
+				</a>
+				<!-- TMPL_VAR NAME="marc_subfield" -->
+				<!-- TMPL_VAR NAME="marc_lib" --></label>
+				<!-- TMPL_VAR NAME="marc_value" -->
+			</p>
+		<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
 </div>
 	
 <script language="JavaScript" type="text/javascript">
 
 function confirm_deletion() {
-	var is_confirmed = confirm('Are you sure you want to delete this authority?');
+	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
 	if (is_confirmed) {
-		window.location="authorities-home.pl?op=delete&amp;authid=<!-- TMPL_VAR NAME="authid" -->";
+		window.location="authorities.pl?op=delete&authid=<!-- TMPL_VAR NAME="authid" -->&nonav=<!-- TMPL_VAR NAME="nonav" -->";
 	}
 }
 function Dopop(link) {
 	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
 }
 </script>
-
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/linkresultlist-auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/linkresultlist-auth.tmpl
index a0dfcfddf5..70aa29e85a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/authorities/linkresultlist-auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/linkresultlist-auth.tmpl
@@ -6,21 +6,21 @@
 		<div id="resultnumber">
 			<p>
 				<!-- TMPL_IF name="displayprev" -->
-					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
-						<img src="/intranet-tmpl/default/images/numbers/prev.gif"  border="0">
+					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author&index=<!-- TMPL_VAR NAME="index" -->">
+						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif"  border="0">
 					</a>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_LOOP NAME="numbers" -->
 					<!-- TMPL_IF name="highlight" -->
-						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
+						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
 					<!-- TMPL_ELSE -->
-						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
-							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
+						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author&index=<!-- TMPL_VAR NAME="index" -->">
+							<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
 					<!-- /TMPL_IF -->
 				<!-- /TMPL_LOOP -->
 				<!-- TMPL_IF name="displaynext" -->
-					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
-						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
+					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author&index=<!-- TMPL_VAR NAME="index" -->">
+						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0"></a>
 				<!-- /TMPL_IF -->
 			</p>
 			<p>
@@ -63,20 +63,20 @@
 			<p>
 				<!-- TMPL_IF name="displayprev" -->
 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
-						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
+						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0">
 					</a>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_LOOP NAME="numbers" -->
 					<!-- TMPL_IF name="highlight" -->
-						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
+						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
 					<!-- TMPL_ELSE -->
 						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
-							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
+							<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
 					<!-- /TMPL_IF -->
 				<!-- /TMPL_LOOP -->
 				<!-- TMPL_IF name="displaynext" -->
 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
-						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
+						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0"></a>
 				<!-- /TMPL_IF -->
 			</p>
 		</div>	
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl
new file mode 100644
index 0000000000..a14b9fa516
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl
@@ -0,0 +1,95 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
+
+<div id="main">
+	<h1 class="authority">Authority search results</h1>
+		<div id="resultnumber">
+			<p>
+				<!-- TMPL_IF name="displayprev" -->
+					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author&index=<!-- TMPL_VAR NAME="index" -->">
+						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif"  border="0">
+					</a>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_LOOP NAME="numbers" -->
+					<!-- TMPL_IF name="highlight" -->
+						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
+					<!-- TMPL_ELSE -->
+						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author&index=<!-- TMPL_VAR NAME="index" -->">
+							<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
+					<!-- /TMPL_IF -->
+				<!-- /TMPL_LOOP -->
+				<!-- TMPL_IF name="displaynext" -->
+					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author&index=<!-- TMPL_VAR NAME="index" -->">
+						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0"></a>
+				<!-- /TMPL_IF -->
+			</p>
+			<p>
+				<!-- TMPL_IF name="total" -->
+					&nbsp;<b>Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --></b><br><br>
+				<!-- TMPL_ELSE -->
+					&nbsp;No results found.<br>
+				<!-- /TMPL_IF -->
+			</p>
+		</div>
+		<div id="resultlist">
+			<table>
+				<tr>
+					<th class="authority">Summary</th>
+					<th class="authority">Used</th>
+					<th class="authority">Get It!</th>
+					<th class="authority">Edit It!</th>
+				</tr>
+				<tr>
+					<td>Clear any entry</td>
+					<td>&nbsp;</td>
+					<td>
+						<a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=0&amp;index=<!-- TMPL_VAR NAME="index" -->')" class="button authority">
+							Clear
+						</a>
+					</td>
+				<!-- TMPL_LOOP NAME="result" -->
+					<tr>
+						<td><!-- TMPL_VAR NAME="summary" --></td>
+						<td><!-- TMPL_VAR NAME="used" --> times</td>
+						<td>
+							<a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=<!-- TMPL_VAR NAME="authid" -->&amp;index=<!-- TMPL_VAR NAME="index" -->')"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/arrow.gif" width="16" height="16" hspace="0" vspace="0" border="0"></a>
+						</td>
+						<td> <a href="/cgi-bin/koha/authorities/authorities.pl?nonav=<!-- TMPL_VAR NAME="nonav" -->&authid=<!-- TMPL_VAR NAME="authid" -->&index=<!-- TMPL_VAR NAME="index" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">Edit<a/></td>
+					</tr>
+				<!-- /TMPL_LOOP -->
+			</table>
+	
+		</div>
+		<div id="resultnumber">
+			<p>
+				<!-- TMPL_IF name="displayprev" -->
+					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
+						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0">
+					</a>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_LOOP NAME="numbers" -->
+					<!-- TMPL_IF name="highlight" -->
+						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
+					<!-- TMPL_ELSE -->
+						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
+							<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
+					<!-- /TMPL_IF -->
+				<!-- /TMPL_LOOP -->
+				<!-- TMPL_IF name="displaynext" -->
+					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
+						<img src="<!-- TMPL_VAR NAME="themelang" -->/numbers/next.gif" border="0"></a>
+				<!-- /TMPL_IF -->
+			</p>
+		</div><a href="auth_finder.pl?index=<!-- TMPL_VAR NAME="index" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">Search again</a>	
+	</div>
+</div>
+
+<script language="JavaScript" type="text/javascript">
+
+function jumpfull(page)
+{	
+	window.open(page,'','');
+}
+</script>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl
index 274f96ad43..aa8984bd00 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl
@@ -1,64 +1,110 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-Koha -- Authorities -- Search result list 
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
+<div id="main">
+	<h1 class="authority">Authority search results</h1>
+	<div id="resultnumber">
+		<p>
+			<!-- TMPL_IF name="displayprev" -->
+				<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;stype=author&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
+					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0">
+				</a>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="numbers" -->
+				<!-- TMPL_IF name="highlight" -->
+					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
+				<!-- TMPL_ELSE -->
+					<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;stype=author&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
+						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0">
+					</a>
+				<!-- /TMPL_IF -->
+			<!-- /TMPL_LOOP -->
+			<!-- TMPL_IF name="displaynext" -->
+				<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;stype=author&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
+					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0">
+				</a>
+				<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<!-- TMPL_IF name="total" -->
+			&nbsp;<b>Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --></b><br><br>
+			<!-- TMPL_ELSE -->
+			&nbsp;No results found.<br>
+			<!-- /TMPL_IF -->
+		</p>
+	</div>
+	<div id="resultlist">
+		<table>
+			<tr>
+				<th class="authority">Summary</th>
+				<th class="authority">Used in</th>
+				<th class="authority">Authid/Delete</th>
+				
+			</tr>
+			<!-- TMPL_LOOP NAME="result" -->
+				<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+				
+					<td><!-- TMPL_VAR NAME="summary" --></td>
+					<td><a href="/cgi-bin/koha/catalogue/catalogue-search.pl?kohafield=auth_authid&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;op=do_search&amp;zoom=1" class="button authority"><!-- TMPL_VAR NAME="used" --> biblio(s)</a></td>
+					
+					<td><!-- TMPL_VAR NAME="authid" -->&nbsp;
+						<!-- TMPL_UNLESS name="used" -->
+						<a href="javascript:do_delete('authorities-home.pl?op=delete&authid=<!-- TMPL_VAR NAME="authid" -->')">Delete</a>
+						<!-- /TMPL_UNLESS -->
+					</td>
+					
+				</tr>
+			<!-- /TMPL_LOOP -->
+		</table>
+	</div>
+	<div id="resultnumber">
+		<p>
+			<!-- TMPL_IF name="displayprev" -->
+				<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;stype=author&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
+					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0">
+				</a>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="numbers" -->
+				<!-- TMPL_IF name="highlight" -->
+					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
+				<!-- TMPL_ELSE -->
+					<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;stype=author&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
+						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0">
+					</a>
+				<!-- /TMPL_IF -->
+			<!-- /TMPL_LOOP -->
+			<!-- TMPL_IF name="displaynext" -->
+				<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;stype=author&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
+					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0">
+				</a>
+				<!-- /TMPL_IF -->
+		</p>
+	</div>	
+<form name"m" id="m">
 
-<h1 class="authority">Authority search results</h1>
-
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
-
-<p id="authorities_searchresultlist_current_page_info">
-<!-- TMPL_IF name="total" -->
-  Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" -->
-<!-- TMPL_ELSE -->
-  No results found.
-<!-- /TMPL_IF -->
-</p>
-
-<div id="authorities_searchresultlist_results">
-  <table>
-    <tr>
-      <th>Summary</th>
-<!-- TMPL_UNLESS name="isEDITORS" -->
-      <th>Used in</th>
-<!-- /TMPL_UNLESS -->
-      <th>View</th>
-      <th>Delete</th>
-    </tr>
-<!-- TMPL_LOOP NAME="result" -->
-    <tr>
-      <td><!-- TMPL_VAR NAME="summary" --></td>
-  <!-- TMPL_UNLESS name="isEDITORS" -->
-      <td>
-        <a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button authority"><!-- TMPL_VAR NAME="used" --> biblio(s)</a>
-      </td>
-  <!-- /TMPL_UNLESS -->
-      <td>
-        <a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->">Authority number <!-- TMPL_VAR NAME="authid" --></a>
-      </td>
-      <td>
-  <!-- TMPL_UNLESS name="used" -->
-        <a href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="authid" -->)">Delete</a>
-  <!-- /TMPL_UNLESS -->
-      </td>
-    </tr>
-<!-- /TMPL_LOOP -->
-  </table>
+From:<input type="text" size="10" name="mergefrom" id="mergefrom" value=""/>&nbsp;&nbsp;To:<input type="text" size="10" id="mergeto" name="mergeto" value=""/>
+<input type="button" class="submit" value="Merge" onclick="do_merge(); return false;" /></form>
+					
 </div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 
 <script language="JavaScript" type="text/javascript" >
+function do_delete(page)
+{
+window.location = page;
+}
+function do_merge(page)
+{
 
-function confirm_deletion(id) {
-	
-	var is_confirmed = confirm('Are you sure you want to delete this authority?');
+X = document.forms['m'].elements['mergefrom'].value;
+	Y = document.forms['m'].elements['mergeto'].value;
+var is_confirmed = confirm('Merging from ID:'+X+'  to ID: '+Y+' .Confirm?');
 	if (is_confirmed) {
-		window.location="authorities-home.pl?op=delete&amp;authid="+id;
-	}
+window.location="authorities-home.pl?op=merge&mergefrom="+X+"&mergeto="+Y;
 }
-</script>
-
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
+}
+</script>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/ISBDdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/catalogue/ISBDdetail.tmpl
index 9bb6bd9014..1712fc3227 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/catalogue/ISBDdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/catalogue/ISBDdetail.tmpl
@@ -1,64 +1,18 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalogue MARC detail<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: ISBD View<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="search-topmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
+<div id="main">
 
-
-<h1 class="catalogue">MARC biblio : <!-- TMPL_VAR NAME="biblionumber" --></h1>
-
-	<div id="catalogue_ISBDdetail">
-		<!-- TMPL_VAR NAME="ISBD" -->
-	</div>
+<div class="tabitem"><form action="MARCdetail.pl" method="get">
+<input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" />
+<input type="submit" class="submit" value="View MARC" /></form> <form action="/cgi-bin/koha/moredetail.pl" method="get"><input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" /><input type="hidden" name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->" /><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" /><input type="submit" class="submit" value="Item Details" /></form> <form action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Print" onclick="Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="bib" /> <input type="submit" value="Place Reserve" class="submit" /></form> <form action="acqui.simple/addbiblio.pl"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Edit this Record" class="submit" /></form><!-- /TMPL_IF -->
 </div>
 
-<div id="action">
-		<form action="javascript:Addbiblio('')">
-			<input type="submit" value="Edit biblio" />
-		</form>
-		<form action="javascript:Addbiblio('duplicate')">
-			<input type="submit" value="Duplicate" />
-		</form>
-		<form action="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->">
-			<input type="submit" value="Edit item" />
-		</form>
-		<form action="javascript:confirm_deletion()">
-			<input type="submit" value="delete" />
-		</form>
-		<form action="MARCdetail.pl">
-			<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-			<input type="submit" value="Complete" />
-		</form>
-		<form action="#">
-			<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-			<input type="submit" value="Normal" />
-		</form>
-		<form action="ISBDdetail.pl">
-			<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-			<input type="submit" value="ISBD" />
-		</form>
-		<form action="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')">
-			<input type="submit" value="Add to shelf" />
-		</form>
-		<form action="javascript:Dopop('detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')">
-			<input type="submit" value="Print" />
-		</form>
-		<!-- TMPL_IF name="subscriptionsnumber" -->
-		<form action="serials-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-			<input type="submit" value="Subscription(s)" />
-		</form>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="norequests" -->
-		<!-- TMPL_ELSE -->
-			<form action="request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-				<input type="submit" value="Request" />
-			</form>
-		<!-- /TMPL_IF -->
+	<div class="isbd">
+		<p><!-- TMPL_VAR NAME="ISBD" --></p>
+	</div>
 </div>
 
-<script language="javascript" type="text/javascript">
-function Dopop(link) {
-	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
-}
-</script>
-
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl
index 669a77ef22..8d587cf2ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl
@@ -1,425 +1,250 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalogue MARC detail<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: MARC Record View<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!--TMPL_UNLESS NAME="popup"-->
 
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
+<h2>MARC Record for number <em><!-- TMPL_VAR name="biblionumber" --><!-- TMPL_VAR NAME="biblio_title" --><!-- TMPL_IF NAME="biblio_subtitle" -->: <!-- TMPL_VAR NAME="biblio_subtitle" --><!-- /TMPL_IF --></em></h2>
+<div class="tabitem"><form action="detail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="Brief Display" /></form><!-- TMPL_IF NAME="norequests" -->&nbsp;<!-- TMPL_ELSE --> <form action="/cgi-bin/koha/reserve/request.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <input type="submit" class="submit" value="Place Reserve" /></form>
+		<!-- /TMPL_IF --><form action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple Print View" /></form> <!-- TMPL_IF name="subscriptionid" --><form action="/cgi-bin/koha/bull/subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Subscription" class="submit" /></form>
+<form action="/cgi-bin/koha/bull/serial-issues.pl" method="get"><input type="hidden" name="subscriptionid" value="!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Serial Issues" class="submit" /></form><!-- /TMPL_IF -->  <form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit MARC" /></form> <form action="/cgi-bin/koha/cataloguing/additem.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber"-->" /><input type="submit" class="submit" value="Edit Items" /></form> <form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="cancel" value="Delete Record" onclick="confirm_deletion(); return false;" /></form></div>
 
-
-<!-- TMPL_UNLESS name="popup" -->
-	<div class="tabbed">
-	<form Name="f">
-		<h1 class="catalogue">
-			Biblionumber : <!-- TMPL_VAR NAME="biblionumber" -->
-			<b>With Framework :<!--TMPL_VAR Name="framework" --></b>
-		</h1>
-	</form>
-	</div>
-<!-- /TMPL_UNLESS -->
-	<div class="tabs">
-		<!-- TMPL_IF NAME="0XX" -->
-			<div id="link0"><a href="javascript:active(0)">0</a></div>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="1XX" -->
-			<div id="link1"><a href="javascript:active(1)">1</a></div>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="2XX" -->
-			<div id="link2"><a href="javascript:active(2)">2</a></div>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="3XX" -->
-			<div id="link3"><a href="javascript:active(3)">3</a></div>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="4XX" -->
-			<div id="link4"><a href="javascript:active(4)">4</a></div>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="5XX" -->
-			<div id="link5"><a href="javascript:active(5)">5</a></div>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="6XX" -->
-			<div id="link6"><a href="javascript:active(6)">6</a></div>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="7XX" -->
-			<div id="link7"><a href="javascript:active(7)">7</a></div>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="8XX" -->
-			<div id="link8"><a href="javascript:active(8)">8</a></div>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="9XX" -->
-			<div id="link9"><a href="javascript:active(9)">9</a></div>
-		<!-- /TMPL_IF -->
-		<a href="javascript:active(10)">I<br>t<br>e<br>m<br>s</a>
-	</div>
-
-	<div name="0XX" id="0XX" class="tab" style="visibility:visible">
-		<!-- TMPL_LOOP NAME="0XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<p class="MARCtag">
-						<!-- TMPL_VAR NAME="tag" -->
-					</p>
-				<!-- TMPL_ELSE -->
-					<br />
-				<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="subfield" -->
-				<p>
-					<label class="labelsubfield">&nbsp;
-					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
-					<!-- TMPL_VAR NAME="marc_lib" --></label>
-					<!-- TMPL_VAR NAME="marc_value" -->
-					<!-- TMPL_IF name="link" -->
-						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+<!-- TMPL_IF NAME="0XX" -->
+<table class="marc">
+	<!-- TMPL_LOOP NAME="0XX" -->
+	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
+	<!-- TMPL_LOOP NAME="subfield" -->
+	<tr>
+         <td>&nbsp;</td>
+	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS --></td>
+		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
+		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
+<td><!-- TMPL_IF name="link" -->
+						<a href="catalogue-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;zoom=1&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
 						</a>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF NAME="authority" -->
-						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
-					<!-- /TMPL_IF -->
-				</p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_LOOP -->
-	</div>
-	
-	<div id="1XX" class="tab">
-		<!-- TMPL_LOOP NAME="1XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<p class="MARCtag">
-						<!-- TMPL_VAR NAME="tag" -->
-					</p>
-				<!-- TMPL_ELSE -->
-					<br />
-				<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="subfield" -->
-				<p>
-					<label class="labelsubfield">&nbsp;
-					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
-					<!-- TMPL_VAR NAME="marc_lib" --></label>
-					<!-- TMPL_VAR NAME="marc_value" -->
-					<!-- TMPL_IF name="link" -->
-						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+					<!-- /TMPL_IF --></td> 
+	</tr>
+	<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
+     </table>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="1XX" -->
+    <table class="marc">
+	<!-- TMPL_LOOP NAME="1XX" -->
+	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
+	<!-- TMPL_LOOP NAME="subfield" -->
+	<tr>
+         <td>&nbsp;</td>
+	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS --></td>
+		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
+		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
+<td><!-- TMPL_IF name="link" -->
+						<a href="catalogue-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;zoom=1&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
 						</a>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF NAME="authority" -->
-						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
-					<!-- /TMPL_IF -->
-				</p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_LOOP -->
-	</div>
-	
-	<div id="2XX" class="tab">
-		<!-- TMPL_LOOP NAME="2XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<p class="MARCtag">
-						<!-- TMPL_VAR NAME="tag" -->
-					</p>
-				<!-- TMPL_ELSE -->
-					<br />
-				<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="subfield" -->
-				<p>
-					<label class="labelsubfield">&nbsp;
-					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
-					<!-- TMPL_VAR NAME="marc_lib" --></label>
-					<!-- TMPL_VAR NAME="marc_value" -->
-					<!-- TMPL_IF name="link" -->
-						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+					<!-- /TMPL_IF --></td> 
+       </tr>
+	<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
+     </table>
+	 <!-- /TMPL_IF -->
+	 
+<!-- TMPL_IF NAME="2XX" -->
+    <table class="marc">
+	<!-- TMPL_LOOP NAME="2XX" -->
+	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
+	<!-- TMPL_LOOP NAME="subfield" -->
+	<tr>
+         <td>&nbsp;</td>
+	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
+		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
+		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
+<td><!-- TMPL_IF name="link" -->
+						<a href="catalogue-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;zoom=1&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
 						</a>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF NAME="authority" -->
-						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
-					<!-- /TMPL_IF -->
-				</p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_LOOP -->
-	</div>
-	
-	<div id="3XX" class="tab">
-		<!-- TMPL_LOOP NAME="3XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<p class="MARCtag">
-						<!-- TMPL_VAR NAME="tag" -->
-					</p>
-				<!-- TMPL_ELSE -->
-					<br />
-				<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="subfield" -->
-				<p>
-					<label class="labelsubfield">&nbsp;
-					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
-					<!-- TMPL_VAR NAME="marc_lib" --></label>
-					<!-- TMPL_VAR NAME="marc_value" -->
-					<!-- TMPL_IF name="link" -->
-						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+					<!-- /TMPL_IF --></td> 
+       </tr>
+	<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
+     </table>
+	 <!-- /TMPL_IF -->
+	 
+<!-- TMPL_IF NAME="3XX" -->
+    <table class="marc">
+	<!-- TMPL_LOOP NAME="3XX" -->
+	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
+	<!-- TMPL_LOOP NAME="subfield" -->
+	<tr>
+         <td>&nbsp;</td>
+	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
+		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
+		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
+<td><!-- TMPL_IF name="link" -->
+						<a href="catalogue-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;zoom=1&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
 						</a>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF NAME="authority" -->
-						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
-					<!-- /TMPL_IF -->
-				</p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_LOOP -->
-	</div>
-	
-	<div id="4XX" class="tab">
-		<!-- TMPL_LOOP NAME="4XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<p class="MARCtag">
-						<!-- TMPL_VAR NAME="tag" -->
-					</p>
-				<!-- TMPL_ELSE -->
-					<br />
-				<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="subfield" -->
-				<p>
-					<label class="labelsubfield">&nbsp;
-					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
-					<!-- TMPL_VAR NAME="marc_lib" --></label>
-					<!-- TMPL_VAR NAME="marc_value" -->
-					<!-- TMPL_IF name="link" -->
-						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+					<!-- /TMPL_IF --></td> 
+       </tr>
+	<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
+     </table>
+	 <!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="4XX" -->
+    <table class="marc">
+	<!-- TMPL_LOOP NAME="4XX" -->
+	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
+	<!-- TMPL_LOOP NAME="subfield" -->
+	<tr>
+         <td>&nbsp;</td>
+	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
+		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
+		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
+<td><!-- TMPL_IF name="link" -->
+						<a href="catalogue-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;zoom=1&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
 						</a>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF NAME="authority" -->
-						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
-					<!-- /TMPL_IF -->
-				</p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_LOOP -->
-	</div>
-	
-	<div  id="5XX" class="tab">
-		<!-- TMPL_LOOP NAME="5XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<p class="MARCtag">
-						<!-- TMPL_VAR NAME="tag" -->
-					</p>
-				<!-- TMPL_ELSE -->
-					<br />
-				<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="subfield" -->
-				<p>
-					<label class="labelsubfield">&nbsp;
-					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
-					<!-- TMPL_VAR NAME="marc_lib" --></label>
-					<!-- TMPL_VAR NAME="marc_value" -->
-					<!-- TMPL_IF name="link" -->
-						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+					<!-- /TMPL_IF --></td> 
+	<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
+     </table>
+	 <!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="5XX" -->
+    <table class="marc">
+	<!-- TMPL_LOOP NAME="5XX" -->
+	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
+	<!-- TMPL_LOOP NAME="subfield" -->
+	<tr>
+         <td>&nbsp;</td>
+	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
+		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
+		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
+<td><!-- TMPL_IF name="link" -->
+						<a href="catalogue-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;zoom=1&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
 						</a>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF NAME="authority" -->
-						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
-					<!-- /TMPL_IF -->
-				</p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_LOOP -->
-	</div>
-	
-	<div id="6XX" class="tab">
-		<!-- TMPL_LOOP NAME="6XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<p class="MARCtag">
-						<!-- TMPL_VAR NAME="tag" -->
-					</p>
-				<!-- TMPL_ELSE -->
-					<br />
-				<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="subfield" -->
-				<p>
-					<label class="labelsubfield">&nbsp;
-					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
-					<!-- TMPL_VAR NAME="marc_lib" --></label>
-					<!-- TMPL_VAR NAME="marc_value" -->
-					<!-- TMPL_IF name="link" -->
-						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+					<!-- /TMPL_IF --></td> 
+       </tr>
+	<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
+     </table>
+	 <!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="6XX" -->
+    <table class="marc">
+	<!-- TMPL_LOOP NAME="6XX" -->
+	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
+	<!-- TMPL_LOOP NAME="subfield" -->
+	<tr>
+         <td>&nbsp;</td>
+	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
+		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
+		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
+<td><!-- TMPL_IF name="link" -->
+						<a href="catalogue-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;zoom=1&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
 						</a>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF NAME="authority" -->
-						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
-					<!-- /TMPL_IF -->
-				</p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_LOOP -->
-	</div>
-	
-	<div  id="7XX" class="tab">
-		<!-- TMPL_LOOP NAME="7XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<p class="MARCtag">
-						<!-- TMPL_VAR NAME="tag" -->
-					</p>
-				<!-- TMPL_ELSE -->
-					<br />
-				<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="subfield" -->
-				<p>
-					<label class="labelsubfield">&nbsp;
-					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
-					<!-- TMPL_VAR NAME="marc_lib" --></label>
-					<!-- TMPL_VAR NAME="marc_value" -->
-					<!-- TMPL_IF name="link" -->
-						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+					<!-- /TMPL_IF --></td> 
+       </tr>
+	<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
+     </table>
+	 <!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="7XX" -->
+    <table class="marc">
+	<!-- TMPL_LOOP NAME="7XX" -->
+	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
+	<!-- TMPL_LOOP NAME="subfield" -->
+	<tr>
+         <td>&nbsp;</td>
+	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
+		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
+		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
+<td><!-- TMPL_IF name="link" -->
+						<a href="catalogue-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;zoom=1&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
 						</a>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF NAME="authority" -->
-						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
-					<!-- /TMPL_IF -->
-				</p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_LOOP -->
-	</div>
-	
-	<div id="8XX" class="tab">
-		<!-- TMPL_LOOP NAME="8XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<p class="MARCtag">
-						<!-- TMPL_VAR NAME="tag" -->
-					</p>
-				<!-- TMPL_ELSE -->
-					<br />
-				<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="subfield" -->
-				<p>
-					<label class="labelsubfield">&nbsp;
-					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
-					<!-- TMPL_VAR NAME="marc_lib" --></label>
-					<!-- TMPL_VAR NAME="marc_value" -->
-					<!-- TMPL_IF name="link" -->
-						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+					<!-- /TMPL_IF --></td> 
+       </tr>
+	<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
+     </table>
+	 <!-- /TMPL_IF -->
+
+	 
+<!-- TMPL_IF NAME="8XX" -->
+    <table class="marc">
+	<!-- TMPL_LOOP NAME="8XX" -->
+	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
+	<!-- TMPL_LOOP NAME="subfield" -->
+	<tr>
+         <td>&nbsp;</td>
+	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
+		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
+		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
+<td><!-- TMPL_IF name="link" -->
+						<a href="catalogue-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;zoom=1&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
 						</a>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF NAME="authority" -->
-						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
-					<!-- /TMPL_IF -->
-				</p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_LOOP -->
-	</div>
-	
-	<div id="9XX" class="tab">
-		<!-- TMPL_LOOP NAME="9XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<p class="MARCtag">
-						<!-- TMPL_VAR NAME="tag" -->
-					</p>
-				<!-- TMPL_ELSE -->
-					<br />
-				<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="subfield" -->
-				<p>
-					<label class="labelsubfield">&nbsp;
-					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
-					<!-- TMPL_VAR NAME="marc_lib" --></label>
-					<!-- TMPL_VAR NAME="marc_value" -->
-					<!-- TMPL_IF name="link" -->
-						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+					<!-- /TMPL_IF --></td> 
+       </tr>
+	<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
+     </table>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="9XX" -->
+    <table class="marc">
+	<!-- TMPL_LOOP NAME="9XX" -->
+	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
+	<!-- TMPL_LOOP NAME="subfield" -->
+	<tr>
+         <td>&nbsp;</td>
+	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
+		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
+		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
+<td><!-- TMPL_IF name="link" -->
+						<a href="catalogue-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;zoom=1&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
 						</a>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF NAME="authority" -->
-						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
-					<!-- /TMPL_IF -->
-				</p>
-			<!-- /TMPL_LOOP -->
+					<!-- /TMPL_IF --></td> 
+       </tr>
+	<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
+     </table>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF NAME="item_loop" -->    <table>
+		<tr>
+			<!-- TMPL_LOOP NAME="item_header_loop" --><th><!-- TMPL_VAR NAME="header_value" --></th><!-- /TMPL_LOOP -->
+		</tr>
+		<!-- TMPL_LOOP NAME="item_loop" -->
+			<tr>
+					<!-- TMPL_VAR NAME="item_value" -->
+			</tr>
 		<!-- /TMPL_LOOP -->
-	</div>
-	
-	<div id="10XX" class="tab">
-		<p class="MARCtag">Items</p>
-		<br/>
-		<table class="noborder">
-				<tr>
-					<!-- TMPL_LOOP NAME="item_header_loop" -->
-						<th class="noborder">
-							<!-- TMPL_VAR NAME="header_value" -->
-						</th>
-					<!-- /TMPL_LOOP -->
-				</tr>
-				<!-- TMPL_LOOP NAME="item_loop" -->
-					<tr>
-						<!-- TMPL_VAR NAME="item_value" -->
-					</tr>
-				<!-- /TMPL_LOOP -->
-		</table>
-	</div>
-<div id="action">
-		<form action="javascript:Addbiblio('')">
-			<input type="submit" value="Edit biblio" />
-		</form>
-		<form action="javascript:Addbiblio('duplicate')">
-			<input type="submit" value="Duplicate" />
-		</form>
-		<form action="../cataloguing/additem.pl">
-			<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-			<input type="submit" value="Edit item" />
-		</form>
-		<form action="javascript:confirm_deletion()">
-			<input type="submit" value="delete" />
-		</form>
-		<form action="#">
-			<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-			<input type="submit" value="Complete" />
-		</form>
-		<form action="detail.pl">
-			<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-			<input type="submit" value="Normal" />
-		</form>
-		<form action="ISBDdetail.pl">
-			<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-			<input type="submit" value="ISBD" />
-		</form>
-		<form action="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')">
-			<input type="submit" value="Add to shelf" />
-		</form>
-		<form action="javascript:Dopop('detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')">
-			<input type="submit" value="Print" />
-		</form>
-		<!-- TMPL_IF name="subscriptionsnumber" -->
-		<form action="serials-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-			<input type="submit" value="Subscription(s)" />
-		</form>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="norequests" -->
-		<!-- TMPL_ELSE -->
-			<form action="request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-				<input type="submit" value="Request" />
-			</form>
-		<!-- /TMPL_IF -->
-</div>
-<script language="JavaScript" type="text/javascript">
-function active(numlayer)
-{
-	for (i=0; i <= 10 ; i++ ) {
-		ong = i+"XX";
-		link = "link"+i;
-		if (numlayer==i) {
-			document.getElementById(ong).style.visibility="visible";
-		} else {
-			document.getElementById(ong).style.visibility="hidden";
-		}
-	}
-}
+     </table><!-- /TMPL_IF -->
 
+	
+	<script language="JavaScript" type="text/javascript">
 function confirm_deletion() {
-	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
+	var is_confirmed = confirm('Are you sure you want to delete this record and all the attached items?');
 	if (is_confirmed) {
-		window.location="../cataloguing/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
+		window.location="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
 	}
 }
-function Dopop(link) {
-	newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
-}
 function Changefwk(FwkList) {
   var fwk = FwkList.options[FwkList.selectedIndex].value;
-  window.location = "MARCdetail.pl?bib=<!--TMPL_VAR Name="biblionumber"-->&frameworkcode="+fwk;
+  window.location = "MARCdetail.pl?biblionumber=<!--TMPL_VAR Name="biblionumber"-->&frameworkcode="+fwk;
 }
 function Addbiblio(op) {
-  var fwk = document.forms['f'].Frameworks.options[document.forms['f'].Frameworks.selectedIndex].value;
-  window.location = "../cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode="+fwk+"&op="+op; 
+  var fwk = document.forms['duplicate'].Frameworks.options[document.forms['duplicate'].Frameworks.selectedIndex].value;
+  window.location = "/cgi-bin/koha/cataloguing/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode="+fwk+"&op="+op; 
 }
 </script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/catalogue_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/catalogue/catalogue_search.tmpl
new file mode 100644
index 0000000000..b67277f946
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/catalogue/catalogue_search.tmpl
@@ -0,0 +1,162 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Simple Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
+
+	<h1>Catalogue Search</h1>
+<table align ="center" >
+	
+	    <td align ="center">
+	       <input id="searchType1" type="button" value="Zoom Search" onclick="changeSearch1()" <!-- TMPL_IF name="zoom_search" -->style="background-color:orange"<!-- TMPL_ELSE -->style="background-color:yellow"<!-- /TMPL_IF -->>
+		</td>	
+		<td align ="center">
+	       <input id="searchType2" type="button" value="SQL search" onclick="changeSearch2()" <!-- TMPL_IF name="sql_search" -->style="background-color:orange"<!-- TMPL_ELSE -->style="background-color:yellow"<!-- /TMPL_IF --> background-color="orange">
+		</td>
+	</tr>
+</table>
+<form  name="zoom_form" id="zoom_form" action="/cgi-bin/koha/catalogue/catalogue-search.pl" method='post' <!-- TMPL_IF name="zoom_search" -->style="display:inline;"<!-- TMPL_ELSE -->style="display:none;"<!-- /TMPL_IF -->>
+    <input type="hidden" name="op" value="do_search">
+    <input type="hidden" name="search_type" value="zoom">
+    <input type="hidden" name="startfrom" value="0">
+	<input type="hidden" name="zoom" value="1">
+<table style="border:0" align="center">
+
+<tr><td><b>Format to display</b></td><td>MARC<input type="radio" name="MARC" value="1" checked=1>Brief<input type="radio" name="MARC" value="0"></td><td><b>Display per page:</b><input type text name="number_of_results" value="10" size="3"/></td></tr>
+
+<tr>	<td>Search on:</td><td><select size="1"  name="kohafield" style="width:170px">
+				<!-- TMPL_LOOP name="kohafields" -->
+	                <option value="<!-- TMPL_VAR name="marctokoha" -->" <!-- TMPL_IF name="sel" -->selected<!-- /TMPL_IF -->  ><!-- TMPL_VAR name="liblibrarian" --></option>
+				<!-- /TMPL_LOOP --></select></td><td><input type="text"  size="25" name="value" value="<!-- TMPL_VAR name="value" -->" ></td>
+							<td>With</td><td><Select type="text"  name="relation">
+							<option value=" " <!-- TMPL_IF name="blank" -->selected<!-- /TMPL_IF --> >&nbsp;
+							</option>
+				            			<option value="@attr 5=1 " <!-- TMPL_IF name="@attr 5=1 " -->selected<!-- /TMPL_IF --> >* wildcard anywhere
+							</option>
+							<option value="@attr 5=100 " <!-- TMPL_IF name="@attr 5=100 " -->selected<!-- /TMPL_IF --> >No truncation
+							</option>
+							<option value="@attr 5=102 " <!-- TMPL_IF name="@attr 5=102 " -->selected<!-- /TMPL_IF --> >Mistakes allowed
+							</option>
+							<option value="@attr 5=1 @attr 6=3 " <!-- TMPL_IF name="@attr 5=1 @attr 6=3 " -->selected<!-- /TMPL_IF --> >Starts with
+							</option>
+							<option value="@attr 2=1  " <!-- TMPL_IF name="@attr 2=1 " -->selected<!-- /TMPL_IF --> >Less than
+							</option>
+							<option value="@attr 2=2  " <!-- TMPL_IF name="@attr 2=2 " -->selected<!-- /TMPL_IF --> >Less than & equal
+							</option>
+							<option value="@attr 2=5  " <!-- TMPL_IF name="@attr 2=5 " -->selected<!-- /TMPL_IF --> >Greater than
+							</option>
+							<option value="@attr 2=4  " <!-- TMPL_IF name="@attr 2=4 " -->selected<!-- /TMPL_IF --> >Greater than & equal
+							</option>
+						</select></td></tr>
+		<tr><td>		
+					<Select type="text"  name="and_or">
+				            			<option value="@and" <!-- TMPL_IF name="and" -->selected<!-- /TMPL_IF --> >AND
+							</option>
+							<option value="@or" <!-- TMPL_IF name="or" -->selected<!-- /TMPL_IF --> >OR
+							</option>
+							<option value="@not" <!-- TMPL_IF name="not" -->selected<!-- /TMPL_IF --> >NOT
+							</option>
+						</select></td></tr>
+			<tr>	<td>Search on:</td><td><select size="1"  name="kohafield" style="width:170px">
+				<option value="">All</option>
+				<!-- TMPL_LOOP name="kohafields" -->
+	                <option value="<!-- TMPL_VAR name="marctokoha" -->" <!-- TMPL_IF name="sel" -->selected<!-- /TMPL_IF -->  ><!-- TMPL_VAR name="liblibrarian" --></option>
+				<!-- /TMPL_LOOP --></select></td><td><input type="text"  size="25" name="value" value="<!-- TMPL_VAR name="value" -->" ></td>
+							<td>With</td><td><Select type="text"  name="relation">
+							<option value=" " <!-- TMPL_IF name="blank" -->selected<!-- /TMPL_IF --> >&nbsp;
+							</option>
+				            			<option value="@attr 5=1 " <!-- TMPL_IF name="@attr 5=1 " -->selected<!-- /TMPL_IF --> >* wildcard anywhere
+							</option>
+							<option value="@attr 5=100 " <!-- TMPL_IF name="@attr 5=100 " -->selected<!-- /TMPL_IF --> >No truncation
+							</option>
+							<option value="@attr 5=102 " <!-- TMPL_IF name="@attr 5=102 " -->selected<!-- /TMPL_IF --> >Mistakes allowed
+							</option>
+							<option value="@attr 5=1 @attr 6=3 " <!-- TMPL_IF name="@attr 5=1 @attr 6=3 " -->selected<!-- /TMPL_IF --> >Starts with
+							</option>
+							<option value="@attr 2=1  " <!-- TMPL_IF name="@attr 2=1 " -->selected<!-- /TMPL_IF --> >Less than
+							</option>
+							<option value="@attr 2=2  " <!-- TMPL_IF name="@attr 2=2 " -->selected<!-- /TMPL_IF --> >Less than & equal
+							</option>
+							<option value="@attr 2=5  " <!-- TMPL_IF name="@attr 2=5 " -->selected<!-- /TMPL_IF --> >Greater than
+							</option>
+							<option value="@attr 2=4  " <!-- TMPL_IF name="@attr 2=4 " -->selected<!-- /TMPL_IF --> >Greater than & equal
+							</option>
+						</select></td></tr>
+<tr>
+			<td colspan=2><b>Sort on:</b><select size="1"  name="order" style="width:170px">
+			<option value="">System Ranked</option>	
+			<!-- TMPL_LOOP name="sorts" -->
+	              	  <option value="<!-- TMPL_VAR name="marctokoha" -->" <!-- TMPL_IF name="sel" -->selected<!-- /TMPL_IF -->  ><!-- TMPL_VAR name="liblibrarian" --></option>
+				<!-- /TMPL_LOOP --></select>
+			<select size="1"  name="asc" style="width:100px">
+				<option value="1">Ascending</option>
+				<option value="2">Descending</option>
+				</td>
+				</tr><tr><td colspan=2><input class = "button" type="submit" value="Start search"></td></tr>
+	
+</form>
+<form onSubmit="return checkSQLSearch()" name="precise_form" id="sql_form" action="/cgi-bin/koha/catalogue/catalogue-search.pl" method='post' <!-- TMPL_IF name="sql_search" -->style="display:inline;"<!-- TMPL_ELSE -->style="display:none;"<!-- /TMPL_IF -->>
+
+    <input type="hidden" name = "op" value="do_search">
+    <input type="hidden" name = "search_type" value="sql">
+<input type="hidden" name="zoom" value="0">
+	<table style="border:0" align="center">
+<tr>
+<td><b>Format to display</b></td><td>MARC<input type="radio" name="MARC" value="1" checked=1>Brief<input type="radio" name="MARC" value="0"></td>
+	    <tr>
+			<td>Barcode</td>
+			<td colspan="1"><input type="text"  size="15"   name="barcode" value="<!-- TMPL_VAR name="barcode" -->" onchange="if(this.value != '') {this.form.itemnumber.value = ''; this.form.biblionumber.value = ''}"></td>
+		    <td>Item number</td>
+			<td colspan="1"><input type="text"  size="15"   name="itemnumber" value="<!-- TMPL_VAR name="itemnumber" -->" onchange="if(this.value != '') {this.form.biblionumber.value = ''; this.form.barcode.value = ''} "></td>
+		
+			 <td>Biblio Number</td>
+			<td colspan="1"><input type="text"  size="15"   name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" onchange="if(this.value != '') {this.form.barcode.value = ''; this.form.itemnumber.value = ''} "></td>
+		</tr>
+
+	    <tr>
+			<td colspan = "4" align = "center">
+			    <br>
+				<input class = "button" type="submit" value="Start search">
+	      		</td>
+		</tr>
+
+	</table>
+</form>
+</table>
+<script language="JavaScript" type="text/javascript">
+function hideSearchsTypes() {
+            document.getElementById('zoom_form').style.display = 'none';
+            document.getElementById('sql_form').style.display = 'none';
+          
+		}
+
+		function resetButtonsColors() {
+			document.getElementById('searchType1').style.backgroundColor = 'yellow';
+			document.getElementById('searchType2').style.backgroundColor = 'yellow';
+			
+			
+		}
+
+		function changeSearch1() {
+		    resetButtonsColors();
+		    document.getElementById('searchType1').style.backgroundColor = 'orange';
+		    hideSearchsTypes();
+		    document.getElementById('zoom_form').style.display = 'inline';
+		}
+
+        function changeSearch2() {
+            resetButtonsColors();
+		    document.getElementById('searchType2').style.backgroundColor = 'orange';
+		    hideSearchsTypes();
+		    document.getElementById('sql_form').style.display = 'inline';
+		}
+function checkSQLSearch() {
+		if ( (document.sql_form.barcode.value == '') &&
+			(document.sql_form.itemnumber.value == '') && (document.sql_form.biblionumber.value == '') ) {
+			alert("Enter a barcode or itemnumber or biblionumber to start searching.");
+			return false;
+		} else {
+		    return true;
+		}
+	}
+</script>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/catalogue_searchresults.tmpl b/koha-tmpl/intranet-tmpl/prog/en/catalogue/catalogue_searchresults.tmpl
new file mode 100644
index 0000000000..37edc0b891
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/catalogue/catalogue_searchresults.tmpl
@@ -0,0 +1,235 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Simple Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
+
+<script language="JavaScript" type="text/javascript">
+
+var no_biblios_selected = "Select one or more documents to add to your virtual shelves.";
+var no_shelves_selected = "Select one or more virtual shelves to add the selected documents.";
+
+/*Add the selected biblionumber to the seleted virtual shelves*/
+function addBibliosToShelves(){
+	shelf_frm = document.shelf_form;
+	//check for at least one shelf seleted
+	shelf_sel = false;
+	for (var i=0; i < shelf_frm.shelfnumber.length; i++) {
+		if (shelf_frm.shelfnumber[i].checked) {
+			shelf_sel = true;
+			break;
+		}
+	}
+	if (shelf_sel) {
+	    shelf_frm.biblios.value = '';
+		for (var i=0; i < document.myform.bibid.length; i++) {
+			if (document.myform.bibid[i].checked) {
+				shelf_frm.biblios.value = shelf_frm.biblios.value + document.myform.bibid[i].value + ",";
+			}
+		}
+		if (shelf_frm.biblios.value == '') {
+            alert(no_biblios_selected);
+		} else {
+			shelf_frm.submit();
+		}
+	} else {
+        alert(no_shelves_selected);
+	}
+}
+
+function show_shelfPanel() {
+
+	if (document.getElementById('shelf_panel').style.display == 'block') {
+	    //document.getElementById('shelf_panel').style.visibility = 'hidden';
+	    document.getElementById('shelf_panel').style.display = 'none';
+	} else {
+	    document.getElementById('shelf_panel').style.display = 'block';
+        //document.getElementById('shelf_panel').style.visibility = 'visible';
+	}
+}
+
+</script>
+
+
+
+    <h1>Catalogue search</h1>
+
+<!-- TMPL_ELSE -->
+	<!-- TMPL_LOOP NAME="searchdesc" -->
+    	You searched:
+    	<div style="color:green;">|&nbsp;
+	 <!-- TMPL_VAR name="query" -->&nbsp;|&nbsp;
+		</div>
+	<!-- /TMPL_LOOP -->
+	<!-- TMPL_VAR NAME="numrecords" --> results
+
+<div id="pages" >
+    <!-- Row of numbers corresponding to search result pages -->
+    
+    <!-- TMPL_LOOP NAME="numbers" -->
+		<!-- TMPL_IF NAME="highlight" -->
+		    <span class="current">
+		    <!-- TMPL_VAR NAME="number" -->
+	        </span>
+		<!-- TMPL_ELSE -->
+		    <span class="pages">
+	        <a class="pages"  href="catalogue-search.pl?op=do_search&amp;zoom=1&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="forminputs" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="HTML" --><!-- /TMPL_LOOP -->&amp;pg=<!-- TMPL_VAR NAME="pg" -->&amp;reorder=<!-- TMPL_VAR NAME="reorder" -->"><!-- TMPL_VAR NAME="number" --></a>
+	        </span>
+		<!-- /TMPL_IF -->
+    <!-- /TMPL_LOOP -->
+    
+</div>
+
+<!-- TMPL_IF name="shelvescount" -->
+<table style="border:0">
+	<tr>
+	    <td width="75%"></td>
+		<td>
+			<input type="button" value="Add to my virtual shelves" class="button"
+				    style="border:0px;background-color:#F2F0E9;text-align:left;display:block;"
+					onclick="show_shelfPanel();">
+
+			<div class="shelf_panel" id="shelf_panel" style="display:none;">
+	    		<form name="shelf_form" action="/cgi-bin/koha/bookshelves/add-biblios-to-shelves.pl" method="post">
+        		<input type="checkbox" name="shelfnumber" value="-1" style="display:none;">
+				<input type="hidden" name="biblios" value="">
+				<input type="hidden" name="return_url" value="catalogue-search.pl?op=do_search&amp;zoom=1&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->">
+				<span class="style3">Select one or more documents and the virtual shelves you want to add them.</span>
+				<table style="border:0">
+				<!-- TMPL_LOOP name="shelves" -->
+		    	<tr>
+		        	<td>
+						<input type="checkbox" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
+					</td>
+		        	<td>
+						<a class="style12" href="/cgi-bin/koha/bookshelves/shelves.pl?op=viewcontent&shelfnumber=<!-- TMPL_VAR name="shelfnumber" -->"><!-- TMPL_VAR name="shelfname" --></a>
+					</td>
+					<td>
+						<!-- TMPL_VAR name="bibliocount" --> documents
+					</td>
+				</tr>
+				<!-- /TMPL_LOOP -->
+				</table>
+				<div align="right" class="style5">
+					<input type="button" onclick="addBibliosToShelves()" value="Add" style="border:0px;background-color:#4898B0;height:20px;" class="button">
+				</div>
+				</form>
+			</div>
+  		</td>
+  	</tr>
+</table>
+<!-- /TMPL_IF -->
+
+<!-- Search Results Table -->
+<!-- TMPL_IF NAME="numrecords" -->
+<form name="myform" action="" style="margin:0px">
+	<br>
+	<table border="0" cellspacing="0" cellpadding="2" width="80%" align="center">
+	<tr bgcolor="#99cccc" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif">
+        <th colspan="2"></th>
+		<th align="left"> <a  href="catalogue-search.pl?op=do_search&amp;zoom=1&amp;reorder=title,2<!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->">▼</a>Title <a  href="catalogue-search.pl?op=do_search&zoom=1<!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&amp;reorder=title,1">▲</a>
+	   </th>
+		<th align="left"> <a  href="catalogue-search.pl?op=do_search&amp;zoom=1<!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&amp;reorder=author,2 ">▼</a>Author<a  href="catalogue-search.pl?op=do_search&zoom=1<!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&amp;reorder=author,1">▲</a>
+
+		<th>Publisher</th>
+		
+		<th>&copy;</th>
+		<th align="left"> <a  href="catalogue-search.pl?op=do_search&zoom=1<!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&amp;reorder=lcsort,2 ">▼</a>LC <a  href="catalogue-search.pl?op=do_search&zoom=1<!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&amp;reorder=lcsort,1">▲</a>
+	<th>Availability</th>
+		<th>&nbsp;</th>
+	</tr>
+
+
+	<!-- Actual Search Results -->
+	    <input type="checkbox" name="bibid" value="0" style="display:none">
+		<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
+			<tr <!-- TMPL_IF name="even" -->bgcolor="#ffffcc"<!-- /TMPL_IF -->>
+				<td>
+					<div align="center">
+							<img src='<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif'
+							     width="16" height="16">
+						</div>
+				</td>
+				<td width="10" align="center" valign="middle">
+					<input type="checkbox" name="bibid" value='<!-- TMPL_VAR NAME="biblionumber" -->'>
+				</td>
+				<td >
+					
+					<a class="transparent" href="/cgi-bin/koha/<!--TMPL_VAR NAME="script"-->?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" -->
+					</a>
+					<br>
+					<span style="font-size:90%">
+                    <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_VAR NAME="subtitle" --><br> <!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="isbn" -->ISBN: <!-- TMPL_VAR NAME="isbn" --> <!-- /TMPL_IF -->
+					</span>
+				</td>
+				<td> <!-- TMPL_IF NAME="author" --> <a class="transparent" href="catalogue-search.pl?op=do_search&zoom=1&kohafield=author&value=<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a><br><!-- /TMPL_IF -->
+				    <span style="font-size:90%">
+					<!-- TMPL_LOOP NAME="additionalauthors" -->
+					    <a class="transparent" href="catalogue-search.pl?op=do_search&zoom=1&kohafield=author&value=<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="value" --></a><br>
+                   				 <!-- /TMPL_LOOP -->
+                    </span>
+				</td>
+                <td ><!-- TMPL_VAR NAME="publishercode" --></a></td>
+				
+				<td align="center" > <!-- TMPL_IF NAME="copyrightdate" --> <!-- TMPL_VAR NAME="copyrightdate" --> <!-- TMPL_ELSE --> - <!-- /TMPL_IF --> </td>
+				<td><!-- TMPL_VAR NAME="classification" --></td>
+				<td align="center">
+                    <!-- TMPL_IF NAME="on-loan-p" --> <!-- TMPL_VAR NAME="on-loan-p" --> - On Loan <br> <!-- /TMPL_IF -->
+					    <!-- TMPL_IF NAME="lost-p" --> <!-- TMPL_VAR NAME="lost-p" --> - Lost <br> <!-- /TMPL_IF -->
+					  <!-- TMPL_IF NAME="withdrawn-p" --> <!-- TMPL_VAR NAME="withdrawn-p" --> -Withdrawn <br> <!-- /TMPL_IF -->
+					  
+					    <!-- TMPL_IF NAME="not-available-p" --> <!-- TMPL_VAR NAME="not-available-p" --> - Not available <br> <!-- /TMPL_IF -->
+							<!-- TMPL_IF name="location-only" -->
+							<!-- TMPL_VAR name="location-only" -->
+						<!-- TMPL_ELSE -->
+							-
+						<!-- /TMPL_IF -->
+				</td>
+				<td align="center">
+					<!-- TMPL_IF NAME="noitems" -->
+								-
+							<!-- TMPL_ELSE -->
+								<!-- TMPL_IF NAME="norequests" -->
+        							 Not reservable
+								<!-- TMPL_ELSE -->
+									<a class="style1"
+									   href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+          								Reserve
+									</a>
+								<!-- /TMPL_IF -->
+							<!-- /TMPL_IF -->
+				</td>
+			</tr>
+		<!-- /TMPL_LOOP -->
+
+
+		
+		</table>
+</form>
+<br>
+<div class="pages">
+    <!-- Row of numbers corresponding to search result pages -->
+
+    <!-- TMPL_LOOP NAME="numbers" -->
+		<!-- TMPL_IF NAME="highlight" -->
+		    <span class="current">
+		    <!-- TMPL_VAR NAME="number" -->
+	        </span>
+		<!-- TMPL_ELSE -->
+		    <span class="pages">
+	        <a class="pages" href="catalogue-search.pl?op=do_search&zoom=1&startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="forminputs" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&amp;pg=<!-- TMPL_VAR NAME="pg" -->&amp;reorder=<!-- TMPL_VAR NAME="reorder" -->"><!-- TMPL_VAR NAME=number --></a>
+	        </span>
+		<!-- /TMPL_IF -->
+    <!-- /TMPL_LOOP -->
+    
+</div>
+<br>
+<div align="center">Results <b><!-- TMPL_VAR NAME="startfrom" --></b> - <b><!-- TMPL_VAR NAME="endat" --></b> of <b><!-- TMPL_VAR NAME="numrecords" --></b> records.</div>
+<!-- TMPL_ELSE -->
+	<div align="center">0 records <br></div>
+<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+<div align="center"><a class="transparent" href="catalogue-search.pl">New search</a></div>
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl
index cbbedca3bf..fdaf06e623 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl
@@ -1,202 +1,103 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalogue MARC detail<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Details for <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
-
 <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-	<h1><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></h1>
-	
-	<div id="catalogue_detail_biblio">
-		<h2>biblio detail</h2>
-		<!-- TMPL_IF name="subtitles" -->
-			<p><label>Subtitle(s):</label>
-			<!-- TMPL_LOOP name="subtitles" -->
-				<!-- TMPL_VAR NAME="subtitle" --> ; 
-			<!-- /TMPL_LOOP -->
-			</p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="author" -->
-			<p><label><b>Author:</b> </label><!-- TMPL_VAR NAME="author" --></p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="additional" -->
-			<p><label><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --></p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="illus" -->
-			<p><label><b>Illus:</b></label><!-- TMPL_VAR name="illus" --></p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="publishercode" -->
-			<p><label><b>Published by :</b></label> <!-- TMPL_VAR NAME="publishercode" --></p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="publicationyear" -->
-			<p><label><b>in </b></label><!-- TMPL_VAR NAME="publicationyear" --></p>
-		<!-- /TMPL_IF -->
-		<p>
-			<label>&nbsp;</label>
-				<!-- TMPL_IF name="pages" --> <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
-				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" -->
-		</p>
-		<!-- TMPL_IF name="isbn" -->
-			<p><label><b>ISBN:</b> </label><!-- TMPL_VAR NAME="isbn" --></p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="issn" -->
-			<p><label><b>ISSN:</b> </label><!-- TMPL_VAR NAME="issn" --></p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="seriestitle" -->
-			<p><label><b>Collection:</b> </label>
-				<!-- TMPL_VAR NAME="seriestitle" --> 
-				<!-- TMPL_IF name="volume" -->vol. <!-- TMPL_VAR name="volume" --> <!-- TMPL_VAR name="volumedate" --><!-- /TMPL_IF -->
-				<!-- TMPL_VAR name="volumedesc" -->
-			</p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="MARCSUBJCTS" -->
-			<p><label><b>Subjects:</b></label></p>
-			<p>
-				<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
-					<label>-</label><a href="/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->">
-						<!-- TMPL_VAR NAME="marcsubjct" -->
-					</a><br>
-				<!-- /TMPL_LOOP -->
-			</p>
-		<!-- TMPL_ELSE -->
-			<!-- TMPL_IF name="subjects" --><p><label><b>Subject(s):</b> </label></p>
-				<!-- TMPL_LOOP name="subjects" -->
-					<p><a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator==&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, </p> <!-- /TMPL_LOOP -->
-			<!-- /TMPL_IF -->
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="copyrightdate" -->
-			<p><label><b>Year :</b> </label><!-- TMPL_VAR NAME="copyrightdate" --></p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="MARCNOTES" -->
-			<p><label><b>Notes:</b> </label></p>
-			<p>
-				<!-- TMPL_LOOP NAME="MARCNOTES" -->
-					<p>- <!-- TMPL_VAR NAME="marcnote" --></p>
-				<!-- /TMPL_LOOP -->
-			</p>
-		<!-- TMPL_ELSE -->
-			<!-- TMPL_IF name="notes" -->
-				<p><label><b>Notes:</b> </label><!-- TMPL_VAR NAME="notes" --></p>
-			<!-- /TMPL_IF -->
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="unititle" -->
-			<p><label><b>Alt title:</b> </label><!-- TMPL_VAR NAME="unititle" --></p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="classification" -->
-			<p><label><b>classification:</b></label><!-- TMPL_VAR name="subclass" --><!-- TMPL_VAR name="classification" --></p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="dewey" -->
-			<p><label><b>Dewey:</b></label><!-- TMPL_VAR name="dewey" --></p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="URLS" -->
-			<p><label><b>URL:</b> </label>
-				<!-- TMPL_LOOP name="URLS" -->
-					<a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a>&nbsp;
-				<!-- /TMPL_LOOP -->
-			</p>
-		<!-- /TMPL_IF -->
-		<p><label><b>Item type : </b></label>
-			<!-- TMPL_IF name="description" -->
-				<!-- TMPL_VAR name="description" -->
-			<!-- TMPL_ELSE -->
-				<!-- TMPL_VAR NAME="itemtype" -->
-			<!-- /TMPL_IF -->
-		</p>
-		<!-- TMPL_IF name="count" -->
-			<p><b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" --></p>
-		<!-- /TMPL_IF -->
-	</div>
+<h3 class="title"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF NAME="author" -->(<!-- TMPL_VAR NAME="author" -->)<!-- /TMPL_IF --></h3>
+
+	<div class="tabitem">
+<form action="MARCdetail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View MARC" /></form>
+<form action="moredetail.pl" method="get"><input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" /><input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->" /><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="View Item Details" /></form> 	
+<form action="/cgi-bin/koha/bookshelves/addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Add to Shelf" onclick="openWindow('/cgi-bin/koha/bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->', 'popped'); return false;" /></form> 
+<form action="detailprint.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Print" onclick="openWindow('detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','printview'); return false;" /></form>
+<!-- TMPL_UNLESS NAME="norequests" --> <form action="/cgi-bin/koha/reserve/request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="biblionumber" /> <input type="submit" value="Reserves" class="submit" /></form><!-- /TMPL_UNLESS -->
+	 </div>
+<!-- TMPL_IF NAME="isbn" --><div >
+<img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01.MZZZZZZZ.jpg" alt="Book Cover Image" />
+</div><!-- /TMPL_IF -->
+<div class="details">
+			
+<ul>
+			<!-- TMPL_IF NAME="subtitle" --><li><b>Subtitle:</b> <!-- TMPL_VAR NAME="subtitle" --></li><!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="author" --><li><b>Author:</b> <a href="catalogue-search.pl?kohafield=author&op=do_search&value=<!--TMPL_VAR NAME="author" ESCAPE=URL>&and_or=@and&order=author,1&zoom=1"><!-- TMPL_VAR NAME="author" --></a></li><!--/TMPL_IF-->
+			<!-- TMPL_IF NAME="additionalauthor" --><li><b>Additional Author:</b> <!-- TMPL_VAR NAME="additionalauthor" --></li><!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="isbn" --><li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="isbn" --></li><!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="classification" --><li><strong>Classification:</strong> <!-- TMPL_VAR NAME="classification" --></li><!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="seriestitle" --><li><b>Series Title:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF --></li><!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="subject" --><li><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --></li><!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="copyrightdate" --><li><b>Copyright:</b> <!-- TMPL_VAR NAME="copyrightdate" --></li><!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="notes" --><li><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --></li><!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="unititle" --><li><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --></li><!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="serial" --><li><b>Serial:</b> <!-- TMPL_VAR NAME="serial" --></li><!-- /TMPL_IF --> 
+			<!-- TMPL_IF name="url" --><li><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!--TMPL_VAR NAME="url" --></a></li><!-- /TMPL_IF -->
+			
 <!-- /TMPL_LOOP -->
-<div id="catalogue_detail_items">
-	<h2>Items</h2>
-	<table>
+			<!-- TMPL_LOOP NAME="MARCSUBJCTS" --><!-- TMPL_IF NAME="MARCSUBJCT" --><li><b>Subjects:</b><!-- TMPL_VAR NAME="MARCSUBJCT" --><!--/TMPL_IF--><!-- /TMPL_LOOP -->
+			<!-- TMPL_LOOP NAME="MARCURLS" --><!-- TMPL_IF NAME="MARCURL" --><li><b>URLs:</b><!-- TMPL_VAR NAME="MARCURL" --><!--/TMPL_IF--><!-- /TMPL_LOOP -->
+			<!-- TMPL_LOOP NAME="MARCNOTES" --><!-- TMPL_IF NAME="MARCNOTE" --><li><b>Abstract:</b><!-- TMPL_VAR NAME="MARCNOTE" --><!--/TMPL_IF--><!-- /TMPL_LOOP -->
+
+			<li><b>Biblio Record</b> <!-- TMPL_VAR NAME="biblionumber" --></li>
+			<li><b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" --></li>
+			</ul>
+
+<br clear="both" /></div><div class="tabitem">
+		<form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit Record" /></form>
+		<form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="op" value="duplicate" /><input type="submit" class="submit" value="Duplicate Record" /></form>
+		<form action="/cgi-bin/koha/cataloguing/additem.pl" method="get" ><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber"-->" /><input type="submit" class="submit" value="Edit Items" /></form>
+		</div>
+
+
+<div class="table"><table>
+	<tr>
+		<th>Item Type</th>
+		<th>LC Classifiction</th>
+		<th>Location</th>
+		<th>Date Due</th>
+		<th>Last Seen</th>
+		<th>Barcode</th>
+		<th>Volume</th>
+	</tr>
+	
+<!-- TMPL_IF NAME="ITEM_RESULTS" -->
+<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
 		<tr>
-			<th>Item type</th>
-			<th>Location</th>
-			<th>Status</th>
-			<th>Date Due</th>
-			<th>Last seen</th>
-			<th>Barcode</th>
-			<th>Volume</th>
+			<td><!-- TMPL_VAR NAME="itemtype" --></td>
+			<td><!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="classification" --><!-- /TMPL_IF --></td>
+			<td><!-- TMPL_VAR NAME="branchname" -->-<!-- TMPL_VAR NAME="shelf" --></td>
+			<td><!-- TMPL_VAR NAME="datedue" --></td>
+			<td><!-- TMPL_VAR NAME="datelastseen" --></td>
+			<td><a href="moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;barcode=<!-- TMPL_VAR NAME="barcode" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
+			 <td><!-- TMPL_IF NAME="volumedesc" --><!-- TMPL_VAR NAME="volumeddesc" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td> 
+		
 		</tr>
-		<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
-			<tr>
-				<td><!-- TMPL_VAR NAME="description" --></td>
-				<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --></td>
-				<td>
-					<!-- TMPL_IF name="datedue" -->
-						On issue to <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a>
-					<!-- TMPL_ELSE -->
-						<!-- TMPL_VAR name="notforloan" -->
-					<!-- /TMPL_IF -->
-				</td>
-				<td><!-- TMPL_VAR NAME="datedue" --></td>
-				<td><!-- TMPL_VAR NAME="datelastseen" --></td>
-				<td><a href="/cgi-bin/koha/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
-				<td><!-- TMPL_VAR NAME="volumeddesc" --></td>
-				<!-- TMPL_IF NAME="type" -->
-					<td>
-						<a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Fix Itemtype</a>
-					</td>
-				<!-- /TMPL_IF -->
-			</tr>
-		<!-- /TMPL_LOOP -->
-	</table>
-</div>
+	<!-- /TMPL_LOOP --><!-- TMPL_ELSE --><tr><td colspan="6">This record has no items.</td></tr><!-- /TMPL_IF -->
+	
+</table></div>
+
+<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+<!-- TMPL_IF NAME="abstract -->
+<table>
+<caption>Abstract</caption>
+<tr>
+<td><!-- TMPL_VAR NAME="abstact" --></td>
+</tr>
+</table>
+<!-- /TMPL_IF -->
+<!-- /TMPL_LOOP -->
 
-<div id="action">
-		<form action="javascript:Addbiblio('')">
-			<input type="submit" value="Edit biblio" />
-		</form>
-		<form action="javascript:Addbiblio('duplicate')">
-			<input type="submit" value="Duplicate" />
-		</form>
-		<form action="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->">
-			<input type="submit" value="Edit item" />
-		</form>
-		<form action="javascript:confirm_deletion()">
-			<input type="submit" value="delete" />
-		</form>
-		<form action="MARCdetail.pl">
-			<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-			<input type="submit" value="Complete" />
-		</form>
-		<form action="#">
-			<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-			<input type="submit" value="Normal" />
-		</form>
-		<form action="ISBDdetail.pl">
-			<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-			<input type="submit" value="ISBD" />
-		</form>
-		<form action="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')">
-			<input type="submit" value="Add to shelf" />
-		</form>
-		<form action="javascript:Dopop('detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')">
-			<input type="submit" value="Print" />
-		</form>
-		<!-- TMPL_IF name="subscriptionsnumber" -->
-		<form action="serials-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-			<input type="submit" value="Subscription(s)" />
-		</form>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="norequests" -->
-		<!-- TMPL_ELSE -->
-			<form action="request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-				<input type="submit" value="Request" />
-			</form>
-		<!-- /TMPL_IF -->
-</div>
+<!-- TMPL_IF NAME="SITE_RESULTS" -->
+<table>
+<caption>Links to Associated Web Sites</caption>
+<!-- TMPL_LOOP NAME="SITE_RESULTS" -->
+<tr>
+<td><b>Title:</b> <!-- TMPL_VAR name="title" --><br>
+<b>Description:</b> <!-- TMPL_VAR name="description" --><br>
+<b>URL:</b><a href="http://<!-- TMPL_VAR name="url" -->">http://<!--TMPL_VAR name="url"></a><br>
+</td>
+</tr>
+<!-- /TMPL_LOOP -->
+</table>
+<!-- /TMPL_IF -->
 
-<script language="javascript" type="text/javascript">
-function Dopop(link) {
-	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
-}
-function confirm_deletion() {
-	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
-	if (is_confirmed) {
-		window.location="acqui.simple/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
-	}
-}
-</script>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/detailprint.tmpl b/koha-tmpl/intranet-tmpl/prog/en/catalogue/detailprint.tmpl
new file mode 100644
index 0000000000..cc73996dea
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/catalogue/detailprint.tmpl
@@ -0,0 +1,43 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Print View for <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_LOOP --><!-- TMPL_INCLUDE NAME="doc-head-close-print.inc" -->
+
+<!-- main site -->
+<div id="main">
+<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+	<table class="list">
+	<caption><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></caption>
+	<tr><th>Biblio Record Number: </th><td> <!-- TMPL_VAR NAME="biblionumber" -->	</td></tr>
+<!-- TMPL_IF NAME="author" --><tr><th>Author: </th><td><!-- TMPL_VAR NAME="author" --></td></tr><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="additional" --><tr><th>Additional Author: </th><td><!-- TMPL_VAR NAME="additional" --></td></tr><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
+<!-- TMPL_IF name="publishercode" --><tr><th>Publisher: </th><td><!-- TMPL_VAR NAME="publishercode" --></td></tr><!-- /TMPL_IF -->
+<tr><th>Publication Details: </th><td>			<!-- TMPL_IF name="publicationyear" --><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
+			<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --></td></tr>
+			<!-- TMPL_IF name="collection" --><tr><th>Collection:</th><td> <!-- TMPL_VAR NAME="seriestitle" --></td></tr><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="subject" --><tr><th>Subject: </th><td><!-- TMPL_VAR NAME="subject" --></td></tr><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="copyrightdate" --><tr><th>Copyright Date: </th><td> <!-- TMPL_VAR NAME="copyrightdate" --></td></tr><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="notes" --><tr><th>Notes: </th><td><!-- TMPL_VAR NAME="notes" --></td></tr><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="unititle" --><tr><th>Unititle: </th><td><!-- TMPL_VAR NAME="unititle" --></td></tr><!-- /TMPL_IF --> 
+			<!-- TMPL_IF name="dewey" --><tr><th>Dewey: </th><td><!-- TMPL_VAR name="dewey" --></td></tr><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="classification" --><tr><th>Classification: </th><td> <!-- TMPL_VAR name="classification" --></td></tr><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="lccn" --><tr><th>LCCN: </th><td><!-- TMPL_VAR name="lccn" --></td></tr><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="url" --><tr><th>URL: </th><td><a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a></td></tr><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="ISBN" --><tr><th>ISBN: </th><td><!-- TMPL_VAR NAME="ISBN" --></td></tr><!-- /TMPL_IF -->
+	</table>
+<!-- /TMPL_LOOP -->
+
+<table>
+	<tr><th>Item Type</th><th>Call Number</th><th>Location</th><th>Date Due</th><th>Last Seen</th><th>Barcode</th></tr>
+	<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
+		<tr>
+			<td><!-- TMPL_VAR NAME="description" --></td>
+			<td><!-- TMPL_VAR NAME="classification" --></td>
+			<td><!-- TMPL_VAR NAME="branchname" --><!-- TMPL_IF NAME="bulk" -->, <!-- TMPL_VAR NAME="bulk" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_VAR NAME="datedue" --></td>
+			<td><!-- TMPL_VAR NAME="datelastseen" --></td>
+			<td><!-- TMPL_VAR NAME="barcode" --></td>
+		</tr>
+	<!-- /TMPL_LOOP -->
+</table>
+
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl
new file mode 100644
index 0000000000..33c9580879
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl
@@ -0,0 +1,87 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Item Details for <!-- TMPL_LOOP NAME="BIBITEM_DATA" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+<div id="main">
+
+<!-- TMPL_LOOP NAME="BIBITEM_DATA" -->
+<!-- TMPL_IF NAME="error" --><div id="error" class="error"><!-- TMPL_VAR NAME="error" -->
+<form class="inline" method="get" action="moredetail.pl">
+<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR name="itemnumber" -->" />
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+<input type="hidden" name="lost" value="<!-- TMPL_VAR name="lost" -->" />
+<input type="hidden" name="withdrawn" value="<!-- TMPL_VAR name="withdrawn" -->" />
+<input type="hidden" name="override" value="yes" />
+<input type="hidden" name="op" value="update" />
+<input type="submit" value="Confirm Change" class="submit" accesskey="y" /></form><form class="inline" method="get" action="moredetail.pl"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="cancel" value="Don't Change" accesskey="n" /></form>
+</div><!--/TMPL_IF-->
+
+<!-- BIBLIO ITEM  -->
+<h1><!-- TMPL_VAR NAME="title" -->
+<!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></h1>
+<div class="tabitem"><form action="/cgi-bin/koha/reserve/request.pl" method="post"><input type="hidden" value="<!-- TMPL_VAR NAME="biblionumber" -->" name="biblionumber" /><input type="submit" class="submit" value="Reserves" /></form> <form action="detail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="Return to Brief Display" /></form><form action="MARCdetail.pl" method="get">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
+<input type="submit" class="submit" value="View MARC" /></form></div>
+<div class="data-main"><table>
+	<caption>Bibliographic Details</caption>
+	<!-- TMPL_IF NAME="biblionumber" --><tr><th>Biblionumber:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="itemtype" --><tr><th>Item Type:</th><td><!-- TMPL_VAR NAME="itemtype" --></td></tr><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="url" --><tr><th>URL:</th><td><!-- <!-- TMPL_VAR NAME="url" --> --></td></tr><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="loanlength" --><tr><th>Loan Length:</th><td><!-- TMPL_VAR NAME="loanlength" --> days</td></tr><!-- /TMPL_IF -->
+	<!-- <tr><th>Rental Charge:</th><td><!-- TMPL_VAR NAME="rentalcharge" --></td></tr> -->
+	<!-- TMPL_IF NAME="dewey" --><tr><th>Classification:</th><td><!-- TMPL_VAR NAME="classification" --><!-- TMPL_VAR NAME="subclass" --></td></tr><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="isbn" --><tr><th>ISBN:</th><td> <!-- TMPL_VAR NAME="isbn" --></td></tr><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="publishercode" --><tr><th>Publisher:</th><td><!-- TMPL_VAR NAME="publishercode" --></td> </tr><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="place" --><tr><th>Place:</th><td><!-- TMPL_VAR NAME="place" --></td></tr><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="publicationyear" --><tr><th>Date:</th><td><!-- TMPL_VAR NAME="publicationyear" --></td></tr><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="volumedesc" --><tr><th>Volume:</th><td><!-- TMPL_VAR NAME="volumeddesc" --></td></tr><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="pages" --><tr><th>Pages:</th><td><!-- TMPL_VAR NAME="pages" --></td></tr><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="illus" --><tr><th>Illus:</th><td><!-- TMPL_VAR NAME="illus" --></td></tr><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="size" --><tr><th>Size:</th><td><!-- TMPL_VAR NAME="size" --></td></tr><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="bnotes" --><tr><th>Notes:</th><td><!-- TMPL_VAR NAME="bnotes" --></td></tr><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="count" --><tr><th>No. of Items:</th><td><!-- TMPL_VAR NAME="count" --></td></tr><!-- /TMPL_IF -->
+</table></div>
+
+
+<!-- /TMPL_LOOP -->
+
+<!-- TMPL_LOOP NAME="ITEM_DATA" -->
+<div class="data">
+<table>
+<caption><a name="<!-- TMPL_VAR NAME="barcode" -->" id="<!-- TMPL_VAR NAME="barcode" -->">Barcode: <!-- TMPL_VAR NAME="barcode" --></a></caption>
+<!-- TMPL_IF NAME="homebranch" --><tr><th>Home Branch:</th><td> <!-- TMPL_VAR NAME="homebranch" --></td></tr><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="holdingbranch" --><tr><th>Current Branch:</th><td> <!-- TMPL_VAR NAME="holdingbranch" --></td></tr><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="datelastseen" --><tr><th>Last seen:</th><td> <!-- TMPL_VAR NAME="datelastseen" --></td></tr><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="issue" --><tr><th>Item Status:</th><td> Due <!-- TMPL_VAR NAME="date_due" --> (Issued to <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a>)</td></tr><!-- TMPL_ELSE --><tr><th>Item Status</th><td>Available</td></tr><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="datelastborrowed" --><tr><th>Last borrowed:</th><td> <!-- TMPL_VAR NAME="datelastborrowed" --></td></tr><!-- /TMPL_IF -->
+<!-- on issue bit -->
+<!-- TMPL_IF NAME="card0" --><tr><th>Last Borrower 1:</th><td> <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="card0" -->"><!-- TMPL_VAR NAME="card0" --></a></td></tr><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="card1" --><tr><th>Last Borrower 2:</th><td> <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="card1" -->"><!-- TMPL_VAR NAME="card1" --></a></td></tr><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="replacementprice" --><tr><th>Replacement Price:</th><td> $<!-- TMPL_VAR NAME="replacementprice" --></td></tr><!-- /TMPL_IF -->
+<tr><th>Lost Status:</th><td><!-- TMPL_IF NAME="itemlost" -->Lost<!-- TMPL_ELSE -->Not Lost<!-- /TMPL_IF -->
+<form class="inline" action="moredetail.pl" method="post"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
+<input type="hidden" name="op" value="update">
+<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
+<!-- TMPL_IF NAME="itemlost" --><input type="hidden" value="0" name="lost" /><!-- TMPL_ELSE --><input type="hidden" value="1" name="lost" /><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="wthdrawn" --><input type="hidden" name="withdrawn" value="1" /><!-- TMPL_ELSE --><input type="hidden" name="withdrawn" value="0" /><!-- /TMPL_IF -->
+<input type="submit" name="submit" class="submit" value="<!-- TMPL_IF NAME="itemlost" -->Make Found<!-- TMPL_ELSE -->Make Lost<!-- /TMPL_IF -->" /></form></td></tr>
+<tr><th>Withdrawn: </th><td><!-- TMPL_IF NAME="wthdrawn" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --> 
+<form class="inline" action="moredetail.pl" method="post"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
+<input type="hidden" name="op" value="update">
+<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
+<!-- TMPL_IF NAME="itemlost" --><input type="hidden" value="1" name="lost" /><!-- TMPL_ELSE --><input type="hidden" value="0" name="lost" /><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="wthdrawn" --><input type="hidden" name="withdrawn" value="0" /><!-- TMPL_ELSE --><input type="hidden" name="withdrawn" value="1" /><!-- /TMPL_IF -->
+
+<input type="submit" name="submit" class="submit" value="<!-- TMPL_IF NAME="wthdrawn" -->Restore<!-- TMPL_ELSE -->Make Withdrawn<!-- /TMPL_IF -->" /></form></td></tr>
+<!-- TMPL_IF NAME="paidfor" --><tr><th>Paid for:</th><td> <!-- TMPL_VAR NAME="paidfor" --></td></tr><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="itemnotes" --><tr><th>Notes:</th><td> <!-- TMPL_VAR NAME="itemnotes" --></td></tr><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="renewals" --><tr><th>Renewals:</th><td> <!-- TMPL_VAR NAME="renewals" --></td></tr><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="dateaccessioned" --><tr><th>Accession Date:</th><td><!-- TMPL_VAR NAME="dateaccessioned" --> (<a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&amp;catview=yes">View Receipt Summary</a>)</td></tr><!-- /TMPL_IF -->
+
+<tr><th>Total Issues:</th><td><!-- TMPL_VAR NAME="issues" --> (<a href="bookcount.pl?&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">View Circulation History</a>)</td></tr>
+</table></div>
+
+<!-- /TMPL_LOOP -->
+
+
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl
index ffe3529f7d..25140d76e2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl
@@ -1,19 +1,18 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Circulation: Transfers<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation: Transfers<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
-
-
 <h1>Circulation: Transfers</h1>
 
 <!-- TMPL_IF Name="found" -->
-	<h3>Reserve Found</h3>
+	<h3 class="alert">Reserve Found</h3>
 		
+	<div class="form">
 		<table>
 		<caption><!-- TMPL_IF Name="reserved" -->Reserve found for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
 		<!-- TMPL_IF Name="waiting" -->
     Item is marked waiting at <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF --></caption>
 		<tr><th>
-			<!-- TMPL_IF Name="reserved" -->Set reserve to waiting and transfer book to <!-- TMPL_VAR Name="branchname" -->: <!-- /TMPL_IF -->
+			<!-- TMPL_IF Name="reserved" -->Set reserve to waiting and transfer book to <b><!-- TMPL_VAR Name="branchname" --> </b>: <!-- /TMPL_IF -->
 			<!-- TMPL_IF Name="waiting" -->Cancel reservation and then attempt transfer: <!-- /TMPL_IF -->
 		</th>
 		<td>
@@ -27,10 +26,10 @@
 				<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="bornum" -->" />
 				<!-- TMPL_IF Name="waiting" --><input type="hidden" name="barcode" value="<!-- TMPL_VAR Name="barcode" -->" />
 					<input type="hidden" name="request" value="KillWaiting" />
-					<input type="submit" value="Cancel" />
+					<input type="submit" value="Cancel" class="cancel" />
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF Name="reserved" --><input type="hidden" name="request" value="SetWaiting" />
-					<input type="submit" value="Waiting" /><!-- /TMPL_IF -->
+					<input type="submit" value="Waiting" class="submit" /><!-- /TMPL_IF -->
 			</form>
 		</td></tr>
 		<!-- TMPL_IF Name="reserved" --><tr><th>Cancel reservation and then attempt transfer:</th>
@@ -47,8 +46,9 @@
 			<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="bornum" -->" />
 			<input type="hidden" name="tobranchcd" value="<!-- TMPL_VAR Name="tobranchcd" -->" />
 			<input type="hidden" name="barcode" value=<!-- TMPL_VAR Name="barcode" --> />
+			<input type="hidden" name="loggedinuser" value=<!-- TMPL_VAR Name="loggedinusername" --> />
 			<input type="hidden" name="request" value="KillReserved" />
-			<input type="submit" value="Cancel" />
+			<input type="submit" class="cancel" value="Cancel" />
 			</form>
 		<!-- /TMPL_IF -->
 		</td></tr>
@@ -62,13 +62,13 @@
 				<input type="hidden" name="fb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="frombrcd" -->" />
 				<input type="hidden" name="tb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="tobrcd" -->" />
 			<!-- /TMPL_LOOP -->
-			<input type="submit" value="Ignore" />
+			<input type="submit" value="Ignore" class="submit" />
 			</form>
 			</td>
-		</tr></table>
+		</tr></table></div>
 
 <!-- TMPL_ELSE -->
-	<table>
+	<div class="table"><table>
 	<caption>Messages</caption>
 	<tr><td>
 	<!-- TMPL_IF Name="reqmessage" -->
@@ -80,6 +80,7 @@
 		<!-- /TMPL_IF -->
 	<!-- /TMPL_IF -->
 	<!-- TMPL_LOOP Name="errmsgloop" -->
+		<font color='red' size='+2'>
 		<!-- TMPL_IF Name="errbadcode" -->
 			No Item with barcode: <!-- TMPL_VAR Name="msg" -->
 		<!-- /TMPL_IF -->
@@ -93,19 +94,19 @@
 			Item was on loan to <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>
 <!-- TMPL_VAR Name="name" --> and has been returned.
 		<!-- /TMPL_IF -->
-
+		</font>
+		<br />
 	<!-- /TMPL_LOOP -->
-	</td></tr></table>
-	
+	</td></tr></table></div>
 	<form method="post" name="mainform" id="mainform" action="/cgi-bin/koha/circ/branchtransfers.pl">
-	<table>
-	<caption>Transfer</caption>
-	<tr><th scope="row">Destination Branch:</th><td><select name="tobranchcd">
+	<h3>Transfer</h3><div class="form">
+	<input type="hidden" name="loggedinuser" value=<!-- TMPL_VAR Name="loggedinusername" --> />
+	<table><tr><th>Destination Branch:</th><td><select name="tobranchcd">
 			<!-- TMPL_LOOP Name="branchoptionloop" -->
 				<option value="<!-- TMPL_VAR Name="code" -->" <!-- TMPL_VAR Name="selected" -->><!-- TMPL_VAR Name="name" --></option>
 			<!-- /TMPL_LOOP -->
 		</select></td></tr>
-<tr><th scope="row">Enter Book Barcode</th><td><input name="barcode" size="15" /></td></tr>
+<tr><th>Enter Book Barcode</th><td><input name="barcode" size="15" /></td></tr>
 </table>
 	<input type="hidden" name="tobranchcd" value="<!-- TMPL_VAR Name="tobrancd" -->" />
 	<!-- TMPL_LOOP Name="trsfitemloop" -->
@@ -113,25 +114,25 @@
 		<input type="hidden" name="fb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="frombrcd" -->" />
 		<input type="hidden" name="tb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="tobrcd" -->" />
 	<!-- /TMPL_LOOP -->
-	<input type="submit" value="Transfer" />
-	</form>
-	
-	<!-- TMPL_IF Name="transferred" -->
-		<table>
+	<input type="submit" class="submit" value="Transfer" />
+
+	<div class="form"><table>
 		<caption>Transfered Items</caption>
-		<tr><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr>
+		<tr><th >Bar Code</th><th>Title</th><th>From</th><th>To</th></tr>
 		<!-- TMPL_LOOP Name="trsfitemloop" -->
-			<tr><td>
-			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR Name="barcode" --></a></td>
-			<td><!-- TMPL_VAR Name="title" --></td>
-			<td><!-- TMPL_VAR Name="author" --></td>
-			<td><!-- TMPL_VAR Name="itemtype" --></td>
-			<td><!-- TMPL_VAR Name="frbrname" --></td>
-			<td><!-- TMPL_VAR Name="tobrname" --></td>
+			<tr><td align="left" width="20">
+			<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR Name="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR Name="barcode" --></a></td>
+			<td align="center"  width="200"><!-- TMPL_VAR Name="title" --></td>
+			
+		
+			<td align="left"  width="100"><!-- TMPL_VAR Name="frbrname" --></td>
+			<td align="left"  width="100"><!-- TMPL_VAR Name="tobrname" --></td>
 			</tr>
 		<!-- /TMPL_LOOP -->
-		</table>
-	<!-- /TMPL_IF -->
+		</table></div>
+	</div>
+	</form>
+		
 <!-- /TMPL_IF -->
 
 <!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl
index ad06472551..95e2f92e68 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl
@@ -1,803 +1,283 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation
-<!-- TMPL_IF Name="borrowernumber" -->
-: Issuing to <!-- TMPL_VAR name="surname" -->, <!-- TMPL_VAR name="firstname" -->
-(<!-- TMPL_VAR NAME="cardnumber" -->)
-<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation<!-- TMPL_IF Name="borrowernumber" -->: Issuing to <!-- TMPL_VAR name="surname" -->, <!-- TMPL_VAR name="firstname" -->  (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
+<h1>Circulation: Issues  <!-- TMPL_VAR NAME="today" --></h1></div>
 
 
-<h1>Circulation: Issues</h1>
-
-<!--  INITIAL BLOC : PARAMETERS & BORROWER INFO --> 	
-<h5>Circulation Parameters</h5>
-<ul>
-  <li>Branch: <!-- TMPL_VAR NAME="branchname" --></li>
-  <li>Printer: <!-- TMPL_VAR NAME="printername" --></li> 
-  <li><a href="selectbranchprinter.pl">Change Settings</a></li>
-</ul>
 	
-<!-- RESULT OF ISSUING REQUEST -->
-
-<!-- TMPL_IF NAME="IMPOSSIBLE" -->
-<fieldset id="circ_circulation_impossible">
-  <legend>Error Issuing Item</legend>
-
-  <ul>
-  <!-- TMPL_IF NAME="INVALID_DATE" -->
-    <li>The due date is invalid</li>
-  <!-- /TMPL_IF -->
-  
-  <!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
-    <li>The barcode was not found</li>
-  <!-- /TMPL_IF -->
-  
-  <!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
-    <li>Item not for loan</li>
-  <!-- /TMPL_IF -->
-  
-  <!-- TMPL_IF NAME="WTHDRAWN" -->
-    <li>Item is cancelled</li>
-  <!-- /TMPL_IF -->
-  
-  <!-- TMPL_IF NAME="GNA" -->
-    <li>Patron's address is in doubt</li>
-  <!-- /TMPL_IF -->
-  
-  <!-- TMPL_IF NAME="CARD_LOST" -->
-    <li>Patron's card is lost</li>
-  <!-- /TMPL_IF -->
-  
-  <!-- TMPL_IF NAME="DEBARRED" -->
-    <li>Patron is debarred</li>
-  <!-- /TMPL_IF -->
-  
-  <!-- TMPL_IF NAME="NO_MORE_RENEWALS" -->
-    <li>No more renewals possible</li>
-  <!-- /TMPL_IF -->
-  
-  <!-- TMPL_IF NAME="EXPIRED" -->
-    <li>Patron's card is expired</li>
-  <!-- /TMPL_IF -->
-  </ul>
-</fieldset>
-<!-- /TMPL_IF --> <!-- IMPOSSIBLE -->
-  
-<!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->
-<fieldset id="circ_circulation_needsconfirmation">
-  <legend>Please Confirm Issue</legend>
-
-  <ul>
-  <!-- TMPL_IF NAME="DEBT" -->
-    <li>The patron has a debt of $<!-- TMPL_VAR name="DEBT" --></li>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="RENEW_ISSUE" -->
-    <li>Item is currently issued to this patron.  Renew?</li>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="RESERVE_WAITING" -->
-    <li>Item is consigned for <!-- TMPL_VAR NAME="RESERVE_WAITING" --></li>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="RESERVED" -->
-    <li>Item is on reserve for <!-- TMPL_VAR NAME="RESERVED" --></li>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
-    <li>Item issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return and issue?</li>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="TOO_MANY" -->
-    <li>Too many issues (already issued / max : <!-- TMPL_VAR name="TOO_MANY" -->)</li>
-  <!-- /TMPL_IF -->
-  </ul>
-
-  <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
-    
-  <!-- TMPL_IF NAME="RESERVED" -->
-    <p>
-      <input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" />
-      <label for="cancelreserve">Cancel Reserve</label>
-    </p>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="RESERVE_WAITING" -->
-    <p>
-      <input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" />
-      <label for="cancelreserve">Cancel Reserve</label>
-    </p>
-  <!-- /TMPL_IF -->
-
-    <input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
-    <input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
-    <input type="hidden" name="issueconfirmed" value="1" />
-    <input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->" />
-    <input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->" />
-    <input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->" />
-
-    <div id="action">
-      <input type="submit" value="Confirm Issue (Y)" accesskey="y" />
-    </div>
-
-  </form>
-
-  <form method="get" action="/cgi-bin/koha/circ/circulation.pl">
-    <input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
-
-    <div id="action">
-      <input type="submit" value="Don't Issue (N)" accesskey="n" />
-    </div>
-  </form>
-  
-</fieldset>
-
-<!-- /TMPL_IF --> <!-- NEEDSCONFIRMATION -->
-
-<!-- TMPL_IF NAME="issued" -->
-<p>Item issued</p>
+<!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
+	
+	
+	<!-- RESULT OF ISSUING REQUEST -->
+	
+		<!-- TMPL_IF NAME="IMPOSSIBLE" -->
+		<div class="error">
+		<h3>Error Issuing:</h3>
+			<ul>
+			<!-- TMPL_IF NAME="INVALID_DATE" -->
+				<li>Invalid date</li>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="TOO_EARLY" -->
+				
+				<li>Too early to renew. <!-- TMPL_VAR NAME="barcode" --> </li>				
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
+				
+				<li>Barcode Unkown</li>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
+				
+				<li>NOT FOR LOAN</li>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="WTHDRAWN" -->
+				<li>Item is cancelled</li>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="GNA" -->
+				<li>Patron's address is in doubt</li>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="CARD_LOST" -->
+				<li>Patron's card is lost</li>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="DEBARRED" -->
+				<li>Patron is debarred</li>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="NO_MORE_RENEWALS" -->
+				<li>No more renewals possible</li>
+			<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="EXPIRED" -->
+				<li>Borrower card expired</li>
+			<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="IN_RESERVE" -->
+				<li>This is a Reserve Section book. Use Reserve issue</li>
+			<!-- /TMPL_IF -->
+			</ul>
+		</div>
+		<!-- TMPL_ELSE -->
+		
+		<!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->
+		
+		<div class="error">
+		<h3>Please Confirm Issue:</h3>
+		
+			<!-- TMPL_IF NAME="DEBT" -->
+				<p>The patron has a debt of <!-- TMPL_VAR name="DEBT" --> YTL</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="RENEW_ISSUE" -->
+				<p>You are trying RE-ISSUE.  USE RENEW</p>
+			<!-- /TMPL_IF -->	
+			<!-- TMPL_IF NAME="SUCCESFUL_RENEW" -->
+				<p>Succesfully renewd items</p>
+			<!-- /TMPL_IF -->	
+			<!-- TMPL_IF NAME="RESERVE_WAITING" -->
+				<p>Item is consigned for <!-- TMPL_VAR NAME="RESERVE_WAITING" --></p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="RESERVED" -->
+				<p>Item is on reserve for <!-- TMPL_VAR NAME="RESERVED" --></p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
+				<p>Item issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return and issue?</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="TOO_MANY" -->
+				<p>Too many issues (already issued / max : <!-- TMPL_VAR name="TOO_MANY" -->)</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
+			<div class="action"><form class="inline" method="post" action="/cgi-bin/koha/circ/circulation.pl">
+				<!-- TMPL_IF NAME="RESERVED" -->
+					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
+				<!-- /TMPL_IF -->
+				
+			
+				
+				<!-- TMPL_IF NAME="RESERVE_WAITING" -->
+					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
+				<!-- /TMPL_IF -->
+				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
+				
+		
+				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+				<input type="hidden" name="issueconfirmed" value="1" />
+				<input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->" />
+				<input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->" />
+				<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->" />
+			 	<!-- TMPL_UNLESS name="RENEW_ISSUE" --><input type="submit" value="Confirm Issue" class="submit" accesskey="y" /></form><form class="inline" method="get" action="/cgi-bin/koha/circ/circulation.pl"><input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="submit" class="cancel" value="Don't Issue" accesskey="n" /><!--/TMPL_UNLESS--></form></div>
+			</div>
+			<!-- /TMPL_UNLESS -->
+		<!-- /TMPL_IF -->
+		<!-- /TMPL_IF -->
+		
+		<!-- TMPL_IF NAME="issued" -->
+			<div class="error"><p>Item issued</p></div>
+		<!-- /TMPL_IF -->
+	
+	<div class="details">
+	<!-- TMPL_IF NAME="message" -->
+	<div class="details">
+	No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> <a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add">Add a new patron</a>
+	</div>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="CGIselectborrower" -->
+	<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform">
+		<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
+		<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
+	<label for="borrnumber">Select a borrower: </label>
+		<style type="text/css">
+		option:hover {
+			background-color : #f0f0f0;
+			color : #000099;
+		}
+	</style>
+	<p><!-- TMPL_VAR name="CGIselectborrower" --></p>
+	<p><input type="submit" class="submit" value="Select" /></p>
+	<p>Patron not found? <a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add">Add a new patron</a></p>
+	</form>
+	<!-- TMPL_ELSE -->
+		<!-- TMPL_IF NAME="borrowernumber" -->
+	<div id="notes">                                							
+	<ul>
+	<li><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="city" --></li>
+	<!-- TMPL_IF NAME="phone" --><li><!-- TMPL_VAR NAME="phone" --></li><!--/TMPL_IF-->
+	<!-- TMPL_IF NAME="emailaddress" --><li><a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a></li><!-- /TMPL_IF -->
+	<li>Category: <!-- TMPL_VAR name="categorycode" --></li>
+	<li>(<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">details</a> / <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;modify=edit&amp;destination=circ">edit</a>)</li>
+	</ul>
+	</div><table width= "70%"><tr><td>
+
+	<h3><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h3>
+	<h4> &nbsp; &nbsp; <!-- TMPL_VAR NAME="issuecount" --> out<!-- TMPL_IF NAME="overduecount" -->, <span class="error"><!-- TMPL_VAR name="overduecount" --> overdue</span><!-- /TMPL_IF --></h4><br clear="right" />
+	</td><td><img src="<!-- TMPL_VAR NAME="borrowerphoto" -->" alt="Photo" hspace="0" vspace="0" border="0" width="100px" heigth="100px" style="clear:both;float:right;position:relative;">
+	</td></tr></table>
+									
+						
+
+
+<!-- TMPL_IF NAME="flagged" -->
+</div><div class="details">
+<ul>
+<!-- TMPL_IF NAME="gna" -->
+<li><span class="error">Address:</span> Patron's address in doubt</li>
 <!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="message" -->
-<p>
-  No patron matched <!-- TMPL_VAR name="message" -->
-  <a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add">Add a new patron</a>
-</p>
+<!-- TMPL_IF NAME="lost" -->
+<li><span class="error">Lost:</span> Patron's card is lost</li>
 <!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="dbarred" -->
+<li><span class="error">Debarred:</span> Patron is debarred <form class="inline compact" action="/cgi-bin/koha/members/setdebar.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" value="circ" name="destination" /><input type="hidden" name="status" value="0" /><input type="submit" class="submit" value="Lift Debarment" /></form></li>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF name="odues" -->	<li><!-- TMPL_IF name="nonreturns" -->
+					<span class="error">Overdues:</span> Patron has <span class="error">ITEMS OVERDUE</span> See highlighted items <a href="#previous">below</a>
+				<!-- /TMPL_IF --></li><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="noissues" -->
+<!-- TMPL_IF NAME="charges" --><li><span class="error">Fines:</span> Patron has <a href="/cgi-bin/koha/members/boraccount.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">outstanding fines</a>. Make <a href="/cgi-bin/koha/members/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a></li><!-- /TMPL_IF -->
+<!-- TMPL_ELSE -->
+	<!-- TMPL_IF name="charges" --><li>Fines: Patron has <a href="/cgi-bin/koha/members/boraccount.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">outstanding fines</a>. Make <a href="/cgi-bin/koha/members/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a></li><!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+</ul>
 
-<!-- TMPL_IF NAME="CGIselectborrower" -->
-<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform">
-  <fieldset id="circ_circulation_selectborrower">
-    <legend>Borrower selection</legend>
-  
-    <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
-    <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
-  
-    <p>
-      <label for="borrnumber">Select a borrower: </label>
-      <!-- TMPL_VAR name="CGIselectborrower" -->
-    </p>
-
-    <p><input type="submit" value="Select" /></p>
-
-    <p>
-      Patron not found?
-      <a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add">Add a new patron</a>
-    </p>
-  </fieldset>
-</form>
-<!-- TMPL_ELSE --> <!-- CGIselectborrower -->
-
-  <!-- TMPL_IF NAME="borrowernumber" -->
-<fieldset id="circ_circulation_borrower_informations">
-  <legend>Borrower informations</legend>
-
-  <h3><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h3>
-
-  <h4>
-    &nbsp; &nbsp; <!-- TMPL_VAR NAME="issuecount" --> out
-    <!-- TMPL_IF NAME="overduecount" -->
-    , <!-- TMPL_VAR name="overduecount" --> overdue
-    <!-- /TMPL_IF -->
-  </h4>
-
-  <ul>
-    <li><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="city" --></li>
-    <li><!-- TMPL_VAR NAME="phone" --></li>
-  
-    <!-- TMPL_IF NAME="emailaddress" -->
-    <li>
-      <a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a>
-    </li>
-    <!-- /TMPL_IF -->
-  
-    <li>Category: <!-- TMPL_VAR name="categorycode" --></li>
-    <li>
-      (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">details</a>
-        / <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;modify=edit&amp;destination=circ">edit</a>)
-    </li>
-  </ul>
-    <!-- TMPL_IF NAME="flagged" -->
-
-  <ul>
-      <!-- TMPL_IF NAME="gna" -->
-    <li>Address: Patron's address in doubt</li>
-      <!-- /TMPL_IF -->
-
-      <!-- TMPL_IF NAME="lost" -->
-    <li>Lost: Patron's card is lost</li>
-      <!-- /TMPL_IF -->
-
-      <!-- TMPL_IF NAME="dbarred" -->
-    <li>
-      Debarred: Patron is debarred
-      <form class="inline compact" action="/cgi-bin/koha/members/setdebar.pl" method="post">
-        <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
-        <input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
-        <input type="hidden" value="circ" name="destination" />
-        <input type="hidden" name="status" value="0" />
-
-        <div id="action">
-          <input type="submit" value="Lift Debarment" />
-        </div>
-      </form>
-    </li>
-      <!-- /TMPL_IF -->
-  
-      <!-- TMPL_IF name="odues" -->
-    <li>
-        <!-- TMPL_IF name="nonreturns" -->
-      Overdues: Patron has ITEMS OVERDUE See highlighted items <a href="#previous">below</a>
-        <!-- /TMPL_IF -->
-    </li>
-      <!-- /TMPL_IF --> <!-- odues -->
-  
-      <!-- TMPL_IF NAME="charges" -->
-    <li>
-      Fines: Patron has 
-      <a href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">outstanding fines</a>.
-      Make <a href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a>
-    </li>
-      <!-- /TMPL_IF -->
-  </ul>
-<!-- this part must be removed if we keep the new waiting infos display-->
-      <!-- TMPL_IF name="waiting" -->
-  <ul>
-    <li>
-      Reserves waiting:
-      <ul>
-        <!-- TMPL_LOOP name="itemswaiting" -->
-        <li>
-          <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR name="title" --></a>
-          (<!-- TMPL_VAR name="barcode" --> -- <!-- TMPL_VAR name="branchname" -->)
-        </li>
-        <!-- /TMPL_LOOP --> <!-- itemswaiting -->
-      </ul>
-    </li>
-  </ul>
-      <!-- /TMPL_IF --> <!-- waiting -->
-<!-- end of this part must be removed if we keep the new waiting infos display-->
-
-      <!-- TMPL_IF name="notes" -->
-  <ul>
-    <li>Notes: <!-- TMPL_VAR name="notesmsg" --></li>
-  </ul>
-      <!-- /TMPL_IF --> <!-- notes -->
-
-    <!-- /TMPL_IF --> <!-- flagged -->
-</fieldset>
-  <!-- TMPL_ELSE --> <!-- borrowernumber -->
-
-<!-- No card entered yet -->
-<form method="post" action="/cgi-bin/koha/circ/circulation.pl" name="mainform" id="mainform">
-  <fieldset id="circ_circulation_borrower_search">
-    <legend>Search a borrower</legend>
-  
-    <p>
-      <label for="findborrower">Enter borrower card number or partial last name: </label>
-      <input name="findborrower" type="text" size="40" />
-    </p>
-
-    <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
-    <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
-    <input type="submit" value="Submit" />
-  </fieldset>
-</form>
-  <!-- /TMPL_IF --> <!-- borrowernumber -->
-<!-- /TMPL_IF --> <!-- CGIselectborrower -->
+<dl>
+		
+<!-- TMPL_IF name="waiting" -->
+		<dt>Reserves waiting:</dt>
+			<dd><ul><!-- TMPL_LOOP name="itemswaiting" -->
+				<li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR name="title" --></a> (<!-- TMPL_VAR name="barcode" --> -- <!-- TMPL_VAR name="branchname" -->)</li>
+			<!-- /TMPL_LOOP -->
+			</ul></dd>
+		<!-- /TMPL_IF -->
+
+		<!-- TMPL_IF name="notes" -->
+					<dt>Notes:</dt> <dd class="error"><!-- TMPL_VAR name="notesmsg" --></dd>
+				<!-- /TMPL_IF -->
+</dl>
+<!-- /TMPL_IF -->
+	<!-- TMPL_ELSE -->
+	<!-- No card entered yet -->
+	<form method="post" action="/cgi-bin/koha/circ/circulation.pl" name="mainform" id="mainform">
+<label for="findborrower">Enter borrower card number or partial last name: </label>
+				<input name="findborrower" type="text" size="40" />
+					<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
+					<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
+				<input type="submit" class="submit" value="Submit" />
+				</form>
+		<!-- /TMPL_IF -->
+	<!-- /TMPL_IF -->
+	</div>
 
 <!-- BARCODE ENTRY -->
 
 <!-- TMPL_IF NAME="borrowernumber" -->
-<form method="post" action="/cgi-bin/koha/circ/circulation.pl" name="mainform">
-  <fieldset id="circ_circulation_issue">
-    <legend>Issue an item</legend>
-
-    <table>
-      <tr>
-        <th><label for="barcode">Enter Item Barcode: </label></th>
-        <td><input name="barcode" size="14" /></td>
-	<!-- TMPL_IF NAME="memberofinstution" -->
-	<td><!-- TMPL_VAR NAME="CGIorganisations" --></td>
-	<!-- /TMPL_IF -->
-      </tr>
-
-      <tr>
-        <th><label for="day">Specify Due Date: </label></th>
-        <td>
-          <select name="day" id="day">
-            <option value="0">Day</option>
-  <!-- TMPL_IF NAME="day1" -->
-            <option value="1" selected="selected">1</option>
-  <!-- TMPL_ELSE -->
-            <option value="1">1</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day2" -->
-            <option value="2" selected="selected">2</option>
-  <!-- TMPL_ELSE -->
-            <option value="2">2</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day3" -->
-            <option value="3" selected="selected">3</option>
-  <!-- TMPL_ELSE -->
-            <option value="3">3</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day4" -->
-            <option value="4" selected="selected">4</option>
-  <!-- TMPL_ELSE -->
-            <option value="4">4</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day5" -->
-            <option value="5" selected="selected">5</option>
-  <!-- TMPL_ELSE -->
-            <option value="5">5</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day6" -->
-            <option value="6" selected="selected">6</option>
-  <!-- TMPL_ELSE -->
-            <option value="6">6</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day7" -->
-            <option value="7" selected="selected">7</option>
-  <!-- TMPL_ELSE -->
-            <option value="7">7</option>
-  <!-- /TMPL_IF -->
+	<div class="details">
+	<form method="post" action="/cgi-bin/koha/circ/circulation.pl" name="mainform">
+<label for="barcode">Enter Item Barcode: </label><input name="barcode" size="14" maxlength="14"class="unfocus" onfocus="this.className='focus'" onblur="this.className='unfocus'" /> <input type="submit" value="Issue" class="submit" /><!-- Display for NPL <input type="hidden" name="day" value="0" /><input type="hidden" name="month" value="0" /><input type="hidden" name="year" value="0" /> /Display for NPL -->
+	<p><input type="hidden" name="day" value="0" /><input type="hidden" name="month" value="0" /><input type="hidden" name="year" value="0" />
+	<!--/TMPL_IF-->		
+		<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+		<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
+		<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
+		<input type="hidden" name="print" value="maybe" />
+		<!-- TMPL_IF NAME="CHARGES" -->
+			<input type="hidden" name="charges" value="yes" />
+			<input type="hidden" name="oldamount" value="<!-- TMPL_VAR NAME="amountold" -->" />
+		<!-- /TMPL_IF -->
+		</p>
+	</form>
+	</div>
 
-  <!-- TMPL_IF NAME="day8" -->
-            <option value="8" selected="selected">8</option>
-  <!-- TMPL_ELSE -->
-            <option value="8">8</option>
-  <!-- /TMPL_IF -->
 
-  <!-- TMPL_IF NAME="day9" -->
-            <option value="9" selected="selected">9</option>
-  <!-- TMPL_ELSE -->
-            <option value="9">9</option>
-  <!-- /TMPL_IF -->
 
-  <!-- TMPL_IF NAME="day10" -->
-            <option value="10" selected="selected">10</option>
-  <!-- TMPL_ELSE -->
-            <option value="10">10</option>
-  <!-- /TMPL_IF -->
 
-  <!-- TMPL_IF NAME="day11" -->
-            <option value="11" selected="selected">11</option>
-  <!-- TMPL_ELSE -->
-            <option value="11">11</option>
-  <!-- /TMPL_IF -->
 
-  <!-- TMPL_IF NAME="day12" -->
-            <option value="12" selected="selected">12</option>
-  <!-- TMPL_ELSE -->
-            <option value="12">12</option>
-  <!-- /TMPL_IF -->
 
-  <!-- TMPL_IF NAME="day13" -->
-            <option value="13" selected="selected">13</option>
-  <!-- TMPL_ELSE -->
-            <option value="13">13</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day14" -->
-            <option value="14" selected="selected">14</option>
-  <!-- TMPL_ELSE -->
-            <option value="14">14</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day15" -->
-            <option value="15" selected="selected">15</option>
-  <!-- TMPL_ELSE -->
-            <option value="15">15</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day16" -->
-            <option value="16" selected="selected">16</option>
-  <!-- TMPL_ELSE -->
-            <option value="16">16</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day17" -->
-            <option value="17" selected="selected">17</option>
-  <!-- TMPL_ELSE -->
-            <option value="17">17</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day18" -->
-            <option value="18" selected="selected">18</option>
-  <!-- TMPL_ELSE -->
-            <option value="18">18</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day19" -->
-            <option value="19" selected="selected">19</option>
-  <!-- TMPL_ELSE -->
-            <option value="19">19</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day20" -->
-            <option value="20" selected="selected">20</option>
-  <!-- TMPL_ELSE -->
-            <option value="20">20</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day21" -->
-            <option value="21" selected="selected">21</option>
-  <!-- TMPL_ELSE -->
-            <option value="21">21</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day22" -->
-            <option value="22" selected="selected">22</option>
-  <!-- TMPL_ELSE -->
-            <option value="22">22</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day23" -->
-            <option value="23" selected="selected">23</option>
-  <!-- TMPL_ELSE -->
-            <option value="23">23</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day24" -->
-            <option value="24" selected="selected">24</option>
-  <!-- TMPL_ELSE -->
-            <option value="24">24</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day25" -->
-            <option value="25" selected="selected">25</option>
-  <!-- TMPL_ELSE -->
-            <option value="25">25</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day26" -->
-            <option value="26" selected="selected">26</option>
-  <!-- TMPL_ELSE -->
-            <option value="26">26</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day27" -->
-            <option value="27" selected="selected">27</option>
-  <!-- TMPL_ELSE -->
-            <option value="27">27</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day28" -->
-            <option value="28" selected="selected">28</option>
-  <!-- TMPL_ELSE -->
-            <option value="28">28</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day29" -->
-            <option value="29" selected="selected">29</option>
-  <!-- TMPL_ELSE -->
-            <option value="29">29</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day30" -->
-            <option value="30" selected="selected">30</option>
-  <!-- TMPL_ELSE -->
-            <option value="30">30</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="day31" -->
-            <option value="31" selected="selected">31</option>
-  <!-- TMPL_ELSE -->
-            <option value="31">31</option>
-  <!-- /TMPL_IF -->
-          </select>
-          <select name="month">
-            <option value="0">Month</option>
-  <!-- TMPL_IF NAME="month1" -->
-            <option value="1" selected="selected">Jan</option>
-  <!-- TMPL_ELSE -->
-            <option value="1">Jan</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="month2" -->
-            <option value="2" selected="selected">Feb</option>
-  <!-- TMPL_ELSE -->
-            <option value="2">Feb</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="month3" -->
-            <option value="3" selected="selected">Mar</option>
-  <!-- TMPL_ELSE -->
-            <option value="3">Mar</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="month4" -->
-            <option value="4" selected="selected">Apr</option>
-  <!-- TMPL_ELSE -->
-            <option value="4">Apr</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="month5" -->
-            <option value="5" selected="selected">May</option>
-  <!-- TMPL_ELSE -->
-            <option value="5">May</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="month6" -->
-            <option value="6" selected="selected">Jun</option>
-  <!-- TMPL_ELSE -->
-            <option value="6">Jun</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="month7" -->
-            <option value="7" selected="selected">Jul</option>
-  <!-- TMPL_ELSE -->
-            <option value="7">Jul</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="month8" -->
-            <option value="8" selected="selected">Aug</option>
-  <!-- TMPL_ELSE -->
-            <option value="8">Aug</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="month9" -->
-            <option value="9" selected="selected">Sep</option>
-  <!-- TMPL_ELSE -->
-            <option value="9">Sep</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="month10" -->
-            <option value="10" selected="selected">Oct</option>
-  <!-- TMPL_ELSE -->
-            <option value="10">Oct</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="month11" -->
-            <option value="11" selected="selected">Nov</option>
-  <!-- TMPL_ELSE -->
-            <option value="11">Nov</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="month12" -->
-            <option value="12" selected="selected">Dec</option>
-  <!-- TMPL_ELSE -->
-            <option value="12">Dec</option>
-  <!-- /TMPL_IF -->
-          </select>
-          <select name="year">
-            <option value="0">Year</option>
-  <!-- TMPL_IF NAME="year2004" -->
-            <option value="2004" selected="selected">2004</option>
-  <!-- TMPL_ELSE -->
-            <option value="2004">2004</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="year2005" -->
-            <option value="2005" selected="selected">2005</option>
-  <!-- TMPL_ELSE -->
-            <option value="2005">2005</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="year2006" -->
-            <option value="2006" selected="selected">2006</option>
-  <!-- TMPL_ELSE -->
-            <option value="2006">2006</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="year2007" -->
-            <option value="2007" selected="selected">2007</option>
-  <!-- TMPL_ELSE -->
-            <option value="2007">2007</option>
-  <!-- /TMPL_IF -->
-
-  <!-- TMPL_IF NAME="year2008" -->
-            <option value="2008" selected="selected">2008</option>
-  <!-- TMPL_ELSE -->
-            <option value="2008">2008</option>
-  <!-- /TMPL_IF -->
-          </select>
-        </td>
-      </tr>
-
-      <tr>
-        <th><label for="stickyduedate">Remember due date for Session:</label></th>
-        <td><input type="checkbox" id="stickyduedate" name="stickyduedate" <!-- TMPL_VAR NAME="selected" --> /></td>
-      </tr>
-
-    </table>
-
-    <input type="hidden" name="day" value="0" />
-    <input type="hidden" name="month" value="0" />
-    <input type="hidden" name="year" value="0" />
-    <input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
-    <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
-    <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
-    <input type="hidden" name="print" value="maybe" />
-    <!-- TMPL_IF NAME="CHARGES" -->
-    <input type="hidden" name="charges" value="yes" />
-    <input type="hidden" name="oldamount" value="<!-- TMPL_VAR NAME="amountold" -->" />
-    <!-- /TMPL_IF -->
-
-    <div id="action">
-      <input type="submit" value="Issue" />
-    </div>
-
-  </fieldset>
-</form>
-
-<!-- TMPL_IF NAME="reservloop" -->
-<fieldset id="circ_circulation_issue">
-	<legend>Borrower current reserves</legend>
+<!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
+<!-- TMPL_IF NAME="borrowernumber" -->
+<div class="table"><form class="inline" action="/cgi-bin/koha/circ/renewscript.pl" method="post"><input type="hidden" value="circ" name="destination" /><input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
 	<table>
-		<tr>
-			<th>Reserve date</th>
-			<th>Barcode</th>
+		<caption>Issues <span class="print"><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page">(Print Page)</a> <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip">(Print Slip)</a></span></caption>
+		<tr><th>Format</th>
+			<th>Due Date</th>
 			<th>Title</th>
 			<th>Author</th>
-			<th>Localisation</th>
+			<th>Call No</th>
+			<th>Barcode</th>
+			<th>Renew?</th>
 		</tr>
-		<!-- TMPL_LOOP NAME="reservloop" -->
-		<tr class="<!-- TMPL_VAR NAME="color" -->">
-					<td>
-						<!-- TMPL_VAR NAME="reservedate" -->
-					</td>
-					<td>
-						<!-- TMPL_IF name="barcodereserv" -->
-						<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra" onclick="openWindow(this, 'Item', 480, 640); return false;"><!-- TMPL_VAR NAME="barcodereserv" --></a>
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF NAME="waitingposition" -->
-						Waiting position for this document :
-						<b> <!-- TMPL_VAR NAME="waitingposition" --> </b>
-						<!-- /TMPL_IF -->
-					</td>
-					<td>
-						<!-- TMPL_VAR NAME="title" --> (<b> <!-- TMPL_VAR NAME="itemtype" --> </b>) 
-
-						<!-- TMPL_IF name="waiting" -->
-						<br/>
-						<i>This document is available</i>
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF name="transfered" -->
-						<br/>
-						<i>This document has been transfered from library : 
-						<!-- TMPL_VAR NAME="frombranch" --> the : <!-- TMPL_VAR NAME="datesent" --> </i>
-						<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="todayissues" -->
+		<!-- TMPL_LOOP NAME="todayissues" -->
+		<!-- TMPL_IF NAME="tcolor" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+			
+			<td><!-- TMPL_VAR NAME="itemtype" --></td>
+			<td><!-- TMPL_VAR NAME="dd" --></td>
+			<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --></a><br/><i><!-- TMPL_VAR name="itemnotes" --></i></td>
+			<td><!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="additionalauthor" --><!-- /TMPL_IF --></td>
+			<td><!-- TMPL_VAR NAME="classification" --></td>
+			<td><!-- TMPL_VAR NAME="barcode" --></td>
+		</tr>
+		<!-- /TMPL_LOOP -->
+	
+<!-- /TMPL_IF -->
 
-						<!-- TMPL_IF name="nottransfered" -->
-						<br/>
-						<i>This document hasn't been transfered yet from library : <!-- TMPL_VAR NAME="nottransferedby" --></i>
-						<!-- /TMPL_IF -->
-				
-					</td>
-					<td><!-- TMPL_VAR NAME="author" --></td>
-					<td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
-			</tr>
+<!-- TMPL_IF NAME="previssues" -->
+		<tr><th colspan="7"><a name="previous" id="previous">Previous Issues</a></th></tr>
+		<!-- TMPL_LOOP NAME="previssues" -->
+			<!-- TMPL_IF NAME="tcolor" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+			
+			<td><!-- TMPL_VAR NAME="itemtype" --></td>
+			<td><!-- TMPL_IF NAME="od" --><span class="error"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="dd" --><!-- TMPL_IF NAME="od" --></span><!-- /TMPL_IF --></td>
+			<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --></a><br/><i><!-- TMPL_VAR name="itemnotes" --></i></td>
+			<td><!-- TMPL_VAR NAME="author" --></td>
+			<td><!-- TMPL_VAR NAME="classification" --></td>
+			<td><!-- TMPL_VAR NAME="barcode" --></td>
+			<td><input type="checkbox" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF NAME="od" --> checked="checked"<!-- /TMPL_IF --> /></td></tr>
 		<!-- /TMPL_LOOP -->
 	</table>
-</fieldset>
+	
+	<p><input type="submit" class="submit" value="Renew Checked Items" /></p>
 <!-- /TMPL_IF -->
+</form>
 
-<!-- /TMPL_IF --> <!-- borrowernumber -->
-
-<!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
-<!-- TMPL_IF NAME="borrowernumber" -->
-<form action="/cgi-bin/koha/reserve/renewscript.pl" method="post">
-  <fieldset id="circ_circulation_borrower_issues">
-    <legend>Borrower current issues</legend>
-
-    <p>
-      <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page">Print Page</a>
-      / <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip">Print Slip</a>
-    </p>
-    
-    <input type="hidden" value="circ" name="destination" />
-    <input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
-    <input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
-
-    <table>
-      <tr>
-        <th>Due Date</th>
-        <th>Title</th>
-        <th>Author</th>
-        <th>Call No</th>
-        <th>Barcode</th>
-        <th>Renew?</th>
-      </tr>
-    
-  <!-- TMPL_IF NAME="todayissues" -->
-      <tr>
-        <th colspan="6"><a name="today" id="today">Today Issues</a></th>
-      </tr>
-    <!-- TMPL_LOOP NAME="todayissues" -->
-      <!-- TMPL_IF NAME="togglecolor" -->
-      <tr>
-      <!-- TMPL_ELSE -->
-      <tr class="highlight">
-      <!-- /TMPL_IF -->
-        <td><!-- TMPL_VAR NAME="dd" --></td>
-        <td>
-          <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --></a>
-          <br/><!-- TMPL_VAR name="itemnotes" -->
-        </td>
-        <td><!-- TMPL_VAR NAME="author" --></td>
-        <td><!-- TMPL_VAR NAME="classification" --></td>
-        <td><!-- TMPL_VAR NAME="barcode" --></td>
-        <td>
-          <input type="checkbox"
-                 name="items[]"
-                value="<!-- TMPL_VAR NAME="itemnumber" -->"
-      <!-- TMPL_IF NAME="od" -->
-              checked="checked"
-      <!-- /TMPL_IF -->
-          />
-          <input type="checkbox"
-                 name="all_items[]"
-                value="<!-- TMPL_VAR NAME="itemnumber" -->"
-              checked="checked"
-                style="display: none;"
-          />
-        </td>
-      </tr>
-    <!-- /TMPL_LOOP --> <!-- todayissues -->
-  <!-- /TMPL_IF --> <!-- todayissues -->
-
-  <!-- TMPL_IF NAME="previssues" -->
-      <tr>
-        <th colspan="6"><a name="previous" id="previous">Previous Issues</a></th>
-      </tr>
-    <!-- TMPL_LOOP NAME="previssues" -->
-      <!-- TMPL_IF NAME="togglecolor" -->
-      <tr>
-      <!-- TMPL_ELSE -->
-      <tr class="highlight">
-      <!-- /TMPL_IF -->
-        <td>
-      <!-- TMPL_IF NAME="od" -->
-      <!-- /TMPL_IF -->
-
-      <!-- TMPL_VAR NAME="dd" -->
-
-      <!-- TMPL_IF NAME="od" -->
-      <!-- /TMPL_IF -->
-        </td>
-        <td>
-          <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --></a>
-          <br/><!-- TMPL_VAR name="itemnotes" -->
-        </td>
-        <td><!-- TMPL_VAR NAME="author" --></td>
-        <td><!-- TMPL_VAR NAME="classification" --></td>
-        <td><!-- TMPL_VAR NAME="barcode" --></td>
-        <td>
-          <input type="checkbox"
-                 name="items[]"
-                value="<!-- TMPL_VAR NAME="itemnumber" -->"
-      <!-- TMPL_IF NAME="od" -->
-              checked="checked"
-      <!-- /TMPL_IF -->
-          />
-          <input type="checkbox"
-                 name="all_items[]"
-                value="<!-- TMPL_VAR NAME="itemnumber" -->"
-              checked="checked"
-                style="display: none;"
-          />
-        </td>
-      </tr>
-    <!-- /TMPL_LOOP --> <!-- previssues -->
-  <!-- /TMPL_IF --> <!-- previssues -->
-    </table>
+	
+</div>
 
-    <div id="action">
-      <input type="submit" name="renew_checked" value="Renew Checked Items" />
-      <input type="submit" name="renew_all" value="Renew All" />
-    </div>
-  </fieldset>
-</form>
+<!-- /TMPL_IF -->
 
-<!-- /TMPL_IF --> <!-- borrowernumber -->
 
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl
index 9edcd9721b..66d6a201a1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl
@@ -1,15 +1,12 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation: Returns<!-- TMPL_IF Name="returned" -->: <!-- TMPL_VAR Name="itemtitle" --><!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation: Returns<!-- TMPL_IF Name="returned" -->: <!-- TMPL_VAR Name="itemtitle" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
-
-
 <!-- TMPL_IF Name="found" -->
-		<h3>Reserve Found<!-- TMPL_IF Name="waiting" --> (item is already consigned) <!-- /TMPL_IF --></h3>
+		<h3 class="alert">Reserve Found<!-- TMPL_IF Name="waiting" --> (item is already <em>consigned</em>) <!-- /TMPL_IF --></h3>
 		<!-- TMPL_IF Name="waiting" -->
-		
+		<div class="items">
 		<table>
-		<caption><a href="/cgi-bin/koha/detail.pl?type=intra&bib=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
+		<caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
 		<tr><th>Patron: </th><td>
 			<ul>
 						<li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
@@ -17,39 +14,27 @@
 			<li><!-- TMPL_VAR Name="borstraddress" --><br />
 			<!-- TMPL_VAR Name="borcity" -->  <!-- TMPL_VAR NAME="borzip" --></li>
 			<li><!-- TMPL_VAR Name="borphone" --></li>
+			
 			</ul></td></tr>
 	<tr><th>Transfer to:</th><td><!-- TMPL_VAR Name="branchname" --></td></tr>
-		</table><form method="post" action="returns.pl" name="mainform" id="mainform">
-			<input type="submit" value="Confirm" /><!-- TMPL_LOOP Name="inputloop" -->
+		</table></div><form method="post" action="returns.pl" name="mainform" id="mainform">
+			<input type="submit" value="Confirm" class="submit" /><!-- TMPL_LOOP Name="inputloop" -->
 				<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
 				<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
 				<input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" />
 			<!-- /TMPL_LOOP -->
 			<input type="hidden" name="barcode" value="0" />
-			</form>			
-		<!-- /TMPL_IF -->
+			</form>
 		
-		<!-- TMPL_IF Name="transfer" -->
-			<h2>This item must return to his homebranch :</h2>
-			<p>The document <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) Must be returned to his homebranch(<b><!-- TMPL_VAR NAME="itemhomebranch" --></b>)
-				<form method="post" action="returns.pl">
-					<!-- TMPL_LOOP Name="inputloop" -->
-						<input type="hidden" name="ri-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
-						<input type="hidden" name="dd-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="duedate" -->">
-						<input type="hidden" name="bn-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="bornum" -->">
-					<!-- /TMPL_LOOP -->
-					<input type="hidden" name="barcode" value="0">
-					<input type="submit" value="OK">
-				</form>
+			
 		<!-- /TMPL_IF -->
-		
 		<!-- TMPL_IF Name="diffbranch" -->
-			<h3>Item Consigned:</h3>
-    	
+			<h3>Item Consigned:</h3><br>
+    	<div class="item">
 		<table>
-		<caption><a href="/cgi-bin/koha/detail.pl?type=intra&bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
+		<caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
 		<tr><th>Patron:</th><td><!-- TMPL_VAR Name="name" --></td></tr>
-		</table><form method="post" action="returns.pl" name="mainform" id="mainform"><input type="submit" value="OK" />
+		</table></div><form method="post" action="returns.pl" name="mainform" id="mainform"><input type="submit" value="OK" />
 			<!-- TMPL_LOOP Name="inputloop" -->
 				<!-- TMPL_UNLESS Name="first" -->
 					<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
@@ -64,20 +49,21 @@
 
 		<!-- /TMPL_IF -->
 		<!-- TMPL_IF Name="reserved" -->
-			
+			<div class="items">
 			<table>
-			<caption><a href="/cgi-bin/koha/detail.pl?type=intra&bib=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
+			<caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
 			<tr><th>Patron: </th><td>
 			<ul>
 						<li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
-			<li><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> </li>
+			<li><!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" --></li>
 			<li><!-- TMPL_VAR Name="borstraddress" --><br />
 			<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
 			<li><!-- TMPL_VAR Name="borphone" --></li>
+			<!-- Display for NPL // <!-- TMPL_IF NAME="boremail" --><li><a href="/intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->" onclick="window.open('/intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->','notify','width=650,height=450,location=no,menubar=no,toolbar=no,scrollbars=yes'); return false;"><!-- TMPL_VAR Name="boremail" --></a></li><!-- /TMPL_IF --> // Display for NPL -->
 			</ul></td></tr>
 			<tr><th>Transfer to: </th><td><!-- TMPL_VAR Name="branchname" --></td></tr></table>
-			 <form method="post" action="returns.pl" name="mainform" id="mainform">
-			<input type="submit" value="Confirm" />
+			</div> <form method="post" action="returns.pl" name="mainform" id="mainform">
+			<input type="submit" class="submit" value="Confirm" />
 			<!-- TMPL_LOOP Name="inputloop" -->
 				<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
 				<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
@@ -90,80 +76,85 @@
 	
 <!-- TMPL_ELSE -->
 <h1>Circulation: Returns</h1>
-	
+	<div class="details">
 	<form method="post" action="/cgi-bin/koha/circ/returns.pl"  name="mainform" id="mainform">
 			<label for="barcode">Enter Item Barcode</label>
-			<input name="barcode" id="barcode" size="14" maxlength="14" />
-			<input type="submit" value="Submit" />
+			<input name="barcode" id="barcode" size="14" maxlength="14" class="unfocus" onfocus="this.className='focus'" onblur="this.className='unfocus'" />
+			<input type="submit" class="submit" value="Submit" />
 			<!-- TMPL_LOOP Name="inputloop" -->
 				<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
 				<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
 				<input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" />
 			<!-- /TMPL_LOOP -->
 		</form><!-- TMPL_IF NAME="errmsgloop" --><!-- TMPL_LOOP Name="errmsgloop" -->
-				
+				<div class="error">
 				<!-- TMPL_IF Name="badbarcode" -->
 					No Item with barcode: <!-- TMPL_VAR Name="msg" -->
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF Name="ispermanent" -->
 					Please return to  <!-- TMPL_VAR Name="msg" -->
 				<!-- /TMPL_IF -->
+				
+				<!-- TMPL_IF Name="reserveissued" -->
+					Issued from RESERVE Section-  Use RESERVE return.
+				<!-- TMPL_ELSE -->
 				<!-- TMPL_IF Name="notissued" -->
 					Not On Issue.
-				<!-- /TMPL_IF -->
+				<!-- /TMPL_IF --><!-- /TMPL_IF -->
 				<!-- TMPL_IF Name="waslost" -->
 					Item was lost, now found.
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF Name="withdrawn" -->
 					Item Cancelled
 				<!-- /TMPL_IF -->
-				
+				</div>
 			<!-- /TMPL_LOOP --><!-- /TMPL_IF -->
-
+</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF Name="returned" -->
-<table>
+<div class="table"><table>
 		<tr><th>Item Information</th><th>Patron Information</th></tr>
 		<tr><td><!-- TMPL_VAR Name="itemtitle" -->
-		</td><td>
+		</td><td><div class="flags">
 <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="ribornum" -->"><!-- TMPL_VAR Name="riborcnum" --></a>
 		<!-- TMPL_VAR Name="riborsurname" -->, <!-- TMPL_VAR Name="ribortitle" --> <!-- TMPL_VAR Name="riborfirstname" -->
 
+<!-- removed: removed-from-returns.tmpl -->
 <!-- TMPL_IF Name="flagset" -->
  (<!-- TMPL_LOOP Name="flagloop" -->
-<!-- TMPL_VAR Name="flag" -->, 
-<!-- /TMPL_LOOP -->)<!-- /TMPL_IF -->
+<span class="error"><!-- TMPL_VAR Name="flag" -->, </span>
+<!-- /TMPL_LOOP -->)<!-- /TMPL_IF --></div>
 </td></tr></table>
-
+</div>
 <!-- /TMPL_IF -->
 
 
 
 <!-- TMPL_IF Name="riloop" -->
-
+<div class="table">
 		<table>
 		<caption>Returned Items</caption>
 		<tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>Patron</th></tr>
 		<!-- TMPL_LOOP Name="riloop" -->
-			<tr><td><!-- TMPL_IF Name="duedate" --><!-- TMPL_IF Name="early" --><!-- /TMPL_IF --><!-- TMPL_VAR Name="month" -->/<!-- TMPL_VAR Name="day" -->/<!-- TMPL_VAR Name="year" --><!-- TMPL_IF Name="early" --></span><!-- /TMPL_IF --><!-- TMPL_ELSE -->Not on Issue.<!-- /TMPL_IF --></td>
+			<tr><td><!-- TMPL_IF Name="duedate" --><!-- TMPL_IF Name="early" --><span class="error"><!-- /TMPL_IF --><!-- TMPL_VAR Name="day" -->/<!-- TMPL_VAR Name="month" -->/<!-- TMPL_VAR Name="year" --><!-- TMPL_IF Name="early" --></span><!-- /TMPL_IF --><!-- TMPL_ELSE -->Not on Issue.<!-- /TMPL_IF --></td>
 			<td>
-			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="itembiblionumber" -->&type=intra"><!-- TMPL_VAR Name="barcode" --></a></td>
+			<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR Name="itembiblionumber" -->&type=intra"><!-- TMPL_VAR Name="barcode" --></a></td>
 			<td><!-- TMPL_VAR Name="itemtitle" --></td>
 			<td><!-- TMPL_VAR Name="itemauthor" --></td>
 			<td><!-- TMPL_VAR Name="itemtype" --></td>
 			<td>
-			<!-- TMPL_IF Name="duedate" -->Yes, duedate
+			<!-- TMPL_IF Name="duedate" -->
 				<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->">
 					<!-- TMPL_VAR Name="borcnum" -->
-				</a><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> 
+				</a> <!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" -->
 			<!-- TMPL_ELSE -->
-								Not on issue.
+								<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a> <!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" -->
 			<!-- /TMPL_IF -->
 			</td></tr>
 		<!-- /TMPL_LOOP -->
 		</table>
-		
+	</div>
 <!-- /TMPL_IF -->
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/help/admin/aqbookfund.tmpl
index 4bf747a755..c36f410710 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/help/admin/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/help/admin/aqbookfund.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Book Fund Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<div id="main-compact">
 
 <h1>Book Fund Administration</h1>
 
@@ -13,4 +13,4 @@
 
 <p>Once you have set up a fund, you will see a link to a page for setting up the fund budget. Here you will enter the beginning and ending dates of your budget year and the amount of money in that particular budget line. Do not use any kind of currency notation (like "$") or commas when entering the number. (Commas will be converted to decimal points.) NOTE: Your dates will not saved correctly unless you have set your date format in the System Preferences section of the Parameters page -- DO THIS BEFORE setting budgets.)</p>
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/help/admin/auth_subfields_structure.tmpl
index 68d3edae93..6c64947b1d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/help/admin/auth_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/help/admin/auth_subfields_structure.tmpl
@@ -23,10 +23,11 @@
 <li>thesaurus : shows the authority type</li>
 <li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
 <li>
-<li><b>Example MARC21 Subject Headings Authority</b>
+<li><b>An Example MARC21 Subject Headings Authority</b>
 <ul>Use field 035$a for your auth_header.authid and 035$8 for auth_header.authtypecode. Make sure your zebra authorities index these fields</ul>
 <ul>Use field 150 for your subject headings</ul>
 <ul>Use field 750$9 (add subfield if not present) for auth_header.linkid . Select <b>Is a linking field</b>. You may use any subfield for linking as $9 is not hardcoded
+<ul>Make sure you defined these fields using Link MARC-ZEBRA in System Admin as well
 <ul>When you add or modify an authority clicking on ... that will appear next to 750$9 will let you search any authority and link it to this record. You may repeat tag 750 and add as many linkages as you like</u>
 </li>
 </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/authorised_values.tmpl b/koha-tmpl/intranet-tmpl/prog/en/help/admin/authorised_values.tmpl
index 525f08fbfc..3453af5ace 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/help/admin/authorised_values.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/help/admin/authorised_values.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Authorised values management<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<div id="main-compact">
 <h1>Authorised values management</h1>
 <p>Koha allows you to restrict the values that catalogers can place in some MARC subfields to certain pre-defined "authorised" values. These authorised values are defined here.</p>
 
@@ -9,4 +9,4 @@
 <li>HINT2 : in the MARC editor, the list is ordered by Text, NOT by value. So you can define a default value by putting a space before the value you want to see first. For example, if your list is related to language, you can set "ENG" as authorised value and " English" as text. The space will order "ENG" as first default value, and the space won't be shown (because HTML automatically discard useless spaces). Super hint : you can put a value 1st with N spaces, then another one 2nd with N-1 space,..., a value in Nth position with 1 space. Don't abuse of this feature, it's easier to find a value in an alphabetical order. It should be used only to have a default value</li>
 </ul>
 <p>Koha automatically sets up authorised value categories for your item types and branch codes, and you can link these authorised values to MARC subfields when you set up your MARC tag structure.</p>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/authtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/help/admin/authtypes.tmpl
index 3e9cb8fa90..f82730315f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/help/admin/authtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/help/admin/authtypes.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Authority types<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<div id="main-compact">
 	<h1>Authority types</h1>
 	<p>You can define as many Authority types as you want.</p>
 	<ul>
@@ -16,4 +16,4 @@
 	<p>
 		In the biblio framework, the reported tag <b>MUST</b> contain a $9 subfield, activated in the tab where the tag is, and hidden (hidden maybe omitted, but the field has no reason to appear anywhere). The $9 subfield in the biblio will contain the Authority number (the internal Koha number)
 	</p>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/biblio_framework.tmpl b/koha-tmpl/intranet-tmpl/prog/en/help/admin/biblios_framework.tmpl
similarity index 91%
rename from koha-tmpl/intranet-tmpl/prog/en/help/admin/biblio_framework.tmpl
rename to koha-tmpl/intranet-tmpl/prog/en/help/admin/biblios_framework.tmpl
index 1dd20d2bbb..09f6b4425c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/help/admin/biblio_framework.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/help/admin/biblios_framework.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Biblio framework<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<div id="main-compact">
 	<h1>Biblio framework</h1>
 	<p>biblio frameworks are used to catalogue your biblios.</p>
 	<p>Unlike Koha 2.0, in this version you can have more than 1 framework to catalogate differently various materials. You can, for example, define 1 framework for monographies, 1 framework for serials, 1 framework for URL...</p>
 	<p>Once a framework type is created, you can clic on "MARC structure" to define the exact MARC structure. The first time, Koha will ask you to select an existing framework to copy into the new one. Thus, you don't have to define all the MARC structure</p>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/help/admin/branches.tmpl
index 33c2cca2e8..9d8334dae0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/help/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/help/admin/branches.tmpl
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Branches<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
-
+<div id="main-compact">
 <h1>Help: Library Branches</h1>
 
 <p>Fill in information about your library service outlets on this page.</p>
@@ -9,4 +9,4 @@
 
 <p>Now add the names and addresses, phone numbers, etc of your libraries in the "Branches" section. (All of your libraries should be described here, not just the branch libraries.) Give each library a unique and easily-remembered code (maximum of four characters). This code will be used in Koha's database to identify each library. When libraries are listed in Koha, they will be listed in alphabetical order by code. (Note that until you set your branch the first time you use a computer to circulate items in Koha, the branch will default to the first library in the alphabetical code list -- be careful to set the branch the first time you use Koha or whenever you add a new computer!)</p>
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/help/admin/categorie.tmpl
index 8990fb5b81..41202655e2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/help/admin/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/help/admin/categorie.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Borrower Categories<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<div id="main-compact">
 <h1>Borrower Categories</h1>
 
 <p>Here is where you define the types of users of your library and how they will be handled.</p>
@@ -23,4 +23,4 @@
 
 <h2>Overdue Notice Required</h2>
 <p>Overdue Notice Required lets you bypass generating overdue notices for this user type.</p>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/checkmarc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/help/admin/checkmarc.tmpl
index dfb84ef04b..745c9b17aa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/help/admin/checkmarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/help/admin/checkmarc.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC Check<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<div id="main-compact">
 <h1>MARC Check</h1>
 <p>Once you have completed the process of setting up your MARC tag structure (MarcTagstruct) and checked your MARC to Koha mapping (Koha2MarcLinks), click on this link to activate a small program that checks for major errors in your MARC setup.</p>
 
 <p>This MARC check does not guarantee that you will like the first results of your efforts to set up your MARC displays, etc. -- it simply checks for major errors. You will probably revise your MARC setup several times before you are completely pleased with it. Be sure to run checkmarc after every revision.</p>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/currency.tmpl b/koha-tmpl/intranet-tmpl/prog/en/help/admin/currency.tmpl
index 041d12eb0c..e9442f2e2f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/help/admin/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/help/admin/currency.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Currencies administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<div id="main-compact">
 <h1>Currencies administration</h1>
 <p>Define the currencies you deal with here.</p>
 
 <p>You should at least define your local currency here, giving it a name (like US DOLLAR or EURO) and setting the "rate" at 1. If you do business with vendors who charge in a different currency, enter a name for that currency (e.g. PESO) and set the approximate exchange rate compared to your currency. (Note: names are limited to 10 characters or less.) The exchange rate is used to calculate the remain balances in your materials budgets when you purchase materials using "normal" acquisitions.</p>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/holdings_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/help/admin/holdings_subfields_structure.tmpl
new file mode 100644
index 0000000000..c3d6f2c055
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/help/admin/holdings_subfields_structure.tmpl
@@ -0,0 +1,33 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<div id="main-compact">
+<h1>MARC tag structure administration</h1>
+<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
+<p>You can define as the marc tag structure for each biblio framework you have defined</p>
+
+<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>
+
+<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
+<p>For each subfield you can set :</p>
+<ul>
+<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
+<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
+<li>Search also : This section is not implemented anymore-- will  be depreceated --- Zebra indexing sets these fields</li>
+<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
+<li>Text for librarian : what appears before the subfield in the librarian interface</li>
+<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
+<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
+<li>hidden : You can choose whether this field will show in opac, intranet or editor separately. For editor an extra choice is to display the field collapsed.</li>
+
+<li>URL : if checked, the subfield is an URL, and can be clicked</li>
+<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
+<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
+<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
+<li>link : If you enter a field/subfield here (200b), a little glass appears after the subfield. If the user clic on the glass, a search is done on the DB for the field/subfield with the same value. Can be used for 2 main topic : 
+	<ul>
+		<li>on a field like author (200f in UNIMARC), put 200f here, you will be able to see all biblios with the same author</li>
+		<li>on a field that is a link (4xx) to reach another biblio. For example, put 011a in 464$x, will find the serial that was previously with this issn. With the 4xx pligin, you get a powerful tool to manage biblios connected to biblios</li>
+	</ul>
+</li>
+</ul>
+
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/holdingstagstructure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/help/admin/holdingstagstructure.tmpl
new file mode 100644
index 0000000000..6473fdb1b9
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/help/admin/holdingstagstructure.tmpl
@@ -0,0 +1,26 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<div id="main-compact">
+<h1>MARC tag structure administration</h1>
+<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
+<p>You can define as the marc tag structure for each biblio framework you have defined</p>
+
+<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>
+
+<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
+<p>For each subfield you can set :</p>
+<ul>
+<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
+<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
+<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
+<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
+<li>Text for librarian : what appears before the subfield in the librarian interface</li>
+<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
+<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
+<li>hidden : means that the field is managed, but NOT shown in opac. It's usually for internal fields</li>
+<li>URL : if checked, the subfield is an URL, and can be clicked</li>
+<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
+<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
+<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
+<li>link : useless for instance</li>
+</ul>
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/issuingrules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/help/admin/issuingrules.tmpl
index b3a794d051..2c6b582812 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/help/admin/issuingrules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/help/admin/issuingrules.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Issuing rules<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<div id="main-compact">
 <h1>Issuing rules</h1>
 <p>Issuing rules deals with 2 topics :</p>
 <ul>
@@ -17,4 +17,4 @@
 
 <p>(Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your system administrator to put this script in crontab, after midnight, to have fines calculated every night.)</p>
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/help/admin/itemtypes.tmpl
index 410bdd7958..218b1d563a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/help/admin/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/help/admin/itemtypes.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Item types management<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<div id="main-compact">
 <h1>Item types management</h1>
 <p>You can define as many itemtypes as you want.</p>
 
@@ -17,4 +17,4 @@
     <li>Issuing rules are set for item types (and for borrower types / branches)</li>
 </ul>
 <p>Setting up item types is one of the first things you should do after installing the Koha software.</p>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/koha2marclinks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/help/admin/koha2marclinks.tmpl
index d3714698b4..3e1f839405 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/help/admin/koha2marclinks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/help/admin/koha2marclinks.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Koha 2 MARC links<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<div id="main-compact">
 <h1>Koha 2 MARC links</h1>
 <p>This page provides a simplified way to map your MARC tags and subfields to the non-MARC Koha database tables <b>for default biblio framework</b>. This can also be done while setting the MARC tag structure, but it is easier to see the relationship between the MARC database and the Koha database here.</p>
 
@@ -10,4 +10,4 @@
 <p>This is a one-to-one mapping. In other words, a MARC tag/subfield can be mapped to one, and only one, Koha table.column.</p>
 
 <p>MARC data that is not mapped to a Koha table does not disappear -- it is simply not available for display on circulation screens and on some search results screens.</p>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/help/admin/marc_subfields_structure.tmpl
index 49622ab303..ec74649fca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/help/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/help/admin/marc_subfields_structure.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<div id="main-compact">
 <h1>MARC tag structure administration</h1>
 <p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
 <p>You can define as the marc tag structure for each biblio framework you have defined</p>
@@ -16,7 +16,32 @@
 <li>Text for librarian : what appears before the subfield in the librarian interface</li>
 <li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
 <li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
-<li>hidden : means that the field is managed, but NOT shown in opac. It's usually for internal fields</li>
+<li>hidden : allows you to select from 19 possible visibility conditions, 17 of which are implemented. They are the following:</li>
+<code><br />
+( ! means 'not visible' or in the case of Collapsed 'not
+Collapsed')
+<br /><br />
+  -9 => Future use<br/>
+  -8 =>  Flag<br/>
+  -7 =>  OPAC !Intranet !Editor  Collapsed<br/>
+  -6 =>  OPAC  Intranet !Editor !Collapsed<br/>
+  -5 =>  OPAC  Intranet !Editor  Collapsed<br/>
+  -4 =>  OPAC !Intranet !Editor !Collapsed<br/>
+  -3 =>  OPAC !Intranet  Editor  Collapsed<br/>
+  -2 =>  OPAC !Intranet  Editor !Collapsed<br/>
+  -1 =>  OPAC  Intranet  Editor  Collapsed<br/>
+   0 =>  OPAC  Intranet  Editor !Collapsed<br/>
+   1 => !OPAC  Intranet  Editor  Collapsed<br/>
+   2 => !OPAC !Intranet  Editor !Collapsed<br/>
+   3 => !OPAC !Intranet  Editor  Collapsed<br/>
+   4 => !OPAC  Intranet  Editor !Collapsed<br/>
+   5 => !OPAC !Intranet !Editor  Collapsed<br/>
+   6 => !OPAC  Intranet !Editor !Collapsed<br/>
+   7 => !OPAC  Intranet !Editor  Collapsed<br/>
+   8 => !OPAC !Intranet !Editor !Collapsed<br/>
+   9 => Future use<br/>
+</code>
+
 <li>URL : if checked, the subfield is an URL, and can be clicked</li>
 <li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
 <li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
@@ -25,8 +50,8 @@
 	<ul>
 		<li>on a field like author (200f in UNIMARC), put 200f here, you will be able to see all biblios with the same author</li>
 		<li>on a field that is a link (4xx) to reach another biblio. For example, put 011a in 464$x, will find the serial that was previously with this issn. With the 4xx pligin, you get a powerful tool to manage biblios connected to biblios</li>
-</ul>
+	</ul>
 </li>
 </ul>
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/help/admin/marctagstructure.tmpl
index 1b42ae64b4..6473fdb1b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/help/admin/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/help/admin/marctagstructure.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<div id="main-compact">
 <h1>MARC tag structure administration</h1>
 <p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
 <p>You can define as the marc tag structure for each biblio framework you have defined</p>
@@ -23,4 +23,4 @@
 <li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
 <li>link : useless for instance</li>
 </ul>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/printers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/help/admin/printers.tmpl
index 86458e3240..67370fec04 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/help/admin/printers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/help/admin/printers.tmpl
@@ -1,9 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Printer Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<div id="main-compact">
 <h1>Printer Administration</h1>
 <p>If you are going to be using a printer (or several printers) that are attached to your Koha server for producing statistical and operations reports, then you need to give each printer a name and tell Koha how to access it. You do this by telling Koha which print queue to use.</p>
 
 <p>(In linux, each printer configuration in your printcap file defines a print queue. The default print queue is "lp," but if you use more than one printer you will have other queues, probably with names like "text" or "postscript." Tell Koha which printer queue(s) you want to use for printing reports directly from the server.)</p>
 
 <p>Note that you can always print Koha screens directly to a printer attached to your workstation just by using your web browser's Print function.</p>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/stopwords.tmpl b/koha-tmpl/intranet-tmpl/prog/en/help/admin/stopwords.tmpl
index 1ad6c6e9f9..753b179731 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/help/admin/stopwords.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/help/admin/stopwords.tmpl
@@ -1,9 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Stop word administration page<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<div id="main-compact">
 <h1>Stop word administration page</h1>
 <p>Here you should list all of the words you wish Koha to ignore when performing catalog searches or building the keyword index.</p>
 
 <p>Normally, you will not want Koha to save keyword references to articles like "The" and "A" and other very common words. Saving keyword references to these words does not help to limit a search and will make the keyword index very large and "cluttered" with words that are not really useful. The "stopwords" list defines these unnecessary words for your installation.</p>
 
 <p>(Hint: If you are proficient at MySQL, it is often faster and easier to find an existing stopwords list, edit it, put it in the correct format, and use the MySQL "Load Data Infile" command to import the list into the stopwords table. Many academic libraries publish their stopwords list on the Internet, or you can ask other Koha libraries if they would share their stopword list.)</p>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/prog/en/help/admin/systempreferences.tmpl
index a31bb1ddfc..200aa00580 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/help/admin/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/help/admin/systempreferences.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- System preferences administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<div id="main-compact">
 <h1>System preferences administration</h1>
 <p>This page allows you to set the system preferences that control much of the basic behavior of Koha. These parameters should be set before any other parameters.</p>
 <ul>
@@ -26,7 +26,7 @@
 	<p>means the "block" 995 has &lt;br&gt;Items : BEFORE, then fields 995b, 995j and 995k, repeated for each item (995 is an UNIMARC standard), then nothing after the block.</p>
 	<p> The # means "beginning of a block", the | is the separator of each part, the {} being used for each subfield. A subfield can have up to 3 digits BEFORE and up to 3 digits AFTER each subfield</p>
 	<p>The UNIMARC (partial) definition for ISBD is </p><i>
-	<p>#700|&lt;label&gt;Titre/auteur&lt;/label&gt;|{700a}{701a}{702a}| ;
+	<p>#700|<label>Titre/auteur</label>|{700a}{701a}{702a}| ;
 		#200||{200a}{ [200b] }{. 200c}{ : 200e}{. 200h}{. 200i}{ / 200f}{ ; 200g}|<br/>
 		#230||{ ; 230a}|<br/>
 		#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|<br/>
@@ -68,4 +68,4 @@
 <li><b>timeout --</b> Inactivity timeout period (in seconds). If a workstation is idle for longer than this period, the user will have to login again.</li>
 
 <li><b>virtualshelves --</b> Set virtual shelves management on or off ("1" or "0"). Users can set up and manage their own "virtual bookshelves" of favorite library items if this feature is turned on.</li></ul>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/help/admin/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/help/admin/z3950servers.tmpl
index 2e2444ed4d..e1017c6e1e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/help/admin/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/help/admin/z3950servers.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Z39.50 servers administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<div id="main-compact">
 <h1>Z39.50 servers administration</h1>
 <p>Defines the Z39.50 servers you want Koha to search.</p>
 
@@ -13,4 +13,4 @@
 
 <p>IMPORTANT NOTE : the z3950search will NOT work until your system administrator has not activated the z3950 client daemon on your server. The daemon is in KohaDirectory/script/z3950daemon. It should be added to rc.d to be launched during server boot.</p>
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search-result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search-result.tmpl
index 6159cb8f94..51a44b0cd2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search-result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search-result.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit -- Select supplier<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
+
 <h1>Supplier Search Results</h1>
 <h2>You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h2>
 <table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search.tmpl
index fe4f8a4d50..34e50c2d45 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search.tmpl
@@ -1,5 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit -- Search supplier<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+
+
+
 <script language="Javascript">
 
 function GetIt(aqbooksellerid,name)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl
index 9a04b4aea6..836aa6c879 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl
@@ -1,10 +1,10 @@
 <!-- TMPL_UNLESS NAME="preview" -->
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!--
 TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
 
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
-<div id="mainbloc">
+<div id="main">
 <!-- TMPL_ELSE -->
 <!-- TMPL_INCLUDE NAME="popup-top.inc" -->
 <div class="popup-block">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/distributedto.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/distributedto.tmpl
index 924c1a2a2c..5f3983a5fb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/distributedto.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/distributedto.tmpl
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit -- Select supplier<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
-<div id="mainbloc">
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
+
 	<h1>Select borrowers or enter manually the names</h1>
 	<p>
 		<form action="/cgi-bin/koha/serials/distributedto.pl" method="post" name="Aform">
@@ -82,5 +83,5 @@
 			document.Aform.submit();
 		}
 	</script>
-</div>
+
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/lateissues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/lateissues.tmpl
index e6d37333f2..5c88db10ee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/lateissues.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/lateissues.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
 
 <h1>Late issues</h1>
 <p>
@@ -84,6 +84,6 @@ name="subscriptionid" -->">Receive</a>
 		</table>
 	<!-- /TMPL_IF -->
 		
-		       
+	       
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/printlist.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/printlist.tmpl
index c8e95b4730..79849fb25f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/printlist.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/printlist.tmpl
@@ -1,5 +1,7 @@
 <html>
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+
+<!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
+
 <body onLoad="window.print();">
 <h1>Distribution list</h1>
 <h2>Title : <!-- TMPL_VAR name="title" -->, <!-- TMPL_VAR name="serialseq" --></h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/receipt-search-result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/receipt-search-result.tmpl
index 8e2581ddc4..2a372953fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/receipt-search-result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/receipt-search-result.tmpl
@@ -1,5 +1,7 @@
-<!-- TMPL_INCLUDE NAME="serials-top.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
+
 <div id="mainbloc">
 	<h1 class="authority">Serial search results</h1>
 	<div id="resultnumber">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/result.tmpl
new file mode 100644
index 0000000000..fe62d0a42d
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/result.tmpl
@@ -0,0 +1,86 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
+
+	<h1 class="catalogue">Search results</h1>
+	<div id="resultnumber">
+		<p>
+			<!-- TMPL_IF NAME=displayprev -->
+				<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search>
+					<img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0>
+				</a>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME=numbers -->
+				<!-- TMPL_IF NAME=highlight -->
+					<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
+				<!-- TMPL_ELSE -->
+					<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
+				<!-- /TMPL_IF -->
+			<!-- /TMPL_LOOP -->
+			<!-- TMPL_IF NAME=displaynext -->
+				<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
+				<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<!-- TMPL_IF name=total -->
+			&nbsp<b>Results <!-- TMPL_VAR name="from" --> to <!-- TMPL_VAR name="to" --> of <!-- TMPL_VAR name="total" --></b><br><br>
+			<!-- TMPL_ELSE -->
+			&nbsp No results found.<br>
+			<!-- /TMPL_IF -->
+		</p>
+	</div>
+	<div id="resultlist">
+		<table>
+			<tr>
+			<th class="catalogue">Summary</th>
+			<th class="catalogue">&nbsp;</th>
+			</tr>
+			<!-- TMPL_LOOP name="result" -->
+			<tr>
+				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+					<p>
+						<p><b><!-- TMPL_VAR NAME="title" --></b></p>
+						<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 <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+						<a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" escape="URL" -->') ">Get it!</a>
+				</td>
+			</tr>
+			<!-- /TMPL_LOOP -->
+		</table>
+	</div>
+	<div id="resultnumber">
+		<p>
+			<!-- TMPL_IF NAME=displayprev -->
+			<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME=numbers -->
+				<!-- TMPL_IF NAME=highlight -->
+				<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
+				<!-- TMPL_ELSE -->
+				<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
+				<!-- /TMPL_IF -->
+			<!-- /TMPL_LOOP -->
+			<!-- TMPL_IF NAME=displaynext -->
+			<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
+				<!-- /TMPL_IF -->
+		</p>
+	</div>	
+
+
+
+<script language="Javascript">
+
+function GetIt(bibno,title)
+{
+  opener.document.f.biblionumber.value = bibno;
+  opener.document.f.title.value = title;
+  self.close();
+}
+</script>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/routing-preview.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/routing-preview.tmpl
index b8a9b4fe66..1672fce524 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/routing-preview.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/routing-preview.tmpl
@@ -1,10 +1,7 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!--
-TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
 
-<div id="mainbloc">
 <h1 class="bull">Preview Routing List</h1>
 
 <form method="post" action="routing-preview.pl">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/routing.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/routing.tmpl
index 57fda83a88..d59606d61b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/routing.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/routing.tmpl
@@ -1,8 +1,8 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!--
-TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
+
+
 
 <script language="javascript" type="text/javascript">
 <!--
@@ -14,7 +14,7 @@ function reorder_item(sid,rid,rank){
 //-->
 </script>
 
-<div id="mainbloc">
+<div id="main">
 <!-- TMPL_IF NAME="op" -->
 <h1>Create Routing List</h1>
 <!-- TMPL_ELSE -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues-full.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues-full.tmpl
index 4f505404c3..57425835f6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues-full.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues-full.tmpl
@@ -1,5 +1,6 @@
-<!-- TMPL_INCLUDE NAME="serials-top.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
 
 <!-- TMPL_UNLESS name="popup" -->
 	<h1 class="serial">Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h1>
@@ -47,6 +48,7 @@
 			<!-- /TMPL_LOOP -->
 		</table>
 	</div>
+</div>
 	<!--/TMPL_LOOP -->
 <script language="JavaScript" type="text/javascript">
 active(<!-- TMPL_VAR name="yearmin" -->);
@@ -63,6 +65,6 @@ function active(numlayer)
 	}
 }
 
-</script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues.tmpl
index 16a13d2384..6a38f41700 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues.tmpl
@@ -1,7 +1,6 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
 
 <h1>Issues for a subscription</h1>
 <!-- TMPL_LOOP name="subscription_LOOP" -->
@@ -71,7 +70,7 @@
 			</b>
 		</p>
 		<p>Last renewal of subscription was <b><!-- TMPl_VAR name="startdate" --></b></p>
-		<!-- TMPL_IF name="enddate" --><p><b>This subscription is now ended. The last issue was recieved on <!-- TMPL_VAR name="enddate" --></b></p><!-- /TMPL_IF name="enddate" -->
+		<!-- TMPL_IF name="enddate" --><p><b>This subscription is now ended. The last issue was received on <!-- TMPL_VAR name="enddate" --></b></p><!-- /TMPL_IF name="enddate" -->
 	<!--TMPL_UNLESS Name=fullinfo -->
 		<p><!-- TMPL_VAR name="notes" --></p>
 		<!-- TMPL_IF name="opacnote" -->
@@ -80,10 +79,10 @@
 				<!-- TMPL_VAR name="opacnote" -->
 			</p>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="recievedlist" -->
-			<h3 class="serial">Recieved issues</h2>
+		<!-- TMPL_IF name="receivedlist" -->
+			<h3 class="serial">received issues</h2>
 			<p>
-				<!-- TMPL_VAR name="recievedlist" -->
+				<!-- TMPL_VAR name="receivedlist" -->
 			</p>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_IF name="missinglist" -->
@@ -95,21 +94,13 @@
 	</div>
 	<!-- /TMPL_UNLESS -->
 <!-- /TMPL_LOOP -->
-</div>
+
 <div id="action">
-	<form action="/cgi-bin/koha/serials/serials-home.pl">
-		<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
-		<input type="submit" value="Subscriptions" />
-	</form>
-	<form action="/cgi-bin/koha/catalogue/MARCdetail.pl" >
-		<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
-		<input type="submit" value="Back to biblio" />
-	</form>
+	
 	<form action="/cgi-bin/koha/serials/serial-issues.pl">
 		<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->">
 		<input type="hidden" name="selectview" value="full">
 		<input type="submit" value="Complete view">
 	</form>
 </div>
-
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl
index 57600f6138..578d2564bb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl
@@ -1,8 +1,8 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials <!-- TMPL_VAR name="biblionumber" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
 
+
 <h1>Serials</h1>
 <div id="serials_home">
 	<h2>Serials subscriptions</h2>
@@ -11,7 +11,7 @@
 <!-- /TMPL_IF -->
 
     <table>
-        <tr>
+        <tr><th>Biblionumber</th>
             <th>ISSN</th>
             <th>Title</th>
             <th>
@@ -25,6 +25,9 @@
                 <input type="hidden" name="routing" value="<!-- TMPL_VAR NAME="routing" -->" />
             <!-- /TMPL_IF -->
             <input type="hidden" name="searched" value="1" />
+	<td>
+                <input type="text" size=10 maxlength=15 name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" title="type biblionumber here to filter subscription">
+            </td>
             <td>
                 <input type="text" size=10 maxlength=11 name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->" title="type ISSN here to filter subscription">
             </td>
@@ -39,75 +42,45 @@
             </td>
         </tr>
         <!-- TMPL_LOOP name="subscriptions" -->
-            <tr>
-                <!-- TMPL_IF name="toggle" -->
-                    <td class="hilighted">
+	 <!-- TMPL_IF name="toggle" -->
+            <tr class="hilighted">
                 <!-- TMPL_ELSE -->
-                    <td>
-                <!-- /TMPL_IF -->
+	<tr>
+	          <!-- /TMPL_IF -->
+                    
+               <td><a href="/cgi-bin/koha/cataloguing/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button serial" title="Biblio"><!-- TMPL_VAR name="biblionumber" --></a></td>
+       <td>
                 <!-- TMPL_IF name="ISSN" -->
-                    <a href="serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button serial" title="Issues history"><!-- TMPL_VAR name="ISSN" --></a>
+                   <a href="serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button serial" title="Issues history"><!-- TMPL_VAR name="ISSN" --></a>   
                 <!-- /TMPL_IF -->
-                </td>
-                <!-- TMPL_IF name="toggle" -->
-                    <td class="hilighted">
-                <!-- TMPL_ELSE -->
+             </td>
+               
                     <td>
-                <!-- /TMPL_IF -->
+            
                 <!-- TMPL_IF name="title" -->
                     <!-- TMPL_VAR name="title" -->
                 <!-- TMPL_ELSE -->
                     |
                 <!-- /TMPL_IF -->
                 </td>
-                <!-- TMPL_IF name="toggle" -->
-                    <td class="hilighted">
-                <!-- TMPL_ELSE -->
+                
                     <td>
-                <!-- /TMPL_IF -->
+             
                 <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
                 </td>
                 <!-- TMPL_IF NAME="routing" -->
-                    <!-- TMPL_IF name="toggle" -->
-                        <td class="hilighted">
-                    <!-- TMPL_ELSE -->
                         <td>
-                    <!-- /TMPL_IF -->
                         <a href="routing.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" --><!-- TMPL_UNLESS NAME="routingedit" -->&op=new<!-- /TMPL_UNLESS -->">Routing List</a>
                     </td>
                 <!-- TMPL_ELSE -->
-                <!-- TMPL_IF NAME="alt_links" -->
-                        <!-- TMPL_IF name="toggle" -->
-                            <td class="hilighted">
-                        <!-- TMPL_ELSE -->
-                        <td>
-                        <!-- /TMPL_IF -->
-                            <a href="alt_subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button serial" title="subscription detail">Detail</a>
-                        </td>
-                        <!-- TMPL_IF name="toggle" -->
-                            <td class="hilighted">
-                        <!-- TMPL_ELSE -->
                             <td>
-                        <!-- /TMPL_IF -->
-                        <a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button serial" title="receive issues for this subscription">Receive</a>
-                        </td>			      
-                <!-- TMPL_ELSE -->
-                        <!-- TMPL_IF name="toggle" -->
-                            <td class="hilighted">
-                        <!-- TMPL_ELSE -->
-                            <td>
-                        <!-- /TMPL_IF -->
                             <a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button serial" title="subscription detail">Detail</a>
                         </td>
-                        <!-- TMPL_IF name="toggle" -->
-                            <td class="hilighted">
-                        <!-- TMPL_ELSE -->
                             <td>
-                        <!-- /TMPL_IF -->
-                            <a href="serials-recieve.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button serial" title="receive issues for this subscription">Receive</a>
+                            <a href="serials-receive.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button serial" title="receive issues for this subscription">Receive</a>
                         </td>
                 <!-- /TMPL_IF -->
-                <!-- /TMPL_IF -->
+
             </tr>
         <!-- /TMPL_LOOP -->
     </table>
@@ -121,5 +94,6 @@
         <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
 </div>
+
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/serials-receive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/serials-receive.tmpl
new file mode 100644
index 0000000000..8ce8e39653
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/serials-receive.tmpl
@@ -0,0 +1,187 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
+
+
+
+
+<!--------------------------MAIN BODY OF PAGE-------------------------->
+
+<h1 class="serial">Subscription for <!-- TMPL_VAR name="bibliotitle" --></h1>
+<a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button serial" title="detail of the subscription">Subscription</a>
+<a href="/cgi-bin/koha/serials/serials-home.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button serial" title="all subscriptions on <!-- TMPL_VAR name="title" -->">Subscriptions</a>
+<a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button serial" title="go to <!-- TMPL_VAR name="title" -->">Back to biblio</a>
+
+<div id="bloc25">
+<h2 class="serial">waited or late numbers</h2>
+    <form method="post" name="f" id="f" action="serials-receive.pl">
+        <input type="hidden" name="op" value="serialchangestatus">
+        <input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->">
+        <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
+        <input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
+    <table class="small">
+    <tr>
+        <th class="serial">
+            Numbered
+        </th>
+       <th class="serial">
+            Published on
+        </th>	
+        <th class="serial">
+            Planned for
+        </th>
+        <th class="serial">
+            Status
+        </th>
+        <th class="serial">
+            Notes
+        </th>
+    </tr>
+    <!-- TMPL_LOOP name="serialslist" -->
+        <tr>
+            <td>
+                <input type="text" name="serialseq" value="<!-- TMPL_VAR name="serialseq" -->" size=30 maxlength=100>
+            </td>
+	  <td>
+                <input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size=10 maxlength=15>
+            </td>
+            <td>
+                <input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size=10 maxlength=15>
+            </td>
+            <td>
+                <input type="hidden" id="serialidnumber" name="serialid" value="<!-- TMPL_VAR name="serialid" -->">
+                <select name="status" size="1"   <!--TMPL_IF name="serialsadditems" -->onChange="javascript:AddItemRefresh();"<!--/TMPL_IF-->>
+                    <!--TMPL_IF name="status1" -->
+                        <option value="1" selected>Waited</option>
+                    <!-- /TMPL_IF -->
+                    <!--TMPL_IF name="status2" -->
+                        <option value="2" selected>Arrived</option>
+                    <!-- TMPL_ELSE -->
+                        <option value="2">Arrived</option>
+                    <!-- /TMPL_IF -->
+                    <!--TMPL_IF name="status3" -->
+                        <option value="3" selected>Late</option>
+                    <!-- TMPL_ELSE -->
+                        <option value="3">Late</option>
+                    <!-- /TMPL_IF -->
+                    <!--TMPL_IF name="status4" -->
+                        <option value="4" selected>Missing</option>
+                    <!-- TMPL_ELSE -->
+                        <option value="4">Missing</option>
+                    <!-- /TMPL_IF -->
+                    <!--TMPL_IF name="status5" -->
+                        <option value="5" selected>Not published</option>
+                    <!-- TMPL_ELSE -->
+                        <option value="5">Not published</option>
+                    <!-- /TMPL_IF -->
+                    <!--TMPL_IF name="status6" -->
+                        <option value="6" selected>Delete</option>
+                    <!-- TMPL_ELSE -->
+                        <option value="6">Delete</option>
+                    <!-- /TMPL_IF -->
+                </select>
+            </td>
+            <td>
+                <input type="text" name="notes" value="<!-- TMPL_VAR name="notes" -->" size=20 maxlength=255>
+            </td>
+<!--TMPL_IF name="serialsadditems" -->
+	<td>    <input type="hidden" id="serial<!-- TMPL_VAR name="serialid" -->" name="itemnumber" value="<!-- TMPL_VAR name="itemnumber" -->" />
+		<input type="hidden" id="holdingbranch<!-- TMPL_VAR name="serialid" -->" name="holdingbranch" value="" />
+	             <a  style="display:none;" href="javascript:AddItem('<!-- TMPL_VAR name="scriptaddserials" -->',<!-- TMPL_VAR name="serialid" -->)" name="addbutton" class="button serial" onblur="javascript:AddItemRefresh();">Add item</a>
+	</td>
+<!--/TMPL_IF-->     
+            <td>
+                <a href="javascript:PrintList(<!-- TMPL_VAR name="subscriptionid" -->,'<!-- TMPL_VAR name="serialseq" -->')" class="button serial">print</a>
+            </td>
+        </tr>
+    <!-- /TMPL_LOOP -->
+    <!-- TMPL_UNLESS name="hassubscriptionexpired" -->
+        <tr>
+            <td>
+                Manual issue <input type="text" name="serialseq" size=30 maxlength=100>
+            </td>
+ <td>
+                <input type="text" name="publisheddate" size=10 maxlength=15>
+            </td>
+            <td>
+                <input type="text" name="planneddate" size=10 maxlength=15>
+            </td>
+            <td>
+                <input type="hidden" name="serialid" value="0">
+                <select name="status" size="1" <!--TMPL_IF name="serialsadditems" -->onChange="javascript:AddItemRefresh();"<!--/TMPL_IF-->>
+                        <option value="2">Arrived</option>
+                        <option value="3" selected>Late</option>
+                        <option value="4">Missing</option>
+                </select>
+            </td>
+      <!--TMPL_IF name="serialsadditems" -->
+	<td>    <input type="hidden" id="serial0" name="itemnumber" value="0" />
+		<input type="hidden" id="holdingbranch0" name="holdingbranch" value="" />
+	             <a  style="display:none;" href="javascript:AddItem('<!-- TMPL_VAR name="scriptaddserials" -->',0)" name="addbutton" class="button serial" onblur="javascript:AddItemRefresh();">Add item</a>
+	</td>
+<!--/TMPL_IF-->   
+	
+   </tr>
+	
+    <!-- /TMPL_UNLESS -->
+    </table>
+    <input type="submit" value="Save changes" accesskey="w" class="button serial">
+    <!-- TMPL_IF name="hassubscriptionexpired" -->
+        <p>Subscription has expired. Waited last issue status can't be changed. <a href="#" onClick="popup()" class="button serial">Renew</a> your subscription</p>
+    <!-- /TMPL_IF -->
+    </form>
+</div>
+
+<div id="bloc25">
+    <h2 class="serial">Subscription summary</h2>
+    <form method="post" name="f" action="serials-receive.pl">
+        <input type="hidden" name="op" value="modsubscriptionhistory">
+        <input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->">
+        <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
+        <input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
+        <p><label>Librarian</label><!-- TMPL_VAR name="user" --></p>
+        <p><label class="label100">Beginning date (*)</label><input type="text" name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" READONLY></p>
+        <p><label class="label100">End date</label><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" READONLY></p>
+        <p>received issues</p>
+        <p>&nbsp;<textarea name="receivedlist" COLS=60 ROWS=5><!-- TMPL_VAR name="receivedlist" --></textarea></p>
+        <p>Missing issues</p>
+        <p>&nbsp;<textarea name="missinglist" COLS=60 ROWS=2><!-- TMPL_VAR name="missinglist" --></textarea></p>
+        <!--TMPL_IF Name="notissuedlist"-->
+        <p>Not issued</p>
+        <p>&nbsp;<textarea name="notissuedlist" COLS=60 ROWS=2><!-- TMPL_VAR name="notissuedlist" --></textarea></p>
+        <!--/TMPL_IF-->
+        <p>Opac's note</p>
+        <p>&nbsp;<textarea name="opacnote" COLS=60 ROWS=5><!-- TMPL_VAR name="opacnote" --></textarea></p>
+        <input type="submit" value="Save changes" class="button serial">
+    </form>
+</div>
+
+</table>
+<script language="JavaScript" type="text/javascript">
+
+function popup() {
+     window.open("subscription-renew.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid">","subscription_renewal",'width=700,height=400,toolbar=false,scrollbars=yes');
+}
+function AddItem(itemscript,serial) {
+     window.open(itemscript+serial,"AddItem",'width=700,height=400,toolbar=no,scrollbars=yes,status=yes');
+
+}
+function PrintList(subscriptionid,serialseq) {
+
+    window.open("printlist.pl?subscriptionid="+subscriptionid+"&serialseq="+serialseq);
+}
+function AddItemRefresh(){
+var subf=document.getElementsByName('status');
+var adder=document.getElementsByName('addbutton');
+var itemnos=document.getElementsByName('itemnumber');
+     for (var s=0; s<subf.length; s++ ){
+	if (subf.item(s).value == 2 && itemnos.item(s).value==0){
+	adder.item(s).style.display = 'block';
+	}else{
+	adder.item(s).style.display = 'none';
+	}
+     }
+}
+
+</script>
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
index bc68f03965..d887277f5d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
@@ -1,28 +1,664 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!--TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
 
-<!--------------------------MAIN BODY OF PAGE-------------------------->
+
+
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
+
+
+<script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/calendar/calendar.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/calendar/calendar-en.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/calendar/calendar-setup.js"></script>
+<!-- **************************************************** -->
+
+
+<script type="text/javascript" language="javascript">
+// the english words used in display purposes
+var text = new Array('Number','Volume','Issue','Month','Week','Starting with:','Rollover at:','Choose Hemisphere:','Northern','Southern',
+'Autumn','Winter','Spring','Summer','Fall','Season','Year');
+var is_season = 0;
+var is_hemisphere = 1;
+
+// common pre defined number patterns
+function num_pattern() {
+var patternchoice = document.getElementById("numberpattern").value;
+	switch(patternchoice){
+	case "2":
+	 	document.f.add1.value=1;
+	 	document.f.add2.value=1;
+	 	document.f.add3.value=1;
+		document.f.every1.value=12;
+		document.f.every2.value=1;
+		document.f.every3.value=1;
+		document.f.whenmorethan1.value=9999999;
+		document.f.whenmorethan2.value=12;
+		document.f.whenmorethan3.value=4;
+		document.f.setto1.value=0;
+		document.f.setto2.value=1;
+		document.f.setto3.value=1;
+		document.f.lastvalue1.value=1;
+		document.f.lastvalue2.value=1;
+		document.f.lastvalue3.value=1;
+		document.f.numberingmethod.value='Vol {X}, No {Y}, Issue {Z}';
+		moreoptions(text[1],text[0],text[2]);
+		display_table(0); // toggle info box on (1) or off (0)
+		break;
+	case "3":
+	 	document.f.add1.value=1;
+	 	document.f.add2.value=1;
+	 	document.f.add3.value='';
+		document.f.every1.value=12;
+		document.f.every2.value=1;
+		document.f.every3.value='';
+		document.f.whenmorethan1.value=9999999;
+		document.f.whenmorethan2.value=12;
+		document.f.whenmorethan3.value='';
+		document.f.setto1.value=0;
+		document.f.setto2.value=1;
+		document.f.setto3.value='';
+		document.f.lastvalue1.value=1;
+		document.f.lastvalue2.value=1;
+		document.f.lastvalue3.value='';
+		document.f.numberingmethod.value='Vol {X}, No {Y}';
+		moreoptions(text[1],text[0]);
+		display_table(0);
+		break;
+	case "4":
+	 	document.f.add1.value=1;
+	 	document.f.add2.value=1;
+	 	document.f.add3.value='';
+		document.f.every1.value=12;
+		document.f.every2.value=1;
+		document.f.every3.value='';
+		document.f.whenmorethan1.value=9999999;
+		document.f.whenmorethan2.value=12;
+		document.f.whenmorethan3.value='';
+		document.f.setto1.value=0;
+		document.f.setto2.value=1;
+		document.f.setto3.value='';
+		document.f.lastvalue1.value=1;
+		document.f.lastvalue2.value=1;
+		document.f.lastvalue3.value='';
+		document.f.numberingmethod.value='Vol {X}, Issue {Y}';
+		moreoptions(text[1],text[2]);
+		display_table(0);
+		break;
+	case "5":
+	 	document.f.add1.value=1;
+	 	document.f.add2.value=1;
+	 	document.f.add3.value='';
+		document.f.every1.value=12;
+		document.f.every2.value=1;
+		document.f.every3.value='';
+		document.f.whenmorethan1.value=9999999;
+		document.f.whenmorethan2.value=12;
+		document.f.whenmorethan3.value='';
+		document.f.setto1.value=0;
+		document.f.setto2.value=1;
+		document.f.setto3.value='';
+		document.f.lastvalue1.value=1;
+		document.f.lastvalue2.value=1;
+		document.f.lastvalue3.value='';
+		document.f.numberingmethod.value='No {X}, Issue {Y}';
+		moreoptions(text[0],text[2]);
+		display_table(0);
+		break;
+	case "6":
+		var d = new Date();
+		var sYear = d.getFullYear();
+	 	document.f.add1.value=1;
+	 	document.f.add2.value='1';
+	 	document.f.add3.value='';
+		document.f.every1.value=4;
+		document.f.every2.value='1';
+		document.f.every3.value='';
+		document.f.whenmorethan1.value=9999999;
+		document.f.whenmorethan2.value='4';
+		document.f.whenmorethan3.value='';
+		document.f.setto1.value=0;
+		document.f.setto2.value='1';
+		document.f.setto3.value='';
+		document.f.lastvalue1.value=sYear;
+		document.f.lastvalue2.value='1';
+		document.f.lastvalue3.value='';
+		document.f.periodicity.value='8';
+		document.f.numberingmethod.value='{Y} {X}';
+		moreoptions_seasons(text[15],sYear);
+		display_table(0);
+		is_season = 1;
+		break;
+	case "7":
+		display_table(1);
+		document.f.irreg_check.value=1; 
+		break;
+	default:
+	 	document.f.add1.value=1;
+	 	document.f.add2.value='';
+	 	document.f.add3.value='';
+		document.f.every1.value=1;
+		document.f.every2.value='';
+		document.f.every3.value='';
+		document.f.whenmorethan1.value=9999999;
+		document.f.whenmorethan2.value='';
+		document.f.whenmorethan3.value='';
+		document.f.setto1.value=0;
+		document.f.setto2.value='';
+		document.f.setto3.value='';
+		document.f.lastvalue1.value=1;
+		document.f.lastvalue2.value='';
+		document.f.lastvalue3.value='';
+		document.f.numberingmethod.value='{X}';
+		moreoptions_daily_check(text[0]);
+		document.f.irreg_check.value=1;
+		display_table(0);
+		break;
+	}
+}
+
+function display_table(n) {
+	if(n==1){
+		document.getElementById("basetable").style.display = 'block';
+	} else {
+		document.getElementById("basetable").style.display = 'none';
+	}
+}
+
+function modify_num_pattern() {
+	document.getElementById("numberpattern").value = '<!-- TMPL_VAR NAME="numberpattern" -->';
+	num_pattern();
+	
+	document.f.add1.value='<!-- TMPL_VAR NAME="add1" -->';
+	document.f.add2.value='<!-- TMPL_VAR NAME="add2" -->';
+	document.f.add3.value='<!-- TMPL_VAR NAME="add3" -->';
+	document.f.every1.value='<!-- TMPL_VAR NAME="every1" -->';
+	document.f.every2.value='<!-- TMPL_VAR NAME="every2" -->';
+	document.f.every3.value='<!-- TMPL_VAR NAME="every3" -->';
+	document.f.whenmorethan1.value='<!-- TMPL_VAR NAME="whenmorethan1" -->';
+	document.f.whenmorethan2.value='<!-- TMPL_VAR NAME="whenmorethan2" -->';
+	document.f.whenmorethan3.value='<!-- TMPL_VAR NAME="whenmorethan3" -->';
+	document.f.setto1.value='<!-- TMPL_VAR NAME="setto1" -->';
+	document.f.setto2.value='<!-- TMPL_VAR NAME="setto2" -->';
+	document.f.setto3.value='<!-- TMPL_VAR NAME="setto3" -->';
+	document.f.lastvalue1.value='<!-- TMPL_VAR NAME="lastvalue1" -->';
+	document.f.lastvalue2.value='<!-- TMPL_VAR NAME="lastvalue2" -->';
+	document.f.lastvalue3.value='<!-- TMPL_VAR NAME="lastvalue3" -->';
+	document.f.numberingmethod.value='<!-- TMPL_VAR NAME="numberingmethod" -->';
+
+	var more_strY;
+	var more_strZ;
+	<!-- TMPL_IF NAME="add2" -->
+	if(<!-- TMPL_VAR NAME="add2" --> > 0){
+		more_strY="Y";
+	}
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="add3" -->
+	if(<!-- TMPL_VAR NAME="add3" --> > 0){
+		more_strZ="Z";
+	}
+	<!-- /TMPL_IF -->
+
+	document.f.lastvaluetemp1.value='<!-- TMPL_VAR NAME="lastvalue1" -->';
+	if(more_strY){
+		document.f.lastvaluetemp2.value='<!-- TMPL_VAR NAME="lastvalue2" -->';
+	document.f.whenmorethantemp2.value='<!-- TMPL_VAR NAME="whenmorethan2" -->';
+	}
+	if(more_strZ){
+		document.f.lastvaluetemp3.value='<!-- TMPL_VAR NAME="lastvalue3" -->';
+	document.f.whenmorethantemp3.value='<!-- TMPL_VAR NAME="whenmorethan3" -->';
+	}
+}
+
+// a pre check with more options to see if 'number' and '1/day' are chosen
+function moreoptions_daily_check(x) {
+	var periodicity = document.f.periodicity.value;
+	var errortext='';
+	if(periodicity == 1){
+		document.getElementById("irregularity").innerHTML = '';
+		document.getElementById("more_options").innerHTML = '';
+		var daynames = new Array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday');
+		errortext ="Please indicate which days of the week you <b>DO NOT<\/b> expect to receive issues.<br \/>";
+		for(var j=0;j<daynames.length;j++){
+			errortext +="<input type='checkbox' name='irregular' id='irregular"+(j+1)+"' value='"+(j+1)+"' />"+daynames[j]+" &nbsp; ";
+		}
+	var error = errortext;
+	document.getElementById("irregularity").innerHTML = error;
+	} else {
+		document.getElementById("irregularity").innerHTML = '';
+		document.getElementById("more_options").innerHTML = '';
+		moreoptions(x);
+	}
+}
+
+// to dispaly the more options section
+function moreoptions(x,y,z){
+document.getElementById("irregularity").innerHTML = '';
+document.getElementById("more_options").innerHTML = '';
+var textbox = '';
+	// alert("X: "+x+"Y: "+y+"Z: "+z);
+	if(x){
+		textbox +="<table>\n<tr><td>&nbsp;<\/td><td>"+x+"<\/td>";
+		if(y){
+			textbox +="<td>"+y+"<\/td>";
+			if(z){
+				textbox +="<td>"+z+"<\/td>";
+			}
+		}
+		textbox +="<\/tr>\n";
+		textbox +="<tr><td>"+text[5]+"<\/td><td><input type='text' name='lastvaluetemp1' size='4' onkeyup='moreoptionsupdate(\"lastvalue1\")'><\/td>\n";
+		if(y){
+			textbox +="<td><input type='text' name='lastvaluetemp2' size='4' onkeyup='moreoptionsupdate(\"lastvalue2\")'><\/td>\n";
+			if(z){
+				textbox +="<td><input type='text' name='lastvaluetemp3' size='4' onkeyup='moreoptionsupdate(\"lastvalue3\")'><\/td>\n";
+			}
+		}
+		textbox +="<\/tr>\n";
+		if(y){
+			textbox +="<tr><td>"+text[6]+"<\/td>";
+			textbox +="<td><a href='javascript:irregularity_check()'>Irregularity?<\/a><\/td>\n";
+			textbox +="<td><input type='text' name='whenmorethantemp2' size='4' onkeyup='moreoptionsupdate(\"whenmorethan2\",1)'><\/td>\n";
+			if(z){
+				textbox +="<td><input type='text' name='whenmorethantemp3' size='4' onkeyup='moreoptionsupdate(\"whenmorethan3\",1)'><\/td>\n";
+			}
+			textbox +="<\/tr>";
+		}
+		textbox +="<\/table>\n";
+	}
+	document.getElementById("more_options").innerHTML = textbox;
+}
+
+function hemispheres(chosen){
+var selbox = document.getElementById("season1");
+    if(selbox){
+	var selboxselected = selbox.options[selbox.selectedIndex].value;
+	selbox.options.length = 0;
+
+	if (chosen == "1") {
+		selbox.options[selbox.options.length] = new Option(text[11],'1');
+		selbox.options[selbox.options.length] = new Option(text[12],'2');
+		selbox.options[selbox.options.length] = new Option(text[13],'3');
+		selbox.options[selbox.options.length] = new Option(text[14],'4');
+		is_hemisphere = 1;
+		selbox.options[selboxselected-1].selected = true;
+	}
+
+	if (chosen == "2") {
+		selbox.options[selbox.options.length] = new Option(text[13],'1');
+		selbox.options[selbox.options.length] = new Option(text[10],'2');
+		selbox.options[selbox.options.length] = new Option(text[11],'3');
+		selbox.options[selbox.options.length] = new Option(text[12],'4');
+		is_hemisphere = 2;
+		selbox.options[selboxselected-1].selected = true;
+	}
+    }
+}
+
+// to dispaly the more options section for seasons
+function moreoptions_seasons(x,y){
+document.getElementById("irregularity").innerHTML = '';
+document.getElementById("more_options").innerHTML = '';
+var textbox = '';
+	// alert("X: "+x+"Year: "+y);
+	if(x){
+		var hemi_select = parseInt('<!-- TMPL_VAR NAME="hemisphere" -->');
+		textbox +="<table>\n<tr><td>"+ text[7]  +"<\/td><td colspan='2'><select name='hemisphere' onchange='hemispheres(this.options[this.selectedIndex].value)'>";
+		for(var i = 1; i <= 2; i++){
+			textbox +="<option value='"+i+"'";
+			if(i == hemi_select){
+				textbox += " selected "
+			}
+			textbox +=">"+text[i+7]+"<\/option>";
+		}
+		textbox +="<\/select><\/td><\/tr>\n";
+		textbox +="<tr><td>&nbsp;<\/td><td>"+x+"<\/td>";
+		textbox +="<td>"+text[16]+"<\/td>";
+		textbox +="<\/tr>\n";
+		textbox +="<tr><td>"+text[5]+"<\/td><td><select name='lastvaluetemp2' id='season1' onchange='moreoptionsupdate(\"lastvalue2\")'>";
+		for(var j = 1; j <= 4; j++){
+			textbox +="<option value='"+j+"'>"+text[j+10]+"<\/option>";
+		}
+		textbox +="<\/select><\/td><td><select name='lastvaluetemp1' onchange='moreoptionsupdate(\"lastvalue1\")'>";
+		for(var k = parseInt(y); k <= parseInt(y)+15; k++){
+			textbox +="<option value='"+k+"'>"+k+"<\/option>";
+		}
+		textbox +="<\/select><\/td><\/tr>\n";
+		textbox +="<tr><td>"+text[6]+"<\/td>";
+		textbox +="<td><a href='javascript:irregularity_check()'>Irregularity?<\/a><\/td>\n";
+		textbox +="<td><input type='text' name='whenmorethantemp2' size='4' onkeyup='moreoptionsupdate(\"whenmorethan2\",1)'><\/td>\n";
+    	        textbox +="<\/tr><\/table>\n";
+	}
+	document.getElementById("more_options").innerHTML = textbox;
+}
+
+function irregularity_check(){
+	document.f.irreg_check.value = 1; // Irregularity button now pushed
+	var periodicity = document.f.periodicity.value;
+	var rollover = document.f.whenmorethantemp2.value;
+	if(document.f.whenmorethantemp3){
+		rollover = document.f.whenmorethantemp3.value;
+	}
+	var error='';
+	var toobig;
+	var expected; 
+	var errortext = "<b>Warning irregularity detected<\/b><br \/>";
+	switch(periodicity){
+	case "1":
+		if(rollover < 365) expected =365;
+		if(rollover > 365) {
+			expectedover=365;
+			toobig=1;
+		}
+		break;
+	case "2":
+		if(rollover < 52) expected =52;
+		if(rollover > 52){
+			expectedover=52;
+			toobig=1;
+		}
+		break;
+	case "3":
+		if(rollover < 26) expected =26;
+		if(rollover > 26){
+			expectedover=26;
+			toobig=1;
+		}
+		break;
+	case "4":
+		if(rollover < 17) expected =17;
+		if(rollover > 17){
+			expectedover=17;
+			toobig=1;
+		}
+		break;
+	case "5":
+		if(rollover < 12) expected =12;
+		if(rollover > 12){
+			expectedover=12;
+			toobig=1;
+		}
+		break;
+	case "6":
+		if(rollover < 6) expected =6;
+		if(rollover > 6){
+			expectedover=6;
+			toobig=1;
+		}
+		break;
+	case "7":
+		if(rollover < 4) expected =4;
+		if(rollover > 4){
+			expectedover=4;
+			toobig=1;
+		}
+		break;
+	case "8":
+		if(rollover < 4) expected =4;
+		if(rollover > 4){
+			expectedover=4;
+			toobig=1;
+		}
+		break;
+	case "9":
+		if(rollover < 2) expected =2;
+		if(rollover > 2){
+			expectedover=2;
+			toobig=1;
+		}
+		break;
+	case "10":
+		if(rollover < 1) expected =1;
+		if(rollover > 1){
+			expectedover=1;
+			toobig=1;
+		}
+		break;
+	default:
+		break;
+	}
+	if(expected){
+		if(expected == 365){
+			var daynames = new Array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday');
+			errortext +="Please indicate which days of the week you <b>DO NOT<\/b> expect to receive issues.<br \/>";
+			for(var j=0;j<daynames.length;j++){
+				errortext +="<input type='checkbox' name='irregular' id='irregular"+(j+1)+"' value='"+(j+1)+"' />"+daynames[j]+" &nbsp; ";
+			}
+			error=errortext;
+		} else {
+			errortext +=expected+" issues expected "+rollover+" were entered. <br \/>Please indicate which date(s) an issue is not expected<br \/>";
+			var count=0;
+			for(var i=rollover;i<expected;i++){
+				errortext +="<select name='irregular' id='irregular"+count+"' onchange='display_example(expected)'>\n";
+				errortext +=irregular_options(periodicity);
+				errortext +="<\/select>\n";
+				count++;
+			}
+			error=errortext;
+		}
+	}
+	if(toobig){
+		errortext +=expectedover+" issues expected "+rollover+" were entered.<br \/> You seem to have indicated more issues per year than expected.";
+		error=errortext;
+	}
+	if(error.length ==0){
+		error='No irregularities noticed';
+	}
+	display_example(expected);
+	document.getElementById("irregularity").innerHTML = error;
+}
+
+function irregular_options(periodicity){
+	var titles;
+	var count;
+<!-- TMPL_IF NAME="weekarrayjs" -->
+	var weeks = new Array(<!-- TMPL_VAR NAME="weekarrayjs" -->); 
+<!-- /TMPL_IF -->
+	var months = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
+	var seasons = new Array('Autumn','Winter','Spring','Summer','Fall');
+	var errortext='';
+	if(periodicity == 1) {
+		expected = 366;
+		titles = "Day";
+		count = 1;
+	}
+	if(periodicity == 2 || periodicity == 3 || periodicity == 4) { 
+		expected = 52;
+	<!-- TMPL_IF NAME="weekarrayjs" -->
+		titles = weeks;
+		count = <!-- TMPL_VAR NAME="weekno" -->;
+	<!-- TMPL_ELSE -->
+		titles = "Week";
+		count = 1;
+	<!-- /TMPL_IF -->
+	}
+	if(periodicity == 5 || periodicity == 6 || periodicity == 7 || periodicity == 8 || periodicity == 9) {
+		if(periodicity == 8) {
+			is_season = 1; // setting up from edit page
+		} 
+		if(is_season){
+			titles = seasons;
+			expected = 4;
+			if(is_hemisphere == 2){
+				count = 2;
+			} else {
+				count = 1;
+			}
+		} else {
+			titles = months;
+			expected = 12;
+			count = 1;
+		}
+	}
+	for(var j=1;j<=expected;j++){
+		if(isArray(titles)){
+			if(count>expected){
+				count = count-expected;
+			}
+			if(is_season && is_hemisphere == 1){
+				errortext +="<option value='"+((count*3)-2)+"'>"+titles[j]+"<\/option>\n";
+// alert("value: "+((count*3)-2)+" title: "+titles[j]);
+			} else if(is_season && is_hemisphere == 2){
+				errortext +="<option value='"+((count*3)-2)+"'>"+titles[j-1]+"<\/option>\n";
+// alert("value: "+((count*3)-2)+" title: "+titles[j-1]);
+			} else {
+				errortext +="<option value='"+count+"'>"+titles[j-1]+"<\/option>\n";
+			}
+			count++;
+		} else {
+			errortext +="<option value='"+j+"'>"+titles+" "+j+"<\/option>\n";
+		}
+	}
+	return errortext;
+}
+
+function irregular_order(){
+	var irregular = '<!-- TMPL_VAR NAME="irregularity" -->';
+	var periodicity = document.f.periodicity.value;
+	var irregarray = irregular.split('|');
+	if(periodicity ==1){
+		for(j=0;j<irregarray.length;j++){
+		document.getElementById("irregular"+irregarray[j]).checked = true; 
+		}
+	} else {
+		for(i=0;i<irregarray.length;i++){    
+			document.getElementById("irregular"+i).value = irregarray[i];
+		}
+	}
+}
+
+function display_example(expected){
+	var startfrom1 = parseInt(document.f.lastvalue1.value);
+	var startfrom2 = parseInt(document.f.lastvalue2.value);
+	var startfrom3 = parseInt(document.f.lastvalue3.value);
+	var every1 = parseInt(document.f.every1.value);
+	var every2 = parseInt(document.f.every2.value);
+	var every3 = parseInt(document.f.every3.value);
+	var numberpattern = document.f.numberingmethod.value;
+	var whenmorethan2 = parseInt(document.f.whenmorethan2.value);
+	var whenmorethan3 = parseInt(document.f.whenmorethan3.value);
+	var setto2 = parseInt(document.f.setto2.value);
+	var setto3 = parseInt(document.f.setto3.value);
+	var displaytext = 'Based on the information<br \/>entered the Numbering Pattern<br \/>will look like this<br \/>\n';
+	if(startfrom3>0){
+		var count=startfrom3-1;
+		var count2=startfrom2;
+		for(var i=0;i<12;i++){
+			if(count>=whenmorethan3){
+				count=setto3;
+				if(count2>=whenmorethan2){
+					startfrom1++;
+					count2=setto2;
+				} else {
+					count2++;
+				}
+			} else {
+				count++;
+			}
+			displaytext += numberpattern.replace(/{Z}/,count)+'\n';
+			displaytext = displaytext.replace(/{Y}/,count2)+'<br \/>\n';
+			displaytext = displaytext.replace(/{X}/,startfrom1)+'<br \/>\n';
+
+		}
+	}
+	if(startfrom2>0 && !startfrom3){
+		var count=startfrom2-1;
+		for(var i=0;i<12;i++){
+			if(count>=whenmorethan2){
+				startfrom1++;
+				count=setto2;
+			} else {
+				count++;
+			}
+
+			if(is_season){
+				if(is_hemisphere == 2){
+					if(count == 1) {
+						displaytext += numberpattern.replace(/{Y}/,text[count+12])+'\n';
+					} else {
+						displaytext += numberpattern.replace(/{Y}/,text[count+8])+'\n';
+					}
+				} else {
+				displaytext += numberpattern.replace(/{Y}/,text[count+10])+'\n';
+				}
+			} else {
+				displaytext += numberpattern.replace(/{Y}/,count)+'\n';
+			}
+			displaytext = displaytext.replace(/{X}/,startfrom1)+'<br \/>\n';
+		}
+	}
+	if(startfrom1>0 && !startfrom2 && !startfrom3){
+		for(var i=startfrom1;i<(startfrom1+12);i=i+(1*every1)){
+			startfrom1 = i;
+			displaytext += numberpattern.replace(/{X}/,startfrom1)+'<br \/>\n';
+		}
+	}
+	displaytext = "<div style='padding: 5px; background-color: #CCCCCC'>"+displaytext+"<\/div>";
+	document.getElementById("displayexample").innerHTML = displaytext;
+}
+
+function isArray(obj) {
+   if (obj.constructor.toString().indexOf("Array") == -1)
+      return false;
+   else
+      return true;
+}
+
+function moreoptionsupdate(fieldnames,rollover){
+	fieldname = fieldnames;
+	fld = fieldname.length;
+	fld = fld-1;
+	fieldnametempnumber = fieldname.substr(fld);
+	//alert(fieldnametempnumber);
+	fieldnametemp = fieldname.slice(0,-1)+"temp"+fieldnametempnumber;
+	// alert(fieldnametemp);
+	eval("document.f."+fieldname+".value = document.f."+fieldnametemp+".value");
+	if(rollover){
+		eval("document.f.every"+(fieldnametempnumber-1)+".value = document.f."+fieldnametemp+".value");
+	}
+}
+
+
+function check_input(e){
+	var unicode=e.charCode? e.charCode : e.keyCode
+	if (unicode!=8 && unicode !=46){ // if key isn't backspace or delete
+		if (unicode<48||unicode>57) { // if not a number
+			alert("Needs to be entered in digit form -eg 10");
+			return false // disable key press
+		}
+	}
+}
+
+</script>
+
+<div id="main">
 <!-- TMPL_IF name="mod" -->
 	<h1>Modify subscription</h1>
 	<form method="post" name="f" action="subscription-detail.pl">
-		<input type="hidden" name="op" value="modsubscription" />
-		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
+		<input type="hidden" name="op" value="modsubscription">
+		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
 <!-- TMPL_ELSE -->
-	<h1>Add a subscription</h1>
+	<h1>Add a subscription (Serial Holdings Record)</h1>
 	<form method="post" name="f">
+		<input type="hidden" name="op" value="addsubscription">
 <!-- /TMPL_IF -->
-<div id="serials_subscription_add_information">
+		<input type="hidden" name="user" value="<!-- TMPL_VAR name="loggedinusername" -->">
+		<input type="hidden" name="irreg_check" value="0">
+
+
+<div id="bloc25">
 	<h2>Subscription information</h2>
-		<input type="hidden" name="op" value="addsubscription" />
-		<input type="hidden" name="user" value="<!-- TMPL_VAR name="loggedinusername" -->" />
-		<p>Librarian <!-- TMPL_VAR name="loggedinusername" --></p>
-		<p><label>Supplier</label><input type="text" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size=4 /> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled readonly />)<a href="#" onClick="FindAcqui(f)">...</a></p>
-		<p><label>Biblio</label><input type="text" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size=4 /> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled readonly />)<a href="#" onClick="Plugin(f)">...</a></p>
-		<p><label>Notes</label><textarea name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></p>
+	<table border="0" cellspacing="5" cellpadding="0">
+	<tr><td>Librarian:</td>
+	    <td><!-- TMPL_VAR name="loggedinusername" --></td></tr>
+	<tr><td><label>Supplier:</label></td>
+	    <td><input type="text" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="4"> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled readonly>) <a href="#" onClick="FindAcqui(f)">Search for a Supplier</a></td>
+	<tr><td><label>Biblio</label></td>
+	    <td><input type="text" id="biblionumber"  name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="4"> (<input type="text" id="title" name="title" value="<!-- TMPL_VAR name="title" -->" disabled readonly>) <a href="#" onClick="Plugin(f)">Search for Biblio</a> | <a href="#" onClick="AddBiblio()">Create Biblio</a></td>
+	<tr><td><label>Call Number</label></td>
+	    <td><input type="text" name="callnumber" value="<!-- TMPL_VAR name="callnumber" -->" size="20"></td></tr>
+	<tr><td><label>Notes</label></td>
+	    <td><textarea name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td></tr>
 		<!-- TMPL_IF name="letters" -->
-			<p><label>Enable issue alert</label>
+			<tr><td><label>Enable issue alert</label>
 				<select name="letter">
 					<option value=""></option>
 					<!-- TMPL_LOOP name="letters" -->
@@ -33,21 +669,56 @@
 						<!-- /TMPL_IF -->
 					<!-- /TMPL_LOOP -->
 				</select>
-			</p>
+			</td>
 		<!-- /TMPL_IF -->
-		<p><label>Distributed to </label><a href="#" onClick="DistributedTo()">...</a></p>
-		<p>warning</p>
+		<td><label>Distributed to </label><a href="#" onClick="DistributedTo()">...</a></td><tr>
+
+
+
+
+
+
+
+
+
+	<tr><td><b>Warning:</b></td>
+	    <td>
 		<ul>
-			<li>remember you <b>must</b> have created a biblio <b>before</b> creating a subscription</li>
+			<li>Remember you <b>must</b> have created a biblio <b>before</b> creating a subscription</li>
 			<li>You also must have selected a supplier if you want to ask for late issues</li>
-		</ul>
+		</ul></td></tr>
+	</table>
 </div>
-<div id="serials_subscription_add_planning">
+<div id="bloc25">
 	<h2>Planning</h2>
-	<p><label>Beginnning date:</label> <input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size=13 maxlength=10 /></p>
-	<p><label>Frequency (*)</label>
-			<select name="periodicity" size="1">
-				<option value="" selected>Unknown</option>
+	<table border="0" cellspacing="5" cellpadding="0">
+	<tr><td><label class="label100">This issue publishes on:</label></td>
+	    <td> <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="button2" style="cursor: pointer;"  />
+
+<input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size=13 maxlength=10 id="acqui_date" style="border-width: 0px;">
+<!-- both scripts for calendar must follow the input field --> 
+                                        <script type="text/javascript">
+                                            Calendar.setup({
+                                                inputField:"acqui_date",
+                                                ifFormat       :   "%d/%m/%Y",
+                                                button         :   "button2",
+                                                align          :   "Tl"
+                                            });
+                                        </script>
+                                        <script type="text/javascript">
+                                            Calendar.setup({
+                                                inputField     :   "acqui_date",
+                                                ifFormat       :   "%d/%m/%Y",
+                                                button         :   "acqui_date",
+                                                align          :   "Tl"
+                                            });
+                                        </script></td>
+	    <td rowspan="5"><div id="displayexample"></div></td></tr>
+	<tr><td><label class="label100">Frequency: (*)</label></td>
+	    <td>	<select name="periodicity" size="1">
+				<option value="" selected>-- please choose --</option>
+				<option value="">Unknown</option>
+
 				<!-- TMPL_IF name="periodicity1" -->
 					<option value="1" selected>1/day</option>
 				<!-- TMPL_ELSE -->
@@ -83,11 +754,17 @@
 				<!-- TMPL_ELSE -->
 					<option value="7">1/3 months (1/quarter)</option>
 				<!-- /TMPL_IF -->
-				<!-- periodicity8 is 1/quarter, exactly like periodicity7 -->
+				<!-- periodicity8 is 1/quarter, exactly like periodicity7 but will use it for seasonal option -->
+				<!-- TMPL_IF name="periodicity8" -->
+					<option value="8" selected>1/quarter (seasonal)</option>
+				<!-- TMPL_ELSE -->
+					<option value="8">1/quarter (seasonal)</option>
+				<!-- /TMPL_IF -->
+
 				<!-- TMPL_IF name="periodicity9" -->
 					<option value="9" selected>2/years</option>
 				<!-- TMPL_ELSE -->
-					<option value="9">2/years</option>
+					<option value="9">2/year</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="periodicity10" -->
 					<option value="10" selected>1/year</option>
@@ -100,9 +777,74 @@
 					<option value="11">1/2 years</option>
 				<!-- /TMPL_IF -->
 			</select>
-	</p>
-	<p><label>Arrives on</label>
-			<select name="dow" size="1">
+	</td></tr>
+	<tr><td><label class="label100">Numbering Pattern:</label></td>
+	    <td><select name="numbering_pattern" size="1" id="numberpattern" onchange="num_pattern()">
+		<option value="" selected>-- please choose --</option>
+		<!-- TMPL_IF name="numberpattern1" -->
+			<option value="1" selected>Number</option>
+		<!-- TMPL_ELSE -->
+			<option value="1">Number</option>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="numberpattern2" -->
+			<option value="2" selected>Volume, Number, Issue</option>
+		<!-- TMPL_ELSE -->
+			<option value="2">Volume, Number, Issue</option>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="numberpattern3" -->
+			<option value="3" selected>Volume, Number</option>
+		<!-- TMPL_ELSE -->
+			<option value="3">Volume, Number</option>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="numberpattern4" -->
+			<option value="4" selected>Volume, Issue</option>
+		<!-- TMPL_ELSE -->
+			<option value="4">Volume, Issue</option>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="numberpattern5" -->
+			<option value="5" selected>Number, Issue</option>
+		<!-- TMPL_ELSE -->
+			<option value="5">Number, Issue</option>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="numberpattern6" -->
+			<option value="6" selected>Seasonal only</option>
+		<!-- TMPL_ELSE -->
+	 		<option value="6">Seasonal only</option>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="numberpattern7" -->
+			<option value="7" selected>None of the above</option>
+		<!-- TMPL_ELSE -->
+	 		<option value="7">None of the above</option>
+		<!-- /TMPL_IF -->
+
+		</select>
+<div id="more_options"></div>
+<div id="irregularity"></div></td></tr>
+	<tr><td><label class="label100">Planned to arrive on: (*)</label></td>
+	    <td><img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="button1" style="cursor: pointer;"  />
+<input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size=13 maxlength=10 id="beginning_date" style="border-width: 0px;">
+<!-- both scripts for calendar must follow the input field --> 
+                                        <script type="text/javascript">
+                                            Calendar.setup({
+                                                inputField   : "beginning_date",
+                                                ifFormat     : "%d/%m/%Y",
+                                                button       : "button1",
+                                                align        : "Tl"
+                                            });
+                                        </script>
+                                        <script type="text/javascript">
+                                            Calendar.setup({
+                                                inputField   : "beginning_date",
+                                                ifFormat     : "%d/%m/%Y",
+                                                button       : "beginning_date",
+                                                align        : "Tl"
+                                            });
+                                        </script></td></tr>
+</table> 
+</div>
+
+<!--	<tr><td><label class="label100">Arrives on</label></td>
+	    <td>	<select name="dow" size="1">
 				<option value="">None</option>
 				<!-- TMPL_IF name="dow1" -->
 					<option value="1" selected>Monday</option>
@@ -139,21 +881,21 @@
 				<!-- TMPL_ELSE -->
 					<option value="7">Sunday</option>
 				<!-- /TMPL_IF -->
-			</select>
-</div>
-<div id="serials_subscription_add_length">
+			</select></td></tr> -->
+
+<div id="bloc25">
 	<h2>Subscription length</h2>
-	<p>* fill 1 from :</p>
-	<ul>
-		<p><label>Number of issues</label><input type="text" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->" /></p>
-		<p><label>Number of weeks</label><input type="text" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->" /></p>
-		<p><label>Number of months</label><input type="text" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->" /></p>
-	</ul>
+		<p><select name="subtype">
+<!-- TMPL_LOOP NAME="subtype" -->
+<option value="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="selected" --> selected="SELECTED" <!-- /TMPL_IF -->><!-- TMPL_VAR NAME="name" --></option>
+<!-- /TMPL_LOOP -->
+</select> <input type="text" name="sublength" value="<!-- TMPL_VAR name="sublength" -->" size="3" onkeypress="return check_input(event)"> (*) (enter amount in numerals)</p>
+
 </div>
-<div id="serials_subscription_add_calculation">
+<div id="bloc25">
 	<h2>Numbering calculation</h2>
-	<p>
-		<p>Numbering formula: <input type="text" name="numberingmethod" value="<!-- TMPL_VAR name="numberingmethod" -->"></p>
+	<p>Numbering formula: <input type="text" name="numberingmethod" value="<!-- TMPL_VAR name="numberingmethod" -->"></p>
+	<div id="basetable" style="display: none;">
 		<table class="small">
 			<tr>
 				<th>&nbsp;</th>
@@ -164,40 +906,40 @@
 			<tr>
 				<td>Add</td>
 				<td>
-					<input type="text" name="add1" value="<!-- TMPL_VAR name="add1" -->" />
+					<input type="text" name="add1" value="<!-- TMPL_VAR name="add1" -->">
 				</td>
 				<td>
-					<input type="text" name="add2" value="<!-- TMPL_VAR name="add2" -->" />
+					<input type="text" name="add2" value="<!-- TMPL_VAR name="add2" -->">
 				</td>
 				<td>
-					<input type="text" name="add3" value="<!-- TMPL_VAR name="add3" -->" />
+					<input type="text" name="add3" value="<!-- TMPL_VAR name="add3" -->">
 				</td>
 			</tr>
 			<tr>
 				<td>once every</td>
-				<td><input type="text" name="every1" value="<!-- TMPL_VAR name="every1" -->" /></td>
-				<td><input type="text" name="every2" value="<!-- TMPL_VAR name="every2" -->" /></td>
-				<td><input type="text" name="every3" value="<!-- TMPL_VAR name="every3" -->" /></td>
+				<td><input type="text" name="every1" value="<!-- TMPL_VAR name="every1" -->"></td>
+				<td><input type="text" name="every2" value="<!-- TMPL_VAR name="every2" -->"></td>
+				<td><input type="text" name="every3" value="<!-- TMPL_VAR name="every3" -->"></td>
 			</tr>
 			<tr>
 				<td>When more than</td>
-				<td><input type="text" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->" /></td>
-				<td><input type="text" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->" /></td>
-				<td><input type="text" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->" /></td>
+				<td><input type="text" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
+				<td><input type="text" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
+				<td><input type="text" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
 			</tr>
 			<!-- TMPL_IF name="mod" -->
 			<tr>
 				<td>The loop is for instance</td>
-				<td><input type="text" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->" /></td>
-				<td><input type="text" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->" /></td>
-				<td><input type="text" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->" /></td>
+				<td><input type="text" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->"></td>
+				<td><input type="text" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->"></td>
+				<td><input type="text" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->"></td>
 			</tr>
 			<!-- /TMPL_IF -->
 			<tr>
 				<td>Set back to</td>
-				<td><input type="text" name="setto1" value="<!-- TMPL_VAR name="setto1" -->" /></td>
-				<td><input type="text" name="setto2" value="<!-- TMPL_VAR name="setto2" -->" /></td>
-				<td><input type="text" name="setto3" value="<!-- TMPL_VAR name="setto3" -->" /></td>
+				<td><input type="text" name="setto1" value="<!-- TMPL_VAR name="setto1" -->"></td>
+				<td><input type="text" name="setto2" value="<!-- TMPL_VAR name="setto2" -->"></td>
+				<td><input type="text" name="setto3" value="<!-- TMPL_VAR name="setto3" -->"></td>
 			</tr>
 			<tr>
 				<td>
@@ -207,52 +949,77 @@
 						Begins with
 					<!-- /TMPL_IF -->
 				</td>
-				<td><input type="text" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->" /></td>
-				<td><input type="text" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->" /></td>
-				<td><input type="text" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->" /></td>
+				<td><input type="text" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->"></td>
+				<td><input type="text" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->"></td>
+				<td><input type="text" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->"></td>
 			</tr>
-		</table>
-	</p>
+		</table> </div>
 </div>
 <!-- TMPL_IF name="mod" -->
-	<input type="button" value="Save subscription" onclick="Check(this.form)" accesskey="w" />
+	<input type="button" value="Save subscription" onclick="Check(this.form)" accesskey="w" class="button">
 <!-- TMPL_ELSE -->
-	<input type="button" value="Add subscription" onclick="Check(this.form)" accesskey="w" />
+	<input type="button" value="Add subscription" onclick="Check(this.form)" accesskey="w" class="button">
 <!-- /TMPL_IF -->
-</div>
-
 </form>
 
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
 <script language="JavaScript" type="text/javascript">
 
 function Plugin(f)
 {
-	 window.open("subscription-bib-search.pl","Find a bib index",'width=500,height=400,toolbar=false,scrollbars=yes');
+	 window.open('subscription-bib-search.pl','FindABibIndex','width=500,height=400,toolbar=no,scrollbars=yes');
 }
 
 function FindAcqui(f)
 {
-	 window.open("acqui-search.pl","Find a supplier",'width=500,height=400,toolbar=false,scrollbars=yes');
+	 window.open('acqui-search.pl','FindASupplier','width=500,height=400,toolbar=no,scrollbars=yes');
 }
 
-function DistributedTo()
+function Find_ISSN(f)
 {
-	 window.open("distributedto.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->","Distributed to",'width=800,height=600,toolbar=false,scrollbars=yes');
+	 window.open('issn-search.pl','FindABibIndex','width=500,height=400,toolbar=no,scrollbars=yes');
 }
 
 
-function Check(f)
-{
-	if (f.startdate.value.length != 0 && 
-			f.numberlength.value+f.weeklength.value+f.monthlength.value > 0)
-		{
+function Check(f) {
+	if (f.startdate.value.length != 0 && f.sublength.value > 0) {
+		if (f.irreg_check.value == 1) {
 			document.f.submit();
+		} else {
+			if(f.numbering_pattern.value == ''){
+				alert("need to choose a numbering pattern");
+			} else {
+				alert("need to check for irregularity by clicking 'Irregularity?'");
+			}
 		}
-else
+	} else {
+	 	alert('field marked with * are mandatory');
+	}
+	return false;
+}
+function DistributedTo()
 {
- 	alert('field marked with * are mandatory');
+	newwin= window.open('distributedto.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->',"Distributed_to",'width=800,height=600,toolbar=false,scrollbars=yes');
 }
-	return false;
+function AddBiblio() {
+     window.open("/cgi-bin/koha/cataloguing/addbiblio.pl?fromserials=1&popup=1","AddBiblio",'width=700,height=400,toolbar=no,scrollbars=yes,status=yes');
+
 }
 </script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<!-- TMPL_IF name="mod" -->
+<script language="JavaScript" type="text/javascript">
+window.onload = modify_num_pattern();
+	<!-- TMPL_IF name="hemisphere" -->
+	window.onload = hemispheres(<!-- TMPL_VAR NAME="hemisphere" -->);
+	<!-- /TMPL_IF -->
+</script>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF name="irregularity" -->
+<script language="JavaScript"  type="text/javascript">
+window.onload = irregularity_check();
+window.onload = irregular_order();
+</script>
+<!-- /TMPL_IF -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl
index e5cdc456ce..2ce8046069 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl
@@ -1,53 +1,56 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<div id="main-compact">
 
 <h1>Catalogue search</h1>
 
-<h2>Search on</h2>
 <form name="f" action="/cgi-bin/koha/serials/subscription-bib-search.pl" method="post">
-	<input type="hidden" name="op" value="do_search">
-	<input type="hidden" name="type" value="intranet">
-	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
-	<p>
-		<label>Keyword</label>
-		<input type="hidden" name="marclist" value="">
-		<input type="hidden" name="and_or" value="and">
-		<input type="hidden" name="excluding" value="">
-		<input type="hidden" name="operator" value="contains">
-		<input type="text" name="value">
-	</p>
-	<p>
-		<label>Itemtype</label>
-            <select name="value">
-            <!-- TMPL_LOOP name="itemtypeloop" -->
-                <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="description" --></option>
-            <!-- /TMPL_LOOP -->
-            </select>
-		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="category" -->">
-		<input type="hidden" name="marclist" value="">
-		<input type="hidden" name="and_or" value="and">
-		<input type="hidden" name="excluding" value="">
-		<input type="hidden" name="operator" value="=">
-		<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
-	</p>
-	<p>Results per page :
-		<select align="right" name="resultsperpage" size="1">
-			<option value="20">20</option>
-			<option value="50">50</option>
-			<option value="100">100</option>
-		</select>
-		Ordered by
-		<select name="orderby" size="1">
-			<option value="biblio.title">Title</option>
-			<option value="biblio.author">Author</option>
-			<option value="biblioitems.dewey">Dewey</option>
-			<option value="biblioitems.publicationyear">Publication Year</option>
-			<option value="biblioitems.publishercode">Publisher</option>
-		</select>
-	</p>
-	<p>
-		<input type="submit" value="Start search" class="button catalogue">
-		<a href="javascript:PopupSuggestion()" class="button catalogue">Suggestions</a>
-	</p>
+	<input type="hidden" name="op" value="do_search" />
+	<input type="hidden" name="type" value="intranet" />
+	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
+	<div class="data">
+		<table>
+		<caption>Search on</caption>
+		<tr><th scope="row"><label for="keyword">Search</label></th><td>
+			
+			<input type="hidden" name="and_or" value="@and" />
+			<input type="hidden" name="relation" value="@attr 5=1" /> 
+			<input type="text" id="keyword" name="value"> 
+		</td><td><select align="right" id="kohafield" name="kohafield" size="1">
+				<option value="any">Any field</option>
+				<option value="title">Title</option>
+				<option value="Author">Author</option>
+				<option value="ISSN">ISSN</option>
+			</select></td></tr>
+		<tr><th scope="row"><label for="itemtype">Itemtype</label></th><td>
+			<!-- TMPL_VAR name="CGIitemtype" -->
+			<input type="hidden" name="kohafield" value="itemtype" />
+			<input type="hidden" name="value" value="<!-- TMPL_VAR name="category" -->">
+		
+			<input type="hidden" name="and_or" value="@and" />
+			<input type="hidden" name="relation" value="@attr 5=1" />
+
+			<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->" />
+		</td></tr>
+	</div>
+	<div class="data">
+		<tr><th scope="row"><label for="resultsperpage">Results per page :</label></th><td>
+			<select align="right" id="resultsperpage" name="resultsperpage" size="1">
+				<option value="10">10</option>
+				<option value="20">20</option>
+				<option value="50">50</option>
+			</select></td><td>
+		<label for="orderby">Ordered by</label>
+			<select id="orderby" name="order" size="1">
+				<option value="title">Title</option>
+				<option value="author">Author</option>
+					</select>
+		</td></tr>
+		</table>
+		<p>
+			<input type="submit" value="Start search" class="submit" />
+			
+		</p>
+	</div>
 </form>
 
 <script language="Javascript" type="text/javascript">
@@ -68,4 +71,4 @@ function PopupSuggestion() {
 }
 
 </script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl
index 6ef4856d93..6609baa225 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl
@@ -1,31 +1,199 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription detail<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!--
+TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
 
-<h1>Subscription for <!-- TMPL_VAR name="bibliotitle" --></h1>
-<div id="serials_subscription_detail">
+<script language="Javascript" type="text/javascript">
+<!--
+// the english words used in display purposes
+var text = new Array('Number','Volume','Issue','Month','Week','Starting with:','Rollover at:','Choose Hemisphere:','Northern','Southern',
+'Autumn','Winter','Spring','Summer','Fall','Season','Year');
+
+// common pre defined number patterns
+function num_pattern() {
+var patternchoice = '<!--TMPL_VAR NAME='numberpattern'-->';
+	switch(patternchoice){
+	case "2":
+		options(text[1],text[0],text[2]);
+		irregularity();
+		display_table(0);
+		break;
+	case "3":
+		options(text[1],text[0]);
+		irregularity();
+		display_table(0);
+		break;
+	case "4":
+		options(text[1],text[2]);
+		irregularity();
+		display_table(0);
+		break;
+	case "5":
+		options(text[0],text[2]);
+		irregularity();
+		display_table(0);
+		break;
+	case "6":
+		var d = new Date();
+		var sYear = d.getFullYear();
+		// options_seasons(text[15],sYear);
+		irregularity();
+		is_season = 1;
+		display_table(0);
+		break;
+	case "7":
+		display_table(1);
+		irregularity();
+		break;
+	default:
+		options(text[0]);
+		irregularity();
+		display_table(0);
+		break;
+	}
+}
+
+function display_table(n) {
+	if(n==1){
+		document.getElementById("basetable").style.display = 'block';
+	} else {
+		document.getElementById("basetable").style.display = 'none';
+	}
+}
+
+// to dispaly the options section
+function options(x,y,z){
+var textbox = '';
+	// alert("X: "+x+"Y: "+y+"Z: "+z);
+	if(x){
+		document.f.xfield.value = x;
+		if(y){
+			document.f.yfield.value = y;
+			if(z){
+				document.f.zfield.value = z;
+			}
+		}
+	}
+}
+
+function irregularity(){
+	var periodicity = '<!-- TMPL_VAR NAME="periodicity"-->';
+	switch(periodicity){
+	case "1":
+		var names = new Array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday');
+		break;
+	case "2":
+		<!-- TMPL_IF NAME="weekarrayjs" -->
+		var names = new Array(<!-- TMPL_VAR NAME="weekarrayjs" -->); 
+		<!-- /TMPL_IF -->
+		break;
+	case "3":
+		<!-- TMPL_IF NAME="weekarrayjs" -->
+		var names = new Array(<!-- TMPL_VAR NAME="weekarrayjs" -->); 
+		<!-- /TMPL_IF -->
+		break;
+	case "4":
+		<!-- TMPL_IF NAME="weekarrayjs" -->
+		var names = new Array(<!-- TMPL_VAR NAME="weekarrayjs" -->); 
+		<!-- /TMPL_IF -->
+		break;
+	case "5":
+		var names = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
+		break;
+	case "6":
+		var names = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
+		break;
+	case "7":
+		var names = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
+		break;
+	case "8":
+		var names = new Array('Autumn','Winter','Spring','Summer','Fall');
+		break;
+	case "9":
+		var names = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
+		break;
+	case "10":
+		expected =1;
+		break;
+	default:
+		break;
+	}
+
+	<!-- TMPL_IF NAME="irregularity" -->
+	var irregular = '<!-- TMPL_VAR NAME="irregularity" -->';
+	var irregarray = irregular.split('|');
+	var irregtext = '<p>';
+	for(var i=0;i<irregarray.length;i++){
+		irregtext += names[i]+' &nbsp;';
+	}
+	irregtext += '</p>';
+	document.getElementById("irreg").innerHTML = irregtext;
+	<!-- /TMPL_IF -->
+}
+
+-->
+</script>
+
+
+<h1>Subscription Details for biblio :  <!-- TMPL_VAR name="biblionumber" --></h1>
+<form class="inline" method="get" action="subscription-add.pl">
+<input type="hidden" name="op" value="mod" />
+<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
+<input type="submit" class="submit" title="Modify subscription" value="Edit" /></form>
+
+<form class="inline" method="get" action="serials-receive.pl">
+<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
+<input type="submit" class="submit" value="Receive Issues" /></form>
+
+<form class="inline" method="get" action="serial-issues.pl">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
+<input type="submit" class="submit"  title="All issues on this title" value="Issue History" /></form>
+
+<form class="inline" method="get" action="/cgi-bin/koha/serials/serials-home.pl">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
+<input type="submit" class="submit"  title="all subscriptions on <!-- TMPL_VAR name="bibliotitle" -->" value="Subscriptions" /></form>
+
+<form class="inline" method="get" action="/cgi-bin/koha/catalogue/MARCdetail.pl">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
+<input type="submit" class="submit"  title="go to <!-- TMPL_VAR name="bibliotitle" -->" value="View Biblio Record" /></form>
+
+<form class="inline"><input type="submit" class="cancel" value="Delete Subscription" onclick="confirm_deletion(); return false;" /></form>
+<!-- TMPL_IF NAME="routing" -->
+<form class="inline" method="get" action="/cgi-bin/koha/serials/routing.pl">
+<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
+<input type="submit"  class="submit" value="Edit Routing List"/></form>
+<!-- TMPL_ELSE -->
+<form class="inline" method="get" action="/cgi-bin/koha/serials/routing.pl">
+<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
+<input type="hidden" name="op" value="new" />
+<input type="submit"  class="submit" value="Create Routing List"/></form>
+<!-- /TMPL_IF -->
+
+<table>
+<tr valign="top"><td>
+
+<div class="bloc25">
 	<h2>Subscription information</h2>
-		<p>Librarian identity :</td><td> <!-- TMPL_VAR name="librarian" --></p>
-		<p><label>Supplier </label><!-- TMPL_VAR name="aqbooksellername" --></p>
-		<p><label>Cost</label><!-- TMPL_VAR name="cost" --></p>
-		<p><label>Budget </label><!-- TMPL_VAR name="bookfundid" --></p>
-		<p><label>Biblio</label><i>(<!-- TMPL_VAR name="biblionumber" -->)</i> <!-- TMPL_VAR name="bibliotitle" --></p>
-		<p><label>Notes:</label><!-- TMPL_VAR name="notes" --></p>
-		<p>
-			<!-- TMPL_IF name="letter" -->
-				<label>Issue alert with letter:</label><!-- TMPL_VAR name="letter" -->
-			<!-- TMPL_ELSE -->
-				Borrowers can't subscribe to issue alerts
-			<!-- /TMPL_IF -->
-		</p>
-		<p><label>Distributed to</label>
-		<p><ul><!-- TMPL_VAR name="distributedto" --></ul></p>
+	<p><label class="label100">Librarian identity:</label> <!-- TMPL_VAR name="librarian" --></p><br />
+
+	<p><label class="label100">Supplier:</label> <!-- TMPL_VAR name="aqbooksellername" -->&nbsp;</p>
+
+	<p><label class="label100">Cost:</label> <!-- TMPL_VAR name="cost" -->&nbsp;</p>
+
+	<p><label class="label100">Budget:</label> <!-- TMPL_VAR name="bookfundid" -->&nbsp;</p>
+
+	<p><label class="label100">Biblio:</label> <i>(<!-- TMPL_VAR name="biblionumber" -->)</i> <!-- TMPL_VAR name="bibliotitle" --></p><br />
+	<p><label class="label100">Call Number:</label> <!-- TMPL_VAR name="callnumber" -->&nbsp;</p>
+
+	<p><label class="label100">Notes:</label> <!-- TMPL_VAR name="notes" --></p>
 </div>
-<div id="serials_subscription_detail_planning">
+
+<div class="bloc25">
+	<form name="f">
 	<h2>Planning</h2>
-	<p><label>Beginnning date:</label> <!-- TMPL_VAR name="startdate" --></p>
-	<p><label>Frequency (*):</label>
+	<p><label class="label100">Beginning date:</label> <!-- TMPL_VAR name="publisheddate" -->
+	</p>
+	<p><label class="label100">Frequency (*):</label>
 		<!--TMPL_IF name="periodicity1" -->
 				1/day
 		<!-- /TMPL_IF -->
@@ -60,108 +228,156 @@
 				1/2 years
 		<!-- /TMPL_IF -->
 	</p>
-	<p><label>Arrives on:</label>
-		<!--TMPL_IF name="arrival1" -->
-			Monday
+	<p><label class="label100">Number Pattern:</label>
+		<!-- TMPL_IF name="numberpattern1" -->
+			Number
 		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="arrival2" -->
-				Tuesday
+		<!-- TMPL_IF name="numberpattern2" -->
+			Volume, Number, Issue
 		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="arrival3" -->
-				Wednesday
+		<!-- TMPL_IF name="numberpattern3" -->
+			Volume, Number
 		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="arrival4" -->
-				Thursday
+		<!-- TMPL_IF name="numberpattern4" -->
+			Volume, Issue
 		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="arrival5" -->
-				Friday
+		<!-- TMPL_IF name="numberpattern5" -->
+			Number, Issue
 		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="arrival6" -->
-				Saturday
+		<!-- TMPL_IF name="numberpattern6" -->
+			Seasonal only
 		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="arrival7" -->
-				Sunday
+		<!-- TMPL_IF name="numberpattern7" -->
+			None of the above
 		<!-- /TMPL_IF -->
+	</p>
+	<table cellpadding="0" cellspacing="0">
+	<tr><td>&nbsp;</td>
+	    <td align="right"><input type="text" name="xfield" style="border:0px solid #FFFFFF; text-align:center;"></td>
+	<!--TMPL_IF NAME="lastvalue2"-->
+	    <td align="right"><input type="text" name="yfield" style="border:0px solid #FFFFFF; text-align:center;"></td>
+	<!--/TMPL_IF-->
+	<!--TMPL_IF NAME="lastvalue3"-->
+	    <td align="right"><input type="text" name="zfield" style="border:0px solid #FFFFFF; text-align:center;"></td>
+	<!--/TMPL_IF-->
+	</tr>
+	<tr><td><p><label class="label100">Starting with:</label></p></td>
+	    <td align="center"><!--TMPL_VAR NAME="lastvalue1"--></td>
+	<!--TMPL_IF NAME="lastvalue2"-->
+	    <td align="center">&nbsp; 
+			<!--TMPL_VAR NAME="lastvalue2"-->
+	    </td>
+	<!--/TMPL_IF-->
+	<!--TMPL_IF NAME="lastvalue3"-->
+	    <td align="center">&nbsp; 
+			<!--TMPL_VAR NAME="lastvalue3"-->
+	    </td>
+	<!--/TMPL_IF-->
+	</tr>
+	<tr><td><p><label class="label100">Rollover:</label></p></td>
+	    <td align="center">&nbsp;</td>
+	<!--TMPL_IF NAME="whenmorethan2"-->
+	    <td align="center">&nbsp; 
+			<!--TMPL_VAR NAME="whenmorethan2"-->
+	    </td>
+	<!--/TMPL_IF-->
+	<!--TMPL_IF NAME="whenmorethan3"-->
+	    <td align="center">&nbsp; 
+			<!--TMPL_VAR NAME="whenmorethan3"-->
+	    </td>
+	<!--/TMPL_IF-->
+	</tr>
+	</table>
+	<!-- TMPL_IF NAME="irregularity" -->
+	<p><label class="label100">Irregularity:</label>
+		<div id="irreg"></div>
+	</p>
+	<!-- /TMPL_IF -->
+	<p><label class="label100">Begins on:</label>
+		<!--TMPL_VAR name="startdate" -->
+	</p>
+	</form>
 </div>
-<div id="serials_subscription_detail_length">
+<div class="bloc25">
 	<h2>Subscription length</h2>
-	<p><label>Number of issues</label><!-- TMPL_VAR name="numberlength" --></p>
-	<p><label>Number of weeks</label><!-- TMPL_VAR name="weeklength" --></p>
-	<p><label>Number of months</label><!-- TMPL_VAR name="monthlength" --></p>
+	<!-- TMPL_IF name="numberlength" --><p><label>Number of issues:</label> <!-- TMPL_VAR name="numberlength" --></p><!-- /TMPL_IF -->
+	<!-- TMPL_IF name="weeklength" --><p><label>Number of weeks:</label> <!-- TMPL_VAR name="weeklength" --></p><!-- /TMPL_IF -->
+	<!-- TMPL_IF name="monthlength" --><p><label class="label100">Number of months:</label> <!-- TMPL_VAR name="monthlength" --></p><!-- /TMPL_IF -->
 
 </div>
-<div id="serials_subscription_detail_calculation">
+<div class="bloc25">
 	<h2>Numbering calculation</h2>
-	<p>
-		<p>Numbering formula: <!-- TMPL_VAR name="numberingmethod" --></p>
-		<table>
-			<tr>
-				<th>&nbsp;</th>
-				<th>&nbsp;&nbsp;&nbsp;&nbsp;X&nbsp;&nbsp;&nbsp;&nbsp;</th>
-				<th>&nbsp;&nbsp;&nbsp;&nbsp;Y&nbsp;&nbsp;&nbsp;&nbsp;</th>
-				<th>&nbsp;&nbsp;&nbsp;&nbsp;Z&nbsp;&nbsp;&nbsp;&nbsp;</th>
+	<p><label class="label100">Numbering formula:</label> <!-- TMPL_VAR name="numberingmethod" --></p>
+</div>
+<div class="bloc25" id="basetable">
+	<table cellpadding="0" cellspacing="0" border="0" class="collapse">
+		<tr>
+			<th class="cell-header">&nbsp;</th>
+			<th class="cell-header">X</th>
+			<th class="cell-header">Y</th>
+			<th class="cell-header">Z</th>
 			</tr>
 			<tr>
-				<td>Add</td>
-				<td>
+				<td class="cell">Add</td>
+				<td class="cell">
 					<!-- TMPL_VAR name="add1" -->
 				</td>
-				<td>
+				<td class="cell">
 					<!-- TMPL_VAR name="add2" -->
 				</td>
-				<td>
+				<td class="cell">
 					<!-- TMPL_VAR name="add3" -->
 				</td>
 			</tr>
 			<tr>
-				<td>once every</td>
-				<td><!-- TMPL_VAR name="every1" --></td>
-				<td><!-- TMPL_VAR name="every2" --></td>
-				<td><!-- TMPL_VAR name="every3" --></td>
+				<td class="cell">once every</td>
+				<td class="cell"><!-- TMPL_VAR name="every1" --></td>
+				<td class="cell"><!-- TMPL_VAR name="every2" --></td>
+				<td class="cell"><!-- TMPL_VAR name="every3" --></td>
 			</tr>
 			<tr>
-				<td>When more than</td>
-				<td><!-- TMPL_VAR name="whenmorethan1" --> <!-- TMPL_IF name="innerloop1" --><br/>
+				<td class="cell">When more than</td>
+				<td class="cell"><!-- TMPL_VAR name="whenmorethan1" --> <!-- TMPL_IF name="innerloop1" --><br/>
 					<i>(is <!-- TMPL_VAR name="innerloop1" -->)</i><!-- /TMPL_IF --></td>
-				<td><!-- TMPL_VAR name="whenmorethan2" --> <!-- TMPL_IF name="innerloop2" --><br/>
+				<td class="cell"><!-- TMPL_VAR name="whenmorethan2" --> <!-- TMPL_IF name="innerloop2" --><br/>
 					<i>(is <!-- TMPL_VAR name="innerloop2" -->)</i><!-- /TMPL_IF --></td>
-				<td><!-- TMPL_VAR name="whenmorethan3" --> <!-- TMPL_IF name="innerloop3" --><br/>
+				<td class="cell"><!-- TMPL_VAR name="whenmorethan3" --> <!-- TMPL_IF name="innerloop3" --><br/>
 					<i>(is <!-- TMPL_VAR name="innerloop3" -->)</i><!-- /TMPL_IF --></td>
 			</tr>
 			<tr>
-				<td>Set back to</td>
-				<td><!-- TMPL_VAR name="setto1" --></td>
-				<td><!-- TMPL_VAR name="setto2" --></td>
-				<td><!-- TMPL_VAR name="setto3" --></td>
+				<td class="cell">Set back to</td>
+				<td class="cell"><!-- TMPL_VAR name="setto1" --></td>
+				<td class="cell"><!-- TMPL_VAR name="setto2" --></td>
+				<td class="cell"><!-- TMPL_VAR name="setto3" --></td>
 			</tr>
 			<tr>
-				<td>
+				<td class="cell">
 						Last value
 				</td>
-				<td><!-- TMPL_VAR name="lastvalue1" --></td>
-				<td><!-- TMPL_VAR name="lastvalue2" --></td>
-				<td><!-- TMPL_VAR name="lastvalue3" --></td>
+				<td class="cell"><!-- TMPL_VAR name="lastvalue1" --></td>
+				<td class="cell"><!-- TMPL_VAR name="lastvalue2" --></td>
+				<td class="cell"><!-- TMPL_VAR name="lastvalue3" --></td>
 			</tr>
 		</table>
 </div>
-<div id="serials_subscription_detail_issue_list">
+</td><td>
+<div class="bloc25">
 	<h2>Issues</h2>
-	<table class="small">
+	<table cellpadding="0" cellspacing="0" border="0" class="collapse">
 	<tr>
-		<th>&nbsp;&nbsp;&nbsp;&nbsp;Issue number&nbsp;&nbsp;&nbsp;&nbsp;</th>
-		<th>&nbsp;&nbsp;&nbsp;&nbsp;Planned date&nbsp;&nbsp;&nbsp;&nbsp;</th>
-		<th>&nbsp;&nbsp;&nbsp;&nbsp;Status&nbsp;&nbsp;&nbsp;&nbsp;</th>
-		<th>&nbsp;&nbsp;&nbsp;&nbsp;Note&nbsp;&nbsp;&nbsp;&nbsp;</th>
+		<th class="cell-header">Issue number</th>
+		<th class="cell-header">Planned date</th>
+		<th class="cell-header">Status</th>
 	</tr>
 	<!-- TMPL_LOOP name="serialslist" -->
 		<tr>
-			<td>
+			<td class="cell">
 				<!-- TMPL_VAR name="serialseq" -->
 			</td>
-			<td>
+			<td class="cell">
 				<!-- TMPL_VAR name="planneddate" -->
 			</td>
-			<td>
+			<td class="cell">
 					<!--TMPL_IF name="status1" -->
 						Waited
 					<!-- /TMPL_IF -->
@@ -174,58 +390,28 @@
 					<!--TMPL_IF name="status4" -->
 						Missing
 					<!-- /TMPL_IF -->
-				</select>
-			</td>
-			<td>
-				<!-- TMPL_VAR name="notes" -->
 			</td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 	</table>
 </div>
+</td></tr>
+</table>
 
-<div id="action">
-	<form action="subscription-add.pl">
-		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
-		<input type="hidden" name="op" value="mod" />
-		<input type="submit" value="Modify subscription" />
-	</form>
-	<form action="serials-recieve.pl">
-		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
-		<input type="submit" value="Recieve issues" />
-	</form>
-	<form action="serial-issues.pl">
-		<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
-		<input type="submit" value="Issue history" />
-	</form>
-	<form action="/cgi-bin/koha/serials/serials-home.pl">
-		<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
-		<input type="submit" value="Subscriptions" />
-	</form>
-<!-- TMPL_IF name="letter" -->
-	<form action="viewalerts.pl">
-		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
-		<input type="submit" value="Alerted borrowers" />
-	</form>
-<!-- /TMPL_IF -->
-	<form action="/cgi-bin/koha/MARCdetail.pl">
-		<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
-		<input type="submit" value="Back to biblio" />
-	</form>
-	<!-- TMPL_UNLESS name="totalissues" -->
-		<form action="javascript:confirm_deletion()">
-			<input type="submit" value="delete" />
-		</form>
-	<!-- /TMPL_UNLESS -->
-</div>
 
-<script>
+<script type="text/javascript">
 function _(s) { return s } // dummy function for gettext
 function confirm_deletion() {
-	var is_confirmed = confirm(_('Are you sure you want to delete this subscription?'));
+	<!-- TMPL_IF name="totalissues" -->
+		var is_confirmed = confirm(_('You already made <!-- TMPL_VAR name="totalissues"--> receipts. Do you confirm deletion?'));
+	<!-- TMPL_ELSE -->
+		var is_confirmed = confirm(_('Are you sure you want to delete this subscription?'));
+	<!-- /TMPL_IF -->	
 	if (is_confirmed) {
 		window.location="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&op=del";
 	}
 }
+window.onload = num_pattern();
 </script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-renew.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-renew.tmpl
index a35b4f3aa4..0616369e05 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-renew.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-renew.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="popup-top.inc" -->
-<div id="mainbloc">
+
 
 <h1 class="serial">subscription renewal for <!-- TMPL_VAR name="bibliotitle" --></h1>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/viewalerts.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/viewalerts.tmpl
new file mode 100644
index 0000000000..24c4ebb074
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/viewalerts.tmpl
@@ -0,0 +1,28 @@
+<!-- TMPL_INCLUDE NAME="serials-top.inc" -->
+
+<div id="mainbloc">
+		<h1 class="serial">Alert subscribers for <!-- TMPL_VAR name="bibliotitle" --></h1>
+		<a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button serial">subscription</a>
+		<div class="bloc25">
+		<!-- TMPL_IF name="alertloop" -->
+			<table>
+			<tr>
+				<th class="serial">Borrower name</th>
+				<th class="serial">&nbsp;</th>
+			</tr>
+
+			<!-- TMPL_LOOP NAME="alertloop" -->
+				<tr>
+					<td><!-- TMPL_VAR name="name" --></td>
+					<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR name="borrowernumber">" class="button serial">View</a></td>
+				</tr>
+			<!-- /TMPL_LOOP -->
+			</table>
+		<!-- TMPL_ELSE -->
+			Nobody
+		<!-- /TMPL_IF -->
+		</div>
+
+	
+</div>
+<!-- TMPL_INCLUDE NAME="serials-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl b/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl
index ec6be8fb51..97adfb4c46 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl
@@ -1,29 +1,16 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-
-MARC biblio export
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Cataloging: MARC Export<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
-	<div id="bloc25">
-		<h2 class="parameters">Select biblios to export</h2>
-		<form method="post">
-			<p>from biblio number : <input type="text" name="start_bib">
-			to biblio number : <input type="text" name="end_bib"></p>
-			<p>Document type : <!--TMPL_VAR Name="CGIitemtype"--></p>
-			<p>Branch :  <select name="branch">
-			<option value="">Default</option>
-                        <!-- TMPL_LOOP name="branchloop" -->
-                                <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name
-="branchname" --></option>
-                        <!-- /TMPL_LOOP -->
-                        </select>
-</p>
-			<p>from itemcallnumber : <input type="text" name="start_callnumber">
-			to itemcallnumber : <input type="text" name="end_callnumber"></p>
-			<p>Limit to <input type="text" name="limit"> first biblio</p>
-			<p>Note : the items are NOT exported by this tool</p>
-			<input type="hidden" name="op" value="export">
-			<input type="submit" value="Export" class="button">
-		</form>
-	</div>
-</div>
+<h1>MARC Export</h1>
+<div class="details"><h4>Export in MARC format the following biblios (bibliographic records only):</h4>
+<form method="post">
+<p>From biblio number: <input type="text" name="start_bib" />
+to biblio number: <input type="text" name="end_bib" /></p>
+<p>(leave blank to export every biblio)</p>
+<input type="hidden" name="op" value="export" />
+<input type="submit" value="Export" class="submit" />
+</form></div>
+<p>Note : Exporting all by this tool may take some time</p>
+
+
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/koha-news.tmpl b/koha-tmpl/intranet-tmpl/prog/en/tools/koha-news.tmpl
index 6cab008a9e..7fba6f035a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/tools/koha-news.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/tools/koha-news.tmpl
@@ -1,101 +1,103 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<!-- TMPL_INCLUDE NAME="holidays-top.inc" -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
-
-<div id="koha-news_main">
-	<h1> OPAC & KOHA News</h1>
-	<!-- TMPL_IF name="add_form" -->
-		<form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" >
-			<input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->" />
-			<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
-			<p>
-			<select name="lang">
-				<option value="koha">Librarian interface</option>
-				<!-- TMPL_LOOP name="lang_list" -->
-					<!-- TMPL_IF name="selected" -->
-						<option value="<!-- TMPL_VAR name="language" -->" selected>
-					<!-- TMPL_ELSE -->
-						<option value="<!-- TMPL_VAR name="language" -->">
-					<!-- /TMPL_IF -->
-						<!-- TMPL_VAR name="language" -->
-					</option>
-				<!-- /TMPL_LOOP" -->
-			</select>
-			</p>
-			<p>
-				<label>Title</label>
-				<input size="30" type="text" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
-			</p>
-			<p>News</p>
-			<textarea name="new" cols="35" rows="4"><!-- TMPL_VAR NAME="new" --></textarea>
-			<p>
-				<input class="button" type="submit" value="Save" />
-				<input class="button" type="button" value="Cancel" onclick="window.location.href='/cgi-bin/koha/tools/opac-news.pl'" />
-			</p>
-		</form>
-	<!-- TMPL_ELSE -->
-		<div id="koha-news_filter">
-			<form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" />
-			<label>Language</label>
-			<select name="lang">
-			<option value="">All</option>
-			<option value="koha">Librarian interface</option>
-				<!-- TMPL_LOOP name="lang_list" -->
-					<!-- TMPL_IF name="selected" -->
-						<option value="<!-- TMPL_VAR name="language" -->" selected />
-					<!-- TMPL_ELSE -->
-						<option value="<!-- TMPL_VAR name="language" -->" />
-					<!-- /TMPL_IF -->
-						<!-- TMPL_VAR name="language" -->
-					</option>
-				<!-- /TMPL_LOOP" -->
-			</select>
-			<input type="submit" class="button" value="Filter">
-			</form>
-		</div>
-		<!-- TMPL_IF NAME="opac_news_count" -->
-		<div id="koha-news_list">
-			<form name="del_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" onsubmit="return confirm('Are you sure you want to delete the selected news?')">
-				<table>
-					<tr>
-						<th></th>
-						<th>Language</th>
-						<th>Date</th>
-						<th>Title</th>
-						<th>News</th>
-						<th></th>
-					</tr>
-					<!-- TMPL_LOOP NAME="opac_news" -->
-						<tr>
-							<td>
-								<input type="checkbox" name="ids" value="<!-- TMPL_VAR NAME="idnew" -->" />
-							</td>
-							<td><!-- TMPL_VAR NAME="lang" --></td>
-							<td><!-- TMPL_VAR NAME="newdate" --></td>
-							<td><!-- TMPL_VAR NAME="title" --></td>
-							<td><!-- TMPL_VAR NAME="new" --></td>
-							<td>
-								<a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&id=<!-- TMPL_VAR NAME="idnew" -->">Edit</a>
-							</td>
-						</tr>
-					<!-- /TMPL_LOOP -->
-				</table>
-				<p>
-					<input type="hidden" name="op" value="del" />
-					<input type="submit" class="button" value="Delete selected" />
-				</p>
-			</form>
-		<!-- TMPL_ELSE -->
-			<p>No news loaded</p>
-		<!-- /TMPL_IF -->
-		<form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl">
-			<input type="hidden" name="op" value="add_form" />
-			<input type="submit" class="button" value="Add news" />
-		</form>
-	</div>
-	<!-- /TMPL_IF -->
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menu.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+	<h1> OPAC & KOHA News</h1>
+	<!-- TMPL_IF name="add_form" -->
+
+		<form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" >
+			<input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->">
+			<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->">
+			<table style="border:0" cellspacing="0" cellpadding="2">
+			    <tr>
+			        <td>Language</td>
+			        </td>
+			        <td>
+						<select name="lang">
+				<option value="">All news</option>
+				<option value="koha">Librarian interface</option>
+				<!-- TMPL_LOOP name="lang_list" -->
+					
+						<option value="<!-- TMPL_VAR name="language" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="language" -->	</option>
+				<!-- /TMPL_LOOP" -->
+			</select>
+					</td>
+			    </tr>
+				<tr>
+					<td>Title</td>
+					<td><input size="30" type="text" name="title" value="<!-- TMPL_VAR NAME="title" -->"></td>
+				</tr>
+				<tr>
+					<td>News</td>
+					<td><textarea name="new" cols="35" rows="4"><!-- TMPL_VAR NAME="new" --></textarea></td>
+				</tr>
+				<tr>
+					<td  colspan="2">
+						<input class="button" type="submit" value="Save">
+						<input class="button" type="button" value="Cancel" onclick="window.location.href='/cgi-bin/koha/tools/koha-news.pl'">
+					</td>
+				</tr>
+			</table>
+		</form>
+
+
+	<!-- TMPL_ELSE -->
+
+		<!-- TMPL_IF NAME="opac_news_count" -->
+
+            <form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" >
+			Language:
+			
+			<select name="lang">
+				<option value="">All news</option>
+				<option value="koha">Librarian interface</option>
+				<!-- TMPL_LOOP name="lang_list" -->
+					
+						<option value="<!-- TMPL_VAR name="language" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="language" -->	</option>
+				<!-- /TMPL_LOOP" -->
+			</select>
+		
+			<input type="submit" class="button" value="Filter">
+			</form>
+
+			<form name="del_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" onsubmit="return confirm('¿Are you sure you want to delete the selected news?')">
+				<table border="0" cellspacing="0" cellpadding="3">
+					<tr bgcolor="#99cc33">
+						<th></td>
+						<th style="padding-left:3px;padding-right:3px">Language</th>
+						<th>Date</th>
+						<th  width="20%">Title</th>
+						<th>News</th>
+						<th></th>
+					</tr>
+
+					<!-- TMPL_LOOP NAME="opac_news" -->
+						<tr>
+							<td width="5%"><input type="checkbox" name="ids" value="<!-- TMPL_VAR NAME="idnew" -->"</td>
+							<td align="center"><!-- TMPL_VAR NAME="lang" --></td>
+							<td><!-- TMPL_VAR NAME="newdate" --></td>
+							<td align="center"><!-- TMPL_VAR NAME="title" --></td>
+							<td><!-- TMPL_VAR NAME="new" --></td>
+							<td width="5%">
+								<a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&id=<!-- TMPL_VAR NAME="idnew" -->">Edit</a>
+							</td>
+						</tr>
+					<!-- /TMPL_LOOP -->
+
+				</table>
+					<input type="hidden" name="op" value="del">
+					<input type="submit" class="button" value="Delete selected">
+			</form>
+		<!-- TMPL_ELSE -->
+			<h5>No news loaded</h5>
+		<!-- /TMPL_IF -->
+
+		<form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl">
+			<input type="hidden" name="op" value="add_form">
+			<input type="submit" class="button" value="Add  news">
+		</form>
+	
+	
+	<!-- /TMPL_IF -->
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_008_holdings.tmpl b/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_008_holdings.tmpl
new file mode 100644
index 0000000000..bee75b2c33
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_008_holdings.tmpl
@@ -0,0 +1,688 @@
+<html>
+<head>
+<title>Leader builder</title>
+</head>
+<body>
+<form name="f_pop" onSubmit="javascript:report()">
+<table>
+	<tr>
+		<td>0-5 Date entered on file</td>
+		<td>(auto-filled)</td>
+		<td><input type="text" name="f1" maxlength=6 size=7 value="<!-- TMPL_VAR name="f1" -->"></td>
+	</tr>
+	<tr>
+		
+		<td>06- Receive Status</td>
+		<td>
+			
+			<select name="f6" size="1">
+			<!-- TMPL_IF name="f60" -->
+                                <option value="0" SELECTED>0- Unknown</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="0">0- Unknown</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f61" -->
+				<option value="1" SELECTED>1- Other receipt status</option>
+			<!-- TMPL_ELSE -->
+				<option value="1">1- Other receipt status</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f62" -->
+				<option value="2" SELECTED>2- Complete or ceased</option>
+			<!-- TMPL_ELSE -->
+				<option value="2">2- Complete or ceased</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f63" -->
+				<option value="3" SELECTED>3- On order</option>
+			<!-- TMPL_ELSE -->
+				<option value="3">3- On order</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f64" -->
+				<option value="4" SELECTED>4-Currently Received</option>
+			<!-- TMPL_ELSE -->
+				<option value="4">4- Currently Received</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f65" -->
+				<option value="5" SELECTED>5- Not currently received</option>
+			<!-- TMPL_ELSE -->
+				<option value="5">3- Not currently</option>
+			<!-- /TMPL_IF -->
+
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td>7- Method of acquisition </td>
+		<td>
+			<select name="f7" size="1">
+			<!-- TMPL_IF name="f7c" -->
+                                <option value="c" SELECTED>c- Coop/consotial purch.</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="c">0- Coop/consotial purch.</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f7d" -->
+				<option value="d" SELECTED>d- Deposit</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">1- Deposit</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7e" -->
+				<option value="e" SELECTED>e-Exchange</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">2- Exchange</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7f" -->
+				<option value="f" SELECTED>f- Free</option>
+			<!-- TMPL_ELSE -->
+				<option value="f">f- Free</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7g" -->
+				<option value="g" SELECTED>g- Gift</option>
+			<!-- TMPL_ELSE -->
+				<option value="g">g- Gift</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7m" -->
+				<option value="m" SELECTED>m- Membership</option>
+			<!-- TMPL_ELSE -->
+				<option value="m">m- Membership</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7n" -->
+				<option value="n" SELECTED>n- Non library Purchase</option>
+			<!-- TMPL_ELSE -->
+				<option value="n">n-Non library Purchase</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7p" -->
+				<option value="p" SELECTED>p- Purchase</option>
+			<!-- TMPL_ELSE -->
+				<option value="p">p- Purchase</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7u" -->
+				<option value="u" SELECTED>u- Unknown</option>
+			<!-- TMPL_ELSE -->
+				<option value="u">u- Unknown</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7z" -->
+				<option value="z" SELECTED>z- Other method</option>
+			<!-- TMPL_ELSE -->
+				<option value="z">z- Other method</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+	<tr>
+                <td>08-11 Expected acquisition end date (yymm)</td>
+                <td><input type="text" name="f81" size="4"  maxlength="4" value="<!-- TMPL_VAR NAME="f81" -->"/>
+ 
+	<select name="f8" size="4">
+			<!-- TMPL_IF name="f8uuuu" -->
+                                <option value="uuuu" SELECTED>uuuu-Intent to cancel</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="uuuu">uuuu- Intent to cancel</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f8||||" -->
+				<option value="||||" SELECTED>N/A</option>
+			<!-- TMPL_ELSE -->
+				<option value="||||">N/A</option>
+			<!-- /TMPL_IF -->
+			</select>                    
+        </td>
+        </tr>
+
+	<tr>
+                <td>12- General retention Policy</td>
+                <td>
+  	<select name="f12" size="1">
+			<!-- TMPL_IF name="f120" -->
+                                <option value="0" SELECTED>0- Unknown</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="0">0- Unknown</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f121" -->
+				<option value="1" SELECTED>1- Other general retention policy</option>
+			<!-- TMPL_ELSE -->
+				<option value="1">1- Other general retention policy</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f122" -->
+				<option value="2" SELECTED>2- Retained except as replaced by updates</option>
+			<!-- TMPL_ELSE -->
+				<option value="2">2- Retained except as replaced by updates</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f123" -->
+				<option value="3" SELECTED>3-  Sample issue retained</option>
+			<!-- TMPL_ELSE -->
+				<option value="3">3-  Sample issue retained</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f124" -->
+				<option value="4" SELECTED>4-Currently Received</option>
+			<!-- TMPL_ELSE -->
+				<option value="4">4- Currently Received</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f125" -->
+				<option value="5" SELECTED>5- Retained until replaced by microform</option>
+			<!-- TMPL_ELSE -->
+				<option value="5">3- Retained until replaced by microform</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f126" -->
+				<option value="6" SELECTED>6 - Retained for a limited period</option>
+			<!-- TMPL_ELSE -->
+				<option value="6">6 - Retained for a limited period</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f127" -->
+				<option value="7" SELECTED>7-Not retained</option>
+			<!-- TMPL_ELSE -->
+				<option value="7">7-Not retained</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f128" -->
+				<option value="8" SELECTED>8- Permanently reatined</option>
+			<!-- TMPL_ELSE -->
+				<option value="8">8-Permanently reatined</option>
+			<!-- /TMPL_IF -->
+			</select>              
+		 </td>
+        </tr>
+	 <tr>
+                <td>18-21 Illustrations </td>
+		<td>(auto-filled from 300)<input type="hidden" name="f1821" size="4"  maxlength="4" value="<!-- TMPL_VAR NAME="f1821" -->"/></td>
+        </tr>
+	<tr>
+                <!-- 22 Target Audience -->
+                <td>22- Target Audience</td>
+                <td>                        
+                <select name="f22" size="1">
+
+                        <!-- TMPL_IF name="f22|" -->
+                        <option value="|" SELECTED>|- Default</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="|">|- Default</option>
+                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f220" -->
+                        <option value=" " SELECTED>#- Unknown or not specified</option>
+                        <!-- TMPL_ELSE -->
+                        <option value=" ">#- Unknown or not specified</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f22a" -->
+                         <option value="a" SELECTED>a- Preschool</option>
+	                <!-- TMPL_ELSE -->
+			<option value="a">a- Preschool</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f22b" -->
+                         <option value="b" SELECTED>b- Primary</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="b">b- Primary</option>
+                        <!-- /TMPL_IF -->	
+
+			<!-- TMPL_IF name="f22c" -->
+                         <option value="c" SELECTED>c- Elementary and junior high</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="c">c- Elementary and junior high</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f22d" -->
+                         <option value="d" SELECTED>d- Secondary (senior high)</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="d">d- Secondary (senior high)</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f22e" -->
+                         <option value="e" SELECTED>e- Adult</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="e">e- Adult</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f22f" -->
+                         <option value="f" SELECTED>f- Specialized</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="f">f- Specialized</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f22g" -->
+                         <option value="g" SELECTED>g- General</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="g">g- General</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f22j" -->
+                         <option value="j" SELECTED>j- Juvenile</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="j">j- Juvenile</option>
+                        <!-- /TMPL_IF -->
+		</select>
+		</td>
+	<tr>
+	<tr>
+                <!-- 23 Form of an item -->
+                <td>23- Form of an item</td>
+                <td>
+                <select name="f23" size="1">
+
+                        <!-- TMPL_IF name="f230" -->
+                        <option value=" " SELECTED>#- None of the following</option>
+                        <!-- TMPL_ELSE -->
+                        <option value=" ">#- None of the following</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f23a" -->
+                        <option value="a" SELECTED>a- Microfilm</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="a">a- Microfilm</option>
+                        <!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f23b" -->
+                        <option value="b" SELECTED>b- Microfiche</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="b">b- Microfiche</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f23c" -->
+                        <option value="c" SELECTED>a- Microopaque</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="c">a- Microopaque</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f23d" -->
+                        <option value="d" SELECTED>d- Large Print</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="d">d- Large Print</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f23f" -->
+                        <option value="f" SELECTED>f- Braille</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="f">f- Braille</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f23r" -->
+                        <option value="r" SELECTED>r- Regular print reproduction</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="r">r- Regular print reproduction</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f23s" -->
+                        <option value="s" SELECTED>s- Electronic</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="s">s- Electronic</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f23!" -->
+                        <option value="!" SELECTED>!- No attempt to code</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="!">!- No attempt to code</option>
+                        <!-- /TMPL_IF -->
+		</select>
+		</td>
+	</tr>
+	<tr>
+                <td>24-27 Nature of contents </td>
+                <td>(Derived value)
+                        <input type="hidden" name="f2427" size="4" maxlength="4" value="<!-- TMPL_VAR NAME="f2427" -->"/>                </td>
+        </tr>
+        <tr>
+                <td>28- Government Publication</td>
+                <td>
+                <select name="f28" size="1">                                    
+                        <!-- TMPL_IF name="f280" -->
+                        <option value=" " SELECTED>#- Not a government publication</option>
+                        <!-- TMPL_ELSE -->
+                        <option value=" ">#- Not a government publication</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f28a" -->
+                        <option value="a" SELECTED>a- Autonomous or semi-autonomous component</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="a">a- Autonomous or semi-autonomous component</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f28c" -->
+                        <option value="c" SELECTED>c- Multilocal</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="c">c- Multilocal</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f28f" -->
+                        <option value="f" SELECTED>f- Federal/national</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="f">f- Federal/national</option>
+                        <!-- /TMPL_IF -->
+
+
+                        <!-- TMPL_IF name="f28i" -->
+                        <option value="i" SELECTED>i- International intergovernmental</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="i">i- International intergovernmental</option>
+                        <!-- /TMPL_IF -->
+
+
+                        <!-- TMPL_IF name="f28l" -->
+                        <option value="l" SELECTED>l- Local</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="l">l- Local</option>
+                        <!-- /TMPL_IF -->
+
+			
+                        <!-- TMPL_IF name="f28m" -->
+                        <option value="m" SELECTED>m- Multistate</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="m">m- Multistate</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f28o" -->
+                        <option value="o" SELECTED>o- Government publication - level undetermined</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="o">o- Government publication - level undetermined</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f28s" -->
+                        <option value="s" SELECTED>s- State, provincial,territorial,dependent,etc.</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="s">s- State,provincial,territorial,dependent,etc.</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f28u" -->
+                        <option value="u" SELECTED>u- Unknown if item is government publication</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="u">u- Unknown if item is government publication</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f28z" -->
+                        <option value="z" SELECTED>z- Other</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="z">z- Other</option>
+                        <!-- /TMPL_IF -->
+		</select>
+		</td>
+	</tr>
+        <tr>
+                <td>29- Conference publication</td>
+                <td>
+                <select name="f29" size="1">
+                        <!-- TMPL_IF name="f290" -->
+                        <option value="0" SELECTED>0- Not a conference publication</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="0">0- Not a conference publication</option>
+                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f291" -->
+                        <option value="1" SELECTED>1- Conference publication</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="1">1- Conference publication</option>
+                        <!-- /TMPL_IF -->
+
+		</select>
+		</td>
+	</tr>
+	<tr>
+                <td>30- Festschrift</td>
+                <td>
+                <select name="f30" size="1">
+                        <!-- TMPL_IF name="f300" -->
+                        <option value="0" SELECTED>0- Not a festschrift</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="0">0- Not a festschrift</option>
+                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f301" -->
+                        <option value="1" SELECTED>1- Festschrift</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="1">1- Festschrift</option>
+                        <!-- /TMPL_IF -->
+                </select>
+                </td>
+        </tr>
+
+        <tr>
+                <td>31- Index</td>
+                <td>
+                <select name="f31" size="1">
+                        <!-- TMPL_IF name="f31|" -->
+                        <option value="|" SELECTED>|- Default</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="|">|- Default</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f310" -->
+                        <option value="0" SELECTED>0- No Index</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="0">0- No Index</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f311" -->
+                        <option value="1" SELECTED>1- Index present</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="1">1- Index present</option>
+                        <!-- /TMPL_IF -->
+                </select>
+                </td>
+        	</tr>
+		<tr><td>32 Undefined</td><td></td>
+		</tr>
+		<tr>
+                <td>33- Literary form</td>
+                <td>
+                <select name="f33" size="1">
+                        <!-- TMPL_IF name="f330" -->
+                        <option value="0" SELECTED>0- Not fiction</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="0">0- Not fiction</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f331" -->
+                        <option value="1" SELECTED>1- Fiction</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="1">1- Fiction</option>
+                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f33c" -->
+                        <option value="c" SELECTED>c- Comic strips</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="c">c- Comic stripts</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f33d" -->
+                        <option value="d" SELECTED>d- Dramas</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="d">d- Dramas</option>
+                        <!-- /TMPL_IF -->
+
+
+                        <!-- TMPL_IF name="f33e" -->
+                        <option value="e" SELECTED>e- Essays</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="e">e- Essays</option>
+                        <!-- /TMPL_IF -->
+
+			
+                        <!-- TMPL_IF name="f33f" -->
+                        <option value="f" SELECTED>f- Novels</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="f">f- Novels</option>
+                        <!-- /TMPL_IF -->
+
+			
+                        <!-- TMPL_IF name="f33h" -->
+                        <option value="h" SELECTED>h- Humor,satires,etc.</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="h">h- Humor,satires,etc.</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f33i" -->
+                        <option value="i" SELECTED>i- Letters</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="i">i- Letters</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f33j" -->
+                        <option value="j" SELECTED>j- Short stories</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="j">j- Short stories</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f33m" -->
+                        <option value="m" SELECTED>m- Mixed forms</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="m">m- Mixed forms</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f33p" -->
+                        <option value="p" SELECTED>p- Poetry</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="p">p- Poetry</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f33s" -->
+                        <option value="s" SELECTED>s- Speeches</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="s">s- Speeches</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f33u" -->
+                        <option value="u" SELECTED>u- Unknown</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="u">u- Unknown</option>
+                        <!-- /TMPL_IF -->
+
+
+
+                </select>
+                </td>
+        </tr>
+	<tr>
+                <td>34- Biography</td>
+                <td>
+                <select name="f34" size="1">
+                        <!-- TMPL_IF name="f340" -->
+                        <option value=" " SELECTED>#- No biographical material</option>                              <!-- TMPL_ELSE -->
+                        <option value=" ">#- No biographical material</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f34a" -->
+                        <option value="a" SELECTED>a- Autobiography</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="a">a- Autobiography</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f34b" -->
+                        <option value="b" SELECTED>b- Individual biography</option>                              <!-- TMPL_ELSE -->
+                        <option value="b">b- Individual biography</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f34c" -->
+                        <option value="c" SELECTED>c- Collective biography</option>                              <!-- TMPL_ELSE -->
+                        <option value="c">c- Collective biographyl</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f34d" -->
+                        <option value="d" SELECTED>d- Contains bibliographic information</option>                              <!-- TMPL_ELSE -->
+                        <option value="d">d- Contains bibliographic information</option>
+                        <!-- /TMPL_IF -->
+                </select>
+                </td>
+        </tr>
+
+	 <tr>
+
+                <td>35-37 Language see <a href="http://www.itsmarc.com/crs/lang0098.htm">MARC Code List for Languages</a></td>
+                <td>
+                        <input type="text" name="f3537" size="4"  maxlength="4" value="<!-- TMPL_VAR NAME="f3537" -->"/>
+                </td>
+        </tr>
+	<tr>
+                <td>38- Modified Record</td>
+                <td>                
+		<select name="f38" size="1">                        			
+			<!-- TMPL_IF name="f380" -->
+                        <option value=" " SELECTED>#- Not Modified</option>
+                        <!-- TMPL_ELSE -->
+                        <option value=" ">#- Not Modified</option>
+                        <!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f38s" -->
+                        <option value="s" SELECTED>s- Shortened</option>
+			<!-- TMPL_ELSE -->
+                        <option value="s">s- Shortened</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f38d" -->
+                        <option value="d" SELECTED>d- Dashed-on information omitted</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="d">d- Dashed-on information omitted</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f38x" -->
+                        <option value="x" SELECTED>x- Missing characters</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="x">x- Missing characters</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f38r" -->
+                        <option value="r" SELECTED>r- Completely romanized/printed cards in script</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="r">r- Completely romanized/printed cards in script</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f38o" -->
+                        <option value="o" SELECTED>o- Completely romainzed/printed cards romanized</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="o">o- Completely romanized/printed cards romanized</option>
+                        <!-- /TMPL_IF -->
+		</select>
+
+                </td>
+        </tr>
+<tr>
+                <td>39- Cataloging source</td>
+                <td>
+                <select name="f39" size="1">                                    
+                        <!-- TMPL_IF name="f390" -->
+                        <option value=" " SELECTED>#- National bibliographic agency</option>
+                        <!-- TMPL_ELSE -->
+                        <option value=" ">#- National bibliographic agency</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f39c" -->
+                        <option value="c" SELECTED>c- Cooperative cataloging program</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="c">c- Cooperative cataloging program</option>
+                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f39d" -->
+                        <option value="d" SELECTED>d- Other</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="d">d- Other</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f39u" -->
+                        <option value="u" SELECTED>u- Unknown</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="u">u- Unknown</option>
+                        <!-- /TMPL_IF -->
+		</select>
+                </td>
+        </tr>
+
+	<tr><td colspan=2><input type="submit" value="OK"></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.f6.value+
+			document.f_pop.f710.value+
+			document.f_pop.f1114.value+
+			document.f_pop.f1517.value+
+			document.f_pop.f1821.value+
+			document.f_pop.f22.value+
+			document.f_pop.f23.value+
+			document.f_pop.f2427.value+
+			document.f_pop.f28.value+
+			document.f_pop.f29.value+
+			document.f_pop.f30.value+
+			document.f_pop.f31.value+ ' '+
+			document.f_pop.f33.value+
+			document.f_pop.f34.value+
+			document.f_pop.f3537.value+
+			document.f_pop.f38.value+
+			document.f_pop.f39.value;
+		self.close();
+		return false;
+	}
+</script>
+</body>
+</html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_field_006.tmpl b/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_field_006.tmpl
new file mode 100644
index 0000000000..5715fa48a1
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_field_006.tmpl
@@ -0,0 +1,449 @@
+<html>
+<head>
+<title>Leader builder</title>
+</head>
+<body>
+<form name="f_pop" onSubmit="javascript:report()">
+<table>
+	<tr>
+		<td>0 Form of material</td>
+                <td>
+                        <select name="f0" size="1">
+                        <!-- TMPL_IF name="f0a" -->
+                                <option value="a" SELECTED>a- Language material</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="a">a- Language material</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f0b" -->
+                                <option value="b" SELECTED>b- Manuscript language material</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="b">b- Manuscript language material</option>
+                        <!-- /TMPL_IF -->
+        		</select>
+		</td>
+	</tr>
+	<tr>
+                <td>01-04 Illustrations </td>
+                <td>(auto-filled from 300)<input type="hidden" name="f014" size="4"  maxlength="4" value="<!-- TMPL_VAR NAME="f014" -->"/></td>
+        </tr>
+	        <tr>
+                <!-- 5 Target Audience -->
+                <td>5- Target Audience</td>
+                <td>
+                <select name="f5" size="1">
+
+                        <!-- TMPL_IF name="f5|" -->
+                        <option value="|" SELECTED>|- Default</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="|">|- Default</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f50" -->
+                        <option value=" " SELECTED>#- Unknown or not specified</option>
+                        <!-- TMPL_ELSE -->
+                        <option value=" ">#- Unknown or not specified</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f5a" -->
+                         <option value="a" SELECTED>a- Preschool</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="a">a- Preschool</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f5b" -->
+                         <option value="b" SELECTED>b- Primary</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="b">b- Primary</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f5c" -->
+                         <option value="c" SELECTED>c- Elementary and junior high</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="c">c- Elementary and junior high</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f5d" -->
+                         <option value="d" SELECTED>d- Secondary (senior high)</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="d">d- Secondary (senior high)</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f5e" -->
+                         <option value="e" SELECTED>e- Adult</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="e">e- Adult</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f5f" -->
+                         <option value="f" SELECTED>f- Specialized</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="f">f- Specialized</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f5g" -->
+                         <option value="g" SELECTED>g- General</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="g">g- General</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f5j" -->
+                         <option value="j" SELECTED>j- Juvenile</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="j">j- Juvenile</option>
+                        <!-- /TMPL_IF -->
+                </select>
+                </td>
+        <tr>
+	 <tr>
+                <!-- 06 Form of an item -->
+                <td>06- Form of an item</td>
+                <td>
+                <select name="f6" size="1">
+
+                        <!-- TMPL_IF name="f60" -->
+                        <option value=" " SELECTED>#- None of the following</option>
+                        <!-- TMPL_ELSE -->
+                        <option value=" ">#- None of the following</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f6a" -->
+                        <option value="a" SELECTED>a- Microfilm</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="a">a- Microfilm</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f6b" -->
+                        <option value="b" SELECTED>b- Microfiche</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="b">b- Microfiche</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f6c" -->
+                        <option value="c" SELECTED>a- Microopaque</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="c">a- Microopaque</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f6d" -->
+                        <option value="d" SELECTED>d- Large Print</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="d">d- Large Print</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f6f" -->
+                        <option value="f" SELECTED>f- Braille</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="f">f- Braille</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f6r" -->
+                        <option value="r" SELECTED>r- Regular print reproduction</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="r">r- Regular print reproduction</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f6s" -->
+                        <option value="s" SELECTED>s- Electronic</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="s">s- Electronic</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f6!" -->
+                        <option value="!" SELECTED>!- No attempt to code</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="!">!- No attempt to code</option>
+                        <!-- /TMPL_IF -->
+                </select>
+                </td>
+        </tr>
+       <tr>
+                <td>7-10 Nature of contents </td>
+                <td>(Derived value)
+                        <input type="hidden" name="f710" size="4" maxlength="4" value="<!-- TMPL_VAR NAME="f710" -->"/>                </td>
+        </tr>
+        <tr>
+                <td>11- Government Publication</td>
+                <td>
+                <select name="f11" size="1">
+		
+                        <!-- TMPL_IF name="f11|" -->
+                        <option value="|" SELECTED>|- Default</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="|">|- Default</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f110" -->
+                        <option value=" " SELECTED>#- Not a government publication</option>
+                        <!-- TMPL_ELSE -->
+                        <option value=" ">#- Not a government publication</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f11a" -->
+                        <option value="a" SELECTED>a- Autonomous or semi-autonomous component</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="a">a- Autonomous or semi-autonomous component</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f11c" -->
+                        <option value="c" SELECTED>c- Multilocal</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="c">c- Multilocal</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f11f" -->
+                        <option value="f" SELECTED>f- Federal/national</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="f">f- Federal/national</option>
+                        <!-- /TMPL_IF -->
+
+
+                        <!-- TMPL_IF name="f11i" -->
+                        <option value="i" SELECTED>i- International intergovernmental</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="i">i- International intergovernmental</option>
+                        <!-- /TMPL_IF -->
+
+
+                        <!-- TMPL_IF name="f11l" -->
+                        <option value="l" SELECTED>l- Local</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="l">l- Local</option>
+                        <!-- /TMPL_IF -->
+
+
+                        <!-- TMPL_IF name="f11m" -->
+                        <option value="m" SELECTED>m- Multistate</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="m">m- Multistate</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f11o" -->
+                        <option value="o" SELECTED>o- Government publication - level undetermined</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="o">o- Government publication - level undetermined</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f11s" -->
+                        <option value="s" SELECTED>s- State, provincial,territorial,dependent,etc.</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="s">s- State,provincial,territorial,dependent,etc.</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f11u" -->
+                        <option value="u" SELECTED>u- Unknown if item is government publication</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="u">u- Unknown if item is government publication</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f11z" -->
+                        <option value="z" SELECTED>z- Other</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="z">z- Other</option>
+                        <!-- /TMPL_IF -->
+                </select>
+                </td>
+        </tr>
+        <tr>
+                <td>12- Conference publication</td>
+                <td>
+                <select name="f12" size="1">
+                        <!-- TMPL_IF name="f120" -->
+                        <option value="0" SELECTED>0- Not a conference publication</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="0">0- Not a conference publication</option>
+                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f121" -->
+                        <option value="1" SELECTED>1- Conference publication</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="1">1- Conference publication</option>
+                        <!-- /TMPL_IF -->
+
+		</select>
+		</td>
+	</tr>
+	<tr>
+                <td>13- Festschrift</td>
+                <td>
+                <select name="f13" size="1">
+                        <!-- TMPL_IF name="f130" -->
+                        <option value="0" SELECTED>0- Not a festschrift</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="0">0- Not a festschrift</option>
+                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f131" -->
+                        <option value="1" SELECTED>1- Festschrift</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="1">1- Festschrift</option>
+                        <!-- /TMPL_IF -->
+                </select>
+                </td>
+        </tr>
+
+        <tr>
+                <td>14- Index</td>
+                <td>
+                <select name="f14" size="1">
+                        <!-- TMPL_IF name="f14|" -->
+                        <option value="|" SELECTED>|- Default</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="|">|- Default</option>
+                        <!-- /TMPL_IF -->
+	
+                        <!-- TMPL_IF name="f140" -->
+                        <option value="0" SELECTED>0- No Index</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="0">0- No Index</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f141" -->
+                        <option value="1" SELECTED>1- Index present</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="1">1- Index present</option>
+                        <!-- /TMPL_IF -->
+                </select>
+                </td>
+        	</tr>
+		<tr><td>15 Undefined</td><td></td>
+		</tr>
+		<tr>
+                <td>16- Literary form</td>
+                <td>
+                <select name="f16" size="1">
+                        <!-- TMPL_IF name="f160" -->
+                        <option value="0" SELECTED>0- Not fiction</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="0">0- Not fiction</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f161" -->
+                        <option value="1" SELECTED>1- Fiction</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="1">1- Fiction</option>
+                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f16c" -->
+                        <option value="c" SELECTED>c- Comic strips</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="c">c- Comic stripts</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f16d" -->
+                        <option value="d" SELECTED>d- Dramas</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="d">d- Dramas</option>
+                        <!-- /TMPL_IF -->
+
+
+                        <!-- TMPL_IF name="f16e" -->
+                        <option value="e" SELECTED>e- Essays</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="e">e- Essays</option>
+                        <!-- /TMPL_IF -->
+
+			
+                        <!-- TMPL_IF name="f16f" -->
+                        <option value="f" SELECTED>f- Novels</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="f">f- Novels</option>
+                        <!-- /TMPL_IF -->
+
+			
+                        <!-- TMPL_IF name="f16h" -->
+                        <option value="h" SELECTED>h- Humor,satires,etc.</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="h">h- Humor,satires,etc.</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f16i" -->
+                        <option value="i" SELECTED>i- Letters</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="i">i- Letters</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f16j" -->
+                        <option value="j" SELECTED>j- Short stories</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="j">j- Short stories</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f16m" -->
+                        <option value="m" SELECTED>m- Mixed forms</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="m">m- Mixed forms</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f16p" -->
+                        <option value="p" SELECTED>p- Poetry</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="p">p- Poetry</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f16s" -->
+                        <option value="s" SELECTED>s- Speeches</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="s">s- Speeches</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f16u" -->
+                        <option value="u" SELECTED>u- Unknown</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="u">u- Unknown</option>
+                        <!-- /TMPL_IF -->
+
+                </select>
+                </td>
+        </tr>
+	<tr>
+                <td>17- Biography</td>
+                <td>
+                <select name="f17" size="1">
+                        <!-- TMPL_IF name="f170" -->
+                        <option value=" " SELECTED>#- No biographical material</option>                              <!-- TMPL_ELSE -->
+                        <option value=" ">#- No biographical material</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f17a" -->
+                        <option value="a" SELECTED>a- Autobiography</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="a">a- Autobiography</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f17b" -->
+                        <option value="b" SELECTED>b- Individual biography</option>                              <!-- TMPL_ELSE -->
+                        <option value="b">b- Individual biography</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f17c" -->
+                        <option value="c" SELECTED>c- Collective biography</option>                              <!-- TMPL_ELSE -->
+                        <option value="c">c- Collective biographyl</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f17d" -->
+                        <option value="d" SELECTED>d- Contains bibliographic information</option>                              <!-- TMPL_ELSE -->
+                        <option value="d">d- Contains bibliographic information</option>
+                        <!-- /TMPL_IF -->
+                </select>
+                </td>
+        </tr>
+
+	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
+</table>
+</form>
+<script>
+function report() {
+		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value = 
+			'<!-- TMPL_VAR NAME="dateentered" -->'+
+			document.f_pop.f0.value+
+			document.f_pop.f014.value+
+			document.f_pop.f5.value+
+			document.f_pop.f6.value+
+			document.f_pop.f710.value+
+			document.f_pop.f11.value+
+			document.f_pop.f12.value+
+			document.f_pop.f13.value+
+			document.f_pop.f14.value+ ' '+
+			document.f_pop.f16.value+
+			document.f_pop.f17.value;
+		self.close();
+		return false;
+	}
+</script>
+</body>
+</html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_field_007.tmpl b/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_field_007.tmpl
new file mode 100644
index 0000000000..d84eb48f88
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_field_007.tmpl
@@ -0,0 +1,79 @@
+<html>
+<head>
+<title>Leader builder</title>
+</head>
+<body>
+<form name="f_pop" onSubmit="javascript:report()">
+<table>
+	<tr>
+		<td>00 Category of material</td>
+                <td>
+                        <select name="f0" size="1">
+                        <!-- TMPL_IF name="f0t" -->
+                                <option value="t" SELECTED>t- Text</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="t">t- Text</option>
+                        <!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+	<tr>
+                <td>01 Specific material designation</td>
+                <td>
+                        <select name="f1" size="1">
+                        <!-- TMPL_IF name="f1a" -->
+                                <option value="a" SELECTED>a- Regular print</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="a">a- Regular print</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f1b" -->
+                                <option value="b" SELECTED>b- Large print</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="b">b- Large print </option>
+                        <!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f1c" -->
+                                <option value="c" SELECTED>c- Braille</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="c">c- Braille</option>
+                        <!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f1d" -->
+                                <option value="d" SELECTED>d- Loose-leaf</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="d">d- Loose-leaf</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f1u" -->
+                                <option value="u" SELECTED>u- Unspecified</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="u">u- Unspecified</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f1z" -->
+                                <option value="z" SELECTED>z- Other</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="z">z- Other</option>
+                        <!-- /TMPL_IF -->
+
+                        </select>
+                </td>
+        </tr>
+
+
+
+	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
+</table>
+</form>
+<script>
+function report() {
+		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value = 
+			document.f_pop.f0.value+
+			document.f_pop.f1.value;
+		self.close();
+		return false;
+	}
+</script>
+</body>
+</html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_field_008.tmpl b/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_field_008.tmpl
new file mode 100644
index 0000000000..a43c7713e5
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_field_008.tmpl
@@ -0,0 +1,634 @@
+<html>
+<head>
+<title>Leader builder</title>
+</head>
+<body>
+<form name="f_pop" onSubmit="javascript:report()">
+<table>
+	<tr>
+		<td>1-5 Date entered on file</td>
+		<td>(auto-filled)</td>
+		<td><input type="text" name="f1" maxlength=6 size=7 value="<!-- TMPL_VAR name="f1" -->"></td>
+	</tr>
+	<tr>
+		<!-- 06 Type of date / Publication status -->
+		<td>06- Type of date / Publication Status</td>
+		<td>
+			<!-- NO DATE; B.C. DATE -->
+
+			<select name="f6" size="1">
+			<!-- TMPL_IF name="f60" -->
+                                <option value=" " SELECTED>#- Blank</option>
+                        <!-- TMPL_ELSE -->
+                                <option value=" ">#- Blank</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f6b" -->
+				<option value="b" SELECTED>b- B.C. Date</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">b- B.C. Date</option>
+			<!-- /TMPL_IF -->
+
+			<!-- SINGLE DATE -->
+			<!-- TMPL_IF name="f6e" -->
+                                <option value="e" SELECTED>e- Detailed date</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="e">e- Detailed date</option>
+                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6s" -->
+                                <option value="s" SELECTED>s- Single date</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="s">s- Single date</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- MULTIPLE DATES -->
+			<!-- TMPL_IF name="f6i" -->
+                                <option value="i" SELECTED>i- Inclusive dates of collection</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="i">i- Inclusive dates of collection</option>
+                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6k" -->
+                                <option value="k" SELECTED>k- Range of years of bulk collection</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="k">k- Range of years of bulk collection</option>
+                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6m" -->
+                                <option value="m" SELECTED>m- Multiple dates</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="m">m- Multiple dates</option>
+                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6p" -->
+                                <option value="p" SELECTED>p- Distribution/production date</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="p">p- Distribution/production date</option>
+			<!-- /TMPL_IF -->
+	
+			<!-- TMPL_IF name="f6r" -->
+				<option value="r" SELECTED>r- Reprint/original date</option>
+			<!-- TMPL_ELSE -->
+				<option value="r">r- Reprint/original date</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f6t" -->
+                                <option value="t" SELECTED>t- Publication date and copyright date</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="t">t- Publication date and copyright date</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- UNKNOWN DATES -->
+			<!-- TMPL_IF name="f6n" -->
+                                <option value="n" SELECTED>n- Dates unknown</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="n">n- Dates unknown</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f6q" -->
+                                <option value="q" SELECTED>q- Questionable date</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="q">q- Questionable date</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f6c" -->
+                                <option value="c" SELECTED>c- Serial item currently published</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="c">c- Serial item currently published</option>
+                        <!-- /TMPL_IF -->
+				
+			<!-- TMPL_IF name="f6d" -->
+                                <option value="d" SELECTED>d- Serial item ceased publication (Dead status)</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="d">d- Serial item ceased publication (Dead status)</option>
+                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6u" -->
+                                <option value="u" SELECTED>u- Serial item status unknown</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="u">u- Serial item status unknown</option>
+                        <!-- /TMPL_IF -->
+
+
+	
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td>7-10 Date1 / Begininning date of publication </td>
+		<td>
+			<input type="text" name="f710" size="4" maxlength="4" value="<!-- TMPL_VAR NAME="f710" -->"/>
+		</td>
+	</tr>
+	<tr>
+                <td>11-14 Date2 / ending date of publication </td>
+                <td>
+                        <input type="text" name="f1114" size="4" maxlength="4" value="<!-- TMPL_VAR NAME="f1114" -->"/>                </td>
+        </tr>
+
+	<tr>
+                <td>15-17 Place of publication, production, or execution </td>
+                <td>
+                        <input type="text" name="f1517" size="3"  maxlength="3" value="<!-- TMPL_VAR NAME="f1517" -->"/>
+                </td>
+        </tr>
+	 <tr>
+                <td>18-21 Illustrations </td>
+		<td>(auto-filled from 300)<input type="hidden" name="f1821" size="4"  maxlength="4" value="<!-- TMPL_VAR NAME="f1821" -->"/></td>
+        </tr>
+	<tr>
+                <!-- 22 Target Audience -->
+                <td>22- Target Audience</td>
+                <td>                        
+                <select name="f22" size="1">
+
+                        <!-- TMPL_IF name="f22|" -->
+                        <option value="|" SELECTED>|- Default</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="|">|- Default</option>
+                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f220" -->
+                        <option value=" " SELECTED>#- Unknown or not specified</option>
+                        <!-- TMPL_ELSE -->
+                        <option value=" ">#- Unknown or not specified</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f22a" -->
+                         <option value="a" SELECTED>a- Preschool</option>
+	                <!-- TMPL_ELSE -->
+			<option value="a">a- Preschool</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f22b" -->
+                         <option value="b" SELECTED>b- Primary</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="b">b- Primary</option>
+                        <!-- /TMPL_IF -->	
+
+			<!-- TMPL_IF name="f22c" -->
+                         <option value="c" SELECTED>c- Elementary and junior high</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="c">c- Elementary and junior high</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f22d" -->
+                         <option value="d" SELECTED>d- Secondary (senior high)</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="d">d- Secondary (senior high)</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f22e" -->
+                         <option value="e" SELECTED>e- Adult</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="e">e- Adult</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f22f" -->
+                         <option value="f" SELECTED>f- Specialized</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="f">f- Specialized</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f22g" -->
+                         <option value="g" SELECTED>g- General</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="g">g- General</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f22j" -->
+                         <option value="j" SELECTED>j- Juvenile</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="j">j- Juvenile</option>
+                        <!-- /TMPL_IF -->
+		</select>
+		</td>
+	<tr>
+	<tr>
+                <!-- 23 Form of an item -->
+                <td>23- Form of an item</td>
+                <td>
+                <select name="f23" size="1">
+
+                        <!-- TMPL_IF name="f230" -->
+                        <option value=" " SELECTED>#- None of the following</option>
+                        <!-- TMPL_ELSE -->
+                        <option value=" ">#- None of the following</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f23a" -->
+                        <option value="a" SELECTED>a- Microfilm</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="a">a- Microfilm</option>
+                        <!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f23b" -->
+                        <option value="b" SELECTED>b- Microfiche</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="b">b- Microfiche</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f23c" -->
+                        <option value="c" SELECTED>a- Microopaque</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="c">a- Microopaque</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f23d" -->
+                        <option value="d" SELECTED>d- Large Print</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="d">d- Large Print</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f23f" -->
+                        <option value="f" SELECTED>f- Braille</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="f">f- Braille</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f23r" -->
+                        <option value="r" SELECTED>r- Regular print reproduction</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="r">r- Regular print reproduction</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f23s" -->
+                        <option value="s" SELECTED>s- Electronic</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="s">s- Electronic</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f23!" -->
+                        <option value="!" SELECTED>!- No attempt to code</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="!">!- No attempt to code</option>
+                        <!-- /TMPL_IF -->
+		</select>
+		</td>
+	</tr>
+	<tr>
+                <td>24-27 Nature of contents </td>
+                <td>(Derived value)
+                        <input type="hidden" name="f2427" size="4" maxlength="4" value="<!-- TMPL_VAR NAME="f2427" -->"/>                </td>
+        </tr>
+        <tr>
+                <td>28- Government Publication</td>
+                <td>
+                <select name="f28" size="1">                                    
+                        <!-- TMPL_IF name="f280" -->
+                        <option value=" " SELECTED>#- Not a government publication</option>
+                        <!-- TMPL_ELSE -->
+                        <option value=" ">#- Not a government publication</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f28a" -->
+                        <option value="a" SELECTED>a- Autonomous or semi-autonomous component</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="a">a- Autonomous or semi-autonomous component</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f28c" -->
+                        <option value="c" SELECTED>c- Multilocal</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="c">c- Multilocal</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f28f" -->
+                        <option value="f" SELECTED>f- Federal/national</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="f">f- Federal/national</option>
+                        <!-- /TMPL_IF -->
+
+
+                        <!-- TMPL_IF name="f28i" -->
+                        <option value="i" SELECTED>i- International intergovernmental</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="i">i- International intergovernmental</option>
+                        <!-- /TMPL_IF -->
+
+
+                        <!-- TMPL_IF name="f28l" -->
+                        <option value="l" SELECTED>l- Local</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="l">l- Local</option>
+                        <!-- /TMPL_IF -->
+
+			
+                        <!-- TMPL_IF name="f28m" -->
+                        <option value="m" SELECTED>m- Multistate</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="m">m- Multistate</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f28o" -->
+                        <option value="o" SELECTED>o- Government publication - level undetermined</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="o">o- Government publication - level undetermined</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f28s" -->
+                        <option value="s" SELECTED>s- State, provincial,territorial,dependent,etc.</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="s">s- State,provincial,territorial,dependent,etc.</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f28u" -->
+                        <option value="u" SELECTED>u- Unknown if item is government publication</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="u">u- Unknown if item is government publication</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f28z" -->
+                        <option value="z" SELECTED>z- Other</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="z">z- Other</option>
+                        <!-- /TMPL_IF -->
+		</select>
+		</td>
+	</tr>
+        <tr>
+                <td>29- Conference publication</td>
+                <td>
+                <select name="f29" size="1">
+                        <!-- TMPL_IF name="f290" -->
+                        <option value="0" SELECTED>0- Not a conference publication</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="0">0- Not a conference publication</option>
+                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f291" -->
+                        <option value="1" SELECTED>1- Conference publication</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="1">1- Conference publication</option>
+                        <!-- /TMPL_IF -->
+
+		</select>
+		</td>
+	</tr>
+	<tr>
+                <td>30- Festschrift</td>
+                <td>
+                <select name="f30" size="1">
+                        <!-- TMPL_IF name="f300" -->
+                        <option value="0" SELECTED>0- Not a festschrift</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="0">0- Not a festschrift</option>
+                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f301" -->
+                        <option value="1" SELECTED>1- Festschrift</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="1">1- Festschrift</option>
+                        <!-- /TMPL_IF -->
+                </select>
+                </td>
+        </tr>
+
+        <tr>
+                <td>31- Index</td>
+                <td>
+                <select name="f31" size="1">
+                        <!-- TMPL_IF name="f31|" -->
+                        <option value="|" SELECTED>|- Default</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="|">|- Default</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f310" -->
+                        <option value="0" SELECTED>0- No Index</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="0">0- No Index</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f311" -->
+                        <option value="1" SELECTED>1- Index present</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="1">1- Index present</option>
+                        <!-- /TMPL_IF -->
+                </select>
+                </td>
+        	</tr>
+		<tr><td>32 Undefined</td><td></td>
+		</tr>
+		<tr>
+                <td>33- Literary form</td>
+                <td>
+                <select name="f33" size="1">
+                        <!-- TMPL_IF name="f330" -->
+                        <option value="0" SELECTED>0- Not fiction</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="0">0- Not fiction</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f331" -->
+                        <option value="1" SELECTED>1- Fiction</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="1">1- Fiction</option>
+                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f33c" -->
+                        <option value="c" SELECTED>c- Comic strips</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="c">c- Comic stripts</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f33d" -->
+                        <option value="d" SELECTED>d- Dramas</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="d">d- Dramas</option>
+                        <!-- /TMPL_IF -->
+
+
+                        <!-- TMPL_IF name="f33e" -->
+                        <option value="e" SELECTED>e- Essays</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="e">e- Essays</option>
+                        <!-- /TMPL_IF -->
+
+			
+                        <!-- TMPL_IF name="f33f" -->
+                        <option value="f" SELECTED>f- Novels</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="f">f- Novels</option>
+                        <!-- /TMPL_IF -->
+
+			
+                        <!-- TMPL_IF name="f33h" -->
+                        <option value="h" SELECTED>h- Humor,satires,etc.</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="h">h- Humor,satires,etc.</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f33i" -->
+                        <option value="i" SELECTED>i- Letters</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="i">i- Letters</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f33j" -->
+                        <option value="j" SELECTED>j- Short stories</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="j">j- Short stories</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f33m" -->
+                        <option value="m" SELECTED>m- Mixed forms</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="m">m- Mixed forms</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f33p" -->
+                        <option value="p" SELECTED>p- Poetry</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="p">p- Poetry</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f33s" -->
+                        <option value="s" SELECTED>s- Speeches</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="s">s- Speeches</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f33u" -->
+                        <option value="u" SELECTED>u- Unknown</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="u">u- Unknown</option>
+                        <!-- /TMPL_IF -->
+
+
+
+                </select>
+                </td>
+        </tr>
+	<tr>
+                <td>34- Biography</td>
+                <td>
+                <select name="f34" size="1">
+                        <!-- TMPL_IF name="f340" -->
+                        <option value=" " SELECTED>#- No biographical material</option>                              <!-- TMPL_ELSE -->
+                        <option value=" ">#- No biographical material</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f34a" -->
+                        <option value="a" SELECTED>a- Autobiography</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="a">a- Autobiography</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f34b" -->
+                        <option value="b" SELECTED>b- Individual biography</option>                              <!-- TMPL_ELSE -->
+                        <option value="b">b- Individual biography</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f34c" -->
+                        <option value="c" SELECTED>c- Collective biography</option>                              <!-- TMPL_ELSE -->
+                        <option value="c">c- Collective biographyl</option>
+                        <!-- /TMPL_IF -->
+			
+                        <!-- TMPL_IF name="f34d" -->
+                        <option value="d" SELECTED>d- Contains bibliographic information</option>                              <!-- TMPL_ELSE -->
+                        <option value="d">d- Contains bibliographic information</option>
+                        <!-- /TMPL_IF -->
+                </select>
+                </td>
+        </tr>
+
+	 <tr>
+
+                <td>35-37 Language see <a href="http://www.itsmarc.com/crs/lang0098.htm">MARC Code List for Languages</a></td>
+                <td>
+                        <input type="text" name="f3537" size="4"  maxlength="4" value="<!-- TMPL_VAR NAME="f3537" -->"/>
+                </td>
+        </tr>
+	<tr>
+                <td>38- Modified Record</td>
+                <td>                
+		<select name="f38" size="1">                        			
+			<!-- TMPL_IF name="f380" -->
+                        <option value=" " SELECTED>#- Not Modified</option>
+                        <!-- TMPL_ELSE -->
+                        <option value=" ">#- Not Modified</option>
+                        <!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f38s" -->
+                        <option value="s" SELECTED>s- Shortened</option>
+			<!-- TMPL_ELSE -->
+                        <option value="s">s- Shortened</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f38d" -->
+                        <option value="d" SELECTED>d- Dashed-on information omitted</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="d">d- Dashed-on information omitted</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f38x" -->
+                        <option value="x" SELECTED>x- Missing characters</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="x">x- Missing characters</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f38r" -->
+                        <option value="r" SELECTED>r- Completely romanized/printed cards in script</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="r">r- Completely romanized/printed cards in script</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f38o" -->
+                        <option value="o" SELECTED>o- Completely romainzed/printed cards romanized</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="o">o- Completely romanized/printed cards romanized</option>
+                        <!-- /TMPL_IF -->
+		</select>
+
+                </td>
+        </tr>
+<tr>
+                <td>39- Cataloging source</td>
+                <td>
+                <select name="f39" size="1">                                    
+                        <!-- TMPL_IF name="f390" -->
+                        <option value=" " SELECTED>#- National bibliographic agency</option>
+                        <!-- TMPL_ELSE -->
+                        <option value=" ">#- National bibliographic agency</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f39c" -->
+                        <option value="c" SELECTED>c- Cooperative cataloging program</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="c">c- Cooperative cataloging program</option>
+                        <!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f39d" -->
+                        <option value="d" SELECTED>d- Other</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="d">d- Other</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f39u" -->
+                        <option value="u" SELECTED>u- Unknown</option>
+                        <!-- TMPL_ELSE -->
+                        <option value="u">u- Unknown</option>
+                        <!-- /TMPL_IF -->
+		</select>
+                </td>
+        </tr>
+
+	<tr><td colspan=2><input type="submit" value="OK"></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.f6.value+
+			document.f_pop.f710.value+
+			document.f_pop.f1114.value+
+			document.f_pop.f1517.value+
+			document.f_pop.f1821.value+
+			document.f_pop.f22.value+
+			document.f_pop.f23.value+
+			document.f_pop.f2427.value+
+			document.f_pop.f28.value+
+			document.f_pop.f29.value+
+			document.f_pop.f30.value+
+			document.f_pop.f31.value+ ' '+
+			document.f_pop.f33.value+
+			document.f_pop.f34.value+
+			document.f_pop.f3537.value+
+			document.f_pop.f38.value+
+			document.f_pop.f39.value;
+		self.close();
+		return false;
+	}
+</script>
+</body>
+</html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_leader.tmpl b/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_leader.tmpl
new file mode 100644
index 0000000000..e8fe74fce0
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_leader.tmpl
@@ -0,0 +1,328 @@
+<html>
+<head>
+<title>Leader builder</title>
+</head>
+<body>
+<form name="f_pop" onSubmit="javascript:report()">
+<table>
+	<tr>
+		<td>0-4 Record size</td>
+		<td>(auto-filled)</td>
+	</tr>
+	<tr>
+		<td>5- Record status</td>
+		<td>
+			<select name="f5" size="1">
+			<!-- TMPL_IF name="f5a" -->
+				<option value=" " SELECTED>a- Increase in encoding level</option>
+			<!-- TMPL_ELSE -->
+				<option value=" ">a- Increase in encoding level</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f5c" -->
+				<option value="c" SELECTED>c- Corrected or revised</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">c- Corrected or revised</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5d" -->
+				<option value="d" SELECTED>d- Deleted</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">d- Deleted</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5n" -->
+				<option value="n" SELECTED>n- New</option>
+			<!-- TMPL_ELSE -->
+				<option value="n">n- New</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5p" -->
+				<option value="p" SELECTED>p- Increase in encoding level from prepublication</option>
+			<!-- TMPL_ELSE -->
+				<option value="p">p- Increase in encoding level from prepublication</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td>6- Type of record</td>
+		<td>
+			<select name="f6" size="1">
+			<!-- TMPL_IF name="f6a" -->
+				<option value="a" SELECTED>a- Language material (monography)</option>
+			<!-- TMPL_ELSE -->
+				<option value="a">a- Language material (monography)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6c" -->
+				<option value="c" SELECTED>c- Notated music</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">c- Notated music</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6d" -->
+				<option value="d" SELECTED>d- Manuscript notated music</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">d- Manuscript notated music</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6e" -->
+				<option value="e" SELECTED>e- Cartographic material</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">e- Cartographic material</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6f" -->
+				<option value="f" SELECTED>f - Manuscript cartographic material</option>
+			<!-- TMPL_ELSE -->
+				<option value="f">f - Manuscript cartographic material</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6g" -->
+				<option value="g" SELECTED>g - Projected medium</option>
+			<!-- TMPL_ELSE -->
+				<option value="g">g - Projected medium</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6i" -->
+				<option value="i" SELECTED>i - Nonmusical sound recording</option>
+			<!-- TMPL_ELSE -->
+				<option value="i">i - Nonmusical sound recording</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6j" -->
+				<option value="j" SELECTED>j - Musical sound recording</option>
+			<!-- TMPL_ELSE -->
+				<option value="j">j - Musical sound recording</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6k" -->
+				<option value="k" SELECTED>k - Two-dimensional nonprojectable graphic</option>
+			<!-- TMPL_ELSE -->
+				<option value="k">k - Two-dimensional nonprojectable graphic</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6m" -->
+				<option value="m" SELECTED>m - Computer file</option>
+			<!-- TMPL_ELSE -->
+				<option value="m">m - Computer file</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6o" -->
+				<option value="o" SELECTED>o - Kit</option>
+			<!-- TMPL_ELSE -->
+				<option value="o">o - Kit</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6r" -->
+				<option value="r" SELECTED>r - Three-dimensional artifact or naturally occurring object</option>
+			<!-- TMPL_ELSE -->
+				<option value="r">r - Three-dimensional artifact or naturally occurring object</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6t" -->
+				<option value="t" SELECTED>t - Manuscript language material</option>
+			<!-- TMPL_ELSE -->
+				<option value="t">t - Manuscript language material</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td>7- Bibliographic level</td>
+		<td>
+			<select name="f7" size="1">
+				<!-- TMPL_IF name="f7a" -->
+					<option value="a" SELECTED>a- Monographic component part</option>
+				<!-- TMPL_ELSE -->
+					<option value="a">a- Monographic component part</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f7b" -->
+					<option value="b" SELECTED>b- Serial component part</option>
+				<!-- TMPL_ELSE -->
+					<option value="b">a- Serial component part</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f7c" -->
+					<option value="c" SELECTED>c- Collection</option>
+				<!-- TMPL_ELSE -->
+					<option value="c">c- Collection</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f7d" -->
+					<option value="d" SELECTED>d- Subunit</option>
+				<!-- TMPL_ELSE -->
+					<option value="d">d- Subunit</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f7i" -->
+					<option value="i" SELECTED>i- Integrating resource</option>
+				<!-- TMPL_ELSE -->
+					<option value="i">i- Integrating resource</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f7m" -->
+					<option value="m" SELECTED>m- Monograph/item</option>
+				<!-- TMPL_ELSE -->
+					<option value="m">m- Monograph/item</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f7s" -->
+					<option value="s" SELECTED>s- Serial</option>
+				<!-- TMPL_ELSE -->
+					<option value="s">s- Serial</option>
+				<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+	
+	<tr>
+		<td>8- Hierarchic level</td>
+		<td>
+			<select name="f8" size="1">
+				<!-- TMPL_IF name="f8 " -->
+					<option value=" " SELECTED>No specific type</option>
+				<!-- TMPL_ELSE -->
+					<option value=" ">No specific type</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f8a" -->
+					<option value="a" SELECTED>a- Archival</option>
+				<!-- TMPL_ELSE -->
+					<option value="a">a- Archival</option>
+				<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+
+	<tr>
+		<td>9- Encoding</td>
+		<td>
+			<select name="f9" size="1">
+				<!-- TMPL_IF name="f9 " -->
+					<option value=" " SELECTED>MARC-8</option>
+				<!-- TMPL_ELSE -->
+					<option value=" ">MARC-8</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f9a" -->
+					<option value="a" SELECTED>a- UCS/Unicode</option>
+				<!-- TMPL_ELSE -->
+					<option value="a">a- UCS/Unicode</option>
+				<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td>10-16 indicator/subfields/size</td>
+		<td>(auto-filled)</td>
+	<tr>
+		<td>17- Encoding</td>
+		<td>
+			<select name="f17" size="1">
+				<!-- TMPL_IF name="f17 " -->
+					<option value=" " SELECTED>full level</option>
+				<!-- TMPL_ELSE -->
+					<option value=" ">Full level</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f171" -->
+					<option value="1" SELECTED>1- Full level, material not examined</option>
+				<!-- TMPL_ELSE -->
+					<option value="1">1- Full level, material not examined</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f172" -->
+					<option value="2" SELECTED>2 - Less-than-full level, material not examined</option>
+				<!-- TMPL_ELSE -->
+					<option value="2">2 - Less-than-full level, material not examined</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f173" -->
+					<option value="3" SELECTED>3- Abbreviated level</option>
+				<!-- TMPL_ELSE -->
+					<option value="3">3- Abbreviated level</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f174" -->
+					<option value="4" SELECTED>4- Core level</option>
+				<!-- TMPL_ELSE -->
+					<option value="4">4- Core level</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f175" -->
+					<option value="5" SELECTED>5- Partial (preliminary) level</option>
+				<!-- TMPL_ELSE -->
+					<option value="5">5- Partial (preliminary) level</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f177" -->
+					<option value="7" SELECTED>7- Minimal level</option>
+				<!-- TMPL_ELSE -->
+					<option value="7">7- Minimal level</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f178" -->
+					<option value="8" SELECTED>8- Prepublication level</option>
+				<!-- TMPL_ELSE -->
+					<option value="8">8- Prepublication level</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f17u" -->
+					<option value="u" SELECTED>u - Unknown</option>
+				<!-- TMPL_ELSE -->
+					<option value="u">u - Unknown</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f17z" -->
+					<option value="z" SELECTED>z- Not applicable</option>
+				<!-- TMPL_ELSE -->
+					<option value="z">z- Not applicableFull level</option>
+				<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+
+	<tr>
+		<td>18 - Descriptive cataloging form</td>
+		<td>
+			<select name="f18" size="1">
+				<!-- TMPL_IF name="f18 " -->
+					<option value=" " SELECTED>Non-ISBD</option>
+				<!-- TMPL_ELSE -->
+					<option value=" ">Non-ISBD</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f18a" -->
+					<option value="a" SELECTED>a- AACR 2</option>
+				<!-- TMPL_ELSE -->
+					<option value="a">a- AACR 2</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f18i" -->
+					<option value="i" SELECTED>i- ISBD</option>
+				<!-- TMPL_ELSE -->
+					<option value="i">i- ISBD</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f18u" -->
+					<option value="u" SELECTED>u- Unknown</option>
+				<!-- TMPL_ELSE -->
+					<option value="u">u- Unknown</option>
+				<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+	
+	<tr>
+		<td>19 - Linked record requirement</td>
+		<td>
+			<select name="f19" size="1">
+				<!-- TMPL_IF name="f19 " -->
+					<option value=" " SELECTED>Related record not required</option>
+				<!-- TMPL_ELSE -->
+					<option value=" ">Related record not required</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f19r" -->
+					<option value="r" SELECTED>r- Related record required</option>
+				<!-- TMPL_ELSE -->
+					<option value="r">r- Related record required</option>
+				<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td>20-23 entry map & lengths</td>
+		<td>(auto-filled)</td>
+	<tr>
+
+	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
+</table>
+</form>
+<script>
+function report() {
+		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].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+ 
+			'22     '+
+			document.f_pop.f17.value+
+			document.f_pop.f18.value+
+			document.f_pop.f19.value+
+			'4500';
+		self.close();
+		return false;
+	}
+</script>
+</body>
+</html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_leader_authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_leader_authorities.tmpl
new file mode 100644
index 0000000000..7d24f9db99
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_leader_authorities.tmpl
@@ -0,0 +1,117 @@
+<html>
+<head>
+<title>Leader builder</title>
+</head>
+<body>
+<form name="f_pop" onSubmit="javascript:report()">
+<table>
+	<tr>
+		<td>0-4 Record size</td>
+		<td>(auto-filled)</td>
+	</tr>
+	<tr>
+		<td>5- Record status</td>
+		<td>
+			<select name="f5" size="1">
+			<!-- TMPL_IF name="f5a" -->
+				<option value="a" SELECTED>a- Increase in encoding</option>
+			<!-- TMPL_ELSE -->
+				<option value="a">a- Corrected or revised</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5c" -->
+				<option value="c" SELECTED>c- Corrected or revised</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">c- Corrected or revised</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5d" -->
+				<option value="d" SELECTED>d- Deleted</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">d- Deleted</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5n" -->
+				<option value="n" SELECTED>n- New</option>
+			<!-- TMPL_ELSE -->
+				<option value="n">n- New</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td>6- Type of record</td>
+		<td>
+			<select name="f6" size="1">
+			<!-- TMPL_IF name="f6z" -->
+				<option value="z" SELECTED>z-Authority data</option>
+			<!-- TMPL_ELSE -->
+				<option value="z">z-Authority data</option>
+			<!-- /TMPL_IF -->
+			
+			</select>
+		</td>
+	</tr>
+	
+
+	<tr>
+		<td>9- Encoding</td>
+		<td>
+			<select name="f9" size="1">
+				<!-- TMPL_IF name="f9 " -->
+					<option value=" " SELECTED>MARC-8</option>
+				<!-- TMPL_ELSE -->
+					<option value=" ">MARC-8</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f9a" -->
+					<option value="a" SELECTED>a- UCS/Unicode</option>
+				<!-- TMPL_ELSE -->
+					<option value="a">a- UCS/Unicode</option>
+				<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+	
+		<td>17- Encoding level</td>
+		<td>
+			<select name="f17" size="1">
+				<!-- TMPL_IF name="f17n" -->
+					<option value="n" SELECTED>Complete authority</option>
+				<!-- TMPL_ELSE -->
+					<option value="n">Complete authority</option>
+				<!-- /TMPL_IF -->
+				
+				<!-- TMPL_IF name="f17o" -->
+					<option value="o" SELECTED>z- Incomplete</option>
+				<!-- TMPL_ELSE -->
+					<option value="o">z- Incomplete</option>
+				<!-- /TMPL_IF -->
+				
+			</select>
+		</td>
+	</tr>
+
+	<tr>
+		
+	</tr>
+	
+	
+	
+
+	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
+</table>
+</form>
+<script>
+function report() {
+		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value = 
+			'     '+
+			document.f_pop.f5.value+
+			document.f_pop.f6.value+'||'+
+			document.f_pop.f9.value+ 
+			'22     '+
+			document.f_pop.f17.value+
+			'||4500';
+			
+		self.close();
+		return false;
+	}
+</script>
+</body>
+</html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_leader_holdings.tmpl b/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_leader_holdings.tmpl
new file mode 100644
index 0000000000..b9832420dd
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/value_builder/marc21_leader_holdings.tmpl
@@ -0,0 +1,177 @@
+<html>
+<head>
+<title>Leader builder</title>
+</head>
+<body>
+<form name="f_pop" onSubmit="javascript:report()">
+<table>
+	<tr>
+		<td>0-4 Record size</td>
+		<td>(auto-filled)</td>
+	</tr>
+	<tr>
+		<td>5- Record status</td>
+		<td>
+			<select name="f5" size="1">
+			
+			<!-- TMPL_IF name="f5c" -->
+				<option value="c" SELECTED>c- Corrected or revised</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">c- Corrected or revised</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5d" -->
+				<option value="d" SELECTED>d- Deleted</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">d- Deleted</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5n" -->
+				<option value="n" SELECTED>n- New</option>
+			<!-- TMPL_ELSE -->
+				<option value="n">n- New</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td>6- Type of record</td>
+		<td>
+			<select name="f6" size="1">
+
+			<!-- TMPL_IF name="f6u" -->
+				<option value="u" SELECTED>u-Unknown</option>
+			<!-- TMPL_ELSE -->
+				<option value="u">u-Unknown</option>
+			<!-- /TMPL_IF -->
+	
+			<!-- TMPL_IF name="f6v" -->
+				<option value="v" SELECTED>v-Multipart item holdings</option>
+			<!-- TMPL_ELSE -->
+				<option value="v">v-Multipart item holdings</option>
+			<!-- /TMPL_IF -->
+	
+			<!-- TMPL_IF name="f6x" -->
+				<option value="x" SELECTED>xSingle part item holdings</option>
+			<!-- TMPL_ELSE -->
+				<option value="x">x-Single part item holdings</option>
+			<!-- /TMPL_IF -->
+				
+			<!-- TMPL_IF name="f6y" -->
+				<option value="y" SELECTED>y-Serial item holdings</option>
+			<!-- TMPL_ELSE -->
+				<option value="y">y-Serial item holdings</option>
+			<!-- /TMPL_IF -->
+			
+			</select>
+		</td>
+	</tr>
+	
+
+	<tr>
+		<td>9- Encoding</td>
+		<td>
+			<select name="f9" size="1">
+				<!-- TMPL_IF name="f9 " -->
+					<option value=" " SELECTED>MARC-8</option>
+				<!-- TMPL_ELSE -->
+					<option value=" ">MARC-8</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f9a" -->
+					<option value="a" SELECTED>a- UCS/Unicode</option>
+				<!-- TMPL_ELSE -->
+					<option value="a">a- UCS/Unicode</option>
+				<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+	
+		<td>17- Encoding level</td>
+		<td>
+			<select name="f17" size="1">
+		<!-- TMPL_IF name="f171" -->
+					<option value="1" SELECTED>1-Level 1</option>
+				<!-- TMPL_ELSE -->
+					<option value="1">1-Level 1</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f172" -->
+					<option value="2" SELECTED>2-Level 2</option>
+				<!-- TMPL_ELSE -->
+					<option value="2">2-Level 2</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f173" -->
+					<option value="3" SELECTED>3-Level 3</option>
+				<!-- TMPL_ELSE -->
+					<option value="3">3-Level 3</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f174" -->
+					<option value="4" SELECTED>4-Level 4</option>
+				<!-- TMPL_ELSE -->
+					<option value="4">4-Level 4</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f175" -->
+					<option value="5" SELECTED>5-Level 4 with piece designtn.</option>
+				<!-- TMPL_ELSE -->
+					<option value="5">5-Level 4 with piece designtn</option>
+				<!-- /TMPL_IF -->
+		
+				<!-- TMPL_IF name="f17m" -->
+					<option value="m" SELECTED>m-Mixed</option>
+				<!-- TMPL_ELSE -->
+					<option value="m">m-Mixed</option>
+				<!-- /TMPL_IF -->
+				
+				<!-- TMPL_IF name="f17u" -->
+					<option value="u" SELECTED>u-Unknown</option>
+				<!-- TMPL_ELSE -->
+					<option value="u">u-Unknown</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f17z" -->
+					<option value="z" SELECTED>z-Other</option>
+				<!-- TMPL_ELSE -->
+					<option value="z">z-Other</option>
+				<!-- /TMPL_IF -->
+				
+			</select>
+		</td>
+	</tr><td>18- Item information in record</td>
+		<td>
+			<select name="f18" size="1">
+		<!-- TMPL_IF name="f18i" -->
+					<option value="i" SELECTED>i-Item information</option>
+				<!-- TMPL_ELSE -->
+					<option value="i">i-Item information</option>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="f18n" -->
+					<option value="n" SELECTED>n-No information</option>
+				<!-- TMPL_ELSE -->
+					<option value="n">n-No information</option>
+				<!-- /TMPL_IF -->
+</td>
+
+	<tr>
+		
+	</tr>
+	
+	
+	
+
+	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
+</table>
+</form>
+<script>
+function report() {
+		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value = 
+			'     '+
+			document.f_pop.f5.value+
+			document.f_pop.f6.value+'||'+
+			document.f_pop.f9.value+ 
+			'22     '+
+			document.f_pop.f17.value+
+			document.f_pop.f18.value+
+			'|4500';
+			
+		self.close();
+		return false;
+	}
+</script>
+</body>
+</html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/z3950/searchresult.tmpl b/koha-tmpl/intranet-tmpl/prog/en/z3950/searchresult.tmpl
index 973c20a44f..4204e8250f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/z3950/searchresult.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/z3950/searchresult.tmpl
@@ -1,17 +1,42 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Z39.50 Search Results</title>
-<meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR NAME="refresh" -->" />
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
-<style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
-</style>
-</head>
-<body>
-
-	<h2>Z3950 Search Results</h2>
-	
-	<!-- TMPL_IF NAME="breeding_loop" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Advanced MARC Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+
+
+<!-- TMPL_IF NAME="refresh" -->
+		<meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR NAME="refresh" -->" />
+	<!-- /TMPL_IF -->
+
+<div id="main-compact">
 <table>
+<!-- TMPL_IF name="opsearch" -->
+<h3>Select Search Libraries</h3>
+
+
+<form method="post" action="search.pl" name="f">
+
+<input type="hidden" name="op" id="op" value="do_search" />
+<input type="hidden" name="title" value=<!-- TMPL_VAR NAME="title" --> />
+<input type="hidden" name="author" value=<!-- TMPL_VAR NAME="author" --> />
+<input type="hidden" name="isbn" value=<!-- TMPL_VAR NAME="isbn" --> />
+<input type="hidden" name="issn" value=<!-- TMPL_VAR NAME="issn" --> />
+<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->" />
+
+<tr>
+		<th>Library</th>
+		<th>Select</th>
+</tr>
+<!-- TMPL_LOOP name="serverloop" -->
+		<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+			<td><!-- TMPL_VAR NAME="server" --></td>
+			
+			<td> <input type="checkbox" name="id" value=<!-- TMPL_VAR NAME="id" --> <!-- TMPL_IF name="checked" -->checked="1"<!-- /TMPL_IF --> ></td>
+	</tr>
+	<!-- /TMPL_LOOP -->
+	<tr><td><input type="submit"  class="submit" value="Search internet" onclick="cursor :'wait'";
+	 /></td></tr></form>
+<!-- TMPL_ELSE -->
+
+<caption>Bibliographic Records Found</caption>
 	<tr>
 		<th>Title</th>
 		<th>Author</th>
@@ -20,27 +45,32 @@
 		<th>&nbsp;</th>
 		<th>&nbsp;</th>
 	</tr>
-				<!-- TMPL_LOOP NAME="breeding_loop" -->
+	<!-- TMPL_IF name="breeding_loop" -->
+	<!-- TMPL_LOOP name="breeding_loop" -->
 		<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
-						<td><!-- TMPL_VAR NAME="title" --></td>
+			<td><!-- TMPL_VAR NAME="title" --></a>
 			<td><!-- TMPL_VAR NAME="author" --></td>
 			<td><!-- TMPL_VAR NAME="isbn" --></td>
-			<td><!-- TMPL_VAR NAME="file" --></td>
-			<td><a href="javascript:Import(<!-- TMPL_VAR NAME="id" -->)">Import this biblio</a></td>
+			<td><!-- TMPL_VAR NAME="server" --></td>
+			<td><a href="javascript:Import(<!-- TMPL_VAR NAME="id" -->,<!-- TMPL_VAR NAME="oldbiblionumber" -->)">Import</a></td> 
+		
 		</tr>
 	<!-- /TMPL_LOOP -->
-		</table>
 	<!-- TMPL_ELSE -->
-				<p>Nothing found</p>
+		<tr><td colspan="6">Nothing found</td></tr>
 	<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="numberpending" --><h1>Still <!-- TMPL_VAR NAME="numberpending" --> requests to go</h1><!-- /TMPL_IF -->
-	<script language="javascript" type="text/javascript">
-	function Import(GetThisOne) {
-		opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
+</table>
+<!-- /TMPL_IF -->
+
+</div>
+<!-- TMPL_IF name="numberpending" --><h3 align="center">Still <!-- TMPL_VAR NAME="numberpending" --> requests to go</h3><!-- /TMPL_IF -->
+<script language="JavaScript" type="text/javascript">
+	function Import(GetThisOne,biblionumber) {
+		opener.document.location= "../cataloguing/addbiblio.pl?oldbiblionumber="+biblionumber+"&z3950=1&breedingid="+GetThisOne;
 		self.close();
 		return false;
 	}
 </script>
+</div>
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
 
-</body>
-</html>
\ No newline at end of file
diff --git a/reports/acquisitions_stats.pl b/reports/acquisitions_stats.pl
index 90225a341e..b715dc310a 100755
--- a/reports/acquisitions_stats.pl
+++ b/reports/acquisitions_stats.pl
@@ -19,15 +19,11 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# test comment
-
 use strict;
 use C4::Auth;
 use CGI;
 use C4::Context;
-use HTML::Template;
 use C4::Search;
-use C4::Output;
 use C4::Koha;
 use C4::Interface::CGI::Output;
 use C4::Circulation::Circ2;
@@ -43,21 +39,19 @@ plugin that shows a stats on borrowers
 
 =cut
 
-my $input          = new CGI;
-my $do_it          = $input->param('do_it');
+my $input = new CGI;
+my $do_it=$input->param('do_it');
 my $fullreportname = "reports/acquisitions_stats.tmpl";
-my $line           = $input->param("Line");
-my $column         = $input->param("Column");
-my @filters        = $input->param("Filter");
-my $podsp          = $input->param("PlacedOnDisplay");
-my $rodsp          = $input->param("ReceivedOnDisplay");
-my $aodsp          = $input->param("AcquiredOnDisplay");    ##added by mason.
-my $calc           = $input->param("Cellvalue");
-my $output         = $input->param("output");
-my $basename       = $input->param("basename");
-my $mime           = $input->param("MIME");
-my $del            = $input->param("sep");
-
+my $line = $input->param("Line");
+my $column = $input->param("Column");
+my @filters = $input->param("Filter");
+my $podsp = $input->param("PlacedOnDisplay");
+my $rodsp = $input->param("ReceivedOnDisplay");
+my $calc = $input->param("Cellvalue");
+my $output = $input->param("output");
+my $basename = $input->param("basename");
+my $mime = $input->param("MIME");
+my $del = $input->param("sep");
 #warn "calcul : ".$calc;
 my ($template, $borrowernumber, $cookie)
 	= get_template_and_user({template_name => $fullreportname,
@@ -67,669 +61,441 @@ my ($template, $borrowernumber, $cookie)
 				flagsrequired => {editcatalogue => 1},
 				debug => 1,
 				});
-$template->param(do_it => $do_it,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
+$template->param(do_it => $do_it);
 if ($do_it) {
-
-    #warn
-"line=$line, col=$column, pod=$podsp, rod=$rodsp, aod=$aodsp, calc=$calc, filters=@filters\n";
-
-    my $results =
-      calculate( $line, $column, $podsp, $rodsp, $aodsp, $calc, \@filters );
-    if ( $output eq "screen" ) {
-        $template->param( mainloop => $results );
-        output_html_with_http_headers $input, $cookie, $template->output;
-        exit(1);
-    }
-    else {
-        print $input->header(
-            -type       => 'application/vnd.sun.xml.calc',
-            -attachment => "$basename.csv",
-            -name       => "$basename.csv"
-        );
-        my $cols  = @$results[0]->{loopcol};
-        my $lines = @$results[0]->{looprow};
-        my $sep;
-        $sep = C4::Context->preference("delimiter");
-        print @$results[0]->{line} . "/" . @$results[0]->{column} . $sep;
-        foreach my $col (@$cols) {
-            print $col->{coltitle} . $sep;
-        }
-        print "Total\n";
-        foreach my $line (@$lines) {
-            my $x = $line->{loopcell};
-            print $line->{rowtitle} . $sep;
-            foreach my $cell (@$x) {
-                print $cell->{value} . $sep;
-            }
-            print $line->{totalrow};
-            print "\n";
-        }
-        print "TOTAL";
-        $cols = @$results[0]->{loopfooter};
-        foreach my $col (@$cols) {
-            print $sep. $col->{totalcol};
-        }
-        print $sep. @$results[0]->{total};
-        exit(1);
-    }
-}
-else {
-    my $dbh = C4::Context->dbh;
-    my @values;
-    my %labels;
-    my %select;
-    my $req;
-    $req =
-      $dbh->prepare(
-        "SELECT distinctrow id,name FROM aqbooksellers ORDER BY name");
-    $req->execute;
-    my @select;
-    push @select, "";
-
-    #       $select{""}="";
-    while ( my ( $value, $desc ) = $req->fetchrow ) {
-        push @select, $desc;
-
-        #               $select{$value}=$desc;
-    }
-    my $CGIBookSellers = CGI::scrolling_list(
-        -name   => 'Filter',
-        -id     => 'Filter',
-        -values => \@select,
-
-        #                               -labels   => \%select,
-        -size     => 1,
-        -multiple => 0
-    );
-
-    $req =
-      $dbh->prepare(
-"SELECT DISTINCTROW itemtype,description FROM itemtypes ORDER BY description"
-      );
-    $req->execute;
-    undef @select;
-    undef %select;
-    push @select, "";
-    $select{""} = "";
-    while ( my ( $value, $desc ) = $req->fetchrow ) {
-        push @select, $value;
-        $select{$value} = $desc;
-    }
-    my $CGIItemTypes = CGI::scrolling_list(
-        -name     => 'Filter',
-        -id       => 'Filter',
-        -values   => \@select,
-        -labels   => \%select,
-        -size     => 1,
-        -multiple => 0
-    );
-
-    $req =
-      $dbh->prepare(
-"SELECT DISTINCTROW bookfundid,bookfundname FROM aqbookfund ORDER BY bookfundname"
-      );
-    $req->execute;
-    undef @select;
-    undef %select;
-    push @select, "";
-    $select{""} = "";
-
-    while ( my ( $value, $desc ) = $req->fetchrow ) {
-        push @select, $value;
-        $select{$value} = $desc;
-    }
-    my $CGIBudget = CGI::scrolling_list(
-        -name     => 'Filter',
-        -id       => 'Filter',
-        -values   => \@select,
-        -labels   => \%select,
-        -size     => 1,
-        -multiple => 0
-    );
-
-    $req =
-      $dbh->prepare(
-"SELECT DISTINCTROW sort1 FROM aqorders WHERE sort1 IS NOT NULL ORDER BY sort1"
-      );
-    $req->execute;
-    undef @select;
-    push @select, "";
-    my $hassort1;
-    while ( my ($value) = $req->fetchrow ) {
-        $hassort1 = 1 if ($value);
-        push @select, $value;
-    }
-    my $CGISort1 = CGI::scrolling_list(
-        -name     => 'Filter',
-        -id       => 'Filter',
-        -values   => \@select,
-        -size     => 1,
-        -multiple => 0
-    );
-
-    $req =
-      $dbh->prepare(
-"SELECT DISTINCTROW sort2 FROM aqorders WHERE sort2 IS NOT NULL ORDER BY sort2"
-      );
-    $req->execute;
-    undef @select;
-    push @select, "";
-    my $hassort2;
-    my $hglghtsort2;
-
-    while ( my ($value) = $req->fetchrow ) {
-        $hassort2 = 1 if ($value);
-        $hglghtsort2 = !($hassort1);
-        push @select, $value;
-    }
-    my $CGISort2 = CGI::scrolling_list(
-        -name     => 'Filter',
-        -id       => 'Filter',
-        -values   => \@select,
-        -size     => 1,
-        -multiple => 0
-    );
-
-    my @mime = ( C4::Context->preference("MIME") );
-    foreach my $mime (@mime) {
-
-        #               warn "".$mime;
-    }
-
-    my $CGIextChoice = CGI::scrolling_list(
-        -name     => 'MIME',
-        -id       => 'MIME',
-        -values   => \@mime,
-        -size     => 1,
-        -multiple => 0
-    );
-
-    my @dels         = ( C4::Context->preference("delimiter") );
-    my $CGIsepChoice = CGI::scrolling_list(
-        -name     => 'sep',
-        -id       => 'sep',
-        -values   => \@dels,
-        -size     => 1,
-        -multiple => 0
-    );
-
-    $template->param(
-        CGIBookSeller => $CGIBookSellers,
-        CGIItemType   => $CGIItemTypes,
-        CGIBudget     => $CGIBudget,
-        hassort1      => $hassort1,
-        hassort2      => $hassort2,
-        HlghtSort2    => $hglghtsort2,
-        CGISort1      => $CGISort1,
-        CGISort2      => $CGISort2,
-        CGIextChoice  => $CGIextChoice,
-        CGIsepChoice  => $CGIsepChoice
-    );
+	my $results = calculate($line, $column, $podsp, $rodsp, $calc, \@filters);
+	if ($output eq "screen"){
+		$template->param(mainloop => $results);
+		output_html_with_http_headers $input, $cookie, $template->output;
+		exit(1);
+	} else {
+		print $input->header(-type => 'application/vnd.sun.xml.calc', 
+							 -attachment=>"$basename.csv",
+							 -name=>"$basename.csv" );
+		my $cols = @$results[0]->{loopcol};
+		my $lines = @$results[0]->{looprow};
+		my $sep;
+		$sep =C4::Context->preference("delimiter");
+		print @$results[0]->{line} ."/". @$results[0]->{column} .$sep;
+		foreach my $col ( @$cols ) {
+			print $col->{coltitle}.$sep;
+		}
+		print "Total\n";
+		foreach my $line ( @$lines ) {
+			my $x = $line->{loopcell};
+			print $line->{rowtitle}.$sep;
+			foreach my $cell (@$x) {
+				print $cell->{value}.$sep;
+			}
+			print $line->{totalrow};
+ 			print "\n";
+	 	}
+		print "TOTAL";
+		$cols = @$results[0]->{loopfooter};
+		foreach my $col ( @$cols ) {
+			print $sep.$col->{totalcol};
+		}
+		print $sep.@$results[0]->{total};
+		exit(1);
+	}
+} else {
+	my $dbh = C4::Context->dbh;
+	my @values;
+	my %labels;
+	my %select;
+	my $req;
+	$req = $dbh->prepare("select distinctrow id,name from aqbooksellers order by name");
+	$req->execute;
+	my @select;
+	push @select,"";
+#	$select{""}="";
+	while (my ($value, $desc) =$req->fetchrow) {
+		push @select, $desc;
+#		$select{$value}=$desc;
+	}
+	my $CGIBookSellers=CGI::scrolling_list( -name     => 'Filter',
+				-id => 'Filter',
+				-values   => \@select,
+#				-labels   => \%select,
+				-size     => 1,
+				-multiple => 0 );
+	
+	$req = $dbh->prepare( "select distinctrow bookfundid,bookfundname from aqbookfund order by bookfundname");
+	$req->execute;
+	undef @select;
+	undef %select;
+	push @select,"";
+	$select{""}="";
+	while (my ($value,$desc) =$req->fetchrow) {
+		push @select, $value;
+		$select{$value}=$desc;
+	}
+	my $CGIBudget=CGI::scrolling_list( -name     => 'Filter',
+				-id => 'Filter',
+				-values   => \@select,
+				-labels    => \%select,
+				-size     => 1,
+				-multiple => 0 );
+	
+	$req = $dbh->prepare("select distinctrow sort1 from aqorders where sort1 is not null order by sort1");
+	$req->execute;
+	undef @select;
+	push @select,"";
+	my $hassort1;
+	while (my ($value) =$req->fetchrow) {
+		$hassort1 =1 if ($value);
+		push @select, $value;
+	}
+	my $CGISort1=CGI::scrolling_list( -name     => 'Filter',
+				-id => 'Filter',
+				-values   => \@select,
+				-size     => 1,
+				-multiple => 0 );
+	
+	$req = $dbh->prepare("select distinctrow sort2 from aqorders where sort2 is not null order by sort2");
+	$req->execute;
+	undef @select;
+	push @select,"";
+	my $hassort2;
+	my $hglghtsort2;
+	while (my ($value) =$req->fetchrow) {
+		$hassort2 =1 if ($value);
+		$hglghtsort2= !($hassort1);
+		push @select, $value;
+	}
+	my $CGISort2=CGI::scrolling_list( -name     => 'Filter',
+				-id => 'Filter',
+				-values   => \@select,
+				-size     => 1,
+				-multiple => 0 );
+	
+	my @mime = ( C4::Context->preference("MIME") );
+ 	foreach my $mime (@mime){
+#		warn "".$mime;
+ 	}
+	
+	my $CGIextChoice=CGI::scrolling_list(
+				-name     => 'MIME',
+				-id       => 'MIME',
+				-values   => \@mime,
+				-size     => 1,
+				-multiple => 0 );
+	
+	my @dels = ( C4::Context->preference("delimiter") );
+	my $CGIsepChoice=CGI::scrolling_list(
+				-name     => 'sep',
+				-id       => 'sep',
+				-values   => \@dels,
+				-size     => 1,
+				-multiple => 0 );
+	
+	$template->param(
+					CGIBookSeller => $CGIBookSellers,
+					CGIBudget => $CGIBudget,
+					hassort1=> $hassort1,
+					hassort2=> $hassort2,
+					HlghtSort2 => $hglghtsort2,
+					CGISort1 => $CGISort1,
+					CGISort2 => $CGISort2,
+					CGIextChoice => $CGIextChoice,
+					CGIsepChoice => $CGIsepChoice
+					);
 
 }
 output_html_with_http_headers $input, $cookie, $template->output;
 
-sub calculate {
-    my ( $line, $column, $podsp, $rodsp, $aodsp, $process, $filters ) = @_;
-    my @mainloop;
-    my @loopfooter;
-    my @loopcol;
-    my @loopline;
-    my @looprow;
-    my %globalline;
-    my $grantotal = 0;
-
-    # extract parameters
-    my $dbh = C4::Context->dbh;
-
-    # Filters
-    # Checking filters
-    #
-    my @loopfilter;
-    for ( my $i = 0 ; $i <= 8 ; $i++ ) {
-        my %cell;
-        if ( @$filters[$i] ) {
-            if ( ( ( $i == 1 ) or ( $i == 3 ) ) and ( @$filters[ $i - 1 ] ) ) {
-                $cell{err} = 1 if ( @$filters[$i] < @$filters[ $i - 1 ] );
-            }
-            $cell{filter} .= @$filters[$i];
-            $cell{crit}   .= "Placed On From" if ( $i == 0 );
-            $cell{crit}   .= "Placed On To" if ( $i == 1 );
-            $cell{crit}   .= "Received On From" if ( $i == 2 );
-            $cell{crit}   .= "Received On To" if ( $i == 3 );
-
-            $cell{crit} .= "Acquired On From" if ( $i == 4 );
-            $cell{crit} .= "Acquired On To"   if ( $i == 5 );
-
-            $cell{crit} .= "BookSeller" if ( $i == 6 );
-            $cell{crit} .= "Doc Type"   if ( $i == 7 );
-            $cell{crit} .= "Budget"     if ( $i == 8 );
-            $cell{crit} .= "Sort1"      if ( $i == 9 );
-            $cell{crit} .= "Sort2"      if ( $i == 10 );
-            push @loopfilter, \%cell;
-        }
-    }
-
-    my @linefilter;
-
-    #       warn "filtres ".@filters[0];
-    #       warn "filtres ".@filters[1];
-    #       warn "filtres ".@filters[2];
-    #       warn "filtres ".@filters[3];
-
-    $linefilter[0] = @$filters[0] if ( $line =~ /closedate/ );
-    $linefilter[1] = @$filters[1] if ( $line =~ /closedate/ );
-    $linefilter[0] = @$filters[2] if ( $line =~ /received/ );
-    $linefilter[1] = @$filters[3] if ( $line =~ /received/ );
-
-    $linefilter[0] = @$filters[4] if ( $line =~ /acquired/ );
-    $linefilter[1] = @$filters[5] if ( $line =~ /acquired/ );
-
-    $linefilter[0] = @$filters[6]  if ( $line =~ /bookseller/ );
-    $linefilter[0] = @$filters[7]  if ( $line =~ /itemtype/ );
-    $linefilter[0] = @$filters[8]  if ( $line =~ /bookfund/ );
-    $linefilter[0] = @$filters[9]  if ( $line =~ /sort1/ );
-    $linefilter[0] = @$filters[10] if ( $line =~ /sort2/ );
-
-    #warn "filtre lignes".$linefilter[0]." ".$linefilter[1];
-    #
-    my @colfilter;
-    $colfilter[0] = @$filters[0] if ( $column =~ /closedate/ );
-    $colfilter[1] = @$filters[1] if ( $column =~ /closedate/ );
-    $colfilter[0] = @$filters[2] if ( $column =~ /received/ );
-    $colfilter[1] = @$filters[3] if ( $column =~ /received/ );
-
-    $colfilter[0] = @$filters[4] if ( $column =~ /acquired/ );
-    $colfilter[1] = @$filters[5] if ( $column =~ /acquired/ );
-
-    $colfilter[0] = @$filters[6]  if ( $column =~ /bookseller/ );
-    $colfilter[0] = @$filters[7]  if ( $column =~ /itemtype/ );
-    $colfilter[0] = @$filters[8]  if ( $column =~ /bookfund/ );
-    $colfilter[0] = @$filters[9]  if ( $column =~ /sort1/ );
-    $colfilter[0] = @$filters[10] if ( $column =~ /sort2/ );
-
-    #warn "filtre col ".$colfilter[0]." ".$colfilter[1];
-
-    #warn "line=$line, podsp=$podsp, rodsp=$rodsp, aodsp=$aodsp\n";
-
-    # 1st, loop rows.
-    my $linefield;
-    if ( ( $line =~ /closedate/ ) and ( $podsp == 1 ) ) {
-
-        #Display by day
-        $linefield .= "dayname($line)";
-    }
-    elsif ( ( $line =~ /closedate/ ) and ( $podsp == 2 ) ) {
-
-        #Display by Month
-        $linefield .= "monthname($line)";
-    }
-    elsif ( ( $line =~ /closedate/ ) and ( $podsp == 3 ) ) {
-
-        #Display by Year
-        $linefield .= "Year($line)";
-
-    }
-    elsif ( ( $line =~ /received/ ) and ( $rodsp == 1 ) ) {
-
-        #Display by day
-        $linefield .= "dayname($line)";
-    }
-    elsif ( ( $line =~ /received/ ) and ( $rodsp == 2 ) ) {
-
-        #Display by Month
-        $linefield .= "monthname($line)";
-    }
-    elsif ( ( $line =~ /received/ ) and ( $rodsp == 3 ) ) {
-
-        #Display by Year
-        $linefield .= "Year($line)";
-
-    }
-    elsif ( ( $line =~ /acquired/ ) and ( $aodsp == 1 ) ) {
-
-        #Display by day
-        $linefield .= "dayname($line)";
-    }
-    elsif ( ( $line =~ /acquired/ ) and ( $aodsp == 2 ) ) {
-
-        #Display by Month
-        $linefield .= "monthname($line)";
-    }
-    elsif ( ( $line =~ /acquired/ ) and ( $aodsp == 3 ) ) {
-
-        #Display by Year
-        $linefield .= "Year($line)";
-
-    }
-    else {
-        $linefield .= $line;
-    }
 
-    my $strsth;
-    $strsth .=
-      "SELECT DISTINCTROW $linefield FROM (aqorders, aqbasket,aqorderbreakdown)
-                LEFT JOIN items ON (aqorders.biblioitemnumber= items.biblioitemnumber)
-                LEFT JOIN biblioitems ON (aqorders.biblioitemnumber= biblioitems.biblioitemnumber)
-                LEFT JOIN aqorderdelivery ON (aqorders.ordernumber =aqorderdelivery.ordernumber )
-                LEFT JOIN aqbooksellers ON (aqbasket.booksellerid=aqbooksellers.id) WHERE (aqorders.basketno=aqbasket.basketno)
-                AND (aqorderbreakdown.ordernumber=aqorders.ordernumber) AND $line IS NOT NULL ";
 
-    if (@linefilter) {
-        if ( $linefilter[1] ) {
-            if ( $linefilter[0] ) {
-                $strsth .= " AND $line BETWEEN ? AND ? ";
-            }
-            else {
-                $strsth .= " AND $line < ? ";
-            }
-        }
-        elsif (
-            ( $linefilter[0] )
-            and (  ( $line =~ /closedate/ )
-                or ( $line =~ /received/ )
-                or ( $line =~ /acquired/ ) )
-          )
-        {
-            $strsth .= " AND $line > ? ";
-        }
-        elsif ( $linefilter[0] ) {
-            $linefilter[0] =~ s/\*/%/g;
-            $strsth .= " AND $line LIKE ? ";
-        }
-    }
-    $strsth .= " GROUP BY $linefield";
-    $strsth .= " ORDER BY $linefield";
-
-    #warn "377:strsth= $strsth";
-
-    my $sth = $dbh->prepare($strsth);
-    if ( (@linefilter) and ( $linefilter[1] ) ) {
-        $sth->execute( "'" . $linefilter[0] . "'", "'" . $linefilter[1] . "'" );
-    }
-    elsif ( $linefilter[0] ) {
-        $sth->execute( $linefilter[0] );
-    }
-    else {
-        $sth->execute;
-    }
-
-    while ( my ($celvalue) = $sth->fetchrow ) {
-        my %cell;
-        if ($celvalue) {
-            $cell{rowtitle} = $celvalue;
-
-            #               } else {
-            #                       $cell{rowtitle} = "";
-        }
-        $cell{totalrow} = 0;
-        push @loopline, \%cell;
-    }
-
-    #warn "column=$column, podsp=$podsp, rodsp=$rodsp, aodsp=$aodsp\n";
-
-    # 2nd, loop cols.
-    my $colfield;
-    if ( ( $column =~ /closedate/ ) and ( $podsp == 1 ) ) {
-
-        #Display by day
-        $colfield .= "dayname($column)";
-    }
-    elsif ( ( $column =~ /closedate/ ) and ( $podsp == 2 ) ) {
-
-        #Display by Month
-        $colfield .= "monthname($column)";
-    }
-    elsif ( ( $column =~ /closedate/ ) and ( $podsp == 3 ) ) {
-
-        #Display by Year
-        $colfield .= "Year($column)";
-
-    }
-    elsif ( ( $column =~ /deliverydate/ ) and ( $rodsp == 1 ) ) {
-
-        #Display by day
-        $colfield .= "dayname($column)";
-    }
-    elsif ( ( $column =~ /deliverydate/ ) and ( $rodsp == 2 ) ) {
-
-        #Display by Month
-        $colfield .= "monthname($column)";
-    }
-    elsif ( ( $column =~ /deliverydate/ ) and ( $rodsp == 3 ) ) {
-
-        #Display by Year
-        $colfield .= "Year($column)";
-
-    }
-    elsif ( ( $column =~ /dateaccessioned/ ) and ( $aodsp == 1 ) ) {
-
-        #Display by day
-        $colfield .= "dayname($column)";
-    }
-    elsif ( ( $column =~ /dateaccessioned/ ) and ( $aodsp == 2 ) ) {
-
-        #Display by Month
-        $colfield .= "monthname($column)";
-    }
-    elsif ( ( $column =~ /dateaccessioned/ ) and ( $aodsp == 3 ) ) {
-
-        #Display by Year
-        $colfield .= "Year($column)";
-
-    }
-    else {
-        $colfield .= $column;
-    }
-
-    my $strsth2;
-    $strsth2 .=
-      "SELECT distinctrow $colfield FROM (aqorders, aqbasket,aqorderbreakdown)
-                 LEFT JOIN items ON (aqorders.biblioitemnumber= items.biblioitemnumber)
-                 LEFT JOIN biblioitems ON (aqorders.biblioitemnumber= biblioitems.biblioitemnumber)
-                 LEFT JOIN aqorderdelivery ON (aqorders.ordernumber =aqorderdelivery.ordernumber )
-                 LEFT JOIN aqbooksellers ON (aqbasket.booksellerid=aqbooksellers.id)
-                 WHERE (aqorders.basketno=aqbasket.basketno) AND (aqorderbreakdown.ordernumber=aqorders.ordernumber)
-                 AND $column IS NOT NULL";
-
-    if (@colfilter) {
-        if ( $colfilter[1] ) {
-            if ( $colfilter[0] ) {
-                $strsth2 .= " AND $column BETWEEN  ? AND ? ";
-            }
-            else {
-                $strsth2 .= " AND $column < ? ";
-            }
-        }
-        elsif (
-            ( $colfilter[0] )
-            and (  ( $column =~ /closedate/ )
-                or ( $line =~ /received/ )
-                or ( $line =~ /acquired/ ) )
-          )
-        {
-            $strsth2 .= " AND $column > ? ";
-        }
-        elsif ( $colfilter[0] ) {
-            $colfilter[0] =~ s/\*/%/g;
-            $strsth2 .= " AND $column LIKE ? ";
-        }
-    }
-    $strsth2 .= " GROUP BY $colfield";
-    $strsth2 .= " ORDER BY $colfield";
-
-    #        warn "MASON:. $strsth2";
-
-    my $sth2 = $dbh->prepare($strsth2);
-    if ( (@colfilter) and ( $colfilter[1] ) ) {
-
-        #                warn "from : ".$colfilter[0]." To  :".$colfilter[1];
-        $sth2->execute( "'" . $colfilter[0] . "'", "'" . $colfilter[1] . "'" );
-    }
-    elsif ( $colfilter[0] ) {
-        $sth2->execute( $colfilter[0] );
-    }
-    else {
-        $sth2->execute;
-    }
-
-    while ( my ($celvalue) = $sth2->fetchrow ) {
-        my %cell;
-        if ($celvalue) {
-
-            #               warn "coltitle :".$celvalue;
-            $cell{coltitle} = $celvalue;
-        }
-        push @loopcol, \%cell;
-    }
-
-    #       warn "fin des titres colonnes";
-
-    my $i = 0;
-    my @totalcol;
-    my $hilighted = -1;
-
-    #Initialization of cell values.....
-    my %table;
-
-    #       warn "init table";
-    foreach my $row (@loopline) {
-        foreach my $col (@loopcol) {
-
-#                       warn " init table : $row->{rowtitle} / $col->{coltitle} ";
-            $table{ $row->{rowtitle} }->{ $col->{coltitle} } = 0;
-        }
-        $table{ $row->{rowtitle} }->{totalrow} = 0;
-    }
-
-    # preparing calculation
-    my $strcalc;
-    $strcalc .= "SELECT $linefield, $colfield, ";
-    $strcalc .= "COUNT( aqorders.ordernumber ) " if ( $process == 1 );
-    $strcalc .= "SUM( aqorders.quantity * aqorders.listprice ) "
-      if ( $process == 2 );
-    $strcalc .= "FROM (aqorders, aqbasket,aqorderbreakdown)
-                 LEFT JOIN items ON (aqorders.biblioitemnumber= items.biblioitemnumber)
-                 LEFT JOIN biblioitems ON (aqorders.biblioitemnumber= biblioitems.biblioitemnumber)
-                 LEFT JOIN aqorderdelivery ON (aqorders.ordernumber =aqorderdelivery.ordernumber )
-                 LEFT JOIN aqbooksellers ON (aqbasket.booksellerid=aqbooksellers.id) WHERE (aqorders.basketno=aqbasket.basketno)
-                      AND (aqorderbreakdown.ordernumber=aqorders.ordernumber) ";
-
-    @$filters[0] =~ s/\*/%/g if ( @$filters[0] );
-    $strcalc .= " AND aqbasket.closedate > '" . @$filters[0] . "'"
-      if ( @$filters[0] );
-    @$filters[1] =~ s/\*/%/g if ( @$filters[1] );
-    $strcalc .= " AND aqbasket.closedate < '" . @$filters[1] . "'"
-      if ( @$filters[1] );
-    @$filters[2] =~ s/\*/%/g if ( @$filters[2] );
-    $strcalc .= " AND aqorderdelivery.deliverydate > '" . @$filters[2] . "'"
-      if ( @$filters[2] );
-    @$filters[3] =~ s/\*/%/g if ( @$filters[3] );
-    $strcalc .= " AND aqorderdelivery.deliverydate < '" . @$filters[3] . "'"
-      if ( @$filters[3] );
-    @$filters[4] =~ s/\*/%/g if ( @$filters[4] );
-    $strcalc .= " AND aqbasket.closedate > '" . @$filters[4] . "'"
-      if ( @$filters[4] );
-    @$filters[5] =~ s/\*/%/g if ( @$filters[5] );
-    $strcalc .= " AND aqbasket.closedate < '" . @$filters[5] . "'"
-      if ( @$filters[5] );
-    @$filters[6] =~ s/\*/%/g if ( @$filters[6] );
-    $strcalc .= " AND aqbooksellers.name LIKE '" . @$filters[6] . "'"
-      if ( @$filters[6] );
-    @$filters[7] =~ s/\*/%/g if ( @$filters[7] );
-    $strcalc .= " AND biblioitems.itemtype LIKE '" . @$filters[7] . "'"
-      if ( @$filters[7] );
-    @$filters[8] =~ s/\*/%/g if ( @$filters[8] );
-    $strcalc .= " AND aqbookfund.bookfundid LIKE '" . @$filters[8] . "'"
-      if ( @$filters[8] );
-    @$filters[9] =~ s/\*/%/g if ( @$filters[9] );
-    $strcalc .= " AND aqorders.sort1 LIKE '" . @$filters[9] . "'"
-      if ( @$filters[9] );
-    @$filters[10] =~ s/\*/%/g if ( @$filters[10] );
-    $strcalc .= " AND aqorders.sort2 LIKE '" . @$filters[10] . "'"
-      if ( @$filters[10] );
-    $strcalc .= " GROUP BY $linefield, $colfield ORDER BY $linefield,$colfield";
-
-    #        warn "/n/n". $strcalc;
-    my $dbcalc = $dbh->prepare($strcalc);
-    $dbcalc->execute;
-
-    #       warn "filling table";
-    my $emptycol;
-    while ( my ( $row, $col, $value ) = $dbcalc->fetchrow ) {
-
-        #              warn "filling table $row / $col / $value ";
-        $emptycol = 1         if ( $col eq undef );
-        $col      = "zzEMPTY" if ( $col eq undef );
-        $row      = "zzEMPTY" if ( $row eq undef );
-
-        $table{$row}->{$col}     += $value;
-        $table{$row}->{totalrow} += $value;
-        $grantotal               += $value;
-    }
-
-    push @loopcol, { coltitle => "NULL" } if ($emptycol);
-
-    foreach my $row ( sort keys %table ) {
-        my @loopcell;
-
-        #@loopcol ensures the order for columns is common with column titles
-        # and the number matches the number of columns
-        foreach my $col (@loopcol) {
-            my $value = $table{$row}->{
-                ( $col->{coltitle} eq "NULL" )
-                ? "zzEMPTY"
-                : $col->{coltitle}
-              };
-            push @loopcell, { value => $value };
-        }
-        push @looprow,
-          {
-            'rowtitle' => ( $row eq "zzEMPTY" ) ? "NULL" : $row,
-            'loopcell'  => \@loopcell,
-            'hilighted' => ( $hilighted > 0 ),
-            'totalrow'  => $table{$row}->{totalrow}
-          };
-        $hilighted = -$hilighted;
-    }
-
-    #       warn "footer processing";
-    foreach my $col (@loopcol) {
-        my $total = 0;
-        foreach my $row (@looprow) {
-            $total += $table{
-                ( $row->{rowtitle} eq "NULL" ) ? "zzEMPTY"
-                : $row->{rowtitle}
-              }->{
-                ( $col->{coltitle} eq "NULL" ) ? "zzEMPTY"
-                : $col->{coltitle}
-              };
-
-#                       warn "value added ".$table{$row->{rowtitle}}->{$col->{coltitle}}. "for line ".$row->{rowtitle};
-        }
-
-        #               warn "summ for column ".$col->{coltitle}."  = ".$total;
-        push @loopfooter, { 'totalcol' => $total };
-    }
-
-    # the header of the table
-    #        $globalline{loopfilter}=\@loopfilter;
-    # the core of the table
-    $globalline{looprow} = \@looprow;
-    $globalline{loopcol} = \@loopcol;
-
-    #       # the foot (totals by borrower type)
-    $globalline{loopfooter} = \@loopfooter;
-    $globalline{total}      = $grantotal;
-    $globalline{line}       = $line;
-    $globalline{column}     = $column;
-    push @mainloop, \%globalline;
-    return \@mainloop;
+sub calculate {
+	my ($line, $column, $podsp, $rodsp, ,$process, $filters) = @_;
+	my @mainloop;
+	my @loopfooter;
+	my @loopcol;
+	my @loopline;
+	my @looprow;
+	my %globalline;
+	my $grantotal =0;
+# extract parameters
+	my $dbh = C4::Context->dbh;
+
+# Filters
+# Checking filters
+#
+	my @loopfilter;
+	for (my $i=0;$i<=7;$i++) {
+		my %cell;
+		if ( @$filters[$i] ) {
+			if ((($i==1) or ($i==3)) and (@$filters[$i-1])) {
+				$cell{err} = 1 if (@$filters[$i]<@$filters[$i-1]) ;
+			}
+			$cell{filter} .= @$filters[$i];
+			$cell{crit} .="Placed On From" if ($i==0);
+			$cell{crit} .="Placed On To" if ($i==1);
+			$cell{crit} .="Received On From" if ($i==2);
+			$cell{crit} .="Received On To" if ($i==3);
+			$cell{crit} .="BookSeller" if ($i==4);
+			$cell{crit} .="Budget" if ($i==5);
+			$cell{crit} .="Sort1" if ($i==6);
+			$cell{crit} .="Sort2" if ($i==7);
+			push @loopfilter, \%cell;
+		}
+	}
+	
+	my @linefilter;
+#	warn "filtres ".@filters[0];
+#	warn "filtres ".@filters[1];
+#	warn "filtres ".@filters[2];
+#	warn "filtres ".@filters[3];
+	
+ 	$linefilter[0] = @$filters[0] if ($line =~ /closedate/ )  ;
+ 	$linefilter[1] = @$filters[1] if ($line =~ /closedate/ )  ;
+ 	$linefilter[0] = @$filters[2] if ($line =~ /received/ )  ;
+ 	$linefilter[1] = @$filters[3] if ($line =~ /received/ )  ;
+ 	$linefilter[0] = @$filters[4] if ($line =~ /bookseller/ )  ;
+ 	$linefilter[0] = @$filters[5] if ($line =~ /bookfund/ )  ;
+ 	$linefilter[0] = @$filters[6] if ($line =~ /sort1/ )  ;
+ 	$linefilter[0] = @$filters[7] if ($line =~ /sort2/ ) ;
+#warn "filtre lignes".$linefilter[0]." ".$linefilter[1];
+# 
+ 	my @colfilter ;
+ 	$colfilter[0] = @$filters[0] if ($column =~ /closedate/ ) ;
+ 	$colfilter[1] = @$filters[1] if ($column =~ /closedate/ ) ;
+ 	$colfilter[0] = @$filters[2] if ($column =~ /received/ )  ;
+ 	$colfilter[1] = @$filters[3] if ($column =~ /received/ )  ;
+ 	$colfilter[0] = @$filters[4] if ($column =~ /bookseller/ );
+ 	$colfilter[0] = @$filters[5] if ($column =~ /bookfund/ )  ;
+ 	$colfilter[0] = @$filters[6] if ($column =~ /sort1/ )     ;
+ 	$colfilter[0] = @$filters[7] if ($column =~ /sort2/ )     ;
+#warn "filtre col ".$colfilter[0]." ".$colfilter[1];
+                                              
+# 1st, loop rows.                             
+	my $linefield;                               
+	if (($line =~/closedate/) and ($podsp == 1)) {
+		#Display by day
+		$linefield .="dayname($line)";  
+	} elsif (($line=~/closedate/) and ($podsp == 2)) {
+		#Display by Month
+		$linefield .="monthname($line)";  
+	} elsif (($line=~/closedate/) and ($podsp == 3)) {
+		#Display by Year
+		$linefield .="Year($line)";
+	} elsif (($line =~/received/) and ($rodsp == 1)) {
+		#Display by day
+		$linefield .="dayname($line)";  
+	} elsif (($line=~/received/) and ($rodsp == 2)) {
+		#Display by Month
+		$linefield .="monthname($line)";  
+	} elsif (($line=~/received/) and ($rodsp == 3)) {
+		#Display by Year
+		$linefield .="Year($line)";
+	} else {
+		$linefield .= $line;
+	}  
+	
+ 	my $strsth;
+ 	$strsth .= "select distinctrow $linefield from aqorders, aqbasket,aqorderbreakdown left join aqorderdelivery on (aqorders.ordernumber =aqorderdelivery.ordernumber ) left join aqbooksellers on (aqbasket.booksellerid=aqbooksellers.id) where (aqorders.basketno=aqbasket.basketno) and (aqorderbreakdown.ordernumber=aqorders.ordernumber) and $line is not null ";
+	
+	if ( @linefilter ) {
+		if ($linefilter[1]){
+			if ($linefilter[0]){
+				$strsth .= " and $line between ? and ? " ;
+			} else {
+				$strsth .= " and $line < ? " ;
+			}
+		} elsif (($linefilter[0]) and (($line=~/closedate/) or ($line=~/received/))){
+ 			$strsth .= " and $line > ? " ;
+		} elsif ($linefilter[0]) {
+			$linefilter[0] =~ s/\*/%/g;
+ 			$strsth .= " and $line LIKE ? " ;
+ 		}
+ 	}
+	$strsth .=" group by $linefield";
+	$strsth .=" order by $linefield";
+	warn "". $strsth;
+	
+	my $sth = $dbh->prepare( $strsth );
+	if (( @linefilter ) and ($linefilter[1])){
+		$sth->execute("'".$linefilter[0]."'","'".$linefilter[1]."'");
+	} elsif ($linefilter[0]) {
+		$sth->execute($linefilter[0]);
+	} else {
+		$sth->execute;
+	}
+	
+ 	while ( my ($celvalue) = $sth->fetchrow) {
+ 		my %cell;
+		if ($celvalue) {
+			$cell{rowtitle} = $celvalue;
+#		} else {
+#			$cell{rowtitle} = "";
+		}
+ 		$cell{totalrow} = 0;
+		push @loopline, \%cell;
+ 	}
+
+# 2nd, loop cols.
+	my $colfield;
+	if (($column =~/closedate/) and ($podsp == 1)) {
+		#Display by day
+		$colfield .="dayname($column)";  
+	} elsif (($column=~/closedate/) and ($podsp == 2)) {
+		#Display by Month
+		$colfield .="monthname($column)";  
+	} elsif (($column=~/closedate/) and ($podsp == 3)) {
+		#Display by Year
+		$colfield .="Year($column)";
+	} elsif (($column =~/received/) and ($rodsp == 1)) {
+		#Display by day
+		$colfield .="dayname($column)";  
+	} elsif (($column=~/received/) and ($rodsp == 2)) {
+		#Display by Month
+		$colfield .="monthname($column)";  
+	} elsif (($column=~/received/) and ($rodsp == 3)) {
+		#Display by Year
+		$colfield .="Year($column)";
+	} else {
+		$colfield .= $column;
+	}  
+	
+ 	my $strsth2;
+ 	$strsth2 .= "select distinctrow $colfield from aqorders, aqbasket,aqorderbreakdown left join aqorderdelivery on (aqorders.ordernumber =aqorderdelivery.ordernumber ) left join aqbooksellers on (aqbasket.booksellerid=aqbooksellers.id) where (aqorders.basketno=aqbasket.basketno) and (aqorderbreakdown.ordernumber=aqorders.ordernumber) and $column is not null ";
+	
+	if ( @colfilter ) {
+		if ($colfilter[1]){
+			if ($colfilter[0]){
+				$strsth2 .= " and $column between ? and ? " ;
+			} else {
+				$strsth2 .= " and $column < ? " ;
+			}
+		} elsif (($colfilter[0]) and (($column=~/closedate/) or ($column=~/received/))){
+ 			$strsth2 .= " and $column > ? " ;
+		} elsif ($colfilter[0]) {
+			$colfilter[0] =~ s/\*/%/g;
+ 			$strsth2 .= " and $column LIKE ? " ;
+ 		}
+ 	}
+	$strsth2 .=" group by $colfield";
+	$strsth2 .=" order by $colfield";
+ 	warn "". $strsth2;
+	
+	my $sth2 = $dbh->prepare( $strsth2 );
+	if (( @colfilter ) and ($colfilter[1])){
+		warn "from : ".$colfilter[0]." To  :".$colfilter[1];
+		$sth2->execute("'".$colfilter[0]."'","'".$colfilter[1]."'");
+	} elsif ($colfilter[0]) {
+		$sth2->execute($colfilter[0]);
+	} else {
+		$sth2->execute;
+	}
+
+ 	while (my ($celvalue) = $sth2->fetchrow) {
+ 		my %cell;
+		if ($celvalue){
+#		warn "coltitle :".$celvalue;
+			$cell{coltitle} = $celvalue;
+		}
+		push @loopcol, \%cell;
+ 	}
+#	warn "fin des titres colonnes";
+
+	my $i=0;
+	my @totalcol;
+	my $hilighted=-1;
+	
+	#Initialization of cell values.....
+	my %table;
+#	warn "init table";
+	foreach my $row ( @loopline ) {
+		foreach my $col ( @loopcol ) {
+#			warn " init table : $row->{rowtitle} / $col->{coltitle} ";
+			$table{$row->{rowtitle}}->{$col->{coltitle}}=0;
+		}
+		$table{$row->{rowtitle}}->{totalrow}=0;
+	}
+
+# preparing calculation
+	my $strcalc ;
+	$strcalc .= "SELECT $linefield, $colfield, ";
+	$strcalc .= "COUNT( aqorders.ordernumber ) " if ($process ==1);
+	$strcalc .= "SUM( aqorders.quantity * aqorders.listprice ) " if ($process ==2);
+	$strcalc .= "FROM aqorders, aqbasket,aqorderbreakdown left join aqorderdelivery on (aqorders.ordernumber =aqorderdelivery.ordernumber ) left join aqbooksellers on (aqbasket.booksellerid=aqbooksellers.id) where (aqorders.basketno=aqbasket.basketno) and (aqorderbreakdown.ordernumber=aqorders.ordernumber) ";
+
+	@$filters[0]=~ s/\*/%/g if (@$filters[0]);
+	$strcalc .= " AND aqbasket.closedate > '" . @$filters[0] ."'" if ( @$filters[0] );
+	@$filters[1]=~ s/\*/%/g if (@$filters[1]);
+	$strcalc .= " AND aqbasket.closedate < '" . @$filters[1] ."'" if ( @$filters[1] );
+	@$filters[2]=~ s/\*/%/g if (@$filters[2]);
+	$strcalc .= " AND aqorderdelivery.deliverydate > '" . @$filters[2] ."'" if ( @$filters[2] );
+	@$filters[3]=~ s/\*/%/g if (@$filters[3]);
+	$strcalc .= " AND aqorderdelivery.deliverydate < '" . @$filters[3] ."'" if ( @$filters[3] );
+	@$filters[4]=~ s/\*/%/g if (@$filters[4]);
+	$strcalc .= " AND aqbooksellers.name like '" . @$filters[4] ."'" if ( @$filters[4] );
+	@$filters[5]=~ s/\*/%/g if (@$filters[5]);
+	$strcalc .= " AND aqbookfund.bookfundid like '" . @$filters[5] ."'" if ( @$filters[5] );
+	@$filters[6]=~ s/\*/%/g if (@$filters[6]);
+	$strcalc .= " AND aqorders.sort1 like '" . @$filters[6] ."'" if ( @$filters[6] );
+	@$filters[7]=~ s/\*/%/g if (@$filters[7]);
+	$strcalc .= " AND aqorders.sort2 like '" . @$filters[7] ."'" if ( @$filters[7] );
+	$strcalc .= " group by $linefield, $colfield order by $linefield,$colfield";
+	warn "". $strcalc;
+	my $dbcalc = $dbh->prepare($strcalc);
+	$dbcalc->execute;
+
+# 	warn "filling table";
+	my $emptycol; 
+	while (my ($row, $col, $value) = $dbcalc->fetchrow) {
+#		warn "filling table $row / $col / $value ";
+		$emptycol = 1 if ($col eq undef);
+		$col = "zzEMPTY" if ($col eq undef);
+		$row = "zzEMPTY" if ($row eq undef);
+		
+		$table{$row}->{$col}+=$value;
+		$table{$row}->{totalrow}+=$value;
+		$grantotal += $value;
+	}
+
+ 	push @loopcol,{coltitle => "NULL"} if ($emptycol);
+	
+	foreach my $row ( sort keys %table ) {
+		my @loopcell;
+		#@loopcol ensures the order for columns is common with column titles
+		# and the number matches the number of columns
+		foreach my $col ( @loopcol ) {
+			my $value =$table{$row}->{($col->{coltitle} eq "NULL")?"zzEMPTY":$col->{coltitle}};
+			push @loopcell, {value => $value  } ;
+		}
+		push @looprow,{ 'rowtitle' => ($row eq "zzEMPTY")?"NULL":$row,
+						'loopcell' => \@loopcell,
+						'hilighted' => ($hilighted >0),
+						'totalrow' => $table{$row}->{totalrow}
+					};
+		$hilighted = -$hilighted;
+	}
+	
+#	warn "footer processing";
+	foreach my $col ( @loopcol ) {
+		my $total=0;
+		foreach my $row ( @looprow ) {
+			$total += $table{($row->{rowtitle} eq "NULL")?"zzEMPTY":$row->{rowtitle}}->{($col->{coltitle} eq "NULL")?"zzEMPTY":$col->{coltitle}};
+#			warn "value added ".$table{$row->{rowtitle}}->{$col->{coltitle}}. "for line ".$row->{rowtitle};
+		}
+#		warn "summ for column ".$col->{coltitle}."  = ".$total;
+		push @loopfooter, {'totalcol' => $total};
+	}
+			
+
+	# the header of the table
+	$globalline{loopfilter}=\@loopfilter;
+	# the core of the table
+	$globalline{looprow} = \@looprow;
+	$globalline{loopcol} = \@loopcol;
+# 	# the foot (totals by borrower type)
+	$globalline{loopfooter} = \@loopfooter;
+	$globalline{total}= $grantotal;
+	$globalline{line} = $line;
+	$globalline{column} = $column;
+	push @mainloop,\%globalline;
+	return \@mainloop;
 }
 
-1;
-
+1;
\ No newline at end of file
diff --git a/reports/bor_issues_top.pl b/reports/bor_issues_top.pl
index c318449ab5..c62aebefdb 100755
--- a/reports/bor_issues_top.pl
+++ b/reports/bor_issues_top.pl
@@ -23,14 +23,11 @@ use strict;
 use C4::Auth;
 use CGI;
 use C4::Context;
-use HTML::Template;
 use C4::Search;
-use C4::Output;
 use C4::Koha;
 use C4::Interface::CGI::Output;
 use C4::Circulation::Circ2;
 use Date::Manip;
-use C4::Members;
 
 =head1 NAME
 
@@ -62,11 +59,7 @@ my ($template, $borrowernumber, $cookie)
 				flagsrequired => {editcatalogue => 1},
 				debug => 1,
 				});
-$template->param(do_it => $do_it,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
+$template->param(do_it => $do_it);
 if ($do_it) {
 # Displaying results
 	my $results = calculate($limit, $column, \@filters);
@@ -137,50 +130,10 @@ if ($do_it) {
 				-values   => \@dels,
 				-size     => 1,
 				-multiple => 0 );
-	#branch
-	my $branches = getallbranches;
-	my @branchloop;
-	foreach my $thisbranch (keys %$branches) {
-# 			my $selected = 1 if $thisbranch eq $branch;
-			my %row =(value => $thisbranch,
-# 									selected => $selected,
-									branchname => $branches->{$thisbranch}->{'branchname'},
-							);
-			push @branchloop, \%row;
-	}
-
-	#doctype
-	my $itemtypes = GetItemTypes;
-	my @itemtypeloop;
-	foreach my $thisitemtype (keys %$itemtypes) {
-# 			my $selected = 1 if $thisbranch eq $branch;
-			my %row =(value => $thisitemtype,
-# 									selected => $selected,
-									description => $itemtypes->{$thisitemtype}->{'description'},
-							);
-			push @itemtypeloop, \%row;
-	}
-	
-	#borcat
- 	my ($codes,$labels) = borrowercategories;
- 	my @borcatloop;
- 	foreach my $thisborcat (sort keys %$labels) {
- # 			my $selected = 1 if $thisbranch eq $branch;
- 			my %row =(value => $thisborcat,
- # 									selected => $selected,
- 									description => $labels->{$thisborcat},
- 							);
- 			push @borcatloop, \%row;
- 	}
 	
-	#Day
-	#Month
 	$template->param(
 					CGIextChoice => $CGIextChoice,
-					CGIsepChoice => $CGIsepChoice,
-					branchloop =>\@branchloop,
-					itemtypeloop =>\@itemtypeloop,
-					borcatloop =>\@borcatloop,
+					CGIsepChoice => $CGIsepChoice
 					);
 output_html_with_http_headers $input, $cookie, $template->output;
 }
@@ -288,7 +241,7 @@ sub calculate {
 	
 		while (my ($celvalue) = $sth2->fetchrow) {
 			my %cell;
-			$cell{'coltitle'} = ($celvalue?$celvalue:"NULL");
+			$cell{coltitle} = $celvalue;
 			push @loopcol, \%cell;
 		}
 	#	warn "fin des titres colonnes";
@@ -341,29 +294,31 @@ sub calculate {
 	
 	$strcalc .= " group by borrowers.borrowernumber";
 	$strcalc .= ", $colfield" if ($column);
-	$strcalc .= " order by RANK DESC";
-	$strcalc .= ",$colfield " if ($colfield);
-# 	my $max;
-# 	if (@loopcol) {
-# 		$max = $line*@loopcol;
-# 	} else { $max=$line;}
-# 	$strcalc .= " LIMIT 0,$max";
+	$strcalc .= " order by ";
+	$strcalc .= "$colfield, " if ($colfield);
+	$strcalc .= "RANK DESC ";
+	my $max;
+	if (@loopcol) {
+		$max = $line*@loopcol;
+	} else { $max=$line;}
+	$strcalc .= " LIMIT 0,$max";
 	warn "SQL :". $strcalc;
 	
 	my $dbcalc = $dbh->prepare($strcalc);
 	$dbcalc->execute;
 # 	warn "filling table";
 	my $previous_col;
-	my %indice;
+	my $i=1;
 	while (my  @data = $dbcalc->fetchrow) {
 		my ($row, $rank, $id, $col )=@data;
 		$col = "zzEMPTY" if ($col eq undef);
-		$indice{$col}=1 if (not($indice{$col}));
-		$table[$indice{$col}]->{$col}->{'name'}=$row;
-		$table[$indice{$col}]->{$col}->{'count'}=$rank;
-		$table[$indice{$col}]->{$col}->{'link'}=$id;
-#		warn " ".$i." ".$col. " ".$row;
-		$indice{$col}++;
+		$i=1 if (($previous_col) and not($col eq $previous_col));
+		$table[$i]->{$col}->{'name'}=$row;
+		$table[$i]->{$col}->{'count'}=$rank;
+		$table[$i]->{$col}->{'link'}=$id;
+		warn " ".$i." ".$col. " ".$row;
+		$i++;
+		$previous_col=$col;
 	}
 	
 	push @loopcol,{coltitle => "Global"} if not($column);
@@ -371,7 +326,7 @@ sub calculate {
 	for ($i=1; $i<=$line;$i++) {
 		my @loopcell;
 		warn " $i";
-		#@loborrowersopcol ensures the order for columns is common with column titles
+		#@loopcol ensures the order for columns is common with column titles
 		# and the number matches the number of columns
 		my $colcount=0;
 		foreach my $col ( @loopcol ) {
@@ -414,4 +369,4 @@ sub calculate {
 	return \@mainloop;
 }
 
-1;
+1;
\ No newline at end of file
diff --git a/reports/borrowers_out.pl b/reports/borrowers_out.pl
index c79426e23b..abbb99800d 100755
--- a/reports/borrowers_out.pl
+++ b/reports/borrowers_out.pl
@@ -23,14 +23,12 @@ use strict;
 use C4::Auth;
 use CGI;
 use C4::Context;
-use HTML::Template;
 use C4::Search;
-use C4::Output;
 use C4::Koha;
 use C4::Interface::CGI::Output;
 use C4::Circulation::Circ2;
 use Date::Manip;
-use C4::Members;
+
 =head1 NAME
 
 plugin that shows a stats on borrowers
@@ -61,11 +59,7 @@ my ($template, $borrowernumber, $cookie)
 				flagsrequired => {editcatalogue => 1},
 				debug => 1,
 				});
-$template->param(do_it => $do_it,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
+$template->param(do_it => $do_it);
 if ($do_it) {
 # Displaying results
 	my $results = calculate($limit, $column, \@filters);
@@ -137,22 +131,9 @@ if ($do_it) {
 				-size     => 1,
 				-multiple => 0 );
 	
-	my ($codes,$labels) = borrowercategories;
-	my @borcatloop;
-	foreach my $thisborcat (sort keys %$labels) {
- # 			my $selected = 1 if $thisbranch eq $branch;
- 			my %row =(value => $thisborcat,
- # 									selected => $selected,
-									description => $labels->{$thisborcat},
-							);
-			push @borcatloop, \%row;
-	}
-	
-	
 	$template->param(
 					CGIextChoice => $CGIextChoice,
-					CGIsepChoice => $CGIsepChoice,
-					borcatloop =>\@borcatloop,
+					CGIsepChoice => $CGIsepChoice
 					);
 output_html_with_http_headers $input, $cookie, $template->output;
 }
@@ -176,7 +157,7 @@ sub calculate {
 # Checking filters
 #
 	my @loopfilter;
-	for (my $i=0;$i<=2;$i++) {
+	for (my $i=0;$i<=6;$i++) {
 		my %cell;
 		if ( @$filters[$i] ) {
 			if (($i==1) and (@$filters[$i-1])) {
@@ -184,7 +165,6 @@ sub calculate {
 			}
 			$cell{filter} .= @$filters[$i];
 			$cell{crit} .="Bor Cat" if ($i==0);
-			$cell{crit} .="Without issues since" if ($i==1);
 			push @loopfilter, \%cell;
 		}
 	}
@@ -246,31 +226,13 @@ sub calculate {
 # preparing calculation
 	my $strcalc ;
 	
-# Processing calculation
+# Processing average loanperiods
 	$strcalc .= "SELECT CONCAT( borrowers.surname , \"\\t\",borrowers.firstname, \"\\t\", borrowers.cardnumber)";
 	$strcalc .= " , $colfield " if ($colfield);
-	$strcalc .= " FROM borrowers ";
-	$strcalc .= "WHERE 1 ";
+	$strcalc .= " FROM borrowers LEFT JOIN issues ON  issues.borrowernumber=borrowers.borrowernumber WHERE issues.borrowernumber is null";
 	@$filters[0]=~ s/\*/%/g if (@$filters[0]);
 	$strcalc .= " AND borrowers.categorycode like '" . @$filters[0] ."'" if ( @$filters[0] );
-	if (@$filters[1]){
-		my $strqueryfilter="SELECT DISTINCT borrowernumber FROM issues where issues.timestamp> @$filters[1] ";
-		my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM issues where issues.timestamp> @$filters[1] ");
-		$strcalc .= " AND borrowers.borrowernumber not in ($strqueryfilter)";
-		
-# 		$queryfilter->execute(@$filters[1]);
-# 		while (my ($bornum)=$queryfilter->fetchrow){
-# 			$strcalc .= " AND borrowers.borrowernumber <> $bornum ";
-# 		}
-	} else {
-		my $strqueryfilter="SELECT DISTINCT borrowernumber FROM issues ";
-		my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM issues ");
-		$queryfilter->execute;
-		$strcalc .= " AND borrowers.borrowernumber not in ($strqueryfilter)";
-# 		while (my ($bornum)=$queryfilter->fetchrow){
-# 			$strcalc .= " AND borrowers.borrowernumber <> $bornum ";
-# 		}
-	}
+	
 	$strcalc .= " group by borrowers.borrowernumber";
 	$strcalc .= ", $colfield" if ($column);
 	$strcalc .= " order by $colfield " if ($colfield);
@@ -298,7 +260,7 @@ sub calculate {
 	
 	push @loopcol,{coltitle => "Global"} if not($column);
 	
-	my $max =(($line)?$line:@table -1);
+	my $max =(($line)?$line:@table);
  	for ($i=1; $i<=$max;$i++) {
  		my @loopcell;
  		#@loopcol ensures the order for columns is common with column titles
@@ -336,4 +298,4 @@ sub calculate {
 	return \@mainloop;
 }
 
-1;
+1;
\ No newline at end of file
diff --git a/reports/borrowers_stats.pl b/reports/borrowers_stats.pl
index 5d37d55d44..d08842e66c 100755
--- a/reports/borrowers_stats.pl
+++ b/reports/borrowers_stats.pl
@@ -23,11 +23,8 @@ use strict;
 use C4::Auth;
 use CGI;
 use C4::Context;
-use HTML::Template;
 use C4::Search;
-use C4::Output;
 use C4::Koha;
-use C4::Acquisition;
 use C4::Interface::CGI::Output;
 use C4::Circulation::Circ2;
 
@@ -122,22 +119,6 @@ if ($do_it) {
 				-size     => 1,
 				-multiple => 0 );
 	
-	my @branches;
-	my @select_branch;
-	my %select_branches;
-	my ($count2,@branches)=branches();
-	push @select_branch,"";
-	$select_branches{''}='';
-	for (my $i=0;$i<$count2;$i++){
-			push @select_branch, $branches[$i]->{'branchcode'};#
-			$select_branches{$branches[$i]->{'branchcode'}} = $branches[$i]->{'branchname'};
-	}
-	my $CGIbranch=CGI::scrolling_list( -name     => 'pickup',
-							-values   => \@select_branch,
-							-labels   => \%select_branches,
-							-size     => 1,
-							-multiple => 0 );
-	
 	$req = $dbh->prepare( "select distinctrow sort1 from borrowers order by sort1");
 	$req->execute;
 	my @select_sort1;
@@ -191,14 +172,13 @@ if ($do_it) {
 				-values   => \@dels,
 				-size     => 1,
 				-multiple => 0 );
-	$template->param(CGICatcode => $CGICatCode,
+	$template->param(CGICatCode => $CGICatCode,
 					CGISort1 => $CGIsort1,
 					hassort1 => $hassort1,
 					CGISort2 => $CGIsort2,
 					hassort2 => $hassort2,
 					CGIextChoice => $CGIextChoice,
-					CGIsepChoice => $CGIsepChoice,
-					CGIBranch => $CGIbranch
+					CGIsepChoice => $CGIsepChoice
 					);
 
 }
@@ -227,16 +207,14 @@ sub calculate {
 	
  	$linefilter = @$filters[0] if ($line =~ /categorycode/ )  ;
  	$linefilter = @$filters[1] if ($line =~ /zipcode/ )  ;
- 	$linefilter = @$filters[2] if ($line =~ /branccode/ ) ;
- 	$linefilter = @$filters[3] if ($line =~ /sort1/ ) ;
- 	$linefilter = @$filters[4] if ($line =~ /sort2/ ) ;
+ 	$linefilter = @$filters[2] if ($line =~ /sort1/ ) ;
+ 	$linefilter = @$filters[3] if ($line =~ /sort2/ ) ;
 # 
  	my $colfilter = "";
  	$colfilter = @$filters[0] if ($column =~ /categorycode/);
  	$colfilter = @$filters[1] if ($column =~ /zipcode/);
- 	$colfilter = @$filters[2] if ($column =~ /branchcode/);
- 	$colfilter = @$filters[3] if ($column =~ /sort1/);
- 	$colfilter = @$filters[4] if ($column =~ /sort2/);
+ 	$colfilter = @$filters[2] if ($column =~ /sort1/);
+ 	$colfilter = @$filters[3] if ($column =~ /sort2/);
 
 	my @loopfilter;
 	for (my $i=0;$i<=3;$i++) {
@@ -245,9 +223,8 @@ sub calculate {
 			$cell{filter} .= @$filters[$i];
 			$cell{crit} .="Cat Code " if ($i==0);
 			$cell{crit} .="Zip Code" if ($i==1);
-			$cell{crit} .="Branchcode" if ($i==2);
-			$cell{crit} .="Sort1" if ($i==3);
-			$cell{crit} .="Sort2" if ($i==4);
+			$cell{crit} .="Sort1" if ($i==2);
+			$cell{crit} .="Sort2" if ($i==3);
 			push @loopfilter, \%cell;
 		}
 	}
@@ -301,10 +278,10 @@ sub calculate {
 	$strsth2 .= "select distinctrow $colfield from borrowers where $column is not null";
 	if ( $colfilter ) {
 		$strsth2 .= " and $colfield LIKE ? ";
-	}
+	} 
 	$strsth2 .= " and $status='1' " if ($status);
 	$strsth2 .= " order by $colfield";
-#	warn "". $strsth2;
+	warn "". $strsth2;
 	my $sth2 = $dbh->prepare( $strsth2 );
 	if ($colfilter) {
 		$sth2->execute($colfilter);
@@ -408,3 +385,4 @@ sub calculate {
 	return \@mainloop;
 }
 
+1;
\ No newline at end of file
diff --git a/reports/borrowers_stats.plugin b/reports/borrowers_stats.plugin
new file mode 100644
index 0000000000..3e677afb10
--- /dev/null
+++ b/reports/borrowers_stats.plugin
@@ -0,0 +1,183 @@
+#!/usr/bin/perl
+
+# $Id$
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# 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
+
+use strict;
+use C4::Auth;
+use CGI;
+use C4::Context;
+use HTML::Template;
+use C4::Search;
+use C4::Output;
+use C4::Koha;
+
+=head1 NAME
+
+plugin that shows a stats on borrowers
+
+=head1 DESCRIPTION
+
+
+=over2
+
+=cut
+
+sub set_parameters {
+	my ($template) = @_;
+	my $dbh = C4::Context->dbh;
+	return $template;
+}
+
+sub calculate {
+	my ($line, $column, $filters) = @_;
+	my @results =();
+	my @mainloop;
+	my @loopfooter;
+	my @loopcol;
+	my @looprow;
+	my %globalline;
+	my $grantotal =0;
+# extract parameters
+	my $dbh = C4::Context->dbh;
+# build the SQL query & execute it
+	my $linefilter = "";
+	$linefilter = @$filters[0] if ($line =~ /categorycode/ )  ;
+	$linefilter = @$filters[4] if ($line =~ /zipcode/ )  ;
+	$linefilter = @$filters[2] if ($line =~ /sort1/ ) ;
+	$linefilter = @$filters[3] if ($line =~ /sort2/ ) ;
+
+	my $colfilter = "";
+	$colfilter = @$filters[0] if ($column =~ /categorycode/);
+	$colfilter = @$filters[4] if ($column =~ /zipcode/);
+	$colfilter = @$filters[2] if ($column =~ /sort1/);
+	$colfilter = @$filters[3] if ($column =~ /sort2/);
+
+	my @loopfilter;
+	for (my $i=0;$i<=4;$i++) {
+		my %cell;
+		if ( @$filters[$i] ) {
+			$cell{filter} .= @$filters[$i];
+			$cell{crit} .="Category Code " if ($i==0);
+			$cell{crit} .="Status" if ($i==1);
+			$cell{crit} .="Sort1" if ($i==2);
+			$cell{crit} .="Sort2" if ($i==3);
+			$cell{crit} .="Zip Code" if ($i==4);
+			push @loopfilter, \%cell;
+		}
+	}
+# 1st, loop rows.
+#problem with NULL Values.
+	my $strsth;
+	$strsth .= "select distinctrow $line from borrowers";
+	$linefilter =~ s/\*/%/g;
+	if ( $linefilter ) {
+		$strsth .= " where $line LIKE ? and $line is not null" ;
+	} else {
+		$strsth .= " where $line is not null" ;
+	}
+	$strsth .=" order by $line";
+	my $sth = $dbh->prepare( $strsth );
+	if ( $linefilter ) {
+		$sth->execute($linefilter);
+	} else {
+		$sth->execute;
+	}
+ 	while ( my ($celvalue) = $sth->fetchrow) {
+ 		my %cell;
+		if ($celvalue) {
+			$cell{rowtitle} = $celvalue;
+		} else {
+			$cell{rowtitle} = "";
+		}
+ 		$cell{totalrow} = 0;
+		push @looprow, \%cell;
+ 	}
+
+# 2nd, loop cols.
+	my $strsth2;
+	$colfilter =~ s/\*/%/g;
+	$strsth2 .= "select distinctrow $column from borrowers";
+	if ( $colfilter ) {
+		$strsth2 .= " where $column LIKE ? and $column is not null";
+	} else {
+		$strsth2 .= " where $column is not null";
+	}
+	$strsth2 .= " order by $column";
+	my $sth2 = $dbh->prepare( $strsth2 );
+	if ($colfilter) {
+		$sth2->execute($colfilter);
+	} else {
+		$sth2->execute;
+	}
+ 	while (my ($celvalue) = $sth2->fetchrow) {
+ 		my %cell;
+		my %ft;
+		$cell{coltitle} = $celvalue;
+ 		$ft{totalcol} = 0;
+		push @loopcol, \%cell;
+		push @loopfooter, \%ft;
+ 	}
+# now, parse each category. Before filling the result array, fill it with 0 to have every itemtype column.
+ 	my $strcalc .= "SELECT  count( * ) FROM borrowers WHERE $line = ? and $column= ? ";
+	$strcalc .= " AND categorycode like '" . @$filters[1] ."%' " if ( @$filters[1] );
+	$strcalc .= " AND sort1 like ' " . @$filters[2] ."%'" if ( @$filters[2] );
+	$strcalc .= " AND sort2 like ' " . @$filters[3] ."%'" if ( @$filters[3] );
+	$strcalc .= " AND zipcode like ' " . @$filters[4] ."%'" if ( @$filters[4] );
+	my $dbcalc = $dbh->prepare($strcalc);
+	my $i=0;
+	my @totalcol;
+	my $hilighted=-1;
+	# for each line
+	for (my $i=0; $i<=$#looprow; $i++) {
+		my $row = $looprow[$i]->{'rowtitle'};
+		my @loopcell;
+		my $totalrow=0;
+		# for each column
+		for (my $j=0;$j<=$#loopcol;$j++) {
+			my $col = $loopcol[$j]->{'coltitle'};
+			$dbcalc->execute($row,$col);
+			my ($value) = $dbcalc->fetchrow;
+# 			warn "$row / $col / $value";
+			$totalrow += $value;
+			$grantotal += $value;
+			$loopfooter[$j]->{'totalcol'} +=$value;
+			push @loopcell,{value => $value};
+		}
+		$looprow[$i]->{'totalrow'}=$totalrow;
+		$looprow[$i]->{'loopcell'}=\@loopcell;
+		$looprow[$i]->{'hilighted'} = 1 if $hilighted eq 1;
+		$hilighted = -$hilighted;
+	}
+
+# 	# the header of the table
+ 	$globalline{loopfilter}=\@loopfilter;
+	$globalline{looprow} = \@looprow;
+# 	# the core of the table
+ 	$globalline{loopcol} = \@loopcol;
+# 	# the foot (totals by borrower type)
+ 	$globalline{loopfooter} = \@loopfooter;
+ 	$globalline{total}= $grantotal;
+	$globalline{line} = $line;
+	$globalline{column} = $column;
+	push @mainloop,\%globalline;
+	return \@mainloop;
+}
+
+1;
\ No newline at end of file
diff --git a/reports/cat_issues_top.pl b/reports/cat_issues_top.pl
index f061793ac8..fddcf6d58b 100755
--- a/reports/cat_issues_top.pl
+++ b/reports/cat_issues_top.pl
@@ -30,7 +30,6 @@ use C4::Koha;
 use C4::Interface::CGI::Output;
 use C4::Circulation::Circ2;
 use Date::Manip;
-use C4::Members;
 
 =head1 NAME
 
@@ -62,11 +61,7 @@ my ($template, $borrowernumber, $cookie)
 				flagsrequired => {editcatalogue => 1},
 				debug => 1,
 				});
-$template->param(do_it => $do_it,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
+$template->param(do_it => $do_it);
 if ($do_it) {
 # Displaying results
 	my $results = calculate($limit, $column, \@filters);
@@ -138,50 +133,10 @@ if ($do_it) {
 				-values   => \@dels,
 				-size     => 1,
 				-multiple => 0 );
-	#branch
-	my $branches = getallbranches;
-	my @branchloop;
-	foreach my $thisbranch (keys %$branches) {
-# 			my $selected = 1 if $thisbranch eq $branch;
-			my %row =(value => $thisbranch,
-# 									selected => $selected,
-									branchname => $branches->{$thisbranch}->{'branchname'},
-							);
-			push @branchloop, \%row;
-	}
-
-	#doctype
-	my $itemtypes = GetItemTypes;
-	my @itemtypeloop;
-	foreach my $thisitemtype (keys %$itemtypes) {
-# 			my $selected = 1 if $thisbranch eq $branch;
-			my %row =(value => $thisitemtype,
-# 									selected => $selected,
-									description => $itemtypes->{$thisitemtype}->{'description'},
-							);
-			push @itemtypeloop, \%row;
-	}
-	
-	#borcat
- 	my ($codes,$labels) = borrowercategories;
- 	my @borcatloop;
- 	foreach my $thisborcat (sort keys %$labels) {
- # 			my $selected = 1 if $thisbranch eq $branch;
- 			my %row =(value => $thisborcat,
- # 									selected => $selected,
- 									description => $labels->{$thisborcat},
- 							);
- 			push @borcatloop, \%row;
- 	}
 	
-	#Day
-	#Month
 	$template->param(
 					CGIextChoice => $CGIextChoice,
-					CGIsepChoice => $CGIsepChoice,
-					branchloop =>\@branchloop,
-					itemtypeloop =>\@itemtypeloop,
-					borcatloop =>\@borcatloop,
+					CGIsepChoice => $CGIsepChoice
 					);
 output_html_with_http_headers $input, $cookie, $template->output;
 }
@@ -296,7 +251,10 @@ sub calculate {
 	
 		while (my ($celvalue) = $sth2->fetchrow) {
 			my %cell;
-			$cell{coltitle} = ($celvalue?$celvalue:"NULL");
+	#		my %ft;
+	#		warn "coltitle :".$celvalue;
+			$cell{coltitle} = $celvalue;
+	#		$ft{totalcol} = 0;
 			push @loopcol, \%cell;
 		}
 	#	warn "fin des titres colonnes";
@@ -349,29 +307,31 @@ sub calculate {
 	
 	$strcalc .= " group by biblio.biblionumber";
 	$strcalc .= ", $colfield" if ($column);
-	$strcalc .= " order by RANK DESC";
-	$strcalc .= ", $colfield " if ($colfield);
-# 	my $max;
-# 	if (@loopcol) {
-# 		$max = $line*@loopcol;
-# 	} else { $max=$line;}
-# 	$strcalc .= " LIMIT 0,$max";
+	$strcalc .= " order by ";
+	$strcalc .= "$colfield, " if ($colfield);
+	$strcalc .= "RANK DESC ";
+	my $max;
+	if (@loopcol) {
+		$max = $line*@loopcol;
+	} else { $max=$line;}
+	$strcalc .= " LIMIT 0,$max";
 	warn "SQL :". $strcalc;
 	
 	my $dbcalc = $dbh->prepare($strcalc);
 	$dbcalc->execute;
 # 	warn "filling table";
 	my $previous_col;
-	my %indice;
+	my $i=1;
 	while (my  @data = $dbcalc->fetchrow) {
 		my ($row, $rank, $id, $col )=@data;
 		$col = "zzEMPTY" if ($col eq undef);
-		$indice{$col}=1 if (not($indice{$col}));
-		$table[$indice{$col}]->{$col}->{'name'}=$row;
-		$table[$indice{$col}]->{$col}->{'count'}=$rank;
-		$table[$indice{$col}]->{$col}->{'link'}=$id;
+		$i=1 if (($previous_col) and not($col eq $previous_col));
+		$table[$i]->{$col}->{'name'}=$row;
+		$table[$i]->{$col}->{'count'}=$rank;
+		$table[$i]->{$col}->{'link'}=$id;
 #		warn " ".$i." ".$col. " ".$row;
-		$indice{$col}++;
+		$i++;
+		$previous_col=$col;
 	}
 	
 	push @loopcol,{coltitle => "Global"} if not($column);
@@ -425,4 +385,4 @@ sub calculate {
 	return \@mainloop;
 }
 
-1;
+1;
\ No newline at end of file
diff --git a/reports/catalogue_out.pl b/reports/catalogue_out.pl
index 10b49bd5f5..3a7c2424d4 100755
--- a/reports/catalogue_out.pl
+++ b/reports/catalogue_out.pl
@@ -61,11 +61,7 @@ my ($template, $borrowernumber, $cookie)
 				flagsrequired => {editcatalogue => 1},
 				debug => 1,
 				});
-$template->param(do_it => $do_it,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
+$template->param(do_it => $do_it);
 if ($do_it) {
 # Displaying results
 	my $results = calculate($limit, $column, \@filters);
@@ -136,35 +132,10 @@ if ($do_it) {
 				-values   => \@dels,
 				-size     => 1,
 				-multiple => 0 );
-	#doctype
-	my $itemtypes = GetItemTypes;
-	my @itemtypeloop;
-	foreach my $thisitemtype (keys %$itemtypes) {
-# 			my $selected = 1 if $thisbranch eq $branch;
-			my %row =(value => $thisitemtype,
-# 									selected => $selected,
-									description => $itemtypes->{$thisitemtype}->{'description'},
-							);
-			push @itemtypeloop, \%row;
-	}
-		
-	#branch
-	my $branches = getallbranches;
-	my @branchloop;
-	foreach my $thisbranch (keys %$branches) {
-# 			my $selected = 1 if $thisbranch eq $branch;
-			my %row =(value => $thisbranch,
-# 									selected => $selected,
-									branchname => $branches->{$thisbranch}->{'branchname'},
-							);
-			push @branchloop, \%row;
-	}
 	
 	$template->param(
 					CGIextChoice => $CGIextChoice,
-					CGIsepChoice => $CGIsepChoice,
-					itemtypeloop =>\@itemtypeloop,
-					branchloop =>\@branchloop,
+					CGIsepChoice => $CGIsepChoice
 					);
 output_html_with_http_headers $input, $cookie, $template->output;
 }
@@ -260,9 +231,9 @@ sub calculate {
 	my $strcalc ;
 	
 # Processing average loanperiods
-	$strcalc .= "SELECT items.barcode, biblio.title, biblio.biblionumber, biblio.author";
+	$strcalc .= "SELECT CONCAT( items.itemnumber, \" \",biblioitems.biblioitemnumber)";
 	$strcalc .= " , $colfield " if ($colfield);
-	$strcalc .= " FROM (items LEFT JOIN biblioitems ON biblioitems.biblioitemnumber = items.biblioitemnumber  LEFT JOIN biblio ON biblio.biblionumber=items.biblionumber) LEFT JOIN issues ON  issues.itemnumber=items.itemnumber WHERE issues.itemnumber is null";
+	$strcalc .= " FROM (items LEFT JOIN biblioitems ON biblioitems.biblioitemnumber = items.biblioitemnumber)  LEFT JOIN issues ON  issues.itemnumber=items.itemnumber WHERE issues.itemnumber is null";
 #  	@$filters[0]=~ s/\*/%/g if (@$filters[0]);
 #  	$strcalc .= " AND issues.timestamp <= '" . @$filters[0] ."'" if ( @$filters[0] );
 #  	@$filters[1]=~ s/\*/%/g if (@$filters[1]);
@@ -292,13 +263,10 @@ sub calculate {
 	my $previous_col;
 	my $i=1;
 	while (my  @data = $dbcalc->fetchrow) {
-		my ($barcode,$title,$bibnum,$author, $col )=@data;
+		my ($row, $col )=@data;
 		$col = "zzEMPTY" if ($col eq undef);
 		$i=1 if (($previous_col) and not($col eq $previous_col));
-		$table[$i]->{$col}->{'barcode'}=$barcode;
-		$table[$i]->{$col}->{'title'}=$title;
-		$table[$i]->{$col}->{'bibnum'}=$bibnum;
-		$table[$i]->{$col}->{'author'}=$author;
+		$table[$i]->{$col}=$row;
 #		warn " ".$i." ".$col. " ".$row;
 		$i++;
 		$previous_col=$col;
@@ -313,19 +281,13 @@ sub calculate {
  		# and the number matches the number of columns
  		my $colcount=0;
  		foreach my $col ( @loopcol ) {
- 			my ($barcode, $author, $title, $bibnum);
+ 			my $value;
  			if (@loopcol){
- 				$barcode =$table[$i]->{(($col->{coltitle} eq "NULL") or ($col->{coltitle} eq "Global"))?"zzEMPTY":$col->{coltitle}}->{'barcode'};
- 				$title =$table[$i]->{(($col->{coltitle} eq "NULL") or ($col->{coltitle} eq "Global"))?"zzEMPTY":$col->{coltitle}}->{'title'};
- 				$author =$table[$i]->{(($col->{coltitle} eq "NULL") or ($col->{coltitle} eq "Global"))?"zzEMPTY":$col->{coltitle}}->{'author'};
- 				$bibnum =$table[$i]->{(($col->{coltitle} eq "NULL") or ($col->{coltitle} eq "Global"))?"zzEMPTY":$col->{coltitle}}->{'bibnum'};
+ 				$value =$table[$i]->{(($col->{coltitle} eq "NULL") or ($col->{coltitle} eq "Global"))?"zzEMPTY":$col->{coltitle}};
  			} else {
- 				$barcode =$table[$i]->{"zzEMPTY"}->{'barcode'};
- 				$title =$table[$i]->{"zzEMPTY"}->{'title'};
- 				$author =$table[$i]->{"zzEMPTY"}->{'author'};
- 				$bibnum =$table[$i]->{"zzEMPTY"}->{'bibnum'};
+ 				$value =$table[$i]->{"zzEMPTY"};
  			}
-			push @loopcell, {author=> $author, title=>$title,bibnum=>$bibnum,barcode=>$barcode} ;
+			push @loopcell, {value => $value} ;
 		}
 		push @looprow,{ 'rowtitle' => $i ,
 						'loopcell' => \@loopcell,
@@ -350,4 +312,4 @@ sub calculate {
 	return \@mainloop;
 }
 
-1;
+1;
\ No newline at end of file
diff --git a/reports/catalogue_stats.pl b/reports/catalogue_stats.pl
index f22d371ecd..8a036b3d8d 100755
--- a/reports/catalogue_stats.pl
+++ b/reports/catalogue_stats.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-
+## Will not work. Requires a complete re-write for ZEBRA
 # $Id$
 
 # Copyright 2000-2002 Katipo Communications
@@ -23,7 +23,6 @@ use strict;
 use C4::Auth;
 use CGI;
 use C4::Context;
-use HTML::Template;
 use C4::Search;
 use C4::Output;
 use C4::Koha;
@@ -32,7 +31,7 @@ use C4::Circulation::Circ2;
 
 =head1 NAME
 
-plugin that shows a stats on borrowers
+plugin that shows a stats on catalogue
 
 =head1 DESCRIPTION
 
@@ -106,99 +105,66 @@ if ($do_it) {
 	my %labels;
 	my $count=0;
 	my $req;
-	$req = $dbh->prepare("select count(dewey) from biblioitems ");
-	$req->execute;
-	my $hasdewey;
-	my @select;
-# 	push @select,"";
-	while (my ($value) =$req->fetchrow) {
-		$hasdewey =1 if (($value>2) and (! $hasdewey));
-		$count++ if (($value>2) and (! $hasdewey));
-#		push @select, $value;
+###Use mfield of koha_attr instead of dewey
+my $sth = $dbh->prepare("select authorised_value from authorised_values where category='mfield' order by lib");
+	$sth->execute;
+	my @authorised_values;
+	#push @authorised_values,"";
+	while ((my $category) = $sth->fetchrow_array) {
+		push @authorised_values, $category;
 	}
-# 	my $CGIdewey=CGI::scrolling_list( -name     => 'Filter',
-# 				-id => 'Filter',
-# 				-values   => \@select,
-# 				-size     => 1,
-# 				-multiple => 0 );
+my $hasdewey;
+	my $CGIdewey=CGI::scrolling_list( -name     => 'Filter',
+ 				-id => 'Filter',
+ 				-values   => \@authorised_values,
+ 				-size     => 1,
+ 				-multiple => 0 );
 	
-	$req = $dbh->prepare( "select count(lccn) from biblioitems ");
-	$req->execute;
-# 	undef @select;
-# 	push @select,"";
-	my $haslccn;
-	my $hlghtlccn;
-	while (my ($value) =$req->fetchrow) {
-		$hlghtlccn = !($hasdewey);
-		$haslccn =1 if (($value>2) and (! $haslccn));
-		$count++ if (($value) and (! $haslccn));
-#		push @select, $value;
+
+	my $haslccn=1;
+	my $hlghtlccn=1;
+	my @select;
+	for my $value ("A".."Z") {
+		push @select, $value;
 	}
-# 	my $CGIlccn=CGI::scrolling_list( -name     => 'Filter',
-# 				-id => 'Filter',
-# 				-values   => \@select,
-# 				-size     => 1,
-# 				-multiple => 0 );
+	my $CGIlccn=CGI::scrolling_list( -name     => 'Filter',
+ 				-id => 'Filter',
+ 				-values   => \@select,
+ 				-size     => 1,
+ 				-multiple => 0 );
 	
-	$req = $dbh->prepare("select count(itemcallnumber) from items");
-	$req->execute;
-#	undef @select;
-#	push @select,"";
 	my $hascote;
 	my $hlghtcote;
-	while (my ($value) =$req->fetchrow) {
-		$hascote =1 if (($value>2) and (! $hascote));
-		$count++ if (($value) and (! $hascote));
-		$hlghtcote = (($hasdewey) and ($haslccn)) or (!($hasdewey) and !($haslccn));
-#		push @select, $value;
-	}
-# 	my $CGIcote=CGI::scrolling_list( -name     => 'Filter',
-# 				-id => 'Filter',
-# 				-values   => \@select,
-# 				-size     => 1,
-# 				-multiple => 0 );
 	$count++;
 	my $hglghtDT =$count % 2;
-#	warn "highlightDT ".$hglghtDT;
 	$count++;
 	my $hglghtPub =$count % 2;
-#	warn "highlightPub ".$hglghtPub;
 	$count++;
 	my $hglghtPY =$count % 2;
-#	warn "highlightPY ".$hglghtPY;
 	$count++;
 	my $hglghtHB =$count % 2;
-#	warn "highlightHB ".$hglghtHB;
 	$count++;
 	my $hglghtLOC =$count % 2;
-#	warn "highlightLOC ".$hglghtLOC;
+	my $hglghtSTACK =$count % 2;
 	
-	
-	$req = $dbh->prepare("select distinctrow itemtype from biblioitems order by itemtype");
-	$req->execute;
+	my $itemtypes = GetItemTypes;
 	undef @select;
 	push @select,"";
-	while (my ($value) =$req->fetchrow) {
-		push @select, $value;
-	}
+	my %select_item;
+	$select_item{""} = "";
+foreach my $thisitemtype (sort keys %$itemtypes) {
+ 	push @select,$thisitemtype;
+	$select_item{$thisitemtype}=$itemtypes->{$thisitemtype}->{'description'};
+
+}
+
 	my $CGIitemtype=CGI::scrolling_list( -name     => 'Filter',
 				-id => 'itemtype',
 				-values   => \@select,
+				-labels=>\%select_item,
 				-size     => 1,
 				-multiple => 0 );
 	
-# 	$req = $dbh->prepare("select distinctrow left(publishercode,75) from biblioitems order by publishercode");
-# 	$req->execute;
-# 	undef @select;
-# 	push @select,"";
-# 	while (my ($value) =$req->fetchrow) {
-# 		push @select, $value;
-# 	}
-# 	my $CGIpublisher=CGI::scrolling_list( -name     => 'Filter',
-# 				-id => 'Filter',
-# 				-values   => \@select,
-# 				-size     => 1,
-# 				-multiple => 0 );
 
 	undef @select;
 	push @select,"";
@@ -215,14 +181,28 @@ if ($do_it) {
 				-labels   => \%select_branches,
 				-size     => 1,
 				-multiple => 0 );
-	
-	$req = $dbh->prepare("select distinctrow holdingbranch from items order by holdingbranch");
+
+	my $CGIholdingbranch=CGI::scrolling_list( -name     => 'Filter',
+				-id => 'holdingbranch',
+				-values   => \@select,
+				-labels   => \%select_branches,
+				-size     => 1,
+				-multiple => 0 );
+	$req = $dbh->prepare("select authorised_value,lib from authorised_values where category='sections'");
 	$req->execute;
 	undef @select;
 	push @select,"";
-	my $CGIlocation=CGI::scrolling_list( -name     => 'Filter',
-				-id => 'holdingbranch',
+	my %desc;
+	$desc{""}="";
+	while (my ($value,$desc) =$req->fetchrow) {
+		push @select, $value;
+		$desc{$value}=$desc;
+	}
+
+	my $CGISTACK=CGI::scrolling_list( -name     => 'Filter',
+				-id => 'shelf',
 				-values   => \@select,
+				-labels =>\%desc,
 				-size     => 1,
 				-multiple => 0 );
 	
@@ -247,12 +227,12 @@ if ($do_it) {
 				-multiple => 0 );
 	
 	$template->param(hasdewey=>$hasdewey,
-#					CGIFromDeweyClass => $CGIdewey,
-#					CGIToDeweyClass => $CGIdewey,
+					CGIFromDeweyClass => $CGIdewey,
+					CGIToDeweyClass => $CGIdewey,
 					haslccn=> $haslccn,
 					hlghtlccn => $hlghtlccn,
-#					CGIFromLoCClass => $CGIlccn,
-#					CGIToLoCClass => $CGIlccn,
+					CGIFromLoCClass => $CGIlccn,
+					CGIToLoCClass => $CGIlccn,
 					hascote=> $hascote,
 					hlghtcote => $hlghtcote,
 					hglghtDT => $hglghtDT,
@@ -260,14 +240,11 @@ if ($do_it) {
 					hglghtPY => $hglghtPY,
 					hglghtHB => $hglghtHB,
 					hglghtLOC => $hglghtLOC,
-#					CGIFromCoteClass => $CGIcote,
-#					CGIToCoteClass => $CGIcote,
+					hglghtSTACK => $hglghtSTACK,
 					CGIItemType => $CGIitemtype,
-# 					CGIFromPublicationYear => $CGIpublicationyear,
-# 					CGIToPublicationYear => $CGIpublicationyear,
-#					CGIPublisher => $CGIpublisher,
 					CGIBranch => $CGIbranch,
-					CGILocation => $CGIlocation,
+					CGILocation => $CGIbranch,
+					CGISTACK => $CGISTACK,
 					CGIextChoice => $CGIextChoice,
 					CGIsepChoice => $CGIsepChoice
 					);
@@ -302,16 +279,17 @@ sub calculate {
 			$cell{filter} .= @$filters[$i];
 			$cell{crit} .="Dewey Classification From" if ($i==0);
 			$cell{crit} .="Dewey Classification To" if ($i==1);
-			$cell{crit} .="Lccn Classification From" if ($i==2);
-			$cell{crit} .="Lccn Classification To" if ($i==3);
-			$cell{crit} .="Cote Classification From" if ($i==4);
-			$cell{crit} .="Cote Classification To" if ($i==5);
+			$cell{crit} .="Classification From" if ($i==2);
+			$cell{crit} .="Classification To" if ($i==3);
+			$cell{crit} .="Call Number From" if ($i==4);
+			$cell{crit} .="Call Number To" if ($i==5);
 			$cell{crit} .="Document type" if ($i==6);
 			$cell{crit} .="Publisher" if ($i==7);
 			$cell{crit} .="Publication year From" if ($i==8);
 			$cell{crit} .="Publication year To" if ($i==9);
 			$cell{crit} .="Branch :" if ($i==10);
 			$cell{crit} .="Location:" if ($i==11);
+			$cell{crit} .="Shelving:" if ($i==12);
 			push @loopfilter, \%cell;
 		}
 	}
@@ -324,46 +302,47 @@ sub calculate {
 	
  	$linefilter[0] = @$filters[0] if ($line =~ /dewey/ )  ;
  	$linefilter[1] = @$filters[1] if ($line =~ /dewey/ )  ;
- 	$linefilter[0] = @$filters[2] if ($line =~ /lccn/ )  ;
- 	$linefilter[1] = @$filters[3] if ($line =~ /lccn/ )  ;
- 	$linefilter[0] = @$filters[4] if ($line =~ /items.itemcallnumber/ )  ;
- 	$linefilter[1] = @$filters[5] if ($line =~ /items.itemcallnumber/ )  ;
+ 	$linefilter[0] = @$filters[2] if ($line =~ /classification/ )  ;
+ 	$linefilter[1] = @$filters[3] if ($line =~ /classification/ )  ;
+ 	$linefilter[0] = @$filters[4] if ($line =~ /itemcallnumber/ )  ;
+ 	$linefilter[1] = @$filters[5] if ($line =~ /itemcallnumber/ )  ;
  	$linefilter[0] = @$filters[6] if ($line =~ /itemtype/ )  ;
  	$linefilter[0] = @$filters[7] if ($line =~ /publishercode/ ) ;
  	$linefilter[0] = @$filters[8] if ($line =~ /publicationyear/ ) ;
  	$linefilter[1] = @$filters[9] if ($line =~ /publicationyear/ ) ;
- 	@linefilter[0] = @$filters[10] if ($line =~ /items.homebranch/ ) ;
- 	@linefilter[0] = @$filters[11] if ($line =~ /items.holdingbranch/ ) ;
+ 	$linefilter[0] = @$filters[10] if ($line =~ /homebranch/ ) ;
+ 	$linefilter[0] = @$filters[11] if ($line =~ /holdingbranch/ ) ;
+	$linefilter[0] = @$filters[12] if ($line =~ /shelf/ ) ;
 # 
  	my @colfilter ;
  	$colfilter[0] = @$filters[0] if ($column =~ /dewey/ )  ;
  	$colfilter[1] = @$filters[1] if ($column =~ /dewey/ )  ;
- 	$colfilter[0] = @$filters[2] if ($column =~ /lccn/ )  ;
- 	$colfilter[1] = @$filters[3] if ($column =~ /lccn/ )  ;
+ 	$colfilter[0] = @$filters[2] if ($column =~ /classification/ )  ;
+ 	$colfilter[1] = @$filters[3] if ($column =~ /classification/ )  ;
  	$colfilter[0] = @$filters[4] if ($column =~ /itemcallnumber/ )  ;
  	$colfilter[1] = @$filters[5] if ($column =~ /itemcallnumber/ )  ;
  	$colfilter[0] = @$filters[6] if ($column =~ /itemtype/ )  ;
  	$colfilter[0] = @$filters[7] if ($column =~ /publishercode/ ) ;
  	$colfilter[0] = @$filters[8] if ($column =~ /publicationyear/ ) ;
  	$colfilter[1] = @$filters[9] if ($column =~ /publicationyear/ ) ;
- 	@colfilter[0] = @$filters[10] if ($column =~ /items.homebranch/ ) ;
- 	@colfilter[0] = @$filters[11] if ($column =~ /items.holdingbranch/ ) ;
-
+ 	$colfilter[0] = @$filters[10] if ($column =~ /homebranch/ ) ;
+ 	$colfilter[0] = @$filters[11] if ($column =~ /holdingbranch/ ) ;
+	$colfilter[0] = @$filters[12] if ($column =~ /shelf/ ) ;
 # 1st, loop rows.
 	my $linefield;
 	if (($line =~/dewey/)  and ($deweydigits)) {
 		$linefield .="left($line,$deweydigits)";
-	} elsif (($line=~/lccn/) and ($lccndigits)) {
+	} elsif (($line=~/classification/) and ($lccndigits)) {
 		$linefield .="left($line,$lccndigits)";
-	} elsif (($line=~/items.itemcallnumber/) and ($cotedigits)) {
+	} elsif (($line=~/itemcallnumber/) and ($cotedigits)) {
 		$linefield .="left($line,$cotedigits)";
 	}else {
 		$linefield .= $line;
 	}
 	
-	
+warn $linefield,$colfilter[0],$linefilter[0],$line;	
 	my $strsth;
-	$strsth .= "select distinctrow $linefield from biblioitems left join items on (items.biblioitemnumber = biblioitems.biblioitemnumber) where $line is not null ";
+	$strsth .= "select distinctrow $linefield from biblio left join items on (items.biblionumber = biblio.biblionumber) where $line is not null ";
 	if ( @linefilter ) {
 		if ($linefilter[1]){
 			$strsth .= " and $line >= ? " ;
@@ -399,7 +378,7 @@ sub calculate {
 	my $colfield;
 	if (($column =~/dewey/)  and ($deweydigits)) {
 		$colfield .="left($column,$deweydigits)";
-	}elsif (($column=~/lccn/) and ($lccndigits)) {
+	}elsif (($column=~/classification/) and ($lccndigits)) {
 		$colfield .="left($column,$lccndigits)";
 	}elsif (($column=~/itemcallnumber/) and ($cotedigits)) {
 		$colfield .="left($column,$cotedigits)";
@@ -408,7 +387,7 @@ sub calculate {
 	}
 	
 	my $strsth2;
-	$strsth2 .= "select distinctrow $colfield from biblioitems left join items on (items.biblioitemnumber = biblioitems.biblioitemnumber) where $column is not null ";
+	$strsth2 .= "select distinctrow $colfield from biblio left join items on (items.biblionumber = biblio.biblionumber) where $column is not null ";
 	if (( @colfilter ) and ($colfilter[1])) {
 		$strsth2 .= " and $column> ? and $column< ?";
 	}elsif ($colfilter[0]){
@@ -452,45 +431,83 @@ sub calculate {
 		}
 		$table{$row->{rowtitle}}->{totalrow}=0;
 	}
-
-# preparing calculation
+my @kohafield;
+my @values;
+my @and_or;
+my @relations;
+# preparing calculation in zebra
 	my $strcalc .= "SELECT $linefield, $colfield, count( * ) FROM biblioitems LEFT JOIN  items ON (items.biblioitemnumber = biblioitems.biblioitemnumber) WHERE 1";
 	if (@$filters[0]){
 		@$filters[0]=~ s/\*/%/g;
 		$strcalc .= " AND dewey >" . @$filters[0] ."";
+		push @and_or, "\@and";
+		push @relations "\@attr 2=5";
+		push @kohafield, "dewey";
+		push @values,  @$filters[0] ;
+
 	}
 	if (@$filters[1]){
 		@$filters[1]=~ s/\*/%/g ;
 		$strcalc .= " AND dewey <" . @$filters[1] ."";
+		push @and_or, "\@and";
+		push @relations "\@attr 2=1";
+		push @kohafield, "dewey";
+		push @values,  @$filters[1] ;
+
 		
 	}
 	if (@$filters[2]){
 		@$filters[2]=~ s/\*/%/g ;
-		$strcalc .= " AND lccn >" . @$filters[2] ."" ;
+		$strcalc .= " AND classification >=" .$dbh->quote(@$filters[2]) ."" ;
+		push @and_or, "\@and";
+		push @relations "\@attr 2=4";
+		push @kohafield, "classification";
+		push @values,  @$filters[2];
+
 	}
 	if (@$filters[3]){
 		@$filters[3]=~ s/\*/%/g;
-		$strcalc .= " AND lccn <" . @$filters[3] ."" ;
+		$strcalc .= " AND classification <=" . $dbh->quote(@$filters[3]) ."" ;
+		push @and_or, "\@and";
+		push @relations "\@attr 2=2";
+		push @kohafield, "classification";
+		push @values,  @$filters[3] ;
 	}
 	if (@$filters[4]){
 		@$filters[4]=~ s/\*/%/g ;
 		$strcalc .= " AND items.itemcallnumber >=" . $dbh->quote(@$filters[4]) ."" ;
+		push @and_or, "\@and";
+		push @relations "\@attr 2=4";
+		push @kohafield, "itemcallnumber";
+		push @values,  @$filters[4] ;
 	}
 	
 	if (@$filters[5]){
 		@$filters[5]=~ s/\*/%/g;
 		$strcalc .= " AND items.itemcallnumber <=" . $dbh->quote(@$filters[5]) ."" ;
+		push @and_or, "\@and";
+		push @relations "\@attr 2=2";
+		push @kohafield, "itemcallnumber";
+		push @values,  @$filters[5] ;
 	}
 	
 	if (@$filters[6]){
 		@$filters[6]=~ s/\*/%/g;
 		$strcalc .= " AND biblioitems.itemtype like '" . @$filters[6] ."'";
+		push @and_or, "\@and";
+		push @relations "\@attr 2=3";
+		push @kohafield, "itemtype";
+		push @values,  @$filters[6] ;
 	}
 	
 	if (@$filters[7]){
 		@$filters[7]=~ s/\*/%/g;
 		@$filters[7].="%" unless @$filters[7]=~/%/;
 		$strcalc .= " AND biblioitems.publishercode like \"" . @$filters[7] ."\"";
+		push @and_or, "\@and";
+		push @relations "\@attr 2=3";
+		push @kohafield, "publishercode";
+		push @values,  @$filters[7]; 
 	}
 	if (@$filters[8]){
 		@$filters[8]=~ s/\*/%/g;
@@ -508,11 +525,14 @@ sub calculate {
 		@$filters[11]=~ s/\*/%/g;
 		$strcalc .= " AND items.holdingbranch like '" . @$filters[11] ."'" if ( @$filters[11] );
 	}
-	
+	if (@$filters[12]){
+		@$filters[12]=~ s/\*/%/g;
+		$strcalc .= " AND items.stack like '" . @$filters[12] ."'" if ( @$filters[12] );
+	}
 	$strcalc .= " group by $linefield, $colfield order by $linefield,$colfield";
 	warn "". $strcalc;
 	my $dbcalc = $dbh->prepare($strcalc);
-	$dbcalc->execute;
+#	$dbcalc->execute;
 #	warn "filling table";
 	
 	my $emptycol; 
@@ -527,11 +547,6 @@ sub calculate {
 		$grantotal += $value;
 	}
 
-# 	my %cell = {rowtitle => 'zzROWEMPTY'};
-# 	push @loopline,\%cell;
-# 	undef %cell;
-# 	my %cell;
-# 	%cell = {coltitle => "zzEMPTY"};
  	push @loopcol,{coltitle => "NULL"} if ($emptycol);
 	
 	foreach my $row ( sort keys %table ) {
diff --git a/reports/inventory.pl b/reports/inventory.pl
index 1f32ec91ca..d6c3be5fec 100755
--- a/reports/inventory.pl
+++ b/reports/inventory.pl
@@ -24,8 +24,7 @@ use C4::Context;
 use C4::Output;
 use C4::Interface::CGI::Output;
 use C4::Circulation::Circ2;
-use C4::Date;
-use HTML::Template;
+use C4::Biblio;
 
 # Fixed variables
 my $linecolor1='#ffffcc';
@@ -39,16 +38,14 @@ my $pagepagesize=20;
 # Main loop....
 my $input = new CGI;
 my $minlocation=$input->param('minlocation');
-my $maxlocation=$input->param('maxlocation');
-$maxlocation=$minlocation.'Z' unless $maxlocation;
+#my $maxlocation=$input->param('maxlocation');
+#$maxlocation=$minlocation.'Z' unless $maxlocation;
 my $datelastseen = $input->param('datelastseen');
 my $offset = $input->param('offset');
 my $markseen = $input->param('markseen');
 $offset=0 unless $offset;
 my $pagesize = $input->param('pagesize');
 $pagesize=20 unless $pagesize;
-my $uploadbarcodes = $input->param('uploadbarcodes');
-# warn "uploadbarcodes : ".$uploadbarcodes;
 
 my ($template, $borrowernumber, $cookie)
     = get_template_and_user({template_name => "reports/inventory.tmpl",
@@ -59,70 +56,42 @@ my ($template, $borrowernumber, $cookie)
 			     debug => 1,
 			     });
 $template->param(minlocation => $minlocation,
-				maxlocation => $maxlocation,
+				
 				offset => $offset,
 				pagesize => $pagesize,
 				datelastseen => $datelastseen,
-				intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
 				);
-if ($uploadbarcodes && length($uploadbarcodes)>0){
-	my $dbh=C4::Context->dbh;
-	my $date=format_date($input->param('setdate'));
-	$date = format_date("today") unless $date;
-# 	warn "$date";
-	my $strsth="update items set (datelastseen = $date) where items.barcode =?";
-	my $qupdate = $dbh->prepare($strsth);
-	my $strsth="select * from issues, items where items.itemnumber=issues.itemnumber and items.barcode =? and issues.returndate is null";
-	my $qonloan = $dbh->prepare($strsth);
-	my $strsth="select * from items where items.barcode =? and issues.wthdrawn=1";
-	my $qwthdrawn = $dbh->prepare($strsth);
-	my @errorloop;
-	my $count=0;
-	while (my $barcode=<$uploadbarcodes>){
-		chomp $barcode;
-# 		warn "$barcode";
-		if ($qwthdrawn->execute($barcode) &&$qwthdrawn->rows){
-			push @errorloop, {'barcode'=>$barcode,'ERR_WTHDRAWN'=>1};
-		}else{
-			$qupdate->execute($barcode);
-			$count += $qupdate->rows;
-# 			warn "$count";
-			if ($count){
-				$qonloan->execute($barcode);
-				if ($qonloan->rows){
-					my $data = $qonloan->fetchrow_hashref;
-					my ($doreturn, $messages, $iteminformation, $borrower) =returnbook($barcode, $data->{homebranch});
-					if ($doreturn){push @errorloop, {'barcode'=>$barcode,'ERR_ONLOAN_RET'=>1}}
-					else {push @errorloop, {'barcode'=>$barcode,'ERR_ONLOAN_NOT_RET'=>1}}
-				}
-			} else {
-				push @errorloop, {'barcode'=>$barcode,'ERR_BARCODE'=>1};
-			}
+if ($markseen) {
+	foreach my $field ($input->param) {
+		if ($field =~ /SEEN-(.*)/) {
+			&itemseen($1);
+			&returnbook($1,"MAIN");
 		}
 	}
-	$qupdate->finish;
-	$qonloan->finish;
-	$qwthdrawn->finish;
-	$template->param(date=>$date,Number=>$count);
-# 	$template->param(errorfile=>$errorfile) if ($errorfile);
-	$template->param(errorloop=>\@errorloop) if (@errorloop);
-}else{
-	if ($markseen) {
-		foreach my $field ($input->param) {
-			if ($field =~ /SEEN-(.*)/) {
-				&itemseen($1);
-			}
+}
+if ($minlocation) {
+	my @results = listitemsforinventory($minlocation,$datelastseen,$offset,$pagesize);
+## @results is now a hash of kohaxml
+## convert to normal koha hash for the templates
+my @res;
+my $i=0;
+foreach my $xml(@results) {
+
+	my @kohafields; ## just parse the fields required
+	push @kohafields,"title","author","biblionumber","itemnumber","barcode","itemcallnumber";
+	my $dbh=C4::Context->dbh;
+	my ($biblio,@itemrecords) = XMLmarc2koha($dbh,$xml,"",@kohafields);
+		 foreach my $data(@itemrecords){
+		$data->{title}=$biblio->{title};
+		$data->{author}=$biblio->{author};
+		push @res,$data;
+	
 		}
-	}
-	if ($minlocation) {
-		my $res = C4::Circulation::Circ2::listitemsforinventory($minlocation,$maxlocation,$datelastseen,$offset,$pagesize);
-		$template->param(loop =>$res,
-						nextoffset => ($offset+$pagesize),
-						prevoffset => ($offset?$offset-$pagesize:0),
-						);
-	}
+}
+	$template->param(loop =>\@res,
+					nextoffset => ($offset+$pagesize),
+					prevoffset => ($offset?$offset-$pagesize:0),
+					);
 }
 output_html_with_http_headers $input, $cookie, $template->output;
 
diff --git a/reports/issues_avg_stats.pl b/reports/issues_avg_stats.pl
index f05abfc60c..8721230972 100755
--- a/reports/issues_avg_stats.pl
+++ b/reports/issues_avg_stats.pl
@@ -64,11 +64,7 @@ my ($template, $borrowernumber, $cookie)
 				flagsrequired => {editcatalogue => 1},
 				debug => 1,
 				});
-$template->param(do_it => $do_it,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
+$template->param(do_it => $do_it);
 if ($do_it) {
 # Displaying results
 	my $results = calculate($line, $column, $rodsp, $podsp, $calc, \@filters);
@@ -161,7 +157,7 @@ if ($do_it) {
 		$hassort1 =1 if ($value);
 		push @select, $value;
 	}
-	my $branches=GetBranches();
+	my $branches=getbranches();
 	my @select_branch;
 	my %select_branches;
 	push @select_branch,"";
@@ -593,4 +589,4 @@ sub calculate {
 	return \@mainloop;
 }
 
-1;
+1;
\ No newline at end of file
diff --git a/reports/issues_by_borrower_category.plugin b/reports/issues_by_borrower_category.plugin
index 80cd0a30a2..9b3d542a82 100644
--- a/reports/issues_by_borrower_category.plugin
+++ b/reports/issues_by_borrower_category.plugin
@@ -23,7 +23,6 @@ use strict;
 use C4::Auth;
 use CGI;
 use C4::Context;
-use HTML::Template;
 use C4::Search;
 use C4::Output;
 use C4::Koha;
@@ -63,7 +62,7 @@ the hashes are then translated to hash / arrays to be returned to manager.pl & s
 sub set_parameters {
 	my ($template) = @_;
 	my $dbh = C4::Context->dbh;
-	my $branches=getbranches();
+	my $branches=GetBranches();
 	my @branches;
 	my @select_branch;
 	my %select_branches;
@@ -101,13 +100,13 @@ sub calculate {
 	}
 # now, parse each category. Before filling the result array, fill it with 0 to have every itemtype column.
 	my $strsth="SELECT itemtype, count( * )
-				FROM issues, borrowers, biblioitems, items
+				FROM issues, borrowers, biblio, items
 				WHERE issues.borrowernumber = borrowers.borrowernumber 
 					AND items.itemnumber = issues.itemnumber 
-					AND biblioitems.biblionumber = items.biblionumber 
+					AND biblio.biblionumber = items.biblionumber 
 					AND borrowers.categorycode = ?";
 	$strsth.= " AND borrowers.branchcode = ".$dbh->quote($branch) if ($branch);
-	$strsth .= " GROUP BY biblioitems.itemtype";
+	$strsth .= " GROUP BY biblio.itemtype";
 	my $sth = $dbh->prepare($strsth);
 	my $sthcategories = $dbh->prepare("select categorycode,description from categories");
 	$sthcategories->execute;
diff --git a/reports/issues_stats.pl b/reports/issues_stats.pl
index c75e342594..d39b48987e 100755
--- a/reports/issues_stats.pl
+++ b/reports/issues_stats.pl
@@ -23,9 +23,7 @@ use strict;
 use C4::Auth;
 use CGI;
 use C4::Context;
-use HTML::Template;
 use C4::Search;
-use C4::Output;
 use C4::Koha;
 use C4::Interface::CGI::Output;
 use C4::Circulation::Circ2;
@@ -68,11 +66,7 @@ my ($template, $borrowernumber, $cookie)
 				flagsrequired => {editcatalogue => 1},
 				debug => 1,
 				});
-$template->param(do_it => $do_it,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
+$template->param(do_it => $do_it);
 if ($do_it) {
 # Displaying results
 	my $results = calculate($line, $column, $podsp, $type, $daysel, $monthsel, $calc, \@filters);
@@ -311,7 +305,7 @@ sub calculate {
 	my $linefield;                               
 	if (($line =~/datetime/) and ($dsp == 1)) {
 		#Display by day
-		$linefield .="dayname($line)";  
+		$linefield .="concat(weekday($line),' ',dayname($line))";  
 	} elsif (($line=~/datetime/) and ($dsp == 2)) {
 		#Display by Month
 		$linefield .="monthname($line)";  
@@ -324,9 +318,7 @@ sub calculate {
 		$linefield .= $line;
 	}  
 	my $lineorder = $linefield;
-	$lineorder = "weekday($line)" if $linefield =~ /dayname/;
-	$lineorder = "month($line)" if $linefield =~ "^month";
-	$lineorder = $linefield if (not ($linefield =~ "^month") and not($linefield =~ /dayname/));
+	$lineorder = "weekday($line)" if $lineorder =~ "^dayname";
 
  	my $strsth;
  	$strsth .= "select distinctrow $linefield from statistics, borrowers where (statistics.borrowernumber=borrowers.borrowernumber) and $line is not null ";
@@ -371,8 +363,7 @@ sub calculate {
  	}
 
 # 2nd, loop cols.
-	my $colfield;
-	my $colorder;                               
+	my $colfield;                               
 	if (($column =~/datetime/) and ($dsp == 1)) {
 		#Display by day
 		$colfield .="dayname($column)";  
@@ -387,9 +378,6 @@ sub calculate {
 	} else {
 		$colfield .= $column;
 	}  
-	$colorder = "weekday($line)" if $colfield =~ "^dayname";
-	$colorder = "month($line)" if $colfield =~ "^month";
-	$colorder = $colfield if (not ($colfield =~ "^month") and not($colfield =~ "^dayname"));
 	
  	my $strsth2;
  	$strsth2 .= "select distinctrow $colfield from statistics, borrowers where (statistics.borrowernumber=borrowers.borrowernumber) and $column is not null ";
@@ -410,7 +398,7 @@ sub calculate {
  		$strsth2 .= " and $column LIKE ? " ;
  	}
 	$strsth2 .=" group by $colfield";
-	$strsth2 .=" order by $colorder";
+	$strsth2 .=" order by $colfield";
 #	warn "". $strsth2;
 	
 	my $sth2 = $dbh->prepare( $strsth2 );
@@ -453,17 +441,11 @@ sub calculate {
 
 	$strcalc .= "SELECT $linefield, $colfield, ";
 	$strcalc .= "COUNT( * ) " if ($process ==1);
-	if ($process ==2){
-		$strcalc .= "(COUNT(DISTINCT borrowers.borrowernumber))" ;
-	}
 	if ($process ==3){
-		$strcalc .= "(COUNT(DISTINCT issues.itemnumber))" ;
-	}
-	if ($process ==4){
 		my $rqbookcount = $dbh->prepare("SELECT count(*) FROM items");
 		$rqbookcount->execute;
 		my ($bookcount) = $rqbookcount->fetchrow;
-		$strcalc .= "100*(COUNT(DISTINCT issues.itemnumber))/ $bookcount " ;
+		$strcalc .= "100*(COUNT(itemnumber))/ $bookcount " ;
 	}
 	$strcalc .= "FROM statistics,borrowers where (statistics.borrowernumber=borrowers.borrowernumber) ";
 
@@ -485,14 +467,14 @@ sub calculate {
 	$strcalc .= " AND monthname(datetime) like '" . $monthsel ."'" if ( $monthsel );
 	$strcalc .= " AND statistics.type like '" . $type ."'" if ( $type );
 	
-	$strcalc .= " group by $linefield, $colfield order by $lineorder,$colorder";
+	$strcalc .= " group by $linefield, $colfield order by $lineorder,$colfield";
 	warn "". $strcalc;
 	my $dbcalc = $dbh->prepare($strcalc);
 	$dbcalc->execute;
 # 	warn "filling table";
 	my $emptycol; 
 	while (my ($row, $col, $value) = $dbcalc->fetchrow) {
-		warn "filling table $row / $col / $value ";
+#		warn "filling table $row / $col / $value ";
 		$emptycol = 1 if ($col eq undef);
 		$col = "zzEMPTY" if ($col eq undef);
 		$row = "zzEMPTY" if ($row eq undef);
@@ -503,18 +485,18 @@ sub calculate {
 	}
 	push @loopcol,{coltitle => "NULL"} if ($emptycol);
 
-	foreach my $row (@loopline) {
+	foreach my $row ( sort keys %table ) {
 		my @loopcell;
 		#@loopcol ensures the order for columns is common with column titles
 		# and the number matches the number of columns
 		foreach my $col ( @loopcol ) {
-			my $value =$table{($row->{rowtitle} eq "NULL")?"zzEMPTY":$row->{rowtitle}}->{($col->{coltitle} eq "NULL")?"zzEMPTY":$col->{coltitle}};
+			my $value =$table{$row}->{($col->{coltitle} eq "NULL")?"zzEMPTY":$col->{coltitle}};
 			push @loopcell, {value => $value  } ;
 		}
-		push @looprow,{ 'rowtitle' => ($row->{rowtitle} eq "NULL")?"zzEMPTY":$row->{rowtitle},
+		push @looprow,{ 'rowtitle' => ($row eq "zzEMPTY")?"NULL":$row,
 							'loopcell' => \@loopcell,
 							'hilighted' => ($hilighted >0),
-							'totalrow' => $table{($row->{rowtitle} eq "NULL")?"zzEMPTY":$row->{rowtitle}}->{totalrow}
+							'totalrow' => $table{$row}->{totalrow}
 						};
 		$hilighted = -$hilighted;
 	}
@@ -545,4 +527,4 @@ sub calculate {
 	return \@mainloop;
 }
 
-1;
+1;
\ No newline at end of file
diff --git a/reports/itemtypes.plugin b/reports/itemtypes.plugin
index 05f98a3c17..078df00b50 100644
--- a/reports/itemtypes.plugin
+++ b/reports/itemtypes.plugin
@@ -23,7 +23,6 @@ use strict;
 use C4::Auth;
 use CGI;
 use C4::Context;
-use HTML::Template;
 use C4::Search;
 use C4::Output;
 use C4::Koha;
@@ -35,7 +34,7 @@ use C4::Koha;
 sub set_parameters {
 	my ($template) = @_;
 	my $dbh = C4::Context->dbh;
-	my $branches=getbranches();
+	my $branches=GetBranches();
 	my @branches;
 	my @select_branch;
 	my %select_branches;
@@ -61,15 +60,14 @@ sub calculate {
 	my $dbh = C4::Context->dbh;
 	my $sth;
 	if ($branch) {
-		$sth = $dbh->prepare("select description, biblioitems.itemtype, count(*) as total from itemtypes, biblioitems, items 
-						where biblioitems.itemtype=itemtypes.itemtype 
-							and items.biblioitemnumber=biblioitems.biblioitemnumber
+		$sth = $dbh->prepare("select description, biblio.itemtype, count(*) as total from itemtypes, biblio, items 
+						where biblio.itemtype=itemtypes.itemtype 
+							and items.biblionumber=biblio.biblionumber
 							and items.holdingbranch=?
-						group by biblioitems.itemtype");
+						group by biblio.itemtype");
 		$sth->execute($branch);
 	} else {
-		$sth = $dbh->prepare("select description, biblioitems.itemtype, count(*) as total from itemtypes, biblioitems,items where biblioitems.itemtype=itemtypes.itemtype 
-                                      and biblioitems.biblioitemnumber = items.biblioitemnumber group by biblioitems.itemtype");
+		$sth = $dbh->prepare("select description, biblio.itemtype, count(*) as total from itemtypes, biblio where biblio.itemtype=itemtypes.itemtype group by biblio.itemtype");
 		$sth->execute;
 	}
 	my ($description,$biblioitems,$total);
@@ -97,4 +95,4 @@ sub calculate {
 	return \@mainloop;
 }
 
-1;
+1;
\ No newline at end of file
diff --git a/reports/manager.pl b/reports/manager.pl
index 22a21df6d8..bdd4a461c8 100755
--- a/reports/manager.pl
+++ b/reports/manager.pl
@@ -21,10 +21,9 @@ use strict;
 use CGI;
 use C4::Auth;
 use C4::Context;
-use C4::Output;
 use C4::Interface::CGI::Output;
 use C4::Circulation::Circ2;
-use HTML::Template;
+
 
 my $input = new CGI;
 my $report_name=$input->param("report_name");
@@ -40,11 +39,7 @@ my ($template, $borrowernumber, $cookie)
 				debug => 1,
 				});
 $template->param(do_it => $do_it,
-		report_name => $report_name,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
+		report_name => $report_name);
 my $cgidir = C4::Context->config('intranetdir')."/cgi-bin/reports/";
 unless (opendir(DIR, "$cgidir")) {
 	$cgidir = C4::Context->intranetdir."/reports/";
diff --git a/reports/overdue.pl b/reports/overdue.pl
index 05a4ad6fe7..fd8723d274 100755
--- a/reports/overdue.pl
+++ b/reports/overdue.pl
@@ -21,18 +21,21 @@
 
 use strict;
 use C4::Context;
-use C4::Output;
 use CGI;
-use HTML::Template;
-use C4::Auth;
 
+use C4::Auth;
+use C4::Date;
+use C4::Biblio;
+use C4::Search;
+use C4::Interface::CGI::Output;
+use C4::Date;
 my $input = new CGI;
 my $type=$input->param('type');
 
 my $theme = $input->param('theme'); # only used if allowthemeoverride is set
 
 my ($template, $loggedinuser, $cookie)
-      = get_template_and_user({template_name => "overdue.tmpl",
+      = get_template_and_user({template_name => "reports/overdue.tmpl",
 	                                 query => $input,
 	                                 type => "intranet",
 	                                 authnotrequired => 0,
@@ -41,11 +44,13 @@ my ($template, $loggedinuser, $cookie)
 	                                 });
 my $duedate;
 my $bornum;
-my $itemnum;
+my $itemnumber;
+my $barcode;
 my $data1;
 my $data2;
 my $data3;
 my $name;
+my $categorycode;
 my $phone;
 my $email;
 my $biblionumber;
@@ -53,53 +58,69 @@ my $title;
 my $author;
 my @datearr = localtime(time());
 my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
-
+my $dateformatted= sprintf ("%0.2d", $datearr[3]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.(1900+$datearr[5]);
 my $dbh = C4::Context->dbh;
+my $count=0;
+my @results;
+my @kohafields;
+my @values;
+my @relations;
+my $sort;
+my @and_or;
+push @kohafields, "date_due","date_due";
+push @values,$todaysdate,"0000-00-00";
+push @relations ,"\@attr 2=1","\@attr 2=5"; ## 
+push @and_or,"\@and";
+	($count,@results)=ZEBRAsearch_kohafields(\@kohafields,\@values,\@relations,$sort,\@and_or);
+
 
-my $sth=$dbh->prepare("select date_due,borrowernumber,itemnumber from issues where isnull(returndate) && date_due<? order by date_due,borrowernumber");
-$sth->execute($todaysdate);
 
 my @overduedata;
-while (my $data=$sth->fetchrow_hashref) {
-  $duedate=$data->{'date_due'};
+foreach my $xml(@results) {
+my @kohafields; ## just parse the fields required
+push @kohafields,"title","author","biblionumber","itemnumber","barcode","date_due","borrowernumber";
+my ($biblio,@itemrecords) = XMLmarc2koha($dbh,$xml,"",@kohafields);
+ foreach my $data(@itemrecords){
+   if ($data->{'date_due'} lt $todaysdate && $data->{'date_due'} gt "0000-00-00" ){
+  $duedate=format_date($data->{'date_due'});
   $bornum=$data->{'borrowernumber'};
-  $itemnum=$data->{'itemnumber'};
+  $itemnumber=$data->{'itemnumber'};
+  $biblionumber=$data->{'biblionumber'};
+  $barcode=$data->{'barcode'};
 
-  my $sth1=$dbh->prepare("select concat(firstname,' ',surname),phone,emailaddress from borrowers where borrowernumber=?");
+  my $sth1=$dbh->prepare("select concat(firstname,' ',surname),phone,emailaddress,categorycode from borrowers where borrowernumber=?");
   $sth1->execute($bornum);
   $data1=$sth1->fetchrow_hashref;
   $name=$data1->{'concat(firstname,\' \',surname)'};
   $phone=$data1->{'phone'};
+  $categorycode=$data1->{'categorycode'};
   $email=$data1->{'emailaddress'};
   $sth1->finish;
 
-  my $sth2=$dbh->prepare("select biblionumber from items where itemnumber=?");
-  $sth2->execute($itemnum);
-  $data2=$sth2->fetchrow_hashref;
-  $biblionumber=$data2->{'biblionumber'};
-  $sth2->finish;
-
-  my $sth3=$dbh->prepare("select title,author from biblio where biblionumber=?");
-  $sth3->execute($biblionumber);
-  $data3=$sth3->fetchrow_hashref;
-  $title=$data3->{'title'};
-  $author=$data3->{'author'};
-  $sth3->finish;
-  push (@overduedata, {	duedate      => $duedate,
+ 
+
+
+
+  $title=$biblio->{'title'};
+  $author=$biblio->{'author'};
+   push (@overduedata, {	duedate      => format_date($duedate),
 			bornum       => $bornum,
-			itemnum      => $itemnum,
+			itemnum      => $itemnumber,
 			name         => $name,
+			categorycode         => $categorycode,
 			phone        => $phone,
 			email        => $email,
 			biblionumber => $biblionumber,
+
+			barcode		=>$barcode,
 			title        => $title,
 			author       => $author });
+  }## if overdue
 
-}
-
-$sth->finish;
+  }##foreach item
+}## for each biblio
 
-$template->param(		todaysdate        => $todaysdate,
+$template->param(		dateformatted      => $dateformatted, count=>$count,
 		overdueloop       => \@overduedata );
 
-print "Content-Type: text/html\n\n", $template->output;
+output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/reports/reports-home.pl b/reports/reports-home.pl
index bf5ce35c17..a220183ca2 100644
--- a/reports/reports-home.pl
+++ b/reports/reports-home.pl
@@ -17,8 +17,4 @@ my ($template, $loggedinuser, $cookie)
 				flagsrequired => {catalogue => 1},
 				debug => 1,
 				});
-$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/reports/reservereport.pl b/reports/reservereport.pl
index fcbaa28de1..347b6b4601 100755
--- a/reports/reservereport.pl
+++ b/reports/reservereport.pl
@@ -20,30 +20,16 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# script now takes a branchcode arg
-# eg: http://koha.rangitikei.katipo.co.nz/cgi-bin/koha/reports/reservereport.pl?branch=BL
-
 use strict;
 use C4::Stats;
 use C4::Date;
 use CGI;
 use C4::Output;
-use HTML::Template;
 use C4::Auth;
 use C4::Interface::CGI::Output;
-use C4::Koha;
-
 
 my $input = new CGI;
 my $time  = $input->param('time');
-my $branch = $input->param('branch');
-my $sort = $input->param('sort');
-
-if (!$branch) {
-    $branch = "ALL";
-}
-
-my $branches=GetBranches();
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
@@ -56,21 +42,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     }
 );
 
-# building up branches dropdown box
-
-my %branchall;
-my $branchcount=0;
-my @branchloop;
-
-foreach my $br (keys %$branches) {
-        $branchcount++;
-            my %branch1;
-            $branch1{name}=$branches->{$br}->{'branchname'};
-            $branch1{value}=$br;
-        push(@branchloop,\%branch1);
-    }  
-
-my ( $count, $data ) = unfilledreserves($branch);
+my ( $count, $data ) = unfilledreserves();
 
 my @dataloop;
 my $toggle;
@@ -80,71 +52,21 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
 	$line{'borrowernumber'} = $data->[$i]->{'borrowernumber'};
 	$line{'surname'} = $data->[$i]->{'surname'};
 	$line{'firstname'} = $data->[$i]->{'firstname'};
-        $line{'sortdate'}       = $data->[$i]->{'reservedate'};
-        $line{'reservedate'}    = format_date($data->[$i]->{'reservedate'});
+    $line{'reservedate'}    = format_date($data->[$i]->{'reservedate'});
 	$line{'biblionumber'} = $data->[$i]->{'biblionumber'};
 	$line{'title'} = $data->[$i]->{'title'};
 	$line{'classification'} = $data->[$i]->{'classification'};
 	$line{'dewey'} = $data->[$i]->{'dewey'};
-        $line{'status'} = $data->[$i]->{'found'};
-        $line{'branchcode'} = $data->[$i]->{'branchcode'};
+    $line{'status'} = $data->[$i]->{'found'};
 	$line{'toggle'} = $toggle;
-     if ( $line{'status'} ne 'W' ) {
-	 
-	 # its not waiting, we need to find if its on issue, or on the shelf
-	 # FIXME still need to shift the text to the template so its translateable
-	 if ( $data->[$i]) {
-	     # find if its on issue
-	     my @items = &ItemInfo( undef, $line{'biblionumber'}, 'intra' );
-	     my $onissue = 0;
-	     foreach my $item (@items) {
-		 if ( $item->{'datedue'} eq 'Reserved' ) {
-		     $onissue = 0;
-		     if ($item->{'branchname'} eq ''){
-			 $line{'status'}='In Transit';
-		     }
-		     else {			 
-			 $line{'status'} = "On shelf at $item->{'branchname'}";
-		     }
-		     
-		 }
-		 
-		 else {
-		     $onissue = 1;
-		 }
-	     }		 
-	     if ($onissue) {
-		 $line{'status'} = 'On Issue';
-	     }
-	 }
-	 else {
-	     $line{'status'}="Waiting for pickup";
-	     
-	 }
-     }
+
     push( @dataloop, \%line );
 }
 
-if ($sort eq 'name'){ 
-    @dataloop = sort {$a->{'surname'} cmp $b->{'surname'}} @dataloop;                                                                                         
-}                                                                                                                                                             
-elsif ($sort eq 'date'){                                                                                                                                      
-    @dataloop = sort {$a->{'sortdate'} cmp $b->{'sortdate'}} @dataloop;                                                                                       
-}                                                                                                                                                             
-elsif ($sort eq 'title'){                                                                                                                                     
-    @dataloop = sort {$a->{'title'} cmp $b->{'title'}} @dataloop;                                                                                             
-}                                                                                                                                                             
-else {                                                                                                                                                        
-    @dataloop = sort {$a->{'status'} cmp $b->{'status'}} @dataloop;                                                                                           
-}                                                                                                                                                             
-
 
 $template->param(
     count    => $count,
-    dataloop => \@dataloop,
-    branchcode => $branch,
-    branchloop => \@branchloop
-    
+    dataloop => \@dataloop
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/reports/stats.pl b/reports/stats.pl
index a11be08023..d3e47f8612 100755
--- a/reports/stats.pl
+++ b/reports/stats.pl
@@ -26,7 +26,6 @@
 use strict;
 use CGI;
 use C4::Output;
-use HTML::Template;
 use C4::Auth;
 use C4::Interface::CGI::Output;
 use C4::Context;
@@ -35,7 +34,8 @@ use C4::Stats;
 
 my $input=new CGI;
 my $time=$input->param('time');
-
+my $date=$input->param('from');
+my $date2=$input->param('to');
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "stats.tmpl",
 			     query => $input,
@@ -45,33 +45,8 @@ my ($template, $loggedinuser, $cookie)
 			     debug => 1,
 			     });
 
-my $date;
-my $date2;
-if ($time eq 'yesterday'){
-	$date=ParseDate('yesterday');
-	$date2=ParseDate('today');
-}
-if ($time eq 'today'){
-	$date=ParseDate('today');
-	$date2=ParseDate('tomorrow');
-}
-if ($time eq 'daybefore'){
-	$date=ParseDate('2 days ago');
-	$date2=ParseDate('yesterday');
-}
-if ($time eq 'month') {
-	$date = ParseDate('1 month ago');
-	$date2 = ParseDate('today');
-	warn "d : $date // d2 : $date2";
-}
-if ($time=~ /\//){
-	$date=ParseDate($time);
-	$date2=ParseDateDelta('+ 1 day');
-	$date2=DateCalc($date,$date2);
-}
-$date=UnixDate($date,'%Y-%m-%d');
-$date2=UnixDate($date2,'%Y-%m-%d');
-	warn "d : $date // d2 : $date2";
+
+
 my @payments=TotalPaid($date,$date2);
 my $count=@payments;
 my $total=0;
@@ -81,20 +56,22 @@ my @loop;
 my %row;
 my $i=0;
 while ($i<$count){
-	warn " pay : ".$payments[$i]{'timestamp'};
+#	warn " pay : ".$payments[$i]{'timestamp'};
 	my $time=$payments[$i]{'datetime'};
 	my $payments=$payments[$i]{'value'};
 	my $charge=0;
 	my @temp=split(/ /,$payments[$i]{'datetime'});
-	my $date=$temp[0];
-	my @charges=getcharges($payments[$i]{'borrowernumber'},$payments[$i]{'timestamp'});
-	my $count=@charges;
+	my $date=$payments[$i]{'date'};
+
+	my @charges=getcharges($payments[$i]{'borrowernumber'},$payments[$i]{'date'});
+	my $count2=@charges;
+warn "$count2";
 	my $temptotalf=0;
 	my $temptotalr=0;
 	my $temptotalres=0;
 	my $temptotalren=0;
 	my $temptotalw=0;
-	for (my $i2=0;$i2<$count;$i2++){
+	for (my $i2=0;$i2<$count2;$i2++){
 		$charge+=$charges[$i2]->{'amount'};
 		%row = ( name   => $charges[$i2]->{'description'},
 					type   => $charges[$i2]->{'accounttype'},
@@ -149,6 +126,7 @@ while ($i<$count){
 		$bornum=$payments[$i]{'borrowernumber'};
 		$i++;
 	}
+
 }
 
 $template->param( loop1   => \@loop,
diff --git a/reports/stats.print.pl b/reports/stats.print.pl
index 1f1947d409..2a6df6aa6b 100755
--- a/reports/stats.print.pl
+++ b/reports/stats.print.pl
@@ -23,7 +23,6 @@ my $csv = Text::CSV_XS->new(
 
 my $input=new CGI;
 my $time=$input->param('time');
-my $time2=$input->param('time2');
 
 my @loop1;
 my @loop2;
@@ -57,10 +56,6 @@ if ($time eq ''){
         $date2=ParseDate('tomorrow');
 }
 
-if ($time2 ne ''){
-            $date=ParseDate($time);
-            $date2=ParseDate($time2);
-}
 
 my $date=UnixDate($date,'%Y-%m-%d');
 my $date2=UnixDate($date2,'%Y-%m-%d');
@@ -99,8 +94,7 @@ while ($i<$count ){
                my $sec=substr($payments[$i]{'timestamp'},12,2);
                my $time="$hour:$min:$sec";
                my $time2="$payments[$i]{'date'}";
-#               my $branch=Getpaidbranch($time2,$payments[$i]{'borrowernumber'});
-	       my $branch=$payments[$i]{'branch'};
+               my $branch=Getpaidbranch($time2,$payments[$i]{'borrowernumber'});
 
                my @rows1 = ($branch,          # lets build up a row
                             $payments[$i]->{'datetime'},
@@ -108,19 +102,17 @@ while ($i<$count ){
                             $payments[$i]->{'firstname'},
                             $charges[$i2]->{'description'},
                             $charges[$i2]->{'accounttype'},
-   # rounding amounts to 2dp and adding dollar sign to make excel read it as currency format
-                            "\$".sprintf("%.2f", $charges[$i2]->{'amount'}), 
+                            sprintf("%.2f", $charges[$i2]->{'amount'}), # rounding amounts to 2dp
                             $payments[$i]->{'type'},
-                            "\$".$payments[$i]->{'value'});
+                            $payments[$i]->{'value'});
 
                push (@loop1, \@rows1);
-	       $totalpaid = $totalpaid + $payments[$i]->{'value'};
            }
        } else {
          ++$totalwritten;
        }
-
        $i++; #increment the while loop
+       $totalpaid = $totalpaid + $payments[$i]->{'value'};
 }
 
 #get credits and append to the bottom of payments
@@ -137,11 +129,11 @@ while ($i<$count ){
                     $credits[$i]->{'firstname'},
                     $credits[$i]->{'description'},
                     $credits[$i]->{'accounttype'},
-                    "\$".$credits[$i]->{'amount'});
+                    $credits[$i]->{'amount'});
 
        push (@loop2, \@rows2);
-       $totalcredits = $totalcredits + $credits[$i]->{'amount'};
        $i++;
+       $totalcredits = $totalcredits + $credits[$i]->{'amount'};
 }
 
 #takes off first char minus sign "-100.00"
@@ -149,9 +141,9 @@ $totalcredits = substr($totalcredits, 1);
 
 print $input->header(
     -type       => 'application/vnd.ms-excel',
-    -attachment => "stats.csv",
+    -attachment => "moo.csv",         
 );
-print "Branch, Datetime, Surname, Firstnames, Description, Type, Invoice amount, Payment type, Payment Amount\n";
+print "Branch, Datetime, Surame, Firstnames, Description, Type, Invoice amount, Payment type, Payment Amount\n";
 
 
 for my $row ( @loop1 ) {
@@ -175,4 +167,3 @@ print ",,,,,,,\n";
 print ",,Total Amount Paid, $totalpaid\n";
 print ",,Total Number Written, $totalwritten\n";
 print ",,Total Amount Credits, $totalcredits\n";
-
diff --git a/reports/stats.screen.pl b/reports/stats.screen.pl
index 0cfabcde9c..dfa6e71fbc 100755
--- a/reports/stats.screen.pl
+++ b/reports/stats.screen.pl
@@ -8,86 +8,41 @@ use C4::Auth;
 use C4::Interface::CGI::Output;
 use C4::Context;
 use Date::Manip;
+use C4::Date;
 use C4::Stats;
-use Data::Dumper;
-
 &Date_Init("DateFormat=non-US"); # set non-USA date, eg:19/08/2005
 
 my $input=new CGI;
 my $time=$input->param('time');
-my $time2=$input->param('time2');
-
-
-if($input->param('submit') eq "To Excel" || $input->param('submit_x') eq "To Excel"){
-       print $input->redirect("/cgi-bin/koha/stats.print.pl?time=$time&time2=$time2");
-}
-
+my $date=$input->param('from');
+my $date2=$input->param('to');
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "stats_screen.tmpl",
+    = get_template_and_user({template_name => "reports/stats.screen.tmpl",
                              query => $input,
                              type => "intranet",
-                             authnotrequired => 1,
+                             authnotrequired => 0,
                              flagsrequired => {borrowers => 1},
                              debug => 1,
                              });
 
-my $date;
-my $date2;
-if ($time eq 'yesterday'){
-        $date=ParseDate('yesterday');
-        $date2=ParseDate('today');
-}
-if ($time eq 'today'){
-        $date=ParseDate('today');
-        $date2=ParseDate('tomorrow');
-}
-if ($time eq 'daybefore'){
-        $date=ParseDate('2 days ago');
-        $date2=ParseDate('yesterday');
-}
-if ($time eq 'month') {
-        $date = ParseDate('1 month ago');
-        $date2 = ParseDate('today');
-
-}
-if ($time=~ /\//){
-        $date=ParseDate($time);
-        $date2=ParseDateDelta('+ 1 day');
-        $date2=DateCalc($date,$date2);
-}
-# if time is blank
-if ($time eq ''){
-        $date=ParseDate('today');
-        $date2=ParseDate('tomorrow');
-}
-
-# if script is called with a start and finsh date range...
-if ($time ne '' && $time2 ne ''){
-          $date=ParseDate($time);
-          $date2=ParseDate($time2);
-}
-
-
-my $date=UnixDate($date,'%Y-%m-%d');
-my $date2=UnixDate($date2,'%Y-%m-%d');
-# warn "MASON: TIME: $time, $time2";
-# warn "MASON: DATE: $date, $date2";
-
-# get a list of every payment
-my @payments=TotalPaid($date,$date2,0);
 
+#get a list of every payment
+my @payments=TotalPaid($date,$date2);
 
 my $count=@payments;
-# print "MASON: number of payments=$count\n";
+# warn "number of payments=$count\n";
 
 my $i=0;
 my $totalcharges=0;
 my $totalcredits=0;
 my $totalpaid=0;
 my $totalwritten=0;
+my $totalwrittenamount=0;
+my $totalinvoicesamount=0;
+my $totalinvoices=0;
 my @loop1;
 my @loop2;
-
+my @loop3;
 
 # lets get a a list of all individual item charges paid for by that payment
 while ($i<$count ){
@@ -95,47 +50,38 @@ while ($i<$count ){
        my $count;
        my @charges;
 
-
-       if ($payments[$i]{'type'} ne 'writeoff'){
-
-#       warn Dumper $payments[$i];
-
-           @charges=getcharges($payments[$i]{'borrowernumber'}, $payments[$i]{'timestamp'}, $payments[$i]{'proccode'});
+       if ($payments[$i]->{'accounttype'} ne 'W'){         # lets ignore writeoff payments!.
+           @charges=getcharges($payments[$i]{'borrowernumber'}, $payments[$i]{'offset'}, $payments[$i]{'accountno'});
            $totalcharges++;
            $count=@charges;
 
            # getting each of the charges and putting them into a array to be printed out
            #this loops per charge per person
            for (my $i2=0;$i2<$count;$i2++){
-               my $hour=substr($payments[$i]{'timestamp'},8,2);
-               my $min=substr($payments[$i]{'timestamp'},10,2);
-               my $sec=substr($payments[$i]{'timestamp'},12,2);
-               my $time="$hour:$min:$sec";
+              
                my $time2="$payments[$i]{'date'}";
 #               my $branch=Getpaidbranch($time2,$payments[$i]{'borrowernumber'});
-	       my $branch=$payments[$i]{'branch'};
-#	       if ($payments[$i]{'borrowernumber'} == 18265){
-#               warn "$payments[$i]{'branch'} $branch $payments[$i]{'borrowernumber'}";#
-#		   }
+
                # lets build up a row
-               my %rows1 = (branch => $branch,
-                            datetime => $payments[$i]->{'datetime'},
+               my %rows1 = ( datetime => $payments[$i]->{'timestamp'},
                             surname => $payments[$i]->{'surname'},
                             firstname => $payments[$i]->{'firstname'},
-                            description => $charges[$i2]->{'description'},
+                            description => $payments[$i]->{'description'},
                             accounttype => $charges[$i2]->{'accounttype'},
-                            amount => sprintf("%.2f", $charges[$i2]->{'amount'}), # rounding amounts to 2dp
-                            type => $payments[$i]->{'type'},
-                            value => sprintf("%.2f", $payments[$i]->{'value'})); # rounding amounts to 2dp
+                            amount => sprintf("%.2f",  $charges[$i2]->{'amount'}), # rounding amounts to 2dp
+                            type => $payments[$i]->{'accounttype'},
+                            value => sprintf("%.2f", $payments[$i]->{'amount'}*(-1))); # rounding amounts to 2dp
 
                push (@loop1, \%rows1);
-	       $totalpaid = $totalpaid + $payments[$i]->{'value'};
+  $totalpaid = sprintf("%.2f",$totalpaid + $payments[$i]->{'amount'}*(-1));
            }
        } else {
+$totalwrittenamount= sprintf("%.2f",$totalwrittenamount + $payments[$i]->{'amount'}*(-1));
          ++$totalwritten;
        }
-
-       $i++; #increment the while loop 
+      
+     
+ $i++; #increment the while loop
 }
 
 #get credits and append to the bottom of payments
@@ -146,59 +92,51 @@ my $i=0;
 
 while ($i<$count ){
 
-       my %rows2 = (creditbranch        => $credits[$i]->{'branchcode'},
-                    creditdate          => $credits[$i]->{'date'},
+       my %rows2 = (creditdate          => format_date($credits[$i]->{'date'}),
                     creditsurname       => $credits[$i]->{'surname'},
                     creditfirstname     => $credits[$i]->{'firstname'},
                     creditdescription   => $credits[$i]->{'description'},
                     creditaccounttype   => $credits[$i]->{'accounttype'},
-                    creditamount        => sprintf("%.2f", $credits[$i]->{'amount'})
-                    );
+                    creditamount        => sprintf("%.2f",$credits[$i]->{'amount'}*(-1)));
 
        push (@loop2, \%rows2);
-       $totalcredits = $totalcredits + $credits[$i]->{'amount'};
-       $i++; #increment the while loop
+    
+       $totalcredits =sprintf("%.2f", $totalcredits + $credits[$i]->{'amount'});
+         $i++; #increment the while loop
+
 }
 
+
 #takes off first char minus sign "-100.00"
 $totalcredits = substr($totalcredits, 1);
 
-my $totalrefunds=0;
-my @loop3;
-my @refunds=getrefunds($date,$date2);
-$count=@refunds;
-$i=0;
+my @invoices=getinvoices($date,$date2);
+my $count=@invoices;
+my $i=0;
 
 while ($i<$count ){
 
-       my %rows2 = (refundbranch        => $refunds[$i]->{'branchcode'},
-                    refunddate          => $refunds[$i]->{'date'},
-                    refundsurname       => $refunds[$i]->{'surname'},
-                    refundfirstname     => $refunds[$i]->{'firstname'},
-                    refunddescription   => $refunds[$i]->{'description'},
-                    refundaccounttype   => $refunds[$i]->{'accounttype'},
-                    refundamount        => sprintf("%.2f", $refunds[$i]->{'amount'})
-                    );
-
-       push (@loop3, \%rows2);
-       $totalrefunds = $totalrefunds + $refunds[$i]->{'amount'};
-       $i++; #increment the while loop
-}
-
-my $totalcash=$totalpaid-$totalrefunds;
+       my %rows3 = (invoicesdate          => format_date($invoices[$i]->{'date'}),
+                   invoicessurname       => $invoices[$i]->{'surname'},
+                   invoicesfirstname     => $invoices[$i]->{'firstname'},
+                    invoicesdescription   => $invoices[$i]->{'description'},
+                    invoicesaccounttype   => $invoices[$i]->{'accounttype'},
+                    invoicesamount        => sprintf("%.2f",$invoices[$i]->{'amount'}),
+	invoicesamountremaining=>sprintf("%.2f",$invoices[$i]->{'amountoutstanding'}));
+       push (@loop3, \%rows3);
+         $totalinvoicesamount =sprintf("%.2f", $totalinvoicesamount + $invoices[$i]->{'amountoutstanding'});
+       $totalinvoices =sprintf("%.2f", $totalinvoices + $invoices[$i]->{'amount'});
+         $i++; #increment the while loop
 
-
-$template->param( date                => $time,
-                  date2               => $time2,
-                  loop1               => \@loop1,
+}
+$template->param( loop1               => \@loop1,
                   loop2               => \@loop2,
-                  loop3               => \@loop3,
+		 loop3               => \@loop3,
                   totalpaid           => $totalpaid,
                   totalcredits        => $totalcredits,
-                  totalwritten        => $totalwritten,
-                  totalrefund         => $totalrefunds,
-                  totalcash           => $totalcash);
+		totalcreditsamount        => sprintf("%.2f",$totalcredits-$totalwrittenamount),
+	totalwrittenamount        => $totalwrittenamount,
+                  totalwritten        => $totalwritten ,
+	totalinvoices=>$totalinvoices, totalinvoicesamount=>$totalinvoicesamount	);
 
 output_html_with_http_headers $input, $cookie, $template->output;
-
-
diff --git a/reports/transfers.plugin b/reports/transfers.plugin
new file mode 100644
index 0000000000..246e1a27d6
--- /dev/null
+++ b/reports/transfers.plugin
@@ -0,0 +1,105 @@
+#!/usr/bin/perl
+
+# $Id$
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# 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
+
+use strict;
+use C4::Auth;
+use CGI;
+use C4::Context;
+use C4::Search;
+use C4::Output;
+use C4::Koha;
+
+=head1
+
+=cut
+
+sub set_parameters {
+	my ($template) = @_;
+	my $dbh = C4::Context->dbh;
+	my $branches=GetBranches();
+	my @branches;
+	my @select_branch;
+	my %select_branches;
+	push @select_branch,"";
+	$select_branches{""} = "";
+	foreach my $branch (keys %$branches) {
+		push @select_branch, $branch;
+		$select_branches{$branch} = $branches->{$branch}->{'branchname'};
+	}
+	my $CGIbranch=CGI::scrolling_list( -name     => 'value',
+				-id => 'value',
+				-values   => \@select_branch,
+				-labels   => \%select_branches,
+				-size     => 1,
+				-multiple => 0 );
+	$template->param(CGIbranch => $CGIbranch);
+	return $template;
+}
+sub calculate {
+	my ($parameters) = @_;
+	my @results =();
+	my $branch = @$parameters[0];
+	my $dbh = C4::Context->dbh;
+	my $sth;
+	if ($branch) {
+		$sth = $dbh->prepare("SELECT i.itemnumber,i.barcode,i.biblionumber,ms.tobranch,ms.frombranch,ms.datearrived,ms.comments FROM `items` i
+		left join branchtransfers as ms on i.itemnumber=ms.itemnumber
+		where ms.frombranch=? order by ms.datearrived desc");
+		$sth->execute($branch);
+	} else {
+		$sth = $dbh->prepare("SELECT i.itemnumber,i.barcode,i.biblionumber,ms.tobranch,ms.frombranch,ms.datearrived,ms.comments FROM `items` i, branchtransfers as ms
+		where i.itemnumber=ms.itemnumber and ms.itemnumber is not null order by ms.datearrived desc");
+		$sth->execute;
+	}
+
+	my ($itemnumber,$barcode,$biblionumber,$currentbranch,$origbranch,$date,$by);
+	 my $nbresult=$dbh->prepare("SELECT FOUND_ROWS()");
+	$nbresult->execute;
+	my $grantotal = $nbresult->fetchrow;
+	my $count = 0;
+	while  (($itemnumber,$barcode,$biblionumber,$currentbranch,$origbranch,$date,$by) = $sth->fetchrow) {
+		my %line;
+		if($count % 2){
+			$line{toggle} = 1;
+			} else {
+				$line{toggle} = 0;
+			}
+		$line{itemnumber} = $itemnumber;
+		$line{barcode} = $barcode;
+		$line{biblionumber} = $biblionumber;
+		
+		$line{currentb} = $currentbranch;
+		$line{origb} = $origbranch;
+		$line{date} = $date;
+		$line{by} = $by;
+		push @results,\%line;
+		$count ++;
+	}
+	my @mainloop;
+	my %globalline;
+	$globalline{loopitemtype} = \@results;
+	$globalline{total} = $grantotal;
+	$globalline{branch} = $branch;
+	push @mainloop,\%globalline;
+	return \@mainloop;
+}
+
+1;
\ No newline at end of file
diff --git a/reserve/modrequest.pl b/reserve/modrequest.pl
index a319214ca1..0d74f7edca 100755
--- a/reserve/modrequest.pl
+++ b/reserve/modrequest.pl
@@ -28,7 +28,7 @@ use C4::Search;
 use CGI;
 use C4::Output;
 use C4::Reserves2;
-
+use C4::Members;
 my $input = new CGI;
 #print $input->header;
 
@@ -39,16 +39,16 @@ my @biblionumber=$input->param('biblionumber');
 my @borrower=$input->param('borrowernumber');
 my @branch=$input->param('pickup');
 my $count=@rank;
-
+my $cataloger=$input->param('loggedinuser');
 # goes through and manually changes the reserves record....
 # no attempt is made to check consistency.
 for (my $i=0;$i<$count;$i++){
-    UpdateReserve($rank[$i],$biblionumber[$i],$borrower[$i],$branch[$i]); #from C4::Reserves2
+    UpdateReserves($rank[$i],$biblionumber[$i],$borrower[$i],$branch[$i],$cataloger); #from C4::Reserves2
 }
 
 my $from=$input->param('from');
 if ($from eq 'borrower'){
   print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrower[0]");
  } else {
-   print $input->redirect("/cgi-bin/koha/reserve/request.pl?bib=$biblionumber[0]");
+   print $input->redirect("/cgi-bin/koha/reserve/request.pl?biblionumber=$biblionumber[0]");
 }
diff --git a/reserve/placerequest.pl b/reserve/placerequest.pl
index e7716ad8c5..eaafca19f8 100755
--- a/reserve/placerequest.pl
+++ b/reserve/placerequest.pl
@@ -24,19 +24,16 @@
 use strict;
 #use DBI;
 use C4::Search;
-use C4::Biblio;
 use CGI;
 use C4::Output;
 use C4::Reserves2;
-use C4::Circulation::Circ2;
 use C4::Members;
-
 my $input = new CGI;
 #print $input->header;
-
+my $itemnumber=$input->param('itemnumber');
 my @bibitems=$input->param('biblioitem');
 my @reqbib=$input->param('reqbib');
-my $biblio=$input->param('biblio');
+my $biblionumber=$input->param('biblionumber');
 my $borrower=$input->param('member');
 my $notes=$input->param('notes');
 my $branch=$input->param('pickup');
@@ -44,53 +41,37 @@ my @rank=$input->param('rank-request');
 my $type=$input->param('type');
 my $title=$input->param('title');
 my $bornum=borrdata($borrower,'');
-my $checkitem=$input->param('checkitem');
-# my $priority;
-my $found;
+my $cataloger=$input->param('loggedinuser');
 
-#new op : if we have an item selectionned, and the pickup branch is the same as the holdingbranch of the document, we force the value $rank and $found .
-if ($checkitem ne ''){
-		$rank[0] = '0';
-		my %env;
-		my $item = $checkitem;
-		$item = getiteminformation(\%env,$item);
-		if ( $item->{'holdingbranch'} eq $branch ){
-		$found = 'W';	
-		}
+if ($type eq 'str8' && $bornum ne ''){
+    my $count=@bibitems;
+    @bibitems=sort @bibitems;
+    my $i2=1;
+    my @realbi;
+    $realbi[0]=$bibitems[0];
+for (my $i=1;$i<$count;$i++){
+    my $i3=$i2-1;
+    if ($realbi[$i3] ne $bibitems[$i]){
+	$realbi[$i2]=$bibitems[$i];
+	$i2++;
+    }
+}
 
+my $env;
 
-}
+my $const;
 
-# END of new op .
 
-if ($type eq 'str8' && $bornum ne ''){
-	my $count=@bibitems;
-	@bibitems=sort @bibitems;
-	my $i2=1;
-	my @realbi;
-	$realbi[0]=$bibitems[0];
-	for (my $i=1;$i<$count;$i++) {
-		my $i3=$i2-1;
-		if ($realbi[$i3] ne $bibitems[$i]) {
-			$realbi[$i2]=$bibitems[$i];
-			$i2++;
-		}
-	}
-	my $env;
-	my $const;
-	if ($input->param('request') eq 'any'){
-	$const='a';
-  CreateReserve(\$env,$branch,$bornum->{'borrowernumber'},$biblio,$const,\@realbi,$rank[0],$notes,$title,$checkitem,$found);
-	} elsif ($reqbib[0] ne ''){
-	$const='o';
-  CreateReserve(\$env,$branch,$bornum->{'borrowernumber'},$biblio,$const,\@reqbib,$rank[0],$notes,$title,$checkitem, $found);
-	} else {
-  CreateReserve(\$env,$branch,$bornum->{'borrowernumber'},$biblio,'a',\@realbi,$rank[0],$notes,$title,$checkitem, $found);
-	}
-	
-print $input->redirect("request.pl?bib=$biblio");
+for (my $i=0; $i<@reqbib; $i++){
+if ($reqbib[$i] ne ''){
+  $const='o';
+  CreateReserve(\$env,$bornum->{'borrowernumber'},$cataloger,$biblionumber,'','',$branch,$const,$rank[0],$notes,$title,"",$reqbib[$i]);
+}
+}
+
+print $input->redirect("request.pl?biblionumber=$biblionumber");
 } elsif ($bornum eq ''){
-	print $input->header();
-	print "Invalid card number please try again";
-	print $input->Dump;
+  print $input->header();
+  print "Invalid card number please try again";
+  print $input->Dump;
 }
diff --git a/reserve/renewscript.pl b/reserve/renewscript.pl
deleted file mode 100755
index f22215c563..0000000000
--- a/reserve/renewscript.pl
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/perl
-
-# $Id$
-
-#written 18/1/2000 by chris@katipo.co.nz
-#script to renew items from the web
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# 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
-
-use CGI;
-use C4::Circulation::Circ2;
-
-my $input = new CGI;
-
-#
-# find items to renew, all items or a selection of items
-#
-
-my @data;
-if ($input->param('renew_all')) {
-    @data = $input->param('all_items[]');
-}
-else {
-    @data = $input->param('items[]');
-}
-
-#
-# renew items
-#
-my %env;
-my $cardnumber = $input->param("cardnumber");
-my $bornum = $input->param("bornum");
-
-foreach my $itemno (@data) {
-    #check status before renewing issue
-    if (renewstatus(\%env,$bornum,$itemno)){
-        renewbook(\%env,$bornum,$itemno);
-    }
-}
-
-#
-# redirection to the referrer page
-#
-if ($input->param('destination') eq "circ"){
-    print $input->redirect(
-        '/cgi-bin/koha/circ/circulation.pl?findborrower='.$cardnumber
-    );
-}
-else {
-    print $input->redirect(
-        '/cgi-bin/koha/members/moremember.pl?bornum='.$bornum
-    );
-}
diff --git a/reserve/request.pl b/reserve/request.pl
index 899c1e627e..03d59a0161 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -24,13 +24,6 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
-use HTML::Template;
-use CGI;
-use Date::Manip;
-use List::MoreUtils qw/uniq/;
-use Data::Dumper;
-use Date::Calc qw/Today/;
-
 use C4::Search;
 use C4::Output;
 use C4::Interface::CGI::Output;
@@ -39,383 +32,174 @@ use C4::Reserves2;
 use C4::Biblio;
 use C4::Koha;
 use C4::Circulation::Circ2;
-# FIXME Is there utility to use Acquisition.pm ???? 
-# use C4::Acquisition;
+use C4::Acquisition;
+use CGI;
 use C4::Date;
-use C4::Members;
 
-my $dbh = C4::Context->dbh;
-my $sth;
 my $input = new CGI;
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({
-        template_name => "reserve/request.tmpl",
-        query => $input,
-        type => "intranet",
-        authnotrequired => 0,
-        flagsrequired => {reserveforothers => 1},
-    });
-
+my $dbh=C4::Context->dbh;
 # get biblio information....
-my $bib = $input->param('bib');
-my $dat = bibdata($bib);
-
-# Select borrowers infos
-my $findborrower = $input->param('findborrower');
-$findborrower =~ s|,| |g;
-my $cardnumber = $input->param('cardnumber');
-my %env;
-my $borrowerslist;
-my $messageborrower;
-
-# my $date = today();
-my $date= sprintf('%04d-%02d-%02d', Today());
-
-if ($findborrower) {
-    my ($count,$borrowers) =  BornameSearch(\%env, $findborrower, 'cardnumber', 'web');
-
-    my @borrowers = @$borrowers;
-
-    if ($#borrowers == -1) {
-        $input->param('findborrower', '');
-        $messageborrower =  "'$findborrower'";
-    }
-    elsif ($#borrowers == 0) {
-        $input->param('cardnumber', $borrowers[0]->{'cardnumber'});
-        $cardnumber = $borrowers[0]->{'cardnumber'};
-    }
-    else {
-        $borrowerslist = \@borrowers;
-    }
-}
-
-if ($cardnumber) {
-	my $borrowerinfo = getpatroninformation (\%env,0,$cardnumber);
-	my $expiry;
-	my $diffbranch;
-	my @getreservloop;
-	my $count_reserv = 0;
-	my $maxreserves;
-
-# 	we check the reserves of the borrower, and if he can reserv a document
-# FIXME At this time we have a simple count of reservs, but, later, we could improve the infos "title" ...
-
-        my $number_reserves =
-            GetNumberReservesFromBorrower($borrowerinfo->{'borrowernumber'});
-
-        if ($number_reserves > C4::Context->preference('maxreserves')) {
-            $maxreserves = 1;
-        }
-
-# we check the date expiricy of the borrower
-	my $warning=Date_Cmp(ParseDate("today"),format_date($borrowerinfo->{'dateexpiry'}));
-	if ( $warning > 0) {
-			$expiry = 1;
-	}
-
-# check if the borrower make the reserv in a different branch
-	if ($borrowerinfo->{'branchcode'} ne C4::Context->userenv->{'branch'}) {
-		$diffbranch = 1;
-	}
-
-	$template->param(
-		borrowersurname => $borrowerinfo->{'surname'},
-		borrowerfirstname => $borrowerinfo->{'firstname'},
-		borrowerreservs => $count_reserv,
-		maxreserves => $maxreserves,
-		expiry => $expiry,
-		diffbranch => $diffbranch
-	);
-}
-
-$template->param(
-    messageborrower => $messageborrower
-);
-
-my $CGIselectborrower;
-if ($borrowerslist) {
-    my @values;
-    my %labels;
-
-    foreach my $borrower (
-        sort {$a->{surname}.$a->{firstname} cmp $b->{surname}.$b->{firstname}}
-            @{$borrowerslist}
-    ) {
-        push @values, $borrower->{cardnumber};
-
-        $labels{ $borrower->{cardnumber} } = sprintf(
-            '%s, %s ... (%s - %s) ... %s',
-            $borrower->{surname},
-            $borrower->{firstname},
-            $borrower->{cardnumber},
-            $borrower->{categorycode},
-            $borrower->{streetaddress},
-        );
-    }
-
-    $CGIselectborrower = CGI::scrolling_list(
-        -name     => 'cardnumber',
-        -values   => \@values,
-        -labels   => \%labels,
-        -size     => 7,
-        -multiple => 0,
-    );
-}
-
+my $biblionumber = $input->param('biblionumber');
+my ($record) = XMLgetbiblio($dbh,$biblionumber);
+$record=XML_xml2hash_onerecord($record);
+my $dat=XMLmarc2koha_onerecord($dbh,$record,"biblios");
 # get existing reserves .....
-my ($count, $reserves) = FindReserves($bib, undef);
+my ($count,$reserves) = FindReserves($biblionumber);
 my $totalcount = $count;
-my $alreadyreserved;
-
-# FIXME launch another time getpatroninformation perhaps until
-my $borrowerinfo = getpatroninformation (\%env,0,$cardnumber);
-
 foreach my $res (@$reserves) {
-    if (($res->{found} eq 'W') or ($res->{priority} == 0)) {
+    if ($res->{'found'} eq 'W') {
 	$count--;
     }
-
-    if ($borrowerinfo->{borrowernumber} eq $res->{borrowernumber}) {
-	$alreadyreserved = 1;
-    }
 }
-$template->param(alreadyreserved => $alreadyreserved);
 
 # make priorities options
-my @optionloop;
-for (1 .. $count + 1) {
-    push(
-        @optionloop,
-        {
-            num => $_,
-            selected => ($_ == $count + 1),
-        }
-    );
-}
-
-my @branchcodes;
-my %itemnumbers_of_biblioitem;
-my @itemnumbers = @{get_itemnumbers_of($bib)->{$bib}};
-my $iteminfos_of = get_iteminfos_of(@itemnumbers);
-
-foreach my $itemnumber (@itemnumbers) {
-    push(
-        @branchcodes,
-        $iteminfos_of->{$itemnumber}->{homebranch},
-        $iteminfos_of->{$itemnumber}->{holdingbranch}
-    );
-
-    my $biblioitemnumber = $iteminfos_of->{$itemnumber}->{biblioitemnumber};
-    push(
-        @{ $itemnumbers_of_biblioitem{$biblioitemnumber} },
-        $itemnumber
-    );
-}
-
-@branchcodes = uniq @branchcodes;
-
-my @biblioitemnumbers = keys %itemnumbers_of_biblioitem;
-
-my $branchinfos_of = get_branchinfos_of(@branchcodes);
-my $notforloan_label_of = get_notforloan_label_of();
-my $biblioiteminfos_of = get_biblioiteminfos_of(@biblioitemnumbers);
+my $num = $count + 1;
 
-my @itemtypes;
-foreach my $biblioitemnumber (@biblioitemnumbers) {
-    push @itemtypes, $biblioiteminfos_of->{$biblioitemnumber}{itemtype};
+#priorityoptions building
+my @optionloop;
+for (my $i=1; $i<=$num; $i++){
+	my %option;
+	$option{num}=$i;
+	$option{selected}=($i==$num);
+	push(@optionloop, \%option);
 }
 
-my $itemtypeinfos_of = get_itemtypeinfos_of(@itemtypes);
-
-my $return_date_of = get_current_return_date_of(@itemnumbers);
+# todays date
+my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =localtime(time);
+$year=$year+1900;
+$mon++;
+my $date=format_date("$year-$mon-$mday");
 
 my @bibitemloop;
 
-foreach my $biblioitemnumber (@biblioitemnumbers) {
-    my $biblioitem = $biblioiteminfos_of->{$biblioitemnumber};
-
-    $biblioitem->{description} =
-        $itemtypeinfos_of->{ $biblioitem->{itemtype} }{description};
-
-    foreach my $itemnumber (@{$itemnumbers_of_biblioitem{$biblioitemnumber}}) {
-        my $item = $iteminfos_of->{$itemnumber};
-
-        $item->{homebranchname} =
-            $branchinfos_of->{ $item->{homebranch} }{branchname};
-
-        # if the holdingbranch is different than the homebranch, we show the
-        # holdingbranch of the document too
-        if ($item->{homebranch} ne $item->{holdingbranch}) {
-            $item->{holdingbranchname} =
-                $branchinfos_of->{ $item->{holdingbranch} }{branchname};
-        }
-
-        # if the item is currently on loan, we display its return date and
-        # change the background color
-        my $date_due;
-
-        if (defined $return_date_of->{$itemnumber}) {
-            $date_due = format_date($return_date_of->{$itemnumber});
-	    $item->{date_due} = $date_due;
-            $item->{backgroundcolor} = 'onloan';
-        }
-
-        # checking reserve
-        my $reservedate = GetFirstReserveDateFromItem($itemnumber);
-
-        if (defined $reservedate) {
-            $item->{backgroundcolor} = 'reserved';
-            $item->{reservedate} = format_date($reservedate);
-        }
-
-        # Management of the notforloan document
-        if ($item->{notforloan}) {
-            $item->{backgroundcolor} = 'other';
-            $item->{notforloanvalue} =
-                $notforloan_label_of->{ $item->{notforloan} };
-        }
-
-        # Management of lost or long overdue items
-        if ($item->{itemlost}) {
+	my %abibitem;
+	my @barcodeloop;
+    my @barcodes = barcodes($biblionumber);
+#warn @barcodes;
+    foreach my $num (@barcodes) {
+		my %barcode;
+		$barcode{'date_due'}=$num->{'date_due'} if $num->{'date_due'} gt "0000-00-00" ;
+		$barcode{'barcode'}=$num->{'barcode'};
+		$barcode{'itemnumber'}=$num->{'itemnumber'};
+		$barcode{'message'}=$num->{'itemlost'} == 1 ? "(lost)" :
+	  	$num->{'itemlost'} == 2 ? "(long overdue)" : "";
+		$barcode{'class'}=$num->{'itemcallnumber'};
+		$abibitem{'itemlost'}=(($num->{'notforloan'})|| ($num->{'itemlost'} == 1)) ;
+		$abibitem{'itemlost'}=($num->{'wthdrawn'}) ;
+		push(@barcodeloop, \%barcode);
+    }
+#	
+    	$abibitem{'class'}="$dat->{'classification'}$dat->{'dewey'}$dat->{'subclass'}";
+	$abibitem{'biblionumber'}=$dat->{'biblionumber'};
+	$abibitem{'description'}=$dat->{'itemtype'};
+	$abibitem{'volumeddesc'}=$dat->{'volumeddesc'};
+	$abibitem{'publicationyear'}=$dat->{'publicationyear'};
 
-            # FIXME localized strings should never be in Perl code
-            $item->{message} = $item->{itemlost} == 1
-                ? "(lost)"
-                : $item->{itemlost} == 2
-                    ? "(long overdue)"
-                    : "";
-            $item->{backgroundcolor} = 'other';
-        }
+	$abibitem{'barcodeloop'}=\@barcodeloop;
+	push(@bibitemloop,\%abibitem);
 
-        # Check of the transfered documents 
-        my ($transfertwhen,$transfertfrom,$transfertto) =
-            get_transfert_infos($itemnumber);
 
-        if ($transfertwhen ne '') {
-            $item->{transfertwhen} = format_date($transfertwhen);
-            $item->{transfertfrom} =
-                $branchinfos_of->{$transfertfrom}{branchname};
-            $item->{transfertto} =
-                $branchinfos_of->{$transfertto}{branchname};
-        }
 
-        # If there is no loan, return and transfer, we show a checkbox.
-        $item->{notforloan} = $item->{notforloan} || 0;
 
-        # An item is available only if:
-        if (not defined $reservedate      # not reserved yet
-            and $date_due eq ''           # not currently on loan
-            and not $item->{itemlost}     # not lost
-            and not $item->{notforloan}   # not forbidden to loan
-            and $transfertwhen eq ''      # not currently on transfert
-        ) {
-            $item->{available} = 1;
-        }
+#existingreserves building
+my @reserveloop;
+my $branches = GetBranches();
+
+foreach my $res (sort {$a->{'found'} cmp $b->{'found'}} @$reserves){
+	my %reserve;
+if ($res->{'priority'}>$totalcount){$totalcount=$res->{'priority'};}
+#    my $prioropt = priorityoptions($totalcount, $res->{'priority'});
+	my @optionloop;
+	for (my $i=1; $i<=$totalcount; $i++){
+		my %option;
+		$option{num}=$i;
+		$option{selected}=($i==$res->{'priority'});
+		push(@optionloop, \%option);
+	}
+	my @branchloop;
 
-        push @{$biblioitem->{itemloop}}, $item;
-    }
+	foreach my $br (keys %$branches) {
 
-    push @bibitemloop, $biblioitem;
-}
 
 
-# existingreserves building
-my @reserveloop;
-my $branches = GetBranches('RE');
-foreach my $res (sort {$a->{found} cmp $b->{found}} @$reserves){
-    my %reserve;
-    my @optionloop;
-    for (my $i=1; $i <= $totalcount; $i++) {
-        push(
-            @optionloop,
-            {
-                num => $i,
-                selected => ($i == $res->{priority}),
-            }
-        );
-    }
-    my @branchloop;
-    foreach my $br (keys %$branches) {
-        my %abranch;
-        $abranch{'selected'}=($br eq $res->{'branchcode'});
-        $abranch{'branch'}=$br;
-        $abranch{'branchname'}=$branches->{$br}->{'branchname'};
-        push(@branchloop,\%abranch);
-    }
+		(next) unless $branches->{$br}->{'IS'};
 
-    if (($res->{'found'} eq 'W') or ($res->{'priority'} eq '0')) {
-        my %env;
-        my $item = $res->{'itemnumber'};
-        $item = getiteminformation(\%env,$item);
-        $reserve{'holdingbranch'}=$item->{'holdingbranch'};
-        $reserve{'barcode'}=$item->{'barcode'};
-        $reserve{'biblionumber'}=$item->{'biblionumber'};
-        $reserve{'wbrcode'} = $res->{'branchcode'};
-        $reserve{'wbrname'} = $branches->{$res->{'branchcode'}}->{'branchname'};
-        if($reserve{'holdingbranch'} eq $reserve{'wbrcode'}){
-            $reserve{'atdestination'} = 1;
-        }
+				# Only branches with the 'IS' branchrelation
+				# can issue books
+		my %abranch;
+		$abranch{'selected'}=($br eq $res->{'branchcode'});
+		$abranch{'branch'}=$br;
+		$abranch{'branchname'}=$branches->{$br}->{'branchname'};
+		push(@branchloop,\%abranch);
+	}
+my %env;
+#		my $item = $res->{'itemnumber'};
+#		$item = getiteminformation(\%env,$item);
+
+    if ($res->{'found'} eq 'W') {
+		
+		$reserve{'holdingbranch'}=$res->{'holdingbranch'};
+		$reserve{'barcode'}=$res->{'barcode'};
+		$reserve{'biblionumber'}=$res->{'biblionumber'};
+		$reserve{'wbrcode'} = $res->{'branchcode'};
+		$reserve{'wbrname'} = $branches->{$res->{'branchcode'}}->{'branchname'};
+		if($reserve{'holdingbranch'} eq $reserve{'wbrcode'}){
+			$reserve{'atdestination'} = 1;
+		}
     }
-
-    $reserve{'date'} = format_date($res->{'reservedate'});
-    $reserve{'borrowernumber'}=$res->{'borrowernumber'};
-    $reserve{'biblionumber'}=$res->{'biblionumber'};
-    $reserve{'bornum'}=$res->{'borrowernumber'};
-    $reserve{'firstname'}=$res->{'firstname'};
-    $reserve{'surname'}=$res->{'surname'};
-    $reserve{'bornum'}=$res->{'borrowernumber'};
-    $reserve{'notes'}=$res->{'reservenotes'};
-    $reserve{'wait'}=(($res->{'found'} eq 'W') or ($res->{'priority'} eq '0'));
-    $reserve{'constrainttypea'}=($res->{'constrainttype'} eq 'a');
-    $reserve{'constrainttypeo'}=($res->{'constrainttype'} eq 'o');
-    $reserve{'voldesc'}=$res->{'volumeddesc'};
-    $reserve{'itemtype'}=$res->{'itemtype'};
-    $reserve{'branchloop'}=\@branchloop;
-    $reserve{'optionloop'}=\@optionloop;
-
-    push(@reserveloop,\%reserve);
+	$reserve{'barcode'}=$res->{'barcode'};
+  	$reserve{'date'} = format_date($res->{'reservedate'});
+	$reserve{'borrowernumber'}=$res->{'borrowernumber'};
+	$reserve{'biblionumber'}=$res->{'biblionumber'};
+	$reserve{'bornum'}=$res->{'borrowernumber'};
+	$reserve{'firstname'}=$res->{'firstname'};
+	$reserve{'surname'}=$res->{'surname'};
+	$reserve{'bornum'}=$res->{'borrowernumber'};
+	$reserve{'notes'}=$res->{'reservenotes'};
+	$reserve{'wait'}=($res->{'found'} eq 'W');
+	$reserve{'constrainttypea'}=($res->{'constrainttype'} eq 'a');
+	$reserve{'constrainttypeo'}=($res->{'constrainttype'} eq 'o');
+	$reserve{'voldesc'}=$res->{'volumeddesc'};
+	$reserve{'itemtype'}=$res->{'itemtype'};
+	$reserve{'branchloop'}=\@branchloop;
+	$reserve{'optionloop'}=\@optionloop;
+	push(@reserveloop,\%reserve);
 }
 
-my $default = C4::Context->userenv->{branch};
-my @values;
-my %label_of;
+my @branches;
+my @select_branch;
+my %select_branches;
+my $branches=GetBranches;
+#my $count2=scalar(@branches);
+foreach my $br (keys %$branches) {
 
-foreach my $branchcode (keys %{$branches}) {
-    push @values, $branchcode;
-    $label_of{$branchcode} = $branches->{$branchcode}->{branchname};
+	push @select_branch, $br;
+	$select_branches{$br}= $branches->{$br}->{'branchname'};
 }
-my $CGIbranch = CGI::scrolling_list(
-    -name     => 'pickup',
-    -values   => \@values,
-    -default  => $default,
-    -labels   => \%label_of,
-    -size     => 1,
-    -multiple => 0,
-);
+my $CGIbranch=CGI::scrolling_list( -name     => 'pickup',
+			-values   => \@select_branch,
+			-labels   => \%select_branches,
+			-size     => 1,
+			-multiple => 0 );
 
-# get the time for the form name...
+#get the time for the form name...
 my $time = time();
 
-$template->param(
-    CGIbranch => $CGIbranch,
-    reserveloop => \@reserveloop,
-    time => $time,
-);
-
-# setup colors
-$template->param(
-    optionloop =>\@optionloop,
-    bibitemloop => \@bibitemloop,
-    date => $date,
-    bib => $bib,
-    findborrower => $findborrower,
-    cardnumber => $cardnumber,
-    CGIselectborrower => $CGIselectborrower,
-    title =>$dat->{title},
-);
-
+#setup colours
+my ($template, $borrowernumber, $cookie)
+    = get_template_and_user({template_name => "reserve/request.tmpl",
+							query => $input,
+                            type => "intranet",
+                            authnotrequired => 0,
+                            flagsrequired => {borrowers => 1},
+                         });
+$template->param(	optionloop =>\@optionloop,
+								CGIbranch => $CGIbranch,
+								reserveloop => \@reserveloop,
+								'time' => $time,
+								bibitemloop => \@bibitemloop,
+								date => $date,
+								biblionumber => $biblionumber,
+								title =>$dat->{title});
 # printout the page
-print $input->header(
-	-type => C4::Interface::CGI::Output::guesstype($template->output),
-	-expires=>'now'
-), $template->output;
+output_html_with_http_headers $input, $cookie, $template->output;
\ No newline at end of file
diff --git a/serials/serials-receive.pl b/serials/serials-receive.pl
index 8c43faddc0..8a1c1b11b3 100755
--- a/serials/serials-receive.pl
+++ b/serials/serials-receive.pl
@@ -99,7 +99,6 @@ my $abouttoexpire = abouttoexpire($subscriptionid);
 my @itemnumbers=$query->param('itemnumber');
 my $subscription=GetSubscription($subscriptionid);
 
- $hassubscriptionexpired=1 ;
 my $auser = $subscription->{'librarian'}; # bob
 my $routing = check_routing($subscriptionid); # to see if routing list exists
 my $manualdate ='';
diff --git a/tools/export.pl b/tools/export.pl
index e4cf7cd1b7..0abad2fb50 100755
--- a/tools/export.pl
+++ b/tools/export.pl
@@ -1,109 +1,46 @@
 #!/usr/bin/perl
-use HTML::Template;
 use strict;
-require Exporter;
-use C4::Database;
+
 use C4::Auth;
 use C4::Interface::CGI::Output;
-use C4::Output;  # contains gettemplate
 use C4::Biblio;
 use CGI;
-use C4::Koha;
-
+use C4::Auth;
+use MARC::Record;
+use MARC::File::XML;
 my $query = new CGI;
 my $op=$query->param("op");
-my $dbh=C4::Context->dbh;
-
 if ($op eq "export") {
 	print $query->header('Content-Type: text/marc');
 	my $start_bib = $query->param("start_bib");
 	my $end_bib = $query->param("end_bib");
-	my $format = $query->param("format");
-	my $branch = $query->param("branch");
-	my $start_callnumber = $query->param("start_callnumber");
-	my $end_callnumber = $query->param("end_callnumber");
-	my $limit = $query->param("limit");
-	my $strsth;
-	$strsth="select bibid from marc_biblio ";
+	my $dbh=C4::Context->dbh;
+	my $sth;
 	if ($start_bib && $end_bib) {
-		$strsth.=" where biblionumber>=$start_bib and biblionumber<=$end_bib ";
-	}elsif ($format) {
-		if ($strsth=~/ where/){
-			$strsth=~s/ where (.*)/,biblioitems where biblioitems.biblionumber=marc_biblio.biblionumber and biblioitems.itemtype=\'$format\' and $1/;
-		}else {
-			$strsth.=",biblioitems where biblioitems.biblionumber=marc_biblio.biblionumber and biblioitems.itemtype=\'$format\'";
-		}
-	} elsif ($branch) {
-		if ($strsth=~/ where/){
-			$strsth=~s/ where (.*)/,items where items.biblionumber=marc_biblio.biblionumber and items.homebranch=\'$branch\' and $1/;
-		}else {
-			$strsth.=",items where items.biblionumber=marc_biblio.biblionumber and items.homebranch=\'$branch\'";
-		}
-	} elsif ($start_callnumber && $end_callnumber) {
-		$start_callnumber=~s/\*/\%/g;
-		$start_callnumber=~s/\?/\_/g;
-		$end_callnumber=~s/\*/\%/g;
-		$end_callnumber=~s/\?/\_/g;
-		if ($strsth=~/,items/){
-			$strsth.=" and items.itemcallnumber between \'$start_callnumber\' and \'$end_callnumber\'";
-		} else {
-			if ($strsth=~/ where/){
-				$strsth=~s/ where (.*)/,items where items.biblionumber=marc_biblio.biblionumber and items.itemcallnumber between \'$start_callnumber\' and \'$end_callnumber\' and $1/;
-			}else {
-				$strsth=~",items where items.biblionumber=marc_biblio.biblionumber and items.itemcallnumber between \'$start_callnumber\' and \'$end_callnumber\' ";
-			}
-		}
-	}
-	$strsth.=" order by marc_biblio.biblionumber ";
-	$strsth.= "LIMIT 0,$limit " if ($limit);
-	warn "requête marc.pl : ".$strsth;
-	my $req=$dbh->prepare($strsth);
-	$req->execute;
-	while (my ($bibid) = $req->fetchrow) {
-		my $record = MARCgetbiblio($dbh,$bibid);
-
-		print $record->as_usmarc();
-	}
-} else {
-	my $sth=$dbh->prepare("Select itemtype,description from itemtypes order by description");
-	$sth->execute;
-	my  @itemtype;
-	my %itemtypes;
-	push @itemtype, "";
-	$itemtypes{''} = "";
-	while (my ($value,$lib) = $sth->fetchrow_array) {
-			push @itemtype, $value;
-			$itemtypes{$value}=$lib;
+		$sth=$dbh->prepare("select marcxml from biblio where biblionumber >=? and biblionumber <=? order by biblionumber");
+		$sth->execute($start_bib,$end_bib);
+	} elsif ($start_bib ) {
+		$sth=$dbh->prepare("select marcxml from biblio where biblionumber >=?  order by biblionumber");
+		$sth->execute($start_bib);
+	}else {
+		$sth=$dbh->prepare("select marcxml from biblio order by biblionumber");
+		$sth->execute();
 	}
+	while (my ($marc) = $sth->fetchrow) {
+my $record=MARC::Record->new_from_xml($marc,"UTF-8");
 	
-	my $CGIitemtype=CGI::scrolling_list( -name     => 'format',
-							-values   => \@itemtype,
-							-default  => '',
-							-labels   => \%itemtypes,
-							-size     => 1,
-							-multiple => 0 );
-	$sth->finish;
+		print $record->as_usmarc;;
 	
-	my $branches = getallbranches;
-	my @branchloop;
-	foreach my $thisbranch (keys %$branches) {
-# 			my $selected = 1 if $thisbranch eq $branch;
-			my %row =(value => $thisbranch,
-# 									selected => $selected,
-									branchname => $branches->{$thisbranch}->{'branchname'},
-							);
-			push @branchloop, \%row;
 	}
-	
+} else {
 	my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "tools/export.tmpl",
+	= get_template_and_user({template_name => "tools/marc.tmpl",
 					query => $query,
 					type => "intranet",
 					authnotrequired => 0,
 					flagsrequired => {parameters => 1, management => 1, tools => 1},
 					debug => 1,
 					});
-	$template->param(branchloop=>\@branchloop,CGIitemtype=>$CGIitemtype);
 	output_html_with_http_headers $query, $cookie, $template->output;
 }
 
diff --git a/tools/holidays.pl b/tools/holidays.pl
index f4b5c7909a..e8561d8b13 100755
--- a/tools/holidays.pl
+++ b/tools/holidays.pl
@@ -1,28 +1,18 @@
 #!/usr/bin/perl
-#####Sets holiday periods for each branch. Datedues will be extended if branch is closed -TG
+
 use strict;
 use CGI;
 
 use C4::Auth;
-use C4::Output;
+
 use C4::Interface::CGI::Output;
-use C4::Database;
-use HTML::Template;
-use C4::Calendar;
+
+use C4::Calendar::Calendar;
 
 my $input = new CGI;
-#my $branch = $input->param('branch');
-my $branch=C4::Context->preference('defaultbranch') || $input->param('branch');
+my $branch = $input->param('branch');
+my $branch=C4::Context->preference('defaultbranch') unless $branch;
 my $dbh = C4::Context->dbh();
-# Get the template to use
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "tools/holidays.tmpl",
-			                 type => "intranet",
-			                 query => $input,
-			                 authnotrequired => 0,
-			                 flagsrequired => {parameters => 1},
-					         debug => 1,
-			               });
 
 # Set all the branches.
 my $branches = $dbh->prepare("select branchcode, branchname from branches");
@@ -48,12 +38,10 @@ my $branchesList = CGI::scrolling_list(-name => 'branch',
 $branches->finish;
 
 # Get all the holidays
-warn "BRANCH : $branch";
-my $calendar = C4::Calendar->new(branchcode => $branch);
+my $calendar = C4::Calendar::Calendar->new(branchcode => $branch);
 my $week_days_holidays = $calendar->get_week_days_holidays();
 my @week_days;
 foreach my $weekday (keys %$week_days_holidays) {
-warn "WEEK DAY : $weekday";
 	my %week_day;
 	%week_day = (KEY => $weekday,
 		         TITLE => $week_days_holidays->{$weekday}{title},
@@ -91,6 +79,16 @@ foreach my $yearMonthDay (keys %$single_holidays) {
 	push @holidays, \%holiday;
 }
 
+# Get the template to use
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "tools/holidays.tmpl",
+			                 type => "intranet",
+			                 query => $input,
+			                 authnotrequired => 0,
+			                 flagsrequired => {parameters => 1},
+					         debug => 1,
+			               });
+
 # Replace the template values with the real ones
 $template->param(BRANCHES => $branchesList);
 $template->param(WEEK_DAYS_LOOP => \@week_days);
@@ -100,4 +98,4 @@ $template->param(DAY_MONTH_HOLIDAYS_LOOP => \@day_month_holidays);
 $template->param(branch => $branch);
 
 # Shows the template with the real values replaced
-output_html_with_http_headers $input, $cookie, $template->output;
+output_html_with_http_headers $input, $cookie, $template->output;
\ No newline at end of file
diff --git a/tools/import.pl b/tools/import.pl
index 2a19412af2..1f4f66d166 100755
--- a/tools/import.pl
+++ b/tools/import.pl
@@ -31,240 +31,17 @@ use strict;
 
 # standard or CPAN modules used
 use CGI;
-use DBI;
 
 # Koha modules used
 use C4::Context;
-use C4::Output;
 use C4::Interface::CGI::Output;
-use C4::Input;
-use C4::Biblio;
-use MARC::File::USMARC;
-use HTML::Template;
-use C4::Output;
 use C4::Auth;
 use C4::Breeding;
 
 #------------------
 # Constants
 
-my $includes = C4::Context->config('includes') ||
-	"/usr/local/www/hdl/htdocs/includes";
 
-# HTML colors for alternating lines
-my $lc1='#dddddd';
-my $lc2='#ddaaaa';
-
-#-------------
-#-------------
-# Initialize
-
-my $userid=$ENV{'REMOTE_USER'};
-
-my $input = new CGI;
-my $dbh = C4::Context->dbh;
-
-my $uploadmarc=$input->param('uploadmarc');
-my $overwrite_biblio = $input->param('overwrite_biblio');
-my $filename = $input->param('filename');
-my $syntax = $input->param('syntax');
-my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "tools/import.tmpl",
-					query => $input,
-					type => "intranet",
-					authnotrequired => 0,
-					flagsrequired => {parameters => 1, management => 1, tools => 1},
-					debug => 1,
-					});
-
-$template->param(SCRIPT_NAME => $ENV{'SCRIPT_NAME'},
-						uploadmarc => $uploadmarc);
-if ($uploadmarc && length($uploadmarc)>0) {
-	my $marcrecord='';
-	while (<$uploadmarc>) {
-		$marcrecord.=$_;
-	}
-	my ($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported) = ImportBreeding($marcrecord,$overwrite_biblio,$filename,$syntax,int(rand(99999)));
-
-	$template->param(imported => $imported,
-							alreadyindb => $alreadyindb,
-							alreadyinfarm => $alreadyinfarm,
-							notmarcrecord => $notmarcrecord,
-							total => $imported+$alreadyindb+$alreadyinfarm+$notmarcrecord,
-							);
-
-}
-
-output_html_with_http_headers $input, $cookie, $template->output;
-my $menu;
-my $file;
-
-
-#---------------
-# log cleared, as marcimport is (almost) rewritten from scratch.
-# $Log$
-# Revision 1.1  2006/02/24 11:52:38  hdl
-# Adding tools directory template and scripts
-# Changing barcodes, export and import and letters directory.
-# Changing export script name (marc.pl) to export.pl
-# Changing import script name (breeding.pl) to import.pl
-#
-# Revision 1.4  2005/05/04 08:52:13  tipaul
-# synch'ing 2.2 and head
-#
-# Revision 1.3  2005/03/23 09:57:47  doxulting
-# Adding a parameter to allow acces to people with management/tools flags
-#
-# Revision 1.2  2003/10/06 09:10:38  slef
-# Removing config info from z3950*sh and using C4::Context in processz3950queue (Fixed bug 39)
-#
-# Revision 1.1  2003/06/04 13:46:25  tipaul
-# moving breeding farm import to parameters page (GUI) and to new import/ directory (code structure)
-#
-# Revision 1.33  2003/04/29 16:48:36  tipaul
-# really proud of this commit :-)
-# z3950 search and import seems to works fine.
-# Let me explain how :
-# * a "search z3950" button is added in the addbiblio template.
-# * when clicked, a popup appears and z3950/search.pl is called
-# * z3950/search.pl calls addz3950search in the DB
-# * the z3950 daemon retrieve the records and stores them in z3950results AND in marc_breeding table.
-# * as long as there as searches pending, the popup auto refresh every 2 seconds, and says how many searches are pending.
-# * when the user clicks on a z3950 result => the parent popup is called with the requested biblio, and auto-filled
-#
-# Note :
-# * character encoding support : (It's a nightmare...) In the z3950servers table, a "encoding" column has been added. You can put "UNIMARC" or "USMARC" in this column. Depending on this, the char_decode in C4::Biblio.pm replaces marc-char-encode by an iso 8859-1 encoding. Note that in the breeding import this value has been added too, for a better support.
-# * the marc_breeding and z3950* tables have been modified : they have an encoding column and the random z3950 number is stored too for convenience => it's the key I use to list only requested biblios in the popup.
-#
-# Revision 1.32  2003/04/22 12:22:54  tipaul
-# 1st draft for z3950 client import.
-# moving Breeding farm script to a perl package C4/Breeding.pm
-#
-# Revision 1.31  2003/02/19 01:01:07  wolfpac444
-# Removed the unecessary $dbh argument from being passed.
-# Resolved a few minor FIXMEs.
-#
-# Revision 1.30  2003/02/02 07:18:38  acli
-# Moved C4/Charset.pm to C4/Interface/CGI/Output.pm
-#
-# Create output_html_with_http_headers function to contain the "print $query
-# ->header(-type => guesstype...),..." call. This is in preparation for
-# non-HTML output (e.g., text/xml) and charset conversion before output in
-# the future.
-#
-# Created C4/Interface/CGI/Template.pm to hold convenience functions specific
-# to the CGI interface using HTML::Template
-#
-# Modified moremembers.pl to make the "sex" field localizable for languages
-# where M and F doesn't make sense
-#
-# Revision 1.29  2003/01/28 15:28:31  tipaul
-# removing use MARC::Charset
-# Was a buggy test
-#
-# Revision 1.28  2003/01/28 15:00:31  tipaul
-# user can now search in breeding farm with isbn/issn or title. Title/name are stored in breeding farm and showed when a search is done
-#
-# Revision 1.27  2003/01/26 23:21:49  acli
-# Handle non-latin1 charsets
-#
-# Revision 1.26  2003/01/23 12:26:41  tipaul
-# upgrading import in breeding farm (you can now search on ISBN or on title) AND character encoding.
-#
-# Revision 1.25  2003/01/21 08:13:50  tipaul
-# character encoding ISO646 => 8859-1, first draft
-#
-# Revision 1.24  2003/01/14 16:41:17  tipaul
-# bugfix : use gettemplate_and_user instead of gettemplate.
-# fix a blank screen in 1.3.3 in "import in breeding farm"
-#
-# Revision 1.23  2003/01/06 13:06:28  tipaul
-# removing trailing #
-#
-# Revision 1.22  2002/11/12 15:58:43  tipaul
-# road to 1.3.2 :
-# * many bugfixes
-# * adding value_builder : you can map a subfield in the marc_subfield_structure to a sub stored in "value_builder" directory. In this directory you can create screen used to build values with any method. In this commit is a 1st draft of the builder for 100$a unimarc french subfield, which is composed of 35 digits, with 12 differents values (only the 4th first are provided for instance)
-#
-# Revision 1.21  2002/10/22 15:50:23  tipaul
-# road to 1.3.2 : adding a biblio in MARC format.
-# seems to work a few.
-# still to do :
-# * manage html checks (mandatory subfields...)
-# * add list of acceptable values (authorities)
-# * manage ## in MARC format
-# * manage correctly repeatable fields
-# and probably a LOT of bugfixes
-#
-# Revision 1.20  2002/10/16 12:46:19  arensb
-# Added a FIXME comment.
-#
-# Revision 1.19  2002/10/15 10:14:44  tipaul
-# road to 1.3.2. Full rewrite of marcimport.pl.
-# The acquisition system in MARC version will work like this :
-# * marcimport will put marc records into a "breeding farm" table.
-# * when the user want to add a biblio, he enters first the ISBN/ISSN of the biblio. koha searches into breeding farm and if the record exists, it is shown to the user to help him adding the biblio. When the biblio is added, it's deleted from the breeding farm.
-#
-# This commit :
-# * modify acqui.simple home page  (addbooks.pl)
-# * adds import into breeding farm
-#
-# Please note that :
-# * z3950 functionnality is dropped from "marcimport" will be added somewhere else.
-# * templates are in a new acqui.simple sub directory, and the marcimport template directory will become obsolete soon.I think this is more logic
-#
-#!/usr/bin/perl
-
-# $Id$
-
-# Script for handling import of MARC data into Koha db
-#   and Z39.50 lookups
-
-# Koha library project  www.koha.org
-
-# Licensed under the GPL
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# 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
-
-use strict;
-
-# standard or CPAN modules used
-use CGI;
-use DBI;
-
-# Koha modules used
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Input;
-use C4::Biblio;
-use MARC::File::USMARC;
-use HTML::Template;
-use C4::Output;
-use C4::Auth;
-use C4::Breeding;
-
-#------------------
-# Constants
-
-my $includes = C4::Context->config('includes') ||
-	"/usr/local/www/hdl/htdocs/includes";
 
 # HTML colors for alternating lines
 my $lc1='#dddddd';
@@ -284,7 +61,7 @@ my $overwrite_biblio = $input->param('overwrite_biblio');
 my $filename = $input->param('filename');
 my $syntax = $input->param('syntax');
 my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "import/breeding.tmpl",
+	= get_template_and_user({template_name => "tools/breeding.tmpl",
 					query => $input,
 					type => "intranet",
 					authnotrequired => 0,
@@ -299,7 +76,7 @@ if ($uploadmarc && length($uploadmarc)>0) {
 	while (<$uploadmarc>) {
 		$marcrecord.=$_;
 	}
-	my ($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported) = ImportBreeding($marcrecord,$overwrite_biblio,$filename,$syntax,int(rand(99999)));
+	my ($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported) = ImportBreeding($marcrecord,$overwrite_biblio,$filename,$syntax,"");
 
 	$template->param(imported => $imported,
 							alreadyindb => $alreadyindb,
@@ -318,113 +95,9 @@ my $file;
 #---------------
 # log cleared, as marcimport is (almost) rewritten from scratch.
 # $Log$
-# Revision 1.1  2006/02/24 11:52:38  hdl
-# Adding tools directory template and scripts
-# Changing barcodes, export and import and letters directory.
-# Changing export script name (marc.pl) to export.pl
-# Changing import script name (breeding.pl) to import.pl
-#
-# Revision 1.4  2005/05/04 08:52:13  tipaul
-# synch'ing 2.2 and head
+# Revision 1.2  2006/09/11 17:41:56  tgarip1957
+# New XML API
 #
 # Revision 1.2.4.1  2005/04/07 10:10:52  tipaul
 # copying processz3950queue from 2.0 branch. The 2.2 version misses an important fix
 #
-# Revision 1.2  2003/10/06 09:10:38  slef
-# Removing config info from z3950*sh and using C4::Context in processz3950queue (Fixed bug 39)
-#
-# Revision 1.1  2003/06/04 13:46:25  tipaul
-# moving breeding farm import to parameters page (GUI) and to new import/ directory (code structure)
-#
-# Revision 1.33  2003/04/29 16:48:36  tipaul
-# really proud of this commit :-)
-# z3950 search and import seems to works fine.
-# Let me explain how :
-# * a "search z3950" button is added in the addbiblio template.
-# * when clicked, a popup appears and z3950/search.pl is called
-# * z3950/search.pl calls addz3950search in the DB
-# * the z3950 daemon retrieve the records and stores them in z3950results AND in marc_breeding table.
-# * as long as there as searches pending, the popup auto refresh every 2 seconds, and says how many searches are pending.
-# * when the user clicks on a z3950 result => the parent popup is called with the requested biblio, and auto-filled
-#
-# Note :
-# * character encoding support : (It's a nightmare...) In the z3950servers table, a "encoding" column has been added. You can put "UNIMARC" or "USMARC" in this column. Depending on this, the char_decode in C4::Biblio.pm replaces marc-char-encode by an iso 8859-1 encoding. Note that in the breeding import this value has been added too, for a better support.
-# * the marc_breeding and z3950* tables have been modified : they have an encoding column and the random z3950 number is stored too for convenience => it's the key I use to list only requested biblios in the popup.
-#
-# Revision 1.32  2003/04/22 12:22:54  tipaul
-# 1st draft for z3950 client import.
-# moving Breeding farm script to a perl package C4/Breeding.pm
-#
-# Revision 1.31  2003/02/19 01:01:07  wolfpac444
-# Removed the unecessary $dbh argument from being passed.
-# Resolved a few minor FIXMEs.
-#
-# Revision 1.30  2003/02/02 07:18:38  acli
-# Moved C4/Charset.pm to C4/Interface/CGI/Output.pm
-#
-# Create output_html_with_http_headers function to contain the "print $query
-# ->header(-type => guesstype...),..." call. This is in preparation for
-# non-HTML output (e.g., text/xml) and charset conversion before output in
-# the future.
-#
-# Created C4/Interface/CGI/Template.pm to hold convenience functions specific
-# to the CGI interface using HTML::Template
-#
-# Modified moremembers.pl to make the "sex" field localizable for languages
-# where M and F doesn't make sense
-#
-# Revision 1.29  2003/01/28 15:28:31  tipaul
-# removing use MARC::Charset
-# Was a buggy test
-#
-# Revision 1.28  2003/01/28 15:00:31  tipaul
-# user can now search in breeding farm with isbn/issn or title. Title/name are stored in breeding farm and showed when a search is done
-#
-# Revision 1.27  2003/01/26 23:21:49  acli
-# Handle non-latin1 charsets
-#
-# Revision 1.26  2003/01/23 12:26:41  tipaul
-# upgrading import in breeding farm (you can now search on ISBN or on title) AND character encoding.
-#
-# Revision 1.25  2003/01/21 08:13:50  tipaul
-# character encoding ISO646 => 8859-1, first draft
-#
-# Revision 1.24  2003/01/14 16:41:17  tipaul
-# bugfix : use gettemplate_and_user instead of gettemplate.
-# fix a blank screen in 1.3.3 in "import in breeding farm"
-#
-# Revision 1.23  2003/01/06 13:06:28  tipaul
-# removing trailing #
-#
-# Revision 1.22  2002/11/12 15:58:43  tipaul
-# road to 1.3.2 :
-# * many bugfixes
-# * adding value_builder : you can map a subfield in the marc_subfield_structure to a sub stored in "value_builder" directory. In this directory you can create screen used to build values with any method. In this commit is a 1st draft of the builder for 100$a unimarc french subfield, which is composed of 35 digits, with 12 differents values (only the 4th first are provided for instance)
-#
-# Revision 1.21  2002/10/22 15:50:23  tipaul
-# road to 1.3.2 : adding a biblio in MARC format.
-# seems to work a few.
-# still to do :
-# * manage html checks (mandatory subfields...)
-# * add list of acceptable values (authorities)
-# * manage ## in MARC format
-# * manage correctly repeatable fields
-# and probably a LOT of bugfixes
-#
-# Revision 1.20  2002/10/16 12:46:19  arensb
-# Added a FIXME comment.
-#
-# Revision 1.19  2002/10/15 10:14:44  tipaul
-# road to 1.3.2. Full rewrite of marcimport.pl.
-# The acquisition system in MARC version will work like this :
-# * marcimport will put marc records into a "breeding farm" table.
-# * when the user want to add a biblio, he enters first the ISBN/ISSN of the biblio. koha searches into breeding farm and if the record exists, it is shown to the user to help him adding the biblio. When the biblio is added, it's deleted from the breeding farm.
-#
-# This commit :
-# * modify acqui.simple home page  (addbooks.pl)
-# * adds import into breeding farm
-#
-# Please note that :
-# * z3950 functionnality is dropped from "marcimport" will be added somewhere else.
-# * templates are in a new acqui.simple sub directory, and the marcimport template directory will become obsolete soon.I think this is more logic
-#
diff --git a/tools/koha-news.pl b/tools/koha-news.pl
index ccf455d26b..605a86bca6 100755
--- a/tools/koha-news.pl
+++ b/tools/koha-news.pl
@@ -30,7 +30,7 @@ use C4::Context;
 use C4::Output;
 use C4::Interface::CGI::Output;
 use C4::NewsChannels;
-use HTML::Template;
+
 
 my $cgi = new CGI;
 
diff --git a/tools/newHolidays.pl b/tools/newHolidays.pl
index 9a8345c985..e8fefe43b2 100755
--- a/tools/newHolidays.pl
+++ b/tools/newHolidays.pl
@@ -6,9 +6,7 @@ use CGI;
 use C4::Auth;
 use C4::Output;
 use C4::Interface::CGI::Output;
-use C4::Database;
-use HTML::Template;
-use C4::Calendar;
+use C4::Calendar::Calendar;
 
 my $input = new CGI;
 my $dbh = C4::Context->dbh();
@@ -21,7 +19,7 @@ my $year = $input->param('newYear');
 my $title = $input->param('newTitle');
 my $description = $input->param('newDescription');
 
-my $calendar = C4::Calendar->new(branchcode => $branchcode);
+my $calendar = C4::Calendar::Calendar->new(branchcode => $branchcode);
 
 if ($input->param('newOperation') eq 'weekday') {
 	$calendar->insert_week_day_holiday(weekday => $weekday,
@@ -40,4 +38,4 @@ if ($input->param('newOperation') eq 'weekday') {
 						             description => $description);
 
 }
-print $input->redirect("/cgi-bin/koha/tools/holidays.pl?branch=$branchcode");
+print $input->redirect("/cgi-bin/koha/tools/holidays.pl?branch=$branchcode");
\ No newline at end of file
diff --git a/tools/overduerules.pl b/tools/overduerules.pl
index c863775cce..c12b9f0ce4 100755
--- a/tools/overduerules.pl
+++ b/tools/overduerules.pl
@@ -20,13 +20,10 @@
 use strict;
 use CGI;
 use C4::Context;
-use C4::Output;
-use C4::Database;
 use C4::Auth;
-use C4::Output;
 use C4::Koha;
 use C4::Interface::CGI::Output;
-use HTML::Template;
+
 
 my $input = new CGI;
 my $dbh = C4::Context->dbh;
@@ -121,7 +118,7 @@ if ($op eq 'save') {
 	}
 	unless ($err) {$template->param(datasaved=>1);}
 }
-my $branches = GetBranches;
+my $branches = getbranches;
 my @branchloop;
 foreach my $thisbranch (keys %$branches) {
 	my $selected = 1 if $thisbranch eq $branch;
-- 
2.39.2