[3.0.x] (bug #4263) fix the edition of items with repeatable subfields
[koha.git] / cataloguing / additem.pl
index e575fa6..ad0d51a 100755 (executable)
@@ -28,27 +28,11 @@ use C4::Context;
 use C4::Koha; # XXX subfield_is_koha_internal_p
 use C4::Branch; # XXX subfield_is_koha_internal_p
 use C4::ClassSource;
-
-use Date::Calc qw(Today);
+use C4::Dates;
+use List::MoreUtils qw/any/;
 
 use MARC::File::XML;
 
-sub find_value {
-    my ($tagfield,$insubfield,$record) = @_;
-    my $result;
-    my $indicator;
-    foreach my $field ($record->field($tagfield)) {
-        my @subfields = $field->subfields();
-        foreach my $subfield (@subfields) {
-            if (@$subfield[0] eq $insubfield) {
-                $result .= @$subfield[1];
-                $indicator = $field->indicator(1).$field->indicator(2);
-            }
-        }
-    }
-    return($indicator,$result);
-}
-
 sub get_item_from_barcode {
     my ($barcode)=@_;
     my $dbh=C4::Context->dbh;
@@ -59,25 +43,191 @@ sub get_item_from_barcode {
     return($result);
 }
 
+sub generate_subfield_form {
+        my ($tag, $subfieldtag, $value, $tagslib,$subfieldlib, $branches, $today_iso, $biblionumber, $temp, $loop_data, $i) = @_;
+        
+        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");
+        
+        my $index_subfield = int(rand(1000000)); 
+        if ($subfieldtag eq '@'){
+            $subfield_data{id} = "tag_".$tag."_subfield_00_".$index_subfield;
+        } else {
+            $subfield_data{id} = "tag_".$tag."_subfield_".$subfieldtag."_".$index_subfield;
+        }
+        
+        $subfield_data{tag}        = $tag;
+        $subfield_data{subfield}   = $subfieldtag;
+        $subfield_data{random}     = int(rand(1000000));    # why do we need 2 different randoms?
+        $subfield_data{marc_lib}   ="<span id=\"error$i\" title=\"".$subfieldlib->{lib}."\">".$subfieldlib->{lib}."</span>";
+        $subfield_data{mandatory}  = $subfieldlib->{mandatory};
+        $subfield_data{repeatable} = $subfieldlib->{repeatable};
+        
+        $value =~ s/"/&quot;/g;
+        if ( ! defined( $value ) || $value eq '')  {
+            $value = $subfieldlib->{defaultvalue};
+            # get today date & replace YYYY, MM, DD if provided in the default value
+            my ( $year, $month, $day ) = split ',', $today_iso;     # FIXME: iso dates don't have commas!
+            $value =~ s/YYYY/$year/g;
+            $value =~ s/MM/$month/g;
+            $value =~ s/DD/$day/g;
+        }
+        
+        $subfield_data{visibility} = "display:none;" if (($subfieldlib->{hidden} > 4) || ($subfieldlib->{hidden} < -4));
+        
+        my $pref_itemcallnumber = C4::Context->preference('itemcallnumber');
+        if (!$value && $subfieldlib->{kohafield} eq 'items.itemcallnumber' && $pref_itemcallnumber) {
+            my $CNtag       = substr($pref_itemcallnumber, 0, 3);
+            my $CNsubfield  = substr($pref_itemcallnumber, 3, 1);
+            my $CNsubfield2 = substr($pref_itemcallnumber, 4, 1);
+            my $temp2 = $temp->field($CNtag);
+            if ($temp2) {
+                $value = ($temp2->subfield($CNsubfield)).' '.($temp2->subfield($CNsubfield2));
+                #remove any trailing space incase one subfield is used
+                $value =~ s/^\s+|\s+$//g;
+            }
+        }
+        
+        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" );
+        
+        if ( $subfieldlib->{authorised_value} ) {
+            my @authorised_values;
+            my %authorised_lib;
+            # builds list, depending on authorised value...
+            if ( $subfieldlib->{authorised_value} eq "branches" ) {
+                foreach my $thisbranch (@$branches) {
+                    push @authorised_values, $thisbranch->{value};
+                    $authorised_lib{$thisbranch->{value}} = $thisbranch->{branchname};
+                    $value = $thisbranch->{value} if $thisbranch->{selected};
+                }
+            }
+            elsif ( $subfieldlib->{authorised_value} eq "itemtypes" ) {
+                  push @authorised_values, "" unless ( $subfieldlib->{mandatory} );
+                  my $sth = $dbh->prepare("SELECT itemtype,description FROM itemtypes ORDER BY description");
+                  $sth->execute;
+                  while ( my ( $itemtype, $description ) = $sth->fetchrow_array ) {
+                      push @authorised_values, $itemtype;
+                      $authorised_lib{$itemtype} = $description;
+                  }
+        
+                  unless ( $value ) {
+                      my $itype_sth = $dbh->prepare("SELECT itemtype FROM biblioitems WHERE biblionumber = ?");
+                      $itype_sth->execute( $biblionumber );
+                      ( $value ) = $itype_sth->fetchrow_array;
+                  }
+          
+                  #---- class_sources
+            }
+            elsif ( $subfieldlib->{authorised_value} eq "cn_source" ) {
+                  push @authorised_values, "" unless ( $subfieldlib->{mandatory} );
+                    
+                  my $class_sources = GetClassSources();
+                  my $default_source = C4::Context->preference("DefaultClassificationSource");
+                  
+                  foreach my $class_source (sort keys %$class_sources) {
+                      next unless $class_sources->{$class_source}->{'used'} or
+                                  ($value and $class_source eq $value)      or
+                                  ($class_source eq $default_source);
+                      push @authorised_values, $class_source;
+                      $authorised_lib{$class_source} = $class_sources->{$class_source}->{'description'};
+                  }
+                         $value = $default_source unless ($value);
+        
+                  #---- "true" authorised value
+            }
+            else {
+                  push @authorised_values, "" unless ( $subfieldlib->{mandatory} );
+                  $authorised_values_sth->execute( $subfieldlib->{authorised_value} );
+                  while ( my ( $value, $lib ) = $authorised_values_sth->fetchrow_array ) {
+                      push @authorised_values, $value;
+                      $authorised_lib{$value} = $lib;
+                  }
+            }
+
+            $subfield_data{marc_value} =CGI::scrolling_list(      # FIXME: factor out scrolling_list
+                  -name     => "field_value",
+                  -values   => \@authorised_values,
+                  -default  => $value,
+                  -labels   => \%authorised_lib,
+                  -override => 1,
+                  -size     => 1,
+                  -multiple => 0,
+                  -tabindex => 1,
+                  -id       => "tag_".$tag."_subfield_".$subfieldtag."_".$index_subfield,
+                  -class    => "input_marceditor",
+            );
+
+            # it's a thesaurus / authority field
+        }
+        elsif ( $subfieldlib->{authtypecode} ) {
+                $subfield_data{marc_value} = "<input type=\"text\" $attributes />
+                    <a href=\"#\" class=\"buttonDot\"
+                        onclick=\"Dopop('/cgi-bin/koha/authorities/auth_finder.pl?authtypecode=".$subfieldlib->{authtypecode}."&index=$subfield_data{id}','$subfield_data{id}'); return false;\" title=\"Tag Editor\">...</a>
+            ";
+            # it's a plugin field
+        }
+        elsif ( $subfieldlib->{value_builder} ) {
+                # opening plugin
+                my $plugin = C4::Context->intranetdir . "/cataloguing/value_builder/" . $subfieldlib->{'value_builder'};
+                if (do $plugin) {
+                    my $extended_param = plugin_parameters( $dbh, $temp, $tagslib, $subfield_data{id}, $loop_data );
+                    my ( $function_name, $javascript ) = plugin_javascript( $dbh, $temp, $tagslib, $subfield_data{id}, $loop_data );
+                    $subfield_data{marc_value} = qq[<input $attributes
+                        onfocus="Focus$function_name($subfield_data{random}, '$subfield_data{id}');"
+                         onblur=" Blur$function_name($subfield_data{random}, '$subfield_data{id}');" />
+                        <a href="#" class="buttonDot" onclick="Clic$function_name('$subfield_data{id}'); return false;" title="Tag Editor">...</a>
+                        $javascript];
+                } else {
+                    warn "Plugin Failed: $plugin";
+                    $subfield_data{marc_value} = "<input $attributes />"; # supply default input form
+                }
+        }
+        elsif ( $tag eq '' ) {       # it's an hidden field
+            $subfield_data{marc_value} = qq(<input type="hidden" $attributes />);
+        }
+        elsif ( $subfieldlib->{'hidden'} ) {   # FIXME: shouldn't input type be "hidden" ?
+            $subfield_data{marc_value} = qq(<input type="text" $attributes />);
+        }
+        elsif ( length($value) > 100
+                    or (C4::Context->preference("marcflavour") eq "UNIMARC" and
+                          300 <= $tag && $tag < 400 && $subfieldtag eq 'a' )
+                    or (C4::Context->preference("marcflavour") eq "MARC21"  and
+                          500 <= $tag && $tag < 600                     )
+                  ) {
+            # oversize field (textarea)
+            $subfield_data{marc_value} = "<textarea $attributes_no_value>$value</textarea>\n";
+        } else {
+           # it's a standard field
+           $subfield_data{marc_value} = "<input $attributes />";
+        }
+        
+        return \%subfield_data;
+}
+
+
 my $input = new CGI;
 my $dbh = C4::Context->dbh;
-my $error = $input->param('error');
+my $error        = $input->param('error');
 my $biblionumber = $input->param('biblionumber');
-my $itemnumber = $input->param('itemnumber');
-my $op = $input->param('op');
+my $itemnumber   = $input->param('itemnumber');
+my $op           = $input->param('op');
 
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/additem.tmpl",
                  query => $input,
                  type => "intranet",
                  authnotrequired => 0,
-                 flagsrequired => {editcatalogue => 1},
+                 flagsrequired => {editcatalogue => 'edit_items'},
                  debug => 1,
                  });
 
-# find itemtype
 my $frameworkcode = &GetFrameworkCode($biblionumber);
 
+my $today_iso = C4::Dates->today('iso');
+$template->param(today_iso => $today_iso);
+
 my $tagslib = &GetMarcStructure(1,$frameworkcode);
 my $record = GetMarcBiblio($biblionumber);
 my $oldrecord = TransformMarcToKoha($dbh,$record);
@@ -88,16 +238,18 @@ my @errors; # store errors found while checking data BEFORE saving item.
 if ($op eq "additem") {
 #-------------------------------------------------------------------------------
     # rebuild
-    my @tags = $input->param('tag');
+    my @tags      = $input->param('tag');
     my @subfields = $input->param('subfield');
-    my @values = $input->param('field_value');
+    my @values    = $input->param('field_value');
     # build indicator hash.
-    my @ind_tag = $input->param('ind_tag');
+    my @ind_tag   = $input->param('ind_tag');
     my @indicator = $input->param('indicator');
     my $xml = TransformHtmlToXml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag, 'ITEM');
-        my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
-    # if autoBarcode is ON, calculate barcode...
-    if (C4::Context->preference('autoBarcode')) {
+    my $record = MARC::Record::new_from_xml($xml, 'UTF-8');
+    # if autoBarcode is set to 'incremental', calculate barcode...
+       # NOTE: This code is subject to change in 3.2 with the implemenation of ajax based autobarcode code
+       # NOTE: 'incremental' is the ONLY autoBarcode option available to those not using javascript
+    if (C4::Context->preference('autoBarcode') eq 'incremental') {
         my ($tagfield,$tagsubfield) = &GetMarcFromKohaField("items.barcode",$frameworkcode);
         unless ($record->field($tagfield)->subfield($tagsubfield)) {
             my $sth_barcode = $dbh->prepare("select max(abs(barcode)) from items");
@@ -117,55 +269,53 @@ if ($op eq "additem") {
     push @errors,"barcode_not_unique" if($exist_itemnumber);
     # if barcode exists, don't create, but report The problem.
     my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = AddItemFromMarc($record,$biblionumber) unless ($exist_itemnumber);
+    $nextop = "additem";
     if ($exist_itemnumber) {
-        $nextop = "additem";
         $itemrecord = $record;
-    } else {
-        $nextop = "additem";
     }
 #-------------------------------------------------------------------------------
 } elsif ($op eq "edititem") {
 #-------------------------------------------------------------------------------
 # retrieve item if exist => then, it's a modif
-    $itemrecord = GetMarcItem($biblionumber,$itemnumber);
-    $nextop="saveitem";
+    $itemrecord = C4::Items::GetMarcItem($biblionumber,$itemnumber);
+    $nextop = "saveitem";
 #-------------------------------------------------------------------------------
 } elsif ($op eq "delitem") {
 #-------------------------------------------------------------------------------
-    # check that there is no issue on this item before deletion.
-    my $sth=$dbh->prepare("select * from issues i where i.returndate is null and i.itemnumber=?");
-    $sth->execute($itemnumber);
-    my $onloan=$sth->fetchrow;
-       $sth->finish();
-    push @errors,"book_on_loan" if ($onloan); ##error book_on_loan added to template as well
-    if ($onloan){
-               $nextop="additem";
-    } else {
-               # check it doesnt have a waiting reserve
-               $sth=$dbh->prepare("SELECT * FROM reserves WHERE found = 'w' AND cancellationdate IS NULL AND itemnumber = ?");
-               $sth->execute($itemnumber);
-               my $reserve=$sth->fetchrow;
-               if ($reserve){
-                       push @errors,"book_reserved";
-                       $nextop="additem";
-               }
-               else {
-                       &DelItem($dbh,$biblionumber,$itemnumber);
-                       print $input->redirect("additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode");
-               }
+    $error = &DelItemCheck($dbh,$biblionumber,$itemnumber);
+    if($error == 1){
+        print $input->redirect("additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode");
+               exit;
+    }else{
+        push @errors,$error;
+        $nextop="additem";
+    }
+#-------------------------------------------------------------------------------
+} elsif ($op eq "delallitems") {
+#-------------------------------------------------------------------------------
+    my @biblioitems = &GetBiblioItemByBiblioNumber($biblionumber);
+    foreach my $biblioitem (@biblioitems){
+        my $items = &GetItemsByBiblioitemnumber($biblioitem->{biblioitemnumber});
+
+        foreach my $item (@$items){
+            &DelItemCheck($dbh,$biblionumber,$item->{itemnumber});
+        }
     }
+    print $input->redirect("/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=$biblionumber");
+       exit;
 #-------------------------------------------------------------------------------
 } elsif ($op eq "saveitem") {
 #-------------------------------------------------------------------------------
     # rebuild
-    my @tags = $input->param('tag');
+    my @tags      = $input->param('tag');
     my @subfields = $input->param('subfield');
-    my @values = $input->param('field_value');
+    my @values    = $input->param('field_value');
     # build indicator hash.
-    my @ind_tag = $input->param('ind_tag');
+    my @ind_tag   = $input->param('ind_tag');
     my @indicator = $input->param('indicator');
-    #    my $itemnumber = $input->param('itemnumber');
+    # my $itemnumber = $input->param('itemnumber');
     my $xml = TransformHtmlToXml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag,'ITEM');
+
     my $itemtosave=MARC::Record::new_from_xml($xml, 'UTF-8');
     # MARC::Record builded => now, record in DB
     # warn "R: ".$record->as_formatted;
@@ -176,7 +326,7 @@ if ($op eq "additem") {
         push @errors,"barcode_not_unique";
     } else {
         my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = ModItemFromMarc($itemtosave,$biblionumber,$itemnumber);
-    $itemnumber="";
+        $itemnumber="";
     }
     $nextop="additem";
 }
@@ -189,46 +339,50 @@ 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);
+my (  $itemtagfield,   $itemtagsubfield) = &GetMarcFromKohaField("items.itemnumber", $frameworkcode);
+my ($branchtagfield, $branchtagsubfield) = &GetMarcFromKohaField("items.homebranch", $frameworkcode);
 
 foreach my $field (@fields) {
     next if ($field->tag()<10);
-    my @subf=$field->subfields;
+
+    my @subf = $field->subfields or (); # don't use ||, as that forces $field->subfelds to be interpreted in scalar context
     my %this_row;
 # loop through each subfield
-    for my $i (0..$#subf) {
-        next if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab} ne 10 
+    my $i = 0;
+    foreach my $subfield (@subf){
+        my $subfieldcode = $subfield->[0];
+        my $subfieldvalue= $subfield->[1];
+        
+        next if ($tagslib->{$field->tag()}->{$subfieldcode}->{tab} ne 10 
                 && ($field->tag() ne $itemtagfield 
-                && $subf[$i][0] ne $itemtagsubfield));
-
-        $witness{$subf[$i][0]} = $tagslib->{$field->tag()}->{$subf[$i][0]}->{lib} if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab}  eq 10);
+                && $subfieldcode   ne $itemtagsubfield));
+        $witness{$subfieldcode} = $tagslib->{$field->tag()}->{$subfieldcode}->{lib} if ($tagslib->{$field->tag()}->{$subfieldcode}->{tab}  eq 10);
+               if ($tagslib->{$field->tag()}->{$subfieldcode}->{tab}  eq 10) {
+                   $this_row{$subfieldcode} .= " | " if($this_row{$subfieldcode});
+               $this_row{$subfieldcode} .= GetAuthorisedValueDesc( $field->tag(),
+                        $subfieldcode, $subfieldvalue, '', $tagslib) 
+                                               || $subfieldvalue;
+               }
 
-        $this_row{$subf[$i][0]} =$subf[$i][1] if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab}  eq 10);
-        
-        if (($field->tag eq $branchtagfield) && ($subf[$i][$0] eq $branchtagsubfield) && C4::Context->preference("IndependantBranches")) {
+        if (($field->tag eq $branchtagfield) && ($subfieldcode eq $branchtagsubfield) && C4::Context->preference("IndependantBranches")) {
             #verifying rights
             my $userenv = C4::Context->userenv();
-            unless (($userenv->{'flags'} == 1) or (($userenv->{'branch'} eq $subf[$i][1]))){
+            unless (($userenv->{'flags'} == 1) or (($userenv->{'branch'} eq $subfieldvalue))){
                     $this_row{'nomod'}=1;
             }
         }
-        $this_row{itemnumber} = $subf[$i][1] if ($field->tag() eq $itemtagfield && $subf[$i][0] eq $itemtagsubfield);
+        $this_row{itemnumber} = $subfieldvalue if ($field->tag() eq $itemtagfield && $subfieldcode eq $itemtagsubfield);
     }
     if (%this_row) {
         push(@big_array, \%this_row);
     }
 }
-#fill big_row with missing data
-foreach my $subfield_code  (keys(%witness)) {
-    for (my $i=0;$i<=$#big_array;$i++) {
-        $big_array[$i]{$subfield_code}="&nbsp;" unless ($big_array[$i]{$subfield_code});
-    }
-}
+
 my ($holdingbrtagf,$holdingbrtagsubf) = &GetMarcFromKohaField("items.holdingbranch",$frameworkcode);
 @big_array = sort {$a->{$holdingbrtagsubf} cmp $b->{$holdingbrtagsubf}} @big_array;
 
@@ -236,17 +390,13 @@ my ($holdingbrtagf,$holdingbrtagsubf) = &GetMarcFromKohaField("items.holdingbran
 # First, the existing items for display
 my @item_value_loop;
 my @header_value_loop;
-for (my $i=0;$i<=$#big_array; $i++) {
-    my $items_data;
-    foreach my $subfield_code (sort keys(%witness)) {
-        $items_data .="<td>".$big_array[$i]{$subfield_code}."</td>";
-    }
+for my $row ( @big_array ) {
     my %row_data;
-    $items_data =~ s/"/&quot;/g;
-    $row_data{item_value} = $items_data;
-    $row_data{itemnumber} = $big_array[$i]->{itemnumber};
+    my @item_fields = map +{ field => $_ || '' }, @$row{ sort keys(%witness) };
+    $row_data{item_value} = [ @item_fields ];
+    $row_data{itemnumber} = $row->{itemnumber};
     #reporting this_row values
-    $row_data{'nomod'} = $big_array[$i]{'nomod'};
+    $row_data{'nomod'} = $row->{'nomod'};
     push(@item_value_loop,\%row_data);
 }
 foreach my $subfield_code (sort keys(%witness)) {
@@ -258,289 +408,66 @@ foreach my $subfield_code (sort keys(%witness)) {
 # now, build the item form for entering a new item
 my @loop_data =();
 my $i=0;
-my $authorised_values_sth = $dbh->prepare("SELECT authorised_value,lib FROM authorised_values WHERE category=? ORDER BY lib");
 
-foreach my $tag (sort keys %{$tagslib}) {
-  my $previous_tag = '';
-# loop through each subfield
-  foreach my $subfield (sort keys %{$tagslib->{$tag}}) {
-    next if subfield_is_koha_internal_p($subfield);
-    next if ($tagslib->{$tag}->{$subfield}->{'tab'}  ne "10");
-    my %subfield_data;
-    my $index_subfield= int(rand(1000000)); 
-    if($subfield eq '@'){
-        $subfield_data{id} = "tag_".$tag."_subfield_00_".$index_subfield;
-    } else {
-         $subfield_data{id} = "tag_".$tag."_subfield_".$subfield."_".$index_subfield;
-    }
-    $subfield_data{tag}=$tag;
-    $subfield_data{subfield}=$subfield;
-    $subfield_data{random}=int(rand(1000000)); 
-#        $subfield_data{marc_lib}=$tagslib->{$tag}->{$subfield}->{lib};
-    $subfield_data{marc_lib}="<span id=\"error$i\" title=\"".$tagslib->{$tag}->{$subfield}->{lib}."\">".$tagslib->{$tag}->{$subfield}->{lib}."</span>";
-    $subfield_data{mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory};
-    $subfield_data{repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable};
-    my ($x,$value);
-    ($x,$value) = find_value($tag,$subfield,$itemrecord) if ($itemrecord);
-    $value =~ s/"/&quot;/g;
-    unless ($value) {
-        $value = $tagslib->{$tag}->{$subfield}->{defaultvalue};
+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.
 
-        # get today date & replace YYYY, MM, DD if provided in the default value
-        my ( $year, $month, $day ) = Today();
-        $month = sprintf( "%02d", $month );
-        $day   = sprintf( "%02d", $day );
-        $value =~ s/YYYY/$year/g;
-        $value =~ s/MM/$month/g;
-        $value =~ s/DD/$day/g;
-    }
-    $subfield_data{visibility} = "display:none;" if (($tagslib->{$tag}->{$subfield}->{hidden} % 2 == 1));
-    #testing branch value if IndependantBranches.
-    my $test = (C4::Context->preference("IndependantBranches")) &&
-              ($tag eq $branchtagfield) && ($subfield eq $branchtagsubfield) &&
-              (C4::Context->userenv->{flags} != 1) && ($value) && ($value ne C4::Context->userenv->{branch}) ;
-#         print $input->redirect(".pl?biblionumber=$biblionumber") if ($test);
-        # search for itemcallnumber if applicable
-    if (!$value && $tagslib->{$tag}->{$subfield}->{kohafield} eq 'items.itemcallnumber' && C4::Context->preference('itemcallnumber')) {
-        my $CNtag = substr(C4::Context->preference('itemcallnumber'),0,3);
-        my $CNsubfield = substr(C4::Context->preference('itemcallnumber'),3,1);
-        my $CNsubfield2 = substr(C4::Context->preference('itemcallnumber'),4,1);
-        my $temp2 = $temp->field($CNtag);
-        if ($temp2) {
-                $value = ($temp2->subfield($CNsubfield)).' '.($temp2->subfield($CNsubfield2));
-#remove any trailing space incase one subfield is used
-        $value=~s/^\s+|\s+$//g;
-      }
-    }
-    if ( $tagslib->{$tag}->{$subfield}->{authorised_value} ) {
-      my @authorised_values;
-      my %authorised_lib;
-      my $dbh=C4::Context->dbh;   
-  
-      # builds list, depending on authorised value...
-  
-      #---- branch
-      if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
-          #Use GetBranches($onlymine)
-          my $onlymine=C4::Context->preference('IndependantBranches') && 
-                  C4::Context->userenv && 
-                  C4::Context->userenv->{flags}!=1 && 
-                  C4::Context->userenv->{branch};
-          my $branches = GetBranches($onlymine);
-          my @branchloop;
-          foreach my $thisbranch ( sort keys %$branches ) {
-              push @authorised_values, $thisbranch;
-              $authorised_lib{$thisbranch} = $branches->{$thisbranch}->{'branchname'};
-          }
-          
-          #----- itemtypes
-      }
-      elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) {
-          my $sth =
-            $dbh->prepare(
-              "select itemtype,description from itemtypes order by description");
-          $sth->execute;
-          push @authorised_values, ""
-            unless ( $tagslib->{$tag}->{$subfield}->{mandatory} );
-            
-          my $itemtype;
-          
-          while ( my ( $itemtype, $description ) = $sth->fetchrow_array ) {
-              push @authorised_values, $itemtype;
-              $authorised_lib{$itemtype} = $description;
-          }
-          $value = $itemtype unless ($value);
-  
-          #---- class_sources
-      }
-      elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "cn_source" ) {
-          push @authorised_values, ""
-            unless ( $tagslib->{$tag}->{$subfield}->{mandatory} );
+# We generate form, from actuel record
+my @fields;
+if($itemrecord){
+    foreach my $field ($itemrecord->fields()){
+        my $tag = $field->{_tag};
+        foreach my $subfield ( $field->subfields() ){
             
-          my $class_sources = GetClassSources();
-
-          my $default_source = C4::Context->preference("DefaultClassificationSource");
-          
-          foreach my $class_source (sort keys %$class_sources) {
-              next unless $class_sources->{$class_source}->{'used'} or
-                          ($value and $class_source eq $value) or
-                          ($class_source eq $default_source);
-              push @authorised_values, $class_source;
-              $authorised_lib{$class_source} = $class_sources->{$class_source}->{'description'};
-              $value = $class_source unless ($value);
-              $value = $default_source unless ($value);
-          }
-  
-          #---- "true" authorised value
-      }
-      else {
-          $authorised_values_sth->execute(
-              $tagslib->{$tag}->{$subfield}->{authorised_value} );
-  
-          push @authorised_values, ""
-            unless ( $tagslib->{$tag}->{$subfield}->{mandatory} );
-  
-          while ( my ( $value, $lib ) = $authorised_values_sth->fetchrow_array ) {
-              push @authorised_values, $value;
-              $authorised_lib{$value} = $lib;
-          }
-      }
-      $subfield_data{marc_value} =CGI::scrolling_list(
-          -name     => "field_value",
-          -values   => \@authorised_values,
-          -default  => $value,
-          -labels   => \%authorised_lib,
-          -override => 1,
-          -size     => 1,
-          -multiple => 0,
-          -tabindex => 1,
-          -id       => "tag_".$tag."_subfield_".$subfield."_".$index_subfield,
-          -class    => "input_marceditor",
-      );
-    # it's a thesaurus / authority field
-    }
-    elsif ( $tagslib->{$tag}->{$subfield}->{authtypecode} ) {
-        $subfield_data{marc_value} =
-            "<input type=\"text\"
-                    id=\"".$subfield_data{id}."\"
-                    name=\"field_value\"
-                    value=\"$value\"
-                    class=\"input_marceditor\"
-                    tabindex=\"1\"
-                    size=\"67\"
-                    maxlength=\"255\" 
-                    \/>
-                    <a href=\"#\" class=\"buttonDot\"
-                        onclick=\"Dopop('/cgi-bin/koha/authorities/auth_finder.pl?authtypecode=".$tagslib->{$tag}->{$subfield}->{authtypecode}."&index=$subfield_data{id}','$subfield_data{id}'); return false;\" title=\"Tag Editor\">...</a>
-    ";
-    # it's a plugin field
-    }
-    elsif ( $tagslib->{$tag}->{$subfield}->{'value_builder'} ) {
-
-        # opening plugin. Just check wether we are on a developper computer on a production one
-        # (the cgidir differs)
-        my $cgidir = C4::Context->intranetdir . "/cgi-bin/cataloguing/value_builder";
-        unless ( opendir( DIR, "$cgidir" ) ) {
-            $cgidir = C4::Context->intranetdir . "/cataloguing/value_builder";
-            closedir( DIR );
-        }
-        my $plugin = $cgidir . "/" . $tagslib->{$tag}->{$subfield}->{'value_builder'};
-        if (do $plugin) {
-            my $extended_param = plugin_parameters( $dbh, $temp, $tagslib, $subfield_data{id}, \@loop_data );
-            my ( $function_name, $javascript ) = plugin_javascript( $dbh, $temp, $tagslib, $subfield_data{id}, \@loop_data );
-        
-            $subfield_data{marc_value} =
-                    "<input tabindex=\"1\"
-                            type=\"text\"
-                            id=\"".$subfield_data{id}."\"
-                            name=\"field_value\"
-                            value=\"$value\"
-                            class=\"input_marceditor\"
-                            onfocus=\"Focus$function_name(".$subfield_data{random}.")\"
-                            size=\"67\"
-                            maxlength=\"255\" 
-                            onblur=\"Blur$function_name(".$subfield_data{random}."); \" \/>
-                            <a href=\"#\" class=\"buttonDot\" onclick=\"Clic$function_name('$subfield_data{id}'); return false;\" title=\"Tag Editor\">...</a>
-                    $javascript";
-        } else {
-            warn "Plugin Failed: $plugin";
-            # supply default input form
-            $subfield_data{marc_value} =
-                "<input type=\"text\"
-                        id=\"".$subfield_data{id}."\"
-                        name=\"field_value\"
-                        value=\"$value\"
-                        tabindex=\"1\"
-                        size=\"67\"
-                        maxlength=\"255\" 
-                        class=\"input_marceditor\"
-                \/>
-                ";
+            my $subfieldtag = $subfield->[0];
+            my $value       = $subfield->[1];
+            my $subfieldlib = $tagslib->{$tag}->{$subfieldtag};
+    
+            next if subfield_is_koha_internal_p($subfieldtag);
+            next if ($tagslib->{$tag}->{$subfieldtag}->{'tab'} ne "10");
+    
+            my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $branches, $today_iso, $biblionumber, $temp, \@loop_data, $i);        
+    
+            push @fields, "$tag$subfieldtag";
+            push (@loop_data, $subfield_data);
+            $i++;
         }
-        # it's an hidden field
     }
-    elsif ( $tag eq '' ) {
-        $subfield_data{marc_value} =
-            "<input tabindex=\"1\"
-                    type=\"hidden\"
-                    id=\"".$subfield_data{id}."\"
-                    name=\"field_value\"
-                    size=\"67\"
-                    maxlength=\"255\" 
-                    value=\"$value\" \/>
-            ";
-    }
-    elsif ( $tagslib->{$tag}->{$subfield}->{'hidden'} ) {
-        $subfield_data{marc_value} =
-            "<input type=\"text\"
-                    id=\"".$subfield_data{id}."\"
-                    name=\"field_value\"
-                    class=\"input_marceditor\"
-                    tabindex=\"1\"
-                    size=\"67\"
-                    maxlength=\"255\" 
-                    value=\"$value\"
-            \/>";
-
-        # it's a standard field
-    }
-    else {
-        if (
-            length($value) > 100
-            or
-            ( C4::Context->preference("marcflavour") eq "UNIMARC" && $tag >= 300
-                and $tag < 400 && $subfield eq 'a' )
-            or (    $tag >= 500
-                and $tag < 600
-                && C4::Context->preference("marcflavour") eq "MARC21" )
-          )
-        {
-            $subfield_data{marc_value} =
-                "<textarea cols=\"70\"
-                           rows=\"4\"
-                           id=\"".$subfield_data{id}."\"
-                           name=\"field_value\"
-                           class=\"input_marceditor\"
-                           tabindex=\"1\"
-                            size=\"67\"
-                            maxlength=\"255\" 
-                           >$value</textarea>
-                ";
-        }
-        else {
-            $subfield_data{marc_value} =
-                "<input type=\"text\"
-                        id=\"".$subfield_data{id}."\"
-                        name=\"field_value\"
-                        value=\"$value\"
-                        tabindex=\"1\"
-                        size=\"67\"
-                        maxlength=\"255\" 
-                        class=\"input_marceditor\"
-                \/>
-                ";
-        }
-    }
-#        $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\">";
-        push(@loop_data, \%subfield_data);
-        $i++
+}
+    # and now we add fields that are empty
+    
+foreach my $tag ( keys %{$tagslib}){
+    foreach my $subtag (keys %{$tagslib->{$tag}}){
+        next if subfield_is_koha_internal_p($subtag);
+        next if ($tagslib->{$tag}->{$subtag}->{'tab'} ne "10");
+        next if any { /^$tag$subtag$/ }  @fields;
+        
+        my $value = "";
+        my $subfield_data = generate_subfield_form($tag, $subtag, $value, $tagslib, $tagslib->{$tag}->{$subtag}, $branches, $today_iso, $biblionumber, $temp, \@loop_data, $i);
+        
+        push (@loop_data, $subfield_data);
+        $i++;
     }
 }
-
 # what's the next op ? it's what we are not in : an add if we're editing, otherwise, and edit.
 $template->param( title => $record->title() ) if ($record ne "-1");
-$template->param(item_loop => \@item_value_loop,
-                        item_header_loop => \@header_value_loop,
-                        biblionumber => $biblionumber,
-                        title => $oldrecord->{title},
-                        author => $oldrecord->{author},
-                        item => \@loop_data,
-                        itemnumber => $itemnumber,
-                        itemtagfield => $itemtagfield,
-                        itemtagsubfield =>$itemtagsubfield,
-                        op => $nextop,
-                        opisadd => ($nextop eq "saveitem")?0:1);
+$template->param(
+    biblionumber => $biblionumber,
+    title        => $oldrecord->{title},
+    author       => $oldrecord->{author},
+    item_loop        => \@item_value_loop,
+    item_header_loop => \@header_value_loop,
+    item             => \@loop_data,
+    itemnumber       => $itemnumber,
+    itemtagfield     => $itemtagfield,
+    itemtagsubfield  => $itemtagsubfield,
+    op      => $nextop,
+    opisadd => ($nextop eq "saveitem") ? 0 : 1,
+    C4::Search::enabled_staff_search_views,
+);
 foreach my $error (@errors) {
     $template->param($error => 1);
 }