From f9bb33c1cb4cb3d42a536c90a0ac2d3a2076be1f Mon Sep 17 00:00:00 2001 From: Hector Castro Date: Thu, 26 May 2016 08:41:08 -0600 Subject: [PATCH] Bug 16594: Orders by fund report has wrong link to css and other issues MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Orders by fund has wrong link to css and other issues -> The example in the wiki is wrong: [% INCLUDE 'datatables.inc' %] -> Must be: -> Missing in tag -> Wrong word used "Date deceived" should be "Date received" NOTE: Wiki needs to be updated To test: -Look the code and notice about if else cluase without curly brackets -Go to Reports > Orders by fund -Play with: in filters 'All fund' Output: 'to screen into the browser' -You will see a DataTable displayed in screen clutter -Notice about 'Date deceived' and the foot of table -Apply patch -Refresh or execute again the report Signed-off-by: Sinziana Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit d4394d88eaeff5df6bf0a28ec3e6faed853b202b) Signed-off-by: Frédéric Demians --- .../prog/en/modules/reports/orders_by_budget.tt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt index 22b12d72de..fc4eef7222 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt @@ -7,7 +7,7 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - + [% INCLUDE 'datatables.inc' %] @@ -61,7 +62,7 @@ Total RRP Total cost Entry date - Date deceived + Date received Internal note Vendor note @@ -90,7 +91,7 @@ [% END %] - TOTAL[% total_quantity %][% total_rrp | $Price %][% total_ecost | $Price %] + TOTAL[% total_quantity %][% total_rrp | $Price %][% total_ecost | $Price %] [% END %] [% ELSE %] -- 2.39.5