8e5ee007db
This allows the tax rate for a vendor to be set to zero. Previously, a zero meant that the system default was used. Now, zero means no tax, and to have it be the default the field should simply be left empty. Additionally: * this will now show on the vendor display if the tax value is from the system default * this includes a database update that changes all the existing 0.00 tax settings to be NULL, which preserves existing behaviour. * this now saves the tax value supplied for new vendors Note: this patch applies against master Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
231 lines
15 KiB
Cheetah
231 lines
15 KiB
Cheetah
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
|
|
<title>Koha › Vendor <!-- TMPL_VAR name="bookselname" --></title>
|
|
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
|
|
<script type="text/javascript">
|
|
//<![CDATA[
|
|
function confirm_deletion() {
|
|
if (confirm(_("Confirm deletion of this vendor ?"))) {
|
|
window.location="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&op=delete";
|
|
}
|
|
}
|
|
function check(f) {
|
|
if (f.company.value == "") {
|
|
alert(_("You must specify a name for this vendor."));
|
|
return false;
|
|
}
|
|
f.submit();
|
|
}
|
|
//]]>
|
|
</script>
|
|
</head>
|
|
<body>
|
|
<!-- TMPL_INCLUDE NAME="header.inc" -->
|
|
<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
|
|
|
|
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <!--TMPL_IF Name="enter"--><!-- TMPL_IF name="id" --> <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="name" --></a> › Update: <!-- TMPL_VAR NAME="name" --><!-- TMPL_ELSE -->Add vendor<!-- /TMPL_IF --> <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="name" --><!-- /TMPL_IF --></div>
|
|
|
|
<div id="doc" class="yui-t7">
|
|
|
|
<div id="bd">
|
|
<div id="yui-main">
|
|
<!--TMPL_IF Name="enter"-->
|
|
<!-- TMPL_IF name="id" -->
|
|
<h1>Update: <!-- TMPL_VAR NAME="name" --></h1>
|
|
<!-- TMPL_ELSE -->
|
|
<h1>Add vendor</h1>
|
|
<!-- /TMPL_IF -->
|
|
<!-- /TMPL_IF -->
|
|
<!-- TMPL_UNLESS NAME="enter" --><!-- TMPL_INCLUDE NAME="acquisitions-toolbar.inc" --><!-- /TMPL_UNLESS -->
|
|
<!--TMPL_IF Name="enter"-->
|
|
<form action="updatesupplier.pl" name="updatesupplier" method="post">
|
|
<div class="yui-g">
|
|
<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
|
|
<fieldset class="rows">
|
|
<legend>Company details</legend>
|
|
<ol><li><label for="company" class="required">Name * </label>
|
|
<input type="text" size="40" id="company" name="company" value="<!-- TMPL_VAR NAME="name" -->" /></li>
|
|
<li><label for="company_postal">Postal address</label>
|
|
<textarea id="company_postal" name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea></li>
|
|
<li><label for="physical">Physical address</label>
|
|
<textarea id="physical" name="physical" cols="40" rows="3"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea></li>
|
|
<li><label for="company_phone">Phone</label>
|
|
<input type="text" size="20" id="company_phone" name="company_phone" value="<!-- TMPL_VAR NAME="phone" -->" /></li>
|
|
<li><label for="company_fax">Fax</label>
|
|
<input type="text" size="20" id="company_fax" name="company_fax" value="<!-- TMPL_VAR NAME="fax" -->" /></li>
|
|
<li><label for="website">Website</label>
|
|
<input type="text" size="40" id="website" name="website" value="<!-- TMPL_VAR NAME="url" -->" /></li></ol>
|
|
</fieldset>
|
|
<fieldset class="rows">
|
|
<legend>Contact details</legend>
|
|
<ol> <li><label for="company_contact_name">Contact name</label>
|
|
<input type="text" size="40" id="company_contact_name" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->" /></li>
|
|
<li><label for="company_contact_position">Position</label>
|
|
<input type="text" size="40" id="company_contact_position" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->" /></li>
|
|
<li><label for="contact_phone">Phone</label>
|
|
<input type="text" size="20" id="contact_phone" name="contact_phone" value="<!-- TMPL_VAR NAME="contphone" -->" /> </li>
|
|
<li><label for="contact_phone_2">Alternative phone</label>
|
|
<input type="text" size="20" id="contact_phone_2" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->" /></li>
|
|
<li><label for="contact_fax">Fax</label>
|
|
<input type="text" size="20" id="contact_fax" name="contact_fax" value="<!-- TMPL_VAR NAME="contfax" -->" /></li>
|
|
<li><label for="company_email">Email</label>
|
|
<input type="text" size="40" id="company_email" name="company_email" value="<!-- TMPL_VAR NAME="contemail" -->" /></li>
|
|
<li><label for="contact_notes">Notes</label>
|
|
<textarea id="contact_notes" name="contact_notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea></li></ol>
|
|
</fieldset>
|
|
</div>
|
|
<div class="yui-g">
|
|
<fieldset class="rows">
|
|
<legend>Ordering information</legend>
|
|
<ol class="radio"><li><label for="activestatus" class="radio">Vendor is:</label>
|
|
<!-- TMPL_IF name="active" -->
|
|
<label for="activestatus">Active</label> <input type="radio" id="activestatus" name="status" value="1" checked="checked" />
|
|
<label for="inactivestatus">Inactive</label> <input type="radio" id="inactivestatus" name="status" value="0" />
|
|
<!-- TMPL_ELSE -->
|
|
<label for="activestatus">Active</label> <input type="radio" id="activestatus" name="status" value="1" />
|
|
<label for="inactivestatus">Inactive</label> <input type="radio" id="inactivestatus" name="status" value="0" checked="checked" />
|
|
<!-- /TMPL_IF --></li>
|
|
</ol>
|
|
<ol>
|
|
<li><label for="list_currency">List prices are</label>
|
|
<select name="list_currency" id="list_currency">
|
|
<!-- TMPL_LOOP NAME="loop_currency" -->
|
|
<option value="<!-- TMPL_VAR NAME="currency" -->"
|
|
<!-- TMPL_IF NAME="listprice" -->selected="1"<!-- /TMPL_IF -->>
|
|
<!--TMPL_VAR NAME="currency" --></option>
|
|
<!-- /TMPL_LOOP -->
|
|
</select>
|
|
</li>
|
|
<li><label for="invoice_currency">Invoice prices are</label>
|
|
<select name="invoice_currency" id="invoice_currency">
|
|
<!-- TMPL_LOOP NAME="loop_currency" -->
|
|
<option value="<!-- TMPL_VAR NAME="currency" -->"
|
|
<!-- TMPL_IF NAME="invoiceprice" -->selected="1"<!-- /TMPL_IF -->>
|
|
<!--TMPL_VAR NAME="currency" --></option>
|
|
<!-- /TMPL_LOOP -->
|
|
</select>
|
|
</li>
|
|
</ol>
|
|
<ol class="radio">
|
|
<li><label for="gstyes" class="radio">Tax Number Registered:</label>
|
|
<!-- TMPL_IF name="gstreg" -->
|
|
<label for="gstyes">Yes</label> <input type="radio" name="gst" id="gstyes" value="1" checked="checked" />
|
|
<label for="gstno">No</label> <input type="radio" name="gst" id="gstno" value="0" />
|
|
<!-- TMPL_ELSE -->
|
|
<label for="gstyes">Yes</label> <input type="radio" name="gst" id="gstyes" value="1" />
|
|
<label for="gstno">No</label> <input type="radio" name="gst" id="gstno" value="0" checked="checked" />
|
|
<!-- /TMPL_IF --></li>
|
|
|
|
<li><label for="list_gstyes" class="radio">List prices:</label>
|
|
<!-- TMPL_IF name="listincgst" -->
|
|
<label for="list_gstyes">Include tax</label> <input type="radio" id="list_gstyes" name="list_gst" value="1" checked="checked" />
|
|
<label for="list_gstno">Don't include tax</label> <input type="radio" id="list_gstno" name="list_gst" value="0" />
|
|
<!-- TMPL_ELSE -->
|
|
<label for="list_gstyes">Include tax</label> <input type="radio" id="list_gstyes" name="list_gst" value="1" />
|
|
<label for="list_gstno">Don't include tax</label> <input type="radio" id="list_gstno" name="list_gst" value="0" checked="checked" />
|
|
<!-- /TMPL_IF --></li>
|
|
|
|
<li><label for="invoice_gstyes" class="radio">Invoice prices:</label>
|
|
<!-- TMPL_IF name= "invoiceincgst" -->
|
|
<label for="invoice_gstyes">Include tax</label> <input type="radio" id="invoice_gstyes" name="invoice_gst" value="1" checked="checked" />
|
|
<label for="invoice_gstno">Don't include tax</label> <input type="radio" id="invoice_gstno" name="invoice_gst" value="0" />
|
|
<!-- TMPL_ELSE -->
|
|
<label for="invoice_gstyes">Include tax</label> <input type="radio" id="invoice_gstyes" name="invoice_gst" value="1" />
|
|
<label for="invoice_gstno">Don't include tax</label> <input type="radio" id="invoice_gstno" name="invoice_gst" value="0" checked="checked" />
|
|
<!-- /TMPL_IF --></li>
|
|
</ol>
|
|
<ol>
|
|
<li><label for="discount">Discount</label>
|
|
<input type="text" size="6" id="discount" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" />%</li>
|
|
<li><label for="gstrate">Tax rate</label><input type="text" name="gstrate" id="gstrate" size="6" value="<!-- TMPL_VAR name="gstrate" -->"/>% (leave blank for default tax of <!-- TMPL_VAR name="default_gst_rate" -->%)</li>
|
|
<li><label for="notes">Notes</label>
|
|
<textarea cols="40" rows="4" id="notes" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea></li></ol>
|
|
</fieldset>
|
|
<fieldset class="action"><input type="button" value="Save" onclick="check(this.form);" /> <!--TMPL_IF Name="id"-->
|
|
<a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->"><!--TMPL_ELSE--><a class="cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
|
|
<!--/TMPL_IF-->Cancel</a></fieldset>
|
|
</div>
|
|
</form>
|
|
<!--TMPL_ELSE-->
|
|
<h1><!-- TMPL_VAR NAME="name" --></h1>
|
|
<div class="yui-g">
|
|
<div id="supplier-company-details" class="yui-u first">
|
|
<h2>Supplier details</h2>
|
|
<p><span class="label">Company Name: </span><!-- TMPL_VAR NAME="name" --></p>
|
|
<p><span class="label">Postal Address: </span><!-- TMPL_VAR NAME="postal" --></p>
|
|
<p><span class="label">Physical Address: </span><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></p>
|
|
<p><span class="label">Phone: </span><!-- TMPL_VAR NAME="phone" --></p>
|
|
<p><span class="label">Fax: </span><!-- TMPL_VAR NAME="fax" --></p>
|
|
<!-- TMPL_IF NAME="url" -->
|
|
<p><span class="label">Web site: </span><a href="<!-- TMPL_VAR NAME="url" -->"><!-- TMPL_VAR NAME="url" --></a></p>
|
|
<!-- /TMPL_IF -->
|
|
</div>
|
|
<div id="supplier-contact-details" class="yui-u">
|
|
<h2>Contact details</h2>
|
|
<p><span class="label">Contact name: </span><!-- TMPL_VAR NAME="contact" --></p>
|
|
<p><span class="label">Position: </span><!-- TMPL_VAR NAME="contpos" --></p>
|
|
<p><span class="label">Phone: </span><!-- TMPL_VAR NAME="contphone" --></p>
|
|
<p><span class="label">Alternative phone: </span><!-- TMPL_VAR NAME="contaltphone" --></p>
|
|
<p><span class="label">Fax: </span><!-- TMPL_VAR NAME="contfax" --></p>
|
|
<!-- TMPL_IF NAME="contemail" -->
|
|
<p><span class="label">Email: </span><a href="mailto:<!-- TMPL_VAR NAME="contemail" -->"><!-- TMPL_VAR NAME="contemail" --></a></p>
|
|
<!-- /TMPL_IF -->
|
|
<!-- TMPL_IF NAME="contnotes" -->
|
|
<p><span class="label">Notes: </span><!-- TMPL_VAR NAME="contnotes" --></p>
|
|
<!-- /TMPL_IF -->
|
|
</div>
|
|
</div>
|
|
<div id="supplier-ordering-information" class="yui-g">
|
|
<h3>Ordering information</h3>
|
|
<p><strong>Vendor is: </strong>
|
|
<!-- TMPL_IF name="active" -->
|
|
Active
|
|
<!-- TMPL_ELSE -->
|
|
Inactive
|
|
<!-- /TMPL_IF --></p>
|
|
<p><strong>List prices are: </strong><!--TMPL_VAR Name="listprice"--></p>
|
|
<p><strong>Invoice prices are: </strong><!--TMPL_VAR Name="invoiceprice"--></p>
|
|
<!-- TMPL_IF NAME="GST" --><p><strong>Tax Number Registered: </strong>
|
|
<!-- TMPL_IF name="gstreg" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF --></p>
|
|
<p><strong>List Item Price Includes Tax: </strong>
|
|
<!-- TMPL_IF name="listincgst" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF --></p>
|
|
<p><strong>Invoice Item Price Includes Tax: </strong>
|
|
<!-- TMPL_IF name= "invoiceincgst" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF --></p><!-- /TMPL_IF -->
|
|
<p><strong>Discount: </strong>
|
|
<!-- TMPL_VAR NAME="discount" --> %</p>
|
|
<p><strong>Tax rate: </strong>
|
|
<!-- TMPL_VAR name="GST" -->%<!-- TMPL_UNLESS name="default_tax" --> (default)<!-- /TMPL_UNLESS --></p>
|
|
<!-- TMPL_IF NAME="notes" --><p><strong>Notes: </strong>
|
|
<!-- TMPL_VAR NAME="notes" --></p><!-- /TMPL_IF -->
|
|
</div>
|
|
<!-- TMPL_IF name="contracts" -->
|
|
<div id="supplier-contracts" class="yui-g">
|
|
<h2>Contract(s)</h2>
|
|
<table>
|
|
<tr>
|
|
<th scope="col">Name</th>
|
|
<th scope="col">Description</th>
|
|
<th scope="col">Start date</th>
|
|
<th scope="col">End date</th>
|
|
<th scope="col" colspan="2"> </th>
|
|
</tr>
|
|
<!-- TMPL_LOOP NAME="contracts" -->
|
|
<!-- TMPL_IF NAME="__even__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
|
|
<td>
|
|
<a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=<!-- TMPL_VAR NAME="contractnumber" -->&booksellerid=<!-- TMPL_VAR name="booksellerid" -->"><!-- TMPL_VAR NAME="contractname" --></a>
|
|
</td>
|
|
<td><!-- TMPL_VAR NAME="contractdescription" --></td>
|
|
<td><!-- TMPL_VAR NAME="contractstartdate" --></td>
|
|
<td><!-- TMPL_VAR NAME="contractenddate" --></td>
|
|
<td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=<!-- TMPL_VAR NAME="contractnumber" -->&booksellerid=<!-- TMPL_VAR name="booksellerid" -->">Edit</a></td>
|
|
<td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&contractnumber=<!-- TMPL_VAR NAME="contractnumber" -->&booksellerid=<!-- TMPL_VAR name="booksellerid" -->">Delete</a></td>
|
|
</tr>
|
|
<!-- /TMPL_LOOP -->
|
|
</table>
|
|
</div>
|
|
<!-- /TMPL_IF -->
|
|
|
|
<!--/TMPL_IF-->
|
|
|
|
</div>
|
|
</div>
|
|
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
|