X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=admin%2Fbranch_transfer_limits.pl;h=e7422a63c5f762ae43e34894d11001b74a07b679;hb=a8428e141eb533ac5fafe80d38931a36d927a329;hp=2cee238e9ea053326a044d5f5c3143b7469840bb;hpb=9c72711a2c632fb679d6be215f9fdd6a3b96faa2;p=koha_fer

diff --git a/admin/branch_transfer_limits.pl b/admin/branch_transfer_limits.pl
index 2cee238e9e..e7422a63c5 100755
--- a/admin/branch_transfer_limits.pl
+++ b/admin/branch_transfer_limits.pl
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 # Copyright 2000-2002 Katipo Communications
+# copyright 2010 BibLibre
 #
 # This file is part of Koha.
 #
@@ -13,9 +14,9 @@
 # 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
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use warnings;
@@ -39,10 +40,33 @@ my ($template, $loggedinuser, $cookie)
 			     });
 
 my $dbh = C4::Context->dbh;
+my $branchcode;
+if((!defined($input->param('branchcode'))) & mybranch() ne '')
+{
+	$branchcode = mybranch();
+}
+else
+{
+	$branchcode = $input->param('branchcode');
+}
+
+my $branchname = GetBranchName($branchcode);
+
+# Getting the branches for user selection
+my $branches = GetBranches();
+my @branch_loop;
+for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
+    my %row =(value => $thisbranch,
+              branchname => $branches->{$thisbranch}->{'branchname'},
+              selected => $thisbranch eq $branchcode ? 1 : 0,
+             );
+    push @branch_loop, \%row;
+}
+
 
 # Set the template language for the correct limit type
 my $limit_phrase = 'Collection Code';
-my $limitType = C4::Context->preference("BranchTransferLimitsType");
+my $limitType = C4::Context->preference("BranchTransferLimitsType") || "ccode";
 if ( $limitType eq 'itemtype' ) {
 	$limit_phrase = 'Item Type';
 }
@@ -69,15 +93,14 @@ while ( my $row = $sth->fetchrow_hashref ) {
 
 ## If Form Data Passed, Update the Database
 if ( $input->param('updateLimits') ) {
-    DeleteBranchTransferLimits();
+    DeleteBranchTransferLimits($branchcode);
+
 
 	foreach my $code ( @codes ) {
 		foreach my $toBranch ( @branchcodes ) {
-			foreach my $fromBranch ( @branchcodes ) {
-				my $isSet = $input->param( $code . "_" . $toBranch . "_" . $fromBranch );
-				if ( $isSet ) {
-                                    CreateBranchTransferLimit( $toBranch, $fromBranch, $code );
-				}
+			my $isSet = not $input->param( $code . "_" . $toBranch);
+			if ( $isSet ) {
+			    CreateBranchTransferLimit( $toBranch, $branchcode, $code );
 			}
 		}
 	}
@@ -90,6 +113,7 @@ foreach my $branchcode ( @branchcodes ) {
 	$row_data{ branchcode } = $branchcode;
 	push ( @branchcode_loop, \%row_data );
 }
+my $branchcount = scalar(@branchcode_loop);
 
 ## Build the default data
 my @codes_loop;
@@ -99,23 +123,12 @@ foreach my $code ( @codes ) {
 	$row_data{ code } = $code;
 	$row_data{ to_branch_loop } = \@to_branch_loop;
 	foreach my $toBranch ( @branchcodes ) {
-		my @from_branch_loop;
 		my %row_data;
-		$row_data{ code } = $code;
-		$row_data{ toBranch } = $toBranch;
-		$row_data{ from_branch_loop } = \@from_branch_loop;
-		
-		foreach my $fromBranch ( @branchcodes ) {
-			my %row_data;
-                        my $isChecked = ! IsBranchTransferAllowed( $toBranch, $fromBranch, $code );
-			$row_data{ code } = $code;
-			$row_data{ toBranch } = $toBranch;
-			$row_data{ fromBranch } = $fromBranch;
-                        $row_data{ isChecked } = $isChecked;
-			
-			push( @from_branch_loop, \%row_data );
-		}
-		
+                my $isChecked = IsBranchTransferAllowed( $toBranch, $branchcode, $code );
+		$row_data{ code }         = $code;
+		$row_data{ toBranch }     = $toBranch;
+		$row_data{ isChecked }    = $isChecked;	
+		$row_data{ toBranchname } = GetBranchName($toBranch);	
 		push( @to_branch_loop, \%row_data );
 	}
 
@@ -124,8 +137,12 @@ foreach my $code ( @codes ) {
 
 
 $template->param(
+		branchcount => $branchcount,
 		codes_loop => \@codes_loop,
+		branch_loop => \@branch_loop,
 		branchcode_loop => \@branchcode_loop,
+		branchcode => $branchcode,
+		branchname => $branchname,
 		limit_phrase => $limit_phrase,
 		);