Browse Source

removing useless code * bookfund.pl (replaced by budgets.pl) * spent.pl (useless now)

3.2.x
Paul Poulain 15 years ago
committed by Henri-Damien LAURENT
parent
commit
d22e1e8a46
  1. 101
      acqui/bookfund.pl
  2. 85
      acqui/spent.pl
  3. 115
      koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc
  4. 63
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl
  5. 75
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl

101
acqui/bookfund.pl

@ -1,101 +0,0 @@
#!/usr/bin/perl
# Copyright 2006 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
use C4::Context;
use strict;
use CGI;
use C4::Auth;
use C4::Output;
my $dbh = C4::Context->dbh;
my $input = new CGI;
my $bookfund = $input->param('bookfund');
my $start = $input->param('start');
my $end = $input->param('end');
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
template_name => "acqui/bookfund.tmpl",
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => { acquisition => 1 },
debug => 1,
}
);
my $query = '
SELECT quantity,
datereceived,
freight,
unitprice,
listprice,
ecost,
quantityreceived AS qrev,
subscription,
title,
itemtype,
aqorders.biblionumber,
aqorders.booksellerinvoicenumber,
quantity-quantityreceived AS tleft,
aqorders.ordernumber AS ordnum,
entrydate,
budgetdate,
booksellerid,
aqbasket.basketno
FROM aqorders
INNER JOIN aqorderbreakdown
ON aqorderbreakdown.ordernumber = aqorders.ordernumber
INNER JOIN aqbasket
ON aqbasket.basketno = aqorders.basketno
LEFT JOIN biblioitems
ON biblioitems.biblioitemnumber = aqorders.biblioitemnumber
WHERE bookfundid = ?
AND budgetdate >= ?
AND budgetdate < ?
AND (datecancellationprinted IS NULL
OR datecancellationprinted = \'0000-00-00\')
';
my $sth = $dbh->prepare($query);
$sth->execute( $bookfund, $start, $end );
my @commited_loop;
my $total = 0;
while ( my $data = $sth->fetchrow_hashref ) {
my $left = $data->{'tleft'};
if ( !$left || $left eq '' ) {
$left = $data->{'quantity'};
}
if ( $left && $left > 0 ) {
my $subtotal = $left * $data->{'ecost'};
$data->{subtotal} = sprintf("%.2f",$subtotal);
$data->{'left'} = $left;
push @commited_loop, $data;
$total += $subtotal;
}
}
$template->param(
COMMITTEDLOOP => \@commited_loop,
total => sprintf("%.2f",$total),
);
$sth->finish;
$dbh->disconnect;
output_html_with_http_headers $input, $cookie, $template->output;

85
acqui/spent.pl

@ -1,85 +0,0 @@
#!/usr/bin/perl
# script to show a breakdown of committed and spent budgets
# needs to be templated at some point
use C4::Context;
use C4::Auth;
use C4::Output;
use strict;
use CGI;
my $dbh = C4::Context->dbh;
my $input = new CGI;
my $bookfund = $input->param('bookfund');
my $start = $input->param('start');
my $end = $input->param('end');
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
template_name => "acqui/spent.tmpl",
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => { acquisition => 1 },
debug => 1,
}
);
#James Winter 3/4/2009: Original query does not select spent rows
# correctly due to missing joins between tables
my $query =
"Select distinct quantity,datereceived,freight,unitprice,listprice,ecost,quantityreceived
as qrev,subscription,title,itype as itemtype,aqorders.biblionumber,aqorders.booksellerinvoicenumber,
quantity-quantityreceived as tleft,
aqorders.ordernumber
as ordnum,entrydate,budgetdate,aqbasket.booksellerid,aqbasket.basketno
from aqorders
inner join aqorderbreakdown on aqorderbreakdown.ordernumber = aqorders.ordernumber
inner join aqbasket on aqbasket.basketno = aqorders.basketno
left join items on items.biblionumber=aqorders.biblionumber
where bookfundid=? and
aqorders.ordernumber=aqorderbreakdown.ordernumber and
aqorders.basketno=aqbasket.basketno
and (
(datereceived >= ? and datereceived < ?))
and (datecancellationprinted is NULL or
datecancellationprinted='0000-00-00')
";
my $sth = $dbh->prepare($query);
$sth->execute( $bookfund, $start, $end );
my $total = 0;
my $toggle;
my @spent_loop;
while ( my $data = $sth->fetchrow_hashref ) {
my $recv = $data->{'qrev'};
if ( $recv > 0 ) {
my $subtotal = $recv * $data->{'unitprice'};
$data->{'subtotal'} = $subtotal;
$data->{'unitprice'} += 0;
$total += $subtotal;
if ($toggle) {
$toggle = 0;
}
else {
$toggle = 1;
}
$data->{'toggle'} = $toggle;
push @spent_loop, $data;
}
}
$template->param(
SPENTLOOP => \@spent_loop,
total => $total
);
$sth->finish;
$dbh->disconnect;
output_html_with_http_headers $input, $cookie, $template->output;

115
koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc

@ -1,115 +0,0 @@
<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl"><!-- TMPL_VAR NAME="LibraryName" --></a></h1><!-- Begin Fund Admin Resident Search Box -->
<!-- TMPL_IF NAME="CAN_user_circulate" --><!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
//<![CDATA[
YAHOO.util.Event.onContentReady("header_search", function() {
new function() {
// Define a custom formatter function
this.fnCustomFormatter = function(oResultItem, sQuery) {
var name = oResultItem[0];
var cardnumber = oResultItem[1];
var address = oResultItem[2];
var city = oResultItem[3];
var zip = oResultItem[4];
var aMarkup = [
"<div class=\"sample-result\">",
name,
" (",
cardnumber,
")<small> -- ",
address,
", ",
city,
"<\/small>",
"<\/div>"];
return (aMarkup.join(""));
};
// Instantiate one XHR DataSource and define schema as an array:
// ["Record Delimiter",
// "Field Delimiter"]
this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
this.oACDS.maxCacheEntries = 60;
this.oACDS.queryMatchSubset = true;
// Instantiate first AutoComplete
var myInput = document.getElementById('findborrower');
var myContainer = document.getElementById('yborrowercontainer');
this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
//this.oAutoComp.delimChar = ";";
//this.oAutoComp.queryDelay = 1;
this.oAutoComp.formatResult = this.fnCustomFormatter;
}
});
//]]>
</script> <!-- /TMPL_IF --><!-- /TMPL_IF -->
<div id="header_search">
<div id="bookfund_search" class="residentsearch">
<p class="tip">Search Funds:</p>
<form action="/cgi-bin/koha/admin/aqbookfund.pl" method="post">
<label for="filter_bookfundid_s">Code: </label><select name="filter_bookfundid" id="filter_bookfundid_s">
<option value="">----</option>
<!-- TMPL_LOOP name="filter_bookfundids" -->
<!-- TMPL_IF NAME="selected" -->
<option value="<!-- TMPL_VAR name="bookfundid" -->" selected="selected"><!-- TMPL_VAR name="bookfundid" --></option>
<!-- TMPL_ELSE -->
<option value="<!-- TMPL_VAR name="bookfundid" -->"><!-- TMPL_VAR name="bookfundid" --></option>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</select>
<label for="filter_bookfundname_s">Name: </label><input type="text" name="filter_bookfundname" id="filter_bookfundname_s" size="10" value="<!-- TMPL_VAR name="filter_bookfundname" -->" />
<label for="filter_branchcode_s">Library: </label><select name="filter_branchcode" id="filter_branchcode_s" style="width:10em;">
<option value="">----</option>
<!-- TMPL_LOOP name="filter_branches" -->
<!-- TMPL_IF NAME="selected" -->
<option value="<!-- TMPL_VAR name="code" -->" selected="selected"><!-- TMPL_VAR name="name" --></option>
<!-- TMPL_ELSE -->
<option value="<!-- TMPL_VAR name="code" -->"><!-- TMPL_VAR name="name" --></option>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</select>
<input type="submit" name="filter" value="Submit" />
</form>
</div>
<!-- TMPL_IF NAME="CAN_user_circulate" -->
<div id="circ_search" class="residentsearch" style="display:none;">
<p class="tip">Enter patron card number or partial name:</p>
<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
<!-- TMPL_IF NAME="CircAutocompl" -->
<div class="autocomplete">
<div id="borrowerautocomplete" class="autocomplete">
<input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
<div id="yborrowercontainer"></div>
<input id="ysearchsubmit" type="submit" class="submit" value="Submit" />
<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
<input name="printer" value="" type="hidden" />
</div>
</div>
<!-- TMPL_ELSE -->
<input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
<input name="printer" value="" type="hidden" />
<input value="Submit" class="submit" type="submit" />
<!-- /TMPL_IF -->
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="CAN_user_catalogue" -->
<div id="catalog_search" class="residentsearch" style="display:none;">
<p class="tip">Enter search keywords:</p>
<form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block">
<input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
<input type="submit" value="Submit" class="submit" />
</form>
</div><!-- /TMPL_IF -->
<ul>
<li><a href="/cgi-bin/koha/admin/aqbookfund.pl#bookfund_search">Search Funds</a></li>
<!-- TMPL_IF NAME="CAN_user_circulate" --><li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="CAN_user_catalogue" --><li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li><!-- /TMPL_IF -->
</ul>
</div>
<!-- End Suggestions Resident Search Box -->

63
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl

@ -1,63 +0,0 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
<title>Koha &rsaquo; Acquisitions &rsaquo; Funds</title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body>
<!-- TMPL_INCLUDE NAME="header.inc" -->
<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Funds</div>
<div id="doc3" class="yui-t2">
<div id="bd">
<div id="yui-main">
<div class="yui-b">
<table id="spent">
<tr>
<th>Title</th>
<th>Order</th>
<th>Itemtype</th>
<th>Left on Order</th>
<th>Estimated cost per unit</th>
<th>Budget Date</th>
<th>Subtotal</th>
</tr>
<!--TMPL_LOOP NAME="COMMITTEDLOOP"-->
<!--TMPL_IF name="toggle"-->
<tr class="hilighted">
<!--TMPL_ELSE-->
<tr>
<!--/TMPL_IF-->
<td><!--TMPL_VAR NAME="title"--> </td>
<td> <a href="/cgi-bin/koha/acqui/neworderempty.pl?ordnum=<!--TMPL_VAR NAME="ordnum"-->&amp;booksellerid=<!--TMPL_VAR NAME="booksellerid"-->&amp;basketno=<!--TMPL_VAR NAME="basketno"-->"><!--TMPL_VAR NAME="ordnum"--></a></td>
<td><!--TMPL_VAR NAME="itemtype"--> </td>
<td><!--TMPL_VAR NAME="left"--> </td>
<td><!--TMPL_VAR NAME="ecost"--> </td>
<td><!--TMPL_VAR NAME="budgetdate"--> </td>
<td><!--TMPL_VAR NAME="subtotal"--> </td>
</tr>
<!--/TMPL_LOOP-->
<tr>
<th>Total</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th><!--TMPL_VAR NAME="total"--></th>
</tr>
</table>
</div>
</div>
<div class="yui-b">
<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
</div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

75
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl

@ -1,75 +0,0 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
<title>Koha &rsaquo; Acquisitions &rsaquo; Budgets and Funds: Spent</title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body>
<!-- TMPL_INCLUDE NAME="header.inc" -->
<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Budgets and funds: Spent</div>
<div id="doc3" class="yui-t2">
<div id="bd">
<div id="yui-main">
<div class="yui-b">
<h1>Budgets and funds</h1>
<h2>Spent</h2>
<br /><br />
<table id="spent">
<tr>
<th>Title</th>
<th>Order</th>
<th>Vendor</th>
<th>Invoice</th>
<th>Itemtype</th>
<th>Receieved</th>
<th>Unit Price</th>
<th>Date Received</th>
<th>Subtotal</th>
</tr>
<!--TMPL_LOOP NAME="SPENTLOOP"-->
<!--TMPL_IF name="toggle"-->
<tr class="hilighted">
<!--TMPL_ELSE-->
<tr class="hilighted2">
<!--/TMPL_IF-->
<td><!--TMPL_VAR NAME="title"--> </td>
<td>
<a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!-- TMPL_VAR NAME="ordnum"-->&amp;biblio=<!--TMPL_VAR NAME="biblionumber"-->&amp;invoice=<!--TMPL_VAR NAME="booksellerinvoicenumber"-->&amp;supplierid=<!--TMPL_VAR NAME="booksellerid"-->&amp;catview=yes"><!-- TMPL_VAR NAME="ordnum"--></a></td>
<td><!--TMPL_VAR NAME="booksellerid"--> </td>
<td> <a href=/cgi-bin/koha/acqui/receive.pl?invoice=<!--TMPL_VAR NAME="booksellerinvoicenumber"-->&amp;supplierid=<!--TMPL_VAR NAME="booksellerid"-->><!--TMPL_VAR NAME="booksellerinvoicenumber"--></a></td>
<td><!--TMPL_VAR NAME="itemtype"--> </td>
<td><!--TMPL_VAR NAME="qrev"--> </td>
<td><!--TMPL_VAR NAME="unitprice"--> </td>
<td><!--TMPL_VAR NAME="datereceived"--> </td>
<td><!--TMPL_VAR NAME="subtotal"--> </td>
</tr>
<!--/TMPL_LOOP-->
<tr>
<th>Total</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th><!--TMPL_VAR NAME="total"--></th>
</tr>
</table>
</div>
</div>
<div class="yui-b">
<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
</div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
Loading…
Cancel
Save