[Koha-patches] [PATCH] (new_acq) fix pending reserves js, and aqplan xhtml

[Nahuel ANGELINETTI]

From: Paul Poulain <paul.poulain at biblibre.com>

this fix pending reserve that had broken pagination.
Then it fixe the table in aqplan, that was broken, and wrap lines.o
---
 .../prog/en/modules/admin/aqplan.tmpl              |   14 +++++++-------
 .../prog/en/modules/circ/pendingreserves.tmpl      |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
index 8bef092..33ab41a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
@@ -171,11 +171,11 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
 
     <!-- TMPL_LOOP NAME="authvals_row" -->
          <!-- TMPL_IF NAME="display" -->
-            <th id="<!-- TMPL_VAR NAME="code" -->"   style="text-align: center;
+            <th id="<!-- TMPL_VAR NAME="code" -->"   style="text-align: center;"
                         class="<!-- TMPL_VAR NAME='colnum' -->" >
         <!-- TMPL_ELSE -->
             <th id="<!-- TMPL_VAR NAME="code" -->"   style="text-align: center;
-                            display:none;
+                            display:none;"
                         class="<!-- TMPL_VAR NAME='colnum' -->" >
         <!-- /TMPL_IF -->
 
@@ -199,7 +199,7 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
             <!--/TMPL_IF -->
 
         <td align='left'><!-- TMPL_VAR NAME="budget_name_indent"--></td>
-        <td align='right'><span id='budget_tot_formatted" -->'><!-- TMPL_VAR NAME="budget_amount_formatted"-->&nbsp;</span></td>
+        <td align='right'><span style="white-space: nowrap;" id='budget_tot_formatted'><!-- TMPL_VAR ESCAPE="HTML" NAME="budget_amount_formatted"-->&nbsp;</span></td>
 
         <!-- NEXT DIV ELEMENT IS USED BY JS FOR CALC-ING AUTO-FILL AND ESTIMATED AMOUNTS -->
         <div style="display:none;" id='budget_tot_<!-- TMPL_VAR NAME="budget_id" -->'><!-- TMPL_VAR NAME="budget_amount"--></div>
@@ -233,15 +233,15 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
             <td width="50%"    align="right"  
        <!-- TMPL_IF Name="show_actual" -->
             <!-- TMPL_IF NAME="act_negative" --> style="color: red;" <!--/TMPL_IF -->
-                <!-- TMPL_IF NAME="act_positive" --> style="color: green;" <!--/TMPL_IF --> >
-                <!-- TMPL_VAR NAME="budget_act_remain"-->
-        <!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="act_positive" --> style="color: green;" <!--/TMPL_IF -->
+            <!-- /TMPL_IF --> >
+                <!-- TMPL_VAR ESCAPE="HTML" NAME="budget_act_remain"-->
             </td>
 
             <td width="50%"    align="right"  
         <!-- TMPL_IF NAME="est_negative" --> style="color: red;" <!--/TMPL_IF -->
         <!-- TMPL_IF NAME="est_positive" --> style="color: green;" <!--/TMPL_IF -->
-        name="est_total" id='budget_est_<!-- TMPL_VAR NAME="budget_id"-->'>  <!-- TMPL_VAR NAME="budget_est_remain"-->&nbsp;    
+        name="est_total" id='budget_est_<!-- TMPL_VAR NAME="budget_id"-->'> <!-- TMPL_VAR NAME="budget_est_remain"-->&nbsp;    
             </td>
             </tr>
         </table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
index 3b33853..f9e0800 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
@@ -61,7 +61,7 @@
 			var newbaseurl    = "/cgi-bin/koha/circ/pendingreserves.pl?json=1" +
 								"&holdingbranches=" + holdingbranch +
 								"&locations=" + location +
-								"&itemtypes=" + itemtype;
+								"&itemtypes=" + itemtype + "&";
 
 		 	myDataSource = new YAHOO.util.DataSource(newbaseurl);
 		 	myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON
-- 
1.5.6.5