From 8c95c97aef372c255f04e8ea7c03db62c8372810 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 2 May 2013 10:38:27 +0200 Subject: [PATCH] [PASSED QA] Bug 5336: Merge parent ordernumber and ordernumber columns Signed-off-by: Cedric Vita Signed-off-by: Pierre Angot Signed-off-by: Katrin Fischer --- .../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 04fb8a3..e71d45d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -94,11 +94,10 @@ - + - @@ -113,7 +112,10 @@ [% FOREACH order IN order_loop %] - + -
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 ) %] @@ -128,7 +130,6 @@   [% END %] [% order.ordernumber %] [% order.title |html %]
[% order.author %]
[% order.isbn %] -- 1.7.9.5