From: Paul Poulain <paul.poulain@biblibre.com>
Date: Fri, 6 Jan 2012 09:52:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/new/bug_6328'
X-Git-Tag: v3.08.00~696
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=236747534115e35975de8d51554e6e87f4248462;p=srvgit

Merge remote-tracking branch 'origin/new/bug_6328'

Conflicts:
	kohaversion.pl
---

236747534115e35975de8d51554e6e87f4248462
diff --cc installer/data/mysql/updatedatabase.pl
index 67708fa36e,e901a58534..3ff4ba3980
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@@ -4564,10 -4564,10 +4564,10 @@@ if ( C4::Context->preference("Version"
      SetVersion($DBversion);
  }
  
- $DBversion = "3.06.00.002";
+ $DBversion = "3.07.00.002";
  if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
      $dbh->do("UPDATE borrowers SET debarred=NULL WHERE debarred='0000-00-00';");
 -    print "Setting NULL to debarred where 0000-00-00 is stored (bug 7272)";
 +    print "Setting NULL to debarred where 0000-00-00 is stored (bug 7272)\n";
      SetVersion($DBversion);
  }