Bugzilla – Attachment 27661 Details for
Bug 12111
Improving templates regarding order notes
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 12111: Improving templates regarding order notes
PASSED-QA-Bug-12111-Improving-templates-regarding-.patch (text/plain), 4.82 KB, created by
Katrin Fischer
on 2014-04-26 16:45:22 UTC
(
hide
)
Description:
[PASSED QA] Bug 12111: Improving templates regarding order notes
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2014-04-26 16:45:22 UTC
Size:
4.82 KB
patch
obsolete
>From 2aa5934bea1ce23fcbfc3bf04fb02b8ab4a59044 Mon Sep 17 00:00:00 2001 >From: Mathieu Saby <mathsabypro@gmail.com> >Date: Sat, 19 Apr 2014 20:34:42 +0200 >Subject: [PATCH] [PASSED QA] 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 must 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> >--- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt | 8 ++++++-- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 2 +- > 3 files changed, 8 insertions(+), 4 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt >index 6ade209..91491d2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt >@@ -1,5 +1,5 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Acquisition › Change order [% IF (type == "vendor") %]vendor note[% ELSE %]internal note[% END %]</title> >+<title>Koha › Acquisition › [% 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> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >index 6d2b3fa..cff69bc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -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> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index 93f6109..9825af6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -281,7 +281,7 @@ > [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&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 %]&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 %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]&type=vendor">Add vendor note</a>] > [% END %] >-- >1.8.3.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12111
:
27311
|
27649
| 27661 |
27662
|
29576