From 4dea4ae4943eda625f697630dde459a72dfd8fdc Mon Sep 17 00:00:00 2001 From: tipaul Date: Wed, 4 May 2005 08:50:48 +0000 Subject: [PATCH] synch'ing 2.2 and head --- admin/aqbookfund.pl | 5 +- admin/printers.pl | 2 +- admin/z3950servers.pl | 8 +- authorities/authorities.pl | 28 +-- circ/circulation.pl | 8 +- import/breeding.pl | 212 ++++++++++++++++++ .../default/en/acqui.simple/addbiblio.tmpl | 38 ++-- .../default/en/acqui.simple/addbooks.tmpl | 20 +- .../default/en/acqui.simple/additem.tmpl | 63 ++++-- .../default/en/acqui.simple/isbnsearch.tmpl | 97 +++++--- .../default/en/acqui/basket.tmpl | 65 +++--- .../default/en/acqui/newbiblio.tmpl | 5 +- .../intranet-tmpl/default/en/acqui/order.tmpl | 6 +- .../default/en/acqui/recieve.tmpl | 4 +- .../default/en/acqui/suggestion-select.tmpl | 2 +- .../default/en/authorities/auth_finder.tmpl | 2 +- .../default/en/authorities/authorities.tmpl | 10 + .../default/en/authorities/detail.tmpl | 4 +- .../en/authorities/searchresultlist-auth.tmpl | 2 +- .../default/en/bull/statecollection.tmpl | 18 ++ .../default/en/bull/subscription-add.tmpl | 22 +- .../default/en/bull/subscription-detail.tmpl | 24 +- .../default/en/catalogue/ISBDdetail.tmpl | 35 ++- .../default/en/catalogue/MARCdetail.tmpl | 128 +++++------ .../default/en/catalogue/detail.tmpl | 47 +++- .../default/en/circ/circulation.tmpl | 9 +- .../default/en/circ/returns.tmpl | 2 +- 27 files changed, 611 insertions(+), 255 deletions(-) diff --git a/admin/aqbookfund.pl b/admin/aqbookfund.pl index ec27192ff1..c64dc4823d 100755 --- a/admin/aqbookfund.pl +++ b/admin/aqbookfund.pl @@ -44,6 +44,7 @@ use C4::Context; use C4::Output; use C4::Interface::CGI::Output; use C4::Search; +use C4::Date; use HTML::Template; sub StringSearch { @@ -182,8 +183,8 @@ if ($op eq 'add_form') { while (my ($aqbudgetid,$startdate,$enddate,$budgetamount) = $sth2->fetchrow) { my %budgetrow_data; $budgetrow_data{aqbudgetid} = $aqbudgetid; - $budgetrow_data{startdate} = $startdate; - $budgetrow_data{enddate} = $enddate; + $budgetrow_data{startdate} = format_date($startdate); + $budgetrow_data{enddate} = format_date($enddate); $budgetrow_data{budgetamount} = $budgetamount; push @budget_loop,\%budgetrow_data; } diff --git a/admin/printers.pl b/admin/printers.pl index dd0506dba7..5c5c39c2a6 100755 --- a/admin/printers.pl +++ b/admin/printers.pl @@ -125,7 +125,7 @@ if ($op eq 'add_form') { } elsif ($op eq 'delete_confirm') { $template->param(delete_confirm => 1); my $dbh = C4::Context->dbh; - my $sth=$dbh->prepare("select printername,printqueue,printtype from printers where printername="); + my $sth=$dbh->prepare("select printername,printqueue,printtype from printers where printername=?"); $sth->execute($searchfield); my $data=$sth->fetchrow_hashref; $sth->finish; diff --git a/admin/z3950servers.pl b/admin/z3950servers.pl index 838e32767c..9baba6c462 100755 --- a/admin/z3950servers.pl +++ b/admin/z3950servers.pl @@ -163,7 +163,7 @@ if ($op eq 'add_form') { my $env; my ($count,$results)=StringSearch($env,$searchfield,'web'); my @loop; - my $toggle = 'white'; + my $toggle = 0; for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){ my $urlsearchfield=$results->[$i]{name}; @@ -180,13 +180,13 @@ if ($op eq 'add_form') { toggle => $toggle); push @loop, \%row; - if ( $toggle eq 'white' ) + if ( $toggle eq 0 ) { - $toggle = '#ffffcc'; + $toggle = 1; } else { - $toggle = 'white'; + $toggle = 0; } } diff --git a/authorities/authorities.pl b/authorities/authorities.pl index 48881843dd..a1eee443e6 100755 --- a/authorities/authorities.pl +++ b/authorities/authorities.pl @@ -160,7 +160,6 @@ sub create_input () { sub build_tabs ($$$$) { my($template, $record, $dbh,$encoding) = @_; -# warn "=>".$record->as_formatted if $record; # fill arrays my @loop_data =(); my $tag; @@ -335,31 +334,26 @@ if ($op eq "add") { my $record = AUTHhtml2marc($dbh,\@tags,\@subfields,\@values,%indicators); # MARC::Record built => now, record in DB # check for a duplicate - my ($duplicateauthnumber,$duplicateauthid,$duplicateauthvalue) = FindDuplicate($record,$authtypecode) if ($op eq "add") && (!$is_a_modif); + my ($duplicateauthid,$duplicateauthvalue) = FindDuplicate($record,$authtypecode) if ($op eq "add") && (!$is_a_modif); my $confirm_not_duplicate = $input->param('confirm_not_duplicate'); # it is not a duplicate (determined either by Koha itself or by user checking it's not a duplicate) - if (!$duplicateauthnumber or $confirm_not_duplicate) { - # MARC::Record built => now, record in DB + if (!$duplicateauthid or $confirm_not_duplicate) { if ($is_a_modif) { AUTHmodauthority($dbh,$authid,$record,$authtypecode); } else { ($authid) = AUTHaddauthority($dbh,$record,$authid,$authtypecode); } - # now, redirect to additem page + # now, redirect to detail page print $input->redirect("detail.pl?authid=$authid"); - build_tabs ($template, $record, $dbh,$encoding); - build_hidden_data; exit; } else { # it may be a duplicate, warn the user and do nothing + build_tabs ($template, $record, $dbh,$encoding); + build_hidden_data; $template->param( - duplicateauthnumber => $duplicateauthnumber, - duplicateauthid => $duplicateauthid, - duplicateauthvalue => $duplicateauthvalue, - ); - warn " AUTH : ".$record->as_formatted, - build_tabs ($template, $record, $dbh,$encoding); - build_hidden_data; + duplicateauthid => $duplicateauthid, + duplicateauthvalue => $duplicateauthvalue, + ); } #------------------------------------------------------------------------------------------------------------------------------ } elsif ($op eq "addfield") { @@ -423,8 +417,10 @@ if ($op eq "add") { build_hidden_data; } -# build_tabs ($template, $record, $dbh,$encoding); -# build_hidden_data; +if ($authid) { + build_tabs ($template, $record, $dbh,$encoding); + build_hidden_data; +} $template->param( authid => $authid, # oldbiblionumtagfield => $oldbiblionumtagfield, diff --git a/circ/circulation.pl b/circ/circulation.pl index d4d6681599..b471371ea2 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -86,7 +86,6 @@ my @datearr = localtime(time()); # FIXME - Could just use POSIX::strftime("%Y%m%d", localtime); my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ("%0.2d", ($datearr[3])); -# my $message; # check and see if we should print if ($barcode eq '' && $print eq 'maybe'){ @@ -103,11 +102,13 @@ my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf ( # if there is a list of find borrowers.... # my $borrowerslist; +my $message; if ($findborrower) { my ($count,$borrowers)=BornameSearch(\%env,$findborrower,'cardnumber','web'); my @borrowers=@$borrowers; if ($#borrowers == -1) { $query->param('findborrower', ''); + $message = "'$findborrower'"; } elsif ($#borrowers == 0) { $query->param('borrnumber', $borrowers[0]->{'borrowernumber'}); $query->param('barcode',''); @@ -219,7 +220,7 @@ if ($borrower) { } push @realtodayissues,$book; } - + # parses previous & build Template array foreach my $book (sort {$a->{'date_due'} cmp $b->{'date_due'}} @previousissues){ my $dd = $book->{'date_due'}; @@ -256,7 +257,7 @@ my $CGIselectborrower; if ($borrowerslist) { foreach (sort {$a->{'surname'}.$a->{'firstname'} cmp $b->{'surname'}.$b->{'firstname'}} @$borrowerslist){ push @values,$_->{'borrowernumber'}; - $labels{$_->{'borrowernumber'}} ="$_->{'surname'}, $_->{'firstname'} ($_->{'cardnumber'})"; + $labels{$_->{'borrowernumber'}} ="$_->{'surname'}, $_->{'firstname'} ... ($_->{'cardnumber'} - $_->{'categorycode'}) ... $_->{'streetaddress'} "; } $CGIselectborrower=CGI::scrolling_list( -name => 'borrnumber', -values => \@values, @@ -290,6 +291,7 @@ $template->param( amountold => $amountold, barcode => $barcode, stickyduedate => $stickyduedate, + message => $message, CGIselectborrower => $CGIselectborrower, todayissues => \@realtodayissues, previssues => \@realprevissues, diff --git a/import/breeding.pl b/import/breeding.pl index 7d0e2177a6..57c8a5bf04 100755 --- a/import/breeding.pl +++ b/import/breeding.pl @@ -103,6 +103,9 @@ my $file; #--------------- # log cleared, as marcimport is (almost) rewritten from scratch. # $Log$ +# Revision 1.4 2005/05/04 08:52:13 tipaul +# synch'ing 2.2 and head +# # Revision 1.3 2005/03/23 09:57:47 doxulting # Adding a parameter to allow acces to people with management/tools flags # @@ -204,3 +207,212 @@ my $file; # * z3950 functionnality is dropped from "marcimport" will be added somewhere else. # * templates are in a new acqui.simple sub directory, and the marcimport template directory will become obsolete soon.I think this is more logic # +#!/usr/bin/perl + +# $Id$ + +# Script for handling import of MARC data into Koha db +# and Z39.50 lookups + +# Koha library project www.koha.org + +# Licensed under the GPL + + +# 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., 59 Temple Place, +# Suite 330, Boston, MA 02111-1307 USA + +use strict; + +# standard or CPAN modules used +use CGI; +use DBI; + +# Koha modules used +use C4::Context; +use C4::Output; +use C4::Interface::CGI::Output; +use C4::Input; +use C4::Biblio; +use MARC::File::USMARC; +use HTML::Template; +use C4::Output; +use C4::Auth; +use C4::Breeding; + +#------------------ +# Constants + +my $includes = C4::Context->config('includes') || + "/usr/local/www/hdl/htdocs/includes"; + +# HTML colors for alternating lines +my $lc1='#dddddd'; +my $lc2='#ddaaaa'; + +#------------- +#------------- +# Initialize + +my $userid=$ENV{'REMOTE_USER'}; + +my $input = new CGI; +my $dbh = C4::Context->dbh; + +my $uploadmarc=$input->param('uploadmarc'); +my $overwrite_biblio = $input->param('overwrite_biblio'); +my $filename = $input->param('filename'); +my $syntax = $input->param('syntax'); +my ($template, $loggedinuser, $cookie) + = get_template_and_user({template_name => "import/breeding.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => {parameters => 1, management => 1, tools => 1}, + debug => 1, + }); + +$template->param(SCRIPT_NAME => $ENV{'SCRIPT_NAME'}, + uploadmarc => $uploadmarc); +if ($uploadmarc && length($uploadmarc)>0) { + my $marcrecord=''; + while (<$uploadmarc>) { + $marcrecord.=$_; + } + my ($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported) = ImportBreeding($marcrecord,$overwrite_biblio,$filename,$syntax,int(rand(99999))); + + $template->param(imported => $imported, + alreadyindb => $alreadyindb, + alreadyinfarm => $alreadyinfarm, + notmarcrecord => $notmarcrecord, + total => $imported+$alreadyindb+$alreadyinfarm+$notmarcrecord, + ); + +} + +output_html_with_http_headers $input, $cookie, $template->output; +my $menu; +my $file; + + +#--------------- +# log cleared, as marcimport is (almost) rewritten from scratch. +# $Log$ +# Revision 1.4 2005/05/04 08:52:13 tipaul +# synch'ing 2.2 and head +# +# Revision 1.2.4.1 2005/04/07 10:10:52 tipaul +# copying processz3950queue from 2.0 branch. The 2.2 version misses an important fix +# +# Revision 1.2 2003/10/06 09:10:38 slef +# Removing config info from z3950*sh and using C4::Context in processz3950queue (Fixed bug 39) +# +# Revision 1.1 2003/06/04 13:46:25 tipaul +# moving breeding farm import to parameters page (GUI) and to new import/ directory (code structure) +# +# Revision 1.33 2003/04/29 16:48:36 tipaul +# really proud of this commit :-) +# z3950 search and import seems to works fine. +# Let me explain how : +# * a "search z3950" button is added in the addbiblio template. +# * when clicked, a popup appears and z3950/search.pl is called +# * z3950/search.pl calls addz3950search in the DB +# * the z3950 daemon retrieve the records and stores them in z3950results AND in marc_breeding table. +# * as long as there as searches pending, the popup auto refresh every 2 seconds, and says how many searches are pending. +# * when the user clicks on a z3950 result => the parent popup is called with the requested biblio, and auto-filled +# +# Note : +# * character encoding support : (It's a nightmare...) In the z3950servers table, a "encoding" column has been added. You can put "UNIMARC" or "USMARC" in this column. Depending on this, the char_decode in C4::Biblio.pm replaces marc-char-encode by an iso 8859-1 encoding. Note that in the breeding import this value has been added too, for a better support. +# * the marc_breeding and z3950* tables have been modified : they have an encoding column and the random z3950 number is stored too for convenience => it's the key I use to list only requested biblios in the popup. +# +# Revision 1.32 2003/04/22 12:22:54 tipaul +# 1st draft for z3950 client import. +# moving Breeding farm script to a perl package C4/Breeding.pm +# +# Revision 1.31 2003/02/19 01:01:07 wolfpac444 +# Removed the unecessary $dbh argument from being passed. +# Resolved a few minor FIXMEs. +# +# Revision 1.30 2003/02/02 07:18:38 acli +# Moved C4/Charset.pm to C4/Interface/CGI/Output.pm +# +# Create output_html_with_http_headers function to contain the "print $query +# ->header(-type => guesstype...),..." call. This is in preparation for +# non-HTML output (e.g., text/xml) and charset conversion before output in +# the future. +# +# Created C4/Interface/CGI/Template.pm to hold convenience functions specific +# to the CGI interface using HTML::Template +# +# Modified moremembers.pl to make the "sex" field localizable for languages +# where M and F doesn't make sense +# +# Revision 1.29 2003/01/28 15:28:31 tipaul +# removing use MARC::Charset +# Was a buggy test +# +# Revision 1.28 2003/01/28 15:00:31 tipaul +# user can now search in breeding farm with isbn/issn or title. Title/name are stored in breeding farm and showed when a search is done +# +# Revision 1.27 2003/01/26 23:21:49 acli +# Handle non-latin1 charsets +# +# Revision 1.26 2003/01/23 12:26:41 tipaul +# upgrading import in breeding farm (you can now search on ISBN or on title) AND character encoding. +# +# Revision 1.25 2003/01/21 08:13:50 tipaul +# character encoding ISO646 => 8859-1, first draft +# +# Revision 1.24 2003/01/14 16:41:17 tipaul +# bugfix : use gettemplate_and_user instead of gettemplate. +# fix a blank screen in 1.3.3 in "import in breeding farm" +# +# Revision 1.23 2003/01/06 13:06:28 tipaul +# removing trailing # +# +# Revision 1.22 2002/11/12 15:58:43 tipaul +# road to 1.3.2 : +# * many bugfixes +# * adding value_builder : you can map a subfield in the marc_subfield_structure to a sub stored in "value_builder" directory. In this directory you can create screen used to build values with any method. In this commit is a 1st draft of the builder for 100$a unimarc french subfield, which is composed of 35 digits, with 12 differents values (only the 4th first are provided for instance) +# +# Revision 1.21 2002/10/22 15:50:23 tipaul +# road to 1.3.2 : adding a biblio in MARC format. +# seems to work a few. +# still to do : +# * manage html checks (mandatory subfields...) +# * add list of acceptable values (authorities) +# * manage ## in MARC format +# * manage correctly repeatable fields +# and probably a LOT of bugfixes +# +# Revision 1.20 2002/10/16 12:46:19 arensb +# Added a FIXME comment. +# +# Revision 1.19 2002/10/15 10:14:44 tipaul +# road to 1.3.2. Full rewrite of marcimport.pl. +# The acquisition system in MARC version will work like this : +# * marcimport will put marc records into a "breeding farm" table. +# * when the user want to add a biblio, he enters first the ISBN/ISSN of the biblio. koha searches into breeding farm and if the record exists, it is shown to the user to help him adding the biblio. When the biblio is added, it's deleted from the breeding farm. +# +# This commit : +# * modify acqui.simple home page (addbooks.pl) +# * adds import into breeding farm +# +# Please note that : +# * z3950 functionnality is dropped from "marcimport" will be added somewhere else. +# * templates are in a new acqui.simple sub directory, and the marcimport template directory will become obsolete soon.I think this is more logic +# diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl index 7b5c617b36..1941115832 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl @@ -1,8 +1,7 @@ -
-

MARC biblio :

+

Biblionumber :

@@ -19,34 +18,34 @@

- 0 + 0 - 1 + 1 - 2 + 2 - 3 + 3 - 4 + 4 - 5 + 5 - 6 + 6 - 7 + 7 - 8 + 8 - 9 + 9
@@ -402,11 +401,14 @@ function active(numlayer) link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; + document.getElementById(link).style.color="#FFFFFF"; } else { document.getElementById(ong).style.visibility="hidden"; + document.getElementById(link).style.color="#000000"; } } } +active(0); function Check(f) { // Scan for nonempty fields var field_is_nonempty_p = new Array(); @@ -422,7 +424,6 @@ function Check(f) { // Scan for missing mandatory subfields var total_missing_mandatory_subfields = 0; var missing_mandatory_subfields = new Array(); - for (i=0 ; i"+strQuery,"z3950search",'width=500,height=400,toolbar=false,scrollbars=yes'); + newin=window.open("../z3950/search.pl?bibid="+strQuery,"z3950search",'width=800,height=400,toolbar=false,scrollbars=yes'); } function AddField(field) { diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl index 5ae5c2405f..51cd7a789e 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl @@ -11,8 +11,24 @@

To add a new biblio/item, scan or type the ISBN/ISSN number

-

-

+

+ + + + + + + +

+

+ + + + + + + +

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl index f1cdd9185a..402047c33f 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl @@ -3,32 +3,49 @@
"> "> -

- MARC biblionumber : -

- -
-
+ +

New Item

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl index d401c4576b..e7a7055841 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl @@ -2,13 +2,15 @@

Biblio Search Results

-

You searched on ISBN title

- -

results found

-

Results to displayed

+

You searched on

+ +

ISBN

+ + +

title

-
+

Biblios in koha

@@ -35,27 +37,53 @@ - - - - -
&op=duplicate" class="button catalogue">Duplicate
Nothing found
-

- - - &="> - /images/numbers/prev.gif" border="0"> - - - /images/numbers/placeholder.gif" border="0"> - - - - /images/numbers/-highlight.gif"> + + + + + + + " class="button catalogue">Add items + + " class="button catalogue">Edit... + + + + &op=duplicate" class="button catalogue"> + Duplicate + + + + + + +

+

+ + &=&resultsperpage=&type=intranet&op=do_search"> + <<Previous + + + + + + + &=&resultsperpage=&type=intranet&op=do_search"> + + + + + + &=&&resultsperpage=&type=intranet&op=do_search"> + Next>> + + +

+

+ + Results to of - &="> - /images/numbers/.gif" border="0"> - + No results found. @@ -70,12 +98,12 @@ - - - - - - + + + + + + @@ -86,14 +114,17 @@ - +
TitleAuthorISBNcoming from  TitleAuthorISBNcoming from  
">Add biblio" class="button catalogue">Add biblio
-

Nothing found

+

None

+
+
+

Add biblio

" class="button catalogue">Add New Biblio diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl index 5bcee1513a..352f624fd5 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl @@ -23,7 +23,7 @@ - + @@ -32,10 +32,11 @@ - - - - + + + + + "> @@ -53,13 +54,15 @@ - - - + + + + + > @@ -84,23 +87,25 @@

Basket empty

- - - + + + + + diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl index c5d84baa88..c1412578b2 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl @@ -51,9 +51,8 @@ function messenger(X,Y,etc){ } function check(f) { - quantity=f.quantity.value; - title=f.title.value; - + quantity=f.quantity.value + title=f.title.value if (title == "") { alert("Title can't be empty"); return false; diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl index 45b4603aba..4e4ec91b34 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl @@ -46,7 +46,11 @@ closed on " class="button acquisition">View - " class="button acquisition">modify + + " class="button acquisition">modify + + " class="button acquisition">View + diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl index 30c327ea2c..84b08bf0ea 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl @@ -64,9 +64,7 @@ diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl index af65240e72..c5c426afc0 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl @@ -44,7 +44,7 @@ ,
OrderPublisher&order=biblioitems.publishercode" class="doNotPrint">[order]Publisher&order=biblioitems.publishercode" class="acquisition doNotPrint">[order] Isbn Title AuthorQty Total Fund &order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[order]RemoveRemove
- &basketno=&quantity=0&biblio="> - Remove from basket - - + &basketno=&quantity=0&biblio="> + Remove from basket + +
HELP -
- The total at the bottom of the page should be within a few cents of the total for the invoice.

- When you have finished this invoice save the changes. +

The total at the bottom of the page should be within a few cents of the total for the invoice.

 GST class="hilighted"> - , + , class="hilighted"> diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl index 63fa0b9e2d..8ea0abf0d0 100644 --- a/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl @@ -20,8 +20,8 @@ ">

diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl index cb88229d06..6b8520ee06 100644 --- a/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl @@ -18,6 +18,16 @@










+ +
+

Duplicate suspected with

+

You must either :

+ +
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl index 28460e82a6..3cbdbff780 100644 --- a/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl @@ -36,9 +36,9 @@ \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/ISBDdetail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/ISBDdetail.tmpl index 4371de9bc8..0b0bac0b19 100644 --- a/koha-tmpl/intranet-tmpl/default/en/catalogue/ISBDdetail.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/ISBDdetail.tmpl @@ -2,11 +2,28 @@ /includes/marc-editor.css">
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl index b940b3bc8e..7cea1ebf58 100644 --- a/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl @@ -2,10 +2,13 @@
-

MARC biblionumber :

+

Biblionumber :

" class="button catalogue"> Edit biblio + &op=duplicate" class="button catalogue"> + Duplicate + " class="button catalogue"> Edit item @@ -13,6 +16,9 @@ delete + " class="button catalogue"> + Complete + " class="button catalogue"> Normal @@ -82,16 +88,14 @@

+ + &operator==&type=intranet&value="> + //images/filefind.png" height="15" title="Search on "> + + " class="button catalogue">Auth @@ -112,16 +116,14 @@

+ + &operator==&type=intranet&value="> + //images/filefind.png" height="15" title="Search on "> + + " class="button catalogue">Auth @@ -142,16 +144,14 @@

+ + &operator==&type=intranet&value="> + //images/filefind.png" height="15" title="Search on "> + + " class="button catalogue">Auth @@ -172,16 +172,14 @@

+ + &operator==&type=intranet&value="> + //images/filefind.png" height="15" title="Search on "> + + " class="button catalogue">Auth @@ -202,16 +200,14 @@

+ + &operator==&type=intranet&value="> + //images/filefind.png" height="15" title="Search on "> + + " class="button catalogue">Auth @@ -232,16 +228,14 @@

+ + &operator==&type=intranet&value="> + //images/filefind.png" height="15" title="Search on "> + + " class="button catalogue">Auth @@ -262,16 +256,14 @@

+ + &operator==&type=intranet&value="> + //images/filefind.png" height="15" title="Search on "> + + " class="button catalogue">Auth @@ -292,16 +284,14 @@

+ + &operator==&type=intranet&value="> + //images/filefind.png" height="15" title="Search on "> + + " class="button catalogue">Auth @@ -322,16 +312,14 @@

+ + &operator==&type=intranet&value="> + //images/filefind.png" height="15" title="Search on "> + + " class="button catalogue">Auth @@ -352,16 +340,14 @@

+ + &operator==&type=intranet&value="> + //images/filefind.png" height="15" title="Search on "> + + " class="button catalogue">Auth diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl index 344ed82c14..60e8109c88 100644 --- a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl @@ -3,14 +3,45 @@

()

- " class="button catalogue">MARC - " class="button catalogue">ISBD - ')" class="button catalogue">Add to shelf - ')" class="button catalogue">Print - - - ">Requests - +
+ " class="button catalogue"> + Edit biblio + + &op=duplicate" class="button catalogue"> + Duplicate + + " class="button catalogue"> + Edit item + + + + delete + + " class="button catalogue"> + Complete + + " class="button catalogue"> + Normal + + " class="button catalogue"> + ISBD + + ')" class="button catalogue"> + Add to shelf + + ')" class="button catalogue"> + Print + + + " class="button catalogue"> + Subscription(s) + + + + + " class="button catalogue">Request + +
diff --git a/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl index 5fc45c971b..f9399c308e 100644 --- a/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl @@ -30,10 +30,11 @@

Borrower information

-

- " onclick="openWindow(this,'Member', 480, 640)"> - () +

() + " class="button circulation"> + detail + &modify=edit&destination=circ" class="button circulation">edit

@@ -286,7 +287,7 @@ SUMMARY : TODAY & PREVIOUS ISSUES

- +
diff --git a/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl index 4f5620c49a..5769175b89 100644 --- a/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl @@ -87,7 +87,7 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "> - + -- 2.39.5