Attachment #16524 for bug #7684

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

Lines 1140-1146 sub check_api_auth { Link Here

(-)a/C4/Auth.pm (-1 / +1 lines)
1140	unless ($query->param('userid')) {	1140	unless ($query->param('userid')) {
1141	$sessionID = $query->cookie("CGISESSID");	1141	$sessionID = $query->cookie("CGISESSID");
1142	}	1142	}
1143	if ($sessionID && not ($cas && $query->param('PT')) ) {	1143	if ( $sessionID && not ($cas && $query->param('PT')) ) {
1144	my $session = get_session($sessionID);	1144	my $session = get_session($sessionID);
1145	C4::Context->_new_userenv($sessionID);	1145	C4::Context->_new_userenv($sessionID);
1146	if ($session) {	1146	if ($session) {

Lines 970-978 sub GetLostItems { Link Here

(-)a/C4/Items.pm (-12 / +29 lines)
970		970
971	=head2 GetItemsForInventory	971	=head2 GetItemsForInventory
972		972
973	$itemlist = GetItemsForInventory($minlocation, $maxlocation,	973	=over 4
974	$location, $itemtype $datelastseen, $branch,	974
975	$offset, $size, $statushash);	975	($itemlist, $iTotalRecords) = GetItemsForInventory($minlocation, $maxlocation, $location, $itemtype, $ignoreissued, $datelastseen, $branchcode, $offset, $size, $statushash);
		976
		977	=back
976		978
977	Retrieve a list of title/authors/barcode/callnumber, for biblio inventory.	979	Retrieve a list of title/authors/barcode/callnumber, for biblio inventory.
978		980
Lines 985-990 the datelastseen can be used to specify that you want to see items not seen sinc Link Here
985	offset & size can be used to retrieve only a part of the whole listing (defaut behaviour)	987	offset & size can be used to retrieve only a part of the whole listing (defaut behaviour)
986	$statushash requires a hashref that has the authorized values fieldname (intems.notforloan, etc...) as keys, and an arrayref of statuscodes we are searching for as values.	988	$statushash requires a hashref that has the authorized values fieldname (intems.notforloan, etc...) as keys, and an arrayref of statuscodes we are searching for as values.
987		989
		990	$iTotalRecords is the number of rows that would have been returned without the $offset, $size limit clause
		991
988	=cut	992	=cut
989		993
990	sub GetItemsForInventory {	994	sub GetItemsForInventory {
Lines 993-999 sub GetItemsForInventory { Link Here
993	my ( @bind_params, @where_strings );	997	my ( @bind_params, @where_strings );
994		998
995	my $query = <<'END_SQL';	999	my $query = <<'END_SQL';
996	SELECT items.itemnumber, barcode, itemcallnumber, title, author, biblio.biblionumber, datelastseen	1000	SELECT SQL_CALC_FOUND_ROWS items.itemnumber, barcode, itemcallnumber, title, author, biblio.biblionumber, biblio.frameworkcode, datelastseen, homebranch, location, notforloan, damaged, itemlost, stocknumber
997	FROM items	1001	FROM items
998	LEFT JOIN biblio ON items.biblionumber = biblio.biblionumber	1002	LEFT JOIN biblio ON items.biblionumber = biblio.biblionumber
999	LEFT JOIN biblioitems on items.biblionumber = biblioitems.biblionumber	1003	LEFT JOIN biblioitems on items.biblionumber = biblioitems.biblionumber
Lines 1052-1071 END_SQL Link Here
1052	$query .= join ' AND ', @where_strings;	1056	$query .= join ' AND ', @where_strings;
1053	}	1057	}
1054	$query .= ' ORDER BY items.cn_sort, itemcallnumber, title';	1058	$query .= ' ORDER BY items.cn_sort, itemcallnumber, title';
		1059	$query .= " LIMIT $offset, $size" if ($offset and $size);
1055	my $sth = $dbh->prepare($query);	1060	my $sth = $dbh->prepare($query);
1056	$sth->execute( @bind_params );	1061	$sth->execute( @bind_params );
1057		1062
1058	my @results;	1063	my @results;
1059	$size--;	1064	my $tmpresults = $sth->fetchall_arrayref({});
1060	while ( my $row = $sth->fetchrow_hashref ) {	1065	$sth = $dbh->prepare("SELECT FOUND_ROWS()");
1061	$offset-- if ($offset);	1066	$sth->execute();
1062	$row->{datelastseen}=format_date($row->{datelastseen});	1067	my ($iTotalRecords) = $sth->fetchrow_array();
1063	if ( ( !$offset ) && $size ) {	1068
1064	push @results, $row;	1069	foreach my $row (@$tmpresults) {
1065	$size--;	1070	$row->{datelastseen} = format_date( $row->{datelastseen} );
		1071
		1072	# Auth values
		1073	foreach (keys %$row) {
		1074	# If the koha field is mapped to a marc field
		1075	my ($f, $sf) = GetMarcFromKohaField("items.$_", $row->{'frameworkcode'});
		1076	if ($f and $sf) {
		1077	# We replace the code with it's description
		1078	my $authvals = C4::Koha::GetKohaAuthorisedValuesFromField($f, $sf, $row->{'frameworkcode'});
		1079	$row->{$_} = $authvals->{$row->{$_}} if defined $authvals->{$row->{$_}};
		1080	}
1066	}	1081	}
		1082	push @results, $row;
1067	}	1083	}
1068	return \@results;	1084
		1085	return (\@results, $iTotalRecords);
1069	}	1086	}
1070		1087
1071	=head2 GetItemsCount	1088	=head2 GetItemsCount

Lines 326-332 sub getlanguage { Link Here

(-)a/C4/Templates.pm (-1 / +1 lines)
326	my $lang;	326	my $lang;
327		327
328	# cookie	328	# cookie
329	if ( $query->cookie('KohaOpacLanguage') ) {	329	if ($query and $query->cookie('KohaOpacLanguage') ) {
330	$lang = $query->cookie('KohaOpacLanguage');	330	$lang = $query->cookie('KohaOpacLanguage');
331	$lang =~ s/[^a-zA-Z_-]*//; # sanitize cookie	331	$lang =~ s/[^a-zA-Z_-]*//; # sanitize cookie
332	}	332	}




[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Tools &rsaquo; Inventory</title>
[% INCLUDE 'doc-head-close.inc' %]
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
[% INCLUDE 'calendar.inc' %]
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
<script type="text/javascript">
//<![CDATA[
$(document).ready(function(){

        inventorydt = $('#inventoryt').dataTable($.extend(true, {}, dataTablesDefaults, {
            'sPaginationType': 'full_numbers',
            "aoColumnDefs": [ { "bSortable": false, "aTargets": [ 0 ] } ] 
        } ));


	$("#continuewithoutmarkingbutton").click(function(){
                inventorydt.fnPageChange( 'next' );
	        return false;
        });

        $("#markseenandcontinuebutton").click(function(){
            var param = '';
            $("input:checked").each(function() {
                param += "|" + $(this).attr('name');
            });
            $.post('/cgi-bin/koha/tools/ajax-inventory.pl', { seen: param });
            inventorydt.fnPageChange( 'next' );
            return false;
        });

        $("#markseenandquit").click(function(){
            var param = '';
            $("input:checked").each(function() {
                param += "|" + $(this).attr('name');
            });
            $.ajax({
              type: 'POST',
              url: '/cgi-bin/koha/tools/ajax-inventory.pl',
              data: { seen: param},
              async: false
            });
            document.location.href = '/cgi-bin/koha/tools/inventory.pl';
            return false;
        });



	$(".checkall").click(function(){
	        $(".checkboxed").checkCheckboxes();
	        return false;

//]]>
</script>
</head>
<body>
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; [% IF (loop) %]<a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a> &rsaquo; Results[% ELSE %]Inventory[% END %]</div>

<div id="doc3" class="yui-t2">
   

	<div id="yui-main">
	<div class="yui-b">
    <h1>Inventory/Stocktaking</h1>
    [% IF (moddatecount) %]<div class="dialog message">[% moddatecount %] items modified : datelastseen set to [% date %]</div>[% END %]
    [% IF (errorfile) %]<div class="dialog alert">[% errorfile %] can't be opened</div>[% END %]
    [% FOREACH error IN errorloop %]
        <div class="dialog alert">
            [% error.barcode %]
            [% IF (error.ERR_BARCODE) %]: barcode not found[% END %]
            [% IF (error.ERR_WTHDRAWN) %]: item withdrawn[% END %]
            [% IF (error.ERR_ONLOAN_RET) %]: item was on loan. It was returned before marked as seen[% END %]
            [% IF (error.ERR_ONLOAN_NOT_RET) %]: item was on loan. couldn't be returned.[% END %]
        </div>
    [% END %]
       [% UNLESS op %]
	<div class="yui-g">
    <form method="post" action="/cgi-bin/koha/tools/inventory.pl" enctype="multipart/form-data">
        <fieldset class="rows">
            <legend>Use a barcode file</legend>
	 <ol>
            <li><label for="uploadbarcodes">Barcode file: </label> <input type="file" id="uploadbarcodes" name="uploadbarcodes" /></li>
            <li><label for="setdate">Set inventory date to:</label> <input type="text" id="setdate" name="setdate" value="[% today %]" class="datepickerfrom" />
			<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
            </li>
          </ol>
        </fieldset>
        <fieldset class="rows">
        <legend>Select items you want to check</legend>
        <ol><li>
        <label for="branch">Branch</label>
            <input type="radio" name="branch" value="homebranch">Home Branch</input>
            <input type="radio" name="branch" value="holdingbranch">Holding Branch</input>
        </li><li>
        <label for="branchloop">Library</label><select id="branchloop" name="branchcode" style="width:12em;">
            <option value="">All Locations</option>
        [% FOREACH branch IN branchloop %]
            [% IF (branch.selected) %]
                <option value="[% branch.value %]" selected="selected">[% branch.branchname %]</option>
            [% ELSE %]
                <option value="[% branch.value %]">[% branch.branchname %]</option>
            [% END %]
        [% END %]
        </select>
        </li>
        [% IF (authorised_values) %]
        <li>
            <label for="locationloop">Item Location (items.location) is</label> 
        <select id="locationloop" name="location">
                <option value="">Filter location</option>
        [% FOREACH value IN authorised_values %]
            [% IF (value.selected) %]
                <option value="[% value.authorised_value %]" selected="selected">[% value.lib %]</option>
            [% ELSE %]
                <option value="[% value.authorised_value %]">[% value.lib %]</option>
            [% END %]
        [% END %]
        </select>        </li>
        [% END %]
        <li>
            <label for="minlocation">Item callnumber between: </label>
                <input type="text" name="minlocation" id="minlocation" value="[% minlocation %]" /> (items.itemcallnumber)  </li>
           <li><label for="maxlocation">...and: </label>
                <input type="text" name="maxlocation" id="maxlocation" value="[% maxlocation %]" />
        </li>
        [% IF (statuses) %]
	</ol>
	</fieldset>
            <fieldset class="rows">
            <legend>Item statuses:</legend>
            <div name="statuses" style="display: block;">
                  [% FOREACH status IN statuses %]
                      [% IF (status.values) %]
                          <fieldset style="float: left; padding: 5px; margin: 5px;text-align:right">
                              <legend>[% status.fieldname %]</legend>
                              <ul id="statuses-[% fieldname %]" style="display: inline;">
                              [% FOREACH value IN status.values %]
                                  [% IF (value.lib) %]<li>
                                    <label for="[% value.id %]">
                                      [% value.lib %]
                                    </label>
                                    <input type="checkbox" name="status-[% value.fieldname %]-[% value.authorised_value %]" id="[% value.authorised_value %]" />
                                  </li>[% END %]
                              [% END %]
                              </ul>

        [% END %]

        <li><label for="datelastseen">Inventory date:</label>
            <input type="text" id="datelastseen" name="datelastseen" value="[% datelastseen %]" class="datepickerfrom" />
			<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
        </li>
        <li><label for="ignoreissued">Skip copies on loan: </label>
            [% IF (ignoreissued) %]
            <input type="checkbox" id="ignoreissued" name="ignoreissued" checked="checked" /></li>
            [% ELSE %]
            <input type="checkbox" id="ignoreissued" name="ignoreissued" /></li>
            [% END %]
        <li><label for="pagesize">Show: </label>
            <input type="text" id="pagesize" name="pagesize" value="[% pagesize %]" maxlength="5" size="5" /> items</li>
          <li><label for="offset">Beginning at offset: </label>
            <input type="text" id="offset" name="offset" value="[% offset %]" size="5" maxlength="5" />
        </li>
        <li>
           <label for="CSVexport">Export to csv file</label>
           <input type="checkbox" name="CSVexport" id="CSVexport" />
        </li>
        <li>

	</div>
	</div>
	[% END %]
    [% IF (op) %]
    <form method="post" action="/cgi-bin/koha/tools/inventory.pl" class="checkboxed">
    <input type="hidden" name="markseen" value="1" />
    <input type="hidden" name="minlocation" value="[% minlocation %]" />

    <input type="hidden" name="datelastseen" value="[% datelastseen %]" />
    <input type="hidden" name="pagesize" value="[% pagesize %]" />
    <input type="hidden" name="offset" value="[% offset %]" />
	<div><a href="#" class="checkall">[Select All]</a> <a href="#" class="clearall">[Clear All]</a></div>
    <table id="inventoryt">
    <thead>
        <tr>
            <th>Seen</th>
            <th>Barcode</th>
            <th>Location</th>
            <th>Title</th>
            <th>Status</th>
            <th>Lost</th>
            <th>Damaged</th>
            <th>Unseen since</th>
            <th>Problems</th>
        </tr>
    </thead>
    <tbody>
    [% FOREACH result IN loop %]
        <tr>
            <td>
            <input type="checkbox" name="SEEN-[% result.itemnumber %]" value="1" />
            </td>
            <td>
            [% result.barcode | html %]
            </td>
            <td>
            [% result.homebranch | html %] [% result.location | html %] [[% result.itemcallnumber | html %]]
            </td>
            <td>
            <p><a href="#" onclick="window.open('/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% result.biblionumber %]','marcview','width=800,height=600,toolbar=0,scrollbars=1');">[% result.title | html %]</a></p><p>[% result.author | html %]</p>
                <p>[% loo.author %]</p>
            </td>
            <td>
            [% result.notforloan | html %]
            </td>
            <td>
            [% result.itemlost | html %]
            </td>
            <td>
            [% result.damaged | html %]
            </td>
            <td>
            [% result.datelastseen | html %]
            </td>
            <td>
            [% IF (result.wrongplace) %]<p>Item should not have been scanned</p>[% ELSIF (result.missingitem) %]<p>Item missing</p>[% ELSIF (result.changestatus) %]<p>Change item status</p>[% END %]
            </td>
        </tr>
    [% END %]
    </tbody>
    </table>
    <div class="spacer"></div>
      <p style="display:block;"><span class="exportSelected"></span></p>
	<div style="padding : .3em 0"><a href="#" class="checkall">[Select All]</a> <a href="#" class="clearall">[Clear All]</a></div>
     <input type="submit" id="markseenandquit" value="Mark seen and quit" />
     <input type="submit" value="Mark Seen and Continue &gt;&gt;" id="markseenandcontinuebutton" />
     <input type="submit" value="Continue without Marking &gt;&gt;" id="continuewithoutmarkingbutton" class="submit" />
        <input type="hidden" name="minlocation" value="[% minlocation %]" />
        <input type="hidden" name="maxlocation" value="[% maxlocation %]" />
        <input type="hidden" name="location" value="[% location %]" />
        <input type="hidden" name="branchcode" value="[% branchcode %]" />
        <input type="hidden" name="datelastseen" value="[% datelastseen %]" />
        <input type="hidden" name="pagesize" value="[% pagesize %]" />
        <input type="hidden" name="offset" value="[% prevoffset %]" />
        <input type="hidden" name="op" value="do_it" />
        <input type="submit" value="&lt;&lt; Continue without marking" class="submit" />
    </form>
    [% END %]
    [% IF ( nextoffset ) %]
    <form method="post">
        <input type="hidden" name="branch" value="[% branch %]" />
        <input type="hidden" name="location" value="[% location %]" />
        <input type="hidden" name="branchcode" value="[% branchcode %]" />
        <input type="hidden" name="minlocation" value="[% minlocation %]" />
        <input type="hidden" name="maxlocation" value="[% maxlocation %]" />
        <input type="hidden" name="datelastseen" value="[% datelastseen %]" />
        <input type="hidden" name="pagesize" value="[% pagesize %]" />
        <input type="hidden" name="offset" value="[% nextoffset %]" />
        <input type="hidden" name="op" value="do_it" />
        <input type="submit" value="Continue without marking &gt;&gt;" class="submit" />
    </form>

    </div>

    [% END %]
</div>
<div class="yui-b">




#!/usr/bin/perl
#

use Modern::Perl;

use CGI;
use JSON;

use C4::Auth;
use C4::Circulation qw/CanBookBeRenewed/;
use C4::Context;
use C4::Koha qw/getitemtypeimagelocation/;
use C4::Reserves qw/CheckReserves/;
use C4::Utils::DataTables;
use C4::Output;
use C4::Biblio;
use C4::Items;
use C4::Dates qw/format_date format_date_in_iso/;
use C4::Koha;
use C4::Branch;    # GetBranches
use C4::Reports::Guided;    #_get_column_defs
use C4::Charset;
use List::MoreUtils qw /none/;


my $input = new CGI;

# Authentication
my ($status, $cookie, $sessionId) = C4::Auth::check_api_auth($input, { tools => 'inventory' });
exit unless ($status eq "ok");


my $seen = $input->param('seen');
my @seent = split(/\|/, $seen);

# mark seen if applicable (ie: coming form mark seen checkboxes)
foreach ( @seent ) {
    /SEEN-(.+)/ and &ModDateLastSeen($1);
}


print $input->header('application/json');





use C4::Koha;
use C4::Branch; # GetBranches
use C4::Circulation;
use C4::Reports::Guided;    #_get_column_defs
use C4::Charset;
use List::MoreUtils qw/none/;


my $minlocation=$input->param('minlocation') || '';
my $maxlocation=$input->param('maxlocation');

$pagesize=50 unless $pagesize;
my $branchcode = $input->param('branchcode') || '';
my $branch     = $input->param('branch');
my $op         = $input->param('op');
my $compareinv2barcd = $input->param('compareinv2barcd');
my $res;                                            #contains the results loop

my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
    {   template_name   => "tools/inventory.tmpl",
        query           => $input,
        type            => "intranet",
        authnotrequired => 0,
        flagsrequired   => { tools => 'inventory' },
        debug           => 1,
    }
);


my $branches = GetBranches();
my @branch_loop;

    }
}

my $notforloanlist;
my $statussth = '';
for my $authvfield (@$statuses) {
    if ( scalar @{$staton->{$authvfield->{fieldname}}} > 0 ){
        my $joinedvals = join ',', @{$staton->{$authvfield->{fieldname}}};
        $statussth .= "$authvfield->{fieldname} in ($joinedvals) and ";
        $notforloanlist = $joinedvals if ($authvfield->{fieldname} eq "items.notforloan");
    }
}
$statussth =~ s, and $,,g;
$template->param(
    branchloop               => \@branch_loop,
    authorised_values        => \@authorised_value_list,
    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
    today                    => C4::Dates->today(),
    minlocation              => $minlocation,
    maxlocation              => $maxlocation,
    location                 => $location,
    ignoreissued             => $ignoreissued,
    branchcode               => $branchcode,
    branch                   => $branch,
    offset                   => $offset,
    pagesize                 => $pagesize,
    datelastseen             => $datelastseen,
    compareinv2barcd         => $compareinv2barcd,
    notforloanlist           => $notforloanlist
);

my @notforloans;
if (defined $notforloanlist) {
    @notforloans = split(/,/, $notforloanlist);
}



my @brcditems;
my $barcodelist;
my @errorloop;
if ( $uploadbarcodes && length($uploadbarcodes) > 0 ) {
     my $dbh = C4::Context->dbh;
    my $date = format_date_in_iso( $input->param('setdate') ) || C4::Dates->today('iso');

    my $strsth  = "select * from issues, items where items.itemnumber=issues.itemnumber and items.barcode =?";
    my $qonloan = $dbh->prepare($strsth);
    $strsth="select * from items where items.barcode =? and items.wthdrawn = 1";
    my $qwthdrawn = $dbh->prepare($strsth);
    my $count = 0;
  
    while ( my $barcode = <$uploadbarcodes> ) {
        $barcode =~ s/\r?\n$//;
        $barcodelist .= ($barcodelist) ? '|' . $barcode : $barcode;
        if ( $qwthdrawn->execute($barcode) && $qwthdrawn->rows ) {
            push @errorloop, { 'barcode' => $barcode, 'ERR_WTHDRAWN' => 1 };
        } else {
            my $item = GetItem( '', $barcode );
            if ( defined $item && $item->{'itemnumber'} ) {
                ModItem( { datelastseen => $date }, undef, $item->{'itemnumber'} );
                push @brcditems, $item;
                $count++;
                $qonloan->execute($barcode);

                push @errorloop, {'barcode'=>$barcode,'ERR_BARCODE'=>1};
            }
        }

    }
    $qonloan->finish;
    $qwthdrawn->finish;
    $template->param( date => format_date($date), Number => $count );
    $template->param( errorloop => \@errorloop ) if (@errorloop);


}
$template->param(barcodelist => $barcodelist);

# now build the result list: inventoried items if requested, and mis-placed items -always-
my $inventorylist;
if ( $markseen or $op ) {
    # retrieve all items in this range.
    my $totalrecords;
        ($inventorylist, $totalrecords) = GetItemsForInventory($minlocation, $maxlocation, $location, $itemtype, $ignoreissued, '', $branchcode, $branch, 0, undef , $staton);

    $res = $inventorylist ;
}

# set "missing" flags for all items with a datelastseen before the choosen datelastseen
foreach (@$res) {$_->{missingitem}=1 if C4::Dates->new($_->{datelastseen})->output('iso') lt C4::Dates->new($datelastseen)->output('iso')}

# removing missing items from loop if "Compare barcodes list to results" has not been checked
@$res = grep {!$_->{missingitem} == 1 } @$res if (!$input->param('compareinv2barcd'));

# insert "wrongplace" to all scanned items that are not supposed to be in this range
# note this list is always displayed, whatever the librarian has choosen for comparison
foreach my $temp (@brcditems) {

  # Saving notforloan code before it's replaced by it's authorised value for later comparison
  $temp->{'notforloancode'} = $temp->{'notforloan'};

  # Populating with authorised values
  foreach (keys %$temp) {
        # If the koha field is mapped to a marc field
        my $fc = $temp->{'frameworkcode'} || '';
        my ($f, $sf) = GetMarcFromKohaField("items.$_", $fc);
        if ($f and $sf) {
            # We replace the code with it's description
            my $authvals = C4::Koha::GetKohaAuthorisedValuesFromField($f, $sf, $fc);
            if ($authvals and defined $temp->{$_} and defined $authvals->{$temp->{$_}}) {
              $temp->{$_} = $authvals->{$temp->{$_}};
            }
        }
    }

    next if $temp->{onloan}; # skip checked out items

    # If we have scanned items with a non-matching notforloan value
    if (none { $temp->{'notforloancode'} eq $_ } @notforloans) {
        $temp->{'changestatus'} = 1;
        my $biblio = C4::Biblio::GetBiblioData($temp->{biblionumber});
        $temp->{title} = $biblio->{title};
        $temp->{author} = $biblio->{author};
        $temp->{datelastseen} = format_date($temp->{datelastseen});
        push @$res, $temp;

    }

    if (none { $temp->{barcode} eq $_->{barcode} && !$_->{onloan} } @$inventorylist) {
        $temp->{wrongplace}=1;
        my $biblio = C4::Biblio::GetBiblioData($temp->{biblionumber});
        $temp->{title} = $biblio->{title};
        $temp->{author} = $biblio->{author};
        $temp->{datelastseen} = format_date($temp->{datelastseen});
        push @$res, $temp;
    }
}

# Finally, modifying datelastseen for remaining items
my $moddatecount = 0;
foreach (@$res) {
    unless ($_->{'missingitem'}) {
        ModDateLastSeen($_->{'itemnumber'}); 
        $moddatecount++;
        }
    }
}

# Removing items that don't have any problems from loop
@$res = grep { $_->{missingitem} || $_->{wrongplace} || $_->{changestatus} } @$res;

$template->param(
    moddatecount => $moddatecount,
    loop       => $res,
    nextoffset => ( $offset + $pagesize ),
    prevoffset => ( $offset ? $offset - $pagesize : 0 ),
    op         => $op
);

if (defined $input->param('CSVexport') && $input->param('CSVexport') eq 'on'){
    eval {use Text::CSV};
    my $csv = Text::CSV->new or

        -type       => 'text/csv',
        -attachment => 'inventory.csv',
    );

    my $columns_def_hashref = C4::Reports::Guided::_get_column_defs();
    foreach my $key ( keys %$columns_def_hashref ) {
        my $initkey = $key;
        $key =~ s/[^\.]*\.//;
        $columns_def_hashref->{$initkey}=NormalizeString($columns_def_hashref->{$initkey});
        $columns_def_hashref->{$key} = $columns_def_hashref->{$initkey};
    }

    my @translated_keys;
    for my $key (qw / biblioitems.title    biblio.author 
                      items.barcode        items.itemnumber 
                      items.homebranch     items.location 
                      items.itemcallnumber items.notforloan 
                      items.itemlost       items.damaged
                      items.stocknumber
                      / ) {
       push @translated_keys, $columns_def_hashref->{$key};
    }

    $csv->combine(@translated_keys);
    print $csv->string, "\n";

    my @keys = qw / title author barcode itemnumber homebranch location itemcallnumber notforloan lost damaged stocknumber /; 
    for my $re (@$res) {
        my @line;
        for my $key (@keys) {
            push @line, $re->{$key};
        }
        push @line, "wrong place" if $re->{wrongplace};
        push @line, "missing item" if $re->{missingitem};
        push @line, "change item status" if $re->{changestatus};
        $csv->combine(@line);
        print $csv->string, "\n";
    }
    # Adding not found barcodes
    foreach my $error (@errorloop) {
	my @line;
	if ($error->{'ERR_BARCODE'}) {
		push @line, map { $_ eq 'barcode' ? $error->{'barcode'} : ''} @keys;
		push @line, "barcode not found";
		$csv->combine(@line);
		print $csv->string, "\n";
	}
    }
    exit;
}

- 

Return to bug 7684

Lines 1-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt (-91 / +117 lines)
1	[% INCLUDE 'doc-head-open.inc' %]	1	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Tools &rsaquo; Inventory</title>	2	<title>Koha &rsaquo; Tools &rsaquo; Inventory</title>
3	[% INCLUDE 'doc-head-close.inc' %]	3	[% INCLUDE 'doc-head-close.inc' %]
		4	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
		5	<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
		6	<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
4	[% INCLUDE 'calendar.inc' %]	7	[% INCLUDE 'calendar.inc' %]
5	<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>	8	<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
6	<script type="text/javascript">	9	<script type="text/javascript">
7	//<![CDATA[	10	//<![CDATA[
8	$(document).ready(function(){	11	$(document).ready(function(){
		12
		13	inventorydt = $('#inventoryt').dataTable($.extend(true, {}, dataTablesDefaults, {
		14	'sPaginationType': 'full_numbers',
		15	"aoColumnDefs": [ { "bSortable": false, "aTargets": [ 0 ] } ]
		16	} ));
		17
		18
		19	$("#continuewithoutmarkingbutton").click(function(){
		20	inventorydt.fnPageChange( 'next' );
		21	return false;
		22	});
		23
		24	$("#markseenandcontinuebutton").click(function(){
		25	var param = '';
		26	$("input:checked").each(function() {
		27	param += "\|" + $(this).attr('name');
		28	});
		29	$.post('/cgi-bin/koha/tools/ajax-inventory.pl', { seen: param });
		30	inventorydt.fnPageChange( 'next' );
		31	return false;
		32	});
		33
		34	$("#markseenandquit").click(function(){
		35	var param = '';
		36	$("input:checked").each(function() {
		37	param += "\|" + $(this).attr('name');
		38	});
		39	$.ajax({
		40	type: 'POST',
		41	url: '/cgi-bin/koha/tools/ajax-inventory.pl',
		42	data: { seen: param},
		43	async: false
		44	});
		45	document.location.href = '/cgi-bin/koha/tools/inventory.pl';
		46	return false;
		47	});
		48
		49
		50
9	$(".checkall").click(function(){	51	$(".checkall").click(function(){
10	$(".checkboxed").checkCheckboxes();	52	$(".checkboxed").checkCheckboxes();
11	return false;	53	return false;
Lines 28-38 $(document).ready(function(){ Link Here
28	//]]>	70	//]]>
29	</script>	71	</script>
30	</head>	72	</head>
31	<body id="tools_inventory" class="tools">	73	<body>
32	[% INCLUDE 'header.inc' %]	74	[% INCLUDE 'header.inc' %]
33	[% INCLUDE 'cat-search.inc' %]	75	[% INCLUDE 'cat-search.inc' %]
34		76
35	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; [% IF ( loop ) %]<a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a> &rsaquo; Results[% ELSE %]Inventory[% END %]</div>	77	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; [% IF (loop) %]<a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a> &rsaquo; Results[% ELSE %]Inventory[% END %]</div>
36		78
37	<div id="doc3" class="yui-t2">	79	<div id="doc3" class="yui-t2">
38		80
Lines 40-123 $(document).ready(function(){ Link Here
40	<div id="yui-main">	82	<div id="yui-main">
41	<div class="yui-b">	83	<div class="yui-b">
42	<h1>Inventory/Stocktaking</h1>	84	<h1>Inventory/Stocktaking</h1>
43	[% IF ( Number ) %]<div class="dialog message">[% Number %] items modified : datelastseen set to [% date %]</div>[% END %]	85	[% IF (moddatecount) %]<div class="dialog message">[% moddatecount %] items modified : datelastseen set to [% date %]</div>[% END %]
44	[% IF ( errorfile ) %]<div class="dialog alert">[% errorfile %] can't be opened</div>[% END %]	86	[% IF (errorfile) %]<div class="dialog alert">[% errorfile %] can't be opened</div>[% END %]
45	[% FOREACH errorloo IN errorloop %]	87	[% FOREACH error IN errorloop %]
46	<div class="dialog alert">	88	<div class="dialog alert">
47	[% errorloo.barcode %]	89	[% error.barcode %]
48	[% IF ( errorloo.ERR_BARCODE ) %]: barcode not found[% END %]	90	[% IF (error.ERR_BARCODE) %]: barcode not found[% END %]
49	[% IF ( errorloo.ERR_WTHDRAWN ) %]: item withdrawn[% END %]	91	[% IF (error.ERR_WTHDRAWN) %]: item withdrawn[% END %]
50	[% IF ( errorloo.ERR_ONLOAN_RET ) %]: item was on loan. It was returned before marked as seen[% END %]	92	[% IF (error.ERR_ONLOAN_RET) %]: item was on loan. It was returned before marked as seen[% END %]
51	[% IF ( errorloo.ERR_ONLOAN_NOT_RET ) %]: item was on loan. couldn't be returned.[% END %]	93	[% IF (error.ERR_ONLOAN_NOT_RET) %]: item was on loan. couldn't be returned.[% END %]
52	</div>	94	</div>
53	[% END %]	95	[% END %]
54	[% UNLESS ( loop ) %]	96	[% UNLESS op %]
55	<div class="yui-g">	97	<div class="yui-g">
56	<form method="post" action="/cgi-bin/koha/tools/inventory.pl" enctype="multipart/form-data">	98	<form method="post" action="/cgi-bin/koha/tools/inventory.pl" enctype="multipart/form-data">
57	<fieldset class="rows">	99	<fieldset class="rows">
58	<legend>Use a barcode file</legend>	100	<legend>Use a barcode file</legend>
59	<ol>	101	<ol>
60	<li><label for="uploadbarcodes">Barcode file: </label> <input type="file" id="uploadbarcodes" name="uploadbarcodes" /></li>	102	<li><label for="uploadbarcodes">Barcode file: </label> <input type="file" id="uploadbarcodes" name="uploadbarcodes" /></li>
61	<li><label for="setdate">Set inventory date to:</label> <input type="text" id="setdate" name="setdate" value="[% today %]" class="datepicker" />	103	<li><label for="setdate">Set inventory date to:</label> <input type="text" id="setdate" name="setdate" value="[% today %]" class="datepickerfrom" />
62	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
63	</li>	104	</li>
64	</ol>	105	</ol>
65	</fieldset>	106	</fieldset>
66	<fieldset class="rows">	107	<fieldset class="rows">
67	<legend>Select items you want to check</legend>	108	<legend>Select items you want to check</legend>
68	<ol><li>	109	<ol><li>
69	<label for="branch">Library</label>	110	<label for="branch">Branch</label>
70	<input type="radio" name="branch" value="homebranch"> Home library</input>	111	<input type="radio" name="branch" value="homebranch">Home Branch</input>
71	<input type="radio" name="branch" value="holdingbranch"> Current location</input>	112	<input type="radio" name="branch" value="holdingbranch">Holding Branch</input>
72	</li><li>	113	</li><li>
73	<label for="branchloop">Library</label><select id="branchloop" name="branchcode" style="width:12em;">	114	<label for="branchloop">Library</label><select id="branchloop" name="branchcode" style="width:12em;">
74	<option value="">All locations</option>	115	<option value="">All Locations</option>
75	[% FOREACH branchloo IN branchloop %]	116	[% FOREACH branch IN branchloop %]
76	[% IF ( branchloo.selected ) %]	117	[% IF (branch.selected) %]
77	<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>	118	<option value="[% branch.value %]" selected="selected">[% branch.branchname %]</option>
78	[% ELSE %]	119	[% ELSE %]
79	<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>	120	<option value="[% branch.value %]">[% branch.branchname %]</option>
80	[% END %]	121	[% END %]
81	[% END %]	122	[% END %]
82	</select>	123	</select>
83	</li>	124	</li>
84	[% IF ( authorised_values ) %]	125	[% IF (authorised_values) %]
85	<li>	126	<li>
86	<label for="locationloop">Shelving location (items.location) is</label>	127	<label for="locationloop">Item Location (items.location) is</label>
87	<select id="locationloop" name="location">	128	<select id="locationloop" name="location">
88	<option value="">Filter location</option>	129	<option value="">Filter location</option>
89	[% FOREACH authorised_value IN authorised_values %]	130	[% FOREACH value IN authorised_values %]
90	[% IF ( authorised_value.selected ) %]	131	[% IF (value.selected) %]
91	<option value="[% authorised_value.authorised_value %]" selected="selected">[% authorised_value.lib %]</option>	132	<option value="[% value.authorised_value %]" selected="selected">[% value.lib %]</option>
92	[% ELSE %]	133	[% ELSE %]
93	<option value="[% authorised_value.authorised_value %]">[% authorised_value.lib %]</option>	134	<option value="[% value.authorised_value %]">[% value.lib %]</option>
94	[% END %]	135	[% END %]
95	[% END %]	136	[% END %]
96	</select> </li>	137	</select> </li>
97	[% END %]	138	[% END %]
98	<li>	139	<li>
99	<label for="minlocation">Item call number between: </label>	140	<label for="minlocation">Item callnumber between: </label>
100	<input type="text" name="minlocation" id="minlocation" value="[% minlocation %]" /> (items.itemcallnumber) </li>	141	<input type="text" name="minlocation" id="minlocation" value="[% minlocation %]" /> (items.itemcallnumber) </li>
101	<li><label for="maxlocation">...and: </label>	142	<li><label for="maxlocation">...and: </label>
102	<input type="text" name="maxlocation" id="maxlocation" value="[% maxlocation %]" />	143	<input type="text" name="maxlocation" id="maxlocation" value="[% maxlocation %]" />
103	</li>	144	</li>
104	[% IF ( statuses ) %]	145	[% IF (statuses) %]
105	</ol>	146	</ol>
106	</fieldset>	147	</fieldset>
107	<fieldset class="rows">	148	<fieldset class="rows">
108	<legend>Item statuses:</legend>	149	<legend>Item statuses:</legend>
109	<div name="statuses" style="display: block;">	150	<div name="statuses" style="display: block;">
110	[% FOREACH statuse IN statuses %]	151	[% FOREACH status IN statuses %]
111	[% IF ( statuse.values ) %]	152	[% IF (status.values) %]
112	<fieldset style="float: left; padding: 5px; margin: 5px;text-align:right">	153	<fieldset style="float: left; padding: 5px; margin: 5px;text-align:right">
113	<legend>[% statuse.fieldname %]</legend>	154	<legend>[% status.fieldname %]</legend>
114	<ul id="statuses-[% statuse.fieldname %]" style="display: inline;">	155	<ul id="statuses-[% fieldname %]" style="display: inline;">
115	[% FOREACH value IN statuse.values %]	156	[% FOREACH value IN status.values %]
116	[% IF ( value.lib ) %]<li>	157	[% IF (value.lib) %]<li>
117	<label for="[% value.id %]">	158	<label for="[% value.id %]">
118	[% value.lib %]	159	[% value.lib %]
119	</label>	160	</label>
120	<input type="checkbox" name="status-[% value.fieldname %]-[% value.id %]" id="[% value.id %]" />	161	<input type="checkbox" name="status-[% value.fieldname %]-[% value.authorised_value %]" id="[% value.authorised_value %]" />
121	</li>[% END %]	162	</li>[% END %]
122	[% END %]	163	[% END %]
123	</ul>	164	</ul>
Lines 131-152 $(document).ready(function(){ Link Here
131	[% END %]	172	[% END %]
132		173
133	<li><label for="datelastseen">Inventory date:</label>	174	<li><label for="datelastseen">Inventory date:</label>
134	<input type="text" id="datelastseen" name="datelastseen" value="[% datelastseen %]" class="datepicker"/>	175	<input type="text" id="datelastseen" name="datelastseen" value="[% datelastseen %]" class="datepickerfrom" />
135	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
136	</li>	176	</li>
137	<li><label for="ignoreissued">Skip copies on loan: </label>	177	<li><label for="ignoreissued">Skip copies on loan: </label>
138	[% IF ( ignoreissued ) %]	178	[% IF (ignoreissued) %]
139	<input type="checkbox" id="ignoreissued" name="ignoreissued" checked="checked" /></li>	179	<input type="checkbox" id="ignoreissued" name="ignoreissued" checked="checked" /></li>
140	[% ELSE %]	180	[% ELSE %]
141	<input type="checkbox" id="ignoreissued" name="ignoreissued" /></li>	181	<input type="checkbox" id="ignoreissued" name="ignoreissued" /></li>
142	[% END %]	182	[% END %]
143	<li><label for="pagesize">Show: </label>
144	<input type="text" id="pagesize" name="pagesize" value="[% pagesize %]" maxlength="5" size="5" /> items</li>
145	<li><label for="offset">Beginning at offset: </label>
146	<input type="text" id="offset" name="offset" value="[% offset %]" size="5" maxlength="5" />
147	</li>
148	<li>	183	<li>
149	<label for="CSVexport">Export to CSV file</label>	184	<label for="CSVexport">Export to csv file</label>
150	<input type="checkbox" name="CSVexport" id="CSVexport" />	185	<input type="checkbox" name="CSVexport" id="CSVexport" />
151	</li>	186	</li>
152	<li>	187	<li>
Lines 161-167 $(document).ready(function(){ Link Here
161	</div>	196	</div>
162	</div>	197	</div>
163	[% END %]	198	[% END %]
164	[% IF ( loop ) %]	199	[% IF (op) %]
165	<form method="post" action="/cgi-bin/koha/tools/inventory.pl" class="checkboxed">	200	<form method="post" action="/cgi-bin/koha/tools/inventory.pl" class="checkboxed">
166	<input type="hidden" name="markseen" value="1" />	201	<input type="hidden" name="markseen" value="1" />
167	<input type="hidden" name="minlocation" value="[% minlocation %]" />	202	<input type="hidden" name="minlocation" value="[% minlocation %]" />
Lines 171-244 $(document).ready(function(){ Link Here
171	<input type="hidden" name="datelastseen" value="[% datelastseen %]" />	206	<input type="hidden" name="datelastseen" value="[% datelastseen %]" />
172	<input type="hidden" name="pagesize" value="[% pagesize %]" />	207	<input type="hidden" name="pagesize" value="[% pagesize %]" />
173	<input type="hidden" name="offset" value="[% offset %]" />	208	<input type="hidden" name="offset" value="[% offset %]" />
174	<div style="padding : .3em 0"><a href="#" class="checkall">[Select all]</a> <a href="#" class="clearall">[Clear all]</a></div>	209	<div><a href="#" class="checkall">[Select All]</a> <a href="#" class="clearall">[Clear All]</a></div>
175	<table>	210	<table id="inventoryt">
		211	<thead>
176	<tr>	212	<tr>
177	<th>Seen</th>	213	<th>Seen</th>
178	<th>Barcode</th>	214	<th>Barcode</th>
		215	<th>Location</th>
179	<th>Title</th>	216	<th>Title</th>
		217	<th>Status</th>
		218	<th>Lost</th>
		219	<th>Damaged</th>
180	<th>Unseen since</th>	220	<th>Unseen since</th>
181	<th>Problems</th>	221	<th>Problems</th>
182	</tr>	222	</tr>
183	[% FOREACH loo IN loop %]	223	</thead>
		224	<tbody>
		225	[% FOREACH result IN loop %]
184	<tr>	226	<tr>
185	<td>	227	<td>
186	<input type="checkbox" name="SEEN-[% loo.itemnumber %]" value="1" />	228	<input type="checkbox" name="SEEN-[% result.itemnumber %]" value="1" />
		229	</td>
		230	<td>
		231	[% result.barcode \| html %]
187	</td>	232	</td>
188	<td>	233	<td>
189	[% loo.barcode %]	234	[% result.homebranch \| html %] [% result.location \| html %] [[% result.itemcallnumber \| html %]]
190	</td>	235	</td>
191	<td>	236	<td>
192	<p><b>[% loo.itemcallnumber %]</b> - <a href="#" onclick="window.open('/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% loo.biblionumber %]','marcview','width=800,height=600,toolbar=0,scrollbars=1');">[% loo.title \|html %]</a></p>	237	<p><a href="#" onclick="window.open('/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% result.biblionumber %]','marcview','width=800,height=600,toolbar=0,scrollbars=1');">[% result.title \| html %]</a></p><p>[% result.author \| html %]</p>
193	<p>[% loo.author %]</p>
194	</td>	238	</td>
195	<td>	239	<td>
196	<p>[% loo.datelastseen %]</p>	240	[% result.notforloan \| html %]
197	</td>	241	</td>
198	<td>	242	<td>
199	[% IF ( loo.notfoundbarcode ) %]	243	[% result.itemlost \| html %]
200	<p style="background: red;">Not found among barcodes in barcodes file.</p>	244	</td>
201	[% ELSIF ( loo.notfoundkoha ) %]	245	<td>
202	<p style="background: red;">Not found in Koha.</p>	246	[% result.damaged \| html %]
203	[% ELSE %]	247	</td>
204	<p style="background: green;">None</p>	248	<td>
205	[% END %]	249	[% result.datelastseen \| html %]
		250	</td>
		251	<td>
		252	[% IF (result.wrongplace) %]<p>Item should not have been scanned</p>[% ELSIF (result.missingitem) %]<p>Item missing</p>[% ELSIF (result.changestatus) %]<p>Change item status</p>[% END %]
206	</td>	253	</td>
207	</tr>	254	</tr>
208	[% END %]	255	[% END %]
		256	</tbody>
209	</table>	257	</table>
210	<div style="padding : .3em 0"><a href="#" class="checkall">[Select all]</a> <a href="#" class="clearall">[Clear all]</a></div>	258	<div class="spacer"></div>
211	<input type="submit" id="markseen" value="Mark seen" />	259	<p style="display:block;"><span class="exportSelected"></span></p>
212	</form>	260	<div style="padding : .3em 0"><a href="#" class="checkall">[Select All]</a> <a href="#" class="clearall">[Clear All]</a></div>
213	[% IF ( offset ) %]	261	<input type="submit" id="markseenandquit" value="Mark seen and quit" />
214	<form method="post" action="/cgi-bin/koha/tools/inventory.pl">	262	<input type="submit" value="Mark Seen and Continue >>" id="markseenandcontinuebutton" />
215	<input type="hidden" name="branch" value="[% branch %]" />	263	<input type="submit" value="Continue without Marking >>" id="continuewithoutmarkingbutton" class="submit" />
216	<input type="hidden" name="minlocation" value="[% minlocation %]" />
217	<input type="hidden" name="maxlocation" value="[% maxlocation %]" />
218	<input type="hidden" name="location" value="[% location %]" />
219	<input type="hidden" name="branchcode" value="[% branchcode %]" />
220	<input type="hidden" name="datelastseen" value="[% datelastseen %]" />
221	<input type="hidden" name="pagesize" value="[% pagesize %]" />
222	<input type="hidden" name="offset" value="[% prevoffset %]" />
223	<input type="hidden" name="op" value="do_it" />
224	<input type="submit" value="<< Continue without marking" class="submit" />
225	</form>
226	[% END %]
227	[% IF ( nextoffset ) %]
228	<form method="post">
229	<input type="hidden" name="branch" value="[% branch %]" />
230	<input type="hidden" name="location" value="[% location %]" />
231	<input type="hidden" name="branchcode" value="[% branchcode %]" />
232	<input type="hidden" name="minlocation" value="[% minlocation %]" />
233	<input type="hidden" name="maxlocation" value="[% maxlocation %]" />
234	<input type="hidden" name="datelastseen" value="[% datelastseen %]" />
235	<input type="hidden" name="pagesize" value="[% pagesize %]" />
236	<input type="hidden" name="offset" value="[% nextoffset %]" />
237	<input type="hidden" name="op" value="do_it" />
238	<input type="submit" value="Continue without marking >>" class="submit" />
239	</form>	264	</form>
		265
240	</div>	266	</div>
241	[% END %]	267
242	[% END %]	268	[% END %]
243	</div>	269	</div>
244	<div class="yui-b">	270	<div class="yui-b">

Line 0 Link Here

(-)a/tools/ajax-inventory.pl (+43 lines)
	1	#!/usr/bin/perl
	2	#
	3
	4	use Modern::Perl;
	5
	6	use CGI;
	7	use JSON;
	8
	9	use C4::Auth;
	10	use C4::Circulation qw/CanBookBeRenewed/;
	11	use C4::Context;
	12	use C4::Koha qw/getitemtypeimagelocation/;
	13	use C4::Reserves qw/CheckReserves/;
	14	use C4::Utils::DataTables;
	15	use C4::Output;
	16	use C4::Biblio;
	17	use C4::Items;
	18	use C4::Dates qw/format_date format_date_in_iso/;
	19	use C4::Koha;
	20	use C4::Branch; # GetBranches
	21	use C4::Reports::Guided; #_get_column_defs
	22	use C4::Charset;
	23	use List::MoreUtils qw /none/;
	24
	25
	26	my $input = new CGI;
	27
	28	# Authentication
	29	my ($status, $cookie, $sessionId) = C4::Auth::check_api_auth($input, { tools => 'inventory' });
	30	exit unless ($status eq "ok");
	31
	32
	33	my $seen = $input->param('seen');
	34	my @seent = split(/\\|/, $seen);
	35
	36	# mark seen if applicable (ie: coming form mark seen checkboxes)
	37	foreach ( @seent ) {
	38	/SEEN-(.+)/ and &ModDateLastSeen($1);
	39	}
	40
	41
	42	print $input->header('application/json');
	43

Lines 35-40 use C4::Dates qw/format_date format_date_in_iso/; Link Here

(-)a/tools/inventory.pl (-76 / +182 lines)
35	use C4::Koha;	35	use C4::Koha;
36	use C4::Branch; # GetBranches	36	use C4::Branch; # GetBranches
37	use C4::Circulation;	37	use C4::Circulation;
		38	use C4::Reports::Guided; #_get_column_defs
		39	use C4::Charset;
		40	use List::MoreUtils qw/none/;
		41
38		42
39	my $minlocation=$input->param('minlocation') \|\| '';	43	my $minlocation=$input->param('minlocation') \|\| '';
40	my $maxlocation=$input->param('maxlocation');	44	my $maxlocation=$input->param('maxlocation');
Lines 50-68 my $pagesize = $input->param('pagesize'); Link Here
50	$pagesize=50 unless $pagesize;	54	$pagesize=50 unless $pagesize;
51	my $branchcode = $input->param('branchcode') \|\| '';	55	my $branchcode = $input->param('branchcode') \|\| '';
52	my $branch = $input->param('branch');	56	my $branch = $input->param('branch');
53	my $op = $input->param('op');	57	my $op = $input->param('op');
54	my $res; #contains the results loop	58	my $compareinv2barcd = $input->param('compareinv2barcd');
55	# warn "uploadbarcodes : ".$uploadbarcodes;	59	my $res; #contains the results loop
56	# use Data::Dumper; warn Dumper($input);	60
57		61	my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
58	my ($template, $borrowernumber, $cookie)	62	{ template_name => "tools/inventory.tmpl",
59	= get_template_and_user({template_name => "tools/inventory.tmpl",	63	query => $input,
60	query => $input,	64	type => "intranet",
61	type => "intranet",	65	authnotrequired => 0,
62	authnotrequired => 0,	66	flagsrequired => { tools => 'inventory' },
63	flagsrequired => {tools => 'inventory'},	67	debug => 1,
64	debug => 1,	68	}
65	});	69	);
		70
66		71
67	my $branches = GetBranches();	72	my $branches = GetBranches();
68	my @branch_loop;	73	my @branch_loop;
Lines 114-160 for my $authvfield (@$statuses) { Link Here
114	}	119	}
115	}	120	}
116		121
		122	my $notforloanlist;
117	my $statussth = '';	123	my $statussth = '';
118	for my $authvfield (@$statuses) {	124	for my $authvfield (@$statuses) {
119	if ( scalar @{$staton->{$authvfield->{fieldname}}} > 0 ){	125	if ( scalar @{$staton->{$authvfield->{fieldname}}} > 0 ){
120	my $joinedvals = join ',', @{$staton->{$authvfield->{fieldname}}};	126	my $joinedvals = join ',', @{$staton->{$authvfield->{fieldname}}};
121	$statussth .= "$authvfield->{fieldname} in ($joinedvals) and ";	127	$statussth .= "$authvfield->{fieldname} in ($joinedvals) and ";
		128	$notforloanlist = $joinedvals if ($authvfield->{fieldname} eq "items.notforloan");
122	}	129	}
123	}	130	}
124	$statussth =~ s, and $,,g;	131	$statussth =~ s, and $,,g;
125		132	$template->param(
126	$template->param(branchloop => \@branch_loop,	133	branchloop => \@branch_loop,
127	authorised_values=>\@authorised_value_list,	134	authorised_values => \@authorised_value_list,
128	today => C4::Dates->today(),	135	DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
129	minlocation => $minlocation,	136	today => C4::Dates->today(),
130	maxlocation => $maxlocation,	137	minlocation => $minlocation,
131	location=>$location,	138	maxlocation => $maxlocation,
132	ignoreissued=>$ignoreissued,	139	location => $location,
133	branchcode=>$branchcode,	140	ignoreissued => $ignoreissued,
134	branch => $branch,	141	branchcode => $branchcode,
135	offset => $offset,	142	branch => $branch,
136	pagesize => $pagesize,	143	offset => $offset,
137	datelastseen => $datelastseen,	144	pagesize => $pagesize,
138	);	145	datelastseen => $datelastseen,
		146	compareinv2barcd => $compareinv2barcd,
		147	notforloanlist => $notforloanlist
		148	);
		149
		150	my @notforloans;
		151	if (defined $notforloanlist) {
		152	@notforloans = split(/,/, $notforloanlist);
		153	}
		154
		155
		156
139	my @brcditems;	157	my @brcditems;
140	if ($uploadbarcodes && length($uploadbarcodes)>0){	158	my $barcodelist;
141	my $dbh=C4::Context->dbh;	159	my @errorloop;
142	my $date = format_date_in_iso($input->param('setdate')) \|\| C4::Dates->today('iso');	160	if ( $uploadbarcodes && length($uploadbarcodes) > 0 ) {
143	# warn "$date";	161	my $dbh = C4::Context->dbh;
144	my $strsth="select * from issues, items where items.itemnumber=issues.itemnumber and items.barcode =?";	162	my $date = format_date_in_iso( $input->param('setdate') ) \|\| C4::Dates->today('iso');
		163
		164	my $strsth = "select * from issues, items where items.itemnumber=issues.itemnumber and items.barcode =?";
145	my $qonloan = $dbh->prepare($strsth);	165	my $qonloan = $dbh->prepare($strsth);
146	$strsth="select * from items where items.barcode =? and items.wthdrawn = 1";	166	$strsth="select * from items where items.barcode =? and items.wthdrawn = 1";
147	my $qwthdrawn = $dbh->prepare($strsth);	167	my $qwthdrawn = $dbh->prepare($strsth);
148	my @errorloop;	168	my $count = 0;
149	my $count=0;	169
150	while (my $barcode=<$uploadbarcodes>){	170	while ( my $barcode = <$uploadbarcodes> ) {
151	$barcode =~ s/\r?\n$//;	171	$barcode =~ s/\r?\n$//;
152	if ($qwthdrawn->execute($barcode) &&$qwthdrawn->rows){	172	$barcodelist .= ($barcodelist) ? '\|' . $barcode : $barcode;
153	push @errorloop, {'barcode'=>$barcode,'ERR_WTHDRAWN'=>1};	173	if ( $qwthdrawn->execute($barcode) && $qwthdrawn->rows ) {
154	}else{	174	push @errorloop, { 'barcode' => $barcode, 'ERR_WTHDRAWN' => 1 };
155	my $item = GetItem('', $barcode);	175	} else {
156	if (defined $item && $item->{'itemnumber'}){	176	my $item = GetItem( '', $barcode );
157	ModItem({ datelastseen => $date }, undef, $item->{'itemnumber'});	177	if ( defined $item && $item->{'itemnumber'} ) {
		178	ModItem( { datelastseen => $date }, undef, $item->{'itemnumber'} );
158	push @brcditems, $item;	179	push @brcditems, $item;
159	$count++;	180	$count++;
160	$qonloan->execute($barcode);	181	$qonloan->execute($barcode);
Lines 171-218 if ($uploadbarcodes && length($uploadbarcodes)>0){ Link Here
171	push @errorloop, {'barcode'=>$barcode,'ERR_BARCODE'=>1};	192	push @errorloop, {'barcode'=>$barcode,'ERR_BARCODE'=>1};
172	}	193	}
173	}	194	}
		195
174	}	196	}
175	$qonloan->finish;	197	$qonloan->finish;
176	$qwthdrawn->finish;	198	$qwthdrawn->finish;
177	$template->param(date=>format_date($date),Number=>$count);	199	$template->param( date => format_date($date), Number => $count );
178	# $template->param(errorfile=>$errorfile) if ($errorfile);	200	$template->param( errorloop => \@errorloop ) if (@errorloop);
179	$template->param(errorloop=>\@errorloop) if (@errorloop);	201
		202
		203	}
		204	$template->param(barcodelist => $barcodelist);
		205
		206	# now build the result list: inventoried items if requested, and mis-placed items -always-
		207	my $inventorylist;
		208	if ( $markseen or $op ) {
		209	# retrieve all items in this range.
		210	my $totalrecords;
		211	($inventorylist, $totalrecords) = GetItemsForInventory($minlocation, $maxlocation, $location, $itemtype, $ignoreissued, '', $branchcode, $branch, 0, undef , $staton);
		212
		213	$res = $inventorylist ;
180	}	214	}
181	#if we want to compare the results to a list of barcodes, or we have no barcode file	215
182	if ( ! ($uploadbarcodes && length($uploadbarcodes)>0 ) \|\| ( $input->param('compareinv2barcd') eq 'on' && length($uploadbarcodes)>0) ) {	216	# set "missing" flags for all items with a datelastseen before the choosen datelastseen
183	if ($markseen) {	217	foreach (@$res) {$_->{missingitem}=1 if C4::Dates->new($_->{datelastseen})->output('iso') lt C4::Dates->new($datelastseen)->output('iso')}
184	foreach ($input->param) {	218
185	/SEEN-(.+)/ and &ModDateLastSeen($1);	219	# removing missing items from loop if "Compare barcodes list to results" has not been checked
		220	@$res = grep {!$_->{missingitem} == 1 } @$res if (!$input->param('compareinv2barcd'));
		221
		222	# insert "wrongplace" to all scanned items that are not supposed to be in this range
		223	# note this list is always displayed, whatever the librarian has choosen for comparison
		224	foreach my $temp (@brcditems) {
		225
		226	# Saving notforloan code before it's replaced by it's authorised value for later comparison
		227	$temp->{'notforloancode'} = $temp->{'notforloan'};
		228
		229	# Populating with authorised values
		230	foreach (keys %$temp) {
		231	# If the koha field is mapped to a marc field
		232	my $fc = $temp->{'frameworkcode'} \|\| '';
		233	my ($f, $sf) = GetMarcFromKohaField("items.$_", $fc);
		234	if ($f and $sf) {
		235	# We replace the code with it's description
		236	my $authvals = C4::Koha::GetKohaAuthorisedValuesFromField($f, $sf, $fc);
		237	if ($authvals and defined $temp->{$_} and defined $authvals->{$temp->{$_}}) {
		238	$temp->{$_} = $authvals->{$temp->{$_}};
		239	}
186	}	240	}
187	}	241	}
188	if ($markseen or $op) {	242
189	$res = GetItemsForInventory( $minlocation, $maxlocation, $location, $itemtype, $ignoreissued, $datelastseen, $branchcode, $branch, $offset, $pagesize, $staton );	243	next if $temp->{onloan}; # skip checked out items
190	$template->param(loop =>$res,	244
191	nextoffset => ($offset+$pagesize),	245	# If we have scanned items with a non-matching notforloan value
192	prevoffset => ($offset?$offset-$pagesize:0),	246	if (none { $temp->{'notforloancode'} eq $_ } @notforloans) {
193	);	247	$temp->{'changestatus'} = 1;
		248	my $biblio = C4::Biblio::GetBiblioData($temp->{biblionumber});
		249	$temp->{title} = $biblio->{title};
		250	$temp->{author} = $biblio->{author};
		251	$temp->{datelastseen} = format_date($temp->{datelastseen});
		252	push @$res, $temp;
		253
194	}	254	}
195	if ( defined $input->param('compareinv2barcd') && ( ( $input->param('compareinv2barcd') eq 'on' ) && ( scalar @brcditems != scalar @$res ) ) && length($uploadbarcodes) > 0 ){	255
196	if ( scalar @brcditems > scalar @$res ){	256	if (none { $temp->{barcode} eq $_->{barcode} && !$_->{onloan} } @$inventorylist) {
197	for my $brcditem (@brcditems) {	257	$temp->{wrongplace}=1;
198	if (! grep( $_->{barcode} =~ /$brcditem->{barcode}/ , @$res) ){	258	my $biblio = C4::Biblio::GetBiblioData($temp->{biblionumber});
199	$brcditem->{notfoundkoha} = 1;	259	$temp->{title} = $biblio->{title};
200	push @$res, $brcditem;	260	$temp->{author} = $biblio->{author};
201	}	261	$temp->{datelastseen} = format_date($temp->{datelastseen});
202	}	262	push @$res, $temp;
203	} else {	263	}
204	my @notfound;	264	}
205	for my $item (@$res) {	265
206	if ( ! grep( $_->{barcode} =~ /$item->{barcode}/ , @brcditems) ){	266	# Finally, modifying datelastseen for remaining items
207	$item->{notfoundbarcode} = 1;	267	my $moddatecount = 0;
208	push @notfound, $item;	268	foreach (@$res) {
209	}	269	unless ($_->{'missingitem'}) {
210	}	270	ModDateLastSeen($_->{'itemnumber'});
211	$res = [@$res, @notfound];	271	$moddatecount++;
212	}
213	}	272	}
214	}	273	}
215		274
		275	# Removing items that don't have any problems from loop
		276	@$res = grep { $_->{missingitem} \|\| $_->{wrongplace} \|\| $_->{changestatus} } @$res;
		277
		278	$template->param(
		279	moddatecount => $moddatecount,
		280	loop => $res,
		281	nextoffset => ( $offset + $pagesize ),
		282	prevoffset => ( $offset ? $offset - $pagesize : 0 ),
		283	op => $op
		284	);
		285
216	if (defined $input->param('CSVexport') && $input->param('CSVexport') eq 'on'){	286	if (defined $input->param('CSVexport') && $input->param('CSVexport') eq 'on'){
217	eval {use Text::CSV};	287	eval {use Text::CSV};
218	my $csv = Text::CSV->new or	288	my $csv = Text::CSV->new or
Lines 221-234 if (defined $input->param('CSVexport') && $input->param('CSVexport') eq 'on'){ Link Here
221	-type => 'text/csv',	291	-type => 'text/csv',
222	-attachment => 'inventory.csv',	292	-attachment => 'inventory.csv',
223	);	293	);
224	for my $re (@$res){	294
		295	my $columns_def_hashref = C4::Reports::Guided::_get_column_defs();
		296	foreach my $key ( keys %$columns_def_hashref ) {
		297	my $initkey = $key;
		298	$key =~ s/[^\.]*\.//;
		299	$columns_def_hashref->{$initkey}=NormalizeString($columns_def_hashref->{$initkey});
		300	$columns_def_hashref->{$key} = $columns_def_hashref->{$initkey};
		301	}
		302
		303	my @translated_keys;
		304	for my $key (qw / biblioitems.title biblio.author
		305	items.barcode items.itemnumber
		306	items.homebranch items.location
		307	items.itemcallnumber items.notforloan
		308	items.itemlost items.damaged
		309	items.stocknumber
		310	/ ) {
		311	push @translated_keys, $columns_def_hashref->{$key};
		312	}
		313
		314	$csv->combine(@translated_keys);
		315	print $csv->string, "\n";
		316
		317	my @keys = qw / title author barcode itemnumber homebranch location itemcallnumber notforloan lost damaged stocknumber /;
		318	for my $re (@$res) {
225	my @line;	319	my @line;
226	for my $key (keys %$re) {	320	for my $key (@keys) {
227	push @line, $re->{$key};	321	push @line, $re->{$key};
228	}	322	}
		323	push @line, "wrong place" if $re->{wrongplace};
		324	push @line, "missing item" if $re->{missingitem};
		325	push @line, "change item status" if $re->{changestatus};
229	$csv->combine(@line);	326	$csv->combine(@line);
230	print $csv->string, "\n";	327	print $csv->string, "\n";
231	}	328	}
		329	# Adding not found barcodes
		330	foreach my $error (@errorloop) {
		331	my @line;
		332	if ($error->{'ERR_BARCODE'}) {
		333	push @line, map { $_ eq 'barcode' ? $error->{'barcode'} : ''} @keys;
		334	push @line, "barcode not found";
		335	$csv->combine(@line);
		336	print $csv->string, "\n";
		337	}
		338	}
232	exit;	339	exit;
233	}	340	}
234		341
235	-