From 2aa5934bea1ce23fcbfc3bf04fb02b8ab4a59044 Mon Sep 17 00:00:00 2001 From: Mathieu Saby 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 --- 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' %] -Koha › Acquisition › Change order [% IF (type == "vendor") %]vendor note[% ELSE %]internal note[% END %] +Koha › Acquisition › [% IF (type == "vendor") %]Change order vendor note vendor note[% ELSE %]Change order internal note[% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -12,7 +12,11 @@
-

Change order [% IF (type == "vendor") %]vendor note[% ELSE %]internal note[% END %] (order no. [% ordernumber %])

+ [% IF (type == "vendor") %] +

Change order vendor note (order no. [% ordernumber %])

+ [% ELSE %] +

Change order internal note (order no. [% ordernumber %])

+ [% END %]
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 @@ [% END %]
  • -
  • +
  • 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 @@ [Add internal note] [% END %] [% IF ( loop_order.order_vendornote ) %] -

    Vendor note: [% loop_order.order_vendornote|html %] [Change vendor note]

    +

    Vendor note: [% loop_order.order_vendornote|html %]

    [% ELSE %] [Add vendor note] [% END %] -- 1.8.3.2