Merge branch 'bug_9438' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2013-03-21 09:42:13 -04:00
commit fcefbff02b
2 changed files with 3 additions and 2 deletions

View file

@ -389,13 +389,14 @@ $template->param(
total => sprintf( "%.2f", ($data->{ecost} || 0) * ($data->{'quantity'} || 0) ),
ecost => sprintf( "%.2f", $data->{ecost} || 0),
unitprice => sprintf( "%.2f", $data->{unitprice} || 0),
notes => $data->{'notes'},
publishercode => $data->{'publishercode'},
barcode_subfield => $barcode_subfield,
import_batch_id => $import_batch_id,
(uc(C4::Context->preference("marcflavour"))) => 1
);
$template->param ( notes => $data->{'notes'} ) if ( $ordernumber );
output_html_with_http_headers $input, $cookie, $template->output;

View file

@ -548,7 +548,7 @@ $(document).ready(function()
</li>
<li>
<label for="notes">Notes: </label>
<textarea id="notes" cols="30" rows="3" name="notes" >[% notes %]</textarea>
<textarea id="notes" cols="30" rows="3" name="notes" >[% IF ( notes ) %][% notes %][% END %]</textarea>
</li>
<li><div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
<label for="sort1">Statistic 1: </label>