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

Merge branch 'bug_9062' into 3.12-master

Browse source
This commit is contained in:
Jared Camins-Esakov 2013-01-17 18:24:03 -05:00
commit 5e1562c699
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/history.txt
View file

@ -649,3 +649,4 @@ December 21 2012 Nadia Nicolaides becomes the 198th developer to have a patch pu
December 22 2012 Koha 3.10.1 released releases December 22 2012 Koha 3.10.1 released releases
December 22 2012 Koha 3.8.8 released releases December 22 2012 Koha 3.8.8 released releases
December 27 2012 Koha 3.6.11 released releases December 27 2012 Koha 3.6.11 released releases
January 17 2013 Hugh Davenport becomes the 199th developer to have a patch pushed

1
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
View file

@ -212,6 +212,7 @@
<li>Christophe Croullebois</li> <li>Christophe Croullebois</li>
<li>Nate Curulla</li> <li>Nate Curulla</li>
<li>Vincent Danjean</li> <li>Vincent Danjean</li>
<li>Hugh Davenport</li>
<li>Elliott Davis</li> <li>Elliott Davis</li>
<li>Doug Dearden</li> <li>Doug Dearden</li>
<li>Kip DeGraaf</li> <li>Kip DeGraaf</li>

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

@ -176,7 +176,7 @@ if (f.company.value == "") {
[% END %] [% END %]
<ol> <ol>
<li><label for="discount">Discount</label> <li><label for="discount">Discount</label>
<input type="text" size="6" id="discount" name="discount" value="[% discount %]" />%</li> <input type="text" size="6" id="discount" name="discount" value="[% discount | format ("%.1f") %]" />%</li>
<li> <li>
<label for="deliverytime">Delivery time</label> <label for="deliverytime">Delivery time</label>
<input type="text" size="2" id="deliverytime" name="deliverytime" value="[% deliverytime %]" /> days <input type="text" size="2" id="deliverytime" name="deliverytime" value="[% deliverytime %]" /> days
@ -238,9 +238,9 @@ if (f.company.value == "") {
<p><strong>Invoice item price includes tax: </strong> <p><strong>Invoice item price includes tax: </strong>
[% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]</p>[% END %] [% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]</p>[% END %]
<p><strong>Discount: </strong> <p><strong>Discount: </strong>
[% discount %] %</p> [% discount | format("%.1f") %] %</p>
<p><strong>Tax rate: </strong> <p><strong>Tax rate: </strong>
[% 0 + gstrate * 100 | format("%.1f") %]%</p> [% 0 + gstrate * 100 | format("%.1f") %] %</p>
[% IF deliverytime.defined %] [% IF deliverytime.defined %]
<p><strong>Delivery time: </strong> <p><strong>Delivery time: </strong>
[% deliverytime %] days</p> [% deliverytime %] days</p>