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

(-)a/catalogue/detail.pl (-6 / +8 lines)
Lines 264-277 foreach my $item (@items) { Link Here
264
	$item->{hosttitle} = GetBiblioData($item->{biblionumber})->{title};
264
	$item->{hosttitle} = GetBiblioData($item->{biblionumber})->{title};
265
    }
265
    }
266
	
266
	
267
	#count if item is used in analytical bibliorecords
267
    #count if item is used in analytical bibliorecords
268
	my $countanalytics= GetAnalyticsCount($item->{itemnumber});
268
    my $countanalytics= GetAnalyticsCount($item->{itemnumber});
269
	if ($countanalytics > 0){
269
    if ($countanalytics > 0){
270
		$analytics_flag=1;
270
        $analytics_flag=1;
271
		$item->{countanalytics} = $countanalytics;
271
        $item->{countanalytics} = $countanalytics;
272
	}
272
    }
273
273
    if (defined($item->{'materials'}) && $item->{'materials'} =~ /\S/){
274
    if (defined($item->{'materials'}) && $item->{'materials'} =~ /\S/){
274
	$materials_flag = 1;
275
	$materials_flag = 1;
276
    }
275
277
276
    if ($currentbranch and $currentbranch ne "NO_LIBRARY_SET"
278
    if ($currentbranch and $currentbranch ne "NO_LIBRARY_SET"
277
    and C4::Context->preference('SeparateHoldings')) {
279
    and C4::Context->preference('SeparateHoldings')) {
(-)a/installer/data/mysql/updatedatabase.pl (-2 lines)
Lines 6112-6118 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
6112
    SetVersion($DBversion);
6112
    SetVersion($DBversion);
6113
}
6113
}
6114
6114
6115
<<<<<<< HEAD
6116
$DBversion = "3.11.00.005";
6115
$DBversion = "3.11.00.005";
6117
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
6116
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
6118
    $dbh->do(qq{CREATE TABLE borrower_attribute_types_branches(bat_code VARCHAR(10), b_branchcode VARCHAR(10),FOREIGN KEY (bat_code) REFERENCES borrower_attribute_types(code) ON DELETE CASCADE,FOREIGN KEY (b_branchcode) REFERENCES branches(branchcode) ON DELETE CASCADE ) ENGINE=INNODB DEFAULT CHARSET=utf8;});
6117
    $dbh->do(qq{CREATE TABLE borrower_attribute_types_branches(bat_code VARCHAR(10), b_branchcode VARCHAR(10),FOREIGN KEY (bat_code) REFERENCES borrower_attribute_types(code) ON DELETE CASCADE,FOREIGN KEY (b_branchcode) REFERENCES branches(branchcode) ON DELETE CASCADE ) ENGINE=INNODB DEFAULT CHARSET=utf8;});
6119
- 

Return to bug 7674