Merge branch 'master' of git://git.koha-community.org/koha

admin/aqplan.pl

@@ -50,7 +50,7 @@ my ( $template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user
         type            => "intranet",
         authnotrequired => 0,
         flagsrequired   => { acquisition => 'planning_manage' },
-        debug           => 1,
+        debug           => 0,
     }
 );
 
@@ -455,6 +455,8 @@ output_html_with_http_headers $input, $cookie, $template->output;
 sub _print_to_csv {
     my ( $header, $results ) = @_;
 
+    binmode STDOUT, ":utf8";
+
     my $csv = Text::CSV_XS->new(
         {   sep_char     => $del,
             always_quote => 'TRUE',
@@ -477,7 +479,8 @@ sub _print_to_csv {
     print "$str\n";
 
     foreach my $row (@$results) {
-        my @col = ( $row->{'budget_name'}, $row->{'budget_amount'} );
+        $row->{'budget_name_indent'} =~ s/ / /g;
+        my @col = ( $row->{'budget_name_indent'}, $row->{'budget_amount'} );
         my $l = $row->{'lines'};
         foreach my $line (@$l) {
             push @col, $line->{'estimated_amount'};

debian/build-git-snapshot

@@ -30,11 +30,12 @@ latest_sha1() {
 }
 
 newversion() {
-    printf '3.2.git%s.%s' $(date +%Y%m%d%H%M%S) $(latest_sha1)
+    printf '3.2~git%s.%s' $(date +%Y%m%d%H%M%S) $(latest_sha1)
 }
 
 adjust_debian_changelog() {
-    dch -v "$1-1" "Building git snapshot."
+    dch --force-distribution -D squeeze-dev -v "$1" \
+        "Building git snapshot."
     dch -r "Building git snapshot."
 }
 
@@ -44,7 +45,7 @@ reset_debian_changelog() {
 
 build_package() {
     git archive --format=tar --prefix="koha-$1/" HEAD | 
-        gzip -9 > "../koha_$1.orig.tar.gz"
+        gzip -9 > "../koha_$1.tar.gz"
     debuild -us -uc
 }
 

debian/control

@@ -69,6 +69,7 @@ Package: koha-common
 Architecture: all
 Depends: ${shlib:Depends}, ${misc:Depends}, ${koha:Depends},
  apache2,
+ apache2-mpm-itk,
  at,
  daemon,
  idzebra-2.0,

debian/koha-common.README.Debian

@@ -1,3 +1,31 @@
+Post-installation configuration
+===============================
+
+You will want to consider doing the following after installing this
+package:
+
+* Install mysql-server, for a local database.
+
+* Alternatively, set up a connection to a remote MySQL server:
+  - rm /etc/mysql/koha-common.cnf
+  - $EDITOR /etc/mysql/koha-common.cnf
+
+        [client]
+        host = some.other.host
+        user = mysqlusername
+        password = mysqlpassword
+        
+* Enable the rewrite module: a2enmod rewrite
+
+* Listen on port 8080: $EDITOR /etc/apache2/ports.conf
+
+* Alternatively, configure koha-create, using /etc/koha/koha-sites.conf
+  (see /usr/sbin/koha-create for which variables to set).
+  
+* After that, you can create a new Koha instance:
+  - koha-create --create-db name
+
+
 Koha filesystem layout on Debian
 ================================
 

debian/koha.README.Debian

@@ -23,14 +23,20 @@ following:
 * Restart Apache.
   - sudo service apache2 restart
 
-The latter two steps can be done by running the koha-post-install-setup
+The latter three steps can be done by running the koha-post-install-setup
 script.
 
 Then access the following URL:
 
     http://localhost:8080/
 
-Alternatively, any other name, IP address, and interface will work, too.
+Alternatively, any other name, IP address, and interface will work, too,
+although will probably need to configure /etc/apache2/ports.conf to 
+have the following line:
+
+    NameVirtualHost *:8080
+    
+(You'll need to restart apache2 afterwards: /etc/init.d/apache2 restart.)
 
 This should bring up the Koha intranet administration screen, which will
 let you log in. The username is koha, the password is in the

koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc

@@ -1,4 +1,4 @@
-<div id="toolbar">
+<div id="toolbar">
 	<script type="text/javascript">
 	//<![CDATA[
 
@@ -10,7 +10,7 @@ function confirm_deletion() {
 }
 function confirm_updatechild() {
     var is_confirmed = window.confirm(_('Are you sure you want to update this child to an Adult category?  This cannot be undone.'));
-   
+
     if (is_confirmed) {
             window.location='/cgi-bin/koha/members/update-child.pl?op=update&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&catcode=<!-- TMPL_VAR NAME="catcode" -->&catcode_multi=<!-- TMPL_VAR NAME="CATCODE_MULTI" -->';
     }
@@ -54,7 +54,7 @@ function update_child() {
 	        { text: _("Print Slip"), onclick: {fn: function(){printx_window("slip")}} },
 	        { text: _("Quick Slip"), onclick: {fn: function(){printx_window("qslip")}} }
 	    ];
-	
+
 		var moremenu = [
 			{ text: _("Renew Patron"),  onclick: { fn: confirm_reregistration } },
 			{ text: _("Set Permissions"), url: "/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->"<!-- TMPL_UNLESS NAME="CAN_user_permissions" -->, disabled: true<!-- /TMPL_UNLESS -->},
@@ -68,8 +68,8 @@ function update_child() {
 	        name: "printmenubutton",
 	        menu: printmenu,
 	        container: "printmenuc"
-	    });   
-	
+	    });
+
 	    new YAHOO.widget.Button({
 	        type: "menu",
 	        label: _("More"),
@@ -84,7 +84,7 @@ function update_child() {
 	    new YAHOO.widget.Button("changepassword");
 	    new YAHOO.widget.Button("printslip");
 		new YAHOO.widget.Button("printpage");
-	    new YAHOO.widget.Button("renewpatron");		 
+	    new YAHOO.widget.Button("renewpatron");
 		new YAHOO.widget.Button("patronflags");
 		new YAHOO.widget.Button("deletepatron");
 		new YAHOO.widget.Button("updatechild");

koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl

@@ -79,7 +79,7 @@
 						</div>
 						<!-- TMPL_ELSE -->
 						<!-- TMPL_IF NAME="searching" -->
-						No results found
+						<div class="dialog alert">No results found</div>
 						<!-- /TMPL_IF -->
 						<!-- /TMPL_IF -->
 

members/memberentry.pl

@@ -335,7 +335,10 @@ if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){
 			delete $newdata{'password'};
 			delete $newdata{'userid'};
 		}
-		&ModMember(%newdata);
+		&ModMember(%newdata) unless scalar(keys %newdata) <= 1; # bug 4508 - avoid crash if we're not
+                                                                # updating any columns in the borrowers table,
+                                                                # which can happen if we're only editing the
+                                                                # patron attributes or messaging preferences sections
         if (C4::Context->preference('ExtendedPatronAttributes') and $input->param('setting_extended_patron_attributes')) {
             C4::Members::Attributes::SetBorrowerAttributes($borrowernumber, $extended_patron_attributes);
         }