Merge remote branch 'koha-fbc/k_bug_5203' into master

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 034a8d6..644ab27 100644 (file)
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -69,7 +69,6 @@ BEGIN {
                &AddRenewal
                &GetRenewCount
                &GetItemIssue
-                &GetOpenIssue
                &GetItemIssues
                &GetBorrowerIssues
                &GetIssuingCharges
@@ -77,6 +76,7 @@ BEGIN {
         &GetBranchBorrowerCircRule
         &GetBranchItemRule
                &GetBiblioIssues
+               &GetOpenIssue
                &AnonymiseIssueHistory
        );
 
@@ -904,7 +904,6 @@ sub AddIssue {
     my ( $borrower, $barcode, $datedue, $cancelreserve, $issuedate, $sipmode) = @_;
     my $dbh = C4::Context->dbh;
        my $barcodecheck=CheckValidBarcode($barcode);
-
     # $issuedate defaults to today.
     if ( ! defined $issuedate ) {
         $issuedate = strftime( "%Y-%m-%d", localtime );

diff --git a/C4/Installer/PerlDependencies.pm b/C4/Installer/PerlDependencies.pm
index 19a84a0..3ac49dc 100644 (file)
--- a/C4/Installer/PerlDependencies.pm
+++ b/C4/Installer/PerlDependencies.pm
@@ -464,6 +464,11 @@ our $PERL_DEPS = {
         'required' => '0',
         'min_ver'  => '0.97',
     },
+    'Business::ISBN' => {
+        'usage'    => 'Core',
+        'required' => '0',
+        'min_ver'  => '2.05',
+    },
 };
 
 1;

diff --git a/C4/Koha.pm b/C4/Koha.pm
index cb93034..fb27ee2 100644 (file)
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -24,6 +24,7 @@ use C4::Context;
 use C4::Output;
 use URI::Split qw(uri_split);
 use Memoize;
+use Business::ISBN;
 
 use vars qw($VERSION @ISA @EXPORT $DEBUG);
 
@@ -1235,6 +1236,7 @@ sub GetNormalizedUPC {
 }
 
 # Normalizes and returns the first valid ISBN found in the record
+# ISBN13 are converted into ISBN10. This is required to get Amazon cover book.
 sub GetNormalizedISBN {
     my ($isbn,$record,$marcflavour) = @_;
     my @fields;
@@ -1321,19 +1323,12 @@ sub _normalize_match_point {
 }
 
 sub _isbn_cleanup ($) {
-    my $normalized_isbn = shift;
-    $normalized_isbn =~ s/-//g;
-    $normalized_isbn =~/([0-9x]{1,})/i;
-    $normalized_isbn = $1;
-    if (
-        $normalized_isbn =~ /\b(\d{13})\b/ or
-        $normalized_isbn =~ /\b(\d{12})\b/i or
-        $normalized_isbn =~ /\b(\d{10})\b/ or
-        $normalized_isbn =~ /\b(\d{9}X)\b/i
-    ) { 
-        return $1;
-    }
-    return undef;
+    my $isbn = Business::ISBN->new( shift );
+    return undef unless $isbn;
+    $isbn = $isbn->as_isbn10 if $isbn->type eq 'ISBN13';
+    $isbn = $isbn->as_string;
+    $isbn =~ s/-//g;
+    return $isbn;
 }
 
 1;

diff --git a/C4/Letters.pm b/C4/Letters.pm
index 885ed5f..62b339a 100644 (file)
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -275,7 +275,7 @@ sub SendAlerts {
 
             # and parse borrower ...
             my $innerletter = $letter;
-            my $borinfo = GetMember( 'borrowernumber' => $_->{'borrowernumber'});
+            my $borinfo = C4::Members::GetMember('borrowernumber' => $_->{'borrowernumber'});
             parseletter( $innerletter, 'borrowers', $_->{'borrowernumber'} );
 
             # ... then send mail

diff --git a/C4/Patroncards/Patroncard.pm b/C4/Patroncards/Patroncard.pm
index 2093976..23cba15 100644 (file)
--- a/C4/Patroncards/Patroncard.pm
+++ b/C4/Patroncards/Patroncard.pm
@@ -83,8 +83,8 @@ sub draw_text {
     my ($self, $pdf, %params) = @_;
     warn sprintf('No pdf object passed in.') and return -1 if !$pdf;
     my @card_text = ();
+    return unless (ref($self->{'layout'}->{'text'}) eq 'ARRAY'); # just in case there is not text
     my $text = [@{$self->{'layout'}->{'text'}}]; # make a copy of the arrayref *not* simply a pointer
-    return unless (ref($text) eq 'ARRAY'); # just in case there is not text
     while (scalar @$text) {
         my $line = shift @$text;
         my $parse_line = $line;

diff --git a/C4/Search.pm b/C4/Search.pm
index 8434886..2cc2dfb 100644 (file)
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -2573,7 +2573,7 @@ AND (authtypecode IS NOT NULL AND authtypecode<>\"\")|);
   #There are no results, build authority record, add it to Authorities, get authid and add it to 9
   ###NOTICE : This is only valid if a subfield is linked to one and only one authtypecode
   ###NOTICE : This can be a problem. We should also look into other types and rejected forms.
-         my $authtypedata=C4::AuthoritiesMarc->GetAuthType($data->{authtypecode});
+         my $authtypedata=C4::AuthoritiesMarc::GetAuthType($data->{authtypecode});
          next unless $authtypedata;
          my $marcrecordauth=MARC::Record->new();
          my $authfield=MARC::Field->new($authtypedata->{auth_tag_to_report},'','',"a"=>"".$field->subfield('a'));

diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index 73ca42d..9d15847 100644 (file)
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -89,7 +89,8 @@ sub shelfpage ($$$$$) {
         if ( $shelfnumber = $query->param('viewshelf') ) {
             if ( ShelfPossibleAction( $loggedinuser, $shelfnumber, 'manage' ) ) {
                 if ( $barcode = $query->param('addbarcode') ) {
-                    if ( $item = GetItem( 0, $barcode ) ) {
+                    $item = GetItem( 0, $barcode );
+                    if (defined $item && $item->{'itemnumber'}){
                         $biblio = GetBiblioFromItemNumber( $item->{'itemnumber'} );
                         AddToShelf( $biblio->{'biblionumber'}, $shelfnumber )
                           or push @paramsloop, { duplicatebiblio => $barcode };

diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index 2ab5252..94560c4 100755 (executable)
--- a/acqui/addorder.pl
+++ b/acqui/addorder.pl
@@ -189,17 +189,18 @@ my $bibitemnum;
 if ( $orderinfo->{quantity} ne '0' ) {
     #TODO:check to see if biblio exists
     unless ( $$orderinfo{biblionumber} ) {
-
         #if it doesnt create it
         my $record = TransformKohaToMarc(
             {
                 "biblio.title"                => "$$orderinfo{title}",
-                "biblio.author"               => "$$orderinfo{author}",
+                "biblio.author"               => $$orderinfo{author}          ? $$orderinfo{author}        : "",
                 "biblio.seriestitle"          => $$orderinfo{series}          ? $$orderinfo{series}        : "",
                 "biblioitems.isbn"            => $$orderinfo{isbn}            ? $$orderinfo{isbn}          : "",
                 "biblioitems.publishercode"   => $$orderinfo{publishercode}   ? $$orderinfo{publishercode} : "",
                 "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
+                "biblio.copyrightdate"        => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "",
             });
+
         # create the record in catalogue, with framework ''
         my ($biblionumber,$bibitemnum) = AddBiblio($record,'');
         # change suggestion status if applicable

diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index a580ae7..6c10459 100755 (executable)
--- a/acqui/neworderempty.pl
+++ b/acqui/neworderempty.pl
@@ -340,7 +340,7 @@ $template->param(
     orderexists      => ( $new eq 'yes' ) ? 0 : 1,
     title            => $data->{'title'},
     author           => $data->{'author'},
-    publicationyear  => $data->{'publicationyear'},
+    publicationyear  => $data->{'publicationyear'} ? $data->{'publicationyear'} : $data->{'copyrightdate'},
     budget_loop      => $budget_loop,
     isbn             => $data->{'isbn'},
     seriestitle      => $data->{'seriestitle'},

diff --git a/admin/preferences.pl b/admin/preferences.pl
index b5bcde8..7fcf5fc 100755 (executable)
--- a/admin/preferences.pl
+++ b/admin/preferences.pl
@@ -266,7 +266,8 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 $lang = $template->param( 'lang' );
 my $op = $input->param( 'op' ) || '';
 my $tab = $input->param( 'tab' );
-$tab ||= 'local-use';
+$tab ||= 'acquisitions'; # Ideally this should be "local-use" but preferences.pl
+                         # does not presently support local use preferences
 
 my $highlighted;
 

diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 824b058..411f434 100755 (executable)
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -801,7 +801,7 @@ if ( $op eq 'add_form' ) {
         $row_data->{delete} = "$script_name?op=delete_confirm&searchfield=" . $results->[$i]{'variable'};
         push( @loop_data, $row_data );
     }
-    $tab = ( $tab ? $tab : "Local Use" );
+    $tab = ( $tab ? $tab : "local-use" );
     $template->param( loop => \@loop_data, $tab => 1 );
     if ( $offset > 0 ) {
         my $prevpage = $offset - $pagesize;

diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index ea4daf9..e6f19d2 100755 (executable)
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -433,7 +433,10 @@ foreach my $tag (sort keys %{$tagslib}) {
           foreach my $thisbranch (@$branches) {
               push @authorised_values, $thisbranch->{value};
               $authorised_lib{$thisbranch->{value}} = $thisbranch->{branchname};
-             # $value = $thisbranch->{value} if $thisbranch->{selected};
+              # in edit item this is set to the data value otherwise use default
+              if ($op ne 'edititem' && $thisbranch->{selected} ) {
+                  $value = $thisbranch->{value};
+              }
           }
       }
       elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) {

diff --git a/docs/history.txt b/docs/history.txt
index cf9f5ab..a1179d5 100644 (file)
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -493,3 +493,11 @@ May 4 2010 Community Handover meeting http://wiki.koha-community.org/wiki/Commun
 May 5 2010     General IRC meeting http://wiki.koha-community.org/wiki/General_Meeting,_May_5_2010
 May 5 2010     Matthew Hunt becomes the 114th committer to have a patch accepted
 May 19 2010    Marcel de Rooy becomes the 115th committer to have a patch accepted
+July 19 2010   Andrew Chilton becomes the 116th committer to have a patch accepted
+June 2 2010    General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_2_June_2010
+July 7 2010    General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_7_July_2010
+June 25 2010   Koha 3.2 Beta released http://koha-community.org/koha-3-2-beta-released/
+July 13 2010   License meeting http://wiki.koha-community.org/wiki/License_Upgrade_Vote_IRC_Meeting,_13_July_2010
+August 11 2010 General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_11_August_2010
+September 1 2010       General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_1_September_2010
+

diff --git a/install_misc/apt-get-debian-lenny.sh b/install_misc/apt-get-debian-lenny.sh
index 48c53e4..8b90a85 100755 (executable)
--- a/install_misc/apt-get-debian-lenny.sh
+++ b/install_misc/apt-get-debian-lenny.sh
@@ -12,6 +12,7 @@ idzebra-2.0 \
 idzebra-2.0-utils \
 libalgorithm-checkdigits-perl \
 libbiblio-endnotestyle-perl \
+libbusiness-isbn-perl \
 libcgi-session-perl \
 libcgi-session-serialize-yaml-perl \
 libclass-accessor-perl \

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index a0b5c4a..ca02c90 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -2871,12 +2871,28 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     print "Upgrade to $DBversion done (adding basketgroups)\n";
     SetVersion ($DBversion);
 }
-
 $DBversion = '3.01.00.077';
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
 
     $dbh->do("SET FOREIGN_KEY_CHECKS=0 ");
+    # create a mapping table holding the info we need to match orders to budgets
+    $dbh->do('DROP TABLE IF EXISTS fundmapping');
+    $dbh->do(
+        q|CREATE TABLE fundmapping AS
+        SELECT aqorderbreakdown.ordernumber, branchcode, bookfundid, budgetdate, entrydate
+        FROM aqorderbreakdown JOIN aqorders ON aqorderbreakdown.ordernumber = aqorders.ordernumber|);
+    # match the new type of the corresponding field
+    $dbh->do('ALTER TABLE fundmapping modify column bookfundid varchar(30)');
+    # System did not ensure budgetdate was valid historically
+    $dbh->do(q|UPDATE fundmapping SET budgetdate = entrydate WHERE budgetdate = '0000-00-00' OR budgetdate IS NULL|);
+    # We save the map in fundmapping in case you need later processing
+    $dbh->do(q|ALTER TABLE fundmapping add column aqbudgetid integer|);
+    # these can speed processing up
+    $dbh->do(q|CREATE INDEX fundmaporder ON fundmapping (ordernumber)|);
+    $dbh->do(q|CREATE INDEX fundmapid ON fundmapping (bookfundid)|);
+
     $dbh->do("DROP TABLE IF EXISTS `aqbudgetperiods` ");
+
     $dbh->do(qq|
                     CREATE TABLE `aqbudgetperiods` (
                     `budget_period_id` int(11) NOT NULL auto_increment,
@@ -2995,10 +3011,31 @@ BUDGETDROPDATES
                     ADD COLUMN `budgetgroup_id` int(11) NOT NULL,
                     ADD COLUMN  `sort1_authcat` varchar(10) default NULL,
                     ADD COLUMN  `sort2_authcat` varchar(10) default NULL" );
-
+                # We need to map the orders to the budgets
+                # For Historic reasons this is more complex than it should be on occasions
+                my $budg_arr = $dbh->selectall_arrayref(
+                    q|SELECT aqbudgets.budget_id, aqbudgets.budget_code, aqbudgetperiods.budget_period_startdate,
+                    aqbudgetperiods.budget_period_enddate
+                    FROM aqbudgets JOIN aqbudgetperiods ON aqbudgets.budget_period_id = aqbudgetperiods.budget_period_id
+                    ORDER BY budget_code, budget_period_startdate|, { Slice => {} });
+                # We arbitarily order on start date, this means if you have overlapping periods the order will be
+                # linked to the latest matching budget YMMV
+                my $b_sth = $dbh->prepare(
+                    'UPDATE fundmapping set aqbudgetid = ? where bookfundid =? AND budgetdate >= ? AND budgetdate <= ?');
+                for my $b ( @{$budg_arr}) {
+                    $b_sth->execute($b->{budget_id}, $b->{budget_code}, $b->{budget_period_startdate}, $b->{budget_period_enddate});
+                }
+                # move the budgetids to aqorders
+                $dbh->do(q|UPDATE aqorders, fundmapping SET aqorders.budget_id = fundmapping.aqbudgetid
+                    WHERE aqorders.ordernumber = fundmapping.ordernumber AND fundmapping.aqbudgetid IS NOT NULL|);
+                # NB fundmapping is left as an accontants trail also if you have budgetids that werent set
+                # you can decide what to do with them
+
+     $dbh->do(
+         q|UPDATE aqorders, aqbudgets SET aqorders.budgetgroup_id = aqbudgets.budget_period_id
+         WHERE aqorders.budget_id = aqbudgets.budget_id|);
                 # cannot do until aqorderbreakdown removed
 #    $dbh->do("DROP TABLE aqbookfund ");
-
 #    $dbh->do("ALTER TABLE aqorders  ADD FOREIGN KEY (`budget_id`) REFERENCES `aqbudgets` (`budget_id`) ON UPDATE CASCADE  " ); ????
     $dbh->do("SET FOREIGN_KEY_CHECKS=1 ");
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc
deleted file mode 100644 (file)
index 3b2fea4..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="menu">
-<ul>
-<!-- TMPL_IF NAME="Acquisitions" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Acquisitions" href="/cgi-bin/koha/admin/preferences.pl?tab=acquisitions">Acquisitions</a></li>
-<!-- TMPL_IF NAME="Admin" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Administration" href="/cgi-bin/koha/admin/preferences.pl?tab=admin">Administration</a></li>
-<!-- TMPL_IF NAME="Authorities" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Authority Control" href="/cgi-bin/koha/admin/preferences.pl?tab=authorities">Authorities</a></li>
-<!-- TMPL_IF NAME="Cataloging" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Cataloging" href="/cgi-bin/koha/admin/preferences.pl?tab=cataloging">Cataloging</a></li>
-<!-- TMPL_IF NAME="Circulation" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Circulation" href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">Circulation</a></li>
-<!-- TMPL_IF NAME="Creators" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Creators" href="/cgi-bin/koha/admin/preferences.pl?tab=creators">Creators</a></li>
-<!-- TMPL_IF NAME="EnhancedContent" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Enhanced content settings" href="/cgi-bin/koha/admin/preferences.pl?tab=enhanced-content">Enhanced Content</a></li>
-<!-- TMPL_IF NAME="I18N/L10N" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Internationalization and Localization" href="/cgi-bin/koha/admin/preferences.pl?tab=i18n-l10n">I18N/L10N</a></li>
-<!-- TMPL_IF NAME="" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/admin/systempreferences.pl">Local Use</a></li>
-<!-- TMPL_IF NAME="Logs" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Transaction Logs" href="/cgi-bin/koha/admin/preferences.pl?tab=logs">Logs</a></li>
-<!-- TMPL_IF NAME="OPAC" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Online Public Access Catalog" href="/cgi-bin/koha/admin/preferences.pl?tab=opac">OPAC</a></li>
-<!-- TMPL_IF NAME="Patrons" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Patrons" href="/cgi-bin/koha/admin/preferences.pl?tab=patrons">Patrons</a></li>
-<!-- TMPL_IF NAME="Searching" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Searching" href="/cgi-bin/koha/admin/preferences.pl?tab=searching">Searching</a></li>
-<!-- TMPL_IF NAME="Serials" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Serials" href="/cgi-bin/koha/admin/preferences.pl?tab=serials">Serials</a></li>
-<!-- TMPL_IF NAME="StaffClient" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Staff Client" href="/cgi-bin/koha/admin/preferences.pl?tab=staff-client">Staff Client</a></li>
-<!-- TMPL_IF NAME="OAI-PMH" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Web Services" href="/cgi-bin/koha/admin/preferences.pl?tab=web-services">Web Services</a></li>
-</ul>
-</div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
index d494cf2..64d5a67 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
@@ -128,7 +128,7 @@
                 <li>Danny Bouman</li>
                 <li>Stan Brinkerhoff</li>
                 <li>Roger Buck</li>
-                <li>Jared Camins-Esakov</li>
+                <li><a href="https://www.ohloh.net/p/koha/contributors/6620692376789">Jared Camins-Esakov</a></li>
                 <li>Colin Campbell</li>
                 <li>DeAndre Carroll</li>
                 <li>Chris Catalfo (new plugin MARC editor)</li>
@@ -142,11 +142,11 @@
                 <li>Ecole des Mines de Saint Etienne, Philippe Jaillon (OAI-PMH support)</li>
                 <li>Stephen Edwards</li>
                 <li>Andrew Elwell</li>
-                <li>Magnus Enger</li>
+                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544677502">Magnus Enger</a></li>
                 <li>Esiee School (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)</li>
                 <li>Pate Eyler (Kaitiaki from 2002 to 2004)</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609865">Antoine Farnault</a></li>
-                <li>Katrin Fischer</li>
+                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544670742">Katrin Fischer</a></li>
                 <li>Clay Fouts</li>
                 <li>Marco Gaiarin</li>
                 <li>Brendan A. Gallagher</li>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index 603d517..1534e75 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -80,7 +80,7 @@ ff.submit();
         <legend>Basket details</legend>
                <ol>
         <!-- TMPL_IF NAME="basketnote" --><li><span class="label">Internal note:</span> <!-- TMPL_VAR NAME="basketnote" --></li><!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="basketbooksellernote" --><li><span class="label">Vendor note</span>: <!-- TMPL_VAR NAME="basketbooksellernote" --></li><!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="basketbooksellernote" --><li><span class="label">Vendor note:</span> <!-- TMPL_VAR NAME="basketbooksellernote" --></li><!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="basketcontractno" -->
             <li><span class="label">Contract number: </span><!-- TMPL_VAR NAME="basketcontractno" --></li>
             <li><span class="label">Contract name:</span> <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;contractnumber=<!-- TMPL_VAR NAME="basketcontractno" -->"><!-- TMPL_VAR NAME="basketcontractname" --></a></li>
@@ -176,16 +176,16 @@ ff.submit();
         <li>
             <!-- TMPL_IF name="biblionumber" -->
             <span class="label">ISBN: </span>
-                <input type="hidden" size="20" name="ISBN" id="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /><!-- TMPL_VAR NAME="isbn" -->
+                <input type="hidden" size="20" name="isbn" id="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /><!-- TMPL_VAR NAME="isbn" -->
             <!-- TMPL_ELSE -->
             <label for="ISBN">ISBN: </label>
-                <input type="text" size="20" name="ISBN" id="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" />
+                <input type="text" size="20" name="isbn" id="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" />
             <!-- /TMPL_IF -->
         </li>
         <li>
             <!-- TMPL_IF name="biblionumber" -->
             <span class="label">Series: </span>
-                <input type="hidden" size="20" name="series" id="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /><span class="title"><!-- TMPL_VAR NAME="seriestitle" --></span>
+                <input type="hidden" size="20" name="series" id="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /><!-- TMPL_VAR NAME="seriestitle" -->
             <!-- TMPL_ELSE -->
             <label for="series">Series: </label>
                 <input type="text" size="20" name="series" id="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" />

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl
index 8d54fe0..de9a592 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl
@@ -347,7 +347,7 @@
 </div>
 </div>
 <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="sysprefs-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="prefs-menu.inc" -->
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
index e722afb..3e510c5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
@@ -324,12 +324,12 @@ function CloneField(index) {
             
             // setting its '+' and '-' buttons
             try {
-                var spans = divs[i].getElementsByTagName('span');
-                for (var j = 0; j < spans.length; j++) {
-                    if(spans[j].getAttribute('class') == 'buttonPlus'){
-                        spans[j].setAttribute('onclick',"CloneSubfield('" + divs[i].getAttribute('id') + "')");
-                    } else if (spans[j].getAttribute('class') == 'buttonMinus') {
-                        spans[j].setAttribute('onclick',"UnCloneField('" + divs[i].getAttribute('id') + "')");
+                var anchors = divs[i].getElementsByTagName('a');
+                for (var j = 0; j < anchors.length; j++) {
+                    if(anchors[j].getAttribute('class') == 'buttonPlus'){
+                        anchors[j].setAttribute('onclick',"CloneSubfield('" + divs[i].getAttribute('id') + "')");
+                    } else if (anchors[j].getAttribute('class') == 'buttonMinus') {
+                        anchors[j].setAttribute('onclick',"UnCloneField('" + divs[i].getAttribute('id') + "')");
                     }
                 }
             }
@@ -479,19 +479,19 @@ function CloneSubfield(index){
     label.setAttribute('for',id_input);
     <!-- /TMPL_UNLESS -->
     
-    // setting a new if for the parent div
+    // setting a new id for the parent div
     clone.setAttribute('id',new_id);
     
     try {
         var buttonUp = clone.getElementsByTagName('img')[0];
         buttonUp.setAttribute('onclick',"upSubfield('" + new_id + "')");
-       var spans = clone.getElementsByTagName('span');
-       if(spans.length){
-               for(var i = 0 ,lenspans = spans.length ; i < lenspans ; i++){
-                       if(spans[i].getAttribute('class') == 'buttonPlus'){
-                    spans[i].setAttribute('onclick',"CloneSubfield('" + new_id + "')");
-                } else if (spans[i].getAttribute('class') == 'buttonMinus') {
-                    spans[i].setAttribute('onclick',"UnCloneField('" + new_id + "')");
+        var anchors = clone.getElementsByTagName('a');
+        if(anchors.length){
+            for(var i = 0 ,lenanchors = anchors.length ; i < lenanchors ; i++){
+                if(anchors[i].getAttribute('class') == 'buttonPlus'){
+                    anchors[i].setAttribute('onclick',"CloneSubfield('" + new_id + "')");
+                } else if (anchors[i].getAttribute('class') == 'buttonMinus') {
+                    anchors[i].setAttribute('onclick',"UnCloneField('" + new_id + "')");
                 }
             }
         }
@@ -810,8 +810,8 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
                 <!-- TMPL_VAR NAME="marc_value" -->
                 
                 <!-- TMPL_IF NAME="repeatable" -->
-                    <span class="subfield_controls"><a href="#" onclick="CloneSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->'); return false;"><img src="/intranet-tmpl/prog/img/clone-subfield.png" alt="Clone" title="Clone this subfield" /></a>
-                                        <a href="#" onclick="UnCloneField('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->'); return false;"><img src="/intranet-tmpl/prog/img/delete-subfield.png" alt="Delete" title="Delete this subfield" /></a></span>
+                    <span class="subfield_controls"><a href="#" class="buttonPlus" tabindex="1" onclick="CloneSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->'); return false;"><img src="/intranet-tmpl/prog/img/clone-subfield.png" alt="Clone" title="Clone this subfield" /></a>
+                                        <a href="#" class="buttonMinus" tabindex="1" onclick="UnCloneField('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->'); return false;"><img src="/intranet-tmpl/prog/img/delete-subfield.png" alt="Delete" title="Delete this subfield" /></a></span>
                 <!-- /TMPL_IF -->
 
                 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index 0067cef..7701a22 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -225,7 +225,7 @@
                 <xsl:call-template name="chopPunctuation">
                   <xsl:with-param name="chopString">
                     <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">bcg</xsl:with-param>
+                        <xsl:with-param name="codes">abcg</xsl:with-param>
                     </xsl:call-template>
                    </xsl:with-param>
                </xsl:call-template>
@@ -375,7 +375,7 @@
             <xsl:call-template name="chopPunctuation">
                 <xsl:with-param name="chopString">
                     <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">abcdvxyz</xsl:with-param>
+                        <xsl:with-param name="codes">abcdtvxyz</xsl:with-param>
                         <xsl:with-param name="subdivCodes">vxyz</xsl:with-param>
                         <xsl:with-param name="subdivDelimiter">-- </xsl:with-param>
                     </xsl:call-template>

diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
index 3572379..6e97ad1 100755 (executable)
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -245,7 +245,7 @@
                 <xsl:call-template name="chopPunctuation">
                   <xsl:with-param name="chopString">
                     <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">bcg</xsl:with-param>
+                        <xsl:with-param name="codes">abcg</xsl:with-param>
                     </xsl:call-template>
                    </xsl:with-param>
                </xsl:call-template>
@@ -395,7 +395,7 @@
             <xsl:call-template name="chopPunctuation">
                 <xsl:with-param name="chopString">
                     <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">abcdvxyz</xsl:with-param>
+                        <xsl:with-param name="codes">abcdtvxyz</xsl:with-param>
                         <xsl:with-param name="subdivCodes">vxyz</xsl:with-param>
                         <xsl:with-param name="subdivDelimiter">-- </xsl:with-param>
                     </xsl:call-template>

diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
index 65e14e5..88f9cca 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
@@ -866,7 +866,7 @@
     <span class="label">Publisher: </span> 
             <xsl:for-each select="marc:datafield[@tag=260]">
                     <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">bcg</xsl:with-param>
+                        <xsl:with-param name="codes">abcg</xsl:with-param>
                     </xsl:call-template>
             </xsl:for-each>
        </span>

diff --git a/members/member.pl b/members/member.pl
index dde29eb..755a051 100755 (executable)
--- a/members/member.pl
+++ b/members/member.pl
@@ -99,7 +99,7 @@ if ($results){
        $count =scalar(@$results);
 }
 my @resultsdata;
-my $to=($count>$to?$to:$count);
+$to=($count>$to?$to:$count);
 my $index=$from;
 foreach my $borrower(@$results[$from..$to-1]){
   #find out stats

diff --git a/members/memberentry.pl b/members/memberentry.pl
index 6ec6d8e..eacb2ff 100755 (executable)
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -247,7 +247,7 @@ if ($op eq 'save' || $op eq 'insert'){
     }
   }
   
-    if(C4::Context->preference('uppercasesurnames')) {
+    if($newdata{surname} && C4::Context->preference('uppercasesurnames')) {
         $newdata{'surname'} = uc($newdata{'surname'});
     }
 

diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl
index 4de6cdd..2e7b2e4 100755 (executable)
--- a/misc/cronjobs/overdue_notices.pl
+++ b/misc/cronjobs/overdue_notices.pl
@@ -662,10 +662,7 @@ sub parse_letter { # FIXME: this code should probably be moved to C4::Letters:pa
                 $item_format = $1;
             }
             if ($params->{'letter'}->{'content'} =~ m/<fine>(.*)<\/fine>/) { # process any fine tags...
-                no strict; # currency_format behaves badly if we quote the bareword for some reason...
                 my $formatted_fine = currency_format("$1", "$fine", FMT_SYMBOL);
-                use strict;
-                $formatted_fine = Encode::encode("utf8", $formatted_fine);
                 $params->{'letter'}->{'content'} =~ s/<fine>.*<\/fine>/$formatted_fine/;
             }
             $params->{'letter'} = C4::Letters::parseletter( $params->{'letter'}, 'biblio',      $item );

diff --git a/misc/translator/po/de-DE-i-opac-t-prog-v-3002000.po b/misc/translator/po/de-DE-i-opac-t-prog-v-3002000.po
index 032dc31..cd1bdf0 100644 (file)
--- a/misc/translator/po/de-DE-i-opac-t-prog-v-3002000.po
+++ b/misc/translator/po/de-DE-i-opac-t-prog-v-3002000.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Improved German Koha Translation\n"
 "POT-Creation-Date: 2010-06-19 16:16+0200\n"
-"PO-Revision-Date: 2010-09-01 23:43+1300\n"
+"PO-Revision-Date: 2010-09-27 06:45+1300\n"
 "Last-Translator: Katrin <katrin.fischer@bsz-bw.de>\n"
 "Language-Team: Koha Translation Team <koha-translate@lists.koha-"
 "community.org>\n"
@@ -6314,7 +6314,7 @@ msgstr "Kunst-Reproduktion"
 #: /home/katrin/kohaclone/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl:641
 #: /home/katrin/kohaclone/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl:503
 msgid "at"
-msgstr "in"
+msgstr "at"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=branch

diff --git a/misc/translator/po/de-DE-i-staff-t-prog-v-3002000.po b/misc/translator/po/de-DE-i-staff-t-prog-v-3002000.po
index 82057d5..bd92ede 100644 (file)
--- a/misc/translator/po/de-DE-i-staff-t-prog-v-3002000.po
+++ b/misc/translator/po/de-DE-i-staff-t-prog-v-3002000.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: German Koha Translation\n"
 "POT-Creation-Date: 2010-06-19 16:17+0200\n"
-"PO-Revision-Date: 2010-09-02 01:27+1300\n"
+"PO-Revision-Date: 2010-10-04 14:45+1300\n"
 "Last-Translator: Katrin <katrin.fischer@bsz-bw.de>\n"
 "Language-Team: \n"
 "Language: de\n"
@@ -5268,7 +5268,9 @@ msgstr "<a1>Start</a> &rsaquo; <a2>Werkzeuge</a> &rsaquo; <a3>Stapellöschung vo
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl:37
 #, c-format
 msgid "<a1>Home</a> &rsaquo; <a2>Tools</a> &rsaquo; <a3>Batch item modification</a>"
-msgstr "<a1>Start</a> &rsaquo; <a2>Werkzeuge</a> &rsaquo; <a3>Stapellöschung von Exemplaren</a>"
+msgstr ""
+"<a1>Start</a> &rsaquo; <a2>Werkzeuge</a> &rsaquo; <a3>Stapelbearbeitung von "
+"Exemplaren</a>"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tmpl:14
 #, c-format
@@ -6126,7 +6128,10 @@ msgstr "Keines dieser Exemplare kann vorgemerkt werden."
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-home.tmpl:17
 msgid "A label batch is where you take your Layout, Layout Template and merge with the items you wish to create the labels for."
-msgstr "Eine Etiketten-Beschickung ist der Ort, wo Sie Ihr Layout, Ihr Layout Template nehmen und es mit den Exemplaren vebinden, für die sie Etiketten kreiern wollen."
+msgstr ""
+"Eine Etiketten-Beschickung ist der Ort, wo Sie Ihr Layout, Ihr Layout "
+"Template nehmen und es mit den Exemplaren vebinden, für die sie Etiketten "
+"erstellen wollen."
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-layout.tmpl:5
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/manage.tmpl:15
@@ -6821,7 +6826,7 @@ msgstr "Etat hinzufügen"
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tmpl:93
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl:70
 msgid "Add checked"
-msgstr "Hinzufügung überprüft"
+msgstr "Markierte hinzufügen"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc:127
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc:110
@@ -7700,32 +7705,32 @@ msgstr "Antoine Farnault"
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tmpl:8
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tmpl:14
 msgid "Any"
-msgstr "Beliebig"
+msgstr "Alle"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl:80
 msgid "Any Branch"
-msgstr "Beliebige Bibliothek"
+msgstr "Alle Bibliotheken"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl:55
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:201
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:209
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl:58
 msgid "Any Category code"
-msgstr "Beliebiger Kategoriecode"
+msgstr "Alle Benutzertypen"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:100
 msgid "Any Document type"
-msgstr "Beliebiger Dokumententyp:"
+msgstr "Alle Dokumententypen"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:93
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl:188
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:196
 msgid "Any Library"
-msgstr "Beliebige Bibliothek"
+msgstr "Alle Bibliotheken"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl:285
 msgid "Any Phrase"
-msgstr "Beliebiger Satz"
+msgstr "Beliebige Wortfolge"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl:70
 msgid "Any Vendor"
@@ -8434,7 +8439,7 @@ msgstr "verfügbar seit"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:20
 msgid "Average Checkout Period"
-msgstr "durchschnittliche Ausleihfrist"
+msgstr "Durchschnittliche Leihdauer"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:65
 msgid "Average checkout period statistics"
@@ -9262,7 +9267,9 @@ msgstr "Indem man die Priorität hoch oder runter setzt, kann ein Benutzer auf d
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/acquisitions_stats.tmpl:11
 msgid "By changing the report from 'Count items' to 'Amount' you will see the total spent"
-msgstr "Indem Sie den Report von 'Exemplare zählen' auf 'Betrag' ändern, sehen Sie die Gesamtausgaben."
+msgstr ""
+"Indem Sie den Report von 'Anzahl Exemplare' auf 'Betrag' ändern, sehen Sie "
+"die Gesamtausgaben."
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tmpl:22
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tmpl:7
@@ -10107,14 +10114,14 @@ msgstr "Benutzerpasswort ändern"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl:9
 msgid "Change Username and/or Password"
-msgstr "Username und/oder Passwort ändern"
+msgstr "Benutzername und/oder Passwort ändern"
 
 #. %1$s: TMPL_VAR name=firstname
 #. %2$s: TMPL_VAR name=surname
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl:40
 #, c-format
 msgid "Change Username and/or Password for %s %s"
-msgstr "Username und/oder Passwort ändern für %s %s"
+msgstr "Benutzername und/oder Passwort ändern für %s %s"
 
 #. INPUT type=submit
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:177
@@ -10411,7 +10418,7 @@ msgstr "Ausgeliehen von"
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:398
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl:36
 msgid "Checked out on"
-msgstr "Ausgeliehen am"
+msgstr "Ausleihdatum"
 
 #. %1$s: TMPL_VAR name=cardnumber
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl:17
@@ -11016,7 +11023,7 @@ msgstr "Ausleihe:"
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl:18
 #, c-format
 msgid "Circulation: Overdues at %s"
-msgstr "Ausleihe: Überfällige Medien am %s"
+msgstr "Ausleihe: Überfällige Ausleihen am %s"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl:44
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl:265
@@ -12201,7 +12208,7 @@ msgstr "Inhalte:"
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tmpl:57
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl:43
 msgid "Continue"
-msgstr "Fortfahren"
+msgstr "Weiter"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tmpl:25
 msgid "Continue adding 'field's and clicking '&gt;&gt;' to insert them into the notice until your message is completed."
@@ -12452,7 +12459,7 @@ msgstr "Anzahl"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:282
 msgid "Count items"
-msgstr "Exemplare zählen"
+msgstr "Anzahl Exemplare"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl:45
 msgid "Count of Checkouts"
@@ -12460,11 +12467,11 @@ msgstr "Zahl der Ausleihen"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:277
 msgid "Count total items"
-msgstr "Medien zählen"
+msgstr "Anzahl Exemplare"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl:278
 msgid "Count unique items"
-msgstr "Medien zählen"
+msgstr "Anzahl Exemplare"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl:114
 msgid "Country"
@@ -14977,7 +14984,7 @@ msgstr "Geben Sie einen 'Sortierregelcode' ein"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tmpl:12
 msgid "Enter a 'Message Subject' (for example 'Item Overdue')"
-msgstr "Geben Sie ein 'Nachrichten Thema' ein (zum Beispiel 'Überfällige Medien')"
+msgstr "Geben Sie einen Betreff ein (zum Beispiel 'Überfällige Medien')"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/help/virtualshelves/shelves.tmpl:25
 msgid "Enter a 'Name' for your list in the field provided"
@@ -16232,7 +16239,7 @@ msgstr "Für:"
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:670
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl:426
 msgid "Forgive fines on return:"
-msgstr "Gebühren bei Rückgabe erlassen:"
+msgstr "Gebührenerlass bei Rückgabe:"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl:344
 msgid "Forgive overdue charges"
@@ -17326,13 +17333,13 @@ msgstr "Vormerkung, die Transfer benötigt, gefunden: <a1>%s</a>"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:158
 msgid "Hold placed by :"
-msgstr "Vorgemerkt durch:"
+msgstr "Vormerkung:"
 
 #. %1$s: TMPL_VAR name=reservedate
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:557
 #, c-format
 msgid "Hold placed on %s."
-msgstr "Vorgemerkt durch %s."
+msgstr "Vormerkung am %s."
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tmpl:34
 msgid "Hold priority can be altered by viewing the holds for the title"
@@ -17909,7 +17916,7 @@ msgstr "EXEMPLARE"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:525
 msgid "ITEMS OVERDUE"
-msgstr "ÜBERFÄLLIGE MEDIEN"
+msgstr "ÜBERFÄLLIGE AUSLEIHEN"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl:209
 msgid "Ian Walls"
@@ -18956,7 +18963,7 @@ msgstr "Exemplar zugesendet:"
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tmpl:158
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl:30
 msgid "Item Count"
-msgstr "Exemplar Zählen"
+msgstr "Anzahl Exemplare"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:64
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tmpl:16
@@ -19321,7 +19328,7 @@ msgstr "Jo Ransom"
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl:153
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl:164
 msgid "Job progress:"
-msgstr "Auftrag Fortschritt: "
+msgstr "Fortschritt:"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tmpl:72
 msgid "Jobs already entered"
@@ -19989,7 +19996,7 @@ msgstr "Koha &rsaquo; Reports"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl:2
 msgid "Koha &rsaquo; Reports &rsaquo; Average checkout period"
-msgstr "Koha &rsaquo; Reports &rsaquo; Durchschnittliche Ausleihfrist"
+msgstr "Koha &rsaquo; Reports &rsaquo; Durchschnittliche Leihdauer"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl:2
 msgid "Koha &rsaquo; Reports &rsaquo; Checkouts by patron category"
@@ -25658,7 +25665,7 @@ msgstr "Andere.."
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:286
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl:111
 msgid "Output"
-msgstr "Output"
+msgstr "Ausgabe"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tmpl:58
 msgid "Output Format:"
@@ -26307,7 +26314,7 @@ msgstr "Benutzer"
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/cleanborrowers.tmpl:3
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl:44
 msgid "Patrons (anonymize, bulk-delete)"
-msgstr "Benutzer (anonymisieren, löschen)"
+msgstr "Benutzer anonymisieren / löschen"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tmpl:16
 msgid "Patrons and Circulation"
@@ -26685,7 +26692,7 @@ msgstr "Bestellt am"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl:67
 msgid "Placed on"
-msgstr "Plaziert auf"
+msgstr "Bestellt am"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc:16
 msgid "Places"
@@ -28422,7 +28429,7 @@ msgstr "Wiederherstellen"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl:312
 msgid "Restrict access to:"
-msgstr "Zugang einschränken auf:"
+msgstr "Zugang beschränken auf:"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl:522
 msgid "Restricted:"
@@ -31296,7 +31303,7 @@ msgstr "Abonnement ist abgelaufen"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl:1085
 msgid "Subscription history"
-msgstr "Abonnementsverlauf"
+msgstr "Abonnementverlauf"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl:36
 msgid "Subscription id"
@@ -32634,7 +32641,11 @@ msgstr "Das Standardminimum der Passwortlänge ist 3 Zeichen. Um diesen Wert zu
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl:41
 #, c-format
 msgid "The developers of the Label Creator module hope you will find this an extremely useful tool in the course of your cataloging work. You are encouraged to submit any enhancement requests as well as any bugs via <a1>Koha Project Bugzilla</a>."
-msgstr "Die Entwickler des Etikettenmoduls hoffen, dass Sie dieses Werkzeug für die Arbeit in der Katalogisierung nützlich finden. Bitte teilen Sie uns Verbesserungswünsche und Fehler über <a1>Bugtracking-System des Koha Projekts</a1> mit."
+msgstr ""
+"Die Entwickler des Etikettenmoduls hoffen, dass Sie dieses Werkzeug für die "
+"Arbeit in der Katalogisierung nützlich finden. Bitte teilen Sie uns "
+"Verbesserungswünsche und Fehler über das <a1>Bugtracking-System des Koha "
+"Projekts</a1> mit."
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/home.tmpl:15
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tmpl:36
@@ -33594,7 +33605,9 @@ msgstr "Mit diesem Werkzeug definieren Sie Mahntrigger für Mahnbenachrichtigung
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/batchMod.tmpl:18
 msgid "This tool will allow you to delete a batch of item records from Koha."
-msgstr "Dieses Werkzeug ermöglicht Ihnen die stapelweise Lösung von Exemplaren aus Koha."
+msgstr ""
+"Dieses Werkzeug ermöglicht Ihnen die stapelweise Löschung von Exemplaren aus "
+"Koha."
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tmpl:5
 msgid "This tool will allow you to map MARC fields to a set of predefined keywords."
@@ -33883,7 +33896,7 @@ msgstr "An"
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl:195
 #, c-format
 msgid "To %S"
-msgstr "An %S"
+msgstr "Bis %S"
 
 #. INPUT type=submit name=submit
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tmpl:45
@@ -35110,7 +35123,7 @@ msgstr "Eindeutige Kennung:"
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl:184
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl:70
 msgid "Unit cost"
-msgstr "Kosten/Einheit"
+msgstr "Kosten/Exemplare"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detailprint.tmpl:25
 msgid "Unititle:"
@@ -38295,7 +38308,7 @@ msgstr "as- Platzkarte"
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl:289
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl:448
 msgid "at"
-msgstr "in"
+msgstr "at"
 
 #. %1$s: TMPL_VAR name=branch
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl:74
@@ -39898,7 +39911,7 @@ msgstr "konnte nicht durchsucht werden!"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl:23
 msgid "count"
-msgstr "zählen"
+msgstr "Anzahl"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128a.tmpl:107
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128a.tmpl:109
@@ -40406,7 +40419,7 @@ msgstr "Lösche %s %s"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tmpl:32
 msgid "deletion"
-msgstr "Löschung"
+msgstr "löschen"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl:97
 msgid "des sous-titres,"
@@ -43957,7 +43970,7 @@ msgstr "modern"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tmpl:32
 msgid "modification"
-msgstr "Ã\84nderung"
+msgstr "ändern"
 
 #: /home/katrin/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl:104
 msgid "modify"

diff --git a/misc/translator/po/de-DE-pref.po b/misc/translator/po/de-DE-pref.po
index 53aad8b..bb57b7b 100644 (file)
--- a/misc/translator/po/de-DE-pref.po
+++ b/misc/translator/po/de-DE-pref.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-23 19:35+1300\n"
-"PO-Revision-Date: 2010-07-28 21:11+1300\n"
+"PO-Revision-Date: 2010-09-10 02:17+1300\n"
 "Last-Translator: Katrin <katrin.fischer@bsz-bw.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: de\n"
@@ -102,15 +102,15 @@ msgstr "Informationen für Debugging wenn ein interner Fehler auftritt"
 
 # Administration > Interface options
 msgid "admin.pref#DebugLevel# lots of"
-msgstr "Viele"
+msgstr "viele"
 
 # Administration > Interface options
 msgid "admin.pref#DebugLevel# no"
-msgstr "Keine"
+msgstr "keine"
 
 # Administration > Interface options
 msgid "admin.pref#DebugLevel# some"
-msgstr "Einige"
+msgstr "einige"
 
 # Administration > Login options
 msgid "admin.pref#IndependantBranches# Don't prevent"
@@ -130,7 +130,10 @@ msgstr "Verwende"
 
 # Administration > Interface options
 msgid "admin.pref#KohaAdminEmailAddress# as the email address for the administrator of Koha. (This is the default From: address for emails unless there is one for the particular branch, and is referred to when an internal error occurs.)"
-msgstr "als Email-Adresse für den Koha-Administrator. (Das ist der Stanard-Absender, der in Emails verwendet wird, wenn keine andere Adresse für die Bibliothek definiert wurde und wenn ein interner Fehler auftritt.)"
+msgstr ""
+"als Email-Adresse für den Koha-Administrator. (Das ist die Absendeadresse, "
+"die für Emails verwendet wird, wenn keine andere Adresse für die Bibliothek "
+"definiert wurde oder ein interner Fehler auftritt.)"
 
 # Administration > Login options
 msgid "admin.pref#SessionStorage# Store login session information"
@@ -600,7 +603,9 @@ msgstr "Erlaube nicht"
 
 # Circulation > Holds Policy
 msgid "circulation.pref#AllowHoldPolicyOverride# staff to override hold policies when placing holds."
-msgstr "dass Mitarbeiter beim vormerken Vormerkbeschränkungen übergehen können."
+msgstr ""
+", dass Mitarbeiter die Vormerkbeschränkungen beim Setzen von Vormerken "
+"übergehen können."
 
 # Circulation > Holds Policy
 msgid "circulation.pref#AllowHoldsOnDamagedItems# Allow"
@@ -648,7 +653,10 @@ msgstr "Erlaube nicht,"
 
 # Circulation > Checkout Policy
 msgid "circulation.pref#AllowRenewalLimitOverride# staff to manually override the renewal limit and renew a checkout when it would go over the renewal limit."
-msgstr "dass Mitarbeiter Verlängerungsbeschränkungen manuell übergehen und eine Ausleihe verlängern, wenn dabei die maximale Anzahl an Verlängerungen überschritten wird."
+msgstr ""
+"dass Mitarbeiter Verlängerungsbeschränkungen manuell übergehen und eine "
+"Ausleihe verlängern, auch wenn dabei die maximale Anzahl an Verlängerungen "
+"überschritten wird."
 
 # Circulation > Self Checkout
 msgid "circulation.pref#AutoSelfCheckAllowed# ."

diff --git a/misc/translator/po/en-NZ-i-staff-t-prog-v-3002000.po b/misc/translator/po/en-NZ-i-staff-t-prog-v-3002000.po
index 624adfc..f9cdd56 100644 (file)
--- a/misc/translator/po/en-NZ-i-staff-t-prog-v-3002000.po
+++ b/misc/translator/po/en-NZ-i-staff-t-prog-v-3002000.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Koha 3.2.0\n"
 "Report-Msgid-Bugs-To: koha-translate@lists.koha-community.org\n"
 "POT-Creation-Date: 2010-07-29 11:24+1200\n"
-"PO-Revision-Date: 2010-09-01 12:07+1300\n"
+"PO-Revision-Date: 2010-09-15 14:10+1300\n"
 "Last-Translator: Chris <chris@bigballofwax.co.nz>\n"
 "Language-Team: en_NZ <koha-translate@lists.koha-community.org>\n"
 "Language: en_NZ\n"
@@ -8784,7 +8784,7 @@ msgstr "Are you sure you want to remove the selected items?"
 #: /home/chris/git/koha.git/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc:111
 #: /home/chris/git/koha.git/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc:95
 msgid "Are you sure you want to renew this patron\\'s registration?"
-msgstr "Are you sure you want to renew this member'sregistration?"
+msgstr "Are you sure you want to renew this member\\'s registration?"
 
 #. SCRIPT
 #: /home/chris/git/koha.git/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl:49

diff --git a/misc/translator/po/es-ES-i-opac-t-prog-v-3002000.po b/misc/translator/po/es-ES-i-opac-t-prog-v-3002000.po
index f5b6c6b..432f117 100644 (file)
--- a/misc/translator/po/es-ES-i-opac-t-prog-v-3002000.po
+++ b/misc/translator/po/es-ES-i-opac-t-prog-v-3002000.po
@@ -3437,7 +3437,7 @@ msgid ""
 "attached file is a MARC biblographic records file which can be imported into "
 "a Personal Bibliographic Software like EndNote, Reference Manager or ProCite."
 msgstr ""
-"Hola, %s % le ha enviado esta bolsa desde nuestro catálogo en linea. Por "
+"Hola, %s %s ha enviado esta bolsa desde nuestro catálogo en linea. Por "
 "favor note que el archivo adjunto es un archivo de registros bibliográficos "
 "MARC que puede ser importado en un software bibliográfico personal como "
 "EndNote, Reference Manager o ProCite."

diff --git a/misc/translator/po/uk-UA-pref.po b/misc/translator/po/uk-UA-pref.po
index 06a8c76..d1b0ac3 100644 (file)
--- a/misc/translator/po/uk-UA-pref.po
+++ b/misc/translator/po/uk-UA-pref.po
@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-07-14 20:01+1300\n"
-"PO-Revision-Date: 2010-07-20 10:32+1300\n"
-"Last-Translator: folcklord <folcklord@writeme.com>\n"
+"PO-Revision-Date: 2010-08-03 18:52+1300\n"
+"Last-Translator: Serhij Dubyk / Сергій Дубик <serhijdubyk@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
@@ -14,19 +14,11 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.0.3\n"
 
-# MgrATG  <a href="http://ncelzjujpjbj.com/">ncelzjujpjbj</a>, [url=http://idbgnsgtpzrr.com/]idbgnsgtpzrr[/url], [link=http://bhlpspznqbln.com/]bhlpspznqbln[/link], http://rooonfovvagl.com/
 msgid "acquisitions.pref Policy"
 msgstr ""
-"MgrATG  <a href=\"http://ncelzjujpjbj.com/\">ncelzjujpjbj</a>, "
-"[url=http://idbgnsgtpzrr.com/]idbgnsgtpzrr[/url], "
-"[link=http://bhlpspznqbln.com/]bhlpspznqbln[/link], http://rooonfovvagl.com/"
 
-# Ghzx2f  <a href="http://srxrsutykkaq.com/">srxrsutykkaq</a>, [url=http://hnolqbjhpsgf.com/]hnolqbjhpsgf[/url], [link=http://aqljnxpinori.com/]aqljnxpinori[/link], http://tjxteadhvzwn.com/
 msgid "acquisitions.pref Printing"
 msgstr ""
-"Ghzx2f  <a href=\"http://srxrsutykkaq.com/\">srxrsutykkaq</a>, "
-"[url=http://hnolqbjhpsgf.com/]hnolqbjhpsgf[/url], "
-"[link=http://aqljnxpinori.com/]aqljnxpinori[/link], http://tjxteadhvzwn.com/"
 
 # Acquisitions > Policy
 msgid "acquisitions.pref#AcqCreateItem# Create an item when"

diff --git a/offline_circ/process_koc.pl b/offline_circ/process_koc.pl
index a187722..7da7c9d 100755 (executable)
--- a/offline_circ/process_koc.pl
+++ b/offline_circ/process_koc.pl
@@ -176,6 +176,7 @@ returns a hashref containing the information from the header.
 sub parse_header_line {
     my $header_line = shift;
     chomp($header_line);
+    $header_line =~ s/\r//g;
 
     my @fields = split( /\t/, $header_line );
     my %header_info = map { split( /=/, $_ ) } @fields;
@@ -189,7 +190,8 @@ sub parse_header_line {
 sub parse_command_line {
     my $command_line = shift;
     chomp($command_line);
-
+    $command_line =~ s/\r//g;
+    
     my ( $timestamp, $command, @args ) = split( /\t/, $command_line );
     my ( $date,      $time,    $id )   = split( /\s/, $timestamp );
 
@@ -248,11 +250,11 @@ sub kocIssueItem {
   my ( $year, $month, $day ) = split( /-/, $circ->{'date'} );
   ( $year, $month, $day ) = Add_Delta_Days( $year, $month, $day, $issuelength );
   my $date_due = sprintf("%04d-%02d-%02d", $year, $month, $day);
-  
+
   if ( $issue->{ 'date_due' } ) { ## Item is currently checked out to another person.
 #warn "Item Currently Issued.";
     my $issue = GetOpenIssue( $item->{'itemnumber'} );
-
+    
     if ( $issue->{'borrowernumber'} eq $borrower->{'borrowernumber'} ) { ## Issued to this person already, renew it.
 #warn "Item issued to this member already, renewing.";
     

diff --git a/patroncards/create-pdf.pl b/patroncards/create-pdf.pl
index 5604f17..f063e9b 100755 (executable)
--- a/patroncards/create-pdf.pl
+++ b/patroncards/create-pdf.pl
@@ -141,13 +141,13 @@ foreach my $item (@{$items}) {
                 elsif ($images->{$_}->{'data_source'}->[0]->{'image_source'} eq 'creator_images') {
                     my $dbh = C4::Context->dbh();
                     $dbh->{LongReadLen} = 1000000;      # allows us to read approx 1MB
-                    $image_data = $dbh->selectrow_hashref("SELECT imagefile FROM creator_images WHERE image_name = \'$$layout_xml{'images'}{$_}{'data_source'}{'image_name'}\'");
+                    $image_data = $dbh->selectrow_hashref("SELECT imagefile FROM creator_images WHERE image_name = \'$images->{$_}->{'data_source'}->[0]->{'image_name'}\'");
                     warn sprintf('Database returned the following error: %s.', $error) if $error;
-                    warn sprintf('Image does not exists in db table %s.', $$layout_xml{'images'}{$_}{'data_source'}{'image_source'}) if !$image_data;
+                    warn sprintf('Image does not exists in db table %s.', $images->{$_}->{'data_source'}->[0]->{'image_name'}) if !$image_data;
                     next PROCESS_IMAGES if !$image_data;
                 }
                 else {
-                    warn sprintf('No retrieval method for image source %s.', $$layout_xml{'images'}{$_}{'data_source'}{'image_source'});
+                    warn sprintf('No retrieval method for image source %s.', $images->{$_}->{'data_source'}->[0]->{'image_source'});
                     next PROCESS_IMAGES;
                 }
             }

diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl
index d8c0ea3..143cf88 100755 (executable)
--- a/serials/subscription-add.pl
+++ b/serials/subscription-add.pl
@@ -85,7 +85,9 @@ if ($op eq 'mod' || $op eq 'dup' || $op eq 'modsubscription') {
             $subs->{$_} = format_date($subs->{$_});
         }
          }
-    $subs->{'letter'}='' unless($subs->{'letter'});
+      if (!defined $subs->{letter}) {
+          $subs->{letter}= q{};
+      }
     letter_loop($subs->{'letter'}, $template);
     $nextexpected = GetNextExpected($subscriptionid);
     $nextexpected->{'isfirstissue'} = $nextexpected->{planneddate}->output('iso') eq $firstissuedate ;
@@ -131,10 +133,11 @@ for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{b
 $template->param(branchloop => $branchloop,
     DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
 );
-my $count = 0;
 # prepare template variables common to all $op conditions:
-$template->param(  'dateformat_' . C4::Context->preference('dateformat') => 1 ,
-                );
+$template->param(  'dateformat_' . C4::Context->preference('dateformat') => 1 );
+if ($op!~/^mod/) {
+    letter_loop(q{}, $template);
+}
 
 if ($op eq 'addsubscription') {
     redirect_add_subscription();
@@ -151,10 +154,8 @@ if ($op eq 'addsubscription') {
            }
            push( @sub_type_data, \%row );
         }
-    $template->param(subtype => \@sub_type_data,
-       );
+    $template->param(subtype => \@sub_type_data);
 
-    letter_loop('', $template);
 
     my $new_biblionumber = $query->param('biblionumber_for_new_subscription');
     if (defined $new_biblionumber) {
@@ -170,16 +171,15 @@ if ($op eq 'addsubscription') {
 sub letter_loop {
     my ($selected_letter, $templte) = @_;
     my $letters = GetLetters('serial');
-    my @letterloop;
-    foreach my $thisletter (keys %$letters) {
-        my $selected = $thisletter eq $selected_letter ? 1 : 0;
-        push @letterloop, {
+    my $letterloop;
+    foreach my $thisletter (keys %{$letters}) {
+        push @{$letterloop}, {
             value => $thisletter,
-            selected => $selected,
+            selected => $thisletter eq $selected_letter,
             lettername => $letters->{$thisletter},
         };
     }
-    $templte->param(letterloop => \@letterloop) if @letterloop;
+    $templte->param(letterloop => $letterloop);
     return;
 }
 

diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index f5138d1..5271d81 100755 (executable)
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -82,7 +82,6 @@ my @not_deleted;           # List of the itemnumbers that could not be deleted
 
 my %cookies = parse CGI::Cookie($cookie);
 my $sessionID = $cookies{'CGISESSID'}->value;
-my $dbh = C4::Context->dbh;
 
 
 #--- ----------------------------------------------------------------------------
@@ -492,7 +491,7 @@ sub BuildItemsData{
 # Where subfield is not repeated
 # And where we are sure that field should correspond
 # And $tag>10
-sub UpdateMarcWith($$){
+sub UpdateMarcWith {
   my ($marcfrom,$marcto)=@_;
   #warn "FROM :",$marcfrom->as_formatted;
        my (  $itemtag,   $itemtagsubfield) = &GetMarcFromKohaField("items.itemnumber", "");