[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull order.tmpl,1.4,1.5 subscription-add.tmpl,1.4,1.5

[Paul POULAIN]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5423/koha-tmpl/intranet-tmpl/default/en/bull

Modified Files:
        order.tmpl subscription-add.tmpl 
Log Message:
reintegrating aqbookseller search, to ask book seller for late issues

Index: order.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/order.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** order.tmpl  12 Aug 2004 14:37:36 -0000      1.4
--- order.tmpl  2 Sep 2004 16:28:01 -0000       1.5
***************
*** 1,53 ****
  <!-- TMPL_INCLUDE name="popup-top.inc" -->
  <div id="mainbloc">
! <h1 class="acquisition">Supplier Search Results</h1>
! <div id="bloc100">
! <h2 class="acquisition">You searched on <b>supplier <!-- TMPL_VAR 
name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h2>
! <table>
! <tr>
!       <th class="acquisition">Company</th>
!       <th class="acquisition">
!               <table class="noborder">
                        <tr>
!                               <th class="acquisition">Basket</th>
!                               <th class="acquisition">&nbsp;</th>
                        </tr>
                </table>
-       </td>
- </tr>
- 
- <!-- TMPL_LOOP name="loop_suppliers" -->
-       <tr valign=top bgcolor=<!-- TMPL_VAR name="color" -->>
-               <td><!-- TMPL_VAR name="name" --></td>
-               <td>
-                       <table width="100%" cellspacing=0 cellpadding=5 
border=0>
-                                       <tr>
-                                               <th 
class="acquisition">Basket</th>
-                                               <th 
class="acquisition">Items</th>
-                                               <th class="acquisition">Created 
by</th>
-                                               <th 
class="acquisition">Date</th>
-                                               <th 
class="acquisition">&nbsp;</th>
-                                       </tr>
-                                       <!-- TMPL_LOOP NAME="loop_basket" -->
-                                               <tr>
-                                                       <td><!-- TMPL_VAR 
NAME="basketno" --></a></td>
-                                                       <td><TMPL_VAR 
NAME="total"></td>
-                                                       <td><!-- TMPL_VAR 
NAME="authorisedby" --></td>
-                                                       <td><!-- TMPL_VAR 
NAME="creationdate" --></td>
-                                                       <td>
-                                                               <!-- TMPL_IF 
name="closedate" -->
-                                                                       closed 
on <!-- TMPL_VAR NAME="closedate" -->
-                                                               <!-- TMPL_ELSE 
-->
-                                                                       <a 
href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" 
class="button acquisition">...</a>
-                                                               <!-- /TMPL_IF 
-->
-                                                       </td>
-                                               </tr>
-                                       <!-- /TMPL_LOOP -->
-                               </table>
-               </tr>
-       <!-- /TMPL_LOOP -->
-       </table>
        </div>
-       <a class="button acquisition" href="supplier.pl?supplerid=0">Add 
supplier</a>
  </div>
  <!-- TMPL_INCLUDE name="popup-bottom.inc" -->
--- 1,30 ----
  <!-- TMPL_INCLUDE name="popup-top.inc" -->
  <div id="mainbloc">
!       <h1>Supplier Search Results</h1>
!       <div id="bloc100">
!               <h2>You searched on <b>supplier <!-- TMPL_VAR name="supplier" 
-->,</b> <!-- TMPL_VAR name="count" --> results found</h2>
!               <table>
                        <tr>
!                               <th>Book seller</th>
!                               <th>Select</th>
                        </tr>
+                       <!-- TMPL_LOOP name="loop_suppliers" -->
+                               <tr>
+                                       <td><!-- TMPL_VAR name="name" --></td>
+                                       <td><a href="#" 
onclick="javascript:GetIt(<!-- TMPL_VAR name="aqbooksellerid" -->,'<!-- 
TMPL_VAR name="name" -->')">Get It !</td>
+                               </tr>
+                       <!-- /TMPL_LOOP -->
                </table>
        </div>
  </div>
+ 
+ <script language="Javascript">
+ 
+ function GetIt(aqbooksellerid,name)
+ {
+   opener.document.f.aqbooksellerid.value = aqbooksellerid;
+   opener.document.f.aqbooksellername.value = name;
+   self.close();
+ }
+ </script>
  <!-- TMPL_INCLUDE name="popup-bottom.inc" -->

Index: subscription-add.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** subscription-add.tmpl       12 Aug 2004 14:37:36 -0000      1.4
--- subscription-add.tmpl       2 Sep 2004 16:28:01 -0000       1.5
***************
*** 16,19 ****
--- 16,20 ----
                <input type="hidden" name="user" value="<!-- TMPL_VAR 
name="user" -->">
                <p>Librarian</td><td> <!-- TMPL_VAR name="user" --></p>
+               <p><label>Supplier</label><input type="text" 
name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size=4> 
(<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR 
name="aqbooksellername" -->" disabled readonly>)<a href="#" 
onClick="FindAcqui(f)">...</a></p>
                <p><label>Biblio</label><input type="text" name="biblionumber" 
value="<!-- TMPL_VAR name="biblionumber" -->" size=4> (<input type="text" 
name="title" value="<!-- TMPL_VAR name="title" -->" disabled readonly>)<a 
href="#" onClick="Plugin(f)">...</a></p>
                <p><label>Notes</label><TEXTAREA NAME="notes" COLS=30 
ROWS=2><!-- TMPL_VAR name="notes" --></TEXTAREA></p>
***************
*** 21,25 ****
                <ul>
                        <li>remember you <b>must</b> have created a biblio 
<b>before</b> creating a subscription</li>
!                       <li>a suggestion is sent to the librarian. The 
suggestion will be changed to an order</li>
                </ul>
  </div>
--- 22,26 ----
                <ul>
                        <li>remember you <b>must</b> have created a biblio 
<b>before</b> creating a subscription</li>
!                       <li>You also must have selected a supplier if you want 
to ask for late issues</li>
                </ul>
  </div>