Bugzilla – Attachment 24993 Details for
Bug 11027
add a column for basketgroups in late orders table
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED OFF] Bug 11027 (QA) : hide link if no basketgroup and use real branch name
SIGNED-OFF-Bug-11027-QA--hide-link-if-no-basketgro.patch (text/plain), 2.49 KB, created by
Mark Tompsett
on 2014-02-03 03:37:34 UTC
(
hide
)
Description:
[SIGNED OFF] Bug 11027 (QA) : hide link if no basketgroup and use real branch name
Filename:
MIME Type:
Creator:
Mark Tompsett
Created:
2014-02-03 03:37:34 UTC
Size:
2.49 KB
patch
obsolete
>From d2c76d26e68585741f1c9707e8c4cddc368428d5 Mon Sep 17 00:00:00 2001 >From: Mathieu Saby <mathsabypro@gmail.com> >Date: Sun, 2 Feb 2014 23:07:16 +0100 >Subject: [PATCH] [SIGNED OFF] Bug 11027 (QA) : hide link if no basketgroup > and use real branch name > >This patch is a answer to remarks made by QA: >- if there is no basketgroup for an order, the basketgroup column in lastorders.pl is now blank (instead of parentheses) >- the name of the branch is used instead of its code in the branch column > >To test: check late orders, included and not included into basketgroup > >Signed-off-by: Mark Tompsett <mtompset@hotmail.com> >--- > .../prog/en/modules/acqui/lateorders.tt | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >index c5341c2..8a3cd83 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -1,4 +1,5 @@ > [% USE KohaDates %] >+[% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Acquisitions › Late orders</title> > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> >@@ -166,13 +167,15 @@ $(document).ready(function() { > [% END %] > </td> > <td> >- [% IF ( CAN_user_acquisition_group_manage ) %] >- <a href="basketgroup.pl?op=add&booksellerid=[% lateorder.supplierid %]&basketgroupid=[% lateorder.basketgroupid %]" title="basketgroup">[% lateorder.basketgroupname %] ([% lateorder.basketgroupid %])</a> >- [% ELSE %] >- [% lateorder.basketgroupname %] ([% lateorder.basketgroupid %])</a> >+ [% IF ( lateorder.basketgroupid ) %] >+ [% IF ( CAN_user_acquisition_group_manage ) %] >+ <a href="basketgroup.pl?op=add&booksellerid=[% lateorder.supplierid %]&basketgroupid=[% lateorder.basketgroupid %]" title="basketgroup">[% lateorder.basketgroupname %] ([% lateorder.basketgroupid %])</a> >+ [% ELSE %] >+ [% lateorder.basketgroupname %] ([% lateorder.basketgroupid %])</a> >+ [% END %] > [% END %] > </td> >- <td>[% lateorder.branch %] >+ <td>[% Branches.GetName( lateorder.branch ) %] > </td> > <td>[% lateorder.budget %] > </td> >-- >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 11027
:
21951
|
23659
|
23762
|
24850
|
24851
|
24852
|
24991
|
24993
|
25012
|
25013
|
25014