View | Details | Raw Unified | Return to bug 8667
Collapse All | Expand All

(-)a/C4/Acquisition.pm (+5 lines)
Lines 1781-1786 sub GetHistory { Link Here
1781
            aqorders.ordernumber,
1781
            aqorders.ordernumber,
1782
            aqorders.booksellerinvoicenumber as invoicenumber,
1782
            aqorders.booksellerinvoicenumber as invoicenumber,
1783
            aqbooksellers.id as id,
1783
            aqbooksellers.id as id,
1784
            aqorders.branch,
1785
            aqorders.budget_id,
1784
            aqorders.biblionumber
1786
            aqorders.biblionumber
1785
        FROM aqorders
1787
        FROM aqorders
1786
        LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
1788
        LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
Lines 1863-1868 sub GetHistory { Link Here
1863
        $total_qty         += $line->{'quantity'};
1865
        $total_qty         += $line->{'quantity'};
1864
        $total_qtyreceived += $line->{'quantityreceived'};
1866
        $total_qtyreceived += $line->{'quantityreceived'};
1865
        $total_price       += $line->{'quantity'} * $line->{'ecost'};
1867
        $total_price       += $line->{'quantity'} * $line->{'ecost'};
1868
        my $budget = C4::Budgets::GetBudget($line->{budget_id});
1869
        $line->{budget_name} = $budget->{budget_name} if $budget;
1870
        $line->{branchname} = C4::Branch::GetBranchName($line->{branch});
1866
    }
1871
    }
1867
    return \@order_loop, $total_qty, $total_price, $total_qtyreceived;
1872
    return \@order_loop, $total_qty, $total_price, $total_qtyreceived;
1868
}
1873
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-1 / +4 lines)
Lines 66-71 Link Here
66
                <th>Order number</th>
66
                <th>Order number</th>
67
				<th>Summary</th>
67
				<th>Summary</th>
68
				<th>Vendor</th>
68
				<th>Vendor</th>
69
                <th>Fund</th>
70
                <th>Branch</th>
69
				<th>Placed on</th>
71
				<th>Placed on</th>
70
				<th>Received on</th>
72
				<th>Received on</th>
71
				<th>Quantity ordered</th>
73
				<th>Quantity ordered</th>
Lines 93-98 Link Here
93
					<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% suggestions_loo.biblionumber %]">[% suggestions_loo.title |html %]</a>
95
					<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% suggestions_loo.biblionumber %]">[% suggestions_loo.title |html %]</a>
94
                        <br />[% suggestions_loo.author %] <br /> [% suggestions_loo.isbn %]</td>
96
                        <br />[% suggestions_loo.author %] <br /> [% suggestions_loo.isbn %]</td>
95
					<td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% suggestions_loo.id %]">[% suggestions_loo.name %]</a></td>
97
					<td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% suggestions_loo.id %]">[% suggestions_loo.name %]</a></td>
98
                    <td>[% suggestions_loo.budget_name %]</td>
99
                    <td>[% suggestions_loo.branchname %]</td>
96
					<td>[% suggestions_loo.creationdate | $KohaDates %]</td>
100
					<td>[% suggestions_loo.creationdate | $KohaDates %]</td>
97
					<td>[% suggestions_loo.datereceived | $KohaDates %]</td>
101
					<td>[% suggestions_loo.datereceived | $KohaDates %]</td>
98
					<td>[% suggestions_loo.quantity %]</td>
102
					<td>[% suggestions_loo.quantity %]</td>
99
- 

Return to bug 8667