[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui acquire.tmpl,1.14,1.15 basket.tmpl,1.14,1.15 newbiblio.tmpl,1.14,1.15
Paul POULAIN
tipaul at users.sourceforge.net
Thu Dec 2 17:40:15 CET 2004
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29697/koha-tmpl/intranet-tmpl/default/en/acqui
Modified Files:
acquire.tmpl basket.tmpl newbiblio.tmpl
Log Message:
CRITICAL bug in acquisition (another one...) : when MARC=ON, and an order line is created from an existing biblio (to buy another item), the MARC biblio is lost and replaced by the non marc one (that has a lot less informations...). To solve the problem, the biblio can no more be modified after the order has been placed. Less feature, but more reliable ! (not simple solution to solve this problem. Would imply to rewrite the MARC biblio from the non marc datas, and no API is provided for this yet)
Index: acquire.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** acquire.tmpl 14 Sep 2004 12:35:55 -0000 1.14
--- acquire.tmpl 2 Dec 2004 16:40:12 -0000 1.15
***************
*** 70,74 ****
<p>
<label class="label100">Actual Cost *</label>
! <input type="text" size="20" name="cost" value="<!-- TMPL_VAR NAME="unitprice" -->">
</p>
<p>
--- 70,74 ----
<p>
<label class="label100">Actual Cost *</label>
! <input type="text" size="20" name="cost" value="<!-- TMPL_IF name="unitprice"--><!-- TMPL_VAR NAME="unitprice" --><!-- TMPL_ELSE --><!-- TMPL_VAR name="rrp" --><!-- /TMPL_IF -->">
</p>
<p>
Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** basket.tmpl 5 Oct 2004 09:22:17 -0000 1.14
--- basket.tmpl 2 Dec 2004 16:40:12 -0000 1.15
***************
*** 39,43 ****
<td><!-- TMPL_VAR NAME="publishercode" --></td>
<td><!-- TMPL_VAR NAME="isbn" --></td>
! <td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
<td><!-- TMPL_VAR NAME="author" --></td>
<td><!-- TMPL_VAR NAME="rrp" --></td>
--- 39,47 ----
<td><!-- TMPL_VAR NAME="publishercode" --></td>
<td><!-- TMPL_VAR NAME="isbn" --></td>
! <!-- TMPL_IF name="closedate" -->
! <td><!-- TMPL_VAR NAME="title" --></td>
! <!-- TMPL_ELSE -->
! <td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! <!-- /TMPL_IF -->
<td><!-- TMPL_VAR NAME="author" --></td>
<td><!-- TMPL_VAR NAME="rrp" --></td>
Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** newbiblio.tmpl 14 Sep 2004 12:09:52 -0000 1.14
--- newbiblio.tmpl 2 Dec 2004 16:40:12 -0000 1.15
***************
*** 82,98 ****
<p>
<label class="label100"><b>Title *</b></label>
! <input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->">
</p>
<p>
<label class="label100">Author</label>
! <input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" >
</p>
<p>
<label class="label100"> Publisher</label>
! <input type="text" size="30" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" >
</p>
<p>
<label class="label100">Copyright Date</label>
! <input type="text" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->">
</p>
<p>
--- 82,114 ----
<p>
<label class="label100"><b>Title *</b></label>
! <!-- TMPL_IF name="biblio" -->
! <input type="hidden" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->"><!-- TMPL_VAR NAME="title" -->
! <!-- TMPL_ELSE -->
! <input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->">
! <!-- /TMPL_IF -->
</p>
<p>
<label class="label100">Author</label>
! <!-- TMPL_IF name="biblio" -->
! <input type="hidden" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->"><!-- TMPL_VAR NAME="author" -->
! <!-- TMPL_ELSE -->
! <input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->">
! <!-- /TMPL_IF -->
</p>
<p>
<label class="label100"> Publisher</label>
! <!-- TMPL_IF name="biblio" -->
! <input type="hidden" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->"><!-- TMPL_VAR NAME="publishercode" -->
! <!-- TMPL_ELSE -->
! <input type="text" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->">
! <!-- /TMPL_IF -->
</p>
<p>
<label class="label100">Copyright Date</label>
! <!-- TMPL_IF name="biblio" -->
! <input type="hidden" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->"><!-- TMPL_VAR NAME="copyrightdate" -->
! <!-- TMPL_ELSE -->
! <input type="text" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->">
! <!-- /TMPL_IF -->
</p>
<p>
***************
*** 102,110 ****
<p>
<label class="label100">ISBN</label>
! <input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->">
</p>
<p>
<label class="label100">Series</label>
! <input type="text" size="20" name="Series" value="<!-- TMPL_VAR NAME="seriestitle" -->">
</p>
<p>
--- 118,134 ----
<p>
<label class="label100">ISBN</label>
! <!-- TMPL_IF name="biblio" -->
! <input type="hidden" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->"><!-- TMPL_VAR NAME="isbn" -->
! <!-- TMPL_ELSE -->
! <input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->">
! <!-- /TMPL_IF -->
</p>
<p>
<label class="label100">Series</label>
! <!-- TMPL_IF name="biblio" -->
! <input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->"><!-- TMPL_VAR NAME="seriestitle" -->
! <!-- TMPL_ELSE -->
! <input type="text" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->">
! <!-- /TMPL_IF -->
</p>
<p>
More information about the Koha-cvs
mailing list