From 2d5559ffcce28e8a6f5b0ce56e1a456bc58a1bc7 Mon Sep 17 00:00:00 2001
From: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date: Fri, 2 Jul 2010 15:27:59 +0200
Subject: [PATCH] (bug #4931) add the ability to choose home or holding branch
 in stocktaking

This add radio box in stocktaking to base it on home or holdingbranch

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
---
 C4/Items.pm                                          | 12 ++++++++----
 .../prog/en/modules/tools/inventory.tmpl             |  4 ++++
 tools/inventory.pl                                   |  3 ++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/C4/Items.pm b/C4/Items.pm
index d5a4167403..cc84447a52 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -1034,7 +1034,7 @@ offset & size can be used to retrieve only a part of the whole listing (defaut b
 =cut
 
 sub GetItemsForInventory {
-    my ( $minlocation, $maxlocation,$location, $itemtype, $ignoreissued, $datelastseen, $branch, $offset, $size ) = @_;
+    my ( $minlocation, $maxlocation,$location, $itemtype, $ignoreissued, $datelastseen, $branchcode, $branch, $offset, $size ) = @_;
     my $dbh = C4::Context->dbh;
     my ( @bind_params, @where_strings );
 
@@ -1066,9 +1066,13 @@ END_SQL
         push @bind_params, $location;
     }
     
-    if ( $branch ) {
-        push @where_strings, 'items.homebranch = ?';
-        push @bind_params, $branch;
+    if ( $branchcode ) {
+        if($branch eq "homebranch"){
+            push @where_strings, 'items.homebranch = ?';
+        }else{
+            push @where_strings, 'items.holdingbranch = ?';
+        }
+        push @bind_params, $branchcode;
     }
     
     if ( $itemtype ) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
index dfb7a4cba9..df67ea28b6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
@@ -47,6 +47,10 @@ $(document).ready(function(){
         <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;">
         <!-- TMPL_LOOP NAME="branchloop" -->
             <!-- TMPL_IF name="selected" -->
diff --git a/tools/inventory.pl b/tools/inventory.pl
index 8474d7d274..2b91304308 100755
--- a/tools/inventory.pl
+++ b/tools/inventory.pl
@@ -44,6 +44,7 @@ my $pagesize = $input->param('pagesize');
 $pagesize=50 unless $pagesize;
 my $uploadbarcodes = $input->param('uploadbarcodes');
 my $branchcode = $input->param('branchcode');
+my $branch     = $input->param('branch');
 my $op = $input->param('op');
 # warn "uploadbarcodes : ".$uploadbarcodes;
 # use Data::Dumper; warn Dumper($input);
@@ -156,7 +157,7 @@ if ($uploadbarcodes && length($uploadbarcodes)>0){
         }
     }
     if ($markseen or $op) {
-        my $res = GetItemsForInventory($minlocation,$maxlocation,$location,$itemtype,$ignoreissued,$datelastseen,$branchcode,$offset,$pagesize);
+        my $res = GetItemsForInventory($minlocation,$maxlocation,$location,$itemtype,$ignoreissued,$datelastseen,$branchcode,$branch,$offset,$pagesize);
         $template->param(loop =>$res,
                         nextoffset => ($offset+$pagesize),
                         prevoffset => ($offset?$offset-$pagesize:0),
-- 
2.39.5