templating normal acquisition before reordering acquisition and cataloguing.
authortipaul <tipaul>
Mon, 10 Feb 2003 13:38:44 +0000 (13:38 +0000)
committertipaul <tipaul>
Mon, 10 Feb 2003 13:38:44 +0000 (13:38 +0000)
supplier now works with currencies table, not hardcoded currencies

acqui/acqui-home.pl [new file with mode: 0755]
acqui/order.pl
acqui/supplier.pl
koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl [new file with mode: 0644]
koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl [new file with mode: 0644]
koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl [new file with mode: 0644]

diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl
new file mode 100755 (executable)
index 0000000..53c99b2
--- /dev/null
@@ -0,0 +1,64 @@
+#!/usr/bin/perl
+
+use strict;
+use CGI;
+use C4::Auth;
+use C4::Output;
+use C4::Interface::CGI::Output;
+use C4::Database;
+use HTML::Template;
+use C4::Catalogue;
+
+my $query = new CGI;
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "acqui/acqui-home.tmpl",
+                            query => $query,
+                            type => "intranet",
+                            authnotrequired => 0,
+                            flagsrequired => {acquisition => 1},
+                            debug => 1,
+                            });
+
+# budget
+my ($count,@results)=bookfunds;
+my $classlist='';
+my $total=0;
+my $totspent=0;
+my $totcomtd=0;
+my $totavail=0;
+my @loop_budget = ();
+for (my $i=0;$i<$count;$i++){
+       my ($spent,$comtd)=bookfundbreakdown($results[$i]->{'bookfundid'});
+       my $avail=$results[$i]->{'budgetamount'}-($spent+$comtd);
+       my %line;
+       $line{bookfundname} = $results[$i]->{'bookfundname'};
+       $line{budgetamount} = $results[$i]->{'budgetamount'};
+       $line{spent} = sprintf  ("%.2f", $spent);
+       $line{comtd} = sprintf  ("%.2f",$comtd);
+       $line{avail}  = sprintf  ("%.2f",$avail);
+       push @loop_budget, \%line;
+       $total+=$results[$i]->{'budgetamount'};
+       $totspent+=$spent;
+       $totcomtd+=$comtd;
+       $totavail+=$avail;
+}
+#currencies
+my ($count,$rates)=getcurrencies();
+my @loop_currency = ();
+for (my $i=0;$i<$count;$i++){
+       my %line;
+       $line{currency} = $rates->[$i]->{'currency'};
+       $line{rate} = $rates->[$i]->{'rate'};
+       push @loop_currency, \%line;
+}
+$template->param(loggedinuser => $loggedinuser,
+                                               classlist => $classlist,
+                                               type => 'intranet',
+                                               loop_budget => \@loop_budget,
+                                               loop_currency => \@loop_currency,
+                                               total => sprintf("%.2f",$total),
+                                               totspent => sprintf("%.2f",$totspent),
+                                               totcomtd => sprintf("%.2f",$totcomtd),
+                                               totavail => sprintf("%.2f",$totavail));
+
+output_html_with_http_headers $query, $cookie, $template->output;
index 6766966..f077ced 100755 (executable)
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
+use strict;
 use C4::Catalogue;
+use C4::Auth;
 use C4::Biblio;
 use C4::Output;
 use CGI;
-use strict;
+use C4::Interface::CGI::Output;
+use C4::Database;
+use HTML::Template;
+use C4::Catalogue;
 
-my $input=new CGI;
-print $input->header();
-my $supplier=$input->param('supplier');
-print startpage;
+my $query=new CGI;
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "acqui/order.tmpl",
+                            query => $query,
+                            type => "intranet",
+                            authnotrequired => 0,
+                            flagsrequired => {acquisition => 1},
+                            debug => 1,
+                            });
 
-print startmenu('acquisitions');
+my $supplier=$query->param('supplier');
 my ($count,@suppliers)=bookseller($supplier);
 
-print <<printend
-<FONT SIZE=6><em>Supplier Search Results</em></FONT>
-<div align=right>
-<a href=supplier.pl?id=0><img  alt="Add New Supplier" src="/images/new-supplier.gif"  WIDTH=187  HEIGHT=42 BORDER=0 border=0></a>
-</div>
-<CENTER>
-You searched on <b>supplier $supplier,</b> $count results found<p>
-<table border=0 cellspacing=0 cellpadding=5>
-<tr valign=top bgcolor=#99cc33>
-<td background="/images/background-mem.gif">&nbsp;</td>
-<td background="/images/background-mem.gif"><b>COMPANY</b></td>
-<td background="/images/background-mem.gif"><b>BASKETS</b></td><td background="/images/background-mem.gif"><b>ITEMS</b></td><td background="/images/background-mem.gif"><b>STAFF</b></td><td background="/images/background-mem.gif"><b>DATE</b></td></tr>
-printend
-;
 my $colour='#ffffcc';
 my $toggle=0;
+my @loop_suppliers;
 for (my $i=0; $i<$count; $i++) {
-    if ($toggle==0){
-       $colour='#ffffcc';
-       $toggle=1;
-    } else {
-       $colour='white';
-       $toggle=0;
-    }
-    my ($ordcount,$orders)=getorders($suppliers[$i]->{'id'});
-# print $ordcount;
-    if ($orders->[0]->{'basketno'}>0) {
-       print <<printend
-           <tr valign=top bgcolor=$colour>
-           <td><a href="newbasket.pl?id=$suppliers[$i]->{'id'}"><img src="/images/new-basket-short.gif" alt="New Basket" width=77 height=32 border=0 ></a>
-           <a href="recieveorder.pl?id=$suppliers[$i]->{'id'}"><img src="/images/receive-order-short.gif" alt="Receive Order" width=77 height=32 border=0 ></a></td>
-           <td><a href="supplier.pl?id=$suppliers[$i]->{'id'}">$suppliers[$i]->{'name'}</a></td>
-           <td><a href="/cgi-bin/koha/acqui/basket.pl?basket=$orders->[0]->{'basketno'}">HLT-$orders->[0]->{'basketno'}</a></td>
-           <td>$orders->[0]->{'count(*)'}</td>
-           <td>$orders->[0]->{'authorisedby'}</td>
-           <td>$orders->[0]->{'entrydate'}</td></tr>
-printend
-;
-    } else {
-       print <<printend
-           <tr valign=top bgcolor=$colour>
-           <td><a href="newbasket.pl?id=$suppliers[$i]->{'id'}"><img src="/images/new-basket-short.gif" alt="New Basket" width=77 height=32 border=0 ></a>
-           <a href="recieveorder.pl?id=$suppliers[$i]->{'id'}"><img src="/images/receive-order-short.gif" alt="Receive Order" width=77 height=32 border=0 ></a></td>
-           <td><a href="supplier.pl?id=$suppliers[$i]->{'id'}">$suppliers[$i]->{'name'}</a></td>
-           <td>&nbsp;</a></td>
-           <td>$orders->[0]->{'count(*)'}</td>
-           <td>$orders->[0]->{'authorisedby'}</td>
-           <td>$orders->[0]->{'entrydate'}</td></tr>
-printend
-;
-    }
-    for (my $i2=1;$i2<$ordcount;$i2++){
-       if ($orders->[$i2]->{'basketno'}>=1) {
-           print <<printend
-               <tr valign=top bgcolor=$colour>
-               <td> &nbsp; </td>
-               <td> &nbsp; </td>
-               <td><a href="/cgi-bin/koha/acqui/basket.pl?basket=$orders->[$i2]->{'basketno'}">HLT-$orders->[$i2]->{'basketno'}</a></td>
-               <td>$orders->[$i2]->{'count(*)'}</td><td>$orders->[$i2]->{'authorisedby'} &nbsp; </td>
-               <td>$orders->[$i2]->{'entrydate'}</td></tr>
-
-printend
-;
+       my ($ordcount,$orders)=getorders($suppliers[$i]->{'id'});
+       my %line;
+       if ($toggle==0){
+               $line{color}='#ffffcc';
+               $toggle=1;
        } else {
-           print <<printend
-               <tr valign=top bgcolor=$colour>
-               <td> &nbsp; </td>
-               <td> &nbsp; </td>
-               <td> &nbsp;</td>
-               <td>$orders->[$i2]->{'count(*)'}</td><td>$orders->[$i2]->{'authorisedby'} &nbsp; </td>
-               <td>$orders->[$i2]->{'entrydate'}</td></tr>
-
-printend
-;
+               $line{color}='white';
+               $toggle=0;
        }
-    }
+       $line{id} =$suppliers[$i]->{'id'};
+       $line{name} = $suppliers[$i]->{'name'};
+       $line{total} = $orders->[0]->{'count(*)'};
+       $line{authorisedby} = $orders->[0]->{'authorisedby'};
+       $line{entrydate} = $orders->[0]->{'entrydate'};
+       my @loop_basket;
+       for (my $i2=0;$i2<$ordcount;$i2++){
+               my %inner_line;
+       warn "bask : ".$orders->[$i2]->{'basketno'};
+                       $inner_line{basketno} =$orders->[$i2]->{'basketno'};
+                       $inner_line{total} =$orders->[$i2]->{'count(*)'};
+                       $inner_line{authorisedby} = $orders->[$i2]->{'authorisedby'};
+                       $inner_line{entrydate} = $orders->[$i2]->{'entrydate'};
+                       push @loop_basket, \%inner_line;
+       }
+       $line{loop_basket} = \@loop_basket;
+       push @loop_suppliers, \%line;
 }
+$template->param(loop_suppliers => \@loop_suppliers,
+                                               supplier => $supplier,
+                                               count => $count);
 
-print <<printend
-</table>
-
-</CENTER>
-printend
-;
-
-print endmenu('acquisitions');
-
-print endpage;
+output_html_with_http_headers $query, $cookie, $template->output;
index cb3ff66..b6b88da 100755 (executable)
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
+use C4::Auth;
 use C4::Catalogue;
 use C4::Biblio;
 use C4::Output;
 use CGI;
+use C4::Interface::CGI::Output;
+use C4::Database;
+use HTML::Template;
+use C4::Catalogue;
 use strict;
 
-my $input=new CGI;
-print $input->header();
-my $id=$input->param('id');
+my $query=new CGI;
+my $id=$query->param('id');
 my ($count,@booksellers)=bookseller($id);
-print startpage;
-
-print startmenu('acquisitions');
-
-print <<EOP
-<form action=updatesupplier.pl method=post>
-
-<input type=hidden name=id value=$id>
-<FONT SIZE=6><em>Update: $booksellers[0]->{'name'}</em></FONT>
-<P>
-<CENTER>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
-<tr valign=top bgcolor=#99cc33><td background="/images/background-mem.gif" colspan=2><B>COMPANY DETAILS</B></td></tr>
-<TR VALIGN=TOP>
-<TD><b>Company Name</b></td>
-<td><input type=text size=20 name=company value="$booksellers[0]->{'name'}">
-</td>
-</tr>
-<TR VALIGN=TOP>
-<TD>Postal Address</td>
-<td><textarea name=company_postal cols=20 rows=3>$booksellers[0]->{'postal'}
-</textarea></td>
-</tr>
-<TR VALIGN=TOP>
-<TD>Physical Address</td>
-<td><textarea name=physical cols=20 rows=4>$booksellers[0]->{'address1'}
-$booksellers[0]->{'address2'}
-$booksellers[0]->{'address3'}
-$booksellers[0]->{'address4'}
-</textarea>
-</td>
-</tr>
-<TR VALIGN=TOP>
-<TD>Phone</td>
-<td><input type=text size=20 name=company_phone value="$booksellers[0]->{'phone'}">
-</td>
-</tr>
-<TR VALIGN=TOP>
-<TD>Fax</td>
-<td><input type=text size=20 name=company_fax value="$booksellers[0]->{'fax'}">
-</td>
-</tr>
-<TR VALIGN=TOP>
-<TD>Website</td>
-<td><input type=text size=20 name=website value="$booksellers[0]->{'url'}">
-</td>
-</tr>
-<tr valign=top bgcolor=#99cc33><td background="/images/background-mem.gif" colspan=2><B>CONTACT DETAILS</B></td></tr>
-<TR VALIGN=TOP>
-<TD>Contact Name</td>
-<td><input type=text size=20 name=company_contact_name value="$booksellers[0]->{'contact'}">
-</td>
-</tr>
-<TR VALIGN=TOP>
-<TD>Position</td>
-<td><input type=text size=20 name=company_contact_position value="$booksellers[0]->{'contpos'}">
-</td>
-</tr>
-<TR VALIGN=TOP>
-<TD>Phone</td>
-<td><input type=text size=20 name=contact_phone value="$booksellers[0]->{'contphone'}">
-</td>
-</tr>
-<TR VALIGN=TOP>
-<TD>Alternative Phone</td>
-<td><input type=text size=20 name=contact_phone_2 value="$booksellers[0]->{'contaltphone'}">
-</td>
-</tr>
-<TR VALIGN=TOP>
-<TD>Fax</td>
-<td><input type=text size=20 name=contact_fax value="$booksellers[0]->{'contfax'}">
-</td>
-</tr>
-<TR VALIGN=TOP>
-<TD>E-mail</td>
-<td><input type=text size=20 name=company_email value="$booksellers[0]->{'contemail'}">
-</td>
-</tr>
-<TR VALIGN=TOP>
-<TD>Notes</td>
-<td><textarea name=notes cols=20 rows=4>$booksellers[0]->{'contnotes'}</textarea>
-</td>
-</tr>
-<tr valign=right><td><input type=image  name=submit src=/images/save-changes.gif border=0 width=187 height=42 align=right></td></tr>
-</table>
-<img src="/images/holder.gif" width=32 height=250 align=left>
-
-<table border=1 cellspacing=0 cellpadding=5 width="40%">
-<tr valign=top bgcolor=#99cc33><td background="/images/background-mem.gif" colspan=2><B>CURRENT STATUS</B></td></tr>
-<TR VALIGN=TOP>
-<TD>Supplier is</td>
-<td><input type=radio name=status value=1
-EOP
-;
-if ($booksellers[0]->{'active'}==1){
-  print " checked ";
-}
-print ">Active
-<input type=radio name=status value=0";
-if ($booksellers[0]->{'active'}==0){
-  print " checked ";
-}
-print <<EOP
->Inactive
-</td>
-</tr>
-<tr valign=top bgcolor=#99cc33><td background="/images/background-mem.gif" colspan=2><B>ORDERING INFORMATION</B></td></tr>
-<TR VALIGN=TOP>
-<TD>Publishers and Imprints</td>
-<td><textarea name=publishers_imprints cols=20 rows=4>$booksellers[0]->{'specialty'}</textarea>
-</td>
-</tr>
-<TR VALIGN=TOP>
-<TD>List Prices are</td>
-<td><select name=list_currency size=1>
-<option value=NZD
-EOP
-;
-if ($booksellers[0]->{'listprice'} eq 'NZD'){
-  print " selected";
-}
-print ">\$ NZ
-<option value=AUD";
-if ($booksellers[0]->{'listprice'} eq 'AUD'){
-  print " selected";
-}
-print ">\$ Aus
-<option value=USD";
-if ($booksellers[0]->{'listprice'} eq 'USD'){
-  print " selected";
-}
-print ">\$ USA
-<option value=UKP";
-if ($booksellers[0]->{'listprice'} eq 'UKP'){
-  print " selected";
-}
-
-print <<EOP
->&pound; Sterling
-</select>
-</td>
-</tr>
-<TR VALIGN=TOP>
-<TD>Invoice Prices are</td>
-<td><select name=invoice_currency size=1>
-<option value=NZD
-EOP
-;
-if ($booksellers[0]->{'invoiceprice'} eq 'NZD'){
-  print " selected";
-}
-print ">\$ NZ
-<option value=AUD";
-if ($booksellers[0]->{'invoiceprice'} eq 'AUD'){
-  print " selected";
-}
-print ">\$ Aus
-<option value=USD";
-if ($booksellers[0]->{'invoiceprice'} eq 'USD'){
-  print " selected";
-}
-print ">\$ USA
-<option value=UKP";
-if ($booksellers[0]->{'invoiceprice'} eq 'UKP'){
-  print " selected";
-}
-print <<EOP
->&pound; Sterling
-</select>
-</td>
-</tr>
-<TR VALIGN=TOP>
-<TD>GST Registered</td>
-<td><input type=radio name=gst value=1
-EOP
-;
-if ($booksellers[0]->{'gstreg'}==1){
-  print " checked";
-}
-print ">Yes
-<input type=radio name=gst value=0";
-if ($booksellers[0]->{'gstreg'}==0){
-  print " checked";
-}
-print <<EOP
->No
-</td>
-</tr>
-<TR VALIGN=TOP>
-<TD>List Item Price Includes GST</td>
-<td><input type=radio name=list_gst value=1
-EOP
-;
-if ($booksellers[0]->{'listincgst'}==1){
-  print " checked";
-}
-print ">Yes
-<input type=radio name=list_gst value=0";
-if ($booksellers[0]->{'listincgst'}==0){
-  print " checked";
-}
-print <<EOP
->No
-</td>
-</tr>
-<TR VALIGN=TOP>
-<TD>Invoice Item Price Includes GST</td>
-<td><input type=radio name=invoice_gst value=1
-EOP
-;
-if ($booksellers[0]->{'invoiceincgst'}==1){
-  print " checked";
-}
-print ">Yes
-<input type=radio name=invoice_gst value=0";
-if ($booksellers[0]->{'invoiceincgst'}==0){
-  print " checked";
-}
-print <<EOP
->No
-</td>
-</tr>
-<TR VALIGN=TOP>
-<TD>Discount</td>
-<td><input type=text size=3 name=discount value=$booksellers[0]->{'discount'}> %
-</tr>
-</table>
-
-</form>
-</center>
-EOP
-;
-
-
-print endmenu('acquisitions');
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "acqui/supplier.tmpl",
+                            query => $query,
+                            type => "intranet",
+                            authnotrequired => 0,
+                            flagsrequired => {acquisition => 1},
+                            debug => 1,
+                            });
+#build array for currencies
+my  ($count, $currencies) = &getcurrencies();
+my @loop_pricescurrency;
+my @loop_invoicecurrency;
+for (my $i=0;$i<$count;$i++) {
+       if ($booksellers[0]->{'listprice'} eq $currencies->[$i]->{'currency'}) {
+               push @loop_pricescurrency, { currency => "<option selected value=\"$currencies->[$i]->{'currency'}\">$currencies->[$i]->{'currency'}</option>" };
+       } else {
+               push @loop_pricescurrency, { currency => "<option value=\"$currencies->[$i]->{'currency'}\">$currencies->[$i]->{'currency'}</option>"};
+       }
+       if ($booksellers[0]->{'invoiceprice'} eq $currencies->[$i]->{'currency'}) {
+               push @loop_invoicecurrency, { currency => "<option selected value=\"$currencies->[$i]->{'currency'}\">$currencies->[$i]->{'currency'}</option>"};
+       } else {
+               push @loop_invoicecurrency, { currency => "<option value=\"$currencies->[$i]->{'currency'}\">$currencies->[$i]->{'currency'}</option>"};
+       }
+}
+$template->param(id => $id,
+                                       name => $booksellers[0]->{'name'},
+                                       postal =>$booksellers[0]->{'postal'},
+                                       address1 => $booksellers[0]->{'address1'},
+                                       address2 => $booksellers[0]->{'address2'},
+                                       address3 => $booksellers[0]->{'address3'},
+                                       address4 => $booksellers[0]->{'address4'},
+                                       phone =>$booksellers[0]->{'phone'},
+                                       fax => $booksellers[0]->{'fax'},
+                                       url => $booksellers[0]->{'url'},
+                                       contact => $booksellers[0]->{'contact'},
+                                       contpos => $booksellers[0]->{'contpos'},
+                                       contphone => $booksellers[0]->{'contphone'},
+                                       contaltphone => $booksellers[0]->{'contaltphone'},
+                                       contfax => $booksellers[0]->{'contfax'},
+                                       contemail => $booksellers[0]->{'contemail'},
+                                       contnotes => $booksellers[0]->{'contnotes'},
+                                       active => $booksellers[0]->{'active'},
+                                       specialty => $booksellers[0]->{'specialty'},
+                                       gstreg => $booksellers[0]->{'gstreg'},
+                                       listinggst => $booksellers[0]->{'listincgst'},
+                                       invoiceincgst => $booksellers[0]->{'invoiceincgst'},
+                                       discount => $booksellers[0]->{'discount'},
+                                       loop_pricescurrency => \@loop_pricescurrency,
+                                       loop_invoicecurrency => \@loop_invoicecurrency,);
 
-print endpage;
+output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl
new file mode 100644 (file)
index 0000000..cc164a9
--- /dev/null
@@ -0,0 +1,118 @@
+<TMPL_INCLUDE name="acquisitions-top.inc">
+
+<FONT SIZE=6><em>Acquisitions</em></FONT><br>
+
+<TABLE align="left" width="40%" cellspacing=0 cellpadding=5 border=1 >
+<TR VALIGN=TOP>
+       <TD  bgcolor="ffdf61" colspan=2>
+               <b>START, RECEIVE, MODIFY ANY ORDER</b>
+       </TD>
+</TR>
+<TR VALIGN=TOP>
+       <TD>Supplier ID or Name</TD>
+       <TD>
+               <form action="/cgi-bin/koha/acqui/order.pl" method=post>
+               <INPUT TYPE="text"  SIZE="25"   NAME="supplier">
+               </form>
+       </TD>
+</TR>
+</table>
+<img src="/images/holder.gif" width=24 height=50 align=left>
+
+<TABLE width="40%" cellspacing=0 cellpadding=5 border=1 >
+<TR VALIGN=TOP>
+       <TD  bgcolor="ffdf61" colspan=2>
+               <b>RECEIVE OR MODIFY PERIODICAL ORDER</b>
+       </TD>
+</TR>
+<TR VALIGN=TOP>
+       <TD>Title Search</TD>
+       <TD>
+               <FORM ACTION="/cgi-bin/koha/acqui/acquire.pl" method=post>
+               <INPUT TYPE="text"  SIZE="25"   NAME="recieve">
+               </form>
+       </TD>
+</TR>
+</table>
+
+<br />
+
+<!-- currencies-->
+<TABLE align="left" cellspacing=0 cellpadding=5 border=1 >
+       <FORM ACTION="/cgi-bin/koha/currency.pl">
+       <input type=hidden name=type value=change>
+       <TR VALIGN=TOP>
+               <TD  bgcolor="ffdf61" colspan=2><b>EXCHANGE RATES </b></TD>
+       </TR>
+       <TMPL_LOOP name="loop_currency">
+               <TR VALIGN=TOP>
+                       <TD>
+                               <TMPL_VAR name="currency">
+                       </td>
+                       <td>
+                               <INPUT TYPE="text"  SIZE="10"   NAME="<TMPL_VAR name="currency">" value=<TMPL_VAR name="rate">>
+                       </td>
+               </TR>
+       </TMPL_LOOP>
+       <tr>
+               <td colspan=2 align="center"><input type=submit value="Save"></TD>
+       </tr>
+       </form>
+</table>
+
+<img src="/images/holder.gif" width=24 height=50 align=left>
+
+<!-- showbudget-->
+<TABLE  width="40%"  cellspacing=0 cellpadding=5 border=1 >
+<FORM ACTION="/cgi-bin/koha/search.pl">
+<TR VALIGN=TOP>
+       <TD  bgcolor="ffdf61" colspan=2><b>BUDGETS AND BOOKFUNDS</b></TD>
+</TR>
+<TR VALIGN=TOP>
+       <TD colspan=2>
+               <table cellspacing=0 cellpadding=2 border=1>
+                       <tr>
+                               <td><b>Budgets</B></TD>
+                               <TD><b>Total</B></TD>
+                               <TD><b>Spent</B></TD>
+                               <TD><b>Comtd</B></TD>
+                               <TD><b>Avail</B></TD>
+                       </TR>
+                       <TMPL_LOOP name="loop_budget">
+                               <tr>
+                                       <td><TMPL_VAR name="bookfundname"></TD>
+                                       <TD><TMPL_VAR name="budgetamount"></TD>
+                                       <TD><TMPL_VAR name="spent"></TD>
+                                       <TD><TMPL_VAR name="comtd"></TD>
+                                       <TD><TMPL_VAR name="avail"></TD>
+                               </TR>
+                       </TMPL_LOOP>
+                       <tr>
+                               <td><b>Total</b></TD>
+                               <TD><b><TMPL_VAR name="total"></b></TD>
+                               <TD><b><TMPL_VAR name="totspent"></b></TD>
+                               <TD><b><TMPL_VAR name="totcomtd"></b></TD>
+                               <TD><b><TMPL_VAR name="totavail"></b></TD>
+                       </TR>
+               </table><br>
+               Use your reload button [ctrl + r] to get the most recent figures.
+               Committed figures are approximate only, as exchange rates will affect the amount actually paid.
+       </TD>
+</TR>
+</form>
+</table>
+
+<br />
+<TABLE cellspacing=0 cellpadding=5 border=1 >
+<TR VALIGN=TOP>
+       <TD  bgcolor="ffdf61" colspan=2>
+               <b>HELP</b><br>
+               <b>Ordering:</b> <p>To start an acquisition, whether an order, local purchase or donation first search on the supplier, you will be asked to check their details, and enter your name which  will set up a "shopping basket" for you. (Why is this you might ask... well because we want to know that it's really you ordering things - not just your computer).</p>
+               <p>To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.  </p>
+               <p>To start a new shopping basket with a new supplier return to this page and just start a new supplier search.</p>
+               <p>To close off a shopping basket click on "view shopping baskets" or search above, and the click on "confirm basket".</p>
+       </td>
+</TR>
+</table>
+
+<TMPL_INCLUDE name="acquisitions-bottom.inc">
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl
new file mode 100644 (file)
index 0000000..7b62af3
--- /dev/null
@@ -0,0 +1,46 @@
+<TMPL_INCLUDE name="acquisitions-top.inc">
+<FONT SIZE=6><em>Supplier Search Results</em></FONT>
+<div align=right>
+<a href=supplier.pl?id=0><img  alt="Add New Supplier" src="/images/new-supplier.gif"  WIDTH=187  HEIGHT=42 BORDER=0 border=0></a>
+</div>
+<CENTER>
+You searched on <b>supplier <TMPL_VAR name="supplier">,</b> <TMPL_VAR name="count"> results found<p>
+<table border=0 cellspacing=0 cellpadding=5 width="80%">
+<tr valign=top bgcolor=#99cc33>
+       <td background="/images/background-mem.gif" width="20%">&nbsp;</td>
+       <td background="/images/background-mem.gif" width="30%"><b>Company</b></td>
+       <td background="/images/background-mem.gif" width="50%">
+               <table width="100%" border=0 cellspacing=0 cellpadding=5>
+                       <tr>
+                               <td width="15%"><b>Basket</b></td>
+                               <td width="15%"><b>Items</b></td>
+                               <td width="40%"><b>Staff</b></td>
+                               <td width="30%"><b>Date</b></td>
+                       </tr>
+               </table>
+       </td>
+</tr>
+
+<TMPL_LOOP name="loop_suppliers">
+       <tr valign=top bgcolor=<TMPL_VAR name="color">>
+               <td>
+                       <a href="newbasket.pl?id=<TMPL_VAR name="id">"><img src="/images/new-basket-short.gif" alt="New Basket" width=70 height=30 border=0 ></a>
+                       <a href="recieveorder.pl?id=<TMPL_VAR name="id">"><img src="/images/receive-order-short.gif" alt="Receive Order" width=70 height=30 border=0 ></a>
+               </td>
+               <td><a href="supplier.pl?id=<TMPL_VAR name="id">"><TMPL_VAR name="name"></a></td>
+               <td>
+                       <table width="100%" cellspacing=0 cellpadding=5 border=0>
+                               <TMPL_LOOP name="loop_basket">
+                                       <tr>
+                                               <td width="15%"><a href="/cgi-bin/koha/acqui/basket.pl?basket=<TMPL_VAR name="basketno">"><TMPL_VAR name="basketno"></a></td>
+                                               <td width="15%"><TMPl_VAR name="total"></td>
+                                               <td width="40%"><TMPL_VAR name="authorisedby"></td>
+                                               <td width="30%"><TMPL_VAR name="entrydate"></td>
+                                       </tr>
+                               </TMPL_LOOP>
+                       </table>
+       </tr>
+</TMPL_LOOP>
+</table>
+</CENTER>
+<TMPL_INCLUDE name="acquisitions-bottom.inc">
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl
new file mode 100644 (file)
index 0000000..90db94a
--- /dev/null
@@ -0,0 +1,153 @@
+<TMPL_INCLUDE name="acquisitions-top.inc">
+
+<form action=updatesupplier.pl method=post>
+
+<input type=hidden name=id value=<TMPL_VAR name="id">>
+<FONT SIZE=6><em>Update: <TMPL_VAR name="name"></em></FONT>
+<P>
+<CENTER>
+<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
+<tr valign=top bgcolor=#99cc33><td background="/images/background-mem.gif" colspan=2><B>COMPANY DETAILS</B></td></tr>
+<TR VALIGN=TOP>
+<TD><b>Company Name</b></td>
+<td><input type=text size=20 name=company value="<TMPL_VAR name="name">">
+</td>
+</tr>
+<TR VALIGN=TOP>
+<TD>Postal Address</td>
+<td><textarea name=company_postal cols=20 rows=3><TMPL_VAR name="postal">
+</textarea></td>
+</tr>
+<TR VALIGN=TOP>
+<TD>Physical Address</td>
+<td><textarea name=physical cols=20 rows=4><TMPL_VAR name="address1">
+<TMPL_VAR name="address2">
+<TMPL_VAR name="address3">
+<TMPL_VAR name="address4">
+</textarea>
+</td>
+</tr>
+<TR VALIGN=TOP>
+<TD>Phone</td>
+<td><input type=text size=20 name=company_phone value="<TMPL_VAR name="phone">">
+</td>
+</tr>
+<TR VALIGN=TOP>
+<TD>Fax</td>
+<td><input type=text size=20 name=company_fax value="<TMPL_VAR name="fax">">
+</td>
+</tr>
+<TR VALIGN=TOP>
+<TD>Website</td>
+<td><input type=text size=20 name=website value="<TMPL_VAR name="url">">
+</td>
+</tr>
+<tr valign=top bgcolor=#99cc33><td background="/images/background-mem.gif" colspan=2><B>CONTACT DETAILS</B></td></tr>
+<TR VALIGN=TOP>
+<TD>Contact Name</td>
+<td><input type=text size=20 name=company_contact_name value="<TMPL_VAR name="contact">">
+</td>
+</tr>
+<TR VALIGN=TOP>
+<TD>Position</td>
+<td><input type=text size=20 name=company_contact_position value="<TMPL_VAR name="contpos">">
+</td>
+</tr>
+<TR VALIGN=TOP>
+<TD>Phone</td>
+<td><input type=text size=20 name=contact_phone value="<TMPL_VAR name="contphone">">
+</td>
+</tr>
+<TR VALIGN=TOP>
+<TD>Alternative Phone</td>
+<td><input type=text size=20 name=contact_phone_2 value="<TMPL_VAR name="contaltphone">">
+</td>
+</tr>
+<TR VALIGN=TOP>
+<TD>Fax</td>
+<td><input type=text size=20 name=contact_fax value="<TMPL_VAR name="contfax">">
+</td>
+</tr>
+<TR VALIGN=TOP>
+<TD>E-mail</td>
+<td><input type=text size=20 name=company_email value="<TMPL_VAR name="contemail">">
+</td>
+</tr>
+<TR VALIGN=TOP>
+<TD>Notes</td>
+<td><textarea name=notes cols=20 rows=4><TMPL_VAR name="contnotes"></textarea>
+</td>
+</tr>
+<tr valign=right><td><input type=image  name=submit src=/images/save-changes.gif border=0 width=187 height=42 align=right></td></tr>
+</table>
+<img src="/images/holder.gif" width=32 height=250 align=left>
+
+<table border=1 cellspacing=0 cellpadding=5 width="40%">
+       <tr valign=top bgcolor=#99cc33>
+               <td background="/images/background-mem.gif" colspan=2><B>CURRENT STATUS</B></td>
+       </tr>
+       <TR VALIGN=TOP>
+               <TD>Supplier is</td>
+               <td><input type="radio" name="status" value="1" <TMPL_IF name="active">checked</TMPL_IF>>Active
+                       <input type="radio" name="status" value="0" <TMPL_UNLESS name="active">checked</TMPL_UNLESS>>Inactive</td>
+       </tr>
+       <tr valign=top bgcolor=#99cc33>
+               <td background="/images/background-mem.gif" colspan=2><B>ORDERING INFORMATION</B></td>
+       </tr>
+       <TR VALIGN=TOP>
+               <TD>Publishers and Imprints</td>
+               <td><textarea name="publishers_imprints" cols=20 rows=4><TMPL_VAR name="specialty"></textarea>
+               </td>
+       </tr>
+       <TR VALIGN=TOP>
+               <TD>List Prices are</td>
+               <td>
+                       <select name=list_currency size=1>
+                       <TMPL_LOOP name="loop_pricescurrency">
+                               <TMPL_VAR name="currency">
+                       </TMPL_LOOP>
+                       </select>
+               </td>
+       </tr>
+       <TR VALIGN=TOP>
+               <TD>Invoice Prices are</td>
+               <td>
+                       <select name=invoice_currency size=1>
+                       <TMPL_LOOP name="loop_invoicecurrency">
+                               <TMPL_VAR name="currency">
+                       </TMPL_LOOP>
+                       </select>
+               </td>
+       </tr>
+       <TR VALIGN=TOP>
+               <TD>GST Registered</td>
+               <td>
+                       <input type=radio name=gst value=1 <TMPL_IF name="gstreg">checked</TMPL_IF>>Yes
+                       <input type=radio name=gst value=0 <TMPL_UNLESS name="gstreg">checked</TMPL_UNLESS>>No
+               </td>
+       </tr>
+       <TR VALIGN=TOP>
+               <TD>List Item Price Includes GST</td>
+               <td>
+                       <input type=radio name=list_gst <TMPL_IF name="listincgst">checked</TMPL_IF>>Yes
+                       <input type=radio name=list_gst value=0 <TMPL_UNLESS name="listincgst">checked</TMPL_UNLESS>>No
+               </td>
+       </tr>
+       <TR VALIGN=TOP>
+               <TD>Invoice Item Price Includes GST</td>
+               <td>
+                       <input type=radio name=invoice_gst value=1 <TMPL_IF name= "invoiceincgst">checked</TMPL_IF>>Yes
+                       <input type=radio name=invoice_gst value=0 <TMPL_UNLESS name="invoiceincgst">checked</TMPL_UNLESS>>No
+               </td>
+       </tr>
+       <TR VALIGN=TOP>
+               <TD>Discount</td>
+               <td><input type=text size=3 name=discount value=<TMPL_VAR name="discount">> %
+       </tr>
+</table>
+
+</form>
+</center>
+
+
+<TMPL_INCLUDE name="acquisitions-bottom.inc">