X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=cataloguing%2Fadditem.pl;h=0db2d2df308c61a36960ac0200c0ee6164095a3f;hb=f02796d989a377266a844e5b498945372a2a254f;hp=c5dd7d9efc6017f21f784b676752cc1696fe9abb;hpb=b18ae6dee66f5bbba3d5d78ce6885a6d34cbcecd;p=koha_gimpoz

diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index c5dd7d9efc..0db2d2df30 100755
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -1,8 +1,8 @@
 #!/usr/bin/perl
 
-
 # Copyright 2000-2002 Katipo Communications
 # Copyright 2004-2010 BibLibre
+# Parts Copyright Catalyst IT 2011
 #
 # This file is part of Koha.
 #
@@ -34,6 +34,7 @@ use C4::Dates;
 use List::MoreUtils qw/any/;
 
 use MARC::File::XML;
+use URI::Escape;
 
 my $dbh = C4::Context->dbh;
 
@@ -65,12 +66,16 @@ sub get_item_from_barcode {
 
 sub set_item_default_location {
     my $itemnumber = shift;
+    my $item = GetItem( $itemnumber );
     if ( C4::Context->preference('NewItemsDefaultLocation') ) {
-        my $item = GetItem( $itemnumber );
         $item->{'permanent_location'} = $item->{'location'};
         $item->{'location'} = C4::Context->preference('NewItemsDefaultLocation');
         ModItem( $item, undef, $itemnumber);
     }
+    else {
+      $item->{'permanent_location'} = $item->{'location'} if !defined($item->{'permanent_location'});
+      ModItem( $item, undef, $itemnumber);
+    }
 }
 
 # NOTE: This code is subject to change in the future with the implemenation of ajax based autobarcode code
@@ -95,7 +100,8 @@ sub _increment_barcode {
 
 sub generate_subfield_form {
         my ($tag, $subfieldtag, $value, $tagslib,$subfieldlib, $branches, $today_iso, $biblionumber, $temp, $loop_data, $i) = @_;
-        
+  
+  my $frameworkcode = &GetFrameworkCode($biblionumber);
         my %subfield_data;
         my $dbh = C4::Context->dbh;        
         my $authorised_values_sth = $dbh->prepare("SELECT authorised_value,lib FROM authorised_values WHERE category=? ORDER BY lib");
@@ -139,6 +145,10 @@ sub generate_subfield_form {
             }
         }
         
+        if ($frameworkcode eq 'FA' && $subfieldlib->{kohafield} eq 'items.barcode'){
+	    my $input = new CGI;
+	    $value = $input->param('barcode');
+	}
         my $attributes_no_value = qq(tabindex="1" id="$subfield_data{id}" name="field_value" class="input_marceditor" size="67" maxlength="255" );
         my $attributes          = qq($attributes_no_value value="$value" );
         
@@ -150,7 +160,7 @@ sub generate_subfield_form {
                 foreach my $thisbranch (@$branches) {
                     push @authorised_values, $thisbranch->{value};
                     $authorised_lib{$thisbranch->{value}} = $thisbranch->{branchname};
-                    $value = $thisbranch->{value} if $thisbranch->{selected};
+                    $value = $thisbranch->{value} if $thisbranch->{selected} && !$value;
                 }
             }
             elsif ( $subfieldlib->{authorised_value} eq "itemtypes" ) {
@@ -262,7 +272,6 @@ sub generate_subfield_form {
 
 
 my $input        = new CGI;
-my $dbh          = C4::Context->dbh;
 my $error        = $input->param('error');
 my $biblionumber = $input->param('biblionumber');
 my $itemnumber   = $input->param('itemnumber');
@@ -281,7 +290,7 @@ if (not defined $userflags) {
 }
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/additem.tmpl",
+    = get_template_and_user({template_name => "cataloguing/additem.tt",
                  query => $input,
                  type => "intranet",
                  authnotrequired => 0,
@@ -412,6 +421,14 @@ if ($op eq "additem") {
 	    }
 	    undef($itemrecord);
 	}
+    }	
+    if ($frameworkcode eq 'FA' && $input->param('borrowernumber')){
+	my $redirect_string = 'borrowernumber=' . uri_escape($input->param('borrowernumber')) .
+	  '&barcode=' . uri_escape($input->param('barcode'));
+	$redirect_string .= '&duedatespec=' . uri_escape($input->param('duedatespec')) . 
+	  '&stickyduedate=1';
+	print $input->redirect("/cgi-bin/koha/circ/circulation.pl?" . $redirect_string);
+	exit;
     }
 
 
@@ -494,13 +511,14 @@ if ($op eq "additem") {
 
 # now, build existiing item list
 my $temp = GetMarcBiblio( $biblionumber );
-my @fields = $temp->fields();
 #my @fields = $record->fields();
 my %witness; #---- stores the list of subfields used at least once, with the "meaning" of the code
 my @big_array;
 #---- finds where items.itemnumber is stored
 my (  $itemtagfield,   $itemtagsubfield) = &GetMarcFromKohaField("items.itemnumber", $frameworkcode);
 my ($branchtagfield, $branchtagsubfield) = &GetMarcFromKohaField("items.homebranch", $frameworkcode);
+C4::Biblio::EmbedItemsInMarcBiblio($temp, $biblionumber);
+my @fields = $temp->fields();
 
 foreach my $field (@fields) {
     next if ( $field->tag() < 10 );
@@ -570,10 +588,14 @@ my $onlymine = C4::Context->preference('IndependantBranches') &&
                C4::Context->userenv                           && 
                C4::Context->userenv->{flags}!=1               && 
                C4::Context->userenv->{branch};
-my $branches = GetBranchesLoop(undef,$onlymine);  # build once ahead of time, instead of multiple times later.
+my $branch = C4::Context->userenv->{branch};
+if ($frameworkcode eq 'FA'){
+    $branch = $input->param('branch');
+}    
+my $branches = GetBranchesLoop($branch,$onlymine);  # build once ahead of time, instead of multiple times later.
 
 # We generate form, from actuel record
-my @fields;
+@fields = ();
 if($itemrecord){
     foreach my $field ($itemrecord->fields()){
         my $tag = $field->{_tag};
@@ -630,6 +652,14 @@ $template->param(
     opisadd => ($nextop eq "saveitem") ? 0 : 1,
     C4::Search::enabled_staff_search_views,
 );
+
+if ($frameworkcode eq 'FA'){
+    $template->{VARS}->{'borrowernumber'}=$input->param('borrowernumber');
+    $template->{VARS}->{'barcode'}=$input->param('barcode');
+    $template->{VARS}->{'stickyduedate'}=$input->param('stickduedate');
+    $template->{VARS}->{'duedatespec'}=$input->param('duedatespec');
+}    
+
 foreach my $error (@errors) {
     $template->param($error => 1);
 }