From 23213f2f56e9054f3c65dc7f7930d0df12b69ea7 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <Katrin.Fischer.83@web.de>
Date: Wed, 10 Jun 2015 00:34:50 +0200
Subject: [PATCH] Bug 13962: Add vendor to acq details tab in staff

Implementing some feedback from our user meeting:
The acquisition details tab on the detail page
in staff should also show the vendor of the
order.

To test:
- Make sure AcquisitionDetails is active.
- Create an order or look up an order in the
  acqusition module.
- Go to the ordered record and check the
  'Acquisition details' tab
- Verify the vendor shows up there as first
  column now
- Check that sorting and display of the other
  columns are still working correctly

Note: Also fixes a </th> that should be a </td>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 6935eeb..cf47653 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -295,9 +295,9 @@ function verify_images() {
                 'sDom': 't',
                 'bPaginate': false,
                 'bAutoWidth': false,
-                "aaSorting": [[ 3, "desc" ]],
+                "aaSorting": [[ 4, "desc" ]],
                 "aoColumnDefs": [
-                    { "aTargets": [ 3, 4 ], "sType": "title-string" }
+                    { "aTargets": [ 4, 5 ], "sType": "title-string" }
                 ]
             }));
 
@@ -932,6 +932,7 @@ function verify_images() {
     <table id="orders">
       <thead>
         <tr>
+          <th>Vendor</th>
           <th>Basket group</th>
           <th>Basket</th>
           <th>Order number</th>
@@ -945,6 +946,11 @@ function verify_images() {
       [% FOR order IN orders %]
           <tr>
             <td>
+            [% IF (order.id) %]
+                [% order.name %]
+            [% END %]
+            </td>
+            <td>
             [% IF (order.basketgroupid) %]
                 [% IF CAN_user_acquisition_group_manage %]
                     <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% order.id %]&basketgroupid=[% order.basketgroupid %]">[% order.groupname %] ([% order.basketgroupid %])</a>
@@ -970,7 +976,7 @@ function verify_images() {
                 [% CASE 'cancelled' %]Cancelled
               [% END %]
             </td>
-            <td>[% order.quantity %]</th>
+            <td>[% order.quantity %]</td>
           </tr>
       [% END %]
       </tbody>
-- 
1.9.1