my $invoice = $sth->fetchrow_hashref;
$query = qq{
- SELECT aqorders.*, biblio.*,
+ SELECT aqorders.*, biblio.*, aqorders_items.itemnumber,
aqbasket.basketname
FROM aqorders
LEFT JOIN aqbasket ON aqorders.basketno = aqbasket.basketno
LEFT JOIN biblio ON aqorders.biblionumber = biblio.biblionumber
+ LEFT JOIN aqorders_items ON aqorders.ordernumber = aqorders_items.ordernumber
WHERE invoiceid = ?
};
$sth = $dbh->prepare($query);
@EXPORT = qw(
&GetBudget
+ &GetBudgetByOrderNumber
&GetBudgets
&GetBudgetHierarchy
&AddBudget
return $result;
}
+=head2 GetBudgetByOrderNumber
+
+ &GetBudgetByOrderNumber($ordernumber);
+
+get a specific budget by order number
+
+=cut
+
+# -------------------------------------------------------------------
+sub GetBudgetByOrderNumber {
+ my ( $ordernumber ) = @_;
+ my $dbh = C4::Context->dbh;
+ my $query = "
+ SELECT aqbudgets.*
+ FROM aqbudgets, aqorders
+ WHERE ordernumber=?
+ AND aqorders.budget_id = aqbudgets.budget_id
+ ";
+ my $sth = $dbh->prepare($query);
+ $sth->execute( $ordernumber );
+ my $result = $sth->fetchrow_hashref;
+ return $result;
+}
+
=head2 GetChildBudgetsSpent
&GetChildBudgetsSpent($budget-id);
sub GetReservesFromBiblionumber {
my ($biblionumber) = shift or return (0, []);
my ($all_dates) = shift;
+ my ($itemnumber) = shift;
+ warn "ITEMNUMBER: $itemnumber";
my $dbh = C4::Context->dbh;
# Find the desired items in the reserves
+ my @params;
my $query = "
SELECT reserve_id,
branchcode,
suspend_until
FROM reserves
WHERE biblionumber = ? ";
+ push( @params, $biblionumber );
unless ( $all_dates ) {
- $query .= "AND reservedate <= CURRENT_DATE()";
+ $query .= " AND reservedate <= CURRENT_DATE() ";
+ }
+ if ( $itemnumber ) {
+ $query .= " AND ( itemnumber IS NULL OR itemnumber = ? )";
+ push( @params, $itemnumber );
}
$query .= "ORDER BY priority";
my $sth = $dbh->prepare($query);
- $sth->execute($biblionumber);
+ $sth->execute( @params );
my @results;
my $i = 0;
while ( my $data = $sth->fetchrow_hashref ) {
use C4::Output;
use C4::Dates qw/format_date format_date_in_iso/;
use C4::Suggestions;
+use C4::Reserves qw/GetReservesFromBiblionumber/;
use JSON;
my $input=new CGI;
$line{invoice} = $invoice->{invoicenumber};
$line{total} = sprintf($cfstr, $total);
$line{booksellerid} = $invoice->{booksellerid};
+ my ($count) = &GetReservesFromBiblionumber($line{biblionumber},undef,$item->{itemnumber});
+ $line{holds} = $count;
+ $line{budget} = GetBudgetByOrderNumber( $line{ordernumber} );
$totalprice += $item->{'unitprice'};
$line{unitprice} = sprintf( $cfstr, $item->{'unitprice'} );
my $gste = get_gste( $line{total}, $line{gstrate}, $bookseller );
if ( $line{parent_ordernumber} != $line{ordernumber} ) {
if ( grep { $_->{ordernumber} == $line{parent_ordernumber} }
- @parcelitems )
+ @parcelitems
+ )
{
$line{cannot_cancel} = 1;
}
+[% USE currency = format('%.2f') -%]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha › Acquisitions › [% IF ( date ) %]
Receipt summary for [% name %] [% IF ( invoice ) %]invoice [% invoice %][% END %] on [% formatteddatereceived %][% ELSE %]Receive orders from [% name %][% END %]</title>
"iCookieDuration": 60*60*24*1000, // 1000 days
"aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
"aoColumnDefs": [
- { "aTargets": [ 3, -1 ], "bSortable": false, "bSearchable": false },
+ { "aTargets": [ 4, -1 ], "bSortable": false, "bSearchable": false },
],
"aoColumns": [
{ "sType": "num-html" },
{ "sType": "num-html" },
{ "sType": "html" },
+ { "sType": "html" },
+ null,
null,
null,
null,
[% IF ( loop_received ) %]
+ [% SET funds = {} %]
+ [% SET estimated_total = 0 %]
+
+ [% FOREACH loop_receive IN loop_received %]
+ [% SET estimated_total = estimated_total + ( loop_receive.ecost * loop_receive.quantityreceived ) %]
+ [% SET funds.${ loop_receive.budget.budget_name }.estimated = funds.${ loop_receive.budget.budget_name }.estimated + ( loop_receive.ecost * loop_receive.quantityreceived )%]
+ [% SET funds.${ loop_receive.budget.budget_name }.actual = funds.${ loop_receive.budget.budget_name }.actual + loop_receive.total %]
+ [% END %]
+
<form action="/cgi-bin/koha/acqui/parcel.pl" method="get" name="orderform">
<table id="receivedt">
<thead>
<tr>
- <th>Basket</th>
- <th>Order line</th>
- <th>Summary</th>
- <th>View record</th>
- <th>Quantity</th>
- <th>Est cost</th>
- <th>Actual cost</th>
- <th>TOTAL</th>
+ <th>Basket</th>
+ <th>Order Line</th>
+ <th>Holds</th>
+ <th>Summary</th>
+ <th>View record</th>
+ <th>Quantity</th>
+ <th>Fund</th>
+ <th>Est cost</th>
+ <th>Actual cost</th>
+ <th>TOTAL</th>
<th></th>
</tr>
</thead>
<tfoot>
+ [% FOREACH key IN funds.keys.sort %]
+ <tr>
+ <td colspan="6" class="total"> </td>
+ <td><i>Subtotal for</i> [% key %]</td>
+ <td>[% currency( funds.$key.estimated ) %]</td>
+ <td>[% currency( funds.$key.actual ) %]</td>
+ <td> </td>
+ <td> </td>
+ </tr>
+ [% END %]
<tr>
- <th colspan="7" class="total">Total tax exc.</th>
+ <th colspan="9" class="total">Total tax exc.</th>
<th>[% total_gste %]</th>
<th></th>
</tr>
[% FOREACH book_foot IN book_foot_loop %]
<tr>
- <th colspan="7">Total (GST [% book_foot.gstrate * 100 | format ("%.1f") %]%)</th>
+ <th colspan="9">Total (GST [% book_foot.gstrate * 100 | format ("%.1f") %]%)</th>
<th>[% book_foot.value %]</th>
<th></th>
</tr>
[% END %]
<tr>
- <th colspan="7" class="total">Total tax inc.</th>
+ <th colspan="9" class="total">Total tax inc.</th>
<th>[% total_gsti %]</th>
<th></th>
</tr>
<tr>
<td>[% loop_receive.basketname %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_receive.basketno %]">[% loop_receive.basketno %]</a>)</td>
<td><a href="neworderempty.pl?ordernumber=[% loop_receive.ordernumber %]&booksellerid=[% booksellerid %]">[% loop_receive.ordernumber %]</a></td>
+ <td>[% IF loop_receive.holds %]<span class="error"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.holds %]</a></span>[% END %]</td>
<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_receive.biblionumber %]">[% loop_receive.title |html %]</a>
[% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %]
[% IF ( loop_receive.isbn ) %] - [% loop_receive.isbn %][% END %]
</td>
<td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_receive.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% loop_receive.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a></td>
<td>[% loop_receive.quantityreceived %]</td>
+ <td>[% loop_receive.budget.budget_name %]</td>
<td>[% loop_receive.ecost %]</td>
<td>[% loop_receive.unitprice %]</td>
<td>[% loop_receive.total %]</td>