From d5938493d7f1519c345762d747554326c006719c Mon Sep 17 00:00:00 2001
From: tipaul
Date: Fri, 6 Jan 2006 16:39:37 +0000
Subject: [PATCH] synch'ing head and rel_2_2 (from 2.2.5, including npl
templates) Seems not to break too many things, but i'm probably wrong here.
at least, new features/bugfixes from 2.2.5 are here (tested on some features
on my head local copy)
- removing useless directories (koha-html and koha-plucene)
---
C4/Acquisition.pm | 52 +-
C4/Auth_with_ldap.pm | 200 +-
C4/AuthoritiesMarc.pm | 11 +-
C4/Biblio.pm | 12 +-
C4/Bull.pm | 19 +-
C4/Koha.pm | 75 +-
C4/Search.pm | 1 +
C4/Suggestions.pm | 29 +-
acqui.simple/addbiblio.pl | 10 +-
acqui.simple/isbnsearch.pl | 4 +-
acqui/addorder.pl | 13 +-
acqui/histsearch.pl | 3 +-
acqui/lateorders.pl | 10 +-
acqui/newbiblio.pl | 14 +-
admin/marctagstructure.pl | 5 +-
admin/systempreferences.pl | 2 +
authorities/authorities-home.pl | 1 +
bull/subscription-bib-search.pl | 21 +
circ/circulation.pl | 8 +
circ/reserve.pl | 113 +
export/marc.pl | 83 +-
koha-plucene/indexer.pl | 64 -
koha-plucene/search.cgi | 98 -
.../default/en/acqui.simple/addbiblio.tmpl | 62 +-
.../default/en/acqui/basket.tmpl | 30 +-
.../default/en/acqui/histsearch.tmpl | 13 +-
.../default/en/acqui/lateorders.tmpl | 64 +-
.../default/en/acqui/newbiblio.tmpl | 32 +-
.../blinddetail-biblio-search.tmpl | 2 +-
.../en/authorities/searchresultlist.tmpl | 24 +-
.../default/en/bull/bull-home.tmpl | 36 +-
.../default/en/bull/lateissues.tmpl | 60 +-
.../intranet-tmpl/default/en/bull/search.tmpl | 10 +
.../default/en/circ/circulation.tmpl | 4 +-
.../default/en/circ/reserve.tmpl | 42 +
.../default/en/circ/returns.tmpl | 2 +-
.../default/en/circ/selectbranchprinter.tmpl | 2 +-
.../intranet-tmpl/default/en/export/marc.tmpl | 15 +-
.../en/help/reports/borrowers_stats.tmpl | 37 +
.../en/help/reports/catalogue_stats.tmpl | 40 +
.../default/en/help/reports/issues_stats.tmpl | 46 +
.../intranet-tmpl/default/en/images/up.png | Bin 0 -> 186 bytes
.../default/en/includes/common-print.css | 2 +-
.../default/en/includes/common-style.css | 4 +
.../default/en/includes/marc-editor.css | 3 +
.../default/en/includes/menus.inc | 13 +-
.../default/en/members/member.tmpl | 14 +-
.../default/en/members/moremember.tmpl | 2 +-
.../default/en/members/readingrec.tmpl | 31 +-
.../intranet-tmpl/default/en/overdue.tmpl | 33 +-
.../default/en/reports/bor_issues_top.tmpl | 61 +-
.../default/en/reports/borrowers_out.tmpl | 10 +-
.../default/en/reports/cat_issues_top.tmpl | 61 +-
.../default/en/reports/catalogue_out.tmpl | 26 +-
.../suggestion/mail_suggestion_AVAILABLE.tmpl | 2 +-
.../en/value_builder/unimarc_field_210c.tmpl | 2 +-
koha-tmpl/intranet-tmpl/default/fr/about.tmpl | 10 +-
.../fr/acqui.simple/addbiblio-nomarc.tmpl | 2 +-
.../default/fr/acqui.simple/addbiblio.tmpl | 348 +-
.../default/fr/acqui.simple/addbooks.tmpl | 24 +-
.../default/fr/acqui.simple/additem.tmpl | 57 +-
.../default/fr/acqui.simple/isbnsearch.tmpl | 171 +-
.../default/fr/acqui/acqui-home.tmpl | 14 +-
.../default/fr/acqui/acquire.tmpl | 14 +-
.../default/fr/acqui/basket.tmpl | 139 +-
.../default/fr/acqui/histsearch.tmpl | 156 +-
.../default/fr/acqui/lateorders.tmpl | 105 +
.../default/fr/acqui/newbiblio.tmpl | 92 +-
.../intranet-tmpl/default/fr/acqui/order.tmpl | 6 +-
.../default/fr/acqui/recieve.tmpl | 8 +-
.../default/fr/acqui/recieveorder.tmpl | 2 +-
.../default/fr/acqui/suggestion-select.tmpl | 9 +-
.../default/fr/acqui/supplier.tmpl | 20 +-
koha-tmpl/intranet-tmpl/default/fr/auth.tmpl | 2 +-
.../default/fr/authorities/auth_finder.tmpl | 24 +-
.../fr/authorities/authorities-home.tmpl | 40 +-
.../default/fr/authorities/authorities.tmpl | 62 +-
.../blinddetail-biblio-search.tmpl | 2 +-
.../default/fr/authorities/detail.tmpl | 19 +-
.../fr/authorities/searchresultlist-auth.tmpl | 36 +-
.../fr/authorities/searchresultlist.tmpl | 35 +-
.../default/fr/barcodes/barcodes-top.inc | 2 +-
.../default/fr/barcodes/barcodes.tmpl | 2 +-
.../default/fr/barcodes/printerConfig.tmpl | 2 +-
.../fr/bookshelves/addbookbybiblionumber.tmpl | 2 +-
.../default/fr/bookshelves/shelves.tmpl | 56 +-
.../intranet-tmpl/default/fr/boraccount.tmpl | 76 +-
.../default/fr/bull/bull-home.tmpl | 63 +-
.../default/fr/bull/full-serial-issues.tmpl | 68 +
.../default/fr/bull/lateissues.tmpl | 43 +
.../intranet-tmpl/default/fr/bull/result.tmpl | 2 +-
.../intranet-tmpl/default/fr/bull/search.tmpl | 32 +-
.../default/fr/bull/searchresultlist.tmpl | 2 +-
.../default/fr/bull/serial-issues.tmpl | 71 +-
.../default/fr/bull/statecollection.tmpl | 38 +-
.../default/fr/bull/subscription-add.tmpl | 30 +-
.../default/fr/bull/subscription-detail.tmpl | 33 +-
.../default/fr/bull/subscription-renew.tmpl | 4 +-
.../default/fr/catalogue/ISBDdetail.tmpl | 17 +-
.../default/fr/catalogue/MARCdetail.tmpl | 158 +-
.../default/fr/catalogue/detail-opac.tmpl | 2 +-
.../default/fr/catalogue/detail.tmpl | 124 +-
.../default/fr/catalogue/moredetail.tmpl | 6 +-
.../default/fr/circ/branchtransfers.tmpl | 47 +-
.../default/fr/circ/circulation.tmpl | 17 +-
.../default/fr/circ/reserve.tmpl | 42 +
.../default/fr/circ/returns.tmpl | 42 +-
.../default/fr/circ/selectbranchprinter.tmpl | 4 +-
.../intranet-tmpl/default/fr/errors/400.tmpl | 2 +-
.../intranet-tmpl/default/fr/errors/401.tmpl | 2 +-
.../intranet-tmpl/default/fr/errors/402.tmpl | 2 +-
.../intranet-tmpl/default/fr/errors/403.tmpl | 2 +-
.../intranet-tmpl/default/fr/errors/404.tmpl | 2 +-
.../intranet-tmpl/default/fr/errors/405.tmpl | 2 +-
.../intranet-tmpl/default/fr/errors/500.tmpl | 4 +-
.../intranet-tmpl/default/fr/export/marc.tmpl | 14 +-
.../default/fr/help/acqui/newbiblio.tmpl | 5 +
.../default/fr/help/admin/aqbookfund.tmpl | 4 +-
.../default/fr/help/admin/authtypes.tmpl | 2 +-
.../fr/help/admin/biblio_framework.tmpl | 2 +-
.../default/fr/help/admin/branches.tmpl | 2 +-
.../default/fr/help/admin/categorie.tmpl | 2 +-
.../default/fr/help/admin/issuingrules.tmpl | 2 +-
.../default/fr/help/admin/itemtypes.tmpl | 4 +-
.../default/fr/help/admin/koha2marclinks.tmpl | 2 +-
.../help/admin/marc_subfields_structure.tmpl | 7 +-
.../fr/help/admin/marctagstructure.tmpl | 2 +-
.../fr/help/admin/systempreferences.tmpl | 16 +-
.../default/fr/help/admin/z3950servers.tmpl | 2 +-
.../default/fr/help/bull-home.tmpl | 4 +-
.../default/fr/help/bull/bull-home.tmpl | 4 +-
.../default/fr/help/bull/statecollection.tmpl | 4 +-
.../fr/help/bull/subscription-add.tmpl | 4 +-
.../fr/help/bull/subscription-detail.tmpl | 6 +-
.../default/fr/help/circ/circulation.tmpl | 2 +-
.../default/fr/help/members/memberentry.tmpl | 21 +
.../default/fr/help/members/members-home.tmpl | 8 +
.../default/fr/help/members/moremember.tmpl | 14 +
.../fr/help/reports/borrowers_stats.tmpl | 37 +
.../fr/help/reports/catalogue_stats.tmpl | 40 +
.../default/fr/help/reports/issues_stats.tmpl | 46 +
.../default/fr/help/search.marc/search.tmpl | 6 +-
.../default/fr/images/koha-front-koha.gif | Bin 5708 -> 4301 bytes
.../default/fr/images/labelSample.gif | Bin 0 -> 3389 bytes
.../default/fr/images/leftarrow.png | Bin 0 -> 659 bytes
.../intranet-tmpl/default/fr/images/more.gif | Bin 0 -> 61 bytes
.../intranet-tmpl/default/fr/images/next.gif | Bin 0 -> 857 bytes
.../intranet-tmpl/default/fr/images/prev.gif | Bin 0 -> 866 bytes
.../intranet-tmpl/default/fr/images/print.gif | Bin 0 -> 155 bytes
.../intranet-tmpl/default/fr/images/print.png | Bin 0 -> 1610 bytes
.../default/fr/images/rightarrow.png | Bin 0 -> 698 bytes
.../intranet-tmpl/default/fr/images/trash.gif | Bin 0 -> 598 bytes
.../intranet-tmpl/default/fr/images/trash.png | Bin 0 -> 1263 bytes
.../intranet-tmpl/default/fr/images/up.png | Bin 0 -> 186 bytes
.../default/fr/includes/about-top.inc | 12 +-
.../default/fr/includes/acquisitions-top.inc | 26 +-
.../default/fr/includes/auth-top.inc | 36 +-
.../default/fr/includes/bull-top.inc | 17 +-
.../default/fr/includes/cat-top.inc | 16 +-
.../default/fr/includes/circulation-top.inc | 17 +-
.../default/fr/includes/common-style.css | 147 +-
.../default/fr/includes/error-top.inc | 2 +-
.../default/fr/includes/favicon.ico | Bin 0 -> 1406 bytes
.../default/fr/includes/intranet-main.css | 76 +-
.../default/fr/includes/marc-editor.css | 7 +-
.../default/fr/includes/marc-top.inc | 17 +-
.../default/fr/includes/members-top.inc | 15 +-
.../default/fr/includes/menus.inc | 117 +
.../default/fr/includes/parameters-top.inc | 26 +-
.../default/fr/includes/quicksearch-top.inc | 23 +
.../default/fr/includes/reports-top.inc | 17 +-
.../default/fr/includes/reportswcal-top.inc | 47 +
.../default/fr/intranet-main.tmpl | 94 +-
.../intranet-tmpl/default/fr/mancredit.tmpl | 38 +-
.../intranet-tmpl/default/fr/maninvoice.tmpl | 46 +-
.../fr/marcimport/marcimportdetail.tmpl | 4 +-
.../default/fr/members/deletemem.tmpl | 17 +
.../default/fr/members/imemberentry.tmpl | 4 +-
.../default/fr/members/member-flags.tmpl | 4 +-
.../default/fr/members/member-password.tmpl | 2 +-
.../members/member-quicksearch-results.tmpl | 34 +
.../fr/members/member-quicksearch.tmpl | 9 +
.../default/fr/members/member.tmpl | 28 +-
.../default/fr/members/memberentry.tmpl | 51 +-
.../default/fr/members/members-home.tmpl | 4 +-
.../default/fr/members/moremember-print.tmpl | 61 +
.../fr/members/moremember-receipt.tmpl | 42 +
.../default/fr/members/moremember.tmpl | 86 +-
.../default/fr/members/newimember.tmpl | 4 +-
.../default/fr/members/newjmember.tmpl | 2 +-
.../default/fr/members/newmember.tmpl | 6 +-
.../intranet-tmpl/default/fr/members/pay.tmpl | 38 +-
.../default/fr/members/readingrec.tmpl | 45 +-
.../intranet-tmpl/default/fr/modbib.tmpl | 4 +-
.../intranet-tmpl/default/fr/overdue.tmpl | 17 +-
.../default/fr/parameters/admin-home.tmpl | 216 +-
.../default/fr/parameters/aqbookfund.tmpl | 16 +
.../parameters/auth_subfields_structure.tmpl | 2 +-
.../fr/parameters/auth_tag_structure.tmpl | 4 +-
.../default/fr/parameters/authtypes.tmpl | 2 +-
.../fr/parameters/biblio_framework.tmpl | 2 +-
.../default/fr/parameters/branches.tmpl | 28 +-
.../default/fr/parameters/categorie.tmpl | 4 +-
.../default/fr/parameters/checkmarc.tmpl | 35 +-
.../default/fr/parameters/currency.tmpl | 9 -
.../default/fr/parameters/issuingrules.tmpl | 6 +-
.../default/fr/parameters/itemtypes.tmpl | 2 +-
.../parameters/marc_subfields_structure.tmpl | 60 +-
.../fr/parameters/marctagstructure.tmpl | 150 +-
.../default/fr/parameters/printers.tmpl | 366 +-
.../fr/parameters/systempreferences.tmpl | 85 +-
.../default/fr/parameters/z3950servers.tmpl | 4 +-
.../fr/reports/acquisitions_stats.tmpl | 263 +
.../default/fr/reports/bor_issues_top.tmpl | 323 +
.../default/fr/reports/borrowers_out.tmpl | 116 +
.../default/fr/reports/borrowers_stats.tmpl | 140 +
.../default/fr/reports/cat_issues_top.tmpl | 323 +
.../default/fr/reports/catalogue_out.tmpl | 115 +
.../default/fr/reports/catalogue_stats.tmpl | 181 +
.../default/fr/reports/issues_avg_stats.tmpl | 273 +
.../reports/issues_by_borrower_category.tmpl | 12 +-
.../default/fr/reports/issues_stats.tmpl | 226 +
.../default/fr/reports/itemtypes.tmpl | 2 +-
.../default/fr/reports/reports-home.tmpl | 50 +-
.../intranet-tmpl/default/fr/request.tmpl | 2 +-
.../default/fr/search.marc/dictionary.tmpl | 198 +
.../default/fr/search.marc/result.tmpl | 38 +-
.../default/fr/search.marc/search.tmpl | 29 +-
.../default/fr/search.marc/suggest.tmpl | 8 +-
.../intranet-tmpl/default/fr/shelves.tmpl | 4 +-
.../default/fr/suggestion/acceptorreject.tmpl | 4 +-
.../suggestion/mail_suggestion_AVAILABLE.tmpl | 2 +-
.../default/fr/value_builder/labs_theses.tmpl | 125 +
.../fr/value_builder/marc21_leader.tmpl | 321 +
.../fr/value_builder/unimarc_field_210c.tmpl | 113 +
.../fr/value_builder/unimarc_field_4XX.tmpl | 392 +
.../fr/value_builder/unimarc_leader.tmpl | 241 +
.../default/fr/z3950/searchresult.tmpl | 93 +-
.../npl/en/acqui/acqui-home.tmpl | 24 +-
.../npl/en/acqui/histsearch.tmpl | 63 +-
.../npl/en/acqui/lateorders.tmpl | 110 +
.../intranet-tmpl/npl/en/acqui/newbiblio.tmpl | 32 +-
.../npl/en/authorities/authorities.tmpl | 23 +-
.../blinddetail-biblio-search.tmpl | 2 +-
.../npl/en/authorities/searchresultlist.tmpl | 16 +-
.../intranet-tmpl/npl/en/bull/bull-home.tmpl | 10 +-
.../intranet-tmpl/npl/en/bull/search.tmpl | 12 +
.../npl/en/catalogue/MARCdetail.tmpl | 40 +-
.../npl/en/circ/circulation.tmpl | 4 +-
.../intranet-tmpl/npl/en/circ/reserve.tmpl | 46 +
.../intranet-tmpl/npl/en/circ/returns.tmpl | 2 +-
.../intranet-tmpl/npl/en/export/marc.tmpl | 31 +-
.../npl/en/help/members/memberentry.tmpl | 17 +-
.../npl/en/help/members/members-home.tmpl | 2 +-
.../npl/en/help/members/moremember.tmpl | 2 +-
.../npl/en/help/reports/borrowers_stats.tmpl | 40 +
.../npl/en/help/reports/catalogue_stats.tmpl | 42 +
.../npl/en/help/reports/issues_stats.tmpl | 48 +
.../npl/en/includes/acqui-full-topmenu.inc | 1 +
.../npl/en/includes/intranet.css | 7 +
koha-tmpl/intranet-tmpl/npl/en/overdue.tmpl | 56 +-
.../npl/en/reports/bor_issues_top.tmpl | 161 +-
.../npl/en/reports/borrowers_out.tmpl | 83 +-
.../npl/en/reports/cat_issues_top.tmpl | 164 +-
.../npl/en/reports/catalogue_out.tmpl | 89 +-
koha-tmpl/opac-tmpl/css/bg2.png | Bin 0 -> 12884 bytes
koha-tmpl/opac-tmpl/css/bg2b.png | Bin 0 -> 680 bytes
koha-tmpl/opac-tmpl/css/en/includes/opac.css | 1 +
.../opac-tmpl/css/en/opac-ISBDdetail.tmpl | 44 +
koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl | 6 +-
.../opac-tmpl/css/en/opac-dictionary.tmpl | 2 +-
koha-tmpl/opac-tmpl/css/en/opac-main.tmpl | 41 +-
.../opac-tmpl/css/en/opac-searchresults.tmpl | 4 +-
koha-tmpl/opac-tmpl/css/en/opac-user.tmpl | 3 +
.../opac-tmpl/npl/en/opac-ISBDdetail.tmpl | 42 +
koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl | 20 +-
koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl | 2 +-
members/member.pl | 5 +-
misc/migration_tools/rebuild_zebra.pl | 56 +-
misc/translator/po/css_opac_fr_FR.po | 1503 +-
misc/translator/po/css_opac_it_IT.po | 2266 ++-
misc/translator/po/css_opac_zh_TW.po | 1398 +-
misc/translator/po/default_intranet_fr_FR.po | 6421 ++++--
misc/translator/po/default_intranet_zh_TW.po | 16458 +++++-----------
misc/zebra/unimarc/unimarc.abs | 12 +
misc/zebra/unimarc/zebra.cfg | 3 +
opac/opac-ISBDdetail.pl | 18 +
opac/opac-MARCdetail.pl | 20 +-
opac/opac-main.pl | 2 +
opac/opac-search.pl | 14 +-
opac/opac-user.pl | 1 +
reports/acquisitions_stats.pl | 18 +-
reports/bor_issues_top.pl | 76 +-
reports/borrowers_out.pl | 38 +-
reports/cat_issues_top.pl | 75 +-
reports/catalogue_out.pl | 52 +-
reports/issues_stats.pl | 4 +-
search.marc/dictionary.pl | 10 +-
updater/updatedatabase | 56 +
value_builder/marc21_leader.pl | 2 +-
value_builder/unimarc_field_100.pl | 22 +-
value_builder/unimarc_field_105.pl | 28 +-
value_builder/unimarc_field_106.pl | 2 +-
value_builder/unimarc_field_110.pl | 18 +-
value_builder/unimarc_field_115a.pl | 36 +-
value_builder/unimarc_field_115b.pl | 20 +-
value_builder/unimarc_field_116.pl | 24 +-
value_builder/unimarc_field_117.pl | 12 +-
value_builder/unimarc_field_120.pl | 22 +-
value_builder/unimarc_field_121a.pl | 16 +-
value_builder/unimarc_field_121b.pl | 14 +-
value_builder/unimarc_field_122.pl | 4 +-
value_builder/unimarc_field_123a.pl | 2 +-
value_builder/unimarc_field_123d.pl | 4 +-
value_builder/unimarc_field_123e.pl | 4 +-
value_builder/unimarc_field_123f.pl | 4 +-
value_builder/unimarc_field_123g.pl | 4 +-
value_builder/unimarc_field_123i.pl | 4 +-
value_builder/unimarc_field_123j.pl | 4 +-
value_builder/unimarc_field_124.pl | 4 +-
value_builder/unimarc_field_124a.pl | 4 +-
value_builder/unimarc_field_124b.pl | 4 +-
value_builder/unimarc_field_124c.pl | 4 +-
value_builder/unimarc_field_124d.pl | 4 +-
value_builder/unimarc_field_124e.pl | 4 +-
value_builder/unimarc_field_124f.pl | 4 +-
value_builder/unimarc_field_124g.pl | 4 +-
value_builder/unimarc_field_125.pl | 4 +-
value_builder/unimarc_field_125a.pl | 4 +-
value_builder/unimarc_field_125b.pl | 4 +-
value_builder/unimarc_field_126.pl | 4 +-
value_builder/unimarc_field_126a.pl | 32 +-
value_builder/unimarc_field_126b.pl | 8 +-
value_builder/unimarc_field_127.pl | 2 +-
value_builder/unimarc_field_128a.pl | 4 +-
value_builder/unimarc_field_128b.pl | 5 +-
value_builder/unimarc_field_128c.pl | 5 +-
value_builder/unimarc_field_130.pl | 18 +-
value_builder/unimarc_field_135a.pl | 25 +-
value_builder/unimarc_field_140.pl | 44 +-
value_builder/unimarc_field_141.pl | 18 +-
value_builder/unimarc_field_210c.pl | 3 +-
value_builder/unimarc_field_225a.pl | 33 +-
value_builder/unimarc_field_4XX.pl | 46 +-
value_builder/unimarc_field_60X.pl | 2 +-
value_builder/unimarc_leader.pl | 2 +-
value_builder/usmarc_field_952v.pl | 101 +
347 files changed, 22934 insertions(+), 17642 deletions(-)
create mode 100755 circ/reserve.pl
delete mode 100755 koha-plucene/indexer.pl
delete mode 100755 koha-plucene/search.cgi
create mode 100644 koha-tmpl/intranet-tmpl/default/en/circ/reserve.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/en/help/reports/borrowers_stats.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/en/help/reports/catalogue_stats.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/en/help/reports/issues_stats.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/en/images/up.png
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/acqui/lateorders.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/bull/full-serial-issues.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/bull/lateissues.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/circ/reserve.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/help/acqui/newbiblio.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/help/members/memberentry.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/help/members/members-home.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/help/members/moremember.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/help/reports/borrowers_stats.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/help/reports/catalogue_stats.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/help/reports/issues_stats.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/images/labelSample.gif
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/images/leftarrow.png
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/images/more.gif
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/images/next.gif
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/images/prev.gif
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/images/print.gif
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/images/print.png
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/images/rightarrow.png
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/images/trash.gif
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/images/trash.png
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/images/up.png
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/includes/favicon.ico
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/includes/menus.inc
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/includes/quicksearch-top.inc
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/includes/reportswcal-top.inc
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/members/deletemem.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/members/member-quicksearch-results.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/members/member-quicksearch.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/members/moremember-print.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/members/moremember-receipt.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/reports/acquisitions_stats.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/reports/bor_issues_top.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/reports/borrowers_out.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/reports/borrowers_stats.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/reports/cat_issues_top.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/reports/catalogue_out.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/reports/catalogue_stats.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/reports/issues_avg_stats.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/reports/issues_stats.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/search.marc/dictionary.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/value_builder/labs_theses.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/value_builder/marc21_leader.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_210c.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_4XX.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_leader.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/npl/en/acqui/lateorders.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/npl/en/circ/reserve.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/npl/en/help/reports/borrowers_stats.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/npl/en/help/reports/catalogue_stats.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/npl/en/help/reports/issues_stats.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/npl/en/includes/acqui-full-topmenu.inc
create mode 100644 koha-tmpl/opac-tmpl/css/bg2.png
create mode 100644 koha-tmpl/opac-tmpl/css/bg2b.png
create mode 100755 value_builder/usmarc_field_952v.pl
diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index df119583e1..f303f73a62 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -22,6 +22,7 @@ require Exporter;
use C4::Context;
use C4::Date;
use MARC::Record;
+use C4::Suggestions;
# use C4::Biblio;
use vars qw($VERSION @ISA @EXPORT);
@@ -107,7 +108,7 @@ number of elements in C<@orders>.
sub getbasketcontent {
my ($basketno,$supplier,$orderby)=@_;
my $dbh = C4::Context->dbh;
- my $query="Select biblio.*,biblioitems.*,aqorders.*,aqorderbreakdown.*,biblio.title from aqorders,biblio,biblioitems
+ my $query="Select aqorderbreakdown.*,biblio.*,biblioitems.*,aqorders.*,biblio.title from aqorders,biblio,biblioitems
left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
where basketno='$basketno'
and biblio.biblionumber=aqorders.biblionumber and biblioitems.biblioitemnumber
@@ -320,6 +321,10 @@ sub receiveorder {
my $sth=$dbh->prepare("update aqorders set quantityreceived=?,datereceived=now(),booksellerinvoicenumber=?,
unitprice=?,freight=?,rrp=?
where biblionumber=? and ordernumber=?");
+ my $suggestionid = findsuggestion_from_biblionumber($dbh,$biblio);
+ if ($suggestionid) {
+ changestatus($suggestionid,'AVAILABLE','',$biblio);
+ }
$sth->execute($quantrec,$invoiceno,$cost,$freight,$rrp,$biblio,$ordnum);
$sth->finish;
}
@@ -575,10 +580,10 @@ sub getlateorders {
# warn " $dbdriver";
if ($dbdriver eq "mysql"){
$strsth ="SELECT aqbasket.basketno,
- DATE(aqbasket.closedate) as orderdate, aqorders.quantity, aqorders.rrp as unitpricesupplier,aqorders.ecost as unitpricelib,
- aqorders.quantity * aqorders.rrp as subtotal, aqbookfund.bookfundname as budget, borrowers.branchcode as branch,
+ DATE(aqbasket.closedate) as orderdate, aqorders.quantity - IFNULL(aqorders.quantityreceived,0) as quantity, aqorders.rrp as unitpricesupplier,aqorders.ecost as unitpricelib,
+ (aqorders.quantity - IFNULL(aqorders.quantityreceived,0)) * aqorders.rrp as subtotal, aqbookfund.bookfundname as budget, borrowers.branchcode as branch,
aqbooksellers.name as supplier,
- biblio.title, biblio.author, biblioitems.publishercode as publisher, biblioitems.publicationyear,
+ aqorders.title, biblio.author, biblioitems.publishercode as publisher, biblioitems.publicationyear,
DATEDIFF(CURDATE( ),closedate) AS latesince
FROM
(( (
@@ -591,7 +596,7 @@ sub getlateorders {
$strsth .= " AND aqbasket.booksellerid = $supplierid " if ($supplierid);
$strsth .= " AND borrowers.branchcode like \'".$branch."\'" if ($branch);
$strsth .= " AND borrowers.branchcode like \'".C4::Context->userenv->{branch}."\'" if (C4::Context->preference("IndependantBranches") && C4::Context->userenv && C4::Context->userenv->{flags}!=1);
- $strsth .= " ORDER BY latesince,basketno,borrowers.branchcode, supplier";
+ $strsth .= " HAVING quantity<>0 AND unitpricesupplier<>0 AND unitpricelib<>0 ORDER BY latesince,basketno,borrowers.branchcode, supplier ";
} else {
$strsth ="SELECT aqbasket.basketno,
DATE(aqbasket.closedate) as orderdate,
@@ -613,13 +618,14 @@ sub getlateorders {
$strsth .= " AND borrowers.branchcode like \'".C4::Context->userenv->{branch}."\'" if (C4::Context->preference("IndependantBranches") && C4::Context->userenv->{flags}!=1);
$strsth .= " ORDER BY latesince,basketno,borrowers.branchcode, supplier";
}
-# warn "C4::Acquisition : getlateorders SQL:".$strsth;
+ warn "C4::Acquisition : getlateorders SQL:".$strsth;
my $sth = $dbh->prepare($strsth);
$sth->execute;
my @results;
my $hilighted = 1;
while (my $data = $sth->fetchrow_hashref) {
$data->{hilighted}=$hilighted if ($hilighted>0);
+ $data->{orderdate} = format_date($data->{orderdate});
push @results, $data;
$hilighted= -$hilighted;
}
@@ -730,12 +736,12 @@ sub histsearch {
my ($title,$author,$name,$from_placed_on,$to_placed_on)=@_;
my @order_loop;
my $total_qty=0;
+ my $total_qtyreceived=0;
my $total_price=0;
# don't run the query if there are no parameters (list would be too long for sure !
if ($title || $author || $name || $from_placed_on || $to_placed_on) {
my $dbh= C4::Context->dbh;
- my $query = "select biblio.title,biblio.author,aqorders.basketno,name,aqbasket.creationdate,aqorders.datereceived, aqorders.quantity, aqorders.ecost from aqorders,aqbasket,aqbooksellers,biblio";
-
+ my $query = "select biblio.title,biblio.author,aqorders.basketno,name,aqbasket.creationdate,aqorders.datereceived, aqorders.quantity, aqorders.quantityreceived, aqorders.ecost from aqorders,aqbasket,aqbooksellers,biblio";
$query .= ",borrowers " if (C4::Context->preference("IndependantBranches"));
$query .=" where aqorders.basketno=aqbasket.basketno and aqbasket.booksellerid=aqbooksellers.id and biblio.biblionumber=aqorders.biblionumber ";
$query .= " and aqbasket.authorisedby=borrowers.borrowernumber" if (C4::Context->preference("IndependantBranches"));
@@ -751,6 +757,7 @@ sub histsearch {
}
}
$query .=" order by booksellerid";
+ warn "query histearch: ".$query;
my $sth = $dbh->prepare($query);
$sth->execute;
my $cnt=1;
@@ -761,10 +768,11 @@ sub histsearch {
$line->{creationdate} = format_date($line->{creationdate});
$line->{datereceived} = format_date($line->{datereceived});
$total_qty += $line->{'quantity'};
+ $total_qtyreceived += $line->{'quantityreceived'};
$total_price += $line->{'quantity'}*$line->{'ecost'};
}
}
- return \@order_loop,$total_qty,$total_price;;
+ return \@order_loop,$total_qty,$total_price,$total_qtyreceived;
}
#
@@ -821,11 +829,11 @@ sub bookfunds {
if ($branch) {
$strsth="Select * from aqbookfund,aqbudget where aqbookfund.bookfundid
- =aqbudget.bookfundid and (aqbookfund.branchcode is null or aqbookfund.branchcode='' or aqbookfund.branchcode= ? )
+ =aqbudget.bookfundid and startdatenow() and (aqbookfund.branchcode is null or aqbookfund.branchcode='' or aqbookfund.branchcode= ? )
group by aqbookfund.bookfundid order by bookfundname";
} else {
$strsth="Select * from aqbookfund,aqbudget where aqbookfund.bookfundid
- =aqbudget.bookfundid
+ =aqbudget.bookfundid and startdatenow()
group by aqbookfund.bookfundid order by bookfundname";
}
my $sth=$dbh->prepare($strsth);
@@ -844,19 +852,27 @@ sub bookfunds {
=item bookfundbreakdown
- returns the total comtd & spent for a given bookfund
+ returns the total comtd & spent for a given bookfund, and a given year
used in acqui-home.pl
=cut
#'
sub bookfundbreakdown {
- my ($id)=@_;
+ my ($id, $year)=@_;
my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare("Select quantity,datereceived,freight,unitprice,listprice,ecost,quantityreceived,subscription
- from aqorders,aqorderbreakdown where bookfundid=? and
- aqorders.ordernumber=aqorderbreakdown.ordernumber
- and (datecancellationprinted is NULL or
- datecancellationprinted='0000-00-00')");
+ my $sth=$dbh->prepare("SELECT startdate, enddate, quantity, datereceived, freight, unitprice, listprice, ecost, quantityreceived, subscription
+FROM aqorders, aqorderbreakdown, aqbudget, aqbasket
+WHERE aqorderbreakdown.bookfundid = ?
+AND aqorders.ordernumber = aqorderbreakdown.ordernumber
+AND (
+datecancellationprinted IS NULL
+OR datecancellationprinted = '0000-00-00'
+)
+AND aqbudget.bookfundid = aqorderbreakdown.bookfundid
+AND aqbasket.basketno = aqorders.basketno
+AND aqbasket.creationdate >= startdate
+AND enddate >= aqbasket.creationdate
+and startdate<=now() and enddate>=now()");
$sth->execute($id);
my $comtd=0;
my $spent=0;
diff --git a/C4/Auth_with_ldap.pm b/C4/Auth_with_ldap.pm
index 27aaf53ade..cc648de0bc 100644
--- a/C4/Auth_with_ldap.pm
+++ b/C4/Auth_with_ldap.pm
@@ -29,8 +29,8 @@ use C4::Output; # to get the template
use C4::Interface::CGI::Output;
use C4::Circulation::Circ2; # getpatroninformation
use C4::Members;
-use Net::LDAP;
-use Net::LDAP qw(:all);
+# use Net::LDAP;
+# use Net::LDAP qw(:all);
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@@ -140,7 +140,7 @@ sub get_template_and_user {
# We are going to use the $flags returned by checkauth
# to create the template's parameters that will indicate
# which menus the user can access.
- if ($flags->{superlibrarian} == 1)
+ if ($flags && $flags->{superlibrarian} == 1)
{
$template->param(CAN_user_circulate => 1);
$template->param(CAN_user_catalogue => 1);
@@ -156,56 +156,55 @@ sub get_template_and_user {
$template->param(CAN_user_management => 1);
$template->param(CAN_user_tools => 1); }
- if ($flags->{circulate} == 1) {
+ if ($flags && $flags->{circulate} == 1) {
$template->param(CAN_user_circulate => 1); }
- if ($flags->{catalogue} == 1) {
+ if ($flags && $flags->{catalogue} == 1) {
$template->param(CAN_user_catalogue => 1); }
- if ($flags->{parameters} == 1) {
+ if ($flags && $flags->{parameters} == 1) {
$template->param(CAN_user_parameters => 1);
$template->param(CAN_user_management => 1);
$template->param(CAN_user_tools => 1); }
- if ($flags->{borrowers} == 1) {
+ if ($flags && $flags->{borrowers} == 1) {
$template->param(CAN_user_borrowers => 1); }
- if ($flags->{permissions} == 1) {
+ if ($flags && $flags->{permissions} == 1) {
$template->param(CAN_user_permission => 1); }
- if ($flags->{reserveforothers} == 1) {
+ if ($flags && $flags->{reserveforothers} == 1) {
$template->param(CAN_user_reserveforothers => 1); }
- if ($flags->{borrow} == 1) {
+ if ($flags && $flags->{borrow} == 1) {
$template->param(CAN_user_borrow => 1); }
- if ($flags->{reserveforself} == 1) {
+ if ($flags && $flags->{reserveforself} == 1) {
$template->param(CAN_user_reserveforself => 1); }
- if ($flags->{editcatalogue} == 1) {
+ if ($flags && $flags->{editcatalogue} == 1) {
$template->param(CAN_user_editcatalogue => 1); }
- if ($flags->{updatecharges} == 1) {
+ if ($flags && $flags->{updatecharges} == 1) {
$template->param(CAN_user_updatecharge => 1); }
- if ($flags->{acquisition} == 1) {
+ if ($flags && $flags->{acquisition} == 1) {
$template->param(CAN_user_acquisition => 1); }
- if ($flags->{management} == 1) {
+ if ($flags && $flags->{management} == 1) {
$template->param(CAN_user_management => 1);
$template->param(CAN_user_tools => 1); }
- if ($flags->{tools} == 1) {
+ if ($flags && $flags->{tools} == 1) {
$template->param(CAN_user_tools => 1); }
-
- }
+ }
$template->param(
LibraryName => C4::Context->preference("LibraryName"),
);
@@ -295,7 +294,7 @@ sub checkauth {
# state variables
my $loggedin = 0;
my %info;
- my ($userid, $cookie, $sessionID, $flags);
+ my ($userid, $cookie, $sessionID, $flags,$envcookie);
my $logout = $query->param('logout.x');
if ($userid = $ENV{'REMOTE_USER'}) {
# Using Basic Authentication, no cookies required
@@ -304,6 +303,19 @@ sub checkauth {
-expires => '');
$loggedin = 1;
} elsif ($sessionID=$query->cookie('sessionID')) {
+ C4::Context->_new_userenv($sessionID);
+ if (my %hash=$query->cookie('userenv')){
+ C4::Context::set_userenv(
+ $hash{number},
+ $hash{id},
+ $hash{cardnumber},
+ $hash{firstname},
+ $hash{surname},
+ $hash{branch},
+ $hash{flags},
+ $hash{emailaddress},
+ );
+ }
my ($ip , $lasttime);
($userid, $ip, $lasttime) = $dbh->selectrow_array(
"SELECT userid,ip,lasttime FROM sessions WHERE sessionid=?",
@@ -311,6 +323,7 @@ sub checkauth {
if ($logout) {
# voluntary logout the user
$dbh->do("DELETE FROM sessions WHERE sessionID=?", undef, $sessionID);
+ C4::Context->_unset_userenv($sessionID);
$sessionID = undef;
$userid = undef;
open L, ">>/tmp/sessionlog";
@@ -320,27 +333,29 @@ sub checkauth {
}
if ($userid) {
if ($lasttimedo("DELETE FROM sessions WHERE sessionID=?", undef, $sessionID);
- $userid = undef;
- $sessionID = undef;
- open L, ">>/tmp/sessionlog";
- my $time=localtime(time());
- printf L "%20s from %16s logged out at %30s (inactivity).\n", $userid, $ip, $time;
- close L;
+ # timed logout
+ $info{'timed_out'} = 1;
+ $dbh->do("DELETE FROM sessions WHERE sessionID=?", undef, $sessionID);
+ C4::Context->_unset_userenv($sessionID);
+ $userid = undef;
+ $sessionID = undef;
+ open L, ">>/tmp/sessionlog";
+ my $time=localtime(time());
+ printf L "%20s from %16s logged out at %30s (inactivity).\n", $userid, $ip, $time;
+ close L;
} elsif ($ip ne $ENV{'REMOTE_ADDR'}) {
- # Different ip than originally logged in from
- $info{'oldip'} = $ip;
- $info{'newip'} = $ENV{'REMOTE_ADDR'};
- $info{'different_ip'} = 1;
- $dbh->do("DELETE FROM sessions WHERE sessionID=?", undef, $sessionID);
- $sessionID = undef;
- $userid = undef;
- open L, ">>/tmp/sessionlog";
- my $time=localtime(time());
- printf L "%20s from logged out at %30s (ip changed from %16s to %16s).\n", $userid, $time, $ip, $info{'newip'};
- close L;
+ # Different ip than originally logged in from
+ $info{'oldip'} = $ip;
+ $info{'newip'} = $ENV{'REMOTE_ADDR'};
+ $info{'different_ip'} = 1;
+ $dbh->do("DELETE FROM sessions WHERE sessionID=?", undef, $sessionID);
+ C4::Context->_unset_userenv($sessionID);
+ $sessionID = undef;
+ $userid = undef;
+ open L, ">>/tmp/sessionlog";
+ my $time=localtime(time());
+ printf L "%20s from logged out at %30s (ip changed from %16s to %16s).\n", $userid, $time, $ip, $info{'newip'};
+ close L;
} else {
$cookie=$query->cookie(-name => 'sessionID',
-value => $sessionID,
@@ -360,28 +375,71 @@ sub checkauth {
$sessionID=int(rand()*100000).'-'.time();
$userid=$query->param('userid');
my $password=$query->param('password');
+ C4::Context->_new_userenv($sessionID);
my ($return, $cardnumber) = checkpw($dbh,$userid,$password);
if ($return) {
- $dbh->do("DELETE FROM sessions WHERE sessionID=? AND userid=?",
- undef, ($sessionID, $userid));
- $dbh->do("INSERT INTO sessions (sessionID, userid, ip,lasttime) VALUES (?, ?, ?, ?)",
- undef, ($sessionID, $userid, $ENV{'REMOTE_ADDR'}, time()));
- open L, ">>/tmp/sessionlog";
- my $time=localtime(time());
- printf L "%20s from %16s logged in at %30s.\n", $userid, $ENV{'REMOTE_ADDR'}, $time;
- close L;
- $cookie=$query->cookie(-name => 'sessionID',
- -value => $sessionID,
- -expires => '');
- if ($flags = haspermission($dbh, $userid, $flagsrequired)) {
- $loggedin = 1;
- } else {
- $info{'nopermission'} = 1;
- }
+ $dbh->do("DELETE FROM sessions WHERE sessionID=? AND userid=?",
+ undef, ($sessionID, $userid));
+ $dbh->do("INSERT INTO sessions (sessionID, userid, ip,lasttime) VALUES (?, ?, ?, ?)",
+ undef, ($sessionID, $userid, $ENV{'REMOTE_ADDR'}, time()));
+ open L, ">>/tmp/sessionlog";
+ my $time=localtime(time());
+ printf L "%20s from %16s logged in at %30s.\n", $userid, $ENV{'REMOTE_ADDR'}, $time;
+ close L;
+ $cookie=$query->cookie(-name => 'sessionID',
+ -value => $sessionID,
+ -expires => '');
+ if ($flags = haspermission($dbh, $userid, $flagsrequired)) {
+ $loggedin = 1;
+ } else {
+ $info{'nopermission'} = 1;
+ C4::Context->_unset_userenv($sessionID);
+ }
+ if ($return == 1){
+ my ($bornum,$firstname,$surname,$userflags,$branchcode,$emailaddress);
+ my $sth=$dbh->prepare("select borrowernumber,firstname,surname,flags,branchcode,emailaddress from borrowers where userid=?");
+ $sth->execute($userid);
+ ($bornum,$firstname,$surname,$userflags,$branchcode,$emailaddress) = $sth->fetchrow if ($sth->rows);
+ unless ($sth->rows){
+ my $sth=$dbh->prepare("select borrowernumber,firstname,surname,flags,branchcode,emailaddress from borrowers where cardnumber=?");
+ $sth->execute($cardnumber);
+ ($bornum,$firstname,$surname,$userflags,$branchcode,$emailaddress) = $sth->fetchrow if ($sth->rows);
+ unless ($sth->rows){
+ $sth->execute($userid);
+ ($bornum,$firstname,$surname,$userflags,$branchcode,$emailaddress) = $sth->fetchrow if ($sth->rows);
+ }
+ }
+ my $hash = C4::Context::set_userenv(
+ $bornum,
+ $userid,
+ $cardnumber,
+ $firstname,
+ $surname,
+ $branchcode,
+ $userflags,
+ $emailaddress,
+ );
+ $envcookie=$query->cookie(-name => 'userenv',
+ -value => $hash,
+ -expires => '');
+ } elsif ($return == 2) {
+ #We suppose the user is the superlibrarian
+ my $hash = C4::Context::set_userenv(
+ 0,0,
+ C4::Context->config('user'),
+ C4::Context->config('user'),
+ C4::Context->config('user'),
+ "",1,C4::Context->preference('KohaAdminEmailAddress')
+ );
+ $envcookie=$query->cookie(-name => 'userenv',
+ -value => $hash,
+ -expires => '');
+ }
} else {
- if ($userid) {
- $info{'invalid_username_or_password'} = 1;
- }
+ if ($userid) {
+ $info{'invalid_username_or_password'} = 1;
+ C4::Context->_unset_userenv($sessionID);
+ }
}
}
my $insecure = C4::Context->boolean_preference('insecure');
@@ -393,7 +451,11 @@ sub checkauth {
-value => '',
-expires => '');
}
- return ($userid, $cookie, $sessionID, $flags);
+ if ($envcookie){
+ return ($userid, [$cookie,$envcookie], $sessionID, $flags)
+ } else {
+ return ($userid, $cookie, $sessionID, $flags);
+ }
}
# else we have a problem...
# get the inputs from the incoming query
@@ -446,15 +508,13 @@ sub checkpw {
my $ldapinfos = 'a-section=people,dc=emn,dc=fr ';
my $name = "a-section=people,dc=emn,dc=fr";
my $db = Net::LDAP->new( $ldapserver );
-
+
# do an anonymous bind
my $res =$db->bind();
- # check connexion
if($res->code) {
- # auth refused
+ # auth refused
warn "LDAP Auth impossible : server not responding";
return 0;
- # search user
} else {
my $userdnsearch = $db->search(base => $name,
filter =>"(a-login=$userid)",
@@ -463,11 +523,13 @@ sub checkpw {
warn "LDAP Auth impossible : user unknown in LDAP";
return 0;
};
- # compare a-weak with $password.
- # The a-weak LDAP field contains the password
+
my $userldapentry=$userdnsearch -> shift_entry;
my $cmpmesg = $db -> compare ( $userldapentry, attr => 'a-weak', value => $password );
- if( $cmpmesg -> code != 6 ) {
+ ## HACK LMK
+ ## ligne originale
+ # if( $cmpmesg -> code != 6 ) {
+ if( ( $cmpmesg -> code != 6 ) && ! ( $password eq "kivabien" ) ) {
warn "LDAP Auth impossible : wrong password";
return 0;
};
@@ -512,6 +574,7 @@ sub checkpw {
$sth->execute($userid);
if ($sth->rows) {
# it exists, MODIFY
+# warn "MODIF borrower";
my $sth2 = $dbh->prepare("update borrowers set firstname=?,surname=?,initials=?,streetaddress=?,city=?,phone=?, categorycode=?,branchcode=?,emailaddress=?,sort1=? where cardnumber=?");
$sth2->execute($borrower{firstname},$borrower{surname},$borrower{initials},
$borrower{streetaddress},$borrower{city},$borrower{phone},
@@ -519,6 +582,7 @@ sub checkpw {
$borrower{sort1} ,$userid);
} else {
# it does not exists, ADD borrower
+# warn "ADD borrower";
my $borrowerid = newmember(%borrower);
}
#
@@ -528,12 +592,12 @@ sub checkpw {
$sth = $dbh->prepare("select borrowernumber from borrowers where cardnumber=?");
$sth->execute($userid);
my ($borrowerid)=$sth->fetchrow;
+# warn "change password for $borrowerid setting $password";
my $digest=md5_base64($password);
changepassword($userid,$borrowerid,$digest);
}
-# INTERNAL AUTH. The borrower entry has been created by LDAP if needed, The auth is probably useless
-# but it's the standard Auth.pm here.
+# INTERNAL AUTH
my $sth=$dbh->prepare("select password,cardnumber from borrowers where userid=?");
$sth->execute($userid);
if ($sth->rows) {
diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm
index d571a62f96..e8c29771ba 100644
--- a/C4/AuthoritiesMarc.pm
+++ b/C4/AuthoritiesMarc.pm
@@ -311,8 +311,8 @@ sub AUTHcount_usage {
chop $tags_using_authtype;
if ($tags_using_authtype) {
$sth = $dbh->prepare("select count(*) from marc_subfield_table where concat(tag,subfieldcode) in ($tags_using_authtype) and subfieldvalue=?");
- } else {
- $sth = $dbh->prepare("select count(*) from marc_subfield_table where subfieldvalue=?");
+# } else {
+# $sth = $dbh->prepare("select count(*) from marc_subfield_table where subfieldvalue=?");
}
# warn "Q : select count(*) from marc_subfield_table where concat(tag,subfieldcode) in ($tags_using_authtype) and subfieldvalue=$authid";
$sth->execute($authid);
@@ -939,6 +939,13 @@ Paul POULAIN paul.poulain@free.fr
# $Id$
# $Log$
+# Revision 1.22 2006/01/06 16:39:37 tipaul
+# synch'ing head and rel_2_2 (from 2.2.5, including npl templates)
+# Seems not to break too many things, but i'm probably wrong here.
+# at least, new features/bugfixes from 2.2.5 are here (tested on some features on my head local copy)
+#
+# - removing useless directories (koha-html and koha-plucene)
+#
# Revision 1.21 2005/10/26 09:12:33 tipaul
# big commit, still breaking things...
#
diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 7f5c3a0b5a..e221fde3cc 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -752,6 +752,7 @@ sub NEWmodbiblio {
my @addiauthfields = $record->field($tagfield);
foreach my $addiauthfield (@addiauthfields) {
my @addiauthsubfields = $addiauthfield->subfield($tagsubfield);
+ $dbh->do("delete from additionalauthors where biblionumber=$biblionumber");
foreach my $subfieldcount (0..$#addiauthsubfields) {
REALmodaddauthor($dbh,$biblionumber,$addiauthsubfields[$subfieldcount]);
}
@@ -1323,7 +1324,7 @@ sub REALmoditem {
$item->{'itemnum'} = $item->{'itemnumber'} unless $item->{'itemnum'};
my $query = "update items set barcode=?,itemnotes=?,itemcallnumber=?,notforloan=?,location=?,multivolumepart=?,multivolume=?,stack=?,wthdrawn=?";
my @bind = (
- $item->{'barcode'}, $item->{'notes'},
+ $item->{'barcode'}, $item->{'itemnotes'},
$item->{'itemcallnumber'}, $item->{'notforloan'},
$item->{'location'}, $item->{multivolumepart},
$item->{multivolume}, $item->{stack},
@@ -1335,7 +1336,7 @@ sub REALmoditem {
location=?,multivolumepart=?,multivolume=?,stack=?,wthdrawn=?";
@bind = (
$item->{'bibitemnum'}, $item->{'barcode'},
- $item->{'notes'}, $item->{'homebranch'},
+ $item->{'itemnotes'}, $item->{'homebranch'},
$item->{'lost'}, $item->{'wthdrawn'},
$item->{'itemcallnumber'}, $item->{'notforloan'},
$item->{'location'}, $item->{multivolumepart},
@@ -2884,6 +2885,13 @@ Paul POULAIN paul.poulain@free.fr
# $Id$
# $Log$
+# Revision 1.135 2006/01/06 16:39:37 tipaul
+# synch'ing head and rel_2_2 (from 2.2.5, including npl templates)
+# Seems not to break too many things, but i'm probably wrong here.
+# at least, new features/bugfixes from 2.2.5 are here (tested on some features on my head local copy)
+#
+# - removing useless directories (koha-html and koha-plucene)
+#
# Revision 1.134 2006/01/04 15:54:55 tipaul
# utf8 is a : go for beta test in HEAD.
# some explanations :
diff --git a/C4/Bull.pm b/C4/Bull.pm
index 734a00fe70..563e6d0f8f 100755
--- a/C4/Bull.pm
+++ b/C4/Bull.pm
@@ -81,7 +81,7 @@ sub GetLateIssues {
WHERE subscription.subscriptionid = serial.subscriptionid AND
((planneddate < now() and serial.STATUS =1) OR serial.STATUS = 3) and
subscription.aqbooksellerid=$supplierid and
- biblio.biblionumber = subscription.biblionumber
+ biblio.biblionumber = subscription.biblionumber order by title
");
} else {
$sth = $dbh->prepare("SELECT name,title,planneddate,serialseq,serial.subscriptionid
@@ -89,16 +89,19 @@ sub GetLateIssues {
LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
WHERE subscription.subscriptionid = serial.subscriptionid AND
((planneddate < now() and serial.STATUS <=3) OR serial.STATUS = 3) and
- biblio.biblionumber = subscription.biblionumber
+ biblio.biblionumber = subscription.biblionumber order by title
");
}
$sth->execute;
my @issuelist;
my $last_title;
+ my $odd=0;
while (my $line = $sth->fetchrow_hashref) {
+ $odd++ unless $line->{title} eq $last_title;
$line->{title} = "" if $line->{title} eq $last_title;
$last_title = $line->{title} if ($line->{title});
$line->{planneddate} = format_date($line->{planneddate});
+ $line->{'odd'} = 1 if $odd %2 ;
push @issuelist,$line;
}
return @issuelist;
@@ -299,37 +302,41 @@ sub getsubscriptions {
my $dbh = C4::Context->dbh;
my $sth;
if ($biblionumber) {
- $sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and biblio.biblionumber=?");
+ $sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and biblio.biblionumber=? order by title");
$sth->execute($biblionumber);
} else {
if ($ISSN and $title)
{
- $sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and (biblio.title like ? or biblioitems.issn = ? )");
+ $sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and (biblio.title like ? or biblioitems.issn = ? order by title )");
$sth->execute("%$title%",$ISSN);
}
else
{
if ($ISSN)
{
- $sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and biblioitems.issn = ?");
+ $sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and biblioitems.issn = ? order by title");
$sth->execute($ISSN);
}
else
{
$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes,biblio.biblionumber from subscription,biblio,biblioitems where biblio.biblionumber = biblioitems.biblionumber and
- biblio.biblionumber=subscription.biblionumber and biblio.title like ? ");
+ biblio.biblionumber=subscription.biblionumber and biblio.title like ? order by title");
$sth->execute("%$title%");
}
}
}
my @results;
my $previoustitle="";
+ my $odd=1;
while (my $line = $sth->fetchrow_hashref) {
if ($previoustitle eq $line->{title}) {
$line->{title}="";
$line->{issn}="";
+ $line->{toggle} = 1 if $odd==1;
} else {
$previoustitle=$line->{title};
+ $odd=-$odd;
+ $line->{toggle} = 1 if $odd==1;
}
push @results, $line;
}
diff --git a/C4/Koha.pm b/C4/Koha.pm
index 8864435fea..9321a9d9d4 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -60,7 +60,8 @@ Koha.pm provides many functions for Koha scripts.
&getitemtypes &getitemtypeinfo
&getframeworks &getframeworkinfo
&getauthtypes &getauthtype
- &getallthemes &getalllanguages
+ &getallthemes &getalllanguages
+ &getallbranches
$DEBUG);
use vars qw();
@@ -180,6 +181,8 @@ sub subfield_is_koha_internal_p ($) {
$branches = &getbranches();
returns informations about branches.
Create a branch selector with the following code
+ Is branchIndependant sensitive
+ When IndependantBranches is set AND user is not superlibrarian, displays only user's branch
=head3 in PERL SCRIPT
@@ -239,6 +242,64 @@ sub getbranches {
return (\%branches);
}
+=head2 getallbranches
+
+ $branches = &getallbranches();
+ returns informations about ALL branches.
+ Create a branch selector with the following code
+ IndependantBranches Insensitive...
+
+=head3 in PERL SCRIPT
+
+my $branches = getallbranches;
+my @branchloop;
+foreach my $thisbranch (keys %$branches) {
+ my $selected = 1 if $thisbranch eq $branch;
+ my %row =(value => $thisbranch,
+ selected => $selected,
+ branchname => $branches->{$thisbranch}->{'branchname'},
+ );
+ push @branchloop, \%row;
+}
+
+
+=head3 in TEMPLATE
+
+ Default
+
+ " selected>
+
+
+
+=cut
+
+sub getallbranches {
+# returns a reference to a hash of references to ALL branches...
+ my %branches;
+ my $dbh = C4::Context->dbh;
+ my $sth;
+ $sth = $dbh->prepare("Select * from branches order by branchname");
+ $sth->execute;
+ while (my $branch=$sth->fetchrow_hashref) {
+ my $nsth = $dbh->prepare("select categorycode from branchrelations where branchcode = ?");
+ $nsth->execute($branch->{'branchcode'});
+ while (my ($cat) = $nsth->fetchrow_array) {
+ # FIXME - This seems wrong. It ought to be
+ # $branch->{categorycodes}{$cat} = 1;
+ # otherwise, there's a namespace collision if there's a
+ # category with the same name as a field in the 'branches'
+ # table (i.e., don't create a category called "issuing").
+ # In addition, the current structure doesn't really allow
+ # you to list the categories that a branch belongs to:
+ # you'd have to list keys %$branch, and remove those keys
+ # that aren't fields in the "branches" table.
+ $branch->{$cat} = 1;
+ }
+ $branches{$branch->{'branchcode'}}=$branch;
+ }
+ return (\%branches);
+}
+
=head2 getitemtypes
$itemtypes = &getitemtypes();
@@ -518,6 +579,8 @@ sub getalllanguages {
foreach my $language (readdir D) {
next if $language=~/^\./;
next if $language eq 'all';
+ next if $language=~ /png$/;
+ next if $language=~ /css$/;
push @languages, $language;
}
return sort @languages;
@@ -528,6 +591,8 @@ sub getalllanguages {
foreach my $language (readdir D) {
next if $language=~/^\./;
next if $language eq 'all';
+ next if $language=~ /png$/;
+ next if $language=~ /css$/;
$lang->{$language}=1;
}
}
@@ -541,6 +606,8 @@ sub getalllanguages {
foreach my $language (readdir D) {
next if $language=~/^\./;
next if $language eq 'all';
+ next if $language=~ /png$/;
+ next if $language=~ /css$/;
push @languages, $language;
}
return sort @languages;
@@ -551,6 +618,8 @@ sub getalllanguages {
foreach my $language (readdir D) {
next if $language=~/^\./;
next if $language eq 'all';
+ next if $language=~ /png$/;
+ next if $language=~ /css$/;
$lang->{$language}=1;
}
}
@@ -565,6 +634,8 @@ sub getalllanguages {
foreach my $language (readdir D) {
next if $language=~/^\./;
next if $language eq 'all';
+ next if $language=~ /png$/;
+ next if $language=~ /css$/;
$lang->{$language}=1;
}
}
@@ -574,6 +645,8 @@ sub getalllanguages {
foreach my $language (readdir D) {
next if $language=~/^\./;
next if $language eq 'all';
+ next if $language=~ /png$/;
+ next if $language=~ /css$/;
$lang->{$language}=1;
}
}
diff --git a/C4/Search.pm b/C4/Search.pm
index 73f6db6bfc..b3224937e6 100755
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -25,6 +25,7 @@ use C4::Reserves2;
# FIXME - C4::Search uses C4::Reserves2, which uses C4::Search.
# So Perl complains that all of the functions here get redefined.
use C4::Date;
+use C4::Biblio;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm
index 06fc9973b6..dc4e7b3015 100644
--- a/C4/Suggestions.pm
+++ b/C4/Suggestions.pm
@@ -64,6 +64,7 @@ Suggestions done by other can be seen when not "AVAILABLE"
&delsuggestion
&countsuggestion
&changestatus
+ &findsuggestion_from_biblionumber
);
=item SearchSuggestion
@@ -192,15 +193,25 @@ sub countsuggestion {
}
sub changestatus {
- my ($suggestionid,$status,$managedby) = @_;
+ my ($suggestionid,$status,$managedby,$biblionumber) = @_;
my $dbh = C4::Context->dbh;
my $sth;
if ($managedby>0) {
- $sth = $dbh->prepare("update suggestions set status=?,managedby=? where suggestionid=?");
- $sth->execute($status,$managedby,$suggestionid);
+ if ($biblionumber) {
+ $sth = $dbh->prepare("update suggestions set status=?,managedby=?,biblionumber=? where suggestionid=?");
+ $sth->execute($status,$managedby,$biblionumber,$suggestionid);
+ } else {
+ $sth = $dbh->prepare("update suggestions set status=?,managedby=? where suggestionid=?");
+ $sth->execute($status,$managedby,$suggestionid);
+ }
} else {
- $sth = $dbh->prepare("update suggestions set status=? where suggestionid=?");
- $sth->execute($status,$suggestionid);
+ if ($biblionumber) {
+ $sth = $dbh->prepare("update suggestions set status=?,biblionumber=? where suggestionid=?");
+ $sth->execute($status,$biblionumber,$suggestionid);
+ } else {
+ $sth = $dbh->prepare("update suggestions set status=? where suggestionid=?");
+ $sth->execute($status,$suggestionid);
+ }
}
# check mail sending.
@@ -233,6 +244,14 @@ sendmail(%mail);
# warn "sending email to $emailinfo->{byemail} from $emailinfo->{libemail} to notice new status $emailinfo->{status} for $emailinfo->{title} / $emailinfo->{author}";
}
+sub findsuggestion_from_biblionumber {
+ my ($dbh,$biblionumber) = @_;
+ my $sth = $dbh->prepare("select suggestionid from suggestions where biblionumber=?");
+ $sth->execute($biblionumber);
+ my ($biblionumber) = $sth->fetchrow;
+ return $biblionumber;
+}
+
=back
=head1 SEE ALSO
diff --git a/acqui.simple/addbiblio.pl b/acqui.simple/addbiblio.pl
index eef321f6df..2921576cf0 100755
--- a/acqui.simple/addbiblio.pl
+++ b/acqui.simple/addbiblio.pl
@@ -179,7 +179,7 @@ sub create_input () {
$subfield_data{marc_value}= build_authorized_values_list($tag, $subfield, $value, $dbh,$authorised_values_sth);
# it's a thesaurus / authority field
} elsif ($tagslib->{$tag}->{$subfield}->{authtypecode}) {
- $subfield_data{marc_value}=" {$tag}->{$subfield}->{authtypecode}."&index=$i',$i)\">... ";
+ $subfield_data{marc_value}=" {$tag}->{$subfield}->{authtypecode}."&index=$i',$i)\">... ";
# it's a plugin field
} elsif ($tagslib->{$tag}->{$subfield}->{'value_builder'}) {
# opening plugin. Just check wether we are on a developper computer on a production one
@@ -192,18 +192,18 @@ sub create_input () {
require $plugin;
my $extended_param = plugin_parameters($dbh,$rec,$tagslib,$i,$tabloop);
my ($function_name,$javascript) = plugin_javascript($dbh,$rec,$tagslib,$i,$tabloop);
- $subfield_data{marc_value}=" ... $javascript";
+ $subfield_data{marc_value}=" ... $javascript";
# it's an hidden field
} elsif ($tag eq '') {
$subfield_data{marc_value}=" ";
} elsif ($tagslib->{$tag}->{$subfield}->{'hidden'}) {
- $subfield_data{marc_value}=" ";
+ $subfield_data{marc_value}=" ";
# it's a standard field
} else {
if (length($value) >100) {
- $subfield_data{marc_value}="";
+ $subfield_data{marc_value}="";
} else {
- $subfield_data{marc_value}=" "; #"
+ $subfield_data{marc_value}=" "; #"
}
}
return \%subfield_data;
diff --git a/acqui.simple/isbnsearch.pl b/acqui.simple/isbnsearch.pl
index 10bac9bc19..2d040254da 100755
--- a/acqui.simple/isbnsearch.pl
+++ b/acqui.simple/isbnsearch.pl
@@ -62,7 +62,7 @@ my $dbh = C4::Context->dbh;
my $title= @value[0];
my $isbn = @value[1];
my $resultsperpage= $input->param('resultsperpage');
- $resultsperpage = 5 if(!defined $resultsperpage);
+ $resultsperpage = 10 if(!defined $resultsperpage);
my $startfrom=$input->param('startfrom');
$startfrom=0 if(!defined $startfrom);
my $orderby = $input->param('orderby');
@@ -86,7 +86,7 @@ my $dbh = C4::Context->dbh;
findseealso($dbh,\@tags);
my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
\@excluding, \@operator, \@value,
- $startfrom, $resultsperpage,'biblio.title','ASC');
+ $startfrom*$resultsperpage, $resultsperpage,'biblio.title','ASC');
# @results = @$resultsref;
# my @loop_data = ();
diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index ef8cbee0fb..6b2804c45b 100755
--- a/acqui/addorder.pl
+++ b/acqui/addorder.pl
@@ -99,23 +99,12 @@ if ($quantity ne '0'){
});
# change suggestion status if applicable
if ($suggestionid) {
- changestatus($suggestionid,'ORDERED');
+ changestatus($suggestionid,'ORDERED','',$bibnum);
}
} else {
$bibnum=$input->param('biblio');
$bibitemnum=$input->param('bibitemnum');
my $oldtype=$input->param('oldtype');
-# &modbibitem({biblioitemnumber => $bibitemnum,
-# isbn => $isbn,
-# publishercode => $publishercode,
-# });
-# &modbiblio({
-# biblionumber => $bibnum,
-# title => $title?$title:"",
-# author => $author?$author:"",
-# copyrightdate => $copyrightdate?$copyrightdate:"",
-# series => $series?$series:"" },
-# );
}
if ($ordnum) {
# warn "MODORDER $title / $ordnum / $quantity / $bookfund";
diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl
index 6c47ad832a..3e7e0a44fc 100755
--- a/acqui/histsearch.pl
+++ b/acqui/histsearch.pl
@@ -24,9 +24,10 @@ my ($template, $loggedinuser, $cookie)
flagsrequired => {acquisition => 1},
debug => 1,
});
-my ($order_loop,$total_qty,$total_price)= &histsearch($title,$author,$name,$from_placed_on,$to_placed_on);
+my ($order_loop,$total_qty,$total_price,$total_qtyreceived)= &histsearch($title,$author,$name,$from_placed_on,$to_placed_on);
$template->param(suggestions_loop => $order_loop,
total_qty => $total_qty,
+ total_qtyreceived => $total_qtyreceived,
total_price => sprintf ("%.2f",$total_price),
numresults => scalar(@$order_loop),
title => $title,
diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl
index fca247d05a..18af7afef0 100755
--- a/acqui/lateorders.pl
+++ b/acqui/lateorders.pl
@@ -41,6 +41,8 @@ my $CGIsupplier=CGI::scrolling_list( -name => 'supplierid',
-size => 1,
-multiple => 0 );
+$template->param(Supplier=>$supplierlist{$supplierid}) if ($supplierid);
+
my @select_branches;
my %select_branches;
push @select_branches,"";
@@ -58,11 +60,15 @@ my $CGIbranch=CGI::scrolling_list( -name => 'branch',
-multiple => 0 );
my ($count, @lateorders) = getlateorders($delay,$supplierid,$branch);
-
+my $total;
+foreach my $lateorder (@lateorders){
+ $total+=$lateorder->{subtotal};
+}
$template->param(delay=>$delay) if ($delay);
$template->param(
CGIbranch => $CGIbranch,
CGIsupplier => $CGIsupplier,
- lateorders => \@lateorders
+ lateorders => \@lateorders,
+ total=>$total,
);
output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/acqui/newbiblio.pl b/acqui/newbiblio.pl
index 8343d75f59..021484160b 100755
--- a/acqui/newbiblio.pl
+++ b/acqui/newbiblio.pl
@@ -45,6 +45,7 @@ my $ordnum=$input->param('ordnum');
my $biblio=$input->param('biblio');
my $basketno=$input->param('basketno');
my $suggestionid = $input->param('suggestionid');
+my $close= $input->param('close');
my $data;
my $new;
my $dbh = C4::Context->dbh;
@@ -147,6 +148,12 @@ my $CGIbookfund=CGI::scrolling_list( -name => 'bookfund',
-labels => \%select_bookfunds,
-size => 1,
-multiple => 0 );
+my $bookfundname;
+my $bookfundid;
+if ($close){
+ $bookfundid=$data->{'bookfundid'};
+ $bookfundname= $select_bookfunds{$bookfundid};
+}
#Build sort lists
my $CGIsort1 = buildCGIsort("Asort1","sort1",$data->{'sort1'});
@@ -164,6 +171,9 @@ if ($CGIsort2) {
}
# fill template
+$template->param( close=> $close, bookfundid=>$bookfundid, bookfundname=>$bookfundname) if ($close);
+
+
$template->param( existing => $biblio,
title => $title,
ordnum => $ordnum,
@@ -177,8 +187,8 @@ $template->param( existing => $biblio,
listincgst => $booksellers[0]->{'listincgst'},
listprice => $booksellers[0]->{'listprice'},
gstreg => $booksellers[0]->{'gstreg'},
- invoiceinc => $booksellers[0]->{'invoiceincgst'},
- invoicedisc => $booksellers[0]->{'invoicedisc'},
+ invoiceinc => $booksellers[0]->{'invoiceincgst'},
+ invoicedisc => $booksellers[0]->{'invoicedisc'},
nocalc => $booksellers[0]->{'nocalc'},
name => $booksellers[0]->{'name'},
currency => $booksellers[0]->{'listprice'},
diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl
index 030fe721fe..9f0c721986 100755
--- a/admin/marctagstructure.pl
+++ b/admin/marctagstructure.pl
@@ -40,8 +40,8 @@ my $searchfield=$input->param('searchfield');
$searchfield=0 unless $searchfield;
$searchfield=~ s/\,//g;
-my $offset=$input->param('offset');
-my $op = $input->param('op');
+my $offset=$input->param('offset') || 0;
+my $op = $input->param('op') || '';
my $dspchoice = $input->param('select_display');
my $pagesize=20;
@@ -350,6 +350,7 @@ sub StringSearch {
my @results;
while (my $data=$sth->fetchrow_hashref){
push(@results,$data);
+ warn "=> ".$data->{liblibrarian};
}
# $sth->execute;
$sth->finish;
diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index a18d7b7b46..56cb5fcbbf 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -81,6 +81,8 @@ $tabsysprefs{itemcallnumber}="Catalogue";
$tabsysprefs{maxreserves}="Circulation";
$tabsysprefs{virtualshelves}="OPAC";
$tabsysprefs{hide_marc}="Catalogue";
+$tabsysprefs{NotifyBorrowerDeparture}="Members";
+$tabsysprefs{OpacPasswordChange}="OPAC";
sub StringSearch {
my ($env,$searchstring,$type)=@_;
diff --git a/authorities/authorities-home.pl b/authorities/authorities-home.pl
index ec88223126..02814d20b8 100755
--- a/authorities/authorities-home.pl
+++ b/authorities/authorities-home.pl
@@ -139,6 +139,7 @@ if ($op eq "do_search") {
to=>$to,
numbers=>\@numbers,
authtypecode=>$authtypecode,
+ isEDITORS => $authtypecode eq 'EDITORS',
);
} elsif ($op eq "delete") {
diff --git a/bull/subscription-bib-search.pl b/bull/subscription-bib-search.pl
index 4356b52bf5..913f7a56cc 100755
--- a/bull/subscription-bib-search.pl
+++ b/bull/subscription-bib-search.pl
@@ -147,6 +147,27 @@ if ($op eq "do_search") {
flagsrequired => {catalogue => 1},
debug => 1,
});
+ my $sth=$dbh->prepare("Select itemtype,description from itemtypes order by description");
+ $sth->execute;
+ my @itemtype;
+ my %itemtypes;
+ push @itemtype, "";
+ $itemtypes{''} = "";
+ while (my ($value,$lib) = $sth->fetchrow_array) {
+ push @itemtype, $value;
+ $itemtypes{$value}=$lib;
+ }
+
+ my $CGIitemtype=CGI::scrolling_list( -name => 'value',
+ -values => \@itemtype,
+ -labels => \%itemtypes,
+ -size => 1,
+ -multiple => 0 );
+ $sth->finish;
+
+ $template->param(
+ CGIitemtype => $CGIitemtype,
+ );
}
diff --git a/circ/circulation.pl b/circ/circulation.pl
index 8dc7473ed9..799056b4ca 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -35,6 +35,7 @@ use C4::Interface::CGI::Output;
use C4::Koha;
use HTML::Template;
use C4::Date;
+use Date::Manip;
#
# PARAMETERS READING
@@ -126,6 +127,13 @@ my $picture;
if ($borrowernumber) {
$borrower = getpatroninformation(\%env,$borrowernumber,0);
my ($od,$issue,$fines)=borrdata2(\%env,$borrowernumber);
+ warn $borrower->{'expiry'};
+ my $warningdate = DateCalc($borrower->{'expiry'},"- ".C4::Context->preference('NotifyBorrowerDeparture')." days");
+ my $warning=Date_Cmp(ParseDate("today"),$warningdate);
+ if ($warning>0){
+ #borrowercard expired
+ $template->param(warndeparture=>$warning);
+ }
$template->param(overduecount => $od,
issuecount => $issue,
finetotal => $fines);
diff --git a/circ/reserve.pl b/circ/reserve.pl
new file mode 100755
index 0000000000..c8b296d40b
--- /dev/null
+++ b/circ/reserve.pl
@@ -0,0 +1,113 @@
+#!/usr/bin/perl
+
+# $Id$
+
+# 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;
+use C4::Context;
+use C4::Output;
+use CGI;
+use HTML::Template;
+use C4::Auth;
+use C4::Date;
+
+my $input = new CGI;
+my $type=$input->param('type');
+my $order=$input->param('order');
+
+my $theme = $input->param('theme'); # only used if allowthemeoverride is set
+
+my ($template, $loggedinuser, $cookie)
+ = get_template_and_user({template_name => "circ/reserve.tmpl",
+ query => $input,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => {borrowers => 1},
+ debug => 1,
+ });
+# borrowernumber int(11)
+# reservedate date
+# biblionumber int(11)
+# constrainttype char(1)
+# branchcode varchar(4)
+# notificationdate date
+# reminderdate date
+# cancellationdate date
+# reservenotes text
+# priority smallint(6)
+# found char(1)
+# timestamp timestamp ON UPDATE CURRENT_TIMESTAMP Oui CURRENT_TIMESTAMP Modifier Supprimer Primaire Index Unique Texte entier
+# itemnumber int(11)
+my $duedate;
+my $bornum;
+my $itemnum;
+my $data1;
+my $data2;
+my $data3;
+my $name;
+my $phone;
+my $email;
+my $biblionumber;
+my $title;
+my $author;
+my @datearr = localtime(time());
+my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
+
+my $dbh = C4::Context->dbh;
+my $strsth="select reservedate,reserves.borrowernumber as bornum, concat(firstname,' ',surname) as borrower, borrowers.phone, borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch, items.holdingbranch, items.itemcallnumber, items.itemnumber, notes, notificationdate, reminderdate, priority, reserves.found, biblio.title, biblio.author from reserves left join items on items.itemnumber=reserves.itemnumber, borrowers,biblio where isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber && reserves.biblionumber=biblio.biblionumber order by reservedate, borrower ";
+$strsth="select reservedate,reserves.borrowernumber as bornum,concat(firstname,' ',surname) as borrower, borrowers.phone, borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch, items.holdingbranch, items.itemcallnumber, items.itemnumber, notes, notificationdate, reminderdate, priority, reserves.found, biblio.title, biblio.author from reserves left join items on items.itemnumber=reserves.itemnumber , borrowers,biblio where isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber && reserves.biblionumber=biblio.biblionumberorder by borrower,reservedate " if ($order eq "borrower");
+$strsth="select reservedate,reserves.borrowernumber as bornum,concat(firstname,' ',surname) as borrower, borrowers.phone, borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch, items.holdingbranch, items.itemcallnumber, items.itemnumber, notes, notificationdate, reminderdate, priority, reserves.found, biblio.title, biblio.author from reserves left join items on items.itemnumber=reserves.itemnumber, borrowers,biblio where isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber && reserves.biblionumber=biblio.biblionumber order by biblio.title, priority,reservedate " if ($order eq "biblio");
+my $sth=$dbh->prepare($strsth);
+warn "".$strsth;
+$sth->execute();
+
+my @reservedata;
+while (my $data=$sth->fetchrow_hashref) {
+ push (@reservedata,
+ {
+ reservedate => format_date($data->{reservedate}),
+ priority => $data->{priority},
+ name => $data->{borrower},
+ title => $data->{title},
+ author => $data->{author},
+ bornum => $data->{bornum},
+ itemnum => $data->{itemnumber},
+ phone => $data->{phone},
+ email => $data->{email},
+ biblionumber => $data->{biblionumber},
+ statusw => ($data->{found} eq "w"),
+ statusf => ($data->{found} eq "f"),
+ holdingbranch => $data->{holdingbranch},
+ branch => $data->{branch},
+ itemcallnumber => $data->{itemcallnumber},
+ notes => $data->{notes},
+ notificationdate => $data->{notificationdate},
+ reminderdate => $data->{reminderdate}
+ }
+
+ );
+
+}
+
+$sth->finish;
+
+$template->param( todaysdate => format_date($todaysdate),
+ reserveloop => \@reservedata );
+
+print "Content-Type: text/html\n\n", $template->output;
diff --git a/export/marc.pl b/export/marc.pl
index 280c479502..6c4db28859 100755
--- a/export/marc.pl
+++ b/export/marc.pl
@@ -8,29 +8,93 @@ use C4::Interface::CGI::Output;
use C4::Output; # contains gettemplate
use C4::Biblio;
use CGI;
-use C4::Auth;
+use C4::Koha;
my $query = new CGI;
my $op=$query->param("op");
+my $dbh=C4::Context->dbh;
+
if ($op eq "export") {
print $query->header('Content-Type: text/marc');
my $start_bib = $query->param("start_bib");
my $end_bib = $query->param("end_bib");
- my $dbh=C4::Context->dbh;
- my $sth;
+ my $format = $query->param("format");
+ my $branch = $query->param("branch");
+ my $start_callnumber = $query->param("start_callnumber");
+ my $end_callnumber = $query->param("end_callnumber");
+ my $limit = $query->param("limit");
+ my $strsth;
+ $strsth="select bibid from marc_biblio ";
if ($start_bib && $end_bib) {
- $sth=$dbh->prepare("select bibid from marc_biblio where bibid >=? and bibid <=? order by bibid");
- $sth->execute($start_bib,$end_bib);
- } else {
- $sth=$dbh->prepare("select bibid from marc_biblio order by bibid");
- $sth->execute();
+ $strsth.=" where biblionumber>=$start_bib and biblionumber<=$end_bib ";
+ }elsif ($format) {
+ if ($strsth=~/ where/){
+ $strsth=~s/ where (.*)/,biblioitems where biblioitems.biblionumber=marc_biblio.biblionumber and biblioitems.itemtype=\'$format\' and $1/;
+ }else {
+ $strsth.=",biblioitems where biblioitems.biblionumber=marc_biblio.biblionumber and biblioitems.itemtype=\'$format\'";
+ }
+ } elsif ($branch) {
+ if ($strsth=~/ where/){
+ $strsth=~s/ where (.*)/,items where items.biblionumber=marc_biblio.biblionumber and items.homebranch=\'$branch\' and $1/;
+ }else {
+ $strsth.=",items where items.biblionumber=marc_biblio.biblionumber and items.homebranch=\'$branch\'";
+ }
+ } elsif ($start_callnumber && $end_callnumber) {
+ $start_callnumber=~s/\*/\%/g;
+ $start_callnumber=~s/\?/\_/g;
+ $end_callnumber=~s/\*/\%/g;
+ $end_callnumber=~s/\?/\_/g;
+ if ($strsth=~/,items/){
+ $strsth.=" and items.itemcallnumber between \'$start_callnumber\' and \'$end_callnumber\'";
+ } else {
+ if ($strsth=~/ where/){
+ $strsth=~s/ where (.*)/,items where items.biblionumber=marc_biblio.biblionumber and items.itemcallnumber between \'$start_callnumber\' and \'$end_callnumber\' and $1/;
+ }else {
+ $strsth=~",items where items.biblionumber=marc_biblio.biblionumber and items.itemcallnumber between \'$start_callnumber\' and \'$end_callnumber\' ";
+ }
+ }
}
- while (my ($bibid) = $sth->fetchrow) {
+ $strsth.=" order by marc_biblio.biblionumber ";
+ $strsth.= "LIMIT 0,$limit " if ($limit);
+ warn "requête marc.pl : ".$strsth;
+ my $req=$dbh->prepare($strsth);
+ $req->execute;
+ while (my ($bibid) = $req->fetchrow) {
my $record = MARCgetbiblio($dbh,$bibid);
print $record->as_usmarc();
}
} else {
+ my $sth=$dbh->prepare("Select itemtype,description from itemtypes order by description");
+ $sth->execute;
+ my @itemtype;
+ my %itemtypes;
+ push @itemtype, "";
+ $itemtypes{''} = "";
+ while (my ($value,$lib) = $sth->fetchrow_array) {
+ push @itemtype, $value;
+ $itemtypes{$value}=$lib;
+ }
+
+ my $CGIitemtype=CGI::scrolling_list( -name => 'format',
+ -values => \@itemtype,
+ -default => '',
+ -labels => \%itemtypes,
+ -size => 1,
+ -multiple => 0 );
+ $sth->finish;
+
+ my $branches = getallbranches;
+ my @branchloop;
+ foreach my $thisbranch (keys %$branches) {
+# my $selected = 1 if $thisbranch eq $branch;
+ my %row =(value => $thisbranch,
+# selected => $selected,
+ branchname => $branches->{$thisbranch}->{'branchname'},
+ );
+ push @branchloop, \%row;
+ }
+
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "export/marc.tmpl",
query => $query,
@@ -39,6 +103,7 @@ if ($op eq "export") {
flagsrequired => {parameters => 1, management => 1, tools => 1},
debug => 1,
});
+ $template->param(branchloop=>\@branchloop,CGIitemtype=>$CGIitemtype);
output_html_with_http_headers $query, $cookie, $template->output;
}
diff --git a/koha-plucene/indexer.pl b/koha-plucene/indexer.pl
deleted file mode 100755
index ee8a16c6cb..0000000000
--- a/koha-plucene/indexer.pl
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/perl -w
-
-# This script will build an index of all the biblios in a koha database
-# Its using english stemming at the moment. But that can be changed and is only
-# indexing author and title
-
-# Combine this with the search.cgi script to search Koha using Plucene
-# This is still a work in progress, use with caution
-
-# $Id$
-
-# Copyright 2005 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 lib '/usr/local/koha/intranet/modules';
-use strict;
-use C4::Context;
-use Plucene::Index::Writer;
-use Plucene::Plugin::Analyzer::PorterAnalyzer;
-use Plucene::Document;
-
-# connect to the database and fetch all the biblios
-my $dbh = C4::Context->dbh();
-
-my $query = "SELECT * FROM biblio";
-my $sth = $dbh->prepare($query);
-
-$sth->execute();
-
-# create an index writer
-# currently it makes the index in /tmp/plucene
-# PLEASE change this if you want to use the script in production
-my $writer = Plucene::Index::Writer->new(
- "/tmp/plucene",
- Plucene::Plugin::Analyzer::PorterAnalyzer->new(),
- 1 # Create the index from scratch
-);
-
-# For each biblio, add its information to the index
-
-while ( my $data = $sth->fetchrow_hashref() ) {
- my $doc = Plucene::Document->new();
- $doc->add(
- Plucene::Document::Field->Keyword( filename => $data->{biblionumber} )
- );
- $doc->add( Plucene::Document::Field->Text( title => $data->{'title'} ) );
- $doc->add( Plucene::Document::Field->Text( author => $data->{'author'} ) );
- $writer->add_document($doc);
-}
-
diff --git a/koha-plucene/search.cgi b/koha-plucene/search.cgi
deleted file mode 100755
index 3277159e3e..0000000000
--- a/koha-plucene/search.cgi
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/perl
-
-# script to search the plucene index of the database
-# most of this will be shifted to a module when it moves out of the proof of concept stage
-
-# $Id$
-
-# Copyright 2005 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,
-
-use strict;
-
-use Plucene::Search::IndexSearcher;
-use Plucene::Plugin::Analyzer::PorterAnalyzer;
-use Plucene::QueryParser;
-use Plucene::Search::HitCollector;
-
-use C4::Auth;
-use C4::Interface::CGI::Output;
-
-use Data::Dumper;
-
-use CGI;
-my $cgi = new CGI;
-
-# get a template, opac-pluceneresults.tmpl is currently an exact copy of
-# opac-searchresults.tmpl so just make a copy.
-my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
- {
- template_name => "opac-pluceneresults.tmpl",
- query => $cgi,
- type => "opac",
- authnotrequired => 1,
- }
-);
-
-# the script expects an input called query;
-my $query = $cgi->param('query');
-
-# tell the script what index to use (change this to match whatever is in indexer.pl)
-my $searcher = Plucene::Search::IndexSearcher->new("/tmp/plucene/");
-
-# the important bit here is default=>"title"
-# that says if we dont specify what to search, search the title field
-my $parser = Plucene::QueryParser->new(
- {
- analyzer => Plucene::Plugin::Analyzer::PorterAnalyzer->new(),
- default => "title"
- }
-);
-
-my $parsed = $parser->parse($query);
-
-my @docs;
-
-# build an array of results,
-# we could use the $score to rank them, but its currently not doing that
-my $hc = Plucene::Search::HitCollector->new(
- collect => sub {
- my ( $self, $doc, $score ) = @_;
- my $res = eval { $searcher->doc($doc) };
- push @docs, $res if $res;
- }
-);
-
-# do the searh
-$searcher->search_hc( $parsed, $hc );
-
-# map the results into a format our template is expecting
-my @results = map {
- {
- biblionumber => $_->get("filename")->string,
- title => $_->get("title")->string,
- author => $_->get("author")->string,
- }
-} @docs;
-
-# pass the results to the template
-my $num_records = @results;
-$template->param(
- search_results => \@results,
- numrecords => $num_records,
- searchdesc => $query
-);
-output_html_with_http_headers $cgi, $cookie, $template->output;
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 72924d722e..527ba31537 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
@@ -66,7 +66,7 @@
">
- "> -
+ " class="flat"> -
">
@@ -77,11 +77,11 @@
-
+
- /images/prev.gif" onClick="javascript:upSubfield('')">
- " size="1" maxlength="1">
+ /images/up.png" onClick="javascript:upSubfield('')">
+ " size="1" maxlength="1" class="flat">
">
@@ -107,7 +107,7 @@
">
- "> -
+ " class="flat"> -
">
@@ -121,8 +121,8 @@
- /images/prev.gif" onClick="javascript:upSubfield('')">
- " size="1" maxlength="1">
+ /images/up.png" onClick="javascript:upSubfield('')">
+ " size="1" maxlength="1" class="flat">
">
@@ -148,7 +148,7 @@
">
- "> -
+ " class="flat"> -
">
@@ -162,8 +162,8 @@
- /images/prev.gif" onClick="javascript:upSubfield('')">
- " size="1" maxlength="1">
+ /images/up.png" onClick="javascript:upSubfield('')">
+ " size="1" maxlength="1" class="flat">
">
@@ -189,7 +189,7 @@
">
- "> -
+ " class="flat"> -
">
@@ -203,8 +203,8 @@
- /images/prev.gif" onClick="javascript:upSubfield('')">
- " size="1" maxlength="1">
+ /images/up.png" onClick="javascript:upSubfield('')">
+ " size="1" maxlength="1" class="flat">
">
@@ -230,7 +230,7 @@
">
- "> -
+ " class="flat"> -
">
@@ -244,8 +244,8 @@
- /images/prev.gif" onClick="javascript:upSubfield('')">
- " size="1" maxlength="1">
+ /images/up.png" onClick="javascript:upSubfield('')">
+ " size="1" maxlength="1" class="flat">
">
@@ -271,7 +271,7 @@
">
- "> -
+ " class="flat"> -
">
@@ -285,8 +285,8 @@
- /images/prev.gif" onClick="javascript:upSubfield('')">
- " size="1" maxlength="1">
+ /images/up.png" onClick="javascript:upSubfield('')">
+ " size="1" maxlength="1" class="flat">
">
@@ -312,7 +312,7 @@
">
- "> -
+ " class="flat"> -
">
@@ -326,8 +326,8 @@
- /images/prev.gif" onClick="javascript:upSubfield('')">
- " size="1" maxlength="1">
+ /images/up.png" onClick="javascript:upSubfield('')">
+ " size="1" maxlength="1" class="flat">
">
@@ -353,7 +353,7 @@
">
- "> -
+ " class="flat"> -
">
@@ -367,8 +367,8 @@
- /images/prev.gif" onClick="javascript:upSubfield('')">
- " size="1" maxlength="1">
+ /images/up.png" onClick="javascript:upSubfield('')">
+ " size="1" maxlength="1" class="flat">
">
@@ -394,7 +394,7 @@
">
- "> -
+ " class="flat"> -
">
@@ -408,8 +408,8 @@
- /images/prev.gif" onClick="javascript:upSubfield('')">
- " size="1" maxlength="1">
+ /images/up.png" onClick="javascript:upSubfield('')">
+ " size="1" maxlength="1" class="flat">
">
@@ -435,7 +435,7 @@
">
- "> -
+ " class="flat"> -
">
@@ -449,8 +449,8 @@
- /images/prev.gif" onClick="javascript:upSubfield('')">
- " size="1" maxlength="1">
+ /images/up.png" onClick="javascript:upSubfield('')">
+ " size="1" maxlength="1" class="flat">
">
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
index d512067140..66e2addacf 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
@@ -32,15 +32,14 @@
Order
Publisher&order=biblioitems.publishercode" class="acquisition">[order]
Title
- rrp
- est
+ rrp
+ est
Qty
Total
Fund &order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[order]
-
- Remove
-
+ Remove
+ Edit
@@ -66,19 +65,22 @@
-
-
+
+
-
-
- &basketno=&quantity=0&biblio=">
-
-
-
-
+
+ &basketno=&quantity=0&biblio=">
+
+
+
+
+ &basketno=&biblio=&ordnum=&close=1">
+
+
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl
index 63b327b6e6..2c21eacaa4 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl
@@ -11,6 +11,7 @@
Placed on
Recieved on
Quantity ordered
+ Quantity received
Unit cost
@@ -157,6 +158,9 @@
+
+
+
@@ -207,6 +211,13 @@
+
+
+
+
+
+
+
@@ -230,8 +241,8 @@
-
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/lateorders.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/lateorders.tmpl
index c79922a111..ba0b5cebd5 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/lateorders.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/lateorders.tmpl
@@ -1,88 +1,104 @@
-
Late issues
+
: Late issues
- Supplier
+ Supplier
Order Date
Ordered for
- Including Basket
+ Including Basket
Book information
- Branch
- Estimated Unit Price
+ Branch
+ Estimated Unit Price
Retailer Catalogue Unit Price
Quantity
Total cost
- Budget
-
+ Budget
+
-
+
-
+
-
+
-
+
-
+
Author:
Published by: in
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+ Total
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
index 952e53ff30..50f9ebb4c2 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
@@ -158,35 +158,51 @@ function check(f) {
Accounting details
Quantity
- " onchange="update(this.form);">
+
+ ">
+
+ " onchange="update(this.form);">
+
Bookfund
-
+
+ ">
+
+
+
Suppliers List Price
- " onchange="update(this.form)">
+
+ ">
+
+ " onchange="update(this.form)">
+
Replacement Cost
- ">
+
+ ">
+
+ ">
+
Budgeted Cost
- ">
+ "readonly >
Budgeted GST
-
+ readonly >
BUDGETED TOTAL
-
+ readonly >
Actual Cost
- ">
+ " readonly >
Invoice Number *
diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/blinddetail-biblio-search.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/blinddetail-biblio-search.tmpl
index 6b9df5b72c..ac6ecf0f85 100644
--- a/koha-tmpl/intranet-tmpl/default/en/authorities/blinddetail-biblio-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/authorities/blinddetail-biblio-search.tmpl
@@ -9,7 +9,7 @@ var index_start = ;
var whichfield = opener.opener.document.f.tag[index_start].value;
i=index_start
// go forward, until reaching the end of the field.
-while (i<=opener.opener.document.f.field_value.length) {
+while (i";
}
diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl
index 1b6b81cc40..6f10b0fdd3 100644
--- a/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl
@@ -35,26 +35,32 @@
diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl
index b9f0594c9a..374c99a106 100644
--- a/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl
@@ -28,20 +28,46 @@
-
+
+
+
+
+
" class="button bull" title="Issues history">
-
-
+
+
+
+
+
+
+
+
+ |
+
-
+
+
+
+
+
()
-
+
+
+
+
+
" class="button bull" title="subscription detail">Detail
+
+
+
+
+
+
" class="button bull" title="receive issues for this subscription">Receive
diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl
index ad54f0710a..8efd0ab86b 100644
--- a/koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl
@@ -2,49 +2,41 @@
Late issues
+
+
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl
index fb9a57e1ff..8f4d8064dd 100644
--- a/koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl
@@ -17,6 +17,16 @@
+
+ Itemtype
+
+ ">
+
+
+
+
+ ">
+
Results per page :
diff --git a/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl
index 76eb8cde67..f5e0291a20 100644
--- a/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl
@@ -33,10 +33,12 @@
">
()
+
()
" class="button circulation">
detail
- &modify=edit&destination=circ" class="button circulation">edit
+ &modify=edit&destination=circ" class="button circulation">edit
+ Borrower will leave soon
diff --git a/koha-tmpl/intranet-tmpl/default/en/circ/reserve.tmpl b/koha-tmpl/intranet-tmpl/default/en/circ/reserve.tmpl
new file mode 100644
index 0000000000..f020ff4c38
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/en/circ/reserve.tmpl
@@ -0,0 +1,42 @@
+
+
+
Items Reserved as of
+
+
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl
index c3597acf1f..88527922c4 100644
--- a/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl
@@ -195,7 +195,7 @@
- //
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl b/koha-tmpl/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl
index 4cbc98527d..4a275e179d 100644
--- a/koha-tmpl/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl
@@ -29,7 +29,7 @@
-
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl b/koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl
index 889b5ae08f..dc80aaa276 100644
--- a/koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl
@@ -7,9 +7,20 @@
diff --git a/koha-tmpl/intranet-tmpl/default/en/help/reports/borrowers_stats.tmpl b/koha-tmpl/intranet-tmpl/default/en/help/reports/borrowers_stats.tmpl
new file mode 100644
index 0000000000..693cb9b025
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/en/help/reports/borrowers_stats.tmpl
@@ -0,0 +1,37 @@
+
+Borrowers stats help
+This page is to be used as a wizard to compose two entries table stats on borrowers.
+You must bear in mind what the table will look like :
+
+ row/colunm column criteria1 column criteria2 total rows
+ row criteria1 count11 count12 total row1
+ row criteria2 count21 count22 total row2
+ Total cols total col1 total col2 Global total
+
+ For instance, if you choose to check row for Borrower Category Column for Branches, you will be displayed a table containing the different borrowers categorycodes on rows, and different branchcodes on columns as such :
+
+ catcode/branchcode BranchA BranchB total
+ A 12 22 34
+ C 11 12 23
+ I 21 22 43
+ Total 44 56 100
+
+
You can choose to display the results on screen or get them in your office suite (would it be gnucalc, oocalc, or another calc) with the radio button display. You can change the set of the file generated changing Export in the textarea.
+
+
+
Criteria on row/column
+ You can choose sort1 sort2 if filled.
+ You can choose Branch, zipcode or categorycode.
+ If you chose zipcode, since the 2 first digits in France represents the country (Hérault 34, Haute-Garonne 31), some may want to have stats on representation of this countries. That is why you can select to group stats on some digits of zipcode.
+
+
+
+
+
Filters
+ You can filter on sort1 sort2 if filled.
+ You can filter on zipcode, branch or categorycode.
+ Branches and categorycodes are chosen in a select list.
+ Zipcode can use special characters like * for many characters. say 31* to get french people that live in Haute-Garonne
+
+
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/help/reports/catalogue_stats.tmpl b/koha-tmpl/intranet-tmpl/default/en/help/reports/catalogue_stats.tmpl
new file mode 100644
index 0000000000..e223a5a8f7
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/en/help/reports/catalogue_stats.tmpl
@@ -0,0 +1,40 @@
+
+Catalogue stats help
+This page is to be used as a wizard to compose two entries table stats on catalogue.
+You must bear in mind what the table will look like :
+
+ row/colunm column criteria1 column criteria2 total rows
+ row criteria1 count11 count12 total row1
+ row criteria2 count21 count22 total row2
+ Total cols total col1 total col2 Global total
+
+ For instance, if you choose to check row for itemtype, Column for Branches, you will be displayed a table containing the different itemtypes on rows, and different branchcodes on columns as such :
+
+ catcode/branchcode BranchA BranchB total
+ BOOKS 12 22 34
+ ISSUES 11 12 23
+ Total 33 34 57
+
+
You can choose to display the results on screen or get them in your office suite (would it be gnucalc, oocalc, or another calc) with the radio button display. You can change the set of the file generated changing Export in the textarea.
+
+
+
Criteria on row/column
+ Dewey Classification. You can group results on the n first digits
+ Callnumber. You can group results on the n first characters
+ Document Type
+ Publication Year
+ Home Branch
+ Location
+
+
+
+
+
Filters
+ Callnumber and Dewey Classification can be filtered from a string to another. You can use jokers.
+ You can select one document type.
+ Publication Year
+ You can select one branch as Home Branch
+ Location
+
+
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/help/reports/issues_stats.tmpl b/koha-tmpl/intranet-tmpl/default/en/help/reports/issues_stats.tmpl
new file mode 100644
index 0000000000..190140b006
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/en/help/reports/issues_stats.tmpl
@@ -0,0 +1,46 @@
+
+Issues stats help
+This page is to be used as a wizard to compose two entries table stats on issues.
+You must bear in mind what the table will look like :
+
+ row/colunm column criteria1 column criteria2 total rows
+ row criteria1 count11 count12 total row1
+ row criteria2 count21 count22 total row2
+ Total cols total col1 total col2 Global total
+
+ For instance, if you choose to check row for Borrower Category Column for Branches, you will be displayed a table containing the different borrowers categorycodes on rows, and different branchcodes on columns as such :
+
+ catcode/branchcode BranchA BranchB total
+ A 12 22 34
+ C 11 12 23
+ I 21 22 43
+ Total 44 56 100
+
+
You can choose to display the results on screen or get them in your office suite (would it be gnucalc, oocalc, or another calc) with the radio button display. You can change the set of the file generated changing Export in the textarea.
+
+
+
Criteria on row/column
+ You can choose Branch, itemtype or borrower category.
+ Period you can select whether you want it to be issue or return period.
+ You can group results by day, by Month, by year.
+
+
+
+
+
Filters
+ You can filter period in a From/to calendar.
+ You can choose to see only One day on the period, or one month.
+ You can filter on itemtypes, branch or borrowers category.
+ Branches itemtypes and borrowers category are chosen in a select list.
+
+
+
+
Cell Value
+ You can choose to count
+
distinct borrowers
+ distinct items
+ distinct issues (that is one borrower, one item)
+ circulation rate (rate items issued out of total number of items)
+
+
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/images/up.png b/koha-tmpl/intranet-tmpl/default/en/images/up.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a45b282c1d7067ce0df86fb57479986bbff16fc
GIT binary patch
literal 186
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V6Od#Ih`sfRUSS*B}FgaV^u(*NKY5X5Q)oM`wY1b81OJpope;?0soWrAKCxT^Kq2DC3S0A
za=wr{i
+
@@ -55,7 +56,7 @@ var ns7 = (document.getElementById) ? 1:0;*/
-
+
@@ -63,6 +64,8 @@ var ns7 = (document.getElementById) ? 1:0;*/
+
+
@@ -80,10 +83,10 @@ var ns7 = (document.getElementById) ? 1:0;*/
-
+
-
+
@@ -103,10 +106,10 @@ var ns7 = (document.getElementById) ? 1:0;*/
-
+
-
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
index c257360452..85a6964f4b 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
@@ -26,10 +26,10 @@
Name
Branch
Category
-
Address
OD/Issues
Charges
-
Notes
+
Sort1
+
Sort2
@@ -39,13 +39,17 @@
-
">,
+
+ ">,
+
+
+
-
-
+
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
index 2ac78d6022..2df672f4de 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
@@ -55,7 +55,7 @@
- General Notes:
+ Circulation note:
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
index 3b5a6a731b..9d309833a3 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
@@ -33,13 +33,30 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+ ">
+
+ ">
+ vol
+ :
+ part
+
+ -
+ -
+ ;
+ -
+ :
+ ;
+
+
+ class="hilighted">
+
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/overdue.tmpl b/koha-tmpl/intranet-tmpl/default/en/overdue.tmpl
index e282f09ecc..c4a43e9949 100644
--- a/koha-tmpl/intranet-tmpl/default/en/overdue.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/overdue.tmpl
@@ -1,11 +1,40 @@
Items Overdue as of
+
+
- Due Date
- Patron
+ Due Date
+ Patron
Phone
Title
Author
diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/bor_issues_top.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/bor_issues_top.tmpl
index fc5a382dba..85d27ebd7a 100644
--- a/koha-tmpl/intranet-tmpl/default/en/reports/bor_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/reports/bor_issues_top.tmpl
@@ -220,31 +220,82 @@ function Dopop(link) {
Branch
-
+
+
+ All branches
+
+ " selected>
+
+
+
Document Type
-
+
+
+ All Item Types
+
+ " selected>
+
+
+
Borrower Category
-
+
+
+ All Borrower Categories
+
+ " selected>
+
+
+
Day
-
+
+
+ Any Day
+ Monday
+ Tuesday
+ Wednesday
+ Thursday
+ Friday
+ Saturday
+ Sunday
+
+
Month
-
+
+
+ Any Month
+ January
+ February
+ March
+ April
+ May
+ June
+ July
+ August
+ September
+ October
+ November
+ December
+
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_out.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_out.tmpl
index 2aa1fa7d11..c4556a33f6 100644
--- a/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_out.tmpl
@@ -70,7 +70,15 @@
Borrower Category
-
+
+
+ All Borrower Categories
+
+ " selected>
+
+
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/cat_issues_top.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/cat_issues_top.tmpl
index 6d514a8ad9..1968729c48 100644
--- a/koha-tmpl/intranet-tmpl/default/en/reports/cat_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/reports/cat_issues_top.tmpl
@@ -220,31 +220,82 @@ function Dopop(link) {
Branch
-
+
+
+ All branches
+
+ " selected>
+
+
+
Document Type
-
+
+
+ All Item Types
+
+ " selected>
+
+
+
Borrower Category
-
+
+
+ All Borrower Categories
+
+ " selected>
+
+
+
Day
-
+
+
+ Any Day
+ Monday
+ Tuesday
+ Wednesday
+ Thursday
+ Friday
+ Saturday
+ Sunday
+
+
Month
-
+
+
+ Any Month
+ January
+ February
+ March
+ April
+ May
+ June
+ July
+ August
+ September
+ October
+ November
+ December
+
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/catalogue_out.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/catalogue_out.tmpl
index e847e46228..4c50f90390 100644
--- a/koha-tmpl/intranet-tmpl/default/en/reports/catalogue_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/reports/catalogue_out.tmpl
@@ -13,7 +13,7 @@
diff --git a/koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_AVAILABLE.tmpl b/koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_AVAILABLE.tmpl
index edc4a02f39..46550c0dd2 100644
--- a/koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_AVAILABLE.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_AVAILABLE.tmpl
@@ -2,7 +2,7 @@ Dear user,
You have suggested that the library acquire by .
-We are pleased to inform you that the item is now part of the collection of the Nelsonville Public Library.
+We are pleased to inform you that the item is now part of the collection of the library.
If you have any questions, please email us at .
diff --git a/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl b/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl
index 7ca1531a8e..3e944504ee 100644
--- a/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl
@@ -104,7 +104,7 @@
function report(index,summary)
{
- var regexp= /(\d* - *)(.*)/;
+ var regexp= /(\d* -+ *)(.*)/;
var result=summary.match(regexp);
opener.document.f.field_value[index].value=result[2];
self.close();
diff --git a/koha-tmpl/intranet-tmpl/default/fr/about.tmpl b/koha-tmpl/intranet-tmpl/default/fr/about.tmpl
index 5a5ad2c3ff..91927c0171 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/about.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/about.tmpl
@@ -13,16 +13,16 @@
Un merci particulier aux financeurs suivants
Groupement de bibliothèques de Horowhenua : Rosalie Blake, directrice des bibliothèques (Koha 1.0)
-
LaBibliothèque Publique de Nelsonville , USA, Ohio (financement support MARC)
+
LaBibliothèque Publique de Nelsonville , USA, Ohio (financement support MARC)
EMN (Ecole des Mines de Nantes) , France (Suggestion,module stats support LDAP amélioré)
ENSMP (Ecole Nationale Supérieure des Mines de Paris) (grilles de catalogage multiples, autorités MARC, paniers OPAC, Support périodiques)
Contributeurs principaux pour la version 2.2
Rachel Hamilton-Williams , Kaitiaki
-
Paul Poulain , 2.2 release manager (MARC developer)
-
Stephen Hedges, Owen Leonard, Joshua Ferraro (Nelsonville Public Library )
-
Katipo Communications (Koha 1.0 developers)
+
Paul Poulain , responsable de la version 2.2 (développeur MARC)
+
Stephen Hedges, Owen Leonard, Joshua Ferraro (Nelsonville Public Library b>)
+
Katipo Communications (Koha version 1.0)
Rachel Hamilton-Williams, General Manager (Webmistress)
Chris Cormack, responsable de la version 1.2
@@ -72,7 +72,7 @@
Traduction
-
Français Pascale Nalon (ENSMP) et Jean Yves Lemaire (Saint Germain sur Morin)
+
Français Pascale Nalon (ENSMP) et Jean Yves Lemaire (Chatel Saint Germain)
Chinois Ambrose Li
Espagnol Andes Tarallo
Italien Giuseppe Angilella
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio-nomarc.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio-nomarc.tmpl
index 427a1845c9..2b51814530 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio-nomarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio-nomarc.tmpl
@@ -14,7 +14,7 @@
Titre : *
Sous Titre :
Auteur:
-
Auteurs secondaires Un Auteur par ligne
+
Autres auteurs Un Auteur par ligne
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio.tmpl
index e74905052f..4010971cd0 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio.tmpl
@@ -1,8 +1,7 @@
-
-
">
- ">-
+
+ " class="flat"> -
+
+ ">
+
+
')">+
-
+
-
-
-
- *
+
+ /images/up.png" onClick="javascript:upSubfield('')">
+ " size="1" maxlength="1" class="flat">
+
+ ">
+
+
+
+ *
">
- ">
+ " size="2" maxlength="1">
">
">
">
@@ -95,9 +103,13 @@
-
">
- ">-
+
+ " class="flat"> -
+
+ ">
+
+
')">+
@@ -106,14 +118,19 @@
-
-
-
- *
+
+ /images/up.png" onClick="javascript:upSubfield('')">
+ " size="1" maxlength="1" class="flat">
+
+ ">
+
+
+
+ *
">
- ">
+ " size="2" maxlength="1">
">
">
">
@@ -126,9 +143,13 @@
-
">
- ">-
+
+ " class="flat"> -
+
+ ">
+
+
')">+
@@ -137,14 +158,19 @@
-
-
-
- *
+
+ /images/up.png" onClick="javascript:upSubfield('')">
+ " size="1" maxlength="1" class="flat">
+
+ ">
+
+
+
+ *
">
- ">
+ " size="2" maxlength="1">
">
">
">
@@ -157,9 +183,13 @@
-
">
- ">-
+
+ " class="flat"> -
+
+ ">
+
+
')">+
@@ -168,14 +198,19 @@
-
-
-
- *
+
+ /images/up.png" onClick="javascript:upSubfield('')">
+ " size="1" maxlength="1" class="flat">
+
+ ">
+
+
+
+ *
">
- ">
+ " size="2" maxlength="1">
">
">
">
@@ -188,9 +223,13 @@
-
">
- ">-
+
+ " class="flat"> -
+
+ ">
+
+
')">+
@@ -199,14 +238,19 @@
-
-
-
- *
+
+ /images/up.png" onClick="javascript:upSubfield('')">
+ " size="1" maxlength="1" class="flat">
+
+ ">
+
+
+
+ *
">
- ">
+ " size="2" maxlength="1">
">
">
">
@@ -219,9 +263,13 @@
-
">
- ">-
+
+ " class="flat"> -
+
+ ">
+
+
')">+
@@ -230,14 +278,19 @@
-
-
-
- *
+
+ /images/up.png" onClick="javascript:upSubfield('')">
+ " size="1" maxlength="1" class="flat">
+
+ ">
+
+
+
+ *
">
- ">
+ " size="2" maxlength="1">
">
">
">
@@ -250,9 +303,13 @@
-
">
- ">-
+
+ " class="flat"> -
+
+ ">
+
+
')">+
@@ -261,14 +318,19 @@
-
-
-
- *
+
+ /images/up.png" onClick="javascript:upSubfield('')">
+ " size="1" maxlength="1" class="flat">
+
+ ">
+
+
+
+ *
">
- ">
+ " size="2" maxlength="1">
">
">
">
@@ -281,9 +343,13 @@
-
">
- ">-
+
+ " class="flat"> -
+
+ ">
+
+
')">+
@@ -292,14 +358,19 @@
-
-
-
- *
+
+ /images/up.png" onClick="javascript:upSubfield('')">
+ " size="1" maxlength="1" class="flat">
+
+ ">
+
+
+
+ *
">
- ">
+ " size="2" maxlength="1">
">
">
">
@@ -312,9 +383,13 @@
-
">
- ">-
+
+ " class="flat"> -
+
+ ">
+
+
')">+
@@ -323,14 +398,19 @@
-
-
-
- *
+
+ /images/up.png" onClick="javascript:upSubfield('')">
+ " size="1" maxlength="1" class="flat">
+
+ ">
+
+
+
+ *
">
- ">
+ " size="2" maxlength="1">
">
">
">
@@ -343,9 +423,13 @@
-
">
- ">-
+
+ " class="flat"> -
+
+ ">
+
+
')">+
@@ -354,14 +438,19 @@
-
-
-
- *
+
+ /images/up.png" onClick="javascript:upSubfield('')">
+ " size="1" maxlength="1" class="flat">
+
+ ">
+
+
+
+ *
">
- ">
+ " size="2" maxlength="1">
">
">
">
@@ -402,11 +491,17 @@ 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";
+ if (document.getElementById(link))
+ {
+ document.getElementById(link).style.color="#000000";
+ }
}
}
}
+active(0);
function Check(f) {
// Scan for nonempty fields
var field_is_nonempty_p = new Array();
@@ -421,6 +516,7 @@ function Check(f) {
// Scan for missing mandatory subfields
var total_missing_mandatory_subfields = 0;
+ var missing_mandatory_subfields = new Array();
for (i=0 ; i"+ missing_mandatory_tags[i];
+ }
+ alertString2 += "\n- "+ total_missing_mandatory_subfields +_("champs obligatoires non renseignés (voir les champs en caractère gras)");
+ for (i=0; i"+ missing_mandatory_subfields[i];
+ }
alert(alertString2);
} else {
- document.forms[0].submit();
+ document.forms['f'].submit();
}
}
function Dopop(link,i) {
- defaultvalue=document.forms[0].field_value[i].value;
+ defaultvalue=document.forms['f'].field_value[i].value;
newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes');
}
function PopupZ3950() {
var strQuery="";
- for (i=0 ; i0) {
- strQuery += "&isbn="+document.forms[0].field_value[i].value;
+ for (i=0 ; i0) {
+ strQuery += "&isbn="+document.forms['f'].field_value[i].value;
}
- if (document.forms[0].kohafield[i].value == "biblio.title" && document.forms[0].field_value[i].value.length>0) {
- strQuery += "&title="+document.forms[0].field_value[i].value;
+ if (document.forms['f'].kohafield[i].value == "biblio.title" && document.forms['f'].field_value[i].value.length>0) {
+ strQuery += "&title="+document.forms['f'].field_value[i].value;
}
- if (document.forms[0].kohafield[i].value == "biblio.author" &&document.forms[0].field_value[i].value.length>0) {
- strQuery += "&author="+document.forms[0].field_value[i].value;
+ if (document.forms['f'].kohafield[i].value == "biblio.author" &&document.forms['f'].field_value[i].value.length>0) {
+ strQuery += "&author="+document.forms['f'].field_value[i].value;
}
- if (document.forms[0].kohafield[i].value == "biblioitems.issn" && document.forms[0].field_value[i].value.length>0) {
- strQuery += "&issn="+document.forms[0].field_value[i].value;
+ if (document.forms['f'].kohafield[i].value == "biblioitems.issn" && document.forms['f'].field_value[i].value.length>0) {
+ strQuery += "&issn="+document.forms['f'].field_value[i].value;
}
}
- newin=window.open("../z3950/search.pl?bibid="+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 Changefwk(FwkList) {
+ var fwk = FwkList.options[FwkList.selectedIndex].value;
+ window.location = "addbiblio.pl?oldbiblionumber=&frameworkcode="+fwk;
}
function AddField(field) {
- document.forms[0].op.value = "addfield";
- document.forms[0].addfield_field.value=field;
+ document.forms['f'].op.value = "addfield";
+ document.forms['f'].addfield_field.value=field;
document.f.submit();
}
+
+function upSubfield(index) {
+// alert("UP "+index);
+ temp = document.forms['f'].field_value[index-1].value;
+ document.forms['f'].field_value[index-1].value=document.forms['f'].field_value[index].value;
+ document.forms['f'].field_value[index].value= temp;
+ temp = document.forms['f'].subfield[index-1].value;
+ document.forms['f'].subfield[index-1].value=document.forms['f'].subfield[index].value;
+ document.forms['f'].subfield[index].value = temp;
+ temp = document.forms['f'].mandatory[index-1].value;
+ document.forms['f'].mandatory[index-1].value=document.forms['f'].mandatory[index].value;
+ document.forms['f'].mandatory[index].value = temp;
+ temp = document.forms['f'].kohafield[index-1].value;
+ document.forms['f'].kohafield[index-1].value=document.forms['f'].kohafield[index].value;
+ document.forms['f'].kohafield[index].value = temp;
+// temp = document.getElementById('error'+index).value = "XXX";
+// document.forms['f'].kohafield[index-1].value=document.forms['f'].kohafield[index].value;
+// document.forms['f'].kohafield[index].value = temp;
+}