gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 12111: Improving templates regarding order notes 

This bug changes some lines in modordernotes.tt to make them more easily
translatable, especially in german (remark by K. Fisher on bug 9416).
No change should be visible

It also suppresses the ability to edit order "vendor note" in reception,
as the note for vendor is not made to be changed after the document is
received.

Test plan :
- in a basket, try to edit the notes (internal and vendor) of order.
  Check the display is correct
- go in reception module (parcel.pl page) : in the list of all orders
  to receive, you should have a link to change "internal note", but no
  more link to change "vendor note"
- try to receive a specific order which have a "vendor note". On the
  right panel of the page, you must have an editable textarea for
  internal note, and a non-editable (colored in grey) textarea for
  vendor note

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This commit is contained in:
Mathieu Saby 2014-04-19 20:34:42 +02:00 committed by Galen Charlton
parent 54a62cddb3
commit fda9976cda
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt
View File

@ -1,5 +1,5 @@
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Acquisition &rsaquo; Change order [% IF (type == "vendor") %]vendor note[% ELSE %]internal note[% END %]</title>
<title>Koha &rsaquo; Acquisition &rsaquo; [% IF (type == "vendor") %]Change order vendor note vendor note[% ELSE %]Change order internal note[% END %]</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
@ -12,7 +12,11 @@
<div id="bd">
<div id="yui-main">
<h1>Change order [% IF (type == "vendor") %]vendor note[% ELSE %]internal note[% END %] (order no. [% ordernumber %])</h1>
[% IF (type == "vendor") %]
<h1>Change order vendor note (order no. [% ordernumber %])</h1>
[% ELSE %]
<h1>Change order internal note (order no. [% ordernumber %])</h1>
[% END %]
<form action="/cgi-bin/koha/acqui/modordernotes.pl" method="post">
<fieldset class="brief">
<label for="ordernotes">Note:</label>

2
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
View File

@ -330,7 +330,7 @@
<input type="text" size="20" name="cost" id="cost" value="[% ecost %]" />
[% END %]</li>
<li><label for="order_internalnote">Internal note: </label><textarea name="order_internalnote" width="40" rows="8" >[% order_internalnote %]</textarea></li>
<li><label for="order_vendornote">Vendor note: </label><textarea name="order_vendornote" width="40" rows="8" >[% order_vendornote %]</textarea></li>
<li><label for="order_vendornote">Vendor note: </label><textarea name="order_vendornote" width="40" rows="8" readonly="readonly">[% order_vendornote %]</textarea></li>
</ol>
</fieldset>

2
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
View File

@ -281,7 +281,7 @@
[<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]&type=internal">Add internal note</a>]
[% END %]
[% IF ( loop_order.order_vendornote ) %]
<p class="ordernote"><strong>Vendor note: </strong>[% loop_order.order_vendornote|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]&type=vendor">Change vendor note</a>]</p>
<p class="ordernote"><strong>Vendor note: </strong>[% loop_order.order_vendornote|html %]</p>
[% ELSE %]
[<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&amp;referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]&type=vendor">Add vendor note</a>]
[% END %]