@@ -, +, @@ --- acqui/addorder.pl | 8 ++++++-- admin/marc_subfields_structure.pl | 5 +++++ catalogue/detail.pl | 16 ++++++++++++++++ catalogue/search.pl | 10 ++++++++++ .../prog/en/modules/catalogue/detail.tt | 8 ++++++++ .../prog/en/modules/catalogue/results.tt | 3 +++ koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 4 ++++ .../opac-tmpl/prog/en/modules/opac-results.tt | 4 ++++ opac/opac-detail.pl | 10 ++++++++++ opac/opac-search.pl | 9 +++++++++ 10 files changed, 75 insertions(+), 2 deletions(-) --- a/acqui/addorder.pl +++ a/acqui/addorder.pl @@ -230,7 +230,9 @@ if ( $orderinfo->{quantity} ne '0' ) { "aqorders.notes" => $$orderinfo{notes} ? $$orderinfo{notes} : "", "aqorders.supplierreference" => $$orderinfo{supplierreference}?$$orderinfo{supplierreference}:"", "aqorders.sort1" => $$orderinfo{sort1} ? $$orderinfo{sort1} : "", - "aqorders.sort2" => $$orderinfo{sort2} ? $$orderinfo{sort2} : "" + "aqorders.sort2" => $$orderinfo{sort2} ? $$orderinfo{sort2} : "", + "aqorders.basketno" => $$orderinfo{basketno} ? $$orderinfo{basketno} : "", + "aqbasket.booksellerid" => $$orderinfo{booksellerid} ? $$orderinfo{booksellerid} : "" } ); @@ -288,10 +290,12 @@ if ( $orderinfo->{quantity} ne '0' ) { # Replacing or creating subfields my ($t, $st); - for my $tablefield (qw/branchcode quantity listprice uncertainprice rrp ecost notes supplierreference sort1 sort2/) { + for my $tablefield (qw/branchcode quantity listprice uncertainprice rrp ecost notes supplierreference sort1 sort2 basketno/) { ($t, $st) = GetMarcFromKohaField("aqorders.$tablefield", 'ACQ'); $_->update($st, $$orderinfo{$tablefield}) if ($$orderinfo{$tablefield} and $st); } + ($t, $st) = GetMarcFromKohaField("aqbasket.booksellerid", 'ACQ'); + $_->update($st, $$orderinfo{booksellerid}) if ($$orderinfo{booksellerid} and $st); ModBiblio($record, $$orderinfo{biblionumber}, 'ACQ'); } } --- a/admin/marc_subfields_structure.pl +++ a/admin/marc_subfields_structure.pl @@ -128,6 +128,11 @@ if ( $op eq 'add_form' ) { while ( ( my $field ) = $sth2->fetchrow_array ) { push @kohafields, "aqorders." . $field; } + $sth2 = $dbh->prepare("SHOW COLUMNS from aqbasket"); + $sth2->execute; + while ( ( my $field ) = $sth2->fetchrow_array ) { + push @kohafields, "aqbasket." . $field; + } # build authorised value list --- a/catalogue/detail.pl +++ a/catalogue/detail.pl @@ -60,6 +60,22 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( my $biblionumber = $query->param('biblionumber'); my $record = GetMarcBiblio($biblionumber); +my ($ordernofield ,$ordernosubfield) = GetMarcFromKohaField("aqorders.ordernumber",'ACQ'); +my ($basketnofield ,$basketnosubfield) = GetMarcFromKohaField("aqorders.basketno",'ACQ'); +my ($bookselleridfield ,$bookselleridsubfield) = GetMarcFromKohaField("aqbasket.booksellerid",'ACQ'); +my $marcfield = GetMarcBiblio($biblionumber); +if(my $fieldtag = $marcfield->field($ordernofield)) +{ +if(my $s = $fieldtag->as_string($ordernosubfield)) +{ +$template->param( field_flag => 1); +$template->param( orderno => $fieldtag->as_string($ordernosubfield) , + basketno => $fieldtag->as_string($basketnosubfield) , + booksellerid => $fieldtag->as_string($bookselleridsubfield) ); +} +}else{ +$template->param( field_flag => 0); +} if ( not defined $record ) { # biblionumber invalid -> report and exit $template->param( unknownbiblionumber => 1, --- a/catalogue/search.pl +++ a/catalogue/search.pl @@ -150,6 +150,7 @@ use C4::Members qw(GetMember); use C4::VirtualShelves; use POSIX qw(ceil floor); use C4::Branch; # GetBranches +use C4::Biblio; my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold"); # create a new CGI object @@ -594,6 +595,15 @@ for (my $i=0;$i<@servers;$i++) { # in order to avoid problems generated by the default size value in TT foreach my $line (@newresults) { if ( not exists $line->{'size'} ) { $line->{'size'} = "" } + my $record = GetMarcBiblio($line->{'biblionumber'}); + my ($ordernofield ,$ordernosubfield) = GetMarcFromKohaField("aqorders.ordernumber",'ACQ'); + if(my $fieldtag = $record->field($ordernofield)) + { + if(my $s = $fieldtag->as_string($ordernosubfield)) + { + $line->{'field_flag'} = 1; + } + } } $template->param(SEARCH_RESULTS => \@newresults); ## FIXME: add a global function for this, it's better than the current global one --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -441,8 +441,16 @@ function verify_images() {