[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmpl,1.15.2.2,1.15.2.3 order.tmpl,1.21,1.21.2.1
Paul POULAIN
tipaul at users.sourceforge.net
Tue Apr 5 11:38:10 CEST 2005
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24406/koha-tmpl/intranet-tmpl/default/en/acqui
Modified Files:
Tag: rel_2_2
basket.tmpl order.tmpl
Log Message:
bugfix : when a supplier is inactive, the librarian can't modify an order (just recieve books)
Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -C2 -r1.15.2.2 -r1.15.2.3
*** basket.tmpl 8 Mar 2005 14:03:34 -0000 1.15.2.2
--- basket.tmpl 5 Apr 2005 09:38:08 -0000 1.15.2.3
***************
*** 33,40 ****
<th class="acquisition">Total</th>
<th class="acquisition doNotPrint">Fund <a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[order]</a></th>
! <!-- TMPL_UNLESS name="closedate" -->
! <th class="acquisition doNotPrint">Remove</th>
! <!-- /TMPL_UNLESS -->
!
</tr>
<!-- TMPL_LOOP NAME="books_loop" -->
--- 33,41 ----
<th class="acquisition">Total</th>
<th class="acquisition doNotPrint">Fund <a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[order]</a></th>
! <!-- TMPL_IF name="active" -->
! <!-- TMPL_UNLESS name="closedate" -->
! <th class="acquisition doNotPrint">Remove</th>
! <!-- /TMPL_UNLESS -->
! <!-- /TMPL_IF -->
</tr>
<!-- TMPL_LOOP NAME="books_loop" -->
***************
*** 54,64 ****
<td><!-- TMPL_VAR NAME="line_total" --></td>
<td class="doNotPrint"><!-- TMPL_VAR NAME="bookfundid" --></td>
! <!-- TMPL_UNLESS name="closedate" -->
! <td class="doNotPrint">
! <a href="addorder.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&quantity=0&biblio=<!-- TMPL_VAR NAME="biblionumber" -->">
! <img src="/intranet-tmpl/default/images/edittrash.png" alt="Remove from basket" title="Remove from basket" width="32" hspace="0" vspace="0" border="0">
! </a>
! </td>
! <!-- /TMPL_UNLESS -->
</tr>
<!-- /TMPL_LOOP -->
--- 55,67 ----
<td><!-- TMPL_VAR NAME="line_total" --></td>
<td class="doNotPrint"><!-- TMPL_VAR NAME="bookfundid" --></td>
! <!-- TMPL_IF name="active" -->
! <!-- TMPL_UNLESS name="closedate" -->
! <td class="doNotPrint">
! <a href="addorder.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&quantity=0&biblio=<!-- TMPL_VAR NAME="biblionumber" -->">
! <img src="/intranet-tmpl/default/images/edittrash.png" alt="Remove from basket" title="Remove from basket" width="32" hspace="0" vspace="0" border="0">
! </a>
! </td>
! <!-- /TMPL_UNLESS -->
! <!-- /TMPL_IF -->
</tr>
<!-- /TMPL_LOOP -->
***************
*** 85,106 ****
<!-- /TMPL_IF -->
</div>
! <!-- TMPL_UNLESS name="closedate" -->
! <div id="bloc25">
! <h2 class="acquisition">Add order line</h2>
! <form action="/cgi-bin/koha/acqui/newbasket2.pl" method="post">
! <input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->">
! <input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
! <p>from an existing biblio: </b><input type="text" size="25" name="search"><input type="submit" class="button acquisition" value="Search"></p>
! <p>or
! <a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">
! from a suggestion
! </a>
! <a href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">
! New biblio
! </a>
! </p>
! </form>
! </div>
! <!-- /TMPL_UNLESS -->
</div>
<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
--- 88,111 ----
<!-- /TMPL_IF -->
</div>
! <!-- TMPL_IF name="active" -->
! <!-- TMPL_UNLESS name="closedate" -->
! <div id="bloc25">
! <h2 class="acquisition">Add order line</h2>
! <form action="/cgi-bin/koha/acqui/newbasket2.pl" method="post">
! <input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->">
! <input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
! <p>from an existing biblio: </b><input type="text" size="25" name="search"><input type="submit" class="button acquisition" value="Search"></p>
! <p>or
! <a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">
! from a suggestion
! </a>
! <a href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">
! New biblio
! </a>
! </p>
! </form>
! </div>
! <!-- /TMPL_UNLESS -->
! <!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
Index: order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C2 -r1.21 -r1.21.2.1
*** order.tmpl 17 Sep 2004 12:32:46 -0000 1.21
--- order.tmpl 5 Apr 2005 09:38:08 -0000 1.21.2.1
***************
*** 47,51 ****
<a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">View</a>
<!-- TMPL_ELSE -->
! <a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">modify</a>
<!-- /TMPL_IF -->
</td>
--- 47,55 ----
<a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">View</a>
<!-- TMPL_ELSE -->
! <!-- TMPL_IF name="active" -->
! <a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">modify</a>
! <!-- TMPL_ELSE -->
! <a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">View</a>
! <!-- /TMPL_IF -->
<!-- /TMPL_IF -->
</td>
More information about the Koha-cvs
mailing list