From chrisc at catalyst.net.nz Fri Apr 1 00:01:00 2011 From: chrisc at catalyst.net.nz (Chris Cormack) Date: Fri, 1 Apr 2011 11:01:00 +1300 Subject: [Koha-patches] [PATCH] (bug #5164) fix csv in overdue notice Message-ID: <1301608860-32076-1-git-send-email-chrisc@catalyst.net.nz> From: Nahuel ANGELINETTI This fix the csv export sent by email for empty lines. --- misc/cronjobs/overdue_notices.pl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl index 3ef566a..c266c56 100755 --- a/misc/cronjobs/overdue_notices.pl +++ b/misc/cronjobs/overdue_notices.pl @@ -584,6 +584,8 @@ END_SQL local $, = "\f"; # pagebreak print @output_chunks; } + my $content = join(";", qw(title name surname address1 address2 zipcode city email itemcount itemsinfo due_date issue_date)) . "\n"; + $content .= join( "\n", map { m/(.+)/ } @output_chunks ); my $attachment = { filename => defined $csvfilename ? 'attachment.csv' : 'attachment.txt', type => 'text/plain', -- 1.7.1 From robin at catalyst.net.nz Fri Apr 1 00:31:31 2011 From: robin at catalyst.net.nz (Robin Sheat) Date: Fri, 1 Apr 2011 11:31:31 +1300 Subject: [Koha-patches] [PATCH] bug 6031: play with options passed on to rebuild-zebra.pl Message-ID: <1301610691-14160-1-git-send-email-robin@catalyst.net.nz> From: Srdjan Jankovic --- debian/scripts/koha-rebuild-zebra | 40 ++++++++++++++++++++++++++++-------- 1 files changed, 31 insertions(+), 9 deletions(-) diff --git a/debian/scripts/koha-rebuild-zebra b/debian/scripts/koha-rebuild-zebra index 3ae693b..b8201e8 100755 --- a/debian/scripts/koha-rebuild-zebra +++ b/debian/scripts/koha-rebuild-zebra @@ -19,20 +19,42 @@ set -e +opt_idx="-z" +opt_xml="-x" +opts_other="" + +while [ -n "$*" ]; do + case "$1" in + -u|--usmarc) + opt_xml="" + ;; + -f|--full) + opt_idx="-r" + ;; + -*) + opts_other="$opts_other $1"; + ;; + *) + break + ;; + esac -if [ "$1" = --full ] -then - opts="-r" shift -else - opts="-z" -fi +done -for name in "$@" -do + +function run_zebra () { + name=$1; shift + sudo -u "$name-koha" -H \ env PERL5LIB=/usr/share/koha/lib \ KOHA_CONF="/etc/koha/sites/$name/koha-conf.xml" \ - /usr/share/koha/bin/migration_tools/rebuild_zebra.pl -b -a $opts + /usr/share/koha/bin/migration_tools/rebuild_zebra.pl $@ +} + +for name in "$@" +do + run_zebra $name -b $opt_idx $opt_xml $opts_other + run_zebra $name -a $opt_idx $opts_other done -- 1.7.1 From srdjan at catalyst.net.nz Fri Apr 1 05:17:04 2011 From: srdjan at catalyst.net.nz (Srdjan Jankovic) Date: Fri, 1 Apr 2011 16:17:04 +1300 Subject: [Koha-patches] [PATCH] wr78692 (bug 6024): add "Run report" link on the new report creation success page In-Reply-To: References: Message-ID: <1301627824-31327-1-git-send-email-srdjan@catalyst.net.nz> --- C4/Reports/Guided.pm | 9 ++++++--- .../en/modules/reports/guided_reports_start.tmpl | 3 +++ reports/guided_reports.pl | 3 ++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/C4/Reports/Guided.pm b/C4/Reports/Guided.pm index 7231457..4c6cbbb 100644 --- a/C4/Reports/Guided.pm +++ b/C4/Reports/Guided.pm @@ -468,7 +468,8 @@ sub execute_query ($;$$$) { =item save_report($sql,$name,$type,$notes) -Given some sql and a name this will saved it so that it can resued +Given some sql and a name this will saved it so that it can reused +Returns id of the newly created report =cut @@ -478,8 +479,10 @@ sub save_report { $sql =~ s/(\s*\;\s*)$//; # removes trailing whitespace and /;/ my $query = "INSERT INTO saved_sql (borrowernumber,date_created,last_modified,savedsql,report_name,type,notes) VALUES (?,now(),now(),?,?,?,?)"; - my $sth = $dbh->prepare($query); - $sth->execute( $borrowernumber, $sql, $name, $type, $notes ); + $dbh->do( $query, undef, $borrowernumber, $sql, $name, $type, $notes ); + my $id = $dbh->selectrow_array("SELECT max(id) FROM saved_sql WHERE borrowernumber=? AND report_name=?", undef, + $borrowernumber, $name); + return $id; } sub update_sql { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl index eb8d4fb..705fd6a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl @@ -617,6 +617,9 @@ Sub report: - - + +

This hold is waiting

This hold () was placed by : , @@ -64,8 +66,9 @@ $.tablesorter.addParser({

- - + + +
  • Hold(s) waiting
  • @@ -118,6 +121,17 @@ $.tablesorter.addParser({

    Holds listed here have been awaiting pickup for more than days.

    +

    +

    + + " /> + and Transfer All" /> +
    + + Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds sypref) + +

    +
    @@ -153,13 +167,13 @@ $.tablesorter.addParser({ -
    Available since
    +
    No holds found.
- + -- 1.6.5 From chrisc at catalyst.net.nz Mon Apr 4 04:32:16 2011 From: chrisc at catalyst.net.nz (Chris Cormack) Date: Mon, 4 Apr 2011 14:32:16 +1200 Subject: [Koha-patches] [PATCH] Bug 5462 : More fixes for template toolkit, should have no visible difference Message-ID: <1301884336-20867-1-git-send-email-chrisc@catalyst.net.nz> --- .../opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl | 20 ++++++++++---------- opac/opac-MARCdetail.pl | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl index 5c50d64..f18800b 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl @@ -78,7 +78,7 @@ $(document).ready(function(){
- + @@ -87,7 +87,7 @@ $(document).ready(function(){ - + @@ -97,7 +97,7 @@ $(document).ready(function(){ - + @@ -107,7 +107,7 @@ $(document).ready(function(){ - + @@ -117,7 +117,7 @@ $(document).ready(function(){ - + @@ -127,7 +127,7 @@ $(document).ready(function(){ - + @@ -137,7 +137,7 @@ $(document).ready(function(){ - + @@ -147,7 +147,7 @@ $(document).ready(function(){ - + @@ -157,7 +157,7 @@ $(document).ready(function(){ - + @@ -167,7 +167,7 @@ $(document).ready(function(){ - + diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl index a5c9789..8e492aa 100755 --- a/opac/opac-MARCdetail.pl +++ b/opac/opac-MARCdetail.pl @@ -194,7 +194,7 @@ for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) { undef @subfields_data; } } - $template->param( $tabloop . "XX" => \@loop_data ); + $template->param( "tab" . $tabloop . "XX" => \@loop_data ); } -- 1.5.6.5 From chrisc at catalyst.net.nz Mon Apr 4 05:09:43 2011 From: chrisc at catalyst.net.nz (Chris Cormack) Date: Mon, 4 Apr 2011 15:09:43 +1200 Subject: [Koha-patches] [PATCH] Bug 6040 : Adding some error handling to the opac export Message-ID: <1301886583-2034-1-git-send-email-chrisc@catalyst.net.nz> --- opac/opac-export.pl | 44 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 37 insertions(+), 7 deletions(-) diff --git a/opac/opac-export.pl b/opac/opac-export.pl index 4c53aff..f9d3c25 100755 --- a/opac/opac-export.pl +++ b/opac/opac-export.pl @@ -1,5 +1,24 @@ #!/usr/bin/perl -use HTML::Template::Pro; + +# Parts Copyright Catalyst IT 2011 +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, +# Suite 330, Boston, MA 02111-1307 USA +# + + use strict; use warnings; @@ -22,6 +41,7 @@ if ($op eq "export") { $sth=$dbh->prepare("SELECT marc FROM biblioitems WHERE biblionumber =?"); $sth->execute($biblionumber); } + my $error; while (my ($marc) = $sth->fetchrow) { if ($marc){ @@ -41,21 +61,31 @@ if ($op eq "export") { elsif ($format =~ /bibtex/) { $marc = marc2bibtex(C4::Biblio::GetMarcBiblio($biblionumber),$biblionumber); }elsif ($format =~ /dc/) { - my $error; - ($error,$marc) = marc2dcxml($marc,1); + ($error,$marc) = marc2dcxml($marc,1); $format = "dublin-core.xml"; } elsif ($format =~ /marc8/) { - $marc = changeEncoding($marc,"MARC","MARC21","MARC-8"); - $marc = $marc->as_usmarc(); + ($error,$marc) = changeEncoding($marc,"MARC","MARC21","MARC-8"); + if (! $error){ + $marc = $marc->as_usmarc(); + } } elsif ($format =~ /utf8/) { #default } - print $query->header( + if ($error){ + print $query->header(); + print $query->start_html(); + print "

An error occured

"; + print $error; + print $query->end_html(); + } + else { + print $query->header( -type => 'application/octet-stream', -attachment=>"bib-$biblionumber.$format"); - print $marc; + print $marc; + } } } } -- 1.5.6.5 From chrisc at catalyst.net.nz Mon Apr 4 05:59:20 2011 From: chrisc at catalyst.net.nz (Chris Cormack) Date: Mon, 4 Apr 2011 15:59:20 +1200 Subject: [Koha-patches] [PATCH] Bug 5462 : Fixing more spaces in variable names Message-ID: <1301889560-20879-1-git-send-email-chrisc@catalyst.net.nz> --- .../opac-tmpl/prog/en/modules/opac-messaging.tmpl | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tmpl index c585936..35c2417 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tmpl @@ -39,12 +39,12 @@ - + @@ -260,20 +261,22 @@ - + + - - + + - - + + + @@ -303,6 +308,7 @@
Publisher : + @@ -351,3 +357,4 @@ + -- 1.7.1 From Katrin.Fischer.83 at web.de Mon Apr 4 11:44:06 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Mon, 4 Apr 2011 11:44:06 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5963 : Add the ability to filter budgets using the active column Message-ID: <1301910246-28547-1-git-send-email-Katrin.Fischer.83@web.de> From: Christophe Croullebois (MT #4717) Add the capability to have a filter by active budget the sub GetBudgetHierarchy return aqbudgetperiods.budget_period_active to have acces to a new filtering way, more the neworderempty.pl page have a check box "shox all". Signed-off-by: Katrin Fischer Bug 5963: Modify GetBudgetsHierarchy to returns all funds GetBudgetHierarchy now returns all funds, not only those that are part of an active budget. Fixed a layout problem. Signed-off-by: Katrin Fischer --- C4/Budgets.pm | 16 +++---- acqui/neworderempty.pl | 1 + .../prog/en/modules/acqui/neworderempty.tmpl | 40 +++++++++++++++++++- 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/C4/Budgets.pm b/C4/Budgets.pm index 0882756..d80a820 100644 --- a/C4/Budgets.pm +++ b/C4/Budgets.pm @@ -487,17 +487,15 @@ sub ModBudgetPeriod { # ------------------------------------------------------------------- sub GetBudgetHierarchy { - my ($budget_period_id, $branchcode, $owner) = @_; - my @bind_params; - my $dbh = C4::Context->dbh; - my $query = qq| - SELECT aqbudgets.* + my ( $budget_period_id, $branchcode, $owner ) = @_; + my @bind_params; + my $dbh = C4::Context->dbh; + my $query = qq| + SELECT aqbudgets.*, aqbudgetperiods.budget_period_active FROM aqbudgets - LEFT JOIN aqbudgetperiods - ON aqbudgetperiods.budget_period_id=aqbudgets.budget_period_id |; + JOIN aqbudgetperiods USING (budget_period_id)|; + my @where_strings; - # Pick out the active ones - push @where_strings, 'aqbudgetperiods.budget_period_active=1'; # show only period X if requested if ($budget_period_id) { push @where_strings," aqbudgets.budget_period_id = ?"; diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl index 0ba7180..e6ceccc 100755 --- a/acqui/neworderempty.pl +++ b/acqui/neworderempty.pl @@ -263,6 +263,7 @@ foreach my $r (@{$budgets}) { push @{$budget_loop}, { b_id => $r->{budget_id}, b_txt => $r->{budget_name}, + b_active => $r->{budget_period_active}, b_sel => ( $r->{budget_id} == $budget_id ) ? 1 : 0, }; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl index 76f5a3f..fb57ff1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl @@ -64,7 +64,39 @@ ff.submit(); } - +$(document).ready(function() + { + //We apply the fonction only for modify option + + $('#quantity').blur(function() + { + // if user decreases the quantity + if($(this).val() < ) + { + alert("You have deleted item(s) in the order, don't forget to delete it(them) in the catalog"); + return true; + } + else + { + // if user increases the quantity + alert("You can't add a new item, please create a new order line"); + // and we replace the original value + $(this).val() + return false; + } + }); + + + $('#showallbudgets').click(function() { + if ( $('#budget_id .b_inactive').is(":visible") ) + { + $('#budget_id .b_inactive').hide(); + } + else { + $('#budget_id .b_inactive').show(); + } + }); + }); //]]> @@ -273,10 +305,14 @@ ff.submit(); - + + + + +
  • -- 1.7.1 From paul.poulain at biblibre.com Mon Apr 4 11:51:21 2011 From: paul.poulain at biblibre.com (paul.poulain at biblibre.com) Date: Mon, 4 Apr 2011 11:51:21 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Adding a javascript function to check the validation of a record with a budget. Message-ID: <1301910681-28488-1-git-send-email-paul.poulain@biblibre.com> From: koha-preprod Signed-off-by: Paul Poulain --- .../prog/en/modules/acqui/neworderempty.tmpl | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl index 76f5a3f..410ddd2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl @@ -18,6 +18,11 @@ function Check(ff) { ok=1; _alertString += "\n- " + _("Title cannot be empty"); } + + if(isNull(ff.budget_id,1)){ + ok=1; + _alertString += "\n- "+ _("You must select a budget"); + } if (!(isNum(ff.quantity,0))){ ok=1; -- 1.7.1 From paul.poulain at biblibre.com Mon Apr 4 12:25:55 2011 From: paul.poulain at biblibre.com (paul.poulain at biblibre.com) Date: Mon, 4 Apr 2011 12:25:55 +0200 Subject: [Koha-patches] [PATCH][SIGNED-OFF] Fix for Bug 5989 - Funds filter does not remember library choice Message-ID: <1301912755-29757-1-git-send-email-paul.poulain@biblibre.com> From: Owen Leonard Signed-off-by: Paul Poulain --- admin/aqbudgets.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl index d266727..ed8d294 100755 --- a/admin/aqbudgets.pl +++ b/admin/aqbudgets.pl @@ -75,9 +75,9 @@ my $budget_hash = $input->Vars; my $budget_id = $$budget_hash{budget_id}; my $budget_permission = $input->param('budget_permission'); my $budget_period_dropbox = $input->param('budget_period_dropbox'); +my $filter_budgetbranch = $input->param('filter_budgetbranch'); #filtering non budget keys delete $$budget_hash{$_} foreach grep {/filter|^op$|show/} keys %$budget_hash; -my $filter_budgetbranch = $input->param('filter_budgetbranch'); my $filter_budgetname = $input->param('filter_budgetname'); $template->param( notree => ($filter_budgetbranch or $show_mine) -- 1.7.1 From Katrin.Fischer.83 at web.de Mon Apr 4 12:29:36 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Mon, 4 Apr 2011 12:29:36 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5949 : Popup alert when deleting items from basket, also change planning value to statistics Message-ID: <1301912976-21615-1-git-send-email-Katrin.Fischer.83@web.de> From: Christophe Croullebois (MT #2391) : acqui/neworderempty.pl Multiple fixes in neworderempty.pl, mainly about Modify order line page, link to edit catalog, user can delete items with popup information and can't add items also with popup explanation. Signed-off-by: Katrin Fischer - changed the the link from 'Edit Catalog' to 'Edit record' (like on result list) - changed position of 'Edit record' to be shown behind the label 'Catalog details' instead of showing behind the Title. --- .../prog/en/modules/acqui/neworderempty.tmpl | 38 ++++++++++++++++---- 1 files changed, 31 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl index 76f5a3f..9c16a71 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl @@ -63,8 +63,29 @@ if (ok) { ff.submit(); } - - +$(document).ready(function() + { + //We apply the fonction only for modify option + + $('#quantity').blur(function() + { + // if user decreases the quantity + if($(this).val() < ) + { + alert("You have deleted item(s) in the order, don't forget to delete it(them) in the catalog"); + return true; + } + else + { + // if user increases the quantity + alert("You can't add a new item, please create a new order line"); + // and we replace the original value + $(this).val() + return false; + } + }); + + }); //]]> @@ -83,7 +104,7 @@ ff.submit();

    - Modify order details (line #) + Modify order line New order @@ -132,7 +153,10 @@ ff.submit();
    - Catalog details + + Catalog details + "> Edit record + @@ -361,10 +385,10 @@ ff.submit();

  • - +
  • The 2 following fields are available for your own usage. They can be useful for statistical purposes
    - + @@ -374,7 +398,7 @@ ff.submit();
  • - + -- 1.7.1 From M.de.Rooy at rijksmuseum.nl Mon Apr 4 12:38:42 2011 From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy) Date: Mon, 4 Apr 2011 10:38:42 +0000 Subject: [Koha-patches] [PATCH] Follow up fix for 5839 (items stocknumber) Message-ID: <809BE39CD64BFD4EB9036172EBCCFA3123FD46@S-MAIL-1B.rijksmuseum.intra> New installer file for norway was not yet included. Tested with mysql. --- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/installer/data/mysql/nb-NO/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/mysql/nb-NO/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql index 5b4fa11..8ab9400 100644 --- a/installer/data/mysql/nb-NO/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql +++ b/installer/data/mysql/nb-NO/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql @@ -121,6 +121,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian` ('952', 'f', 'Coded location qualifier', 'Coded location qualifier', 0, 0, 'items.coded_location_qualifier', 10, '', '', '', NULL, 0, '', '', '', NULL), ('952', 'g', 'Cost, normal purchase price', 'Cost, normal purchase price', 0, 0, 'items.price', 10, '', '', '', 0, 0, '', '', '', NULL), ('952', 'h', 'Serial Enumeration / chronology','Serial Enumeration / chronology', 0, 0, 'items.enumchron', 10, '', '', '', 0, 0, '', '', '', NULL), + ('952', 'i', 'Inventory number','Inventory number', 0, 0, 'items.stocknumber', 10, '', '', '', 0, 0, '', '', '', NULL), ('952', 'j', 'Shelving control number', 'Shelving control number', 0, 0, 'items.stack', 10, 'STACK', '', '', NULL, -1, '', '', '', NULL), ('952', 'l', 'Total Checkouts', 'Total Checkouts', 0, 0, 'items.issues', 10, '', '', '', NULL, -5, '', '', '', NULL), ('952', 'm', 'Total Renewals', 'Total Renewals', 0, 0, 'items.renewals', 10, '', '', '', NULL, -5, '', '', '', NULL), -- 1.6.0.6 From M.de.Rooy at rijksmuseum.nl Mon Apr 4 13:20:20 2011 From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy) Date: Mon, 4 Apr 2011 11:20:20 +0000 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5860: Adding duplicate stocknumber fails silently Message-ID: <809BE39CD64BFD4EB9036172EBCCFA3123FD9F@S-MAIL-1B.rijksmuseum.intra> From: Katrin Fischer When adding a duplicate stocknumber the duplicate was not saved to the database. This happened, because the field stocknumber in table items was declared to be unique. Discussion on bug suggests to lift this restriction. Signed-off-by: Marcel de Rooy Tested. Corrected typo in updatedatabase script. Version 3.01.00.095 introduced the index with double s, although structure had only one s in index name. Unaware of this bug, I entered the more general bug 6041 for similar problems with modifying items. --- installer/data/mysql/kohastructure.sql | 2 +- installer/data/mysql/updatedatabase.pl | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index e0bea81..7a41617 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -1023,7 +1023,7 @@ CREATE TABLE `items` ( `stocknumber` varchar(32) default NULL, PRIMARY KEY (`itemnumber`), UNIQUE KEY `itembarcodeidx` (`barcode`), - UNIQUE KEY `itemstocknumberidx` (`stocknumber`), + KEY `itemstocknumberidx` (`stocknumber`), KEY `itembinoidx` (`biblioitemnumber`), KEY `itembibnoidx` (`biblionumber`), KEY `homebranch` (`homebranch`), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 5c71849..f60e6df 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -4209,6 +4209,14 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } +$DBversion = '3.03.00.XXX'; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("ALTER TABLE `items` DROP INDEX `itemsstocknumberidx`;"); + $dbh->do("ALTER TABLE items ADD INDEX itemstocknumberidx (stocknumber);"); + print "Upgrade to $DBversion done (Change items.stocknumber to be not unique)\n"; + SetVersion ($DBversion); +} + =head1 FUNCTIONS =head2 DropAllForeignKeys($table) -- 1.6.0.6 From alex.arnaud at biblibre.com Mon Apr 4 13:59:11 2011 From: alex.arnaud at biblibre.com (Alex Arnaud) Date: Mon, 4 Apr 2011 13:59:11 +0200 Subject: [Koha-patches] [PATCH] Bug #6042 SIP : Format dates as should be in Koha Message-ID: <1301918351-22714-1-git-send-email-alex.arnaud@biblibre.com> --- C4/SIP/Sip/MsgType.pm | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/C4/SIP/Sip/MsgType.pm b/C4/SIP/Sip/MsgType.pm index 508a06b..9675278 100644 --- a/C4/SIP/Sip/MsgType.pm +++ b/C4/SIP/Sip/MsgType.pm @@ -18,6 +18,7 @@ use Sip::Checksum qw(verify_cksum); use Data::Dumper; use CGI; use C4::Auth qw(&check_api_auth); +use C4::Dates; use UNIVERSAL qw(can); # make sure this is *after* C4 modules. @@ -545,7 +546,7 @@ sub handle_checkout { $resp .= add_field(FID_ITEM_ID, $item_id); $resp .= add_field(FID_TITLE_ID, $item->title_id); if ($item->due_date) { - $resp .= add_field(FID_DUE_DATE, Sip::timestamp($item->due_date)); + $resp .= add_field( FID_DUE_DATE, C4::Dates->new($item->due_date,'iso' )->output() ); } else { $resp .= add_field(FID_DUE_DATE, q{}); } @@ -988,7 +989,7 @@ sub handle_patron_info { # SIP 2.0 extensions used by Envisionware # Other terminals will ignore unrecognized fields (unrecognized field identifiers) - $resp .= maybe_add(FID_PATRON_BIRTHDATE, $patron->birthdate); + $resp .= maybe_add( FID_PATRON_BIRTHDATE, C4::Dates->new($patron->birthdate,'iso')->output() ); $resp .= maybe_add(FID_PATRON_CLASS, $patron->ptype); # Custom protocol extension to report patron internet privileges @@ -1128,13 +1129,13 @@ sub handle_item_information { $resp .= add_field(FID_HOLD_QUEUE_LEN, $i); } if ($item->due_date) { - $resp .= add_field(FID_DUE_DATE, Sip::timestamp($item->due_date)); + $resp .= add_field( FID_DUE_DATE, C4::Dates->new($item->due_date,'iso' )->output() ); } if (($i = $item->recall_date) != 0) { - $resp .= add_field(FID_RECALL_DATE, Sip::timestamp($i)); + $resp .= add_field( FID_RECALL_DATE, C4::Dates->new($i,'iso' )->output() ); } if (($i = $item->hold_pickup_date) != 0) { - $resp .= add_field(FID_HOLD_PICKUP_DATE, Sip::timestamp($i)); + $resp .= add_field( FID_HOLD_PICKUP_DATE, C4::Dates->new($i,'iso' )->output() ); } $resp .= maybe_add(FID_SCREEN_MSG, $item->screen_msg); @@ -1360,7 +1361,7 @@ sub handle_renew { $resp .= add_field(FID_PATRON_ID, $patron->id); $resp .= add_field(FID_ITEM_ID, $item->id); $resp .= add_field(FID_TITLE_ID, $item->title_id); - $resp .= add_field(FID_DUE_DATE, Sip::timestamp($item->due_date)); + $resp .= add_field( FID_DUE_DATE, C4::Dates->new($item->due_date,'iso' )->output() ); if ($ils->supports('security inhibit')) { $resp .= add_field(FID_SECURITY_INHIBIT, $status->security_inhibit); -- 1.6.3.3 From paul.poulain at biblibre.com Mon Apr 4 13:59:33 2011 From: paul.poulain at biblibre.com (paul.poulain at biblibre.com) Date: Mon, 4 Apr 2011 13:59:33 +0200 Subject: [Koha-patches] [PATCH][SIGNED-OFF] Corrects an error when showing a suggestion linked to a deleted budget. Message-ID: <1301918373-740-1-git-send-email-paul.poulain@biblibre.com> From: Fr?d?rick Capovilla If a suggestion is associated to a budget that was deleted, an error was returned because we try to get the name of a budget that doesn't exist. With this fix, the page is shown without errors. Signed-off-by: Paul Poulain --- suggestion/suggestion.pl | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl index 44d65ed..cb8c5f9 100755 --- a/suggestion/suggestion.pl +++ b/suggestion/suggestion.pl @@ -184,7 +184,10 @@ if ($op=~/else/) { my $suggestions = &SearchSuggestion($suggestion_ref); foreach my $suggestion (@$suggestions){ - $suggestion->{budget_name}=GetBudget($suggestion->{budgetid})->{budget_name} if $suggestion->{budgetid}; + if($suggestion->{budgetid}) { + my $budget = GetBudget($suggestion->{budgetid}); + $suggestion->{budget_name}=$budget->{budget_name} if $budget; + } foreach my $date qw(suggesteddate manageddate accepteddate){ if ($suggestion->{$date} ne "0000-00-00" && $suggestion->{$date} ne "" ){ $suggestion->{$date}=format_date($suggestion->{$date}) ; -- 1.7.1 From matthias.meusburger at biblibre.com Mon Apr 4 14:25:26 2011 From: matthias.meusburger at biblibre.com (Matthias Meusburger) Date: Mon, 4 Apr 2011 14:25:26 +0200 Subject: [Koha-patches] [PATCH 1/2] [SIGNED-OFF] wr76595: barcode display Message-ID: <1301919927-989-1-git-send-email-matthias.meusburger@biblibre.com> From: Srdjan Jankovic Signed-off-by: Matthias Meusburger --- koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl | 6 +++++- opac/opac-user.pl | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl index 4f8ae07..5513f13 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl @@ -196,11 +196,12 @@ $.tablesorter.addParser({ ">
  •  Days in advanceSMSEmailDigests only?Do not notify
    Item DUE - Advance Notice - Upcoming Events - Hold Filled - Item Check-in - Item Checkout + Item Due + Advance Notice + Upcoming Events + Hold Filled + Item Check-in + Item Checkout Unknown @@ -345,7 +345,7 @@
  • - +
  • Order Line Summary View RecordQuantity Est cost Actual cost TOTAL
    SUBTOTAL  
      +   Shipping
    +

    HELP
    The total at the bottom of the page should be within a few cents of the total for the invoice. @@ -281,9 +284,11 @@

    Tax rate
    TOTAL  
    " title="MARC" rel="gb_page_center[600,500]">MARC | " title="MARC" rel="gb_page_center[600,500]">Card
    - + + @@ -241,6 +242,7 @@ $.tablesorter.addParser({ + @@ -292,6 +294,7 @@ $.tablesorter.addParser({ + @@ -323,6 +326,7 @@ $.tablesorter.addParser({ + diff --git a/opac/opac-user.pl b/opac/opac-user.pl index 5601e85..23de179 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -108,7 +108,7 @@ my @issuedat; my $itemtypes = GetItemTypes(); my ($issues) = GetPendingIssues($borrowernumber); if ($issues){ - foreach my $issue ( sort sort { $b->{'date_due'} cmp $a->{'date_due'} } @$issues ) { + foreach my $issue ( sort { $b->{'date_due'} cmp $a->{'date_due'} } @$issues ) { # check for reserves my ( $restype, $res ) = CheckReserves( $issue->{'itemnumber'} ); if ( $restype ) { @@ -228,7 +228,7 @@ foreach my $res (@reserves) { $res->{'wait'}= 1; $res->{'holdingbranch'}=$item->{'holdingbranch'}; $res->{'biblionumber'}=$item->{'biblionumber'}; - $res->{'barcodenumber'} = $item->{'barcode'}; + $res->{'barcode'} = $item->{'barcode'}; $res->{'wbrcode'} = $res->{'branchcode'}; $res->{'itemnumber'} = $res->{'itemnumber'}; $res->{'wbrname'} = $branches->{$res->{'branchcode'}}->{'branchname'}; -- 1.7.1 From matthias.meusburger at biblibre.com Mon Apr 4 14:25:27 2011 From: matthias.meusburger at biblibre.com (Matthias Meusburger) Date: Mon, 4 Apr 2011 14:25:27 +0200 Subject: [Koha-patches] [PATCH 2/2] [SIGNED-OFF] wr76595 (bug 4157): Control barcode display with a borrower attribute In-Reply-To: <1301919927-989-1-git-send-email-matthias.meusburger@biblibre.com> References: <1301919927-989-1-git-send-email-matthias.meusburger@biblibre.com> Message-ID: <1301919927-989-2-git-send-email-matthias.meusburger@biblibre.com> From: Srdjan Jankovic Signed-off-by: Matthias Meusburger --- C4/Members/AttributeTypes.pm | 18 ++++++++++++++- C4/Members/Attributes.pm | 24 +++++++++++++++++++- installer/data/mysql/en/mandatory/auth_values.sql | 2 + installer/data/mysql/en/mandatory/auth_values.txt | 1 + .../data/mysql/en/optional/patron_atributes.sql | 2 + .../data/mysql/en/optional/patron_atributes.txt | 2 + installer/data/mysql/updatedatabase.pl | 10 ++++++++ koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl | 8 +++--- opac/opac-user.pl | 11 +++++++++ 9 files changed, 72 insertions(+), 6 deletions(-) create mode 100644 installer/data/mysql/en/mandatory/auth_values.sql create mode 100644 installer/data/mysql/en/mandatory/auth_values.txt create mode 100644 installer/data/mysql/en/optional/patron_atributes.sql create mode 100644 installer/data/mysql/en/optional/patron_atributes.txt diff --git a/C4/Members/AttributeTypes.pm b/C4/Members/AttributeTypes.pm index 21d17eb..3a05268 100644 --- a/C4/Members/AttributeTypes.pm +++ b/C4/Members/AttributeTypes.pm @@ -69,7 +69,7 @@ If $all_fields is true, then each hashref also contains the other fields from bo =cut sub GetAttributeTypes { - my $all = @_ ? shift : 0; + my ($all) = @_; my $select = $all ? '*' : 'code, description'; my $dbh = C4::Context->dbh; my $sth = $dbh->prepare("SELECT $select FROM borrower_attribute_types ORDER by code"); @@ -83,6 +83,22 @@ sub GetAttributeTypes_hashref { return \%hash; } +=head2 AttributeTypeExists + + my $have_attr_xyz = C4::Members::AttributeTypes::AttributeTypeExists($code) + +Returns true if we have attribute type C<$code> +in the database. + +=cut + +sub AttributeTypeExists { + my ($code) = @_; + my $dbh = C4::Context->dbh; + my $exists = $dbh->selectrow_array("SELECT code FROM borrower_attribute_types WHERE code = ?", undef, $code); + return $exists; +} + =head1 METHODS my $attr_type = C4::Members::AttributeTypes->new($code, $description); diff --git a/C4/Members/Attributes.pm b/C4/Members/Attributes.pm index 1db9424..24c6f71 100644 --- a/C4/Members/Attributes.pm +++ b/C4/Members/Attributes.pm @@ -31,7 +31,7 @@ BEGIN { # set the version for version checking $VERSION = 3.01; @ISA = qw(Exporter); - @EXPORT_OK = qw(GetBorrowerAttributes CheckUniqueness SetBorrowerAttributes + @EXPORT_OK = qw(GetBorrowerAttributes GetBorrowerAttributeValue CheckUniqueness SetBorrowerAttributes extended_attributes_code_value_arrayref extended_attributes_merge SearchIdMatchingAttribute); %EXPORT_TAGS = ( all => \@EXPORT_OK ); @@ -94,6 +94,28 @@ sub GetBorrowerAttributes { return \@results; } +=head2 GetBorrowerAttributeValue + + my $value = C4::Members::Attributes::GetBorrowerAttributeValue($borrowernumber, $attribute_code); + +Retrieve the value of an extended attribute C<$attribute_code> associated with the +patron specified by C<$borrowernumber>. + +=cut + +sub GetBorrowerAttributeValue { + my $borrowernumber = shift; + my $code = shift; + + my $dbh = C4::Context->dbh(); + my $query = "SELECT attribute + FROM borrower_attributes + WHERE borrowernumber = ? + AND code = ?"; + my $value = $dbh->selectrow_array($query, undef, $borrowernumber, $code); + return $value; +} + =head2 SearchIdMatchingAttribute my $matching_records = C4::Members::Attributes::SearchIdMatchingAttribute($filter); diff --git a/installer/data/mysql/en/mandatory/auth_values.sql b/installer/data/mysql/en/mandatory/auth_values.sql new file mode 100644 index 0000000..d7fb280 --- /dev/null +++ b/installer/data/mysql/en/mandatory/auth_values.sql @@ -0,0 +1,2 @@ +INSERT INTO authorised_values (category,authorised_value,lib,lib_opac) VALUES ('YES_NO','0','No','No'); +INSERT INTO authorised_values (category,authorised_value,lib,lib_opac) VALUES ('YES_NO','1','Yes','Yes'); diff --git a/installer/data/mysql/en/mandatory/auth_values.txt b/installer/data/mysql/en/mandatory/auth_values.txt new file mode 100644 index 0000000..effc454 --- /dev/null +++ b/installer/data/mysql/en/mandatory/auth_values.txt @@ -0,0 +1 @@ +Default Koha system authorised values diff --git a/installer/data/mysql/en/optional/patron_atributes.sql b/installer/data/mysql/en/optional/patron_atributes.sql new file mode 100644 index 0000000..17d7b8a --- /dev/null +++ b/installer/data/mysql/en/optional/patron_atributes.sql @@ -0,0 +1,2 @@ +INSERT INTO `borrower_attribute_types` (`code`, `description`, `repeatable`, `unique_id`, `opac_display`, `password_allowed`, `staff_searchable`, `authorised_value_category`) +VALUES ('SHOW_BCODE', 'Show barcode on the summary screen items listings', 0, 0, 1, 0, 0, 'YES_NO'); diff --git a/installer/data/mysql/en/optional/patron_atributes.txt b/installer/data/mysql/en/optional/patron_atributes.txt new file mode 100644 index 0000000..50d91d1 --- /dev/null +++ b/installer/data/mysql/en/optional/patron_atributes.txt @@ -0,0 +1,2 @@ +Useful patron atribute types: +* SHOW_BCODE - Show barcode on the patron summary screen items listings diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 5c71849..bc55025 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -4209,6 +4209,16 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } +$DBversion = "3.03.00.XXX"; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + + $dbh->do("INSERT INTO authorised_values (category,authorised_value,lib,lib_opac) VALUES ('YES_NO','0','No','No')"); + $dbh->do("INSERT INTO authorised_values (category,authorised_value,lib,lib_opac) VALUES ('YES_NO','1','Yes','Yes')"); + + print "Upgrade to $DBversion done ( add generic boolean YES_NO authorised_values pair )\n"; + SetVersion ($DBversion); +} + =head1 FUNCTIONS =head2 DropAllForeignKeys($table) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl index 5513f13..08a33da 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl @@ -201,7 +201,7 @@ $.tablesorter.addParser({ - + @@ -242,7 +242,7 @@ $.tablesorter.addParser({ - + @@ -294,7 +294,7 @@ $.tablesorter.addParser({ - + @@ -326,7 +326,7 @@ $.tablesorter.addParser({ - + diff --git a/opac/opac-user.pl b/opac/opac-user.pl index 23de179..c16eaaf 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -27,6 +27,8 @@ use C4::Koha; use C4::Circulation; use C4::Reserves; use C4::Members; +use C4::Members::AttributeTypes; +use C4::Members::Attributes qw/GetBorrowerAttributeValue/; use C4::Output; use C4::Biblio; use C4::Items; @@ -34,6 +36,8 @@ use C4::Dates qw/format_date/; use C4::Letters; use C4::Branch; # GetBranches +use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE'; + my $query = new CGI; BEGIN { @@ -167,6 +171,13 @@ $template->param( issues_count => $count ); $template->param( OVERDUES => \@overdues ); $template->param( overdues_count => $overdues_count ); +my $show_barcode = C4::Members::AttributeTypes::AttributeTypeExists( ATTRIBUTE_SHOW_BARCODE ); +if ($show_barcode) { + my $patron_show_barcode = GetBorrowerAttributeValue($borrowernumber, ATTRIBUTE_SHOW_BARCODE); + undef $show_barcode if defined($patron_show_barcode) && !$patron_show_barcode; +} +$template->param( show_barcode => 1 ) if $show_barcode; + # load the branches my $branches = GetBranches(); my @branch_loop; -- 1.7.1 From Katrin.Fischer.83 at web.de Mon Apr 4 14:28:19 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Mon, 4 Apr 2011 14:28:19 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5962 : Budgets showing when they shouldn't (MT #4717) Bug in Koha 3.2 on acqui-home.pl Message-ID: <1301920099-25937-1-git-send-email-Katrin.Fischer.83@web.de> From: Christophe Croullebois In the screen all the budgets with budget_branchcode=NULL were displayed even if the budget_owner_id was not NULL. This patch fixes the bug Signed-off-by: Katrin Fischer To test: 1) Add a new fund, leave library empty, owned by yourself 2) Go into the database and change aqbudgets.budget_branchcode to be NULL 3) Check acq home. Before patch the fund will not show up, although it's owned by you. After patch it will. --- C4/Budgets.pm | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/C4/Budgets.pm b/C4/Budgets.pm index 0882756..9d3e94b 100644 --- a/C4/Budgets.pm +++ b/C4/Budgets.pm @@ -506,8 +506,9 @@ sub GetBudgetHierarchy { # show only budgets owned by me, my branch or everyone if ($owner) { if ($branchcode) { - push @where_strings,qq{ (budget_owner_id = ? OR budget_branchcode = ? OR (budget_branchcode IS NULL or budget_branchcode="" AND (budget_owner_id IS NULL OR budget_owner_id="")))}; - push @bind_params, ($owner, $branchcode); + push @where_strings, + qq{ (budget_owner_id = ? OR budget_branchcode = ? OR ((budget_branchcode IS NULL or budget_branchcode="") AND (budget_owner_id IS NULL OR budget_owner_id="")))}; + push @bind_params, ( $owner, $branchcode ); } else { push @where_strings, ' (budget_owner_id = ? OR budget_owner_id IS NULL or budget_owner_id ="") '; push @bind_params, $owner; -- 1.7.1 From claire.hernandez at biblibre.com Mon Apr 4 12:04:30 2011 From: claire.hernandez at biblibre.com (Claire Hernandez) Date: Mon, 4 Apr 2011 12:04:30 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 3628: opacSerialDefaultTab Message-ID: <1301911470-18896-1-git-send-email-claire.hernandez@biblibre.com> From: Marcel de Rooy This partial fix makes this existing pref visible in the interface. It should work for UNIMARC. Some work still needs to be done at the MARC side. Signed-off-by: Claire Hernandez --- .../prog/en/modules/admin/preferences/serials.pref | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref index fc20c55..58db404 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref @@ -1,5 +1,13 @@ Serials: - + - Show + - pref: opacSerialDefaultTab + choices: + holdings: Holdings tab + subscriptions: Subscriptions tab + serialcollection: Serial Collection tab + - as default tab for serials in OPAC. Please note that the Serial Collection tab is currently available only for UNIMARC. + - - pref: RenewSerialAddsSuggestion choices: yes: Add @@ -33,4 +41,4 @@ Serials: choices: simplified: a summary full: a full list - - of the serial issues. \ No newline at end of file + - of the serial issues. -- 1.7.1 From oleonard at myacpl.org Mon Apr 4 14:50:03 2011 From: oleonard at myacpl.org (Owen Leonard) Date: Mon, 4 Apr 2011 08:50:03 -0400 Subject: [Koha-patches] [PATCH] [Revised] Fix for Bug 5991 - Javascript error on purchase suggestion pages Message-ID: <1301921403-15257-1-git-send-email-oleonard@myacpl.org> Rebased on master 2011-04-04 --- koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 2 +- .../prog/en/modules/suggestion/suggestion.tmpl | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js index b5ec994..de9e92c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js @@ -695,7 +695,7 @@ function calcNewsuggTotal(){ var total = new Number(quantity*price*exchangerate); document.getElementById('total').value = total.toFixed(2); - document.getElementById('price').value = listprice.toFixed(2); + document.getElementById('price').value = price.toFixed(2); return true; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl index cf38b72..3d7817e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl @@ -4,7 +4,7 @@ - - + -- 1.7.3 From claire.hernandez at biblibre.com Mon Apr 4 15:02:57 2011 From: claire.hernandez at biblibre.com (Claire Hernandez) Date: Mon, 4 Apr 2011 15:02:57 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 3628: opacSerialDefaultTab Message-ID: <1301922177-2109-1-git-send-email-claire.hernandez@biblibre.com> From: Marcel de Rooy This partial fix makes this existing pref visible in the interface. It should work for UNIMARC. Some work still needs to be done at the MARC side. Signed-off-by: Claire Hernandez --- .../prog/en/modules/admin/preferences/serials.pref | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref index fc20c55..58db404 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref @@ -1,5 +1,13 @@ Serials: - + - Show + - pref: opacSerialDefaultTab + choices: + holdings: Holdings tab + subscriptions: Subscriptions tab + serialcollection: Serial Collection tab + - as default tab for serials in OPAC. Please note that the Serial Collection tab is currently available only for UNIMARC. + - - pref: RenewSerialAddsSuggestion choices: yes: Add @@ -33,4 +41,4 @@ Serials: choices: simplified: a summary full: a full list - - of the serial issues. \ No newline at end of file + - of the serial issues. -- 1.7.1 From paul.poulain at biblibre.com Mon Apr 4 15:14:48 2011 From: paul.poulain at biblibre.com (paul.poulain at biblibre.com) Date: Mon, 4 Apr 2011 15:14:48 +0200 Subject: [Koha-patches] [PATCH] Bug 6043: SQL error when IndependantBranches=ON on suggestion Message-ID: <1301922888-4307-1-git-send-email-paul.poulain@biblibre.com> From: Paul Poulain On suggestion page, when IndependantBranch=ON, the SQL built is wrong: branchcode is ambiguous --- C4/Suggestions.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm index 9cb2c18..779cc7c 100644 --- a/C4/Suggestions.pm +++ b/C4/Suggestions.pm @@ -127,7 +127,7 @@ sub SearchSuggestion { if ($userenv) { if (($userenv->{flags} % 2) != 1 && !$suggestion->{branchcode}){ push @sql_params,$$userenv{branch}; - push @query,q{ and (branchcode = ? or branchcode ='')}; + push @query,q{ and (suggestions.branchcode = ? or suggestions.branchcode ='')}; } } } -- 1.7.1 From Katrin.Fischer.83 at web.de Mon Apr 4 15:19:32 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Mon, 4 Apr 2011 15:19:32 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6043: SQL error when IndependantBranches=ON on suggestion Message-ID: <1301923172-23629-1-git-send-email-Katrin.Fischer.83@web.de> From: Paul Poulain On suggestion page, when IndependantBranch=ON, the SQL built is wrong: branchcode is ambiguous Signed-off-by: Katrin Fischer --- C4/Suggestions.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm index 9cb2c18..779cc7c 100644 --- a/C4/Suggestions.pm +++ b/C4/Suggestions.pm @@ -127,7 +127,7 @@ sub SearchSuggestion { if ($userenv) { if (($userenv->{flags} % 2) != 1 && !$suggestion->{branchcode}){ push @sql_params,$$userenv{branch}; - push @query,q{ and (branchcode = ? or branchcode ='')}; + push @query,q{ and (suggestions.branchcode = ? or suggestions.branchcode ='')}; } } } -- 1.7.1 From alex.arnaud at biblibre.com Mon Apr 4 15:28:11 2011 From: alex.arnaud at biblibre.com (Alex Arnaud) Date: Mon, 4 Apr 2011 15:28:11 +0200 Subject: [Koha-patches] [PATCH] Bug #6044 - Authority is deleted when mergeto and mergefrom are the same Message-ID: <1301923691-27973-1-git-send-email-alex.arnaud@biblibre.com> --- misc/migration_tools/merge_authority.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/misc/migration_tools/merge_authority.pl b/misc/migration_tools/merge_authority.pl index 0987827..b99591f 100755 --- a/misc/migration_tools/merge_authority.pl +++ b/misc/migration_tools/merge_authority.pl @@ -97,7 +97,7 @@ if ($batch) { my $MARCto = GetAuthority($mergeto); &merge($mergefrom,$MARCfrom,$mergeto,$MARCto); #Could add mergefrom authority to mergeto rejected forms before deletion - DelAuthority($mergefrom); + DelAuthority($mergefrom) if ($mergefrom != $mergeto); } my $timeneeded = gettimeofday - $starttime; print "Done in $timeneeded seconds" unless $noconfirm; -- 1.6.3.3 From paul.poulain at biblibre.com Mon Apr 4 15:44:00 2011 From: paul.poulain at biblibre.com (paul.poulain at biblibre.com) Date: Mon, 4 Apr 2011 15:44:00 +0200 Subject: [Koha-patches] [PATCH] Bug 6045: suggestedby list on she filter was not created properly Message-ID: <1301924640-5385-1-git-send-email-paul.poulain@biblibre.com> From: Paul Poulain The suggestedby patron list contained empty lines. This was because retrieving patron name was not correct --- suggestion/suggestion.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl index cb8c5f9..2b4e3d9 100755 --- a/suggestion/suggestion.pl +++ b/suggestion/suggestion.pl @@ -56,7 +56,7 @@ sub GetCriteriumDesc{ return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i); return (GetBranchName($criteriumvalue)) if ($displayby =~/branchcode/); return (GetSupportName($criteriumvalue)) if ($displayby =~/itemtype/); - if ($displayby =~/managedby/||$displayby =~/acceptedby/){ + if ($displayby =~/suggestedby/||$displayby =~/managedby/||$displayby =~/acceptedby/){ my $borr=C4::Members::GetMember(borrowernumber=>$criteriumvalue); return "" unless $borr; return $$borr{firstname} . ", " . $$borr{surname}; -- 1.7.1 From paul.poulain at biblibre.com Mon Apr 4 15:45:53 2011 From: paul.poulain at biblibre.com (paul.poulain at biblibre.com) Date: Mon, 4 Apr 2011 15:45:53 +0200 Subject: [Koha-patches] [PATCH] Bug 6046: suggestedby list on she filter was not created properly Message-ID: <1301924753-5579-1-git-send-email-paul.poulain@biblibre.com> From: Paul Poulain The suggestedby patron list contained empty lines. This was because retrieving patron name was not correct --- suggestion/suggestion.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl index cb8c5f9..2b4e3d9 100755 --- a/suggestion/suggestion.pl +++ b/suggestion/suggestion.pl @@ -56,7 +56,7 @@ sub GetCriteriumDesc{ return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i); return (GetBranchName($criteriumvalue)) if ($displayby =~/branchcode/); return (GetSupportName($criteriumvalue)) if ($displayby =~/itemtype/); - if ($displayby =~/managedby/||$displayby =~/acceptedby/){ + if ($displayby =~/suggestedby/||$displayby =~/managedby/||$displayby =~/acceptedby/){ my $borr=C4::Members::GetMember(borrowernumber=>$criteriumvalue); return "" unless $borr; return $$borr{firstname} . ", " . $$borr{surname}; -- 1.7.1 From Katrin.Fischer.83 at web.de Mon Apr 4 15:53:19 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Mon, 4 Apr 2011 15:53:19 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6046: suggestedby list on she filter was not created properly Message-ID: <1301925199-10396-1-git-send-email-Katrin.Fischer.83@web.de> From: Paul Poulain The suggestedby patron list contained empty lines. This was because retrieving patron name was not correct Signed-off-by: Katrin Fischer --- suggestion/suggestion.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl index 44d65ed..9b1fa91 100755 --- a/suggestion/suggestion.pl +++ b/suggestion/suggestion.pl @@ -56,7 +56,7 @@ sub GetCriteriumDesc{ return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i); return (GetBranchName($criteriumvalue)) if ($displayby =~/branchcode/); return (GetSupportName($criteriumvalue)) if ($displayby =~/itemtype/); - if ($displayby =~/managedby/||$displayby =~/acceptedby/){ + if ($displayby =~/suggestedby/||$displayby =~/managedby/||$displayby =~/acceptedby/){ my $borr=C4::Members::GetMember(borrowernumber=>$criteriumvalue); return "" unless $borr; return $$borr{firstname} . ", " . $$borr{surname}; -- 1.7.1 From magnus at enger.priv.no Mon Apr 4 17:09:52 2011 From: magnus at enger.priv.no (Magnus Enger) Date: Mon, 4 Apr 2011 15:09:52 +0000 Subject: [Koha-patches] [PATCH] Bug 5671 Revised Patch #2 - Add a column of custom HTML to my summary Message-ID: <1301929792-14818-1-git-send-email-magnus@enger.priv.no> Fix JS error in /koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl --- installer/data/mysql/de-DE/mandatory/sysprefs.sql | 1 + installer/data/mysql/en/mandatory/sysprefs.sql | 1 + .../1-Obligatoire/unimarc_standard_systemprefs.sql | 1 + installer/data/mysql/it-IT/necessari/sysprefs.sql | 1 + installer/data/mysql/pl-PL/mandatory/sysprefs.sql | 1 + ...m_preferences_full_optimal_for_install_only.sql | 1 + ...m_preferences_full_optimal_for_install_only.sql | 1 + .../prog/en/modules/admin/preferences/opac.pref | 6 ++++++ koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl | 14 ++++++++++---- opac/opac-user.pl | 18 +++++++++++++++--- 10 files changed, 38 insertions(+), 7 deletions(-) diff --git a/installer/data/mysql/de-DE/mandatory/sysprefs.sql b/installer/data/mysql/de-DE/mandatory/sysprefs.sql index 8a909c8..a38a08b 100755 --- a/installer/data/mysql/de-DE/mandatory/sysprefs.sql +++ b/installer/data/mysql/de-DE/mandatory/sysprefs.sql @@ -266,6 +266,7 @@ INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanatio INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanation` , `type` ) VALUES ( 'DisplayClearScreenButton', '0', '', 'If set to ON, a clear screen button will appear on the circulation page.', 'YesNo'); INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('HidePatronName', '0', '', 'If this is switched on, patron''s cardnumber will be shown instead of their name on the holds and catalog screens', 'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACSearchForTitleIn','
  • Other Libraries (WorldCat)
  • \n
  • Other Databases (Google Scholar)
  • \n
  • Online Stores (Bookfinder.com)
  • ','Enter the HTML that will appear in the \'Search for this title in\' box on the detail page in the OPAC. Enter {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the URL. Leave blank to disable \'More Searches\' menu.','70|10','Textarea'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACMySummaryHTML','','Enter the HTML that will appear in a column on the \'my profile\' tab when a user is logged in to the OPAC. Enter {BIBLIONUMBER}, {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the HTML. Leave blank to disable.','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACPatronDetails','1','If OFF the patron details tab in the OPAC is disabled.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACFinesTab','1','If OFF the patron fines tab in the OPAC is disabled.','','YesNo'); INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('DisplayOPACiconsXSLT', '1', '', 'If ON, displays the format, audience, type icons in XSLT MARC21 results and display pages.', 'YesNo'); diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql index 3ce2c18..e4e9d8b 100755 --- a/installer/data/mysql/en/mandatory/sysprefs.sql +++ b/installer/data/mysql/en/mandatory/sysprefs.sql @@ -268,6 +268,7 @@ INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanatio INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanation` , `type` ) VALUES ( 'DisplayClearScreenButton', '0', '', 'If set to ON, a clear screen button will appear on the circulation page.', 'YesNo'); INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('HidePatronName', '0', '', 'If this is switched on, patron''s cardnumber will be shown instead of their name on the holds and catalog screens', 'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACSearchForTitleIn','
  • Other Libraries (WorldCat)
  • \n
  • Other Databases (Google Scholar)
  • \n
  • Online Stores (Bookfinder.com)
  • ','Enter the HTML that will appear in the \'Search for this title in\' box on the detail page in the OPAC. Enter {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the URL. Leave blank to disable \'More Searches\' menu.','70|10','Textarea'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACMySummaryHTML ','','Enter the HTML that will appear in a column on the \'my profile\' tab when a user is logged in to the OPAC. Enter {BIBLIONUMBER}, {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the HTML. Leave blank to disable.','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACPatronDetails','1','If OFF the patron details tab in the OPAC is disabled.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACFinesTab','1','If OFF the patron fines tab in the OPAC is disabled.','','YesNo'); INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('DisplayOPACiconsXSLT', '1', '', 'If ON, displays the format, audience, type icons in XSLT MARC21 results and display pages.', 'YesNo'); diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql index 2773a72..5acff4b 100755 --- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql @@ -259,6 +259,7 @@ INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanatio INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanation` , `type` ) VALUES ( 'ReturnToShelvingCart', '0', '', 'Si d?fini, quand un exemplaire est renvoy? son code sera modifi? pour CART.', 'YesNo'); INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('HidePatronName', '0', '', 'Active l''affichage du num?ro des adh?rents ? la place de leur nom dans les pages de r?servation et du catalogue.', 'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACSearchForTitleIn','
  • Other Libraries (WorldCat)
  • \n
  • Other Databases (Google Scholar)
  • \n
  • Online Stores (Bookfinder.com)
  • ','Entrer le HTML ? mettre dans la section Rechercher ce titre dans Sur les notices d?taill?es ? l''OPAC. Entrer {TITLE}, {AUTHOR}, or {ISBN} pour les utiliser dans les URL. Vider pour d?sactiver le bloc \'Plus de Recherches\'.','70|10','Textarea'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACMySummaryHTML','','Enter the HTML that will appear in a column on the \'my profile\' tab when a user is logged in to the OPAC. Enter {BIBLIONUMBER}, {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the HTML. Leave blank to disable.','70|10','Textarea'); INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('DisplayOPACiconsXSLT', '1', '', 'Si activ?, affiche le format, le type de public et les ic?nes de type en XSLT (MARC21)).', 'YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowAllMessageDeletion','0','Autorise la biblioth?que ? supprimer n''importe quel message','','YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type)VALUES('ShowPatronImageInWebBasedSelfCheck', '0', 'Si activ?, affiche la photo de l''adh?rent lors de l''utilisation de la console de pr?t auto-contr?l?', '', 'YesNo'); diff --git a/installer/data/mysql/it-IT/necessari/sysprefs.sql b/installer/data/mysql/it-IT/necessari/sysprefs.sql index 5915497..b9572df 100755 --- a/installer/data/mysql/it-IT/necessari/sysprefs.sql +++ b/installer/data/mysql/it-IT/necessari/sysprefs.sql @@ -260,6 +260,7 @@ INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACFineNoRenewals','100','Fine limit above which user cannot renew books via OPAC','','Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACFinesTab','1','If OFF the patron fines tab in the OPAC is disabled.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACSearchForTitleIn','
  • Other Libraries (WorldCat)
  • \n
  • Other Databases (Google Scholar)
  • \n
  • Online Stores (Bookfinder.com)
  • ','Enter the HTML that will appear in the \'Search for this title in\' box on the detail page in the OPAC. Enter {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the URL. Leave blank to disable \'More Searches\' menu.','70|10','Textarea'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACMySummaryHTML','','Enter the HTML that will appear in a column on the \'my profile\' tab when a user is logged in to the OPAC. Enter {BIBLIONUMBER}, {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the HTML. Leave blank to disable.','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('RoutingListAddReserves','1','If ON the patrons on routing lists are automatically added to holds on the issue.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacSerialDefaultTab', 'subscriptions', 'Define the default tab for serials in OPAC.', 'holdings|serialcollection|subscriptions', 'Choice'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACShowCheckoutName','0','Displays in the OPAC the name of patron who has checked out the material. WARNING: Most sites should leave this off. It is intended for corporate or special sites which need to track who has the item.','','YesNo'); diff --git a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql index f09ed54..29f9210 100755 --- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql +++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql @@ -262,6 +262,7 @@ INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanatio INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanation` , `type` ) VALUES ( 'DisplayClearScreenButton', '0', '', 'If set to ON, a clear screen button will appear on the circulation page.', 'YesNo'); INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('HidePatronName', '0', '', 'If this is switched on, patron''s cardnumber will be shown instead of their name on the holds and catalog screens', 'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACSearchForTitleIn','
  • Other Libraries (WorldCat)
  • \n
  • Other Databases (Google Scholar)
  • \n
  • Online Stores (Bookfinder.com)
  • ','Enter the HTML that will appear in the \'Search for this title in\' box on the detail page in the OPAC. Enter {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the URL. Leave blank to disable \'More Searches\' menu.','70|10','Textarea'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACMySummaryHTML','','Enter the HTML that will appear in a column on the \'my profile\' tab when a user is logged in to the OPAC. Enter {BIBLIONUMBER}, {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the HTML. Leave blank to disable.','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACPatronDetails','1','If OFF the patron details tab in the OPAC is disabled.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACFinesTab','1','If OFF the patron fines tab in the OPAC is disabled.','','YesNo'); INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('DisplayOPACiconsXSLT', '1', '', 'If ON, displays the format, audience, type icons in XSLT MARC21 results and display pages.', 'YesNo'); diff --git a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql index 3cb5d8f..11e97fd 100755 --- a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql +++ b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql @@ -321,6 +321,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OverdueNoticeBcc','','Email address to bcc outgoing overdue notices sent by email','','free'); INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('HidePatronName', '0', '', 'If this is switched on, patron''s cardnumber will be shown instead of their name on the holds and catalog screens', 'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACSearchForTitleIn','
  • Other Libraries (WorldCat)
  • \n
  • Other Databases (Google Scholar)
  • \n
  • Online Stores (Bookfinder.com)
  • ','Enter the HTML that will appear in the \'Search for this title in\' box on the detail page in the OPAC. Enter {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the URL. Leave blank to disable \'More Searches\' menu.','70|10','Textarea'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACMySummaryHTML','','Enter the HTML that will appear in a column on the \'my profile\' tab when a user is logged in to the OPAC. Enter {BIBLIONUMBER}, {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the HTML. Leave blank to disable.','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACPatronDetails','1','If OFF the patron details tab in the OPAC is disabled.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACFinesTab','1','If OFF the patron fines tab in the OPAC is disabled.','','YesNo'); INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('DisplayOPACiconsXSLT', '1', '', 'If ON, displays the format, audience, type icons in XSLT MARC21 results and display pages.', 'YesNo'); diff --git a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql index bfdd00e..b7f4e2b 100755 --- a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql +++ b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql @@ -346,6 +346,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OverdueNoticeBcc','','Email address to bcc outgoing overdue notices sent by email','','free'); INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('HidePatronName', '0', '', 'If this is switched on, patron''s cardnumber will be shown instead of their name on the holds and catalog screens', 'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACSearchForTitleIn','
  • Other Libraries (WorldCat)
  • \n
  • Other Databases (Google Scholar)
  • \n
  • Online Stores (Bookfinder.com)
  • ','Enter the HTML that will appear in the \'Search for this title in\' box on the detail page in the OPAC. Enter {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the URL. Leave blank to disable \'More Searches\' menu.','70|10','Textarea'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACMySummaryHTML','','Enter the HTML that will appear in a column on the \'my profile\' tab when a user is logged in to the OPAC. Enter {BIBLIONUMBER}, {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the HTML. Leave blank to disable.','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACPatronDetails','1','If OFF the patron details tab in the OPAC is disabled.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACFinesTab','1','If OFF the patron fines tab in the OPAC is disabled.','','YesNo'); INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('DisplayOPACiconsXSLT', '1', '', 'If ON, displays the format, audience, type icons in XSLT MARC21 results and display pages.', 'YesNo'); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index 83b6133..b06664b 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -159,6 +159,12 @@ OPAC: type: textarea class: code - + - 'Include a "Links" column on the "my summary" tab when a user is logged in to the OPAC, with the following HTML (leave blank to disable):' + - '
    Note: The placeholders {BIBLIONUMBER}, {TITLE}, {ISBN} and {AUTHOR} will be replaced with information from the displayed record.' + - pref: OPACMySummaryHTML + type: textarea + class: code + - - pref: OpacAddMastheadLibraryPulldown choices: yes: Add diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl index 4f8ae07..872c0b7 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl @@ -29,17 +29,17 @@ $.tablesorter.addParser({ sortList: [[3,0]], - headers: { 0: { sorter: false }, 1: { sorter: 'articles' },4: { sorter: false },5: { sorter: false }} + headers: { 0: { sorter: false }, 1: { sorter: 'articles' },4: { sorter: false },5: { sorter: false },6: { sorter: false }} - headers: { 0: { sorter: false }, 1: { sorter: 'articles' },5: { sorter: false },6: { sorter: false }} + headers: { 0: { sorter: false }, 1: { sorter: 'articles' },5: { sorter: false },6: { sorter: false },7: { sorter: false }} sortList: [[2,0]], - headers: { 0: { sorter: 'articles' },3: { sorter: false },4: { sorter: false }} + headers: { 0: { sorter: 'articles' },3: { sorter: false },4: { sorter: false },5: { sorter: false }} sortList: [[3,0]], - headers: { 0: { sorter: 'articles' },4: { sorter: false },5: { sorter: false }} + headers: { 0: { sorter: 'articles' },4: { sorter: false },5: { sorter: false },6: { sorter: false }} }); @@ -209,6 +209,9 @@ $.tablesorter.addParser({
    + + + + + +
    Items Checked Out Item(s) Checked Out
      Title Item Type Barcode Call No. Due " title="" alt="" />   Title Item Type Barcode Call No. Due "> " title="" alt="" />   Title Item Type BarcodeBarcode Call No. Due " title="" alt="" />   Title Item Type BarcodeBarcode Call No. Due "> " title="" alt="" /> Fines Links
    YesNo
    diff --git a/opac/opac-user.pl b/opac/opac-user.pl index 5601e85..62137b8 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -93,9 +93,10 @@ $borr->{'amountoutstanding'} = sprintf "%.02f", $borr->{'amountoutstanding'}; my @bordat; $bordat[0] = $borr; -$template->param( BORROWER_INFO => \@bordat, - borrowernumber => $borrowernumber, - patron_flagged => $borr->{flagged}, +$template->param( BORROWER_INFO => \@bordat, + borrowernumber => $borrowernumber, + patron_flagged => $borr->{flagged}, + OPACMySummaryHTML => (C4::Context->preference("OPACMySummaryHTML")) ? 1 : 0, ); #get issued items .... @@ -159,6 +160,17 @@ if ($issues){ my $isbn = GetNormalizedISBN($issue->{'isbn'}); $issue->{normalized_isbn} = $isbn; + + # My Summary HTML + if (my $my_summary_html = C4::Context->preference('OPACMySummaryHTML')){ + $issue->{author} ? $my_summary_html =~ s/{AUTHOR}/$issue->{author}/g : $my_summary_html =~ s/{AUTHOR}//g; + $issue->{title} =~ s/\/+$//; # remove trailing slash + $issue->{title} =~ s/\s+$//; # remove trailing space + $issue->{title} ? $my_summary_html =~ s/{TITLE}/$issue->{title}/g : $my_summary_html =~ s/{TITLE}//g; + $issue->{isbn} ? $my_summary_html =~ s/{ISBN}/$isbn/g : $my_summary_html =~ s/{ISBN}//g; + $issue->{biblionumber} ? $my_summary_html =~ s/{BIBLIONUMBER}/$issue->{biblionumber}/g : $my_summary_html =~ s/{BIBLIONUMBER}//g; + $issue->{MySummaryHTML} = $my_summary_html; + } } } $template->param( ISSUES => \@issuedat ); -- 1.5.6.5 From Katrin.Fischer.83 at web.de Mon Apr 4 16:13:33 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Mon, 4 Apr 2011 16:13:33 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5991 - Javascript error on purchase suggestion pages Message-ID: <1301926413-21232-1-git-send-email-Katrin.Fischer.83@web.de> From: Owen Leonard Rebased on master 2011-04-04 Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 2 +- .../prog/en/modules/suggestion/suggestion.tmpl | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js index b5ec994..de9e92c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js @@ -695,7 +695,7 @@ function calcNewsuggTotal(){ var total = new Number(quantity*price*exchangerate); document.getElementById('total').value = total.toFixed(2); - document.getElementById('price').value = listprice.toFixed(2); + document.getElementById('price').value = price.toFixed(2); return true; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl index cf38b72..3d7817e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl @@ -4,7 +4,7 @@ - - + -- 1.7.1 From alex.arnaud at biblibre.com Mon Apr 4 16:20:03 2011 From: alex.arnaud at biblibre.com (Alex Arnaud) Date: Mon, 4 Apr 2011 16:20:03 +0200 Subject: [Koha-patches] [PATCH] printoverdues.sh bash odities Message-ID: <1301926803-31243-1-git-send-email-alex.arnaud@biblibre.com> From: Sophie Meynieux set is obsolete changing to variable=value --- misc/cronjobs/printoverdues.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/misc/cronjobs/printoverdues.sh b/misc/cronjobs/printoverdues.sh index 6c7e2dc..f7b677e 100755 --- a/misc/cronjobs/printoverdues.sh +++ b/misc/cronjobs/printoverdues.sh @@ -27,7 +27,8 @@ then fi if [[ -n $2 && -f $2 ]] then - set $optpisa "--css $2"; + # set $optpisa "--css $2"; + optpisa="--css $2"; fi if [[ -n $3 ]] then -- 1.6.3.3 From paul.poulain at biblibre.com Mon Apr 4 16:24:32 2011 From: paul.poulain at biblibre.com (paul.poulain at biblibre.com) Date: Mon, 4 Apr 2011 16:24:32 +0200 Subject: [Koha-patches] [PATCH] Bug 6045: Accepted by is empty when accepting from list Message-ID: <1301927072-7080-1-git-send-email-paul.poulain@biblibre.com> From: Paul Poulain --- suggestion/suggestion.pl | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl index 2b4e3d9..aa8fad0 100755 --- a/suggestion/suggestion.pl +++ b/suggestion/suggestion.pl @@ -138,11 +138,16 @@ elsif ($op=~/edit/) { $op ='save'; } elsif ($op eq "change" ) { + # set accepted/rejected/managed informations if applicable + # ie= if the librarian has choosen some action on the suggestions + if ($$suggestion_ref{"STATUS"} eq "ACCEPTED"){ + $$suggestion_ref{"accepteddate"}=C4::Dates->today; + $$suggestion_ref{"acceptedby"}=C4::Context->userenv->{number}; + } elsif ($$suggestion_ref{"STATUS"} eq "REJECTED"){ + $$suggestion_ref{"rejecteddate"}=C4::Dates->today; + $$suggestion_ref{"rejectedby"}=C4::Context->userenv->{number}; + } if ($$suggestion_ref{"STATUS"}){ - if (my $tmpstatus=lc($$suggestion_ref{"STATUS"}) =~/ACCEPTED|REJECTED/i){ - $$suggestion_ref{"$tmpstatus"."date"}=C4::Dates->today; - $$suggestion_ref{"$tmpstatus"."by"}=C4::Context->userenv->{number}; - } $$suggestion_ref{"manageddate"}=C4::Dates->today; $$suggestion_ref{"managedby"}=C4::Context->userenv->{number}; } -- 1.7.1 From Katrin.Fischer.83 at web.de Mon Apr 4 16:28:44 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Mon, 4 Apr 2011 16:28:44 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6045: Accepted by is empty when accepting from list Message-ID: <1301927324-30243-1-git-send-email-Katrin.Fischer.83@web.de> From: Paul Poulain Signed-off-by: Katrin Fischer --- suggestion/suggestion.pl | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl index 44d65ed..f5202e4 100755 --- a/suggestion/suggestion.pl +++ b/suggestion/suggestion.pl @@ -138,11 +138,16 @@ elsif ($op=~/edit/) { $op ='save'; } elsif ($op eq "change" ) { + # set accepted/rejected/managed informations if applicable + # ie= if the librarian has choosen some action on the suggestions + if ($$suggestion_ref{"STATUS"} eq "ACCEPTED"){ + $$suggestion_ref{"accepteddate"}=C4::Dates->today; + $$suggestion_ref{"acceptedby"}=C4::Context->userenv->{number}; + } elsif ($$suggestion_ref{"STATUS"} eq "REJECTED"){ + $$suggestion_ref{"rejecteddate"}=C4::Dates->today; + $$suggestion_ref{"rejectedby"}=C4::Context->userenv->{number}; + } if ($$suggestion_ref{"STATUS"}){ - if (my $tmpstatus=lc($$suggestion_ref{"STATUS"}) =~/ACCEPTED|REJECTED/i){ - $$suggestion_ref{"$tmpstatus"."date"}=C4::Dates->today; - $$suggestion_ref{"$tmpstatus"."by"}=C4::Context->userenv->{number}; - } $$suggestion_ref{"manageddate"}=C4::Dates->today; $$suggestion_ref{"managedby"}=C4::Context->userenv->{number}; } -- 1.7.1 From matthias.meusburger at biblibre.com Mon Apr 4 16:28:40 2011 From: matthias.meusburger at biblibre.com (Matthias Meusburger) Date: Mon, 4 Apr 2011 16:28:40 +0200 Subject: [Koha-patches] [PATCH] Bug 5978 Follow-up : MT3513 followup : searching authorities Message-ID: <1301927320-3328-1-git-send-email-matthias.meusburger@biblibre.com> looking for authorities via authority number has to do exact search. Follow-up : The use of wrdl did not perform exact search. This patch uses ext, which does. --- etc/zebradb/marc_defs/unimarc/biblios/record.abs | 82 ++++++++++---------- .../modules/opac-authoritiessearchresultlist.tmpl | 2 +- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/etc/zebradb/marc_defs/unimarc/biblios/record.abs b/etc/zebradb/marc_defs/unimarc/biblios/record.abs index 9406aac..acb1578 100644 --- a/etc/zebradb/marc_defs/unimarc/biblios/record.abs +++ b/etc/zebradb/marc_defs/unimarc/biblios/record.abs @@ -89,21 +89,21 @@ melm 200$f Author:w,Author:p # other Authors melm 200$g Author:w,Author:p # physical Author -melm 700$9 Koha-Auth-Number,Koha-Auth-Number:n +melm 700$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n melm 700$a Author,Author-name-personal,Author:p,Author-name-personal:p,Author-name-personal,Author:s melm 700 Author,Author-name-personal,Author:p,Author-name-personal:p,Author-name-personal:p -melm 701$9 Koha-Auth-Number,Koha-Auth-Number:n +melm 701$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n melm 701 Author,Author-name-personal,Author:p,Author-name-personal:p,Author-name-personal:p -melm 702$9 Koha-Auth-Number,Koha-Auth-Number:n +melm 702$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n melm 702 Author,Author-name-personal,Author:p,Author-name-personal:p,Author-name-personal:p # collective Author -melm 710$9 Koha-Auth-Number,Koha-Auth-Number:n +melm 710$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n melm 710 Author,Author-name-corporate,Author-name-conference,Corporate-name,Conference-name,Author:p,Author-name-corporate:p,Author-name-conference:p,Corporate-name:p,Conference-name:p -melm 711$9 Koha-Auth-Number,Koha-Auth-Number:n +melm 711$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n melm 711 Author,Author-name-corporate,Author-name-conference,Corporate-name,Conference-name,Author:p,Author-name-corporate:p,Author-name-conference:p,Corporate-name:p,Conference-name:p -melm 712$9 Koha-Auth-Number,Koha-Auth-Number:n +melm 712$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n melm 712 Author,Author-name-corporate,Author-name-conference,Corporate-name,Conference-name,Author:p,Author-name-corporate:p,Author-name-conference:p,Corporate-name:p,Conference-name:p ############## TITLE ################## @@ -232,25 +232,25 @@ melm 445$d pubdate:n melm 461$d pubdate:n # Authorities Title -melm 500$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 501$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 503$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 510$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 512$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 513$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 514$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 515$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 516$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 517$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 518$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 519$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 520$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 530$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 531$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 532$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 540$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 541$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 545$9 Koha-Auth-Number,Koha-Auth-Number:n +melm 500$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 501$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 503$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 510$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 512$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 513$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 514$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 515$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 516$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 517$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 518$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 519$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 520$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 530$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 531$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 532$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 540$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 541$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 545$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n melm 500 Title,Title:p melm 501 Title,Title:p @@ -273,22 +273,22 @@ melm 541 Title,Title:p melm 545 Title,Title:p ########### SUBJECTS (6xx) ################## -melm 600$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 601$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 602$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 603$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 604$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 605$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 606$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 607$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 610$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 630$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 631$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 632$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 633$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 634$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 635$9 Koha-Auth-Number,Koha-Auth-Number:n -melm 636$9 Koha-Auth-Number,Koha-Auth-Number:n +melm 600$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 601$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 602$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 603$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 604$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 605$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 606$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 607$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 610$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 630$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 631$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 632$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 633$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 634$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 635$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n +melm 636$9 Koha-Auth-Number,Koha-Auth-Number:p,Koha-Auth-Number:n melm 600$a Personal-name,Personal-name:p,Subject,Subject:p melm 600 Subject,Subject:p diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl index 24bc0f1..e967fd7 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl @@ -55,7 +55,7 @@ - "> biblios + "> biblios -- 1.7.1 From henridamien.laurent at biblibre.com Mon Apr 4 16:31:30 2011 From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT) Date: Mon, 4 Apr 2011 16:31:30 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5989 - Funds filter does not remember library choice Message-ID: <1301927490-27474-1-git-send-email-henridamien.laurent@biblibre.com> From: Owen Leonard Signed-off-by: Paul Poulain Signed-off-by: Chris Cormack Signed-off-by: Henri-Damien LAURENT --- admin/aqbudgets.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl index d266727..ed8d294 100755 --- a/admin/aqbudgets.pl +++ b/admin/aqbudgets.pl @@ -75,9 +75,9 @@ my $budget_hash = $input->Vars; my $budget_id = $$budget_hash{budget_id}; my $budget_permission = $input->param('budget_permission'); my $budget_period_dropbox = $input->param('budget_period_dropbox'); +my $filter_budgetbranch = $input->param('filter_budgetbranch'); #filtering non budget keys delete $$budget_hash{$_} foreach grep {/filter|^op$|show/} keys %$budget_hash; -my $filter_budgetbranch = $input->param('filter_budgetbranch'); my $filter_budgetname = $input->param('filter_budgetname'); $template->param( notree => ($filter_budgetbranch or $show_mine) -- 1.7.1 From alex.arnaud at biblibre.com Mon Apr 4 17:00:43 2011 From: alex.arnaud at biblibre.com (Alex Arnaud) Date: Mon, 4 Apr 2011 17:00:43 +0200 Subject: [Koha-patches] [PATCH] Bug #6049 - Add a filter by date in overdue.pl Message-ID: <1301929243-1996-1-git-send-email-alex.arnaud@biblibre.com> --- circ/overdue.pl | 12 ++++++- .../prog/en/modules/circ/overdue.tmpl | 30 ++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/circ/overdue.pl b/circ/overdue.pl index 3510a2b..94bd0f8 100755 --- a/circ/overdue.pl +++ b/circ/overdue.pl @@ -27,7 +27,7 @@ use CGI qw(-oldstyle_urls); use C4::Auth; use C4::Branch; use C4::Debug; -use C4::Dates qw/format_date/; +use C4::Dates qw/format_date format_date_in_iso/; use Date::Calc qw/Today/; use Text::CSV_XS; @@ -40,6 +40,8 @@ my $itemtypefilter = $input->param('itemtype') || ''; my $borflagsfilter = $input->param('borflag') || ''; my $branchfilter = $input->param('branch') || ''; my $op = $input->param('op') || ''; +my $dateduefrom = format_date_in_iso($input->param( 'dateduefrom' )) || ''; +my $datedueto = format_date_in_iso($input->param( 'datedueto' )) || ''; my $isfiltered = $op =~ /apply/i && $op =~ /filter/i; my $noreport = C4::Context->preference('FilterBeforeOverdueReport') && ! $isfiltered && $op ne "csv"; @@ -209,7 +211,11 @@ $template->param( patron_attr_filter_loop => \@patron_attr_filter_loop, borname => $bornamefilter, order => $order, - showall => $showall); + showall => $showall, + DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), + dateduefrom => $input->param( 'dateduefrom' ) || '', + datedueto => $input->param( 'datedueto' ) || '', +); if ($noreport) { # la de dah ... page comes up presto-quicko @@ -254,6 +260,8 @@ if ($noreport) { $strsth.=" AND biblioitems.itemtype = '" . $itemtypefilter . "' " if $itemtypefilter; $strsth.=" AND borrowers.flags = '" . $borflagsfilter . "' " if $borflagsfilter; $strsth.=" AND borrowers.branchcode = '" . $branchfilter . "' " if $branchfilter; + $strsth.=" AND date_due < '" . $datedueto . "' " if $datedueto; + $strsth.=" AND date_due > '" . $dateduefrom . "' " if $dateduefrom; # restrict patrons (borrowers) to those matching the patron attribute filter(s), if any my $bnlist = $have_pattr_filter_data ? join(',',keys %borrowernumber_to_attributes) : ''; $strsth =~ s/WHERE 1=1/WHERE 1=1 AND borrowers.borrowernumber IN ($bnlist)/ if $bnlist; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl index 9682fb1..c1f2053 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl @@ -69,6 +69,7 @@ + @@ -137,6 +138,35 @@

    Filter On:

      +
    1. Date due: + + " /> + + + + " /> + +
    2. " />
    3. - + + + +
    4. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl index b5c9d84..a5e00d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl @@ -226,7 +226,7 @@ $(document).ready(function() { - , ''); return false" >Print list + , ' () (Rec\'d: )'); return false" >Print list diff --git a/serials/routing.pl b/serials/routing.pl index 2bd7d69..9792a96 100755 --- a/serials/routing.pl +++ b/serials/routing.pl @@ -74,6 +74,7 @@ my $serialdates = GetLatestSerials($subscriptionid,$count); my $dates = []; foreach my $dateseq (@{$serialdates}) { my $d = {}; + $d->{publisheddate} = $dateseq->{publisheddate}; $d->{planneddate} = $dateseq->{planneddate}; $d->{serialseq} = $dateseq->{serialseq}; $d->{serialid} = $dateseq->{serialid}; -- 1.7.1 From chrisc at catalyst.net.nz Tue Apr 5 04:47:19 2011 From: chrisc at catalyst.net.nz (Chris Cormack) Date: Tue, 5 Apr 2011 14:47:19 +1200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Adding a javascript function to check the validation of a record with a budget. In-Reply-To: <1301910681-28488-1-git-send-email-paul.poulain@biblibre.com> References: <1301910681-28488-1-git-send-email-paul.poulain@biblibre.com> Message-ID: <20110405024719.GZ8495@rorohiko> * paul.poulain at biblibre.com (paul.poulain at biblibre.com) wrote: > From: koha-preprod Do we have a bug number for this? Chris > > > Signed-off-by: Paul Poulain > --- > .../prog/en/modules/acqui/neworderempty.tmpl | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl > index 76f5a3f..410ddd2 100644 > --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl > +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl > @@ -18,6 +18,11 @@ function Check(ff) { > ok=1; > _alertString += "\n- " + _("Title cannot be empty"); > } > + > + if(isNull(ff.budget_id,1)){ > + ok=1; > + _alertString += "\n- "+ _("You must select a budget"); > + } > > if (!(isNum(ff.quantity,0))){ > ok=1; > -- > 1.7.1 > > _______________________________________________ > Koha-patches mailing list > Koha-patches at lists.koha-community.org > http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches > website : http://www.koha-community.org/ > git : http://git.koha-community.org/ > bugs : http://bugs.koha-community.org/ -- Chris Cormack Catalyst IT Ltd. +64 4 803 2238 PO Box 11-053, Manners St, Wellington 6142, New Zealand -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: Digital signature URL: From chrisc at catalyst.net.nz Tue Apr 5 04:50:39 2011 From: chrisc at catalyst.net.nz (Chris Cormack) Date: Tue, 5 Apr 2011 14:50:39 +1200 Subject: [Koha-patches] [PATCH][SIGNED-OFF] Corrects an error when showing a suggestion linked to a deleted budget. In-Reply-To: <1301918373-740-1-git-send-email-paul.poulain@biblibre.com> References: <1301918373-740-1-git-send-email-paul.poulain@biblibre.com> Message-ID: <20110405025039.GA8495@rorohiko> * paul.poulain at biblibre.com (paul.poulain at biblibre.com) wrote: > From: Fr?d?rick Capovilla > > If a suggestion is associated to a budget that was deleted, an error was > returned because we try to get the name of a budget that doesn't exist. > With this fix, the page is shown without errors. I need a bug number with this one too please Chris > > Signed-off-by: Paul Poulain > --- > suggestion/suggestion.pl | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl > index 44d65ed..cb8c5f9 100755 > --- a/suggestion/suggestion.pl > +++ b/suggestion/suggestion.pl > @@ -184,7 +184,10 @@ if ($op=~/else/) { > > my $suggestions = &SearchSuggestion($suggestion_ref); > foreach my $suggestion (@$suggestions){ > - $suggestion->{budget_name}=GetBudget($suggestion->{budgetid})->{budget_name} if $suggestion->{budgetid}; > + if($suggestion->{budgetid}) { > + my $budget = GetBudget($suggestion->{budgetid}); > + $suggestion->{budget_name}=$budget->{budget_name} if $budget; > + } > foreach my $date qw(suggesteddate manageddate accepteddate){ > if ($suggestion->{$date} ne "0000-00-00" && $suggestion->{$date} ne "" ){ > $suggestion->{$date}=format_date($suggestion->{$date}) ; > -- > 1.7.1 > > _______________________________________________ > Koha-patches mailing list > Koha-patches at lists.koha-community.org > http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches > website : http://www.koha-community.org/ > git : http://git.koha-community.org/ > bugs : http://bugs.koha-community.org/ -- Chris Cormack Catalyst IT Ltd. +64 4 803 2238 PO Box 11-053, Manners St, Wellington 6142, New Zealand -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: Digital signature URL: From jonathan.druart at biblibre.com Tue Apr 5 09:54:11 2011 From: jonathan.druart at biblibre.com (Jonathan Druart) Date: Tue, 5 Apr 2011 09:54:11 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5941 : (MT4425) Replace search 'an' by 'an, phr' in searchresultlist.tmpl Message-ID: <1301990051-1345-1-git-send-email-jonathan.druart@biblibre.com> From: Alex Arnaud Signed-off-by: Jonathan Druart --- .../en/modules/authorities/searchresultlist.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl index 01667e5..3ed1f58 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl @@ -66,7 +66,7 @@ function searchauthority() { "> - " class="button"> biblio(s) + " class="button"> biblio(s) -- 1.7.1 From frederic.durand at univ-lyon2.fr Tue Apr 5 09:59:58 2011 From: frederic.durand at univ-lyon2.fr (fdurand) Date: Tue, 5 Apr 2011 09:59:58 +0200 Subject: [Koha-patches] [PATCH 2/2] [SIGNED-OFF] Bug 5631 : (MT #2993) add EAN, PUC and Music-Number indexes Message-ID: <1301990398-2451-1-git-send-email-frederic.durand@univ-lyon2.fr> From: Henri-Damien LAURENT This fix add different "music" identifier to zebra indexes, for example it permit search through CDs via EAN. Signed-off-by: fdurand --- C4/Search.pm | 3 +++ etc/zebradb/ccl.properties | 6 ++++++ etc/zebradb/marc_defs/unimarc/biblios/record.abs | 4 ++++ 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/C4/Search.pm b/C4/Search.pm index c69e787..70d6194 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -865,6 +865,7 @@ sub getIndexes{ 'Date-of-acquisition', 'Date-of-publication', 'Dewey-classification', + 'EAN', 'extent', 'fic', 'fiction', @@ -902,6 +903,7 @@ sub getIndexes{ 'mc-rtype', 'mus', 'name', + 'Music-number', 'Name-geographic', 'Name-geographic-heading', 'Name-geographic-see', @@ -943,6 +945,7 @@ sub getIndexes{ 'su-to', 'su-ut', 'ut', + 'UPC', 'Term-genre-form', 'Term-genre-form-heading', 'Term-genre-form-see', diff --git a/etc/zebradb/ccl.properties b/etc/zebradb/ccl.properties index 59c2705..ee2553c 100644 --- a/etc/zebradb/ccl.properties +++ b/etc/zebradb/ccl.properties @@ -438,6 +438,12 @@ ns ISSN # #Identifier-stock 1028 A stock number that could be 037 # used for ordering the item. +Identifier-standard 1=1007 4=6 +ident Identifier-standard +upc 1=UPC +ean 1=EAN +music 1=Music-number + Stock-number 1=1028 #Identifier-thematic 1030 The numeric designation for a $n in the following: diff --git a/etc/zebradb/marc_defs/unimarc/biblios/record.abs b/etc/zebradb/marc_defs/unimarc/biblios/record.abs index 9406aac..84b3b50 100644 --- a/etc/zebradb/marc_defs/unimarc/biblios/record.abs +++ b/etc/zebradb/marc_defs/unimarc/biblios/record.abs @@ -39,6 +39,10 @@ melm 011$y ISSN:w,Identifier-standard:w # wrong ISSN melm 011$z ISSN:w,Identifier-standard:w +melm 071$a Music-number:w,Identifier-standard:w +melm 072$a UPC:w,Identifier-standard:w +melm 073$a EAN:w,Identifier-standard:w + melm 200$b itemtype:w,itype:w melm 995$r itemtype:w,itype:w -- 1.7.1 From henridamien.laurent at biblibre.com Tue Apr 5 10:15:26 2011 From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT) Date: Tue, 5 Apr 2011 10:15:26 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Follow-up fix for Bug 5952, Shows member relatives in issues list Message-ID: <1301991326-26657-1-git-send-email-henridamien.laurent@biblibre.com> From: Owen Leonard - Moving columns around to match display of patron's own checkouts - Correcting terminology (issues, borrowers) - Hiding columns added in previous patch which do not display in the standard checkout list: materials, stock number, collection. If these are to be added they should be added to all displays. Signed-off-by: Henri-Damien LAURENT --- .../prog/en/modules/circ/circulation.tmpl | 27 ++++++++----------- .../prog/en/modules/members/moremember.tmpl | 21 +++++---------- 2 files changed, 18 insertions(+), 30 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl index ae128e4..a66ce30 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl @@ -645,7 +645,7 @@ No patron matched 0 Checkouts -
    5. Relatives Issues
    6. +
    7. Relatives' Checkouts
    8. Hold(s) @@ -830,18 +830,17 @@ No patron matched
      -

      Relatives issues

      - + - - + + @@ -856,12 +855,11 @@ No patron matched - + - - + + @@ -877,16 +875,13 @@ No patron matched - - + + - - + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl index ad5731d..69cba4c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl @@ -394,7 +394,7 @@ function validate1(date) {
      Due date Title Item TypeBranch Checked out onCall no ChargeBorrowerMaterialPricePatron
      &type=intra">, by - &itemnumber=#item"> " alt="" /> - () ">"> ()
      &type=intra">, by - &itemnumber=#item"> - - - () " alt="" /> ">"> ()
      - - - - - - + + + @@ -548,16 +544,13 @@ function validate1(date) { - - - - + - - + + -- 1.7.1 From guillaume.hatt at enc.sorbonne.fr Tue Apr 5 10:16:02 2011 From: guillaume.hatt at enc.sorbonne.fr (guillaume.hatt at enc.sorbonne.fr) Date: Tue, 5 Apr 2011 10:16:02 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5922: Notify of waiting holds at checkin Message-ID: <1301991362-31761-1-git-send-email-guillaume.hatt@enc.sorbonne.fr> From: Katrin Fischer This patch adds a new sys pref WaitingNotifyAtCheckin. If ON librarian will be notified of waiting holds for this patron at this branch. If OFF (default) not message will be shown. Signed-off-by: Guillaume Hatt --- patchs/5922-3458.patch | 222 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 222 insertions(+), 0 deletions(-) create mode 100644 patchs/5922-3458.patch diff --git a/patchs/5922-3458.patch b/patchs/5922-3458.patch new file mode 100644 index 0000000..9259401 --- /dev/null +++ b/patchs/5922-3458.patch @@ -0,0 +1,222 @@ +From 1438439d37473c8041558f47f67d00c9de2bb438 Mon Sep 17 00:00:00 2001 +From: Katrin Fischer +Date: Sat, 26 Mar 2011 22:27:06 +0100 +Subject: [PATCH] Bug 5922: Notify of waiting holds at checkin +Content-Type: text/plain; charset="utf-8" + +This patch adds a new sys pref WaitingNotifyAtCheckin. + +If ON librarian will be notified of waiting holds for this patron at this branch. + +If OFF (default) not message will be shown. +--- + circ/returns.pl | 18 +++++++++++++++++- + installer/data/mysql/de-DE/mandatory/sysprefs.sql | 1 + + installer/data/mysql/en/mandatory/sysprefs.sql | 1 + + .../1-Obligatoire/unimarc_standard_systemprefs.sql | 1 + + installer/data/mysql/it-IT/necessari/sysprefs.sql | 3 ++- + installer/data/mysql/pl-PL/mandatory/sysprefs.sql | 1 + + ...m_preferences_full_optimal_for_install_only.sql | 3 ++- + ...m_preferences_full_optimal_for_install_only.sql | 1 + + installer/data/mysql/updatedatabase.pl | 6 ++++++ + .../en/modules/admin/preferences/circulation.pref | 6 ++++++ + .../prog/en/modules/circ/returns.tmpl | 8 ++++++++ + kohaversion.pl | 2 +- + 12 files changed, 47 insertions(+), 4 deletions(-) + +diff --git a/circ/returns.pl b/circ/returns.pl +index 262c126..b83d17a 100755 +--- a/circ/returns.pl ++++ b/circ/returns.pl +@@ -249,7 +249,23 @@ if ($barcode) { + $template->param( fineborrowernumber => $borrower->{'borrowernumber'} ); + } + } +- ++ ++ if (C4::Context->preference("WaitingNotifyAtCheckin") ) { ++ #Check for waiting holds ++ my @reserves = GetReservesFromBorrowernumber($borrower->{'borrowernumber'}); ++ my $waiting_holds; ++ foreach my $num_res (@reserves) { ++ if ( $num_res->{'found'} eq 'W' && $num_res->{'branchcode'} eq $userenv_branch) { ++ $waiting_holds++; ++ } ++ } ++ if ($waiting_holds > 0) { ++ $template->param( ++ waiting_holds => $waiting_holds, ++ holdsborrowernumber => $borrower->{'borrowernumber'}, ++ ); ++ } ++ } + } + elsif ( !$messages->{'BadBarcode'} ) { + $input{duedate} = 0; +diff --git a/installer/data/mysql/de-DE/mandatory/sysprefs.sql b/installer/data/mysql/de-DE/mandatory/sysprefs.sql +index 7b62465..0d45b53 100644 +--- a/installer/data/mysql/de-DE/mandatory/sysprefs.sql ++++ b/installer/data/mysql/de-DE/mandatory/sysprefs.sql +@@ -34,6 +34,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FinesLog',1,'If ON, log fines',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems',0,'If ON, disables display of\"lost\" items in OPAC.','','YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hide_marc',0,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)',NULL,'YesNo'); ++INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WaitingNotifyAtCheckin',0,'If ON, notify librarians of waiting holds for the patron whose items they are checking in.',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IndependantBranches',0,'If ON, increases security between libraries',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('insecure',0,'If ON, bypasses all authentication. Be careful!',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetBiblioDefaultView','normal','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','normal|marc|isbd|labeled_marc','Choice'); +diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql +index cb06622..853cd16 100644 +--- a/installer/data/mysql/en/mandatory/sysprefs.sql ++++ b/installer/data/mysql/en/mandatory/sysprefs.sql +@@ -34,6 +34,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FinesLog',1,'If ON, log fines',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems',0,'If ON, disables display of\"lost\" items in OPAC.','','YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hide_marc',0,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)',NULL,'YesNo'); ++INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WaitingNotifyAtCheckin',0,'If ON, notify librarians of waiting holds for the patron whose items they are checking in.',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IndependantBranches',0,'If ON, increases security between libraries',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('insecure',0,'If ON, bypasses all authentication. Be careful!',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetBiblioDefaultView','normal','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','normal|marc|isbd|labeled_marc','Choice'); +diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql +index 68d78a0..46d4d63 100644 +--- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql ++++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql +@@ -36,6 +36,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('gist', '0', 'Ce param??tre d??finit le taux de TVA. Attention : ce n''est pas un % mais un nombre (0.055 et pas 5.5%) Laisser ?? 0 si vous ne r??cup??rez pas la TVA, ce qui est le cas de la plupart des biblioth??ques fran??aises', '', 'Integer'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems', '0', 'Si ce param??tre est activ??, l''OPAC n''affichera pas les notices pour lesquelles le ou les exemplaires sont marqu??s "perdus"', '', 'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hide_marc', '0', 'Si ce param??tre est positionn??, les code des champs et sous-champs MARC sont cach??s, on ne voit que les libell??s.', '', 'YesNo'); ++INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WaitingNotifyAtCheckin',0,'If ON, notify librarians of waiting holds for the patron whose items they are checking in.',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IndependantBranches', '0', 'Si ce param??tre est ?? "Oui", chaque site est ind??pendant au niveau de ses acquisitions, de son catalogage, de l''inscription de ses lecteurs...', '', 'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('insecure', '0', 'Ce param??tre, s''il est positionn?? ?? "Oui", permet d''utiliser Koha sans mot de passe. A utiliser avec pr??caution. Devrait ??tre ?? "Non" normalement', '', 'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('intranetcolorstylesheet', '', 'Ce param??tre permet de d??finir un jeu de couleur alternatif dans l''interface professionnelle', '50', 'free'); +diff --git a/installer/data/mysql/it-IT/necessari/sysprefs.sql b/installer/data/mysql/it-IT/necessari/sysprefs.sql +index 35116c1..fa40866 100644 +--- a/installer/data/mysql/it-IT/necessari/sysprefs.sql ++++ b/installer/data/mysql/it-IT/necessari/sysprefs.sql +@@ -65,6 +65,7 @@ insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, + insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('GoogleJackets','1','','Se ON, visualizza le copertine usando Google Books','YesNo'); + insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('hidelostitems','0','','Se ON, viene disabilitata la visualizzazione nell\'OPAC delle copie perse.','YesNo'); + insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('hide_marc','0','','Se su ON, disabilita la visualizzazione dei campi del MARC, codici di sottocampi e indicatori (mostra ancora i dati)','YesNo'); ++INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WaitingNotifyAtCheckin',0,'If ON, notify librarians of waiting holds for the patron whose items they are checking in.',NULL,'YesNo'); + insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('HomeOrHoldingBranch','holdingbranch','holdingbranch|homebranch','Se IndependantBranches e\' settata su ON, allora il sitema legge questa variabile. Se questa variabile e\' sul valore \'homebranch\' quando arriva una copia di un\'altra biblioteca si puo\' registare la restituzione dove la copia e\' arrivata. Se invece vale \'holdingbranch\', allora non si puo fare la restituzione ma solo prenderla e inviarla alla biblioteca di appartenenza; l?? verr?? fatta la restituzione ','Choice'); + insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('IndependantBranches','0','','Se ?? ON, aumenta il livello di sicurezza tra le biblioteche','YesNo'); + insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('insecure','0','','Se ?? su ON, tutte le richieste di autenticazioni vengono aggirate. Attenzione!','YesNo'); +@@ -285,4 +286,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES + INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowPurchaseSuggestionBranchChoice', 0, 'Allow user to choose branch when making a purchase suggestion','1','YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free'); +-INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo'); +\ No newline at end of file ++INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo'); +diff --git a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql +index 231e541..30f18c8 100644 +--- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql ++++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql +@@ -34,6 +34,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FinesLog',1,'If ON, log fines',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems',0,'If ON, disables display of\"lost\" items in OPAC.','','YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hide_marc',0,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)',NULL,'YesNo'); ++INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WaitingNotifyAtCheckin',0,'If ON, notify librarians of waiting holds for the patron whose items they are checking in.',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IndependantBranches',0,'If ON, increases security between libraries',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('insecure',0,'If ON, bypasses all authentication. Be careful!',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetBiblioDefaultView','normal','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','normal|marc|isbd|labeled_marc','Choice'); +diff --git a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql +index af69408..f6f2e26 100644 +--- a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql ++++ b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql +@@ -46,6 +46,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FinesLog',1,'If ON, log fines',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems',0,'If ON, disables display of\"lost\" items in OPAC.','','YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hide_marc',0,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)',NULL,'YesNo'); ++INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WaitingNotifyAtCheckin',0,'If ON, notify librarians of waiting holds for the patron whose items they are checking in.',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IndependantBranches',0,'If ON, increases security between libraries',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('insecure',0,'If ON, bypasses all authentication. Be careful!',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetBiblioDefaultView','normal','IntranetBiblioDefaultView','normal|marc|isbd|labeled_marc','Choice'); +@@ -352,4 +353,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES + INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowPurchaseSuggestionBranchChoice', 0, 'Allow user to choose branch when making a purchase suggestion','1','YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free'); +-INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo'); +\ No newline at end of file ++INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo'); +diff --git a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql +index a72e79a..049e1c0 100644 +--- a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql ++++ b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql +@@ -45,6 +45,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FinesLog',1,'If ON, log fines',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems',0,'If ON, disables display of\"lost\" items in OPAC.','','YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hide_marc',0,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)',NULL,'YesNo'); ++INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WaitingNotifyAtCheckin',0,'If ON, notify librarians of waiting holds for the patron whose items they are checking in.',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IndependantBranches',0,'If ON, increases security between libraries',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('insecure',0,'If ON, bypasses all authentication. Be careful!',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetBiblioDefaultView','normal','IntranetBiblioDefaultView','normal|marc|isbd|labeled_marc','Choice'); +diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl +index 23b5d67..a2bef31 100755 +--- a/installer/data/mysql/updatedatabase.pl ++++ b/installer/data/mysql/updatedatabase.pl +@@ -4131,6 +4131,12 @@ $DBversion = '3.03.00.032'; + if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', 1, 'Create searches on all subdivisions for subject tracings.','1','YesNo')"); + print "Upgrade to $DBversion done ( include subdivisions when generating subject tracing searches )\n"; ++} ++ ++$DBversion = "3.03.00.XXX"; ++if (C4::Context->preference("Version") < TransformToNum($DBversion)) { ++ $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WaitingNotifyAtCheckin',0,'If ON, notify librarians of waiting holds for the patron whose items they are checking in.',NULL,'YesNo');"); ++ print "Upgrade to $DBversion done (Add syspref WaitingNotifyAtCheckin)\n"; + SetVersion ($DBversion); + } + +diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +index e0eac4d..2b15543 100644 +--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref ++++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +@@ -67,6 +67,12 @@ Circulation: + no: "Don't notify" + - librarians of overdue fines on the items they are checking in. + - ++ - pref: WaitingNotifyAtCheckin ++ choices: ++ yes: Notify ++ no: "Don't notify" ++ - librarians of waiting holds for the patron whose items they are checking in. ++ - + - pref: FilterBeforeOverdueReport + choices: + yes: Require +diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl +index 724a3e9..879a006 100644 +--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl ++++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl +@@ -66,6 +66,14 @@ function Dopop(link) { + + + ++ ++ ++
      ++

      Patron has hold(s) waiting for pickup.

      ++

      ">Checkout holds.

      ++
      ++ ++ + + +

      Cannot Check In

      This item must be checked in at its home library. NOT CHECKED IN

      +diff --git a/kohaversion.pl b/kohaversion.pl +index 3fbc4e1..8330459 100644 +--- a/kohaversion.pl ++++ b/kohaversion.pl +@@ -16,7 +16,7 @@ the kohaversion is divided in 4 parts : + use strict; + + sub kohaversion { +- our $VERSION = '3.03.00.032'; ++ our $VERSION = '3.03.00.XXX'; + # version needs to be set this way + # so that it can be picked up by Makefile.PL + # during install +-- +1.7.1 + -- 1.7.0.4 From frederic.durand at univ-lyon2.fr Tue Apr 5 10:22:22 2011 From: frederic.durand at univ-lyon2.fr (fdurand) Date: Tue, 5 Apr 2011 10:22:22 +0200 Subject: [Koha-patches] [PATCH 1/2] [SIGNED-OFF] Bug 5546 Javascript driven ability to hide MARC documentation links Message-ID: <1301991744-2646-1-git-send-email-frederic.durand@univ-lyon2.fr> From: Tomas Cohen Arazi Signed-off-by: fdurand --- cataloguing/addbiblio.pl | 3 + .../prog/en/modules/cataloguing/addbiblio.tmpl | 59 ++++++++++++++++++- 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl index 60f8e15..061511e 100755 --- a/cataloguing/addbiblio.pl +++ b/cataloguing/addbiblio.pl @@ -1023,10 +1023,13 @@ $template->param( title => $record->title() ) if ( $record ne "-1" ); if (C4::Context->preference("marcflavour") eq "MARC21"){ $template->param(MARC21 => 1); } + + $template->param( popup => $mode, frameworkcode => $frameworkcode, itemtype => $frameworkcode, + borrowernumber => $loggedinuser ); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl index ba59280..b39212c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl @@ -26,9 +26,20 @@ fields_in_use[field_id] = 1; } }); - }); - - $('#header_search > ul').tabs().bind('show.ui-tabs', function(e, ui) { $('#header_search > div:not(.ui-tabs-hide)').find('input').eq(0).focus(); }); + /* check cookie to hide/show marcdocs*/ + if($.cookie("marcdocs_") == 'false'){ + hideMARCdocLinks(); + $("#marcDocsSelect").attr('checked',false); + } else { + /* reset cookie expire date */ + $.cookie("marcdocs_",'true', + { path: "/", expires: 365 }); + } + + }); + + $('#header_search > ul').tabs().bind('show.ui-tabs', function(e, ui) { $('#header_search > div:not(.ui-tabs-hide)').find('input').eq(0).focus(); }); + function confirmnotdup(redirect){ $("#confirm_not_duplicate").attr("value","1"); @@ -101,6 +112,45 @@ function _UNIMARCFieldDoc(field, blocknumber) { } } +/* + * Functions to load/unload css from the head element + */ +function loadCSS(id,cssDef) { + + var cssElem=document.createElement("style"); + cssElem.setAttribute("type", "text/css"); + cssElem.setAttribute("id", id); + cssElem.innerHTML = cssDef; + + document.getElementsByTagName("head")[0].appendChild(cssElem); +} + +function unloadCSS(id) { + var elem = document.getElementById(id); + elem.parentNode.removeChild(elem); +} + +/* + * Functions to hide/show marc docs links + */ +function hideMARCdocLinks() { + loadCSS("marcDocsCSS",".marcdocs{display: none;}"); + $.cookie("marcdocs_",'false', { path: "/", expires: 365 }); +} + +function showMARCdocLinks() { + unloadCSS("marcDocsCSS"); + $.cookie("marcdocs_",'true', { path: "/", expires: 365 }); +} + +function toggleMARCDocs(checked) { + if (checked) { + showMARCdocLinks(); + } else { + hideMARCdocLinks(); + } +} + /** * check if mandatory subfields are written */ @@ -643,6 +693,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?

      Editing (Record Number )

      Add MARC Record +
      Show MARC tag documentation links
      @@ -788,7 +839,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ? - Click to Expand this Tag" onclick="ExpandField('tag__'); return false;"> - ">">', ); return false;"> ? -- 1.7.1 From frederic.durand at univ-lyon2.fr Tue Apr 5 10:22:23 2011 From: frederic.durand at univ-lyon2.fr (fdurand) Date: Tue, 5 Apr 2011 10:22:23 +0200 Subject: [Koha-patches] [PATCH 2/2] [SIGNED-OFF] Bug 5546: Follow-up / fixes In-Reply-To: <1301991744-2646-1-git-send-email-frederic.durand@univ-lyon2.fr> References: <1301991744-2646-1-git-send-email-frederic.durand@univ-lyon2.fr> Message-ID: <1301991744-2646-2-git-send-email-frederic.durand@univ-lyon2.fr> From: Tomas Cohen Arazi Suggested by Owen. Signed-off-by: fdurand --- .../prog/en/modules/cataloguing/addbiblio.tmpl | 40 +++++-------------- 1 files changed, 11 insertions(+), 29 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl index b39212c..a1f1302 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl @@ -113,44 +113,18 @@ function _UNIMARCFieldDoc(field, blocknumber) { } /* - * Functions to load/unload css from the head element - */ -function loadCSS(id,cssDef) { - - var cssElem=document.createElement("style"); - cssElem.setAttribute("type", "text/css"); - cssElem.setAttribute("id", id); - cssElem.innerHTML = cssDef; - - document.getElementsByTagName("head")[0].appendChild(cssElem); -} - -function unloadCSS(id) { - var elem = document.getElementById(id); - elem.parentNode.removeChild(elem); -} - -/* * Functions to hide/show marc docs links */ function hideMARCdocLinks() { - loadCSS("marcDocsCSS",".marcdocs{display: none;}"); + $(".marcdocs").hide(); $.cookie("marcdocs_",'false', { path: "/", expires: 365 }); } function showMARCdocLinks() { - unloadCSS("marcDocsCSS"); + $(".marcdocs").show(); $.cookie("marcdocs_",'true', { path: "/", expires: 365 }); } -function toggleMARCDocs(checked) { - if (checked) { - showMARCdocLinks(); - } else { - hideMARCdocLinks(); - } -} - /** * check if mandatory subfields are written */ @@ -693,7 +667,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?

      Editing (Record Number )

      Add MARC Record -
      Show MARC tag documentation links
      +
      Show MARC tag documentation links
      @@ -738,6 +712,14 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ? $("#z3950searchc").empty(); $("#savebutton").empty(); yuiToolbar(); + + $("#marcDocsSelect").click(function(){ + if($(this).attr("checked")){ + showMARCdocLinks(); + } else { + hideMARCdocLinks(); + } + }); }); function redirect(dest){ -- 1.7.1 From jonathan.druart at biblibre.com Mon Apr 4 15:00:11 2011 From: jonathan.druart at biblibre.com (Jonathan Druart) Date: Mon, 4 Apr 2011 15:00:11 +0200 Subject: [Koha-patches] [PATCH] [Bug 5546] Javascript driven ability to hide MARC documentation links Message-ID: <1301922011-31027-1-git-send-email-jonathan.druart@biblibre.com> From: Tomas Cohen Arazi --- cataloguing/addbiblio.pl | 3 + .../prog/en/includes/doc-head-close.inc | 1 + .../en/lib/jquery/plugins/jquery.cookie.min.js | 1 + .../prog/en/modules/cataloguing/addbiblio.tmpl | 59 ++++++++++++++++++- 4 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.cookie.min.js diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl index da58166..b1f63dd 100755 --- a/cataloguing/addbiblio.pl +++ b/cataloguing/addbiblio.pl @@ -1023,10 +1023,13 @@ $template->param( title => $record->title() ) if ( $record ne "-1" ); if (C4::Context->preference("marcflavour") eq "MARC21"){ $template->param(MARC21 => 1); } + + $template->param( popup => $mode, frameworkcode => $frameworkcode, itemtype => $frameworkcode, + borrowernumber => $loggedinuser ); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl index be98543..8692faa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl @@ -26,9 +26,20 @@ fields_in_use[field_id] = 1; } }); - }); - - $('#header_search > ul').tabs().bind('show.ui-tabs', function(e, ui) { $('#header_search > div:not(.ui-tabs-hide)').find('input').eq(0).focus(); }); + /* check cookie to hide/show marcdocs*/ + if($.cookie("marcdocs_") == 'false'){ + hideMARCdocLinks(); + $("#marcDocsSelect").attr('checked',false); + } else { + /* reset cookie expire date */ + $.cookie("marcdocs_",'true', + { path: "/", expires: 365 }); + } + + }); + + $('#header_search > ul').tabs().bind('show.ui-tabs', function(e, ui) { $('#header_search > div:not(.ui-tabs-hide)').find('input').eq(0).focus(); }); + function confirmnotdup(redirect){ $("#confirm_not_duplicate").attr("value","1"); @@ -101,6 +112,45 @@ function _UNIMARCFieldDoc(field, blocknumber) { } } +/* + * Functions to load/unload css from the head element + */ +function loadCSS(id,cssDef) { + + var cssElem=document.createElement("style"); + cssElem.setAttribute("type", "text/css"); + cssElem.setAttribute("id", id); + cssElem.innerHTML = cssDef; + + document.getElementsByTagName("head")[0].appendChild(cssElem); +} + +function unloadCSS(id) { + var elem = document.getElementById(id); + elem.parentNode.removeChild(elem); +} + +/* + * Functions to hide/show marc docs links + */ +function hideMARCdocLinks() { + loadCSS("marcDocsCSS",".marcdocs{display: none;}"); + $.cookie("marcdocs_",'false', { path: "/", expires: 365 }); +} + +function showMARCdocLinks() { + unloadCSS("marcDocsCSS"); + $.cookie("marcdocs_",'true', { path: "/", expires: 365 }); +} + +function toggleMARCDocs(checked) { + if (checked) { + showMARCdocLinks(); + } else { + hideMARCdocLinks(); + } +} + /** * check if mandatory subfields are written */ @@ -641,6 +691,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?

      Editing (Record Number )

      Add MARC Record +
      Show MARC tag documentation links
      @@ -786,7 +837,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ? - Click to Expand this Tag" onclick="ExpandField('tag__'); return false;"> - ">">', ); return false;"> ? -- 1.7.1 From stephane.delaune at biblibre.com Mon Apr 4 15:22:37 2011 From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=) Date: Mon, 4 Apr 2011 15:22:37 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5942, sql for UNIMARC Authorities Message-ID: <1301923357-9562-1-git-send-email-stephane.delaune@biblibre.com> (MT #4339) init default UNIMARC sql structure Signed-off-by: St?phane Delaune --- .../Obligatoire/autorite_default.sql | 454 ++++++++++++++++++++ .../Obligatoire/autorite_default.txt | 1 + 2 files changed, 455 insertions(+), 0 deletions(-) create mode 100644 installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/autorite_default.sql create mode 100644 installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/autorite_default.txt diff --git a/installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/autorite_default.sql b/installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/autorite_default.sql new file mode 100644 index 0000000..db6b253 --- /dev/null +++ b/installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/autorite_default.sql @@ -0,0 +1,454 @@ +-- +-- Fichiers de structure UNIMARC des autorit?s par d?faut +-- Default Authorities structure tables for UNIMARC in french +-- Copyright Paul POULAIN, BibLibre SARL + +-- This file is part of Koha. +-- +-- Koha is free software; you can redistribute it and/or modify it under the +-- terms of the GNU General Public License as published by the Free Software +-- Foundation; either version 2 of the License, or (at your option) any later +-- version. +-- +-- Koha is distributed in the hope that it will be useful, but WITHOUT ANY +-- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +-- A PARTICULAR PURPOSE. See the GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License along with +-- Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, +-- Suite 330, Boston, MA 02111-1307 USA +-- + +-- +-- Contenu de la table `auth_types` +-- + +set NAMES 'utf8'; +INSERT INTO `auth_types` (`authtypecode`, `authtypetext`, `auth_tag_to_report`, `summary`) VALUES ('', 'D?faut', '', ''); + +-- +-- Contenu de la table `auth_tag_structure` +-- + +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '001', 'Identificateur de la notice', '', 0, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '005', 'Identificateur de la version', '', 0, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '015', '(ISADN)', '', 0, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '035', 'Identificateur de la notice dans un autre syst?me', '', 0, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '100', 'Donn?es g?n?rales de traitement', '', 0, 1, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '101', 'Langue de l''entit?', '', 0, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '102', 'Nationalit? de l''entit?', '', 0, 1, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '106', 'Zone de donn?es cod?es : Nom de personne / Nom de collectivit? / Famille /Marque, utilis?s comme vedettes mati?res', '', 0, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '120', 'Zone de donn?es cod?es : Nom de personne', '', 0, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '123', 'Zone de donn?es cod?es : Nom de territoire ou nom g?ographique', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '150', 'Zone de donn?es cod?es : Nom de collectivit?', '', 0, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '152', 'R?gles', '', 0, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '154', 'Zone de donn?es cod?es : titre uniforme', '', 0, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '160', 'Code d''aire g?ographique', '', 0, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '200', 'Vedette', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '210', 'Vedette', '', 1, 0, ''); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '215', 'Vedette', '', 1, 0, ''); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '230', 'Vedette', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '240', 'Vedette', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '250', 'Vedette-Mati?re nom commun', '', 1, 0, ''); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '300', 'Note d''information', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '305', 'Note de renvoi textuel "Voir aussi"', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '310', 'Note de renvoi textuel "Voir"', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '320', 'Note de renvoi explicatif', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '330', 'Note sur le champ d''application', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '340', 'Note sur la biographie et l''activit?', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '356', 'Note g?ographique', '', 0, 1, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '400', 'Forme rejet?e', '', 1, 0, ''); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '410', 'Forme rejet?e', '', 1, 0, ''); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '415', 'Forme rejet?e', '', 1, 0, ''); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '430', 'Forme rejet?e', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '450', 'Forme rejet?e', '', 1, 0, ''); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '500', 'Forme associ?e', '', 1, 0, ''); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '515', 'Forme associ?e', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '530', 'Forme associ?e', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '540', 'Forme associ?e', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '550', 'Forme associ?e', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '510', 'Forme associ?e', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '675', 'Classification d?cimale universelle (CDU)(provisoire)', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '676', 'Classification d?cimale Dewey (CDD)', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '680', 'Classification de la Biblioth?que du Congr?s (LCC)', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '686', 'Autres classifications', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '710', 'Forme parall?le', '', 1, 0, ''); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '801', 'Origine de la notice', '', 1, 1, ''); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '810', 'Sources consult?es avec profit', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '815', 'Sources consult?es en vain', '', 0, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '820', 'Information sur l''utilisation ou le champ d''application de la vedette', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '825', 'Citation dans une autre notice', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '830', 'Note g?n?rale de travail', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '835', 'Information sur les vedettes rempla?ant une vedette d?truite', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '836', 'Information sur les vedettes remplac?es', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '856', 'Adresse ?lectronique et mode d''acc?s', '', 1, 0, NULL); +INSERT INTO `auth_tag_structure` (`authtypecode`, `tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`) VALUES ('', '886', 'Donn?es non converties du format source', '', 1, 0, NULL); + + +-- +-- Contenu de la table `auth_subfield_structure` +-- + +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '001', '@', 'tag 001', '', 0, 0, 0, '', '', NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '005', '@', 'tag 005', '', 0, 0, 0, '', '', NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '015', '@', 'tag 015', '', 0, 0, 0, '', '', NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '035', 'a', 'Num?ro de contr?le syst?me', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '035', 'z', 'Num?ro de contr?le annul? ou erron?', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '100', 'a', 'Donn?es g?n?rale de traitement', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '101', 'a', 'Langue utilis?e par l''entit?', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '102', 'a', 'Pays', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '102', 'b', 'Localit?', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '106', 'a', 'Code d''un caract?re', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '120', 'a', 'Donn?es cod?es : nom de personne', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '123', 'd', 'Coordonn?e-Longitude la plus occidentale', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '123', 'e', 'Coordonn?e-Longitude la plus orientale', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '123', 'f', 'Coordonn?e-Latitude la plus septentrionale', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '123', 'g', 'Coordonn?e-Latitude la plus m?ridionale', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '150', 'a', 'Donn?es de traitement sur la collectivit?', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '152', 'a', 'R?gles de catalogage', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '152', 'b', 'syst?me d''indexation mati?re', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '154', 'a', 'Donn?es g?n?rales de traitement du titre', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '160', 'a', 'Code de l''aire g?ographique', '', 1, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '200', '4', 'Code de fonction', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '200', '7', 'Ecriture de catalogage et ?criture de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '200', '8', 'Langue de catalogage et langue de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '200', 'a', 'El?ment d''entr?e', '', 0, 1, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '200', 'b', 'Pr?nom', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '200', 'c', 'Qualif autre que dates', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '200', 'd', 'Chiffres romains', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '200', 'f', 'Dates', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '200', 'g', 'D?veloppement des initiales du pr?nom', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '200', 'j', 'Subdivision de forme', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '200', 'x', 'Subdiv. de sujet', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '200', 'y', 'Subdiv. g?ographique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '200', 'z', 'Subdiv. chronologique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '210', '4', 'Code de fonction', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '210', '7', 'Ecriture de catalogage et ?criture de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '210', '8', 'Langue de catalogage et langue de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '210', 'a', 'El?ment d''entr?e', '', 0, 1, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '210', 'b', 'Subdivision', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '210', 'c', 'El?ment ajout? au nom ou qualificatif', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '210', 'd', 'N? de congr?s/session', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '210', 'e', 'Lieu du congr?s', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '210', 'f', 'Date du congr?s', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '210', 'g', 'El?ment rejet?', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '210', 'h', 'Partie du nom autre que l''?l?ment d''entr?e et autre que l''?l?ment rejet? 0 0', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '210', 'x', 'Subdiv. de sujet', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '210', 'y', 'Subdiv. g?ographique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '210', 'z', 'Subdiv. chronologique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '230', '7', 'Ecriture de catalogage et ?criture de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '230', '8', 'Langue de catalogage et langue de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '230', 'a', 'El?ment d''entr?e', '', 0, 1, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '230', 'b', 'Indication g?n?rale du type de document', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '230', 'h', 'Num?ro de section ou de partie', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '230', 'i', 'Titre de partie', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '230', 'j', 'Subdivision de forme', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '230', 'k', 'Date de publication', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '230', 'l', 'Sous-vedette de forme', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '230', 'm', 'Langue', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '230', 'q', 'Version (ou date d''une version)', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '230', 'r', 'Distribution d''ex?cution (pour la musique)', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '230', 's', 'R?f?rences num?riques (pour la musique)', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '230', 'u', 'Tonalit? (pour la musique)', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '230', 'w', 'Mention d''arrangement', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '230', 'x', 'Subdiv. de sujet', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '230', 'y', 'Subdiv. g?ographique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '230', 'z', 'Subdiv. chronologique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '240', '7', 'Ecriture de catalogage et ?criture de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '240', '8', 'Langue de catalogage et langue de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '240', 'a', 'Auteur', '', 0, 1, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '240', 'b', 'Pr?nom', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '240', 'c', 'Qualificatifs', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '240', 'f', 'Dates', '', 0, 0, 0, '', NULL, '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '240', 'j', 'Subdivision de forme', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '240', 't', 'Titre', '', 0, 1, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '240', 'x', 'Subdiv. de sujet', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '240', 'y', 'Subdiv. g?ographique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '240', 'z', 'Subdiv. chronologique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '250', '7', 'Ecriture de catalogage et ?criture de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '250', '8', 'Langue de catalogage et langue de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '250', 'a', 'El?ment d''entr?e', '', 0, 1, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '250', 'b', 'Statut', '', 0, 0, 0, 'CAND', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '250', 'j', 'Subdivision de forme', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '250', 'x', 'Subdiv. de sujet', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '250', 'y', 'Subdivision g?ographique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '250', 'z', 'Subdiv. chronologique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '300', '6', 'Donn?es de lien entre zones', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '300', '7', 'Ecriture de catalogage et ?criture de la racine de la vedette', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '300', 'a', 'Note d''information', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '305', '6', 'Donn?es de lien entre zones', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '305', '7', 'Ecriture de la notice et ?criture de la racine de la vedette', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '305', 'a', 'Formule introductive', '', 1, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '305', 'b', 'Vedette ? laquelle on renvoie', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '310', '6', 'Donn?es de lien entre zones', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '310', '7', 'Ecriture de la notice et ?criture de la racine de la vedette', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '310', 'a', 'Formule introductive', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '310', 'b', 'Vedette ? laquelle on renvoie', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '320', '6', 'Donn?es de lien entre zones', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '320', 'a', 'Note de renvoi explicatif', '', 1, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '330', '6', 'Donn?es de lien entre zones', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '330', '7', 'Ecriture de la notice et ?criture de la racine de la vedette', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '330', 'a', 'Note sur le champ d''application', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '340', '6', 'Donn?es de lien entre zones', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '340', '7', 'Ecriture de la notice et ?criture de la racine de la vedette', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '340', 'a', 'Note sur la biographie ou l''activit?', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '356', '6', 'Donn?es de liens entre zones', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '356', '7', 'Ecriture de la notice et ?criture de la racine de la vedette', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '356', 'a', 'Note g?ographique', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '400', '0', 'Formule introductive', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '400', '2', 'code du syst?me d''indexation mati?re', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '400', '3', 'Identificateur de la notice d''autorit?', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '400', '4', 'Code de fonction', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '400', '5', 'Donn?es cod?es relatives aux mentions de formes rejet?es ou associ?es 0 0', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '400', '6', 'Donn?es de lien entre zones', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '400', '8', 'Langue de catalogage et langue de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '400', 'a', 'El?ment d''entr?e', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '400', 'b', 'Autre ?l?ment du nom', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '400', 'c', 'Qualif autre que dates', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '400', 'd', 'Chiffres romains', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '400', 'f', 'Dates', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '400', 'g', 'D?veloppement des initiales du pr?nom', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '400', 'j', 'Subdivision de forme', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '400', 'x', 'Subdiv. de sujet', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '400', 'y', 'Subdiv. g?ographique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '400', 'z', 'Subdivision', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '410', '0', 'Formule introductive', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '410', '2', 'Code du syst?me d''indexation mati?re', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '410', '3', 'Identificateur de la notice d''autorit?', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '410', '4', 'Code de fonction', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '410', '5', 'Donn?es cod?es relatives aux mentions de formes rejet?es ou associ?es 0 0', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '410', '6', 'Donn?es de lien entre zones', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '410', '7', 'Ecriture de catalogage et ?criture de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '410', '8', 'Langue de catalogage et langue de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '410', 'a', 'El?ment d''entr?e', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '410', 'b', 'Subdivision', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '410', 'c', 'El?ment ajout? au nom ou qualificatif', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '410', 'd', 'Num?ro de congr?s', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '410', 'e', 'Lieu du congr?s', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '410', 'f', 'Date du congr?s', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '410', 'g', 'El?ment rejet?', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '410', 'h', 'Partie du nom autre que l''?l?ment d''entr?e et que l''?l?ment rejet?', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '410', 'j', 'Subdivision de forme', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '410', 'x', 'Subdiv. de sujet', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '410', 'y', 'Subdiv. g?ographique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '410', 'z', 'Subdivision', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', '0', 'Formule introductive', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', '2', 'code du syst?me d''indexation mati?re', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', '3', 'Identificateur de la notice d''autorit?', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', '5', 'Donn?es cod?es relatives aux mentions de formes rejet?es ou associ?es 0', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', '6', 'Donn?es de lien entre zones', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', '7', 'Ecriture de catalogage et ?criture de la racine de la vedette 0', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', '8', 'Langue de catalogage et langue de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', 'a', 'El?ment d''entr?e', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', 'b', 'Indication g?n?rale du type de document', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', 'h', 'Num?ro de section ou de partie', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', 'i', 'titre de section ou de partie', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', 'j', 'Subdivision de forme', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', 'k', 'date de publication', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', 'l', 'Sous-vedette de forme', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', 'm', 'Langue (quand elle fait partie de la vedette)', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', 'n', 'Autres informations', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', 'q', 'Version (ou date d''une version)', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', 'r', 'Distribution d''ex?cution (pour la musique)', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', 's', 'R?f?rences num?riques (pour la musique)', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', 'u', 'Tonalit? (pour la musique)', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', 'w', 'Mention d''arrangement (pour la musique)', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', 'x', 'Subdiv. de sujet', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', 'y', 'Subdiv. g?ographique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '430', 'z', 'Subdiv. chronologique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '440', '0', 'Formule introductive', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '440', '2', 'Code du syst?me d''indexation mati?re', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '440', '3', 'Identificateur de la notice d''autorit?', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '440', '5', 'Donn?es cod?es relatives aux mentions de formes rejet?es ou associ?es 0', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '440', '6', 'Donn?es de lien entre zones', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '440', '7', 'Ecriture de catalogage et ?criture de la racine de la vedette 0 0', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '440', '8', 'Langue de catalogage et langue de la racine de la vedette 0', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '440', 'a', 'Auteur', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '440', 'b', 'Pr?nom', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '440', 'c', 'qualificatif', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '440', 'd', 'num?rotation (chiffres romains)', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '440', 'f', 'Dates', '', 0, 0, 0, '', NULL, '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '440', 'j', 'Subdivision de forme', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '440', 't', 'Titre', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '440', 'x', 'Subdiv. de sujet', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '440', 'y', 'Subdiv. g?ographique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '440', 'z', 'Subdiv. chronologique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '450', '0', 'Formule introductive', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '450', '2', 'Code du syst?me d''indexation mati?re', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '450', '3', 'Identificateur de la notice d''autorit?', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '450', '5', 'Donn?es cod?es relatives aux mentions de formes rejet?es ou associ?es 0', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '450', '6', 'Donn?es de lien entre zones', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '450', '7', 'Ecriture de catalogage et ?criture de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '450', '8', 'Langue de catalogage et langue de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '450', 'a', 'El?ment d''entr?e', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '450', 'j', 'Subdivision de forme', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '450', 'x', 'Subdiv. de sujet', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '450', 'y', 'Subdiv. g?ographique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '450', 'z', 'Subdiv. chronologique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '500', '0', 'Formule introductive', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '500', '2', 'Code du syst?me d''indexation mati?re', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '500', '3', 'Identificateur de la notice d''autorit?', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '500', '4', 'Code de fonction', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '500', '5', 'Donn?es cod?es relatives aux mentions de formes rejet?es ou associ?es 0', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '500', '6', 'Donn?es de lien entre zones', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '500', '7', 'Ecriture de catalogage et ?criture de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '500', '8', 'Langue de catalogage et langue de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '500', 'a', 'El?ment d''entr?e', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '500', 'b', 'Autre ?l?ment du nom', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '500', 'c', 'Qualificatifs autres au les dates', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '500', 'd', 'Chiffres romains', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '500', 'f', 'Dates', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '500', 'g', 'D?veloppement des initiales du pr?nom', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '500', 'j', 'Subdivision de forme', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '500', 'x', 'Subdiv. de sujet', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '500', 'y', 'Subdiv. g?ographique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '500', 'z', 'Subdiv. chronologique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '510', '0', 'Formule introductive', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '510', '2', 'Code du syst?me d''indexation mati?re', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '510', '3', 'Identificateur de la notice d''autorit?', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '510', '4', 'Code de fonction', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '510', '5', 'Donn?es cod?es relatives aux mentions de formes rejet?es ou associ?es 0', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '510', '6', 'Donn?es de lien entre zones', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '510', '7', 'Ecriture de catalogage et ?criture de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '510', '8', 'Langue de catalogage et langue de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '510', 'a', 'El?ment d''entr?e', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '510', 'b', 'Subdivision', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '510', 'c', 'El?ment ajout? au nom ou qualificatif', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '510', 'd', 'Num?ro de congr?s', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '510', 'e', 'Lieu de congr?s', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '510', 'f', 'Date du congr?s', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '510', 'g', 'El?ment rejet?', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '510', 'h', 'Partie du nom autre que l''?l?ment d''entr?e et que l''?l?ment rejet? 0 0', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '510', 'j', 'subdivision de forme', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '510', 'x', 'Subdiv. de sujet', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '510', 'y', 'Subdiv. g?ographique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '510', 'z', 'Subdiv. chronologique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', '0', 'Formule introductive', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', '2', 'Code du syst?me d''indexation mati?re', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', '3', 'Identificateur de la notice d''autorit?', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', '5', 'Donn?es cod?es relatives aux mentions de formes rejet?es ou associ?es 0', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', '6', 'Donn?es de lien entre zones', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', '7', 'Ecriture de catalogage et ?criture de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', '8', 'Langue de catalogage et langue de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', 'a', 'El?ment d''entr?e', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', 'b', 'Indication g?n?rale du type de document', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', 'h', 'Num?ro de section ou de partie', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', 'i', 'Titre de section ou de partie', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', 'j', 'Subdivision de forme', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', 'k', 'Date de publication', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', 'l', 'Sous-vedette de forme', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', 'm', 'langue (quand elle fait partie de la vedette)', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', 'n', 'Autre informations', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', 'q', 'Version (ou date d''une version)', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', 'r', 'Distribution d''ex?cution (pour la musique)', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', 's', 'R?f?rences num?riques (pour la musique)', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', 'u', 'Tonalit? (pour la musique)', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', 'w', 'Mention d''arrangement (pour la musique)', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', 'x', 'Subdiv. de sujet', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', 'y', 'Subdiv. g?ographique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '530', 'z', 'Subdiv. chronologique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '540', '0', 'Formule introductive', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '540', '2', 'Code du syst?me d''indexation mati?re', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '540', '3', 'Identificateur de la notice d''autorit?', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '540', '5', 'Donn?es cod?es relatives aux mentions de formes rejet?es ou associ?es 0 0', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '540', '6', 'Donn?es de lien entre zones', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '540', '7', 'Ecriture de catalogage et ?criture de la racine de la vedette', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '540', '8', 'Langue de catalogage et langue de la racine de la vedette', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '540', 'a', 'Auteur', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '540', 'j', 'Subdivision de forme', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '540', 't', 'Titre', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '540', 'x', 'Subdiv. de sujet', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '540', 'y', 'Subdiv. g?ographique', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '540', 'z', 'Subdiv. chronologique', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '550', '0', 'Formule introductive', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '550', '2', 'Code du syst?me d''indexation mati?re', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '550', '3', 'Identificateur de la notice d''autorit?', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '550', '5', 'Donn?es cod?es relatives aux mentions de formes rejet?es ou associ?es 0', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '550', '6', 'Donn?es de lien entre zones', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '550', '7', 'Ecriture de catalogage et ?criture de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '550', '8', 'Langue de catalogage et langue de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '550', 'a', 'El?ment d''entr?e', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '550', 'j', 'Subdivision de forme', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '550', 'x', 'Subdiv. de sujet', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '550', 'y', 'Subdiv. g?ographique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '550', 'z', 'Subdiv. chronologique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '675', '3', 'Identificateur de la notice de classification', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '675', 'a', 'Indice CDU, isol? ou d?but d''une s?rie', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '675', 'b', 'Indice CDU, fin de s?rie', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '675', 'c', 'Termes explicatifs', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '675', 'v', 'Edition de la CDU', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '675', 'z', 'Langue de l''?dition', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '676', '3', 'Identificateur de la notice de classification', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '676', 'a', 'Indice CDD, isol? ou d?but d''une s?rie', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '676', 'b', 'Indice CDD, fin de s?rie', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '676', 'c', 'Termes explicatifs', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '676', 'v', 'Edition de la CDD', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '676', 'z', 'Langue de l''?dition', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '680', '3', 'Identificateur de la notice de classification', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '680', 'a', 'Indice LCC, isol? ou d?but d''une s?rie', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '680', 'b', 'Indice LCC, fin de s?rie', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '680', 'c', 'Termes explicatifs', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '686', '3', 'Identificateur de la notice de classification', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '686', 'a', 'Indice , isol? ou d?but d''une s?rie', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '686', 'b', 'Indice , fin de s?rie', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '686', 'c', 'Termes explicatifs', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '710', '2', 'Code du syst?me d''indexation mati?re', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '710', '3', 'Identificateur', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '710', '4', 'Code de fonction', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '710', '7', 'Ecriture de catalogage et ?criture de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '710', '8', 'Langue de catalogage et langue de la racine de la vedette', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '710', 'a', 'El?ment d''entr?e', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '710', 'b', 'Subdivision', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '710', 'c', 'El?ment ajout? au nom ou qualificatif', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '710', 'd', 'Num?ro de congr?s', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '710', 'e', 'Lieu du congr?s', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '710', 'f', 'Date du congr?s', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '710', 'g', 'El?ment rejet?', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '710', 'h', 'Partie du nom autre que l''?l?ment d''entr?e et que l''?l?ment rejet?', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '710', 'j', 'Subdivision de forme', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '710', 'x', 'Subdiv. de sujet', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '710', 'y', 'Subdiv. g?ographique', '', 1, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '710', 'z', 'Subdivision', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '801', 'a', 'Pays', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '801', 'b', 'Etablissement catalogueur', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '801', 'c', 'Date derni?re transaction', '', 0, 0, 0, '', '', '', NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '810', 'a', 'Citation', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '810', 'b', 'Information trouv?e', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '815', 'a', 'Citation', '', 1, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '820', 'a', 'Texte de la note', '', 1, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '825', 'a', 'Texte de la note', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '830', 'a', 'Texte de la note', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '835', 'a', 'Texte de la note', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '835', 'b', 'Vedette de remplacement', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '835', 'd', 'Date de la transaction', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '836', 'b', 'Vedette remplac?e', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '836', 'd', 'Date de transaction', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'a', 'Nom du serveur', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'b', 'Num?ro d''acc?s', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'c', 'Compression', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'd', 'Chemin d''acc?s', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'e', 'Date et heure de consultation et d''acc?s', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'f', 'Nom ?lectronique', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'g', 'Nom normalis? d''une ressource', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'h', 'Nom de l''utilisateur', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'i', 'Instruction', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'j', 'Bits par seconde', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'k', 'Mot de passe', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'l', 'Logon/login', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'm', 'Contact pour l''assistance technique', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'n', 'Adresse du serveur cit? dans la sous-zone $a', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'o', 'syst?me d''exploitation', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'p', 'Port', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'q', 'Type de format ?lectronique', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'r', 'Param?trage', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 's', 'Taille du fichier', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 't', 'Emulation du terminal', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'u', 'Adresse ?lectronique normalis?e (URL)', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'v', 'Heures d''acc?s', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'w', 'Num?ro d''identification de la notice', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'x', 'Note confidentielle', '', 0, 1, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'y', 'Mode d''acc?s', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '856', 'z', 'Note publique', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '886', '2', 'Code de syst?me', '', 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '886', 'a', 'Etiquette de la zone du format source', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); +INSERT INTO `auth_subfield_structure` (`authtypecode`, `tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `tab`, `authorised_value`, `value_builder`, `seealso`, `isurl`, `hidden`, `linkid`, `kohafield`, `frameworkcode`) VALUES ('', '886', 'b', 'Indicateurs et sous-zones de la zone du format source', '', 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, NULL, ''); diff --git a/installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/autorite_default.txt b/installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/autorite_default.txt new file mode 100644 index 0000000..a082b30 --- /dev/null +++ b/installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/autorite_default.txt @@ -0,0 +1 @@ +Structure des autorit?s UNIMARC par d?faut en Fran?ais. -- 1.7.0.4 From stephane.delaune at biblibre.com Mon Apr 4 16:02:53 2011 From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=) Date: Mon, 4 Apr 2011 16:02:53 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Corrected search for ISBN / ISSN Message-ID: <1301925773-10057-1-git-send-email-stephane.delaune@biblibre.com> From: Janusz Kaczmarek Signed-off-by: St?phane Delaune --- C4/Search.pm | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/C4/Search.pm b/C4/Search.pm index c69e787..9cf9a25 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -1146,7 +1146,6 @@ sub buildQuery { } # ISBN,ISSN,Standard Number, don't need special treatment elsif ( $index eq 'nb' || $index eq 'ns' ) { - $indexes_set++; ( $stemming, $auto_truncation, $weight_fields, $fuzzy_enabled, @@ -1161,7 +1160,7 @@ sub buildQuery { # Set default structure attribute (word list) my $struct_attr = q{}; - unless ( $indexes_set || !$index || $index =~ /(st-|phr|ext|wrdl)/ ) { + unless ( $indexes_set || !$index || $index =~ /(st-|phr|ext|wrdl|nb|ns)/ ) { $struct_attr = ",wrdl"; } @@ -1353,7 +1352,7 @@ sub buildQuery { # This is flawed , means we can't search anything with : in it # if user wants to do ccl or cql, start the query with that # $query =~ s/:/=/g; - $query =~ s/(?<=(ti|au|pb|su|an|kw|mc)):/=/g; + $query =~ s/(?<=(ti|au|pb|su|an|kw|mc|nb|ns)):/=/g; $query =~ s/(?<=(wrdl)):/=/g; $query =~ s/(?<=(trn|phr)):/=/g; $limit =~ s/:/=/g; -- 1.7.0.4 From frederic.durand at univ-lyon2.fr Mon Apr 4 17:51:50 2011 From: frederic.durand at univ-lyon2.fr (fdurand) Date: Mon, 4 Apr 2011 17:51:50 +0200 Subject: [Koha-patches] [PATCH 2/2] [SIGNED-OFF] Bug 5631 : (MT #2993) add EAN, PUC and Music-Number indexes Message-ID: <1301932310-28551-1-git-send-email-frederic.durand@univ-lyon2.fr> From: Henri-Damien LAURENT This fix add different "music" identifier to zebra indexes, for example it permit search through CDs via EAN. Signed-off-by: fdurand --- C4/Search.pm | 3 +++ etc/zebradb/ccl.properties | 6 ++++++ etc/zebradb/marc_defs/unimarc/biblios/record.abs | 4 ++++ 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/C4/Search.pm b/C4/Search.pm index c69e787..70d6194 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -865,6 +865,7 @@ sub getIndexes{ 'Date-of-acquisition', 'Date-of-publication', 'Dewey-classification', + 'EAN', 'extent', 'fic', 'fiction', @@ -902,6 +903,7 @@ sub getIndexes{ 'mc-rtype', 'mus', 'name', + 'Music-number', 'Name-geographic', 'Name-geographic-heading', 'Name-geographic-see', @@ -943,6 +945,7 @@ sub getIndexes{ 'su-to', 'su-ut', 'ut', + 'UPC', 'Term-genre-form', 'Term-genre-form-heading', 'Term-genre-form-see', diff --git a/etc/zebradb/ccl.properties b/etc/zebradb/ccl.properties index 59c2705..ee2553c 100644 --- a/etc/zebradb/ccl.properties +++ b/etc/zebradb/ccl.properties @@ -438,6 +438,12 @@ ns ISSN # #Identifier-stock 1028 A stock number that could be 037 # used for ordering the item. +Identifier-standard 1=1007 4=6 +ident Identifier-standard +upc 1=UPC +ean 1=EAN +music 1=Music-number + Stock-number 1=1028 #Identifier-thematic 1030 The numeric designation for a $n in the following: diff --git a/etc/zebradb/marc_defs/unimarc/biblios/record.abs b/etc/zebradb/marc_defs/unimarc/biblios/record.abs index 9406aac..84b3b50 100644 --- a/etc/zebradb/marc_defs/unimarc/biblios/record.abs +++ b/etc/zebradb/marc_defs/unimarc/biblios/record.abs @@ -39,6 +39,10 @@ melm 011$y ISSN:w,Identifier-standard:w # wrong ISSN melm 011$z ISSN:w,Identifier-standard:w +melm 071$a Music-number:w,Identifier-standard:w +melm 072$a UPC:w,Identifier-standard:w +melm 073$a EAN:w,Identifier-standard:w + melm 200$b itemtype:w,itype:w melm 995$r itemtype:w,itype:w -- 1.7.1 From stephane.delaune at biblibre.com Tue Apr 5 10:08:12 2011 From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=) Date: Tue, 5 Apr 2011 10:08:12 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Adds "do-not-truncate" in the search queries of Heading.pm Message-ID: <1301990892-4179-1-git-send-email-stephane.delaune@biblibre.com> From: Fr?d?rick Capovilla Signed-off-by: St?phane Delaune --- C4/Heading.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/C4/Heading.pm b/C4/Heading.pm index 9d7d98a..643d820 100644 --- a/C4/Heading.pm +++ b/C4/Heading.pm @@ -106,7 +106,7 @@ heading. sub authorities { my $self = shift; - my $query = qq(Match-heading,ext="$self->{'search_form'}"); + my $query = qq(Match-heading,do-not-truncate,ext="$self->{'search_form'}"); $query .= $self->_query_limiters(); my ($error, $results, $total_hits) = SimpleSearch( $query, undef, undef, [ "authorityserver" ] ); return $results; @@ -123,7 +123,7 @@ that are a preferred form of the heading. sub preferred_authorities { my $self = shift; - my $query = "Match-heading-see-from,ext='$self->{'search_form'}'"; + my $query = "Match-heading-see-from,do-not-truncate,ext='$self->{'search_form'}'"; $query .= $self->_query_limiters(); my ($error, $results, $total_hits) = SimpleSearch( $query, undef, undef, [ "authorityserver" ] ); return $results; -- 1.7.0.4 From jonathan.druart at biblibre.com Tue Apr 5 10:40:14 2011 From: jonathan.druart at biblibre.com (Jonathan Druart) Date: Tue, 5 Apr 2011 10:40:14 +0200 Subject: [Koha-patches] [PATCH 1/2] [SIGNED-OFF] Bug 5923 : Authorities list :removing link on Summary Message-ID: <1301992815-2065-1-git-send-email-jonathan.druart@biblibre.com> From: Henri-Damien LAURENT removing the link to authority details on authority List directly from summary And adding a generic link to details Signed-off-by: Jonathan Druart --- .../en/modules/authorities/searchresultlist.tmpl | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl index 01667e5..869203e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl @@ -51,7 +51,7 @@ function searchauthority() {
      Due date TitleCollectionStock numberBarcode Item TypeChecked out onBorrowerCall noChecked out onCall no Charge PricePatron
      ">, by ; , &itemnumber=#item">">, by ; , &itemnumber=#item"> " alt="" /> "> "> ()
      - + @@ -63,7 +63,8 @@ function searchauthority() { - + + - - - - + + + + + @@ -104,10 +126,24 @@ + + + + + + + + + + + + + +
      SummarySummary Used in
      ">">Details " class="button"> biblio(s) -- 1.7.1 From jonathan.druart at biblibre.com Tue Apr 5 10:40:15 2011 From: jonathan.druart at biblibre.com (Jonathan Druart) Date: Tue, 5 Apr 2011 10:40:15 +0200 Subject: [Koha-patches] [PATCH 2/2] [SIGNED-OFF] Bug 5923 : Removed link from variable $summary In-Reply-To: <1301992815-2065-1-git-send-email-jonathan.druart@biblibre.com> References: <1301992815-2065-1-git-send-email-jonathan.druart@biblibre.com> Message-ID: <1301992815-2065-2-git-send-email-jonathan.druart@biblibre.com> From: Julian Maurice Variable $summary contained and tag. They have been deleted. Signed-off-by: Jonathan Druart --- C4/AuthoritiesMarc.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm index 0122ca8..8ba7636 100644 --- a/C4/AuthoritiesMarc.pm +++ b/C4/AuthoritiesMarc.pm @@ -1044,7 +1044,7 @@ sub BuildSummary{ $narrowerterms =~s/-- \n$//; $seealso =~s/-- \n$//; $see =~s/-- \n$//; - $summary = "".$heading."
      ".($notes?"$notes
      ":""); + $summary = $heading."
      ".($notes?"$notes
      ":""); $summary.= '

      TG : '.$broaderterms.'

      ' if ($broaderterms); $summary.= '

      TS : '.$narrowerterms.'

      ' if ($narrowerterms); $summary.= '

      TA : '.$seealso.'

      ' if ($seealso); -- 1.7.1 From jonathan.druart at biblibre.com Tue Apr 5 10:50:42 2011 From: jonathan.druart at biblibre.com (Jonathan Druart) Date: Tue, 5 Apr 2011 10:50:42 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5914 : BuildUnimarchierarchies can go into an infinite loop Squashed commit of the following: Message-ID: <1301993442-2271-1-git-send-email-jonathan.druart@biblibre.com> From: Chris Cormack commit 58e18dfa4109fcdde3c71675ff07ed6aae86b258 Author: Henri-Damien LAURENT Date: Tue May 18 16:54:49 2010 +0200 Bug 5914 : followup BuildUnimarchierarchies fixing infinite loop commit bbbcb7fcb0ff36eb8a072d9b0442996e71ebb247 Author: Henri-Damien LAURENT Date: Tue May 18 13:11:44 2010 +0200 Bug 5914 : BuildUnimarcHierarchies : Fixing infinite loop When referenced authority in 5XX$3 would be the same as the current authid, the script would get into infinite loop Conflicts solved: C4/AuthoritiesMarc.pm commit 3581021997bc8965af807738c47d5fd27f2fd97f Author: Henri-Damien LAURENT Date: Wed Apr 7 15:15:59 2010 +0200 Bug 5914 : BuildUnimarcHierarchies : Fixing infinite loop When referenced authority in 5XX$3 would be the same as the current authid, the script would get into infinite loop Signed-off-by: St?phane Delaune Signed-off-by: Jonathan Druart --- C4/AuthoritiesMarc.pm | 66 +++++++++++++++++++++++++----------------------- 1 files changed, 34 insertions(+), 32 deletions(-) diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm index 0122ca8..d06ffc4 100644 --- a/C4/AuthoritiesMarc.pm +++ b/C4/AuthoritiesMarc.pm @@ -1125,33 +1125,34 @@ sub BuildUnimarcHierarchies{ my $data = GetHeaderAuthority($authid); if ($data->{'authtrees'} and not $force){ return $data->{'authtrees'}; - } elsif ($data->{'authtrees'}){ - $hierarchies=$data->{'authtrees'}; +# } elsif ($data->{'authtrees'}){ +# $hierarchies=$data->{'authtrees'}; } else { my $record = GetAuthority($authid); my $found; - if ($record){ - foreach my $field ($record->field('550')){ - if ($field->subfield('5') && $field->subfield('5') eq 'g'){ - my $parentrecord = GetAuthority($field->subfield('3')); - my $localresult=$hierarchies; - my $trees; - $trees = BuildUnimarcHierarchies($field->subfield('3')); - my @trees; - if ($trees=~/;/){ - @trees = split(/;/,$trees); - } else { - push @trees, $trees; - } - foreach (@trees){ - $_.= ",$authid"; - } - @globalresult = (@globalresult, at trees); - $found=1; - } - $hierarchies=join(";", at globalresult); - } - } + return unless $record; + foreach my $field ($record->field('5..')){ + if ($field->subfield('5') && $field->subfield('5') eq 'g'){ + my $subfauthid=_get_authid_subfield($field); + next if ($subfauthid eq $authid); + my $parentrecord = GetAuthority($subfauthid); + my $localresult=$hierarchies; + my $trees; + $trees = BuildUnimarcHierarchies($subfauthid); + my @trees; + if ($trees=~/;/){ + @trees = split(/;/,$trees); + } else { + push @trees, $trees; + } + foreach (@trees){ + $_.= ",$authid"; + } + @globalresult = (@globalresult, at trees); + $found=1; + } + $hierarchies=join(";", at globalresult); + } #Unless there is no ancestor, I am alone. $hierarchies="$authid" unless ($hierarchies); } @@ -1188,15 +1189,16 @@ sub BuildUnimarcHierarchy{ my $parents=""; my $children=""; my (@loopparents, at loopchildren); foreach my $field ($record->field('5..')){ - my $subfauthid=_get_authid_subfield($field); - if ($field->subfield('5') && $field->subfield('a')){ - if ($field->subfield('5') eq 'h'){ - push @loopchildren, { "childauthid"=>$subfauthid,"childvalue"=>$field->subfield('a')}; - }elsif ($field->subfield('5') eq 'g'){ - push @loopparents, { "parentauthid"=>$subfauthid,"parentvalue"=>$field->subfield('a')}; - } + my $subfauthid=_get_authid_subfield($field); + if ($subfauthid && $field->subfield('5') && $field->subfield('a')){ + if ($field->subfield('5') eq 'h'){ + push @loopchildren, { "childauthid"=>$field->subfield('3'),"childvalue"=>$field->subfield('a')}; + } + elsif ($field->subfield('5') eq 'g'){ + push @loopparents, { "parentauthid"=>$field->subfield('3'),"parentvalue"=>$field->subfield('a')}; + } # brothers could get in there with an else - } + } } $cell{"ifparents"}=1 if (scalar(@loopparents)>0); $cell{"ifchildren"}=1 if (scalar(@loopchildren)>0); -- 1.7.1 From jonathan.druart at biblibre.com Tue Apr 5 11:04:42 2011 From: jonathan.druart at biblibre.com (Jonathan Druart) Date: Tue, 5 Apr 2011 11:04:42 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5915 : C4::AuthoritiesMarc AddAuthority Message-ID: <1301994282-2554-1-git-send-email-jonathan.druart@biblibre.com> From: Paul Poulain Fixing 100$a simple error: Sometimes, language is encoded fre50 and not frey50. This patch adds check for that problem Signed-off-by: Jonathan Druart --- C4/AuthoritiesMarc.pm | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm index 0122ca8..6d6d9c1 100644 --- a/C4/AuthoritiesMarc.pm +++ b/C4/AuthoritiesMarc.pm @@ -651,17 +651,21 @@ sub AddAuthority { } } - if (($format eq "UNIMARCAUTH") && (!$record->subfield('100','a'))){ + if ($format eq "UNIMARCAUTH") { $record->leader(" nx j22 ") unless ($record->leader()); my $date=POSIX::strftime("%Y%m%d",localtime); - if ($record->field('100')){ + if (my $string=$record->subfield('100',"a")){ + $string=~s/fre50/frey50/; + $record->field('100')->update('a'=>$string); + } + elsif ($record->field('100')){ $record->field('100')->update('a'=>$date."afrey50 ba0"); - } else { - $record->append_fields( - MARC::Field->new('100',' ',' ' - ,'a'=>$date."afrey50 ba0") - ); - } + } else { + $record->append_fields( + MARC::Field->new('100',' ',' ' + ,'a'=>$date."afrey50 ba0") + ); + } } my ($auth_type_tag, $auth_type_subfield) = get_auth_type_location($authtypecode); if (!$authid and $format eq "MARC21") { -- 1.7.1 From alex.arnaud at biblibre.com Tue Apr 5 11:08:34 2011 From: alex.arnaud at biblibre.com (Alex Arnaud) Date: Tue, 5 Apr 2011 11:08:34 +0200 Subject: [Koha-patches] [PATCH] Bug #6052 - BranchTransfer Limit :Adds a default value Message-ID: <1301994514-642-1-git-send-email-alex.arnaud@biblibre.com> --- admin/branch_transfer_limits.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/admin/branch_transfer_limits.pl b/admin/branch_transfer_limits.pl index 1d85937..abba127 100755 --- a/admin/branch_transfer_limits.pl +++ b/admin/branch_transfer_limits.pl @@ -65,7 +65,7 @@ for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{b # Set the template language for the correct limit type my $limit_phrase = 'Collection Code'; -my $limitType = C4::Context->preference("BranchTransferLimitsType"); +my $limitType = C4::Context->preference("BranchTransferLimitsType") || "ccode"; if ( $limitType eq 'itemtype' ) { $limit_phrase = 'Item Type'; } -- 1.6.3.3 From julian.maurice at biblibre.com Tue Apr 5 11:17:49 2011 From: julian.maurice at biblibre.com (Julian Maurice) Date: Tue, 5 Apr 2011 11:17:49 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6013 : removed z3950 host in label when cataloguing Message-ID: <1301995069-9103-1-git-send-email-julian.maurice@biblibre.com> From: Nicolas Morin removed the full host in the label of the z3950 targets: it made for very very long labels, which were unecessary since we allow librarians to provide a user friendly name for the host. Signed-off-by: Julian Maurice --- .../prog/en/modules/cataloguing/z3950_search.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl index f0b11f8..1b6f761 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl @@ -110,7 +110,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : " value="" /> - +

      -- 1.7.4.1 From stephane.delaune at biblibre.com Tue Apr 5 11:19:01 2011 From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=) Date: Tue, 5 Apr 2011 11:19:01 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5868: Subject indexes do not search 6xx fields Message-ID: <1301995141-24101-1-git-send-email-stephane.delaune@biblibre.com> From: Jared Camins-Esakov Prior to this change, the named Zebra Subject phrase index did not include the 600, 610, 611, 630, 654, 655, 656, and 657 fields. This could be seen in searches such as: "su:Bible and su:N.T. and su:Matthew and su:Textbooks", which should return a result with the following field: =630 00$aBible.$pN.T.$pMatthew$vTextbooks. This did not formerly work. This patch modifies etc/zebradb/marc_defs/marc21/biblios/records.abs. This file must be installed and biblios reindexed in Zebra for the changes made here to affect records already in the catalog. Signed-off-by: St?phane Delaune --- etc/zebradb/marc_defs/marc21/biblios/record.abs | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/etc/zebradb/marc_defs/marc21/biblios/record.abs b/etc/zebradb/marc_defs/marc21/biblios/record.abs index 601cafd..5cd5612 100755 --- a/etc/zebradb/marc_defs/marc21/biblios/record.abs +++ b/etc/zebradb/marc_defs/marc21/biblios/record.abs @@ -161,19 +161,19 @@ melm 600$a Name-and-title,Name,Personal-name,Subject-name-personal,Subject melm 600$t Name-and-title,Title,Subject melm 600$9 Koha-Auth-Number #melm 600 Name,Personal-name,Subject-heading,Subject-name-personal -melm 600 Name,Personal-name,Subject-name-personal,Subject +melm 600 Name,Personal-name,Subject-name-personal,Subject,Subject:p melm 610$a Name-and-title melm 610$t Name-and-title,Title melm 610$9 Koha-Auth-Number -melm 610 Name,Subject,Corporate-name +melm 610 Name,Subject,Subject:p,Corporate-name melm 611$a Name-and-title melm 611$t Name-and-title,Title melm 611$9 Koha-Auth-Number -melm 611 Conference-name,Name,Subject +melm 611 Conference-name,Name,Subject,Subject:p melm 630$n Thematic-number melm 630$r Music-key melm 630$9 Koha-Auth-Number -melm 630 Subject +melm 630 Subject,Subject:p melm 650$9 Koha-Auth-Number melm 650 Subject,Subject:p melm 651$9 Koha-Auth-Number @@ -183,13 +183,13 @@ melm 652$9 Koha-Auth-Number melm 653$9 Koha-Auth-Number melm 653 Subject,Subject:p melm 654$9 Koha-Auth-Number -melm 654 Subject +melm 654 Subject,Subject:p melm 655$9 Koha-Auth-Number -melm 655 Subject +melm 655 Subject,Subject:p melm 656$9 Koha-Auth-Number -melm 656 Subject +melm 656 Subject,Subject:p melm 657$9 Koha-Auth-Number -melm 657 Subject +melm 657 Subject,Subject:p melm 658$a curriculum:w,curriculum:p melm 658$b curriculum:w,curriculum:p melm 658$c curriculum:w,curriculum:p -- 1.7.0.4 From paul.poulain at biblibre.com Tue Apr 5 11:24:00 2011 From: paul.poulain at biblibre.com (paul.poulain at biblibre.com) Date: Tue, 5 Apr 2011 11:24:00 +0200 Subject: [Koha-patches] [PATCH][SIGNED-OFF Bug 5946 : (MT1177) aqplan.pl, fix the problem of calculating the total remaining. Message-ID: <1301995440-20158-1-git-send-email-paul.poulain@biblibre.com> From: Alex Arnaud Bug 5946 followup : (MT1236) aqplan.pl - Fixe the problem of unrounded sums Signed-off-by: Paul Poulain --- koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 21 +++++++++++++------ .../prog/en/modules/admin/aqplan.tmpl | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js index b5ec994..1b924a2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js @@ -557,12 +557,14 @@ function getElementsByClass( searchClass, domNode, tagName) { function calcTotalRow(cell) { - var bud_id = cell.className; + var string = cell.name; + var pos = string.indexOf(",", 0); + var bud_id = string.substring(0, pos); var val1 = cell.value; - var remainingTotal = document.getElementById("budget_est_"+bud_id).textContent; + var remainingTotal = document.getElementById("budget_est_"+bud_id); var remainingNew =0; var budgetTotal = document.getElementById("budget_tot_"+bud_id ).textContent; - var arr = getElementsByClass(bud_id); + var arr = getElementsByClass(cell.className); budgetTotal = budgetTotal.replace(/\,/, ""); @@ -594,7 +596,7 @@ function calcTotalRow(cell) { function autoFillRow(bud_id) { - var remainingTotal = document.getElementById("budget_est_"+bud_id).textContent; + var remainingTotal = document.getElementById("budget_est_"+bud_id); var remainingNew = new Number; var budgetTotal = document.getElementById("budget_tot_"+bud_id ).textContent; var arr = getElementsByClass("plan_entry_" + bud_id); @@ -602,20 +604,25 @@ function autoFillRow(bud_id) { budgetTotal = budgetTotal.replace(/\,/, ""); var qty = new Number; // get the totals + var novalueArr = new Array(); for ( var i=0, len=arr.length; i

      Planning for by

      - +" /> -- 1.7.1 From matthias.meusburger at biblibre.com Tue Apr 5 11:32:41 2011 From: matthias.meusburger at biblibre.com (Matthias Meusburger) Date: Tue, 5 Apr 2011 11:32:41 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6040 : Adding some error handling to the opac export Message-ID: <1301995961-17454-1-git-send-email-matthias.meusburger@biblibre.com> From: Chris Cormack Signed-off-by: Matthias Meusburger --- opac/opac-export.pl | 44 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 37 insertions(+), 7 deletions(-) diff --git a/opac/opac-export.pl b/opac/opac-export.pl index 4c53aff..f9d3c25 100755 --- a/opac/opac-export.pl +++ b/opac/opac-export.pl @@ -1,5 +1,24 @@ #!/usr/bin/perl -use HTML::Template::Pro; + +# Parts Copyright Catalyst IT 2011 +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, +# Suite 330, Boston, MA 02111-1307 USA +# + + use strict; use warnings; @@ -22,6 +41,7 @@ if ($op eq "export") { $sth=$dbh->prepare("SELECT marc FROM biblioitems WHERE biblionumber =?"); $sth->execute($biblionumber); } + my $error; while (my ($marc) = $sth->fetchrow) { if ($marc){ @@ -41,21 +61,31 @@ if ($op eq "export") { elsif ($format =~ /bibtex/) { $marc = marc2bibtex(C4::Biblio::GetMarcBiblio($biblionumber),$biblionumber); }elsif ($format =~ /dc/) { - my $error; - ($error,$marc) = marc2dcxml($marc,1); + ($error,$marc) = marc2dcxml($marc,1); $format = "dublin-core.xml"; } elsif ($format =~ /marc8/) { - $marc = changeEncoding($marc,"MARC","MARC21","MARC-8"); - $marc = $marc->as_usmarc(); + ($error,$marc) = changeEncoding($marc,"MARC","MARC21","MARC-8"); + if (! $error){ + $marc = $marc->as_usmarc(); + } } elsif ($format =~ /utf8/) { #default } - print $query->header( + if ($error){ + print $query->header(); + print $query->start_html(); + print "

      An error occured

      "; + print $error; + print $query->end_html(); + } + else { + print $query->header( -type => 'application/octet-stream', -attachment=>"bib-$biblionumber.$format"); - print $marc; + print $marc; + } } } } -- 1.7.1 From stephane.delaune at biblibre.com Tue Apr 5 11:50:48 2011 From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=) Date: Tue, 5 Apr 2011 11:50:48 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5213 - Suffix number sequence not resetting properly in hmyymmincr barcode autogen pattern Message-ID: <1301997048-24456-1-git-send-email-stephane.delaune@biblibre.com> From: Chris Nighswonger Two things are happening. First, the SELECT does not account for a branchcode greater than 2 chars. This is fixed by just selecting the final four digits representing the incremental suffix from the barcode field. Second, the incremental suffix (4 digits) is not rolling back over to zero when reaching 9999. This pattern probably needs help. It should allow for cataloging of 10000 items per month as is. I would not recommend doing barcode numbering this way, but need to support it since it is in use in at least one library. This patch also impliments strict and warnings per Bug 2505 Signed-off-by: St?phane Delaune --- cataloguing/value_builder/barcode.pl | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cataloguing/value_builder/barcode.pl b/cataloguing/value_builder/barcode.pl index 3c6ef74..c05ec48 100755 --- a/cataloguing/value_builder/barcode.pl +++ b/cataloguing/value_builder/barcode.pl @@ -1,8 +1,6 @@ #!/usr/bin/perl - -# $Id: barcode.pl,v 1.1.2.2 2006/09/20 02:24:42 kados Exp $ - # Copyright 2000-2002 Katipo Communications +# Parts copyright 2008-2010 Foundations Bible College # # This file is part of Koha. # @@ -19,10 +17,13 @@ # with Koha; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -#use strict; -#use warnings; FIXME - Bug 2505 +use strict; +use warnings; +no warnings 'redefine'; # otherwise loading up multiple plugins fills the log with subroutine redefine warnings + use C4::Context; require C4::Dates; + my $DEBUG = 0; =head1 @@ -99,11 +100,12 @@ sub plugin_javascript { } elsif ($autoBarcodeType eq 'hbyymmincr') { # Generates a barcode where hb = home branch Code, yymm = year/month catalogued, incr = incremental number, reset yearly -fbcit $year = substr($year, -2); - $query = "SELECT MAX(CAST(SUBSTRING(barcode,7,4) AS signed)) FROM items WHERE barcode REGEXP ?"; + $query = "SELECT MAX(CAST(SUBSTRING(barcode,-4) AS signed)) AS number FROM items WHERE barcode REGEXP ?"; my $sth = $dbh->prepare($query); $sth->execute("^[a-zA-Z]{1,}$year"); while (my ($count)= $sth->fetchrow_array) { $nextnum = $count if $count; + $nextnum = 0 if $nextnum == 9999; # this sequence only allows for cataloging 10000 books per month warn "Existing incremental number = $nextnum" if $DEBUG; } $nextnum++; -- 1.7.0.4 From magnus at enger.priv.no Tue Apr 5 11:57:21 2011 From: magnus at enger.priv.no (Magnus Enger) Date: Tue, 5 Apr 2011 11:57:21 +0200 Subject: [Koha-patches] [PATCH 2/2] Bug 5980 Change Location to Shelving Location Message-ID: <1301997441-4723-1-git-send-email-magnus@enger.priv.no> --- .../prog/en/includes/search_indexes.inc | 2 +- .../opac-tmpl/prog/en/modules/opac-advsearch.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc index c738ed6..83bbda2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc @@ -14,7 +14,7 @@ - + diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl index 419be67..13d9caf 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl @@ -69,7 +69,7 @@ - + -- 1.7.1 From paul.poulain at biblibre.com Tue Apr 5 12:05:16 2011 From: paul.poulain at biblibre.com (paul.poulain at biblibre.com) Date: Tue, 5 Apr 2011 12:05:16 +0200 Subject: [Koha-patches] [PATCH] BZ5961: follow-up, save currency Message-ID: <1301997916-22250-1-git-send-email-paul.poulain@biblibre.com> From: Paul Poulain Cait noticed that currency was not saved properly in the aqorders table. note a surprise, as the 3.2 had no currency feature and 5961 had been written against 3.2 anyway, this patch fixes the problem --- acqui/addorderiso2709.pl | 36 +++++++++++++++++++- .../prog/en/modules/acqui/addorderiso2709.tmpl | 9 +++++ 2 files changed, 44 insertions(+), 1 deletions(-) diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index a77b111..c46263a 100755 --- a/acqui/addorderiso2709.pl +++ b/acqui/addorderiso2709.pl @@ -87,8 +87,41 @@ if ($op eq ""){ # } elsif ($op eq "batch_details"){ #display lines inside the selected batch + # get currencies (for change rates calcs if needed) + my $active_currency = GetCurrency(); + my $default_currency; + if (! $data->{currency} ) { # New order no currency set + if ( $bookseller->{listprice} ) { + $default_currency = $bookseller->{listprice}; + } + else { + $default_currency = $active_currency->{currency}; + } + } + my @rates = GetCurrencies(); + + # ## @rates + + my @loop_currency = (); + for my $curr ( @rates ) { + my $selected; + if ($data->{currency} ) { + $selected = $curr->{currency} eq $data->{currency}; + } + else { + $selected = $curr->{currency} eq $default_currency; + } + push @loop_currency, { + currcode => $curr->{currency}, + rate => $curr->{rate}, + selected => $selected, + } + } + $template->param("batch_details" => 1, - "basketno" => $cgiparams->{'basketno'}); + "basketno" => $cgiparams->{'basketno'}, + loop_currencies => \@loop_currency, + ); import_biblios_list($template, $cgiparams->{'import_batch_id'}); if ( C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber ) { # prepare empty item form @@ -166,6 +199,7 @@ if ($op eq ""){ "budget_id", $budget_id, "uncertainprice", 1, "sort1", $cgiparams->{'sort1'},"sort2", $cgiparams->{'sort2'}, "notes", $cgiparams->{'notes'}, "budget_id", $cgiparams->{'budget_id'}, + "currency",$cgiparams->{'currency'}, ); # get the price if there is one. # filter by storing only the 1st number diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl index 7365030..1bd65e4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl @@ -156,6 +156,14 @@ Budget: " /> +
    9. + + +
    10. +
    11. +
    12. -- 1.7.1 From Katrin.Fischer.83 at web.de Tue Apr 5 12:07:26 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Tue, 5 Apr 2011 12:07:26 +0200 Subject: [Koha-patches] [PATCH] Bug 6056: Notes were not shown when modifying order line Message-ID: <1301998046-27817-1-git-send-email-Katrin.Fischer.83@web.de> To test: - add a new order in acquisitions with some content in the notes field - save order - modify order - Notes field will be shown as empty The template variable for notes is missing from the template. --- .../prog/en/modules/acqui/neworderempty.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl index e2895c6..d8b34ce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl @@ -405,7 +405,7 @@ $(document).ready(function()
    13. - +
    14. The 2 following fields are available for your own usage. They can be useful for statistical purposes
      -- 1.7.1 From magnus at enger.priv.no Tue Apr 5 12:12:45 2011 From: magnus at enger.priv.no (Magnus Enger) Date: Tue, 5 Apr 2011 12:12:45 +0200 Subject: [Koha-patches] [PATCH] Bug 5980 : Adding location to search indexes Message-ID: <1301998365-5116-1-git-send-email-magnus@enger.priv.no> From: Henri-Damien LAURENT Adding location to search indexes in search pages Original patch amended to change Location to Shelving Location. --- .../prog/en/includes/search_indexes.inc | 1 + .../opac-tmpl/prog/en/modules/opac-advsearch.tmpl | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc index aa140f2..83bbda2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc @@ -14,6 +14,7 @@ + diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl index bd0752c..13d9caf 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl @@ -69,6 +69,7 @@ + -- 1.7.1 From Katrin.Fischer.83 at web.de Tue Apr 5 12:16:43 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Tue, 5 Apr 2011 12:16:43 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5961: Filling a basket from the reservoir Message-ID: <1301998603-433-1-git-send-email-Katrin.Fischer.83@web.de> From: Paul Poulain creating a form order to import all records from a staged file at once. All lines of the choosen staged file will be created with the same budget and item (if applicable depending on AcqCreateItem syspref) BibLibre bug #4007 Signed-off-by: Katrin Fischer Bug 5961: follow-up : use matchingrules selected in manage-stage-import instead of FindDuplicate Now, bulk importing the iso2709 result in adding biblio or connecting to an existing one Signed-off-by: Katrin Fischer BZ5961: follow-up, save currency Cait noticed that currency was not saved properly in the aqorders table. note a surprise, as the 3.2 had no currency feature and 5961 had been written against 3.2 anyway, this patch fixes the problem Signed-off-by: Katrin Fischer --- C4/Biblio.pm | 68 ++++ acqui/addorderiso2709.pl | 370 ++++++++++++-------- .../prog/en/modules/acqui/addorderiso2709.tmpl | 141 +++++++- 3 files changed, 407 insertions(+), 172 deletions(-) diff --git a/C4/Biblio.pm b/C4/Biblio.pm index a0e06f6..75e9a3d 100644 --- a/C4/Biblio.pm +++ b/C4/Biblio.pm @@ -79,6 +79,8 @@ BEGIN { &GetUsedMarcStructure &GetXmlBiblio &GetCOinSBiblio + &GetMarcPrice + &GetMarcQuantity &GetAuthorisedValueDesc &GetMarcStructure @@ -1243,6 +1245,72 @@ sub GetCOinSBiblio { return $coins_value; } + +=head2 GetMarcPrice + +return the prices in accordance with the Marc format. +=cut + +sub GetMarcPrice { + my ( $record, $marcflavour ) = @_; + my @listtags; + my $subfield; + + if ( $marcflavour eq "MARC21" ) { + @listtags = ('345', '020'); + $subfield="c"; + } elsif ( $marcflavour eq "UNIMARC" ) { + @listtags = ('345', '010'); + $subfield="d"; + } else { + return; + } + + for my $field ( $record->field(@listtags) ) { + for my $subfield_value ($field->subfield($subfield)){ + #check value + return $subfield_value if ($subfield_value); + } + } + return 0; # no price found +} + +=head2 GetMarcQuantity + +return the quantity of a book. Used in acquisition only, when importing a file an iso2709 from a bookseller +Warning : this is not really in the marc standard. In Unimarc, Electre (the most widely used bookseller) use the 969$a + +=cut + +sub GetMarcQuantity { + my ( $record, $marcflavour ) = @_; + my @listtags; + my $subfield; + + if ( $marcflavour eq "MARC21" ) { + return 0 + } elsif ( $marcflavour eq "UNIMARC" ) { + @listtags = ('969'); + $subfield="a"; + } else { + return; + } + + for my $field ( $record->field(@listtags) ) { + for my $subfield_value ($field->subfield($subfield)){ + #check value + if ($subfield_value) { + # in France, the cents separator is the , but sometimes, ppl use a . + # in this case, the price will be x100 when unformatted ! Replace the . by a , to get a proper price calculation + $subfield_value =~ s/\./,/ if C4::Context->preference("CurrencyFormat") eq "FR"; + return $subfield_value; + } + } + } + return 0; # no price found +} + + =head2 GetAuthorisedValueDesc my $subfieldvalue =get_authorised_value_desc( diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index 29f8143..c46263a 100755 --- a/acqui/addorderiso2709.pl +++ b/acqui/addorderiso2709.pl @@ -3,9 +3,8 @@ #A script that lets the user populate a basket from an iso2709 file #the script first displays a list of import batches, then when a batch is selected displays all the biblios in it. #The user can then pick which biblios he wants to order -#written by john.soros at biblibre.com 01/12/2008 -# Copyright 2008 - 2009 BibLibre SARL +# Copyright 2008 - 2011 BibLibre SARL # # This file is part of Koha. # @@ -25,20 +24,26 @@ use strict; use warnings; use CGI; +use Number::Format qw(:all); + use C4::Context; use C4::Auth; use C4::Input; use C4::Output; -use C4::ImportBatch qw/GetImportBatchRangeDesc GetNumberOfNonZ3950ImportBatches GetImportRecordMatches GetImportBibliosRange GetImportBatchOverlayAction GetImportBatchNoMatchAction GetImportBatchItemAction GetImportRecordMarc GetImportBatch/; +use C4::ImportBatch; use C4::Matcher; use C4::Search qw/FindDuplicate BiblioAddAuthorities/; -use C4::Acquisition qw/NewOrder/; +use C4::Acquisition; use C4::Biblio; use C4::Items; -use C4::Koha qw/GetItemTypes/; -use C4::Budgets qw/GetBudgets/; -use C4::Acquisition qw/NewOrderItem GetBasket/; +use C4::Koha; +use C4::Budgets; +use C4::Acquisition; use C4::Bookseller qw/GetBookSellerFromId/; +use C4::Dates; +use C4::Suggestions; # GetSuggestion +use C4::Branch; # GetBranches +use C4::Members; my $input = new CGI; my ($template, $loggedinuser, $cookie) = get_template_and_user({ @@ -53,6 +58,7 @@ my $cgiparams = $input->Vars; my $op = $cgiparams->{'op'}; my $booksellerid = $input->param('booksellerid'); my $bookseller = GetBookSellerFromId($booksellerid); +my $data; $template->param(scriptname => "/cgi-bin/koha/acqui/addorderiso2709.pl", booksellerid => $booksellerid, @@ -69,17 +75,73 @@ if (! $cgiparams->{'basketno'}){ die "Basketnumber required to order from iso2709 file import"; } +# +# 1st step = choose the file to import into acquisition +# if ($op eq ""){ $template->param("basketno" => $cgiparams->{'basketno'}); #display batches import_batches_list($template); +# +# 2nd step = display the content of the choosen file +# } elsif ($op eq "batch_details"){ #display lines inside the selected batch + # get currencies (for change rates calcs if needed) + my $active_currency = GetCurrency(); + my $default_currency; + if (! $data->{currency} ) { # New order no currency set + if ( $bookseller->{listprice} ) { + $default_currency = $bookseller->{listprice}; + } + else { + $default_currency = $active_currency->{currency}; + } + } + my @rates = GetCurrencies(); + + # ## @rates + + my @loop_currency = (); + for my $curr ( @rates ) { + my $selected; + if ($data->{currency} ) { + $selected = $curr->{currency} eq $data->{currency}; + } + else { + $selected = $curr->{currency} eq $default_currency; + } + push @loop_currency, { + currcode => $curr->{currency}, + rate => $curr->{rate}, + selected => $selected, + } + } + $template->param("batch_details" => 1, - "basketno" => $cgiparams->{'basketno'}); + "basketno" => $cgiparams->{'basketno'}, + loop_currencies => \@loop_currency, + ); import_biblios_list($template, $cgiparams->{'import_batch_id'}); - -} elsif ($op eq 'import_records'){ + if ( C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber ) { + # prepare empty item form + my $cell = PrepareItemrecordDisplay( '', '', '', 'ACQ' ); + + # warn "==> ".Data::Dumper::Dumper($cell); + unless ($cell) { + $cell = PrepareItemrecordDisplay( '', '', '', '' ); + $template->param( 'NoACQframework' => 1 ); + } + my @itemloop; + push @itemloop, $cell; + + $template->param( items => \@itemloop ); + } +# +# 3rd step = import the records +# +} elsif ( $op eq 'import_records' ) { + my $num=FormatNumber(); #import selected lines $template->param('basketno' => $cgiparams->{'basketno'}); # Budget_id is mandatory for adding an order, we just add a default, the user needs to modify this aftewards @@ -95,141 +157,97 @@ if ($op eq ""){ my $import_batch_id = $cgiparams->{'import_batch_id'}; my $biblios = GetImportBibliosRange($import_batch_id); for my $biblio (@$biblios){ - if($cgiparams->{'order-'.$biblio->{'import_record_id'}}){ - my ($marcblob, $encoding) = GetImportRecordMarc($biblio->{'import_record_id'}); - my $marcrecord = MARC::Record->new_from_usmarc($marcblob) || die "couldn't translate marc information"; - my ($duplicatetitle, $biblionumber); - if(!(($biblionumber,$duplicatetitle) = FindDuplicate($marcrecord))){ -#FIXME: missing: marc21 support (should be same with different field) - if ( C4::Context->preference("marcflavour") eq 'UNIMARC' ) { - my $itemtypeid = "itemtype-" . $biblio->{'import_record_id'}; - $marcrecord->field(200)->update("b" => $cgiparams->{$itemtypeid}); - } - # add the biblio - my $bibitemnum; - # remove ISBN - - my ($isbnfield,$isbnsubfield) = GetMarcFromKohaField('biblioitems.isbn',''); - if ( $marcrecord->field($isbnfield) ) { - foreach my $field ( $marcrecord->field($isbnfield) ) { - foreach my $subfield ( $field->subfield($isbnsubfield) ) { - my $newisbn = $field->subfield($isbnsubfield); - $newisbn =~ s/-//g; - $field->update( $isbnsubfield => $newisbn ); - } + # 1st insert the biblio, or find it through matcher + my ( $marcblob, $encoding ) = GetImportRecordMarc( $biblio->{'import_record_id'} ); + my $marcrecord = MARC::Record->new_from_usmarc($marcblob) || die "couldn't translate marc information"; + my $match = GetImportRecordMatches( $biblio->{'import_record_id'}, 1 ); + my $biblionumber=$#$match > -1?$match->[0]->{'biblionumber'}:0; + + unless ( $biblionumber ) { + # add the biblio + my $bibitemnum; + + # remove ISBN - + my ( $isbnfield, $isbnsubfield ) = GetMarcFromKohaField( 'biblioitems.isbn', '' ); + if ( $marcrecord->field($isbnfield) ) { + foreach my $field ( $marcrecord->field($isbnfield) ) { + foreach my $subfield ( $field->subfield($isbnsubfield) ) { + my $newisbn = $field->subfield($isbnsubfield); + $newisbn =~ s/-//g; + $field->update( $isbnsubfield => $newisbn ); } } - - ( $biblionumber, $bibitemnum ) = AddBiblio( $marcrecord, $cgiparams->{'frameworkcode'} || '' ); - } else { - warn("Duplicate item found: ", $biblionumber, "; Duplicate: ", $duplicatetitle); } + ( $biblionumber, $bibitemnum ) = AddBiblio( $marcrecord, $cgiparams->{'frameworkcode'} || '' ); + # 2nd add authorities if applicable if (C4::Context->preference("BiblioAddsAuthorities")){ my ($countlinked,$countcreated)=BiblioAddAuthorities($marcrecord, $cgiparams->{'frameworkcode'}); } - my $patron = C4::Members->GetMember(borrowernumber => $loggedinuser); - my $branch = C4::Branch->GetBranchDetail($patron->{branchcode}); - my ($invoice); - my %orderinfo = ("biblionumber", $biblionumber, - "basketno", $cgiparams->{'basketno'}, - "quantity", $cgiparams->{'quantityrec-' . $biblio->{'import_record_id'}}, - "branchcode", $branch, - "booksellerinvoicenumber", $invoice, - "budget_id", $budget_id, - "uncertainprice", 1, - ); - # get the price if there is one. - # filter by storing only the 1st number - # we suppose the currency is correct, as we have no possibilities to get it. - if ($marcrecord->subfield("345","d")) { - $orderinfo{'listprice'} = $marcrecord->subfield("345","d"); - if ($orderinfo{'listprice'} =~ /^([\d\.,]*)/) { - $orderinfo{'listprice'} = $1; - $orderinfo{'listprice'} =~ s/,/\./; - my $basket = GetBasket($orderinfo{basketno}); - my $bookseller = GetBookSellerFromId($basket->{booksellerid}); - # '//' is like '||' but tests for defined, rather than true - my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0; - $orderinfo{'unitprice'} = $orderinfo{listprice} - ($orderinfo{listprice} * ($bookseller->{discount} / 100)); - $orderinfo{'ecost'} = $orderinfo{unitprice}; - } else { - $orderinfo{'listprice'} = 0; - } - $orderinfo{'rrp'} = $orderinfo{'listprice'}; - } - elsif ($marcrecord->subfield("010","d")) { - $orderinfo{'listprice'} = $marcrecord->subfield("010","d"); - if ($orderinfo{'listprice'} =~ /^([\d\.,]*)/) { - $orderinfo{'listprice'} = $1; - $orderinfo{'listprice'} =~ s/,/\./; - my $basket = GetBasket($orderinfo{basketno}); - my $bookseller = GetBookSellerFromId($basket->{booksellerid}); - my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0; - $orderinfo{'unitprice'} = $orderinfo{listprice} - ($orderinfo{listprice} * ($bookseller->{discount} / 100)); - $orderinfo{'ecost'} = $orderinfo{unitprice}; - } else { - $orderinfo{'listprice'} = 0; - } - $orderinfo{'rrp'} = $orderinfo{'listprice'}; - } - # remove uncertainprice flag if we have found a price in the MARC record - $orderinfo{uncertainprice} = 0 if $orderinfo{listprice}; - my $basketno; - ( $basketno, $ordernumber ) = NewOrder(\%orderinfo); - - # now, add items if applicable - # parse all items sent by the form, and create an item just for the import_record_id we are dealing with - # this is not optimised, but it's working ! - if (C4::Context->preference('AcqCreateItem') eq 'ordering') { - my @tags = $input->param('tag'); - my @subfields = $input->param('subfield'); - my @field_values = $input->param('field_value'); - my @serials = $input->param('serial'); - my @itemids = $input->param('itemid'); # hint : in iso2709, the itemid contains the import_record_id, not an item id. It is used to get the right item, as we have X biblios. - my @ind_tag = $input->param('ind_tag'); - my @indicator = $input->param('indicator'); - #Rebuilding ALL the data for items into a hash - # parting them on $itemid. - my %itemhash; - my $range=scalar(@itemids); - - my $i = 0; - my @items; - for my $itemid (@itemids){ - my $realitemid; #javascript generated random itemids, in the form itemid-randomnumber, $realitemid is the itemid, while $itemid is the itemide parsed from the html - if ($itemid =~ m/(\d+)-.*/){ - my @splits = split(/-/, $itemid); - $realitemid = $splits[0]; - } - if ( ( $realitemid && $cgiparams->{'order-'. $realitemid} && $realitemid eq $biblio->{import_record_id}) || ($itemid && $cgiparams->{'order-'. $itemid} && $itemid eq $biblio->{import_record_id}) ){ - my ($item, $found); - for my $tmpitem (@items){ - if ($tmpitem->{itemid} eq $itemid){ - $item = $tmpitem; - $found = 1; - } - } - push @{$item->{tags}}, $tags[$i]; - push @{$item->{subfields}}, $subfields[$i]; - push @{$item->{field_values}}, $field_values[$i]; - push @{$item->{ind_tag}}, $ind_tag[$i]; - push @{$item->{indicator}}, $indicator[$i]; - $item->{itemid} = $itemid; - if (! $found){ - push @items, $item; - } - } - ++$i - } - foreach my $item (@items){ - my $xml = TransformHtmlToXml( $item->{'tags'}, - $item->{'subfields'}, - $item->{'field_values'}, - $item->{'ind_tag'}, - $item->{'indicator'}); - my $record=MARC::Record::new_from_xml($xml, 'UTF-8'); - my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber); - NewOrderItem( $itemnumber, $ordernumber); - } + } else { + SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' ); + } + # 3rd add order + my $patron = C4::Members->GetMember( borrowernumber => $loggedinuser ); + my $branch = C4::Branch->GetBranchDetail( $patron->{branchcode} ); + my ($invoice); + # get quantity in the MARC record (1 if none) + my $quantity = GetMarcQuantity($marcrecord, C4::Context->preference('marcflavour')) || 1; + my %orderinfo = ( + "biblionumber", $biblionumber, "basketno", $cgiparams->{'basketno'}, + "quantity", $quantity, "branchcode", $branch, + "booksellerinvoicenumber", $invoice, + "budget_id", $budget_id, "uncertainprice", 1, + "sort1", $cgiparams->{'sort1'},"sort2", $cgiparams->{'sort2'}, + "notes", $cgiparams->{'notes'}, "budget_id", $cgiparams->{'budget_id'}, + "currency",$cgiparams->{'currency'}, + ); + # get the price if there is one. + # filter by storing only the 1st number + # we suppose the currency is correct, as we have no possibilities to get it. + my $price= GetMarcPrice($marcrecord, C4::Context->preference('marcflavour')); + if ($price){ + $price = $num->unformat_number($price); + } + if ($price){ + $orderinfo{'listprice'} = $price; + eval "use C4::Acquisition qw/GetBasket/;"; + eval "use C4::Bookseller qw/GetBookSellerFromId/;"; + my $basket = GetBasket( $orderinfo{basketno} ); + my $bookseller = GetBookSellerFromId( $basket->{booksellerid} ); + my $gst = $bookseller->{gstrate} || C4::Context->preference("gist") || 0; + $orderinfo{'unitprice'} = $orderinfo{listprice} - ( $orderinfo{listprice} * ( $bookseller->{discount} / 100 ) ); + $orderinfo{'ecost'} = $orderinfo{unitprice}; + } else { + $orderinfo{'listprice'} = 0; + } + $orderinfo{'rrp'} = $orderinfo{'listprice'}; + + # remove uncertainprice flag if we have found a price in the MARC record + $orderinfo{uncertainprice} = 0 if $orderinfo{listprice}; + my $basketno; + ( $basketno, $ordernumber ) = NewOrder( \%orderinfo ); + + # 4th, add items if applicable + # parse the item sent by the form, and create an item just for the import_record_id we are dealing with + # this is not optimised, but it's working ! + if ( C4::Context->preference('AcqCreateItem') eq 'ordering' ) { + my @tags = $input->param('tag'); + my @subfields = $input->param('subfield'); + my @field_values = $input->param('field_value'); + my @serials = $input->param('serial'); + my @ind_tag = $input->param('ind_tag'); + my @indicator = $input->param('indicator'); + my $item; + push @{ $item->{tags} }, $tags[0]; + push @{ $item->{subfields} }, $subfields[0]; + push @{ $item->{field_values} }, $field_values[0]; + push @{ $item->{ind_tag} }, $ind_tag[0]; + push @{ $item->{indicator} }, $indicator[0]; + my $xml = TransformHtmlToXml( \@tags, \@subfields, \@field_values, \@ind_tag, \@indicator ); + my $record = MARC::Record::new_from_xml( $xml, 'UTF-8' ); + for (my $qtyloop=1;$qtyloop <=$quantity;$qtyloop++) { + my ( $biblionumber, $bibitemnum, $itemnumber ) = AddItemFromMarc( $record, $biblionumber ); + NewOrderItem( $itemnumber, $ordernumber ); } } } @@ -237,6 +255,65 @@ if ($op eq ""){ print $input->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=".$cgiparams->{'basketno'}); exit; } + +my $budgets = GetBudgets(); +my $budget_id = @$budgets[0]->{'budget_id'}; +# build bookfund list +my $borrower = GetMember( 'borrowernumber' => $loggedinuser ); +my ( $flags, $homebranch ) = ( $borrower->{'flags'}, $borrower->{'branchcode'} ); +my $budget = GetBudget($budget_id); + +# build budget list +my $budget_loop = []; +my $budgets = GetBudgetHierarchy( q{}, $borrower->{branchcode}, $borrower->{borrowernumber} ); +foreach my $r ( @{$budgets} ) { + if ( !defined $r->{budget_amount} || $r->{budget_amount} == 0 ) { + next; + } + push @{$budget_loop}, + { b_id => $r->{budget_id}, + b_txt => $r->{budget_name}, + b_sel => ( $r->{budget_id} == $budget_id ) ? 1 : 0, + }; +} +$template->param( budget_loop => $budget_loop,); + +my $CGIsort1; +if ($budget) { # its a mod .. + if ( defined $budget->{'sort1_authcat'} ) { # with custom Asort* planning values + $CGIsort1 = GetAuthvalueDropbox( 'sort1', $budget->{'sort1_authcat'}, $data->{'sort1'} ); + } +} elsif ( scalar(@$budgets) ) { + $CGIsort1 = GetAuthvalueDropbox( 'sort1', @$budgets[0]->{'sort1_authcat'}, '' ); +} else { + $CGIsort1 = GetAuthvalueDropbox( 'sort1', '', '' ); +} + +# if CGIsort is successfully fetched, the use it +# else - failback to plain input-field +if ($CGIsort1) { + $template->param( CGIsort1 => $CGIsort1 ); +} else { + $template->param( sort1 => $data->{'sort1'} ); +} + +my $CGIsort2; +if ($budget) { + if ( defined $budget->{'sort2_authcat'} ) { + $CGIsort2 = GetAuthvalueDropbox( 'sort2', $budget->{'sort2_authcat'}, $data->{'sort2'} ); + } +} elsif ( scalar(@$budgets) ) { + $CGIsort2 = GetAuthvalueDropbox( 'sort2', @$budgets[0]->{sort2_authcat}, '' ); +} else { + $CGIsort2 = GetAuthvalueDropbox( 'sort2', '', '' ); +} + +if ($CGIsort2) { + $template->param( CGIsort2 => $CGIsort2 ); +} else { + $template->param( sort2 => $data->{'sort2'} ); +} + output_html_with_http_headers $input, $cookie, $template->output; @@ -268,12 +345,7 @@ sub import_biblios_list { my $batch = GetImportBatch($import_batch_id,'staged'); my $biblios = GetImportBibliosRange($import_batch_id,'','','staged'); my @list = (); -# # Itemtype is mandatory for adding a biblioitem, we just add a default, the user needs to modify this aftewards -# my $itemtypehash = GetItemTypes(); -# my @itemtypes; -# for my $key (sort { $itemtypehash->{$a}->{description} cmp $itemtypehash->{$b}->{description} } keys %$itemtypehash) { -# push(@itemtypes, $itemtypehash->{$key}); -# } + foreach my $biblio (@$biblios) { my $citation = $biblio->{'title'}; $citation .= " $biblio->{'author'}" if $biblio->{'author'}; @@ -293,18 +365,8 @@ sub import_biblios_list { match_biblionumber => $#$match > -1 ? $match->[0]->{'biblionumber'} : 0, match_citation => $#$match > -1 ? $match->[0]->{'title'} . ' ' . $match->[0]->{'author'} : '', match_score => $#$match > -1 ? $match->[0]->{'score'} : 0, -# itemtypes => \@itemtypes, ); -# if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber) { -# # prepare empty item form -# my $cell = PrepareItemrecordDisplay(); -# my @itemloop; -# push @itemloop,$cell; -# $cellrecord{'items'} = \@itemloop; -# } push @list, \%cellrecord; - - } my $num_biblios = $batch->{'num_biblios'}; my $overlay_action = GetImportBatchOverlayAction($import_batch_id); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl index 94637d1..1bd65e4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl @@ -8,6 +8,7 @@ + + @@ -83,14 +104,15 @@
    15. Total    
      -
      +
    Show all :  -- 1.6.3.3 From Katrin.Fischer.83 at web.de Tue Apr 5 13:40:55 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Tue, 5 Apr 2011 13:40:55 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] bug #6054 - Add a filter by active budget on acqui-home Message-ID: <1302003655-19230-1-git-send-email-Katrin.Fischer.83@web.de> From: Alex Arnaud Signed-off-by: Katrin Fischer --- acqui/acqui-home.pl | 18 +++++++- .../prog/en/modules/acqui/acqui-home.tmpl | 46 +++++++++++++++++-- 2 files changed, 58 insertions(+), 6 deletions(-) diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl index ed96a9e..0d9c207 100755 --- a/acqui/acqui-home.pl +++ b/acqui/acqui-home.pl @@ -88,6 +88,11 @@ my $totordered = 0; my $totcomtd = 0; my $totavail = 0; +my $total_active = 0; +my $totspent_active = 0; +my $totordered_active = 0; +my $totavail_active = 0; + foreach my $budget ( @{$budget_arr} ) { $budget->{budget_code_indent} =~ s/\ /\ \;/g; @@ -121,6 +126,13 @@ foreach my $budget ( @{$budget_arr} ) { $totordered += $budget->{'budget_ordered'}; $totavail += $budget->{'budget_avail'}; + if ($budget->{budget_period_active}){ + $total_active += $budget->{'budget_amount'}; + $totspent_active += $budget->{'budget_spent'}; + $totordered_active += $budget->{'budget_ordered'}; + $totavail_active += $budget->{'budget_avail'}; + } + for my $field (qw( budget_amount budget_spent budget_ordered budget_avail ) ) { $budget->{$field} = $num_formatter->format_price( $budget->{$field} ); } @@ -135,7 +147,11 @@ $template->param( totordered => $num_formatter->format_price($totordered), totcomtd => $num_formatter->format_price($totcomtd), totavail => $num_formatter->format_price($totavail), - suggestions_count => $suggestions_count, + total_active => $num_formatter->format_price($total_active), + totspent_active => $num_formatter->format_price($totspent_active), + totordered_active => $num_formatter->format_price($totordered_active), + totavail_active => $num_formatter->format_price($totavail_active), + suggestions_count => $suggestions_count, ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl index 02f5f22..66df546 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl @@ -1,6 +1,27 @@ Koha › Acquisitions + + @@ -83,14 +104,15 @@ Total     - - - - + + + + + @@ -104,10 +126,24 @@ + + + + + + + + + + + + + + - + Show all :  -- 1.7.1 From paul.poulain at biblibre.com Tue Apr 5 13:42:57 2011 From: paul.poulain at biblibre.com (paul.poulain at biblibre.com) Date: Tue, 5 Apr 2011 13:42:57 +0200 Subject: [Koha-patches] [PATCH][SIGNED-OFF] Bug 6056: Notes were not shown when modifying order line Message-ID: <1302003777-25449-1-git-send-email-paul.poulain@biblibre.com> From: Katrin Fischer To test: - add a new order in acquisitions with some content in the notes field - save order - modify order - Notes field will be shown as empty The template variable for notes is missing from the template. Signed-off-by: Paul Poulain --- .../prog/en/modules/acqui/neworderempty.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl index e2895c6..d8b34ce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl @@ -405,7 +405,7 @@ $(document).ready(function()
  • - +
  • The 2 following fields are available for your own usage. They can be useful for statistical purposes
    -- 1.7.1 From cnighswonger at foundations.edu Tue Apr 5 13:51:40 2011 From: cnighswonger at foundations.edu (Chris Nighswonger) Date: Tue, 5 Apr 2011 07:51:40 -0400 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 4276: XSLT subject tracings only use subfield a In-Reply-To: References: <1300301846-10739-1-git-send-email-nengard@bywatersolutions.com> Message-ID: On Mon, Apr 4, 2011 at 8:14 PM, Jared Camins-Esakov < jcamins at cpbibliography.com> wrote: > I'm not sure if this should apply to 3.2.x. It's in a liminal space between > bug fix and enhancement. It's definitely a bug, but it's a fairly > significant behavior change. What does the community think? Resubmit for > 3.2.x, or leave it 3.4+ only? The bug report posits it as a bug and as such it should be fixed in the current stable branch rather than being ignored in favor of a combined bugfix/enhancement. This, however, is a broken existing advertised feature and therefore does not constitute "new" functionality which is the course criteria I use for inclusion decisions related to 3.2.x. In short, resubmit it rebased against 3.2.x, and I will include it. Kind Regards, Chris > On Mon, Apr 4, 2011 at 7:59 PM, Chris Nighswonger < > cnighswonger at foundations.edu> wrote: > >> This patch does not apply cleanly to 3.2.x. If it should apply, please >> fixup and resubmit with [3.2.x] in the subject line. >> >> Kind Regards, >> Chris >> >> >> >> On Wed, Mar 16, 2011 at 2:57 PM, Nicole C. Engard < >> nengard at bywatersolutions.com> wrote: >> >>> From: Jared Camins-Esakov >>> >>> When XSLT is enabled, the subject tracings on the details view (both OPAC >>> and >>> Intranet) previously only searched on the subfield 'a'. In addition, >>> searches >>> failed when the tracing included parentheses, and the XSLT display did >>> not >>> include subfields other than abcdvxyz, even for those 6xx tags that have >>> other >>> subfields. >>> >>> This patch adds a syspref: TraceSubjectSubdivisons. When >>> TraceSubjectSubdivisions is set to "Don't include" (default), the subject >>> tracings in the XSLT details view will only search on subfield 'a'. When >>> TraceSubjectSubdivisions is set to "Include", the subject tracings will >>> search >>> on all subfields, not just subfield 'a'. >>> >>> Signed-off-by: Nicole C. Engard >>> --- >>> C4/XSLT.pm | 2 +- >>> installer/data/mysql/de-DE/mandatory/sysprefs.sql | 2 +- >>> installer/data/mysql/en/mandatory/sysprefs.sql | 1 + >>> .../1-Obligatoire/unimarc_standard_systemprefs.sql | 1 + >>> installer/data/mysql/it-IT/necessari/sysprefs.sql | 1 + >>> installer/data/mysql/pl-PL/mandatory/sysprefs.sql | 1 + >>> ...m_preferences_full_optimal_for_install_only.sql | 1 + >>> ...m_preferences_full_optimal_for_install_only.sql | 1 + >>> installer/data/mysql/updatedatabase.pl | 7 +++++++ >>> .../en/modules/admin/preferences/searching.pref | 7 +++++++ >>> .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 14 ++++++++++++-- >>> .../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 4 +++- >>> .../prog/en/xslt/MARC21slim2OPACDetail.xsl | 14 ++++++++++++-- >>> .../opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 4 +++- >>> 14 files changed, 52 insertions(+), 8 deletions(-) >>> >>> diff --git a/C4/XSLT.pm b/C4/XSLT.pm >>> index 2d1facc..f349376 100644 >>> --- a/C4/XSLT.pm >>> +++ b/C4/XSLT.pm >>> @@ -131,7 +131,7 @@ sub XSLTParse4Display { >>> foreach my $syspref ( qw/ hidelostitems OPACURLOpenInNewWindow >>> DisplayOPACiconsXSLT URLLinkText viewISBD >>> OPACBaseURL TraceCompleteSubfields >>> - UseAuthoritiesForTracings / ) >>> + UseAuthoritiesForTracings >>> TraceSubjectSubdivisions / ) >>> { >>> my $sp = C4::Context->preference( $syspref ); >>> next unless defined($sp); >>> diff --git a/installer/data/mysql/de-DE/mandatory/sysprefs.sql >>> b/installer/data/mysql/de-DE/mandatory/sysprefs.sql >>> index a2018ed..9f6b2f7 100644 >>> --- a/installer/data/mysql/de-DE/mandatory/sysprefs.sql >>> +++ b/installer/data/mysql/de-DE/mandatory/sysprefs.sql >>> @@ -291,4 +291,4 @@ INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> ('TraceCompleteSubfields','0','Force subject tracings to only match complete >>> subfields.','0','YesNo'); >>> INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> ('UseAuthoritiesForTracings','1','Use authority record numbers for subject >>> tracings instead of heading strings.','0','YesNo'); >>> INSERT INTO systempreferences (variable,value,explanation,options,type) >>> VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose >>> the branch they want to pickup their hold from','1','YesNo'); >>> - >>> +INSERT INTO systempreferences (variable,value,explanation,options,type) >>> VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all >>> subdivisions for subject tracings.','1','YesNo'); >>> diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql >>> b/installer/data/mysql/en/mandatory/sysprefs.sql >>> index 6d382c7..8020d11 100644 >>> --- a/installer/data/mysql/en/mandatory/sysprefs.sql >>> +++ b/installer/data/mysql/en/mandatory/sysprefs.sql >>> @@ -292,3 +292,4 @@ INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> ('TraceCompleteSubfields','0','Force subject tracings to only match complete >>> subfields.','0','YesNo'); >>> INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> ('UseAuthoritiesForTracings','1','Use authority record numbers for subject >>> tracings instead of heading strings.','0','YesNo'); >>> INSERT INTO systempreferences (variable,value,explanation,options,type) >>> VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose >>> the branch they want to pickup their hold from','1','YesNo'); >>> +INSERT INTO systempreferences (variable,value,explanation,options,type) >>> VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all >>> subdivisions for subject tracings.','1','YesNo'); >>> diff --git >>> a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql >>> b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql >>> index cc1d954..6a9079c 100644 >>> --- >>> a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql >>> +++ >>> b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql >>> @@ -293,4 +293,5 @@ INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> ('TraceCompleteSubfields','0','Force subject tracings to only match complete >>> subfields.','0','YesNo'); >>> INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> ('UseAuthoritiesForTracings','1','Use authority record numbers for subject >>> tracings instead of heading strings.','0','YesNo'); >>> INSERT INTO systempreferences (variable,value,explanation,options,type) >>> VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose >>> the branch they want to pickup their hold from','1','YesNo'); >>> +INSERT INTO systempreferences (variable,value,explanation,options,type) >>> VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all >>> subdivisions for subject tracings.','1','YesNo'); >>> >>> diff --git a/installer/data/mysql/it-IT/necessari/sysprefs.sql >>> b/installer/data/mysql/it-IT/necessari/sysprefs.sql >>> index 08abec5..c27a13d 100644 >>> --- a/installer/data/mysql/it-IT/necessari/sysprefs.sql >>> +++ b/installer/data/mysql/it-IT/necessari/sysprefs.sql >>> @@ -278,4 +278,5 @@ INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> ('TraceCompleteSubfields','0','Force subject tracings to only match complete >>> subfields.','0','YesNo'); >>> INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> ('UseAuthoritiesForTracings','1','Use authority record numbers for subject >>> tracings instead of heading strings.','0','YesNo'); >>> INSERT INTO systempreferences (variable,value,explanation,options,type) >>> VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose >>> the branch they want to pickup their hold from','1','YesNo'); >>> +INSERT INTO systempreferences (variable,value,explanation,options,type) >>> VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all >>> subdivisions for subject tracings.','1','YesNo'); >>> >>> diff --git a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql >>> b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql >>> index cfbca16..13ca437 100644 >>> --- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql >>> +++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql >>> @@ -290,4 +290,5 @@ INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> ('TraceCompleteSubfields','0','Force subject tracings to only match complete >>> subfields.','0','YesNo'); >>> INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> ('UseAuthoritiesForTracings','1','Use authority record numbers for subject >>> tracings instead of heading strings.','0','YesNo'); >>> INSERT INTO systempreferences (variable,value,explanation,options,type) >>> VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose >>> the branch they want to pickup their hold from','1','YesNo'); >>> +INSERT INTO systempreferences (variable,value,explanation,options,type) >>> VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all >>> subdivisions for subject tracings.','1','YesNo'); >>> >>> diff --git >>> a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql >>> b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql >>> index 5ffcd7b..a4a7707 100644 >>> --- >>> a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql >>> +++ >>> b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql >>> @@ -345,3 +345,4 @@ INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> ('TraceCompleteSubfields','0','Force subject tracings to only match complete >>> subfields.','0','YesNo'); >>> INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> ('UseAuthoritiesForTracings','1','Use authority record numbers for subject >>> tracings instead of heading strings.','0','YesNo'); >>> INSERT INTO systempreferences (variable,value,explanation,options,type) >>> VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose >>> the branch they want to pickup their hold from','1','YesNo'); >>> +INSERT INTO systempreferences (variable,value,explanation,options,type) >>> VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all >>> subdivisions for subject tracings.','1','YesNo'); >>> diff --git >>> a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql >>> b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql >>> index bceb62b..b3da1cf 100644 >>> --- >>> a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql >>> +++ >>> b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql >>> @@ -370,3 +370,4 @@ INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> ('TraceCompleteSubfields','0','Force subject tracings to only match complete >>> subfields.','0','YesNo'); >>> INSERT INTO `systempreferences` >>> (variable,value,explanation,options,type) VALUES >>> ('UseAuthoritiesForTracings','1','Use authority record numbers for subject >>> tracings instead of heading strings.','0','YesNo'); >>> INSERT INTO systempreferences (variable,value,explanation,options,type) >>> VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose >>> the branch they want to pickup their hold from','1','YesNo'); >>> +INSERT INTO systempreferences (variable,value,explanation,options,type) >>> VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all >>> subdivisions for subject tracings.','1','YesNo'); >>> diff --git a/installer/data/mysql/updatedatabase.plb/installer/data/mysql/ >>> updatedatabase.pl >>> index 66e9828..0b39a8d 100755 >>> --- a/installer/data/mysql/updatedatabase.pl >>> +++ b/installer/data/mysql/updatedatabase.pl >>> @@ -4090,6 +4090,13 @@ if (C4::Context->preference("Version") < >>> TransformToNum($DBversion)) { >>> SetVersion ($DBversion); >>> } >>> >>> +$DBversion = 'XXX'; >>> +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { >>> + $dbh->do("INSERT INTO systempreferences >>> (variable,value,explanation,options,type) VALUES >>> ('TraceSubjectSubdivisions', 1, 'Create searches on all subdivisions for >>> subject tracings.','1','YesNo')"); >>> + print "Upgrade to $DBversion done ( include subdivisions when >>> generating subject tracing searches )\n"; >>> + SetVersion ($DBversion); >>> +} >>> + >>> =head1 FUNCTIONS >>> >>> =head2 DropAllForeignKeys($table) >>> diff --git >>> a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref >>> b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref >>> index 5ff267f..e69b17e 100644 >>> --- >>> a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref >>> +++ >>> b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref >>> @@ -62,6 +62,13 @@ Searching: >>> yes: Force >>> no: "Don't force" >>> - subject tracings in the OPAC and Staff Client to search >>> only for complete-subfield matches. >>> + - >>> + - pref: TraceSubjectSubdivisions >>> + default: 0 >>> + choices: >>> + yes: Include >>> + no: "Don't include" >>> + - subdivisions for searches generated by clicking on subject >>> tracings. >>> Search Form: >>> - >>> - Show checkboxes to search by >>> diff --git >>> a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >>> b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >>> index 3072ce0..390b8b7 100644 >>> --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >>> +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >>> @@ -21,6 +21,7 @@ >>> >> select="marc:sysprefs/marc:syspref[@name='OPACBaseURL']"/> >>> >> test="marc:sysprefs/marc:syspref[@name='TraceCompleteSubfields']='1'">,complete-subfield >>> >> select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/> >>> + >> select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/> >>> >>> >>> >>> @@ -421,14 +422,23 @@ >>> >>> /cgi-bin/koha/catalogue/ >>> search.pl?q=an:>> select="marc:subfield[@code=9]"/> >>> >>> + >>> + /cgi-bin/koha/catalogue/ >>> search.pl?q= >>> + >> name="codes">abcdfgklmnopqrstvxyz >>> + and >>> >>> + (su>> select="$SubjectModifier"/>:" >>> + >> name="suffix">") >>> + >>> + >>> + >>> >>> - /cgi-bin/koha/catalogue/ >>> search.pl?q=su:>> select="marc:subfield[@code='a']"/> >>> + /cgi-bin/koha/catalogue/ >>> search.pl?q=su:">> select="marc:subfield[@code='a']"/>" >>> >>> >>> >>> >>> >>> - >> name="codes">abcdtvxyz >>> + >> name="codes">abcdfgklmnopqrstvxyz >>> >> name="subdivCodes">vxyz >>> -- >>> >>> >>> diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl >>> b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl >>> index 0cd4559..05a1d83 100644 >>> --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl >>> +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl >>> @@ -24,13 +24,15 @@ >>> >>> >>> >>> >>> + >>> + >>> >>> >>> >>> >>> >>> >>> - >> select="text()"/> >>> + >> select="$prefix"/>>> select="$suffix"/> >>> >>> >>> >>> diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl >>> b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl >>> index b5e60b9..095a642 100755 >>> --- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl >>> +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl >>> @@ -25,6 +25,7 @@ >>> >>> >> test="marc:sysprefs/marc:syspref[@name='TraceCompleteSubfields']='1'">,complete-subfield >>> >> select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/> >>> + >> select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/> >>> >>> >>> >>> @@ -478,14 +479,23 @@ >>> >>> /cgi-bin/koha/ >>> opac-search.pl?q=an:>> select="marc:subfield[@code=9]"/> >>> >>> + >>> + /cgi-bin/koha/ >>> opac-search.pl?q= >>> + >> name="codes">abcdfgklmnopqrstvxyz >>> + and >>> >>> + (su>> select="$SubjectModifier"/>:" >>> + >> name="suffix">") >>> + >>> + >>> + >>> >>> - /cgi-bin/koha/ >>> opac-search.pl?q=su>> select="$SubjectModifier"/>:>> select="marc:subfield[@code='a']"/> >>> + /cgi-bin/koha/ >>> opac-search.pl?q=su>> select="$SubjectModifier"/>:">> select="marc:subfield[@code='a']"/>" >>> >>> >>> >>> >>> >>> - >> name="codes">abcdtvxyz >>> + >> name="codes">abcdfgklmnopqrstvxyz >>> >> name="subdivCodes">vxyz >>> -- >>> >>> >>> diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl >>> b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl >>> index 559de13..4ffc031 100644 >>> --- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl >>> +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl >>> @@ -24,13 +24,15 @@ >>> >>> >>> >>> >>> + >>> + >>> >>> >>> >>> >>> >>> >>> - >> select="text()"/> >>> + >> select="$prefix"/>>> select="$suffix"/> >>> >>> >>> >>> -- >>> 1.7.2.3 >>> >>> _______________________________________________ >>> Koha-patches mailing list >>> Koha-patches at lists.koha-community.org >>> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches >>> website : http://www.koha-community.org/ >>> git : http://git.koha-community.org/ >>> bugs : http://bugs.koha-community.org/ >>> >> >> >> _______________________________________________ >> Koha-patches mailing list >> Koha-patches at lists.koha-community.org >> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches >> website : http://www.koha-community.org/ >> git : http://git.koha-community.org/ >> bugs : http://bugs.koha-community.org/ >> > > > > -- > Jared Camins-Esakov > Freelance bibliographer, C & P Bibliography Services, LLC > (phone) +1 (917) 727-3445 > (e-mail) jcamins at cpbibliography.com > (web) http://www.cpbibliography.com/ > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From jcamins at bywatersolutions.com Tue Apr 5 14:03:56 2011 From: jcamins at bywatersolutions.com (Jared Camins-Esakov) Date: Tue, 5 Apr 2011 08:03:56 -0400 Subject: [Koha-patches] [PATCH] Bug 3543: split NLM call numbers in label creator Message-ID: <1302005036-1538-1-git-send-email-jcamins@bywatersolutions.com> Split NLM call numbers using the same rules as those used for Library of Congress call numbers. --- C4/Labels/Label.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/C4/Labels/Label.pm b/C4/Labels/Label.pm index 0ea2de9..0c98d6f 100644 --- a/C4/Labels/Label.pm +++ b/C4/Labels/Label.pm @@ -408,7 +408,7 @@ sub draw_label_text { # Fields which hold call number data FIXME: ( 060? 090? 092? 099? ) my @callnumber_list = qw(itemcallnumber 050a 050b 082a 952o 995k); if ((grep {$field->{'code'} =~ m/$_/} @callnumber_list) and ($self->{'printing_type'} eq 'BIB') and ($self->{'callnum_split'})) { # If the field contains the call number, we do some sp - if ($cn_source eq 'lcc') { + if ($cn_source eq 'lcc' || $cn_source eq 'nlm') { # NLM and LCC should be split the same way @label_lines = _split_lccn($field_data); @label_lines = _split_ccn($field_data) if !@label_lines; # If it was not a true lccn, try it as a custom call number push (@label_lines, $field_data) if !@label_lines; # If it was not that, send it on unsplit -- 1.7.2.3 From jcamins at bywatersolutions.com Tue Apr 5 14:04:26 2011 From: jcamins at bywatersolutions.com (Jared Camins-Esakov) Date: Tue, 5 Apr 2011 08:04:26 -0400 Subject: [Koha-patches] [PATCH] Bug 5859: Allow user to set encoding for import Message-ID: <1302005066-1572-1-git-send-email-jcamins@bywatersolutions.com> Rather than having options for MARC21 and UNIMARC in the "Character encoding" dropdown, the user should be able to select the appropriate character encoding. The default retains the current behavior, which is to allow the system to guess which character encoding is in use. However, it should be noticed that this is almost always wrong for non-UTF8 records with non-ASCII characters. Specifying a character set is much more reliable if you're not using UTF-8. --- C4/ImportBatch.pm | 11 +++++++---- .../prog/en/modules/tools/stage-marc-import.tmpl | 8 ++------ tools/stage-marc-import.pl | 8 ++++---- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/C4/ImportBatch.pm b/C4/ImportBatch.pm index 145e5d9..b6db406 100644 --- a/C4/ImportBatch.pm +++ b/C4/ImportBatch.pm @@ -210,7 +210,7 @@ sub ModBiblioInBatch { =head2 BatchStageMarcRecords ($batch_id, $num_records, $num_items, @invalid_records) = - BatchStageMarcRecords($marc_flavor, $marc_records, $file_name, + BatchStageMarcRecords($encoding, $marc_records, $file_name, $comments, $branch_code, $parse_items, $leave_as_staging, $progress_interval, $progress_callback); @@ -218,7 +218,7 @@ sub ModBiblioInBatch { =cut sub BatchStageMarcRecords { - my $marc_flavor = shift; + my $encoding = shift; my $marc_records = shift; my $file_name = shift; my $comments = shift; @@ -258,13 +258,16 @@ sub BatchStageMarcRecords { &$progress_callback($rec_num); } my ($marc_record, $charset_guessed, $char_errors) = - MarcToUTF8Record($marc_blob, C4::Context->preference("marcflavour")); + MarcToUTF8Record($marc_blob, C4::Context->preference("marcflavour"), $encoding); + + $encoding = $charset_guessed unless $encoding; + my $import_record_id; if (scalar($marc_record->fields()) == 0) { push @invalid_records, $marc_blob; } else { $num_valid++; - $import_record_id = AddBiblioToBatch($batch_id, $rec_num, $marc_record, $marc_flavor, int(rand(99999)), 0); + $import_record_id = AddBiblioToBatch($batch_id, $rec_num, $marc_record, $encoding, int(rand(99999)), 0); if ($parse_items) { my @import_items_ids = AddItemsToImportBiblio($batch_id, $import_record_id, $marc_record, 0); $num_items += scalar(@import_items_ids); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tmpl index 8660db0..a1f0b79 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tmpl @@ -96,12 +96,8 @@ function CheckForm(f) {
  • - - - - - - + +
  • diff --git a/tools/stage-marc-import.pl b/tools/stage-marc-import.pl index b113332..745a36a 100755 --- a/tools/stage-marc-import.pl +++ b/tools/stage-marc-import.pl @@ -55,7 +55,7 @@ my $nomatch_action = $input->param('nomatch_action'); my $parse_items = $input->param('parse_items'); my $item_action = $input->param('item_action'); my $comments = $input->param('comments'); -my $syntax = $input->param('syntax'); +my $encoding = $input->param('encoding'); my ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "tools/stage-marc-import.tmpl", query => $input, @@ -130,10 +130,10 @@ if ($completedJobID) { } # FIXME branch code - my ($batch_id, $num_valid, $num_items, @import_errors) = BatchStageMarcRecords($syntax, $marcrecord, $filename, - $comments, '', $parse_items, 0, - 50, staging_progress_callback($job, $dbh)); + my ($batch_id, $num_valid, $num_items, @import_errors) = BatchStageMarcRecords($encoding, $marcrecord, $filename, $comments, '', $parse_items, 0, 50, staging_progress_callback($job, $dbh)); + $dbh->commit(); + my $num_with_matches = 0; my $checked_matches = 0; my $matcher_failed = 0; -- 1.7.2.3 From Katrin.Fischer.83 at web.de Tue Apr 5 14:05:57 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Tue, 5 Apr 2011 14:05:57 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] BZ6058: uncertain price can't be unchecked Message-ID: <1302005157-1299-1-git-send-email-Katrin.Fischer.83@web.de> From: Paul Poulain Signed-off-by: Paul Poulain Signed-off-by: Katrin Fischer --- C4/Acquisition.pm | 4 ++++ acqui/addorder.pl | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index 7474502..2a3f9c4 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -961,6 +961,10 @@ sub ModOrder { my $dbh = C4::Context->dbh; my @params; + + # update uncertainprice to an integer, just in case (under FF, checked boxes have the value "ON" by default) + $orderinfo->{uncertainprice}=1 if $orderinfo->{uncertainprice}; + # delete($orderinfo->{'branchcode'}); # the hash contains a lot of entries not in aqorders, so get the columns ... my $sth = $dbh->prepare("SELECT * FROM aqorders LIMIT 1;"); diff --git a/acqui/addorder.pl b/acqui/addorder.pl index 35d3507..44623ec 100755 --- a/acqui/addorder.pl +++ b/acqui/addorder.pl @@ -152,6 +152,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( # get CGI parameters my $orderinfo = $input->Vars; $orderinfo->{'list_price'} ||= 0; +$orderinfo->{'uncertainprice'} ||= 0; #my $ordernumber = $input->param('ordernumber'); #my $basketno = $input->param('basketno'); #my $booksellerid = $input->param('booksellerid'); -- 1.7.1 From jcamins at bywatersolutions.com Tue Apr 5 14:06:11 2011 From: jcamins at bywatersolutions.com (Jared Camins-Esakov) Date: Tue, 5 Apr 2011 08:06:11 -0400 Subject: [Koha-patches] [PATCH] Bug 5921 follow-up: fix text wrapping Message-ID: <1302005171-1633-1-git-send-email-jcamins@bywatersolutions.com> On records with hundreds of items, the "Serial enumeration/chronology" label wraps onto a second line, which is very unattractive. Changing the label to "Serial enumeration" fixes this. --- .../prog/en/modules/catalogue/moredetail.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl index 16c2c5b..4610720 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl @@ -173,7 +173,7 @@
  • Previous Borrower: "> 
  • Previous Borrower: "> 
  • Paid for?:  
  • -
  • Serial enumeration/chronology:  
  • +
  • Serial enumeration:  
  • Public Note: " /> -- 1.7.2.3 From jcamins at bywatersolutions.com Tue Apr 5 14:06:37 2011 From: jcamins at bywatersolutions.com (Jared Camins-Esakov) Date: Tue, 5 Apr 2011 08:06:37 -0400 Subject: [Koha-patches] [PATCH] Bug 5651: Question marks break searches w/ICU Message-ID: <1302005197-1667-1-git-send-email-jcamins@bywatersolutions.com> When a user is doing a simple keyword search, they should not be expected to deal with the magical behavior of question marks in Zebra. This fix escapes question marks, and reduces the number of false positives for identifying a "simple keyword search." --- C4/Search.pm | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/C4/Search.pm b/C4/Search.pm index b8939b6..df8e946 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -1120,10 +1120,12 @@ sub buildQuery { my $indexes_set; # If the user is sophisticated enough to specify an index, turn off field weighting, stemming, and stopword handling - if ( $operands[$i] =~ /(:|=)/ || $scan ) { + if ( $operands[$i] =~ /\w(:|=)/ || $scan ) { $weight_fields = 0; $stemming = 0; $remove_stopwords = 0; + } else { + $operands[$i] =~ s/\?/{?}/g; # need to escape question marks } my $operand = $operands[$i]; my $index = $indexes[$i]; -- 1.7.2.3 From jcamins at bywatersolutions.com Tue Apr 5 14:07:15 2011 From: jcamins at bywatersolutions.com (Jared Camins-Esakov) Date: Tue, 5 Apr 2011 08:07:15 -0400 Subject: [Koha-patches] [PATCH] Bug 5957 follow-up: use comparison operator in if Message-ID: <1302005235-1707-1-git-send-email-jcamins@bywatersolutions.com> The patch for bug 5957 used an assignment operator instead of a comparison operator. Replace the assignment operator with the string comparison that was desired. --- opac/opac-search.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/opac/opac-search.pl b/opac/opac-search.pl index e2725fa..c30ee21 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -84,7 +84,7 @@ else { authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), } ); -if ($template_name = 'opac-results.tmpl') { +if ($template_name eq 'opac-results.tmpl') { $template->param('COinSinOPACResults' => C4::Context->preference('COinSinOPACResults')); } -- 1.7.2.3 From jcamins at bywatersolutions.com Tue Apr 5 14:08:23 2011 From: jcamins at bywatersolutions.com (Jared Camins-Esakov) Date: Tue, 5 Apr 2011 08:08:23 -0400 Subject: [Koha-patches] [PATCH] Bug 4276 follow-up: quote strings with curly braces Message-ID: <1302005303-1747-1-git-send-email-jcamins@bywatersolutions.com> Previous fix used the wrong characters for quoting. I should have used curly braces instead of double quotes. Some searches using double quotes will fail (the problem seems to be punctuation, although there may be other circumstances where double quotes fail as well). --- .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 6 +++--- .../prog/en/xslt/MARC21slim2OPACDetail.xsl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl index 64c2fb7..7906c55 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl @@ -444,13 +444,13 @@ /cgi-bin/koha/catalogue/search.pl?q= abcdfgklmnopqrstvxyz and - (su:" - ") + (su:{ + }) - /cgi-bin/koha/catalogue/search.pl?q=su:"" + /cgi-bin/koha/catalogue/search.pl?q=su:{} diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl index b86cca7..369b74b 100755 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl @@ -501,13 +501,13 @@ /cgi-bin/koha/opac-search.pl?q= abcdfgklmnopqrstvxyz and - (su:" - ") + (su:{ + }) - /cgi-bin/koha/opac-search.pl?q=su:"" + /cgi-bin/koha/opac-search.pl?q=su:{} -- 1.7.2.3 From jcamins at bywatersolutions.com Tue Apr 5 14:10:04 2011 From: jcamins at bywatersolutions.com (Jared Camins-Esakov) Date: Tue, 5 Apr 2011 08:10:04 -0400 Subject: [Koha-patches] [PATCH] Bug 6032: Give biblio register and shadow sane default max sizes Message-ID: <1302005404-1795-1-git-send-email-jcamins@bywatersolutions.com> The out-of-the-box maximum size for the biblio register and shadow stores is 4GB, which is much too small for even medium sized libraries. This makes the default maximum 20GB, which should be enough for even most large libraries. --- etc/zebradb/zebra-biblios.cfg | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/zebradb/zebra-biblios.cfg b/etc/zebradb/zebra-biblios.cfg index 5bfe38e..6de43bf 100644 --- a/etc/zebradb/zebra-biblios.cfg +++ b/etc/zebradb/zebra-biblios.cfg @@ -44,8 +44,8 @@ lockDir: __ZEBRA_LOCK_DIR__/biblios perm.anonymous:ar perm.__ZEBRA_USER__:rw passwd: __ZEBRA_CONF_DIR__/etc/passwd -register: __ZEBRA_DATA_DIR__/biblios/register:4G -shadow: __ZEBRA_DATA_DIR__/biblios/shadow:4G +register: __ZEBRA_DATA_DIR__/biblios/register:20G +shadow: __ZEBRA_DATA_DIR__/biblios/shadow:20G # Temp File area for result sets setTmpDir: __ZEBRA_DATA_DIR__/biblios/tmp -- 1.7.2.3 From stephane.delaune at biblibre.com Tue Apr 5 14:11:00 2011 From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=) Date: Tue, 5 Apr 2011 14:11:00 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug #6044 - Authority is deleted when mergeto and mergefrom are the same Message-ID: <1302005460-24950-1-git-send-email-stephane.delaune@biblibre.com> From: Alex Arnaud Signed-off-by: St?phane Delaune --- misc/migration_tools/merge_authority.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/misc/migration_tools/merge_authority.pl b/misc/migration_tools/merge_authority.pl index 0987827..b99591f 100755 --- a/misc/migration_tools/merge_authority.pl +++ b/misc/migration_tools/merge_authority.pl @@ -97,7 +97,7 @@ if ($batch) { my $MARCto = GetAuthority($mergeto); &merge($mergefrom,$MARCfrom,$mergeto,$MARCto); #Could add mergefrom authority to mergeto rejected forms before deletion - DelAuthority($mergefrom); + DelAuthority($mergefrom) if ($mergefrom != $mergeto); } my $timeneeded = gettimeofday - $starttime; print "Done in $timeneeded seconds" unless $noconfirm; -- 1.7.0.4 From alex.arnaud at biblibre.com Tue Apr 5 14:11:59 2011 From: alex.arnaud at biblibre.com (Alex Arnaud) Date: Tue, 5 Apr 2011 14:11:59 +0200 Subject: [Koha-patches] [PATCH] Bug #6057 - Improve finding next stock number Message-ID: <1302005519-12713-1-git-send-email-alex.arnaud@biblibre.com> --- cataloguing/value_builder/stocknumber.pl | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cataloguing/value_builder/stocknumber.pl b/cataloguing/value_builder/stocknumber.pl index 005f011..4c9b267 100755 --- a/cataloguing/value_builder/stocknumber.pl +++ b/cataloguing/value_builder/stocknumber.pl @@ -53,14 +53,11 @@ sub plugin_javascript { my $branchcode = C4::Context->userenv->{'branch'}; - $query = "SELECT MAX(CAST(SUBSTRING_INDEX(stocknumber,'_',-1) AS SIGNED)) FROM items WHERE homebranch = ?"; + $query = "SELECT MAX(CAST(SUBSTRING_INDEX(stocknumber,'_',-1) AS SIGNED))+1 FROM items WHERE homebranch = ? AND stocknumber LIKE ?"; my $sth=$dbh->prepare($query); - $sth->execute($branchcode); - while (my ($count)= $sth->fetchrow_array) { - $nextnum = $count; - } - $nextnum++; + $sth->execute($branchcode,$branchcode."_%"); + my ($nextnum) = $sth->fetchrow; my $nextnum = $branchcode.'_'.$nextnum; my $scr = < From: Henri-Damien LAURENT Fix the problem of searching on partial itemtypes strings for instance, itemtype="ARTICLE DE PERIODIQUE", itemtype="PERIODIQUE" searching on itemtype="PERIODIQUE" would also get "ARTICLE DE PERIODIQUE" Signed-off-by: Jonathan Druart --- catalogue/search.pl | 2 +- etc/zebradb/marc_defs/marc21/biblios/record.abs | 6 +++--- etc/zebradb/marc_defs/unimarc/biblios/record.abs | 10 +++++++--- opac/opac-search.pl | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/catalogue/search.pl b/catalogue/search.pl index 17cbdcc..85bccdf 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -250,7 +250,7 @@ my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes"); if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') { foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) { my %row =( number=>$cnt++, - ccl => $itype_or_itemtype, + ccl => qq($itype_or_itemtype,phr), code => $thisitemtype, selected => $selected, description => $itemtypes->{$thisitemtype}->{'description'}, diff --git a/etc/zebradb/marc_defs/marc21/biblios/record.abs b/etc/zebradb/marc_defs/marc21/biblios/record.abs index 601cafd..77169fe 100755 --- a/etc/zebradb/marc_defs/marc21/biblios/record.abs +++ b/etc/zebradb/marc_defs/marc21/biblios/record.abs @@ -268,7 +268,7 @@ melm 999$d biblioitemnumber:n,biblioitemnumber:w,biblioitemnumber:s melm 942$0 totalissues:n,totalissues:s melm 942$2 cn-bib-source melm 942$6 cn-bib-sort:n,cn-bib-sort:s -melm 942$c itemtype:w +melm 942$c itemtype:w,itemtype:p melm 942$n Suppress:w,Suppress:n # need to check bib1 @@ -286,7 +286,7 @@ melm 952$4 damaged:n,damaged:w melm 952$5 restricted:n,restricted:w melm 952$6 cn-sort:n,cn-sort:s melm 952$7 notforloan:n,notforloan:w -melm 952$8 ccode +melm 952$8 ccode:w,ccode:p melm 952$9 itemnumber:n,itemnumber:s melm 952$a homebranch melm 952$b holdingbranch @@ -314,5 +314,5 @@ melm 952$u uri:u melm 952$v replacementprice melm 952$w replacementpricedate #melm 952$x -melm 952$y itype:w +melm 952$y itype:w,itype:p melm 952$z Note:w,Note:p diff --git a/etc/zebradb/marc_defs/unimarc/biblios/record.abs b/etc/zebradb/marc_defs/unimarc/biblios/record.abs index 9406aac..4281af8 100644 --- a/etc/zebradb/marc_defs/unimarc/biblios/record.abs +++ b/etc/zebradb/marc_defs/unimarc/biblios/record.abs @@ -39,8 +39,8 @@ melm 011$y ISSN:w,Identifier-standard:w # wrong ISSN melm 011$z ISSN:w,Identifier-standard:w -melm 200$b itemtype:w,itype:w -melm 995$r itemtype:w,itype:w +melm 200$b itemtype:w,itemtype:p,itype:w,itype:p +melm 995$r itemtype:w,itemtype:p,itype:w,itype:p melm 100$a tpubdate:s:range(data,8,1),ta:w:range(data,17,1),ta:w:range(data,18,1),ta:w:range(data,19,1),Modified-code:n:range(data,21,1),ln:s:range(data,22,3),char-encoding:n:range(data,26,2),char-encoding:n:range(data,28,2),char-encoding:n:range(data,30,2),script-Title:n:range(data,34,2) melm 101$a ln @@ -56,7 +56,7 @@ melm 102$a Country-heading #Biography code 1 melm 105$a Illustration-code:w:range(data,0,4),Content-type:w:range(data,4,1),Content-type:w:range(data,5,1),Content-type:w:range(data,6,1),Content-type:w:range(data,7,1),Conference-code:w:range(data,8,1),Festschrift-indicator:w:range(data,9,1),Index-indicator:w:range(data,10,1),Literature-Code:w:range(data,11,1),Biography-Code:w:range(data,12,1) -melm 106$a itype +melm 106$a itype:w,itype:p #Field 110 Description #Name of Data Element Number of characters Character Positions @@ -80,6 +80,10 @@ melm 680$b LC-call-number:s melm 680 LC-call-number #melm 001 Identifier-standard:w +<<<<<<< HEAD +======= +melm 200$b itype:w,itype:p +>>>>>>> (Bug 4049) Searching itemtypes returning noise #melm 100$9 Cross-Reference !:w diff --git a/opac/opac-search.pl b/opac/opac-search.pl index e2725fa..6dde2fd 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -164,8 +164,8 @@ my $advanced_search_types = C4::Context->preference("AdvancedSearchTypes"); if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') { foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'} } keys %$itemtypes ) { - my %row =( number=>$cnt++, - ccl => $itype_or_itemtype, + my %row =( number=>$cnt++, + ccl => "$itype_or_itemtype,phr", code => $thisitemtype, selected => $selected, description => $itemtypes->{$thisitemtype}->{'description'}, -- 1.7.1 From frederic.durand at univ-lyon2.fr Tue Apr 5 14:18:16 2011 From: frederic.durand at univ-lyon2.fr (fdurand) Date: Tue, 5 Apr 2011 14:18:16 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5924 : C4::AuthoritiesMarc.pm search enhancement Message-ID: <1302005896-4439-1-git-send-email-frederic.durand@univ-lyon2.fr> From: Henri-Damien LAURENT Heading Main is defined in unimarc record.abs re enabling that feature Signed-off-by: fdurand --- C4/AuthoritiesMarc.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm index 0122ca8..3fbe2f6 100644 --- a/C4/AuthoritiesMarc.pm +++ b/C4/AuthoritiesMarc.pm @@ -230,7 +230,7 @@ sub SearchAuthorities { # FIXME: 'Heading-Main' index not yet defined in zebra # $attr =" \@attr 1=Heading-Main "; - $attr =" \@attr 1=Heading "; + $attr =" \@attr 1=Heading-Main "; }elsif (@$tags[$i] eq "mainentry") { $attr =" \@attr 1=Heading "; -- 1.7.1 From alex.arnaud at biblibre.com Tue Apr 5 14:29:28 2011 From: alex.arnaud at biblibre.com (Alex Arnaud) Date: Tue, 5 Apr 2011 14:29:28 +0200 Subject: [Koha-patches] [PATCH] Bug 6061 - C4::Context clearing up system preference on update Message-ID: <1302006568-13950-1-git-send-email-alex.arnaud@biblibre.com> --- C4/Context.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/C4/Context.pm b/C4/Context.pm index 484d4e1..cbafad8 100644 --- a/C4/Context.pm +++ b/C4/Context.pm @@ -521,7 +521,7 @@ sub set_preference { my $type = $dbh->selectrow_array( "SELECT type FROM systempreferences WHERE variable = ?", {}, $var ); $value = 0 if ( $type && $type eq 'YesNo' && $value eq '' ); - + clear_syspref_cache; my $sth = $dbh->prepare( " INSERT INTO systempreferences ( variable, value ) -- 1.6.3.3 From Katrin.Fischer.83 at web.de Tue Apr 5 14:43:23 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Tue, 5 Apr 2011 14:43:23 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] BZ6062: ordering basketgroups Message-ID: <1302007403-23529-1-git-send-email-Katrin.Fischer.83@web.de> From: Paul Poulain When you have many basketgroups, you get the oldest one on top. Usually, you have something to do on recent ones, so it's better to have basket groups ordered DESC Signed-off-by: Katrin Fischer --- C4/Acquisition.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index 7474502..2aa4cf2 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -658,7 +658,7 @@ Returns a reference to the array of all the basketgroups of bookseller $booksell sub GetBasketgroups { my $booksellerid = shift; die "bookseller id is required to edit a basketgroup" unless $booksellerid; - my $query = "SELECT * FROM aqbasketgroups WHERE booksellerid=?"; + my $query = "SELECT * FROM aqbasketgroups WHERE booksellerid=? ORDER BY `id` DESC"; my $dbh = C4::Context->dbh; my $sth = $dbh->prepare($query); $sth->execute($booksellerid); -- 1.7.1 From stephane.delaune at biblibre.com Tue Apr 5 14:44:07 2011 From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=) Date: Tue, 5 Apr 2011 14:44:07 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6047: Remove check on subfield 3 that prevents biblios from BNF to create corresponding authorities Message-ID: <1302007447-25600-1-git-send-email-stephane.delaune@biblibre.com> From: Sophie Meynieux Signed-off-by: St?phane Delaune --- cataloguing/addbiblio.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl index 60f8e15..038878f 100755 --- a/cataloguing/addbiblio.pl +++ b/cataloguing/addbiblio.pl @@ -758,7 +758,7 @@ AND (authtypecode IS NOT NULL AND authtypecode<>\"\")|); my ($countcreated,$countlinked); while (my $data=$query->fetchrow_hashref){ foreach my $field ($record->field($data->{tagfield})){ - next if ($field->subfield('9')); + next if ($field->subfield('3') || $field->subfield('9')); # No authorities id in the tag. # Search if there is any authorities to link to. my $query='at='.$data->{authtypecode}.' '; -- 1.7.0.4 From Katrin.Fischer.83 at web.de Tue Apr 5 14:54:48 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Tue, 5 Apr 2011 14:54:48 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] BZ6065: confirmation when deleting an order Message-ID: <1302008088-30164-1-git-send-email-Katrin.Fischer.83@web.de> From: Paul Poulain when clicking on "delete order", there is no confirmation box, the order line is deleted without any question ! Signed-off-by: Katrin Fischer --- .../prog/en/modules/acqui/basket.tmpl | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl index aaa7462..02b0a06 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl @@ -33,6 +33,13 @@ window.location = "?op=delete_confirm&basketno=&booksellerid="; } } + function confirm_delete_item(ordernumber, biblionumber) { + var is_confirmed = confirm(_('Are you sure you want to delete this order ?')); + if (is_confirmed) { + window.location = "addorder.pl?ordernumber="+ordernumber+"&basketno=&quantity=0&biblionumber="+biblionumber; + } + } + //]]> @@ -270,7 +277,7 @@ &booksellerid=&basketno=">Modify - &basketno=&quantity=0&biblionumber=">Delete + ,)" class="button">Delete -- 1.7.1 From claire.hernandez at biblibre.com Tue Apr 5 15:16:44 2011 From: claire.hernandez at biblibre.com (Claire Hernandez) Date: Tue, 5 Apr 2011 15:16:44 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5980 : Adding location to search indexes Message-ID: <1302009404-6052-1-git-send-email-claire.hernandez@biblibre.com> From: Henri-Damien LAURENT Adding location to search indexes in search pages Original patch amended to change Location to Shelving Location. Signed-off-by: Claire Hernandez --- .../prog/en/includes/search_indexes.inc | 1 + .../opac-tmpl/prog/en/modules/opac-advsearch.tmpl | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc index aa140f2..83bbda2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc @@ -14,6 +14,7 @@ + diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl index bd0752c..13d9caf 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl @@ -69,6 +69,7 @@ + -- 1.7.1 From paul.poulain at biblibre.com Tue Apr 5 15:16:47 2011 From: paul.poulain at biblibre.com (paul.poulain at biblibre.com) Date: Tue, 5 Apr 2011 15:16:47 +0200 Subject: [Koha-patches] [PATCH] MT5189 let's the librarian choose the itemtype when ordering Message-ID: <1302009407-29809-1-git-send-email-paul.poulain@biblibre.com> From: Paul Poulain For libraries with item-level_itype, the itemtype is in the item. For others, it's in the biblio and should be added with the title/author when it's ordered This patch adds the list when applicable,and build the biblio record accordingly --- acqui/addorder.pl | 1 + acqui/neworderempty.pl | 4 ++++ .../prog/en/modules/acqui/neworderempty.tmpl | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/acqui/addorder.pl b/acqui/addorder.pl index 44623ec..e321d2c 100755 --- a/acqui/addorder.pl +++ b/acqui/addorder.pl @@ -204,6 +204,7 @@ if ( $orderinfo->{quantity} ne '0' ) { "biblioitems.publishercode" => $$orderinfo{publishercode} ? $$orderinfo{publishercode} : "", "biblioitems.publicationyear" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "", "biblio.copyrightdate" => $$orderinfo{publicationyear} ? $$orderinfo{publicationyear}: "", + "biblioitems.itemtype" => $$orderinfo{itemtype} ? $$orderinfo{itemtype} : "", }); # create the record in catalogue, with framework '' diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl index e6ceccc..5adffad 100755 --- a/acqui/neworderempty.pl +++ b/acqui/neworderempty.pl @@ -324,6 +324,9 @@ if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber) { $template->param(items => \@itemloop); } +# Get the item types list, but only if item_level_itype is YES. Otherwise, it will be in the item, no need to display it in the biblio +my @itemtypes = C4::ItemType->all unless C4::Context->preference('item-level_itypes'); + # fill template $template->param( @@ -368,6 +371,7 @@ $template->param( budget_loop => $budget_loop, isbn => $data->{'isbn'}, seriestitle => $data->{'seriestitle'}, + itemtypeloop => \@itemtypes, quantity => $data->{'quantity'}, quantityrec => $data->{'quantity'}, rrp => $data->{'rrp'}, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl index d8b34ce..57a2f38 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl @@ -247,6 +247,24 @@ $(document).ready(function() " />
  • + + + +
  • + Item type: + +
  • + + + + -- 1.7.1 From guillaume.hatt at enc.sorbonne.fr Tue Apr 5 15:24:12 2011 From: guillaume.hatt at enc.sorbonne.fr (guillaume.hatt at enc.sorbonne.fr) Date: Tue, 5 Apr 2011 15:24:12 +0200 Subject: [Koha-patches] [PATCH] bug 4837 make circ print page show item type description Message-ID: <1302009852-11453-1-git-send-email-guillaume.hatt@enc.sorbonne.fr> From: Nicole Engard --- .../prog/en/modules/members/moremember-print.tmpl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl index e395e3f..151c98d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl @@ -21,7 +21,7 @@ Title Author - Format + Item Type Date Due Charge Price @@ -36,7 +36,7 @@ - + -- 1.5.6.5 From guillaume.hatt at enc.sorbonne.fr Tue Apr 5 15:30:07 2011 From: guillaume.hatt at enc.sorbonne.fr (guillaume.hatt at enc.sorbonne.fr) Date: Tue, 5 Apr 2011 15:30:07 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] bug 4837 make circ print page show item type description Message-ID: <1302010207-11727-1-git-send-email-guillaume.hatt@enc.sorbonne.fr> From: Nicole Engard Signed-off-by: Guillaume Hatt --- .../prog/en/modules/members/moremember-print.tmpl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl index e395e3f..151c98d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl @@ -21,7 +21,7 @@ Title Author - Format + Item Type Date Due Charge Price @@ -36,7 +36,7 @@ - + -- 1.7.0.4 From guillaume.hatt at enc.sorbonne.fr Tue Apr 5 15:35:36 2011 From: guillaume.hatt at enc.sorbonne.fr (guillaume.hatt at enc.sorbonne.fr) Date: Tue, 5 Apr 2011 15:35:36 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5922: Notify of waiting holds at checkin Message-ID: <1302010536-11881-1-git-send-email-guillaume.hatt@enc.sorbonne.fr> From: Katrin Fischer This patch adds a new sys pref WaitingNotifyAtCheckin. If ON librarian will be notified of waiting holds for this patron at this branch. If OFF (default) not message will be shown. Signed-off-by: Guillaume Hatt --- patchs/5922-3458.patch | 222 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 222 insertions(+), 0 deletions(-) create mode 100644 patchs/5922-3458.patch diff --git a/patchs/5922-3458.patch b/patchs/5922-3458.patch new file mode 100644 index 0000000..9259401 --- /dev/null +++ b/patchs/5922-3458.patch @@ -0,0 +1,222 @@ +From 1438439d37473c8041558f47f67d00c9de2bb438 Mon Sep 17 00:00:00 2001 +From: Katrin Fischer +Date: Sat, 26 Mar 2011 22:27:06 +0100 +Subject: [PATCH] Bug 5922: Notify of waiting holds at checkin +Content-Type: text/plain; charset="utf-8" + +This patch adds a new sys pref WaitingNotifyAtCheckin. + +If ON librarian will be notified of waiting holds for this patron at this branch. + +If OFF (default) not message will be shown. +--- + circ/returns.pl | 18 +++++++++++++++++- + installer/data/mysql/de-DE/mandatory/sysprefs.sql | 1 + + installer/data/mysql/en/mandatory/sysprefs.sql | 1 + + .../1-Obligatoire/unimarc_standard_systemprefs.sql | 1 + + installer/data/mysql/it-IT/necessari/sysprefs.sql | 3 ++- + installer/data/mysql/pl-PL/mandatory/sysprefs.sql | 1 + + ...m_preferences_full_optimal_for_install_only.sql | 3 ++- + ...m_preferences_full_optimal_for_install_only.sql | 1 + + installer/data/mysql/updatedatabase.pl | 6 ++++++ + .../en/modules/admin/preferences/circulation.pref | 6 ++++++ + .../prog/en/modules/circ/returns.tmpl | 8 ++++++++ + kohaversion.pl | 2 +- + 12 files changed, 47 insertions(+), 4 deletions(-) + +diff --git a/circ/returns.pl b/circ/returns.pl +index 262c126..b83d17a 100755 +--- a/circ/returns.pl ++++ b/circ/returns.pl +@@ -249,7 +249,23 @@ if ($barcode) { + $template->param( fineborrowernumber => $borrower->{'borrowernumber'} ); + } + } +- ++ ++ if (C4::Context->preference("WaitingNotifyAtCheckin") ) { ++ #Check for waiting holds ++ my @reserves = GetReservesFromBorrowernumber($borrower->{'borrowernumber'}); ++ my $waiting_holds; ++ foreach my $num_res (@reserves) { ++ if ( $num_res->{'found'} eq 'W' && $num_res->{'branchcode'} eq $userenv_branch) { ++ $waiting_holds++; ++ } ++ } ++ if ($waiting_holds > 0) { ++ $template->param( ++ waiting_holds => $waiting_holds, ++ holdsborrowernumber => $borrower->{'borrowernumber'}, ++ ); ++ } ++ } + } + elsif ( !$messages->{'BadBarcode'} ) { + $input{duedate} = 0; +diff --git a/installer/data/mysql/de-DE/mandatory/sysprefs.sql b/installer/data/mysql/de-DE/mandatory/sysprefs.sql +index 7b62465..0d45b53 100644 +--- a/installer/data/mysql/de-DE/mandatory/sysprefs.sql ++++ b/installer/data/mysql/de-DE/mandatory/sysprefs.sql +@@ -34,6 +34,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FinesLog',1,'If ON, log fines',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems',0,'If ON, disables display of\"lost\" items in OPAC.','','YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hide_marc',0,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)',NULL,'YesNo'); ++INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WaitingNotifyAtCheckin',0,'If ON, notify librarians of waiting holds for the patron whose items they are checking in.',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IndependantBranches',0,'If ON, increases security between libraries',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('insecure',0,'If ON, bypasses all authentication. Be careful!',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetBiblioDefaultView','normal','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','normal|marc|isbd|labeled_marc','Choice'); +diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql +index cb06622..853cd16 100644 +--- a/installer/data/mysql/en/mandatory/sysprefs.sql ++++ b/installer/data/mysql/en/mandatory/sysprefs.sql +@@ -34,6 +34,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FinesLog',1,'If ON, log fines',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems',0,'If ON, disables display of\"lost\" items in OPAC.','','YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hide_marc',0,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)',NULL,'YesNo'); ++INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WaitingNotifyAtCheckin',0,'If ON, notify librarians of waiting holds for the patron whose items they are checking in.',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IndependantBranches',0,'If ON, increases security between libraries',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('insecure',0,'If ON, bypasses all authentication. Be careful!',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetBiblioDefaultView','normal','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','normal|marc|isbd|labeled_marc','Choice'); +diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql +index 68d78a0..46d4d63 100644 +--- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql ++++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql +@@ -36,6 +36,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('gist', '0', 'Ce param??tre d??finit le taux de TVA. Attention : ce n''est pas un % mais un nombre (0.055 et pas 5.5%) Laisser ?? 0 si vous ne r??cup??rez pas la TVA, ce qui est le cas de la plupart des biblioth??ques fran??aises', '', 'Integer'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems', '0', 'Si ce param??tre est activ??, l''OPAC n''affichera pas les notices pour lesquelles le ou les exemplaires sont marqu??s "perdus"', '', 'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hide_marc', '0', 'Si ce param??tre est positionn??, les code des champs et sous-champs MARC sont cach??s, on ne voit que les libell??s.', '', 'YesNo'); ++INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WaitingNotifyAtCheckin',0,'If ON, notify librarians of waiting holds for the patron whose items they are checking in.',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IndependantBranches', '0', 'Si ce param??tre est ?? "Oui", chaque site est ind??pendant au niveau de ses acquisitions, de son catalogage, de l''inscription de ses lecteurs...', '', 'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('insecure', '0', 'Ce param??tre, s''il est positionn?? ?? "Oui", permet d''utiliser Koha sans mot de passe. A utiliser avec pr??caution. Devrait ??tre ?? "Non" normalement', '', 'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('intranetcolorstylesheet', '', 'Ce param??tre permet de d??finir un jeu de couleur alternatif dans l''interface professionnelle', '50', 'free'); +diff --git a/installer/data/mysql/it-IT/necessari/sysprefs.sql b/installer/data/mysql/it-IT/necessari/sysprefs.sql +index 35116c1..fa40866 100644 +--- a/installer/data/mysql/it-IT/necessari/sysprefs.sql ++++ b/installer/data/mysql/it-IT/necessari/sysprefs.sql +@@ -65,6 +65,7 @@ insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, + insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('GoogleJackets','1','','Se ON, visualizza le copertine usando Google Books','YesNo'); + insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('hidelostitems','0','','Se ON, viene disabilitata la visualizzazione nell\'OPAC delle copie perse.','YesNo'); + insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('hide_marc','0','','Se su ON, disabilita la visualizzazione dei campi del MARC, codici di sottocampi e indicatori (mostra ancora i dati)','YesNo'); ++INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WaitingNotifyAtCheckin',0,'If ON, notify librarians of waiting holds for the patron whose items they are checking in.',NULL,'YesNo'); + insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('HomeOrHoldingBranch','holdingbranch','holdingbranch|homebranch','Se IndependantBranches e\' settata su ON, allora il sitema legge questa variabile. Se questa variabile e\' sul valore \'homebranch\' quando arriva una copia di un\'altra biblioteca si puo\' registare la restituzione dove la copia e\' arrivata. Se invece vale \'holdingbranch\', allora non si puo fare la restituzione ma solo prenderla e inviarla alla biblioteca di appartenenza; l?? verr?? fatta la restituzione ','Choice'); + insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('IndependantBranches','0','','Se ?? ON, aumenta il livello di sicurezza tra le biblioteche','YesNo'); + insert into `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) values('insecure','0','','Se ?? su ON, tutte le richieste di autenticazioni vengono aggirate. Attenzione!','YesNo'); +@@ -285,4 +286,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES + INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowPurchaseSuggestionBranchChoice', 0, 'Allow user to choose branch when making a purchase suggestion','1','YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free'); +-INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo'); +\ No newline at end of file ++INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo'); +diff --git a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql +index 231e541..30f18c8 100644 +--- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql ++++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql +@@ -34,6 +34,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FinesLog',1,'If ON, log fines',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems',0,'If ON, disables display of\"lost\" items in OPAC.','','YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hide_marc',0,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)',NULL,'YesNo'); ++INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WaitingNotifyAtCheckin',0,'If ON, notify librarians of waiting holds for the patron whose items they are checking in.',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IndependantBranches',0,'If ON, increases security between libraries',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('insecure',0,'If ON, bypasses all authentication. Be careful!',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetBiblioDefaultView','normal','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','normal|marc|isbd|labeled_marc','Choice'); +diff --git a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql +index af69408..f6f2e26 100644 +--- a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql ++++ b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql +@@ -46,6 +46,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FinesLog',1,'If ON, log fines',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems',0,'If ON, disables display of\"lost\" items in OPAC.','','YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hide_marc',0,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)',NULL,'YesNo'); ++INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WaitingNotifyAtCheckin',0,'If ON, notify librarians of waiting holds for the patron whose items they are checking in.',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IndependantBranches',0,'If ON, increases security between libraries',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('insecure',0,'If ON, bypasses all authentication. Be careful!',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetBiblioDefaultView','normal','IntranetBiblioDefaultView','normal|marc|isbd|labeled_marc','Choice'); +@@ -352,4 +353,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES + INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowPurchaseSuggestionBranchChoice', 0, 'Allow user to choose branch when making a purchase suggestion','1','YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free'); +-INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo'); +\ No newline at end of file ++INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo'); +diff --git a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql +index a72e79a..049e1c0 100644 +--- a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql ++++ b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql +@@ -45,6 +45,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FinesLog',1,'If ON, log fines',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hidelostitems',0,'If ON, disables display of\"lost\" items in OPAC.','','YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('hide_marc',0,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)',NULL,'YesNo'); ++INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WaitingNotifyAtCheckin',0,'If ON, notify librarians of waiting holds for the patron whose items they are checking in.',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IndependantBranches',0,'If ON, increases security between libraries',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('insecure',0,'If ON, bypasses all authentication. Be careful!',NULL,'YesNo'); + INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetBiblioDefaultView','normal','IntranetBiblioDefaultView','normal|marc|isbd|labeled_marc','Choice'); +diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl +index 23b5d67..a2bef31 100755 +--- a/installer/data/mysql/updatedatabase.pl ++++ b/installer/data/mysql/updatedatabase.pl +@@ -4131,6 +4131,12 @@ $DBversion = '3.03.00.032'; + if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', 1, 'Create searches on all subdivisions for subject tracings.','1','YesNo')"); + print "Upgrade to $DBversion done ( include subdivisions when generating subject tracing searches )\n"; ++} ++ ++$DBversion = "3.03.00.XXX"; ++if (C4::Context->preference("Version") < TransformToNum($DBversion)) { ++ $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('WaitingNotifyAtCheckin',0,'If ON, notify librarians of waiting holds for the patron whose items they are checking in.',NULL,'YesNo');"); ++ print "Upgrade to $DBversion done (Add syspref WaitingNotifyAtCheckin)\n"; + SetVersion ($DBversion); + } + +diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +index e0eac4d..2b15543 100644 +--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref ++++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +@@ -67,6 +67,12 @@ Circulation: + no: "Don't notify" + - librarians of overdue fines on the items they are checking in. + - ++ - pref: WaitingNotifyAtCheckin ++ choices: ++ yes: Notify ++ no: "Don't notify" ++ - librarians of waiting holds for the patron whose items they are checking in. ++ - + - pref: FilterBeforeOverdueReport + choices: + yes: Require +diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl +index 724a3e9..879a006 100644 +--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl ++++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl +@@ -66,6 +66,14 @@ function Dopop(link) { + + + ++ ++ ++
    ++

    Patron has hold(s) waiting for pickup.

    ++

    ">Checkout holds.

    ++
    ++ ++ + + +

    Cannot Check In

    This item must be checked in at its home library. NOT CHECKED IN

    +diff --git a/kohaversion.pl b/kohaversion.pl +index 3fbc4e1..8330459 100644 +--- a/kohaversion.pl ++++ b/kohaversion.pl +@@ -16,7 +16,7 @@ the kohaversion is divided in 4 parts : + use strict; + + sub kohaversion { +- our $VERSION = '3.03.00.032'; ++ our $VERSION = '3.03.00.XXX'; + # version needs to be set this way + # so that it can be picked up by Makefile.PL + # during install +-- +1.7.1 + -- 1.7.0.4 From colin.campbell at ptfs-europe.com Tue Apr 5 15:39:21 2011 From: colin.campbell at ptfs-europe.com (Colin Campbell) Date: Tue, 5 Apr 2011 14:39:21 +0100 Subject: [Koha-patches] [PATCH] Bug 5605 SIP: Add Support for the Fee Paid Message Message-ID: <1302010761-28022-1-git-send-email-colin.campbell@ptfs-europe.com> Allow fee paid to be supported for those machines which handle it Development Sponsered by Halton Borough Council --- C4/SIP/ILS.pm | 14 ++++++--- C4/SIP/ILS/Transaction/FeePayment.pm | 52 ++++++++++++++++++++++++++++++---- C4/SIP/Sip/MsgType.pm | 8 ++-- 3 files changed, 59 insertions(+), 15 deletions(-) diff --git a/C4/SIP/ILS.pm b/C4/SIP/ILS.pm index 9e20845..7dc29a7 100644 --- a/C4/SIP/ILS.pm +++ b/C4/SIP/ILS.pm @@ -32,7 +32,7 @@ my %supports = ( "login" => 1, "patron information" => 1, "end patron session" => 1, - "fee paid" => 0, + "fee paid" => 1, "item information" => 1, "item status update" => 0, "patron enable" => 1, @@ -214,14 +214,18 @@ sub pay_fee { my ($self, $patron_id, $patron_pwd, $fee_amt, $fee_type, $pay_type, $fee_id, $trans_id, $currency) = @_; my $trans; - my $patron; -# $trans = new ILS::Transaction::FeePayment; + $trans = ILS::Transaction::FeePayment->new(); - $patron = new ILS::Patron $patron_id; $trans->transaction_id($trans_id); - $trans->patron($patron); + my $patron; + $trans->patron($patron = ILS::Patron->new($patron_id)); + if (!$patron) { + $trans->screen_msg('Invalid patron barcode.'); + return $trans; + } + $trans->pay($patron->{borrowernumber},$fee_amt); $trans->ok(1); return $trans; diff --git a/C4/SIP/ILS/Transaction/FeePayment.pm b/C4/SIP/ILS/Transaction/FeePayment.pm index 8a156b7..3026296 100644 --- a/C4/SIP/ILS/Transaction/FeePayment.pm +++ b/C4/SIP/ILS/Transaction/FeePayment.pm @@ -3,16 +3,56 @@ package ILS::Transaction::FeePayment; use warnings; use strict; +# Copyright 2011 PTFS-Europe Ltd. +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use C4::Accounts qw(recordpayment); +use ILS; +use base qw(ILS::Transaction); + use vars qw($VERSION @ISA $debug); -BEGIN { - $VERSION = 1.00; - @ISA = qw(ILS::Transaction); - $debug = 0; +our $debug = 0; +our $VERSION = 1.00; + +my %fields = (); + +sub new { + my $class = shift; + my $self = $class->SUPER::new(); + + foreach ( keys %fields ) { + $self->{_permitted}->{$_} = $fields{$_}; # overlaying _permitted + } + + @{$self}{ keys %fields } = values %fields; # copying defaults into object + return bless $self, $class; } -use ILS; -use ILS::Transaction; +sub pay { + my $self = shift; + my $borrowernumber = shift; + my $amt = shift; + warn("RECORD:$borrowernumber::$amt"); + recordpayment( $borrowernumber, $amt ); +} + +#sub DESTROY { +#} 1; __END__ diff --git a/C4/SIP/Sip/MsgType.pm b/C4/SIP/Sip/MsgType.pm index 508a06b..e2cb3da 100644 --- a/C4/SIP/Sip/MsgType.pm +++ b/C4/SIP/Sip/MsgType.pm @@ -176,13 +176,13 @@ my %handlers = ( handler => \&handle_fee_paid, protocol => { 2 => { - template => "A18A2A3", - template_len => 0, + template => "A18A2A2A3", + template_len => 25, fields => [(FID_FEE_AMT), (FID_INST_ID), (FID_PATRON_ID), (FID_TERMINAL_PWD), (FID_PATRON_PWD), (FID_FEE_ID), - (FID_TRANSACTION_ID)], - } + (FID_TRANSACTION_ID)], + } } }, (ITEM_INFORMATION) => { -- 1.7.4 From jonathan.druart at biblibre.com Tue Apr 5 15:48:03 2011 From: jonathan.druart at biblibre.com (Jonathan Druart) Date: Tue, 5 Apr 2011 15:48:03 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5651: Question marks break searches w/ICU Message-ID: <1302011283-4352-1-git-send-email-jonathan.druart@biblibre.com> From: Jared Camins-Esakov When a user is doing a simple keyword search, they should not be expected to deal with the magical behavior of question marks in Zebra. This fix escapes question marks, and reduces the number of false positives for identifying a "simple keyword search." Signed-off-by: Jonathan Druart --- C4/Search.pm | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/C4/Search.pm b/C4/Search.pm index c69e787..24ed772 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -1122,10 +1122,12 @@ sub buildQuery { my $indexes_set; # If the user is sophisticated enough to specify an index, turn off field weighting, stemming, and stopword handling - if ( $operands[$i] =~ /(:|=)/ || $scan ) { + if ( $operands[$i] =~ /\w(:|=)/ || $scan ) { $weight_fields = 0; $stemming = 0; $remove_stopwords = 0; + } else { + $operands[$i] =~ s/\?/{?}/g; # need to escape question marks } my $operand = $operands[$i]; my $index = $indexes[$i]; -- 1.7.1 From fridolyn.somers at progilone.fr Tue Apr 5 12:18:58 2011 From: fridolyn.somers at progilone.fr (Fridolyn SOMERS) Date: Tue, 5 Apr 2011 12:18:58 +0200 Subject: [Koha-patches] [PATCH] BUG6055 moremember.tmpl template syntaxe Message-ID: <1301998738-11790-1-git-send-email-fridolyn.somers@progilone.fr> --- .../prog/en/modules/members/moremember.tmpl | 60 ++++++++++---------- 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl index ad5731d..5f4b217 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl @@ -180,11 +180,11 @@ function validate1(date) {

    - + ,
    -
    +

    @@ -200,14 +200,14 @@ function validate1(date) {
  • Work:
  • - +
  • Professional phone:
  • Professional mobile:
  • Fax:
  • - +
  • Email (home):">
  • -
  • Email (work): ">
  • +
  • Email (work): ">
  • Initials:
  • Date of birth:
  • @@ -218,17 +218,17 @@ function validate1(date) { -
  • Guarantees:
  • +
  • Guarantees:
  • - +
  • Guarantor:">,
  • - + &step=1&guarantorid=">Edit &step=1">Edit @@ -338,7 +338,7 @@ function validate1(date) {
  • Sort field 1:
  • Sort field 2:
  • -
  • OPAC login:
  • +
  • OPAC login:
  • OPAC password: ******* @@ -346,7 +346,7 @@ function validate1(date) { ">Undefined
  • -
  • Circulation note:
  • +
  • Circulation note:
  • OPAC note:
  • @@ -355,14 +355,14 @@ function validate1(date) {

    Alternate Address

    - +
    1. Address:
    2. Address 2:
    3. City, State:
    4. Zip/Postal Code:
    5. Country:
    6. -
    7. Phone:
    8. -
    9. Email:
    +
  • Phone:
  • +
  • Email:
    1. Surname:
    2. @@ -392,13 +392,13 @@ function validate1(date) {
        -
      • Checkout(s)
      • +
      • Checkout(s)
      • Relatives issues
      • Fines & Charges
      • -
      • - Hold(s) +
      • + Hold(s) 0 Holds
      • @@ -432,9 +432,9 @@ function validate1(date) { - + - + @@ -447,7 +447,7 @@ function validate1(date) { - ">, by ; , &itemnumber=#item"> + ">, by ; , &itemnumber=#item"> " alt="" /> @@ -457,7 +457,7 @@ function validate1(date) { Renewal Failed 0 - +
      @@ -585,18 +585,18 @@ function validate1(date) { ">, by - + Item is waiting - + Item in transit from since - + Item hasn't been transferred yet from - + "> -- 1.7.1 From fridolyn.somers at progilone.fr Tue Apr 5 14:41:43 2011 From: fridolyn.somers at progilone.fr (Fridolyn SOMERS) Date: Tue, 5 Apr 2011 14:41:43 +0200 Subject: [Koha-patches] [PATCH] BUG6063 Add tablesorter on memeber messaging table Message-ID: <1302007303-12768-1-git-send-email-fridolyn.somers@progilone.fr> --- .../prog/en/modules/members/messaging.tmpl | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/messaging.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/messaging.tmpl index 75bec95..c90df8e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/messaging.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/messaging.tmpl @@ -1,6 +1,16 @@ Koha › Patrons › <!-- TMPL_IF NAME="unknowuser" -->Patron does not exist<!-- TMPL_ELSE -->Patron Details for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- /TMPL_IF --> + + + @@ -42,9 +52,12 @@
    - +
    - + + + + @@ -52,6 +65,7 @@ +
    Message Queue
    TypeSubjectStatusTime Prepared
    TypeSubjectStatusTime Prepared
    There is no record of any messages that have been sent to this patron.
    -- 1.7.1 From fridolyn.somers at progilone.fr Tue Apr 5 15:21:16 2011 From: fridolyn.somers at progilone.fr (Fridolyn SOMERS) Date: Tue, 5 Apr 2011 15:21:16 +0200 Subject: [Koha-patches] [PATCH] BUG6067 when Add Duplicate change in framework would loose data Message-ID: <1302009676-13512-1-git-send-email-fridolyn.somers@progilone.fr> --- cataloguing/addbiblio.pl | 7 +++++++ .../prog/en/modules/cataloguing/addbiblio.tmpl | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl index 60f8e15..43fc42f 100755 --- a/cataloguing/addbiblio.pl +++ b/cataloguing/addbiblio.pl @@ -913,6 +913,9 @@ if ($biblionumber) { #------------------------------------------------------------------------------------- if ( $op eq "addbiblio" ) { #------------------------------------------------------------------------------------- + $template->param( + biblionumberdata => $biblionumber, + ); # getting html input my @params = $input->param(); $record = TransformHtmlToMarc( \@params , $input ); @@ -996,6 +999,10 @@ elsif ( $op eq "delete" ) { #---------------------------------------------------------------------------- # If we're in a duplication case, we have to set to "" the biblionumber # as we'll save the biblio as a new one. + $template->param( + biblionumberdata => $biblionumber, + op => $op, + ); if ( $op eq "duplicate" ) { $biblionumber = ""; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl index ba59280..ccfa577 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl @@ -231,7 +231,7 @@ function GetZ3950Terms(){ function Changefwk(FwkList) { var fwk = FwkList.options[FwkList.selectedIndex].value; - window.location = "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=&breedingid=&frameworkcode="+fwk; + window.location = "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=&op=&breedingid=&mode=&frameworkcode="+fwk; } -- 1.7.1 From Katrin.Fischer.83 at web.de Tue Apr 5 16:26:16 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Tue, 5 Apr 2011 16:26:16 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5951 : consistency change: s/planning/statistic/ Message-ID: <1302013576-17286-1-git-send-email-Katrin.Fischer.83@web.de> From: Paul POULAIN Signed-off-by: Katrin Fischer --- .../prog/en/modules/admin/aqbudgets.tmpl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl index fbf66e0..64e9389 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl @@ -328,7 +328,7 @@
  • - +
  • - + + + + + + + + + + + + + + + + +

    Filter


    Date:" />
    Author:" />
    Keyword:" />
    + +
     page(s) : /prog/img/first.png" class="first"/> diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl index a53712e..5a50ea8 100755 --- a/reports/guided_reports.pl +++ b/reports/guided_reports.pl @@ -22,7 +22,7 @@ use strict; use CGI; use Text::CSV; use C4::Reports::Guided; -use C4::Auth; +use C4::Auth qw/:DEFAULT get_session/; use C4::Output; use C4::Dates; use C4::Debug; @@ -61,8 +61,20 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( debug => 1, } ); +my $session = $cookie ? get_session($cookie->value) : undef; - my @errors = (); +my $filter; +if ( $input->param("filter_set") ) { + $filter = {}; + $filter->{$_} = $input->param("filter_$_") foreach qw/date author keyword/; + $session->param('report_filter', $filter) if $session; +} +elsif ($session) { + $filter = $session->param('report_filter'); +} + + +my @errors = (); if ( !$phase ) { $template->param( 'start' => 1 ); # show welcome page @@ -75,8 +87,15 @@ elsif ( $phase eq 'Build new' ) { elsif ( $phase eq 'Use saved' ) { # use a saved report # get list of reports and display them - $template->param( 'saved1' => 1 ); - $template->param( 'savedreports' => get_saved_reports() ); + $template->param( + 'saved1' => 1, + 'savedreports' => get_saved_reports($filter), + ); + if ($filter) { + while ( my ($k, $v) = each %$filter ) { + $template->param( "filter_$k" => $v ) if $v; + } + } } elsif ( $phase eq 'Delete Saved') { -- 1.6.5 From srdjan at catalyst.net.nz Wed Apr 6 07:22:56 2011 From: srdjan at catalyst.net.nz (Srdjan Jankovic) Date: Wed, 6 Apr 2011 17:22:56 +1200 Subject: [Koha-patches] [PATCH] wr77152 (bug 5928): AllowPurchaseSuggestionBranchChoice sys pref In-Reply-To: References: Message-ID: <1302067376-13282-1-git-send-email-srdjan@catalyst.net.nz> --- admin/systempreferences.pl | 1 + installer/data/mysql/en/mandatory/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 7 +++++++ .../prog/en/modules/admin/preferences/opac.pref | 13 +++++++++++++ .../prog/en/modules/opac-suggestions.tmpl | 13 +++++++++++++ opac/opac-suggestions.pl | 15 ++++++++++++++- 6 files changed, 49 insertions(+), 1 deletions(-) diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl index b33c7ec..4e72229 100755 --- a/admin/systempreferences.pl +++ b/admin/systempreferences.pl @@ -380,6 +380,7 @@ $tabsysprefs{OPACGroupResults} = "OPAC"; $tabsysprefs{XSLTDetailsDisplay} = "OPAC"; $tabsysprefs{XSLTResultsDisplay} = "OPAC"; $tabsysprefs{OPACShowCheckoutName} = "OPAC"; +$tabsysprefs{AllowPurchaseSuggestionBranchChoice} = "OPAC"; # Serials $tabsysprefs{RoutingListAddReserves} = "Serials"; diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql index 6d382c7..49adaf4 100644 --- a/installer/data/mysql/en/mandatory/sysprefs.sql +++ b/installer/data/mysql/en/mandatory/sysprefs.sql @@ -292,3 +292,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('TraceCompleteSubfields','0','Force subject tracings to only match complete subfields.','0','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('UseAuthoritiesForTracings','1','Use authority record numbers for subject tracings instead of heading strings.','0','YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OPACAllowUserToChooseBranch', 1, 'Allow the user to choose the branch they want to pickup their hold from','1','YesNo'); +INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowPurchaseSuggestionBranchChoice', 0, 'Allow user to choose branch when making a purchase suggestion','1','YesNo'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 66e9828..155d67a 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -4090,6 +4090,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } +$DBversion = "3.03.00.XXX"; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowPurchaseSuggestionBranchChoice', 0, 'Allow user to choose branch when making a purchase suggestion','1','YesNo')"); + print "Upgrade to $DBversion done (Add syspref to control if user can choose branch when making purchase suggestion)\n"; + SetVersion ($DBversion); +} + =head1 FUNCTIONS =head2 DropAllForeignKeys($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index 3014e63..ac3206a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -274,6 +274,19 @@ OPAC: yes: Show no: "Don't show" - purchase suggestions from other patrons on the OPAC. + - + - pref: AllowPurchaseSuggestionBranchChoice + default: 0 + choices: + no: "Don't allow" + yes: Allow + - patrons to select branch when making a purchase suggestion + - + - pref: SearchMyLibraryFirst + choices: + yes: Limit + no: "Don't limit" + - "patrons' searches to the library they are registered at." Privacy: - - pref: AnonSuggestions diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl index ab1e811..6783bb3 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl @@ -91,6 +91,19 @@ $.tablesorter.addParser({
  • + +
  • + +
  • +
  • diff --git a/opac/opac-suggestions.pl b/opac/opac-suggestions.pl index 2f0dc36..15eebf9 100755 --- a/opac/opac-suggestions.pl +++ b/opac/opac-suggestions.pl @@ -20,6 +20,7 @@ use warnings; use CGI; use C4::Auth; # get_template_and_user +use C4::Members; use C4::Branch; use C4::Koha; use C4::Output; @@ -77,7 +78,7 @@ if ( $op eq "add_confirm" ) { } else { $$suggestion{'suggesteddate'}=C4::Dates->today; - $$suggestion{'branchcode'}=C4::Context->userenv->{"branch"}; + $$suggestion{'branchcode'}= $input->param('branch') || C4::Context->userenv->{"branch"}; &NewSuggestion($suggestion); # empty fields, to avoid filter in "SearchSuggestion" $$suggestion{$_}='' foreach qw; @@ -122,6 +123,18 @@ foreach my $suggestion(@$suggestions_loop) { my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG"); +# Is the person allowed to choose their branch +if ( C4::Context->preference("AllowPurchaseSuggestionBranchChoice") ) { + my ( $borr ) = GetMemberDetails( $borrowernumber ); + +# pass the pickup branch along.... + my $branch = $input->param('branch') || $borr->{'branchcode'} || C4::Context->userenv->{branch} || '' ; + +# make branch selection options... + my $CGIbranchloop = GetBranchesLoop($branch); + $template->param( branch_loop => $CGIbranchloop ); +} + $template->param( %$suggestion, itemtypeloop=> $supportlist, -- 1.6.5 From stephane.delaune at biblibre.com Wed Apr 6 09:33:31 2011 From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=) Date: Wed, 6 Apr 2011 09:33:31 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Corrected search for ISBN / ISSN Message-ID: <1302075211-3147-1-git-send-email-stephane.delaune@biblibre.com> From: Janusz Kaczmarek <januszop at gmail.com> Signed-off-by: St?phane Delaune <stephane.delaune at biblibre.com> --- C4/Search.pm | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/C4/Search.pm b/C4/Search.pm index c69e787..9cf9a25 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -1146,7 +1146,6 @@ sub buildQuery { } # ISBN,ISSN,Standard Number, don't need special treatment elsif ( $index eq 'nb' || $index eq 'ns' ) { - $indexes_set++; ( $stemming, $auto_truncation, $weight_fields, $fuzzy_enabled, @@ -1161,7 +1160,7 @@ sub buildQuery { # Set default structure attribute (word list) my $struct_attr = q{}; - unless ( $indexes_set || !$index || $index =~ /(st-|phr|ext|wrdl)/ ) { + unless ( $indexes_set || !$index || $index =~ /(st-|phr|ext|wrdl|nb|ns)/ ) { $struct_attr = ",wrdl"; } @@ -1353,7 +1352,7 @@ sub buildQuery { # This is flawed , means we can't search anything with : in it # if user wants to do ccl or cql, start the query with that # $query =~ s/:/=/g; - $query =~ s/(?<=(ti|au|pb|su|an|kw|mc)):/=/g; + $query =~ s/(?<=(ti|au|pb|su|an|kw|mc|nb|ns)):/=/g; $query =~ s/(?<=(wrdl)):/=/g; $query =~ s/(?<=(trn|phr)):/=/g; $limit =~ s/:/=/g; -- 1.7.0.4 From stephane.delaune at biblibre.com Wed Apr 6 09:36:22 2011 From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=) Date: Wed, 6 Apr 2011 09:36:22 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug5555 Corrected search for ISBN / ISSN Message-ID: <1302075382-3204-1-git-send-email-stephane.delaune@biblibre.com> From: Janusz Kaczmarek <januszop at gmail.com> Signed-off-by: St?phane Delaune <stephane.delaune at biblibre.com> --- C4/Search.pm | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/C4/Search.pm b/C4/Search.pm index c69e787..9cf9a25 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -1146,7 +1146,6 @@ sub buildQuery { } # ISBN,ISSN,Standard Number, don't need special treatment elsif ( $index eq 'nb' || $index eq 'ns' ) { - $indexes_set++; ( $stemming, $auto_truncation, $weight_fields, $fuzzy_enabled, @@ -1161,7 +1160,7 @@ sub buildQuery { # Set default structure attribute (word list) my $struct_attr = q{}; - unless ( $indexes_set || !$index || $index =~ /(st-|phr|ext|wrdl)/ ) { + unless ( $indexes_set || !$index || $index =~ /(st-|phr|ext|wrdl|nb|ns)/ ) { $struct_attr = ",wrdl"; } @@ -1353,7 +1352,7 @@ sub buildQuery { # This is flawed , means we can't search anything with : in it # if user wants to do ccl or cql, start the query with that # $query =~ s/:/=/g; - $query =~ s/(?<=(ti|au|pb|su|an|kw|mc)):/=/g; + $query =~ s/(?<=(ti|au|pb|su|an|kw|mc|nb|ns)):/=/g; $query =~ s/(?<=(wrdl)):/=/g; $query =~ s/(?<=(trn|phr)):/=/g; $limit =~ s/:/=/g; -- 1.7.0.4 From christophe.croullebois at biblibre.com Wed Apr 6 09:51:45 2011 From: christophe.croullebois at biblibre.com (Christophe Croullebois) Date: Wed, 6 Apr 2011 09:51:45 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Partial fix for Bug 4870, Damaged status does not prevent items from being selected for reserves Message-ID: <1302076305-18802-1-git-send-email-christophe.croullebois@biblibre.com> From: Owen Leonard <oleonard at myacpl.org> This patch changes the holds queue build process in order to require that items not be damaged in order to appear in the holds queue report. Revision adds a check for the AllowHoldsOnDamagedItems preference to determine whether a damaged item should be included in the holds queue report. Signed-off-by: Christophe Croullebois <christophe.croullebois at biblibre.com> --- misc/cronjobs/holds/build_holds_queue.pl | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/misc/cronjobs/holds/build_holds_queue.pl b/misc/cronjobs/holds/build_holds_queue.pl index b02ab60..f01153e 100755 --- a/misc/cronjobs/holds/build_holds_queue.pl +++ b/misc/cronjobs/holds/build_holds_queue.pl @@ -168,8 +168,9 @@ sub GetItemsAvailableToFillHoldRequestsForBib { $items_query .= "WHERE items.notforloan = 0 AND holdingbranch IS NOT NULL AND itemlost = 0 - AND wthdrawn = 0 - AND items.onloan IS NULL + AND wthdrawn = 0"; + $items_query .= " AND damaged = 0 " unless C4::Context->preference('AllowHoldsOnDamagedItems'); + $items_query .= " AND items.onloan IS NULL AND (itemtypes.notforloan IS NULL OR itemtypes.notforloan = 0) AND itemnumber NOT IN ( SELECT itemnumber -- 1.7.0.4 From paul.poulain at biblibre.com Tue Apr 5 22:17:31 2011 From: paul.poulain at biblibre.com (paul.poulain at biblibre.com) Date: Tue, 5 Apr 2011 22:17:31 +0200 Subject: [Koha-patches] [PATCH] BZ6074: setting import flag when staged file imported in aqbasket Message-ID: <1302034651-8272-1-git-send-email-paul.poulain@biblibre.com> From: Paul Poulain <paul.poulain at biblibre.com> Lines issued from a staged file have a flag that can be set when the order has been added in a basket. It's set when a staged file is imported into the catalogue, it should be set also when a record is inserted through aquisition. --- acqui/addorderiso2709.pl | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index c46263a..2e6de2f 100755 --- a/acqui/addorderiso2709.pl +++ b/acqui/addorderiso2709.pl @@ -179,6 +179,7 @@ if ($op eq ""){ } } ( $biblionumber, $bibitemnum ) = AddBiblio( $marcrecord, $cgiparams->{'frameworkcode'} || '' ); + SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' ); # 2nd add authorities if applicable if (C4::Context->preference("BiblioAddsAuthorities")){ my ($countlinked,$countcreated)=BiblioAddAuthorities($marcrecord, $cgiparams->{'frameworkcode'}); @@ -249,6 +250,8 @@ if ($op eq ""){ my ( $biblionumber, $bibitemnum, $itemnumber ) = AddItemFromMarc( $record, $biblionumber ); NewOrderItem( $itemnumber, $ordernumber ); } + } else { + SetImportRecordStatus( $biblio->{'import_record_id'}, 'imported' ); } } # go to basket page @@ -324,15 +327,22 @@ sub import_batches_list { my @list = (); foreach my $batch (@$batches) { if ($batch->{'import_status'} eq "staged") { - push @list, { - import_batch_id => $batch->{'import_batch_id'}, - num_biblios => $batch->{'num_biblios'}, - num_items => $batch->{'num_items'}, - upload_timestamp => $batch->{'upload_timestamp'}, - import_status => $batch->{'import_status'}, - file_name => $batch->{'file_name'}, - comments => $batch->{'comments'}, - }; + # check if there is at least 1 line still staged + my $stagedList=GetImportBibliosRange($batch->{'import_batch_id'}, undef, undef, 'staged'); + if (scalar @$stagedList) { + push @list, { + import_batch_id => $batch->{'import_batch_id'}, + num_biblios => $batch->{'num_biblios'}, + num_items => $batch->{'num_items'}, + upload_timestamp => $batch->{'upload_timestamp'}, + import_status => $batch->{'import_status'}, + file_name => $batch->{'file_name'}, + comments => $batch->{'comments'}, + }; + } else { + # if there are no more line to includes, set the status to imported + SetImportBatchStatus( $batch->{'import_batch_id'}, 'imported' ); + } } } $template->param(batch_list => \@list); -- 1.7.1 From paul.poulain at biblibre.com Tue Apr 5 22:43:06 2011 From: paul.poulain at biblibre.com (paul.poulain at biblibre.com) Date: Tue, 5 Apr 2011 22:43:06 +0200 Subject: [Koha-patches] [PATCH] BZ6075: problem in pdf and columns alignment Message-ID: <1302036186-9363-1-git-send-email-paul.poulain@biblibre.com> From: Paul Poulain <paul.poulain at biblibre.com> When some fields are empty, the table is wrongly set : the empty columns are not set, thus the column don't contains what they are supposed to contain --- acqui/basketgroup.pl | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl index 457b616..a92d730 100755 --- a/acqui/basketgroup.pl +++ b/acqui/basketgroup.pl @@ -211,19 +211,18 @@ sub printbasketgrouppdf{ } else { push(@ba_order, undef); } - if ($ord->{itemtype}){ - push(@ba_order, $itemtypes->{$bib->{itemtype}}->{description}) if $bib->{itemtype}; + if ($ord->{itemtype} and $bib->{itemtype}){ + push(@ba_order, $itemtypes->{$bib->{itemtype}}->{description}); } else { push(@ba_order, undef); } # } else { # push(@ba_order, undef, undef); for my $key (qw/author title publishercode quantity listprice ecost/) { - push(@ba_order, $ord->{$key}); #Order lines + push(@ba_order, ($ord->{$key} || undef )); #Order lines } - push(@ba_order, $bookseller->{discount}); + push(@ba_order, $bookseller->{discount} || undef ); push(@ba_order, $bookseller->{gstrate}*100 // C4::Context->preference("gist") // 0); - push(@ba_orders, \@ba_order); # Editor Number my $en; if (C4::Context->preference("marcflavour") eq 'UNIMARC') { @@ -236,6 +235,7 @@ sub printbasketgrouppdf{ } else { push(@ba_order, undef); } + push( @ba_orders, \@ba_order ); } } $orders{$basket->{basketno}}=\@ba_orders; -- 1.7.1 From paul.poulain at biblibre.com Tue Apr 5 23:28:24 2011 From: paul.poulain at biblibre.com (paul.poulain at biblibre.com) Date: Tue, 5 Apr 2011 23:28:24 +0200 Subject: [Koha-patches] [PATCH] BZ6077: qty not incremented for AcqCreateItem=recieve Message-ID: <1302038904-11303-1-git-send-email-paul.poulain@biblibre.com> From: Paul Poulain <paul.poulain at biblibre.com> When you want to create items on order recieve, the qty was not incremented when the librarian adds an item with the + This was because the js was expecting the qty field to be id=quantity --- .../prog/en/modules/acqui/orderreceive.tmpl | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl index 8206ec4..99d3189 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl @@ -90,35 +90,35 @@ <legend>Accounting details</legend> <ol> <li><label for="datereceived">Date received: </label><span class="label"> <!-- TMPL_VAR NAME="datereceived" --> </span></li> - <li><label for="quantity">Quantity to receive: </label><span class="label"> + <li><label for="quantityto">Quantity to receive: </label><span class="label"> <!-- TMPL_IF name="edit" --> <input type="text" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" /> <!-- TMPL_ELSE --> <input type="text" READONLY name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" /> <!-- /TMPL_IF --> </span></li> - <li><label for="quantityrec">Quantity received: </label> + <li><label for="quantity">Quantity received: </label> <!-- TMPL_IF NAME="quantityreceived" --> <!-- TMPL_IF name="edit" --> - <input id="quantityrec" type="text" size="20" name="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->" /> + <input type="text" size="20" name="quantityrec" id="quantity" value="<!-- TMPL_VAR NAME="quantityreceived" -->" /> <input id="origquantityrec" READONLY type="hidden" name="origquantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->" /> <!-- TMPL_ELSE --> <!-- TMPL_IF name="items" --> - <input id="quantityrec" READONLY type="text" size="20" name="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceivedplus1" -->" /> + <input READONLY type="text" size="20" name="quantityrec" id="quantity" value="<!-- TMPL_VAR NAME="quantityreceivedplus1" -->" /> <!-- TMPL_ELSE --> - <input id="quantityrec" type="text" size="20" name="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceivedplus1" -->" /> + <input type="text" size="20" name="quantityrec" id="quantity" value="<!-- TMPL_VAR NAME="quantityreceivedplus1" -->" /> <!-- /TMPL_IF --> <input id="origquantityrec" READONLY type="hidden" name="origquantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->" /> <!-- /TMPL_IF --> <!-- TMPL_ELSE --> <!-- TMPL_IF name="items" --> - <input id="quantityrec" READONLY type="text" size="20" name="quantityrec" value="1" /> + <input READONLY type="text" id="quantity" size="20" name="quantityrec" value="1" /> <!-- TMPL_ELSE --> - <input id="quantityrec" type="text" size="20" name="quantityrec" value="1" /> + <input type="text" size="20" id="quantity" name="quantityrec" value="1" /> <!-- /TMPL_IF --> <input id="origquantityrec" READONLY type="hidden" name="origquantityrec" value="0" /> <!-- /TMPL_IF --> - <!-- <input type="text" size="20" name="quantityrec" id="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->" /> --></li> + </li> <li><label for="rrp">Replacement cost: </label><input type="text" size="20" name="rrp" id="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" /></li> <li><label for="ecost">Budgeted cost: </label><input type="text" size="20" name="ecost" id="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" /></li> <li><label for="cost">Actual cost:</label> -- 1.7.1 From Katrin.Fischer.83 at web.de Wed Apr 6 10:02:31 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Wed, 6 Apr 2011 10:02:31 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] BZ6077: qty not incremented for AcqCreateItem=recieve Message-ID: <1302076951-16264-1-git-send-email-Katrin.Fischer.83@web.de> From: Paul Poulain <paul.poulain at biblibre.com> When you want to create items on order recieve, the qty was not incremented when the librarian adds an item with the + This was because the js was expecting the qty field to be id=quantity Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> --- .../prog/en/modules/acqui/orderreceive.tmpl | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl index 8206ec4..99d3189 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl @@ -90,35 +90,35 @@ <legend>Accounting details</legend> <ol> <li><label for="datereceived">Date received: </label><span class="label"> <!-- TMPL_VAR NAME="datereceived" --> </span></li> - <li><label for="quantity">Quantity to receive: </label><span class="label"> + <li><label for="quantityto">Quantity to receive: </label><span class="label"> <!-- TMPL_IF name="edit" --> <input type="text" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" /> <!-- TMPL_ELSE --> <input type="text" READONLY name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" /> <!-- /TMPL_IF --> </span></li> - <li><label for="quantityrec">Quantity received: </label> + <li><label for="quantity">Quantity received: </label> <!-- TMPL_IF NAME="quantityreceived" --> <!-- TMPL_IF name="edit" --> - <input id="quantityrec" type="text" size="20" name="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->" /> + <input type="text" size="20" name="quantityrec" id="quantity" value="<!-- TMPL_VAR NAME="quantityreceived" -->" /> <input id="origquantityrec" READONLY type="hidden" name="origquantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->" /> <!-- TMPL_ELSE --> <!-- TMPL_IF name="items" --> - <input id="quantityrec" READONLY type="text" size="20" name="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceivedplus1" -->" /> + <input READONLY type="text" size="20" name="quantityrec" id="quantity" value="<!-- TMPL_VAR NAME="quantityreceivedplus1" -->" /> <!-- TMPL_ELSE --> - <input id="quantityrec" type="text" size="20" name="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceivedplus1" -->" /> + <input type="text" size="20" name="quantityrec" id="quantity" value="<!-- TMPL_VAR NAME="quantityreceivedplus1" -->" /> <!-- /TMPL_IF --> <input id="origquantityrec" READONLY type="hidden" name="origquantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->" /> <!-- /TMPL_IF --> <!-- TMPL_ELSE --> <!-- TMPL_IF name="items" --> - <input id="quantityrec" READONLY type="text" size="20" name="quantityrec" value="1" /> + <input READONLY type="text" id="quantity" size="20" name="quantityrec" value="1" /> <!-- TMPL_ELSE --> - <input id="quantityrec" type="text" size="20" name="quantityrec" value="1" /> + <input type="text" size="20" id="quantity" name="quantityrec" value="1" /> <!-- /TMPL_IF --> <input id="origquantityrec" READONLY type="hidden" name="origquantityrec" value="0" /> <!-- /TMPL_IF --> - <!-- <input type="text" size="20" name="quantityrec" id="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->" /> --></li> + </li> <li><label for="rrp">Replacement cost: </label><input type="text" size="20" name="rrp" id="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" /></li> <li><label for="ecost">Budgeted cost: </label><input type="text" size="20" name="ecost" id="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" /></li> <li><label for="cost">Actual cost:</label> -- 1.7.1 From paul.poulain at biblibre.com Tue Apr 5 23:13:57 2011 From: paul.poulain at biblibre.com (paul.poulain at biblibre.com) Date: Tue, 5 Apr 2011 23:13:57 +0200 Subject: [Koha-patches] [PATCH] BZ7076: acqui pdf error when marcxml wrong Message-ID: <1302038037-10658-1-git-send-email-paul.poulain@biblibre.com> From: Paul Poulain <paul.poulain at biblibre.com> when marcxml is wrong the PDF is not generated. There is a Perl error because the biblio can't be retrieved. This can be workarounded with a eval when decoding the marc --- acqui/basketgroup.pl | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl index a92d730..5e50503 100755 --- a/acqui/basketgroup.pl +++ b/acqui/basketgroup.pl @@ -225,10 +225,13 @@ sub printbasketgrouppdf{ push(@ba_order, $bookseller->{gstrate}*100 // C4::Context->preference("gist") // 0); # Editor Number my $en; - if (C4::Context->preference("marcflavour") eq 'UNIMARC') { - $en = MARC::Record::new_from_xml($ord->{marcxml},'UTF-8')->subfield('345',"b"); - } elsif (C4::Context->preference("marcflavour") eq 'MARC21') { - $en = MARC::Record::new_from_xml($ord->{marcxml},'UTF-8')->subfield('037',"a"); + my $marcrecord=eval{MARC::Record::new_from_xml( $ord->{marcxml},'UTF-8' )}; + if ($marcrecord){ + if ( C4::Context->preference("marcflavour") eq 'UNIMARC' ) { + $en = $marcrecord->subfield( '345', "b" ); + } elsif ( C4::Context->preference("marcflavour") eq 'MARC21' ) { + $en = $marcrecord->subfield( '037', "a" ); + } } if($en){ push(@ba_order, $en); -- 1.7.1 From Katrin.Fischer.83 at web.de Wed Apr 6 10:14:04 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Wed, 6 Apr 2011 10:14:04 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 3803 Show ISSN in orderline of basket display Message-ID: <1302077644-20612-1-git-send-email-Katrin.Fischer.83@web.de> From: Colin Campbell <colin.campbell at ptfs-europe.com> Where an item possesses an ISSN is may be of equal or greater importance to acquisitions staff as the ISBN so include it in the display Sponsered by UNFAO, Rome Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> --- .../prog/en/modules/acqui/basket.tmpl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl index 02b0a06..6a3044b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl @@ -262,6 +262,7 @@ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" ESCAPE="html" --></a> by <!-- TMPL_VAR NAME="author" --> <!-- TMPL_IF name="notes" --> <!--TMPL_VAR name="notes" --><!-- /TMPL_IF --> <!-- TMPL_IF name="isbn"--> - <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF --> + <!-- TMPL_IF name="issn"--> - <!-- TMPL_VAR name="issn" --><!-- /TMPL_IF --> <!-- TMPL_IF name="publishercode" -->, <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF --> <!-- TMPL_IF name="publicationyear" -->, <!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF --> </p> -- 1.7.1 From stephane.delaune at biblibre.com Wed Apr 6 10:14:29 2011 From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=) Date: Wed, 6 Apr 2011 10:14:29 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 4374 Improve biblio data entry form regarding hidden/mandatory fields Message-ID: <1302077669-3747-1-git-send-email-stephane.delaune@biblibre.com> From: Fr?d?ric Demians <f.demians at tamil.fr> Biblio framework has 3 entry points controlling if input box are displayed by default in data entry form: - 'mandatory' flag at field level - 'mandatory' flag at subfield level - 'hidden' flag at subfield level It doesn't work as it should (?): - All subfields are expanded (shown) if their field is mandatory - A subfield containing anything is always expanded whatever it contains - A mandatory subfield is always expanded - An hidden subfield isn't expanded. Default framework having 0 in all marc_subfield_structure.hidden, by default all subfields will be expanded. TO BE INTEGRATED IN RELEASE NOTES: Koha sysadmin should have to edit its frameworks to add hidden=1 in appropriate subfields. Signed-off-by: St?phane Delaune <stephane.delaune at biblibre.com> --- cataloguing/addbiblio.pl | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl index 038878f..4bb2012 100755 --- a/cataloguing/addbiblio.pl +++ b/cataloguing/addbiblio.pl @@ -341,14 +341,14 @@ sub create_input { if(exists $mandatory_z3950->{$tag.$subfield}){ $subfield_data{z3950_mandatory} = $mandatory_z3950->{$tag.$subfield}; } - # decide if the subfield must be expanded (visible) by default or not - # if it is mandatory, then expand. If it is hidden explicitly by the hidden flag, hidden anyway + # Subfield is hidden depending of hidden and mandatory flag, and is always + # shown if it contains anything or if its field is mandatory. + my $tdef = $tagslib->{$tag}; $subfield_data{visibility} = "display:none;" - if ( ($tagslib->{$tag}->{$subfield}->{hidden} % 2 == 1) and $value ne '' - or ($value eq '' and !$tagslib->{$tag}->{$subfield}->{mandatory}) - ); - # always expand all subfields of a mandatory field - $subfield_data{visibility} = "" if $tagslib->{$tag}->{mandatory}; + if $tdef->{$subfield}->{hidden} % 2 == 1 && + $value eq '' && + !$tdef->{$subfield}->{mandatory} && + !$tdef->{mandatory}; # it's an authorised field if ( $tagslib->{$tag}->{$subfield}->{authorised_value} ) { $subfield_data{marc_value} = -- 1.7.0.4 From christophe.croullebois at biblibre.com Wed Apr 6 10:20:59 2011 From: christophe.croullebois at biblibre.com (Christophe Croullebois) Date: Wed, 6 Apr 2011 10:20:59 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug #6049 - Add a filter by date in overdue.pl Message-ID: <1302078059-18981-1-git-send-email-christophe.croullebois@biblibre.com> From: Alex Arnaud <alex.arnaud at biblibre.com> Signed-off-by: Christophe Croullebois <christophe.croullebois at biblibre.com> --- circ/overdue.pl | 12 ++++++- .../prog/en/modules/circ/overdue.tmpl | 30 ++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/circ/overdue.pl b/circ/overdue.pl index 3510a2b..94bd0f8 100755 --- a/circ/overdue.pl +++ b/circ/overdue.pl @@ -27,7 +27,7 @@ use CGI qw(-oldstyle_urls); use C4::Auth; use C4::Branch; use C4::Debug; -use C4::Dates qw/format_date/; +use C4::Dates qw/format_date format_date_in_iso/; use Date::Calc qw/Today/; use Text::CSV_XS; @@ -40,6 +40,8 @@ my $itemtypefilter = $input->param('itemtype') || ''; my $borflagsfilter = $input->param('borflag') || ''; my $branchfilter = $input->param('branch') || ''; my $op = $input->param('op') || ''; +my $dateduefrom = format_date_in_iso($input->param( 'dateduefrom' )) || ''; +my $datedueto = format_date_in_iso($input->param( 'datedueto' )) || ''; my $isfiltered = $op =~ /apply/i && $op =~ /filter/i; my $noreport = C4::Context->preference('FilterBeforeOverdueReport') && ! $isfiltered && $op ne "csv"; @@ -209,7 +211,11 @@ $template->param( patron_attr_filter_loop => \@patron_attr_filter_loop, borname => $bornamefilter, order => $order, - showall => $showall); + showall => $showall, + DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), + dateduefrom => $input->param( 'dateduefrom' ) || '', + datedueto => $input->param( 'datedueto' ) || '', +); if ($noreport) { # la de dah ... page comes up presto-quicko @@ -254,6 +260,8 @@ if ($noreport) { $strsth.=" AND biblioitems.itemtype = '" . $itemtypefilter . "' " if $itemtypefilter; $strsth.=" AND borrowers.flags = '" . $borflagsfilter . "' " if $borflagsfilter; $strsth.=" AND borrowers.branchcode = '" . $branchfilter . "' " if $branchfilter; + $strsth.=" AND date_due < '" . $datedueto . "' " if $datedueto; + $strsth.=" AND date_due > '" . $dateduefrom . "' " if $dateduefrom; # restrict patrons (borrowers) to those matching the patron attribute filter(s), if any my $bnlist = $have_pattr_filter_data ? join(',',keys %borrowernumber_to_attributes) : ''; $strsth =~ s/WHERE 1=1/WHERE 1=1 AND borrowers.borrowernumber IN ($bnlist)/ if $bnlist; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl index 9682fb1..c1f2053 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl @@ -69,6 +69,7 @@ <style type="text/css"> .sql {display:none;} </style> +<!-- TMPL_INCLUDE NAME="calendar.inc" --> </head> <body> <!-- TMPL_INCLUDE NAME="header.inc" --> @@ -137,6 +138,35 @@ <fieldset class="brief"> <h4>Filter On:</h4> <ol> + <li style="border: dashed; border-width:1px;">Date due: + <label for="dateduefrom">From: + <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="dateduefrom_button" alt="Show Calendar" /> + </label> + <input type="text" id="dateduefrom" name="dateduefrom" size="20" value="<!-- TMPL_VAR NAME="dateduefrom" -->" /> + <script language="JavaScript" type="text/javascript"> + Calendar.setup( + { + inputField : "dateduefrom", + ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->", + button : "dateduefrom_button" + } + ); + </script> + + <label for="datedueto">To: + <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="datedueto_button" alt="Show Calendar" /> + </label> + <input type="text" id="datedueto" name="datedueto" size="20" value="<!-- TMPL_VAR NAME="datedueto" -->" /> + <script language="JavaScript" type="text/javascript"> + Calendar.setup( + { + inputField : "datedueto", + ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->", + button : "datedueto_button" + } + ); + </script> + </li> <li><label>Name or cardnumber:</label><input type="text" name="borname" value="<!--TMPL_VAR Name="borname" escape="html" -->" /></li> <li><label>Patron category:</label><select name="borcat" id="borcat"><option value="">Any</option> <!-- TMPL_LOOP name="borcatloop" --> -- 1.7.0.4 From julian.maurice at biblibre.com Wed Apr 6 10:46:35 2011 From: julian.maurice at biblibre.com (Julian Maurice) Date: Wed, 6 Apr 2011 10:46:35 +0200 Subject: [Koha-patches] [PATCH] Bug 6078: Request to find borrowers without issues overload the server Message-ID: <1302079596-27436-1-git-send-email-julian.maurice@biblibre.com> From: Sophie Meynieux <sophie.meynieux at biblibre.com> Optimization of the SQL request using NOT EXISTS instead of NOT IN BibLibre MT5946 --- reports/borrowers_out.pl | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/reports/borrowers_out.pl b/reports/borrowers_out.pl index 0a135e1..278e412 100755 --- a/reports/borrowers_out.pl +++ b/reports/borrowers_out.pl @@ -230,18 +230,12 @@ sub calculate { @$filters[0]=~ s/\*/%/g if (@$filters[0]); $strcalc .= " AND borrowers.categorycode like '" . @$filters[0] ."'" if ( @$filters[0] ); - my $strqueryfilter = "SELECT DISTINCT borrowernumber FROM "; - $strqueryfilter .= "(SELECT borrowernumber from old_issues WHERE borrowernumber IS NOT NULL "; - if ($filters->[1]){ - $strqueryfilter .= "AND old_issues.timestamp> '$filters->[1]' "; - } - $strqueryfilter .= "UNION SELECT borrowernumber FROM issues WHERE 1 "; - if ($filters->[1]){ - $strqueryfilter .= "AND issues.timestamp> '$filters->[1]' "; - } - $strqueryfilter .= ") active_borrowers"; - - $strcalc .= " AND borrowers.borrowernumber not in ($strqueryfilter)"; + $strcalc .= " AND NOT EXISTS (SELECT * FROM issues WHERE issues.borrowernumber=borrowers.borrowernumber "; + $strcalc .= " AND issues.timestamp> '" . @$filters[1] . "'" if (@$filters[1]); + $strcalc .= ") "; + $strcalc .= " AND NOT EXISTS (SELECT * FROM old_issues WHERE old_issues.borrowernumber=borrowers.borrowernumber "; + $strcalc .= " AND old_issues.timestamp> '" . @$filters[1] . "'" if (@$filters[1]); + $strcalc .= ") "; $strcalc .= " group by borrowers.borrowernumber"; $strcalc .= ", $colfield" if ($column); $strcalc .= " order by $colfield " if ($colfield); -- 1.7.4.1 From Katrin.Fischer.83 at web.de Wed Apr 6 10:54:38 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Wed, 6 Apr 2011 10:54:38 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] BZ6072: fixing permission inconsistencies MT5306 Message-ID: <1302080078-11567-1-git-send-email-Katrin.Fischer.83@web.de> From: Paul Poulain <paul.poulain at biblibre.com> In large libraries, some librarian may have permission only to recieve shipments This patch fixes some permission : * booksellers page = accessible to anyone that has at least 1 acq permission * parcels = accessible to anyone with order_recieve * supplier detail = accessible to anyone that has at least 1 acq permission, but modifying accessible only if vendor_manage Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> --- acqui/booksellers.pl | 2 +- acqui/parcels.pl | 2 +- acqui/supplier.pl | 2 +- .../prog/en/includes/acquisitions-toolbar.inc | 22 +++++++++++-------- .../prog/en/modules/acqui/booksellers.tmpl | 4 ++- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl index 88dbaa9..cc5c084 100755 --- a/acqui/booksellers.pl +++ b/acqui/booksellers.pl @@ -66,7 +66,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( query => $query, type => 'intranet', authnotrequired => 0, - flagsrequired => { acquisition => 'vendors_manage' }, + flagsrequired => { acquisition => '*' }, debug => 1, } ); diff --git a/acqui/parcels.pl b/acqui/parcels.pl index 1e8d44e..915b1e8 100755 --- a/acqui/parcels.pl +++ b/acqui/parcels.pl @@ -91,7 +91,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( query => $input, type => 'intranet', authnotrequired => 0, - flagsrequired => { acquisition => 1 }, + flagsrequired => { acquisition => 'order_receive' }, debug => 1, } ); diff --git a/acqui/supplier.pl b/acqui/supplier.pl index 52d940c..2a4078a 100755 --- a/acqui/supplier.pl +++ b/acqui/supplier.pl @@ -64,7 +64,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( query => $query, type => 'intranet', authnotrequired => 0, - flagsrequired => { acquisition => 'vendors_manage' }, + flagsrequired => { acquisition => '*' }, debug => 1, } ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc index 9f7a8e5..a11417a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -21,9 +21,11 @@ new YAHOO.widget.Button("editcontracts"); var manageorders = [ - { text: _("New basket"), url: "/cgi-bin/koha/acqui/basketheader.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->&op=add_form"}, - { text: _("Baskets"), url: "/cgi-bin/koha/acqui/booksellers.pl?supplierid=<!--TMPL_VAR Name="id"-->"}, - { text: _("Basket groups"), url: "/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->"}, + <!-- TMPL_IF name="CAN_user_acquisition_order_manage" --> + { text: _("New basket"), url: "/cgi-bin/koha/acqui/basketheader.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->&op=add_form"}, + { text: _("Baskets"), url: "/cgi-bin/koha/acqui/booksellers.pl?supplierid=<!--TMPL_VAR Name="id"-->"}, + { text: _("Basket groups"), url: "/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->"}, + <!-- /TMPL_IF --> { text: _("Receive shipments"), url: "/cgi-bin/koha/acqui/parcels.pl?supplierid=<!--TMPL_VAR Name="id"-->" }, <!-- TMPL_IF name="basketno" --> { text: _("Uncertain prices"), url: "/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=<!-- TMPL_VAR NAME="id" -->&basketno=<!--TMPL_VAR name="basketno" -->&owner=1"} @@ -42,12 +44,14 @@ </script> <ul id="toolbar-list" class="toolbar"> <!-- TMPL_IF NAME="id" --> - <li><a id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&op=enter">Edit</a></li> - <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=<!-- TMPL_VAR name="id" -->">New Contract</a></li> - <li><a id="editcontracts" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=<!-- TMPL_VAR name="id" -->">Contracts</a></li> - <!-- TMPL_UNLESS NAME="basketcount" --> - <li><a id="newbasket" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=<!-- TMPL_VAR name="id" -->&op=add_form">New Basket</a></li> - <!-- /TMPL_UNLESS --> + <!-- TMPL_IF name="CAN_user_acquisition_vendors_manage" --> + <li><a id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&op=enter">Edit</a></li> + <li><a id="newcontract" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=<!-- TMPL_VAR name="id" -->">New Contract</a></li> + <li><a id="editcontracts" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=<!-- TMPL_VAR name="id" -->">Contracts</a></li> + <!-- TMPL_UNLESS NAME="basketcount" --> + <li><a id="newbasket" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=<!-- TMPL_VAR name="id" -->&op=add_form">New Basket</a></li> + <!-- /TMPL_UNLESS --> + <!-- /TMPL_IF --> <!-- TMPL_ELSE --> <li><a id="newbudget" href="/cgi-bin/koha/acqui/supplier.pl?op=enter">New Vendor</a></li> <!-- /TMPL_IF --> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl index 50b3ea7..6d64251 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl @@ -58,11 +58,13 @@ <!-- TMPL_ELSE --> <tr> <!-- /TMPL_UNLESS --> - <td> <!-- TMPL_IF name="active" --> + <td><!-- TMPL_IF name="CAN_user_acquisition_order_manage" --> + <!-- TMPL_IF name="active" --> <a href="basketheader.pl?booksellerid=<!-- TMPL_VAR name="supplierid" -->&op=add_form">New basket</a> <!-- TMPL_ELSE --> Inactive <!-- /TMPL_IF --> + <!-- /TMPL_IF --> </td> <td> <a href="parcels.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">Receive shipment</a> </td> -- 1.7.1 From julian.maurice at biblibre.com Wed Apr 6 11:21:48 2011 From: julian.maurice at biblibre.com (Julian Maurice) Date: Wed, 6 Apr 2011 11:21:48 +0200 Subject: [Koha-patches] [PATCH] Bug 6080: total is wrong in acqui-home.pl Message-ID: <1302081708-12425-1-git-send-email-julian.maurice@biblibre.com> From: Paul Poulain <paul.poulain at biblibre.com> In Acqui-home, with hierarchic bugdets, it's a non sense to do total & sub-totals: we're adding budgets more than once. For example : Books 1000 fictions books 500 NF books 500 result in a total of 2000 ! This patch removes the total BibLibre MT5446 --- acqui/acqui-home.pl | 16 ---------------- .../prog/en/modules/acqui/acqui-home.tmpl | 11 ----------- 2 files changed, 0 insertions(+), 27 deletions(-) diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl index ed96a9e..b95e082 100755 --- a/acqui/acqui-home.pl +++ b/acqui/acqui-home.pl @@ -82,12 +82,6 @@ my $budget_arr = GetBudgetHierarchy( '', $user->{branchcode}, $template->{param_map}->{'USER_INFO'}[0]->{'borrowernumber'} ); -my $total = 0; -my $totspent = 0; -my $totordered = 0; -my $totcomtd = 0; -my $totavail = 0; - foreach my $budget ( @{$budget_arr} ) { $budget->{budget_code_indent} =~ s/\ /\ \;/g; @@ -116,11 +110,6 @@ foreach my $budget ( @{$budget_arr} ) { $budget->{'budget_avail'} = $budget->{'budget_amount'} - ( $budget->{'budget_spent'} + $budget->{'budget_ordered'} ); - $total += $budget->{'budget_amount'}; - $totspent += $budget->{'budget_spent'}; - $totordered += $budget->{'budget_ordered'}; - $totavail += $budget->{'budget_avail'}; - for my $field (qw( budget_amount budget_spent budget_ordered budget_avail ) ) { $budget->{$field} = $num_formatter->format_price( $budget->{$field} ); } @@ -130,11 +119,6 @@ $template->param( type => 'intranet', loop_budget => $budget_arr, branchname => $branchname, - total => $num_formatter->format_price($total), - totspent => $num_formatter->format_price($totspent), - totordered => $num_formatter->format_price($totordered), - totcomtd => $num_formatter->format_price($totcomtd), - totavail => $num_formatter->format_price($totavail), suggestions_count => $suggestions_count, ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl index 02f5f22..5e4bec4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl @@ -78,17 +78,6 @@ <th>Avail</th> </tr> </thead> - <tfoot> - <tr> - <th>Total</th> - <th> </th> - <th> </th> - <th align="right" ><!-- TMPL_VAR name="total" --></th> - <th align="right" ><!-- TMPL_VAR name="totordered" --></th> - <th align="right" ><!-- TMPL_VAR name="totspent" --></th> - <th align="right" ><!-- TMPL_VAR name="totavail" --></th> - </tr> - </tfoot> <tbody> <!-- TMPL_LOOP name="loop_budget" --> <!--TMPL_IF NAME="__odd__" --> -- 1.7.4.1 From alex.arnaud at biblibre.com Wed Apr 6 11:22:42 2011 From: alex.arnaud at biblibre.com (Alex Arnaud) Date: Wed, 6 Apr 2011 11:22:42 +0200 Subject: [Koha-patches] [PATCH] Bug #6068 - New feature: capability to blanking subfields in BatchMod Message-ID: <1302081762-25559-1-git-send-email-alex.arnaud@biblibre.com> --- .../prog/en/modules/tools/batchMod-edit.tmpl | 22 ++++++++ tools/batchMod.pl | 51 +++++++++++++++---- 2 files changed, 62 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl index 1d6216a..a4d07f8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl @@ -15,6 +15,26 @@ var allColumns = new Array(<!-- TMPL_LOOP NAME="item_header_loop" -->'<!-- TMPL_ for( x=0; x<allColumns.length; x++ ){ allColumns[x] = Number(allColumns[x]) + 2; } +$("#itemst").tablesorter({ widgets : ['zebra'], headers: {0:{sorter: false}} }); +$("#selectallbutton").click(function() { + $("#itemst").find("input:checkbox").each(function() { + $(this).attr("checked", true); + }); +}); +$("#clearallbutton").click(function() { + $("#itemst").find("input:checkbox").each(function() { + $(this).attr("checked", false); + }); +}); +$("input[name='disable_input']").click(function() { + if ($(this).is(":checked")){ + $(this).val($(this).siblings("[name='subfield']").val()); + $(this).siblings().attr('disabled',true); + } + else { + $(this).siblings().removeAttr('disabled'); + } +}); //]]> </script> <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/js/pages/batchMod.js"></script> @@ -117,6 +137,7 @@ for( x=0; x<allColumns.length; x++ ){ <div id="cataloguing_additem_newitem"> <h2>Edit Items</h2> + <div class="hint">Checking the box right next the subfield label will disable the entry and delete the values of that subfield on all selected items</div> <fieldset class="rows"> <ol> <!-- TMPL_LOOP NAME="item" --> @@ -126,6 +147,7 @@ for( x=0; x<allColumns.length; x++ ){ <!-- TMPL_VAR NAME="marc_lib" --> <!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --> </label> + <input type="checkbox" title="check to delete subfield <!-- TMPL_VAR NAME="subfield" -->" name="disable_input" value="<!-- TMPL_VAR NAME="subfield" -->" /> <!-- TMPL_VAR NAME="marc_value" --> <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->" /> <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" /> diff --git a/tools/batchMod.pl b/tools/batchMod.pl index d9a0b76..27a0ce3 100755 --- a/tools/batchMod.pl +++ b/tools/batchMod.pl @@ -89,13 +89,16 @@ if ($op eq "action") { my @tags = $input->param('tag'); my @subfields = $input->param('subfield'); my @values = $input->param('field_value'); + my @disabled = $input->param('disable_input'); # build indicator hash. my @ind_tag = $input->param('ind_tag'); my @indicator = $input->param('indicator'); # Is there something to modify ? # TODO : We shall use this var to warn the user in case no modification was done to the items - my $something_to_modify = scalar(grep {!/^$/} @values); + my $values_to_modify = scalar(grep {!/^$/} @values); + my $values_to_blank = scalar(@disabled); + my $marcitem; # Once the job is done if ($completedJobID) { @@ -114,8 +117,8 @@ if ($op eq "action") { # Calling the template add_saved_job_results_to_template($template, $completedJobID); - # While the job is getting done } else { + # While the job is getting done # Job size is the number of items we have to process my $job_size = scalar(@itemnumbers); @@ -128,6 +131,24 @@ if ($op eq "action") { $callback = progress_callback($job, $dbh); } + #initializing values for updates + my ( $itemtagfield, $itemtagsubfield) = &GetMarcFromKohaField("items.itemnumber", ""); + if ($values_to_modify){ + my $xml = TransformHtmlToXml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag, 'ITEM'); + $marcitem = MARC::Record::new_from_xml($xml, 'UTF-8'); + } + if ($values_to_blank){ + foreach my $disabledsubf (@disabled){ + if ($marcitem && $marcitem->field($itemtagfield)){ + $marcitem->field($itemtagfield)->update( $disabledsubf => "" ); + } + else { + $marcitem = MARC::Record->new(); + $marcitem->append_fields( MARC::Field->new( $itemtagfield, '', '', $disabledsubf => "" ) ); + } + } + } + # For each item my $i = 1; foreach my $itemnumber(@itemnumbers){ @@ -140,16 +161,19 @@ if ($op eq "action") { $deleted_items++; } else { $not_deleted_items++; - push @not_deleted, { biblionumber => $itemdata->{'biblionumber'}, itemnumber => $itemdata->{'itemnumber'}, barcode => $itemdata->{'barcode'}, title => $itemdata->{'title'}, $return => 1 }; + push @not_deleted, + { biblionumber => $itemdata->{'biblionumber'}, + itemnumber => $itemdata->{'itemnumber'}, + barcode => $itemdata->{'barcode'}, + title => $itemdata->{'title'}, + $return => 1 + }; } } else { - if ($something_to_modify) { - my $xml = TransformHtmlToXml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag, 'ITEM'); - my $marcitem = MARC::Record::new_from_xml($xml, 'UTF-8'); - my $localitem = TransformMarcToKoha( $dbh, $marcitem, "", 'items' ); - my $localmarcitem=Item2Marc($itemdata); - UpdateMarcWith($marcitem,$localmarcitem); - eval{my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = ModItemFromMarc($localmarcitem,$itemdata->{biblionumber},$itemnumber)}; + if ($values_to_modify || $values_to_blank) { + my $localmarcitem = Item2Marc($itemdata); + UpdateMarcWith( $marcitem, $localmarcitem ); + eval{ my ( $oldbiblionumber, $oldbibnum, $oldbibitemnum ) = ModItemFromMarc( $localmarcitem, $itemdata->{biblionumber}, $itemnumber ) }; } } $i++; @@ -505,7 +529,12 @@ sub UpdateMarcWith { my @fields_to=$marcto->field($itemtag); foreach my $subfield ($fieldfrom->subfields()){ foreach my $field_to_update (@fields_to){ - $field_to_update->update($$subfield[0]=>$$subfield[1]) if ($$subfield[1] != '' or $$subfield[1] == '0'); + if ($subfield->[1]){ + $field_to_update->update($subfield->[0]=>$subfield->[1]); + } + else { + $field_to_update->delete_subfield(code=> $subfield->[0]); + } } } #warn "TO edited:",$marcto->as_formatted; -- 1.6.3.3 From Katrin.Fischer.83 at web.de Wed Apr 6 11:27:11 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Wed, 6 Apr 2011 11:27:11 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5156, JavaScript error when adding list Message-ID: <1302082031-30326-1-git-send-email-Katrin.Fischer.83@web.de> From: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> --- .../prog/en/modules/virtualshelves/shelves.tmpl | 2 +- .../opac-tmpl/prog/en/modules/opac-shelves.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl index 6fb3efa..0b3bf2d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl @@ -100,7 +100,7 @@ function placeHold () { } if (_alertString.length==0) { - document.f.submit(); + f.submit(); } else { alertString2 = _("Form not submitted because of the following problem(s)"); alertString2 += "\n------------------------------------------------------------------------------------\n\n"; diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl index da6ce16..e8d18f8 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl @@ -125,7 +125,7 @@ $(function() { } if (_alertString.length==0) { - document.f.submit(); + f.submit(); } else { alertString2 = _("Form not submitted because of the following problem(s)"); alertString2 += "\n------------------------------------------------------------------------------------\n\n"; -- 1.7.1 From Katrin.Fischer.83 at web.de Wed Apr 6 11:38:39 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Wed, 6 Apr 2011 11:38:39 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] This patch fixes the broken pagination in members-search.pl Message-ID: <1302082719-4627-1-git-send-email-Katrin.Fischer.83@web.de> From: Koustubha Kale <kmkale at anantcorp.com> Small patch to fix Error 404 which comes up when we click on pagination links after searching in Patron Card creator. Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> --- patroncards/members-search.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/patroncards/members-search.pl b/patroncards/members-search.pl index 42fbba7..c2abe07 100755 --- a/patroncards/members-search.pl +++ b/patroncards/members-search.pl @@ -92,7 +92,7 @@ if ($member || $category) { ); push(@resultsdata, \%row); } - my $base_url = __FILE__ . '?' . join('&', map { $_->{term} . ' = ' . $_->{val} } ( + my $base_url = '?' . join('&', map { $_->{term} . '=' . $_->{val} } ( { term => 'member', val => $member }, { term => 'category', val => $category }, { term => 'orderby', val => $orderby }, -- 1.7.1 From jonathan.druart at biblibre.com Wed Apr 6 11:40:20 2011 From: jonathan.druart at biblibre.com (Jonathan Druart) Date: Wed, 6 Apr 2011 11:40:20 +0200 Subject: [Koha-patches] [PATCH] Bug 3626: new 210c plugin Message-ID: <1302082820-7056-1-git-send-email-jonathan.druart@biblibre.com> --- cataloguing/plugin_launcher.pl | 16 ++-- .../value_builder/unimarc_field_210c_bis.pl | 110 ++++++++++++++++++++ cataloguing/ysearch.pl | 78 ++++++++++++++ .../value_builder/unimarc_field_210c_bis.tmpl | 75 +++++++++++++ 4 files changed, 271 insertions(+), 8 deletions(-) create mode 100755 cataloguing/value_builder/unimarc_field_210c_bis.pl create mode 100755 cataloguing/ysearch.pl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tmpl diff --git a/cataloguing/plugin_launcher.pl b/cataloguing/plugin_launcher.pl index 9a264ab..f33ef3f 100755 --- a/cataloguing/plugin_launcher.pl +++ b/cataloguing/plugin_launcher.pl @@ -1,6 +1,5 @@ #!/usr/bin/perl - # Copyright 2000-2002 Katipo Communications # # This file is part of Koha. @@ -19,20 +18,21 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. use strict; + #use warnings; FIXME - Bug 2505 use CGI; use C4::Context; use C4::Output; -my $input = new CGI; -my $plugin_name="cataloguing/value_builder/".$input->param("plugin_name"); +my $input = new CGI; +my $plugin_name = "cataloguing/value_builder/" . $input->param("plugin_name"); # 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"; -my $vbdir = "$cgidir/cataloguing/value_builder"; -unless (-r $vbdir and -d $vbdir) { - $cgidir = C4::Context->intranetdir; +my $cgidir = C4::Context->intranetdir . "/cgi-bin"; +my $vbdir = "$cgidir/cataloguing/value_builder"; +unless ( -r $vbdir and -d $vbdir ) { + $cgidir = C4::Context->intranetdir; } -do $cgidir."/".$plugin_name; +do $cgidir . "/" . $plugin_name; &plugin($input); diff --git a/cataloguing/value_builder/unimarc_field_210c_bis.pl b/cataloguing/value_builder/unimarc_field_210c_bis.pl new file mode 100755 index 0000000..420fa8f --- /dev/null +++ b/cataloguing/value_builder/unimarc_field_210c_bis.pl @@ -0,0 +1,110 @@ +#!/usr/bin/perl + +# Copyright 2000-2002 Katipo Communications +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +=head1 SYNOPSIS + +This plugin is used to map isbn/editor with collection. +It need : + in thesaurus, a category named EDITORS + in this category, datas must be entered like following : + isbn separator editor separator collection. + for example : + 2204 -- Cerf -- Cogitatio fidei + 2204 -- Cerf -- Le Magistere de l'Eglise + 2204 -- Cerf -- Lectio divina + 2204 -- Cerf -- Lire la Bible + 2204 -- Cerf -- Pour lire + 2204 -- Cerf -- Sources chretiennes + + when the user clic on ... on 225a line, the popup shows the list of collections from the selected editor + if the biblio has no isbn, then the search if done on editor only + If the biblio ha an isbn, the search is done on isbn and editor. It's faster. + +=over 2 + +=cut + +use strict; + +#use warnings; FIXME - Bug 2505 +use C4::Auth; +use CGI; +use C4::Context; + +use C4::AuthoritiesMarc; +use C4::Output; + +=head1 + +plugin_parameters : other parameters added when the plugin is called by the dopop function + +=cut + +sub plugin_parameters { + my ( $dbh, $record, $tagslib, $i, $tabloop ) = @_; + return ""; +} + +sub plugin_javascript { + my ( $dbh, $record, $tagslib, $field_number, $tabloop ) = @_; + my $function_name = $field_number; + my $res = " + <script type=\"text/javascript\"> + function Focus$function_name(subfield_managed) { + return 1; + } + + function Blur$function_name(subfield_managed) { + return 1; + } + + function Clic$function_name(index) { + window.open(\"../cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_210c_bis.pl&index=\"+index,\"unimarc210c\",'width=500,height=400,toolbar=false,scrollbars=no'); + } + </script> +"; + + return ( $function_name, $res ); +} + +sub plugin { + my ($input) = @_; + my $index = $input->param('index'); + my $result = $input->param('result'); + my $editor_found = $input->param('editor_found'); + my $authoritysep = C4::Context->preference("authoritysep"); + warn Data::Dumper::Dumper $index; + + my ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { template_name => "cataloguing/value_builder/unimarc_field_210c_bis.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => { editcatalogue => '*' }, + debug => 1, + } + ); + + $template->param( + index => $index, + ); + output_html_with_http_headers $input, $cookie, $template->output; +} + +1; diff --git a/cataloguing/ysearch.pl b/cataloguing/ysearch.pl new file mode 100755 index 0000000..5cd0205 --- /dev/null +++ b/cataloguing/ysearch.pl @@ -0,0 +1,78 @@ +#!/usr/bin/perl + +# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html) + +# Copyright 2007 Tamil s.a.r.l. +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +=head1 ysearch.pl + + +=cut + +use strict; + +#use warnings; FIXME - Bug 2505 +use CGI; +use C4::Context; +use C4::Auth qw/check_cookie_auth/; + +my $input = new CGI; +my $query = $input->param('query'); +my $table = $input->param('table'); +my $field = $input->param('field'); + +# Prevent from disclosing data +die() unless ($table eq "biblioitems"); + +binmode STDOUT, ":utf8"; +print $input->header( -type => 'text/plain', -charset => 'UTF-8' ); + +my ( $auth_status, $sessionID ) = check_cookie_auth( $input->cookie('CGISESSID'), { cataloguing => '*' } ); +if ( $auth_status ne "ok" ) { + exit 0; +} + +my $dbh = C4::Context->dbh; +my $sql = qq(SELECT distinct $field + FROM $table + WHERE $field LIKE ? OR $field LIKE ? or $field LIKE ?); +$sql .= qq( ORDER BY $field); +my $sth = $dbh->prepare($sql); +$sth->execute("$query%", "% $query%", "%-$query%"); + +while ( my $rec = $sth->fetchrow_hashref ) { + print nsb_clean($rec->{$field}) . "\n"; +} + +sub nsb_clean { + my $NSB = '\x88' ; # NSB : begin Non Sorting Block + my $NSE = '\x89' ; # NSE : Non Sorting Block end + my $NSB2 = '\x98' ; # NSB : begin Non Sorting Block + my $NSE2 = '\x9C' ; # NSE : Non Sorting Block end + # handles non sorting blocks + my ($string) = @_ ; + $_ = $string ; + s/$NSB//g ; + s/$NSE//g ; + s/$NSB2//g ; + s/$NSE2//g ; + $string = $_ ; + + return($string) ; +} + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tmpl new file mode 100644 index 0000000..da95963 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tmpl @@ -0,0 +1,75 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <title>UNIMARC_Field 225a builder + + + + + /css/staff-global.css" /> + + + +