From ec7eb02fbbf721f6b3f472ccff1a9cb4676156a3 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 2 May 2013 10:38:27 +0200 Subject: [PATCH] Bug 5336: Merge parent ordernumber and ordernumber columns Signed-off-by: Cedric Vita --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt index 2b5f30a..cd48a79 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -96,11 +96,10 @@ - + - @@ -115,7 +114,10 @@ [% FOREACH order IN order_loop %] - + - -- 1.7.10.4
Order lineOrder line (parent) Basket Basket group Invoice numberOrder number Summary Vendor Placed on
[% order.parent_ordernumber %] + [% order.ordernumber %] + [% IF order.ordernumber != order.parent_ordernumber %]([% order.parent_ordernumber %])[% END %] + [% order.basketname %] ([% order.basketno %]) [% IF ( order.basketgroupid ) %] @@ -130,7 +132,6 @@   [% END %] [% order.ordernumber %] [% order.title |html %]
[% order.author %]
[% IF ( order.internalnotes ) %][% order.internalnotes %]
[% END %][% order.isbn %]