From 56244e6efdd4d4749761b3645b6ca2576ade3305 Mon Sep 17 00:00:00 2001
From: kados <kados>
Date: Fri, 16 Mar 2007 01:25:08 +0000
Subject: [PATCH] Using my precrash CVS copy I did the following:

cvs -z3 -d:ext:kados@cvs.savannah.nongnu.org:/sources/koha co -P koha
find koha.precrash -type d -name "CVS" -exec rm -v {} \;
cp -r koha.precrash/* koha/
cd koha/
cvs commit

This should in theory put us right back where we were before the crash
---
 C4/AuthoritiesMarc.pm                         |   16 +-
 C4/Context.pm                                 |   16 +-
 catalogue/search.pl                           |    2 +
 installer/kohastructure.sql                   | 1341 ++++++-----------
 .../prog/en/admin/authtypes.tmpl              |    9 -
 .../blinddetail-biblio-search.tmpl            |   15 +-
 .../prog/en/includes/calendar.inc             |    4 +
 .../prog/en/includes/doc-head-close.inc       |    2 -
 .../intranet-tmpl/prog/en/includes/members.js |  180 +++
 .../prog/en/includes/menu-circ.inc            |   14 +-
 .../prog/en/includes/menu-members.inc         |   11 +-
 .../intranet-tmpl/prog/en/includes/menus.inc  |    3 +-
 .../intranet-tmpl/prog/en/members/member.tmpl |  157 +-
 .../prog/en/members/memberentryA.tmpl         |    8 +-
 .../prog/en/members/memberentryC.tmpl         |    8 +-
 .../prog/en/members/memberentryI.tmpl         |    8 +-
 .../prog/en/members/memberentryP.tmpl         | 1254 ++++++++-------
 .../prog/en/members/moremember.tmpl           |   44 +-
 members/member.pl                             |   95 +-
 misc/sql-datas/en/mandatory/05_sysprefs.sql   |  198 +--
 opac/opac-search.pl                           |    2 +
 updater/updatedatabase                        |   20 +
 22 files changed, 1576 insertions(+), 1831 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/members.js

diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm
index 1458ad48ec..283e8268ba 100644
--- a/C4/AuthoritiesMarc.pm
+++ b/C4/AuthoritiesMarc.pm
@@ -637,7 +637,7 @@ sub FindDuplicate {
 #     warn "record :".$record->as_formatted." authtattoreport :$auth_tag_to_report";
     # build a request for authoritysearch
     my $query='at='.$authtypecode.' ';
-    map {$query.= " and he=\"".$_->[1]."\"" if ($_->[0]=~/[A-z]/)}  $record->field($auth_tag_to_report)->subfields();
+    map {$query.= " and he=\"".$_->[1]."\"" if ($_->[0]=~/[A-z]/)}  $record->field($auth_tag_to_report)->subfields() if $record->field($auth_tag_to_report);
     my ($error,$results)=SimpleSearch($query,"authorityserver");
     # there is at least 1 result => return the 1st one
     if (@$results>0) {
@@ -950,6 +950,20 @@ Paul POULAIN paul.poulain@free.fr
 
 # $Id$
 # $Log$
+# Revision 1.39  2007/03/16 01:25:08  kados
+# Using my precrash CVS copy I did the following:
+#
+# cvs -z3 -d:ext:kados@cvs.savannah.nongnu.org:/sources/koha co -P koha
+# find koha.precrash -type d -name "CVS" -exec rm -v {} \;
+# cp -r koha.precrash/* koha/
+# cd koha/
+# cvs commit
+#
+# This should in theory put us right back where we were before the crash
+#
+# Revision 1.39  2007/03/12 22:16:31  kados
+# chcking for field before calling subfields
+#
 # Revision 1.38  2007/03/09 14:31:47  tipaul
 # rel_3_0 moved to HEAD
 #
diff --git a/C4/Context.pm b/C4/Context.pm
index b76b7ac6f2..303c689ae0 100644
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -138,7 +138,7 @@ Returns undef in case of error.
 sub read_config_file {
     my $fname = shift;    # Config file to read
     my $retval = {};    # Return value: ref-to-hash holding the configuration
-    my $koha = XMLin($fname, keyattr => ['id'],forcearray => ['listen']);
+    my $koha = XMLin($fname, keyattr => ['id'],forcearray => ['listen', 'server', 'serverinfo']);
     return $koha;
 }
 
@@ -874,6 +874,20 @@ Joshua Ferraro <jmf at liblime dot com>
 =cut
 
 # $Log$
+# Revision 1.52  2007/03/16 01:25:08  kados
+# Using my precrash CVS copy I did the following:
+#
+# cvs -z3 -d:ext:kados@cvs.savannah.nongnu.org:/sources/koha co -P koha
+# find koha.precrash -type d -name "CVS" -exec rm -v {} \;
+# cp -r koha.precrash/* koha/
+# cd koha/
+# cvs commit
+#
+# This should in theory put us right back where we were before the crash
+#
+# Revision 1.52  2007/03/12 21:17:05  rych
+# add server, serverinfo as arrays from config
+#
 # Revision 1.51  2007/03/09 14:31:47  tipaul
 # rel_3_0 moved to HEAD
 #
diff --git a/catalogue/search.pl b/catalogue/search.pl
index ead0c81006..dc4b28470b 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -437,7 +437,9 @@ for (my $i=0;$i<=@servers;$i++) {
                 my $this_offset = (($j*$results_per_page)-$results_per_page);
                 my $this_page_number = $j;
                 my $highlight = 1 if ($this_page_number == $current_page_number);
+                if ($this_page_number <= $pages) {
                 push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight, sort_by => join " ",@sort_by };
+                }
             }
             $template->param(PAGE_NUMBERS => \@page_numbers,
                             previous_page_offset => $previous_page_offset,
diff --git a/installer/kohastructure.sql b/installer/kohastructure.sql
index 26e278750b..5933cc2464 100644
--- a/installer/kohastructure.sql
+++ b/installer/kohastructure.sql
@@ -1,25 +1,38 @@
--- phpMyAdmin SQL Dump
--- version 2.9.0.2
--- http://www.phpmyadmin.net
--- 
--- Serveur: localhost
--- Généré le : Mardi 06 Février 2007 à 15:21
--- Version du serveur: 4.1.12
--- Version de PHP: 5.0.4
--- 
--- Base de données: `Kohazebratest`
--- 
-
--- --------------------------------------------------------
-
--- 
--- Structure de la table `accountlines`
--- 
--- Création: Mardi 06 Février 2007 à 11:14
--- 
+-- MySQL dump 10.11
+--
+-- Host: localhost    Database: rel3_edit
+-- ------------------------------------------------------
+-- Server version	5.0.32-Debian_3-log
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+-- Koha Database Structure
+-- 3.0 pre-release
+-- March 2007 
+-- 
+-- IMPORTANT: 
+-- Turning off foreign key checks for import speed.
+-- If you edit this file, run it with foreign key checks ON before committing!
+--
+
+-- SET AUTOCOMMIT = 0;
+-- SET FOREIGN_KEY_CHECKS=0;
+
+--
+-- Table structure for table `accountlines`
+--
 
 DROP TABLE IF EXISTS `accountlines`;
-CREATE TABLE IF NOT EXISTS `accountlines` (
+CREATE TABLE `accountlines` (
   `borrowernumber` int(11) NOT NULL default '0',
   `accountno` smallint(6) NOT NULL default '0',
   `itemnumber` int(11) default NULL,
@@ -34,19 +47,17 @@ CREATE TABLE IF NOT EXISTS `accountlines` (
   `notify_level` int(2) NOT NULL default '0',
   KEY `acctsborridx` (`borrowernumber`),
   KEY `timeidx` (`timestamp`),
-  KEY `itemnumber` (`itemnumber`)
+  KEY `itemnumber` (`itemnumber`),
+  CONSTRAINT `accountlines_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE SET NULL ON UPDATE SET NULL,
+  CONSTRAINT `accountlines_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `accountoffsets`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:56
--- 
+--
+-- Table structure for table `accountoffsets`
+--
 
 DROP TABLE IF EXISTS `accountoffsets`;
-CREATE TABLE IF NOT EXISTS `accountoffsets` (
+CREATE TABLE `accountoffsets` (
   `borrowernumber` int(11) NOT NULL default '0',
   `accountno` smallint(6) NOT NULL default '0',
   `offsetaccount` smallint(6) NOT NULL default '0',
@@ -54,16 +65,12 @@ CREATE TABLE IF NOT EXISTS `accountoffsets` (
   `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `action_logs`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:56
--- 
+--
+-- Table structure for table `action_logs`
+--
 
 DROP TABLE IF EXISTS `action_logs`;
-CREATE TABLE IF NOT EXISTS `action_logs` (
+CREATE TABLE `action_logs` (
   `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
   `user` int(11) NOT NULL default '0',
   `module` text,
@@ -73,16 +80,12 @@ CREATE TABLE IF NOT EXISTS `action_logs` (
   PRIMARY KEY  (`timestamp`,`user`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `alert`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:56
--- 
+--
+-- Table structure for table `alert`
+--
 
 DROP TABLE IF EXISTS `alert`;
-CREATE TABLE IF NOT EXISTS `alert` (
+CREATE TABLE `alert` (
   `alertid` int(11) NOT NULL auto_increment,
   `borrowernumber` int(11) NOT NULL default '0',
   `type` varchar(10) NOT NULL default '',
@@ -92,16 +95,12 @@ CREATE TABLE IF NOT EXISTS `alert` (
   KEY `type` (`type`,`externalid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `aqbasket`
--- 
--- Création: Mardi 06 Février 2007 à 11:14
--- 
+--
+-- Table structure for table `aqbasket`
+--
 
 DROP TABLE IF EXISTS `aqbasket`;
-CREATE TABLE IF NOT EXISTS `aqbasket` (
+CREATE TABLE `aqbasket` (
   `basketno` int(11) NOT NULL auto_increment,
   `creationdate` date default NULL,
   `closedate` date default NULL,
@@ -109,19 +108,16 @@ CREATE TABLE IF NOT EXISTS `aqbasket` (
   `authorisedby` varchar(10) default NULL,
   `booksellerinvoicenumber` text,
   PRIMARY KEY  (`basketno`),
-  KEY `booksellerid` (`booksellerid`)
+  KEY `booksellerid` (`booksellerid`),
+  CONSTRAINT `aqbasket_ibfk_1` FOREIGN KEY (`booksellerid`) REFERENCES `aqbooksellers` (`id`) ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `aqbookfund`
--- 
--- Création: Mardi 06 Février 2007 à 11:14
--- 
+--
+-- Table structure for table `aqbookfund`
+--
 
 DROP TABLE IF EXISTS `aqbookfund`;
-CREATE TABLE IF NOT EXISTS `aqbookfund` (
+CREATE TABLE `aqbookfund` (
   `bookfundid` varchar(5) NOT NULL default '''''',
   `bookfundname` text,
   `bookfundgroup` varchar(5) default NULL,
@@ -129,16 +125,12 @@ CREATE TABLE IF NOT EXISTS `aqbookfund` (
   PRIMARY KEY  (`bookfundid`,`branchcode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `aqbooksellers`
--- 
--- Création: Mardi 06 Février 2007 à 11:14
--- 
+--
+-- Table structure for table `aqbooksellers`
+--
 
 DROP TABLE IF EXISTS `aqbooksellers`;
-CREATE TABLE IF NOT EXISTS `aqbooksellers` (
+CREATE TABLE `aqbooksellers` (
   `id` int(11) NOT NULL default '0',
   `name` text,
   `address1` text,
@@ -178,19 +170,17 @@ CREATE TABLE IF NOT EXISTS `aqbooksellers` (
   `invoicedisc` float(6,4) default NULL,
   PRIMARY KEY  (`id`),
   KEY `listprice` (`listprice`),
-  KEY `invoiceprice` (`invoiceprice`)
+  KEY `invoiceprice` (`invoiceprice`),
+  CONSTRAINT `aqbooksellers_ibfk_2` FOREIGN KEY (`invoiceprice`) REFERENCES `currency` (`currency`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `aqbooksellers_ibfk_1` FOREIGN KEY (`listprice`) REFERENCES `currency` (`currency`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `aqbudget`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:56
--- 
+--
+-- Table structure for table `aqbudget`
+--
 
 DROP TABLE IF EXISTS `aqbudget`;
-CREATE TABLE IF NOT EXISTS `aqbudget` (
+CREATE TABLE `aqbudget` (
   `bookfundid` varchar(5) NOT NULL default '',
   `startdate` date NOT NULL default '0000-00-00',
   `enddate` date default NULL,
@@ -200,35 +190,29 @@ CREATE TABLE IF NOT EXISTS `aqbudget` (
   PRIMARY KEY  (`aqbudgetid`,`branchcode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `aqorderbreakdown`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:41
--- 
+--
+-- Table structure for table `aqorderbreakdown`
+--
 
 DROP TABLE IF EXISTS `aqorderbreakdown`;
-CREATE TABLE IF NOT EXISTS `aqorderbreakdown` (
+CREATE TABLE `aqorderbreakdown` (
   `ordernumber` int(11) default NULL,
   `linenumber` int(11) default NULL,
   `branchcode` char(4) default NULL,
   `bookfundid` char(5) NOT NULL default '',
   `allocation` smallint(6) default NULL,
   KEY `ordernumber` (`ordernumber`),
-  KEY `bookfundid` (`bookfundid`)
+  KEY `bookfundid` (`bookfundid`),
+  CONSTRAINT `aqorderbreakdown_ibfk_2` FOREIGN KEY (`bookfundid`) REFERENCES `aqbookfund` (`bookfundid`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `aqorderbreakdown_ibfk_1` FOREIGN KEY (`ordernumber`) REFERENCES `aqorders` (`ordernumber`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `aqorderdelivery`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:56
--- 
+--
+-- Table structure for table `aqorderdelivery`
+--
 
 DROP TABLE IF EXISTS `aqorderdelivery`;
-CREATE TABLE IF NOT EXISTS `aqorderdelivery` (
+CREATE TABLE `aqorderdelivery` (
   `ordernumber` date NOT NULL default '0000-00-00',
   `deliverynumber` smallint(6) NOT NULL default '0',
   `deliverydate` varchar(18) default NULL,
@@ -236,16 +220,12 @@ CREATE TABLE IF NOT EXISTS `aqorderdelivery` (
   `deliverycomments` text
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `aqorders`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:41
--- 
+--
+-- Table structure for table `aqorders`
+--
 
 DROP TABLE IF EXISTS `aqorders`;
-CREATE TABLE IF NOT EXISTS `aqorders` (
+CREATE TABLE `aqorders` (
   `ordernumber` int(11) NOT NULL auto_increment,
   `biblionumber` int(11) default NULL,
   `title` text,
@@ -277,19 +257,17 @@ CREATE TABLE IF NOT EXISTS `aqorders` (
   `sort2` varchar(80) default NULL,
   PRIMARY KEY  (`ordernumber`),
   KEY `basketno` (`basketno`),
-  KEY `biblionumber` (`biblionumber`)
+  KEY `biblionumber` (`biblionumber`),
+  CONSTRAINT `aqorders_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE SET NULL ON UPDATE SET NULL,
+  CONSTRAINT `aqorders_ibfk_1` FOREIGN KEY (`basketno`) REFERENCES `aqbasket` (`basketno`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `auth_header`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:56
--- 
+--
+-- Table structure for table `auth_header`
+--
 
 DROP TABLE IF EXISTS `auth_header`;
-CREATE TABLE IF NOT EXISTS `auth_header` (
+CREATE TABLE `auth_header` (
   `authid` bigint(20) unsigned NOT NULL auto_increment,
   `authtypecode` varchar(10) NOT NULL default '',
   `datecreated` date NOT NULL default '0000-00-00',
@@ -303,16 +281,12 @@ CREATE TABLE IF NOT EXISTS `auth_header` (
   KEY `origincode` (`origincode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `auth_subfield_structure`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `auth_subfield_structure`
+--
 
 DROP TABLE IF EXISTS `auth_subfield_structure`;
-CREATE TABLE IF NOT EXISTS `auth_subfield_structure` (
+CREATE TABLE `auth_subfield_structure` (
   `authtypecode` varchar(10) NOT NULL default '',
   `tagfield` varchar(3) NOT NULL default '',
   `tagsubfield` char(1) NOT NULL default '',
@@ -334,16 +308,12 @@ CREATE TABLE IF NOT EXISTS `auth_subfield_structure` (
   KEY `tab` (`authtypecode`,`tab`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `auth_subfield_table`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:56
--- 
+--
+-- Table structure for table `auth_subfield_table`
+--
 
 DROP TABLE IF EXISTS `auth_subfield_table`;
-CREATE TABLE IF NOT EXISTS `auth_subfield_table` (
+CREATE TABLE `auth_subfield_table` (
   `subfieldid` bigint(20) unsigned NOT NULL auto_increment,
   `authid` bigint(20) unsigned NOT NULL default '0',
   `tag` varchar(3) NOT NULL default '',
@@ -359,16 +329,12 @@ CREATE TABLE IF NOT EXISTS `auth_subfield_table` (
   KEY `subfieldvalue` (`subfieldvalue`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `auth_tag_structure`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:41
--- 
+--
+-- Table structure for table `auth_tag_structure`
+--
 
 DROP TABLE IF EXISTS `auth_tag_structure`;
-CREATE TABLE IF NOT EXISTS `auth_tag_structure` (
+CREATE TABLE `auth_tag_structure` (
   `authtypecode` char(10) NOT NULL default '',
   `tagfield` char(3) NOT NULL default '',
   `liblibrarian` char(255) NOT NULL default '',
@@ -376,19 +342,16 @@ CREATE TABLE IF NOT EXISTS `auth_tag_structure` (
   `repeatable` tinyint(4) NOT NULL default '0',
   `mandatory` tinyint(4) NOT NULL default '0',
   `authorised_value` char(10) default NULL,
-  PRIMARY KEY  (`authtypecode`,`tagfield`)
+  PRIMARY KEY  (`authtypecode`,`tagfield`),
+  CONSTRAINT `auth_tag_structure_ibfk_1` FOREIGN KEY (`authtypecode`) REFERENCES `auth_types` (`authtypecode`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `auth_types`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:56
--- 
+--
+-- Table structure for table `auth_types`
+--
 
 DROP TABLE IF EXISTS `auth_types`;
-CREATE TABLE IF NOT EXISTS `auth_types` (
+CREATE TABLE `auth_types` (
   `authtypecode` varchar(10) NOT NULL default '',
   `authtypetext` varchar(255) NOT NULL default '',
   `auth_tag_to_report` varchar(3) NOT NULL default '',
@@ -396,16 +359,12 @@ CREATE TABLE IF NOT EXISTS `auth_types` (
   PRIMARY KEY  (`authtypecode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `auth_word`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `auth_word`
+--
 
 DROP TABLE IF EXISTS `auth_word`;
-CREATE TABLE IF NOT EXISTS `auth_word` (
+CREATE TABLE `auth_word` (
   `authid` bigint(20) NOT NULL default '0',
   `tagsubfield` varchar(4) NOT NULL default '',
   `tagorder` tinyint(4) NOT NULL default '1',
@@ -418,16 +377,12 @@ CREATE TABLE IF NOT EXISTS `auth_word` (
   KEY `sndx_word` (`sndx_word`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `authorised_values`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `authorised_values`
+--
 
 DROP TABLE IF EXISTS `authorised_values`;
-CREATE TABLE IF NOT EXISTS `authorised_values` (
+CREATE TABLE `authorised_values` (
   `id` int(11) NOT NULL auto_increment,
   `category` char(10) NOT NULL default '',
   `authorised_value` char(80) NOT NULL default '',
@@ -436,16 +391,12 @@ CREATE TABLE IF NOT EXISTS `authorised_values` (
   KEY `name` (`category`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `biblio`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `biblio`
+--
 
 DROP TABLE IF EXISTS `biblio`;
-CREATE TABLE IF NOT EXISTS `biblio` (
+CREATE TABLE `biblio` (
   `biblionumber` int(11) NOT NULL default '0',
   `author` text,
   `title` text,
@@ -461,52 +412,40 @@ CREATE TABLE IF NOT EXISTS `biblio` (
   KEY `blbnoidx` (`biblionumber`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `biblio_framework`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `biblio_framework`
+--
 
 DROP TABLE IF EXISTS `biblio_framework`;
-CREATE TABLE IF NOT EXISTS `biblio_framework` (
+CREATE TABLE `biblio_framework` (
   `frameworkcode` char(4) NOT NULL default '',
   `frameworktext` char(255) NOT NULL default '',
   PRIMARY KEY  (`frameworkcode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `biblioanalysis`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `biblioanalysis`
+--
 
 DROP TABLE IF EXISTS `biblioanalysis`;
-CREATE TABLE IF NOT EXISTS `biblioanalysis` (
+CREATE TABLE `biblioanalysis` (
   `analyticaltitle` text,
   `biblionumber` int(11) NOT NULL default '0',
   `analyticalauthor` text
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `biblioitems`
--- 
--- Création: Mardi 06 Février 2007 à 11:14
--- 
+--
+-- Table structure for table `biblioitems`
+--
 
 DROP TABLE IF EXISTS `biblioitems`;
-CREATE TABLE IF NOT EXISTS `biblioitems` (
+CREATE TABLE `biblioitems` (
   `biblioitemnumber` int(11) NOT NULL default '0',
   `biblionumber` int(11) NOT NULL default '0',
   `volume` text,
   `number` text,
   `classification` varchar(25) default NULL,
-  `itemtype` varchar(4) default NULL,
+  `itemtype` varchar(10) default NULL,
   `isbn` varchar(14) default NULL,
   `issn` varchar(9) default NULL,
   `dewey` varchar(30) default '',
@@ -532,46 +471,17 @@ CREATE TABLE IF NOT EXISTS `biblioitems` (
   KEY `bibnoidx` (`biblionumber`),
   KEY `itemtype` (`itemtype`),
   KEY `isbn` (`isbn`),
-  KEY `publishercode` (`publishercode`)
+  KEY `publishercode` (`publishercode`),
+  CONSTRAINT `biblioitems_ibfk_1` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
 
--- 
--- Structure de la table `bibliothesaurus`
--- 
--- Création: Mercredi 04 Octobre 2006 à 23:21
--- Dernière modification: Mercredi 04 Octobre 2006 à 23:21
--- Dernière vérification: Mercredi 04 Octobre 2006 à 23:21
--- 
-
-DROP TABLE IF EXISTS `bibliothesaurus`;
-CREATE TABLE IF NOT EXISTS `bibliothesaurus` (
-  `id` bigint(20) NOT NULL auto_increment,
-  `freelib` char(255) NOT NULL default '',
-  `stdlib` char(255) NOT NULL default '',
-  `category` char(10) NOT NULL default '',
-  `level` tinyint(4) NOT NULL default '1',
-  `hierarchy` char(80) NOT NULL default '',
-  `father` char(80) NOT NULL default '',
-  PRIMARY KEY  (`id`),
-  KEY `freelib` (`freelib`),
-  KEY `stdlib` (`stdlib`),
-  KEY `category` (`category`),
-  KEY `hierarchy` (`hierarchy`),
-  KEY `category_2` (`category`,`freelib`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
--- 
--- Structure de la table `bookshelf`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `bookshelf`
+--
 
 DROP TABLE IF EXISTS `bookshelf`;
-CREATE TABLE IF NOT EXISTS `bookshelf` (
+CREATE TABLE `bookshelf` (
   `shelfnumber` int(11) NOT NULL auto_increment,
   `shelfname` char(255) default NULL,
   `owner` char(80) default NULL,
@@ -579,30 +489,22 @@ CREATE TABLE IF NOT EXISTS `bookshelf` (
   PRIMARY KEY  (`shelfnumber`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `borexp`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `borexp`
+--
 
 DROP TABLE IF EXISTS `borexp`;
-CREATE TABLE IF NOT EXISTS `borexp` (
+CREATE TABLE `borexp` (
   `borrowernumber` int(11) default NULL,
   `newexp` date default NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `borrowers`
--- 
--- Création: Mardi 06 Février 2007 à 11:14
--- 
+--
+-- Table structure for table `borrowers`
+--
 
 DROP TABLE IF EXISTS `borrowers`;
-CREATE TABLE IF NOT EXISTS `borrowers` (
+CREATE TABLE `borrowers` (
   `borrowernumber` int(11) NOT NULL auto_increment,
   `cardnumber` varchar(16) NOT NULL default '',
   `surname` text NOT NULL,
@@ -658,49 +560,39 @@ CREATE TABLE IF NOT EXISTS `borrowers` (
   UNIQUE KEY `cardnumber` (`cardnumber`),
   KEY `borrowernumber` (`borrowernumber`),
   KEY `categorycode` (`categorycode`),
-  KEY `branchcode` (`branchcode`)
+  KEY `branchcode` (`branchcode`),
+  CONSTRAINT `borrowers_ibfk_2` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`),
+  CONSTRAINT `borrowers_ibfk_1` FOREIGN KEY (`categorycode`) REFERENCES `categories` (`categorycode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `borrowers_to_borrowers`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `borrowers_to_borrowers`
+--
 
 DROP TABLE IF EXISTS `borrowers_to_borrowers`;
-CREATE TABLE IF NOT EXISTS `borrowers_to_borrowers` (
+CREATE TABLE `borrowers_to_borrowers` (
   `borrower1` int(11) default NULL,
   `borrower2` int(11) default NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `branchcategories`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `branchcategories`
+--
 
 DROP TABLE IF EXISTS `branchcategories`;
-CREATE TABLE IF NOT EXISTS `branchcategories` (
+CREATE TABLE `branchcategories` (
   `categorycode` varchar(4) NOT NULL default '',
   `categoryname` text,
   `codedescription` text,
   PRIMARY KEY  (`categorycode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `branches`
--- 
--- Création: Mardi 06 Février 2007 à 11:14
--- 
+--
+-- Table structure for table `branches`
+--
 
 DROP TABLE IF EXISTS `branches`;
-CREATE TABLE IF NOT EXISTS `branches` (
+CREATE TABLE `branches` (
   `branchcode` varchar(10) NOT NULL default '',
   `branchname` text NOT NULL,
   `branchaddress1` text,
@@ -715,30 +607,22 @@ CREATE TABLE IF NOT EXISTS `branches` (
   UNIQUE KEY `branchcode` (`branchcode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `branchrelations`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `branchrelations`
+--
 
 DROP TABLE IF EXISTS `branchrelations`;
-CREATE TABLE IF NOT EXISTS `branchrelations` (
+CREATE TABLE `branchrelations` (
   `branchcode` varchar(4) default NULL,
   `categorycode` varchar(4) default NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `branchtransfers`
--- 
--- Création: Mardi 06 Février 2007 à 11:14
--- 
+--
+-- Table structure for table `branchtransfers`
+--
 
 DROP TABLE IF EXISTS `branchtransfers`;
-CREATE TABLE IF NOT EXISTS `branchtransfers` (
+CREATE TABLE `branchtransfers` (
   `itemnumber` int(11) NOT NULL default '0',
   `datesent` datetime default NULL,
   `frombranch` varchar(10) NOT NULL default '',
@@ -747,19 +631,18 @@ CREATE TABLE IF NOT EXISTS `branchtransfers` (
   `comments` text,
   KEY `frombranch` (`frombranch`),
   KEY `tobranch` (`tobranch`),
-  KEY `itemnumber` (`itemnumber`)
+  KEY `itemnumber` (`itemnumber`),
+  CONSTRAINT `branchtransfers_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `branchtransfers_ibfk_1` FOREIGN KEY (`frombranch`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `branchtransfers_ibfk_2` FOREIGN KEY (`tobranch`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `catalogueentry`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `catalogueentry`
+--
 
 DROP TABLE IF EXISTS `catalogueentry`;
-CREATE TABLE IF NOT EXISTS `catalogueentry` (
+CREATE TABLE `catalogueentry` (
   `catalogueentry` text NOT NULL,
   `entrytype` varchar(2) default NULL,
   `see` text,
@@ -768,16 +651,12 @@ CREATE TABLE IF NOT EXISTS `catalogueentry` (
   `biblionumber` int(11) default NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `categories`
--- 
--- Création: Mardi 06 Février 2007 à 11:14
--- 
+--
+-- Table structure for table `categories`
+--
 
 DROP TABLE IF EXISTS `categories`;
-CREATE TABLE IF NOT EXISTS `categories` (
+CREATE TABLE `categories` (
   `categorycode` varchar(10) NOT NULL default '',
   `description` text,
   `enrolmentperiod` smallint(6) default NULL,
@@ -794,32 +673,24 @@ CREATE TABLE IF NOT EXISTS `categories` (
   UNIQUE KEY `categorycode` (`categorycode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `categorytable`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `categorytable`
+--
 
 DROP TABLE IF EXISTS `categorytable`;
-CREATE TABLE IF NOT EXISTS `categorytable` (
+CREATE TABLE `categorytable` (
   `categorycode` varchar(5) NOT NULL default '',
   `description` text,
   `itemtypecodes` text,
   PRIMARY KEY  (`categorycode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `charges`
--- 
--- Création: Vendredi 08 Décembre 2006 à 16:47
--- 
+--
+-- Table structure for table `charges`
+--
 
 DROP TABLE IF EXISTS `charges`;
-CREATE TABLE IF NOT EXISTS `charges` (
+CREATE TABLE `charges` (
   `charge_id` varchar(5) NOT NULL default '',
   `description` text NOT NULL,
   `amount` decimal(28,6) NOT NULL default '0.000000',
@@ -829,47 +700,35 @@ CREATE TABLE IF NOT EXISTS `charges` (
   PRIMARY KEY  (`charge_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `cities`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `cities`
+--
 
 DROP TABLE IF EXISTS `cities`;
-CREATE TABLE IF NOT EXISTS `cities` (
+CREATE TABLE `cities` (
   `cityid` int(11) NOT NULL auto_increment,
   `city_name` char(100) NOT NULL default '',
   `city_zipcode` char(20) default NULL,
   PRIMARY KEY  (`cityid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `currency`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `currency`
+--
 
 DROP TABLE IF EXISTS `currency`;
-CREATE TABLE IF NOT EXISTS `currency` (
+CREATE TABLE `currency` (
   `currency` varchar(10) NOT NULL default '',
   `rate` float(7,5) default NULL,
   PRIMARY KEY  (`currency`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `deletedbiblio`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `deletedbiblio`
+--
 
 DROP TABLE IF EXISTS `deletedbiblio`;
-CREATE TABLE IF NOT EXISTS `deletedbiblio` (
+CREATE TABLE `deletedbiblio` (
   `biblionumber` int(11) NOT NULL default '0',
   `author` text,
   `title` text,
@@ -886,22 +745,18 @@ CREATE TABLE IF NOT EXISTS `deletedbiblio` (
   KEY `blbnoidx` (`biblionumber`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `deletedbiblioitems`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:40
--- 
+--
+-- Table structure for table `deletedbiblioitems`
+--
 
 DROP TABLE IF EXISTS `deletedbiblioitems`;
-CREATE TABLE IF NOT EXISTS `deletedbiblioitems` (
+CREATE TABLE `deletedbiblioitems` (
   `biblioitemnumber` int(11) NOT NULL default '0',
   `biblionumber` int(11) NOT NULL default '0',
   `volume` text,
   `number` text,
   `classification` varchar(25) default NULL,
-  `itemtype` varchar(4) default NULL,
+  `itemtype` varchar(10) default NULL,
   `isbn` varchar(14) default NULL,
   `issn` varchar(9) default NULL,
   `dewey` double(8,6) default NULL,
@@ -927,16 +782,12 @@ CREATE TABLE IF NOT EXISTS `deletedbiblioitems` (
   KEY `bibnoidx` (`biblionumber`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `deletedborrowers`
--- 
--- Création: Mardi 06 Février 2007 à 11:14
--- 
+--
+-- Table structure for table `deletedborrowers`
+--
 
 DROP TABLE IF EXISTS `deletedborrowers`;
-CREATE TABLE IF NOT EXISTS `deletedborrowers` (
+CREATE TABLE `deletedborrowers` (
   `borrowernumber` int(11) NOT NULL default '0',
   `cardnumber` varchar(9) NOT NULL default '',
   `surname` text NOT NULL,
@@ -965,7 +816,7 @@ CREATE TABLE IF NOT EXISTS `deletedborrowers` (
   `B_phone` text,
   `dateofbirth` date default NULL,
   `branchcode` varchar(4) NOT NULL default '',
-  `categorycode` varchar(2) default NULL,
+  `categorycode` varchar(10) default NULL,
   `dateenrolled` date default NULL,
   `dateexpiry` date default NULL,
   `gonenoaddress` tinyint(1) default NULL,
@@ -995,16 +846,12 @@ CREATE TABLE IF NOT EXISTS `deletedborrowers` (
   KEY `branchcode` (`branchcode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `deleteditems`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:40
--- 
+--
+-- Table structure for table `deleteditems`
+--
 
 DROP TABLE IF EXISTS `deleteditems`;
-CREATE TABLE IF NOT EXISTS `deleteditems` (
+CREATE TABLE `deleteditems` (
   `itemnumber` int(11) NOT NULL default '0',
   `biblionumber` int(11) NOT NULL default '0',
   `multivolumepart` varchar(30) default NULL,
@@ -1048,31 +895,23 @@ CREATE TABLE IF NOT EXISTS `deleteditems` (
   KEY `itembibnoidx` (`biblionumber`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `ethnicity`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `ethnicity`
+--
 
 DROP TABLE IF EXISTS `ethnicity`;
-CREATE TABLE IF NOT EXISTS `ethnicity` (
+CREATE TABLE `ethnicity` (
   `code` varchar(10) NOT NULL default '',
   `name` varchar(255) default NULL,
   PRIMARY KEY  (`code`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `issues`
--- 
--- Création: Mardi 06 Février 2007 à 11:14
--- 
+--
+-- Table structure for table `issues`
+--
 
 DROP TABLE IF EXISTS `issues`;
-CREATE TABLE IF NOT EXISTS `issues` (
+CREATE TABLE `issues` (
   `borrowernumber` int(11) default '0',
   `itemnumber` int(11) default '0',
   `date_due` date default NULL,
@@ -1086,21 +925,19 @@ CREATE TABLE IF NOT EXISTS `issues` (
   `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
   KEY `issuesborridx` (`borrowernumber`),
   KEY `issuesitemidx` (`itemnumber`),
-  KEY `bordate` (`borrowernumber`,`timestamp`)
+  KEY `bordate` (`borrowernumber`,`timestamp`),
+  CONSTRAINT `issues_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE SET NULL ON UPDATE SET NULL,
+  CONSTRAINT `issues_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE SET NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `issuingrules`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:41
--- 
+--
+-- Table structure for table `issuingrules`
+--
 
 DROP TABLE IF EXISTS `issuingrules`;
-CREATE TABLE IF NOT EXISTS `issuingrules` (
-  `categorycode` varchar(2) NOT NULL default '',
-  `itemtype` varchar(4) NOT NULL default '',
+CREATE TABLE `issuingrules` (
+  `categorycode` varchar(10) NOT NULL default '',
+  `itemtype` varchar(10) NOT NULL default '',
   `restrictedtype` tinyint(1) default NULL,
   `rentaldiscount` decimal(28,6) default NULL,
   `reservecharge` decimal(28,6) default NULL,
@@ -1114,19 +951,17 @@ CREATE TABLE IF NOT EXISTS `issuingrules` (
   `branchcode` varchar(4) NOT NULL default '',
   PRIMARY KEY  (`branchcode`,`categorycode`,`itemtype`),
   KEY `categorycode` (`categorycode`),
-  KEY `itemtype` (`itemtype`)
+  KEY `itemtype` (`itemtype`),
+  CONSTRAINT `issuingrules_ibfk_2` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `issuingrules_ibfk_1` FOREIGN KEY (`categorycode`) REFERENCES `categories` (`categorycode`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `items`
--- 
--- Création: Mardi 06 Février 2007 à 11:14
--- 
+--
+-- Table structure for table `items`
+--
 
 DROP TABLE IF EXISTS `items`;
-CREATE TABLE IF NOT EXISTS `items` (
+CREATE TABLE `items` (
   `itemnumber` int(11) NOT NULL default '0',
   `biblionumber` int(11) NOT NULL default '0',
   `multivolumepart` varchar(30) default NULL,
@@ -1165,34 +1000,28 @@ CREATE TABLE IF NOT EXISTS `items` (
   KEY `itembinoidx` (`biblioitemnumber`),
   KEY `itembibnoidx` (`biblionumber`),
   KEY `homebranch` (`homebranch`),
-  KEY `holdingbranch` (`holdingbranch`)
+  KEY `holdingbranch` (`holdingbranch`),
+  CONSTRAINT `items_ibfk_2` FOREIGN KEY (`holdingbranch`) REFERENCES `branches` (`branchcode`) ON UPDATE CASCADE,
+  CONSTRAINT `items_ibfk_1` FOREIGN KEY (`biblioitemnumber`) REFERENCES `biblioitems` (`biblioitemnumber`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `itemsprices`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `itemsprices`
+--
 
 DROP TABLE IF EXISTS `itemsprices`;
-CREATE TABLE IF NOT EXISTS `itemsprices` (
+CREATE TABLE `itemsprices` (
   `itemnumber` int(11) default NULL,
   `price1` decimal(28,6) default NULL,
   `price2` decimal(28,6) default NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `itemtypes`
--- 
--- Création: Mardi 06 Février 2007 à 11:14
--- 
+--
+-- Table structure for table `itemtypes`
+--
 
 DROP TABLE IF EXISTS `itemtypes`;
-CREATE TABLE IF NOT EXISTS `itemtypes` (
+CREATE TABLE `itemtypes` (
   `itemtype` varchar(10) NOT NULL default '',
   `description` text,
   `renewalsallowed` smallint(6) default NULL,
@@ -1204,32 +1033,24 @@ CREATE TABLE IF NOT EXISTS `itemtypes` (
   UNIQUE KEY `itemtype` (`itemtype`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `labels`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `labels`
+--
 
 DROP TABLE IF EXISTS `labels`;
-CREATE TABLE IF NOT EXISTS `labels` (
+CREATE TABLE `labels` (
   `labelid` int(11) NOT NULL auto_increment,
   `itemnumber` varchar(100) NOT NULL default '',
   `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
   PRIMARY KEY  (`labelid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `labels_conf`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `labels_conf`
+--
 
 DROP TABLE IF EXISTS `labels_conf`;
-CREATE TABLE IF NOT EXISTS `labels_conf` (
+CREATE TABLE `labels_conf` (
   `id` int(4) NOT NULL auto_increment,
   `barcodetype` char(100) default '',
   `title` tinyint(1) default '0',
@@ -1244,16 +1065,12 @@ CREATE TABLE IF NOT EXISTS `labels_conf` (
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `letter`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `letter`
+--
 
 DROP TABLE IF EXISTS `letter`;
-CREATE TABLE IF NOT EXISTS `letter` (
+CREATE TABLE `letter` (
   `module` varchar(20) NOT NULL default '',
   `code` varchar(20) NOT NULL default '',
   `name` varchar(100) NOT NULL default '',
@@ -1262,16 +1079,12 @@ CREATE TABLE IF NOT EXISTS `letter` (
   PRIMARY KEY  (`module`,`code`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `marc_biblio`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `marc_biblio`
+--
 
 DROP TABLE IF EXISTS `marc_biblio`;
-CREATE TABLE IF NOT EXISTS `marc_biblio` (
+CREATE TABLE `marc_biblio` (
   `bibid` bigint(20) unsigned NOT NULL auto_increment,
   `biblionumber` int(11) NOT NULL default '0',
   `datecreated` date NOT NULL default '0000-00-00',
@@ -1283,31 +1096,23 @@ CREATE TABLE IF NOT EXISTS `marc_biblio` (
   KEY `biblionumber` (`biblionumber`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `marc_blob_subfield`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:57
--- 
+--
+-- Table structure for table `marc_blob_subfield`
+--
 
 DROP TABLE IF EXISTS `marc_blob_subfield`;
-CREATE TABLE IF NOT EXISTS `marc_blob_subfield` (
+CREATE TABLE `marc_blob_subfield` (
   `blobidlink` bigint(20) NOT NULL auto_increment,
   `subfieldvalue` longtext NOT NULL,
   PRIMARY KEY  (`blobidlink`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `marc_breeding`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:58
--- 
+--
+-- Table structure for table `marc_breeding`
+--
 
 DROP TABLE IF EXISTS `marc_breeding`;
-CREATE TABLE IF NOT EXISTS `marc_breeding` (
+CREATE TABLE `marc_breeding` (
   `id` bigint(20) NOT NULL auto_increment,
   `file` varchar(80) NOT NULL default '',
   `isbn` varchar(10) NOT NULL default '',
@@ -1321,16 +1126,12 @@ CREATE TABLE IF NOT EXISTS `marc_breeding` (
   KEY `isbn` (`isbn`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `marc_subfield_structure`
--- 
--- Création: Lundi 27 Novembre 2006 à 17:58
--- 
+--
+-- Table structure for table `marc_subfield_structure`
+--
 
 DROP TABLE IF EXISTS `marc_subfield_structure`;
-CREATE TABLE IF NOT EXISTS `marc_subfield_structure` (
+CREATE TABLE `marc_subfield_structure` (
   `tagfield` varchar(3) NOT NULL default '',
   `tagsubfield` char(1) NOT NULL default '',
   `liblibrarian` varchar(255) NOT NULL default '',
@@ -1352,16 +1153,12 @@ CREATE TABLE IF NOT EXISTS `marc_subfield_structure` (
   KEY `kohafield` (`frameworkcode`,`kohafield`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `marc_subfield_table`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:11
--- 
+--
+-- Table structure for table `marc_subfield_table`
+--
 
 DROP TABLE IF EXISTS `marc_subfield_table`;
-CREATE TABLE IF NOT EXISTS `marc_subfield_table` (
+CREATE TABLE `marc_subfield_table` (
   `subfieldid` bigint(20) unsigned NOT NULL auto_increment,
   `bibid` bigint(20) unsigned NOT NULL default '0',
   `tag` varchar(3) NOT NULL default '',
@@ -1381,16 +1178,12 @@ CREATE TABLE IF NOT EXISTS `marc_subfield_table` (
   KEY `tagorder` (`tagorder`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `marc_tag_structure`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:11
--- 
+--
+-- Table structure for table `marc_tag_structure`
+--
 
 DROP TABLE IF EXISTS `marc_tag_structure`;
-CREATE TABLE IF NOT EXISTS `marc_tag_structure` (
+CREATE TABLE `marc_tag_structure` (
   `tagfield` char(3) NOT NULL default '',
   `liblibrarian` char(255) NOT NULL default '',
   `libopac` char(255) NOT NULL default '',
@@ -1401,16 +1194,12 @@ CREATE TABLE IF NOT EXISTS `marc_tag_structure` (
   PRIMARY KEY  (`frameworkcode`,`tagfield`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `marc_word`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `marc_word`
+--
 
 DROP TABLE IF EXISTS `marc_word`;
-CREATE TABLE IF NOT EXISTS `marc_word` (
+CREATE TABLE `marc_word` (
   `bibid` bigint(20) NOT NULL default '0',
   `tagsubfield` varchar(4) NOT NULL default '',
   `tagorder` tinyint(4) NOT NULL default '1',
@@ -1425,48 +1214,36 @@ CREATE TABLE IF NOT EXISTS `marc_word` (
   KEY `Search_Marc` (`tagsubfield`,`word`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `marcrecorddone`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `marcrecorddone`
+--
 
 DROP TABLE IF EXISTS `marcrecorddone`;
-CREATE TABLE IF NOT EXISTS `marcrecorddone` (
+CREATE TABLE `marcrecorddone` (
   `isbn` char(40) default NULL,
   `issn` char(40) default NULL,
   `lccn` char(40) default NULL,
   `controlnumber` char(40) default NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `mediatypetable`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `mediatypetable`
+--
 
 DROP TABLE IF EXISTS `mediatypetable`;
-CREATE TABLE IF NOT EXISTS `mediatypetable` (
+CREATE TABLE `mediatypetable` (
   `mediatypecode` varchar(5) NOT NULL default '',
   `description` text,
   `itemtypecodes` text,
   PRIMARY KEY  (`mediatypecode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `notifys`
--- 
--- Création: Vendredi 08 Décembre 2006 à 16:47
--- 
+--
+-- Table structure for table `notifys`
+--
 
 DROP TABLE IF EXISTS `notifys`;
-CREATE TABLE IF NOT EXISTS `notifys` (
+CREATE TABLE `notifys` (
   `notify_id` int(11) NOT NULL default '0',
   `borrowernumber` int(11) NOT NULL default '0',
   `itemnumber` int(11) NOT NULL default '0',
@@ -1476,16 +1253,12 @@ CREATE TABLE IF NOT EXISTS `notifys` (
   `method` varchar(20) NOT NULL default ''
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `opac_news`
--- 
--- Création: Mardi 06 Février 2007 à 11:14
--- 
+--
+-- Table structure for table `opac_news`
+--
 
 DROP TABLE IF EXISTS `opac_news`;
-CREATE TABLE IF NOT EXISTS `opac_news` (
+CREATE TABLE `opac_news` (
   `idnew` int(10) unsigned NOT NULL auto_increment,
   `title` varchar(250) NOT NULL default '',
   `new` text NOT NULL,
@@ -1496,18 +1269,14 @@ CREATE TABLE IF NOT EXISTS `opac_news` (
   PRIMARY KEY  (`idnew`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `overduerules`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `overduerules`
+--
 
 DROP TABLE IF EXISTS `overduerules`;
-CREATE TABLE IF NOT EXISTS `overduerules` (
+CREATE TABLE `overduerules` (
   `branchcode` varchar(255) NOT NULL default '',
-  `categorycode` varchar(2) NOT NULL default '',
+  `categorycode` varchar(10) NOT NULL default '',
   `delay1` int(4) default '0',
   `letter1` varchar(20) default NULL,
   `debarred1` char(1) default '0',
@@ -1520,16 +1289,12 @@ CREATE TABLE IF NOT EXISTS `overduerules` (
   PRIMARY KEY  (`branchcode`,`categorycode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `phrase_log`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `phrase_log`
+--
 
 DROP TABLE IF EXISTS `phrase_log`;
-CREATE TABLE IF NOT EXISTS `phrase_log` (
+CREATE TABLE `phrase_log` (
   `phr_phrase` varchar(100) NOT NULL default '',
   `phr_resultcount` int(11) NOT NULL default '0',
   `phr_ip` varchar(30) NOT NULL default '',
@@ -1539,32 +1304,24 @@ CREATE TABLE IF NOT EXISTS `phrase_log` (
   KEY `phr_ip` (`phr_ip`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `printers`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `printers`
+--
 
 DROP TABLE IF EXISTS `printers`;
-CREATE TABLE IF NOT EXISTS `printers` (
+CREATE TABLE `printers` (
   `printername` char(40) NOT NULL default '''''',
   `printqueue` char(20) default NULL,
   `printtype` char(20) default NULL,
   PRIMARY KEY  (`printername`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `repeatable_holidays`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `repeatable_holidays`
+--
 
 DROP TABLE IF EXISTS `repeatable_holidays`;
-CREATE TABLE IF NOT EXISTS `repeatable_holidays` (
+CREATE TABLE `repeatable_holidays` (
   `id` int(11) NOT NULL auto_increment,
   `branchcode` varchar(4) NOT NULL default '',
   `weekday` smallint(6) default NULL,
@@ -1575,16 +1332,12 @@ CREATE TABLE IF NOT EXISTS `repeatable_holidays` (
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `reserveconstraints`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `reserveconstraints`
+--
 
 DROP TABLE IF EXISTS `reserveconstraints`;
-CREATE TABLE IF NOT EXISTS `reserveconstraints` (
+CREATE TABLE `reserveconstraints` (
   `borrowernumber` int(11) NOT NULL default '0',
   `reservedate` date NOT NULL default '0000-00-00',
   `biblionumber` int(11) NOT NULL default '0',
@@ -1592,16 +1345,12 @@ CREATE TABLE IF NOT EXISTS `reserveconstraints` (
   `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `reserves`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:41
--- 
+--
+-- Table structure for table `reserves`
+--
 
 DROP TABLE IF EXISTS `reserves`;
-CREATE TABLE IF NOT EXISTS `reserves` (
+CREATE TABLE `reserves` (
   `borrowernumber` int(11) NOT NULL default '0',
   `reservedate` date NOT NULL default '0000-00-00',
   `biblionumber` int(11) NOT NULL default '0',
@@ -1619,19 +1368,19 @@ CREATE TABLE IF NOT EXISTS `reserves` (
   KEY `borrowernumber` (`borrowernumber`),
   KEY `biblionumber` (`biblionumber`),
   KEY `itemnumber` (`itemnumber`),
-  KEY `branchcode` (`branchcode`)
+  KEY `branchcode` (`branchcode`),
+  CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `reserves_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `reserves_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `reviews`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `reviews`
+--
 
 DROP TABLE IF EXISTS `reviews`;
-CREATE TABLE IF NOT EXISTS `reviews` (
+CREATE TABLE `reviews` (
   `reviewid` int(11) NOT NULL auto_increment,
   `borrowernumber` int(11) default NULL,
   `biblionumber` int(11) default NULL,
@@ -1641,31 +1390,23 @@ CREATE TABLE IF NOT EXISTS `reviews` (
   PRIMARY KEY  (`reviewid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `roadtype`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `roadtype`
+--
 
 DROP TABLE IF EXISTS `roadtype`;
-CREATE TABLE IF NOT EXISTS `roadtype` (
+CREATE TABLE `roadtype` (
   `roadtypeid` int(11) NOT NULL auto_increment,
   `road_type` char(100) NOT NULL default '',
   PRIMARY KEY  (`roadtypeid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `serial`
--- 
--- Création: Mardi 06 Février 2007 à 11:14
--- 
+--
+-- Table structure for table `serial`
+--
 
 DROP TABLE IF EXISTS `serial`;
-CREATE TABLE IF NOT EXISTS `serial` (
+CREATE TABLE `serial` (
   `serialid` int(11) NOT NULL auto_increment,
   `biblionumber` varchar(100) NOT NULL default '',
   `subscriptionid` varchar(100) NOT NULL default '',
@@ -1680,32 +1421,24 @@ CREATE TABLE IF NOT EXISTS `serial` (
   PRIMARY KEY  (`serialid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `sessionqueries`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `sessionqueries`
+--
 
 DROP TABLE IF EXISTS `sessionqueries`;
-CREATE TABLE IF NOT EXISTS `sessionqueries` (
+CREATE TABLE `sessionqueries` (
   `sessionID` varchar(255) NOT NULL default '',
   `userid` varchar(100) NOT NULL default '',
   `ip` varchar(18) NOT NULL default '',
   `url` text NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `sessions`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `sessions`
+--
 
 DROP TABLE IF EXISTS `sessions`;
-CREATE TABLE IF NOT EXISTS `sessions` (
+CREATE TABLE `sessions` (
   `sessionID` varchar(255) NOT NULL default '',
   `userid` varchar(255) default NULL,
   `ip` varchar(16) default NULL,
@@ -1713,34 +1446,28 @@ CREATE TABLE IF NOT EXISTS `sessions` (
   PRIMARY KEY  (`sessionID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `shelfcontents`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:41
--- 
+--
+-- Table structure for table `shelfcontents`
+--
 
 DROP TABLE IF EXISTS `shelfcontents`;
-CREATE TABLE IF NOT EXISTS `shelfcontents` (
+CREATE TABLE `shelfcontents` (
   `shelfnumber` int(11) NOT NULL default '0',
   `itemnumber` int(11) NOT NULL default '0',
   `flags` int(11) default NULL,
   `dateadded` timestamp NULL default NULL,
   KEY `shelfnumber` (`shelfnumber`),
-  KEY `itemnumber` (`itemnumber`)
+  KEY `itemnumber` (`itemnumber`),
+  CONSTRAINT `shelfcontents_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `shelfcontents_ibfk_1` FOREIGN KEY (`shelfnumber`) REFERENCES `bookshelf` (`shelfnumber`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `special_holidays`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `special_holidays`
+--
 
 DROP TABLE IF EXISTS `special_holidays`;
-CREATE TABLE IF NOT EXISTS `special_holidays` (
+CREATE TABLE `special_holidays` (
   `id` int(11) NOT NULL auto_increment,
   `branchcode` varchar(4) NOT NULL default '',
   `day` smallint(6) NOT NULL default '0',
@@ -1752,16 +1479,12 @@ CREATE TABLE IF NOT EXISTS `special_holidays` (
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `statistics`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `statistics`
+--
 
 DROP TABLE IF EXISTS `statistics`;
-CREATE TABLE IF NOT EXISTS `statistics` (
+CREATE TABLE `statistics` (
   `datetime` datetime NOT NULL default '0000-00-00 00:00:00',
   `branch` varchar(4) default NULL,
   `proccode` varchar(4) default NULL,
@@ -1770,51 +1493,39 @@ CREATE TABLE IF NOT EXISTS `statistics` (
   `other` text,
   `usercode` varchar(10) default NULL,
   `itemnumber` int(11) default NULL,
-  `itemtype` varchar(4) default NULL,
+  `itemtype` varchar(10) default NULL,
   `borrowernumber` int(11) default NULL,
   `associatedborrower` int(11) default NULL,
   KEY `timeidx` (`datetime`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `stopwords`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `stopwords`
+--
 
 DROP TABLE IF EXISTS `stopwords`;
-CREATE TABLE IF NOT EXISTS `stopwords` (
+CREATE TABLE `stopwords` (
   `word` varchar(255) default NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `subcategorytable`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `subcategorytable`
+--
 
 DROP TABLE IF EXISTS `subcategorytable`;
-CREATE TABLE IF NOT EXISTS `subcategorytable` (
+CREATE TABLE `subcategorytable` (
   `subcategorycode` varchar(5) NOT NULL default '',
   `description` text,
   `itemtypecodes` text,
   PRIMARY KEY  (`subcategorycode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `subscription`
--- 
--- Création: Vendredi 26 Janvier 2007 à 12:44
--- 
+--
+-- Table structure for table `subscription`
+--
 
 DROP TABLE IF EXISTS `subscription`;
-CREATE TABLE IF NOT EXISTS `subscription` (
+CREATE TABLE `subscription` (
   `biblionumber` int(11) NOT NULL default '0',
   `manualhistory` tinyint(1) NOT NULL default '0',
   `subscriptionid` int(11) NOT NULL auto_increment,
@@ -1862,16 +1573,12 @@ CREATE TABLE IF NOT EXISTS `subscription` (
   PRIMARY KEY  (`subscriptionid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `subscriptionhistory`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `subscriptionhistory`
+--
 
 DROP TABLE IF EXISTS `subscriptionhistory`;
-CREATE TABLE IF NOT EXISTS `subscriptionhistory` (
+CREATE TABLE `subscriptionhistory` (
   `biblionumber` int(11) NOT NULL default '0',
   `subscriptionid` int(11) NOT NULL default '0',
   `histstartdate` date NOT NULL default '0000-00-00',
@@ -1884,16 +1591,12 @@ CREATE TABLE IF NOT EXISTS `subscriptionhistory` (
   KEY `biblionumber` (`biblionumber`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `subscriptionroutinglist`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `subscriptionroutinglist`
+--
 
 DROP TABLE IF EXISTS `subscriptionroutinglist`;
-CREATE TABLE IF NOT EXISTS `subscriptionroutinglist` (
+CREATE TABLE `subscriptionroutinglist` (
   `routingid` int(11) NOT NULL auto_increment,
   `borrowernumber` int(11) default NULL,
   `ranking` int(11) default NULL,
@@ -1901,16 +1604,12 @@ CREATE TABLE IF NOT EXISTS `subscriptionroutinglist` (
   PRIMARY KEY  (`routingid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `suggestions`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:40
--- 
+--
+-- Table structure for table `suggestions`
+--
 
 DROP TABLE IF EXISTS `suggestions`;
-CREATE TABLE IF NOT EXISTS `suggestions` (
+CREATE TABLE `suggestions` (
   `suggestionid` int(8) NOT NULL auto_increment,
   `suggestedby` int(11) NOT NULL default '0',
   `managedby` int(11) default NULL,
@@ -1933,16 +1632,12 @@ CREATE TABLE IF NOT EXISTS `suggestions` (
   KEY `managedby` (`managedby`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `systempreferences`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:40
--- 
+--
+-- Table structure for table `systempreferences`
+--
 
 DROP TABLE IF EXISTS `systempreferences`;
-CREATE TABLE IF NOT EXISTS `systempreferences` (
+CREATE TABLE `systempreferences` (
   `variable` varchar(50) NOT NULL default '',
   `value` text,
   `options` text,
@@ -1951,31 +1646,23 @@ CREATE TABLE IF NOT EXISTS `systempreferences` (
   PRIMARY KEY  (`variable`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `tags`
--- 
--- Création: Mardi 06 Février 2007 à 11:14
--- 
+--
+-- Table structure for table `tags`
+--
 
 DROP TABLE IF EXISTS `tags`;
-CREATE TABLE IF NOT EXISTS `tags` (
+CREATE TABLE `tags` (
   `entry` varchar(255) NOT NULL default '',
   `weight` bigint(20) NOT NULL default '0',
   PRIMARY KEY  (`entry`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `uploadedmarc`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `uploadedmarc`
+--
 
 DROP TABLE IF EXISTS `uploadedmarc`;
-CREATE TABLE IF NOT EXISTS `uploadedmarc` (
+CREATE TABLE `uploadedmarc` (
   `id` int(11) NOT NULL auto_increment,
   `marc` longblob,
   `hidden` smallint(6) default NULL,
@@ -1983,48 +1670,36 @@ CREATE TABLE IF NOT EXISTS `uploadedmarc` (
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `userflags`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `userflags`
+--
 
 DROP TABLE IF EXISTS `userflags`;
-CREATE TABLE IF NOT EXISTS `userflags` (
+CREATE TABLE `userflags` (
   `bit` int(11) NOT NULL default '0',
   `flag` char(30) default NULL,
   `flagdesc` char(255) default NULL,
   `defaulton` int(11) default NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `users`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `users`
+--
 
 DROP TABLE IF EXISTS `users`;
-CREATE TABLE IF NOT EXISTS `users` (
+CREATE TABLE `users` (
   `usercode` varchar(10) default NULL,
   `username` text,
   `password` text,
   `level` smallint(6) default NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `websites`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `websites`
+--
 
 DROP TABLE IF EXISTS `websites`;
-CREATE TABLE IF NOT EXISTS `websites` (
+CREATE TABLE `websites` (
   `websitenumber` int(11) NOT NULL auto_increment,
   `biblionumber` int(11) NOT NULL default '0',
   `title` text,
@@ -2033,16 +1708,12 @@ CREATE TABLE IF NOT EXISTS `websites` (
   PRIMARY KEY  (`websitenumber`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `z3950queue`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `z3950queue`
+--
 
 DROP TABLE IF EXISTS `z3950queue`;
-CREATE TABLE IF NOT EXISTS `z3950queue` (
+CREATE TABLE `z3950queue` (
   `id` int(11) NOT NULL auto_increment,
   `term` text,
   `type` varchar(10) default NULL,
@@ -2056,16 +1727,12 @@ CREATE TABLE IF NOT EXISTS `z3950queue` (
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `z3950results`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `z3950results`
+--
 
 DROP TABLE IF EXISTS `z3950results`;
-CREATE TABLE IF NOT EXISTS `z3950results` (
+CREATE TABLE `z3950results` (
   `id` int(11) NOT NULL auto_increment,
   `queryid` int(11) default NULL,
   `server` varchar(255) default NULL,
@@ -2080,16 +1747,12 @@ CREATE TABLE IF NOT EXISTS `z3950results` (
   UNIQUE KEY `query_server` (`queryid`,`server`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `z3950servers`
--- 
--- Création: Lundi 27 Novembre 2006 à 18:39
--- 
+--
+-- Table structure for table `z3950servers`
+--
 
 DROP TABLE IF EXISTS `z3950servers`;
-CREATE TABLE IF NOT EXISTS `z3950servers` (
+CREATE TABLE `z3950servers` (
   `host` varchar(255) default NULL,
   `port` int(11) default NULL,
   `db` varchar(255) default NULL,
@@ -2107,16 +1770,12 @@ CREATE TABLE IF NOT EXISTS `z3950servers` (
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- --------------------------------------------------------
-
--- 
--- Structure de la table `zebraqueue`
--- 
--- Création: Mardi 16 Janvier 2007 à 14:19
--- 
+--
+-- Table structure for table `zebraqueue`
+--
 
 DROP TABLE IF EXISTS `zebraqueue`;
-CREATE TABLE IF NOT EXISTS `zebraqueue` (
+CREATE TABLE `zebraqueue` (
   `id` int(11) NOT NULL auto_increment,
   `biblio_auth_number` int(11) NOT NULL default '0',
   `operation` char(20) NOT NULL default '',
@@ -2124,118 +1783,18 @@ CREATE TABLE IF NOT EXISTS `zebraqueue` (
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
--- 
--- Contraintes pour les tables exportées
--- 
 
--- 
--- Contraintes pour la table `accountlines`
--- 
-ALTER TABLE `accountlines`
-  ADD CONSTRAINT `accountlines_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `accountlines`
-  ADD CONSTRAINT `accountlines_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE SET NULL ON UPDATE SET NULL;
+-- SET FOREIGN_KEY_CHECKS = 1;
+-- COMMIT;
+-- SET AUTOCOMMIT = 1;
 
--- 
--- Contraintes pour la table `aqbasket`
--- 
-ALTER TABLE `aqbasket`
-  ADD CONSTRAINT `aqbasket_ibfk_1` FOREIGN KEY (`booksellerid`) REFERENCES `aqbooksellers` (`id`) ON UPDATE CASCADE;
-
--- 
--- Contraintes pour la table `aqbooksellers`
--- 
-ALTER TABLE `aqbooksellers`
-  ADD CONSTRAINT `aqbooksellers_ibfk_1` FOREIGN KEY (`listprice`) REFERENCES `currency` (`currency`) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `aqbooksellers`
-  ADD CONSTRAINT `aqbooksellers_ibfk_2` FOREIGN KEY (`invoiceprice`) REFERENCES `currency` (`currency`) ON DELETE CASCADE ON UPDATE CASCADE;
-
--- 
--- Contraintes pour la table `aqorderbreakdown`
--- 
-ALTER TABLE `aqorderbreakdown`
-  ADD CONSTRAINT `aqorderbreakdown_ibfk_1` FOREIGN KEY (`ordernumber`) REFERENCES `aqorders` (`ordernumber`) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `aqorderbreakdown`
-    ADD CONSTRAINT `aqorderbreakdown_ibfk_2` FOREIGN KEY (`bookfundid`) REFERENCES `aqbookfund` (`bookfundid`) ON DELETE CASCADE ON UPDATE CASCADE;
-
--- 
--- Contraintes pour la table `aqorders`
--- 
-ALTER TABLE `aqorders`
-  ADD CONSTRAINT `aqorders_ibfk_1` FOREIGN KEY (`basketno`) REFERENCES `aqbasket` (`basketno`) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `aqorders`
-    ADD CONSTRAINT `aqorders_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE SET NULL ON UPDATE SET NULL;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- 
--- Contraintes pour la table `auth_tag_structure`
--- 
-ALTER TABLE `auth_tag_structure`
-  ADD CONSTRAINT `auth_tag_structure_ibfk_1` FOREIGN KEY (`authtypecode`) REFERENCES `auth_types` (`authtypecode`) ON DELETE CASCADE ON UPDATE CASCADE;
-
--- 
--- Contraintes pour la table `biblioitems`
--- 
-ALTER TABLE `biblioitems`
-  ADD CONSTRAINT `biblioitems_ibfk_1` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE;
-
--- 
--- Contraintes pour la table `borrowers`
--- 
-ALTER TABLE `borrowers`
-  ADD CONSTRAINT `borrowers_ibfk_1` FOREIGN KEY (`categorycode`) REFERENCES `categories` (`categorycode`);
-ALTER TABLE `borrowers`
-    ADD CONSTRAINT `borrowers_ibfk_2` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`);
-
--- 
--- Contraintes pour la table `branchtransfers`
--- 
-ALTER TABLE `branchtransfers`
-  ADD CONSTRAINT `branchtransfers_ibfk_1` FOREIGN KEY (`frombranch`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `branchtransfers`
-   ADD CONSTRAINT `branchtransfers_ibfk_2` FOREIGN KEY (`tobranch`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `branchtransfers`
-   ADD CONSTRAINT `branchtransfers_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE;
-
--- 
--- Contraintes pour la table `issues`
--- 
-ALTER TABLE `issues`
-  ADD CONSTRAINT `issues_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE SET NULL;
-ALTER TABLE `issues`
-    ADD CONSTRAINT `issues_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE SET NULL ON UPDATE SET NULL;
-
--- 
--- Contraintes pour la table `issuingrules`
--- 
-ALTER TABLE `issuingrules`
-  ADD CONSTRAINT `issuingrules_ibfk_1` FOREIGN KEY (`categorycode`) REFERENCES `categories` (`categorycode`) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `issuingrules`
-    ADD CONSTRAINT `issuingrules_ibfk_2` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE;
-
--- 
--- Contraintes pour la table `items`
--- 
-ALTER TABLE `items`
-  ADD CONSTRAINT `items_ibfk_1` FOREIGN KEY (`biblioitemnumber`) REFERENCES `biblioitems` (`biblioitemnumber`) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `items`
-    ADD CONSTRAINT `items_ibfk_2` FOREIGN KEY (`holdingbranch`) REFERENCES `branches` (`branchcode`) ON UPDATE CASCADE;
-
--- 
--- Contraintes pour la table `reserves`
--- 
-ALTER TABLE `reserves`
-  ADD CONSTRAINT `reserves_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `reserves`
-  ADD CONSTRAINT `reserves_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `reserves`
-  ADD CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `reserves`
-   ADD CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE;
-
--- 
--- Contraintes pour la table `shelfcontents`
--- 
-ALTER TABLE `shelfcontents`
-  ADD CONSTRAINT `shelfcontents_ibfk_1` FOREIGN KEY (`shelfnumber`) REFERENCES `bookshelf` (`shelfnumber`) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `shelfcontents`
-    ADD CONSTRAINT `shelfcontents_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE;
+-- Dump completed on 2007-03-12 16:24:34
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl
index 032b534712..49566b3c44 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl
@@ -120,15 +120,6 @@ function Check(f) {
 		<th>Edit</th>
 		<th>Delete</th>
 	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td>Default framework</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td><a href="auth_tag_structure.pl">MARC structure</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-	</tr>
 	
 	<!-- TMPL_LOOP NAME="loop" -->
 		<tr>
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
index 9b31b4bc0a..0f73869a2d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl
@@ -1,13 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<!-- TMPL_IF NAME="TemplateEncoding" -->
-    <meta http-equiv="Content-Type" content="text/html; charset=<!-- TMPL_VAR NAME="TemplateEncoding" -->">
-<!-- TMPL_ELSE -->
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<!-- /TMPL_IF -->
-
-<body>
-<script language="JavaScript" type="text/javascript">
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<script type="text/javascript">
 
 function go()
 {
@@ -61,5 +53,4 @@ while (i>=0) {
 <script language="javascript" type="text/javascript">
 window.onload = go();
 </script>
-</body>
-</html>
+<!-- TMPL_INCLUDE NAME="intranet-bottom" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
new file mode 100644
index 0000000000..f73f9d4985
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
@@ -0,0 +1,4 @@
+<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>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index c2a8e04ed2..41ffb23dd8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -1,4 +1,3 @@
-</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/includes/intranet-print.css" />
@@ -13,5 +12,4 @@
     <!-- /TMPL_IF -->
 </style>
 </head>
-
 <body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members.js b/koha-tmpl/intranet-tmpl/prog/en/includes/members.js
new file mode 100644
index 0000000000..7f3e9d4dd6
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members.js
@@ -0,0 +1,180 @@
+function _(s) { return s; }
+
+// this function checks id date is like DD/MM/YYYY
+function CheckDate(field) {
+var d = field.value;
+if (d!="") {
+      var amin = 1900; 
+      var amax = 2100; 
+      var date = d.split("/");
+      var ok=1;
+      var msg;
+      if ( (date.length < 2) && (ok==1) ) {
+        msg = _("Separator must be /"); 
+    	alert(msg); ok=0; field.focus();
+    	return;
+      }
+      var dd   = date[0];
+      var mm   = date[1];
+      var yyyy = date[2]; 
+      // checking days
+      if ( ((isNaN(dd))||(dd<1)||(dd>31)) && (ok==1) ) {
+        msg = _("day not correct."); 
+	    alert(msg); ok=0; field.focus();
+	    return;
+      }
+      // checking months
+      if ( ((isNaN(mm))||(mm<1)||(mm>12)) && (ok==1) ) {
+        msg = _("month not correct.");
+	    alert(msg); ok=0; field.focus();
+	    return;
+      }
+      // checking years
+      if ( ((isNaN(yyyy))||(yyyy<amin)||(yyyy>amax)) && (ok==1) ) {
+        msg = _("years not correct."); 
+	    alert(msg); ok=0; field.focus();
+	    return;
+      }
+   }
+}
+
+//function test if member is unique and if it's right the member is registred
+function unique() {
+var msg1;
+var msg2;
+if (  document.form.check_member.value==1){
+	if (document.form.categorycode.value != "I"){
+		
+		msg1 += ("Warning  !!!! Duplicate borrower!!!!");
+		alert(msg1);
+	check_form_borrowers(0);
+	document.form.submit();
+	
+	}else{
+		msg2 += ("Warning !!!! Duplicate organisation!!!!");
+		alert(msg2);
+	check_form_borrowers(0);
+	}
+}
+else
+{
+	document.form.submit();
+}
+
+}
+//end function
+//function test if date enrooled < date expiry
+function check_manip_date(status) {
+if (status=='verify'){
+// this part of function('verify') is used to check if dateenrolled<date expiry
+if (document.form.dateenrolled != '' && document.form.dateexpiry.value !='') {
+var myDate1=document.form.dateenrolled.value.split ('/');
+var myDate2=document.form.dateexpiry.value.split ('/');
+	if ((myDate1[2]>myDate2[2])||(myDate1[2]==myDate2[2] && myDate1[1]>myDate2[1])||(myDate1[2]==myDate2[2] && myDate1[1]>=myDate2[1] && myDate1[0]>=myDate2[0]))
+	
+		{ 
+		document.form.dateenrolled.focus();
+		var msg = ("Warning !!! check date expiry  >= date enrolment");
+		alert(msg);
+		}
+	}
+	}
+}
+//end function
+
+
+// function to test all fields in forms and nav in different forms(1 ,2 or 3)
+ function check_form_borrowers(nav){
+var statut=0;
+if (nav < document.form.step.value) {
+	document.form.step.value=nav;
+	if ((document.form.step.value==0) && document.form.check_member.value == 1 )
+	{
+ 	
+		if (document.form_double.answernodouble)	{
+			if( (!(document.form_double.answernodouble.checked))){
+				document.form.nodouble.value=0;
+			}
+			else {
+			document.form.nodouble.value=1;
+			}
+ 		}
+ 	} 
+	document.form.submit();
+	
+} else {
+	if (document.form.BorrowerMandatoryField.value==''||document.form.FormFieldList.value=='' )
+	{}
+	else
+	{
+	    var champ_verif = document.form.BorrowerMandatoryField.value.split ('|');
+ 	    var champ_form= document.form.FormFieldList.value.split('|');
+	    var message ="The following fields are mandatory :\n";
+	    var message_champ="";
+		for (var j=0; j<champ_form.length; j++){ 
+			if (document.getElementsByName(""+champ_form[j]+"")[0]){
+			for (var i=0; i<champ_verif.length; i++) {
+					if (document.getElementsByName(""+champ_verif[i]+"")[0]) {
+					var val_champ=eval("document.form."+champ_verif[i]+".value");
+					var ref_champ=eval("document.form."+champ_verif[i]);
+					var val_form=eval("document.form."+champ_form[j]+".value");
+					if (champ_verif[i] == champ_form[j]){
+						//check if it's a select
+						if (ref_champ.type=='select-one'){
+							if (ref_champ.options[0].selected ){
+								// action if field is empty
+								message_champ+=champ_verif[i]+"\n";
+								//test to konw if you must show a message with error
+								statut=1;
+							}
+						}else {
+							if ( val_champ == '' ) {
+								// action if the field is not empty
+								message_champ+=champ_verif[i]+"\n";
+								statut=1;
+								}	
+							}	
+						}
+					}
+				}
+			}
+		}
+	}
+//borrowers form 2 test if u chcked no to the quetsion of double 
+ 	if (document.form.step.value==2 && statut!=1 && document.form.check_member.value > 0 )
+	{
+		
+  		
+			if (!(document.form_double.answernodouble.checked)){
+					
+				message ="";
+					message_champ+=("Please confirm suspicious duplicate borrower !!! ");
+					statut=1;
+					document.form.nodouble.value=0;
+			}
+			else {
+			document.form.nodouble.value=1;
+			}
+ 	}
+		
+			if (statut==1){
+			//alert if at least 1 error
+				alert(message+"\n"+message_champ);
+			}
+			else 
+			{
+			document.form.step=nav;
+			document.form.submit();
+			}
+		}
+}
+
+function Dopop(link) {
+// // 	var searchstring=document.form.value[i].value;
+	var newin=window.open(link,'popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=no,top');
+}
+
+function Dopopguarantor(link) {
+
+	var newin=window.open(link,'popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=yes,top');
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
index 828a27d5ea..5727911d9b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
@@ -1,23 +1,15 @@
 <div id="submenu">
-    <ul>
-    <li>
     <a href="/cgi-bin/koha/circ/circulation.pl">Issues</a>
     <a href="/cgi-bin/koha/circ/returns.pl">Returns</a>
     <a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a>
     <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set branch</a>
-    </li>
-    <li>
-    Reserves <a href="/cgi-bin/koha/circ/reserve.pl">Pending</a>
+    <a href="/cgi-bin/koha/circ/reserve.pl">Pending</a>
     <a href="/cgi-bin/koha/circ/branchreserves.pl">Waiting</a>
-    Transfers <a href="/cgi-bin/koha/circ/waitingreservestransfers.pl">to do</a>
-    <a href="/cgi-bin/koha/circ/currenttransfers.pl">to recieve</a>
-    </li>
-    <li>
+    <a href="/cgi-bin/koha/circ/waitingreservestransfers.pl">Transfers (waiting)</a>
+    <a href="/cgi-bin/koha/circ/currenttransfers.pl">Transfers(current)</a>
 	<a href="/cgi-bin/koha/circ/overdue.pl">Overdues</a>
     <a href="/cgi-bin/koha/circ/branchoverdues.pl">Overdues by branch/department</a>
     <a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Daily reconciliation</a>
-    </li>
-    </ul>
 </div>
 
 <div id="main">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
index 1cb4c18a21..c097e4a979 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
@@ -1,10 +1,9 @@
-<!-- TMPL_INCLUDE NAME="javascript/members.js" -->
 <div id="submenu">
- 	<a href="/cgi-bin/koha/members/members-home.pl">Search</a>
- 	<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A"/>Add adult</a>
- 	<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C"/>Add child</a>
- 	<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=P"/>Add prof</a>
- 	<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=I"/>Add org</a>
+ 	<a href="/cgi-bin/koha/members/members-home.pl">Borrowers</a>
+ 	<a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A">Add adult</a>
+ 	<a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C">Add child</a>
+ 	<a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P">Add professional</a>
+ 	<a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I">Add organisation</a>
 </div>
 
 <div id="main">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
index 96181c3050..62521e578d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
@@ -2,8 +2,7 @@
     <a href="#" onclick="javascript:window.open('/cgi-bin/koha/help.pl','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes');">[?]</a>
 </div>
 <div id="mainmenu">
-<h3><a href="/cgi-bin/koha/mainpage.pl">Koha
-intranet</a></h3>
+<h3><a href="/cgi-bin/koha/mainpage.pl">Koha Staff Client</a></h3>
     <!-- TMPL_IF NAME="CAN_user_circulate" -->
     <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
     <ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl
index 583a97fc05..fe968138cc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl
@@ -1,87 +1,96 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Borrowers &rsaquo; Search Results</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<div id="hd">
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
+</div>
+<div id="bd">
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+</div>
+<div id="yui-main">
+<div class="yui-b">
+
+<a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Borrowers</a><!-- TMPL_IF NAME="searching" --> &rsaquo; <a>Search Results</a><!-- /TMPL_IF -->
 
-<h1>Borrowers &rsaquo; Search Results</h1>
+<form name="f" action="/cgi-bin/koha/members/member.pl" method="post">
+    <label for="member">Search by name or barcode:</label>
+    <input id="member" type="text" size="25" name="member" />
+    order by:
+    <select name="orderby" id="orderby">
+    <option value="surname,firstname">Surname</option>
+    <option value="cardnumber">Cardnumber</option>
+    </select>
+    <input type="submit" value="Search" />
+</form>
+<div>
+    Browse by last name:
+    <a href="/cgi-bin/koha/members/member.pl?member=a">A</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=b">B</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=c">C</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=d">D</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=e">E</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=f">F</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=g">G</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=h">H</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=i">I</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=j">J</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=k">K</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=l">L</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=m">M</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=n">N</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=o">O</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=p">P</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=q">Q</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=r">R</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=s">S</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=t">T</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=u">U</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=v">V</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=w">W</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=x">X</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=y">Y</a>
+    <a href="/cgi-bin/koha/members/member.pl?member=z">Z</a>
+</div>
 
-    <form name="f" action="/cgi-bin/koha/members/member.pl" method="post">
-        <label for="member">Search by name or barcode:</label>
-        <input id="member" type="text" size="25" name="member" />
-        <select name="orderby" id="orderby">
-            <option value="surname,firstname">Order by last name</option>
-            <option value="cardnumber">Order by card number</option>
-        </select>
-        <input type="submit" value="Search" />
-    </form>
-    <div>
-        Browse by last name:
-        <a href="/cgi-bin/koha/members/member.pl?member=a">A</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=b">B</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=c">C</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=d">D</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=e">E</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=f">F</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=g">G</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=h">H</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=i">I</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=j">J</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=k">K</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=l">L</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=m">M</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=n">N</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=o">O</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=p">P</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=q">Q</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=r">R</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=s">S</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=t">T</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=u">U</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=v">V</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=w">W</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=x">X</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=y">Y</a>
-        <a href="/cgi-bin/koha/members/member.pl?member=z">Z</a>
-    </div>
 <!-- TMPL_IF NAME="resultsloop" -->
 <div class="searchresults">
-	<table>
-	<tr>
-		<th>Card</th>
-		<th>Name</th>
-		<th>Cat</th>
-		<th>OD/Issues</th>
-		<th>Fines</th>
-		<th>Notes</th>
-	</tr>
-	<!-- TMPL_LOOP NAME="resultsloop" -->
-	<!-- TMPL_IF EXPR="odissue+fines > 0" -->
-	   <tr class="problem">
-	<!-- TMPL_ELSE -->
-	   <tr>
-	<!-- /TMPL_IF -->
-		<td><!-- TMPL_VAR NAME="cardnumber" --></td>
-		<td><p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a></p>
-		<p><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></p> </td>
-		<td><!-- TMPL_VAR NAME="category_description" --> (<!-- TMPL_VAR name="category_type" -->)</td>
-		<td><!-- TMPL_VAR NAME="odissue" --></td>
-		<td><!-- TMPL_VAR NAME="fines" --></td>
-		<td><!-- TMPL_VAR NAME="borrowernotes" --></td>
-	</tr>
+    <table>
+    <tr>
+    <th>Card</th>
+    <th>Name</th>
+    <th>Cat</th>
+    <th>OD/Issues</th>
+    <th>Fines</th>
+    <th>Notes</th>
+    </tr>
+    <!-- TMPL_LOOP NAME="resultsloop" -->
+    <!-- TMPL_IF EXPR="odissue+fines > 0" -->
+    <tr class="problem">
+    <!-- TMPL_ELSE -->
+    <tr>
+    <!-- /TMPL_IF -->
+    <td><!-- TMPL_VAR NAME="cardnumber" --></td>
+    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a>
+    <!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city -->
+    </td>
+    <td><!-- TMPL_VAR NAME="category_description" --> (<!-- TMPL_VAR name="category_type" -->)</td>
+    <td><!-- TMPL_VAR NAME="odissue" --></td>
+    <td><!-- TMPL_VAR NAME="fines" --></td>
+    <td><!-- TMPL_VAR NAME="borrowernotes" --></td>
+    </tr>
     <!-- /TMPL_LOOP -->
-</table>
+    </table>
 </div>
 <!-- TMPL_ELSE -->
-    <!-- TMPL_IF NAME="searching" -->
-    No results found
-    <!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="searching" -->
+No results found
 <!-- /TMPL_IF -->
-
-    <script type="text/javascript">
-		//set the focus to the input text.    
-    	document.f.member.focus();
-    </script>
-
+<!-- /TMPL_IF -->
+<script type="text/javascript">
+//set the focus to the input text.    
+document.f.member.focus();
+</script>
+</div>
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
index db1d641446..8055abc8ec 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
@@ -1,15 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Adult Borrower Management</title>
 <script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/includes/members.js"></script>
+<!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
-<!-- Additions to enable Calendar system -->
-<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>
-<!-- End of additions -->
-
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 	<!-- TMPL_IF NAME="opadd" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
index 193984a953..06f901d343 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
@@ -1,15 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Child Borrower Management</title>
 <script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/includes/members.js"></script>
+<!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
-<!-- Additions to enable Calendar system -->
-<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>
-<!-- End of additions -->
-
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 <script language="javascript" type="text/javascript">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl
index 557de3529a..7299939123 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl
@@ -1,15 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Organisation Borrower Management</title>
 <script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/includes/members.js"></script>
+<!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
-<!-- Additions to enable Calendar system -->
-<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>
-<!-- End of additions -->
-
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
index 7a5433f48b..dc44cef870 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
@@ -1,166 +1,156 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Professional Borrower Management</title>
 <script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/includes/members.js"></script>
+<!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
-<!-- Additions to enable Calendar system -->
-<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>
-<!-- End of additions -->
-
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
-	<!-- TMPL_IF NAME="opadd" -->
-	<h1>
-		Add professional borrower (step <!-- TMPL_VAR NAME="step" -->) <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
-	</h1>
-	<!-- TMPL_ELSE -->
-	<h1 >
-		Modify professional borrower <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
-	</h1>
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="check_member" -->
-		<!-- TMPL_IF NAME="step_2" -->
-	<p>
-	<form name="form_double">
-		<div id="problem">
-			Duplicate suspected 
-			<a href="javascript:Dopop('borrowers_details.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->');" class="borrowers_button">Details</a>
-			Duplicate ?	
-			<a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->&category_type=<!--TMPL_VAR NAME="check_categorytype"-->" class="borrowers_button">Yes</a> 
-			&nbsp;&nbsp;&nbsp; No, it is not
-			<INPUT type="checkbox" <!-- TMPL_IF NAME="checked"--> checked <!--/TMPL_IF--> name="answernodouble" >
-		</div>
-	</form>	
-	
-		</p>	
-		<!--/TMPL_IF-->
-	<!--/TMPL_IF-->
-	<!-- TMPL_IF Name="nok" -->
-		<h1>ERROR</h1>
-		<div id="problem">
-			<p>The following fields are wrong. Please fix it/them</p>
-			<!-- TMPL_IF NAME="ERROR_login_exist" -->
-				<p>login/password already exist</p>
-			<!-- /TMPL_IF -->
-		 <!-- TMPL_IF NAME="ERROR_age_limitations" -->
-                                Borrower is too young or too old for this category
-                        <!-- /TMPL_IF -->
-		</div>
-	<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="opadd" -->
+    <h1>Add professional borrower (step <!-- TMPL_VAR NAME="step" -->) <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --></h1>
+    <!-- TMPL_ELSE -->
+    <h1>Modify professional borrower <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --></h1>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="check_member" -->
+        <!-- TMPL_IF NAME="step_2" -->
+    <p>
+    <form name="form_double">
+        <div id="problem">
+            Duplicate borrower suspected 
+            <a href="javascript:Dopop('borrowers_details.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->');" class="borrowers_button">Details</a>
+            Duplicate ? 
+            <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->&category_type=<!--TMPL_VAR NAME="check_categorytype"-->" class="borrowers_button">Yes</a> 
+            &nbsp;&nbsp;&nbsp; No, it is not
+            <INPUT type="checkbox" <!-- TMPL_IF NAME="checked"--> checked <!--/TMPL_IF--> name="answernodouble" >
+        </div>
+    </form> 
+    </p>    
+        <!--/TMPL_IF-->
+    <!--/TMPL_IF-->
+
+    <!-- TMPL_IF Name="nok" -->
+        <h1>ERROR</h1>
+        <div id="problem">
+        The following fields are wrong. Please fix it/them:
+            <!-- TMPL_IF NAME="ERROR_login_exist" -->
+            login already exists
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="ERROR_age_limitations" -->
+            Borrower age is wrong for this category
+            <!-- /TMPL_IF -->
+        </div>
+    <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="step_1"--><!--BEGIN OF TEST IF NOT collectivity BUT IN 1 STEP-->
-<form name="form"  action="/cgi-bin/koha/members/memberentry.pl" method="post"> 
-		<!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
-		<input type="hidden" name="FormFieldList" value="surname|select_city|othernames|initials|title|cardnumber|firstname|dateofbirth|sort1|sort2">
-		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-		<input type="hidden" name="type" value="borrowers">
-		<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-		<input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
-		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
-		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
-		<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" >
-		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-		<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->"/>
+<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post"> 
+        <!-- field always hidden in different form (1,2,3) -->
+        <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->"/>
+        <input type="hidden" name="FormFieldList" value="surname|select_city|othernames|initials|title|cardnumber|firstname|dateofbirth|sort1|sort2">
+        <input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
+        <input type="hidden" name="type" value="borrowers">
+        <input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
+        <input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
+        <input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
+        <input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
+        <input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
+        <input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" >
+        <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
+        <input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->"/>
 
-<!-- 		from form 2 -->
-		<input type="hidden" name="streetnumber"  value="<!-- TMPL_VAR NAME="streetnumber" -->">
-		<input type="hidden" name="address"  value="<!-- TMPL_VAR NAME="address" -->">
-		<input type="hidden" name="address2"  value="<!-- TMPL_VAR NAME="address2" -->">
-		<input type="hidden" name="streettype"  value="<!-- TMPL_VAR NAME="streettype" -->">	
-		<input type="hidden" name="zipcode"  value="<!-- TMPL_VAR NAME="zipcode" -->">
-		<input type="hidden" name="city"  value="<!-- TMPL_VAR NAME="city" -->"> 
-		<input type="hidden" name="branchcode"  value="<!-- TMPL_VAR NAME="branchcode" -->">
-		<input type="hidden" name="phone"   value="<!-- TMPL_VAR NAME="phone" -->" >
-		<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-		<input type="hidden" name="mobile"  value="<!-- TMPL_VAR NAME="mobile" -->" >	
-		<input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" >
-		<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-		<input type="hidden" name="contactname"  value="<!-- TMPL_VAR NAME="contactname" -->">
-		<input type="hidden" name="relationship"  value="<!-- TMPL_VAR NAME="relationship" -->">
-		<input type="hidden" name="B_address" value="<!-- TMPL_VAR NAME="B_address" -->">
-		<input type="hidden" name="B_zipcode"  value="<!-- TMPL_VAR NAME="B_zipcode" -->">
-		<input type="hidden" name="B_city"  value="<!-- TMPL_VAR NAME="B_city" -->">
-		<input type="hidden" name="B_phone"  value="<!-- TMPL_VAR NAME="B_phone" -->"> 
-		<input type="hidden" name="fax"  value="<!-- TMPL_VAR NAME="fax" -->"> 	
-		<textarea style="display:none;" name="contactnote" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnote" --></textarea>
+<!-- from form 2 -->
+        <input type="hidden" name="streetnumber"  value="<!-- TMPL_VAR NAME="streetnumber" -->">
+        <input type="hidden" name="address"  value="<!-- TMPL_VAR NAME="address" -->">
+        <input type="hidden" name="address2"  value="<!-- TMPL_VAR NAME="address2" -->">
+        <input type="hidden" name="streettype"  value="<!-- TMPL_VAR NAME="streettype" -->">    
+        <input type="hidden" name="zipcode"  value="<!-- TMPL_VAR NAME="zipcode" -->">
+        <input type="hidden" name="city"  value="<!-- TMPL_VAR NAME="city" -->"> 
+        <input type="hidden" name="branchcode"  value="<!-- TMPL_VAR NAME="branchcode" -->">
+        <input type="hidden" name="phone"   value="<!-- TMPL_VAR NAME="phone" -->" >
+        <input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
+        <input type="hidden" name="mobile"  value="<!-- TMPL_VAR NAME="mobile" -->" >   
+        <input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" >
+        <input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
+        <input type="hidden" name="contactname"  value="<!-- TMPL_VAR NAME="contactname" -->">
+        <input type="hidden" name="relationship"  value="<!-- TMPL_VAR NAME="relationship" -->">
+        <input type="hidden" name="B_address" value="<!-- TMPL_VAR NAME="B_address" -->">
+        <input type="hidden" name="B_zipcode"  value="<!-- TMPL_VAR NAME="B_zipcode" -->">
+        <input type="hidden" name="B_city"  value="<!-- TMPL_VAR NAME="B_city" -->">
+        <input type="hidden" name="B_phone"  value="<!-- TMPL_VAR NAME="B_phone" -->"> 
+        <input type="hidden" name="fax"  value="<!-- TMPL_VAR NAME="fax" -->">  
+        <textarea style="display:none;" name="contactnote" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnote" --></textarea>
 
-<!-- 		from form 3 -->
-		<input type="hidden" name="dateenrolled"  value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-		<input type="hidden" name="dateexpiry"  value="<!-- TMPL_VAR NAME="dateexpiry" -->">
-		<textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
-		<textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-		<input type="hidden" name="userid"   value="<!-- TMPL_VAR NAME="userid" -->">
-		<input type="hidden" name="password"   value="<!-- TMPL_VAR NAME="password" -->">	
-		<input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
-		<input type="hidden" name="lost"  value="<!-- TMPL_VAR NAME="lost" -->" />
-		<input type="hidden" name="gonenoaddress"  value="<!-- TMPL_VAR NAME="gonenoaddress" -->" />
-	<!-- TMPL_IF NAME="opadd" -->
-		<input type="hidden" name="op" value="add">
-	<!-- TMPL_ELSE -->
-		<input type="hidden" name="op" value="modify">
-	<!-- /TMPL_IF -->
-	<!-- TMPL_VAR NAME="member" -->
-	<p>
-		<!-- TMPL_IF NAME="mandatorycardnumber" -->
-		<label style="font-weight:bold">
-		<!--TMPL_ELSE-->
-		<label>
-		<!-- /TMPL_IF-->
-		Card number</label>
-			<input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
-	</p>	
-	<fieldset id="memberentry_identity">
-		<legend>Borrower identity</legend>
-		<p>
-		<!-- TMPL_IF NAME="female" -->
-		<input type="radio" name="sex" value="F" checked>Female
-		<input type="radio" name="sex" value="M">Male
-		<!-- TMPL_ELSE -->
-		<input type="radio" name="sex" value="F">Female
-		<input type="radio" name="sex" value="M" checked>Male
-		<!-- /TMPL_IF -->
-		</p>
-		<p>
-		<!-- TMPL_IF NAME="mandatorytitle" -->
-			<label style="font-weight:bold">
-		<!-- TMPL_ELSE -->
-			<label>
-		<!-- /TMPL_IF-->
-		Title</label>
-		<!-- TMPL_VAR NAME="borrotitlepopup" -->
-		</p>
-		<p>
-		<!-- TMPL_IF NAME="mandatorysurname" -->
-		<label style="font-weight:bold">
-		<!-- TMPL_ELSE -->
-		<label>
-		<!-- /TMPL_IF-->
-		Surname</label>
-		<input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
-		</p>
-		<p>
-		<!-- TMPL_IF NAME="mandatoryfirstname" -->
-		<label style="font-weight:bold">
-		<!-- TMPL_ELSE -->
-		<label>
-		<!-- /TMPL_IF-->
-		Firstname</label>
-		<input style="text-transform:capitalize;" type="text" name="firstname" size="20"  value="<!-- TMPL_VAR NAME="firstname" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorydateofbirth" -->
-			<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->	
-			<label>
-			<!-- /TMPL_IF-->
-			Date of birth</label>
-			<input type="text" id="dateofbirth" name="dateofbirth" size="20" onBlur="CheckDate(document.form.dateofbirth);" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
+<!-- from form 3 -->
+        <input type="hidden" name="dateenrolled"  value="<!-- TMPL_VAR NAME="dateenrolled" -->">
+        <input type="hidden" name="dateexpiry"  value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+        <textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
+        <textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
+        <input type="hidden" name="userid"   value="<!-- TMPL_VAR NAME="userid" -->">
+        <input type="hidden" name="password"   value="<!-- TMPL_VAR NAME="password" -->">   
+        <input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
+        <input type="hidden" name="lost"  value="<!-- TMPL_VAR NAME="lost" -->" />
+        <input type="hidden" name="gonenoaddress"  value="<!-- TMPL_VAR NAME="gonenoaddress" -->" />
+    <!-- TMPL_IF NAME="opadd" -->
+        <input type="hidden" name="op" value="add">
+    <!-- TMPL_ELSE -->
+        <input type="hidden" name="op" value="modify">
+    <!-- /TMPL_IF -->
+    <!-- TMPL_VAR NAME="member" -->
+    <p>
+        <!-- TMPL_IF NAME="mandatorycardnumber" -->
+        <label style="font-weight:bold">
+        <!--TMPL_ELSE-->
+        <label>
+        <!-- /TMPL_IF-->
+        Cardnumber</label>
+            <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
+    </p>    
+    <fieldset id="memberentry_identity">
+        <legend>Borrower identity</legend>
+        <p>
+        <!-- TMPL_IF NAME="female" -->
+        <input type="radio" name="sex" value="F" checked>Female
+        <input type="radio" name="sex" value="M">Male
+        <!-- TMPL_ELSE -->
+        <input type="radio" name="sex" value="F">Female
+        <input type="radio" name="sex" value="M" checked>Male
+        <!-- /TMPL_IF -->
+        </p>
+        <p>
+        <!-- TMPL_IF NAME="mandatorytitle" -->
+            <label style="font-weight:bold">
+        <!-- TMPL_ELSE -->
+            <label>
+        <!-- /TMPL_IF-->
+        Title</label>
+        <!-- TMPL_VAR NAME="borrotitlepopup" -->
+        </p>
+        <p>
+        <!-- TMPL_IF NAME="mandatorysurname" -->
+        <label style="font-weight:bold">
+        <!-- TMPL_ELSE -->
+        <label>
+        <!-- /TMPL_IF-->
+        Surname</label>
+        <input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
+        </p>
+        <p>
+        <!-- TMPL_IF NAME="mandatoryfirstname" -->
+        <label style="font-weight:bold">
+        <!-- TMPL_ELSE -->
+        <label>
+        <!-- /TMPL_IF-->
+        Firstname</label>
+        <input style="text-transform:capitalize;" type="text" name="firstname" size="20"  value="<!-- TMPL_VAR NAME="firstname" -->">
+        </p>
+        <p>
+            <!-- TMPL_IF NAME="mandatorydateofbirth" -->
+            <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->  
+            <label>
+            <!-- /TMPL_IF-->
+            Date of birth</label>
+            <input type="text" id="dateofbirth" name="dateofbirth" size="20" onBlur="CheckDate(document.form.dateofbirth);" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
             <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="dateofbirth_button" />
             <script language="JavaScript" type="text/javascript">
                 Calendar.setup(
@@ -171,503 +161,503 @@
                 }
                 );
             </script>
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryinitials" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Initials</label>
-			<input type="text" name="initials" size="20"  value="<!-- TMPL_VAR NAME="initials" -->">	
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryothernames" -->
-			<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-			<label>
-			<!-- /TMPL_IF-->
-			Other name</label>
-			<input style="text-transform:uppercase;" type="text" name="othernames" size="20"  value="<!-- TMPL_VAR NAME="othernames" -->" >
-		</p>
-	</fieldset>
-	<fieldset id="memberentry_identity">
-		<legend>Borrower type</legend>
-		<p>
+        </p>
+        <p>
+            <!-- TMPL_IF NAME="mandatoryinitials" -->
+                <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+                <label>
+            <!-- /TMPL_IF-->
+            Initials</label>
+            <input type="text" name="initials" size="20"  value="<!-- TMPL_VAR NAME="initials" -->">    
+        </p>
+        <p>
+            <!-- TMPL_IF NAME="mandatoryothernames" -->
+            <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+            <label>
+            <!-- /TMPL_IF-->
+            Other name</label>
+            <input style="text-transform:uppercase;" type="text" name="othernames" size="20"  value="<!-- TMPL_VAR NAME="othernames" -->" >
+        </p>
+    </fieldset>
+    <fieldset id="memberentry_identity">
+        <legend>Borrower type</legend>
+        <p>
     <!-- TMPL_IF NAME="catcodepopup" -->
-			    <label>Category</label>
-			    <!-- TMPL_VAR NAME="catcodepopup" -->
-			<!-- TMPL_ELSE -->
-			    <span class="problem">There is no category type to add a Professional.</span>
-			        <a href="/cgi-bin/koha/admin/categorie.pl">Please create one</a>
-			     
-			<!-- /TMPL_IF -->
-		</p>
-		<!-- TMPL_IF NAME="city_cgipopup" -->	
-		<p>
-			<!-- TMPL_IF NAME="mandatoryselect_city" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Select a city</label>
-			<!-- TMPL_VAR NAME="citypopup" -->
-		</p>
-		<!-- /TMPL_IF-->
-		<p>
-			<!-- TMPL_IF NAME="mandatorysort1" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Sort 1</label>
-			<!--TMPL_IF NAME="CGIsort1" -->	
-				<!-- TMPL_VAR NAME="CGIsort1" -->
-			<!--TMPL_ELSE-->
-				<input type="text" name="sort1" size="20"  value="<!-- TMPL_VAR NAME="sort1" -->" >
-			<!-- /TMPL_IF -->		
-		</p>
-		<p>
-		<!-- TMPL_IF NAME="mandatorysort2" -->
-		<label style="font-weight:bold">
-		<!-- TMPL_ELSE -->
-		<label>
-		<!-- /TMPL_IF-->
-		Sort 2</label>
-		<!--TMPL_IF NAME="CGIsort2" -->	
-			<!-- TMPL_VAR NAME="CGIsort2" -->
-		<!--TMPL_ELSE-->
-			<input type="text" name="sort2" size="20"  value="<!-- TMPL_VAR NAME="sort2" -->" >
-		<!-- /TMPL_IF -->	
-		</p>
-	</fieldset>
-	<div>
-		<input type="button" name="next_step" value="Next Step" onclick="check_form_borrowers(1);">
-	</div>
+                <label>Category</label>
+                <!-- TMPL_VAR NAME="catcodepopup" -->
+            <!-- TMPL_ELSE -->
+                <span class="problem">There is no category type to add a Professional borrower.</span>
+                Please <a href="/cgi-bin/koha/admin/categorie.pl">create one</a>
+                 
+            <!-- /TMPL_IF -->
+        </p>
+        <!-- TMPL_IF NAME="city_cgipopup" -->   
+        <p>
+            <!-- TMPL_IF NAME="mandatoryselect_city" -->
+                <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+                <label>
+            <!-- /TMPL_IF-->
+            Select a city</label>
+            <!-- TMPL_VAR NAME="citypopup" -->
+        </p>
+        <!-- /TMPL_IF-->
+        <p>
+            <!-- TMPL_IF NAME="mandatorysort1" -->
+                <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+                <label>
+            <!-- /TMPL_IF-->
+            Sort 1</label>
+            <!--TMPL_IF NAME="CGIsort1" --> 
+                <!-- TMPL_VAR NAME="CGIsort1" -->
+            <!--TMPL_ELSE-->
+                <input type="text" name="sort1" size="20"  value="<!-- TMPL_VAR NAME="sort1" -->" >
+            <!-- /TMPL_IF -->       
+        </p>
+        <p>
+        <!-- TMPL_IF NAME="mandatorysort2" -->
+        <label style="font-weight:bold">
+        <!-- TMPL_ELSE -->
+        <label>
+        <!-- /TMPL_IF-->
+        Sort 2</label>
+        <!--TMPL_IF NAME="CGIsort2" --> 
+            <!-- TMPL_VAR NAME="CGIsort2" -->
+        <!--TMPL_ELSE-->
+            <input type="text" name="sort2" size="20"  value="<!-- TMPL_VAR NAME="sort2" -->" >
+        <!-- /TMPL_IF -->   
+        </p>
+    </fieldset>
+    <div>
+        <input type="button" name="next_step" value="Next Step" onclick="check_form_borrowers(1);">
+    </div>
 </form>
-<!-- /TMPL_IF --><!--STEP_1	-->
+<!-- /TMPL_IF --><!--STEP_1 -->
 
 
 <!-- TMPL_IF NAME="step_2"-->
 <!-- ############################BEGIN FORM PROFESSIONAL############################################"-->
-	
+    
 <form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
-		<!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
-		<input type="hidden" name="FormFieldList" value="cardnumber|streetnumber|streettype|address|address2|zipcode|city|contactname|phone|phonepro|mobile|email|emailpro|B_zipcode|B_phone|B_address|B_city|relationship|fax|contactnote">
-		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-		<input type="hidden" name="type" value="borrowers">
-		<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-		<input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
-		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
-		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
-		<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-		<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
-	
+        <!--        field always hidden in different form (1,2,3) -->
+        <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->"/>
+        <input type="hidden" name="FormFieldList" value="cardnumber|streetnumber|streettype|address|address2|zipcode|city|contactname|phone|phonepro|mobile|email|emailpro|B_zipcode|B_phone|B_address|B_city|relationship|fax|contactnote"/>
+        <input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->"/>
+        <input type="hidden" name="type" value="borrowers"/>
+        <input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->"/>
+        <input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->"/>
+        <input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->"/>
+        <input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->"/>
+        <input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
+        <input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
+        <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->"/>
+        <input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
+    
 
-<!-- 		from form 1 -->
-		<input type="hidden" name="title"  value="<!-- TMPL_VAR NAME="title" -->">
-		<input type="hidden" name="surname"  value="<!-- TMPL_VAR NAME="surname" -->" >
-		<input type="hidden" name="firstname"  value="<!-- TMPL_VAR NAME="firstname" -->">
-		<input type="hidden" name="dateofbirth"  value="<!-- TMPL_VAR NAME="dateofbirth" -->">
-		<input type="hidden" name="initials"  value="<!-- TMPL_VAR NAME="initials" -->">
-		<input type="hidden" name="othernames"  value="<!-- TMPL_VAR NAME="othernames" -->" >
-		<input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->" >
-		<input type="hidden" name="categorycode"  value="<!-- TMPL_VAR NAME="categorycode" -->">
-		<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->">
-		<input type="hidden" name="sort1"   value="<!-- TMPL_VAR NAME="sort1" -->">
-		<input type="hidden" name="sort2"   value="<!-- TMPL_VAR NAME="sort2" -->">
-		
-<!-- 		from form 3 -->
-		<input type="hidden" name="dateenrolled"  value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-		<input type="hidden" name="dateexpiry"  value="<!-- TMPL_VAR NAME="dateexpiry" -->">
-		<textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
-		<textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-		<input type="hidden" name="userid"   value="<!-- TMPL_VAR NAME="userid" -->">
-		<input type="hidden" name="password"   value="<!-- TMPL_VAR NAME="password" -->">	
-		<input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
-		<input type="hidden" name="lost"  value="<!-- TMPL_VAR NAME="lost" -->" />
-		<input type="hidden" name="gonenoaddress"  value="<!-- TMPL_VAR NAME="gonenoaddress" -->" />
-		
-		<!-- TMPL_IF NAME="opadd" -->
-			<input type="hidden" name="op" value="add">
-		<!-- TMPL_ELSE -->
-			<input type="hidden" name="op" value="modify">
-		<!-- /TMPL_IF -->
+<!--        from form 1 -->
+        <input type="hidden" name="title"  value="<!-- TMPL_VAR NAME="title" -->"/>
+        <input type="hidden" name="surname"  value="<!-- TMPL_VAR NAME="surname" -->"/>
+        <input type="hidden" name="firstname"  value="<!-- TMPL_VAR NAME="firstname" -->"/>
+        <input type="hidden" name="dateofbirth"  value="<!-- TMPL_VAR NAME="dateofbirth" -->"/>
+        <input type="hidden" name="initials"  value="<!-- TMPL_VAR NAME="initials" -->"/>
+        <input type="hidden" name="othernames"  value="<!-- TMPL_VAR NAME="othernames" -->"/>
+        <input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->"/>
+        <input type="hidden" name="categorycode"  value="<!-- TMPL_VAR NAME="categorycode" -->"/>
+        <input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->"/>
+        <input type="hidden" name="sort1"   value="<!-- TMPL_VAR NAME="sort1" -->"/>
+        <input type="hidden" name="sort2"   value="<!-- TMPL_VAR NAME="sort2" -->"/>
+        
+<!--        from form 3 -->
+        <input type="hidden" name="dateenrolled"  value="<!-- TMPL_VAR NAME="dateenrolled" -->"/>
+        <input type="hidden" name="dateexpiry"  value="<!-- TMPL_VAR NAME="dateexpiry" -->"/>
+        <textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
+        <textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
+        <input type="hidden" name="userid"   value="<!-- TMPL_VAR NAME="userid" -->"/>
+        <input type="hidden" name="password"   value="<!-- TMPL_VAR NAME="password" -->"/>  
+        <input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
+        <input type="hidden" name="lost"  value="<!-- TMPL_VAR NAME="lost" -->" />
+        <input type="hidden" name="gonenoaddress"  value="<!-- TMPL_VAR NAME="gonenoaddress" -->" />
+        
+        <!-- TMPL_IF NAME="opadd" -->
+            <input type="hidden" name="op" value="add"/>
+        <!-- TMPL_ELSE -->
+            <input type="hidden" name="op" value="modify"/>
+        <!-- /TMPL_IF -->
 
-		<input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
+        <input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
 
-	<p>
-		<!-- TMPL_IF NAME="mandatorycardnumber" -->
-		<label style="font-weight:bold">
-		<!-- TMPL_ELSE -->
-		<label>
-		<!-- /TMPL_IF-->
-		Card number</label>
-		<input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
-	</p>
-	<fieldset is="memberentry_address">
-		<legend>Professional address</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatorystreetnumber" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->	
-			Street number</label>
-			<input type="text" name="streetnumber" size="5" value="<!-- TMPL_VAR NAME="streetnumber" -->">
-		</p>
-			<!-- TMPL_IF NAME="road_cgipopup" -->
-				<p>
-				<!-- TMPL_IF NAME="mandatorystreettype" -->
-					<label style="font-weight:bold">
-				<!--TMPL_ELSE-->
-					<label>
-				<!-- /TMPL_IF-->
-				Road type</label>
-				<!-- TMPL_VAR NAME="roadpopup" -->
-				</p>
-			<!--/TMPL_IF-->	
-		<p>
-			<!-- TMPL_IF NAME="mandatoryaddress" -->
-			<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->	
-			Address</label>
-			<input type="text" name="address" size="34" value="<!-- TMPL_VAR NAME="address" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryaddress2s" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Address 2</label>
-			<input type="text" name="address2" size="33" value="<!-- TMPL_VAR NAME="address2" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryzipcode" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-				Zipcode</label>
-			<input type="text" name="zipcode" size="10"  maxlength="10" value="<!-- TMPL_VAR NAME="zipcode" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorycity" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-				City</label>
-			<input style="text-transform:uppercase;" type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorybranchcode" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-				Branch</label>
-		<!-- TMPL_VAR NAME="CGIbranch" -->
-		</p>
-	</fieldset>
-	<fieldset>
-		<legend>Professional contact</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryphone" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Phone (home)</label>
-			<input type="text" name="phone" value="<!-- TMPL_VAR NAME="phone" -->" >
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryphonepro" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Phone (prof)</label>
-			<input type="text" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorymobile" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Phone (cell)</label>				
-			<input type="text" name="mobile" value="<!-- TMPL_VAR NAME="mobile" -->" >
-		</p>
-		<p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryemail" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			E-mail (home)</label>
-			<input type="text" name="email" value="<!-- TMPL_VAR NAME="email" -->" >	
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryemailpro" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			E-mail (prof)</label>
-			<input type="text" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryefax" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Fax</label>	
-			<input type="text" name="fax" value="<!-- TMPL_VAR NAME="fax" -->">
-		</p>
-	</fieldset>
-	<fieldset>
-		<legend>Structure</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatorycontactname" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Name</label>
-			<input style="text-transform:uppercase;" type="text" name="contactname" size="20" value="<!-- TMPL_VAR NAME="contactname" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryrelationship" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Relation</label>
-			<select name="relationship" size="1">
-				<option> </option>
-				<!-- TMPL_LOOP NAME="relshiploop" -->
-					<option <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="relationship" --></option>
-				<!-- /TMPL_LOOP -->
-			</select>
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryB_address" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Adress </label>
-			<input type="text" name="B_address" size="40" value="<!-- TMPL_VAR NAME="B_address" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryB_zipcode" -->
-			<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-			<label>
-			<!-- /TMPL_IF-->	
-			Zipcode</label>
-			<input type="text" maxlength="5" name="B_zipcode" size="5" value="<!-- TMPL_VAR NAME="B_zipcode" -->">
-		</p>
-			<!-- TMPL_IF NAME="mandatoryB_city" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			City</label>
-			<input style="text-transform:uppercase;" type="text" name="B_city" size="20" value="<!-- TMPL_VAR NAME="B_city" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryB_phone" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Phone (home)</label>
-			<input type="text" name="B_phone" size="20" value="<!-- TMPL_VAR NAME="B_phone" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorycontactnote" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Notes</label>
-			<textarea  name="contactnote" cols="70" rows="2"   ><!-- TMPL_VAR NAME="contactnote" --></textarea>
-		</p>
-	</fieldset>
-		<div>
-		<input type="button" class="borrowers_button" name="etapeprec1" value="previous step" onclick="check_form_borrowers(0);">
-		<input type="button" class="borrowers_button" name="etapesuiv3" onclick="check_form_borrowers('3')" value="next step"></div>
-	</p>
+    <p>
+        <!-- TMPL_IF NAME="mandatorycardnumber" -->
+        <label style="font-weight:bold">
+        <!-- TMPL_ELSE -->
+        <label>
+        <!-- /TMPL_IF-->
+        Card number</label>
+        <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"/>
+    </p>
+    <fieldset is="memberentry_address">
+        <legend>Professional address</legend>
+        <p>
+            <!-- TMPL_IF NAME="mandatorystreetnumber" -->
+                <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+                <label>
+            <!-- /TMPL_IF-->    
+            Street number</label>
+            <input type="text" name="streetnumber" size="5" value="<!-- TMPL_VAR NAME="streetnumber" -->">
+        </p>
+            <!-- TMPL_IF NAME="road_cgipopup" -->
+                <p>
+                <!-- TMPL_IF NAME="mandatorystreettype" -->
+                    <label style="font-weight:bold">
+                <!--TMPL_ELSE-->
+                    <label>
+                <!-- /TMPL_IF-->
+                Road type</label>
+                <!-- TMPL_VAR NAME="roadpopup" -->
+                </p>
+            <!--/TMPL_IF--> 
+        <p>
+            <!-- TMPL_IF NAME="mandatoryaddress" -->
+            <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+                <label>
+            <!-- /TMPL_IF-->    
+            Address</label>
+            <input type="text" name="address" size="34" value="<!-- TMPL_VAR NAME="address" -->">
+        </p>
+        <p>
+            <!-- TMPL_IF NAME="mandatoryaddress2s" -->
+                <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+                <label>
+            <!-- /TMPL_IF-->
+            Address 2</label>
+            <input type="text" name="address2" size="33" value="<!-- TMPL_VAR NAME="address2" -->">
+        </p>
+        <p>
+            <!-- TMPL_IF NAME="mandatoryzipcode" -->
+                <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+                <label>
+            <!-- /TMPL_IF-->
+                Zipcode</label>
+            <input type="text" name="zipcode" size="10"  maxlength="10" value="<!-- TMPL_VAR NAME="zipcode" -->">
+        </p>
+        <p>
+            <!-- TMPL_IF NAME="mandatorycity" -->
+                <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+                <label>
+            <!-- /TMPL_IF-->
+                City</label>
+            <input style="text-transform:uppercase;" type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->">
+        </p>
+        <p>
+            <!-- TMPL_IF NAME="mandatorybranchcode" -->
+                <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+                <label>
+            <!-- /TMPL_IF-->
+                Branch</label>
+        <!-- TMPL_VAR NAME="CGIbranch" -->
+        </p>
+    </fieldset>
+    <fieldset>
+        <legend>Professional contact</legend>
+        <p>
+            <!-- TMPL_IF NAME="mandatoryphone" -->
+                <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+                <label>
+            <!-- /TMPL_IF-->
+            Phone (home)</label>
+            <input type="text" name="phone" value="<!-- TMPL_VAR NAME="phone" -->" >
+        </p>
+        <p>
+            <!-- TMPL_IF NAME="mandatoryphonepro" -->
+                <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+                <label>
+            <!-- /TMPL_IF-->
+            Phone (prof)</label>
+            <input type="text" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
+        </p>
+        <p>
+            <!-- TMPL_IF NAME="mandatorymobile" -->
+                <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+                <label>
+            <!-- /TMPL_IF-->
+            Phone (cell)</label>                
+            <input type="text" name="mobile" value="<!-- TMPL_VAR NAME="mobile" -->" >
+        </p>
+        <p>
+        <p>
+            <!-- TMPL_IF NAME="mandatoryemail" -->
+                <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+                <label>
+            <!-- /TMPL_IF-->
+            E-mail (home)</label>
+            <input type="text" name="email" value="<!-- TMPL_VAR NAME="email" -->" >    
+        </p>
+        <p>
+            <!-- TMPL_IF NAME="mandatoryemailpro" -->
+                <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+                <label>
+            <!-- /TMPL_IF-->
+            E-mail (prof)</label>
+            <input type="text" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
+        </p>
+        <p>
+            <!-- TMPL_IF NAME="mandatoryefax" -->
+                <label style="font-weight:bold">
+            <!--TMPL_ELSE-->
+                <label>
+            <!-- /TMPL_IF-->
+            Fax</label> 
+            <input type="text" name="fax" value="<!-- TMPL_VAR NAME="fax" -->">
+        </p>
+    </fieldset>
+    <fieldset>
+        <legend>Institution</legend>
+        <p>
+            <!-- TMPL_IF NAME="mandatorycontactname" -->
+                <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+                <label>
+            <!-- /TMPL_IF-->
+            Name</label>
+            <input style="text-transform:uppercase;" type="text" name="contactname" size="20" value="<!-- TMPL_VAR NAME="contactname" -->">
+        </p>
+        <p>
+            <!-- TMPL_IF NAME="mandatoryrelationship" -->
+                <label style="font-weight:bold">
+            <!--TMPL_ELSE-->
+                <label>
+            <!-- /TMPL_IF-->
+            Relation</label>
+            <select name="relationship" size="1">
+                <option> </option>
+                <!-- TMPL_LOOP NAME="relshiploop" -->
+                    <option <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="relationship" --></option>
+                <!-- /TMPL_LOOP -->
+            </select>
+        </p>
+        <p>
+            <!-- TMPL_IF NAME="mandatoryB_address" -->
+                <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+                <label>
+            <!-- /TMPL_IF-->
+            Address </label>
+            <input type="text" name="B_address" size="40" value="<!-- TMPL_VAR NAME="B_address" -->">
+        </p>
+        <p>
+            <!-- TMPL_IF NAME="mandatoryB_zipcode" -->
+            <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+            <label>
+            <!-- /TMPL_IF-->    
+            Zipcode</label>
+            <input type="text" maxlength="5" name="B_zipcode" size="5" value="<!-- TMPL_VAR NAME="B_zipcode" -->">
+        </p>
+            <!-- TMPL_IF NAME="mandatoryB_city" -->
+                <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+                <label>
+            <!-- /TMPL_IF-->
+            City</label>
+            <input style="text-transform:uppercase;" type="text" name="B_city" size="20" value="<!-- TMPL_VAR NAME="B_city" -->">
+        </p>
+        <p>
+            <!-- TMPL_IF NAME="mandatoryB_phone" -->
+                <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+                <label>
+            <!-- /TMPL_IF-->
+            Phone (home)</label>
+            <input type="text" name="B_phone" size="20" value="<!-- TMPL_VAR NAME="B_phone" -->">
+        </p>
+        <p>
+            <!-- TMPL_IF NAME="mandatorycontactnote" -->
+                <label style="font-weight:bold">
+            <!-- TMPL_ELSE -->
+                <label>
+            <!-- /TMPL_IF-->
+            Notes</label>
+            <textarea  name="contactnote" cols="70" rows="2"   ><!-- TMPL_VAR NAME="contactnote" --></textarea>
+        </p>
+    </fieldset>
+        <div>
+        <input type="button" class="borrowers_button" name="etapeprec1" value="previous step" onclick="check_form_borrowers(0);">
+        <input type="button" class="borrowers_button" name="etapesuiv3" onclick="check_form_borrowers('3')" value="next step"></div>
+    </p>
 </form>
 <!-- ############################END FORM PROFESSIONAL############################################"-->
 <!--/TMPL_IF-->
 
 <!-- TMPL_IF NAME="step_3"-->
-	<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
-		<!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
-		<input type="hidden" name="FormFieldList" value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password">
-		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-		<input type="hidden" name="type" value="borrowers">
-		<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-		<input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
-		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
-		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
-		<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-		<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
-		
-	<!-- 		from form 1 -->
-		<input type="hidden" name="title"  value="<!-- TMPL_VAR NAME="title" -->">
-		<input type="hidden" name="surname"  value="<!-- TMPL_VAR NAME="surname" -->" >
-		<input type="hidden" name="firstname"  value="<!-- TMPL_VAR NAME="firstname" -->">
-		<input type="hidden" name="dateofbirth"  value="<!-- TMPL_VAR NAME="dateofbirth" -->">
-		<input type="hidden" name="initials"  value="<!-- TMPL_VAR NAME="initials" -->">
-		<input type="hidden" name="othernames"  value="<!-- TMPL_VAR NAME="othernames" -->" >
-		<input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->" >
-		<input type="hidden" name="categorycode"  value="<!-- TMPL_VAR NAME="categorycode" -->">
-		<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->">
-		<input type="hidden" name="sort1"   value="<!-- TMPL_VAR NAME="sort1" -->">
-		<input type="hidden" name="sort2"   value="<!-- TMPL_VAR NAME="sort2" -->">
+    <form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
+        <!--        field always hidden in different form (1,2,3) -->
+        <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->"/>
+        <input type="hidden" name="FormFieldList" value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password"/>
+        <input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->"/>
+        <input type="hidden" name="type" value="borrowers"/>
+        <input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->"/>
+        <input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->"/>
+        <input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->"/>
+        <input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->"/>
+        <input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
+        <input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
+        <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
+        <input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
+        
+    <!--        from form 1 -->
+        <input type="hidden" name="title"  value="<!-- TMPL_VAR NAME="title" -->"/>
+        <input type="hidden" name="surname"  value="<!-- TMPL_VAR NAME="surname" -->" />
+        <input type="hidden" name="firstname"  value="<!-- TMPL_VAR NAME="firstname" -->"/>
+        <input type="hidden" name="dateofbirth"  value="<!-- TMPL_VAR NAME="dateofbirth" -->"/>
+        <input type="hidden" name="initials"  value="<!-- TMPL_VAR NAME="initials" -->"/>
+        <input type="hidden" name="othernames"  value="<!-- TMPL_VAR NAME="othernames" -->" />
+        <input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->" />
+        <input type="hidden" name="categorycode"  value="<!-- TMPL_VAR NAME="categorycode" -->"/>
+        <input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->"/>
+        <input type="hidden" name="sort1"   value="<!-- TMPL_VAR NAME="sort1" -->"/>
+        <input type="hidden" name="sort2"   value="<!-- TMPL_VAR NAME="sort2" -->"/>
 
 
-	<!-- 		from form 2 -->
-		<input type="hidden" name="streetnumber"  value="<!-- TMPL_VAR NAME="streetnumber" -->">
-		<input type="hidden" name="address"  value="<!-- TMPL_VAR NAME="address" -->">
-		<input type="hidden" name="address2"  value="<!-- TMPL_VAR NAME="address2" -->">
-		<input type="hidden" name="streettype"  value="<!-- TMPL_VAR NAME="streettype" -->">	
-		<input type="hidden" name="zipcode"  value="<!-- TMPL_VAR NAME="zipcode" -->">
-		<input type="hidden" name="city"  value="<!-- TMPL_VAR NAME="city" -->"> 
-		<input type="hidden" name="branchcode"  value="<!-- TMPL_VAR NAME="branchcode" -->">
-		<input type="hidden" name="phone"   value="<!-- TMPL_VAR NAME="phone" -->" >
-		<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-		<input type="hidden" name="mobile"  value="<!-- TMPL_VAR NAME="mobile" -->" >	
-		<input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" >
-		<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-		<input type="hidden" name="contactname"  value="<!-- TMPL_VAR NAME="contactname" -->">
-		<input type="hidden" name="relationship"  value="<!-- TMPL_VAR NAME="relationship" -->">
-		<input type="hidden" name="B_address" value="<!-- TMPL_VAR NAME="B_address" -->">
-		<input type="hidden" name="B_zipcode"  value="<!-- TMPL_VAR NAME="B_zipcode" -->">
-		<input type="hidden" name="B_city"  value="<!-- TMPL_VAR NAME="B_city" -->">
-		<input type="hidden" name="B_phone"  value="<!-- TMPL_VAR NAME="B_phone" -->"> 
-		<input type="hidden" name="fax"  value="<!-- TMPL_VAR NAME="fax" -->"> 	
-		<textarea style="display:none;" name="contactnote" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnote" --></textarea>
-	
-		<!-- TMPL_IF NAME="opadd" -->
-			<input type="hidden" name="op" value="add">
-		<!-- TMPL_ELSE -->
-			<input type="hidden" name="op" value="modify">
-		<!-- /TMPL_IF -->
-		<p>
-			<!-- TMPL_IF NAME="mandatorycardnumber" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			 Card number</label>
-			<input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
-		</p>
-	<fieldset id="memberentry_subscription">
-	<legend>Library set-up</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatorydateenrolled" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Arrival date</label>
-			<input type="text" name="dateenrolled"  maxlength="10"	  size="10" onchange="CheckDate(document.form.dateenrolled);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorydateexpiry" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Expiry date</label>
-			<input type="text" name="dateexpiry" maxlength="10"  size="10"
-							onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryopacnote" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->	
-			OPAC note</label>
-			<textarea  name="opacnote" cols="40" rows="2"   ><!-- TMPL_VAR NAME="opacnote" --></textarea>
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryborrowernotes" -->	
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Library note</label>
-			<textarea name="borrowernotes" cols="40" rows="2"   ><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-		</p>
-	</fieldset>
-	<fieldset id="memberentry_userid">
-		<legend>OPAC login</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryuserid" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			OPAC Login</label>
-			<input type="text" name="userid" size="20"  value="<!-- TMPL_VAR NAME="userid" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorypassword" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Password</label>
-			<!--TMPL_IF NAME="opadd"-->
-				<input type="text" name="password" size="20"  value="<!-- TMPL_VAR NAME="password" -->">
-			<!--TMPL_ELSE-->
-				<!--TMPL_IF NAME="password"-->
-					<input type="text" name="password" size="20"  value="****">
-				<!--TMPL_ELSE-->
-					<input type="text" name="password" size="20"  value="">
-				<!--/TMPL_IF-->
-			<!--/TMPL_IF-->
-		</p>
-		<!--this zones are not necessary in modif mode -->
-		<!-- TMPL_UNLESS NAME="opadd" -->
-			<h2>Warning</h2>
-			<!-- TMPL_LOOP NAME="flagloop" -->
-			<p>
-				<label class="borrowers_labels_title"><!-- TMPL_VAR NAME="html" --></label>
-				<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Yes
-				<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>No
-			</p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_UNLESS -->	
-		<p>
-		</fieldset>
-		<div>
-			<input type="button" class="borrowers_button" name="step2" value="Previous step" onclick="check_form_borrowers(1);">	
-			<!-- TMPL_IF NAME="opadd" -->
-				<input type="button" name="step4" onclick="unique();" value="Add member">
-			<!-- TMPL_ELSE -->
-				<input type="button" name="step4" onclick="check_form_borrowers();" value="Modify member">
-			<!--/TMPL_IF -->
-		</div>
-	</form>
+    <!--        from form 2 -->
+        <input type="hidden" name="streetnumber"  value="<!-- TMPL_VAR NAME="streetnumber" -->"/>
+        <input type="hidden" name="address"  value="<!-- TMPL_VAR NAME="address" -->"/>
+        <input type="hidden" name="address2"  value="<!-- TMPL_VAR NAME="address2" -->"/>
+        <input type="hidden" name="streettype"  value="<!-- TMPL_VAR NAME="streettype" -->"/>   
+        <input type="hidden" name="zipcode"  value="<!-- TMPL_VAR NAME="zipcode" -->"/>
+        <input type="hidden" name="city"  value="<!-- TMPL_VAR NAME="city" -->"/> 
+        <input type="hidden" name="branchcode"  value="<!-- TMPL_VAR NAME="branchcode" -->"/>
+        <input type="hidden" name="phone"   value="<!-- TMPL_VAR NAME="phone" -->"/>
+        <input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->"/>
+        <input type="hidden" name="mobile"  value="<!-- TMPL_VAR NAME="mobile" -->"/>   
+        <input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->"/>
+        <input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->"/>
+        <input type="hidden" name="contactname"  value="<!-- TMPL_VAR NAME="contactname" -->"/>
+        <input type="hidden" name="relationship"  value="<!-- TMPL_VAR NAME="relationship" -->"/>
+        <input type="hidden" name="B_address" value="<!-- TMPL_VAR NAME="B_address" -->"/>
+        <input type="hidden" name="B_zipcode"  value="<!-- TMPL_VAR NAME="B_zipcode" -->"/>
+        <input type="hidden" name="B_city"  value="<!-- TMPL_VAR NAME="B_city" -->"/>
+        <input type="hidden" name="B_phone"  value="<!-- TMPL_VAR NAME="B_phone" -->"/> 
+        <input type="hidden" name="fax"  value="<!-- TMPL_VAR NAME="fax" -->"/>     
+        <textarea style="display:none;" name="contactnote" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnote" --></textarea>
+    
+        <!-- TMPL_IF NAME="opadd" -->
+            <input type="hidden" name="op" value="add">
+        <!-- TMPL_ELSE -->
+            <input type="hidden" name="op" value="modify">
+        <!-- /TMPL_IF -->
+        <p>
+            <!-- TMPL_IF NAME="mandatorycardnumber" -->
+            <label style="font-weight:bold">
+            <!--TMPL_ELSE-->
+            <label>
+            <!-- /TMPL_IF-->
+             Card number</label>
+            <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"/>
+        </p>
+    <fieldset id="memberentry_subscription">
+    <legend>Library set-up</legend>
+        <p>
+            <!-- TMPL_IF NAME="mandatorydateenrolled" -->
+            <label style="font-weight:bold">
+            <!--TMPL_ELSE-->
+            <label>
+            <!-- /TMPL_IF-->
+            Arrival date</label>
+            <input type="text" name="dateenrolled"  maxlength="10"    size="10" onchange="CheckDate(document.form.dateenrolled);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
+        </p>
+        <p>
+            <!-- TMPL_IF NAME="mandatorydateexpiry" -->
+            <label style="font-weight:bold">
+            <!--TMPL_ELSE-->
+            <label>
+            <!-- /TMPL_IF-->
+            Expiry date</label>
+            <input type="text" name="dateexpiry" maxlength="10"  size="10"
+                            onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+        </p>
+        <p>
+            <!-- TMPL_IF NAME="mandatoryopacnote" -->
+                <label style="font-weight:bold">
+            <!--TMPL_ELSE-->
+                <label>
+            <!-- /TMPL_IF-->    
+            OPAC note</label>
+            <textarea  name="opacnote" cols="40" rows="2"   ><!-- TMPL_VAR NAME="opacnote" --></textarea>
+        </p>
+        <p>
+            <!-- TMPL_IF NAME="mandatoryborrowernotes" -->  
+                <label style="font-weight:bold">
+            <!--TMPL_ELSE-->
+                <label>
+            <!-- /TMPL_IF-->
+            Library note</label>
+            <textarea name="borrowernotes" cols="40" rows="2"   ><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
+        </p>
+    </fieldset>
+    <fieldset id="memberentry_userid">
+        <legend>OPAC login</legend>
+        <p>
+            <!-- TMPL_IF NAME="mandatoryuserid" -->
+            <label style="font-weight:bold">
+            <!--TMPL_ELSE-->
+            <label>
+            <!-- /TMPL_IF-->
+            OPAC Login</label>
+            <input type="text" name="userid" size="20"  value="<!-- TMPL_VAR NAME="userid" -->">
+        </p>
+        <p>
+            <!-- TMPL_IF NAME="mandatorypassword" -->
+            <label style="font-weight:bold">
+            <!--TMPL_ELSE-->
+            <label>
+            <!-- /TMPL_IF-->
+            Password</label>
+            <!--TMPL_IF NAME="opadd"-->
+                <input type="text" name="password" size="20"  value="<!-- TMPL_VAR NAME="password" -->">
+            <!--TMPL_ELSE-->
+                <!--TMPL_IF NAME="password"-->
+                    <input type="text" name="password" size="20"  value="****">
+                <!--TMPL_ELSE-->
+                    <input type="text" name="password" size="20"  value="">
+                <!--/TMPL_IF-->
+            <!--/TMPL_IF-->
+        </p>
+        <!--this zones are not necessary in modif mode -->
+        <!-- TMPL_UNLESS NAME="opadd" -->
+            <h2>Warning</h2>
+            <!-- TMPL_LOOP NAME="flagloop" -->
+            <p>
+                <label class="borrowers_labels_title"><!-- TMPL_VAR NAME="html" --></label>
+                <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Yes
+                <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>No
+            </p>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_UNLESS -->   
+        <p>
+        </fieldset>
+        <div>
+            <input type="button" class="borrowers_button" name="step2" value="Previous step" onclick="check_form_borrowers(1);">    
+            <!-- TMPL_IF NAME="opadd" -->
+                <input type="button" name="step4" onclick="unique();" value="Add member">
+            <!-- TMPL_ELSE -->
+                <input type="button" name="step4" onclick="check_form_borrowers();" value="Modify member">
+            <!--/TMPL_IF -->
+        </div>
+    </form>
 <!-- /TMPL_IF -->
-<!--	 TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<!--     TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
index 723b813d54..0360090bff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
@@ -1,40 +1,40 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Borrower's Details</title>
+<title>Koha &rsaquo; Borrower's Details</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
 <!-- TMPL_IF NAME="unknowuser" -->
-    <p>This borrower doesn't exist anymore.<a href="javascript:back();">Go Back</a></p>
+    This borrower doesn't exist anymore.<a href="javascript:back();">Go Back</a>
 <!-- TMPL_ELSE -->
+<a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Borrowers</a> &rsaquo; <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Details for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</a>
 
-<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h1>
-	<form name="form">
-	<input type="hidden" name="reregistration" value="<!-- TMPL_VAR NAME="reregistration"-->"> 
-	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
-	</form>
+<form action="" name="form">
+<input type="hidden" name="reregistration" value="<!-- TMPL_VAR NAME="reregistration"-->"/> 
+<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+</form>
 <div id="action">
     <div class="edit">
         <!-- TMPL_IF name="adultborrower" -->
-            <a href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=<!-- TMPL_VAR NAME="borrowernumber" -->&category_type=C">
+        <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=C">
             Add child
             </a> 
         <!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="category_type" -->
             <!--TMPL_IF NAME="guarantor"-->
-                <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&guarantorid=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->&category_type=<!-- TMPL_VAR NAME="category_type"-->">
+                <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;guarantorid=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->&amp;category_type=<!-- TMPL_VAR NAME="category_type"-->">
             <!--TMPL_ELSE-->
-            <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&category_type=<!-- TMPL_VAR NAME="category_type"-->">
+            <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=<!-- TMPL_VAR NAME="category_type"-->">
             <!--/TMPL_IF-->
         Edit
             </a>
         <!-- TMPL_ELSE --> <!-- try with categorycode if no category_type -->
             <!-- TMPL_IF NAME="categorycode" -->
-            <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&categorycode=<!-- TMPL_VAR NAME="categorycode"-->">
+            <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;categorycode=<!-- TMPL_VAR NAME="categorycode"-->">
                 Edit
             </a>
             <!-- TMPL_ELSE --> <!-- if no categorycode, set category_type to A by default -->
-                <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&category_type=A">
+                <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=A">
                     Edit
                 </a>
             <!-- /TMPL_IF -->
@@ -66,7 +66,7 @@
     </div>
     <div class="others">
         <!-- TMPL_IF NAME="CAN_user_parameters"-->
-        <a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&module=MEMBERS&action=MODIFY&object=<!-- TMPL_VAR NAME="borrowernumber"-->">Modification log</a>
+        <a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;module=MEMBERS&amp;action=MODIFY&amp;object=<!-- TMPL_VAR NAME="borrowernumber"-->">Modification log</a>
         <!-- /TMPL_IF -->
     </div>
 </div>
@@ -213,7 +213,7 @@
     <table>
         <tr>
             <th scope="col">Title</th>
-            <th scope="col">Due</th>
+            <th scope="col">Date due</th>
             <th scope="col">Itemtype</th>
             <th scope="col">Charge</th>
             <th scope="col">Price</th>
@@ -277,10 +277,10 @@
             <td colspan="3">&nbsp;</td>
         </tr>
         </table>
-            <div id="action">
-            <input type="submit" name="renew_checked" value="Renew Checked Items" />
-            <input type="submit" name="renew_all" value="Renew All" />
-            </div>
+        <div>
+        <input type="submit" name="renew_checked" value="Renew checked items" />
+        <input type="submit" name="renew_all" value="Renew all" />
+        </div>
     </form>
     </div>
 <!-- TMPL_IF NAME="reservloop" -->
@@ -334,11 +334,9 @@
 		<!-- /TMPL_LOOP -->
 	</table>
 	<!-- /TMPL_IF -->
-</div>
-
 <script type="text/javascript">
 function confirm_deletion() {
-    var is_confirmed = window.confirm('Do you confirm deletion ?');
+    var is_confirmed = window.confirm('Click OK to confirm deletion');
     var borrowernumbervalue=document.form.borrowernumber.value; 
    
     if (is_confirmed) {
@@ -347,10 +345,10 @@ function confirm_deletion() {
 }
 
 function confirm_reregistration() {
-    var is_confirmed = window.confirm('Do you confirm re_registration ?');
+    var is_confirmed = window.confirm('Click OK to confirm renewal');
     var borrowernumbervalue1=document.form.borrowernumber.value;
     if (is_confirmed) {
-    window.location='/cgi-bin/koha/members/moremember.pl?reregistration=y&borrowernumber='+borrowernumbervalue1+'';
+    window.location='/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber='+borrowernumbervalue1+'';
     }
 }
 </script>
diff --git a/members/member.pl b/members/member.pl
index 9e2a18910a..d58b08e50f 100755
--- a/members/member.pl
+++ b/members/member.pl
@@ -35,31 +35,31 @@ my $input = new CGI;
 my $quicksearch = $input->param('quicksearch');
 my ($template, $loggedinuser, $cookie);
 if($quicksearch){
-	($template, $loggedinuser, $cookie)
+    ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "members/member-quicksearch-results.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {borrowers => 1},
-			     debug => 1,
-			     });
+                 query => $input,
+                 type => "intranet",
+                 authnotrequired => 0,
+                 flagsrequired => {borrowers => 1},
+                 debug => 1,
+                 });
 } else {
-	($template, $loggedinuser, $cookie)
+    ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "members/member.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {borrowers => 1},
-			     debug => 1,
-			     });
+                 query => $input,
+                 type => "intranet",
+                 authnotrequired => 0,
+                 flagsrequired => {borrowers => 1},
+                 debug => 1,
+                 });
 }
 my $theme = $input->param('theme') || "default";
-			# only used if allowthemeoverride is set
+            # only used if allowthemeoverride is set
 #my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' );
-	# FIXME - Error-checking
+    # FIXME - Error-checking
 #my $template = HTML::Template->new( filename => $tmpldata{'path'},
-#				    die_on_bad_params => 0,
-#				    loop_context_vars => 1 );
+#                   die_on_bad_params => 0,
+#                   loop_context_vars => 1 );
 
 
 my $member=$input->param('member');
@@ -73,11 +73,11 @@ my ($count,$results);
 
 if(length($member) == 1)
 {
-	($count,$results)=BornameSearch($env,$member,$orderby,"simple");
+    ($count,$results)=BornameSearch($env,$member,$orderby,"simple");
 }
 else
 {
-	($count,$results)=BornameSearch($env,$member,$orderby,"advanced");
+    ($count,$results)=BornameSearch($env,$member,$orderby,"advanced");
 }
 
 
@@ -88,37 +88,38 @@ for (my $i=0; $i < $count; $i++){
   my ($od,$issue,$fines)=borrdata2($env,$results->[$i]{'borrowernumber'});
 
   my %row = (
-  	background => $background,
-	count => $i+1,
-        borrowernumber => $results->[$i]{'borrowernumber'},
-        cardnumber => $results->[$i]{'cardnumber'},
-        surname => $results->[$i]{'surname'},
-        firstname => $results->[$i]{'firstname'},
-        categorycode => $results->[$i]{'categorycode'},
-        category_type => $results->[$i]{'category_type'},
-        category_description => $results->[$i]{'description'},
-        streetaddress => $results->[$i]{'streetaddress'},
-        city => $results->[$i]{'city'},
-        branchcode => $results->[$i]{'branchcode'},
-		overdues => $od,
-		issues => $issue,
-        odissue => "$od/$issue",
-        fines =>  sprintf("%.2f",$fines),
-        borrowernotes => $results->[$i]{'borrowernotes'},
-        sort1 => $results->[$i]{'sort1'},
-        sort2 => $results->[$i]{'sort2'},
-        );
+    background => $background,
+    count => $i+1,
+    borrowernumber => $results->[$i]{'borrowernumber'},
+    cardnumber => $results->[$i]{'cardnumber'},
+    surname => $results->[$i]{'surname'},
+    firstname => $results->[$i]{'firstname'},
+    categorycode => $results->[$i]{'categorycode'},
+    category_type => $results->[$i]{'category_type'},
+    category_description => $results->[$i]{'description'},
+    streetaddress => $results->[$i]{'streetaddress'},
+    city => $results->[$i]{'city'},
+    branchcode => $results->[$i]{'branchcode'},
+    overdues => $od,
+    issues => $issue,
+    odissue => "$od/$issue",
+    fines =>  sprintf("%.2f",$fines),
+    borrowernotes => $results->[$i]{'borrowernotes'},
+    sort1 => $results->[$i]{'sort1'},
+    sort2 => $results->[$i]{'sort2'},
+    );
   if ( $background ) { $background = 0; } else {$background = 1; }
   push(@resultsdata, \%row);
 }
 
 $template->param( 
-			member          => $member,
-			numresults		=> $count,
-			resultsloop     => \@resultsdata,
-			intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-			);
+        searching       => "1",
+        member          => $member,
+        numresults      => $count,
+        resultsloop     => \@resultsdata,
+        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/misc/sql-datas/en/mandatory/05_sysprefs.sql b/misc/sql-datas/en/mandatory/05_sysprefs.sql
index db9a320ca1..20cf97407f 100644
--- a/misc/sql-datas/en/mandatory/05_sysprefs.sql
+++ b/misc/sql-datas/en/mandatory/05_sysprefs.sql
@@ -1,99 +1,99 @@
-INSERT INTO `systempreferences` VALUES('acquisitions','normal','Normal, budget-based acquisitions, or Simple bibliographic-data acquisitions','simple|normal','Choice');
-INSERT INTO `systempreferences` VALUES('advancedMARCeditor','0','If set, the MARC editor won\'t show you tag/subfields description','','YesNo');
-INSERT INTO `systempreferences` VALUES('AmazonAssocTag','','see: associates.amazon.com/gp/flex/associates/apply-login.html','','free');
-INSERT INTO `systempreferences` VALUES('AmazonContent','0','Turn On Amazon Content - You MUST set AmazonDevKey and AmazonAssocTag if enabled','','YesNo');
-INSERT INTO `systempreferences` VALUES('AmazonDevKey','','see: aws-portal.amazon.com/gp/aws/developer/registration/index.html','','free');
-INSERT INTO `systempreferences` VALUES('AnonSuggestions','0','Set to anonymous borrowernumber to enable Anonymous suggestions',NULL,'free');
-INSERT INTO `systempreferences` VALUES('authoritysep','--','the separator used in authority/thesaurus. Usually --','10','free');
-INSERT INTO `systempreferences` VALUES('autoBarcode','1','Barcode is auto-calculated','','YesNo');
-INSERT INTO `systempreferences` VALUES('AutoLocation','0','switch to activate or not Autolocation, if Yes, the Librarian can\'t change his location, it\'s defined by branchip',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('AutomaticItemReturn','1','This Variable allow or not to return automaticly to his homebranch',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('autoMemberNum','1','Member number is auto-calculated','','YesNo');
-INSERT INTO `systempreferences` VALUES('BiblioDefaultView','normal','Define the default view of a biblio. Can be either normal, marc or isbd','normal|marc|isbd','Choice');
-INSERT INTO `systempreferences` VALUES('BorrowerMandatoryField','zipcode|surname','List all mandatory fields for borrowers',NULL,'free');
-INSERT INTO `systempreferences` VALUES('borrowerRelationship','father|mother','The relationships between a guarantor & a guarantee (separated by | or ,)','','free');
-INSERT INTO `systempreferences` VALUES('BorrowersLog','0','Active this if you want to log borrowers edition/creation/deletion...',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('BorrowersTitles','Mr|Mrs|Miss|Ms','List all Titles for borrowers',NULL,'free');
-INSERT INTO `systempreferences` VALUES('CataloguingLog','0','Active this if you want to log cataloguing action.',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('checkdigit','none','Validity checks on membership number: none or \"Katipo\" style checks','none|katipo','Choice');
-INSERT INTO `systempreferences` VALUES('dateformat','us','date format (us mm/dd/yyyy, metric dd/mm/yyy, ISO yyyy/mm/dd)','metric|us|iso','Choice');
-INSERT INTO `systempreferences` VALUES('delimiter',';','Define the default separator character for report exportations into files',';|tabulation|,|/|\\|#','Choice');
-INSERT INTO `systempreferences` VALUES('Disable_Dictionary','1','Disables Dictionary buttons if set to yes','','YesNo');
-INSERT INTO `systempreferences` VALUES('expandedSearchOption','0','search among marc field',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('FinesLog','0','Active this if you want to log fines',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('gist','0','the gist rate. NOT in %, but in numeric form (0.12 for 12%)','','free');
-INSERT INTO `systempreferences` VALUES('hidelostitems','0','show or hide \"lost\" items in OPAC.','','YesNo');
-INSERT INTO `systempreferences` VALUES('hide_marc','0','hide marc specific datas like subfield code & indicators to library',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('IndependantBranches','0','Turn Branch independancy management On an Off',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('insecure','NO','If YES, no auth at all is needed. Be careful if you set this to yes!',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('IntranetBiblioDefaultView','normal','IntranetBiblioDefaultView','','');
-INSERT INTO `systempreferences` VALUES('intranetcolorstylesheet','intranet.css','Enter the name of the color stylesheet to use in Intranet','','free');
-INSERT INTO `systempreferences` VALUES('IntranetmainUserblock','','A user-defined block of HTML on the intranet home page','50|20','Textarea');
-INSERT INTO `systempreferences` VALUES('IntranetNav','','Use HTML tabs to add navigational links to the left-hand navigational bar in Int','70|10','Textarea');
-INSERT INTO `systempreferences` VALUES('intranetreadinghistory','0','Turn on or off the Reading History option in the intranet','','YesNo');
-INSERT INTO `systempreferences` VALUES('intranetstylesheet','','Enter a complete URL to use an alternate layout stylesheet in Intranet',NULL,'free');
-INSERT INTO `systempreferences` VALUES('intranetuserjs','function prepareEmailPopup(){\r\n  if (!document.getElementById) return false;\r\n  if (!document.getElementById(\'reserveemail\')) return false;\r\n  rsvlink = document.getElementById(\'reserveemail\');\r\n  rsvlink.onclick = function() {\r\n      doReservePopup();\r\n      return false;\r\n	}\r\n}\r\n\r\nfunction doReservePopup(){\r\n}\r\n\r\nfunction prepareReserveList(){\r\n}\r\n\r\naddLoadEvent(prepareEmailPopup);\r\naddLoadEvent(prepareReserveList);','Custom javascript for inclusion in Intranet','50|10','Textarea');
-INSERT INTO `systempreferences` VALUES('intranet_includes','includes','The includes directory you want for specific look of Koha (includes or includes_npl for example)',NULL,'Free');
-INSERT INTO `systempreferences` VALUES('ISBD','#100||{ 100a }{ 100b }{ 100c }{ 100d }{ 110a }{ 110b }{ 110c }{ 110d }{ 110e }{ 110f }{ 110g }{ 130a }{ 130d }{ 130f }{ 130g }{ 130h }{ 130k }{ 130l }{ 130m }{ 130n }{ 130o }{ 130p }{ 130r }{ 130s }{ 130t }|<br/><br/>\r\n#245||{ 245a }{ 245b }{245f }{ 245g }{ 245k }{ 245n }{ 245p }{ 245s }{ 245h }|\r\n#246||{ : 246i }{ 246a }{ 246b }{ 246f }{ 246g }{ 246n }{ 246p }{ 246h }|\r\n#242||{ = 242a }{ 242b }{ 242n }{ 242p }{ 242h }|\r\n#245||{ 245c }|\r\n#242||{ = 242c }|\r\n#250| - |{ 250a }{ 250b }|\r\n#254|, |{ 254a }|\r\n#255|, |{ 255a }{ 255b }{ 255c }{ 255d }{ 255e }{ 255f }{ 255g }|\r\n#256|, |{ 256a }|\r\n#257|, |{ 257a }|\r\n#258|, |{ 258a }{ 258b }|\r\n#260| - |{ 260a }{ 260b }{ 260c }|\r\n#300| - |{ 300a }{ 300b }{ 300c }{ 300d }{ 300e }{ 300f }{ 300g }|\r\n#306| - |{ 306a }|\r\n#307| - |{ 307a }{ 307b }|\r\n#310| - |{ 310a }{ 310b }|\r\n#321| - |{ 321a }{ 321b }|\r\n#340| - |{ 3403 }{ 340a }{ 340b }{ 340c }{ 340d }{ 340e }{ 340f }{ 340h }{ 340i }|\r\n#342| - |{ 342a }{ 342b }{ 342c }{ 342d }{ 342e }{ 342f }{ 342g }{ 342h }{ 342i }{ 342j }{ 342k }{ 342l }{ 342m }{ 342n }{ 342o }{ 342p }{ 342q }{ 342r }{ 342s }{ 342t }{ 342u }{ 342v }{ 342w }|\r\n#343| - |{ 343a }{ 343b }{ 343c }{ 343d }{ 343e }{ 343f }{ 343g }{ 343h }{ 343i }|\r\n#351| - |{ 3513 }{ 351a }{ 351b }{ 351c }|\r\n#352| - |{ 352a }{ 352b }{ 352c }{ 352d }{ 352e }{ 352f }{ 352g }{ 352i }{ 352q }|\r\n#362| - |{ 362a }{ 351z }|\r\n#440| - |{ 440a }{ 440n }{ 440p }{ 440v }{ 440x }|.\r\n#490| - |{ 490a }{ 490v }{ 490x }|.\r\n#800| - |{ 800a }{ 800b }{ 800c }{ 800d }{ 800e }{ 800f }{ 800g }{ 800h }{ 800j }{ 800k }{ 800l }{ 800m }{ 800n }{ 800o }{ 800p }{ 800q }{ 800r }{ 800s }{ 800t }{ 800u }{ 800v }|.\r\n#810| - |{ 810a }{ 810b }{ 810c }{ 810d }{ 810e }{ 810f }{ 810g }{ 810h }{ 810k }{ 810l }{ 810m }{ 810n }{ 810o }{ 810p }{ 810r }{ 810s }{ 810t }{ 810u }{ 810v }|.\r\n#811| - |{ 811a }{ 811c }{ 811d }{ 811e }{ 811f }{ 811g }{ 811h }{ 811k }{ 811l }{ 811n }{ 811p }{ 811q }{ 811s }{ 811t }{ 811u }{ 811v }|.\r\n#830| - |{ 830a }{ 830d }{ 830f }{ 830g }{ 830h }{ 830k }{ 830l }{ 830m }{ 830n }{ 830o }{ 830p }{ 830r }{ 830s }{ 830t }{ 830v }|.\r\n#500|<br/><br/>|{ 5003 }{ 500a }|\r\n#501|<br/><br/>|{ 501a }|\r\n#502|<br/><br/>|{ 502a }|\r\n#504|<br/><br/>|{ 504a }|\r\n#505|<br/><br/>|{ 505a }{ 505t }{ 505r }{ 505g }{ 505u }|\r\n#506|<br/><br/>|{ 5063 }{ 506a }{ 506b }{ 506c }{ 506d }{ 506u }|\r\n#507|<br/><br/>|{ 507a }{ 507b }|\r\n#508|<br/><br/>|{ 508a }{ 508a }|\r\n#510|<br/><br/>|{ 5103 }{ 510a }{ 510x }{ 510c }{ 510b }|\r\n#511|<br/><br/>|{ 511a }|\r\n#513|<br/><br/>|{ 513a }{513b }|\r\n#514|<br/><br/>|{ 514z }{ 514a }{ 514b }{ 514c }{ 514d }{ 514e }{ 514f }{ 514g }{ 514h }{ 514i }{ 514j }{ 514k }{ 514m }{ 514u }|\r\n#515|<br/><br/>|{ 515a }|\r\n#516|<br/><br/>|{ 516a }|\r\n#518|<br/><br/>|{ 5183 }{ 518a }|\r\n#520|<br/><br/>|{ 5203 }{ 520a }{ 520b }{ 520u }|\r\n#521|<br/><br/>|{ 5213 }{ 521a }{ 521b }|\r\n#522|<br/><br/>|{ 522a }|\r\n#524|<br/><br/>|{ 524a }|\r\n#525|<br/><br/>|{ 525a }|\r\n#526|<br/><br/>|{\\n510i }{\\n510a }{ 510b }{ 510c }{ 510d }{\\n510x }|\r\n#530|<br/><br/>|{\\n5063 }{\\n506a }{ 506b }{ 506c }{ 506d }{\\n506u }|\r\n#533|<br/><br/>|{\\n5333 }{\\n533a }{\\n533b }{\\n533c }{\\n533d }{\\n533e }{\\n533f }{\\n533m }{\\n533n }|\r\n#534|<br/><br/>|{\\n533p }{\\n533a }{\\n533b }{\\n533c }{\\n533d }{\\n533e }{\\n533f }{\\n533m }{\\n533n }{\\n533t }{\\n533x }{\\n533z }|\r\n#535|<br/><br/>|{\\n5353 }{\\n535a }{\\n535b }{\\n535c }{\\n535d }|\r\n#538|<br/><br/>|{\\n5383 }{\\n538a }{\\n538i }{\\n538u }|\r\n#540|<br/><br/>|{\\n5403 }{\\n540a }{ 540b }{ 540c }{ 540d }{\\n520u }|\r\n#544|<br/><br/>|{\\n5443 }{\\n544a }{\\n544b }{\\n544c }{\\n544d }{\\n544e }{\\n544n }|\r\n#545|<br/><br/>|{\\n545a }{ 545b }{\\n545u }|\r\n#546|<br/><br/>|{\\n5463 }{\\n546a }{ 546b }|\r\n#547|<br/><br/>|{\\n547a }|\r\n#550|<br/><br/>|{ 550a }|\r\n#552|<br/><br/>|{ 552z }{ 552a }{ 552b }{ 552c }{ 552d }{ 552e }{ 552f }{ 552g }{ 552h }{ 552i }{ 552j }{ 552k }{ 552l }{ 552m }{ 552n }{ 562o }{ 552p }{ 552u }|\r\n#555|<br/><br/>|{ 5553 }{ 555a }{ 555b }{ 555c }{ 555d }{ 555u }|\r\n#556|<br/><br/>|{ 556a }{ 506z }|\r\n#563|<br/><br/>|{ 5633 }{ 563a }{ 563u }|\r\n#565|<br/><br/>|{ 5653 }{ 565a }{ 565b }{ 565c }{ 565d }{ 565e }|\r\n#567|<br/><br/>|{ 567a }|\r\n#580|<br/><br/>|{ 580a }|\r\n#581|<br/><br/>|{ 5633 }{ 581a }{ 581z }|\r\n#584|<br/><br/>|{ 5843 }{ 584a }{ 584b }|\r\n#585|<br/><br/>|{ 5853 }{ 585a }|\r\n#586|<br/><br/>|{ 5863 }{ 586a }|\r\n#020|<br/><br/><label>ISBN: </label>|{ 020a }{ 020c }|\r\n#022|<br/><br/><label>ISSN: </label>|{ 022a }|\r\n#222| = |{ 222a }{ 222b }|\r\n#210| = |{ 210a }{ 210b }|\r\n#024|<br/><br/><label>Standard No.: </label>|{ 024a }{ 024c }{ 024d }{ 0242 }|\r\n#027|<br/><br/><label>Standard Tech. Report. No.: </label>|{ 027a }|\r\n#028|<br/><br/><label>Publisher. No.: </label>|{ 028a }{ 028b }|\r\n#013|<br/><br/><label>Patent No.: </label>|{ 013a }{ 013b }{ 013c }{ 013d }{ 013e }{ 013f }|\r\n#030|<br/><br/><label>CODEN: </label>|{ 030a }|\r\n#037|<br/><br/><label>Source: </label>|{ 037a }{ 037b }{ 037c }{ 037f }{ 037g }{ 037n }|\r\n#010|<br/><br/><label>LCCN: </label>|{ 010a }|\r\n#015|<br/><br/><label>Nat. Bib. No.: </label>|{ 015a }{ 0152 }|\r\n#016|<br/><br/><label>Nat. Bib. Agency Control No.: </label>|{ 016a }{ 0162 }|\r\n#600|<br/><br/><label>Subjects--Personal Names: </label>|{\\n6003 }{\\n600a}{ 600b }{ 600c }{ 600d }{ 600e }{ 600f }{ 600g }{ 600h }{--600k}{ 600l }{ 600m }{ 600n }{ 600o }{--600p}{ 600r }{ 600s }{ 600t }{ 600u }{--600x}{--600z}{--600y}{--600v}|\r\n#610|<br/><br/><label>Subjects--Corporate Names: </label>|{\\n6103 }{\\n610a}{ 610b }{ 610c }{ 610d }{ 610e }{ 610f }{ 610g }{ 610h }{--610k}{ 610l }{ 610m }{ 610n }{ 610o }{--610p}{ 610r }{ 610s }{ 610t }{ 610u }{--610x}{--610z}{--610y}{--610v}|\r\n#611|<br/><br/><label>Subjects--Meeting Names: </label>|{\\n6113 }{\\n611a}{ 611b }{ 611c }{ 611d }{ 611e }{ 611f }{ 611g }{ 611h }{--611k}{ 611l }{ 611m }{ 611n }{ 611o }{--611p}{ 611r }{ 611s }{ 611t }{ 611u }{--611x}{--611z}{--611y}{--611v}|\r\n#630|<br/><br/><label>Subjects--Uniform Titles: </label>|{\\n630a}{ 630b }{ 630c }{ 630d }{ 630e }{ 630f }{ 630g }{ 630h }{--630k }{ 630l }{ 630m }{ 630n }{ 630o }{--630p}{ 630r }{ 630s }{ 630t }{--630x}{--630z}{--630y}{--630v}|\r\n#648|<br/><br/><label>Subjects--Chronological Terms: </label>|{\\n6483 }{\\n648a }{--648x}{--648z}{--648y}{--648v}|\r\n#650|<br/><br/><label>Subjects--Topical Terms: </label>|{\\n6503 }{\\n650a}{ 650b }{ 650c }{ 650d }{ 650e }{--650x}{--650z}{--650y}{--650v}|\r\n#651|<br/><br/><label>Subjects--Geographic Terms: </label>|{\\n6513 }{\\n651a}{ 651b }{ 651c }{ 651d }{ 651e }{--651x}{--651z}{--651y}{--651v}|\r\n#653|<br/><br/><label>Subjects--Index Terms: </label>|{ 653a }|\r\n#654|<br/><br/><label>Subjects--Facted Index Terms: </label>|{\\n6543 }{\\n654a}{--654b}{--654x}{--654z}{--654y}{--654v}|\r\n#655|<br/><br/><label>Index Terms--Genre/Form: </label>|{\\n6553 }{\\n655a}{--655b}{--655x }{--655z}{--655y}{--655v}|\r\n#656|<br/><br/><label>Index Terms--Occupation: </label>|{\\n6563 }{\\n656a}{--656k}{--656x}{--656z}{--656y}{--656v}|\r\n#657|<br/><br/><label>Index Terms--Function: </label>|{\\n6573 }{\\n657a}{--657x}{--657z}{--657y}{--657v}|\r\n#658|<br/><br/><label>Index Terms--Curriculum Objective: </label>|{\\n658a}{--658b}{--658c}{--658d}{--658v}|\r\n#050|<br/><br/><label>LC Class. No.: </label>|{ 050a }{ / 050b }|\r\n#082|<br/><br/><label>Dewey Class. No.: </label>|{ 082a }{ / 082b }|\r\n#080|<br/><br/><label>Universal Decimal Class. No.: </label>|{ 080a }{ 080x }{ / 080b }|\r\n#070|<br/><br/><label>National Agricultural Library Call No.: </label>|{ 070a }{ / 070b }|\r\n#060|<br/><br/><label>National Library of Medicine Call No.: </label>|{ 060a }{ / 060b }|\r\n#074|<br/><br/><label>GPO Item No.: </label>|{ 074a }|\r\n#086|<br/><br/><label>Gov. Doc. Class. No.: </label>|{ 086a }|\r\n#088|<br/><br/><label>Report. No.: </label>|{ 088a }|','ISBD','80|20','Textarea');
-INSERT INTO `systempreferences` VALUES('IssueLog','0','Active this if you want to log issue.',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('IssuingInProcess','0','Allow no debt alert if the patron is issuing item that accumulate debt',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('item-level_itypes','1','Item-level Itemtype / issuing rules','','YesNo');
-INSERT INTO `systempreferences` VALUES('itemcallnumber','676a','The MARC field/subfield that is used to calculate the itemcallnumber (in UNIMARC',NULL,'free');
-INSERT INTO `systempreferences` VALUES('KohaAdminEmailAddress','root@localhost','the email address where borrowers modifs are sent','','free');
-INSERT INTO `systempreferences` VALUES('kohaspsuggest','1','Keep track of queries and suggestions in a database','','');
-INSERT INTO `systempreferences` VALUES('LabelMARCView','standard','Define how a MARC record will display','standard|economical','Choice');
-INSERT INTO `systempreferences` VALUES('LetterLog','0','Active this if you want to log all the letter sent',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('LibraryName','','Library name as shown on main opac page','','');
-INSERT INTO `systempreferences` VALUES('marc','ON','Turn on MARC support',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('marcflavour','MARC21','your MARC flavor (MARC21 or UNIMARC) used for character encoding','MARC21|UNIMARC','Choice');
-INSERT INTO `systempreferences` VALUES('MARCOrgCode','OSt','Your MARC Organization Code - http://www.loc.gov/marc/organizations/orgshome.htm','','free');
-INSERT INTO `systempreferences` VALUES('maxoutstanding','5','maximum amount withstanding to be able make reserves','','Integer');
-INSERT INTO `systempreferences` VALUES('maxreserves','50','maximum number of reserves a member can make','','Integer');
-INSERT INTO `systempreferences` VALUES('memberofinstitution','0','Are your patrons members of institutions',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('MIME','EXCEL','Define the default application for report exportations into files','EXCEL|OPENOFFICE.ORG','Choice');
-INSERT INTO `systempreferences` VALUES('noissuescharge','5','maximum amount withstanding to be able to check out an item','','Integer');
-INSERT INTO `systempreferences` VALUES('NotifyBorrowerDeparture','0','Delay before expiry where a notice is sent when issuing',NULL,'Integer');
-INSERT INTO `systempreferences` VALUES('OpacAuthorities','1','Enable / Disable the search authority link on OPAC',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('opacbookbag','1','Enable or disable display of biblio basket (book bag)','','YesNo');
-INSERT INTO `systempreferences` VALUES('OpacBrowser','1','Enable/Disable browser link on OPAC (needs to set misc/cronjob/build_browser.pl)',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('OpacCloud','1','Enable / Disable cloud link on OPAC',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('opaccolorstylesheet','colors.css','Enter the name of the color stylesheet to use in the OPAC','','free');
-INSERT INTO `systempreferences` VALUES('opaccredits','','Put any HTML Credits at the bottom of the OPAC page','70|10','Textarea');
-INSERT INTO `systempreferences` VALUES('opacheader','','Enter HTML to be included as a custom header in the OPAC','30|10','Textarea');
-INSERT INTO `systempreferences` VALUES('opaclanguages','en','Set the preferred order for translations.  The top language will be tried first.',NULL,'Languages');
-INSERT INTO `systempreferences` VALUES('opaclanguagesdisplay','0','Turn on/off display of Change Language feature on OPAC','','YesNo');
-INSERT INTO `systempreferences` VALUES('opaclargeimage','','Enter a complete URL to an image, will be on the main page, instead of the Koha',NULL,'free');
-INSERT INTO `systempreferences` VALUES('opaclayoutstylesheet','opac.css','Enter the name of the layout stylesheet to use in the OPAC','','free');
-INSERT INTO `systempreferences` VALUES('OpacMaintenance','0','This will give the users a nice maintenance warning if enabled','','YesNo');
-INSERT INTO `systempreferences` VALUES('OpacMainUserBlock','Welcome to Koha...\r\n<hr>','A user-defined block of HTML  in the main content area of the opac main page','50|20','Textarea');
-INSERT INTO `systempreferences` VALUES('OpacNav','Important links here.','Use HTML tabs to add navigational links to the left-hand navigational bar in OPA','70|10','Textarea');
-INSERT INTO `systempreferences` VALUES('OpacPasswordChange','1','Enable/Disable password change in OPAC (disable it when using LDAP auth)',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('opacreadinghistory','1','Turn on/off display of Patron Reading History in OPAC','','YesNo');
-INSERT INTO `systempreferences` VALUES('opacsmallimage','','Enter a complete URL to an image, will be on top/left instead of the Koha logo','','free');
-INSERT INTO `systempreferences` VALUES('opacstylesheet','','Enter a complete URL to use an alternate layout stylesheet in OPAC','','free');
-INSERT INTO `systempreferences` VALUES('opacthemes','prog','Set the preferred order for themes.  The top theme will be tried first.','','Themes');
-INSERT INTO `systempreferences` VALUES('OpacTopissue','1','Enable / Disable the top issue link on OPAC',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('opacuserjs','','Custom javascript for inclusion in OPAC','50|20','Textarea');
-INSERT INTO `systempreferences` VALUES('opacuserlogin','1','Enable or disable display of user login features',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('patronimages','0','Turn on/off display of patron images in Intranet and specify a file extension fo','','YesNo');
-INSERT INTO `systempreferences` VALUES('printcirculationslips','1','if set to 1, print circulation slips. If set to 0, don\'t','','free');
-INSERT INTO `systempreferences` VALUES('ReadingHistory','1','Allow reading record info retrievable from issues and oldissues tables','','YesNo');
-INSERT INTO `systempreferences` VALUES('RequestOnOpac','1','option to allow reserves on opac',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('ReservesMaxPickUpDelay','7','Maximum delay to pick up a reserved document','','free');
-INSERT INTO `systempreferences` VALUES('ReturnBeforeExpiry','0','If Yes, Returndate on issuing can\'t be after borrower card expiry',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('ReturnLog','0','Active this if you want to log the circulation return',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('reviewson','1','Allows patrons to submit reviews from the opac','','YesNo');
-INSERT INTO `systempreferences` VALUES('serialsadditems','0','If set, a new item will be automatically added when receiving an issue',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('sortbynonfiling','no','Sort search results by MARC nonfiling characters',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('SpecifyDueDate','1','Choose whether to display \"Specify Due Date\" form in Circulation','','YesNo');
-INSERT INTO `systempreferences` VALUES('SubscriptionHistory',';','Define the information level for serials history in OPAC','simplified|full','Choice');
-INSERT INTO `systempreferences` VALUES('SubscriptionLog','0','Active this if you want to log Subscription action',NULL,'YesNo');
-INSERT INTO `systempreferences` VALUES('suggestion','1','if set to 1, suggestions are activated in OPAC','','free');
-INSERT INTO `systempreferences` VALUES('template','prog','Preference order for intranet interface templates','','Themes');
-INSERT INTO `systempreferences` VALUES('TemplateEncoding','utf-8','Specify the encoding to use in Templates','iso-8859-1|utf-8','Choice');
-INSERT INTO `systempreferences` VALUES('timeout','12000000','Inactivity timeout for cookies authentication (in seconds)',NULL,'Integer');
-INSERT INTO `systempreferences` VALUES('TransfersMaxDaysWarning','3','Max delay before considering the transfer has potentialy a problem',NULL,'free');
-INSERT INTO `systempreferences` VALUES('useDaysMode','Calendar','How to calculate return dates : Calendar means holidays will be controled, Days means the return date don\'t depend on holidays','Calendar|Days','Choice');
-INSERT INTO `systempreferences` VALUES('virtualshelves','1','Set virtual shelves management ON or OFF','','YesNo');
-INSERT INTO `systempreferences` VALUES('z3950AuthorAuthFields','701,702,700','contains the MARC biblio tags of person authorities to fill biblio.author with w',NULL,'free');
-INSERT INTO `systempreferences` VALUES('z3950NormalizeAuthor','0','If set, Personal Name Authorities will replace authors in biblio.author','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('acquisitions','normal','Normal, budget-based acquisitions, or Simple bibliographic-data acquisitions','simple|normal','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('advancedMARCeditor','0','If set, the MARC editor won\'t show you tag/subfields description','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonAssocTag','','see: associates.amazon.com/gp/flex/associates/apply-login.html','','free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonContent','0','Turn On Amazon Content - You MUST set AmazonDevKey and AmazonAssocTag if enabled','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AmazonDevKey','','see: aws-portal.amazon.com/gp/aws/developer/registration/index.html','','free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AnonSuggestions','0','Set to anonymous borrowernumber to enable Anonymous suggestions',NULL,'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('authoritysep','--','the separator used in authority/thesaurus. Usually --','10','free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('autoBarcode','1','Barcode is auto-calculated','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoLocation','0','switch to activate or not Autolocation, if Yes, the Librarian can\'t change his location, it\'s defined by branchip',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutomaticItemReturn','1','This Variable allow or not to return automaticly to his homebranch',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('autoMemberNum','1','Member number is auto-calculated','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BiblioDefaultView','normal','Define the default view of a biblio. Can be either normal, marc or isbd','normal|marc|isbd','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerMandatoryField','zipcode|surname','List all mandatory fields for borrowers',NULL,'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('borrowerRelationship','father|mother','The relationships between a guarantor & a guarantee (separated by | or ,)','','free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowersLog','0','Active this if you want to log borrowers edition/creation/deletion...',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowersTitles','Mr|Mrs|Miss|Ms','List all Titles for borrowers',NULL,'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('CataloguingLog','0','Active this if you want to log cataloguing action.',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('checkdigit','none','Validity checks on membership number: none or \"Katipo\" style checks','none|katipo','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('dateformat','us','date format (us mm/dd/yyyy, metric dd/mm/yyy, ISO yyyy/mm/dd)','metric|us|iso','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('delimiter',';','Define the default separator character for report exportations into files',';|tabulation|,|/|\\|#','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Disable_Dictionary','1','Disables Dictionary buttons if set to yes','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('expandedSearchOption','0','search among marc field',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FinesLog','0','Active this if you want to log fines',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('gist','0','the gist rate. NOT in %, but in numeric form (0.12 for 12%)','','free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems','0','show or hide \"lost\" items in OPAC.','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hide_marc','0','hide marc specific datas like subfield code & indicators to library',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IndependantBranches','0','Turn Branch independancy management On an Off',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('insecure','NO','If YES, no auth at all is needed. Be careful if you set this to yes!',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetBiblioDefaultView','normal','IntranetBiblioDefaultView','','');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('intranetcolorstylesheet','intranet.css','Enter the name of the color stylesheet to use in Intranet','','free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetmainUserblock','','A user-defined block of HTML on the intranet home page','50|20','Textarea');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetNav','','Use HTML tabs to add navigational links to the left-hand navigational bar in Int','70|10','Textarea');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('intranetreadinghistory','0','Turn on or off the Reading History option in the intranet','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('intranetstylesheet','','Enter a complete URL to use an alternate layout stylesheet in Intranet',NULL,'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('intranetuserjs','function prepareEmailPopup(){\r\n  if (!document.getElementById) return false;\r\n  if (!document.getElementById(\'reserveemail\')) return false;\r\n  rsvlink = document.getElementById(\'reserveemail\');\r\n  rsvlink.onclick = function() {\r\n      doReservePopup();\r\n      return false;\r\n	}\r\n}\r\n\r\nfunction doReservePopup(){\r\n}\r\n\r\nfunction prepareReserveList(){\r\n}\r\n\r\naddLoadEvent(prepareEmailPopup);\r\naddLoadEvent(prepareReserveList);','Custom javascript for inclusion in Intranet','50|10','Textarea');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('intranet_includes','includes','The includes directory you want for specific look of Koha (includes or includes_npl for example)',NULL,'Free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ISBD','#100||{ 100a }{ 100b }{ 100c }{ 100d }{ 110a }{ 110b }{ 110c }{ 110d }{ 110e }{ 110f }{ 110g }{ 130a }{ 130d }{ 130f }{ 130g }{ 130h }{ 130k }{ 130l }{ 130m }{ 130n }{ 130o }{ 130p }{ 130r }{ 130s }{ 130t }|<br/><br/>\r\n#245||{ 245a }{ 245b }{245f }{ 245g }{ 245k }{ 245n }{ 245p }{ 245s }{ 245h }|\r\n#246||{ : 246i }{ 246a }{ 246b }{ 246f }{ 246g }{ 246n }{ 246p }{ 246h }|\r\n#242||{ = 242a }{ 242b }{ 242n }{ 242p }{ 242h }|\r\n#245||{ 245c }|\r\n#242||{ = 242c }|\r\n#250| - |{ 250a }{ 250b }|\r\n#254|, |{ 254a }|\r\n#255|, |{ 255a }{ 255b }{ 255c }{ 255d }{ 255e }{ 255f }{ 255g }|\r\n#256|, |{ 256a }|\r\n#257|, |{ 257a }|\r\n#258|, |{ 258a }{ 258b }|\r\n#260| - |{ 260a }{ 260b }{ 260c }|\r\n#300| - |{ 300a }{ 300b }{ 300c }{ 300d }{ 300e }{ 300f }{ 300g }|\r\n#306| - |{ 306a }|\r\n#307| - |{ 307a }{ 307b }|\r\n#310| - |{ 310a }{ 310b }|\r\n#321| - |{ 321a }{ 321b }|\r\n#340| - |{ 3403 }{ 340a }{ 340b }{ 340c }{ 340d }{ 340e }{ 340f }{ 340h }{ 340i }|\r\n#342| - |{ 342a }{ 342b }{ 342c }{ 342d }{ 342e }{ 342f }{ 342g }{ 342h }{ 342i }{ 342j }{ 342k }{ 342l }{ 342m }{ 342n }{ 342o }{ 342p }{ 342q }{ 342r }{ 342s }{ 342t }{ 342u }{ 342v }{ 342w }|\r\n#343| - |{ 343a }{ 343b }{ 343c }{ 343d }{ 343e }{ 343f }{ 343g }{ 343h }{ 343i }|\r\n#351| - |{ 3513 }{ 351a }{ 351b }{ 351c }|\r\n#352| - |{ 352a }{ 352b }{ 352c }{ 352d }{ 352e }{ 352f }{ 352g }{ 352i }{ 352q }|\r\n#362| - |{ 362a }{ 351z }|\r\n#440| - |{ 440a }{ 440n }{ 440p }{ 440v }{ 440x }|.\r\n#490| - |{ 490a }{ 490v }{ 490x }|.\r\n#800| - |{ 800a }{ 800b }{ 800c }{ 800d }{ 800e }{ 800f }{ 800g }{ 800h }{ 800j }{ 800k }{ 800l }{ 800m }{ 800n }{ 800o }{ 800p }{ 800q }{ 800r }{ 800s }{ 800t }{ 800u }{ 800v }|.\r\n#810| - |{ 810a }{ 810b }{ 810c }{ 810d }{ 810e }{ 810f }{ 810g }{ 810h }{ 810k }{ 810l }{ 810m }{ 810n }{ 810o }{ 810p }{ 810r }{ 810s }{ 810t }{ 810u }{ 810v }|.\r\n#811| - |{ 811a }{ 811c }{ 811d }{ 811e }{ 811f }{ 811g }{ 811h }{ 811k }{ 811l }{ 811n }{ 811p }{ 811q }{ 811s }{ 811t }{ 811u }{ 811v }|.\r\n#830| - |{ 830a }{ 830d }{ 830f }{ 830g }{ 830h }{ 830k }{ 830l }{ 830m }{ 830n }{ 830o }{ 830p }{ 830r }{ 830s }{ 830t }{ 830v }|.\r\n#500|<br/><br/>|{ 5003 }{ 500a }|\r\n#501|<br/><br/>|{ 501a }|\r\n#502|<br/><br/>|{ 502a }|\r\n#504|<br/><br/>|{ 504a }|\r\n#505|<br/><br/>|{ 505a }{ 505t }{ 505r }{ 505g }{ 505u }|\r\n#506|<br/><br/>|{ 5063 }{ 506a }{ 506b }{ 506c }{ 506d }{ 506u }|\r\n#507|<br/><br/>|{ 507a }{ 507b }|\r\n#508|<br/><br/>|{ 508a }{ 508a }|\r\n#510|<br/><br/>|{ 5103 }{ 510a }{ 510x }{ 510c }{ 510b }|\r\n#511|<br/><br/>|{ 511a }|\r\n#513|<br/><br/>|{ 513a }{513b }|\r\n#514|<br/><br/>|{ 514z }{ 514a }{ 514b }{ 514c }{ 514d }{ 514e }{ 514f }{ 514g }{ 514h }{ 514i }{ 514j }{ 514k }{ 514m }{ 514u }|\r\n#515|<br/><br/>|{ 515a }|\r\n#516|<br/><br/>|{ 516a }|\r\n#518|<br/><br/>|{ 5183 }{ 518a }|\r\n#520|<br/><br/>|{ 5203 }{ 520a }{ 520b }{ 520u }|\r\n#521|<br/><br/>|{ 5213 }{ 521a }{ 521b }|\r\n#522|<br/><br/>|{ 522a }|\r\n#524|<br/><br/>|{ 524a }|\r\n#525|<br/><br/>|{ 525a }|\r\n#526|<br/><br/>|{\\n510i }{\\n510a }{ 510b }{ 510c }{ 510d }{\\n510x }|\r\n#530|<br/><br/>|{\\n5063 }{\\n506a }{ 506b }{ 506c }{ 506d }{\\n506u }|\r\n#533|<br/><br/>|{\\n5333 }{\\n533a }{\\n533b }{\\n533c }{\\n533d }{\\n533e }{\\n533f }{\\n533m }{\\n533n }|\r\n#534|<br/><br/>|{\\n533p }{\\n533a }{\\n533b }{\\n533c }{\\n533d }{\\n533e }{\\n533f }{\\n533m }{\\n533n }{\\n533t }{\\n533x }{\\n533z }|\r\n#535|<br/><br/>|{\\n5353 }{\\n535a }{\\n535b }{\\n535c }{\\n535d }|\r\n#538|<br/><br/>|{\\n5383 }{\\n538a }{\\n538i }{\\n538u }|\r\n#540|<br/><br/>|{\\n5403 }{\\n540a }{ 540b }{ 540c }{ 540d }{\\n520u }|\r\n#544|<br/><br/>|{\\n5443 }{\\n544a }{\\n544b }{\\n544c }{\\n544d }{\\n544e }{\\n544n }|\r\n#545|<br/><br/>|{\\n545a }{ 545b }{\\n545u }|\r\n#546|<br/><br/>|{\\n5463 }{\\n546a }{ 546b }|\r\n#547|<br/><br/>|{\\n547a }|\r\n#550|<br/><br/>|{ 550a }|\r\n#552|<br/><br/>|{ 552z }{ 552a }{ 552b }{ 552c }{ 552d }{ 552e }{ 552f }{ 552g }{ 552h }{ 552i }{ 552j }{ 552k }{ 552l }{ 552m }{ 552n }{ 562o }{ 552p }{ 552u }|\r\n#555|<br/><br/>|{ 5553 }{ 555a }{ 555b }{ 555c }{ 555d }{ 555u }|\r\n#556|<br/><br/>|{ 556a }{ 506z }|\r\n#563|<br/><br/>|{ 5633 }{ 563a }{ 563u }|\r\n#565|<br/><br/>|{ 5653 }{ 565a }{ 565b }{ 565c }{ 565d }{ 565e }|\r\n#567|<br/><br/>|{ 567a }|\r\n#580|<br/><br/>|{ 580a }|\r\n#581|<br/><br/>|{ 5633 }{ 581a }{ 581z }|\r\n#584|<br/><br/>|{ 5843 }{ 584a }{ 584b }|\r\n#585|<br/><br/>|{ 5853 }{ 585a }|\r\n#586|<br/><br/>|{ 5863 }{ 586a }|\r\n#020|<br/><br/><label>ISBN: </label>|{ 020a }{ 020c }|\r\n#022|<br/><br/><label>ISSN: </label>|{ 022a }|\r\n#222| = |{ 222a }{ 222b }|\r\n#210| = |{ 210a }{ 210b }|\r\n#024|<br/><br/><label>Standard No.: </label>|{ 024a }{ 024c }{ 024d }{ 0242 }|\r\n#027|<br/><br/><label>Standard Tech. Report. No.: </label>|{ 027a }|\r\n#028|<br/><br/><label>Publisher. No.: </label>|{ 028a }{ 028b }|\r\n#013|<br/><br/><label>Patent No.: </label>|{ 013a }{ 013b }{ 013c }{ 013d }{ 013e }{ 013f }|\r\n#030|<br/><br/><label>CODEN: </label>|{ 030a }|\r\n#037|<br/><br/><label>Source: </label>|{ 037a }{ 037b }{ 037c }{ 037f }{ 037g }{ 037n }|\r\n#010|<br/><br/><label>LCCN: </label>|{ 010a }|\r\n#015|<br/><br/><label>Nat. Bib. No.: </label>|{ 015a }{ 0152 }|\r\n#016|<br/><br/><label>Nat. Bib. Agency Control No.: </label>|{ 016a }{ 0162 }|\r\n#600|<br/><br/><label>Subjects--Personal Names: </label>|{\\n6003 }{\\n600a}{ 600b }{ 600c }{ 600d }{ 600e }{ 600f }{ 600g }{ 600h }{--600k}{ 600l }{ 600m }{ 600n }{ 600o }{--600p}{ 600r }{ 600s }{ 600t }{ 600u }{--600x}{--600z}{--600y}{--600v}|\r\n#610|<br/><br/><label>Subjects--Corporate Names: </label>|{\\n6103 }{\\n610a}{ 610b }{ 610c }{ 610d }{ 610e }{ 610f }{ 610g }{ 610h }{--610k}{ 610l }{ 610m }{ 610n }{ 610o }{--610p}{ 610r }{ 610s }{ 610t }{ 610u }{--610x}{--610z}{--610y}{--610v}|\r\n#611|<br/><br/><label>Subjects--Meeting Names: </label>|{\\n6113 }{\\n611a}{ 611b }{ 611c }{ 611d }{ 611e }{ 611f }{ 611g }{ 611h }{--611k}{ 611l }{ 611m }{ 611n }{ 611o }{--611p}{ 611r }{ 611s }{ 611t }{ 611u }{--611x}{--611z}{--611y}{--611v}|\r\n#630|<br/><br/><label>Subjects--Uniform Titles: </label>|{\\n630a}{ 630b }{ 630c }{ 630d }{ 630e }{ 630f }{ 630g }{ 630h }{--630k }{ 630l }{ 630m }{ 630n }{ 630o }{--630p}{ 630r }{ 630s }{ 630t }{--630x}{--630z}{--630y}{--630v}|\r\n#648|<br/><br/><label>Subjects--Chronological Terms: </label>|{\\n6483 }{\\n648a }{--648x}{--648z}{--648y}{--648v}|\r\n#650|<br/><br/><label>Subjects--Topical Terms: </label>|{\\n6503 }{\\n650a}{ 650b }{ 650c }{ 650d }{ 650e }{--650x}{--650z}{--650y}{--650v}|\r\n#651|<br/><br/><label>Subjects--Geographic Terms: </label>|{\\n6513 }{\\n651a}{ 651b }{ 651c }{ 651d }{ 651e }{--651x}{--651z}{--651y}{--651v}|\r\n#653|<br/><br/><label>Subjects--Index Terms: </label>|{ 653a }|\r\n#654|<br/><br/><label>Subjects--Facted Index Terms: </label>|{\\n6543 }{\\n654a}{--654b}{--654x}{--654z}{--654y}{--654v}|\r\n#655|<br/><br/><label>Index Terms--Genre/Form: </label>|{\\n6553 }{\\n655a}{--655b}{--655x }{--655z}{--655y}{--655v}|\r\n#656|<br/><br/><label>Index Terms--Occupation: </label>|{\\n6563 }{\\n656a}{--656k}{--656x}{--656z}{--656y}{--656v}|\r\n#657|<br/><br/><label>Index Terms--Function: </label>|{\\n6573 }{\\n657a}{--657x}{--657z}{--657y}{--657v}|\r\n#658|<br/><br/><label>Index Terms--Curriculum Objective: </label>|{\\n658a}{--658b}{--658c}{--658d}{--658v}|\r\n#050|<br/><br/><label>LC Class. No.: </label>|{ 050a }{ / 050b }|\r\n#082|<br/><br/><label>Dewey Class. No.: </label>|{ 082a }{ / 082b }|\r\n#080|<br/><br/><label>Universal Decimal Class. No.: </label>|{ 080a }{ 080x }{ / 080b }|\r\n#070|<br/><br/><label>National Agricultural Library Call No.: </label>|{ 070a }{ / 070b }|\r\n#060|<br/><br/><label>National Library of Medicine Call No.: </label>|{ 060a }{ / 060b }|\r\n#074|<br/><br/><label>GPO Item No.: </label>|{ 074a }|\r\n#086|<br/><br/><label>Gov. Doc. Class. No.: </label>|{ 086a }|\r\n#088|<br/><br/><label>Report. No.: </label>|{ 088a }|','ISBD','80|20','Textarea');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IssueLog','0','Active this if you want to log issue.',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IssuingInProcess','0','Allow no debt alert if the patron is issuing item that accumulate debt',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('item-level_itypes','1','Item-level Itemtype / issuing rules','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('itemcallnumber','676a','The MARC field/subfield that is used to calculate the itemcallnumber (in UNIMARC',NULL,'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('KohaAdminEmailAddress','root@localhost','the email address where borrowers modifs are sent','','free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('kohaspsuggest','1','Keep track of queries and suggestions in a database','','');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('LabelMARCView','standard','Define how a MARC record will display','standard|economical','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('LetterLog','0','Active this if you want to log all the letter sent',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('LibraryName','','Library name as shown on main opac page','','');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('marc','ON','Turn on MARC support',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('marcflavour','MARC21','your MARC flavor (MARC21 or UNIMARC) used for character encoding','MARC21|UNIMARC','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MARCOrgCode','OSt','Your MARC Organization Code - http://www.loc.gov/marc/organizations/orgshome.htm','','free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxoutstanding','5','maximum amount withstanding to be able make reserves','','Integer');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxreserves','50','maximum number of reserves a member can make','','Integer');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('memberofinstitution','0','Are your patrons members of institutions',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('MIME','EXCEL','Define the default application for report exportations into files','EXCEL|OPENOFFICE.ORG','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('noissuescharge','5','maximum amount withstanding to be able to check out an item','','Integer');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NotifyBorrowerDeparture','0','Delay before expiry where a notice is sent when issuing',NULL,'Integer');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacAuthorities','1','Enable / Disable the search authority link on OPAC',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacbookbag','1','Enable or disable display of biblio basket (book bag)','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacBrowser','1','Enable/Disable browser link on OPAC (needs to set misc/cronjob/build_browser.pl)',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacCloud','1','Enable / Disable cloud link on OPAC',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opaccolorstylesheet','colors.css','Enter the name of the color stylesheet to use in the OPAC','','free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opaccredits','','Put any HTML Credits at the bottom of the OPAC page','70|10','Textarea');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacheader','','Enter HTML to be included as a custom header in the OPAC','30|10','Textarea');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opaclanguages','en','Set the preferred order for translations.  The top language will be tried first.',NULL,'Languages');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opaclanguagesdisplay','0','Turn on/off display of Change Language feature on OPAC','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opaclargeimage','','Enter a complete URL to an image, will be on the main page, instead of the Koha',NULL,'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opaclayoutstylesheet','opac.css','Enter the name of the layout stylesheet to use in the OPAC','','free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacMaintenance','0','This will give the users a nice maintenance warning if enabled','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacMainUserBlock','Welcome to Koha...\r\n<hr>','A user-defined block of HTML  in the main content area of the opac main page','50|20','Textarea');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacNav','Important links here.','Use HTML tabs to add navigational links to the left-hand navigational bar in OPA','70|10','Textarea');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPasswordChange','1','Enable/Disable password change in OPAC (disable it when using LDAP auth)',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacreadinghistory','1','Turn on/off display of Patron Reading History in OPAC','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacsmallimage','','Enter a complete URL to an image, will be on top/left instead of the Koha logo','','free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacstylesheet','','Enter a complete URL to use an alternate layout stylesheet in OPAC','','free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacthemes','prog','Set the preferred order for themes.  The top theme will be tried first.','','Themes');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacTopissue','1','Enable / Disable the top issue link on OPAC',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacuserjs','','Custom javascript for inclusion in OPAC','50|20','Textarea');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacuserlogin','1','Enable or disable display of user login features',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('patronimages','0','Turn on/off display of patron images in Intranet and specify a file extension fo','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('printcirculationslips','1','if set to 1, print circulation slips. If set to 0, don\'t','','free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ReadingHistory','1','Allow reading record info retrievable from issues and oldissues tables','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('RequestOnOpac','1','option to allow reserves on opac',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ReservesMaxPickUpDelay','7','Maximum delay to pick up a reserved document','','free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ReturnBeforeExpiry','0','If Yes, Returndate on issuing can\'t be after borrower card expiry',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ReturnLog','0','Active this if you want to log the circulation return',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('reviewson','1','Allows patrons to submit reviews from the opac','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('serialsadditems','0','If set, a new item will be automatically added when receiving an issue',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('sortbynonfiling','no','Sort search results by MARC nonfiling characters',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SpecifyDueDate','1','Choose whether to display \"Specify Due Date\" form in Circulation','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SubscriptionHistory',';','Define the information level for serials history in OPAC','simplified|full','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('SubscriptionLog','0','Active this if you want to log Subscription action',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('suggestion','1','if set to 1, suggestions are activated in OPAC','','free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('template','prog','Preference order for intranet interface templates','','Themes');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('TemplateEncoding','utf-8','Specify the encoding to use in Templates','iso-8859-1|utf-8','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('timeout','12000000','Inactivity timeout for cookies authentication (in seconds)',NULL,'Integer');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('TransfersMaxDaysWarning','3','Max delay before considering the transfer has potentialy a problem',NULL,'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('useDaysMode','Calendar','How to calculate return dates : Calendar means holidays will be controled, Days means the return date don\'t depend on holidays','Calendar|Days','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('virtualshelves','1','Set virtual shelves management ON or OFF','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('z3950AuthorAuthFields','701,702,700','contains the MARC biblio tags of person authorities to fill biblio.author with w',NULL,'free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('z3950NormalizeAuthor','0','If set, Personal Name Authorities will replace authors in biblio.author','','YesNo');
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index f11c710b4a..a3ba74b73a 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -489,6 +489,7 @@ for ( my $i = 0 ; $i <= @servers ; $i++ ) {
                 my $this_page_number = $i;
                 my $highlight        = 1
                   if ( $this_page_number == $current_page_number );
+                if ($this_page_number <= $pages) {
                 push @page_numbers,
                   {
                     offset    => $this_offset,
@@ -497,6 +498,7 @@ for ( my $i = 0 ; $i <= @servers ; $i++ ) {
                     sort_by   => join " ",
                     @sort_by
                   };
+                }
             }
             $template->param(
                 PAGE_NUMBERS         => \@page_numbers,
diff --git a/updater/updatedatabase b/updater/updatedatabase
index 361674f1f3..b196860750 100755
--- a/updater/updatedatabase
+++ b/updater/updatedatabase
@@ -1101,6 +1101,12 @@ my %indexes = (
             content => 'itemnumber',
         }
     ],
+	userflags => [
+		{ 	indexname => 'PRIMARY',
+			content => 'bit',
+			type => 'PRI',
+		}
+	]
 );
 
 my %foreign_keys = (
@@ -1962,6 +1968,20 @@ $sth->finish;
 exit;
 
 # $Log$
+# Revision 1.159  2007/03/16 01:25:09  kados
+# Using my precrash CVS copy I did the following:
+#
+# cvs -z3 -d:ext:kados@cvs.savannah.nongnu.org:/sources/koha co -P koha
+# find koha.precrash -type d -name "CVS" -exec rm -v {} \;
+# cp -r koha.precrash/* koha/
+# cd koha/
+# cvs commit
+#
+# This should in theory put us right back where we were before the crash
+#
+# Revision 1.159  2007/03/12 17:52:30  rych
+# add pri key to userflags
+#
 # Revision 1.158  2007/03/09 15:14:57  tipaul
 # rel_3_0 moved to HEAD
 #
-- 
2.20.1