Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 5059: Inconsistent use of ordering price and list price in vendor form

Browse source 
Changes Ordering price to List price and make spelling more consistent.

Patch originally send for 3.2, still applied to HEAD without conflicts.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This commit is contained in:
Katrin Fischer 2010-11-12 15:41:51 -05:00 committed by Chris Cormack
parent 11d54188f8
commit 3152938684
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
View file

@ -57,7 +57,7 @@ if (f.company.value == "") {
</fieldset>
<fieldset class="rows">
<legend>Contact details</legend>
<ol> <li><label for="company_contact_name">Contact Name</label>
<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>
@ -86,7 +86,7 @@ if (f.company.value == "") {
<!-- /TMPL_IF --></li>
</ol>
<ol>
<li><label for="list_currency">List Prices are</label>
<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" -->"
@ -95,7 +95,7 @@ if (f.company.value == "") {
<!-- /TMPL_LOOP -->
</select>
</li>
<li><label for="invoice_currency">Invoice Prices are</label>
<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" -->"
@ -115,7 +115,7 @@ if (f.company.value == "") {
<label for="gstno">No</label> <input type="radio" name="gst" id="gstno" value="0" checked="checked" />
<!-- /TMPL_IF --></li><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="GST" --><li><label for="list_gstyes" class="radio">Ordering prices:</label>
<!-- TMPL_IF NAME="GST" --><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" />
@ -187,8 +187,8 @@ if (f.company.value == "") {
<!-- 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>
<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>