diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
index 5c1ee465c6..88815a01f9 100644
--- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
@@ -213,3 +213,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('MergeAuthoritiesOnUpdate', '0', 'Si Activé, met à jour toutes les notices bibliographiques afférentes dès la modification d''une autorité',NULL,'YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowNotForLoanOverride', '0', 'Si activé, permet au bibliothécaire de choisir de prêter tout de même un exemplaire normalement exclu du prêt',NULL,'YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('RenewalPeriodBase', 'date_due', 'Permet de déterminer si la période de renouvellement doit être calculée sur la date de retour ou sur le jour du renouvellement','date_due|now','Choice');
+
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 3fa1ff863f..5b78ad5da9 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -2035,6 +2035,13 @@ if ( C4::Context->preference('Version') < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.00.04.003";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowRenewalLimitOverride', '0', 'if ON, allows renewal limits to be overridden on the circulation screen',NULL,'YesNo')");
+    print "Upgrade to $DBversion done (add new syspref)\n";
+    SetVersion ($DBversion);
+}
+
 =item DropAllForeignKeys($table)
 
   Drop all foreign keys of the table $table
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index ff7d1a1c94..251852425b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -765,13 +765,11 @@ fieldset.rows .inputnote {
 	background-color : #FFFF99;
 }
 .content_hidden {
-    visibility:hidden; /* you propably don't need to change this one */
     display:none;
 }
 
 /* the property for the displayed tab */
 .content_visible {
-    visibility:visible; /* you propably don't need to change this one */
     display:block;
 }
 #newbiblio a, #addchild a, #newentry a, #newshelf a, #newmenuc .first-child, #newsupplier .first-child, #newlabel a, #newtemplate a, #newlabelbatch a, #newpatroncardbatch a, #newprofile a, #newsubscription a, #newdictionary a, #neworder a {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index e74ef12d57..8bcf61b1cb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -10,22 +10,22 @@
 <script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
 $.tablesorter.addParser({
-    id: 'articles', 
-    is: function(s) {return false;  }, 
-    format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); }, 
-    type: 'text' 
+    id: 'articles',
+    is: function(s) {return false;  },
+    format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); },
+    type: 'text'
 });
 <!-- TMPL_UNLESS NAME="borrowernumber" --><!-- TMPL_UNLESS NAME="CGIselectborrower" -->window.onload=function(){ $('#findborrower').focus(); };<!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS -->
 	 $(document).ready(function() {
  		$('#patronlists > ul').tabs();
-		$.tablesorter.defaults.widgets = ['zebra']; 
+		$.tablesorter.defaults.widgets = ['zebra'];
 		$("#issuest").tablesorter({<!-- TMPL_IF EXPR="dateformat eq 'metric'" -->
 		dateFormat: 'uk',<!-- /TMPL_IF -->
 		headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false}}
 		});
 		$("#issuest").bind("sortEnd",function() {
         	$("#previous").parents("tr").remove();  // 'previous checkouts' header chokes table sorter
-	    }); 
+	    });
 		$("#holdst").tablesorter({<!-- TMPL_IF EXPR="dateformat eq 'metric'" -->
 		dateFormat: 'uk',<!-- /TMPL_IF -->
 			sortList: [[0,0]],
@@ -41,13 +41,6 @@ $.tablesorter.addParser({
             }
         } ).attr( 'checked', false );
         <!-- /TMPL_IF -->
-		$("td").click(function(e){
-			if(e.target.tagName.toLowerCase() == 'td'){
-            $(this).find("input:checkbox").each( function() {
-                $(this).attr('checked', !$(this).attr('checked'));
-            });
-			}
-		});
 	 });
 //]]>
 </script>
@@ -63,13 +56,13 @@ $.tablesorter.addParser({
 
 <!-- TMPL_IF NAME="CGIselectborrower" -->
 <div id="doc" class="yui-t7">
-   
+
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-g">
 <!-- TMPL_ELSE -->
 <div id="doc3" class="yui-t2">
-   
+
    <div id="bd">
 <!-- TMPL_IF NAME="borrowernumber" --><div class="yui-b"><!-- TMPL_INCLUDE NAME="circ-menu.inc" --></div><!-- /TMPL_IF -->
 	<div id="yui-main">
@@ -98,7 +91,9 @@ $.tablesorter.addParser({
 </ul>
 
 <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
-<!-- TMPL_IF NAME="RESERVED" -->    <p>
+
+<!-- TMPL_IF NAME="RESERVED" -->
+    <p>
     <input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" />
     <label for="cancelreserve">Cancel Reserve</label>
     </p><!-- /TMPL_IF -->
@@ -130,18 +125,52 @@ $.tablesorter.addParser({
 <div id="circ_impossible" class="dialog alert">
 <!-- RESULT OF ISSUING REQUEST -->
         <ul>
-        <!-- TMPL_IF NAME="STATS" --><li>Local Use Recorded</li><!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="INVALID_DATE" --><li>The due date &quot;<!-- TMPL_VAR NAME="INVALID_DATE" -->&quot; is invalid</li><!-- /TMPL_IF -->  
-        <!-- TMPL_IF NAME="UNKNOWN_BARCODE" --><li>The barcode was not found</li><!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="NOT_FOR_LOAN" --><li>Item not for loan</li><!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="WTHDRAWN" --><li>Item has been withdrawn</li><!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="RESTRICTED" --><li>Item is restricted</li><!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="GNA" --><li>Patron's address is in doubt</li><!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="CARD_LOST" --><li>Patron's card is lost</li><!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="DEBARRED" --><li>Patron is restricted</li><!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="NO_MORE_RENEWALS" --><li>No more renewals possible</li><!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="EXPIRED" --><li>Patron's card is expired</li><!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="NOTSAMEBRANCH" --><li>This item belongs to <!-- TMPL_VAR NAME="itemhomebranch" --> and cannot be issued from this location.</li><!-- /TMPL_IF --> 
+        <!-- TMPL_IF NAME="STATS" -->
+            <li>Local Use Recorded</li>
+        <!-- /TMPL_IF -->
+
+        <!-- TMPL_IF NAME="INVALID_DATE" -->
+            <li>The due date is invalid</li>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
+            <li>The barcode was not found</li>
+        <!-- /TMPL_IF -->
+
+        <!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
+            <li>Item not for loan</li>
+        <!-- /TMPL_IF -->
+
+        <!-- TMPL_IF NAME="WTHDRAWN" -->
+            <li>Item has been withdrawn</li>
+        <!-- /TMPL_IF -->
+
+        <!-- TMPL_IF NAME="RESTRICTED" -->
+            <li>Item is restricted</li>
+        <!-- /TMPL_IF -->
+
+        <!-- TMPL_IF NAME="GNA" -->
+            <li>Patron's address is in doubt</li>
+        <!-- /TMPL_IF -->
+
+        <!-- TMPL_IF NAME="CARD_LOST" -->
+            <li>Patron's card is lost</li>
+        <!-- /TMPL_IF -->
+
+        <!-- TMPL_IF NAME="DEBARRED" -->
+            <li>Patron is restricted</li>
+        <!-- /TMPL_IF -->
+
+        <!-- TMPL_IF NAME="NO_MORE_RENEWALS" -->
+            <li>No more renewals possible</li>
+        <!-- /TMPL_IF -->
+
+        <!-- TMPL_IF NAME="EXPIRED" -->
+            <li>Patron's card is expired</li>
+        <!-- /TMPL_IF -->
+
+        <!-- TMPL_IF NAME="NOTSAMEBRANCH" -->
+            <li>This item belongs to <!-- TMPL_VAR NAME="itemhomebranch" --> and cannot be issued from this location.</li>
+        <!-- /TMPL_IF -->
         </ul>
 
     <!-- TMPL_IF NAME="memberofinstution" -->
@@ -198,14 +227,14 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 <fieldset id="circ_circulation_issue">
     <label for="barcode">Checking out to <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->) </label>
 	<div class="hint">Enter item barcode:</div>
-	
+
 	<input type="text" name="barcode" id="barcode" class="barcode focus" size="14" /> <input type="submit" value="Check Out" />
-        <div class="hint">Specify Due Date:</div>
-		<!-- TMPL_IF NAME="stickyduedate" --><input type="text" size="10" id="duedatespec" name="duedatespec" value="<!-- TMPL_VAR NAME="duedatespec" -->" /><!-- TMPL_ELSE --><input type="text" size="10" id="duedatespec" name="duedatespec" value="" />
-<!-- /TMPL_IF -->
+
+    <div class="date-select">
+        <div class="hint">Specify Due Date:</div><input type="text" size="10" id="duedatespec" name="duedatespec" value="<!-- TMPL_VAR NAME="duedatespec" -->" />
 		<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar"  border="0" id="CalendarDueDate" style="cursor: pointer;" />
              <script language="JavaScript" type="text/javascript">
-			 //<![CDATA[ 
+			 //<![CDATA[
                    function validate1(date) {
                          var today = new Date();
                          if ( date < today ) {
@@ -244,12 +273,17 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
           <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
           <input type="hidden" name="print" value="maybe" />
           <input type="hidden" name="debt_confirmed" value="<!-- TMPL_VAR NAME="debt_confirmed" -->" />
-          <!-- TMPL_IF NAME="CHARGES" --><input type="hidden" name="charges" value="yes" />
-          <input type="hidden" name="oldamount" value="<!-- TMPL_VAR NAME="amountold" -->" />
-          <!-- /TMPL_IF -->
-</fieldset> 
+                <!-- TMPL_IF NAME="CHARGES" -->
+                        <input type="hidden" name="charges" value="yes" />
+                        <input type="hidden" name="oldamount" value="<!-- TMPL_VAR NAME="amountold" -->" />
+                <!-- /TMPL_IF -->
+</div>
+</fieldset>
 </form></div><!-- /TMPL_UNLESS --><!-- /unless noissues -->
 
+<!-- TMPL_IF NAME="noissues" --><div><!-- TMPL_ELSE --><div class="yui-u"><!-- /TMPL_IF -->
+
+
     <!-- TMPL_IF NAME="flagged" -->
     <div class="yui-u">
 		<!-- TMPL_IF NAME="noissues" -->
@@ -258,13 +292,17 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 		<!-- TMPL_ELSE -->
         <div id="circmessages" class="circmessage attention">
 		<!-- /TMPL_IF -->
+
 		<h3><!-- TMPL_IF NAME="noissues" -->Cannot Check Out!<!-- TMPL_ELSE -->Attention:<!-- /TMPL_IF --></h3>
 		<ul>
+
 			<!-- TMPL_IF NAME = "warndeparture" -->
 			<li><span class="circ-hlt">Expiration:</span> Patron's card will expire soon.
 			Patron's card expires on <!-- TMPL_VAR NAME="expiry" --> <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Edit Details</a>
-            </li>
+
+			</li>
 			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF NAME="returnbeforeexpiry" -->
 			 <li><span class="circ-hlt">Set due date to expiry:</span> You have the ReturnBeforeExpiry system preference enabled this means if the
 			 expiry date is before the date due, the date due will be set to the expiry date
@@ -278,27 +316,47 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
             <!-- TMPL_IF NAME="gna" -->
 			<li class="blocker"><span class="circ-hlt">Address:</span> Patron's address in doubt</li>
 			<!-- /TMPL_IF -->
+
             <!-- TMPL_IF NAME="lost" -->
 			<li class="blocker"><span class="circ-hlt">Lost: </span>Patron's card is lost</li>
 			<!-- /TMPL_IF -->
+
             <!-- TMPL_IF NAME="dbarred" --><li class="blocker">
                <span class="circ-hlt"> Restricted:</span> Patron's account is restricted <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&amp;destination=circ&amp;status=0">Lift restriction</a>
 </li><!-- /TMPL_IF -->
             <!-- TMPL_IF name="odues" --><li><!-- TMPL_IF name="nonreturns" --><span class="circ-hlt">Overdues:</span> Patron has <span class="circ-hlt">ITEMS OVERDUE</span>. See highlighted items <a href="#checkouts">below</a><!-- /TMPL_IF --></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF NAME="charges" --><!-- TMPL_IF NAME="charges_is_blocker" --><li class="blocker"><!-- TMPL_ELSE --><li><!-- /TMPL_IF -->
-            <span class="circ-hlt">Fines:</span> Patron has  <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">Outstanding fines<!-- TMPL_IF NAME="chargesamount" --> of $<!-- TMPL_VAR NAME="chargesamount" --><!-- /TMPL_IF --></a>.<!-- TMPL_IF NAME="charges_is_blocker" -->Checkouts are blocked because fine balance is over the limit.<!-- /TMPL_IF --> Make <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a></li><!-- /TMPL_IF -->
-        	<!-- TMPL_IF NAME="credits" --><li><span class="circ-hlt">Credits:</span> Patron has a credit</li><!-- /TMPL_IF -->
+
+        	<!-- TMPL_IF NAME="charges" -->
+                <!-- TMPL_IF NAME="charges_is_blocker" -->
+			        <li class="blocker">
+                <!-- TMPL_ELSE -->
+			        <li>
+                <!-- /TMPL_IF -->
+            <span class="circ-hlt">Fines:</span> Patron has  <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">Outstanding fines</a>.
+                <!-- TMPL_IF NAME="charges_is_blocker" -->
+                    Checkouts are blocked because fine balance is over the limit.
+                <!-- /TMPL_IF -->
+            Make <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a></li>
+			<!-- /TMPL_IF -->
+
+        	<!-- TMPL_IF NAME="credits" -->
+			<li><span class="circ-hlt">Credits:</span> Patron has a credit</li>
+			<!-- /TMPL_IF -->
+
+
+
 			</ul>
         </div>
-			<!-- TMPL_IF NAME="WaitingReserveLoop" -->	
+
+			<!-- TMPL_IF NAME="WaitingReserveLoop" -->
 			<div id="holdswaiting" class="circmessage">
 		    <h4>Holds waiting:</h4>
 			        <!-- TMPL_LOOP NAME="WaitingReserveLoop" -->
 			            <ul> 
 			                <li> <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a> (<!-- TMPL_VAR NAME="itemtype"-->), <!-- TMPL_IF NAME="author" -->by <!-- TMPL_VAR NAME="author"--><!-- /TMPL_IF --> Hold placed on <!-- TMPL_VAR NAME="reservedate"-->.
 			            <!-- TMPL_IF NAME="waitingat" -->
-			                <br /><!-- TMPL_IF NAME="waitinghere" --><strong class="waitinghere"><!-- TMPL_ELSE --><strong><!-- /TMPL_IF -->Waiting at <!-- TMPL_VAR NAME="waitingat" --></strong>	
+			                <br /><!-- TMPL_IF NAME="waitinghere" --><strong class="waitinghere"><!-- TMPL_ELSE --><strong><!-- /TMPL_IF -->Waiting at <!-- TMPL_VAR NAME="waitingat" --></strong>
 			            <!-- /TMPL_IF -->
 			                </li>
 			            </ul>
@@ -310,16 +368,24 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 			<h4>Notes:</h4>
             <p><span class="circ-hlt"><!-- TMPL_VAR name="notesmsg" --></span></p>
 			</div>
-    <!-- /If notes --><!-- /TMPL_IF --> 
-    </div>
+    <!-- /If notes --><!-- /TMPL_IF -->
      <!-- /If flagged --><!-- /TMPL_IF -->
 </div>
 
 <div class="yui-g"><div id="patronlists" class="toptabs">
 
 <ul>
-<li><!--TMPL_IF NAME="issuecount"--><a href="/cgi-bin/koha/circ/circulation.pl#checkouts"><!-- TMPL_VAR NAME="issuecount"--> Checkout(s)</a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/circ/circulation.pl#checkouts">0 Checkouts</a><!-- /TMPL_IF --></li>
-<li><!-- TMPL_IF NAME="countreserv"--><a href="/cgi-bin/koha/circ/circulation.pl#reserves"><!--TMPL_VAR NAME="countreserv"--> Holds(s)</a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/circ/circulation.pl#reserves">0 Holds</a><!-- /TMPL_IF --></li>
+<li>    <!--TMPL_IF NAME="issuecount"-->
+            <a href="/cgi-bin/koha/circ/circulation.pl#checkouts"><!-- TMPL_VAR NAME="issuecount"--> Checkout(s)</a>
+    <!-- TMPL_ELSE -->
+            <a href="/cgi-bin/koha/circ/circulation.pl#checkouts">0 Checkouts</a>
+    <!-- /TMPL_IF --></li>
+<li><!-- TMPL_IF NAME="countreserv"-->
+            <a href="/cgi-bin/koha/circ/circulation.pl#reserves"><!--TMPL_VAR NAME="countreserv"--> Holds(s)</a>
+    <!-- TMPL_ELSE -->
+            <a href="/cgi-bin/koha/circ/circulation.pl#reserves">0 Holds</a>
+    <!-- /TMPL_IF --></li>
+
 </ul>
 
 <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
@@ -329,7 +395,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
     <input type="hidden" value="circ" name="destination" />
     <input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
     <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
-    <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />	
+    <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
         <table id="issuest">
     <thead><tr>
         <th>Due date</th>
@@ -360,9 +426,9 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
         <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
         <td>
-	<!-- TMPL_IF NAME="can_renew" -->
-         <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
-          <!-- TMPL_IF NAME="od" -->
+        <!-- TMPL_IF NAME="can_renew" -->
+        <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
+        <!-- TMPL_IF NAME="od" -->
             <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
           <!-- TMPL_ELSE -->
             <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
@@ -388,6 +454,27 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
                 </span>
             <!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
+        <!-- TMPL_ELSE -->
+            <!-- TMPL_IF NAME="can_confirm" --><span class="renewals-allowed content_hidden">
+                <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
+                <!-- TMPL_IF NAME="od" -->
+                    <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
+                <!-- TMPL_ELSE -->
+                    <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
+                <!-- /TMPL_IF -->
+                </span>
+                <span class="renewals-disabled">
+            <!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="renew_error_on_reserve" -->
+			On Hold
+		<!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="renew_error_too_many" -->
+			Too Many Renewals
+                <!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="can_confirm" -->
+                </span>
+            <!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
         </td>
 		<td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR NAME="barcode" -->">Check In</a></td>
 		<!-- TMPL_IF NAME="renew_failed" -->
@@ -420,9 +507,9 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
         <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
         <td>
-	<!-- TMPL_IF NAME="can_renew" -->
-            <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
-          <!-- TMPL_IF NAME="od" -->
+        <!-- TMPL_IF NAME="can_renew" -->
+        <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
+        <!-- TMPL_IF NAME="od" -->
             <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
           <!-- TMPL_ELSE -->
             <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
@@ -448,6 +535,27 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
                 </span>
             <!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
+        <!-- TMPL_ELSE -->
+            <!-- TMPL_IF NAME="can_confirm" --><span class="renewals-allowed content_hidden">
+                <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
+                <!-- TMPL_IF NAME="od" -->
+                    <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
+                <!-- TMPL_ELSE -->
+                    <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
+                <!-- /TMPL_IF -->
+                </span>
+                <span class="renewals-disabled">
+            <!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="renew_error_on_reserve" -->
+			On Hold
+		<!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="renew_error_too_many" -->
+			Too Many Renewals
+                <!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="can_confirm" -->
+                </span>
+            <!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
         </td>
 		<td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR NAME="barcode" -->">Check In</a></td>
 		<!-- TMPL_IF NAME="renew_failed" -->
@@ -455,11 +563,11 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 		<!-- /TMPL_IF -->
 
     </tr>
-    <!-- /loop previssues --><!-- /TMPL_LOOP --> 
-<!--/if previssues --><!-- /TMPL_IF --> 
+    <!-- /loop previssues --><!-- /TMPL_LOOP -->
+<!--/if previssues --><!-- /TMPL_IF -->
 	</tbody>
     </table>
-	<!--TMPL_IF NAME="issuecount"-->
+    <!--TMPL_IF NAME="issuecount"-->
     <fieldset class="action">
     <!-- TMPL_IF NAME="AllowRenewalLimitOverride" -->
         <label for="override_limit">Override Renewal Limit:</label>
@@ -502,7 +610,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="nottransfered" --> hasn't been transfered yet from <!-- TMPL_VAR NAME="nottransferedby" --></i>
                         <!-- /TMPL_IF --></em></td>
-                    <td>                    
+                    <td>
                         <!-- TMPL_IF NAME="waitingposition" -->
                         Hold priority
                         <b> <!-- TMPL_VAR NAME="waitingposition" --> </b><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 2ac684dfba..c2bc043370 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -35,12 +35,12 @@ $(document).ready(function() {
 		 return confirm('Are you sure you want to replace the current patron image? This cannot be undone.');
 		 }
 	});<!-- /TMPL_IF -->
-	$("#renew_all").click(function(){ $(".checkboxed").checkCheckboxes(":input[@name*=items]"); $(".checkboxed").unCheckCheckboxes(":input[@name*=barcodes]"); });
-	$("#return_all").click(function(){ $(".checkboxed").checkCheckboxes(":input[@name*=barcodes]"); $(".checkboxed").unCheckCheckboxes(":input[@name*=items]"); });
-	$("#CheckAllitems").click(function(){ $(".checkboxed").checkCheckboxes(":input[@name*=items]"); $(".checkboxed").unCheckCheckboxes(":input[@name*=barcodes]"); return false; });
-    $("#CheckNoitems").click(function(){ $(".checkboxed").unCheckCheckboxes(":input[@name*=items]"); return false; });
-	$("#CheckAllreturns").click(function(){ $(".checkboxed").checkCheckboxes(":input[@name*=barcodes]"); $(".checkboxed").unCheckCheckboxes(":input[@name*=items]"); return false; });
-    $("#CheckNoreturns").click(function(){ $(".checkboxed").unCheckCheckboxes(":input[@name*=barcodes]"); return false; });
+	$("#renew_all").click(function(){ $(".checkboxed").checkCheckboxes(":not(input[@name*=barcodes])"); $(".checkboxed").unCheckCheckboxes(":not(input[@name*=items])"); });
+	$("#return_all").click(function(){ $(".checkboxed").checkCheckboxes(":not(input[@name*=items])"); $(".checkboxed").unCheckCheckboxes(":not(input[@name*=barcodes])"); });
+	$("#CheckAllitems").click(function(){ $(".checkboxed").checkCheckboxes(":not(input[@name*=barcodes])"); $(".checkboxed").unCheckCheckboxes(":not(input[@name*=items])"); return false; });
+    $("#CheckNoitems").click(function(){ $(".checkboxed").unCheckCheckboxes(":not(input[@name*=barcodes])"); return false; });
+	$("#CheckAllreturns").click(function(){ $(".checkboxed").checkCheckboxes(":not(input[@name*=items])"); $(".checkboxed").unCheckCheckboxes(":not(input[@name*=barcodes])"); return false; });
+    $("#CheckNoreturns").click(function(){ $(".checkboxed").unCheckCheckboxes(":not(input[@name*=items])"); return false; });
 
     <!-- TMPL_IF NAME="AllowRenewalLimitOverride" -->
     $( '#override_limit' ).click( function () {
@@ -51,18 +51,6 @@ $(document).ready(function() {
         }
     } ).attr( 'checked', false );
     <!-- /TMPL_IF -->
-	$("td").click(function(e){
-		if(e.target.tagName.toLowerCase() == 'td'){
-           $(this).find("input:checkbox").each( function() {
-               $(this).attr('checked', !$(this).attr('checked'));
-			   if($(this).attr('checked')){
-			   	$(this).parent().siblings().find("input:checkbox").each(function(){
-	               if($(this).attr('checked')){ $(this).attr('checked',''); }
-	           });
-			   }
-           });
-		}
-	});
  });
 function uncheck_sibling(me){
 nodename=me.getAttribute("name");
@@ -87,6 +75,7 @@ if (nodename =="barcodes[]"){
    }   
 }
 }
+
 //]]>
 </script>
 
@@ -403,9 +392,13 @@ if (nodename =="barcodes[]"){
       <!-- TMPL_ELSE -->
             <td>
             <!-- TMPL_IF name="norenew" -->
-                <!-- TMPL_IF NAME="can_confirm" --><span class="renewals-allowed" style="display: none">
+                <!-- TMPL_IF NAME="can_confirm" --><span class="renewals-allowed content_hidden">
                     <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
-                   <!-- TMPL_IF NAME="od" --><input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />                             <!-- TMPL_ELSE --><input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />                                                       <!-- /TMPL_IF -->
+                    <!-- TMPL_IF NAME="od" -->
+                        <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
+                    <!-- TMPL_ELSE -->
+                        <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
+                    <!-- /TMPL_IF -->
                     </span>
                     <span class="renewals-disabled">
                 <!-- /TMPL_IF -->
@@ -415,6 +408,9 @@ if (nodename =="barcodes[]"){
 				    <!-- TMPL_IF NAME="norenew_reason_too_many" -->
 				        Too Many Renewals
 				    <!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="can_confirm" -->
+                    </span>
+                <!-- /TMPL_IF -->
             <!-- TMPL_ELSE -->
             <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
             <!-- TMPL_IF NAME="red" -->
diff --git a/kohaversion.pl b/kohaversion.pl
index 5f970c79c2..08410e10b3 100644
--- a/kohaversion.pl
+++ b/kohaversion.pl
@@ -10,7 +10,7 @@
 use strict;
 
 sub kohaversion {
-    our $VERSION = '3.00.04.002';
+    our $VERSION = '3.00.04.003';
     # version needs to be set this way
     # so that it can be picked up by Makefile.PL
     # during install