[replace previous] fix for 3612 (bookseller improvements)

[koha_gimpoz] / koha-tmpl / intranet-tmpl / prog / en / modules / acqui / booksellers.tmpl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
index 7f1cdc6..fd93909 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
@@ -10,79 +10,94 @@
 
 <div id="doc3" class="yui-t2">
    
-   <div id="bd">
-       <div id="yui-main">
-       <div class="yui-b">
-       
+    <div id="bd">
+    <div id="yui-main">
+    <div class="yui-b">
+    
 <!-- TMPL_INCLUDE NAME="acquisitions-toolbar.inc" -->
 <!-- TMPL_IF EXPR="count == 1" -->     
 <h1> <!-- TMPL_VAR NAME="supplier_name" --> </h1>
 <!-- TMPL_ELSE -->
 <h1>You searched on <b>vendor <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h1>
 <!-- /TMPL_IF -->
-<div id="acqui_order_supplierlist">
-       <table>
-       <tr>
-               <th>Order</th>
-               <th>Order receive</th>
-               <th>Company</th>
-               <th>&nbsp;</th>
-       </tr>
-       
-       <!-- TMPL_LOOP name="loop_suppliers" -->
-               <tr>
-                       <td>    <!-- TMPL_IF name="active" -->
-                                       <a href="basket.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">Add order</a>
-                               <!-- TMPL_ELSE -->
-                                       Inactive
-                               <!-- /TMPL_IF -->
-                       </td>
-                       <td>    <a href="parcels.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">Receive order</a>
-                       </td>
-                       <!-- TMPL_IF NAME="name"-->
-                         <td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->"><!-- TMPL_VAR name="name" --></a></td>
-                       <!-- TMPL_ELSE -->
-                         <td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">NO NAME</a></td>
-                       <!-- /TMPL_IF -->
-                       <td>    <table>
-                                   <!-- TMPL_IF NAME="loop_basket"-->
-                                               <tr>
-                                                       <th>Basket</th>
-                                                       <th>Items</th>
-                                                       <th>Created by</th>
-                                                       <th>Date</th>
-                                                       <th>&nbsp;</th>
-                                               </tr>
-                                               <!-- TMPL_LOOP NAME="loop_basket" -->
-                                                       <tr>
-                                                               <td><!-- TMPL_VAR NAME="basketno" --></td>
-                                                               <td><TMPL_VAR NAME="total"></td>
-                                                               <td>                                            <!-- TMPL_VAR name="firstname" -->
-                                                                               <!-- TMPL_VAR name="surname" -->
-                                                               </td>
-                                                               <td><!-- TMPL_VAR NAME="creationdate" --></td>
-                                                               <td>                                            <!-- TMPL_IF name="closedate" -->
-                                                                               closed on <!-- TMPL_VAR NAME="closedate" -->
-                                                                               <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">View</a>
-                                                                       <!-- TMPL_ELSE -->
-                                                                               <!-- TMPL_IF name="active" -->
-                                                                                       <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">modify</a>
-                                                                               <!-- TMPL_ELSE -->
-                                                                                       <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">View</a>
-                                                                               <!-- /TMPL_IF -->
-                                                                       <!-- /TMPL_IF -->
-                                                               </td>
-                                                       </tr>
-                                               <!-- /TMPL_LOOP -->
-                                       <!-- TMPL_ELSE -->
-                                           <tr><td>No pending baskets</td></tr>
-                                       <!-- /TMPL_IF -->
-                                       </table>
-                       </td>
-                       </tr>
-               <!-- /TMPL_LOOP -->
-               </table>
-</div>
+<!-- TMPL_IF name="loop_suppliers" -->
+    <div id="acqui_order_supplierlist">
+        <table>
+        <tr>
+            <th>Order</th>
+            <th>Order receive</th>
+            <th>Vendor</th>
+            <th>&nbsp;</th>
+        </tr>
+        
+        <!-- TMPL_LOOP name="loop_suppliers" -->
+        <!-- TMPL_UNLESS name="__odd__" -->
+            <tr class="highlight">
+        <!-- TMPL_ELSE -->
+            <tr>
+        <!-- /TMPL_UNLESS -->
+                <td>   <!-- TMPL_IF name="active" -->
+                        <a href="basketheader.pl?booksellerid=<!-- TMPL_VAR name="supplierid" -->&op=add_form">Add basket</a>
+                    <!-- TMPL_ELSE -->
+                        Inactive
+                    <!-- /TMPL_IF -->
+                </td>
+                <td>   <a href="parcels.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">Receive shipment</a>
+                </td>
+                <!-- TMPL_IF NAME="name"-->
+                <td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->"><!-- TMPL_VAR name="name" --></a></td>
+                <!-- TMPL_ELSE -->
+                <td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">NO NAME</a></td>
+                <!-- /TMPL_IF -->
+                <td>   <table>
+                        <!-- TMPL_IF NAME="loop_basket"-->
+                            <tr>
+                                <th>Basket</th>
+                                <th>Items</th>
+                                <th>Created by</th>
+                                <th>Date</th>
+                                <th>&nbsp;</th>
+                            </tr>
+                            <!-- TMPL_LOOP NAME="loop_basket" -->
+                            <!--TMPL_IF Name="uncertainprices"-->
+                                <tr class="problem">
+                            <!--TMPL_ELSE-->
+                            <!-- TMPL_UNLESS NAME="__odd__" -->
+                                <tr class="highlight">
+                            <!-- TMPL_ELSE -->
+                                <tr>
+                            <!-- /TMPL_UNLESS -->
+                            <!--/TMPL_IF-->
+                                    <td><!-- TMPL_VAR NAME="basketno" --></td>
+                                    <td><!-- TMPL_VAR NAME="basketname" --></td>
+                                    <td><TMPL_VAR NAME="total"></td>
+                                    <td>                                               <!-- TMPL_VAR name="firstname" -->
+                                            <!-- TMPL_VAR name="surname" -->
+                                    </td>
+                                    <td><!-- TMPL_VAR NAME="creationdate" --></td>
+                                    <td>                                               <!-- TMPL_IF name="closedate" -->
+                                            closed on <!-- TMPL_VAR NAME="closedate" -->
+                                            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">View</a>
+                                        <!-- TMPL_ELSE -->
+                                            <!-- TMPL_IF name="active" -->
+                                                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">modify</a>
+                                            <!-- TMPL_ELSE -->
+                                                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">View</a>
+                                            <!-- /TMPL_IF -->
+                                        <!-- /TMPL_IF -->
+                                    </td>
+                                </tr>
+                            <!-- /TMPL_LOOP -->
+                        <!-- TMPL_ELSE -->
+                            <tr><td>No pending baskets</td></tr>
+                        <!-- /TMPL_IF -->
+                        </table>
+                </td>
+                </tr>
+            <!-- /TMPL_LOOP -->
+            </table>
+        </div>
+    <!-- /TMPL_IF -->
 </div>
 </div>
 <div class="yui-b">