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

(-)a/C4/Acquisition.pm (+5 lines)
Lines 1942-1947 sub GetHistory { Link Here
1942 
            aqorders.ordernumber,
 1942 
            aqorders.ordernumber,
1943 
            aqinvoices.invoicenumber,
 1943 
            aqinvoices.invoicenumber,
1944 
            aqbooksellers.id as id,
 1944 
            aqbooksellers.id as id,
1945 
            aqorders.branch,
1946 
            aqorders.budget_id,
1945 
            aqorders.biblionumber
 1947 
            aqorders.biblionumber
1946 
        FROM aqorders
 1948 
        FROM aqorders
1947 
        LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
 1949 
        LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
Lines 2030-2035 sub GetHistory { Link Here
2030 
        $total_qty         += $line->{'quantity'};
 2032 
        $total_qty         += $line->{'quantity'};
2031 
        $total_qtyreceived += $line->{'quantityreceived'};
 2033 
        $total_qtyreceived += $line->{'quantityreceived'};
2032 
        $total_price       += $line->{'quantity'} * $line->{'ecost'};
 2034 
        $total_price       += $line->{'quantity'} * $line->{'ecost'};
2035 
        my $budget = C4::Budgets::GetBudget($line->{budget_id});
2036 
        $line->{budget_name} = $budget->{budget_name} if $budget;
2037 
        $line->{branchname} = C4::Branch::GetBranchName($line->{branch});
2033 
    }
 2038 
    }
2034 
    return \@order_loop, $total_qty, $total_price, $total_qtyreceived;
 2039 
    return \@order_loop, $total_qty, $total_price, $total_qtyreceived;
2035 
}
 2040 
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-1 / +4 lines)
Lines 70-75 Link Here
70 
                <th>Order number</th>
 70 
                <th>Order number</th>
71 
				<th>Summary</th>
 71 
				<th>Summary</th>
72 
				<th>Vendor</th>
 72 
				<th>Vendor</th>
73 
                <th>Fund</th>
74 
                <th>Branch</th>
73 
				<th>Placed on</th>
 75 
				<th>Placed on</th>
74 
				<th>Received on</th>
 76 
				<th>Received on</th>
75 
				<th>Quantity ordered</th>
 77 
				<th>Quantity ordered</th>
Lines 97-102 Link Here
97 
					<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% suggestions_loo.biblionumber %]">[% suggestions_loo.title |html %]</a>
 99 
					<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% suggestions_loo.biblionumber %]">[% suggestions_loo.title |html %]</a>
98 
                        <br />[% suggestions_loo.author %] <br /> [% suggestions_loo.isbn %]</td>
 100 
                        <br />[% suggestions_loo.author %] <br /> [% suggestions_loo.isbn %]</td>
99 
					<td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% suggestions_loo.id %]">[% suggestions_loo.name %]</a></td>
 101 
					<td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% suggestions_loo.id %]">[% suggestions_loo.name %]</a></td>
102 
                    <td>[% suggestions_loo.budget_name %]</td>
103 
                    <td>[% suggestions_loo.branchname %]</td>
100 
					<td>[% suggestions_loo.creationdate | $KohaDates %]</td>
 104 
					<td>[% suggestions_loo.creationdate | $KohaDates %]</td>
101 
                    <td>
 105 
                    <td>
102 
                        [% IF suggestions_loo.datereceived %]
 106 
                        [% IF suggestions_loo.datereceived %]
103 
-

Return to bug 8667