Merge remote branch 'kc/master' into new/enh/bug_5917

2011-03-28 09:16:50 +13:00 · 2011-03-28 09:16:50 +13:00 · 71e1218fe1
commit 71e1218fe1
parent b9d296b198 a4b2280b6b
43 changed files with 996 additions and 730 deletions
--- a/C4/AuthoritiesMarc.pm
+++ b/C4/AuthoritiesMarc.pm
@ -1182,16 +1182,17 @@ sub BuildUnimarcHierarchy{
  my $class = shift @_;
  my $authid_constructed = shift @_;
  return undef unless ($record);
-  my $authid=$record->subfield('2..','3');
+  my $authid=$record->field('001')->data();
  my %cell;
  my $parents=""; my $children="";
  my (@loopparents,@loopchildren);
-  foreach my $field ($record->field('550')){
+  foreach my $field ($record->field('5..')){
+	my $subfauthid=_get_authid_subfield($field);
    if ($field->subfield('5') && $field->subfield('a')){
      if ($field->subfield('5') eq 'h'){
-        push @loopchildren, { "childauthid"=>$field->subfield('3'),"childvalue"=>$field->subfield('a')};
+        push @loopchildren, { "childauthid"=>$subfauthid,"childvalue"=>$field->subfield('a')};
      }elsif ($field->subfield('5') eq 'g'){
-        push @loopparents, { "parentauthid"=>$field->subfield('3'),"parentvalue"=>$field->subfield('a')};
+        push @loopparents, { "parentauthid"=>$subfauthid,"parentvalue"=>$field->subfield('a')};
      }
          # brothers could get in there with an else
    }
@ -1207,6 +1208,10 @@ sub BuildUnimarcHierarchy{
  return \%cell;
 }

+sub _get_authid_subfield{
+    my ($field)=@_;
+    return $field->subfield('9')||$field->subfield('3');
+}
 =head2 GetHeaderAuthority

  $ref= &GetHeaderAuthority( $authid)
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@ -320,10 +320,15 @@ sub ModBiblio {
    foreach my $fielditem (@fields) {
        my $field;
        foreach ( $fielditem->subfields() ) {
+            # re-encode the subfield only if it isn't already in utf-8.
+            my ($tag, $value) = @$_;
+            $tag = Encode::encode('utf-8', $tag) unless utf8::is_utf8($tag);
+            $value = Encode::encode('utf-8', $value) unless utf8::is_utf8($value);
+
            if ($field) {
-                $field->add_subfields( Encode::encode( 'utf-8', $_->[0] ) => Encode::encode( 'utf-8', $_->[1] ) );
+                $field->add_subfields( $tag => $value );
            } else {
-                $field = MARC::Field->new( "$itemtag", '', '', Encode::encode( 'utf-8', $_->[0] ) => Encode::encode( 'utf-8', $_->[1] ) );
+                $field = MARC::Field->new( "$itemtag", '', '', $tag => $value );
            }
        }
        $record->append_fields($field);
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@ -58,8 +58,8 @@ BEGIN {
 		&GetKohaAuthorisedValues
 		&GetKohaAuthorisedValuesFromField
    &GetKohaAuthorisedValueLib
-      &GetAuthorisedValueByCode
-      &GetKohaImageurlFromAuthorisedValues
+    &GetAuthorisedValueByCode
+    &GetKohaImageurlFromAuthorisedValues
 		&GetAuthValCode
 		&GetNormalizedUPC
 		&GetNormalizedISBN
@ -958,9 +958,9 @@ sub GetKohaImageurlFromAuthorisedValues {
    my $dbh = C4::Context->dbh;
    my $sth = $dbh->prepare("SELECT imageurl FROM authorised_values WHERE category=? AND lib =?");
    $sth->execute( $category, $lib );
-     while ( my $data = $sth->fetchrow_hashref ) {
-     	return $data->{'imageurl'};
-     }
+    while ( my $data = $sth->fetchrow_hashref ) {
+        return $data->{'imageurl'};
+    }
 }

 =head2 GetAuthValCode
@ -1061,19 +1061,20 @@ sub GetAuthorisedValueCategories {

 $authhorised_value = GetAuthorisedValueByCode( $category, $authvalcode );

-Return an hashref of the authorised value represented by $authvalcode.
+Return the lib attribute from authorised_values from the row identified
+by the passed category and code

 =cut

 sub GetAuthorisedValueByCode {
-	my ( $category, $authvalcode ) = @_;
-	
+    my ( $category, $authvalcode ) = @_;
+
    my $dbh = C4::Context->dbh;
    my $sth = $dbh->prepare("SELECT lib FROM authorised_values WHERE category=? AND authorised_value =?");
    $sth->execute( $category, $authvalcode );
-     while ( my $data = $sth->fetchrow_hashref ) {
-     	return $data->{'lib'};
-     }
+    while ( my $data = $sth->fetchrow_hashref ) {
+        return $data->{'lib'};
+    }
 }

 =head2 GetKohaAuthorisedValues
--- a/C4/Serials.pm
+++ b/C4/Serials.pm
@ -1481,9 +1481,9 @@ sub ItemizeSerials {
    my $fwk = GetFrameworkCode( $data->{'biblionumber'} );
    if ( $info->{barcode} ) {
        my @errors;
-        my $exists = itemdata( $info->{'barcode'} );
-        push @errors, "barcode_not_unique" if ($exists);
-        unless ($exists) {
+        if ( is_barcode_in_use( $info->{barcode} ) ) {
+            push @errors, 'barcode_not_unique';
+        } else {
            my $marcrecord = MARC::Record->new();
            my ( $tag, $subfield ) = GetMarcFromKohaField( "items.barcode", $fwk );
            my $newField = MARC::Field->new( "$tag", '', '', "$subfield" => $info->{barcode} );
@ -2338,29 +2338,24 @@ sub GetNextDate(@) {
    return "$resultdate";
 }

-=head2 itemdata
+=head2 is_barcode_in_use

-  $item = itemdata($barcode);
-
-Looks up the item with the given barcode, and returns a
-reference-to-hash containing information about that item. The keys of
-the hash are the fields from the C<items> and C<biblioitems> tables in
-the Koha database.
+Returns number of occurence of the barcode in the items table
+Can be used as a boolean test of whether the barcode has
+been deployed as yet

 =cut

-#'
-sub itemdata {
-    my ($barcode) = @_;
+sub is_barcode_in_use {
+    my $barcode = shift;
    my $dbh       = C4::Context->dbh;
-    my $sth       = $dbh->prepare(
-        "Select * from items LEFT JOIN biblioitems ON items.biblioitemnumber=biblioitems.biblioitemnumber 
-        WHERE barcode=?"
+    my $occurences = $dbh->selectall_arrayref(
+        'SELECT itemnumber from items where barcode = ?',
+        {}, $barcode
+
    );
-    $sth->execute($barcode);
-    my $data = $sth->fetchrow_hashref;
-    $sth->finish;
-    return ($data);
+
+    return @{$occurences};
 }

 1;
--- a/C4/Suggestions.pm
+++ b/C4/Suggestions.pm
@ -1,6 +1,7 @@
 package C4::Suggestions;

 # Copyright 2000-2002 Katipo Communications
+# Parts Copyright Biblibre 2011
 #
 # This file is part of Koha.
 #
@ -43,9 +44,9 @@ our @EXPORT  = qw<
    ModSuggestion
    NewSuggestion
    SearchSuggestion
+    DelSuggestionsOlderThan
 >;

-
 =head1 NAME

 C4::Suggestions - Some useful functions for dealings with aqorders.
@ -429,6 +430,23 @@ sub DelSuggestion {
    }
 }

+=head2 DelSuggestionsOlderThan
+    &DelSuggestionsOlderThan($days)
+    
+    Delete all suggestions older than TODAY-$days , that have be accepted or rejected.
+    
+=cut
+sub DelSuggestionsOlderThan {
+    my ($days) = @_;
+    return if not $days;
+    my $dbh = C4::Context->dbh;
+    
+    my $sth = $dbh->prepare("
+        DELETE FROM suggestions WHERE STATUS <> 'ASKED' AND date < ADDDATE(NOW(), ?);
+    ");
+    $sth->execute("-$days");
+}
+
 1;
 __END__

--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@ -933,7 +933,7 @@ if ( $op eq "addbiblio" ) {
        else {
            ( $biblionumber, $oldbibitemnum ) = AddBiblio( $record, $frameworkcode );
        }
-        if ($mode ne "popup" && !$is_a_modif && $redirect eq "items"){
+        if ($redirect eq "items" || ($mode ne "popup" && !$is_a_modif && $redirect ne "view")){
            print $input->redirect(
                "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode"
            );
--- a/circ/returns.pl
+++ b/circ/returns.pl
@ -242,10 +242,12 @@ if ($barcode) {
        $input{return_overdue} = 1 if ($duedate and $duedate lt $today->output('iso'));
        push( @inputloop, \%input );

-        my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrower->{'borrowernumber'} );
-        if ($fines > 0) {
-            $template->param( fines => sprintf("%.2f",$fines) );
-            $template->param( fineborrowernumber => $borrower->{'borrowernumber'} );
+        if ( C4::Context->preference("FineNotifyAtCheckin") ) {
+            my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrower->{'borrowernumber'} );
+            if ($fines > 0) {
+                $template->param( fines => sprintf("%.2f",$fines) );
+                $template->param( fineborrowernumber => $borrower->{'borrowernumber'} );
+            }
        }

    }
--- a/installer/data/mysql/de-DE/mandatory/sysprefs.sql
+++ b/installer/data/mysql/de-DE/mandatory/sysprefs.sql
@ -30,6 +30,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('delimiter',';','Define the default separator character for exporting reports',';|tabulation|,|/|\\|#|\|','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnhancedMessagingPreferences',0,'If ON, allows patrons to select to receive additional messages about items due or nearly due.','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('expandedSearchOption',0,'If ON, set advanced search to be expanded by default',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FineNotifyAtCheckin',0,'If ON notify librarians of overdue fines on the items they are checking in.',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FinesLog',1,'If ON, log fines',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems',0,'If ON, disables display of\"lost\" items in OPAC.','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hide_marc',0,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)',NULL,'YesNo');
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@ -30,6 +30,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('delimiter',';','Define the default separator character for exporting reports',';|tabulation|,|/|\\|#|\|','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnhancedMessagingPreferences',0,'If ON, allows patrons to select to receive additional messages about items due or nearly due.','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('expandedSearchOption',0,'If ON, set advanced search to be expanded by default',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FineNotifyAtCheckin',0,'If ON notify librarians of overdue fines on the items they are checking in.',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FinesLog',1,'If ON, log fines',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems',0,'If ON, disables display of\"lost\" items in OPAC.','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hide_marc',0,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)',NULL,'YesNo');
--- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
@ -31,6 +31,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('delimiter', ';', 'Ce paramètre définit le séparateur par défaut lors des exports (au format csv) de données (Rapports, statistiques...)', ';|tabulation|,|/|\\|#', 'Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnhancedMessagingPreferences',0,'Si ce paramètre est activé, permet aux adhérents de choisir de recevoir des messages supplémentaires pour les documents dûs ou bientôt dûsIf ON.','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('expandedSearchOption', '1', 'active par défaut la recherche la plus avancée', '', 'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FineNotifyAtCheckin',0,'If ON notify librarians of overdue fines on the items they are checking in.',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FinesLog', '0', 'Activer ce paramètre pour enregistrer les actions sur les pénalités financières', '', 'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('gist', '0', 'Ce paramètre définit le taux de TVA. Attention : ce n''est pas un % mais un nombre (0.055 et pas 5.5%) Laisser à 0 si vous ne récupérez pas la TVA, ce qui est le cas de la plupart des bibliothèques françaises', '', 'Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems', '0', 'Si ce paramètre est activé, l''OPAC n''affichera pas les notices pour lesquelles le ou les exemplaires sont marqués "perdus"', '', 'YesNo');
--- a/installer/data/mysql/it-IT/necessari/sysprefs.sql
+++ b/installer/data/mysql/it-IT/necessari/sysprefs.sql
@ -55,6 +55,7 @@ insert into `systempreferences` (`variable`, `value`, `options`, `explanation`,
 insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('expandedSearchOption','0','','Se ON, la ricerca avanzata si espanderà di default','YesNo');
 insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('ExtendedPatronAttributes','0','','Per usare l\'ID e gli attributi in modo esteso','YesNo');
 insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('finesCalendar','noFinesWhenClosed','ignoreCalendar|noFinesWhenClosed','Per specificare se usare il calendario per calcolare date di scadenza e multe','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FineNotifyAtCheckin',0,'If ON notify librarians of overdue fines on the items they are checking in.',NULL,'YesNo');
 insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('FinesLog','0','','Se ON, logga le multe.','YesNo');
 insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('finesMode','test','off|test|production','Scegli il funzionamento delle multe. \'off\', \'test\' (vengono solo mandate delle mail alla biblioteca) o \'production\' (le multe accumulate vengono inviate all’utente). Il modo ‘production richiede il cronjob  accruefines.','Choice');
 -- insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('FrameworksLoaded','auth_val.sql|authority_framework.sql|class_sources.sql|message_transport_types.sql|notices.sql|parameters.sql|patron_categories.sql|sample_holidays.sql|sample_itemtypes.sql|sample_labels.sql|sample_news.sql|sample_notices_message_attributes.sql|sample_notices_message_transports.sql|stopwords.sql|subtag_registry.sql|sysprefs.sql|unimarc_framework.sql|userflags.sql|userpermissions.sql',NULL,'Frameworks loaded through webinstaller','choice');
--- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
+++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
@ -30,6 +30,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('delimiter',';','Define the default separator character for exporting reports',';|tabulation|,|/|\\|#|\|','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnhancedMessagingPreferences',0,'If ON, allows patrons to select to receive additional messages about items due or nearly due.','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('expandedSearchOption',0,'If ON, set advanced search to be expanded by default',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FineNotifyAtCheckin',0,'If ON notify librarians of overdue fines on the items they are checking in.',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FinesLog',1,'If ON, log fines',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems',0,'If ON, disables display of\"lost\" items in OPAC.','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hide_marc',0,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)',NULL,'YesNo');
@ -296,4 +297,3 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowPurchaseSuggestionBranchChoice', 0, 'Allow user to choose branch when making a purchase suggestion','1','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');
-
--- a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
+++ b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
@ -42,6 +42,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('delimiter',';','Define the default separator character for exporting reports',';|tabulation|,|/|\\|#|\|','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnhancedMessagingPreferences',0,'If ON, allows patrons to select to receive additional messages about items due or nearly due.','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('expandedSearchOption',0,'If ON, set advanced search to be expanded by default',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FineNotifyAtCheckin',0,'If ON notify librarians of overdue fines on the items they are checking in.',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FinesLog',1,'If ON, log fines',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems',0,'If ON, disables display of\"lost\" items in OPAC.','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hide_marc',0,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)',NULL,'YesNo');
--- a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
+++ b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
@ -41,6 +41,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('delimiter',';','Define the default separator character for exporting reports',';|tabulation|,|/|\\|#|\|','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnhancedMessagingPreferences',0,'If ON, allows patrons to select to receive additional messages about items due or nearly due.','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('expandedSearchOption',0,'If ON, set advanced search to be expanded by default',NULL,'YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FineNotifyAtCheckin',0,'If ON notify librarians of overdue fines on the items they are checking in.',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FinesLog',1,'If ON, log fines',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems',0,'If ON, disables display of\"lost\" items in OPAC.','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hide_marc',0,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)',NULL,'YesNo');
@ -375,4 +376,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowPurchaseSuggestionBranchChoice', 0, 'Allow user to choose branch when making a purchase suggestion','1','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@ -4105,14 +4105,6 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
    SetVersion ($DBversion);
 }

-$DBversion = "3.03.00.XXX";
-if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
-    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free')");
-    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free')");
-    print "Upgrade to $DBversion done (Add sysprefs to control custom favicons)\n";
-    SetVersion ($DBversion);
-}
-
 $DBversion = "3.03.00.029";
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowPurchaseSuggestionBranchChoice', 0, 'Allow user to choose branch when making a purchase suggestion','1','YesNo')");
@ -4120,6 +4112,20 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
    SetVersion ($DBversion);
 }

+$DBversion = "3.03.00.030";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free')");
+    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free')");
+    print "Upgrade to $DBversion done (Add sysprefs to control custom favicons)\n";
+    SetVersion ($DBversion);
+}
+
+$DBversion = "3.03.00.031";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FineNotifyAtCheckin',0,'If ON notify librarians of overdue fines on the items they are checking in.',NULL,'YesNo');");
+    print "Upgrade to $DBversion done (Add syspref FineNotifyAtCheckin)\n";
+    SetVersion ($DBversion);
+}

 =head1 FUNCTIONS

--- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
@ -27,7 +27,7 @@
    </tr>
    <!-- TMPL_LOOP name="messaging_preferences" -->
    <tr>
-      <td><!-- TMPL_IF NAME="Item DUE" -->Item DUE
+      <td><!-- TMPL_IF NAME="Item Due" -->Item Due
          <!-- TMPL_ELSIF NAME="Advance Notice" -->Advance Notice
          <!-- TMPL_ELSIF NAME="Upcoming Events" -->Upcoming Events
          <!-- TMPL_ELSIF NAME="Hold Filled" -->Hold Filled
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@ -60,6 +60,12 @@ Circulation:
            - pref: numReturnedItemsToShow
              class: integer
            - last returned items on the checkin screen.
+        -
+            - pref: FineNotifyAtCheckin
+              choices:
+                  yes: Notify
+                  no: "Don't notify"
+            - librarians of overdue fines on the items they are checking in.
        -
            - pref: FilterBeforeOverdueReport
              choices:
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
@ -172,6 +172,7 @@
                <!-- TMPL_IF NAME="card1" --><li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=<!-- TMPL_VAR NAME="borrower1" -->"><!-- TMPL_VAR NAME="card1" --></a>&nbsp;</li><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="card2" --><li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=<!-- TMPL_VAR NAME="borrower2" -->"><!-- TMPL_VAR NAME="card2" --></a>&nbsp;</li><!-- /TMPL_IF -->
                <li><span class="label">Paid for?:</span> <!-- TMPL_VAR NAME="paidfor" -->&nbsp;</li>
+            <li><span class="label">Serial enumeration/chronology:</span> <!-- TMPL_VAR NAME="enumchron" -->&nbsp;</li>
            <li><span class="label">Public Note:</span>
                <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" -->
              <form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/issuehistory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/issuehistory.tmpl
@ -2,6 +2,8 @@

 <h1>Checkout History</h1>

-<p>This tab will provide you with information on the circulation history for this item.  Including the due date or return date and the patron information (if you are keeping track of this data).</p>
+<p>Each bibliographic record keeps a circulation history (with or without the patron information depending on your settings), but each item also has its own circulation history page. To see this, click on the 'Items' tab to the left of the record you are viewing.</p>
+
+<p>Below the 'History' heading is a link to 'View item's checkout history,' clicking that will open up the item's history which will look slightly different from the bibliographic record's history page.</p>

 <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/search.tmpl
@ -2,13 +2,13 @@

 <h1>Searching</h1>

-<p>To see more search options click [More Options] at the bottom of the page.&nbsp; This will allow for more advanced boolean searching.</p>
+<p>To see more search options click [More Options] at the bottom of the page. This will allow for more advanced boolean searching.</p>

 <h2>Searching Subtypes on the Staff Client</h2>

 <p>Below is a summary of  the various pieces of the advanced search limit: </p>

-<h3>AUDIENCE</h3>
+<h3>Audience</h3>

 <p>The index name is 'aud' and it's derived from 008/22</p>

@ -17,7 +17,7 @@
 <li>aud:d Young adult</li>
 <li>aud:e Adult</li></ul>

-<h3>CONTENT</h3>
+<h3>Content</h3>

 <p>There are three indexes that comprise Content: 'fic' is derived from 003/33; 'bio' is derived from the 008/34 and 'mus' is derived from LEADER/06. Common values for each of these are:</p>

@ -27,7 +27,7 @@
 <li>mus:j Musical recording</li>
 <li>mus:i Non-musical recording</li></ul>

-<h3>FORMAT</h3>
+<h3>Format</h3>

 <p>The index name is 'l-format' and it's an index of positions 007/01 and 007/02. Common values are:</p>

@ -41,7 +41,7 @@
 <li>l-format:co CD Software</li>
 <li>l-format:cr Website</li></ul>

-<h3>ADDITIONAL CONTENT TYPES</h3>
+<h3>Additional Content Types</h3>

 <p>The index name is 'ctype' is taken from the 008 and it's where we get the 'additional content types'. It's position 008/24-28 field. Common values are: </p>

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbiblio.tmpl
@ -1,241 +1,91 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->

 <h1>Cataloging</h1>
-<p>
-Cataloging in Koha can be done one of two
-ways.&nbsp; This manual will explain how to use the labeled MARC view for
-cataloging.&nbsp; The other way to catalog is to use the &Dagger;bilbios cataloging
-plugin.&nbsp; 
-</p>
-<h2>Adding a Bib Record<br />
-</h2>
-<p>
-To
-catalog a new record, you need to be in Koha's 'Cataloguing' module.
-You can find this module in your global nav at the top of the screen,
-under the 'More' dropdown list.
-</p>
-<ul>
-	<li>
-	Start by searching the catalog to see if your item is already in the system</li>
-	<li>
-	If 'no results found', click on 'New Record' and choose a 'framework' from the dropdown box. </li>
-	<li style="background-color: #ffe599">TIP: Choose 'default' if you have not yet created a new framework
-	<ul>
-		<li>To create a framework you must go into the administration section
-		<ul>
-			<li><em>Get there: </em>More &gt; Administration &gt; MARC Bibliographic Framework
-			</li>
-		</ul>
-		</li>
-	</ul>
-	</li>
-</ul>
-<ul>
-	<li style="background-color: #ffe599">TIP: To quick start copy cataloging, instead of clicking the 'New Record' button, click the 'Z30.50 Search' button to search for a record from another target.</li>
-	<li>From the 'Add MARC Record' page, you have two options for cataloging new records</li>
-</ul>
-<ul>
-	<li>
-	<ul>
-		<li>Original cataloging OR
-		</li>
-	</ul>
-	<ul>
-		<li>Copy cataloging using the Koha's Z39.50 search
-		<ul>
-			<li style="color: #990000">IMPORTANT: You must first set up Z39.50 Search Targets
-			<ul>
-				<li><em>Get there: </em>More &gt; Administration &gt; Additional parameters &gt; Z39.50 Client Targets</li>
-			</ul>
-			</li>
-		</ul>
-		</li>
-	</ul>
-	</li>
-</ul>
-<h2>
-Original Cataloging</h2>
-<ul>
-	<li>
-	Use the numerical tabbed interface to go through your MARC record
-	<ul>
-		<li>TIP: 1xx fields will be found under tab 1, 2xx fields will be found under tab 2, etc</li>
-	</ul>
-	</li>
-	<li>To help with your original cataloging, Koha has some built in plugins denoted by an ellipsis (...) at the end of the field. <br />
-	<ul>
-		<li>Some of these will automatically enter the data just by clicking in the text field, others require that you click on the '...'
-		</li>
-	</ul>
-	</li>
-</ul>
-<h3>Leader Plugin</h3>
-<strong>
-</strong>
-<ul>
-	<li>The Leader is a fixed field at the beginning of each MARC
-	record that contains coded information for the processing of the
-	record.
-	</li>
-	<li>Koha has no need for Leader information and does not use
-	it. However, Koha can store Leader data, and can help you build your
-	own Leader data.</li>
-	<li>
-	When you create (or edit) bibliographic records, clicking on the '...'
-	to the right of the Leader field will open a pop-up window to guide you
-	through the creation of your MARC Leader.</li>
-	<li>Make the appropriate choices from the pull-down menus, and Koha will
-	create the encoded Leader data and insert it into your 000@ subfield. </li>
-	<li>You now have Leader data stored with your records, should you ever need
-	it for some other application.</li>
-</ul>
-<h3>Adding Additional Fields</h3>
-<ul>
-	<li>When editing MARC fields you can duplicate fields (that are repeatable) by clicking the plus (+) next to the field or subfield<br />
-	<ul>
-		<li>When clicking plus (+) it will automatically duplicate the data in the field into a new field</li>
-		<li>When
-		clicking minus (-) it will delete the field or subfield if there is
-		another of the same field or subfield.&nbsp; If you click minus (-) when
-		there are no other repeats of the field or subfield it will delete the
-		field contents.</li>
-	</ul>
-	</li>
-	<li>By default subfields will appear
-	in alphabetical order. You can move these fields to the right order by
-	clicking the ^ to the left of the subfield&nbsp;
-	</li>
-</ul>
-<h3><strong>Authority Plugin</strong></h3>
-<ul>
-	<li>Some fields (such as the 100) offer Authority Plugins</li>
-	<li>Click the '...' to the left of the field</li>
-	<li>
-	Search for the authority
-	</li>
-	<li>
-	Click 'choose' next to the matching record and it will auto fill the fields in your MARC record<br />
-	</li>
-</ul>
-<h2>
-<strong> Using Z39.50 for Copy Cataloging</strong></h2>
-<p>
-To perform a Z39.50 search
-</p>
-<ul>
-	<li>Enter data into at least one of the following MARC fields
-	<ul>
-		<li>Title - 245</li>
-		<li>ISBN - 020</li>
-		<li>ISSN - 022</li>
-		<li>Author - 100</li>
-	</ul>
-	</li>
-	<li>
-	Click 'Z39.50 Search'</li>
-	<li>
-	Alter your search and choose Z39.50 targets from the pop-up window
-	</li>
-	<li>
-	TIP: First make sure you have set up your Z39.50 search targets

-	<ul>
-		<li>
-		<em>Get there: </em>More &gt; Administration &gt; Additional Parameters &gt; Z39.50 Client Targets
+<p>Before you start cataloging in Koha you're going to want to do some basic setup. Refer to the Implementation Checklist for a full list of these things. Most importantly you're going to want to make sure that your Frameworks are all defined the way you want. Once in the cataloging module you will not be able to add or remove fields and subfields so your frameworks must be ready before you start cataloging.</p>

-		</li>
-	</ul>
-	</li>
-</ul>
-<ul>
-	<li>Click on 'import' to import the record of your choice.</li>
-	<li>
-	Koha
-	will auto-fill the fields in your new MARC record with the values
-	supplied by the record you've just imported from the Z39.50 search.
-	
-	</li>
-	<li>
-	You can now add/edit fields to the record.
-	
-	</li>
-	<li>
-	Click 'Save' when you are done.
-	
-	</li>
-</ul>
-<h2>Editing a record</h2>
-<p>
-Editing a record is mostly the same as adding
-a record except that you will find that your fields will only display
-the subfields that you entered data in.&nbsp; When adding a new record you
-will see this for a 650 field.
-</p>
-<p>
-When editing you will only see
-</p>
-<p>
-To show all possible subfields in the framework, click on the text of the MARC field
-</p>
-<h2>Deleting Records</h2>
-<ul>
-	<li style="background-color: #ffe599">TIP: To delete a BIB Record, first delete all holdings
-	(items) attached to the bib. </li>
-	<li>Select Delete from the Edit dropdown
-	menu in the normal view of the record. <br />
-	<ul>
-		<li>Note: the delete option on the
-		Edit dropdown menu will be grayed out when holdings exist. It will only
-		allow you to delete the bib record after all the holdings (items) have
-		been deleted.</li>
-	</ul>
-	</li>
-</ul>
+<h2>Adding Records</h2>

-<h2>Questions<br />
-</h2>
-
-<h3>&quot;I searched on the MARC record I just added, and no results were found&quot;</h3>
-<p>
-If your catalog changes aren't visible in search results, it is because
-of the indexing process. Indexing can take anywhere from 1 minute to 4
-hours, depending on the load. If you do not see the new records by the
-following day, (24hrs) contact your system administrator. <br />
-</p>
-<h3>How to reorder my subject heading subfields so they appear in the proper order?</h3>
-<p>
-By default Koha alphabetizes your 6xx subfields, but you can easily
-move them around by clicking on the arrow on the left hand side of the
-subfield. This will allow you to put the headings in the order that
-best suits your item.
-</p>
-<h3>Can I duplicate a record in my system to do some copy cataloging?<br />
-</h3>
+<p>Records can be added to Koha via original or copy cataloging. If you would like to catalog a record using a blank template</p>

 <ul>
-	<li>Search for the record you'd like to copy</li>
-	<li>Choose the record by clicking on the title</li>
-	<li>Click on 'Edit'</li>
-	<li>Choose to 'Edit as New (Duplicate)'</li>
-	<li>After editing your record, click 'Save'</li>
-	<li>You will be warned that this record was a duplicate</li>
-	<li>Choose 'No' to save this as a new record</li>
+	<li>Click 'New Record'
+<ul>
+	<li>Choose the framework you would like to base your record off of</li>
+</ul>
+</li>
 </ul>

-<h3>How do I overlay a full
-bib record over the brief one that was added at acquisitions?</h3>
-<p>
-The librarian added orders using the form in Koha, then
-'received' them on that brief record.&nbsp; Is there a way to download the full record right in acquisitions so
-that the item gets attached to that full record? Or if not that, a way
-to replace the brief record with a complete one?</p>
-<p>Search for the partial record in your catalog and then go to Edit &gt;
-Edit Record and from there you can do a Z39.50 search to pull in a more
-full record or you can do your full cataloging there.
-</p>
-<p>
-&nbsp;
-</p>
+<p>If you want to catalog a record based on an existing record at another library</p>

-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
+<ul>
+	<li>Click 'z39.50 Search'</li>
+	<li>Search for the item you would like to catalog
+<ul>
+	<li>If no results are found, try searching for fewer fields, not all Z39.50 targets can search all of the fields above.</li>
+</ul>
+</li>
+	<li>Search targets can be altered by using the Z39.50 Admin area.</li>
+	<li>From the results you can view the MARC or Card view for the records or choose to Import them into Koha
+<ul>
+	<li>In addition to the Import link to the right of each title, you can click on the title you're interested in and a menu will pop up with links to preview the record and import it</li>
+</ul>
+</li>
+</ul>
+
+<p>Once you've opened a blank framework or imported a record via Z39.50 you will be presented with the form to continue cataloging</p>
+
+<ul>
+	<li>To expand a collapsed tag click on the tag number</li>
+	<li>To get help from the Library of Congress on a MARC tag click the question mark (?) to the right of each field number
+<ul>
+	<li style="background-color: #ffe599">If you think this is an unwanted feature, you could add the following JavaScript to your intranetuserjs system preference:
+$(document).ready(function(){<br>
+$(".tagnum a").hide();<br>
+});</li>
+</ul>
+</li>
+	<li>Sometimes fields may not be editable due to the value in your BiblioAddsAuthorities system preference. If you have this preference set to not allow catalogers to type in fields controlled by authorities you may see a lock symbol to the left of the field.
+<ul>
+	<li>If this icon appears you must click the ellipse to the right of the field to search for an existing authority.</li>
+	<li>From the results list click 'Choose authority' to bring that into your catalog record</li>
+</ul>
+</li>
+	<li>To duplicate a field click on the + (plus sign) to the right of the tag
+<ul>
+	<li>To move subfields in to the right order, click the up arrow to the left of the field</li>
+	<li>To duplicate a subfield click on the clone icon (to remove a copied field, click the delete clone icon) to the right of the field</li>
+	<li>To remove a subfield (if there is more than one of the same type), click the - (minus sign) to the right of the field</li>
+</ul>
+</li>
+	<li>To use a plugin click on the ... (ellipse) to the right of the filed
+<ul>
+	<li>Some fixed fields have editors that will change based on the material type you're cataloging (for example the 006 and the 008 fields)</li>
+</ul>
+</li>
+	<li>Once you've finished, click the 'Save' button at the top and choose whether you want to save and view the bib record you have created or continue on to add/edit items attached to the record
+<ul>
+	<li>If you are about to add a duplicate record to the system you will be warned before saving</li>
+</ul>
+</li>
+</ul>  
+
+<h2>Editing Records</h2>
+
+<p>To edit a record you can click 'Edit Biblio' from the search results on the cataloging page or by clicking the Edit button on the Bibliographic Record.</p>
+
+<p>The record will open in the MARC editor</p>
+
+<p>Once you have made your edits you can click 'Save' at the top of the editor.</p>
+
+<h2>Duplicating Records</h2>
+
+<p>Sometimes a copy of the record you need to catalog can't be found via Z39.50. In these cases you can create a duplicate of similar record and edit the necessary pieces to create a new record. To duplicate an existing record click 'Edit as New (Duplicate)' from the Edit menu on the Bibliographic Record</p>
+
+<p>This will open a new MARC record with the fields filled in with the values from the original Bibliographic Record.</p>
+
+<h2>Merging Records</h2>
+
+<p>If you would like to merge together multiple records you can do that via the Lists tool.</p>
+
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/additem.tmpl
@ -1,9 +1,60 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->

-<h1>Adding item details</h1>
+<h2>Adding Items</h2>

-<p>After saving a MARC record, you are presented with a screen to add item details (or, local holdings). This is where you define the location of the item (home branch), the cost of the item, the barcode, etc. </p>
+<p>After saving a new bibliographic record, you will be redirected to a blank item record so that you can attach an item to the bibliographic record. You can also click 'Add Holdings' from the cataloging search results or you can add new item at any time by clicking 'New' on the bibliographic record and choosing 'New Item'</p>

-<ul><li>Click 'Add Item' after entering the data for your item</li><li>A confirmation will appear with the item information</li><li>From here you can edit the item or add another item</li></ul>
+<p>The item edit form will appear:</p>
+
+<p>At the very least, the following fields should be entered for new items:</p>
+
+<ul>
+	<li>8 - Collection code</li>
+	<li>a - Permanent location</li>
+	<li>b - Shelving location</li>
+	<li>o - Full call number</li>
+	<li>p - Barcode</li>
+	<li>v - Cost, replacement price
+<ul>
+	<li>This value will be charged to patrons when you mark and item they have checked out as 'Lost'</li>
+</ul>
+</li>
+	<li>y - Koha item type</li>
+</ul>
+
+<p>Below the add form there are 3 buttons for adding the item</p>
+
+<ul>
+	<li>Add Item will add just the one item</li>
+	<li>Add &amp; Duplicate will add the item and fill in a new form with the same values for your to alter</li>
+	<li>Add Multiple Copies will ask how many copies and will then add that number of copies adding +1 to the barcode so each barcode is unique</li>
+</ul>
+
+<p>Your added items will appear above the add form once submitted</p>
+
+<p>Your items will also appear below the bibliographic details on the bib record display.</p>
+
+<p>If you have SpineLabelShowPrintOnBibDetails set to 'Display' then there will also be a link to print a quick spine label next to each item.</p>
+
+<h2>Editing Items</h2>
+
+<p>Items can be edited in several ways.</p>
+
+<ul>
+	<li>Clicking 'Edit' and 'Edit Items' from the bibliographic record</li>
+	<li>Clicking 'Edit Items' beside the item on the 'Items' tab</li>
+</ul>
+
+<p>The edit menu is also where items can be deleted from</p>
+
+<h2>Moving Items</h2>
+
+<p>Items can be moved from one bibliographic record to another using the Attach Item option</p>
+
+<p>Visit the bibliographic record you want to attach the item to and choose 'Attach Item' from the 'Edit' menu.</p>
+
+<p>Simply enter the barcode for the item you want to move and click 'Select'</p>
+
+<p>If you want to move all items to a new record creating only one bibliographic record you can use the Merge Records tool instead.</p>

 <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tmpl
@ -1,35 +1,22 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->

 <h1>Patron Fines</h1>
-Patron fines are calculated based on your system preferences.<br/>
-		<ul>
-			<li>
-<em>Get there: </em></span>More &gt; Administration &gt; Patrons and Circulation &gt; Circulation and fines rules</li>
-		</ul>	  
-<h3>Viewing Patron Accounts</h3>

-		<ul>
-			<li>Click on the 'Fines' tab under the patron information on the left</li>
-			<li>You will see the patron's account information</li>
-			<li>In addition to overdue fines, replacement costs for lost items, account management fees and other library specific fees will show on the account
-			<ul>
-				<li>
-			    <span style="background-color: #ffe599">
-TIP: Marking an item Lost via the edit item page will automatically put a fine on the patron's record for the replacement cost of the item</span></li>
-			</ul></li>
-			<li>To pay fines, click the 'Pay fines' tab</li>
-			<li>Each charge gives you a menu which lets you decide whether to mark items paid or not</li>
-			<li>By choosing 'Paid' the system assumes that a full payment is being made</li>
-			<li>Payments will appear on the Account tab</li>
-			<li>You can also create manual invoices/charges or apply manual credits to patron's accounts
-			<ul>
-				<li>
-			    <span style="background-color: #ffe599">
-TIP: If you create a manual credit, be aware that it won't be applied to any particular lost or late item</span></li>
-			</ul></li>
-			<li>To create a manual invoice, click the 'Create manual invoice' tab</li>
-			<li>Enter in the information related to the charge you're adding</li>
-			<li>The new charge will appear on the 'Account' tab</li>
-			<li>Manual invoices can be paid the same way as automatic fines, by clicking on 'Pay fines'</li>
-		</ul>
-	</div>	<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
+<p>The patron's complete accounting history will appear on the Fines tab. Contrary to its name, the Fines tab does not just show fine data, it also shows membership fees, rental fees, reserve fees and any other charge you may have for patrons.</p>
+
+<h2>Charging Fines/Fees</h2>
+
+<p>Most fees and fines will be charged automatically if the fines cron job is running:</p>
+
+<ul>
+	<li>Fines will be charged based on your Circulation &amp; Fines Rules</li>
+	<li>Hold fees will be charged based on the rules you set in the Patron Types &amp; Categories administration area</li>
+	<li>Rental fees will be charged based on the settings in your Item Types administration area</li>
+	<li>Marking an item 'Lost' via the cataloging module will automatically charge the patron the replacement cost for that item</li>
+</ul>
+
+<h2>Printing Invoices</h2>
+
+<p>To the right of each account line there is a print link. Clicking that link will print an invoice for the line item that includes the date and description of the line item along with the total outstanding on the account.</p>
+
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/mancredit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/mancredit.tmpl
@ -1,11 +1,13 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->

 <h1>Create Manual Credit</h1>
-		<ul>
-			<li>To create a manual credit, click the 'Create manual credit' tab</li>
-			<li>Enter in the information related to the credit you're adding</li>
-			<li>The new credit will appear on the 'Account' tab</li>
-		</ul>	
-		
-		<p style="background-color: #ffe599">TIP: Use manual credits to pay partial fines.</p>
+
+<p>Manual credits can be used to pay off parts of fines, or to forgive a fine amount.</p>
+<ul>
+	<li>First choose the type of credit you'd like to apply</li>
+	<li>If this credit is associated with an item you can enter that item's barcode so that the line item links to the right item</li>
+	<li>The description field is where you will enter the description of the credit</li>
+	<li>In the amount field, do not enter currency symbols, only numbers and decimals</li>
+</ul>
+
 <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/maninvoice.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/maninvoice.tmpl
@ -1,13 +1,17 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->

 <h1>Create Manual Invoice</h1>
-		<ul>
-			<li>Click the 'Create manual invoice' tab</li>
-			<li>Enter in the information related to the charge you're adding</li>
-			<li>The new charge will appear on the 'Account' tab</li>
-			<li>If you would like to define additional categories for manual invoices you can do so by adding authorized values in the MANUAL_INV categories.</li>
-			<ul><li style="color: #990000">IMPORTANT: Set the authorized value field as the description and the description field is the default fee, if any.</li></ul>
-			<li>Manual invoices can be paid the same way as automatic fines, by clicking on 'Pay fines'</li>
-		</ul>
+
+<p>For fees that are not automatically charged, librarians can create a manual invoice</p>
+<ul>
+	<li>First choose the type of invoice you would like to create
+<ul>
+	<li>To add additional values to the manual invoice type pull down menu, add them to the MANUAL_INV Authorized Value</li>
+</ul>
+</li>
+	<li>If the fee is associated with an item you can enter its barcode so that the line item shows a link to that item</li>
+	<li>The description field is where you will enter the description of the charge</li>
+	<li>In the amount field, do not enter currency symbols, only numbers and decimals</li>
+</ul>

 <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tmpl
@ -1,6 +1,8 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->   
-   <h1>Setting Patron Permissions</h1>
-   <p>Patron permissions are used to define the rights of staff members when in the intranet/staff client.</p>
+
+<h1>Setting Patron Permissions</h1>
+
+<p>Patron permissions are used to define the rights of staff members when in the intranet/staff client.</p>
 	<ul>
 		<li>To alter patron permissions, click on Patrons on the main menu at the top of the screen.</li>
 		<li>Search or browse for the patron you'd like to edit</li>
@ -9,83 +11,360 @@
 		<li>Choose the permissions you'd like this patron to have</li>
 		<li>You can pick as many permissions as you'd like for each staff member
 		<ul>
-			<li>
-		    <span style="background-color: #ffe599">
-TIP: If a staff member is set to 'superlibrarian' they have access to all functions and do not need any other permissions checked</span></li>
+			<li><span style="background-color: #ffe599">TIP: If a staff member is set to 'superlibrarian' they have access to all functions and do not need any other permissions checked</span></li>
 		</ul></li>
 	</ul>

-<h3>What will each permission level do?</h3>
+<h3>Patron Permissions Defined</h3>

 <p>Depending on the permission certain menu items will be removed from the menus in Koha, preventing users from accessing them.</p>
-	<ul>
-		<li><strong>superlibrarian</strong>
-		<ul>
-			<li>Access to all librarian functions</li>
-		</ul></li>
-		<li><strong>circulate</strong>
-		<ul>
-			<li>Ability for logged in user to check books out and back in</li>
-		</ul></li>
-		<li><strong>catalog</strong>
-		<ul>
-			<li>Must be given to all staff members to allow them to log into the staff interface</li>
-			<li>This permission will allow staff members to search the catalog via the staff interface</li>
-		</ul></li>
-		<li><strong>parameters</strong>
-		<ul>
-			<li>Provides access to all admin links and preferences</li>
-		</ul></li>
-		<li><strong>borrowers</strong>
-		<ul>
-			<li>Add or modify patrons (with the exception of setting permissions)</li>
-		</ul></li>
-		<li><strong>permissions</strong>
-		<ul>
-			<li>Ability to set patron permissions&nbsp;</li>
-		</ul></li>
-		<li><strong>reserveforothers</strong>
-		<ul>
-			<li>Place holds on books for patrons via the staff interface</li>
-		</ul></li>
-		<li><strong>borrow</strong>
-		<ul>
-			<li>Borrow books from the library with this staff account</li>
-		</ul></li>
-		<li><strong>editcatalogue</strong> Modify bibliogra
-		<ul>
-			<li>Provides cataloging permissions such as altering and adding bibliographic and holdings data)</li>
-		</ul></li>
-		<li><strong>updatecharges</strong>
-		<ul>
-			<li>Handle fines and charges for patrons (including paying, adding credits, and adding invoices)</li>
-		</ul></li>
-		<li><strong>acquisition</strong>
-		<ul>
-			<li>Access to acquisition and patron purchase suggestions management</li>
-		</ul></li>
-		<li><strong>management</strong>
-		<ul>
-			<li>Deprecated - no longer in use</li>
-		</ul></li>
-		<li><strong>tools</strong>
-		<ul>
-			<li>Use tools (export, import, barcodes)</li>
-		</ul></li>
-		<li><strong>editauthorities</strong>
-		<ul>
-			<li>Allow staff member to edit authorities</li>
-		</ul></li>
-		<li><strong>serials</strong>
-		<ul>
-			<li>Allow staff member to manage serials subscriptions and claims</li>
-		</ul></li>
-		<li><strong>reports</strong>
-		<ul>
-			<li>Allow staff member to access to the reports module</li>
-		</ul></li>
-		<li><strong>staffaccess</strong>
-		<ul>
-			<li>Provides the ability to modify login / permissions for staff users</li>
-		</ul></li>
-	</ul><!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
+<ul>
+	<li>superlibrarian
+<ul>
+	<li>Access to all functions within the staff client</li>
+</ul>
+</li>
+	<li>circulate
+<ul>
+	<li>Ability to check (issue) books out and in and access the 'Circulation' page in the staff client</li>
+	<li>This section can be expanded (Learn more below)</li>
+</ul>
+</li>
+	<li>catalogue
+<ul>
+	<li>Allows staff members to search the catalog via the staff client</li>
+	<li>Must be given to all staff members to allow them to login to the staff client</li>
+</ul>
+</li>
+	<li>parameters
+<ul>
+	<li>Provides access to all areas of the Administration menu</li>
+</ul>
+</li>
+	<li>borrowers
+<ul>
+	<li>Allows staff members to add or modify patrons (with the exception of setting permissions)</li>
+</ul>
+</li>
+	<li>permissions
+<ul>
+	<li>Ability to set patron permissions</li>
+</ul>
+</li>
+	<li>reserveforothers
+<ul>
+	<li>Ability to place holds on books for patrons via the staff interface</li>
+	<li>This section can be expanded (Learn more below)</li>
+</ul>
+</li>
+	<li>borrow
+<ul>
+	<li>Grants staff members the rights to borrow books from the library</li>
+</ul>
+</li>
+	<li>editcatalogue
+<ul>
+	<li>Ability to catalog items (add and edit bibliographic and holdings data)</li>
+	<li>This section can be expanded (Learn more below)</li>
+</ul>
+</li>
+	<li>updatecharges
+<ul>
+	<li>Manage patron accounts (including paying fines, adding credits, and creating invoices)</li>
+</ul>
+</li>
+	<li>acquisition
+<ul>
+	<li>Provides access to the acquisitions and patron purchase suggestion modules</li>
+	<li>This section can be expanded (Learn more below)</li>
+</ul>
+</li>
+	<li>management
+<ul>
+	<li>No longer in use</li>
+</ul>
+</li>
+	<li>tools
+<ul>
+	<li>Access to all items in the Tools section of the staff client</li>
+	<li>This section can be expanded (Learn more below)</li>
+</ul>
+</li>
+	<li>editauthorities
+<ul>
+	<li>Provides access to edit the authority record</li>
+</ul>
+</li>
+	<li>serials
+<ul>
+	<li>Allows access to the serials module</li>
+	<li>This section can be expanded (Learn more below)</li>
+</ul>
+</li>
+	<li>reports
+<ul>
+	<li>Allow access to the Reports module (ability to create, edit and run all reports)</li>
+	<li>Reports found on the Circulation page are not controlled by this permission</li>
+	<li>This section can be expanded (Learn more below)</li>
+</ul>
+</li>
+	<li>staffaccess
+<ul>
+	<li>Provides the ability to modify login / permissions for staff users</li>
+</ul>
+</li>
+</ul>
+<h3>Granular Circulate Permissions</h3>
+<p>If the staff member has 'circulate' permissions they have the ability to perform all of these actions. If you would like to control circulation permissions on a more granular level choose from these options:</p>
+<ul>
+	<li>circulate_remaining_permissions
+<ul>
+	<li>All circulation rights except override permissions</li>
+</ul>
+</li>
+	<li>override_renewals
+<ul>
+	<li>Override blocked renewals</li>
+</ul>
+</li>
+</ul>
+<h3>Granular Holds Permissions</h3>
+<p>If the staff member has 'reserveforothers' permissions they have the ability to perform all of these actions. If you would like to control holds permissions on a more granular level choose from these options:</p>
+<ul>
+	<li>modify_holds_priority
+<ul>
+	<li>Allow staff members to alter the holds priority (moving patrons up and down the queue)</li>
+</ul>
+</li>
+	<li>place_holds
+<ul>
+	<li>All staff members to place holds for patrons via the staff interface</li>
+</ul>
+</li>
+</ul>
+<h3>Granular Cataloging Permissions</h3>
+<p>If the staff member has 'editcatalogue' permissions they have the ability to perform all of these actions. If you would like to control cataloging permissions on a more granular level choose from these options:</p>
+<ul>
+	<li>edit_catalogue
+<ul>
+	<li>Ability to access all cataloging functions via the Cataloging page</li>
+</ul>
+</li>
+	<li>edit_items
+<ul>
+	<li>Ability to make edits to item records, but not bib records</li>
+</ul>
+</li>
+	<li>fast_cataloging
+<ul>
+	<li>The ability to catalog using only the Fast Add Framework found on the Circulation page</li>
+</ul>
+</li>
+</ul>
+<h3>Granular Acquisitions Permissions</h3>
+<p>If the staff member has 'acquisition' permissions they have the ability to perform all of these actions. If you would like to control acquisitions permissions on a more granular level choose from these options:</p>
+<ul>
+	<li>budget_add_del
+<ul>
+	<li>Ability to add and delete budgets (not modify()</li>
+</ul>
+</li>
+	<li>budget_manage
+<ul>
+	<li>Manage budgets</li>
+</ul>
+</li>
+	<li>budget_modify
+<ul>
+	<li>Ability to edit existing budgets (not to add or delete)</li>
+</ul>
+</li>
+	<li>contracts_manage
+<ul>
+	<li>Manage contracts</li>
+</ul>
+</li>
+	<li>group_manage
+<ul>
+	<li>Manage orders and basket groups</li>
+</ul>
+</li>
+	<li>order_manage
+<ul>
+	<li>Manage orders and baskets</li>
+</ul>
+</li>
+	<li>order_receive
+<ul>
+	<li>Manage orders and baskets</li>
+</ul>
+</li>
+	<li>period_manage
+<ul>
+	<li>Manage periods</li>
+</ul>
+</li>
+	<li>planning_manage
+<ul>
+	<li>Manage budget planning</li>
+</ul>
+</li>
+	<li>vendors_manage
+<ul>
+	<li>Manage vendors</li>
+</ul>
+</li>
+</ul>
+<h3>Granular Serials Permissions</h3>
+<p>If the staff member has 'serials' permissions they have the ability to perform all of these actions. If you would like to control serials permissions on a more granular level choose from these options:</p>
+<ul>
+	<li>check_expiration
+<ul>
+	<li>Check the expiration of a serial</li>
+</ul>
+</li>
+	<li>claim_serials
+<ul>
+	<li>Claim missing serials</li>
+</ul>
+</li>
+	<li>create_subscription
+<ul>
+	<li>Create a new subscription</li>
+</ul>
+</li>
+	<li>delete_subscription
+<ul>
+	<li>Delete an existing subscription</li>
+</ul>
+</li>
+	<li>edit_subscription
+<ul>
+	<li>Edit (but not delete or create) an existing subscription</li>
+</ul>
+</li>
+	<li>receive_serials
+<ul>
+	<li>Receive serials on existing subscriptions</li>
+</ul>
+</li>
+	<li>renew_subscription
+<ul>
+	<li>Renew an existing subscription</li>
+</ul>
+</li>
+	<li>routing
+<ul>
+	<li>Manage routing lists</li>
+</ul>
+</li>
+</ul>
+<h3>Granular Tools Permissions</h3>
+<p>If the staff member has 'tools' permissions they have the ability to access and use all items under the Tools menu. If you would like to control which tools staff members have access to on a more granular level choose from these options:</p>
+<ul>
+	<li>batch_upload_patron_images
+<ul>
+	<li>Upload patron images in batch or one at a time (Access to the Image Upload Tool)</li>
+</ul>
+</li>
+	<li>delete_anonymize_patrons
+<ul>
+	<li>Delete old borrowers and anonymize circulation/reading history (Access to the Anonymize Patron Tool)</li>
+</ul>
+</li>
+	<li>edit_calendar
+<ul>
+	<li>Define days when the library is closed (Access to the Calendar/Holidays Tool)</li>
+</ul>
+</li>
+	<li>edit_news
+<ul>
+	<li>Write news for the OPAC and staff interfaces (Access to the News Tool)</li>
+</ul>
+</li>
+	<li>edit_notice_status_triggers
+<ul>
+	<li>Set notice/status triggers for overdue items (Access to the Overdue Notice Status/Triggers Tool)</li>
+</ul>
+</li>
+	<li>edit_notices
+<ul>
+	<li>Define notices (Access to the Notices Tool)</li>
+</ul>
+</li>
+	<li>export_catalog
+<ul>
+	<li>Export bibliographic and holdings data (Access to the Export Bibliographic &amp; Holdings Data Tool)</li>
+</ul>
+</li>
+	<li>import_patrons
+<ul>
+	<li>Import patron data (Access to the Import Patrons Tool)</li>
+</ul>
+</li>
+	<li>inventory
+<ul>
+	<li>Perform inventory (stocktaking) of your catalog (Access to the Inventory Tool)</li>
+</ul>
+</li>
+	<li>items_batchdel
+<ul>
+	<li>Perform batch deletion of items (Access to the Delete a queryset of items Tool)</li>
+</ul>
+</li>
+	<li>items_batchmod
+<ul>
+	<li>Perform batch modification of items (Access to the Modify a queryset of items Tool)</li>
+</ul>
+</li>
+	<li>label_creator
+<ul>
+	<li>Create printable labels and barcodes from catalog and patron data (Access to the Label Creator and Quick Label Creator Tools)</li>
+</ul>
+</li>
+	<li>manage_csv_profiles
+<ul>
+	<li>Create and edit CSV profiles (Access to the CSV Profiles Tool)</li>
+</ul>
+</li>
+	<li>manage_staged_marc
+<ul>
+	<li>Managed staged MARC records, including completing and reversing imports (Access to the Manage Staged MARC Records Tool)</li>
+</ul>
+</li>
+	<li>moderate_comments
+<ul>
+	<li>Moderate patron comments (Access to the Comments and Tags Tools)</li>
+</ul>
+</li>
+	<li>schedule_tasks
+<ul>
+	<li>Schedule tasks to run (Access to the Task Scheduler Tool)</li>
+</ul>
+</li>
+	<li>stage_marc_import
+<ul>
+	<li>Stage MARC records into the reservoir (Access to the Stage MARC Records Tool)</li>
+</ul>
+</li>
+	<li>view_system_logs
+<ul>
+	<li>Browse the system logs (Access to the Log Viewer Tool)</li>
+</ul>
+</li>
+</ul>
+<h3>Granular Reports Permissions</h3>
+<p>If the staff member has 'reports' permissions they have the ability to perform all of these actions. If you would like to control reports permissions on a more granular level choose from these options:</p>
+<ul>
+	<li>create_reports
+<ul>
+	<li>The ability to create and edit but not run SQL reports</li>
+</ul>
+</li>
+	<li>execute_reports
+<ul>
+	<li>The ability to run but not create or edit SQL reports</li>
+</ul>
+</li>
+</ul>
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-password.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-password.tmpl
@ -3,13 +3,12 @@
 <h1>Change Patron Password</h1>

 <p>Koha cannot display existing passwords, so this form can only be used to change a patron's username and/or password, but not to recover an existing password.</p>
-		<div class="hint">	The default minimum password length is 3 characters long.  To change this value, update your system preferences.
-		</div>
-		<div class="hint">
-			<ul>
-				<li><em>Get there:</em> More &gt; Administration &gt; Global System Preferences &gt; Patrons &gt; minPasswordLength</li>
-			</ul>
-		</div>
+
+<p>The default minimum password length is 3 characters long.  To change this value, update your system preferences.</p>
+
+<ul>
+	<li><em>Get there:</em> More &gt; Administration &gt; Global System Preferences &gt; Patrons &gt; minPasswordLength</li>
+</ul>

 <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tmpl
@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->   
-   <h1>Patron Search</h1>
+
+<h1>Patron Search</h1>

 <p>Clicking on the link to the Patron module will bring you to a search/browse screen for patrons. From here you can search for a patron by entering any part of their name or barcode in the search box at the top.</p>

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tmpl
@ -2,174 +2,78 @@

 <h1>Add Patrons</h1>

-<h2>Adding a New Patron</h2>   
-   <p>IMPORTANT: System preferences should be defined before adding new patrons.<p>
-	<ul>
-		<li>
-<em>Get there:</em></span>More &gt; Administration </li>
-	</ul>	Add a new patron:<br/>
-	<ul>
-		<li>Click the 'New' button</li>
-		<li>Choose the type of patron you'd like to add:
-		<ul>
-			<li>Staff = A user that can be configured to perform functions in the staff client.</li>
-			<li>Adult = A regular patron (can have child patrons attached to it).</li>
-			<li>Child = A patron who can have an adult guarantor. </li>
-			<li>Organization = An organization that can have professional patrons attached to it.</li>
-			<li>Professional = A patron that can have an organization as a guarantor. </li>
-			<li>Statistical =		   
-		   A &quot;fake&quot; patron card. When items are scanned on to a Statistical patron card, the items are not checked out, but recorded. 
-			<ul>
-				<li>
-			    <span style="background-color: #ffe599">
-TIP: This can be used to record statistics of items that are used, but do not get checked out, such as reference items, magazines, etc. You can then run a report to gather the statistics from this card</span></li>
-			</ul></li>
-		</ul></li>
-	</ul>
-	<ul>
-		<li>	   
-	   	   
-	   Each patron type will have slightly different options.</li>	   
-		<li>	   
-	   	   
-	   Fill in the fields related to your patron
-		<ul>
-			<li>		   
-		   		   
-		   Note that the Surname (or Last Name) is required for each patron as a default setting. You can define which fields, if any, should be required. 
-			<ul>
-				<li>			   
+<p>Patron categories belong to one of six overreaching categories in Koha.</p>

-<em>Get there</em>: Administration &gt; System Preferences &gt; Patrons &gt; BorrowerMandatoryField.</li>
-			</ul></li>		   
-			<li>		   
-<span style="background-color: #ffe599">
-TIP: 'Initials' and 'Other name' are great for internal use when recognizing patrons</span></li>
-		</ul></li>
-	</ul>
-	<ul>
-		<li>If you're adding a 'Child' or 'Professional' you will see an additional field, asking you to define a Guarantor.
-		<ul>
-			<li>		   
-		   		   
-		   From this menu you must choose the patron record to link to the child or professional.
-			<ul>
-				<li>			   
-			   			   
-			   Click 'Find guarantor' and pick a patron from the resulting list.
-				<ul>
-					<li>
-				    <span style="background-color: #ffe599">
-TIP: Only patrons of type &quot;A&quot; (adult) are searched for when you look for guarantors through the &quot;find guarantor&quot; interface.  This means that (for example) library staff (type &quot;S&quot;) and other children (type &quot;C&quot;) cannot be found as guarantors</span></li>
-					<li style="color: #ff0000">				   
-				   				   
-				   IMPORTANT: Entering a patron by hand will not work the way you'd expect - you must search</li>
-				</ul></li>
-			</ul></li>
-			<li>		   
-		   		   
-		   
-		    <span style="background-color: #ffe599">
-TIP: You can define the terms used in the Guarantor field. 'Mother' and 'Father' are default settings, but you can add &quot;Grandparent&quot; or &quot;Legal Guardian&quot; for instance</span>
-			<ul>
-				<li>			   
-			   			   
-			   
-			    <span>
-<em>Get there: </em></span>Administration &gt; Global system preferences &gt; Patrons &gt;borrowerRelationship</li>
-			</ul></li>
-		</ul></li>
-	</ul>
-	<ul>
-		<li>	   
-	   	   
-	   If you're adding an 'Organization' you will see fewer fields in this first section.</li>
-		<li>	   
-	   	   
-	   Enter your patron's main address.
-		<ul>
-			<li>		   
-		   		   
-		   The 'Street type' dropdown menu comes from your Patrons and Circulation parameters.
-			<ul>
-				<li>			   
-			   			   
-			   
-			    <span>
-<em>Get there: </em></span>Administration &gt; Patrons and Circulation &gt; Road types</li>
-			</ul></li>
-			<li>		   
-		   		   
-		   The City, State dropdown menu comes from your Patrons and Circulation parameters.
-			<ul>
-				<li>
-			    <span>
-<em>Get there: </em></span>Administration &gt; Patrons and circulation &gt; Cities</li>
-			</ul></li>
-		</ul></li>
-		<li>Enter additional contact information for your patron.<br/>
-		<ul>
-			<li>
-		    <span style="background-color: #ffe599">
-TIP: Encourage your patrons to provide an email address. Koha will use this email address to contact patrons when an item they reserved is available and to send overdue notices.</span></li>
-		</ul></li>
-	</ul>
-	<ul>
-		<li>Enter an alternate address (if you require one for your library).
-		<ul>
-			<li>
-		    <span style="background-color: #ffe599">
-TIP: This is handy if your patron has a PO Box and you want their home address as well.</span></li>
-		</ul></li>
-	</ul>
-	<ul>
-		<li>Enter in an additional contact (if you require one for your library)</li>
-		<li>Enter information necessary for patron management in the library
-		<ul>
-			<li>The card number can be auto-calculated, scanned in from a barcode scanner or entered in by hand. The auto-calculated card number can be turned ON and OFF in your system preferences.
-			<ul>
-				<li>
-			    <span>
-<em>Get there</em></span>: Administration &gt; System Preferences &gt; Patrons &gt;  autoMemberNum.</li>
-			</ul></li>
-			<li>Library branches are defined in your Basic Parameters.<ul>
-				<li>
-			    <span>
-<em>Get There:</em></span>Administration &gt; Basic Parameters &gt; Libraries, branches and groups</li>
-			</ul></li>
-			<li>Patron Categories are defined in Patrons and Circulation.<ul>
-				<li>
-			    <span>
-<em>Get There:</em></span>Administration &gt; Patrons and circulation &gt; Patron categories</li>
-			</ul></li>
-			<li>The sort fields are used for internal use and reports.</li>
-		</ul></li>
-	</ul>
-	<ul>
-		<li>Enter information specific to you library policies.
+<ul>
+	<li>Staff = A user that can be configured to perform functions in the staff client</li>
+	<li>Adult = A regular patron (can have child patrons attached to it)</li>
+	<li>Child = A patron who can belong to an Adult patron</li>
+	<li>Organization = An organization that can have Professional patrons attached to it</li>
+	<li>Professional = A patron that can belong to an Organization</li>
+	<li>Statistical = A patron type used solely for tracking in house usage
+<ul>
+	<li><span style="background-color: #ffe599;">TIP: This can be used to record statistics of items that are used, but do not get checked out, such as reference items, magazines, etc. You can then run a report to gather the statistics from this card</span></li>
+</ul>
+</li>
+</ul>
+<h2>Add a new Patron</h2>
+<ul>
+	<li>Click 'New'</li>
+	<li>Enter the identifying information regarding your patron
+<ul>
+	<li>Required fields are defined in the BorrowerMandatoryField system preference</li>
+	<li>Salutation is populated by the BorrowersTitles system preference</li>
+</ul>
+</li>
+	<li>Next enter the contact information</li>
+	<li>If this patron is a child, you will be asked to attach the child patron to an adult patron
+<ul>
+	<li>Click 'Set to Patron' to search your system for an existing patron</li>
+	<li>If the Guarantor is not in the system, you can enter the first and last name in the fields available</li>
+	<li>The relationships are set using the borrowerRelationship system preference</li>
+</ul>
+</li>
+	<li>If this patron is a professional, you will be asked to attach the patron to an organizational patron
+<ul>
+	<li>Click 'Set to Patron to search your system for an existing patron</li>
+</ul>
+</li>
+	<li>Each patron can have an alternate contact
+<ul>
+	<li>An alternate contact could be a parent or guardian. It can also be used in academic settings to store the patron's home address.</li>
+</ul>
+</li>
+	<li>The library management section includes values that are used within the library
+<ul>
+	<li>The card number field is automatically calculated if you have the autoMemberNum system preference set that way</li>
+	<li>If you accidentally chose the wrong patron category at the beginning you can fix that here</li>
+	<li>Sort 1 and 2 are used for statistical purposes within your library</li>
+</ul>
+</li>
+	<li>Next, the Library Setup section includes additional library settings
+<ul>
+	<li>The registration date will automatically be filled in with today's date</li>
+	<li>If your patron cards expire (based on your patron category settings) the Expiry date will automatically be calculated</li>
+	<li>The OPAC Note is a note for the patron - it will appear in the OPAC on the patron's record</li>
+	<li>The Circulation Note is meant solely for your library staff and will appear when the circulation staff goes to check an item out to the patron</li>
+	<li>The OPAC Login and Password are used by the patron to log into their account in the OPAC. They are also used for staff accounts to provide them access to the staff client.</li>
+</ul>
+</li>
+	<li>If you have set additional patron attributes up, these will appear next</li>
+	<li>Finally, if you have EnhancedMessagingPreferences set to 'allow,' you can choose the messaging preferences for this patron.
+<ul>
+	<li>These preferences will override any you set via the patron categories</li>
+	<li>These preference can be altered by the patron via the OPAC</li>
+</ul>
+</li>
+	<li>Once finished, click 'Save'</li>
+	<li>At this point if the system suspects this patron is a duplicate of another it will warn you.</li>
+</ul>

-		<ul>
-			<li>
-		    <span style="background-color: #ffe599">
-TIP: Use 'Library note' for notes you'd like your circulation staff to see.</span></li>
-			<li>
-		    <span style="background-color: #ffe599">
-TIP: Use 'OPAC note' for notes you'd like the patron to see.<br/></span></li>
-			<li>
-		    <span style="background-color: #ffe599">
-		   		   
-		    <span style="background-color: #ffffff">
-IMPORTANT: Make sure your staff understands the difference between these fields. 'Library note' is a private note that ONLY staff can view. 'OPAC note' WILL be viewed by the patron.<br/></span></span></li>
-		</ul></li>
-	</ul>
-	<ul>
-		<li>Provide patrons with a login for the OPAC.
-		<ul>
-			<li>
-		    <span style="background-color: #ffe599">
-TIP: Patrons will be able to update/change their password via the OPAC</span></li>
-		</ul></li>
-	</ul>
-	<ul>
-		<li>Click 'Save' to finish the process.</li>
-	</ul><!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
+<h2>Add a Staff Patron</h2>
+
+<p>All staff members must be entered into Koha as patrons of the 'Staff' type. Follow the steps in Add a Patron to add a staff member. To give the staff member permissions to access the staff client, follow the steps in Patron Permissions</p>
+
+<p style="color: #990000">Remember to assign your staff secure usernames and passwords since these will be used to log into the staff client.</p>
+
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tmpl
@ -2,7 +2,6 @@

 <h1>Patrons help</h1>

-<p>This is the Patrons module of Koha.</p>
 <p>The Patrons portion stores the information you add about your patrons.</p>
 	<ul>
 		<li>To add a patron, type their name into the search box and click the 'Search' button.</li>
@ -12,4 +11,6 @@
 		</ul></li>
 		<li>Alternatively, you can browse a section of patron by selecting the first letter of the Patron's last name from the list on the right.</li>
 		<li>If the patron does not already have an account, click the 'New' button and choose the patron type you'd like to add</li>
-	</ul><!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
+	</ul>
+	
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/messaging.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/messaging.tmpl
@ -1,15 +1,9 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->

-<h1>Patron Messaging Queue</h1>
+<h1>Patron Messaging</h1>

-<p>This tab shows the status of patron notification messages.   Once a message is sent it will say so in the status column.</p>
-		<ul>
-			<li>
-		    <span style="background-color: #ffe599">
-TIP: To turn on messaging options you will need to turn the 'EnhancedMessagingPreferences' system preference to 'ON'</span>
-			<ul>
-				<li><em>Get there</em>: Administration &gt; System Preferences &gt; Patrons &gt;  EnhancedMessagingPreferences.</li>
-			</ul></li>
-		</ul>
+<p>The patron's messaging preferences are set when adding or editing the patron. This tab will show the messages that have been sent and those that are queued to be sent</p>
+
+<p>Once a message is sent it will say so in the status column.</p>

 <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tmpl
@ -1,12 +1,91 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->

-<h1>Member Information Screen</h1>
+<h1>Patron Details</h1>

-<p>This screen shows the information associated with a given patron.</p>
-<p>On the top left is their address and card number.</p>
-<p>A patron's annual membership fee payment status also shows on this screen.</p>
-<p>At the bottom of the patron information page you will find quick access to items the patron has checked out, overdue and on hold.</p>
-<p>You can get information on what a patron has read in the past by clicking on the Circulation History button.</p>
-<p>If you would like to edit a patron's information, click the 'Edit' button.  You can also click one of the 'Edit' links below each section on the patron record.</p>
-<p>If you would like to PERMANENTLY delete a user, click 'Delete' under 'More'. A confirmation box will appear, so don't worry about accidentally deleting a record. Just be absolutely sure before you delete!</p>
-<p>If no patron image exists for this patron, click the &quot;Add Patron Images&quot; link to add an image or images. The pixel dimensions should not exceed 200 X 300 and the file size should be under 520K. Only PNG, GIF, JPEG, XPM formats are supported.</p><!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
+<p>When viewing a patron record you have the option to view information from one of many tabs found on the left hand side of the record.</p>
+
+<h2>Check Out</h2>
+
+<p>For instruction on checking items out click the Check Out tab and read the help file there.</p>
+
+<h2>Details</h2>
+
+<p>All patron information will appear on the Details tab. This includes all the contact information, notes, messaging preferences, etc entered when adding the patron.
+In the case of patrons who are marked as 'Child' or 'Professional' and their Guarantors additional information will appear on their record.</p>
+
+<ul>
+<li>A child patron will list their Guarantor</li>
+<li>On the Guarantor's record, all children and/or professionals will be listed</li>
+</ul> 
+<h2>Fines</h2>
+
+<p>The patron's complete accounting history will appear on the Fines tab. Contrary to its name, the Fines tab does not just show fine data, it also shows membership fees, rental fees, reserve fees and any other charge you may have for patrons.</p>
+
+<h2>Circulation History</h2>
+
+<p>The circulation history tab will appear if you have set the intranetreadinghistory preference to allow it to appear. If you have the OPACPrivacy system preference set to 'Allow' and the patron has decided that the library cannot keep this information this tab will only show currently checked out items.</p>
+
+<h2>Modification Log</h2>
+
+<p>If you have set your BorrowersLog to track changes to patron records, then this tab will appear. The Modification Log will show all changes made to the patron record.</p>
+
+<ul>
+<li>The Librarian field shows the patron number for the librarian who made the changes</li>
+<li>The Object field lists the patron that is being modified</li>
+</ul>
+
+<h2>Messaging</h2>
+
+<p>The patron's messaging preferences are set when adding or editing the patron. This tab will show the messages that have been sent and those that are queued to be sent</p>
+
+<h2>Notices</h2>
+
+<p>The patron's messaging preferences are set when adding or editing the patron. This tab will show the messages that have been sent and those that are queued to be sent with their entire body content</p>
+
+<h2>Editing Patrons</h2>
+
+<p>Patrons in Koha can be edited using one of many edit buttons.</p>
+<ul>
+	<li>To edit the entire patron record simply click the 'Edit' button at the top of the patron record.</li>
+	<li>To only change the patron's password, click the 'Change Password' button
+<ul>
+	<li>Patron passwords are encrypted and cannot be recovered by the library staff</li>
+	<li>This form will automatically generate a random password, this password is not the patron's current password, just a new random password</li>
+</ul>
+</li>
+	<li>To edit a specific section of the patron record (for example the Library Use section) click the 'Edit' link below the section</li>
+	<li>A patron image can be added by browsing for the image on your machine from the 'Manage Patron Image' section
+<ul>
+	<li>This form will not appear if you have the patronimages system preference to allow patron images</li>
+	<li>To add patron images in bulk, use the Upload Patron Images Tool</li>
+</ul>
+</li>
+	<li>Patrons can also be blocked from checking items out by setting Patron Flags
+<ul>
+	<li>If you would like your circulation staff to confirm a patron's address before checking items out to the patron, you can see the 'Gone no Address' flag</li>
+	<li>If you would like to bar a patron from the library you can set the 'Debarred' flag
+<ul>
+	<li>This flag can automatically be set with the Overdue/Notice Status Triggers</li>
+</ul>
+</li>
+	<li>If the patron reports that they have lost their card you can set the 'Lost Card' flag to prevent someone else from using that card to check items out</li>
+</ul>
+</li>
+</ul>
+
+<h2>Duplicate a Patron</h2>
+
+<p>Sometimes when you're adding a new family to your system you don't want to type the contact information over and over. Koha allows for you to duplicate a patron and change only the parts you want to (or need to) change.</p>
+
+<ul>
+	<li>Open the patron you want to use as your base (the patron you want to duplicate information from)</li>
+	<li>Click the 'Duplicate' button at the top of their record</li>
+	<li>All of the fields with the exception of first name, card number, opac login and opac password have been duplicated. Fill in the missing pieces and click 'Save'
+<ul>
+	<li><span style="background-color: #ffe599;">TIP: Clicking in a field that is already populated with data will clear that field of all information (making it easier for you to type in something different)</span></li>
+</ul>
+</li>
+	<li>You will be brought to your new patron</li>
+</ul>
+
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tmpl
@ -0,0 +1,7 @@
+<!-- TMPL_INCLUDE NAME="help-top.inc" -->
+
+<h1>Patron Notices</h1>
+
+<p>The patron's messaging preferences are set when adding or editing the patron. This tab will show the messages that have been sent and those that are queued to be sent with their entire body content</p>
+
+<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tmpl
@ -1,17 +1,18 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->

-<h1>Pay Fines</h1>
-		<ul>
-			<li>To pay fines, click the 'Pay fines' tab</li>
-			<li>Each charge gives you a menu which lets you decide whether to mark items paid or not</li>
-			<li>By choosing 'Paid' the system assumes that a full payment is being made</li>
-			<li>Payments will appear on the Account tab</li>
-			<li>You can also create manual invoices/charges or apply manual credits to patron's accounts
-			<ul>
-				<li>
-			    <span style="background-color: #ffe599">
-TIP: If you create a manual credit, be aware that it won't be applied to any particular lost or late item</span></li>
-			</ul></li>
-		</ul>
+<h1>Pay/Reverse Fines</h1>
+
+<p>Each line item can be paid in full (or written off) using the 'Pay Fines' tab.</p>
+
+<ul>
+	<li>Choose the payment type (Unpaid, Paid, Writeoff) from the pull down menu</li>
+	<li>Click 'Make Payment'</li>
+	<li>A line item will be added to the account information showing the fee paid in full (or written off)</li>
+	<li>If you accidentally mark and item as paid, you can reverse that line item by clicking 'Reverse' to the right of the line
+<ul>
+	<li>Once clicked a new line item will be added to the account, showing the payment as reversed</li>
+</ul>
+</li>
+</ul>

 <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tmpl
@ -1,17 +1,7 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->

 <h1>Patron Cirulation History Help</h1>
-		<ul>
-			<li>To see the patron's reading history, click on the 'Circulation History' tab on the menu to the left.</li>
-			<li>
-		    <span style="background-color: #ffe599">
-TIP: This will only show a reading history if you have the 'intranetreadinghistory' preference turned 'ON'</span>
-			<ul>
-				<li>
-			    <span>
-<em>Get there:</em></span>Administration &gt; Global system preferences &gt; Patrons &gt; intranetreadinghistory</li>
-			</ul></li>
-			<li>To see the history of changes to the patron record click on 'Modification Log' on the menu to the left.</li>
-		</ul>
+
+<p>The circulation history tab will appear if you have set the intranetreadinghistory preference to allow it to appear. If you have the OPACPrivacy system preference set to 'Allow' and the patron has decided that the library cannot keep this information this tab will only show currently checked out items.</p>

 <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@ -193,7 +193,7 @@
                        </a>
                    </xsl:when>
                    <xsl:otherwise>
-                        <a href="/cgi-bin/koha/catalogue/search.pl?q=se:{marc:subfield[@code='t']}">
+                        <a href="/cgi-bin/koha/catalogue/search.pl?q=se:{marc:subfield[@code='a']}">
                            <xsl:call-template name="chopPunctuation">
                                <xsl:with-param name="chopString">
                                    <xsl:call-template name="subfieldSelect">
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@ -110,7 +110,7 @@
 <div id="moresearches">
 <a href="/cgi-bin/koha/opac-search.pl">Advanced Search</a>
 <!-- TMPL_IF NAME="OpacBrowser"     --><span class="pipe"> | </span><a href="/cgi-bin/koha/opac-browser.pl">Browse by Hierarchy</a><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="OpacAuthorities" --><span class="pipe"> | </span><a href="/cgi-bin/koha/opac-authorities-home.pl">Browse by Subject</a><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="OpacAuthorities" --><span class="pipe"> | </span><a href="/cgi-bin/koha/opac-authorities-home.pl">Browse by author or subject</a><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="TagsEnabled"     --><span class="pipe"> | </span><a href="/cgi-bin/koha/opac-tags.pl">Tag Cloud</a><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="OpacCloud"       --><span class="pipe"> | </span><a href="/cgi-bin/koha/opac-tags_subject.pl">Subject Cloud</a><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="OpacTopissue"    --><span class="pipe"> | </span><a href="/cgi-bin/koha/opac-topissues.pl">Most Popular</a><!-- /TMPL_IF -->
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl
@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; Authority Search
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; Browse by author or subject
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body id="opac-authorities">
@ -13,7 +13,7 @@
        <input type="hidden" name="op" value="do_search" />
        <input type="hidden" name="type" value="opac" />
 <fieldset class="rows">
-<legend>Authority search</legend>
+            <legend>Browse by author or subject</legend>
 <ol>
 <li><label for="authtypecode">Search: : </label> <select name="authtypecode" id="authtypecode">
                <!-- TMPL_LOOP NAME="authtypesloop" -->
@ -21,32 +21,7 @@
                <!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="value" -->"> <!-- TMPL_VAR NAME="authtypetext" --></option>
                <!-- /TMPL_IF -->
                <!-- /TMPL_LOOP -->
-                </select></li>           <li>
-                <label for="operatora">Main entry ($a only): </label>
-                <select name="operatora" id="operatora">
-                    <option value="contains">contains</option>
-                    <option value="start">starts with</option>
-                    <option value="is">is exactly</option>
                </select>
-                <input type="text" name="valuea" id="mainentrya_value" value="<!-- TMPL_VAR NAME="value" -->" />
-                <input type="hidden" name="marclista" value="mainmainentry" />
-                <input type="hidden" name="and_ora" value="and" />
-                <input type="hidden" name="excludinga" value="" />
-            </li>
-            <li>
-                <label for="operatorb">Main entry: </label>
-                <select name="operatorb" id="operatorb">
-                    <option value="contains">contains</option>
-                    <option value="start">starts with</option>
-                    <option value="is">is exactly</option>
-                </select>
-                <input type="text" name="valueb" id="mainentry_value" value="<!-- TMPL_VAR NAME="value" -->" />
-                <input type="hidden" name="marclistb" value="mainentry" />
-                <input type="hidden" name="and_orb" value="and" />
-                <input type="hidden" name="excludingb" value="" />
-            </li>
-            <li>
-                <label for="anywhere">Anywhere: </label>
                <select name="operatorc" id="anywhere">
                    <option value="contains">contains</option>
                    <option value="start">starts with</option>
@ -54,7 +29,7 @@
                </select>
                <input type="text" name="valuec" id="anywhere_value" value="<!-- TMPL_VAR NAME="value" -->" />
                <input type="hidden" name="marclistc" value="" />
-                <input type="hidden" name="and_orc" value="and" />
+                    <input type="hidden" name="and_ora" value="and" />
                <input type="hidden" name="excludingc" value="" />
            </li>
            <li><label for="orderby">Order by: </label><select name="orderby" id="orderby">
@ -71,8 +46,8 @@
 </div>
 </div>
 </div>
-
-</div><!-- TMPL_IF NAME="OpacNav" -->
+</div>
+<!-- TMPL_IF NAME="OpacNav" -->
 <div class="yui-b">
 <div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl
@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  Advanced Search
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  Entry
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_IF Name="displayhierarchy"-->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/hierarchy.css">
@ -60,18 +60,16 @@ function showChildren(mynumber) {
 <!--/TMPL_LOOP-->
 </div>
 <!-- /TMPL_IF -->
-<h1>Authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
+<h1>Entry <!-- TMPL_VAR name="authtypetext" --></h1>
 	<p>Used in <a href="opac-search.pl?type=opac&amp;q=<!-- TMPL_VAR NAME="authid" -->&amp;idx=an"><!-- TMPL_VAR name="count" --> records</a></p>
-<table><!-- TMPL_LOOP name="0XX" -->
-        <tr><td colspan="3" class="marctag"><b><!-- TMPL_VAR name="tag" --></b></td></tr>
+        <!-- TMPL_LOOP name="0XX" -->
+        <p><b><!-- TMPL_VAR name="tag" --></b></p>
+        <ul>
        <!-- TMPL_LOOP name="subfield" -->
-                <tr><td class="marcsubfieldletter" ><!-- TMPL_VAR name="marc_subfield" --></td>
-                    <td class="marcsubfieldname" ><!-- TMPL_VAR name="marc_lib" --></td>
-                    <td class="subfieldvalue" ><!-- TMPL_VAR name="marc_value" --></td>
-                </tr>
+                <p><b><!-- TMPL_VAR name="marc_lib" -->:</b> <!-- TMPL_VAR name="marc_value" --></p>
            <!-- /TMPL_LOOP -->
+        </ul>
        <!-- /TMPL_LOOP -->
-</table>
 </div>	

 </div>
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@ -251,7 +251,7 @@
                        </a>
                    </xsl:when>
                    <xsl:otherwise>
-                        <a href="/cgi-bin/koha/opac-search.pl?q=se:{marc:subfield[@code='t']}">
+                        <a href="/cgi-bin/koha/opac-search.pl?q=se:{marc:subfield[@code='a']}">
                            <xsl:call-template name="chopPunctuation">
                                <xsl:with-param name="chopString">
                                    <xsl:call-template name="subfieldSelect">
@ -504,59 +504,59 @@
        <xsl:if test="marc:datafield[@tag=856]">
        <span class="results_summary"><span class="label">Online Resources: </span>
        <xsl:for-each select="marc:datafield[@tag=856]">
-                            <xsl:if test="$OPACURLOpenInNewWindow='0'">
-                                   <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
-                                    <xsl:choose>
-                                    <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
-                                        <xsl:call-template name="subfieldSelect">
-                                        <xsl:with-param name="codes">y3z</xsl:with-param>
-                                        </xsl:call-template>
-                                    </xsl:when>
-                                    <xsl:when test="not(marc:subfield[@code='y']) and not(marc:subfield[@code='3']) and not(marc:subfield[@code='z'])">
-                                        <xsl:choose>
-                                        <xsl:when test="$URLLinkText!=''">
-                                                <xsl:value-of select="$URLLinkText"/>
-                                        </xsl:when>
-                                        <xsl:otherwise>
-                                                <xsl:text>Click here to access online</xsl:text>
-                                        </xsl:otherwise>
-                                        </xsl:choose>
-                                    </xsl:when>
-                                    </xsl:choose>
-                                    </a>
-                              </xsl:if>
-                            <xsl:if test="$OPACURLOpenInNewWindow='1'">
-                                   <a target='_blank'><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
-                                    <xsl:choose>
-                                    <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
-                                        <xsl:call-template name="subfieldSelect">
-                                        <xsl:with-param name="codes">y3z</xsl:with-param>
-                                        </xsl:call-template>
-                                    </xsl:when>
-                                    <xsl:when test="not(marc:subfield[@code='y']) and not(marc:subfield[@code='3']) and not(marc:subfield[@code='z'])">
-                                        <xsl:choose>
-                                        <xsl:when test="$URLLinkText!=''">
-                                                <xsl:value-of select="$URLLinkText"/>
-                                        </xsl:when>
-                                        <xsl:otherwise>
-                                                <xsl:text>Click here to access online</xsl:text>
-                                        </xsl:otherwise>
-                                        </xsl:choose>
-                                    </xsl:when>
-                                    </xsl:choose>
-                                    </a>
-                              </xsl:if>
-                                    <xsl:choose>
-                                    <xsl:when test="position()=last()"><xsl:text>  </xsl:text></xsl:when>
-                                    <xsl:otherwise> | </xsl:otherwise>
-                                    </xsl:choose>
-
+            <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
+            <xsl:if test="$OPACURLOpenInNewWindow='1'">
+                <xsl:attribute name="target">_blank</xsl:attribute>
+            </xsl:if>
+            <xsl:choose>
+            <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
+                <xsl:call-template name="subfieldSelect">
+                    <xsl:with-param name="codes">y3z</xsl:with-param>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:when test="not(marc:subfield[@code='y']) and not(marc:subfield[@code='3']) and not(marc:subfield[@code='z'])">
+                <xsl:choose>
+                <xsl:when test="$URLLinkText!=''">
+                    <xsl:value-of select="$URLLinkText"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:text>Click here to access online</xsl:text>
+                </xsl:otherwise>
+                </xsl:choose>
+            </xsl:when>
+            </xsl:choose>
+            </a>
+            <xsl:choose>
+            <xsl:when test="position()=last()"><xsl:text>  </xsl:text></xsl:when>
+            <xsl:otherwise> | </xsl:otherwise>
+            </xsl:choose>
        </xsl:for-each>
        </span>
        </xsl:if>
+
+        <!-- 530 -->
+        <xsl:if test="marc:datafield[@tag=530]">
+        <xsl:for-each select="marc:datafield[@tag=530]">
+        <span class="results_summary additionalforms">
+            <xsl:call-template name="subfieldSelect">
+                <xsl:with-param name="codes">abcd</xsl:with-param>
+            </xsl:call-template>
+            <xsl:for-each select="marc:subfield[@code='u']">
+                <a><xsl:attribute name="href"><xsl:value-of select="text()"/></xsl:attribute>
+                <xsl:if test="$OPACURLOpenInNewWindow='1'">
+                    <xsl:attribute name="target">_blank</xsl:attribute>
+                </xsl:if>
+                <xsl:value-of select="text()"/>
+                </a>
+            </xsl:for-each>
+        </span>
+        </xsl:for-each>
+        </xsl:if>
+
+        <!-- 505 -->
        <xsl:if test="marc:datafield[@tag=505]">
        <xsl:for-each select="marc:datafield[@tag=505]">
-        <span class="results_summary">
+        <span class="results_summary contents">
        <xsl:choose>
        <xsl:when test="@ind1=1">
            <span class="label">Incomplete contents:</span>
@ -584,6 +584,38 @@
        </xsl:for-each>
        </xsl:if>

+        <!-- 583 -->
+        <xsl:if test="marc:datafield[@tag=583]">
+        <xsl:for-each select="marc:datafield[@tag=583]">
+            <xsl:if test="@ind1=1 or @ind1=' '">
+            <span class="results_summary actionnote">
+                <xsl:choose>
+                <xsl:when test="marc:subfield[@code='z']">
+                    <xsl:value-of select="marc:subfield[@code='z']"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">abcdefgijklnou</xsl:with-param>
+                    </xsl:call-template>
+                </xsl:otherwise>
+                </xsl:choose>
+            </span>
+            </xsl:if>
+        </xsl:for-each>
+        </xsl:if>
+
+        <!-- 586 -->
+        <xsl:if test="marc:datafield[@tag=586]">
+        <xsl:for-each select="marc:datafield[@tag=586]">
+            <span class="results_summary awardsnote">
+                <xsl:if test="@ind1=' '">
+                <span class="label">Awards: </span>
+                </xsl:if>
+                <xsl:value-of select="marc:subfield[@code='a']"/>
+            </span>
+        </xsl:for-each>
+        </xsl:if>
+
        <!-- 773 -->
        <xsl:if test="marc:datafield[@tag=773]">
        <xsl:for-each select="marc:datafield[@tag=773]">
--- a/kohaversion.pl
+++ b/kohaversion.pl
@ -16,7 +16,7 @@ the kohaversion is divided in 4 parts :
 use strict;

 sub kohaversion {
-    our $VERSION = '3.03.00.029';
+    our $VERSION = '3.03.00.031';
    # version needs to be set this way
    # so that it can be picked up by Makefile.PL
    # during install
--- a/misc/cronjobs/purge_suggestions.pl
+++ b/misc/cronjobs/purge_suggestions.pl
@ -0,0 +1,60 @@
+#!/usr/bin/perl -w
+
+# Copyright 2010 Biblibre SARL
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+use strict;
+use warnings;
+use utf8;
+
+BEGIN {
+
+    # find Koha's Perl modules
+    # test carefully before changing this
+    use FindBin;
+    eval { require "$FindBin::Bin/../kohalib.pl" };
+}
+
+use Getopt::Long;
+use Pod::Usage;
+use C4::Suggestions;
+
+my ($help, $days);
+
+GetOptions(
+    'help|?'         => \$help,
+    'days=s'         => \$days,
+);
+
+if($help or not $days){
+    print <<EOF
+    This script delete olds suggestions
+    Parameters :
+    -help|? This message
+    -days TTT to define the age of suggestions to delete
+
+     example :
+     export PERL5LIB=/path/to/koha;export KOHA_CONF=/etc/koha/koha-conf.xml;./purge_suggestions.pl -days 30
+EOF
+;
+    exit;
+}
+
+if($days){
+    DelSuggestionsOlderThan($days);
+}
+
--- a/opac/opac-authoritiesdetail.pl
+++ b/opac/opac-authoritiesdetail.pl
@ -120,6 +120,9 @@ my @fields    = $record->fields();
 foreach my $field (@fields) {
    my @subfields_data;

+    # skip UNIMARC fields <200, they are useless for a patron
+    next if C4::Context->preference('MarcFlavour') eq 'UNIMARC' && $field->tag() <200;
+
    # if tag <10, there's no subfield, use the "@" trick
    if ( $field->tag() < 10 ) {
        next if ( $tagslib->{ $field->tag() }->{'@'}->{hidden} );
@ -137,6 +140,8 @@ foreach my $field (@fields) {
        for my $i ( 0 .. $#subf ) {
            $subf[$i][0] = "@" unless $subf[$i][0];
            next if ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{hidden} );
+            # skip useless subfields (for patrons)
+            next if $subf[$i][0] =~ /7|8|9/;
            my %subfield_data;
            $subfield_data{marc_lib} =
              $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{lib};