Attachment 14519 Details for Bug 8667 – Bug 8667: Add budget and branch columns in histsearch.pl results

[patch] Bug 8667: Add budget and branch columns in histsearch.pl results

Bug-8667-Add-budget-and-branch-columns-in-histsear.patch (text/plain), 2.56 KB, created by Julian Maurice on 2013-01-10 09:20:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2013-01-10 09:20:50 UTC

Size: 2.56 KB

patch

obsolete

>From a5c409516d9ac96506a49282c254000e74aced5c Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Wed, 22 Aug 2012 16:09:20 +0200
>Subject: [PATCH] Bug 8667: Add budget and branch columns in histsearch.pl results
>
>---
> C4/Acquisition.pm                                  |    5 +++++
> .../prog/en/modules/acqui/histsearch.tt            |    4 ++++
> 2 files changed, 9 insertions(+), 0 deletions(-)
>
>diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
>index 17330e5..3201419 100644
>--- a/C4/Acquisition.pm
>+++ b/C4/Acquisition.pm
>@@ -1942,6 +1942,8 @@ sub GetHistory {
>             aqorders.ordernumber,
>             aqinvoices.invoicenumber,
>             aqbooksellers.id as id,
>+            aqorders.branch,
>+            aqorders.budget_id,
>             aqorders.biblionumber
>         FROM aqorders
>         LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
>@@ -2030,6 +2032,9 @@ sub GetHistory {
>         $total_qty         += $line->{'quantity'};
>         $total_qtyreceived += $line->{'quantityreceived'};
>         $total_price       += $line->{'quantity'} * $line->{'ecost'};
>+        my $budget = C4::Budgets::GetBudget($line->{budget_id});
>+        $line->{budget_name} = $budget->{budget_name} if $budget;
>+        $line->{branchname} = C4::Branch::GetBranchName($line->{branch});
>     }
>     return \@order_loop, $total_qty, $total_price, $total_qtyreceived;
> }
>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 5659c1d..6d0f7f1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
>@@ -70,6 +70,8 @@
>                 <th>Order number</th>
> 				<th>Summary</th>
> 				<th>Vendor</th>
>+                <th>Fund</th>
>+                <th>Branch</th>
> 				<th>Placed on</th>
> 				<th>Received on</th>
> 				<th>Quantity ordered</th>
>@@ -97,6 +99,8 @@
> 					<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% suggestions_loo.biblionumber %]">[% suggestions_loo.title |html %]</a>
>                         <br />[% suggestions_loo.author %] <br /> [% suggestions_loo.isbn %]</td>
> 					<td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% suggestions_loo.id %]">[% suggestions_loo.name %]</a></td>
>+                    <td>[% suggestions_loo.budget_name %]</td>
>+                    <td>[% suggestions_loo.branchname %]</td>
> 					<td>[% suggestions_loo.creationdate | $KohaDates %]</td>
>                     <td>
>                         [% IF suggestions_loo.datereceived %]
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 8667: 11749 | 14519