Bugzilla – Attachment 21753 Details for
Bug 5336
Acq history search
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 5336: Merge parent ordernumber and ordernumber columns Signed-off-by: Cedric Vita <cedric.vita@dracenie.com>
PASSED-QA-Bug-5336-Merge-parent-ordernumber-and-or.patch (text/plain), 2.17 KB, created by
Katrin Fischer
on 2013-10-03 11:03:56 UTC
(
hide
)
Description:
[PASSED QA] Bug 5336: Merge parent ordernumber and ordernumber columns Signed-off-by: Cedric Vita <cedric.vita@dracenie.com>
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2013-10-03 11:03:56 UTC
Size:
2.17 KB
patch
obsolete
>From 8c95c97aef372c255f04e8ea7c03db62c8372810 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >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 > <cedric.vita@dracenie.com> > >Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >--- > .../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 @@ > <table id="histsearcht"> > <thead> > <tr> >- <th>Order line</th> >+ <th>Order line (parent)</th> > <th>Basket</th> > <th>Basket group</th> > <th>Invoice number</th> >- <th>Order number</th> > <th>Summary</th> > <th>Vendor</th> > <th>Placed on</th> >@@ -113,7 +112,10 @@ > <tbody> > [% FOREACH order IN order_loop %] > <tr> >- <td>[% order.parent_ordernumber %]</td> >+ <td> >+ [% order.ordernumber %] >+ [% IF order.ordernumber != order.parent_ordernumber %]([% order.parent_ordernumber %])[% END %] >+ </td> > <td>[% order.basketname %] (<a href="basket.pl?basketno=[% order.basketno %]">[% order.basketno %]</a>)</td> > <td> > [% IF ( order.basketgroupid ) %] >@@ -128,7 +130,6 @@ > > [% END %] > </td> >- <td>[% order.ordernumber %]</td> > <td> > <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title |html %]</a> > <br />[% order.author %] <br /> [% order.isbn %] >-- >1.7.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 5336
:
11603
|
11604
|
11792
|
14067
|
14188
|
14213
|
16013
|
17612
|
17613
|
17615
|
17617
|
17648
|
17649
|
17650
|
17883
|
18187
|
18411
|
18412
|
18413
|
18414
|
18496
|
18497
|
18498
|
18499
|
18500
|
19317
|
19318
|
19319
|
19320
|
19321
|
19550
|
20894
|
20895
|
20896
|
20897
|
20898
|
20899
|
21689
|
21690
|
21691
|
21692
|
21693
|
21694
|
21695
|
21696
|
21697
|
21707
|
21708
|
21709
|
21751
|
21752
| 21753 |
21754
|
21755
|
21756
|
21757
|
21758