[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmp
From: |
Paul POULAIN |
Subject: |
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmpl,1.11,1.12 order.tmpl,1.20,1.21 |
Date: |
Fri, 17 Sep 2004 05:32:49 -0700 |
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14940/koha-tmpl/intranet-tmpl/default/en/acqui
Modified Files:
basket.tmpl order.tmpl
Log Message:
1- don't loose bookseller id when closing a basket
2- add possibility to view a closed basket (but not modify it)
Index: basket.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** basket.tmpl 19 Jul 2004 19:21:15 -0000 1.11
--- basket.tmpl 17 Sep 2004 12:32:30 -0000 1.12
***************
*** 3,8 ****
<div id="mainbloc">
<h1 class="acquisition"><!-- TMPL_UNLESS name="basketno" -->New <!--
/TMPL_UNLESS -->shopping Basket <b><!-- TMPL_VAR NAME="basketno" --> </b>for <a
href="supplier.pl?id=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR
NAME="name" --></a></h1><br />
! <div id="bloc25">
! <h2 class="acquisition">Basket info</h2>
<p><label class="label100">Basket number<label> <!--
TMPL_VAR NAME="basketno" --></p>
<p><label class="label100">Managed by<label><!--
TMPL_VAR NAME="authorisedbyname" --></p>
--- 3,9 ----
<div id="mainbloc">
<h1 class="acquisition"><!-- TMPL_UNLESS name="basketno" -->New <!--
/TMPL_UNLESS -->shopping Basket <b><!-- TMPL_VAR NAME="basketno" --> </b>for <a
href="supplier.pl?id=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR
NAME="name" --></a></h1><br />
! <!-- TMPL_UNLESS name="closedate" -->
! <div id="bloc25">
! <h2 class="acquisition">Basket info</h2>
<p><label class="label100">Basket number<label> <!--
TMPL_VAR NAME="basketno" --></p>
<p><label class="label100">Managed by<label><!--
TMPL_VAR NAME="authorisedbyname" --></p>
***************
*** 10,15 ****
<p><label class="label100">for<label> <!-- TMPL_VAR
NAME="booksellerid" --></p>
<p><label class="label100">Invoice number </label><!--
TMPL_VAR NAME="booksellerinvoicenumber" --></p>
! <a
href="/cgi-bin/koha/acqui/order.pl?op=close&basket=<!-- TMPL_VAR
NAME="basketno" -->" class="button acquisition">Close</a>
! </div>
<div id="bloc100">
<h2 class="acquisition">Order</h2>
--- 11,21 ----
<p><label class="label100">for<label> <!-- TMPL_VAR
NAME="booksellerid" --></p>
<p><label class="label100">Invoice number </label><!--
TMPL_VAR NAME="booksellerinvoicenumber" --></p>
! <!-- TMPL_IF name="closedate" -->
! Closed on <!-- TMPL_VAR name="closedate" -->
! <!-- TMPL_ELSE -->
! <a
href="/cgi-bin/koha/acqui/order.pl?op=close&basket=<!-- TMPL_VAR
NAME="basketno" -->&supplier=<!-- TMPL_VAR name="booksellerid" -->"
class="button acquisition">Close</a>
! <!-- /TMPL_IF -->
! </div>
! <!-- /TMPL_UNLESS -->
<div id="bloc100">
<h2 class="acquisition">Order</h2>
***************
*** 62,65 ****
--- 68,72 ----
<!-- /TMPL_IF -->
</div>
+ <!-- TMPL_UNLESS name="closedate" -->
<div id="bloc25">
<h2 class="acquisition">Add order line</h2>
***************
*** 78,81 ****
--- 85,89 ----
</form>
</div>
+ <!-- /TMPL_UNLESS -->
</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.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** order.tmpl 13 Sep 2004 15:28:58 -0000 1.20
--- order.tmpl 17 Sep 2004 12:32:46 -0000 1.21
***************
*** 45,48 ****
--- 45,49 ----
<!-- TMPL_IF
name="closedate" -->
closed
on <!-- TMPL_VAR NAME="closedate" -->
+ <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>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmpl,1.11,1.12 order.tmpl,1.20,1.21,
Paul POULAIN <=