Synching with default template

This commit is contained in:
oleonard 2006-03-07 16:56:04 +00:00
parent 74c4d95f54
commit cbfcffc4f7
4 changed files with 292 additions and 84 deletions

View File

@ -20,7 +20,7 @@
<td>
<a href="recieveorder.pl?id=<!-- TMPL_VAR name="supplierid" -->">Receive</a>
</td>
<td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->"><!-- TMPL_VAR name="name" --></a></td>
<td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->&amp;op=display"><!-- TMPL_VAR name="name" --></a></td>
<td>
<div class="data"><table>
<tr>

View File

@ -4,71 +4,103 @@
<div id="main">
<h1>Receipt Summary for : <!-- TMPL_VAR name="name" -->, Invoice <!-- TMPL_VAR name="invoice" --></h1>
<h1>
Receipt Summary for <i><!-- TMPL_VAR NAME="name" --></i> Invoice <i><!-- TMPL_VAR NAME="invoice" --></i>
</h1>
<ul>
<li>Invoice: <!-- TMPL_VAR name="invoice" --></li>
<li>Received By: <!-- TMPL_VAR name="user" --></li>
<li>Date: <!-- TMPL_VAR name="date" --></li>
</ul>
<form action="/cgi-bin/koha/acqui/acquire.pl">
<input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
<input type="hidden" name="gst" value="<!-- TMPL_VAR name="gst" -->" />
<input type="hidden" name="freight" value="<!-- TMPL_VAR name="freight" -->" />
<input type="hidden" name="invoice" value="<!-- TMPL_VAR name="invoice" -->" />
<b>Search ISBN or Title:</b> <input type="text" size="25" name="recieve" /><input type="submit" class="submit" value="Search" />
</form>
<form method="get" name="orderform">
<table>
<tr>
<th>Basket</th>
<th>ISBN</th>
<th>Title</th>
<th>Author</th>
<th>Actual</th>
<th>P&amp;P</th>
<th>Qty</th>
<th>Total</th>
</tr>
<!-- TMPL_LOOP name="loop_orders" -->
<h2> Items in parcel</h2>
<h5>
<!-- TMPL_VAR NAME="countreceived" --> bibliographic record(s) received
</h5>
<table>
<tr>
<td><!-- TMPL_VAR name="basketno" --></td>
<td><!-- TMPL_VAR name="isbn" --></td>
<td><a href="acquire.pl?recieve=<!-- TMPL_VAR name="ordernumber" -->&amp;biblio=<!-- TMPL_VAR name="biblionumber" -->&amp;invoice=<!-- TMPL_VAR name="invoice" -->&amp;gst=<!-- TMPL_VAR name="gst" -->&amp;freight=<!-- TMPL_VAR name="freight" -->&amp;id=<!-- TMPL_VAR name="id" -->"><!-- TMPL_VAR name="title" --></a></td>
<td><!-- TMPL_VAR name="author" --></td>
<td>$<!-- TMPL_VAR name="unitprice" --></td>
<td>&nbsp;</td>
<td><!-- TMPL_VAR name="quantityrecieved" --></td>
<td>$<!-- TMPL_VAR name="total" --></td>
<th>Basket</th>
<th>ISBN</th>
<th>Title</th>
<th>Author</th>
<th>Est. cost</th>
<th>Qty ordered</th>
<th>P&amp;P</th>
<th>Actual</th>
<th>Qty</th>
<th>Total</th>
</tr>
<!-- /TMPL_LOOP -->
<tr>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td><b>Subtotals</b></td>
<td>$<!-- TMPL_VAR name="totalprice" --></td>
<td><!-- TMPL_VAR name="totalfreight" --></td>
<td><!-- TMPL_VAR name="totalquantity" --></td>
<td>$<!-- TMPL_VAR name="tototal" --></td>
</tr>
<tr>
<td colspan="5">
<b>HELP</b>
<p>
The total at the bottom of the page should be within a few cents of the total for the invoice.</p>
</td>
<td colspan="2"><b>GST</b></td>
<td>$<!-- TMPL_VAR name="gst" --></td>
</tr>
<tr>
<td colspan="5">&nbsp;</td>
<td colspan="2"><b>TOTAL</b></td>
<td>$<!-- TMPL_VAR name="grandtot" --></td>
</tr>
</table>
<!-- TMPL_LOOP NAME="loop_received" -->
<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
<td><!-- TMPL_VAR NAME="basketno" --></td>
<td><!-- TMPL_VAR NAME="isbn" --></td>
<td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->&catview=yes"><!-- TMPL_VAR NAME="title" --></a></td>
<td><!-- TMPL_VAR NAME="author" --></td>
<td><!-- TMPL_VAR NAME="ecost" --></td>
<td><!-- TMPL_VAR NAME="quantity" --></td>
<td>&nbsp;</td>
<td><!-- TMPL_VAR NAME="unitprice" --></td>
<td><!-- TMPL_VAR NAME="quantityrecieved" --></td>
<td><!-- TMPL_VAR NAME="total" --></td>
</tr>
<!-- /TMPL_LOOP -->
<tr>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th><!-- TMPL_VAR NAME="tototal" --></th>
</tr>
<tr>
<td colspan="7" rowspan="2">
<div class="help"><h3>HELP</h3>
<p>The total at the bottom of the page should be within a few cents of the total for the invoice.</p></div>
</td>
<td colspan="2" scope="row">GST</td>
<td><!-- TMPL_VAR NAME="gst" --></td>
</tr>
<tr>
<td colspan="2" scope="row">TOTAL</td>
<td><!-- TMPL_VAR NAME="grandtot" --></td>
</tr>
</table>
<div class="data">
<h2>Pending orders </h2>
<form action="/cgi-bin/koha/acqui/acquire.pl">
<input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->">
<input type="hidden" name="gst" value="<!-- TMPL_VAR NAME="gst" -->">
<input type="hidden" name="freight" value="<!-- TMPL_VAR NAME="freight" -->">
<input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->">
<b>Search ISBN or Title:</b> <input type="text" size="25" name="recieve">
</form>
</div>
<table>
<tr>
<th>Basket</th>
<th>ISBN</th>
<th>Title</th>
<th>Author</th>
</tr>
<!-- TMPL_VAR NAME="countpending" -->
<!-- TMPL_LOOP NAME="loop_orders" -->
<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
<td><!-- TMPL_VAR NAME="basketno" --></td>
<td><!-- TMPL_VAR NAME="isbn" --></td>
<td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="title" --></a></td>
<td><!-- TMPL_VAR NAME="author" --></td>
</tr>
<!-- /TMPL_LOOP -->
</table>
</div>
</div>
<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

View File

@ -3,28 +3,91 @@
<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
<div id="main">
<h1>Receive Orders From Supplier <a href="whitcoulls.html"><!-- TMPL_VAR name="name" --></a></h1>
<form method="get" action="receive.pl">
<input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
<div class="data">
<table>
<caption>Supplier Invoice Information</caption>
<tr>
<th>Supplier Invoice Number</th>
<td><input type="text" size="20" name="invoice" />
</td>
<h1>Receive Orders From Supplier <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
<!-- TMPL_IF NAME="count" --><p> <!-- TMPL_VAR NAME="count" --> parcels found</p><!--/TMPL_IF-->
<div id="resultnumber">
<!-- Row of numbers corresponding to search result pages -->
<!-- TMPL_IF NAME="displayprev" -->
<a href="recieveorder.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="prevstartfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra">&lt;&lt;</a>
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="numbers" -->
<!-- TMPL_IF NAME="highlight" --><span class="current"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE -->
<a href="recieveorder.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><!-- TMPL_VAR NAME="number" --></a>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF NAME="displaynext" -->
<a href="recieveorder.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra">&gt;&gt;
<!-- /TMPL_IF -->
</div>
<div id="resultlist">
<!-- Search Results Table -->
<!-- TMPL_IF NAME="count" -->
<form method="post" action="recieveorder.pl">
<table>
<tr>
<th>Number</th><th>Code</th><th>Date Received</th><th>Item Count</th><th>Biblio count</th><th>Items expected</th>
</tr>
<tr>
<th>GST</th>
<td><input type="text" size="20" name="gst" />
</td>
<tr>
<th>&nbsp;<input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->" /></th><th><input type="text" size="20" name="filter" value="<!-- TMPL_VAR NAME="filter" -->" /></th>
<th>From :<input type="text" size="9" name="datefrom" value="<!-- TMPL_VAR NAME="datefrom" -->" /> <p>To :<input type="text" size="9" name="dateto" value="<!-- TMPL_VAR NAME="dateto" -->" /></th><th>&nbsp;</th><th>Sort by :<select name="orderby">
<option value="aqorders.booksellerinvoicenumber"> Code</option>
<option value="datereceived"> Date Received</option>
<option value="datereceived desc"> Date Received reverse</option>
<option value="aqorders.booksellerinvoicenumber desc"> Code reverse</option>
</select><br />
Results per page :<select name="resultsperpage" value ="<!--TMPL_VAR Name="resultsperpage"-->" size="1">
<option value="20">20</option>
<option value="30">30</option>
<option value="50">50</option>
<option value="100">100</option>
</select>
</th><th><input type="submit" class="submit" value="Filter" />
</th>
</tr>
<tr>
<th>Freight</th>
<td><input type="text" size="20" name="freight" />
</td>
</tr>
</table><input type="submit" name="submit" class="submit" value="Save" />
<!-- Actual Search Results -->
<!-- TMPL_LOOP NAME="searchresults" -->
<!-- TMPL_IF NAME="even" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
<td>
<a href="/cgi-bin/koha/acqui/receive.pl?type=intra&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" ESCAPE=URL -->&amp;datereceived=<!-- TMPL_VAR NAME="datereceived" ESCAPE=URL --><!--TMPL_IF Name="code"-->&amp;code=<!--TMPL_VAR Name="code" ESCAPE=URL --><!--/TMPL_IF-->">
<!-- TMPL_VAR NAME="number" -->
</a>
</td>
<td>
<!--TMPL_IF Name="code"--><!--TMPL_VAR Name="code" --><!--/TMPL_IF-->
</td>
<td> <!-- TMPL_VAR NAME="datereceived" --> </td>
<td> <!-- TMPL_VAR NAME="reccount" --> </td>
<td><!-- TMPL_VAR NAME="bibcount" -->
</td>
<td><!-- TMPL_VAR NAME="itemcount" -->
</td>
</tr>
<!-- /TMPL_LOOP -->
</table>
</form>
<!--/TMPL_IF-->
<div class="data">
<h2> Receive a new Parcel </h2>
<form method="get" action="receive.pl">
<table><tr><th><input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->" />
<label for="invoice">Parcel Code</label></th>
<td><input type="text" size="20" id="invoice" name="invoice" /></td></tr>
<tr><th><label for="gst">GST</label></th>
<td> <input type="text" size="20" id="gst" name="gst" /></td></tr>
<tr><th><label for="freight">Freight</label></th>
<td><input type="text" size="20" id="freight" name="freight" /></td></tr>
</table>
<p><input type="submit" class="submit" value="Save" /></p>
</form>
</div>
</div>
<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

View File

@ -2,8 +2,9 @@
<!-- TMPL_INCLUDE name="masthead.inc" -->
<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
<div id="main"><form action="updatesupplier.pl" method="post">
<div id="main">
<!--TMPL_IF Name="enter"-->
<form action="updatesupplier.pl" method="post">
<input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
<!-- TMPL_IF NAME="id" -->
@ -12,7 +13,7 @@
<h1>Add supplier</h1>
<!-- /TMPL_IF -->
<div class="details"><table>
<div class="data"><table>
<caption>Company Details</caption>
<tr>
<th><label for="company">Company Name</label></td>
@ -46,7 +47,7 @@
</td>
</tr>
</table></div>
<div class="details"><table>
<div class="data"><table>
<caption>Contact Details</caption>
<tr>
<th><label for="company_contact_name">Contact Name</label></th>
@ -84,7 +85,7 @@
</tr>
</table></div>
<div class="details"><table>
<div class="data"><table>
<caption>Current Status</caption>
<tr>
<th><label for="status">Supplier is</label></th>
@ -150,6 +151,118 @@
</div>
<input type="submit" value="Save Changes" class="submit" />
</form>
<!--TMPL_ELSE-->
<h1>Information for : <!-- TMPL_VAR NAME="name" --></h1>
<form class="inline" action="recieveorder.pl" method="get"><input type="hidden" name="supplierid" value="<!--TMPL_VAR Name="id"-->" /><input type="submit" class="submit" value="Receive Parcel" /></form>
<form class="inline" action="order.pl" method="get"><input type="hidden" name="supplier" value="<!--TMPL_VAR Name="name"-->" /><input type="submit" class="submit" value="Manage Orders" /></form>
<form class="inline" action="supplier.pl" method="get"><input type="hidden" name="supplierid" value="<!--TMPL_VAR Name="id"-->" /><input type="submit" class="submit" value="Edit Supplier" /></form>
<div class="data">
<table>
<caption>Company Details</caption>
<tr><th>
Company Name: </th><td>
<!-- TMPL_VAR NAME="name" -->
</td></tr>
<tr><th>
Postal Address: </th><td>
<!-- TMPL_VAR NAME="postal" -->
</td></tr>
<tr><th>
Physical Address: </th><td>
<!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" -->
</td></tr>
<tr><th>
Phone: </th><td>
<!-- TMPL_VAR NAME="phone" -->
</td></tr>
<tr><th>
Fax: </th><td>
<!-- TMPL_VAR NAME="fax" -->
</td></tr>
<tr><th>
Website: </th><td>
<!-- TMPL_VAR NAME="url" -->
</td></tr>
</table>
<table><caption>Contact Dtails</caption>
<tr><th>
Contact Name: </th><td>
<!-- TMPL_VAR NAME="contact" -->
</td></tr>
<tr><th>
Position: </th><td>
<!-- TMPL_VAR NAME="contpos" -->
</td></tr>
<tr><th>
Phone: </th><td>
<!-- TMPL_VAR NAME="contphone" -->
</td></tr>
<tr><th>
Alternative phone: </th><td>
<!-- TMPL_VAR NAME="contaltphone" -->
</td></tr>
<tr><th>
Fax: </th><td>
<!-- TMPL_VAR NAME="contfax" -->
</td></tr>
<tr><th>
E-mail: </th><td>
<!-- TMPL_VAR NAME="contemail" -->
</td></tr>
<tr><th>
Notes: </th><td>
<!-- TMPL_VAR NAME="contnotes" -->
</td></tr>
</table>
<table><caption>Current Status</caption>
<tr><th>
Supplier is: </th><td>
<!-- TMPL_IF name="active" -->
Active
<!-- TMPL_ELSE -->
Inactive
<!-- /TMPL_IF -->
</td></tr>
</table>
<table><caption>Ordering Information</caption>
<tr><th>
Publishers and Imprints: </th><td>
<!-- TMPL_VAR NAME="specialty" -->
</td></tr>
<tr><th>
List Prices are: </th><td><!--TMPL_VAR Name="listprice"-->
</td></tr>
<tr><th>
Invoice Prices are: </th><td><!--TMPL_VAR Name="invoiceprice"-->
</td></tr>
<tr><th>
GST Registered: </th><td>
<!-- TMPL_IF name="gstreg" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF -->
</td></tr>
<tr><th>
List Item Price Includes GST: </th><td>
<!-- TMPL_IF name="listincgst" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF -->
</td></tr>
<tr><th>
Invoice Item Price Includes GST: </th><td>
<!-- TMPL_IF name= "invoiceincgst" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF -->
</td></tr>
<tr><th>
Discount: </th><td>
<!-- TMPL_VAR NAME="discount" --> %
</td></tr>
</table>
</div>
<!--/TMPL_IF-->
</div>
<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->