Bugzilla – Attachment 25012 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]
[PASSED QA] Bug 11027 : Add a column for basketgroups in late orders table and improve other columns
PASSED-QA-Bug-11027--Add-a-column-for-basketgroups.patch (text/plain), 4.94 KB, created by
Katrin Fischer
on 2014-02-03 19:46:35 UTC
(
hide
)
Description:
[PASSED QA] Bug 11027 : Add a column for basketgroups in late orders table and improve other columns
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2014-02-03 19:46:35 UTC
Size:
4.94 KB
patch
obsolete
>From c5130589b39f89fe44e89081806b193ca340b9bb Mon Sep 17 00:00:00 2001 >From: Mathieu Saby <mathieu.saby@univ-rennes2.fr> >Date: Wed, 18 Dec 2013 22:09:50 +0100 >Subject: [PATCH] [PASSED QA] Bug 11027 : Add a column for basketgroups in late > orders table and improve other columns > >This patch makes 4 changes in late orders page : >- adding a new column for basketgroup, displaying > the name and number of the basketgroup >- displaying the name of the basket as well as its > number, with a hyperlink to this basketgroup >- displaying fund in a separate column to make > sorting easier, and renaming it from "budget" to > "fund" (the confusion can be found elsewhere in Koha...) >- displaying branch in a separate column to make > sorting easier (this column could be improved later, > by getting branch from basketgroup if there is one) > >For that, in Aquisition.pm, I made some changes to GetLateOrders: >- 3 new columns in SELECT >- 1 new join > >To test : >1. Display the list of late orders of your instance. >2. Check you have 3 new columns for basketgroups, fund and branch >3. In basketgroup column you should have "name of basket group (number)" >4. In basket column you should have "name of basket (number)" >5. Check the links for basketgroups. They should send you to the > page displaying information for each basketgroup > (without possibiliy of editing them if they are closed) > >Signed-off-by: Mark Tompsett <mtompset@hotmail.com> >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >Patches pass QA script and all tests. >Works as described. Also checked sorting and orders which >are not in a basketgroup display correctly. >--- > C4/Acquisition.pm | 4 ++++ > .../intranet-tmpl/prog/en/modules/acqui/lateorders.tt | 19 ++++++++++++------- > 2 files changed, 16 insertions(+), 7 deletions(-) > >diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm >index 56c2d7f..9fbb202 100644 >--- a/C4/Acquisition.pm >+++ b/C4/Acquisition.pm >@@ -2031,6 +2031,9 @@ sub GetLateOrders { > SELECT aqbasket.basketno, > aqorders.ordernumber, > DATE(aqbasket.closedate) AS orderdate, >+ aqbasket.basketname AS basketname, >+ aqbasket.basketgroupid AS basketgroupid, >+ aqbasketgroups.name AS basketgroupname, > aqorders.rrp AS unitpricesupplier, > aqorders.ecost AS unitpricelib, > aqorders.claims_count AS claims_count, >@@ -2051,6 +2054,7 @@ sub GetLateOrders { > LEFT JOIN aqbudgets ON aqorders.budget_id = aqbudgets.budget_id, > aqbasket LEFT JOIN borrowers ON aqbasket.authorisedby = borrowers.borrowernumber > LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id >+ LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid = aqbasketgroups.id > WHERE aqorders.basketno = aqbasket.basketno > AND ( datereceived = '' > OR datereceived IS NULL >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 c76cf2d..a036945 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -117,6 +117,9 @@ $(document).ready(function() { > <th>Information</th> > <th>Total cost</th> > <th>Basket</th> >+ <th>Basket group</th> >+ <th>Branch</th> >+ <th>Fund</th> > <th>Claims count</th> > <th>Claimed date</th> > </tr> >@@ -154,14 +157,16 @@ $(document).ready(function() { > <td> > [% lateorder.unitpricesupplier %]x[% lateorder.quantity %] = > [% lateorder.subtotal %] >- <p title="budget">[% lateorder.budget %]</p> > </td> > <td> >- <p><a href="basket.pl?basketno=[% lateorder.basketno %]" title="basket"> >- [% lateorder.basketno %] >- </a> >- </p> >- <p title="branch">[% lateorder.branch %]</p> >+ <a href="basket.pl?basketno=[% lateorder.basketno %]" title="basket">[% lateorder.basketname %] ([% lateorder.basketno %])</a> >+ </td> >+ <td> >+ <a href="basketgroup.pl?op=add&booksellerid=[% lateorder.supplierid %]&basketgroupid=[% lateorder.basketgroupid %]" title="basketgroup">[% lateorder.basketgroupname %] ([% lateorder.basketgroupid %])</a> >+ </td> >+ <td>[% lateorder.branch %] >+ </td> >+ <td>[% lateorder.budget %] > </td> > <td>[% lateorder.claims_count %]</td> > <td>[% lateorder.claimed_date %]</td> >@@ -172,7 +177,7 @@ $(document).ready(function() { > <tr> > <th colspan="5">Total</th> > <th>[% total %]</th> >- <th colspan="3"> </th> >+ <th colspan="6"> </th> > </tr> > </tfoot> > </table> >-- >1.8.3.2
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