From 0862f7776942ebf64615d57f94982586d00c34ee Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 19 Sep 2018 19:54:35 -0300
Subject: [PATCH] Bug 17877: Add the order's notes to the table
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This patch adds the vendor and internal note from the acquisition order
to the subscription detail page

Test plan:
- Create an order from a subscription, fill the internal and vendor
notes
- Go to the subscription's detail page
- Confirm that the columns are displayed in the "Acquisition details"
table and contain the correct values
- Make sure the "Home › Administration › Columns settings" admin page
let you hide them by default (for those who will not need them).

Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 admin/columns_settings.yml                                    | 4 ++++
 .../prog/en/modules/serials/subscription-detail.tt            | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 0a4f66ffc3..57bc3992ab 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -608,6 +608,10 @@ modules:
           columnname: receive_date
         -
           columnname: status
+        -
+          columnname: order_internalnote
+        -
+          columnname: order_vendornote
         -
           columnname: fund
         -
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
index 498ceb2ca5..0c6c3efd6a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -350,6 +350,8 @@
                         <th class="title-string">Creation date</th>
                         <th class="title-string">Receive date</th>
                         <th class="title-string">Status</th>
+                        <th>Internal note</th>
+                        <th>Vendor note</th>
                         <th>Fund</th>
                         <th title="ecost tax exc. / ecost tax inc.">Ordered</th>
                         <th title="Actual cost tax exc. / Actual cost tax inc.">Spent</th>
@@ -385,6 +387,8 @@
                             [% CASE 'cancelled' %]<span title="status_5">Cancelled</span>
                           [% END %]
                         </td>
+                        <td>[% order.order_internalnote | html %]</td>
+                        <td>[% order.order_vendornote | html %]</td>
                         <td>[% order.fund.budget_name | html %]</td>
                         <td>
                             [% UNLESS order.datereceived %]
-- 
2.39.2