View | Details | Raw Unified | Return to bug 7294
Collapse All | Expand All

(-)a/acqui/addorder.pl (-2 / +6 lines)
Lines 230-236 if ( $orderinfo->{quantity} ne '0' ) { Link Here
230
                "aqorders.notes"              => $$orderinfo{notes}           ? $$orderinfo{notes}           : "",
230
                "aqorders.notes"              => $$orderinfo{notes}           ? $$orderinfo{notes}           : "",
231
                "aqorders.supplierreference"  => $$orderinfo{supplierreference}?$$orderinfo{supplierreference}:"",
231
                "aqorders.supplierreference"  => $$orderinfo{supplierreference}?$$orderinfo{supplierreference}:"",
232
                "aqorders.sort1"              => $$orderinfo{sort1}           ? $$orderinfo{sort1}           : "",
232
                "aqorders.sort1"              => $$orderinfo{sort1}           ? $$orderinfo{sort1}           : "",
233
                "aqorders.sort2"              => $$orderinfo{sort2}           ? $$orderinfo{sort2}           : ""
233
                "aqorders.sort2"              => $$orderinfo{sort2}           ? $$orderinfo{sort2}           : "",
234
                "aqorders.basketno"           => $$orderinfo{basketno}        ? $$orderinfo{basketno}        : "",
235
                "aqbasket.booksellerid"       => $$orderinfo{booksellerid}    ? $$orderinfo{booksellerid}    : ""
234
            }
236
            }
235
        );
237
        );
236
238
Lines 288-297 if ( $orderinfo->{quantity} ne '0' ) { Link Here
288
290
289
		    # Replacing or creating subfields
291
		    # Replacing or creating subfields
290
		    my ($t, $st);
292
		    my ($t, $st);
291
		    for my $tablefield (qw/branchcode quantity listprice uncertainprice rrp ecost notes supplierreference sort1 sort2/) {
293
		    for my $tablefield (qw/branchcode quantity listprice uncertainprice rrp ecost notes supplierreference sort1 sort2 basketno/) {
292
			($t, $st) = GetMarcFromKohaField("aqorders.$tablefield", 'ACQ');
294
			($t, $st) = GetMarcFromKohaField("aqorders.$tablefield", 'ACQ');
293
			$_->update($st, $$orderinfo{$tablefield}) if ($$orderinfo{$tablefield} and $st);
295
			$_->update($st, $$orderinfo{$tablefield}) if ($$orderinfo{$tablefield} and $st);
294
		    }
296
		    }
297
			($t, $st) = GetMarcFromKohaField("aqbasket.booksellerid", 'ACQ');
298
			$_->update($st, $$orderinfo{booksellerid}) if ($$orderinfo{booksellerid} and $st);
295
		    ModBiblio($record, $$orderinfo{biblionumber}, 'ACQ');
299
		    ModBiblio($record, $$orderinfo{biblionumber}, 'ACQ');
296
		}
300
		}
297
	    }
301
	    }
(-)a/admin/marc_subfields_structure.pl (+5 lines)
Lines 128-133 if ( $op eq 'add_form' ) { Link Here
128
    while ( ( my $field ) = $sth2->fetchrow_array ) {
128
    while ( ( my $field ) = $sth2->fetchrow_array ) {
129
        push @kohafields, "aqorders." . $field;
129
        push @kohafields, "aqorders." . $field;
130
    }
130
    }
131
    $sth2 = $dbh->prepare("SHOW COLUMNS from aqbasket");
132
    $sth2->execute;
133
    while ( ( my $field ) = $sth2->fetchrow_array ) {
134
        push @kohafields, "aqbasket." . $field;
135
    }
131
136
132
137
133
    # build authorised value list
138
    # build authorised value list
(-)a/catalogue/detail.pl (+16 lines)
Lines 60-65 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
60
my $biblionumber = $query->param('biblionumber');
60
my $biblionumber = $query->param('biblionumber');
61
my $record       = GetMarcBiblio($biblionumber);
61
my $record       = GetMarcBiblio($biblionumber);
62
62
63
my ($ordernofield ,$ordernosubfield)           = GetMarcFromKohaField("aqorders.ordernumber",'ACQ');
64
my ($basketnofield ,$basketnosubfield)         = GetMarcFromKohaField("aqorders.basketno",'ACQ');
65
my ($bookselleridfield ,$bookselleridsubfield) = GetMarcFromKohaField("aqbasket.booksellerid",'ACQ');
66
my $marcfield = GetMarcBiblio($biblionumber);
67
if(my $fieldtag = $marcfield->field($ordernofield))
68
{
69
if(my $s = $fieldtag->as_string($ordernosubfield))
70
{
71
$template->param( field_flag => 1);
72
$template->param( orderno  => $fieldtag->as_string($ordernosubfield) ,
73
                  basketno => $fieldtag->as_string($basketnosubfield) ,
74
                  booksellerid => $fieldtag->as_string($bookselleridsubfield) );
75
}
76
}else{
77
$template->param( field_flag => 0);
78
}
63
if ( not defined $record ) {
79
if ( not defined $record ) {
64
    # biblionumber invalid -> report and exit
80
    # biblionumber invalid -> report and exit
65
    $template->param( unknownbiblionumber => 1,
81
    $template->param( unknownbiblionumber => 1,
(-)a/catalogue/search.pl (+10 lines)
Lines 150-155 use C4::Members qw(GetMember); Link Here
150
use C4::VirtualShelves;
150
use C4::VirtualShelves;
151
use POSIX qw(ceil floor);
151
use POSIX qw(ceil floor);
152
use C4::Branch; # GetBranches
152
use C4::Branch; # GetBranches
153
use C4::Biblio;
153
154
154
my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold");
155
my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold");
155
# create a new CGI object
156
# create a new CGI object
Lines 594-599 for (my $i=0;$i<@servers;$i++) { Link Here
594
            # in order to avoid problems generated by the default size value in TT
595
            # in order to avoid problems generated by the default size value in TT
595
            foreach my $line (@newresults) {
596
            foreach my $line (@newresults) {
596
                if ( not exists $line->{'size'} ) { $line->{'size'} = "" }
597
                if ( not exists $line->{'size'} ) { $line->{'size'} = "" }
598
            my $record = GetMarcBiblio($line->{'biblionumber'});
599
            my ($ordernofield ,$ordernosubfield) = GetMarcFromKohaField("aqorders.ordernumber",'ACQ');
600
            if(my $fieldtag = $record->field($ordernofield))
601
            {
602
                if(my $s = $fieldtag->as_string($ordernosubfield))
603
                {
604
                $line->{'field_flag'} = 1;
605
                }
606
            }
597
            }
607
            }
598
            $template->param(SEARCH_RESULTS => \@newresults);
608
            $template->param(SEARCH_RESULTS => \@newresults);
599
            ## FIXME: add a global function for this, it's better than the current global one
609
            ## 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 (+8 lines)
Lines 441-448 function verify_images() { Link Here
441
        <div id="alternateholdings"><span class="holdings_label">Holdings:</span> [% ALTERNATEHOLDING.holding %]</div>
441
        <div id="alternateholdings"><span class="holdings_label">Holdings:</span> [% ALTERNATEHOLDING.holding %]</div>
442
    [% END %]
442
    [% END %]
443
    [% ELSE %]
443
    [% ELSE %]
444
    [% IF ( field_flag ) %]
445
    [% IF ( CAN_user_acquisition ) %]
446
    <div id="noitems">Title has been <a href="/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% orderno %]&amp;booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]">ordered</a></div>
447
    [% ELSE %]  
448
    <div id="noitems">Title has been ordered</div>
449
    [% END %] 
450
    [% ELSE %]  
444
    <div id="noitems">No physical items for this record</div>
451
    <div id="noitems">No physical items for this record</div>
445
    [% END %]
452
    [% END %]
453
    [% END %]
446
[% END %]
454
[% END %]
447
    </div>
455
    </div>
448
    
456
    
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (+3 lines)
Lines 623-628 YAHOO.util.Event.onContentReady("searchheader", function () { Link Here
623
                                    </li>
623
                                    </li>
624
                                    [% ELSE %]
624
                                    [% ELSE %]
625
                                    <span class="unavailable">No items</span>
625
                                    <span class="unavailable">No items</span>
626
                                    [% IF ( SEARCH_RESULT.field_flag ) %]
627
                                    <span class="noitems">Title has been ordered</span>
628
                                    [% END %]
626
                                    [% END %]
629
                                    [% END %]
627
                                    [% END %] <!-- /items count -->
630
                                    [% END %] <!-- /items count -->
628
                                    </div></td>
631
                                    </div></td>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt (+4 lines)
Lines 752-759 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
752
        <div id="alternateholdings"><span class="holdings_label">Holdings:</span> [% ALTERNATEHOLDING.holding %]</div>
752
        <div id="alternateholdings"><span class="holdings_label">Holdings:</span> [% ALTERNATEHOLDING.holding %]</div>
753
    [% END %]
753
    [% END %]
754
    [% ELSE %]
754
    [% ELSE %]
755
    [% IF ( field_flag ) %]
756
    <div id="noitems">Title has been ordered</div>
757
    [% ELSE %]  
755
    <div id="noitems">No physical items for this record</div>
758
    <div id="noitems">No physical items for this record</div>
756
    [% END %]
759
    [% END %]
760
    [% END %]
757
[% END %]
761
[% END %]
758
762
759
[% IF ( OpenOPACShelfBrowser ) %]
763
[% IF ( OpenOPACShelfBrowser ) %]
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt (+4 lines)
Lines 482-487 $(document).ready(function(){ Link Here
482
                    [% IF ( SEARCH_RESULT.orderedcount ) %] On order ([% SEARCH_RESULT.orderedcount %]),[% END %]
482
                    [% IF ( SEARCH_RESULT.orderedcount ) %] On order ([% SEARCH_RESULT.orderedcount %]),[% END %]
483
                    [% IF ( SEARCH_RESULT.onholdcount ) %] On hold ([% SEARCH_RESULT.onholdcount %]),[% END %]
483
                    [% IF ( SEARCH_RESULT.onholdcount ) %] On hold ([% SEARCH_RESULT.onholdcount %]),[% END %]
484
                    [% IF ( SEARCH_RESULT.intransitcount ) %] In transit ([% SEARCH_RESULT.intransitcount %]),[% END %]
484
                    [% IF ( SEARCH_RESULT.intransitcount ) %] In transit ([% SEARCH_RESULT.intransitcount %]),[% END %]
485
                    [% IF ( SEARCH_RESULT.field_flag ) %]
486
                    <span class="unavailable"> Title has been ordered </span>
487
                    [% END %]
488
                    </span>
485
                    </span>
489
                    </span>
486
                </span>
490
                </span>
487
                [% END %]
491
                [% END %]
(-)a/opac/opac-detail.pl (+10 lines)
Lines 71-76 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
71
my $biblionumber = $query->param('biblionumber') || $query->param('bib');
71
my $biblionumber = $query->param('biblionumber') || $query->param('bib');
72
72
73
my $record       = GetMarcBiblio($biblionumber);
73
my $record       = GetMarcBiblio($biblionumber);
74
my ($ordernofield ,$ordernosubfield) = GetMarcFromKohaField("aqorders.ordernumber",'ACQ');
75
if(my $fieldtag = $record->field($ordernofield))
76
{
77
if(my $s = $fieldtag->as_string($ordernosubfield))
78
{
79
$template->param( field_flag => 1);
80
}
81
}else{
82
$template->param( field_flag => 0);
83
}
74
if ( ! $record ) {
84
if ( ! $record ) {
75
    print $query->redirect("/cgi-bin/koha/errors/404.pl"); # escape early
85
    print $query->redirect("/cgi-bin/koha/errors/404.pl"); # escape early
76
    exit;
86
    exit;
(-)a/opac/opac-search.pl (-1 / +9 lines)
Lines 524-529 for (my $i=0;$i<@servers;$i++) { Link Here
524
            if ( grep {$_ eq $line->{'biblionumber'}} @cart_list) {
524
            if ( grep {$_ eq $line->{'biblionumber'}} @cart_list) {
525
                $line->{'incart'} = 1;
525
                $line->{'incart'} = 1;
526
            }
526
            }
527
        my $record = GetMarcBiblio($line->{'biblionumber'});        
528
        my ($ordernofield ,$ordernosubfield) = GetMarcFromKohaField("aqorders.ordernumber",'ACQ');
529
            if(my $fieldtag = $record->field($ordernofield))
530
            {
531
                if(my $s = $fieldtag->as_string($ordernosubfield))
532
                {
533
                $line->{'field_flag'} = 1;
534
                }
535
            }
527
        }
536
        }
528
537
529
538
530
- 

Return to bug 7294