From 5c7afb7095afc2518cc177e0b8cacce9934fe7cf Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Wed, 6 Feb 2019 12:13:12 +0000 Subject: [PATCH] Bug 18166: Show internal and vendor notes for receivied orders This copies the logic for showing, adding and editing vendor and internal notes from the pending orders to the received orders. To test: - In acquisitions create a basket with orders - Make your you have some internal and vendor notes - Close the basket and receive shipment - Create or reuse an invoice - Receive some of your orders - Verify that the notes don't show for received orders - Apply patch - Verify that the edit/change vendor/internal note links work the same on pending and received orders Signed-off-by: Jose-Mario Monteiro-Santos Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit fe0a2474c9b6702e7d452032f7657da9b990e81a) Signed-off-by: Martin Renvoize (cherry picked from commit 684a1e7dc00b45d69a4c857bba5018991519fa44) Signed-off-by: Lucas Gass --- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 faef872320..00b63a468d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -308,6 +308,17 @@ Suggested by: [% order.surnamesuggestedby %][% IF ( order.firstnamesuggestedby ) %], [% order.firstnamesuggestedby %] [% END %] (suggestion #[% order.suggestionid %]) [% END %] +
+ [% IF ( order.order_internalnote ) %] +

Internal note: [% order.order_internalnote | html %] [Change internal note]

+ [% ELSE %] + [Add internal note] + [% END %] + [% IF ( order.order_vendornote ) %] +

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

+ [% ELSE %] + [Add vendor note] + [% END %] MARC | Card [% order.quantityreceived %] -- 2.39.5