[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui acqui-home.tmpl,1.4,1.5 basket.tmpl,1.3,1.4 newbiblio.tmpl,1.2,1.3

Friedrich zur Hellen hellen at users.sourceforge.net
Sat Jun 25 14:58:56 CEST 2005 

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/acqui

Modified Files:
	acqui-home.tmpl basket.tmpl newbiblio.tmpl 
Log Message:
adjustments for 2.2.3

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/acqui-home.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** acqui-home.tmpl	9 Jun 2005 08:37:41 -0000	1.4
--- acqui-home.tmpl	25 Jun 2005 12:58:53 -0000	1.5
***************
*** 6,18 ****
  <div id="bloc25">
  	<h2 class="acquisition">Beginnen, Eingangsbearbeitung, &auml;ndern von Bestellungen</h2>
! 	<!-- TMPL_IF name="nobudget" -->
!   	                 <p class="problem">Sie m&uuml;ssen unter Parameter ein Budget definieren</p>
!   	         <!-- TMPL_ELSE -->
! 		<form action="/cgi-bin/koha/acqui/order.pl" method="post">
  			Lieferantenname: <input type="text"  size="25"   name="supplier">
  			<input type="submit" class="button acquisition" value="OK">
  		</form>
  	<p>oder <a href="histsearch.pl" class="button acquisition"> Suche Bestellhistorie</a></p>
- 	<!-- /TMPL_IF -->
  </div>
  
--- 6,14 ----
  <div id="bloc25">
  	<h2 class="acquisition">Beginnen, Eingangsbearbeitung, &auml;ndern von Bestellungen</h2>
!   	        <form action="/cgi-bin/koha/acqui/order.pl" method="post">
  			Lieferantenname: <input type="text"  size="25"   name="supplier">
  			<input type="submit" class="button acquisition" value="OK">
  		</form>
  	<p>oder <a href="histsearch.pl" class="button acquisition"> Suche Bestellhistorie</a></p>
  </div>
  
***************
*** 35,39 ****
  	<h2 class="acquisition">zu pr&uuml;fende Vorschl&auml;ge</h2>
  		<!-- TMPL_IF name="suggestion" -->
! 			<!--TMPL_VAR NAME="suggestion" --> offene Anschaffungsvorschl%auml;ge <a href="/cgi-bin/koha/suggestion/acceptorreject.pl" class="button acquisition">Manage</a>
  		<!-- TMPL_ELSE -->
  			Keine Anschaffungsvorschl&auml;ge offen
--- 31,35 ----
  	<h2 class="acquisition">zu pr&uuml;fende Vorschl&auml;ge</h2>
  		<!-- TMPL_IF name="suggestion" -->
! 			<!--TMPL_VAR NAME="suggestion" --> suggestions waiting <a href="/cgi-bin/koha/suggestion/acceptorreject.pl" class="button acquisition">Manage</a>
  		<!-- TMPL_ELSE -->
  			Keine Anschaffungsvorschl&auml;ge offen
***************
*** 43,58 ****
  <!-- showbudget-->
  <div id="bloc25">
! 	<form action="/cgi-bin/koha/search.pl">
  		<h2 class="acquisition">Etats und Budgets</h2>
- 		<!-- TMPL_IF name="nobudget" -->
-   	                 <p class="problem">Sie m&uuml;sen unter Parameter ein Budget definieren</p>
-   	         <!-- TMPL_ELSE -->
  		<table class="noborder">
  			<tr>
  				<th class="acquisition">Etats</th>
! 				<th class="acquisition">Gesamt</th>
  				<th class="acquisition">Geschenkt</th>
  				<th class="acquisition">Verausgabt</th>
! 				<th class="acquisition">Verf&uuml;gbar </th>
  			</tr>
  			<!-- TMPL_LOOP NAME="loop_budget" -->
--- 39,51 ----
  <!-- showbudget-->
  <div id="bloc25">
! 		<form action="/cgi-bin/koha/search.pl">	
  		<h2 class="acquisition">Etats und Budgets</h2>
  		<table class="noborder">
  			<tr>
  				<th class="acquisition">Etats</th>
! 				<th class="acquisition">Total</th>
  				<th class="acquisition">Geschenkt</th>
  				<th class="acquisition">Verausgabt</th>
! 				<th class="acquisition">Verf&uuml;gbar</th>
  			</tr>
  			<!-- TMPL_LOOP NAME="loop_budget" -->
***************
*** 66,70 ****
  			<!-- /TMPL_LOOP -->
  			<tr>
! 				<th class="acquisition" align="right">Gesamt</th>
  				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="total" --></th>
  				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="totspent" --></th>
--- 59,63 ----
  			<!-- /TMPL_LOOP -->
  			<tr>
! 				<th class="acquisition" align="right">Total</th>
  				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="total" --></th>
  				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="totspent" --></th>
***************
*** 74,80 ****
  		</table>
  		<p>
! Benutzen Sie den "neu laden"-Button des Browsers zur Anzeige der aktuellen Betr&auml;ge. Die angezeigten Werte sind nur ungef&auml;hre Werte, da bei Zahlung eines Betrags der dann aktuelle Wechselkurs berechnet wird.
  		</p>
! 	<!-- /TMPL_IF -->
  </div>
  
--- 67,73 ----
  		</table>
  		<p>
! 		Benutzen Sie den "neu laden"-Button des Browsers zur Anzeige der aktuellen Betr&auml;ge. Die angezeigten Werte sind nur ungef&auml;hre Werte, da bei Zahlung eines Betrags der dann aktuelle Wechselkurs berechnet wird.
  		</p>
! 	 </form>
  </div>
  

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/basket.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** basket.tmpl	5 Jun 2005 18:10:13 -0000	1.3
--- basket.tmpl	25 Jun 2005 12:58:53 -0000	1.4
***************
*** 1,4 ****
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
! 
  <div id="mainbloc">
  	<h1 class="acquisition"><!-- TMPL_UNLESS name="basketno" -->Neu <!-- /TMPL_UNLESS -->Einkaufskorb <b><!-- TMPL_VAR NAME="basketno" --> </b>f&uuml;r <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1><br />
--- 1,4 ----
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
! <!-- angepasst fuer 2.2.3, hellen, 24/06/05 -->
  <div id="mainbloc">
  	<h1 class="acquisition"><!-- TMPL_UNLESS name="basketno" -->Neu <!-- /TMPL_UNLESS -->Einkaufskorb <b><!-- TMPL_VAR NAME="basketno" --> </b>f&uuml;r <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1><br />
***************
*** 7,12 ****
  			<h2 class="acquisition">Korb-Info</h2>
  			<p><label class="label100">Korb-Nummer<label> <!-- TMPL_VAR NAME="basketno" --></p>
! 			<p><label class="label100">Bearbeitet von<label><!-- TMPL_VAR NAME="authorisedbyname" --></p>
! 			<p><label class="label100">Begonnen am<label> <!-- TMPL_VAR NAME="creationdate" --></p>
  			<p><label class="label100">f&uuml;r<label> <!-- TMPL_VAR NAME="booksellerid" --></p>
  			<p><label class="label100">Rechnungsnummer </label><!-- TMPL_VAR NAME="booksellerinvoicenumber" --></p>
--- 7,12 ----
  			<h2 class="acquisition">Korb-Info</h2>
  			<p><label class="label100">Korb-Nummer<label> <!-- TMPL_VAR NAME="basketno" --></p>
! 			<p><label class="label100">Managed by<label><!-- TMPL_VAR NAME="authorisedbyname" --></p>
! 			<p><label class="label100">open on<label> <!-- TMPL_VAR NAME="creationdate" --></p>
  			<p><label class="label100">f&uuml;r<label> <!-- TMPL_VAR NAME="booksellerid" --></p>
  			<p><label class="label100">Rechnungsnummer </label><!-- TMPL_VAR NAME="booksellerinvoicenumber" --></p>
***************
*** 28,35 ****
  				<th class="acquisition">Titel</th>
  				<th class="acquisition">Verfasser</th>
! 				<th class="acquisition">EK-Preis</th>
! 				<th class="acquisition doNotPrint">Nettopreis</th>
! 				<th class="acquisition">Menge</th>
! 				<th class="acquisition">Gesamt</th>
  				<th class="acquisition doNotPrint">Etat <a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[Bestellung]</a></th>
  				<!-- TMPL_IF name="active" -->
--- 28,35 ----
  				<th class="acquisition">Titel</th>
  				<th class="acquisition">Verfasser</th>
! 				<th class="acquisition">rrp</th>
! 				<th class="acquisition doNotPrint">est</th>
! 				<th class="acquisition">Qty</th>
! 				<th class="acquisition">Total</th>
  				<th class="acquisition doNotPrint">Etat <a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[Bestellung]</a></th>
  				<!-- TMPL_IF name="active" -->
***************
*** 91,100 ****
  		<!-- TMPL_UNLESS name="closedate" -->
  		<div id="bloc25">
! 			<h2 class="acquisition">Weitere Bestellung</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>von einem vorhandenen Biblio </b><input type="text"  size="25"   name="search"><input type="submit" class="button acquisition" value="Suche"></p>
! 				<p>oder <a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition"> f&uuml;r einen Anschaffungsvorschlag </a> <a href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition"> Neuer Biblio </a>
  				</p>
  			</form>
--- 91,105 ----
  		<!-- 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>von einem vorhandenen Biblio </b><input type="text"  size="25"   name="search"><input type="submit" class="button acquisition" value="Suche"></p>
! 				<p>oder
! 				 <a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">
! 				  f&uuml;r einen Anschaffungsvorschlag
! 				   </a> <a href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">
! 				    Neuer Biblio
! 				     </a>
  				</p>
  			</form>

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/newbiblio.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** newbiblio.tmpl	4 Jun 2005 14:10:26 -0000	1.2
--- newbiblio.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  <script language="javascript" type="text/javascript">
! 
  <!--
  function update(f){
--- 1,5 ----
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  <script language="javascript" type="text/javascript">
! <!-- aktualisiert fuer 2.2.3, hellen 24/06/05 -->
  <!--
  function update(f){
***************
*** 87,90 ****
--- 87,91 ----
  	<!-- /TMPL_LOOP -->
  	<a href="basket.pl?basket=<!-- TMPL_VAR NAME="basket" -->" class="button acquisition">Korb ansehen</a> <h1 class="acquisition">
+ 	<h1 class="acquisition">
  		<!-- TMPL_IF name="ordnum" -->
  			Bestellung bearbeiten (Zeile #<!-- TMPL_VAR NAME="ordnum" -->)
***************
*** 94,98 ****
  		 <!-- TMPL_IF name="suggestionid" -->(bestimmt durch Vorschlag)<!-- /TMPL_IF -->
  	</h1>
! 	Einkaufkorb f&uuml;r <!-- TMPL_VAR NAME="name" -->
  	<div id="bloc25">
  		<h2 class="acquisition">Katalog-Details</h2>
--- 95,99 ----
  		 <!-- TMPL_IF name="suggestionid" -->(bestimmt durch Vorschlag)<!-- /TMPL_IF -->
  	</h1>
! 	Shopping Basket For <!-- TMPL_VAR NAME="name" -->
  	<div id="bloc25">
  		<h2 class="acquisition">Katalog-Details</h2>
***************
*** 142,146 ****
  		</p>
  		<p>
! 			<label class="label100">Serie</label>
  			<!-- TMPL_IF name="biblio" -->
  				<input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->"><!-- TMPL_VAR NAME="seriestitle" -->
--- 143,147 ----
  		</p>
  		<p>
! 			<label class="label100">Serien</label>
  			<!-- TMPL_IF name="biblio" -->
  				<input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->"><!-- TMPL_VAR NAME="seriestitle" -->
***************
*** 181,185 ****
  		</p>
  		<p>
! 			<label class="label100"><b>GESAMTSUMME</b></label>
  			<input type="text" size="20" name="total" value="" onchange="update(this.form)">
  		</p>
--- 182,186 ----
  		</p>
  		<p>
! 			<label class="label100"><b>BUDGETED TOTAL</b></label>
  			<input type="text" size="20" name="total" value="" onchange="update(this.form)">
  		</p>

More information about the Koha-cvs mailing list