From 53cdc66a0e61783ab31ba5bbca0ed71b045bc334 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Mon, 29 Apr 2013 16:01:56 +0200
Subject: [PATCH] Bug 10145: The acquisition details block is badly placed.

Bug 5335 introduced a new "Acquisition details" block on the
subscription details page.
It is placed between to tabs and causes an ergonomic issue.

Test plan:
- Order a subscription.
- Go on the subscription detail page and select a tab.
- The "Acquisition details" block is moved from the bottom to the top of
the table.
- Apply the patch
- The "Acquisition details" block is always on the bottom of the table.

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes display problem, passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
---
 .../en/modules/serials/subscription-detail.tt | 73 ++++++++++---------
 1 file changed, 39 insertions(+), 34 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
index 0d9e83261d..959f14f4c5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -131,40 +131,7 @@ $(document).ready(function() {
      </div>
 </div>
 </div>
-    [% IF ( show_acquisition_details ) %]
-        <div id="acquisition_details">
-            <h2>Acquisition details</h2>
-            <table>
-                <thead>
-                    <tr><th></th><th>Price exc. taxes</th><th>Price inc. taxes</th><th>Fund</th><th></th></tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td>Ordered amount</td>
-                        <td>[% valuegste_ordered %]</td>
-                        <td>[% valuegsti_ordered %]</td>
-                        <td>[% budget_name_ordered %]</td>
-                        <td>
-                            [% IF ( ordered_exists ) %]
-                                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">See basket information</a>
-                            [% END %]
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Spent amount</td>
-                        <td>[% valuegste_spent %]</td>
-                        <td>[% valuegsti_spent %]</td>
-                        <td>[% budget_name_spent %]</td>
-                        <td>
-                            [% IF ( spent_exists ) %]
-                                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid %]">See invoice information</a>
-                            [% END %]
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-    [% END %]
+
     <div id="subscription_planning">
     <div class="yui-g">
     <div class="rows">
@@ -416,6 +383,44 @@ $(document).ready(function() {
     </div>
     </div>
     </div>
+
+    [% IF ( show_acquisition_details ) %]
+        <div id="acquisition_details">
+            <h2>Acquisition details</h2>
+            <table>
+                <thead>
+                    <tr><th></th><th>Price exc. taxes</th><th>Price inc. taxes</th><th>Fund</th><th></th></tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>Ordered amount</td>
+                        <td>[% valuegste_ordered %]</td>
+                        <td>[% valuegsti_ordered %]</td>
+                        <td>[% budget_name_ordered %]</td>
+                        <td>
+                            [% IF ( ordered_exists ) %]
+                                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">See basket information</a>
+                            [% END %]
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Spent amount</td>
+                        <td>[% valuegste_spent %]</td>
+                        <td>[% valuegsti_spent %]</td>
+                        <td>[% budget_name_spent %]</td>
+                        <td>
+                            [% IF ( spent_exists ) %]
+                                <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid %]">See invoice information</a>
+                            [% END %]
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    [% END %]
+
+
+
 </div>
 </div>
 
-- 
2.39.5