[Koha-cvs] koha/intranet cgi-bin/.htaccess cgi-bin/about.p... [rel_TG]

[Tumer Garip]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_TG
Changes by:	Tumer Garip <tgarip1957>	07/03/16 16:18:16

Removed files:
	intranet/cgi-bin: .htaccess about.pl help.pl logout.pl 
	                  mainpage.pl plugin_launcher.pl 
	intranet/cgi-bin/acqui: acqui-home.pl addorder.pl basket.pl 
	                        bookfund.pl booksellers.pl currency.pl 
	                        finishreceive.pl histsearch.pl 
	                        lateorders.pl neworderempty.pl 
	                        newordersuggestion.pl parcel.pl 
	                        select-late.pl supplier.pl 
	                        updatesupplier.pl 
	intranet/cgi-bin/admin: admin-careers.pl admin-home.pl 
	                        aqbookfund.pl aqbudget.pl 
	                        auth_subfields_structure.pl 
	                        auth_tag_structure.pl 
	                        authorised_values.pl authtypes.pl 
	                        biblios_framework.pl 
	                        biblios_subfields_structure.pl 
	                        bibliostagstructure.pl branches.pl 
	                        categorie.pl categoryitem.pl 
	                        checkmarc.pl currency.pl 
	                        facets_labels.pl 
	                        holdings_subfields_structure.pl 
	                        holdingstagstructure.pl 
	                        institutions-careers.pl issuingrules.pl 
	                        itemtypes.pl koha-electronic.pl 
	                        koha_attr.pl onlinedatabases.pl 
	                        printers.pl systempreferences.pl 
	                        thesaurus.pl viewlog.pl z3950servers.pl 
	intranet/cgi-bin/authorities: auth_finder.pl auth_linker.pl 
	                              authorities-home.pl authorities.pl 
	                              blinddetail-biblio-search.pl 
	                              blinddetail-linker.pl 
	                              detail-biblio-search.pl detail.pl 
	                              merge_authority.pl 
	intranet/cgi-bin/barcodes: arial.ttf barcodes.pl 
	                           barcodesGenerator.pl cardConfig.pl 
	                           cbarcodes.pl empty_card.jpg 
	                           mbarcodes.pl mprinterConfig.pl 
	                           pdfViewer.pl printerConfig.pl 
	intranet/cgi-bin/bookshelves: add-biblios-to-shelves.pl 
	                              addbookbybiblionumber.pl 
	                              quicksearch.pl shelf-requests.pl 
	                              shelves.pl 
	intranet/cgi-bin/catalogue: ISBDdetail.pl MARCdetail.pl 
	                            bookcount.pl catalogue-search.pl 
	                            cyprus-search.pl detail.pl 
	                            detailprint.pl moredetail.pl 
	                            newsdetail.pl search.pl 
	intranet/cgi-bin/cataloguing: addbiblio.pl addbooks.pl 
	                              additem.pl get-imdb.php 
	                              isbnsearch.pl 
	intranet/cgi-bin/circ: branchreserves.pl branchtransfers.pl 
	                       circulation.pl currenttransfers.pl 
	                       renewscript.pl rescirculation.pl 
	                       resreturns.pl returns.pl 
	                       selectbranchprinter.pl 
	                       waitingreservestransfers.pl 
	intranet/cgi-bin/classes: class.imdb_parser.php 
	intranet/cgi-bin/members: boraccount.pl borrowers_details.pl 
	                          deletemem.pl guarantor_search.pl 
	                          imemberentry.pl insertdata.pl 
	                          insertidata.pl insertjdata.pl 
	                          jmemberentry.pl mancredit.pl 
	                          maninvoice.pl manualcredit.pl 
	                          member-flags.pl member-password.pl 
	                          member-picupload.pl member.pl 
	                          memberentry.pl members-home.pl 
	                          moremember.pl newimember.pl 
	                          newjmember.pl newmember.pl pay.pl 
	                          payprint.pl readingrec.pl setdebar.pl 
	intranet/cgi-bin/reserve: modrequest.pl placerequest.pl 
	                          request.pl 
	intranet/cgi-bin/reviews: reviewswaiting.pl 
	intranet/cgi-bin/serials: acqui-search-result.pl acqui-search.pl 
	                          claims.pl distributedto.pl 
	                          lateissues-excel.pl lateissues.pl 
	                          member-search.pl printlist.pl 
	                          reorder_members.pl routing-preview.pl 
	                          routing.pl serial-issues.pl 
	                          serials-home.pl serials-receive.pl 
	                          subscription-add-new.pl 
	                          subscription-add.pl 
	                          subscription-bib-search.pl 
	                          subscription-detail-new.pl 
	                          subscription-detail.pl 
	                          subscription-renew.pl viewalerts.pl 
	intranet/cgi-bin/sms: sms.pl 
	intranet/cgi-bin/suggestion: acceptorreject.pl 
	intranet/cgi-bin/tools: barcodes.pl barcodesGenerator.pl 
	                        exceptionHolidays.pl export.pl fines2.pl 
	                        holidays.pl import.pl koha-news.pl 
	                        letter.pl newHolidays.pl overduerules.pl 
	                        pdfViewer.pl printerConfig.pl 
	                        tools-home.pl 
	intranet/cgi-bin/value_builder: marc21_008_holdings.pl 
	                                marc21_field_003.pl 
	                                marc21_field_005.pl 
	                                marc21_field_006.pl 
	                                marc21_field_007.pl 
	                                marc21_field_008.pl 
	                                marc21_leader.pl 
	                                marc21_leader_authorities.pl 
	                                marc21_leader_holdings.pl 
	                                usmarc_field_952d.pl 
	intranet/cgi-bin/z3950: search.pl zebraqueue_start.pl 
	                        zebraqueue_windows_start.pl 
	intranet/htdocs: favicon.ico index.html 
	intranet/htdocs/intranet-tmpl/default/en: about.tmpl auth.tmpl 
	                                          intranet-main.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/acqui: acqui-home.tmpl 
	                                                basket.tmpl 
	                                                booksellers.tmpl 
	                                                finishreceive.tmpl 
	                                                histsearch.tmpl 
	                                                lateorders.tmpl 
	                                                neworderempty.tmpl 
	                                                newordersuggestion.tmpl 
	                                                parcel.tmpl 
	                                                parcels.tmpl 
	                                                supplier.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/admin: 
	                                                admin-careers.tmpl 
	                                                admin-home.tmpl 
	                                                aqbookfund.tmpl 
	                                                aqbudget.tmpl 
	                                                auth_group_structure.tmpl 
	                                                auth_subfields_structure.tmpl 
	                                                auth_tag_structure.tmpl 
	                                                authorised_values.tmpl 
	                                                authtgroups.tmpl 
	                                                authtypes.tmpl 
	                                                biblios_framework.tmpl 
	                                                biblios_subfields_structure.tmpl 
	                                                bibliostagstructure.tmpl 
	                                                branches.tmpl 
	                                                categorie.tmpl 
	                                                categoryitem.tmpl 
	                                                charges.tmpl 
	                                                checkmarc.tmpl 
	                                                cities.tmpl 
	                                                currency.tmpl 
	                                                holdings_subfields_structure.tmpl 
	                                                holdingstagstructure.tmpl 
	                                                institutions-careers.tmpl 
	                                                issuingrules.tmpl 
	                                                itemtypes.tmpl 
	                                                koha-electronic.tmpl 
	                                                koha2marclinks.tmpl 
	                                                koha_attr.tmpl 
	                                                onlinedatabases.tmpl 
	                                                printers.tmpl 
	                                                stopwords.tmpl 
	                                                systempreferences.tmpl 
	                                                thesaurus.tmpl 
	                                                viewlog.tmpl 
	                                                z3950servers.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/authorities: 
	                                                      auth_finder.tmpl 
	                                                      auth_linker.tmpl 
	                                                      authorities-home.tmpl 
	                                                      authorities.tmpl 
	                                                      blinddetail-biblio-search.tmpl 
	                                                      blinddetail-linker.tmpl 
	                                                      detail.tmpl 
	                                                      linkresultlist-auth.tmpl 
	                                                      searchresultlist-auth.tmpl 
	                                                      searchresultlist.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/barcodes: barcodes.tmpl 
	                                                   cbarcodes.tmpl 
	                                                   mbarcodes.tmpl 
	                                                   printerConfig.tmpl 
	                                                   shelves.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/bookshelves: 
	                                                      addbookbiblionumber.tmpl 
	                                                      addbookbybiblionumber.tmpl 
	                                                      mail_request_REJECTED.tmpl 
	                                                      quicksearch.tmpl 
	                                                      shelf-requests.tmpl 
	                                                      shelves.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/catalogue: 
	                                                    ISBDdetail.tmpl 
	                                                    MARCdetail.tmpl 
	                                                    bookcount.tmpl 
	                                                    catalogue_search.tmpl 
	                                                    catalogue_searchresults.tmpl 
	                                                    detail.tmpl 
	                                                    detailprint.tmpl 
	                                                    livesearch.tmpl 
	                                                    moredetail.tmpl 
	                                                    news_searchresults.tmpl 
	                                                    newsdetail.tmpl 
	                                                    search.tmpl 
	                                                    searchresults.tmpl 
	                                                    translation.tmpl 
	                                                    translation_en.tmpl 
	                                                    union-searchresult.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/cataloguing: 
	                                                      addbiblio.tmpl 
	                                                      addbooks.tmpl 
	                                                      additem.tmpl 
	                                                      isbnsearch.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/circ: 
	                                               branchreserves.tmpl 
	                                               branchtransfers.tmpl 
	                                               circulation.tmpl 
	                                               currenttransfers.tmpl 
	                                               rescirculation.tmpl 
	                                               resreturns.tmpl 
	                                               returns.tmpl 
	                                               selectbranchprinter.tmpl 
	                                               waitingreservestransfers.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/errors: 400.tmpl 
	                                                 401.tmpl 
	                                                 402.tmpl 
	                                                 403.tmpl 
	                                                 404.tmpl 
	                                                 405.tmpl 
	                                                 500.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/export: marc-time.tmpl 
	                                                 marc.tmpl 
	                                                 marc_item.tmpl 
	                                                 zebra-rebuild.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/help/acqui: 
	                                                     acqui-home.tmpl 
	                                                     basket.tmpl 
	                                                     newbiblio.tmpl 
	                                                     order.tmpl 
	                                                     recieve.tmpl 
	                                                     recieveorder.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/help/admin: 
	                                                     aqbookfund.tmpl 
	                                                     auth_subfields_structure.tmpl 
	                                                     authorised_values.tmpl 
	                                                     authtypes.tmpl 
	                                                     biblio_framework.tmpl 
	                                                     biblios_framework.tmpl 
	                                                     branches.tmpl 
	                                                     categorie.tmpl 
	                                                     checkmarc.tmpl 
	                                                     currency.tmpl 
	                                                     holdings_subfields_structure.tmpl 
	                                                     holdingstagstructure.tmpl 
	                                                     issuingrules.tmpl 
	                                                     items_subfields_structure.tmpl 
	                                                     itemstagstructure.tmpl 
	                                                     itemtypes.tmpl 
	                                                     koha2marclinks.tmpl 
	                                                     marc_subfields_structure.tmpl 
	                                                     marctagstructure.tmpl 
	                                                     printers.tmpl 
	                                                     stopwords.tmpl 
	                                                     systempreferences.tmpl 
	                                                     z3950servers.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/help/authorities: 
	                                                           authorities.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/help: bull-home.tmpl 
	                                               nohelp.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/help/circ: 
	                                                    circulation.tmpl 
	                                                    returns.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/help/export: marc.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/help/import: 
	                                                      breeding.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/help/members: 
	                                                       memberentry.tmpl 
	                                                       members-home.tmpl 
	                                                       moremember.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/help/reports: 
	                                                       borrowers_stats.tmpl 
	                                                       catalogue_stats.tmpl 
	                                                       inventory.tmpl 
	                                                       issues_stats.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/help/search.marc: 
	                                                           search.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/help/serials: 
	                                                       bull-home.tmpl 
	                                                       statecollection.tmpl 
	                                                       subscription-add.tmpl 
	                                                       subscription-detail.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/import: breeding.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/includes: 
	                                                   acqui-full-topmenu.inc 
	                                                   acqui-topmenu.inc 
	                                                   acquisitions-bottom.inc 
	                                                   admin-topmenu.inc 
	                                                   alt_menu-serials.inc 
	                                                   authorities-topmenu.inc 
	                                                   blank.css 
	                                                   borrcirculation-bottom.inc 
	                                                   borrcirculation-top.inc 
	                                                   circ-topmenu.inc 
	                                                   colors.css 
	                                                   common.js.inc 
	                                                   dictionary-bottom.inc 
	                                                   dictionary-top.inc 
	                                                   doc-head-barcodes-close.inc 
	                                                   doc-head-circ-close.inc 
	                                                   doc-head-circ-open.inc 
	                                                   doc-head-close-addbiblio.inc 
	                                                   doc-head-close-calendar.inc 
	                                                   doc-head-close-cat-zoom.inc 
	                                                   doc-head-close-cat.inc 
	                                                   doc-head-close-dic.inc 
	                                                   doc-head-close-print.inc 
	                                                   doc-head-close-receipt.inc 
	                                                   doc-head-close-z3950.inc 
	                                                   doc-head-close.inc 
	                                                   doc-head-open.inc 
	                                                   favicon.ico 
	                                                   help-bottom.inc 
	                                                   help-top.inc 
	                                                   holidays-bottom.inc 
	                                                   holidays-top.inc 
	                                                   intranet-bottom.inc 
	                                                   intranet-facets.inc 
	                                                   intranet-nav-brief.inc 
	                                                   intranet-nav.inc 
	                                                   intranet-topmenu.inc 
	                                                   intranet.css 
	                                                   livesearch.css 
	                                                   livesearch.js 
	                                                   main-top-addbiblio.inc 
	                                                   main-top-blank.inc 
	                                                   main-top-circ.inc 
	                                                   main-top-print.inc 
	                                                   main-top.inc 
	                                                   main.js 
	                                                   marc-editor.css 
	                                                   masthead.inc 
	                                                   masthead_adv.inc 
	                                                   members-topmenu.inc 
	                                                   menu-acqui.inc 
	                                                   menu-admin.inc 
	                                                   menu-authorities.inc 
	                                                   menu-catalogue.inc 
	                                                   menu-circ.inc 
	                                                   menu-main.inc 
	                                                   menu-members.inc 
	                                                   menu-serials.inc 
	                                                   menu-tools.inc 
	                                                   menus.inc 
	                                                   popup-bottom.inc 
	                                                   popup-top.inc 
	                                                   print.css 
	                                                   rollovers.js 
	                                                   search-topmenu.inc 
	                                                   serials-menu.inc 
	                                                   serials-topmenu.inc 
	                                                   tabs.css 
	intranet/htdocs/intranet-tmpl/default/en/includes/calendar: 
	                                                            cal.gif 
	                                                            calendar-en.js 
	                                                            calendar-setup.js 
	                                                            calendar-system.css 
	                                                            calendar.js 
	                                                            menuarrow.gif 
	intranet/htdocs/intranet-tmpl/default/en/includes/countryCodes: 
	                                                                countryCodes.dat 
	                                                                labelCodes.dat 
	intranet/htdocs/intranet-tmpl/default/en/includes/javascript: 
	                                                              members.js 
	intranet/htdocs/intranet-tmpl/default/en/includes/labelConfig: 
	                                                               cardConfig.conf 
	                                                               cardsConfig.conf 
	                                                               itemsLabelConfig.conf 
	                                                               itemsLabelConfig3.conf 
	                                                               itemslabelConfig2.conf 
	                                                               labelConfig.conf 
	                                                               membersConfig.conf 
	intranet/htdocs/intranet-tmpl/default/en/maint: catmaintain.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/members: 
	                                                  boraccount.tmpl 
	                                                  borrowers_details.tmpl 
	                                                  deletemem.tmpl 
	                                                  guarantor_search.tmpl 
	                                                  imemberentry.tmpl 
	                                                  jmemberentry.tmpl 
	                                                  mancredit.tmpl 
	                                                  maninvoice.tmpl 
	                                                  member-flags.tmpl 
	                                                  member-password.tmpl 
	                                                  member-picupload.tmpl 
	                                                  member-quicksearch-results.tmpl 
	                                                  member-quicksearch.tmpl 
	                                                  member.tmpl 
	                                                  memberentry.tmpl 
	                                                  memberentryA.tmpl 
	                                                  memberentryC.tmpl 
	                                                  memberentryI.tmpl 
	                                                  memberentryP.tmpl 
	                                                  members-home.tmpl 
	                                                  moremember-print.tmpl 
	                                                  moremember-receipt.tmpl 
	                                                  moremember.tmpl 
	                                                  newimember.tmpl 
	                                                  newjmember.tmpl 
	                                                  newmember.tmpl 
	                                                  pay.tmpl 
	                                                  payprint.tmpl 
	                                                  readingrec.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/members/receipts: 
	                                                           print-receipts-conf-bottom.inc 
	                                                           print-receipts-conf-top.inc 
	                                                           print-receipts-conf.tmpl 
	                                                           receipt-plain.tmpl 
	                                                           receipt-rich.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/reports: accounts.tmpl 
	                                                  acquisitions_stats.tmpl 
	                                                  bor_issues_top.tmpl 
	                                                  borrowers-stats.tmpl 
	                                                  borrowers_out.tmpl 
	                                                  borrowers_stats.tmpl 
	                                                  cat_issues_top.tmpl 
	                                                  catalogue_out.tmpl 
	                                                  catalogue_stats.tmpl 
	                                                  contact_history.tmpl 
	                                                  inventory.tmpl 
	                                                  issues_avg_stats.tmpl 
	                                                  issues_by_borrower_category.tmpl 
	                                                  issues_stats.tmpl 
	                                                  itemtypes.tmpl 
	                                                  onloan.tmpl 
	                                                  overdue.tmpl 
	                                                  reports-home.tmpl 
	                                                  reports.tmpl 
	                                                  reservereport.tmpl 
	                                                  reserves_by_biblios.tmpl 
	                                                  shelf.tmpl 
	                                                  shelforder.tmpl 
	                                                  shelforderresult.tmpl 
	                                                  sms_history.tmpl 
	                                                  stats.screen.tmpl 
	                                                  stats.tmpl 
	                                                  stock.tmpl 
	                                                  transfers.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/reserve: request.tmpl 
	intranet/htdocs/intranet-tmpl/default/en/serials: 
	                                                  acqui-search-result.tmpl 
	                                                  acqui-search.tmpl 
	                                                  claims.tmpl 
	                                                  distributedto.tmpl 
	                                                  lateissues.tmpl 
	                                                  member-search.tmpl 
	                                                  printlist.tmpl 
	                                                  receipt-search-result.tmpl 
	                                                  result.tmpl 
	                                                  routing-preview-slip.tmpl 
	                                                  routing-preview.tmpl 

Log message:
	removing for a fresh commit to cvs folders

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/.htaccess?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/about.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/help.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/logout.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/mainpage.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/plugin_launcher.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/acqui/acqui-home.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/acqui/addorder.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/acqui/basket.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/acqui/bookfund.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/acqui/booksellers.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/acqui/currency.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/acqui/finishreceive.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/acqui/histsearch.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/acqui/lateorders.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/acqui/neworderempty.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/acqui/newordersuggestion.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/acqui/parcel.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/acqui/select-late.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/acqui/supplier.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/acqui/updatesupplier.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/admin-careers.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/admin-home.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/aqbookfund.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/aqbudget.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/auth_subfields_structure.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/auth_tag_structure.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/authorised_values.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/authtypes.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/biblios_framework.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/biblios_subfields_structure.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/bibliostagstructure.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/branches.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/categorie.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/categoryitem.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/checkmarc.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/currency.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/facets_labels.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/holdings_subfields_structure.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/holdingstagstructure.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/institutions-careers.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/issuingrules.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/itemtypes.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/koha-electronic.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/koha_attr.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/onlinedatabases.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/printers.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/systempreferences.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/thesaurus.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/viewlog.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/admin/z3950servers.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/authorities/auth_finder.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/authorities/auth_linker.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/authorities/authorities-home.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/authorities/authorities.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/authorities/blinddetail-biblio-search.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/authorities/blinddetail-linker.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/authorities/detail-biblio-search.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/authorities/detail.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/authorities/merge_authority.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/barcodes/arial.ttf?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/barcodes/barcodes.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/barcodes/barcodesGenerator.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/barcodes/cardConfig.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/barcodes/cbarcodes.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/barcodes/empty_card.jpg?cvsroot=koha&only_with_tag=rel_TG&rev=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/barcodes/mbarcodes.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/barcodes/mprinterConfig.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/barcodes/pdfViewer.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/barcodes/printerConfig.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/bookshelves/add-biblios-to-shelves.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/bookshelves/addbookbybiblionumber.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/bookshelves/quicksearch.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/bookshelves/shelf-requests.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/bookshelves/shelves.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/catalogue/ISBDdetail.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/catalogue/MARCdetail.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/catalogue/bookcount.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/catalogue/catalogue-search.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/catalogue/cyprus-search.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/catalogue/detail.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/catalogue/detailprint.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/catalogue/moredetail.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/catalogue/newsdetail.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/catalogue/search.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/cataloguing/addbiblio.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/cataloguing/addbooks.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/cataloguing/additem.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/cataloguing/get-imdb.php?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/cataloguing/isbnsearch.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/circ/branchreserves.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/circ/branchtransfers.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/circ/circulation.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/circ/currenttransfers.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/circ/renewscript.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/circ/rescirculation.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/circ/resreturns.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/circ/returns.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/circ/selectbranchprinter.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/circ/waitingreservestransfers.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/classes/class.imdb_parser.php?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/boraccount.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/borrowers_details.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/deletemem.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/guarantor_search.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/imemberentry.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/insertdata.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/insertidata.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/insertjdata.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/jmemberentry.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/mancredit.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/maninvoice.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/manualcredit.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/member-flags.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/member-password.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/member-picupload.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/member.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/memberentry.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/members-home.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/moremember.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/newimember.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/newjmember.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/newmember.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/pay.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/payprint.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/readingrec.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/members/setdebar.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/reserve/modrequest.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/reserve/placerequest.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/reserve/request.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/reviews/reviewswaiting.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/acqui-search-result.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/acqui-search.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/claims.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/distributedto.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/lateissues-excel.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/lateissues.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/member-search.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/printlist.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/reorder_members.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/routing-preview.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/routing.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/serial-issues.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/serials-home.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/serials-receive.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/subscription-add-new.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/subscription-add.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/subscription-bib-search.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/subscription-detail-new.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/subscription-detail.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/subscription-renew.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/serials/viewalerts.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/sms/sms.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/suggestion/acceptorreject.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/tools/barcodes.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/tools/barcodesGenerator.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/tools/exceptionHolidays.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/tools/export.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/tools/fines2.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/tools/holidays.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/tools/import.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/tools/koha-news.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/tools/letter.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/tools/newHolidays.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/tools/overduerules.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/tools/pdfViewer.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/tools/printerConfig.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/tools/tools-home.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/value_builder/marc21_008_holdings.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/value_builder/marc21_field_003.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/value_builder/marc21_field_005.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/value_builder/marc21_field_006.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/value_builder/marc21_field_007.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/value_builder/marc21_field_008.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/value_builder/marc21_leader.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/value_builder/marc21_leader_authorities.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/value_builder/marc21_leader_holdings.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/value_builder/usmarc_field_952d.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/z3950/search.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/z3950/zebraqueue_start.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/cgi-bin/z3950/zebraqueue_windows_start.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/favicon.ico?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/index.html?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/about.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/auth.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/intranet-main.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/acqui/acqui-home.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/acqui/basket.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/acqui/booksellers.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/acqui/finishreceive.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/acqui/histsearch.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/acqui/lateorders.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/acqui/neworderempty.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/acqui/newordersuggestion.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/acqui/parcel.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/acqui/parcels.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/acqui/supplier.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/admin-careers.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/admin-home.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/aqbookfund.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/aqbudget.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/auth_group_structure.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/auth_subfields_structure.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/auth_tag_structure.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/authorised_values.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/authtgroups.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/authtypes.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/biblios_framework.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/biblios_subfields_structure.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/bibliostagstructure.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/branches.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/categorie.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/categoryitem.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/charges.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/checkmarc.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/cities.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/currency.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/holdings_subfields_structure.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/holdingstagstructure.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/institutions-careers.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/issuingrules.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/itemtypes.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/koha-electronic.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/koha2marclinks.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/koha_attr.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/onlinedatabases.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/printers.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/stopwords.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/systempreferences.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/thesaurus.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/viewlog.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/admin/z3950servers.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/authorities/auth_finder.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/authorities/auth_linker.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/authorities/authorities-home.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/authorities/authorities.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/authorities/blinddetail-biblio-search.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/authorities/blinddetail-linker.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/authorities/detail.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/authorities/linkresultlist-auth.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/authorities/searchresultlist.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/barcodes/barcodes.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/barcodes/cbarcodes.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/barcodes/mbarcodes.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/barcodes/printerConfig.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/barcodes/shelves.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/bookshelves/addbookbiblionumber.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/bookshelves/mail_request_REJECTED.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/bookshelves/quicksearch.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/bookshelves/shelf-requests.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/bookshelves/shelves.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/catalogue/ISBDdetail.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/catalogue/bookcount.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/catalogue/catalogue_search.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/catalogue/catalogue_searchresults.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/catalogue/detail.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/catalogue/detailprint.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/catalogue/livesearch.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/catalogue/moredetail.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/catalogue/news_searchresults.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/catalogue/newsdetail.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/catalogue/search.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/catalogue/searchresults.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/catalogue/translation.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/catalogue/translation_en.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/catalogue/union-searchresult.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/cataloguing/addbiblio.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/cataloguing/addbooks.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/cataloguing/additem.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/cataloguing/isbnsearch.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/circ/branchreserves.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/circ/branchtransfers.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/circ/circulation.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/circ/currenttransfers.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/circ/rescirculation.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/circ/resreturns.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/circ/returns.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/circ/waitingreservestransfers.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/errors/400.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/errors/401.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/errors/402.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/errors/403.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/errors/404.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/errors/405.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/errors/500.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/export/marc-time.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/export/marc.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/export/marc_item.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/export/zebra-rebuild.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/acqui/acqui-home.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/acqui/basket.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/acqui/newbiblio.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/acqui/order.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/acqui/recieve.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/acqui/recieveorder.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/aqbookfund.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/auth_subfields_structure.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/authorised_values.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/authtypes.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/biblio_framework.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/biblios_framework.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/branches.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/categorie.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/checkmarc.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/currency.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/holdings_subfields_structure.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/holdingstagstructure.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/issuingrules.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/items_subfields_structure.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/itemstagstructure.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/itemtypes.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/koha2marclinks.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/printers.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/stopwords.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/systempreferences.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/admin/z3950servers.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/authorities/authorities.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/bull-home.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/nohelp.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/circ/circulation.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/circ/returns.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/export/marc.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/import/breeding.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/members/memberentry.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/members/members-home.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/members/moremember.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/reports/borrowers_stats.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/reports/catalogue_stats.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/reports/inventory.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/reports/issues_stats.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/search.marc/search.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/serials/bull-home.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/serials/statecollection.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/serials/subscription-add.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/help/serials/subscription-detail.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/import/breeding.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/acqui-full-topmenu.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/acqui-topmenu.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/acquisitions-bottom.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/admin-topmenu.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/alt_menu-serials.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/authorities-topmenu.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/blank.css?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/borrcirculation-bottom.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/borrcirculation-top.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/circ-topmenu.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/colors.css?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/common.js.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/dictionary-bottom.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/dictionary-top.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/doc-head-barcodes-close.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/doc-head-circ-close.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/doc-head-circ-open.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/doc-head-close-addbiblio.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/doc-head-close-calendar.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/doc-head-close-cat-zoom.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/doc-head-close-cat.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/doc-head-close-dic.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/doc-head-close-print.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/doc-head-close-receipt.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/doc-head-close-z3950.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/doc-head-close.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/doc-head-open.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/favicon.ico?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/help-bottom.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/help-top.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/holidays-bottom.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/holidays-top.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/intranet-bottom.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/intranet-facets.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/intranet-nav-brief.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/intranet-nav.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/intranet-topmenu.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/intranet.css?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/livesearch.css?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/livesearch.js?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/main-top-addbiblio.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/main-top-blank.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/main-top-circ.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/main-top-print.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/main-top.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/main.js?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/marc-editor.css?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/masthead.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/masthead_adv.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/members-topmenu.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/menu-acqui.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/menu-admin.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/menu-authorities.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/menu-catalogue.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/menu-circ.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/menu-main.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/menu-members.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/menu-serials.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/menu-tools.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/menus.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/popup-bottom.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/popup-top.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/print.css?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/rollovers.js?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/search-topmenu.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/serials-menu.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/serials-topmenu.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/tabs.css?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/calendar/cal.gif?cvsroot=koha&only_with_tag=rel_TG&rev=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/calendar/calendar-en.js?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/calendar/calendar-setup.js?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/calendar/calendar-system.css?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/calendar/calendar.js?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/calendar/menuarrow.gif?cvsroot=koha&only_with_tag=rel_TG&rev=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/countryCodes/countryCodes.dat?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/countryCodes/labelCodes.dat?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/javascript/members.js?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/labelConfig/cardConfig.conf?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/labelConfig/cardsConfig.conf?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/labelConfig/itemsLabelConfig.conf?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/labelConfig/itemsLabelConfig3.conf?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/labelConfig/itemslabelConfig2.conf?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/labelConfig/labelConfig.conf?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/includes/labelConfig/membersConfig.conf?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/maint/catmaintain.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/boraccount.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/borrowers_details.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/deletemem.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/guarantor_search.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/imemberentry.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/jmemberentry.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/mancredit.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/maninvoice.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/member-flags.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/member-password.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/member-picupload.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/member-quicksearch.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/member.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/memberentry.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/memberentryA.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/memberentryC.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/memberentryI.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/memberentryP.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/members-home.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/moremember-print.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/moremember-receipt.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/moremember.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/newimember.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/newjmember.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/newmember.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/pay.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/payprint.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/readingrec.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/receipts/print-receipts-conf-bottom.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/receipts/print-receipts-conf-top.inc?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/receipts/print-receipts-conf.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/receipts/receipt-plain.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/members/receipts/receipt-rich.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/accounts.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/acquisitions_stats.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/bor_issues_top.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/borrowers-stats.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/borrowers_out.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/borrowers_stats.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/cat_issues_top.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/catalogue_out.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/catalogue_stats.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/contact_history.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/inventory.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/issues_avg_stats.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/issues_by_borrower_category.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/issues_stats.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/itemtypes.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/onloan.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/overdue.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/reports-home.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/reports.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/reservereport.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/reserves_by_biblios.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/shelf.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/shelforder.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/shelforderresult.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/sms_history.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/stats.screen.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/stats.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/stock.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reports/transfers.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/reserve/request.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/serials/acqui-search-result.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/serials/acqui-search.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/serials/claims.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/serials/distributedto.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/serials/lateissues.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/serials/member-search.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/serials/printlist.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/serials/receipt-search-result.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/serials/result.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/serials/routing-preview-slip.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/intranet/htdocs/intranet-tmpl/default/en/serials/routing-preview.tmpl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=0

Patches:
Index: cgi-bin/.htaccess
===================================================================
RCS file: cgi-bin/.htaccess
diff -N cgi-bin/.htaccess
--- cgi-bin/.htaccess	10 Mar 2007 01:06:21 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-# .htaccess
-
-ErrorDocument 400 /cgi-bin/koha/koha-tmpl/errors/400.pl
-ErrorDocument 401 /cgi-bin/koha/koha-tmpl/errors/401.pl
-ErrorDocument 403 /cgi-bin/koha/koha-tmpl/errors/403.pl
-ErrorDocument 404 /cgi-bin/koha/koha-tmpl/errors/404.pl
-ErrorDocument 500 /cgi-bin/koha/koha-tmpl/errors/500.pl
-
-

Index: cgi-bin/about.pl
===================================================================
RCS file: cgi-bin/about.pl
diff -N cgi-bin/about.pl
--- cgi-bin/about.pl	10 Mar 2007 01:06:21 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-#!/usr/bin/perl
-use HTML::Template;
-use strict;
-require Exporter;
-use C4::Database;
-use C4::Output;  # contains gettemplate
-use C4::Interface::CGI::Output;
-use C4::Auth;
-use C4::Context;
-use CGI;
-
-my $query = new CGI;
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "about.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-
-my $kohaVersion = C4::Context->config("kohaversion");
-my $osVersion = `uname -a`;
-my $perlVersion = $];
-my $mysqlVersion = `mysql -V`;
-my $apacheVersion =  `httpd -v`;
-$apacheVersion =  `httpd2 -v` unless $apacheVersion;
-
-$template->param(
-					kohaVersion => $kohaVersion,
-					osVersion          => $osVersion,
-					perlVersion        => $perlVersion,
-					mysqlVersion       => $mysqlVersion,
-					apacheVersion      => $apacheVersion,
-		);
-
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/help.pl
===================================================================
RCS file: cgi-bin/help.pl
diff -N cgi-bin/help.pl
--- cgi-bin/help.pl	10 Mar 2007 01:06:21 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-
-use C4::Interface::CGI::Output;
- use C4::Auth;
-use C4::Context;
-use C4::Koha;
-use CGI;
-my $query = new CGI;
-
-# find the script that called the online help using the CGI referer()
-
-my $refer  = $query->referer();
-$refer =~ /.*koha\/(.*)\.pl.*/;
-my $from = "help/$1.tmpl";
-my ($template, $loggedinuser, $cookie)    = get_template_and_user({template_name => $from,
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 1,
-			     flagsrequired => {borrow=> 1},
-			     debug => 1,
-			     });
-
-#my $template = gethelptemplate($from,"intranet");
-# my $template
-output_html_with_http_headers $query, $cookie, $template->output;
-
-
-

Index: cgi-bin/logout.pl
===================================================================
RCS file: cgi-bin/logout.pl
diff -N cgi-bin/logout.pl
--- cgi-bin/logout.pl	10 Mar 2007 01:06:21 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@
-#!/usr/bin/perl
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use CGI;
-use C4::Context;
-
-my $query=new CGI;
-
-my $sessionID=$query->cookie('sessionID');
-
-my $sessions;
-open (S, "/tmp/sessions");
-while (my ($sid, $u, $lasttime) = split(/:/, <S>)) {
-    chomp $lasttime;
-    (next) unless ($sid);
-    (next) if ($sid eq $sessionID);
-    $sessions->{$sid}->{'userid'}=$u;
-    $sessions->{$sid}->{'lasttime'}=$lasttime;
-}
-open (S, ">/tmp/sessions");
-foreach (keys %$sessions) {
-    my $userid=$sessions->{$_}->{'userid'};
-    my $lasttime=$sessions->{$_}->{'lasttime'};
-    print S "$_:$userid:$lasttime\n";
-}
-
-my $dbh = C4::Context->dbh;
-
-# Check that this is the ip that created the session before deleting it
-
-my $sth=$dbh->prepare("select userid,ip from sessions where sessionID=?");
-$sth->execute($sessionID);
-my ($userid, $ip);
-if ($sth->rows) {
-    ($userid,$ip) = $sth->fetchrow;
-    if ($ip ne $ENV{'REMOTE_ADDR'}) {
-       # attempt to logout from a different ip than cookie was created at
-       exit;
-    }
-}
-
-$sth=$dbh->prepare("delete from sessions where sessionID=?");
-$sth->execute($sessionID);
-open L, ">>/tmp/sessionlog";
-my $time=localtime(time());
-printf L "%20s from %16s logged out at %30s (manual log out).\n", $userid, $ip, $time;
-close L;
-
-my $cookie=$query->cookie(-name => 'sessionID',
-			  -value => '',
-			  -expires => '+1y');
-
-# Should redirect to intranet home page after logging out
-
-print $query->redirect("mainpage.pl");
-exit;
-
-

Index: cgi-bin/mainpage.pl
===================================================================
RCS file: cgi-bin/mainpage.pl
diff -N cgi-bin/mainpage.pl
--- cgi-bin/mainpage.pl	10 Mar 2007 01:06:21 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-#!/usr/bin/perl 
-use strict;
-use C4::Interface::CGI::Output;
-use CGI;
-use C4::Auth;
-use C4::Suggestions;
-use C4::Koha;
-use C4::BookShelves;
-use C4::NewsChannels;
-use C4::Context;
-my $query =  CGI->new();
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "intranet-main.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {catalogue => 1, circulate => 1,
-			     				parameters => 1, borrowers => 1,
-							permissions =>1, reserveforothers=>1,
-							editcatalogue => 1, updatecharges => 1, },
-			     debug => 1,
-			     });
-
-my $lang = "koha";
-my $error=$query->param('error');
-$template->param(error        =>$error);
-my ($opac_news_count, $all_opac_news) = &get_opac_news(undef, $lang);
-# if ($opac_news_count > 4) {$template->param(more_opac_news => 1);}
-$template->param(opac_news        => $all_opac_news);
-$template->param(opac_news_count  => $opac_news_count);
-
-my $marc_p = C4::Context->boolean_preference("marc");
-$template->param(NOTMARC => !$marc_p);
-my $new_suggestions = &CountSuggestion("ASKED");
-$template->param(new_suggestions => $new_suggestions);
-
-
-my $count_pending_request = CountShelfRequest(undef, "PENDING");
-$template->param(count_pending_request => $count_pending_request);
-output_html_with_http_headers($query, $cookie, $template->output());
-

Index: cgi-bin/plugin_launcher.pl
===================================================================
RCS file: cgi-bin/plugin_launcher.pl
diff -N cgi-bin/plugin_launcher.pl
--- cgi-bin/plugin_launcher.pl	10 Mar 2007 01:06:21 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: plugin_launcher.pl,v 1.1.2.1 2007/03/10 01:06:21 tgarip1957 Exp $
-
-# 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 CGI;
-use C4::Context;
-use C4::Search;
-use C4::Output;
-
-my $input = new CGI;
-#my $plugin_name=$input->param("plugin_name");
-my $cgidir = C4::Context->intranetdir ."/cgi-bin/value_builder";
-		unless (opendir(DIR, "$cgidir")) {
-			$cgidir = C4::Context->intranetdir."/value_builder";
-		} 
-		my $plugin_name=$cgidir."/".$input->param("plugin_name");
-
-
-do $plugin_name;
-&plugin($input);

Index: cgi-bin/acqui/acqui-home.pl
===================================================================
RCS file: cgi-bin/acqui/acqui-home.pl
diff -N cgi-bin/acqui/acqui-home.pl
--- cgi-bin/acqui/acqui-home.pl	10 Mar 2007 01:07:50 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,124 +0,0 @@
-#!/usr/bin/perl
-
-# 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
-
-# $Id: acqui-home.pl,v 1.1.2.1 2007/03/10 01:07:50 tgarip1957 Exp $
-
-
-=head1 NAME
-
-acqui-home.pl
-
-=head1 DESCRIPTION
-
-this script is the main page for acqui/
-It presents the budget's dashboard, another table about differents currency with 
-their rates and the pending suggestions.
-
-=head1 CGI PARAMETERS
-
-=over 4
-
-=item $status
-C<$status> is the status a suggestion could has. Default value is 'ASKED'.
-thus, it can be REJECTED, ACCEPTED, ORDERED, ASKED, AVAIBLE
-
-=back
-
-=cut
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Suggestions;
-use C4::Acquisition;
-use C4::Bookfund;
-use C4::Members;
-
-my $query = new CGI;
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "acqui/acqui-home.tmpl",
-        query           => $query,
-        type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { acquisition => 1 },
-        debug           => 1,
-    }
-);
-
-# budget
-my $me= C4::Context->userenv;
-my $homebranch=$me->{'branch'} ;
-my @results = GetBookFunds($homebranch);
-my $count = scalar @results;
-my $classlist   = '';
-my $total       = 0;
-my $totspent    = 0;
-my $totcomtd    = 0;
-my $totavail    = 0;
-my @loop_budget = ();
-
-for (my $i=0; $i<$count; $i++){
-	my ($spent,$comtd)=GetBookFundBreakdown($results[$i]->{'bookfundid'});
-	my $avail=$results[$i]->{'budgetamount'}-($spent+$comtd);
-	my %line;
-	$line{bookfundname} = $results[$i]->{'bookfundname'};
-	$line{budgetamount} = $results[$i]->{'budgetamount'};
-	$line{spent} = sprintf  ("%.2f", $spent);
-	$line{comtd} = sprintf  ("%.2f",$comtd);
-	$line{avail}  = sprintf  ("%.2f",$avail);
-	push @loop_budget, \%line;
-	$total+=$results[$i]->{'budgetamount'};
-	$totspent+=$spent;
-	$totcomtd+=$comtd;
-	$totavail+=$avail;
-}
-
-# currencies
-my @rates = GetCurrencies();
-my $count = scalar @rates;
-
-my @loop_currency = ();
-for ( my $i = 0 ; $i < $count ; $i++ ) {
-    my %line;
-    $line{currency} = $rates[$i]->{'currency'};
-    $line{rate}     = $rates[$i]->{'rate'};
-    push @loop_currency, \%line;
-}
-
-# suggestions
-my $status           = $query->param('status') || "ASKED";
-my $suggestion       = CountSuggestion($status);
-my $suggestions_loop = &SearchSuggestion( '', '', '', '', $status, '' );
-
-$template->param(
-    classlist        => $classlist,
-    type             => 'intranet',
-    loop_budget      => \@loop_budget,
-    loop_currency    => \@loop_currency,
-    total            => sprintf( "%.2f", $total ),
-    suggestion       => $suggestion,
-    suggestions_loop => $suggestions_loop,
-    totspent         => sprintf( "%.2f", $totspent ),
-    totcomtd         => sprintf( "%.2f", $totcomtd ),
-    totavail         => sprintf( "%.2f", $totavail ),
-    nobudget         => $#results == -1 ? 1 : 0
-);
-
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/acqui/addorder.pl
===================================================================
RCS file: cgi-bin/acqui/addorder.pl
diff -N cgi-bin/acqui/addorder.pl
--- cgi-bin/acqui/addorder.pl	10 Mar 2007 01:07:50 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,225 +0,0 @@
-#!/usr/bin/perl
-
-#script to add an order into the system
-#written 29/2/00 by chris at katipo.co.nz
-
-# 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
-
-
-=head1 NAME
-
-addorder.pl
-
-=head1 DESCRIPTION
-
-this script allows to add an order.
-It is called by :
-
-=item neworderbiblio.pl to add an order from nothing.
-
-=item neworderempty.pl to add an order from an existing biblio.
-
-=item newordersuggestion.pl to add an order from an existing suggestion.
-
-=head1 CGI PARAMETERS
-
-All of the cgi parameters below are related to the new order.
-
-=over 4
-
-=item C<ordnum>
-the number of this new order.
-
-=item C<basketno>
-the number of this new basket
-
-=item C<booksellerid>
-the bookseller the librarian has to pay.
-
-=item C<existing>
-
-=item C<title>
-the title of the record ordered.
-
-=item C<author>
-the author of the record ordered.
-
-=item C<copyrightdate>
-the copyrightdate of the record ordered.
-
-=item C<ISBN>
-the ISBN of the record ordered.
-
-=item C<format>
-
-=item C<quantity>
-the quantity to order.
-
-=item C<list_price>
-the price of this order.
-
-=item C<branch>
-the branch where this order will be received.
-
-=item C<series>
-
-=item C<notes>
-Notes on this basket.
-
-=item C<bookfund>
-bookfund use to pay this order.
-
-=item C<sort1> & C<sort2>
-
-=item C<rrp>
-
-=item C<ecost>
-
-=item C<gst>
-
-=item C<budget>
-
-=item C<cost>
-
-=item C<sub>
-
-=item C<invoice>
-the number of the invoice for this order.
-
-=item C<publishercode>
-
-=item C<suggestionid>
-if it is an order from an existing suggestion : the id of this suggestion.
-
-=item C<donation>
-
-=back
-
-=cut
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Acquisition;
-use C4::Suggestions;
-use C4::Biblio;
-use C4::Interface::CGI::Output;
-
-my $input = new CGI;
-# get_template_and_user used only to check auth & get user id
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "acqui/booksellers.tmpl",
-        query           => $input,
-        type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { acquisition => 1 },
-        debug           => 1,
-    }
-);
-
-
-# get CGI parameters
-my $ordnum       = $input->param('ordnum');
-my $basketno     = $input->param('basketno');
-my $booksellerid = $input->param('booksellerid');
-my $existing     = $input->param('existing');    # existing biblio, (not basket or order)
-my $title         = $input->param('title');
-my $author        = $input->param('author');
-my $copyrightdate = $input->param('copyrightdate');
-my $isbn          = $input->param('ISBN');
-my $itemtype      = $input->param('format');
-my $quantity      = $input->param('quantity');
-my $listprice     = $input->param('list_price');
-my $branch        = $input->param('branch');
-my $discount=$input->param('discount');
-if ( $listprice eq '' ) {
-    $listprice = 0;
-}
-my $series = $input->param('series');
-my $notes         = $input->param('notes');
-my $bookfundid      = $input->param('bookfundid');
-my $sort1         = $input->param('sort1');
-my $sort2         = $input->param('sort2');
-my $rrp           = $input->param('rrp');
-my $ecost         = $input->param('ecost');
-my $gst           = $input->param('gstrate');
-my $budget        = $input->param('budget');
-my $unitprice         = $input->param('unitprice');
-my $sub           = $input->param('sub');
-my $purchaseordernumber       = $input->param('purchaseordernumber');
-my $publishercode = $input->param('publishercode');
-my $suggestionid  = $input->param('suggestionid');
-my $donation      = $input->param('donation');
-my $user          = $input->remote_user;
-my $biblionumber=$input->param('biblionumber');
-my $createbibitem = $input->param('createbibitem');
-
-# create, modify or delete biblio
-# create if $quantity>=0 and $existing='no'
-# modify if $quantity>=0 and $existing='yes'
-# delete if $quantity has been se to 0 by the librarian
-my $dbh=C4::Context->dbh;
-
-if ($quantity ne '0'){
-    #check to see if biblio exists
-    if ( $existing eq 'no' ) {
-        #if it doesnt its created on template
-        # change suggestion status if applicable
-        if ($suggestionid) {
-my $data=GetSuggestion($suggestionid);
-
- my $biblio={title=>$data->{title},author=>$data->{author},publishercode=>$data->{publishercode},copyrightdate=>$data->{copyrightdate},isbn=>$data->{isbn},place=>$data->{place},};
-my $xmlhash=XMLkoha2marc($dbh,$biblio,"biblios");
-$biblionumber = NEWnewbiblio($dbh,$xmlhash,"");
-
-            ModStatus( $suggestionid, 'ORDERED', '', $biblionumber,$input );
-        }
-    }## biblio didnot exist now created
-
-    
-
-   
-    if ($ordnum) {
-
-        # 		warn "MODORDER $title / $ordnum / $quantity / $bookfund";
-        ModOrder(
-            $title,   $ordnum,   $quantity,     $listprice,
-            $biblionumber,  $basketno, $booksellerid, $loggedinuser,
-            $notes,   $bookfundid,    $rrp,
-            $ecost,   $gst,      $budget,       $unitprice,
-            $purchaseordernumber, $sort1,    $sort2,$discount,$branch
-        );
-    }
-    else {
-        ( $basketno, $ordnum ) = NewOrder(
-            $basketno,  $biblionumber,       $title,        $quantity,
-            $listprice, $booksellerid, $loggedinuser, $notes,
-            $bookfundid,    $rrp,          $ecost,
-            $gst,       $budget,       $unitprice,         $sub,
-            $purchaseordernumber,   $sort1,        $sort2, $discount,$branch
-        );
-    }
-
-}
-else {
-#    $biblionumber = $input->param('biblionumber');
-    DelOrder( $biblionumber, $ordnum,$loggedinuser );
-}
-
-print $input->redirect("basket.pl?basketno=$basketno");

Index: cgi-bin/acqui/basket.pl
===================================================================
RCS file: cgi-bin/acqui/basket.pl
diff -N cgi-bin/acqui/basket.pl
--- cgi-bin/acqui/basket.pl	10 Mar 2007 01:07:50 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,189 +0,0 @@
-#!/usr/bin/perl
-
-#script to show display basket of orders
-#written by chris at katipo.co.nz 24/2/2000
-
-# 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
-
-# $Id: basket.pl,v 1.1.2.1 2007/03/10 01:07:50 tgarip1957 Exp $
-
-use strict;
-use C4::Auth;
-use C4::Koha;
-use CGI;
-use C4::Interface::CGI::Output;
-use C4::Acquisition;
-use C4::Bookfund;
-use C4::Bookseller;
-use C4::Date;
-
-=head1 NAME
-
-basket.pl
-
-=head1 DESCRIPTION
-
- This script display all informations about basket for the supplier given
- on input arg. Moreover, it allow to add a new order for this supplier from
- an existing record, a suggestion or from a new record.
-
-=head1 CGI PARAMETERS
-
-=over 4
-
-=item $basketno
-
-this parameter seems to be unused.
-
-=item supplierid
-
-the supplier this script have to display the basket.
-
-=item order
-
-
-
-=back
-
-=cut
-
-my $query        = new CGI;
-my $basketno     = $query->param('basketno');
-my $booksellerid = $query->param('supplierid');
-my $order        = $query->param('order');
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "acqui/basket.tmpl",
-        query           => $query,
-        type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { acquisition => 1 },
-        debug           => 1,
-    }
-);
-
-my $basket = GetBasket($basketno);
-$basket->{authorisedbyname};
-# FIXME : the query->param('supplierid') below is probably useless. The bookseller is always known from the basket
-# if no booksellerid in parameter, get it from basket
-$booksellerid = $basket->{booksellerid} unless $booksellerid;
-my @booksellers = GetBookSeller($booksellerid);
-my $count2 = scalar @booksellers;
-
-# get librarian branch...
-if ( C4::Context->preference("IndependantBranches") ) {
-    my $userenv = C4::Context->userenv;
-    unless ( $userenv->{flags} == 1 ) {
-        my $validtest = ( $basket->{creationdate} eq '' )
-          || ( $basket->{branch}  eq '' )
-          || ( $userenv->{branch} eq $basket->{branch} )
-          || ( $userenv->{branch} eq '' )
-          || ( $basket->{branch}  eq '' );
-        unless ($validtest) {
-            print $query->redirect("../mainpage.pl");
-            exit 1;
-        }
-    }
-}
-
-# if new basket, pre-fill infos
-$basket->{creationdate} = ""            unless ( $basket->{creationdate} );
-$basket->{authorisedby} = $loggedinuser unless ( $basket->{authorisedby} );
-
-my ( $count, @results );
- at results  = GetOrders( $basketno, $order );
-$count = scalar @results;
-my $line_total;     # total of each line
-my $gist =C4::Context->preference('gist');           # GST 
-my $toggle = 0;
-
-# my $line_total_est; # total of each line
-my $sub_total_est;      # total of line totals
-my $gist_est;           # GST
-my $grand_total_est;    # $subttotal + $gist_est - $disc_est
-my $disc_est;
-my $qty_total;
-
-my @books_loop;
-for ( my $i = 0 ; $i < $count ; $i++ ) {
-     $line_total = $results[$i]->{'quantity'} * $results[$i]->{'rrp'};
-    $sub_total_est += $line_total ;
-   $disc_est +=$line_total *$results[$i]->{'discount'}/100;
-   $gist_est +=($line_total  - ($line_total *$results[$i]->{'discount'}/100))*$results[$i]->{'gst'}/100;
-   
-   
-    $qty_total += $results[$i]->{'quantity'};
-    my %line;
-   if ( $toggle == 0 ) {
-        $line{color} = '#EEEEEE';
-        $toggle = 1;
-    }
-    else {
-        $line{color} = 'white';
-        $toggle = 0;
-    }
-    $line{ordernumber}      = $results[$i]->{'ordernumber'};
-    $line{publishercode}    = $results[$i]->{'publishercode'};
-    $line{isbn}             = $results[$i]->{'isbn'};
-    $line{booksellerid}     = $booksellers[0]->{'id'};
-    $line{basketno}         = $basketno;
-    $line{title}            = $results[$i]->{'title'};
-    $line{notes}            = $results[$i]->{'notes'};
-    $line{author}           = $results[$i]->{'author'};
-    $line{i}                = $i;
-    $line{rrp}              = sprintf( "%.2f", $results[$i]->{'rrp'} );
-    $line{ecost}            = sprintf( "%.2f", $results[$i]->{'ecost'} );
-      $line{discount}            = sprintf( "%.2f", $results[$i]->{'discount'} );
-    $line{quantity}         = $results[$i]->{'quantity'};
-    $line{quantityrecieved} = $results[$i]->{'quantityreceived'};
-    $line{line_total}       = sprintf( "%.2f", $line_total );
-    $line{biblionumber}     = $results[$i]->{'biblionumber'};
-    $line{bookfundid}       = $results[$i]->{'bookfundid'};
-    $line{odd}              = $i % 2;
-if  ($line{quantityrecieved}>0){$line{donotdelete}=1;}
-    push @books_loop, \%line;
-$template->param(purchaseordernumber    => $results[0]->{'purchaseordernumber'},
-		booksellerinvoicenumber=>$results[0]->{booksellerinvoicenumber},);
-}
-$grand_total_est =  sprintf( "%.2f", $sub_total_est - $disc_est+$gist_est );
-
-$template->param(
-    basketno         => $basketno,
-    creationdate     => format_date( $basket->{creationdate} ),
-    authorisedby     => $basket->{authorisedby},
-    authorisedbyname => $basket->{authorisedbyname},
-    closedate        => format_date( $basket->{closedate} ),
-    active           => $booksellers[0]->{'active'},
-    booksellerid     => $booksellers[0]->{'id'},
-    name             => $booksellers[0]->{'name'},
-    address1         => $booksellers[0]->{'address1'},
-    address2         => $booksellers[0]->{'address2'},
-    address3         => $booksellers[0]->{'address3'},
-    address4         => $booksellers[0]->{'address4'},
-    entrydate        => format_date( $results[0]->{'entrydate'} ),
-    books_loop       => \@books_loop,
-    count            => $count,
-    gist             => $gist,
-    sub_total_est    =>  sprintf( "%.2f",$sub_total_est),
-    gist_est         =>  sprintf( "%.2f",$gist_est),
-    disc_est	=> sprintf( "%.2f",$disc_est),
-    grand_total_est  => $grand_total_est,
-    currency         => $booksellers[0]->{'listprice'},
-    qty_total        => $qty_total,
-);
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/acqui/bookfund.pl
===================================================================
RCS file: cgi-bin/acqui/bookfund.pl
diff -N cgi-bin/acqui/bookfund.pl
--- cgi-bin/acqui/bookfund.pl	10 Mar 2007 01:07:50 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,102 +0,0 @@
-#!/usr/bin/perl -w
-
-# Copyright 2006 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 C4::Context;
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-
-my $dbh      = C4::Context->dbh;
-my $input    = new CGI;
-my $bookfund = $input->param('bookfund');
-my $start    = $input->param('start');
-my $end      = $input->param('end');
-
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "acqui/bookfund.tmpl",
-        query           => $input,
-        type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { acquisition => 1 },
-        debug           => 1,
-    }
-);
-
-my $query = '
-SELECT quantity,
-       datereceived,
-       freight,
-       unitprice,
-       listprice,
-       ecost,
-       quantityreceived AS qrev,
-       subscription,
-       title,
-       itemtype,
-       aqorders.biblionumber,
-       aqorders.booksellerinvoicenumber,
-       quantity-quantityreceived AS tleft,
-       aqorders.ordernumber AS ordnum,
-       entrydate,
-       budgetdate,
-       booksellerid,
-       aqbasket.basketno
-  FROM aqorders
-    INNER JOIN aqorderbreakdown
-      ON aqorderbreakdown.ordernumber = aqorders.ordernumber
-    INNER JOIN aqbasket
-      ON aqbasket.basketno = aqorders.basketno
-    LEFT JOIN biblio
-      ON biblio.biblionumber = aqorders.biblionumber
-  WHERE bookfundid = ?
-    AND budgetdate >= ?
-    AND budgetdate < ?
-    AND (datecancellationprinted IS NULL
-         OR datecancellationprinted = \'0000-00-00\')
-';
-##warn $query;
-my $sth = $dbh->prepare($query);
-$sth->execute( $bookfund, $start, $end );
-my @commited_loop;
-
-my $total = 0;
-while ( my $data = $sth->fetchrow_hashref ) {
-    my $left = $data->{'tleft'};
-    if ( !$left || $left eq '' ) {
-        $left = $data->{'quantity'};
-    }
-    if ( $left && $left > 0 ) {
-        my $subtotal = $left * $data->{'ecost'};
-        $data->{subtotal} = $subtotal;
-        $data->{'left'} = $left;
-        push @commited_loop, $data;
-        $total += $subtotal;
-    }
-}
-
-$template->param(
-    COMMITEDLOOP => \@commited_loop,
-    total        => $total
-);
-$sth->finish;
-#$dbh->disconnect;
-
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/acqui/booksellers.pl
===================================================================
RCS file: cgi-bin/acqui/booksellers.pl
diff -N cgi-bin/acqui/booksellers.pl
--- cgi-bin/acqui/booksellers.pl	10 Mar 2007 01:07:50 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,127 +0,0 @@
-#!/usr/bin/perl
-
-#script to show suppliers and orders
-#written by chris at katipo.co.nz 23/2/2000
-
-# 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
-
-# $Id: booksellers.pl,v 1.1.2.1 2007/03/10 01:07:50 tgarip1957 Exp $
-
-=head1 NAME
-
-booksellers.pl
-
-=head1 DESCRIPTION
-
-this script displays the list of suppliers & orders like C<$supplier> given on input arg.
-thus, this page brings differents features like to display supplier's details,
-to add an order for a specific supplier or to just add a new supplier.
-
-=head1 CGI PARAMETERS
-
-=over 4
-
-=item supplier
-
-C<$supplier> is the suplier we have to search order.
-=back
-
-=item op
-
-C<OP> can be equals to 'close' if we have to close a basket before building the page.
-
-=item basket
-
-the C<basket> we have to close if op is equal to 'close'.
-
-=back
-
-=cut
-
-use strict;
-use C4::Auth;
-use CGI;
-use C4::Interface::CGI::Output;
-use C4::Acquisition;
-use C4::Date;
-use C4::Bookseller;
-
-my $query = new CGI;
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "acqui/booksellers.tmpl",
-        query           => $query,
-        type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { acquisition => 1 },
-        debug           => 1,
-    }
-);
-
-#parameters
-my $supplier = $query->param('supplier');
-
-my @suppliers = GetBookSeller($supplier);
-my $count = scalar @suppliers;
-
-# check if we have to "close" a basket before building page
-my $op     = $query->param('op');
-my $basketno = $query->param('basketno');
-if ( $op eq 'close' ) {
-    CloseBasket($basketno);
-}
-
-#build result page
-my $toggle = 0;
- my $ordcount;
-my @loop_suppliers;
-for ( my $i = 0 ; $i < $count ; $i++ ) {
-   my $orders  = GetPendingOrders( $suppliers[$i]->{'id'} );
- my    $ordercount = scalar @$orders;
-$ordcount+=$ordercount;
-    my %line;
-    if ( $toggle == 0 ) {
-        $line{even} = 1;
-        $toggle = 1;
-    }
-    else {
-        $line{even} = 0;
-        $toggle = 0;
-    }
-    $line{supplierid} = $suppliers[$i]->{'id'};
-    $line{name}       = $suppliers[$i]->{'name'};
-    $line{active}     = $suppliers[$i]->{'active'};
-    $line{ordcount}=$ordercount;	
-    my @loop_basket;
-     foreach my $order(@$orders){
-        push @loop_basket, $order;
-    }
-    $line{loop_basket} = \@loop_basket;
-    push @loop_suppliers, \%line;
-}
-$template->param(
-    loop_suppliers          => \@loop_suppliers,
-    supplier                => $supplier,
-    count                   => $ordcount,
-    intranetcolorstylesheet =>
-    C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav        => C4::Context->preference("IntranetNav"),
-);
-
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/acqui/currency.pl
===================================================================
RCS file: cgi-bin/acqui/currency.pl
diff -N cgi-bin/acqui/currency.pl
--- cgi-bin/acqui/currency.pl	10 Mar 2007 01:07:50 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: currency.pl,v 1.1.2.1 2007/03/10 01:07:50 tgarip1957 Exp $
-
-#written by chris at katipo.co.nz
-#9/10/2000
-#script to display and update currency rates
-
-
-# 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 CGI;
-use C4::Acquisition;
-use C4::Biblio;
-use C4::Bookfund;
-
-my $input=new CGI;
-
-my @params=$input->param;
-foreach my $param (@params){
-	if ($param ne 'type' && $param !~ /submit/){
-		my $data=$input->param($param);
-#		warn "$data / $param";
-		ModCurrencies($param,$data);
-}
-}
-print $input->redirect('/cgi-bin/koha/acqui/acqui-home.pl');

Index: cgi-bin/acqui/finishreceive.pl
===================================================================
RCS file: cgi-bin/acqui/finishreceive.pl
diff -N cgi-bin/acqui/finishreceive.pl
--- cgi-bin/acqui/finishreceive.pl	10 Mar 2007 01:07:50 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,108 +0,0 @@
-#!/usr/bin/perl
-
-#script to add a new item and to mark orders as received
-#written 1/3/00 by chris at katipo.co.nz
-
-# 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
-
-# this script makes the items, addorder.pl has already made the biblio and biblioitem records: MASON
-
-
-=head1 NAME
-
-finishreceive.pl
-
-=head1 DESCRIPTION
-TODO
-
-=head1 CGI PARAMETERS
-
-=over 4
-
-TODO
-
-=back
-
-=cut
-
-use strict;
-use C4::Acquisition;
-use CGI;
-use C4::Interface::CGI::Output;
-use C4::Auth;
-use C4::Bookseller;
-
-my $input = new CGI;
-
-my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
-    {
-        template_name   => "acqui/finishreceive.tmpl",
-        query           => $input,
-        type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { editcatalogue => 1 },
-        debug           => 1,
-    }
-);
-
-my @biblionumber     = $input->param('biblionumber');
-my @ordnum           = $input->param('ordernumber');
-my $cost             = $input->param('invoicetotal');
-my $locacost             = $input->param('localtotal');
-my $invoiceno        = $input->param('invoice');
-my @replacement    = $input->param('actual');
-my @gst            = $input->param('gstrate');
-my $freight        = $input->param('actualfreight');
-my @freightperitem = $input->param('freight');
-my $supplierid     = $input->param('supplierid');
-my @title         = $input->param('title');
-my $currencyrate=$input->param('currencyrate');
-my @bookfund      = $input->param('bookfund');
-my @discount     = $input->param('discount');
-my @quantrec      = $input->param('received');
-my $totalreceived=$input->param('totalreceived');
-my $incgst=$input->param('incgst');
-my $ecost;
-my $unitprice;
-my $listprice;
-
-my @supplier=GetBookSeller($supplierid);
-my $count=scalar @quantrec;
-my @additems;
-
- for (my $i=0; $i<$count;$i++){
- $freightperitem[$i]=$freight/$totalreceived unless  $freightperitem[$i];
-$listprice=$replacement[$i];
-  $replacement[$i]= $replacement[$i]*$currencyrate;
-	if ($incgst){
-	$ecost= ($replacement[$i]*100/($gst[$i]+100))*(100 - $discount[$i])/100;
-	}else{
-	$ecost= $replacement[$i]*(100 - $discount[$i])/100;
-	}
-$unitprice=$ecost + $ecost*$gst[$i]/100;
-    	if ( $quantrec[$i] != 0 ) {
-       	 # save the quantity recieved.
-        	ModReceiveOrder( $biblionumber[$i], $ordnum[$i], $quantrec[$i], $unitprice,
-            $invoiceno, $freightperitem[$i], $replacement[$i] ,$listprice,$input );   
-  	push @additems,{biblionumber=>$biblionumber[$i],itemcount=>$quantrec[$i], title=>$title[$i],supplier=>$supplier[0]->{name},rrp=>$replacement[$i],};
-
-	}
-}
-$template->param(loopbiblios => \@additems,);
-                      
- output_html_with_http_headers $input, $cookie, $template->output;
\ No newline at end of file

Index: cgi-bin/acqui/histsearch.pl
===================================================================
RCS file: cgi-bin/acqui/histsearch.pl
diff -N cgi-bin/acqui/histsearch.pl
--- cgi-bin/acqui/histsearch.pl	10 Mar 2007 01:07:50 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,90 +0,0 @@
-#!/usr/bin/perl
-
-# 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
-
-# $Id: histsearch.pl,v 1.1.2.1 2007/03/10 01:07:50 tgarip1957 Exp $
-
-
-=head1 NAME
-
-histsearch.pl
-
-=head1 DESCRIPTION
-this script offer a interface to search among order.
-
-
-=head1 CGI PARAMETERS
-
-=over 4
-
-=item title
-if the script has to filter the results on title.
-
-=item author
-if the script has to filter the results on author.
-
-=item name
-if the script has to filter the results on supplier.
-
-=item fromplacedon
-to filter on started date.
-
-=item toplacedon
-to filter on ended date.
-
-=back
-
-=cut
-
-use strict;
-require Exporter;
-use CGI;
-use C4::Auth;       # get_template_and_user
-use C4::Interface::CGI::Output;
-use C4::Acquisition;
-
-my $input = new CGI;
-my $title = $input->param('title');
-my $author = $input->param('author');
-my $name = $input->param('name');
-my $from_placed_on = $input->param('fromplacedon');
-my $to_placed_on = $input->param('toplacedon');
-
-my $dbh = C4::Context->dbh;
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "acqui/histsearch.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {acquisition => 1},
-			     debug => 1,
-			     });
-my ($order_loop,$total_qty,$total_price,$total_qtyreceived)= &GetHistory($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,
-				author => $author,
-				name => $name,
-				from_placed_on =>$from_placed_on,
-				to_placed_on =>$to_placed_on,
-				intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-);
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/acqui/lateorders.pl
===================================================================
RCS file: cgi-bin/acqui/lateorders.pl
diff -N cgi-bin/acqui/lateorders.pl
--- cgi-bin/acqui/lateorders.pl	10 Mar 2007 01:07:50 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,122 +0,0 @@
-#!/usr/bin/perl
-
-# 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
-
-# $Id: lateorders.pl,v 1.1.2.1 2007/03/10 01:07:50 tgarip1957 Exp $
-
-=head1 NAME
-
-lateorders.pl
-
-=head1 DESCRIPTION
-
-this script shows late orders for a specific supplier, branch and delay
-given on input arg.
-
-=head1 CGI PARAMETERS
-
-=over 4
-
-=item supplierid
-To know on which supplier this script have to display late order.
-
-=item delay
-To know the time boundary. Default value is 30 days.
-
-=item branch
-To know on which branch this script have to display late order.
-
-=back
-
-=cut
-
-use strict;
-use CGI;
-use C4::Bookseller;
-use C4::Auth;
-use C4::Koha;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Context;
-use C4::Acquisition;
-
-my $query = new CGI;
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user(
-                {template_name => "acqui/lateorders.tmpl",
-				query => $query,
-				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {acquisition => 1},
-				debug => 1,
-				});
-
-my $supplierid = $query->param('supplierid');
-my $delay = $query->param('delay');
-my $branch = $query->param('branch');
-
-#default value for delay
-$delay = 30 unless $delay;
-
-my %supplierlist = GetBooksellersWithLateOrders($delay,$branch);
-my @select_supplier;
-push @select_supplier,"";
-foreach my $supplierid (keys %supplierlist){
-	push @select_supplier, $supplierid;
-}
-
-my $CGIsupplier=CGI::scrolling_list( -name     => 'supplierid',
-			-values   => \@select_supplier,
-			-default  => $supplierid,
-			-labels   => \%supplierlist,
-			-size     => 1,
-			-tabindex=>'',
-			-multiple => 0 );
-
-$template->param(Supplier=>$supplierlist{$supplierid}) if ($supplierid);
-
-my $branches = GetBranches;
-
-my @branchloop;
-foreach my $thisbranch (sort keys %$branches) {
-	my %row =(value => $thisbranch,
-				branchname => $branches->{$thisbranch}->{'branchname'},
-			);
-	push @branchloop, \%row;
-}
-my $CGIbranch=CGI::scrolling_list( -name     => 'branch',
-				-values   => \@branchloop,
-				-labels   => $branches,
-				-size     => 1,
- 				-tabindex=>'',
-				-multiple => 0 );
-
-my @lateorders = GetLateOrders($delay,$supplierid,$branch);
-my $count = scalar @lateorders;
-
-my $total;
-foreach my $lateorder (@lateorders){
-	$total+=$lateorder->{subtotal};
-}
-$template->param(delay=>$delay) if ($delay);
-$template->param(
-	branchloop => \@branchloop,
-	CGIsupplier => $CGIsupplier,
-	lateorders => \@lateorders,
-	total=>$total,
-	intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-	);
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/acqui/neworderempty.pl
===================================================================
RCS file: cgi-bin/acqui/neworderempty.pl
diff -N cgi-bin/acqui/neworderempty.pl
--- cgi-bin/acqui/neworderempty.pl	10 Mar 2007 01:07:50 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,315 +0,0 @@
-#!/usr/bin/perl
-
-#script to show display basket of orders
-#written by chris at katipo.co.nz 24/2/2000
-
-# 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
-
-
-=head1 NAME
-
-neworderempty.pl
-
-=head1 DESCRIPTION
-this script allows to create a new record to order it. This record shouldn't exist
-on database.
-
-=head1 CGI PARAMETERS
-
-=over 4
-
-=item booksellerid
-the bookseller the librarian has to buy a new book.
-
-=item title
-the title of this new record.
-
-=item author
-the author of this new record.
-
-=item copyright
-the copyright of this new record.
-
-=item ordnum
-the number of this order.
-
-=item biblio
-
-=item basketno
-the basket number for this new order.
-
-=item suggestionid
-if this order comes from a suggestion.
-
-=item close
-
-=back
-
-=cut
-
-use strict;
-use CGI;
-use C4::Context;
-use C4::Auth;
-use C4::Bookfund;
-use C4::Bookseller;
-use C4::Acquisition;
-use C4::Suggestions;
-use C4::Biblio;
-use C4::Search;
-use C4::Koha;
-use C4::Interface::CGI::Output;
-use C4::Members;
-use C4::Input;
-use C4::Date;
-
-my $input        = new CGI;
-my $booksellerid = $input->param('booksellerid');
-my $title        = $input->param('title');
-my $author       = $input->param('author');
-my $copyright    = $input->param('copyright');
-my @booksellers  = GetBookSeller($booksellerid);
-my $count        = scalar @booksellers;
-my $ordnum       = $input->param('ordnum');
-my $biblionumber       = $input->param('biblionumber');
-my $basketno     = $input->param('basketno');
-my $suggestionid = $input->param('suggestionid');
-my $close        = $input->param('close');
-my $data;
-my $new;
-
-my $dbh = C4::Context->dbh;
-
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "acqui/neworderempty.tmpl",
-        query           => $input,
-        type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { acquisition => 1 },
-        debug           => 1,
-    }
-);
-my $me= C4::Context->userenv;
-my $homebranch=$me->{'branch'} ;
-my $branch;
-my $bookfundid;
-my $discount= $booksellers[0]->{'discount'};
-my $gstrate=C4::Context->preference('gist')*100;
-if ( $ordnum eq '' ) {    # create order
-    $new = 'yes';
-    if ( $biblionumber  ) {
-	my $record=XMLgetbibliohash($dbh,$biblionumber);
-          ###Error checking if a non existent biblionumber given manually
-	if (!$record){
-	print $input->redirect("/cgi-bin/koha/acqui/basket.pl?supplierid=$booksellerid");
-	}
-	 $data = XMLmarc2koha_onerecord($dbh,$record,"biblios");
-    }elsif($suggestionid){
-	$data = GetSuggestion($suggestionid);
-    
-   	 if ( $data->{'title'} eq '' ) {
-        	$data->{'title'}         = $title;
-       	 $data->{'author'}        = $author;
-       	 $data->{'copyrightdate'} = $copyright;
-    	}
-   }### if biblionumber
- if ($basketno){
-	 my $basket = GetBasket( $basketno);
-	my @orders=GetOrders($basketno);
-		if (@orders){
-		$template->param(
-    		purchaseordernumber     =>  $orders[0]->{purchaseordernumber}, );
-		}
-	$template->param(
-    	creationdate     => format_date( $basket->{creationdate} ),
-    	authorisedbyname => $basket->{authorisedbyname},);
-  }else{
-	
-	my $date = get_today();
-	$template->param(
-    	creationdate     => format_date($date),
-    	authorisedbyname => $loggedinuser,);
-  }
-}else {    #modify order
-    $data   = GetSingleOrder($ordnum);
-    $biblionumber = $data->{'biblionumber'};
-    #get basketno and suppleirno. too!
-    my $data2 = GetBasket( $data->{'basketno'} );
-    $basketno     = $data->{'basketno'};
-    $booksellerid = $data2->{'booksellerid'};
-    $discount=$data->{'discount'};
-       $gstrate=$data->{'gst'} ;
-    $bookfundid =$data->{'bookfundid'};
- my $aqbookfund=GetBookFund($data->{'bookfundid'});
-$branch=$aqbookfund->{branchcode};
-$template->param(	
-	purchaseordernumber     =>  $data->{purchaseordernumber},
-    	creationdate     => format_date( $data2->{creationdate} ),
-    	authorisedbyname => $data2->{authorisedbyname},);
-	
-}
-
-
-
-# get currencies (for exchange rates calcs if needed)
-my @rates = GetCurrencies();
-my $count = scalar @rates;
-
-my @loop_currency = ();
-for ( my $i = 0 ; $i < $count ; $i++ ) {
-    my %line;
-    $line{currency} = $rates[$i]->{'currency'};
-    $line{rate}     = $rates[$i]->{'rate'};
-    push @loop_currency, \%line;
-}
-
-
-
-
-
-# build branches list
-my $branches = GetBranches;
-my @branchloop;
-foreach my $thisbranch ( sort keys %$branches ) {
-my $selected=1 if $thisbranch eq $branch;
-     my %row = ( 
-        value      => $thisbranch,
-        branchname => $branches->{$thisbranch}->{'branchname'},
-	selected=>$selected ,
-    );
-    push @branchloop, \%row;
-}
-$template->param( branchloop => \@branchloop );
-
-# build bookfund list
-
-my $count2;
-my @bookfund;
-my @select_bookfund;
-my %select_bookfunds;
-my $selbookfund;
- at bookfund = GetBookFunds($homebranch);
-$count2 = scalar @bookfund;
-
-for ( my $i = 0 ; $i < $count2 ; $i++ ) {
-    push @select_bookfund, $bookfund[$i]->{'bookfundid'};
-    $select_bookfunds{ $bookfund[$i]->{'bookfundid'} } =
-      $bookfund[$i]->{'bookfundname'};
-	if ($bookfund[$i]->{'bookfundid'} eq $bookfundid){
-	$selbookfund=1;
-	}
-}
-my $CGIbookfund = CGI::scrolling_list(
-    -name     => 'bookfundid',
-    -values   => \@select_bookfund,
-    -default  => $data->{'bookfundid'},
-    -labels   => \%select_bookfunds,
-    -size     => 1,
-    -selected =>$selbookfund,
-    -multiple => 0
-);
-
-my $bookfundname;
-
-if ($close) {
-    $bookfundid   = $data->{'bookfundid'};
-    $bookfundname = $select_bookfunds{$bookfundid};
-}
-
-#Build sort lists
-my $CGIsort1 = buildCGIsort( "Asort1", "sort1", $data->{'sort1'} );
-if ($CGIsort1) {
-    $template->param( CGIsort1 => $CGIsort1 );
-}
-else {
-    $template->param( sort1 => $data->{'sort1'} );
-}
-
-my $CGIsort2 = buildCGIsort( "Asort2", "sort2", $data->{'sort2'} );
-if ($CGIsort2) {
-    $template->param( CGIsort2 => $CGIsort2 );
-}
-else {
-    $template->param( sort2 => $data->{'sort2'} );
-}
-
-my $bibitemsexists;
-
-#
-
-    $template->param( bibitemexists => "1" ) if $biblionumber;
-	 my @bibitemloop;
-          my %line;
-        $line{isbn}             = $data->{'isbn'};
-        $line{itemtype}         = $data->{'itemtype'};
-        $line{volumeddesc}      = $data->{'volumeddesc'};
-        push( @bibitemloop, \%line );
-
-        $template->param( bibitemloop => \@bibitemloop );
-    
-
-
-# fill template
-$template->param(
-    close        => $close,
-    bookfundid   => $bookfundid,
-    bookfundname => $bookfundname
-  )
-  if ($close);
-
-$template->param(
-    existing         => $biblionumber,
-    ordnum           => $ordnum,
-    basketno         => $basketno,
-    booksellerid     => $booksellerid,
-    suggestionid     => $suggestionid,
-    biblionumber           => $biblionumber,
-    itemtype         => $data->{'itemtype'},
-    discount         => $discount,
-    listincgst       => $booksellers[0]->{'listincgst'},
-    listprice        => $booksellers[0]->{'listprice'},
-    gstreg           => $booksellers[0]->{'gstreg'},
-    invoiceinc       => $booksellers[0]->{'invoiceincgst'},
-    invoicedisc      => $booksellers[0]->{'invoicedisc'},
-    nocalc           => $booksellers[0]->{'nocalc'},
-    name             => $booksellers[0]->{'name'},
-    currency         => $booksellers[0]->{'listprice'},
-    gstrate          =>$gstrate,
-    loop_currencies  => \@loop_currency,
-    orderexists      => ( $new eq 'yes' ) ? 0 : 1,
-    title            => $data->{'title'},
-    author           => $data->{'author'},
-    copyrightdate    => $data->{'copyrightdate'},
-    CGIbookfund      => $CGIbookfund,
-    isbn             => $data->{'isbn'},
-    seriestitle      => $data->{'seriestitle'},
-    quantity         => $data->{'quantity'},
-    listprice        => $data->{'listprice'},
-    rrp              => $data->{'rrp'},
-    invoice          => $data->{'booksellerinvoicenumber'},
-    ecost            => $data->{'ecost'},
-    total		=>$data->{'unitprice'}* $data->{'quantity'},
-  unitprice            => $data->{'unitprice'},
- gst        => $data->{'ecost'}*$gstrate/100,
-    notes            => $data->{'notes'},
-    publishercode    => $data->{'publishercode'},
-#     donation         => $donation
-);
-
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/acqui/newordersuggestion.pl
===================================================================
RCS file: cgi-bin/acqui/newordersuggestion.pl
diff -N cgi-bin/acqui/newordersuggestion.pl
--- cgi-bin/acqui/newordersuggestion.pl	10 Mar 2007 01:07:50 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,172 +0,0 @@
-#!/usr/bin/perl
-
-# 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
-
-# $Id: newordersuggestion.pl,v 1.1.2.1 2007/03/10 01:07:50 tgarip1957 Exp $
-
-=head1 NAME
-newordersuggestion.pl
-
-=head1 DESCRIPTION
-this script allow to add an order from a existing suggestion.
-
-=head1 CGI PARAMETERS
-
-=over 4
-
-=item basketno
-the number of this basket.
-
-=item booksellerid
-the bookseller who sells this record.
-
-=item title
-the title of this record suggested.
-
-=item author
-the author of this suggestion.
-
-=item note
-this param allow to enter a note with this suggestion.
-
-=item copyrightdate
-the copyright date for this suggestion.
-
-=item publishercode
-
-=item volumedesc
-
-=item publicationyear
-the publication year of this record.
-
-=item place
-
-=item isbn
-the isbn of this suggestion.
-
-=item duplicateNumber
-is the biblionumber to put to the new suggestion.
-
-=item suggestionid
-the id of the suggestion to select.
-
-=item op
-can be equal to
-    * connectDuplicate :
-        then call to the function : ConnectSuggestionAndBiblio.
-        i.e set the biblionumber of this suggestion.
-    * else :
-        is the default value.
-=back
-
-=cut
-
-use strict;
-require Exporter;
-use CGI;
-use C4::Auth;       # get_template_and_user
-use C4::Interface::CGI::Output;
-use C4::Suggestions;
-use C4::Biblio;
-use C4::Search;
-
-my $input = new CGI;
-
-my $basketno = $input->param('basketno');
-my $supplierid = $input->param('booksellerid');
-my $title = $input->param('title');
-my $author = $input->param('author');
-my $note = $input->param('note');
-my $copyrightdate =$input->param('copyrightdate');
-my $publishercode = $input->param('publishercode');
-my $volumedesc = $input->param('volumedesc');
-my $publicationyear = $input->param('publicationyear');
-my $place = $input->param('place');
-my $isbn = $input->param('isbn');
-my $duplicateNumber = $input->param('duplicateNumber');
-my $suggestionid = $input->param('suggestionid');
-
-my $status = 'ACCEPTED'; # the suggestion had to be accepeted before to order it.
-my $suggestedbyme = -1; # search ALL suggestors
-my $op = $input->param('op');
-$op = 'else' unless $op;
-
-my $dbh = C4::Context->dbh;
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "acqui/newordersuggestion.tmpl",
-			     type => "intranet",
-			     query => $input,
-			     authnotrequired => 1,
-			     flagsrequired => {acquisition => 1},
-			 });
-
-if ($op eq 'connectDuplicate') {
-	ConnectSuggestionAndBiblio($suggestionid,$duplicateNumber);
-}
-my $suggestions_loop= &SearchSuggestion($borrowernumber,$author,$title,$publishercode,$status,$suggestedbyme);
-foreach (@$suggestions_loop) {
-	unless ($_->{biblionumber}) {
-		my (@kohafields, @and_or, @value, @relation,  $offset,$length);
-		# search on biblio.title
-		if ($_->{title}) {
-			push @kohafields, "title";
-			push @and_or, "\@and";
-			push @relation, "\@attr 5=1";
-			push @value, $_->{title};
-		}
-		if ($_->{author}) {
-			push @kohafields, "author";
-			push @and_or, "\@and";
-			push @relation, "";
-			push @value, $_->{author};
-		}
-		# ... and on publicationyear.
-		if ($_->{publicationyear}) {
-			push @kohafields, "copyrightdate";
-			push @and_or, "\@and";
-			push @relation, "";
-			push @value, $_->{publicationyear};
-		}
-		# ... and on publisher.
-		if ($_->{publishercode}) {
-			push @kohafields, "publishercode";
-			push @and_or, "\@and";
-			push @relation, "";
-			push @value, $_->{publishercode};
-		}
-	
-		my ($nbresult,$facets, at finalresult) = ZEBRAsearch_kohafields(\@kohafields,\@value,\@relation,"",\@and_or,0,"",0,1);
-
-		# there is at least 1 result => return the 1st one
-		if ($nbresult) {
-			$_->{duplicateBiblionumber} = $finalresult[0]->{biblionumber};
-		}
-	}
-}
-$template->param(suggestions_loop => $suggestions_loop,
-				title => $title,
-				author => $author,
-				publishercode => $publishercode,
-				status => $status,
-				suggestedbyme => $suggestedbyme,
-				basketno => $basketno,
-				supplierid => $supplierid,
-				"op_$op" => 1,
-				intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-);
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/acqui/parcel.pl
===================================================================
RCS file: cgi-bin/acqui/parcel.pl
diff -N cgi-bin/acqui/parcel.pl
--- cgi-bin/acqui/parcel.pl	10 Mar 2007 01:07:50 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,187 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: parcel.pl,v 1.1.2.1 2007/03/10 01:07:50 tgarip1957 Exp $
-
-#script to recieve orders
-#written by chris at katipo.co.nz 24/2/2000
-
-
-# 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
-
-
-=head1 NAME
-
-parcel.pl
-
-=head1 DESCRIPTION
-This script shows all orders receipt or pending for a given supplier.
-It allows to write an order as 'received' when he arrives.
-
-=head1 CGI PARAMETERS
-
-=over 4
-
-=item supplierid
-To know the supplier this script has to show orders.
-
-=item code
-is the bookseller invoice number.
-
-=item freight
-
-
-=item gst
-
-
-=item datereceived
-To filter the results list on this given date.
-
-=back
-
-=cut
-use strict;
-use C4::Auth;
-use C4::Acquisition;
-use C4::Bookseller;
-use C4::Bookfund;
-use C4::Biblio;
-use CGI;
-use C4::Interface::CGI::Output;
-use C4::Date;
-use Time::localtime;
-
-
-my $input=new CGI;
-my $supplierid=$input->param('supplierid');
-my $basketno=$input->param('basketno');
-my @booksellers=GetBookSeller($supplierid);
-my $count = scalar @booksellers;
-
-my @datetoday = localtime();
-my $date = (1900+$datetoday[5])."-".($datetoday[4]+1)."-". $datetoday[3];
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "acqui/parcel.tmpl",
-                 query => $input,
-                 type => "intranet",
-                 authnotrequired => 0,
-                 flagsrequired => {acquisition => 1},
-                 debug => 1,
-});
-
-my @booksellers=GetBookSeller($supplierid);
-
-my $gstreg=$booksellers[0]->{gstreg};
-my $incgst=$booksellers[0]->{'invoiceincgst'};
-my $invcurrency=$booksellers[0]->{'invoiceprice'};
-my $discount=$booksellers[0]->{'discount'};
-my $currencyrate;
-# get currencies (for exchange rates calcs if needed)
-my @rates = GetCurrencies();
-my $count = scalar @rates;
-
-for ( my $i = 0 ; $i < $count ; $i++ ) {
- if ($rates[$i]->{'currency'} eq $invcurrency){
-    $currencyrate     = $rates[$i]->{'rate'};
-   }
-}
-my $me=C4::Context->userenv;
-my $user=$me->{'cardnumber'};
-my $totalprice=0;
-my $totalfreight=0;
-my $totalquantity=0;
-my $totaldiscount=0;
-my $total;
-my $tototal;
-my $toggle;
-my $totalgst;
-my $totaltoreceive;
-my $totaltoprice;
-my $totaltogst;
-my $totaltodiscount;
-my @loop_orders;
-my $countpendings;
-my $invoice;
-##Receiving a single basket or all baskets of a supplier
-unless($basketno){
-my $pendingorders = GetPendingOrders($supplierid);
-$countpendings = scalar @$pendingorders;
-foreach my $pendingorder (@$pendingorders){
- my @orders=GetOrders($pendingorder->{basketno});
-  foreach my $order(@orders){
-  $order->{toreceive}=$order->{quantity} - $order->{quantityreceived};
-  $totalquantity+=$order->{quantity};
-  $totaltoreceive+=$order->{toreceive};
-  $totalprice+=$order->{rrp}*$order->{quantity};
-  $totaltoprice+=$order->{rrp}*$order->{toreceive};
-  $totalgst+=(($order->{rrp}*$order->{quantity}) -($order->{rrp}*$order->{quantity}*$order->{discount}/100))* $order->{gst}/100;
-  $totaltogst+=(($order->{rrp}*$order->{toreceive}) -($order->{rrp}*$order->{toreceive}*$order->{discount}/100))* $order->{gst}/100;
-  $totaldiscount +=$order->{rrp}*$order->{quantity}*$order->{discount}/100;
-  $totaltodiscount +=$order->{rrp}*$order->{toreceive}*$order->{discount}/100;
-  $order->{actualrrp}=sprintf( "%.2f",$order->{rrp}/$currencyrate);
-	push @loop_orders, $order;
-  }	
-}
-  
-}else{
-## one basket
-$countpendings=1;
-
-my @orders=GetOrders($basketno);
-  foreach my $order(@orders){
-$invoice=$order->{booksellerinvoicenumber} unless $invoice;
-  $order->{toreceive}=$order->{quantity} - $order->{quantityreceived};
-  $totalquantity+=$order->{quantity};
-  $totaltoreceive+=$order->{toreceive};
-  $totalprice+=$order->{rrp}*$order->{quantity};
-  $totaltoprice+=$order->{rrp}*$order->{toreceive};
-  $totalgst+=(($order->{rrp}*$order->{quantity}) -($order->{rrp}*$order->{quantity}*$order->{discount}/100))* $order->{gst}/100;
-  $totaltogst+=(($order->{rrp}*$order->{toreceive}) -($order->{rrp}*$order->{toreceive}*$order->{discount}/100))* $order->{gst}/100;
-  $totaldiscount +=$order->{rrp}*$order->{quantity}*$order->{discount}/100;
-  $totaltodiscount +=$order->{rrp}*$order->{toreceive}*$order->{discount}/100;
-  $order->{actualrrp}=sprintf( "%.2f",$order->{rrp}/$currencyrate);
-	push @loop_orders, $order;
-  }	
-}
-undef $invcurrency if ($currencyrate ==1);
-
-$template->param( invoice=>$invoice,
-                        date => format_date($date),
-                        name => $booksellers[0]->{'name'},
-                        supplierid => $supplierid,
-                        countpending => $countpendings,
-                        loop_orders => \@loop_orders,
- 	          user=>$user,
-	         totalquantity=>$totalquantity,
-	         totaltoreceive=>$totaltoreceive,
-	          totalprice=>sprintf( "%.2f",$totalprice),
-	         totalactual =>sprintf( "%.2f",$totaltoprice/$currencyrate),
-                        totalgst=>sprintf( "%.2f",$totalgst),
-                        actualgst=>sprintf( "%.2f",$totaltogst/$currencyrate),
-		totaldiscount=>sprintf( "%.2f",$totaldiscount),
-		actualdiscount=>sprintf( "%.2f",$totaltodiscount/$currencyrate),	
-		total=>sprintf( "%.2f",$totalprice+$totalgst-$totaldiscount),
-		gstreg=>$gstreg,
-                            gstrate=>C4::Context->preference('gist')*100,
-		currencyrate=>$currencyrate,
-		incgst =>$incgst,
-		invcurrency=>$invcurrency ,
-                        intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-        intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-        IntranetNav => C4::Context->preference("IntranetNav"),
-                        );
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/acqui/select-late.pl
===================================================================
RCS file: cgi-bin/acqui/select-late.pl
diff -N cgi-bin/acqui/select-late.pl
--- cgi-bin/acqui/select-late.pl	10 Mar 2007 01:07:50 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,102 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: select-late.pl,v 1.1.2.1 2007/03/10 01:07:50 tgarip1957 Exp $
-
-#script to show suppliers and orders
-#written by chris at katipo.co.nz 23/2/2000
-
-
-# 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::Auth;
-use C4::Biblio;
-use CGI;
-use C4::Interface::CGI::Output;
-use C4::Context;
-use C4::Date;
-use C4::Acquisition;
-
-my $query=new CGI;
-my $dbh = C4::Context->dbh;
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "acqui/select-late.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {acquisition => 1},
-			     debug => 1,
-			     });
-
-my $supplier=$query->param('id');
-my @suppliers=GetBookSeller($supplier);
-my $count = scalar @suppliers;
-
-my $sth = $dbh->prepare("select s.serialseq from serial s, subscription u where s.subscriptionid = u.subscriptionid and u.aqbooksellerid = ? and s.status = 2");
-
-$sth->execute($supplier);
-my  @final;
-while (my $sol = $sth->fetchrow_hashref)
-{
-    push @final, $sol;
-}
-
-$template->param(@loop_sol => \@final);
-
-my $colour='#EEEEEE';
-my $toggle=0;
-my @loop_suppliers;
-for (my $i=0; $i<$count; $i++) {
-	my $orders = GetPendingOrders($suppliers[$i]->{'id'});
-    my $ordcount = scalar @$orders;
-    
-	my %line;
-	if ($toggle==0){
-		$line{color}='#EEEEEE';
-		$toggle=1;
-	} else {
-		$line{color}='white';
-		$toggle=0;
-	}
-	$line{id} =$suppliers[$i]->{'id'};
-	$line{name} = $suppliers[$i]->{'name'};
-	$line{active} = $suppliers[$i]->{'active'};
-	$line{total} = $orders->[0]->{'count(*)'};
-	$line{authorisedby} = $orders->[0]->{'authorisedby'};
-	$line{entrydate} = $orders->[0]->{'entrydate'};
-	my @loop_basket;
-	for (my $i2=0;$i2<$ordcount;$i2++){
-		my %inner_line;
-		$inner_line{basketno} =$orders->[$i2]->{'basketno'};
-		$inner_line{total} =$orders->[$i2]->{'count(*)'};
-		$inner_line{authorisedby} = $orders->[$i2]->{'authorisedby'};
-		$inner_line{entrydate} = format_date($orders->[$i2]->{'entrydate'});
-		push @loop_basket, \%inner_line;
-	}
-	$line{loop_basket} = \@loop_basket;
-	push @loop_suppliers, \%line;
-}
-$template->param(loop_suppliers => \@loop_suppliers,
-						supplier => $supplier,
-						count => $count,
-						intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-						);
-
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/acqui/supplier.pl
===================================================================
RCS file: cgi-bin/acqui/supplier.pl
diff -N cgi-bin/acqui/supplier.pl
--- cgi-bin/acqui/supplier.pl	10 Mar 2007 01:07:50 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,112 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: supplier.pl,v 1.1.2.1 2007/03/10 01:07:50 tgarip1957 Exp $
-
-#script to show display basket of orders
-#written by chris at katipo.co.nz 24/2/2000
-
-# 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
-
-=head1 NAME
-
-supplier.pl
-
-=head1 DESCRIPTION
-this script shows the details for a bookseller given on input arg.
-It allows to edit & save information about this bookseller.
-
-=head1 CGI PARAMETERS
-
-=over 4
-
-=item supplierid
-To know the bookseller this script has to display details.
-
-=back
-
-=cut
-
-use strict;
-use C4::Auth;
-use C4::Acquisition;
-use C4::Biblio;
-use CGI;
-use C4::Interface::CGI::Output;
-use C4::Bookseller;
-use C4::Bookfund;
-
-my $query=new CGI;
-my $id=$query->param('supplierid');
-my @booksellers = GetBookSeller($id);
-my $count = scalar @booksellers;
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "acqui/supplier.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {acquisition => 1},
-			     debug => 1,
-			     });
-
-#build array for currencies
-my @currencies = GetCurrencies();
-my $count = scalar @currencies;
-
-my @loop_pricescurrency;
-my @loop_invoicecurrency;
-for (my $i=0;$i<$count;$i++) {
-	if ($booksellers[0]->{'listprice'} eq $currencies[$i]->{'currency'}) {
-		push @loop_pricescurrency, { currency => "<option selected=\"selected\" value=\"$currencies[$i]->{'currency'}\">$currencies[$i]->{'currency'}</option>" };
-	} else {
-		push @loop_pricescurrency, { currency => "<option value=\"$currencies[$i]->{'currency'}\">$currencies[$i]->{'currency'}</option>"};
-	}
-	if ($booksellers[0]->{'invoiceprice'} eq $currencies[$i]->{'currency'}) {
-		push @loop_invoicecurrency, { currency => "<option selected=\"selected\" value=\"$currencies[$i]->{'currency'}\">$currencies[$i]->{'currency'}</option>"};
-	} else {
-		push @loop_invoicecurrency, { currency => "<option value=\"$currencies[$i]->{'currency'}\">$currencies[$i]->{'currency'}</option>"};
-	}
-}
-$template->param(id => $id,
-					name => $booksellers[0]->{'name'},
-					postal =>$booksellers[0]->{'postal'},
-					address1 => $booksellers[0]->{'address1'},
-					address2 => $booksellers[0]->{'address2'},
-					address3 => $booksellers[0]->{'address3'},
-					address4 => $booksellers[0]->{'address4'},
-					phone =>$booksellers[0]->{'phone'},
-					fax => $booksellers[0]->{'fax'},
-					url => $booksellers[0]->{'url'},
-					contact => $booksellers[0]->{'contact'},
-					contpos => $booksellers[0]->{'contpos'},
-					contphone => $booksellers[0]->{'contphone'},
-					contaltphone => $booksellers[0]->{'contaltphone'},
-					contfax => $booksellers[0]->{'contfax'},
-					contemail => $booksellers[0]->{'contemail'},
-					contnotes => $booksellers[0]->{'contnotes'},
-					notes => $booksellers[0]->{'notes'},
-					active => $booksellers[0]->{'active'},
-					specialty => $booksellers[0]->{'specialty'},
-					gstreg => $booksellers[0]->{'gstreg'},
-					listincgst => $booksellers[0]->{'listincgst'},
-					invoiceincgst => $booksellers[0]->{'invoiceincgst'},
-					discount => $booksellers[0]->{'discount'},
-					loop_pricescurrency => \@loop_pricescurrency,
-					loop_invoicecurrency => \@loop_invoicecurrency,);
-
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/acqui/updatesupplier.pl
===================================================================
RCS file: cgi-bin/acqui/updatesupplier.pl
diff -N cgi-bin/acqui/updatesupplier.pl
--- cgi-bin/acqui/updatesupplier.pl	10 Mar 2007 01:07:50 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,96 +0,0 @@
-#!/usr/bin/perl
-
-#script to show suppliers and orders
-#written by chris at katipo.co.nz 23/2/2000
-
-
-# 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
-
-=head1 NAME
-updatesupplier.pl
-
-=head1 DESCRIPTION
-this script allow to update or create (if id == 0)
-a supplier. This script is called from acqui/supplier.pl.
-
-=head1 CGI PARAMETERS
-
-=over 4
-
-All informations regarding this supplier are listed on input parameter.
-Here is the list :
-supplier, id, company, company_postal, physical, company_phone,
-physical, company_phone, company_fax, website, company_contact_name,
-company_contact_position, contact_phone, contact_phone_2, contact_fax,
-company_email, contact_notes, notes, status, publishers_imprints,
-list_currency, gst, list_gst, invoice_gst, discount.
-
-=back
-
-=cut
-
-use C4::Bookseller;
-use C4::Biblio;
-use C4::Output;
-use CGI;
-use strict;
-
-my $input=new CGI;
-#print $input->header();
-my $supplier=$input->param('supplier');
-#print startpage;
-my %data;
-$data{'id'}=$input->param('id');
-
-$data{'name'}=$input->param('company');
-$data{'postal'}=$input->param('company_postal');
-my $address=$input->param('physical');
-my @addresses=split('\n',$address);
-$data{'address1'}=$addresses[0];
-$data{'address2'}=$addresses[1];
-$data{'address3'}=$addresses[2];
-$data{'address4'}=$addresses[3];
-$data{'phone'}=$input->param('company_phone');
-$data{'fax'}=$input->param('company_fax');
-$data{'url'}=$input->param('website');
-$data{'contact'}=$input->param('company_contact_name');
-$data{'contpos'}=$input->param('company_contact_position');
-$data{'contphone'}=$input->param('contact_phone');
-$data{'contaltphone'}=$input->param('contact_phone_2');
-$data{'contfax'}=$input->param('contact_fax');
-$data{'contemail'}=$input->param('company_email');
-$data{'contnotes'}=$input->param('contact_notes');
-# warn "".$data{'contnotes'};
-$data{'notes'}=$input->param('notes');
-$data{'active'}=$input->param('status');
-$data{'specialty'}=$input->param('publishers_imprints');
-$data{'listprice'}=$input->param('list_currency');
-$data{'invoiceprice'}=$input->param('invoice_currency');
-$data{'gstreg'}=$input->param('gst');
-$data{'listincgst'}=$input->param('list_gst');
-$data{'invoiceincgst'}=$input->param('invoiceincgst');
-$data{'discount'}=$input->param('discount');
-my $id=$input->param('id');
-if ($data{'id'} != 0){
-  ModBookseller(\%data);
-} else {
-  $id=AddBookseller(\%data);
-}
-
-#redirect to booksellers.pl
-print $input->redirect("booksellers.pl?supplier=$id");

Index: cgi-bin/admin/admin-careers.pl
===================================================================
RCS file: cgi-bin/admin/admin-careers.pl
diff -N cgi-bin/admin/admin-careers.pl
--- cgi-bin/admin/admin-careers.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,77 +0,0 @@
-#!/usr/bin/perl
-
-# Script to manage the educational institutions and its careers.
-# written 12/04
-# Castañeda, Carlos Sebastian - seba3c at yahoo.com.ar - Physics Library UNLP Argentina
-
-# 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 CGI;
-
-use C4::Auth;
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::AcademicInfo;
-
-
-my $cgi = new CGI;
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/admin-careers.tmpl",
-			     query => $cgi,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {editcatalogue => 1},
-			     debug => 1,
-			     });
-
-my $op = $cgi->param('op'); 
-my $id_career = $cgi->param('id_career'); 
-my $id_institution = $cgi->param('id_institution');
-my $career_name = $cgi->param('career_name'); 
-
-if ($op eq 'add_form') {
-
-	if ($id_career) {
-		my $info = &get_career($id_career);
-		$template->param(op => 'edit');
-		$template->param(career_name => $info->{'career_name'});
-		$template->param(id_career => $id_career);
-	} else {
-		$template->param(op => 'add');
-		$template->param(add => 1);
-	}
-	my $info = &get_educational_institution($id_institution);
-	$template->param(id_institution => $id_institution);
-	$template->param(institution_name => $info->{'institution_name'});
-
-} elsif ($op eq 'add') {
-	add_career($id_institution, $career_name);
-	print $cgi->redirect('/cgi-bin/koha/admin/institutions-careers.pl');
-} elsif ($op eq 'edit') {
-	update_career($id_career, $career_name);
-	print $cgi->redirect('/cgi-bin/koha/admin/institutions-careers.pl');
-} elsif ($op eq 'del') {
-	warn "enter $id_career";
-	del_career($id_career);
-	print $cgi->redirect('/cgi-bin/koha/admin/institutions-careers.pl');
-}
-
-output_html_with_http_headers $cgi, $cookie, $template->output;

Index: cgi-bin/admin/admin-home.pl
===================================================================
RCS file: cgi-bin/admin/admin-home.pl
diff -N cgi-bin/admin/admin-home.pl
--- cgi-bin/admin/admin-home.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-
-
-my $query = new CGI;
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/admin-home.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1, management => 1, tools => 1},
-			     debug => 1,
-			     });
-
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/admin/aqbookfund.pl
===================================================================
RCS file: cgi-bin/admin/aqbookfund.pl
diff -N cgi-bin/admin/aqbookfund.pl
--- cgi-bin/admin/aqbookfund.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,286 +0,0 @@
-#!/usr/bin/perl
-
-#written 20/02/2002 by paul.poulain at free.fr
-
-# 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
-
-
-=head1 NAME
-
-aqbookfund.pl
-
-=head1 DESCRIPTION
-
-script to administer the aqbudget table.
-
-=head1 CGI PARAMETERS
-
-=over 4
-
-=item op
-this script use an C<$op> to know what to do.
-C<op> can be equal to:
-* empty or none of the above values, then
-    - the default screen is build (with all records, or filtered datas).
-	- the   user can clic on add, modify or delete record.
-* add_form, then
-	- if primkey exists, this is a modification,so we read the $primkey record
-	- builds the add/modify form
-* add_validate, then
-	- the user has just send datas, so we create/modify the record
-* delete_form, then
-	- we show the record having primkey=$primkey and ask for deletion validation form
-* delete_confirm, then
-    - we delete the record having primkey=$primkey
-
-=cut
-
-use strict;
-use CGI;
-use C4::Output;
-use List::Util qw/min/;
-use C4::Auth;
-use C4::Koha;
-use C4::Context;
-use C4::Bookfund;
-use C4::Interface::CGI::Output;
-use C4::Search;
-use C4::Date;
-
-my $dbh = C4::Context->dbh;
-my $input = new CGI;
-my $script_name="/cgi-bin/koha/admin/aqbookfund.pl";
-my $bookfundid=$input->param('bookfundid');
-my $pagesize = 10;
-my $op = $input->param('op') || '';
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user(
-        {template_name => "admin/aqbookfund.tmpl",
-         query => $input,
-         type => "intranet",
-         authnotrequired => 0,
-         flagsrequired => {parameters => 1, management => 1},
-         debug => 1,
-        }
-    );
-
-if ($op) {
-    $template->param(
-        script_name => $script_name,
-        $op => 1,
-    ); # we show only the TMPL_VAR names $op
-}
-else {
-    $template->param(script_name => $script_name,
-		else              => 1); # we show only the TMPL_VAR names $op
-}
-$template->param(action => $script_name);
-
-my $branches = GetBranches;
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $dataaqbookfund;
-	my $header;
-	if ($bookfundid) {
-    	$dataaqbookfund = GetBookFund($bookfundid);
-	}
-	if ($bookfundid) {
-	    $header = "Modify book fund";
-	    $template->param('header-is-modify-p' => 1);
-	} else {
-	    $header = "Add book fund";
-	    $template->param('header-is-add-p' => 1);
-	}
-	$template->param('use-header-flags-p' => 1);
-	$template->param(header => $header); 
-	my $add_or_modify=0;
-	if ($bookfundid) {
-	    $add_or_modify=1;
-	}
-	$template->param(add_or_modify => $add_or_modify);
-	$template->param(bookfundid =>$bookfundid);
-	$template->param(bookfundname =>$dataaqbookfund->{'bookfundname'});
-warn $dataaqbookfund->{'bookfundname'};
-        my @branchloop;
-        foreach my $branchcode (sort keys %{$branches}) {
-            my $row = {
-                branchcode => $branchcode,
-                branchname => $branches->{$branchcode}->{branchname},
-            };
-
-            if ( $bookfundid    && $dataaqbookfund->{branchcode} eq $branchcode) {
-                $row->{selected} = 1;
-            }
-
-            push @branchloop, $row;
-        }
-
-        $template->param(branches => \@branchloop);
-
-} # END $OP eq ADD_FORM
-
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-elsif ($op eq 'add_validate') {
-	my $bookfundid = uc $input->param('bookfundid');
-
-    my $number = Countbookfund($bookfundid);
-
-    my $bookfund_already_exists = $number > 0 ? 1 : 0;
-
-    if ($bookfund_already_exists) {
-        my $bookfundname = $input->param('bookfundname');
-        my $branchcode = $input->param('branchcode') || undef;
-
-        ModBookFund($bookfundname,$branchcode,$bookfundid);
-    }
-    else {
-        NewBookFund(
-            $bookfundid,
-            $input->param('bookfundname'),
-            $input->param('branchcode')
-        );
-    }
-    $input->redirect('aqbookfund.pl');
-# END $OP eq ADD_VALIDATE
-}
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-
-elsif ($op eq 'delete_confirm') {
-    my $data = GetBookFund($bookfundid);
-	$template->param(bookfundid => $bookfundid);
-	$template->param(bookfundname => $data->{'bookfundname'});
-} # END $OP eq DELETE_CONFIRM
-
-
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-elsif ($op eq 'delete_confirmed') {
-    DelBookFund(uc($input->param('bookfundid')));
-
-}# END $OP eq DELETE_CONFIRMED
-
-
-################## DEFAULT ##################################
-else { # DEFAULT
-    my ($query, $sth);
-
-    $template->param(scriptname => $script_name);
-
-    # filters
-    my @branchloop;
-    foreach my $branchcode (sort keys %{$branches}) {
-        my $row = {
-            code => $branchcode,
-            name => $branches->{$branchcode}->{branchname},
-        };
-
-        if (defined $input->param('filter_branchcode')
-            and $input->param('filter_branchcode') eq $branchcode) {
-            $row->{selected} = 1;
-        }
-
-        push @branchloop, $row;
-    }
-
-    my @bookfundids_loop;
-    my $sth = GetBookFundsId();
-
-    while (my $row = $sth->fetchrow_hashref) {
-        if (defined $input->param('filter_bookfundid') and $input->param('filter_bookfundid') eq $row->{bookfundid}){
-            $row->{selected} = 1;
-        }
-         push @bookfundids_loop, $row;
-     }
-
-    $template->param(
-        filter_bookfundids => \@bookfundids_loop,
-        filter_branches => \@branchloop,
-        filter_bookfundname => $input->param('filter_bookfundname') || undef,
-    );
-
-    # searching the bookfunds corresponding to our filtering rules
-    my @results = SearchBookFund(
-        $input->param('filter'),
-        $input->param('filter_bookfundid'),
-        $input->param('filter_bookfundname'),
-        $input->param('filter_branchcode'),
-    );
-
-    # does the book funds have budgets?
-    my @loop_id;
-    my $sth = GetBookFundsId();
-    while (my $row = $sth->fetchrow){
-        push @loop_id, $row;
-    }
-
-    my ($id,%nb_budgets_of);
-    foreach $id (@loop_id){
-        my $number = Countbookfund($id);
-        $nb_budgets_of{$id} = $number;
-    }
-
-    # pagination informations
-    my $page = $input->param('page') || 1;
-    my @loop;
-
-    my $first = ($page - 1) * $pagesize;
-
-    # if we are on the last page, the number of the last word to display
-    # must not exceed the length of the results array
-    my $last = min(
-        $first + $pagesize - 1,
-        scalar(@results) - 1,
-    );
-
-    my $toggle = 0;
-    foreach my $result (@results[$first .. $last]) {
-        push(
-            @loop,
-            {
-                %{$result},
-                toggle => $toggle++%2,
-                branchname =>
-                    $branches->{ $result->{branchcode} }->{branchname},
-                has_budgets => defined $nb_budgets_of{ $result->{bookfundid} },
-            }
-        );
-    }
-
-    $template->param(
-            bookfund => \@loop,
-            pagination_bar => pagination_bar(
-                        $script_name,
-                        getnbpages(scalar @results, $pagesize),
-                        $page,
-                        'page'
-            )
-        );
-} #---- END $OP eq DEFAULT
-$template->param(
-    intranetcolorstylesheet =>C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav => C4::Context->preference("IntranetNav"),
-    );
-
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/admin/aqbudget.pl
===================================================================
RCS file: cgi-bin/admin/aqbudget.pl
diff -N cgi-bin/admin/aqbudget.pl
--- cgi-bin/admin/aqbudget.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,431 +0,0 @@
-#!/usr/bin/perl
-
-#script to administer the aqbudget table
-#written 20/02/2002 by paul.poulain at free.fr
-# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
-
-# ALGO :
-# this script use an $op to know what to do.
-# if $op is empty or none of the above values,
-#	- the default screen is build (with all records, or filtered datas).
-#	- the   user can clic on add, modify or delete record.
-# if $op=add_form
-#	- if primkey exists, this is a modification,so we read the $primkey record
-#	- builds the add/modify form
-# if $op=add_validate
-#	- the user has just send datas, so we create/modify the record
-# if $op=delete_form
-#	- we show the record having primkey=$primkey and ask for deletion validation form
-# if $op=delete_confirm
-#	- we delete the record having primkey=$primkey
-
-
-# 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 CGI;
-use List::Util qw/min/;
-use C4::Date;
-use C4::Auth;
-use C4::Acquisition;
-use C4::Context;
-use C4::Interface::CGI::Output;
-use C4::Search;
-use C4::Koha;
-use C4::Output;
-
-my $input = new CGI;
-my $script_name="/cgi-bin/koha/admin/aqbudget.pl";
-my $bookfundid=$input->param('bookfundid');
-my $aqbudgetid=$input->param('aqbudgetid');
-my $pagesize = 20;
-my $op = $input->param('op');
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user(
-        {template_name => "admin/aqbudget.tmpl",
-         query => $input,
-         type => "intranet",
-         authnotrequired => 0,
-         flagsrequired => {parameters => 1},
-         debug => 1,
-     }
-    );
-
-$template->param(
-    action => $script_name,
-    DHTMLcalendar_dateformat => get_date_format_string_for_DHTMLcalendar(),
-    script_name => $script_name,
-    $op || 'else' => 1,
-);
-
-my $dbh = C4::Context->dbh;
-my $sthtemp = $dbh->prepare("Select flags, branchcode from borrowers where borrowernumber = ?");
-$sthtemp->execute($borrowernumber);
-my ($flags, $homebranch)=$sthtemp->fetchrow;
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-    my ($query, $dataaqbudget, $dataaqbookfund, $sth);
-    my $dbh = C4::Context->dbh;
-
-    #---- if primkey exists, it's a modify action, so read values to modify...
-    if ($aqbudgetid) {
-        $query = '
-SELECT aqbudgetid,
-       bookfundname,
-       aqbookfund.bookfundid,
-       startdate,
-       enddate,
-       budgetamount,
-       aqbudget.branchcode
-  FROM aqbudget
-    INNER JOIN aqbookfund ON aqbudget.bookfundid = aqbookfund.bookfundid
-  WHERE aqbudgetid = ?
-';
-        $sth=$dbh->prepare($query);
-        $sth->execute($aqbudgetid);
-        $dataaqbudget=$sth->fetchrow_hashref;
-        $sth->finish;
-    }
-
-    $query = '
-SELECT aqbookfund.branchcode,
-       branches.branchname,
-       aqbookfund.bookfundname
-  FROM aqbookfund
-    LEFT JOIN branches ON aqbookfund.branchcode = branches.branchcode
-  WHERE bookfundid = ?
-';
-    $sth=$dbh->prepare($query);
-    $sth->execute(
-        defined $aqbudgetid ? $dataaqbudget->{bookfundid} : $bookfundid,
-    );
-    $dataaqbookfund=$sth->fetchrow_hashref;
-    $sth->finish;
-
-    if (defined $aqbudgetid) {
-        $template->param(
-            bookfundid => $dataaqbudget->{'bookfundid'},
-            bookfundname => $dataaqbudget->{'bookfundname'}
-        );
-    }
-    else {
-        $template->param(
-            bookfundid => $bookfundid,
-            bookfundname => $dataaqbookfund->{bookfundname},
-        );
-    }
-
-    # Available branches
-    my @branches = ();
-
-    $query = '
-SELECT branchcode,
-       branchname
-  FROM branches
-  ORDER BY branchname
-';
-    $sth=$dbh->prepare($query);
-    $sth->execute();
-    while (my $row = $sth->fetchrow_hashref) {
-        my $branch = $row;
-
-        if (defined $dataaqbookfund->{branchcode}) {
-            $branch->{selected} =
-                $dataaqbookfund->{branchcode} eq $row->{branchcode} ? 1 : 0;
-        }
-        elsif (defined $aqbudgetid) {
-            $branch->{selected} =
-                $dataaqbudget->{branchcode} eq $row->{branchcode} ? 1 : 0;
-        }
-
-        push @branches, $branch;
-    }
-    $sth->finish;
-
-    $template->param(
-        dateformat => display_date_format(),
-        aqbudgetid => $dataaqbudget->{'aqbudgetid'},
-        startdate => format_date($dataaqbudget->{'startdate'}),
-        enddate => format_date($dataaqbudget->{'enddate'}),
-        budgetamount => $dataaqbudget->{'budgetamount'},
-        branches => \@branches,
-    );
-
-    if (defined $dataaqbookfund->{branchcode}) {
-        $template->param(
-            disable_branchselection => 1,
-            branch => $dataaqbookfund->{branchcode},
-        );
-    }
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-    my ($query, $sth);
-
-    if (defined $aqbudgetid) {
-        $query = '
-UPDATE aqbudget
-  SET bookfundid = ?,
-      startdate = ?,
-      enddate = ?,
-      budgetamount = ?,
-      branchcode = ?
-  WHERE aqbudgetid = ?
-';
-        $sth=$dbh->prepare($query);
-        $sth->execute(
-            $input->param('bookfundid'),
-            format_date_in_iso($input->param('startdate')),
-            format_date_in_iso($input->param('enddate')),
-            $input->param('budgetamount'),
-            $input->param('branch') || undef,
-            $aqbudgetid,
-        );
-        $sth->finish;
-    }
-    else {
-        $query = '
-INSERT
-  INTO aqbudget
-  (bookfundid, startdate, enddate, budgetamount, branchcode)
-  VALUES
-  (?, ?, ?, ?, ?)
-';
-        $sth=$dbh->prepare($query);
-        $sth->execute(
-            $input->param('bookfundid'),
-            format_date_in_iso($input->param('startdate')),
-            format_date_in_iso($input->param('enddate')),
-            $input->param('budgetamount'),
-            $input->param('branch') || undef,
-        );
-        $sth->finish;
-    }
-
-    $input->redirect("aqbudget.pl");
-
-# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select aqbudgetid,bookfundid,startdate,enddate,budgetamount,branchcode from aqbudget where aqbudgetid=?");
-	$sth->execute($aqbudgetid);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(bookfundid => $bookfundid);
-	$template->param(aqbudgetid => $data->{'aqbudgetid'});
-	$template->param(startdate => format_date($data->{'startdate'}));
-	$template->param(enddate => format_date($data->{'enddate'}));
-	$template->param(budgetamount => $data->{'budgetamount'});
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	my $dbh = C4::Context->dbh;
-	my $aqbudgetid=uc($input->param('aqbudgetid'));
-	my $sth=$dbh->prepare("delete from aqbudget where aqbudgetid=?");
-	$sth->execute($aqbudgetid);
-	$sth->finish;
-	 print $input->redirect("aqbookfund.pl");
-	 return;
-													# END $OP eq DELETE_CONFIRMED
-################## DEFAULT ##################################
-} else { # DEFAULT
-    my ($query, $sth);
-
-    # create a look-up table for bookfund names from bookfund ids,
-    # instead of having on query per budget
-    my %bookfundname_of = ();
-    $query = '
-SELECT bookfundid, bookfundname
-  FROM aqbookfund
-';
-    $sth=$dbh->prepare($query);
-    $sth->execute;
-    while (my $row = $sth->fetchrow_hashref) {
-        $bookfundname_of{ $row->{bookfundid} } = $row->{bookfundname};
-    }
-    $sth->finish;
-
-    # filters
-    my $branches = GetBranches();
-    my @branchloop;
-    foreach my $branchcode (sort keys %{$branches}) {
-        my $row = {
-            code => $branchcode,
-            name => $branches->{$branchcode}->{branchname},
-        };
-
-        if (defined $input->param('filter_branchcode')
-            and $input->param('filter_branchcode') eq $branchcode) {
-            $row->{selected} = 1;
-        }
-
-        push @branchloop, $row;
-    }
-
-    my @bookfundids_loop;
-    $query = '
-SELECT bookfundid
-  FROM aqbookfund
-';
-    $sth = $dbh->prepare($query);
-    $sth->execute();
-    while (my $row = $sth->fetchrow_hashref) {
-        if (defined $input->param('filter_bookfundid')
-            and $input->param('filter_bookfundid') eq $row->{bookfundid}) {
-            $row->{selected} = 1;
-        }
-
-        push @bookfundids_loop, $row;
-    }
-    $sth->finish;
-
-    $template->param(
-        filter_bookfundids => \@bookfundids_loop,
-        filter_branches => \@branchloop,
-        filter_amount => $input->param('filter_amount') || undef,
-        filter_startdate => $input->param('filter_startdate') || undef,
-        filter_enddate => $input->param('filter_enddate') || undef,
-    );
-
-    my %sign_label_of = (
-        '=' => 'equal',
-        '>=' => 'superior',
-        '<=' => 'inferior',
-    );
-
-    foreach my $field (qw/startdate enddate amount/) {
-        my $param = 'filter_'.$field.'_sign';
-
-        foreach my $sign (keys %sign_label_of) {
-            if ($input->param($param) eq $sign) {
-                $template->param(
-                    $param.'_'.$sign_label_of{$sign}.'_selected' => 1,
-                );
-            }
-        }
-    }
-
-    # Search all available budgets
-    $query = '
-SELECT aqbudgetid,
-       bookfundid,
-       startdate,
-       enddate,
-       budgetamount,
-       branchcode
-  FROM aqbudget
-  WHERE 1 = 1';
-
-    my @bindings;
-
-    if ($input->param('filter_bookfundid')) {
-        $query.= '
-    AND bookfundid = ?
-';
-        push @bindings, $input->param('filter_bookfundid');
-    }
-    if ($input->param('filter_branchcode')) {
-        $query.= '
-    AND branchcode = ?
-';
-        push @bindings, $input->param('filter_branchcode');
-    }
-    if ($input->param('filter_startdate')) {
-        $query.= '
-    AND startdate '.$input->param('filter_startdate_sign').' ?
-';
-        push @bindings, format_date_in_iso($input->param('filter_startdate'));
-    }
-    if ($input->param('filter_enddate')) {
-        $query.= '
-    AND enddate '.$input->param('filter_enddate_sign').' ?
-';
-        push @bindings, format_date_in_iso($input->param('filter_enddate'));
-    }
-    if ($input->param('filter_amount')) {
-        $query.= '
-    AND budgetamount '.$input->param('filter_amount_sign').' ?
-';
-        # the amount must be a quantity, with 2 digits after the decimal
-        # separator
-        $input->param('filter_amount') =~ m{(\d* (?:\.\d{,2})? )}xms;
-        my ($amount) = $1;
-        push @bindings, $amount;
-    }
-
-    $query.= '
-  ORDER BY bookfundid, aqbudgetid
-';
-    $sth = $dbh->prepare($query);
-    $sth->execute(@bindings);
-    my @results;
-    while (my $row = $sth->fetchrow_hashref){
-        push @results, $row;
-    }
-    $sth->finish;
-
-    # filter budgets depending on the pagination
-    my $page = $input->param('page') || 1;
-    my $first = ($page - 1) * $pagesize;
-
-    # if we are on the last page, the number of the last word to display
-    # must not exceed the length of the results array
-    my $last = min(
-        $first + $pagesize - 1,
-        scalar @results - 1,
-    );
-
-    my $toggle = 0;
-    my @loop;
-    foreach my $result (@results[$first .. $last]) {
-        push(
-            @loop,
-            {
-                %{$result},
-                toggle => $toggle++%2,
-                bookfundname => $bookfundname_of{ $result->{'bookfundid'} },
-                branchname => $branches->{ $result->{branchcode} }->{branchname},
-                startdate => format_date($result->{startdate}),
-                enddate => format_date($result->{enddate}),
-            }
-        );
-    }
-
-    $template->param(
-        budget => \@loop,
-        pagination_bar => pagination_bar(
-            $script_name,
-            getnbpages(scalar @results, $pagesize),
-            $page,
-            'page'
-        )
-    );
-} #---- END $OP eq DEFAULT
-$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $input, $cookie, $template->output;
-

Index: cgi-bin/admin/auth_subfields_structure.pl
===================================================================
RCS file: cgi-bin/admin/auth_subfields_structure.pl
diff -N cgi-bin/admin/auth_subfields_structure.pl
--- cgi-bin/admin/auth_subfields_structure.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,451 +0,0 @@
-#!/usr/bin/perl
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Auth;
-use CGI;
-use C4::Search;
-use C4::Context;
-
-
-sub StringSearch  {
-	my ($env,$searchstring,$authtypecode)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select * from auth_subfield_structure where (tagfield like ? and authtypecode=?) order by tagfield");
-	$sth->execute("$searchstring%",$authtypecode);
-	my @results;
-	my $cnt=0;
-	my $u=1;
-	while (my $data=$sth->fetchrow_hashref){
-		push(@results,$data);
-		$cnt ++;
-		$u++;
-	}
-	$sth->finish;
-	$dbh->disconnect;
-	return ($cnt,\@results);
-}
-
-my $input = new CGI;
-my $tagfield=$input->param('tagfield');
-my $tagsubfield=$input->param('tagsubfield');
-my $authtypecode=$input->param('authtypecode');
-my $pkfield="tagfield";
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/admin/auth_subfields_structure.pl";
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/auth_subfields_structure.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-my $pagesize=30;
-my $op = $input->param('op');
-$tagfield=~ s/\,//g;
-
-if ($op) {
-$template->param(script_name => $script_name,
-						tagfield =>$tagfield,
-						authtypecode => $authtypecode,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						tagfield =>$tagfield,
-						authtypecode => $authtypecode,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	my $data;
-	my $dbh = C4::Context->dbh;
-	my $more_subfields = $input->param("more_subfields")+1;
-	
-	# build authorised value list
-
-my	$sth2 = $dbh->prepare("select distinct category from authorised_values");
-	$sth2->execute;
-	my @authorised_values;
-	push @authorised_values,"";
-	while ((my $category) = $sth2->fetchrow_array) {
-		push @authorised_values, $category;
-	}
-	push (@authorised_values,"branches");
-	push (@authorised_values,"itemtypes");
-
-	# build value_builder list
-	my @value_builder=('');
-
-	# read value_builder directory.
-	# 2 cases here : on CVS install, $cgidir does not need a /cgi-bin
-	# on a standard install, /cgi-bin need to be added. 
-	# test one, then the other
-	my $cgidir = C4::Context->intranetdir ."/cgi-bin";
-	unless (opendir(DIR, "$cgidir/value_builder")) {
-		$cgidir = C4::Context->intranetdir;
-		opendir(DIR, "$cgidir/value_builder") || die "can't opendir $cgidir/value_builder: $!";
-	} 
-	while (my $line = readdir(DIR)) {
-		if ($line =~ /\.pl$/) {
-			push (@value_builder,$line);
-		}
-	}
-	closedir DIR;
-
-	# build values list
-	my $sth=$dbh->prepare("select * from auth_subfield_structure where tagfield=? and authtypecode=?"); # and tagsubfield='$tagsubfield'");
-	$sth->execute($tagfield,$authtypecode);
-	my @loop_data = ();
-	my $toggle=1;
-	my $i=0;
-	while ($data =$sth->fetchrow_hashref) {
-
-		my %row_data;  # get a fresh hash for the row data
-		if ($toggle eq 1){
-			$toggle=0;
-	  	} else {
-			$toggle=1;
-	  	}
-		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
-					-id=>"tab$i",
-					-values=>['-1','0','1','2','3','4','5','6','7','8','9'],
-					-labels => {'-1' =>'ignore','0'=>'0','1'=>'1','2' =>'2','3'=>'3','4'=>'4',
-									'5' =>'5','6'=>'6','7'=>'7',
-									'8' =>'8','9'=>'9',},
-					-default=>$data->{'tab'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ohidden} = CGI::scrolling_list(-name=>'ohidden',
-					-id=>"ohidden$i",
-					-values=>['0','2'],
-					-labels => {'0'=>'Show','2' =>'Hide',},
-					-default=>substr($data->{'hidden'},0,1),
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
-					-id=>"ihidden$i",
-					-values=>['0','2'],
-					-labels => {'0'=>'Show',
-									'2' =>'Hide',
-									},
-					-default=>substr($data->{'hidden'},1,1),
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
-					-id=>"ehidden$i",
-					-values=>['0','1','2'],
-					-labels => {'0'=>'Show','1'=>'Show Collapsed',
-									'2' =>'Hide',
-									},
-					-default=>substr($data->{'hidden'},2,1),
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{tagsubfield} =$data->{'tagsubfield'}."<input type=\"hidden\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" id=\"tagsubfield\">";
-		$row_data{liblibrarian} = CGI::escapeHTML($data->{'liblibrarian'});
-		$row_data{libopac} = CGI::escapeHTML($data->{'libopac'});
-		$row_data{seealso} = CGI::escapeHTML($data->{'seealso'});
-		$row_data{authorised_value}  = CGI::scrolling_list(-name=>'authorised_value',
-					-id=>'authorised_value',
-					-values=> \@authorised_values,
-					-default=>$data->{'authorised_value'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{value_builder}  = CGI::scrolling_list(-name=>'value_builder',
-					-id=>'value_builder',
-					-values=> \@value_builder,
-					-default=>$data->{'value_builder'},
-					-size=>1,
-					-multiple=>0,
-					);
-		
-		$row_data{repeatable} = CGI::checkbox(-name=>"repeatable$i",
-	-checked => $data->{'repeatable'}?'checked':'',
-	-value => 1,
-	-label => '',
-	-id => "repeatable$i");
-		$row_data{mandatory} = CGI::checkbox(-name => "mandatory$i",
-	-checked => $data->{'mandatory'}?'checked':'',
-	-value => 1,
-	-label => '',
-	-id => "mandatory$i");
-		$row_data{hidden} = CGI::escapeHTML($data->{hidden}) ;
-		$row_data{isurl} = CGI::checkbox( -name => "isurl$i",
-			-id => "isurl$i",
-			-checked => $data->{'isurl'}?'checked':'',
-			-value => 1,
-			-label => '');
-		$row_data{link} = CGI::checkbox( -name => "link$i",
-			-id => "link$i",
-			-checked => $data->{'link'}?'checked':'',
-			-value => 1,
-			-label => '');
-		$row_data{row} = $i;
-		$row_data{toggle} = $toggle;
-		# $row_data{link} = CGI::escapeHTML($data->{'link'});
-		push(@loop_data, \%row_data);
-		$i++;
-	}
-	# add more_subfields empty lines for add if needed
-	for (my $i=1;$i<=$more_subfields;$i++) {
-		my %row_data;  # get a fresh hash for the row data
-		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
-					-id=>"tab$i",
-					-values=>['-1','0','1','2','3','4','5','6','7','8','9'],
-					-labels => {'-1' =>'ignore','0'=>'0','1'=>'1','2' =>'2','3'=>'3','4'=>'4',
-									'5' =>'5','6'=>'6','7'=>'7',
-									'8' =>'8','9'=>'9',},
-					-default=>"",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ohidden} = CGI::scrolling_list(-name=>'ohidden',
-					-id=>"ohidden$i",
-					-values=>['0','2'],
-					-labels => {'0'=>'Show','2' =>'Hide',},
-					-default=>"0",
-					-size=>1,
-					-multiple=>0,
-					);
-
-		$row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
-					-id=>"ihidden$i",
-					-values=>['0','2'],
-					-labels => {'0'=>'Show','2' =>'Hide',},
-					-default=>"0",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
-					-id=>"ehidden$i",
-					-values=>['0','1','2'],
-					-labels => {'0'=>'Show','1'=>'Show Collapsed',
-									'2' =>'Hide',
-									},
-					-default=>"0",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{tagsubfield} = "<input type=\"text\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\">";
-		$row_data{liblibrarian} = "";
-		$row_data{libopac} = "";
-		$row_data{seealso} = "";
-		$row_data{hidden} = "000";
-		$row_data{repeatable} = CGI::checkbox( -name=> 'repeatable',
-				-id => "repeatable$i",
-				-checked => '',
-				-value => 1,
-				-label => '');
-		$row_data{mandatory} = CGI::checkbox( -name=> 'mandatory',
-			-id => "mandatory$i",
-			-checked => '',
-			-value => 1,
-			-label => '');
-		$row_data{isurl} = CGI::checkbox(-name => 'isurl',
-			-id => "isurl$i",
-			-checked => '',
-			-value => 1,
-			-label => '');
-		
-		$row_data{authorised_value}  = CGI::scrolling_list(-name=>'authorised_value',
-					-id => 'authorised_value',
-					-values=> \@authorised_values,
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{link} = CGI::checkbox( -name => "link",
-			-id => "link$i",
-			-checked => '',
-			-value => 1,
-			-label => '');
-		# $row_data{link} = CGI::escapeHTML($data->{'link'});
-		$row_data{toggle} = $toggle;
-		$row_data{row} = $i;
-		push(@loop_data, \%row_data);
-	}
-	$template->param('use-heading-flags-p' => 1);
-	$template->param('heading-edit-subfields-p' => 1);
-	$template->param(action => "Edit subfields",
-							tagfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\">$tagfield",
-							loop => \@loop_data,
-							more_subfields => $more_subfields,
-							more_tag => $tagfield);
-
-												# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	my $dbh = C4::Context->dbh;
-	$template->param(tagfield => "$input->param('tagfield')");
-	my $sth=$dbh->prepare("replace auth_subfield_structure (tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,tab,seealso,authorised_value,authtypecode,value_builder,hidden,isurl, link)
-									values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
-	my @tagsubfield	= $input->param('tagsubfield');
-	my @liblibrarian	= $input->param('liblibrarian');
-	my @libopac		= $input->param('libopac');
-	my @tab				= $input->param('tab');
-	my @seealso		= $input->param('seealso');
-	#my @hidden		= $input->param('hidden');
-	my @hidden;
-	my @ohidden		= $input->param('ohidden');
-	my @ihidden		= $input->param('ihidden');
-	my @ehidden		= $input->param('ehidden');
-	my @authorised_values	= $input->param('authorised_value');
-#	my $authtypecodes	= $input->param('authtypecode');
-	my @value_builder	=$input->param('value_builder');
-	my @link		=$input->param('link');
-	for (my $i=0; $i<= $#tagsubfield ; $i++) {
-		my $tagfield			=$input->param('tagfield');
-		my $tagsubfield		=$tagsubfield[$i];
-		$tagsubfield="@" unless $tagsubfield ne '';
-		my $liblibrarian		=$liblibrarian[$i];
-		my $libopac			=$libopac[$i];
-		my $repeatable		=$input->param("repeatable$i")?1:0;
-		my $mandatory		=$input->param("mandatory$i")?1:0;
-
-		my $tab				=$tab[$i];
-		my $seealso				=$seealso[$i];
-		my $authorised_value		=$authorised_values[$i];
-#		my $authtypecode		=$authtypecodes;
-		my $value_builder=$value_builder[$i];
-		my $hidden = $ohidden[$i].$ihidden[$i].$ehidden[$i]; #collate from 3 hiddens;
-		my $isurl = $input->param("isurl$i")?1:0;
-		my $link = $input->param("link$i")?1:0;
-		if ($liblibrarian) {
-			unless (C4::Context->config('demo') eq 1) {
-				$sth->execute ($tagfield,
-									$tagsubfield,
-									$liblibrarian,
-									$libopac,
-									$repeatable,
-									$mandatory,
-									$tab,
-									$seealso,
-									$authorised_value,
-									$authtypecode,
-									$value_builder,
-									$hidden,
-									$isurl,
-									
-
-	 $link,
-					      );
-			}
-		}
-	}
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=auth_subfields_structure.pl?tagfield=$tagfield&authtypecode=$authtypecode\"></html>";
-	exit;
-
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select * from auth_subfield_structure where tagfield=? and tagsubfield=? and authtypecode=?");
-	#FIXME : called with 2 bind variables when 3 are needed
-	$sth->execute($tagfield,$tagsubfield);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(liblibrarian => $data->{'liblibrarian'},
-							tagsubfield => $data->{'tagsubfield'},
-							delete_link => $script_name,
-							tagfield      =>$tagfield,
-							tagsubfield => $tagsubfield,
-							authtypecode => $authtypecode,
-							);
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	my $dbh = C4::Context->dbh;
-	unless (C4::Context->config('demo') eq 1) {
-		my $sth=$dbh->prepare("delete from auth_subfield_structure where tagfield=? and tagsubfield=? and authtypecode=?");
-		$sth->execute($tagfield,$tagsubfield,$authtypecode);
-		$sth->finish;
-	}
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=auth_subfields_structure.pl?tagfield=$tagfield&authtypecode=$authtypecode\"></html>";
-	exit;
-	$template->param(tagfield => $tagfield);
-													# END $OP eq DELETE_CONFIRMED
-################## DEFAULT ##################################
-} else { # DEFAULT
-	my $env;
-	my ($count,$results)=StringSearch($env,$tagfield,$authtypecode);
-	my $toggle=1;
-	my @loop_data = ();
-	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-	  	if ($toggle eq 1){
-			$toggle=0;
-	  	} else {
-			$toggle=1;
-	  	}
-		my %row_data;  # get a fresh hash for the row data
-		$row_data{tagfield} = $results->[$i]{'tagfield'};
-		$row_data{tagsubfield} = $results->[$i]{'tagsubfield'};
-		$row_data{liblibrarian} = $results->[$i]{'liblibrarian'};
-		$row_data{repeatable} = $results->[$i]{'repeatable'};
-		$row_data{mandatory} = $results->[$i]{'mandatory'};
-		$row_data{tab} = $results->[$i]{'tab'};
-		$row_data{seealso} = $results->[$i]{'seealso'};
-		$row_data{authorised_value} = $results->[$i]{'authorised_value'};
-		$row_data{authtypecode}	= $results->[$i]{'authtypecode'};
-		$row_data{value_builder}	= $results->[$i]{'value_builder'};
-		$row_data{hidden}	= $results->[$i]{'hidden'} if($results->[$i]{'hidden'} gt "000") ;
-		$row_data{isurl}	= $results->[$i]{'isurl'};
-		$row_data{link}	= $results->[$i]{'link'};
-		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&authtypecode=$authtypecode";
-		$row_data{toggle} = $toggle;
-		if ($row_data{tab} eq -1) {
-			$row_data{subfield_ignored} = 1;
-		}
-
-		push(@loop_data, \%row_data);
-	}
-	$template->param(loop => \@loop_data);
-	$template->param(edit_tagfield => $tagfield,
-		edit_authtypecode => $authtypecode);
-	
-	if ($offset>0) {
-		my $prevpage = $offset-$pagesize;
-		$template->param(prev =>"<a href=\"$script_name?offset=$prevpage\">");
-	}
-	if ($offset+$pagesize<$count) {
-		my $nextpage =$offset+$pagesize;
-		$template->param(next => "<a href=\"$script_name?offset=$nextpage\">");
-	}
-} #---- END $OP eq DEFAULT
-$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/admin/auth_tag_structure.pl
===================================================================
RCS file: cgi-bin/admin/auth_tag_structure.pl
diff -N cgi-bin/admin/auth_tag_structure.pl
--- cgi-bin/admin/auth_tag_structure.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,297 +0,0 @@
-#!/usr/bin/perl
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Koha;
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Search;
-use C4::Context;
-
-
-# retrieve parameters
-my $input = new CGI;
-my $authtypecode = $input->param('authtypecode'); # set to select framework
-$authtypecode="" unless $authtypecode;
-my $existingauthtypecode = $input->param('existingauthtypecode'); # set when we have to create a new framework (in authtype) by copying an old one (in existingauthtype)
-$existingauthtypecode = "" unless $existingauthtypecode;
-# my $authtypeinfo = getauthtypeinfo($authtype);
-my $searchfield=$input->param('searchfield');
-$searchfield=0 unless $searchfield;
-$searchfield=~ s/\,//g;
-
-my $offset=$input->param('offset');
-my $op = $input->param('op');
-my $pagesize=20;
-
-my $script_name="/cgi-bin/koha/admin/auth_tag_structure.pl";
-
-my $dbh = C4::Context->dbh;
-
-# open template
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/auth_tag_structure.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-
-# get authtype list
-my $authtypes = getauthtypes;
-my @authtypesloop;
-foreach my $thisauthtype (keys %$authtypes) {
-	my $selected = 1 if $thisauthtype eq $authtypecode;
-	my %row =(value => $thisauthtype,
-				selected => $selected,
-				authtypetext => $authtypes->{$thisauthtype}->{'authtypetext'},
-			);
-	push @authtypesloop, \%row;
-}
-
-my $sth;
-# check that authtype framework is defined in auth_tag_structure if we are on a default action
-if (!$op or $op eq 'authtype_create_confirm') {
-#warn "IN";
-	$sth=$dbh->prepare("select count(*) from auth_tag_structure where authtypecode=?");
-	$sth->execute($authtypecode);
-	my ($authtypeexist) = $sth->fetchrow;
-	if ($authtypeexist) {
-	} else {
-		# if authtype does not exists, then OP must be changed to "create authtype" if we are not on the way to create it
-		# (op = authtyp_create_confirm)
-		if ($op eq "authtype_create_confirm") {
-			duplicate_auth_framework($authtypecode, $existingauthtypecode);
-		} else {
-			$op = "authtype_create";
-		}
-	}
-}
-$template->param(authtypeloop => \@authtypesloop);
-if ($op && $op ne 'authtype_create_confirm') {
-$template->param(script_name => $script_name,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($searchfield) {
-		$sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from auth_tag_structure where tagfield=? and authtypecode=?");
-		$sth->execute($searchfield,$authtypecode);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-	my $sth = $dbh->prepare("select distinct category from authorised_values");
-	$sth->execute;
-	my @authorised_values;
-	push @authorised_values,"";
-	while ((my $category) = $sth->fetchrow_array) {
-		push @authorised_values, $category;
-	}
-	my $authorised_value  = CGI::scrolling_list(-name=>'authorised_value',
-			-values=> \@authorised_values,
-			-size=>1,
-			-multiple=>0,
-			-default => $data->{'authorised_value'},
-			);
-
-	if ($searchfield) {
-		$template->param(action => "Modify tag",
-								searchfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$searchfield\" />$searchfield");
-		$template->param('heading-modify-tag-p' => 1);
-	} else {
-		$template->param(action => "Add tag",
-								searchfield => "<input type=\"text\" name=\"tagfield\" size=\"5\" maxlength=\"3\" />");
-		$template->param('heading-add-tag-p' => 1);
-	}
-	$template->param('use-heading-flags-p' => 1);
-	$template->param(liblibrarian => $data->{'liblibrarian'},
-							libopac => $data->{'libopac'},
-							repeatable => CGI::checkbox('repeatable',$data->{'repeatable'}?'checked':'',1,''),
-							mandatory => CGI::checkbox('mandatory',$data->{'mandatory'}?'checked':'',1,''),
-							authorised_value => $authorised_value,
-							authtypecode => $authtypecode,
-							);
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	$sth=$dbh->prepare("replace auth_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,authtypecode) values (?,?,?,?,?,?,?)");
-	my $tagfield       =$input->param('tagfield');
-	my $liblibrarian  = $input->param('liblibrarian');
-	my $libopac       =$input->param('libopac');
-	my $repeatable =$input->param('repeatable');
-	my $mandatory =$input->param('mandatory');
-	my $authorised_value =$input->param('authorised_value');
-	unless (C4::Context->config('demo') eq 1) {
-		$sth->execute($tagfield,
-						$liblibrarian,
-						$libopac,
-						$repeatable?1:0,
-						$mandatory?1:0,
-						$authorised_value,
-						$authtypecode
-						);
-	}
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=auth_tag_structure.pl?tagfield=$tagfield&authtypecode=$authtypecode\"></html>";
-	exit;
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	$sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from auth_tag_structure where tagfield=?");
-	$sth->execute($searchfield);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(liblibrarian => $data->{'liblibrarian'},
-							searchfield => $searchfield,
-							authtypecode => $authtypecode,
-							);
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	unless (C4::Context->config('demo') eq 1) {
-		$dbh->do("delete from auth_tag_structure where tagfield='$searchfield' and authtypecode='$authtypecode'");
-		$dbh->do("delete from auth_subfield_structure where tagfield='$searchfield' and authtypecode='$authtypecode'");
-	}
-													# END $OP eq DELETE_CONFIRMED
-################## ITEMTYPE_CREATE ##################################
-# called automatically if an unexisting authtypecode is selected
-} elsif ($op eq 'authtype_create') {
-	$sth = $dbh->prepare("select count(*),auth_tag_structure.authtypecode,authtypetext from auth_tag_structure,auth_types where auth_types.authtypecode=auth_tag_structure.authtypecode group by auth_tag_structure.authtypecode");
-	$sth->execute;
-	my @existingauthtypeloop;
-	while (my ($tot,$thisauthtype,$authtypetext) = $sth->fetchrow) {
-		if ($tot>0) {
-			my %line = ( value => $thisauthtype,
-						authtypetext => $authtypetext,
-					);
-			push @existingauthtypeloop,\%line;
-		}
-	}
-	$template->param(existingauthtypeloop => \@existingauthtypeloop,
-					authtypecode => $authtypecode,
-					);
-################## DEFAULT ##################################
-} else { # DEFAULT
-	# here, $op can be unset or set to "authtype_create_confirm".
-#	warn "authtype : $authtypecode";
-	if  ($searchfield ne '') {
-		 $template->param(searchfield => $searchfield);
-	}
-	my $env;
-	my ($count,$results)=StringSearch($env,$searchfield,$authtypecode);
-	my $toggle="white";
-	my @loop_data = ();
-	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-	  	if ($toggle eq 'white'){
-			$toggle="#ffffcc";
-	  	} else {
-			$toggle="white";
-	  	}
-		my %row_data;  # get a fresh hash for the row data
-		$row_data{tagfield} = $results->[$i]{'tagfield'};
-		$row_data{liblibrarian} = $results->[$i]{'liblibrarian'};
-		$row_data{repeatable} = $results->[$i]{'repeatable'};
-		$row_data{mandatory} = $results->[$i]{'mandatory'};
-		$row_data{authorised_value} = $results->[$i]{'authorised_value'};
-		$row_data{subfield_link} ="auth_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&authtypecode=".$authtypecode;
-		$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&authtypecode=".$authtypecode;
-		$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&authtypecode=".$authtypecode;
-		$row_data{bgcolor} = $toggle;
-		push(@loop_data, \%row_data);
-	}
-	$template->param(loop => \@loop_data,
-					authtypecode => $authtypecode,
-	);
-	if ($offset>0) {
-		my $prevpage = $offset-$pagesize;
-		$template->param(isprevpage => $offset,
-						prevpage=> $prevpage,
-						searchfield => $searchfield,
-						script_name => $script_name,
-		 );
-	}
-	if ($offset+$pagesize<$count) {
-		my $nextpage =$offset+$pagesize;
-		$template->param(nextpage =>$nextpage,
-						searchfield => $searchfield,
-						script_name => $script_name,
-		);
-	}
-} #---- END $OP eq DEFAULT
-
-$template->param(loggeninuser => $loggedinuser);
-output_html_with_http_headers $input, $cookie, $template->output;
-
-
-#
-# the sub used for searches
-#
-sub StringSearch  {
-	my ($env,$searchstring,$authtypecode)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from auth_tag_structure where (tagfield >= ? and authtypecode=?) order by tagfield");
-	$sth->execute($data[0], $authtypecode);
-	my @results;
-	while (my $data=$sth->fetchrow_hashref){
-	push(@results,$data);
-	}
-	#  $sth->execute;
-	$sth->finish;
-	return (scalar(@results),\@results);
-}
-
-#
-# the sub used to duplicate a framework from an existing one in MARC parameters tables.
-#
-sub duplicate_auth_framework {
-	my ($newauthtype,$oldauthtype) = @_;
-#	warn "TO $newauthtype FROM $oldauthtype";
-	my $sth = $dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from auth_tag_structure where authtypecode=?");
-	$sth->execute($oldauthtype);
-	my $sth_insert = $dbh->prepare("insert into auth_tag_structure  (tagfield, liblibrarian, libopac, repeatable, mandatory, authorised_value, authtypecode) values (?,?,?,?,?,?,?)");
-	while ( my ($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value) = $sth->fetchrow) {
-		$sth_insert->execute($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value,$newauthtype);
-	}
-
-	$sth = $dbh->prepare("select tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,value_builder,seealso,hidden,link from auth_subfield_structure where authtypecode=?");
-	$sth->execute($oldauthtype);
-	$sth_insert = $dbh->prepare("insert into auth_subfield_structure (authtypecode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,authorised_value,value_builder,seealso,hidden,link) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
-	while ( my ( $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory, $kohafield,$tab, $authorised_value, $thesaurus_category, $seealso,$hidden,$link) = $sth->fetchrow) {
-		$sth_insert->execute($newauthtype, $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory,$kohafield, $tab, $authorised_value, $thesaurus_category, $seealso,$hidden,$link);
-	}
-}
-

Index: cgi-bin/admin/authorised_values.pl
===================================================================
RCS file: cgi-bin/admin/authorised_values.pl
diff -N cgi-bin/admin/authorised_values.pl
--- cgi-bin/admin/authorised_values.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,207 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Search;
-use C4::Context;
-
-
-sub StringSearch  {
-	my ($env,$searchstring,$type)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select id,category,authorised_value,lib from authorised_values where (category like ?) order by category,authorised_value");
-	$sth->execute("$data[0]%");
-	my @results;
-	my $cnt=0;
-	while (my $data=$sth->fetchrow_hashref){
-	push(@results,$data);
-	$cnt ++;
-	}
-	$sth->finish;
-	return ($cnt,\@results);
-}
-
-my $input = new CGI;
-my $searchfield=$input->param('searchfield');
-$searchfield=~ s/\,//g;
-my $id = $input->param('id');
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/admin/authorised_values.pl";
-my $dbh = C4::Context->dbh;
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/authorised_values.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1, management => 1},
-			     debug => 1,
-			     });
-my $pagesize=20;
-my $op = $input->param('op');
-
-if ($op) {
-$template->param(script_name => $script_name,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	my $data;
-	if ($id) {
-		my $dbh = C4::Context->dbh;
-		my $sth=$dbh->prepare("select id,category,authorised_value,lib from authorised_values where id=?");
-		$sth->execute($id);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	} else {
-		$data->{'category'} = $input->param('category');
-	}
-	if ($searchfield) {
-		$template->param(action => "Modify authorised value");
-		$template->param('heading-modify-authorized-value-p' => 1);
-	} elsif ( ! $data->{'category'} ) {
-		$template->param(action => "Add new category");
-		$template->param('heading-add-new-category-p' => 1);
-	} else {
-		$template->param(action => "Add authorised value");
-		$template->param('heading-add-authorized-value-p' => 1);
-	}
-	$template->param('use-heading-flags-p' => 1);
-	$template->param(category => $data->{'category'},
-							authorised_value => $data->{'authorised_value'},
-							lib => $data->{'lib'},
-							id => $data->{'id'}
-							);
-	if ($data->{'category'}) {
-		$template->param(category => "<input type=\"hidden\" name=\"category\" value='$data->{'category'}'>$data->{'category'}");
-	} else {
-		$template->param(category => "<input type=text name=\"category\" size=8 maxlength=8>");
-	}
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("replace authorised_values (id,category,authorised_value,lib) values (?,?,?,?)");
-	my $lib = $input->param('lib');
-	undef $lib if ($lib eq ""); # to insert NULL instead of a blank string
-	
-	$sth->execute($input->param('id'), $input->param('category'), $input->param('authorised_value'), $lib);
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=".$input->param('category')."\"></html>";
-	exit;
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select category,authorised_value,lib from authorised_values where id=?");
-	$sth->execute($id);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-	
-	$template->param(searchfield => $searchfield,
-							Tvalue => $data->{'authorised_value'},
-							id =>$id,
-							);
-
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("delete from authorised_values where id=?");
-	$sth->execute($id);
-	$sth->finish;
-	
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authorised_values.pl?searchfield=$searchfield\"></html>";
-	exit;
-
-													# END $OP eq DELETE_CONFIRMED
-################## DEFAULT ##################################
-} else { # DEFAULT
-	# build categories list
-	my $sth = $dbh->prepare("select distinct category from authorised_values");
-	$sth->execute;
-	my @category_list;
-	while ( my ($category) = $sth->fetchrow_array) {
-		push(@category_list,$category);
-	}
-	# push koha system categories
-	my $tab_list = CGI::scrolling_list(-name=>'searchfield',
-			-values=> \@category_list,
-			-default=>"",
-			-size=>1,
-			-multiple=>0,
-			);
-	if (!$searchfield) {
-		$searchfield=$category_list[0];
-	}
-	my $env;
-	my ($count,$results)=StringSearch($env,$searchfield,'web');
-	my $toggle="white";
-	my @loop_data = ();
-	# builds value list
-	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-	  	if ($toggle eq 'white'){
-			$toggle="#ffffcc";
-	  	} else {
-			$toggle="white";
-	  	}
-		my %row_data;  # get a fresh hash for the row data
-		$row_data{category} = $results->[$i]{'category'};
-		$row_data{authorised_value} = $results->[$i]{'authorised_value'};
-		$row_data{lib} = $results->[$i]{'lib'};
-		$row_data{edit} = "$script_name?op=add_form&id=".$results->[$i]{'id'};
-		$row_data{delete} = "$script_name?op=delete_confirm&searchfield=$searchfield&id=".$results->[$i]{'id'};
-		push(@loop_data, \%row_data);
-	}
-
-	$template->param(loop => \@loop_data,
-							tab_list => $tab_list,
-							category => $searchfield);
-
-	if ($offset>0) {
-		my $prevpage = $offset-$pagesize;
-		$template->param(isprevpage => $offset,
-						prevpage=> $prevpage,
-						searchfield => $searchfield,
-						script_name => $script_name,
-		 );
-	}
-	if ($offset+$pagesize<$count) {
-		my $nextpage =$offset+$pagesize;
-		$template->param(nextpage =>$nextpage,
-						searchfield => $searchfield,
-						script_name => $script_name,
-		);
-	}
-} #---- END $OP eq DEFAULT
-
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/admin/authtypes.pl
===================================================================
RCS file: cgi-bin/admin/authtypes.pl
diff -N cgi-bin/admin/authtypes.pl
--- cgi-bin/admin/authtypes.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,177 +0,0 @@
-#!/usr/bin/perl
-# NOTE: 4-character tabs
-
-#written 20/02/2002 by paul.poulain at free.fr
-# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
-
-# 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 CGI;
-use C4::Context;
-use C4::Output;
-use C4::Search;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-
-sub StringSearch  {
-	my ($env,$searchstring,$type)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select * from auth_types where (authtypecode like ?) order by authtypecode");
-	$sth->execute("$data[0]%");
-	my @results;
-	while (my $data=$sth->fetchrow_hashref){
-	push(@results,$data);
-	}
-	#  $sth->execute;
-	$sth->finish;
-	return (scalar(@results),\@results);
-}
-
-my $input = new CGI;
-my $searchfield=$input->param('authtypecode');
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/admin/authtypes.pl";
-my $authtypecode=$input->param('authtypecode');
-my $pagesize=20;
-my $op = $input->param('op');
-$searchfield=~ s/\,//g;
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/authtypes.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-
-if ($op) {
-$template->param(script_name => $script_name,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	#start the page and read in includes
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($authtypecode) {
-		my $dbh = C4::Context->dbh;
-		my $sth=$dbh->prepare("select * from auth_types where authtypecode=?");
-		$sth->execute($authtypecode);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-#	warn "=> $data->{'authtypetext'} : ".$data->{'summary'};
-	$template->param(authtypecode => $authtypecode,
-							authtypetext => $data->{'authtypetext'},
-							auth_tag_to_report => $data->{'auth_tag_to_report'},
-							summary => $data->{'summary'},
-							);
-;
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("replace auth_types (authtypecode,authtypetext,auth_tag_to_report,summary) values (?,?,?,?)");
-	$sth->execute($input->param('authtypecode'),$input->param('authtypetext'),$input->param('auth_tag_to_report'),$input->param('summary'));
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authtypes.pl\"></html>";
-	exit;
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	#start the page and read in includes
-	my $dbh = C4::Context->dbh;
-
-	my $total = 0;
-	for my $table ('auth_tag_structure') {
-	   my $sth=$dbh->prepare("select count(*) as total from $table where authtypecode=?");
-	   $sth->execute($authtypecode);
-	   $total += $sth->fetchrow_hashref->{total};
-	   $sth->finish;
-	}
-
-	my $sth=$dbh->prepare("select * from auth_types where authtypecode=?");
-	$sth->execute($authtypecode);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-
-	$template->param(authtypecode => $authtypecode,
-							authtypetext => $data->{'authtypetext'},
-							summary => $data->{'summary'},
-							total => $total);
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	#start the page and read in includes
-	my $dbh = C4::Context->dbh;
-	my $authtypecode=uc($input->param('authtypecode'));
-	my $sth=$dbh->prepare("delete from auth_tag_structure where authtypecode=?");
-	$sth->execute($authtypecode);
-	$sth=$dbh->prepare("delete from auth_subfield_structure where authtypecode=?");
-	$sth->execute($authtypecode);
-	$sth=$dbh->prepare("delete from auth_types where authtypecode=?");
-	$sth->execute($authtypecode);
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authtypes.pl\"></html>";
-	exit;
-													# END $OP eq DELETE_CONFIRMED
-################## DEFAULT ##################################
-} else { # DEFAULT
-	my $env;
-	my ($count,$results)=StringSearch($env,$searchfield,'web');
-	my $toggle="white";
-	my @loop_data;
-	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-		my %row_data;
-		if ($toggle eq 'white'){
-			$row_data{toggle}="#ffffcc";
-		} else {
-			$row_data{toggle}="white";
-		}
-		$row_data{authtypecode} = $results->[$i]{'authtypecode'};
-		$row_data{authtypetext} = $results->[$i]{'authtypetext'};
-		$row_data{auth_tag_to_report} = $results->[$i]{'auth_tag_to_report'};
-		$row_data{summary} = $results->[$i]{'summary'};
-		push(@loop_data, \%row_data);
-	}
-	$template->param(loop => \@loop_data);
-	if ($offset>0) {
-		my $prevpage = $offset-$pagesize;
-		$template->param(previous => "$script_name?offset=".$prevpage);
-	}
-	if ($offset+$pagesize<$count) {
-		my $nextpage =$offset+$pagesize;
-		$template->param(next => "$script_name?offset=".$nextpage);
-	}
-} #---- END $OP eq DEFAULT
-output_html_with_http_headers $input, $cookie, $template->output;
-
-# Local Variables:
-# tab-width: 4
-# End:

Index: cgi-bin/admin/biblios_framework.pl
===================================================================
RCS file: cgi-bin/admin/biblios_framework.pl
diff -N cgi-bin/admin/biblios_framework.pl
--- cgi-bin/admin/biblios_framework.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,177 +0,0 @@
-#!/usr/bin/perl
-# NOTE: 4-character tabs
-
-#written 20/02/2002 by paul.poulain at free.fr
-# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
-
-# 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 CGI;
-use C4::Context;
-use C4::Output;
-use C4::Search;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-
-
-sub StringSearch  {
-	my ($env,$searchstring,$type)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select * from biblios_framework where (frameworkcode like ?) order by frameworktext");
-	$sth->execute("$data[0]%");
-	my @results;
-	while (my $data=$sth->fetchrow_hashref){
-	push(@results,$data);
-	}
-	#  $sth->execute;
-	$sth->finish;
-	return (scalar(@results),\@results);
-}
-
-my $input = new CGI;
-my $searchfield=$input->param('frameworkcode');
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/admin/biblios_framework.pl";
-my $frameworkcode=$input->param('frameworkcode');
-my $pagesize=20;
-my $op = $input->param('op');
-$searchfield=~ s/\,//g;
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/biblios_framework.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-
-if ($op) {
-$template->param(script_name => $script_name,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-
-
-
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	#start the page and read in includes
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($frameworkcode) {
-		my $dbh = C4::Context->dbh;
-		my $sth=$dbh->prepare("select * from biblios_framework where frameworkcode=?");
-		$sth->execute($frameworkcode);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-	$template->param(frameworkcode => $frameworkcode,
-							frameworktext => $data->{'frameworktext'},
-							);
-;
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("replace biblios_framework (frameworkcode,frameworktext) values (?,?)");
-	$sth->execute($input->param('frameworkcode'),$input->param('frameworktext'));
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=biblios_framework.pl\"></html>";
-	exit;
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	#start the page and read in includes
-	my $dbh = C4::Context->dbh;
-
-	# Check both categoryitem and biblioitems, see Bug 199
-	my $total = 0;
-	for my $table ('biblios_tag_structure') {
-	   my $sth=$dbh->prepare("select count(*) as total from $table where frameworkcode=?");
-	   $sth->execute($frameworkcode);
-	   $total += $sth->fetchrow_hashref->{total};
-	   $sth->finish;
-	}
-
-	my $sth=$dbh->prepare("select * from biblios_framework where frameworkcode=?");
-	$sth->execute($frameworkcode);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-
-	$template->param(frameworkcode => $frameworkcode,
-							frameworktext => $data->{'frameworktext'},
-							total => $total);
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	#start the page and read in includes
-	my $dbh = C4::Context->dbh;
-	my $frameworkcode=uc($input->param('frameworkcode'));
-	my $sth=$dbh->prepare("delete from biblios_tag_structure where frameworkcode=?");
-	$sth->execute($frameworkcode);
-	$sth=$dbh->prepare("delete from biblios_subfield_structure where frameworkcode=?");
-	$sth->execute($frameworkcode);
-	$sth=$dbh->prepare("delete from biblios_framework where frameworkcode=?");
-	$sth->execute($frameworkcode);
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=biblios_framework.pl\"></html>";
-	exit;
-													# END $OP eq DELETE_CONFIRMED
-################## DEFAULT ##################################
-} else { # DEFAULT
-	my $env;
-	my ($count,$results)=StringSearch($env,$searchfield,'web');
-	my $toggle="white";
-	my @loop_data;
-	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-		my %row_data;
-		if ($toggle eq 'white'){
-			$row_data{toggle}="#ffffcc";
-		} else {
-			$row_data{toggle}="white";
-		}
-		$row_data{frameworkcode} = $results->[$i]{'frameworkcode'};
-		$row_data{frameworktext} = $results->[$i]{'frameworktext'};
-		push(@loop_data, \%row_data);
-	}
-	$template->param(loop => \@loop_data);
-	if ($offset>0) {
-		my $prevpage = $offset-$pagesize;
-		$template->param(previous => "$script_name?offset=".$prevpage);
-	}
-	if ($offset+$pagesize<$count) {
-		my $nextpage =$offset+$pagesize;
-		$template->param(next => "$script_name?offset=".$nextpage);
-	}
-} #---- END $OP eq DEFAULT
-output_html_with_http_headers $input, $cookie, $template->output;
-
-# Local Variables:
-# tab-width: 4
-# End:

Index: cgi-bin/admin/biblios_subfields_structure.pl
===================================================================
RCS file: cgi-bin/admin/biblios_subfields_structure.pl
diff -N cgi-bin/admin/biblios_subfields_structure.pl
--- cgi-bin/admin/biblios_subfields_structure.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,467 +0,0 @@
-#!/usr/bin/perl
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Auth;
-use CGI;
-use C4::Search;
-use C4::Context;
-
-sub StringSearch  {
-	my ($env,$searchstring,$frameworkcode)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select * from biblios_subfield_structure where (tagfield like ? and frameworkcode=?) order by tagfield");
-	$sth->execute("$searchstring%",$frameworkcode);
-	my @results;
-	my $cnt=0;
-	my $u=1;
-	while (my $data=$sth->fetchrow_hashref){
-		push(@results,$data);
-		$cnt ++;
-		$u++;
-	}
-	$sth->finish;
-	$dbh->disconnect;
-	return ($cnt,\@results);
-}
-
-my $input = new CGI;
-my $tagfield=$input->param('tagfield');
-my $tagsubfield=$input->param('tagsubfield');
-my $frameworkcode=$input->param('frameworkcode');
-my $pkfield="tagfield";
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/admin/biblios_subfields_structure.pl";
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/biblios_subfields_structure.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-my $pagesize=30;
-my $op = $input->param('op');
-$tagfield=~ s/\,//g;
-
-if ($op) {
-$template->param(script_name => $script_name,
-						tagfield =>$tagfield,
-						frameworkcode => $frameworkcode,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						tagfield =>$tagfield,
-						frameworkcode => $frameworkcode,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	my $data;
-	my $dbh = C4::Context->dbh;
-	my $more_subfields = $input->param("more_subfields")+1;
-	
-	
-	# build authorised value list
-	
-my	$sth2 = $dbh->prepare("select distinct category from authorised_values");
-	$sth2->execute;
-	my @authorised_values;
-	push @authorised_values,"";
-	while ((my $category) = $sth2->fetchrow_array) {
-		push @authorised_values, $category;
-	}
-	push (@authorised_values,"branches");
-	push (@authorised_values,"itemtypes");
-	# build thesaurus categories list
-	$sth2->finish;
-	$sth2 = $dbh->prepare("select authtypecode from auth_types");
-	$sth2->execute;
-	my @authtypes;
-	push @authtypes,"";
-	while ((my $authtypecode) = $sth2->fetchrow_array) {
-		push @authtypes, $authtypecode;
-	}
-	# build value_builder list
-	my @value_builder=('');
-
-	# read value_builder directory.
-	# 2 cases here : on CVS install, $cgidir does not need a /cgi-bin
-	# on a standard install, /cgi-bin need to be added. 
-	# test one, then the other
-	my $cgidir = C4::Context->intranetdir ."/cgi-bin";
-	unless (opendir(DIR, "$cgidir/value_builder")) {
-		$cgidir = C4::Context->intranetdir;
-		opendir(DIR, "$cgidir/value_builder") || die "can't opendir $cgidir/value_builder: $!";
-	} 
-	while (my $line = readdir(DIR)) {
-		if ($line =~ /\.pl$/) {
-			push (@value_builder,$line);
-		}
-	}
-	closedir DIR;
-
-	# build values list
-	my $sth=$dbh->prepare("select * from biblios_subfield_structure where tagfield=? and frameworkcode=?"); # and tagsubfield='$tagsubfield'");
-	$sth->execute($tagfield,$frameworkcode);
-	my @loop_data = ();
-	my $toggle=1;
-	my $i=0;
-	while ($data =$sth->fetchrow_hashref) {
-		my %row_data;  # get a fresh hash for the row data
-		if ($toggle eq 1){
-			$toggle=0;
-	  	} else {
-			$toggle=1;
-	  	}
-		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
-					-id=>"tab$i",
-					-values=>['-1','0','1','2','3','4','5','6','7','8','9'],
-					-labels => {'-1' =>'ignore','0'=>'0','1'=>'1','2' =>'2','3'=>'3','4'=>'4',
-									'5' =>'5','6'=>'6','7'=>'7',
-									'8' =>'8','9'=>'9',},
-					-default=>$data->{'tab'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ohidden} = CGI::scrolling_list(-name=>'ohidden',
-					-id=>"ohidden$i",
-					-values=>['0','2'],
-					-labels => {'0'=>'Show',
-									'2' =>'Hide',
-									},
-					-default=>substr($data->{'hidden'},0,1),
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
-					-id=>"ihidden$i",
-					-values=>['0','2'],
-					-labels => {'0'=>'Show',
-									'2' =>'Hide',
-									},
-					-default=>substr($data->{'hidden'},1,1),
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
-					-id=>"ehidden$i",
-					-values=>['0','1','2'],
-					-labels => {'0'=>'Show','1'=>'Show Collapsed',
-									'2' =>'Hide',
-									},
-					-default=>substr($data->{'hidden'},2,1),
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{tagsubfield} =$data->{'tagsubfield'}."<input type=\"hidden\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" id=\"tagsubfield\">";
-		$row_data{liblibrarian} = CGI::escapeHTML($data->{'liblibrarian'});
-		$row_data{libopac} = CGI::escapeHTML($data->{'libopac'});
-		$row_data{seealso} = CGI::escapeHTML($data->{'seealso'});
-		
-		$row_data{authorised_value}  = CGI::scrolling_list(-name=>'authorised_value',
-					-id=>'authorised_value',
-					-values=> \@authorised_values,
-					-default=>$data->{'authorised_value'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{value_builder}  = CGI::scrolling_list(-name=>'value_builder',
-					-id=>'value_builder',
-					-values=> \@value_builder,
-					-default=>$data->{'value_builder'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{authtypes}  = CGI::scrolling_list(-name=>'authtypecode',
-					-id=>'authtypecode',
-					-values=> \@authtypes,
-					-default=>$data->{'authtypecode'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{repeatable} = CGI::checkbox(-name=>"repeatable$i",
-	-checked => $data->{'repeatable'}?'checked':'',
-	-value => 1,
-	-label => '',
-	-id => "repeatable$i");
-		$row_data{mandatory} = CGI::checkbox(-name => "mandatory$i",
-	-checked => $data->{'mandatory'}?'checked':'',
-	-value => 1,
-	-label => '',
-	-id => "mandatory$i");
-		$row_data{hidden} = CGI::escapeHTML($data->{hidden});
-		$row_data{isurl} = CGI::checkbox( -name => "isurl$i",
-			-id => "isurl$i",
-			-checked => $data->{'isurl'}?'checked':'',
-			-value => 1,
-			-label => '');
-		$row_data{row} = $i;
-		$row_data{toggle} = $toggle;
-		$row_data{link} = CGI::escapeHTML($data->{'link'});
-		push(@loop_data, \%row_data);
-		$i++;
-	}
-	# add more_subfields empty lines for add if needed
-	for (my $i=1;$i<=$more_subfields;$i++) {
-		my %row_data;  # get a fresh hash for the row data
-		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
-					-id => "tab$i",
-					-values=>['-1','0','1','2','3','4','5','6','7','8','9'],
-					-labels => {'-1' =>'ignore','0'=>'0','1'=>'1',
-									'2' =>'2','3'=>'3','4'=>'4',
-									'5' =>'5','6'=>'6','7'=>'7',
-									'8' =>'8','9'=>'9',
-									},
-					-default=>"",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ohidden} = CGI::scrolling_list(-name=>'ohidden',
-					-id=>"ohidden$i",
-					-values=>['0','2'],
-					-labels => {'0'=>'Show','2' =>'Hide',},
-					-default=>"0",
-					-size=>1,
-					-multiple=>0,
-					);
-
-		$row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
-					-id=>"ihidden$i",
-					-values=>['0','2'],
-					-labels => {'0'=>'Show','2' =>'Hide',},
-					-default=>"0",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
-					-id=>"ehidden$i",
-					-values=>['0','1','2'],
-					-labels => {'0'=>'Show','1'=>'Show Collapsed',
-									'2' =>'Hide',
-									},
-					-default=>"0",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{tagsubfield} = "<input type=\"text\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\">";
-		$row_data{liblibrarian} = "";
-		$row_data{libopac} = "";
-		$row_data{seealso} = "";
-		$row_data{hidden} = "000";
-		$row_data{repeatable} = CGI::checkbox( -name=> 'repeatable',
-				-id => "repeatable$i",
-				-checked => '',
-				-value => 1,
-				-label => '');
-		$row_data{mandatory} = CGI::checkbox( -name=> 'mandatory',
-			-id => "mandatory$i",
-			-checked => '',
-			-value => 1,
-			-label => '');
-		$row_data{isurl} = CGI::checkbox(-name => 'isurl',
-			-id => "isurl$i",
-			-checked => '',
-			-value => 1,
-			-label => '');
-		
-		$row_data{authorised_value}  = CGI::scrolling_list(-name=>'authorised_value',
-					-id => 'authorised_value',
-					-values=> \@authorised_values,
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{authtypes}  = CGI::scrolling_list(-name=>'authtypecode',
-					-id => 'authtypecode',
-					-values=> \@authtypes,
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{link} = CGI::escapeHTML($data->{'link'});
-		$row_data{toggle} = $toggle;
-		$row_data{row} = $i;
-		push(@loop_data, \%row_data);
-	}
-	$template->param('use-heading-flags-p' => 1);
-	$template->param('heading-edit-subfields-p' => 1);
-	$template->param(action => "Edit subfields",
-							tagfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\">$tagfield",
-							loop => \@loop_data,
-							more_subfields => $more_subfields,
-							more_tag => $tagfield);
-
-												# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	my $dbh = C4::Context->dbh;
-	$template->param(tagfield => "$input->param('tagfield')");
-	my $sth=$dbh->prepare("replace biblios_subfield_structure (tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,tab,seealso,authorised_value,authtypecode,value_builder,hidden,isurl,frameworkcode, link)
-									values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
-	my @tagsubfield	= $input->param('tagsubfield');
-	my @liblibrarian	= $input->param('liblibrarian');
-	my @libopac		= $input->param('libopac');
-
-	my @tab				= $input->param('tab');
-	my @seealso		= $input->param('seealso');
-#	my @hidden		= $input->param('hidden');
-	my @hidden;
-	my @ohidden		= $input->param('ohidden');
-	my @ihidden		= $input->param('ihidden');
-	my @ehidden		= $input->param('ehidden');
-	my @authorised_values	= $input->param('authorised_value');
-	my @authtypecodes	= $input->param('authtypecode');
-	my @value_builder	=$input->param('value_builder');
-	my @link		=$input->param('link');
-	for (my $i=0; $i<= $#tagsubfield ; $i++) {
-		my $tagfield			=$input->param('tagfield');
-		my $tagsubfield		=$tagsubfield[$i];
-		$tagsubfield="@" unless $tagsubfield ne '';
-		my $liblibrarian		=$liblibrarian[$i];
-		my $libopac			=$libopac[$i];
-		my $repeatable		=$input->param("repeatable$i")?1:0;
-		my $mandatory		=$input->param("mandatory$i")?1:0;
-	
-		my $tab				=$tab[$i];
-		my $seealso				=$seealso[$i];
-		my $authorised_value		=$authorised_values[$i];
-		my $authtypecode		=$authtypecodes[$i];
-		my $value_builder=$value_builder[$i];
-		my $hidden = $ohidden[$i].$ihidden[$i].$ehidden[$i]; #collate from 3 hiddens;
-		my $isurl = $input->param("isurl$i")?1:0;
-		my $link = $link[$i];
-		if ($liblibrarian) {
-			unless (C4::Context->config('demo') eq 1) {
-				$sth->execute ($tagfield,
-									$tagsubfield,
-									$liblibrarian,
-									$libopac,
-									$repeatable,
-									$mandatory,
-									
-									$tab,
-									$seealso,
-									$authorised_value,
-									$authtypecode,
-									$value_builder,
-									$hidden,
-									$isurl,
-									$frameworkcode,
-
-	 $link,
-					      );
-			}
-		}
-	}
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=biblios_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode\"></html>";
-	exit;
-
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select * from biblios_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?");
-	#FIXME : called with 2 bind variables when 3 are needed
-	$sth->execute($tagfield,$tagsubfield);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(liblibrarian => $data->{'liblibrarian'},
-							tagsubfield => $data->{'tagsubfield'},
-							delete_link => $script_name,
-							tagfield      =>$tagfield,
-							tagsubfield => $tagsubfield,
-							frameworkcode => $frameworkcode,
-							);
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	my $dbh = C4::Context->dbh;
-	unless (C4::Context->config('demo') eq 1) {
-		my $sth=$dbh->prepare("delete from biblios_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?");
-		$sth->execute($tagfield,$tagsubfield,$frameworkcode);
-		$sth->finish;
-	}
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=biblios_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode\"></html>";
-	exit;
-	$template->param(tagfield => $tagfield);
-													# END $OP eq DELETE_CONFIRMED
-################## DEFAULT ##################################
-} else { # DEFAULT
-	my $env;
-	my ($count,$results)=StringSearch($env,$tagfield,$frameworkcode);
-	my $toggle=1;
-	my @loop_data = ();
-	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-	  	if ($toggle eq 1){
-			$toggle=0;
-	  	} else {
-			$toggle=1;
-	  	}
-		my %row_data;  # get a fresh hash for the row data
-		$row_data{tagfield} = $results->[$i]{'tagfield'};
-		$row_data{tagsubfield} = $results->[$i]{'tagsubfield'};
-		$row_data{liblibrarian} = $results->[$i]{'liblibrarian'};
-		$row_data{repeatable} = $results->[$i]{'repeatable'};
-		$row_data{mandatory} = $results->[$i]{'mandatory'};
-		$row_data{tab} = $results->[$i]{'tab'};
-		$row_data{seealso} = $results->[$i]{'seealso'};
-		$row_data{authorised_value} = $results->[$i]{'authorised_value'};
-		$row_data{authtypecode}	= $results->[$i]{'authtypecode'};
-		$row_data{value_builder}	= $results->[$i]{'value_builder'};
-		$row_data{hidden}	= $results->[$i]{'hidden'} if($results->[$i]{'hidden'} gt "000") ;
-		$row_data{isurl}	= $results->[$i]{'isurl'};
-		$row_data{link}	= $results->[$i]{'link'};
-		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&frameworkcode=$frameworkcode";
-		$row_data{toggle} = $toggle;
-		if ($row_data{tab} eq -1) {
-			$row_data{subfield_ignored} = 1;
-		}
-
-		push(@loop_data, \%row_data);
-	}
-	$template->param(loop => \@loop_data);
-	$template->param(edit_tagfield => $tagfield,
-		edit_frameworkcode => $frameworkcode);
-	
-	if ($offset>0) {
-		my $prevpage = $offset-$pagesize;
-		$template->param(prev =>"<a href=\"$script_name?offset=$prevpage\">");
-	}
-	if ($offset+$pagesize<$count) {
-		my $nextpage =$offset+$pagesize;
-		$template->param(next => "<a href=\"$script_name?offset=$nextpage\">");
-	}
-} #---- END $OP eq DEFAULT
-$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/admin/bibliostagstructure.pl
===================================================================
RCS file: cgi-bin/admin/bibliostagstructure.pl
diff -N cgi-bin/admin/bibliostagstructure.pl
--- cgi-bin/admin/bibliostagstructure.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,397 +0,0 @@
-#!/usr/bin/perl
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Koha;
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Search;
-
-
-# retrieve parameters
-my $input = new CGI;
-my $frameworkcode = $input->param('frameworkcode'); # set to select framework
-$frameworkcode="" unless $frameworkcode;
-my $existingframeworkcode = $input->param('existingframeworkcode'); # set when we have to create a new framework (in frameworkcode) by copying an old one (in existingframeworkcode)
-$existingframeworkcode = "" unless $existingframeworkcode;
-my $frameworkinfo = getframeworkinfo($frameworkcode);
-my $searchfield=$input->param('searchfield');
-$searchfield=0 unless $searchfield;
-$searchfield=~ s/\,//g;
-
-my $offset=$input->param('offset');
-my $op = $input->param('op');
-my $dspchoice = $input->param('select_display');
-my $pagesize=20;
-
-my $script_name="/cgi-bin/koha/admin/bibliostagstructure.pl";
-
-my $dbh = C4::Context->dbh;
-
-# open template
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/bibliostagstructure.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-
-# get framework list
-my $frameworks = getframeworks();
-my @frameworkloop;
-foreach my $thisframeworkcode (keys %$frameworks) {
-	my $selected = 1 if $thisframeworkcode eq $frameworkcode;
-	my %row =(value => $thisframeworkcode,
-				selected => $selected,
-				frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
-			);
-	push @frameworkloop, \%row;
-}
-
-# check that framework is defined in biblios_tag_structure
-my $sth=$dbh->prepare("select count(*) from biblios_tag_structure where frameworkcode=?");
-$sth->execute($frameworkcode);
-my ($frameworkexist) = $sth->fetchrow;
-if ($frameworkexist) {
-} else {
-	# if frameworkcode does not exists, then OP must be changed to "create framework" if we are not on the way to create it
-	# (op = itemtyp_create_confirm)
-	if ($op eq "framework_create_confirm") {
-		duplicate_framework($frameworkcode, $existingframeworkcode);
-		$op=""; # unset $op to go back to framework list
-	} else {
-		$op = "framework_create";
-	}
-}
-$template->param(frameworkloop => \@frameworkloop,
-				frameworkcode => $frameworkcode,
-				frameworktext => $frameworkinfo->{frameworktext});
-if ($op) {
-$template->param(script_name => $script_name,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($searchfield) {
-		$sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from biblios_tag_structure where tagfield=? and frameworkcode=?");
-		$sth->execute($searchfield,$frameworkcode);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-	my $sth = $dbh->prepare("select distinct category from authorised_values");
-	$sth->execute;
-	my @authorised_values;
-	push @authorised_values,"";
-	while ((my $category) = $sth->fetchrow_array) {
-		push @authorised_values, $category;
-	}
-	my $authorised_value  = CGI::scrolling_list(-name=>'authorised_value',
-			-values=> \@authorised_values,
-			-size=>1,
-			-id=>"authorised_value",
-			-multiple=>0,
-			-default => $data->{'authorised_value'},
-			);
-
-	if ($searchfield) {
-		$template->param(action => "Modify tag",
-								searchfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$searchfield\" />$searchfield");
-		$template->param('heading-modify-tag-p' => 1);
-	} else {
-		$template->param(action => "Add tag",
-								searchfield => "<input type=\"text\" name=\"tagfield\" size=\"5\" maxlength=\"3\" />");
-		$template->param('heading-add-tag-p' => 1);
-	}
-	$template->param('use-heading-flags-p' => 1);
-	$template->param(liblibrarian => $data->{'liblibrarian'},
-			libopac => $data->{'libopac'},
-			repeatable => CGI::checkbox(-name=>'repeatable',
-						-checked=> $data->{'repeatable'}?'checked':'',
-						-value=> 1,
-						-label => '',
-						-id=> 'repeatable'),
-			mandatory => CGI::checkbox(-name => 'mandatory',
-						-checked => $data->{'mandatory'}?'checked':'',
-						-value => 1,
-						-label => '',
-						-id => 'mandatory'),
-			authorised_value => $authorised_value,
-			frameworkcode => $frameworkcode,
-			);
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	$sth=$dbh->prepare("replace biblios_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) values (?,?,?,?,?,?,?)");
-	my $tagfield       =$input->param('tagfield');
-	my $liblibrarian  = $input->param('liblibrarian');
-	my $libopac       =$input->param('libopac');
-	my $repeatable =$input->param('repeatable');
-	my $mandatory =$input->param('mandatory');
-	my $authorised_value =$input->param('authorised_value');
-	unless (C4::Context->config('demo') eq 1) {
-		$sth->execute($tagfield,
-							$liblibrarian,
-							$libopac,
-							$repeatable?1:0,
-							$mandatory?1:0,
-							$authorised_value,
-							$frameworkcode
-							);
-	}
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=bibliostagstructure.pl?searchfield=$tagfield&frameworkcode=$frameworkcode\"></html>";
-	exit;
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	$sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from biblios_tag_structure where tagfield=? and frameworkcode=?");
-	$sth->execute($searchfield,$frameworkcode);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(liblibrarian => $data->{'liblibrarian'},
-							searchfield => $searchfield,
-							frameworkcode => $frameworkcode,
-							);
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	unless (C4::Context->config('demo') eq 1) {
-		$dbh->do("delete from biblios_tag_structure where tagfield='$searchfield' and frameworkcode='$frameworkcode'");
-		$dbh->do("delete from biblios_subfield_structure where tagfield='$searchfield' and frameworkcode='$frameworkcode'");
-		
-	}
-													# END $OP eq DELETE_CONFIRMED
-################## ITEMTYPE_CREATE ##################################
-# called automatically if an unexisting  frameworkis selected
-} elsif ($op eq 'framework_create') {
-	$sth = $dbh->prepare("select count(*),biblios_tag_structure.frameworkcode,frameworktext from biblios_tag_structure,biblios_framework where biblios_framework.frameworkcode=biblios_tag_structure.frameworkcode group by biblios_tag_structure.frameworkcode");
-	$sth->execute;
-	my @existingframeworkloop;
-	while (my ($tot,$thisframeworkcode,$frameworktext) = $sth->fetchrow) {
-		if ($tot>0) {
-			my %line = ( value => $thisframeworkcode,
-						frameworktext => $frameworktext,
-					);
-			push @existingframeworkloop,\%line;
-		}
-	}
-	$template->param(existingframeworkloop => \@existingframeworkloop,
-					frameworkcode => $frameworkcode,
-# 					FRtext => $frameworkinfo->{frameworktext},
-					);
-################## DEFAULT ##################################
-} else { # DEFAULT
-	# here, $op can be unset or set to "framework_create_confirm".
-	if  ($searchfield ne '') {
-		 $template->param(searchfield => $searchfield);
-	}
-	my $cnt=0;
-	if ($dspchoice) {
-		#here, user only wants used tags/subfields displayed
-		my $env;
-		$searchfield=~ s/\'/\\\'/g;
-		my @data=split(' ',$searchfield);
-		my $sth=$dbh->prepare("Select biblios_tag_structure.tagfield as mts_tagfield,biblios_tag_structure.liblibrarian as mts_liblibrarian,biblios_tag_structure.libopac as mts_libopac,biblios_tag_structure.repeatable as mts_repeatable,biblios_tag_structure.mandatory as mts_mandatory,biblios_tag_structure.authorised_value as mts_authorized_value,biblios_subfield_structure.* from biblios_tag_structure LEFT JOIN biblios_subfield_structure ON (biblios_tag_structure.tagfield=biblios_subfield_structure.tagfield AND biblios_tag_structure.frameworkcode=biblios_subfield_structure.frameworkcode) where (biblios_tag_structure.tagfield >= ? and biblios_tag_structure.frameworkcode=?) AND biblios_subfield_structure.tab>=0 order by biblios_tag_structure.tagfield,biblios_subfield_structure.tagsubfield");
-		#could be ordoned by tab
-		$sth->execute($data[0], $frameworkcode);
-		my @results = ();
-		while (my $data=$sth->fetchrow_hashref){
-			push(@results,$data);
-			$cnt++;
-		}
-		$sth->finish;
-		
-		my $toggle=0;
-		my @loop_data = ();
-		my $j=1;
-		my $i=$offset;
-		while ($i < ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt)) {
-			if ($toggle eq 0){
-				$toggle=1;
-			} else {
-				$toggle=0;
-			}
-			my %row_data;  # get a fresh hash for the row data
-			$row_data{tagfield} = $results[$i]->{'mts_tagfield'};
-			$row_data{liblibrarian} = $results[$i]->{'mts_liblibrarian'};
-			$row_data{repeatable} = $results[$i]->{'mts_repeatable'};
-			$row_data{mandatory} = $results[$i]->{'mts_mandatory'};
-			$row_data{authorised_value} = $results[$i]->{'mts_authorised_value'};
-			$row_data{subfield_link} ="biblios_subfields_structure.pl?op=add_form&tagfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{toggle} = $toggle;
-			$j=$i;
-			my @internal_loop = ();
-			while (($results[$i]->{'tagfield'}==$results[$j]->{'tagfield'}) and ($j< ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt))) {
-				if ($toggle eq 0) {
-					$toggle=1;
-				} else {
-					$toggle=0;
-				}
-				my %subfield_data;
-				$subfield_data{tagsubfield} = $results[$j]->{'tagsubfield'};
-				$subfield_data{liblibrarian} = $results[$j]->{'liblibrarian'};
-				$subfield_data{repeatable} = $results[$j]->{'repeatable'};
-				$subfield_data{mandatory} = $results[$j]->{'mandatory'};
-				$subfield_data{tab} = $results[$j]->{'tab'};
-				$subfield_data{seealso} = $results[$j]->{'seealso'};
-				$subfield_data{authorised_value} = $results[$j]->{'authorised_value'};
-				$subfield_data{authtypecode}= $results[$j]->{'authtypecode'};
-				$subfield_data{value_builder}= $results[$j]->{'value_builder'};
-				$subfield_data{toggle}	= $toggle;
-# 				warn "tagfield :  ".$results[$j]->{'tagfield'}." tagsubfield :".$results[$j]->{'tagsubfield'};
-				push @internal_loop,\%subfield_data;
-				$j++;
-			}
-			$row_data{'subfields'}=\@internal_loop;
-			push(@loop_data, \%row_data);
-#			undef @internal_loop;
-			$i=$j;
-		}
-		$template->param(select_display => "True",
-						loop => \@loop_data);
-		#  $sth->execute;
-		$sth->finish;
-	} else {
-		#here, normal old style : display every tags
-		my $env;
-		my ($count,$results)=StringSearch($env,$searchfield,$frameworkcode);
-		$cnt = $count;
-		my $toggle=0;
-		my @loop_data = ();
-		for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-			if ($toggle eq 0){
-				$toggle=1;
-			} else {
-				$toggle=0;
-			}
-			my %row_data;  # get a fresh hash for the row data
-			$row_data{tagfield} = $results->[$i]{'tagfield'};
-			$row_data{liblibrarian} = $results->[$i]{'liblibrarian'};
-			$row_data{repeatable} = $results->[$i]{'repeatable'};
-			$row_data{mandatory} = $results->[$i]{'mandatory'};
-			$row_data{authorised_value} = $results->[$i]{'authorised_value'};
-			$row_data{subfield_link} ="biblios_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{toggle} = $toggle;
-			push(@loop_data, \%row_data);
-		}
-		$template->param(loop => \@loop_data);
-	}
-	if ($offset>0) {
-		my $prevpage = $offset-$pagesize;
-		$template->param(isprevpage => $offset,
-						prevpage=> $prevpage,
-						searchfield => $searchfield,
-						script_name => $script_name,
-						frameworkcode => $frameworkcode,
-		);
-	}
-	if ($offset+$pagesize<$cnt) {
-		my $nextpage =$offset+$pagesize;
-		$template->param(nextpage =>$nextpage,
-						searchfield => $searchfield,
-						script_name => $script_name,
-						frameworkcode => $frameworkcode,
-		);
-	}
-} #---- END $OP eq DEFAULT
-
-$template->param(loggeninuser => $loggedinuser,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $input, $cookie, $template->output;
-
-
-#
-# the sub used for searches
-#
-sub StringSearch  {
-	my ($env,$searchstring,$frameworkcode)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from biblios_tag_structure where (tagfield >= ? and frameworkcode=?) order by tagfield");
-	$sth->execute($data[0], $frameworkcode);
-	my @results;
-	while (my $data=$sth->fetchrow_hashref){
-	push(@results,$data);
-	}
-	#  $sth->execute;
-	$sth->finish;
-	return (scalar(@results),\@results);
-}
-
-#
-# the sub used to duplicate a framework from an existing one in MARC parameters tables.
-#
-sub duplicate_framework {
-	my ($newframeworkcode,$oldframeworkcode) = @_;
-	my $sth = $dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from biblios_tag_structure where frameworkcode=?");
-	$sth->execute($oldframeworkcode);
-	my $sth_insert = $dbh->prepare("insert into biblios_tag_structure (tagfield, liblibrarian, libopac, repeatable, mandatory, authorised_value, frameworkcode) values (?,?,?,?,?,?,?)");
-	while ( my ($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value) = $sth->fetchrow) {
-		$sth_insert->execute($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value,$newframeworkcode);
-	}
-
-	$sth = $dbh->prepare("select frameworkcode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,tab,authorised_value,authtypecode,value_builder,seealso,hidden,isurl from biblios_subfield_structure where frameworkcode=?");
-	$sth->execute($oldframeworkcode);
-	$sth_insert = $dbh->prepare("insert into biblios_subfield_structure (frameworkcode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,tab,authorised_value,authtypecode,value_builder,seealso,hidden,isurl) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
-	while ( my ($frameworkcode, $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory,  $tab, $authorised_value, $thesaurus_category, $value_builder, $seealso,$hidden,$isurl) = $sth->fetchrow) {
-	    $sth_insert->execute($newframeworkcode, $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory, $tab, $authorised_value, $thesaurus_category, $value_builder, $seealso,$hidden,$isurl);
-	}
-	
-## now the same for holdings
-	$sth = $dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from holdings_tag_structure where frameworkcode=?");
-	$sth->execute($oldframeworkcode);
-	my $sth_insert = $dbh->prepare("insert into holdings_tag_structure (tagfield, liblibrarian, libopac, repeatable, mandatory, authorised_value, frameworkcode) values (?,?,?,?,?,?,?)");
-	while ( my ($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value) = $sth->fetchrow) {
-		$sth_insert->execute($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value,$newframeworkcode);
-	}
-
-	$sth = $dbh->prepare("select frameworkcode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,tab,authorised_value,authtypecode,value_builder,seealso,hidden,isurl from holdings_subfield_structure where frameworkcode=?");
-	$sth->execute($oldframeworkcode);
-	$sth_insert = $dbh->prepare("insert into holdings_subfield_structure (frameworkcode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,tab,authorised_value,authtypecode,value_builder,seealso,hidden,isurl) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
-	while ( my ($frameworkcode, $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory,  $tab, $authorised_value, $thesaurus_category, $value_builder, $seealso,$hidden,$isurl) = $sth->fetchrow) {
-	    $sth_insert->execute($newframeworkcode, $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory, $tab, $authorised_value, $thesaurus_category, $value_builder, $seealso,$hidden,$isurl);
-	}
-}
-

Index: cgi-bin/admin/branches.pl
===================================================================
RCS file: cgi-bin/admin/branches.pl
diff -N cgi-bin/admin/branches.pl
--- cgi-bin/admin/branches.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,509 +0,0 @@
-#!/usr/bin/perl
-
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Search;
-# Fixed variables
-my $linecolor1='#ffffcc';
-my $linecolor2='white';
-
-my $script_name="/cgi-bin/koha/admin/branches.pl";
-my $pagesize=20;
-
-
-#######################################################################################
-# Main loop....
-my $input = new CGI;
-my $branchcode=$input->param('branchcode');
-my $branchname=$input->param('branchname');
-my $categorycode = $input->param('categorycode');
-my $op = $input->param('op');
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/branches.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1, management => 1},
-			     debug => 1,
-			     });
-if ($op) {
-	$template->param(script_name => $script_name,
-				$op         => 1); # we show only the TMPL_VAR names $op
-} else {
-	$template->param(script_name => $script_name,
-				else        => 1); # we show only the TMPL_VAR names $op
-}
-$template->param(action => $script_name);
-if ($op eq 'add') {
-	# If the user has pressed the "add new branch" button.
-	heading("Branches: Add Branch");
-	$template->param('heading-branches-add-branch-p' => 1);
-	$template->param('use-heading-flags-p' => 1);
-	editbranchform();
-
-} elsif ($op eq 'edit') {
-	# if the user has pressed the "edit branch settings" button.
-	heading("Branches: Edit Branch");
-	$template->param('heading-branches-edit-branch-p' => 1);
-	$template->param('use-heading-flags-p' => 1);
-	$template->param(add => 1);
-	editbranchform($branchcode);
-} elsif ($op eq 'add_validate') {
-	# confirm settings change...
-	my $params = $input->Vars;
-	unless ($params->{'branchcode'} && $params->{'branchname'}) {
-		default ("Cannot change branch record: You must specify a Branchname and a Branchcode");
-	} else {
-		setbranchinfo($params);
-		$template->param(else => 1);
-		default ("Branch record changed for branch: $params->{'branchname'}");
-	}
-} elsif ($op eq 'delete') {
-	# if the user has pressed the "delete branch" button.
-	my $message = checkdatabasefor($branchcode);
-	if ($message) {
-		$template->param(else => 1);
-		default($message);
-	} else {
-		$template->param(branchname => $branchname);
-		$template->param(delete_confirm => 1);
-		$template->param(branchcode => $branchcode);
-	}
-} elsif ($op eq 'delete_confirmed') {
-	# actually delete branch and return to the main screen....
-	deletebranch($branchcode);
-	$template->param(else => 1);
-	default("The branch \"$branchname\" ($branchcode) has been deleted.");
-} elsif ($op eq 'editcategory') {
-	# If the user has pressed the "add new category" or "modify" buttons.
-	heading("Branches: Edit Category");
-	$template->param('heading-branches-edit-category-p' => 1);
-	$template->param('use-heading-flags-p' => 1);
-	editcatform($categorycode);
-} elsif ($op eq 'addcategory_validate') {
-	# confirm settings change...
-	my $params = $input->Vars;
-	unless ($params->{'categorycode'} && $params->{'categoryname'}) {
-		default ("Cannot change branch record: You must specify a Branchname and a Branchcode");
-	} else {
-		setcategoryinfo($params);
-		$template->param(else => 1);
-		default ("Category record changed for category $params->{'categoryname'}");
-	}
-} elsif ($op eq 'delete_category') {
-	# if the user has pressed the "delete branch" button.
-	my $message = checkcategorycode($categorycode);
-	if ($message) {
-		$template->param(else => 1);
-		default($message);
-	} else {
-		$template->param(delete_category => 1);
-		$template->param(categorycode => $categorycode);
-	}
-} elsif ($op eq 'categorydelete_confirmed') {
-	# actually delete branch and return to the main screen....
-	deletecategory($categorycode);
-	$template->param(else => 1);
-	default("The category with code $categorycode has been deleted.");
-
-} else {
-	# if no operation has been set...
-	default();
-}
-
-
-
-######################################################################################################
-#
-# html output functions....
-
-sub default {
-	my ($message) = @_;
-	heading("Branches");
-	$template->param('heading-branches-p' => 1);
-	$template->param('use-heading-flags-p' => 1);
-	$template->param(message => $message);
-	$template->param(action => $script_name);
-	branchinfotable();
-}
-
-# FIXME: this function should not exist; otherwise headings are untranslatable
-sub heading {
-	my ($head) = @_;
-	$template->param(head => $head);
-}
-
-sub editbranchform {
-	# prepares the edit form...
-	my ($branchcode) = @_;
-	my $data;
-	if ($branchcode) {
-		$data = getbranchinfo($branchcode);
-		$data = $data->[0];
-		$template->param(branchcode => $data->{'branchcode'});
-		$template->param(branchname => $data->{'branchname'});
-		$template->param(branchaddress1 => $data->{'branchaddress1'});
-		$template->param(branchaddress2 => $data->{'branchaddress2'});
-		$template->param(branchaddress3 => $data->{'branchaddress3'});
-		$template->param(branchphone => $data->{'branchphone'});
-		$template->param(branchfax => $data->{'branchfax'});
-		$template->param(branchemail => $data->{'branchemail'});
-    }
-
-    # make the checkboxs.....
-    #
-    # We export a "categoryloop" array to the template, each element of which
-    # contains separate 'categoryname', 'categorycode', 'codedescription', and
-    # 'checked' fields. The $checked field is either '' or 'checked'
-    # (see bug 130)
-    #
-    my $catinfo = getcategoryinfo();
-    my $catcheckbox;
-#    print DEBUG "catinfo=".cvs($catinfo)."\n";
-    my @categoryloop = ();
-    foreach my $cat (@$catinfo) {
-	my $checked = "";
-	my $tmp = quotemeta($cat->{'categorycode'});
-	if (grep {/^$tmp$/} @{$data->{'categories'}}) {
-		$checked = "checked=\"checked\"";
-	}
-	push @categoryloop, {
-		categoryname    => $cat->{'categoryname'},
-		categorycode    => $cat->{'categorycode'},
-		codedescription => $cat->{'codedescription'},
-		checked         => $checked,
-	    };
-	}
-	$template->param(categoryloop => \@categoryloop);
-
-    # {{{ Leave this here until bug 130 is completely resolved in the templates
-	for my $obsolete ('categoryname', 'categorycode', 'codedescription') {
-		$template->param($obsolete => 'Your template is out of date (bug 130)');
-	}
-    # }}}
-}
-
-sub editcatform {
-	# prepares the edit form...
-	my ($categorycode) = @_;
-	warn "cat : $categorycode";
-	my $data;
-	if ($categorycode) {
-		$data = getcategoryinfo($categorycode);
-		$data = $data->[0];
-		$template->param(categorycode => $data->{'categorycode'});
-		$template->param(categoryname => $data->{'categoryname'});
-		$template->param(codedescription => $data->{'codedescription'});
-    }
-}
-
-sub deleteconfirm {
-# message to print if the
-    my ($branchcode) = @_;
-}
-
-
-sub branchinfotable {
-# makes the html for a table of branch info from reference to an array of hashs.
-
-	my ($branchcode) = @_;
-	my $branchinfo;
-	if ($branchcode) {
-		$branchinfo = getbranchinfo($branchcode);
-	} else {
-		$branchinfo = getbranchinfo();
-	}
-	my $color;
-	my @loop_data =();
-	foreach my $branch (@$branchinfo) {
-		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
-		#
-		# We export the following fields to the template. These are not
-		# pre-composed as a single "address" field because the template
-		# might (and should) escape what is exported here. (See bug 180)
-		#
-		# - color
-		# - branch_name     (Note: not "branchname")
-		# - branch_code     (Note: not "branchcode")
-		# - address         (containing a static error message)
-		# - branchaddress1 \
-		# - branchaddress2  |
-		# - branchaddress3  | comprising the old "address" field
-		# - branchphone     |
-		# - branchfax       |
-		# - branchemail    /
-		# - address-empty-p (1 if no address information, 0 otherwise)
-		# - categories      (containing a static error message)
-		# - category_list   (loop containing "categoryname")
-		# - no-categories-p (1 if no categories set, 0 otherwise)
-		# - value
-		# - action
-		#
-		my %row = ();
-
-		# Handle address fields separately
-		my $address_empty_p = 1;
-		for my $field ('branchaddress1', 'branchaddress2', 'branchaddress3',
-			'branchphone', 'branchfax', 'branchemail') {
-			$row{$field} = $branch->{$field};
-			if ( $branch->{$field} ) {
-				$address_empty_p = 0;
-			}
-		}
-		$row{'address-empty-p'} = $address_empty_p;
-		# {{{ Leave this here until bug 180 is completely resolved in templates
-		$row{'address'} = 'Your template is out of date (see bug 180)';
-		# }}}
-
-		# Handle categories
-		my $no_categories_p = 1;
-		my @categories = '';
-		foreach my $cat (@{$branch->{'categories'}}) {
-			my ($catinfo) = @{getcategoryinfo($cat)};
-			push @categories, {'categoryname' => $catinfo->{'categoryname'}};
-			$no_categories_p = 0;
-		}
-		# {{{ Leave this here until bug 180 is completely resolved in templates
-		$row{'categories'} = 'Your template is out of date (see bug 180)';
-		# }}}
-		$row{'category_list'} = \@categories;
-		$row{'no-categories-p'} = $no_categories_p;
-
-		# Handle all other fields
-		$row{'branch_name'} = $branch->{'branchname'};
-		$row{'branch_code'} = $branch->{'branchcode'};
-		$row{'color'} = $color;
-		$row{'value'} = $branch->{'branchcode'};
-		$row{'action'} = '/cgi-bin/koha/admin/branches.pl';
-
-		push @loop_data, { %row };
-	}
-	my @branchcategories =();
-	my $catinfo = getcategoryinfo();
-	foreach my $cat (@$catinfo) {
-		push @branchcategories, {
-			categoryname    => $cat->{'categoryname'},
-			categorycode    => $cat->{'categorycode'},
-			codedescription => $cat->{'codedescription'},
-		};
-	}
-
-	$template->param(branches => \@loop_data,
-							branchcategories => \@branchcategories);
-
-}
-
-# FIXME logic seems wrong
-sub branchcategoriestable {
-#Needs to be implemented...
-
-    my $categoryinfo = getcategoryinfo();
-    my $color;
-    foreach my $cat (@$categoryinfo) {
-	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
-	$template->param(color => $color);
-	$template->param(categoryname => $cat->{'categoryname'});
-	$template->param(categorycode => $cat->{'categorycode'});
-	$template->param(codedescription => $cat->{'codedescription'});
-    }
-}
-
-######################################################################################################
-#
-# Database functions....
-
-sub getbranchinfo {
-# returns a reference to an array of hashes containing branches,
-
-    my ($branchcode) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth;
-    if ($branchcode) {
-		$sth = $dbh->prepare("Select * from branches where branchcode = ? order by branchcode");
-		$sth->execute($branchcode);
-    } else {
-		$sth = $dbh->prepare("Select * from branches order by branchcode");
-		$sth->execute();
-    }
-    my @results;
-    while (my $data = $sth->fetchrow_hashref) {
-	my $nsth = $dbh->prepare("select categorycode from branchrelations where branchcode = ?");
-	$nsth->execute($data->{'branchcode'});;
-	my @cats = ();
-	while (my ($cat) = $nsth->fetchrow_array) {
-	    push(@cats, $cat);
-	}
-	$nsth->finish;
-	$data->{'categories'} = \@cats;
-	push(@results, $data);
-    }
-    $sth->finish;
-    return \@results;
-}
-
-# FIXME This doesn't belong here; it should be moved into a module
-sub getcategoryinfo {
-# returns a reference to an array of hashes containing branches,
-	my ($catcode) = @_;
-	my $dbh = C4::Context->dbh;
-	my $sth;
-	#    print DEBUG "getcategoryinfo: entry: catcode=".cvs($catcode)."\n";
-	if ($catcode) {
-		$sth = $dbh->prepare("select * from branchcategories where categorycode = ?");
-		$sth->execute($catcode);
-	} else {
-		$sth = $dbh->prepare("Select * from branchcategories");
-		$sth->execute();
-	}
-	my @results;
-	while (my $data = $sth->fetchrow_hashref) {
-		push(@results, $data);
-	}
-	$sth->finish;
-	#    print DEBUG "getcategoryinfo: exit: returning ".cvs(\@results)."\n";
-	return \@results;
-}
-
-# FIXME This doesn't belong here; it should be moved into a module
-sub setbranchinfo {
-# sets the data from the editbranch form, and writes to the database...
-	my ($data) = @_;
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("replace branches (branchcode,branchname,branchaddress1,branchaddress2,branchaddress3,branchphone,branchfax,branchemail) values (?,?,?,?,?,?,?,?)");
-	$sth->execute(uc($data->{'branchcode'}), $data->{'branchname'},
-		$data->{'branchaddress1'}, $data->{'branchaddress2'},
-		$data->{'branchaddress3'}, $data->{'branchphone'},
-		$data->{'branchfax'}, $data->{'branchemail'});
-
-	$sth->finish;
-	# sort out the categories....
-	my @checkedcats;
-	my $cats = getcategoryinfo();
-	foreach my $cat (@$cats) {
-		my $code = $cat->{'categorycode'};
-		if ($data->{$code}) {
-			push(@checkedcats, $code);
-		}
-	}
-	my $branchcode =uc($data->{'branchcode'});
-	my $branch = getbranchinfo($branchcode);
-	$branch = $branch->[0];
-	my $branchcats = $branch->{'categories'};
-	my @addcats;
-	my @removecats;
-	foreach my $bcat (@$branchcats) {
-		unless (grep {/^$bcat$/} @checkedcats) {
-			push(@removecats, $bcat);
-		}
-	}
-	foreach my $ccat (@checkedcats){
-		unless (grep {/^$ccat$/} @$branchcats) {
-			push(@addcats, $ccat);
-		}
-	}
-	foreach my $cat (@addcats) {
-		my $sth = $dbh->prepare("insert into branchrelations (branchcode, categorycode) values(?, ?)");
-		$sth->execute($branchcode, $cat);
-		$sth->finish;
-	}
-	foreach my $cat (@removecats) {
-		my $sth = $dbh->prepare("delete from branchrelations where branchcode=? and categorycode=?");
-		$sth->execute($branchcode, $cat);
-		$sth->finish;
-	}
-}
-
-sub deletebranch {
-# delete branch...
-    my ($branchcode) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth=$dbh->prepare("delete from branches where branchcode = ?");
-    $sth->execute($branchcode);
-    $sth->finish;
-}
-
-sub setcategoryinfo {
-# sets the data from the editbranch form, and writes to the database...
-	my ($data) = @_;
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("replace branchcategories (categorycode,categoryname,codedescription) values (?,?,?)");
-	$sth->execute(uc($data->{'categorycode'}), $data->{'categoryname'},$data->{'codedescription'});
-
-	$sth->finish;
-}
-sub deletecategory {
-# delete branch...
-    my ($categorycode) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth=$dbh->prepare("delete from branchcategories where categorycode = ?");
-    $sth->execute($categorycode);
-    $sth->finish;
-}
-
-sub checkdatabasefor {
-# check to see if the branchcode is being used in the database somewhere....
-    my ($branchcode) = @_;
-my @kohafield;
-my @value;
-my @relation;
-my @and_or;
- push @kohafield, "holdingbranch","homebranch";
-push @value, $branchcode,$branchcode;
-push @and_or, "\@or";
-push @relation ,"\@attr 5=100","\@attr 5=100"; ##do not truncate
-    my ($total, at results) =ZEBRAsearch_kohafields(\@kohafield,\@value, \@relation,"", \@and_or);
-   
-    my $message;
-    if ($total) {
-	# We do not return verbal messages but a flag. fix templates to accept $error=1 as a message
-	$message = "Branch cannot be deleted because there are $total items using that branch.";
-	
-    }
-    return $message;
-}
-
-sub checkcategorycode {
-# check to see if the branchcode is being used in the database somewhere....
-    my ($categorycode) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth=$dbh->prepare("select count(*) from branchrelations where categorycode=?");
-    $sth->execute($categorycode);
-    my ($total) = $sth->fetchrow_array;
-    $sth->finish;
-    my $message;
-    if ($total) {
-	# FIXME: need to be replaced by an exported boolean parameter
-	$message = "Category cannot be deleted because there are $total branches using that category.";
-    }
-    return $message;
-}
-
-output_html_with_http_headers $input, $cookie, $template->output;
-
-# Local Variables:
-# tab-width: 8
-# End:

Index: cgi-bin/admin/categorie.pl
===================================================================
RCS file: cgi-bin/admin/categorie.pl
diff -N cgi-bin/admin/categorie.pl
--- cgi-bin/admin/categorie.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,212 +0,0 @@
-#!/usr/bin/perl
-
-#script to administer the categories table
-#written 20/02/2002 by paul.poulain at free.fr
-
-# ALGO :
-# this script use an $op to know what to do.
-# if $op is empty or none of the above values,
-#	- the default screen is build (with all records, or filtered datas).
-#	- the   user can clic on add, modify or delete record.
-# if $op=add_form
-#	- if primkey exists, this is a modification,so we read the $primkey record
-#	- builds the add/modify form
-# if $op=add_validate
-#	- the user has just send datas, so we create/modify the record
-# if $op=delete_form
-#	- we show the record having primkey=$primkey and ask for deletion validation form
-# if $op=delete_confirm
-#	- we delete the record having primkey=$primkey
-
-
-# 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 CGI;
-
-use C4::Context;
-use C4::Output;
-use C4::Search;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-
-sub StringSearch  {
-	my ($env,$searchstring,$type)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select * from categories where (description like ?)");
-	$sth->execute("$data[0]%");
-	my @results;
-	while (my $data=$sth->fetchrow_hashref){
-	push(@results,$data);
-	}
-	#  $sth->execute;
-	$sth->finish;
-	return (scalar(@results),\@results);
-}
-
-my $input = new CGI;
-my $searchfield=$input->param('description');
-my $script_name="/cgi-bin/koha/admin/categorie.pl";
-my $categorycode=$input->param('categorycode');
-my $op = $input->param('op');
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/categorie.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-
-
-$template->param(script_name => $script_name,
-		 categorycode => $categorycode,
-		 searchfield => $searchfield);
-
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	$template->param(add_form => 1);
-	
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($categorycode) {
-		my $dbh = C4::Context->dbh;
-		my $sth=$dbh->prepare("select categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,overduenoticerequired, canmakepublicshelves, addRequestToShelves, allowrenewsfromopac from categories where categorycode=?");
-		$sth->execute($categorycode);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-
-	$template->param(description             => $data->{'description'},
-				enrolmentperiod         => $data->{'enrolmentperiod'},
-				upperagelimit           => $data->{'upperagelimit'},
-				dateofbirthrequired     => $data->{'dateofbirthrequired'},
-				enrolmentfee            => $data->{'enrolmentfee'},
-				overduenoticerequired   => $data->{'overduenoticerequired'},
-				issuelimit              => $data->{'issuelimit'},
-				reservefee              => $data->{'reservefee'},
-				canmakepublicshelves	=> $data->{'canmakepublicshelves'},
-				addRequestToShelves		=> $data->{'addRequestToShelves'},
-				allowrenewsfromopac		=> $data->{'allowrenewsfromopac'}
-	);
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	$template->param(add_validate => 1);
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("replace categories (categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,enrolmentfee,reservefee,overduenoticerequired, issuelimit, canmakepublicshelves, addRequestToShelves , allowrenewsfromopac) values (?,?,?,?,?,?,?,?,?,?,?,?)");
-	$sth->execute(map { $input->param($_) } ('categorycode','description','enrolmentperiod','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','overduenoticerequired', 'issuelimit', 'canmakepublicshelves', 'addRequestToShelves', 'allowrenewsfromopac'));
-	$sth->finish;
-	
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	$template->param(delete_confirm => 1);
-
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select count(*) as total from borrowers where categorycode=?");
-	$sth->execute($categorycode);
-	my $total = $sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(total => $total->{'total'});
-	
-	my $sth2=$dbh->prepare("select categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,overduenoticerequired, canmakepublicshelves, addRequestToShelves,allowrenewsfromopac  from categories where categorycode=?");
-	$sth2->execute($categorycode);
-	my $data=$sth2->fetchrow_hashref;
-	$sth2->finish;
-	if ($total->{'total'} >0) {
-		$template->param(totalgtzero => 1);
-	}
-
-        $template->param(description             => $data->{'description'},
-                                enrolmentperiod         => $data->{'enrolmentperiod'},
-                                upperagelimit           => $data->{'upperagelimit'},
-                                dateofbirthrequired     => $data->{'dateofbirthrequired'},
-                                enrolmentfee            => $data->{'enrolmentfee'},
-                                overduenoticerequired   => $data->{'overduenoticerequired'},
-                                issuelimit              => $data->{'issuelimit'},
-                                reservefee              => $data->{'reservefee'},
-								canmakepublicshelves    => $data->{'canmakepublicshelves'},
-								addRequestToShelves		=> $data->{'addRequestToShelves'},
-								allowrenewsfromopac     => $data->{'allowrenewsfromopac'},
-		
-		);
-
-
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	$template->param(delete_confirmed => 1);
-	my $dbh = C4::Context->dbh;
-	my $categorycode=uc($input->param('categorycode'));
-	my $sth=$dbh->prepare("delete from categories where categorycode=?");
-	$sth->execute($categorycode);
-	$sth->finish;
-													# END $OP eq DELETE_CONFIRMED
-} else { # DEFAULT
-	$template->param(else => 1);
-	my $env;
-	my @loop;
-	my ($count,$results)=StringSearch($env,$searchfield,'web');
-	my $toggle = 0;
-	for (my $i=0; $i < $count; $i++){
-		my %row = (categorycode => $results->[$i]{'categorycode'},
-				description => $results->[$i]{'description'},
-				enrolmentperiod => $results->[$i]{'enrolmentperiod'},
-				upperagelimit => $results->[$i]{'upperagelimit'},
-				dateofbirthrequired => $results->[$i]{'dateofbirthrequired'},
-				enrolmentfee => $results->[$i]{'enrolmentfee'},
-				overduenoticerequired => $results->[$i]{'overduenoticerequired'},
-				issuelimit => $results->[$i]{'issuelimit'},
-				reservefee => $results->[$i]{'reservefee'},
-				canmakepublicshelves => $results->[$i]{'canmakepublicshelves'},
-				addRequestToShelves		=> $results->[$i]{'addRequestToShelves'},
-				allowrenewsfromopac => $results->[$i]{'allowrenewsfromopac'},
-				toggle => $toggle );	
-		push @loop, \%row;
-		$toggle = not $toggle;
-	}
-	$template->param(loop => \@loop);
-	# check that I (institution) and C (child) exists. otherwise => warning to the user
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select categorycode from categories where categorycode='C'");
-	$sth->execute;
-	my ($categoryChild) = $sth->fetchrow;
-	$template->param(categoryChild => $categoryChild);
-	$sth=$dbh->prepare("select categorycode from categories where categorycode='I'");
-	$sth->execute;
-	my ($categoryInstitution) = $sth->fetchrow;
-	$template->param(categoryInstitution => $categoryInstitution);
-	$sth->finish;
-
-
-} #---- END $OP eq DEFAULT
-
-
-
-output_html_with_http_headers $input, $cookie, $template->output;
-

Index: cgi-bin/admin/categoryitem.pl
===================================================================
RCS file: cgi-bin/admin/categoryitem.pl
diff -N cgi-bin/admin/categoryitem.pl
--- cgi-bin/admin/categoryitem.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,200 +0,0 @@
-#!/usr/bin/perl
-
-#script to administer the categories table
-#written 20/02/2002 by paul.poulain at free.fr
-# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
-
-# ALGO :
-# this script use an $op to know what to do.
-# if $op is empty or none of the above values,
-#	- the default screen is build (with all records, or filtered datas).
-#	- the   user can clic on add, modify or delete record.
-# if $op=add_form
-#	- if primkey exists, this is a modification,so we read the $primkey record
-#	- builds the add/modify form
-# if $op=add_validate
-#	- the user has just send datas, so we create/modify the record
-# if $op=delete_form
-#	- we show the record having primkey=$primkey and ask for deletion validation form
-# if $op=delete_confirm
-#	- we delete the record having primkey=$primkey
-
-
-# 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 CGI;
-
-use C4::Context;
-use C4::Output;
-use C4::Search;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-
-sub StringSearch  {
-	my ($env,$searchstring,$type)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select * from categories where (description like ?)");
-	$sth->execute("$data[0]%");
-	my @results;
-	while (my $data=$sth->fetchrow_hashref){
-	push(@results,$data);
-	}
-	#  $sth->execute;
-	$sth->finish;
-	return (scalar(@results),\@results);
-}
-
-my $input = new CGI;
-my $searchfield=$input->param('description');
-my $script_name="/cgi-bin/koha/admin/categorie.pl";
-my $categorycode=$input->param('categorycode');
-my $op = $input->param('op');
-$searchfield=~ s/\,//g;
-
-my ($template, $loggedinuser, $cookie) 
-    = get_template_and_user({template_name => "admin/categoryitem.tmpl",
-                             query => $input,
-                             type => "intranet",
-                             authnotrequired => 0,
-                             debug => 1,
-                             });
-
-
-$template->param(script_name => $script_name,
-                 categorycode => $categorycode,
-		 searchfield => $searchfield);
-
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	$template->param(add_form => 1);
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($categorycode) {
-		my $dbh = C4::Context->dbh;
-		my $sth=$dbh->prepare("select categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,reservefee,overduenoticerequired from categories where categorycode=?");
-		$sth->execute($categorycode);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-
-        $template->param(description             => $data->{'description'},
-                                enrolmentperiod         => $data->{'enrolmentperiod'},
-                                upperagelimit           => $data->{'upperagelimit'},
-                                dateofbirthrequired     => $data->{'dateofbirthrequired'},
-                                finetype                => $data->{'finetype'},
-                                bulk                    => $data->{'bulk'},
-                                enrolmentfee            => $data->{'enrolmentfee'},
-                                overduenoticerequired   => $data->{'overduenoticerequired'},
-                                reservefee              => $data->{'reservefee'});
-
-
-;
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	$template->param(add_validate => 1);
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("replace categories (categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,reservefee,overduenoticerequired) values (?,?,?,?,?,?,?,?,?,?)");
-	$sth->execute(map {$input->param($_)} ('categorycode','description','enrolmentperiod','upperagelimit','dateofbirthrequired','finetype','bulk','enrolmentfee','reservefee','overduenoticerequired'));
-	$sth->finish;
-	print "data recorded";
-	print "<form action='$script_name' method=post>";
-	print "<input type=submit value=OK>";
-	print "</form>";
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	$template->param(delete_confirm => 1);
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select count(*) as total from categoryitem where categorycode=?");
-	$sth->execute($categorycode);
-	my $total = $sth->fetchrow_hashref;
-	print "TOTAL : $categorycode : $total->{'total'}<br>";
-	$sth->finish;
-	my $sth2=$dbh->prepare("select categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,reservefee,overduenoticerequired from categories where categorycode=?");
-	$sth2->execute($categorycode);
-	my $data=$sth2->fetchrow_hashref;
-	$sth2->finish;
-
-        $template->param(description             => $data->{'description'},
-                                enrolmentperiod         => $data->{'enrolmentperiod'},
-                                upperagelimit           => $data->{'upperagelimit'},
-                                dateofbirthrequired     => $data->{'dateofbirthrequired'},
-                                finetype                => $data->{'finetype'},
-                                bulk                    => $data->{'bulk'},
-                                enrolmentfee            => $data->{'enrolmentfee'},
-                                overduenoticerequired   => $data->{'overduenoticerequired'},
-                                reservefee              => $data->{'reservefee'});
-
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	$template->param(delete_confirmed => 1);
-	my $dbh = C4::Context->dbh;
-	my $categorycode=uc($input->param('categorycode'));
-	my $sth=$dbh->prepare("delete from categories where categorycode=?");
-	$sth->execute($categorycode);
-	$sth->finish;
-													# END $OP eq DELETE_CONFIRMED
-} else { # DEFAULT
-        $template->param(else => 1);
-        my $env;
-        my @loop;
-        my ($count,$results)=StringSearch($env,$searchfield,'web');
-	my $toggle = 'white';
-        for (my $i=0; $i < $count; $i++){
-                my %row = (categorycode => $results->[$i]{'categorycode'},
-                                description => $results->[$i]{'description'},
-                                enrolmentperiod => $results->[$i]{'enrolmentperiod'},
-                                upperagelimit => $results->[$i]{'upperagelimit'},
-                                dateofbirthrequired => $results->[$i]{'dateofbirthrequired'},
-                                finetype => $results->[$i]{'finetype'},
-                                bulk => $results->[$i]{'bulk'},
-                                enrolmentfee => $results->[$i]{'enrolmentfee'},
-                                overduenoticerequired => $results->[$i]{'overduenoticerequired'},
-                                reservefee => $results->[$i]{'reservefee'},
-				toggle => $toggle );
-                push @loop, \%row;
-                if ( $toggle eq 'white' )
-                {
-                        $toggle = '#ffffcc';
-                }
-                else
-                {
-                        $toggle = 'white';
-                }
-
-        }
-        $template->param(loop => \@loop);
-
-
-} #---- END $OP eq DEFAULT
-
-output_html_with_http_headers $input, $cookie, $template->output;
-
-
-

Index: cgi-bin/admin/checkmarc.pl
===================================================================
RCS file: cgi-bin/admin/checkmarc.pl
diff -N cgi-bin/admin/checkmarc.pl
--- cgi-bin/admin/checkmarc.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,129 +0,0 @@
-#!/usr/bin/perl
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Auth;
-use CGI;
-use C4::Search;
-use C4::Context;
-use C4::Biblio;
-
-my $input = new CGI;
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/checkmarc.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-
-my $dbh = C4::Context->dbh;
-my $total;
-# checks itemnumber field
-my $sth = $dbh->prepare("select tagfield from koha_attr where kohafield=\"itemnumber\"");
-$sth->execute;
-my ($res) = $sth->fetchrow;
-unless ($res) {
-	$template->param(itemnumber => 1);
-	$total++;
-}
-#check biblionumber
-my $sth = $dbh->prepare("select tagfield from koha_attr where kohafield=\"biblionumber\"");
-$sth->execute;
-my ($res) = $sth->fetchrow;
-if ($res ){
-	($res) = $sth->fetchrow;
-	unless ($res){
-	$template->param(biblionumber => 1);
-	$total++;
-	}
-}
-#check barcode
-my $sth = $dbh->prepare("select tagfield from koha_attr where kohafield=\"barcode\"");
-$sth->execute;
-my ($res) = $sth->fetchrow;
-unless ($res){
-	$template->param(barcode=> 1);
-	$total++;
-}
-
-## Check for itemtype
-my $sth = $dbh->prepare("select tagfield,tagsubfield from koha_attr where kohafield=\"itemtype\"");
-$sth->execute;
-my ($res,$res2) = $sth->fetchrow;
-if ($res) {
-$sth = $dbh->prepare("select authorised_value from biblios_subfield_structure where tagfield=? and tagsubfield=?");
-$sth->execute($res,$res2);
- my ($item)=$sth->fetchrow;
-    unless ($item eq "itemtypes"){
-	$template->param(itemtype => 1);
-	$total++;
-    }
-}
-
-## Check for homebranch
-my $sth = $dbh->prepare("select tagfield from koha_attr where kohafield=\"homebranch\"");
-$sth->execute;
-my ($res) = $sth->fetchrow;
-unless  ($res) {
-	$template->param(branch => 1);
-	$total++;
-    
-}
-
-## Check for holdingbranch
-my $sth = $dbh->prepare("select tagfield,tagsubfield from koha_attr where kohafield=\"holdingbranch\"");
-$sth->execute;
-my ($res,$res2) = $sth->fetchrow;
-if ($res) {
-$sth = $dbh->prepare("select authorised_value from holdings_subfield_structure where tagfield=? and tagsubfield=?");
-$sth->execute($res,$res2);
- my ($item)=$sth->fetchrow;
-    unless ($item eq "branches"){
-	$template->param(holdingbranch => 1);
-	$total++;
-    }
-}
-
-
-
-# checks that itemtypes & branches tables are not empty
-$sth = $dbh->prepare("select count(*) from itemtypes");
-$sth->execute;
-($res) = $sth->fetchrow;
-unless ($res) {
-	$template->param(itemtypes_empty =>1);
-	$total++;
-}
-
-$sth = $dbh->prepare("select count(*) from branches");
-$sth->execute;
-($res) = $sth->fetchrow;
-unless ($res) {
-	$template->param(branches_empty =>1);
-	$total++;
-}
-
-$template->param(total => $total);
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/admin/currency.pl
===================================================================
RCS file: cgi-bin/admin/currency.pl
diff -N cgi-bin/admin/currency.pl
--- cgi-bin/admin/currency.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,198 +0,0 @@
-#!/usr/bin/perl
-
-#script to administer the aqbudget table
-#written 20/02/2002 by paul.poulain at free.fr
-# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
-
-# ALGO :
-# this script use an $op to know what to do.
-# if $op is empty or none of the above values,
-#	- the default screen is build (with all records, or filtered datas).
-#	- the   user can clic on add, modify or delete record.
-# if $op=add_form
-#	- if primkey exists, this is a modification,so we read the $primkey record
-#	- builds the add/modify form
-# if $op=add_validate
-#	- the user has just send datas, so we create/modify the record
-# if $op=delete_form
-#	- we show the record having primkey=$primkey and ask for deletion validation form
-# if $op=delete_confirm
-#	- we delete the record having primkey=$primkey
-
-
-# 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 CGI;
-use C4::Context;
-use C4::Output;
-use C4::Search;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-
-sub StringSearch  {
-	my ($env,$searchstring,$type)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $query="Select currency,rate from currency where (currency like \"$data[0]%\") order by currency";
-	my $sth=$dbh->prepare($query);
-	$sth->execute;
-	my @results;
-	my $cnt=0;
-	while (my $data=$sth->fetchrow_hashref){
-	push(@results,$data);
-	$cnt ++;
-	}
-	#  $sth->execute;
-	$sth->finish;
-	return ($cnt,\@results);
-}
-
-my $input = new CGI;
-my $searchfield=$input->param('searchfield');
-#my $branchcode=$input->param('branchcode');
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/admin/currency.pl";
-
-my $pagesize=20;
-my $op = $input->param('op');
-$searchfield=~ s/\,//g;
-
-my ($template, $loggedinuser, $cookie) 
-    = get_template_and_user({template_name => "admin/currency.tmpl",
-                             query => $input,
-                             type => "intranet",
-			     flagsrequired => {parameters => 1, management => 1},
-			     authnotrequired => 0,
-                             debug => 1,
-                             });
-
-$template->param(searchfield => $searchfield,
-		 script_name => $script_name);
-
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	$template->param(add_form => 1);
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($searchfield) {
-		my $dbh = C4::Context->dbh;
-		my $sth=$dbh->prepare("select currency,rate from currency where currency=?");
-		$sth->execute($searchfield);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-
-	$template->param(currency => $data->{'currency'},
-			 rate => $data->{'rate'});
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	$template->param(add_validate => 1);
-	my $dbh = C4::Context->dbh;
-
-	my $check = $dbh->prepare("select * from currency where currency = ?");
-	$check->execute($input->param('currency'));
-	if ( $check->fetchrow )
-	{
-		my $sth = $dbh->prepare("UPDATE currency SET rate = ? WHERE currency = ?");
-		$sth->execute($input->param('rate'),$input->param('currency'));
-		$sth->finish;
-	}
-	else
-	{
-		my $sth = $dbh->prepare("INSERT INTO currency (currency, rate) VALUES (?,?)");
-		$sth->execute($input->param('currency'),$input->param('rate'));
-		$sth->finish;
-	}	 
-
-	$check->finish;
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	$template->param(delete_confirm => 1);
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select count(*) as total from aqbooksellers where currency=?");
-	$sth->execute($searchfield);
-	my $total = $sth->fetchrow_hashref;
-	$sth->finish;
-	my $sth2=$dbh->prepare("select currency,rate from currency where currency=?");
-	$sth2->execute($searchfield);
-	my $data=$sth2->fetchrow_hashref;
-	$sth2->finish;
-
-	if ($total->{'total'} >0) {
-		$template->param(totalgtzero => 1);
-	}
-
-	$template->param(rate => $data->{'rate'},
-			 total => $total);
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	$template->param(delete_confirmed => 1);
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("delete from currency where currency=?");
-	$sth->execute($searchfield);
-	$sth->finish;
-													# END $OP eq DELETE_CONFIRMED
-################## DEFAULT ##################################
-} else { # DEFAULT
-	$template->param(else => 1);
-
-	my $env;
-	my ($count,$results)=StringSearch($env,$searchfield,'web');
-	my @loop;
-	my $toggle = 'white';
-	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-		my %row = ( currency => $results->[$i]{'currency'},
-			    rate => $results->[$i]{'rate'},
-			    toggle => $toggle);
-		push @loop, \%row;
-
-                if ( $toggle eq 'white' )
-                {
-                        $toggle = '#ffffcc';
-                }
-                else
-                {
-                        $toggle = 'white';
-                }
-	}
-	$template->param(loop => \@loop);
-
-	if ($offset>0) {
-		$template->param(offsetgtzero => 1,
-				 prevpage => $offset-$pagesize);
-	}
-
-	if ($offset+$pagesize<$count) {
-		$template->param(ltcount => 1,
-				 nextpage => $offset+$pagesize);
-	}
-} #---- END $OP eq DEFAULT
-
-output_html_with_http_headers $input, $cookie, $template->output;
-

Index: cgi-bin/admin/facets_labels.pl
===================================================================
RCS file: cgi-bin/admin/facets_labels.pl
diff -N cgi-bin/admin/facets_labels.pl
--- cgi-bin/admin/facets_labels.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,297 +0,0 @@
-#!/usr/bin/perl
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Koha;
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Search;
-
-
-# retrieve parameters
-my $input = new CGI;
-
-my $searchfield=$input->param('searchfield');
-$searchfield="" unless $searchfield;
-my $id=$input->param('id');
-my $offset=$input->param('offset');
-$offset=0 unless $offset;
-my $op = $input->param('op');
-my $dspchoice = $input->param('select_display');
-my $pagesize=20;
-my @results = ();
-my $script_name="/cgi-bin/koha/admin/facets_labels.pl";
-
-my $dbh = C4::Context->dbh;
-my $sth;
-# open template
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/facets_labels.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-
-
-if ($op) {
-$template->param(script_name => $script_name,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($id) {
-		$sth=$dbh->prepare("select * from facets where id=? ");
-		$sth->execute($id);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-	my $sth = $dbh->prepare("select kohafield,label from koha_attr where attr<>''");
-	$sth->execute;
-	my @authorised_values;
-	#push @authorised_values,"";
-	while ((my $kohafield,$label) = $sth->fetchrow_array) {
-		push @authorised_values, $kohafield;
-		push @authorised_labels, $label;
-	}
-	my $recordlist  = CGI::scrolling_list(-name=>'kohafield',
-			-values=> \@authorised_values,
-			-labels=>\@authorised_labels,
-			-size=>1,
-			-multiple=>0,
-			-default => $data->{'kohafield'},
-			);
-	
-	if ($searchfield) {
-		$template->param(action => "Modify tag",id=>$id ,searchfield => "<input type=\"hidden\" name=\"kohafield\" value=\"$searchfield\" />$searchfield");
-		$template->param('heading-modify-tag-p' => 1);
-	} else {
-		$template->param(action => "Add tag",
-								searchfield => "<input type=\"text\" name=\"kohafield\" size=\"40\" maxlength=\"80\" />");
-		$template->param('heading-add-tag-p' => 1);
-	}
-	$template->param('use-heading-flags-p' => 1);
-	$template->param(label => $data->{'label'},
-			attr=> $data->{'attr'},
-			recordtype=>$recordlist,
-			tagfield=>$taglist,
-			tagsubfield=>$tagsublist,
-			sorts => CGI::checkbox(-name=>'sorts',
-					-checked=> $data->{'sorts'}?'checked':'',
-						-value=> 1,
-						-label => '',
-						-id=> 'sorts'),
-			opacshow => CGI::checkbox(-name=>'opacshow',
-						-checked=> $data->{'opacshow'}?'checked':'',
-						-value=> 1,
-						-label => '',
-						-id=> 'opacshow'),
-			intrashow => CGI::checkbox(-name=>'intrashow',
-						-checked=> $data->{'intrashow'}?'checked':'',
-						-value=> 1,
-						-label => '',
-						-id=> 'intrashow'),
-
-
-			);
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-my $id       =$input->param('id');
-
-	$sth=$dbh->prepare("replace koha_attr  set id=?,kohafield=?,attr=?,label=?,sorts=?,recordtype=?,tagfield=?,tagsubfield=? ,opacshow=?,intrashow=? ");
-
-	
-	my $kohafield       =$input->param('kohafield');
-	my $attr       =$input->param('attr');
-	my $label  = $input->param('label');
-	my $sorts =$input->param('sorts');
-	my $opacshow =$input->param('opacshow');
-	my $intrashow =$input->param('intrashow');
-	my $recordtype =$input->param('recordtype');
-	my $tagfield =$input->param('tagfield');
-	my $tagsubfield =$input->param('tagsubfield');
-	unless (C4::Context->config('demo') eq 1) {
-		$sth->execute( $id,$kohafield,$attr,$label,$sorts?1:0,$recordtype,$tagfield,$tagsubfield,$opacshow?1:0,$intrashow?1:0);
-	}
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=koha_attr.pl?searchfield=$kohafield\"></html>";
-
-	exit;
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	$sth=$dbh->prepare("select id,kohafield,label,recordtype from koha_attr where id=? ");
-		$sth->execute($id);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(label => $data->{'label'}."/". $data->{'recordtype'},id=>$data->{'id'},
-							searchfield => $searchfield,
-							);
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-
-	unless (C4::Context->config('demo') eq 1) {
-		$dbh->do("delete from koha_attr where id=$id ");
-	}
-													# END $OP eq DELETE_CONFIRMED
-
-################## DEFAULT ##################################
-} else { # DEFAULT
-	# here, $op can be unset or set 
-	if  ($searchfield ne '') {
-		 $template->param(searchfield => $searchfield);
-	}
-	my $cnt=0;
-	if ($dspchoice) {
-		#here, user only wants used tags/subfields displayed
-		my $sth=$dbh->prepare("Select * from koha_attr where tagfield <>'' and kohafield >= ? ");
-		#could be ordoned by tab
-		$sth->execute($searchfield);
-
-		while (my $data=$sth->fetchrow_hashref){
-			push(@results,$data);
-			$cnt++;
-		}
-
-		$sth->finish;
-		
-		my $toggle=0;
-		my @loop_data = ();
-		my $j=1;
-		my $i=$offset;
-		while ($i < ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt)) {
-			if ($toggle eq 0){
-				$toggle=1;
-			} else {
-				$toggle=0;
-			}
-			my %row_data;  # get a fresh hash for the row data
-			$row_data{id} = $results[$i]->{'id'};
-			$row_data{kohafield} = $results[$i]->{'kohafield'};
-			$row_data{label} = $results[$i]->{'label'};
-			$row_data{sorts} = $results[$i]->{'sorts'};
-			$row_data{attr} = $results[$i]->{'attr'};
-			$row_data{recordtype} = $results[$i]->{'recordtype'};
-			$row_data{tagfield} = $results[$i]->{'tagfield'};
-			$row_data{tagsubfield} = $results[$i]->{'tagsubfield'};
-			$row_data{opacshow} = $results[$i]->{'opacshow'};
-			$row_data{intrashow} = $results[$i]->{'intrashow'};
-			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results[$i]->{'kohafield'}."&amp;id=".$results[$i]->{'id'};
-			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results[$i]->{'kohafield'}."&amp;id=".$results[$i]->{'id'};
-			$row_data{toggle} = $toggle;
-			push(@loop_data, \%row_data);
-			$i++;
-		}
-		$template->param(select_display => "True",
-						loop => \@loop_data);
-		$sth->finish;
-	} else {
-		#here, normal old style : display every tags
-		my ($count, at results)=StringSearch($dbh,$searchfield);
-		$cnt = $count;
-		my $toggle=0;
-		my @loop_data = ();
-		for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-			if ($toggle eq 0){
-				$toggle=1;
-			} else {
-				$toggle=0;
-			}
-			my %row_data;  # get a fresh hash for the row data
-			$row_data{id} = $results[$i]->{'id'};
-			$row_data{kohafield} = $results[$i]->{'kohafield'};
-			$row_data{label} = $results[$i]->{'label'};
-			$row_data{sorts} = $results[$i]->{'sorts'};
-			$row_data{attr} = $results[$i]->{'attr'};
-			$row_data{recordtype} = $results[$i]->{'recordtype'};
-			$row_data{tagfield} = $results[$i]->{'tagfield'};
-			$row_data{tagsubfield} = $results[$i]->{'tagsubfield'};
-			$row_data{opacshow} = $results[$i]->{'opacshow'};
-			$row_data{intrashow} = $results[$i]->{'intrashow'};
-			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results[$i]->{'kohafield'}."&amp;id=".$results[$i]->{'id'};
-			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results[$i]->{'kohafield'}."&amp;id=".$results[$i]->{'id'};
-			$row_data{toggle} = $toggle;
-			push(@loop_data, \%row_data);
-		}
-		$template->param(loop => \@loop_data);
-	}
-	if ($offset>0) {
-		my $prevpage = $offset-$pagesize;
-		$template->param(isprevpage => $offset,
-						prevpage=> $prevpage,
-						searchfield => $searchfield,
-						script_name => $script_name,
-						
-		);
-	}
-	if ($offset+$pagesize<$cnt) {
-		my $nextpage =$offset+$pagesize;
-		$template->param(nextpage =>$nextpage,
-						searchfield => $searchfield,
-						script_name => $script_name,
-						
-		);
-	}
-} #---- END $OP eq DEFAULT
-
-$template->param(loggeninuser => $loggedinuser,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $input, $cookie, $template->output;
-
-
-#
-# the sub used for searches
-#
-sub StringSearch  {
-	my ($dbh,$searchstring)=@_;
-	my $sth=$dbh->prepare("Select * from koha_attr  where kohafield >=?  order by kohafield");
-	$sth->execute($searchstring);
-	my @dataresults;
-	while (my $data=$sth->fetchrow_hashref){
-	push(@dataresults,$data);
-
-	}
-
-	$sth->finish;
-	return (scalar(@dataresults), at dataresults);
-}
-
-
-

Index: cgi-bin/admin/holdings_subfields_structure.pl
===================================================================
RCS file: cgi-bin/admin/holdings_subfields_structure.pl
diff -N cgi-bin/admin/holdings_subfields_structure.pl
--- cgi-bin/admin/holdings_subfields_structure.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,458 +0,0 @@
-#!/usr/bin/perl
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Auth;
-use CGI;
-use C4::Search;
-use C4::Context;
-
-
-sub StringSearch  {
-	my ($env,$searchstring,$frameworkcode)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select * from holdings_subfield_structure where (tagfield like ? and frameworkcode=?) order by tagfield");
-	$sth->execute("$searchstring%",$frameworkcode);
-	my @results;
-	my $cnt=0;
-	my $u=1;
-	while (my $data=$sth->fetchrow_hashref){
-		push(@results,$data);
-		$cnt ++;
-		$u++;
-	}
-	$sth->finish;
-	$dbh->disconnect;
-	return ($cnt,\@results);
-}
-
-my $input = new CGI;
-my $tagfield=$input->param('tagfield');
-my $tagsubfield=$input->param('tagsubfield');
-my $frameworkcode=$input->param('frameworkcode');
-my $pkfield="tagfield";
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/admin/holdings_subfields_structure.pl";
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/holdings_subfields_structure.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-my $pagesize=30;
-my $op = $input->param('op');
-$tagfield=~ s/\,//g;
-
-if ($op) {
-$template->param(script_name => $script_name,
-						tagfield =>$tagfield,
-						frameworkcode => $frameworkcode,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						tagfield =>$tagfield,
-						frameworkcode => $frameworkcode,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	my $data;
-	my $dbh = C4::Context->dbh;
-	my $more_subfields = $input->param("more_subfields")+1;
-	
-	
-	# build authorised value list
-	
-my	$sth2 = $dbh->prepare("select distinct category from authorised_values");
-	$sth2->execute;
-	my @authorised_values;
-	push @authorised_values,"";
-	while ((my $category) = $sth2->fetchrow_array) {
-		push @authorised_values, $category;
-	}
-	push (@authorised_values,"branches");
-	push (@authorised_values,"itemtypes");
-	# build thesaurus categories list
-	$sth2->finish;
-	$sth2 = $dbh->prepare("select authtypecode from auth_types");
-	$sth2->execute;
-	my @authtypes;
-	push @authtypes,"";
-	while ((my $authtypecode) = $sth2->fetchrow_array) {
-		push @authtypes, $authtypecode;
-	}
-	# build value_builder list
-	my @value_builder=('');
-
-	# read value_builder directory.
-	# 2 cases here : on CVS install, $cgidir does not need a /cgi-bin
-	# on a standard install, /cgi-bin need to be added. 
-	# test one, then the other
-	my $cgidir = C4::Context->intranetdir ."/cgi-bin";
-	unless (opendir(DIR, "$cgidir/value_builder")) {
-		$cgidir = C4::Context->intranetdir;
-		opendir(DIR, "$cgidir/value_builder") || die "can't opendir $cgidir/value_builder: $!";
-	} 
-	while (my $line = readdir(DIR)) {
-		if ($line =~ /\.pl$/) {
-			push (@value_builder,$line);
-		}
-	}
-	closedir DIR;
-
-	# build values list
-	my $sth=$dbh->prepare("select * from holdings_subfield_structure where tagfield=? and frameworkcode=?"); # and tagsubfield='$tagsubfield'");
-	$sth->execute($tagfield,$frameworkcode);
-	my @loop_data = ();
-	my $toggle=1;
-	my $i=0;
-	while ($data =$sth->fetchrow_hashref) {
-		my %row_data;  # get a fresh hash for the row data
-		if ($toggle eq 1){
-			$toggle=0;
-	  	} else {
-			$toggle=1;
-	  	}
-		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
-					-id=>"tab$i",
-					-values=>['-1','10'],
-					-labels => {'-1' =>'ignore','10'=>'items (10)',	},
-					-default=>$data->{'tab'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ohidden} = CGI::scrolling_list(-name=>'ohidden',
-					-id=>"ohidden$i",
-					-values=>['0','2'],
-					-labels => {'0'=>'Show','2' =>'Hide',},
-					-default=>substr($data->{'hidden'},0,1),
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
-					-id=>"ihidden$i",
-					-values=>['0','2'],
-					-labels => {'0'=>'Show','2' =>'Hide',},
-					-default=>substr($data->{'hidden'},1,1),
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
-					-id=>"ehidden$i",
-					-values=>['0','1','2'],
-					-labels => {'0'=>'Show','1'=>'Show Collapsed',
-									'2' =>'Hide',
-									},
-					-default=>substr($data->{'hidden'},2,1),
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{tagsubfield} =$data->{'tagsubfield'}."<input type=\"hidden\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" id=\"tagsubfield\">";
-		$row_data{liblibrarian} = CGI::escapeHTML($data->{'liblibrarian'});
-		$row_data{libopac} = CGI::escapeHTML($data->{'libopac'});
-		$row_data{seealso} = CGI::escapeHTML($data->{'seealso'});
-		
-		$row_data{authorised_value}  = CGI::scrolling_list(-name=>'authorised_value',
-					-id=>'authorised_value',
-					-values=> \@authorised_values,
-					-default=>$data->{'authorised_value'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{value_builder}  = CGI::scrolling_list(-name=>'value_builder',
-					-id=>'value_builder',
-					-values=> \@value_builder,
-					-default=>$data->{'value_builder'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{authtypes}  = CGI::scrolling_list(-name=>'authtypecode',
-					-id=>'authtypecode',
-					-values=> \@authtypes,
-					-default=>$data->{'authtypecode'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{repeatable} = CGI::checkbox(-name=>"repeatable$i",
-	-checked => $data->{'repeatable'}?'checked':'',
-	-value => 1,
-	-label => '',
-	-id => "repeatable$i");
-		$row_data{mandatory} = CGI::checkbox(-name => "mandatory$i",
-	-checked => $data->{'mandatory'}?'checked':'',
-	-value => 1,
-	-label => '',
-	-id => "mandatory$i");
-		$row_data{hidden} = CGI::escapeHTML($data->{hidden});
-		$row_data{isurl} = CGI::checkbox( -name => "isurl$i",
-			-id => "isurl$i",
-			-checked => $data->{'isurl'}?'checked':'',
-			-value => 1,
-			-label => '');
-		$row_data{row} = $i;
-		$row_data{toggle} = $toggle;
-		$row_data{link} = CGI::escapeHTML($data->{'link'});
-		push(@loop_data, \%row_data);
-		$i++;
-	}
-	# add more_subfields empty lines for add if needed
-	for (my $i=1;$i<=$more_subfields;$i++) {
-		my %row_data;  # get a fresh hash for the row data
-		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
-					-id => "tab$i",
-					-values=>['-1','10'],
-					-labels => {'-1' =>'ignore','10'=>'items (10)',},
-					-default=>"",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ohidden} = CGI::scrolling_list(-name=>'ohidden',
-					-id=>"ohidden$i",
-					-values=>['0','2'],
-					-labels => {'0'=>'Show','2' =>'Hide',},
-					-default=>"0",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
-					-id=>"ihidden$i",
-					-values=>['0','2'],
-					-labels => {'0'=>'Show','2' =>'Hide',},
-					-default=>"0",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
-					-id=>"ehidden$i",
-					-values=>['0','1','2'],
-					-labels => {'0'=>'Show','1'=>'Show Collapsed',
-									'2' =>'Hide',
-									},
-					-default=>"0",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{tagsubfield} = "<input type=\"text\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\">";
-		$row_data{liblibrarian} = "";
-		$row_data{libopac} = "";
-		$row_data{seealso} = "";
-		$row_data{hidden} = "000";
-		$row_data{repeatable} = CGI::checkbox( -name=> 'repeatable',
-				-id => "repeatable$i",
-				-checked => '',
-				-value => 1,
-				-label => '');
-		$row_data{mandatory} = CGI::checkbox( -name=> 'mandatory',
-			-id => "mandatory$i",
-			-checked => '',
-			-value => 1,
-			-label => '');
-		$row_data{isurl} = CGI::checkbox(-name => 'isurl',
-			-id => "isurl$i",
-			-checked => '',
-			-value => 1,
-			-label => '');
-		
-		$row_data{authorised_value}  = CGI::scrolling_list(-name=>'authorised_value',
-					-id => 'authorised_value',
-					-values=> \@authorised_values,
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{authtypes}  = CGI::scrolling_list(-name=>'authtypecode',
-					-id => 'authtypecode',
-					-values=> \@authtypes,
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{link} = CGI::escapeHTML($data->{'link'});
-		$row_data{toggle} = $toggle;
-		$row_data{row} = $i;
-		push(@loop_data, \%row_data);
-	}
-	$template->param('use-heading-flags-p' => 1);
-	$template->param('heading-edit-subfields-p' => 1);
-	$template->param(action => "Edit subfields",
-							tagfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\">$tagfield",
-							loop => \@loop_data,
-							more_subfields => $more_subfields,
-							more_tag => $tagfield);
-
-												# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	my $dbh = C4::Context->dbh;
-	$template->param(tagfield => "$input->param('tagfield')");
-	my $sth=$dbh->prepare("replace holdings_subfield_structure (tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,tab,seealso,authorised_value,authtypecode,value_builder,hidden,isurl,frameworkcode, link)
-									values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
-	my @tagsubfield	= $input->param('tagsubfield');
-	my @liblibrarian	= $input->param('liblibrarian');
-	my @libopac		= $input->param('libopac');
-	
-	my @tab				= $input->param('tab');
-	my @seealso		= $input->param('seealso');
-#	my @hidden		= $input->param('hidden');
-	my @hidden;
-	my @ohidden		= $input->param('ohidden');
-	my @ihidden		= $input->param('ihidden');
-	my @ehidden		= $input->param('ehidden');
-	my @authorised_values	= $input->param('authorised_value');
-	my @authtypecodes	= $input->param('authtypecode');
-	my @value_builder	=$input->param('value_builder');
-	my @link		=$input->param('link');
-	for (my $i=0; $i<= $#tagsubfield ; $i++) {
-		my $tagfield			=$input->param('tagfield');
-		my $tagsubfield		=$tagsubfield[$i];
-		$tagsubfield="@" unless $tagsubfield ne '';
-		my $liblibrarian		=$liblibrarian[$i];
-		my $libopac			=$libopac[$i];
-		my $repeatable		=$input->param("repeatable$i")?1:0;
-		my $mandatory		=$input->param("mandatory$i")?1:0;
-		
-		my $tab				=$tab[$i];
-		my $seealso				=$seealso[$i];
-		my $authorised_value		=$authorised_values[$i];
-		my $authtypecode		=$authtypecodes[$i];
-		my $value_builder=$value_builder[$i];
-		my $hidden = $ohidden[$i].$ihidden[$i].$ehidden[$i]; #collate from 3 hiddens;
-		my $isurl = $input->param("isurl$i")?1:0;
-		my $link = $link[$i];
-		if ($liblibrarian) {
-			unless (C4::Context->config('demo') eq 1) {
-				$sth->execute ($tagfield,
-									$tagsubfield,
-									$liblibrarian,
-									$libopac,
-									$repeatable,
-									$mandatory,
-									
-									$tab,
-									$seealso,
-									$authorised_value,
-									$authtypecode,
-									$value_builder,
-									$hidden,
-									$isurl,
-									$frameworkcode,
-
-	 $link,
-					      );
-			}
-		}
-	}
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=holdings_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode\"></html>";
-	exit;
-
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select * from holdings_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?");
-	#FIXME : called with 2 bind variables when 3 are needed
-	$sth->execute($tagfield,$tagsubfield);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(liblibrarian => $data->{'liblibrarian'},
-							tagsubfield => $data->{'tagsubfield'},
-							delete_link => $script_name,
-							tagfield      =>$tagfield,
-							tagsubfield => $tagsubfield,
-							frameworkcode => $frameworkcode,
-							);
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	my $dbh = C4::Context->dbh;
-	unless (C4::Context->config('demo') eq 1) {
-		my $sth=$dbh->prepare("delete from holdings_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?");
-		$sth->execute($tagfield,$tagsubfield,$frameworkcode);
-		$sth->finish;
-	}
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=holdings_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode\"></html>";
-	exit;
-	$template->param(tagfield => $tagfield);
-													# END $OP eq DELETE_CONFIRMED
-################## DEFAULT ##################################
-} else { # DEFAULT
-	my $env;
-	my ($count,$results)=StringSearch($env,$tagfield,$frameworkcode);
-	my $toggle=1;
-	my @loop_data = ();
-	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-	  	if ($toggle eq 1){
-			$toggle=0;
-	  	} else {
-			$toggle=1;
-	  	}
-		my %row_data;  # get a fresh hash for the row data
-		$row_data{tagfield} = $results->[$i]{'tagfield'};
-		$row_data{tagsubfield} = $results->[$i]{'tagsubfield'};
-		$row_data{liblibrarian} = $results->[$i]{'liblibrarian'};
-		
-		$row_data{repeatable} = $results->[$i]{'repeatable'};
-		$row_data{mandatory} = $results->[$i]{'mandatory'};
-		$row_data{tab} = $results->[$i]{'tab'};
-		$row_data{seealso} = $results->[$i]{'seealso'};
-		$row_data{authorised_value} = $results->[$i]{'authorised_value'};
-		$row_data{authtypecode}	= $results->[$i]{'authtypecode'};
-		$row_data{value_builder}	= $results->[$i]{'value_builder'};
-		$row_data{hidden}	= $results->[$i]{'hidden'} if($results->[$i]{'hidden'} gt "000") ;
-		$row_data{isurl}	= $results->[$i]{'isurl'};
-		$row_data{link}	= $results->[$i]{'link'};
-		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&frameworkcode=$frameworkcode";
-		$row_data{toggle} = $toggle;
-		if ($row_data{tab} eq -1) {
-			$row_data{subfield_ignored} = 1;
-		}
-
-		push(@loop_data, \%row_data);
-	}
-	$template->param(loop => \@loop_data);
-	$template->param(edit_tagfield => $tagfield,
-		edit_frameworkcode => $frameworkcode);
-	
-	if ($offset>0) {
-		my $prevpage = $offset-$pagesize;
-		$template->param(prev =>"<a href=\"$script_name?offset=$prevpage\">");
-	}
-	if ($offset+$pagesize<$count) {
-		my $nextpage =$offset+$pagesize;
-		$template->param(next => "<a href=\"$script_name?offset=$nextpage\">");
-	}
-} #---- END $OP eq DEFAULT
-$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/admin/holdingstagstructure.pl
===================================================================
RCS file: cgi-bin/admin/holdingstagstructure.pl
diff -N cgi-bin/admin/holdingstagstructure.pl
--- cgi-bin/admin/holdingstagstructure.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,366 +0,0 @@
-#!/usr/bin/perl
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Koha;
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Search;
-
-
-# retrieve parameters
-my $input = new CGI;
-my $frameworkcode = $input->param('frameworkcode'); # set to select framework
-$frameworkcode="" unless $frameworkcode;
-my $existingframeworkcode = $input->param('existingframeworkcode'); # set when we have to create a new framework (in frameworkcode) by copying an old one (in existingframeworkcode)
-$existingframeworkcode = "" unless $existingframeworkcode;
-my $frameworkinfo = getframeworkinfo($frameworkcode);
-my $searchfield=$input->param('searchfield');
-$searchfield=0 unless $searchfield;
-$searchfield=~ s/\,//g;
-
-my $offset=$input->param('offset');
-my $op = $input->param('op');
-my $dspchoice = $input->param('select_display');
-my $pagesize=20;
-
-my $script_name="/cgi-bin/koha/admin/holdingstagstructure.pl";
-
-my $dbh = C4::Context->dbh;
-
-# open template
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/holdingstagstructure.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-
-# get framework list
-my $frameworks = getframeworks();
-my @frameworkloop;
-foreach my $thisframeworkcode (keys %$frameworks) {
-	my $selected = 1 if $thisframeworkcode eq $frameworkcode;
-	my %row =(value => $thisframeworkcode,
-				selected => $selected,
-				frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
-			);
-	push @frameworkloop, \%row;
-}
-
-# check that framework is defined in holdings_tag_structure
-my $sth=$dbh->prepare("select count(*) from holdings_tag_structure where frameworkcode=?");
-$sth->execute($frameworkcode);
-my ($frameworkexist) = $sth->fetchrow;
-if ($frameworkexist) {
-} else {
-	# if frameworkcode does not exists, then OP must be changed to "create framework" if we are not on the way to create it
-	# (op = itemtyp_create_confirm)
-	if ($op eq "framework_create_confirm") {
-		duplicate_framework($frameworkcode, $existingframeworkcode);
-		$op=""; # unset $op to go back to framework list
-	} else {
-		$op = "framework_create";
-	}
-}
-$template->param(frameworkloop => \@frameworkloop,
-				frameworkcode => $frameworkcode,
-				frameworktext => $frameworkinfo->{frameworktext});
-if ($op) {
-$template->param(script_name => $script_name,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($searchfield) {
-		$sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from holdings_tag_structure where tagfield=? and frameworkcode=?");
-		$sth->execute($searchfield,$frameworkcode);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-	my $sth = $dbh->prepare("select distinct category from authorised_values");
-	$sth->execute;
-	my @authorised_values;
-	push @authorised_values,"";
-	while ((my $category) = $sth->fetchrow_array) {
-		push @authorised_values, $category;
-	}
-	my $authorised_value  = CGI::scrolling_list(-name=>'authorised_value',
-			-values=> \@authorised_values,
-			-size=>1,
-			-id=>"authorised_value",
-			-multiple=>0,
-			-default => $data->{'authorised_value'},
-			);
-
-	if ($searchfield) {
-		$template->param(action => "Modify tag",
-								searchfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$searchfield\" />$searchfield");
-		$template->param('heading-modify-tag-p' => 1);
-	} else {
-		$template->param(action => "Add tag",
-								searchfield => "<input type=\"text\" name=\"tagfield\" size=\"5\" maxlength=\"3\" />");
-		$template->param('heading-add-tag-p' => 1);
-	}
-	$template->param('use-heading-flags-p' => 1);
-	$template->param(liblibrarian => $data->{'liblibrarian'},
-			libopac => $data->{'libopac'},
-			repeatable => CGI::checkbox(-name=>'repeatable',
-						-checked=> $data->{'repeatable'}?'checked':'',
-						-value=> 1,
-						-label => '',
-						-id=> 'repeatable'),
-			mandatory => CGI::checkbox(-name => 'mandatory',
-						-checked => $data->{'mandatory'}?'checked':'',
-						-value => 1,
-						-label => '',
-						-id => 'mandatory'),
-			authorised_value => $authorised_value,
-			frameworkcode => $frameworkcode,
-			);
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	$sth=$dbh->prepare("replace holdings_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) values (?,?,?,?,?,?,?)");
-	my $tagfield       =$input->param('tagfield');
-	my $liblibrarian  = $input->param('liblibrarian');
-	my $libopac       =$input->param('libopac');
-	my $repeatable =$input->param('repeatable');
-	my $mandatory =$input->param('mandatory');
-	my $authorised_value =$input->param('authorised_value');
-	unless (C4::Context->config('demo') eq 1) {
-		$sth->execute($tagfield,
-							$liblibrarian,
-							$libopac,
-							$repeatable?1:0,
-							$mandatory?1:0,
-							$authorised_value,
-							$frameworkcode
-							);
-	}
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=holdingstagstructure.pl?searchfield=$tagfield&frameworkcode=$frameworkcode\"></html>";
-	exit;
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	$sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from holdings_tag_structure where tagfield=? and frameworkcode=?");
-	$sth->execute($searchfield,$frameworkcode);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(liblibrarian => $data->{'liblibrarian'},
-							searchfield => $searchfield,
-							frameworkcode => $frameworkcode,
-							);
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	unless (C4::Context->config('demo') eq 1) {
-		$dbh->do("delete from holdings_tag_structure where tagfield='$searchfield' and frameworkcode='$frameworkcode'");
-		$dbh->do("delete from holdings_subfield_structure where tagfield='$searchfield' and frameworkcode='$frameworkcode'");
-
-	}
-													# END $OP eq DELETE_CONFIRMED
-################## ITEMTYPE_CREATE ##################################
-# called automatically if an unexisting  frameworkis selected
-} elsif ($op eq 'framework_create') {
-	$sth = $dbh->prepare("select count(*),holdings_tag_structure.frameworkcode,frameworktext from holdings_tag_structure,biblio_framework where biblio_framework.frameworkcode=holdings_tag_structure.frameworkcode group by holdings_tag_structure.frameworkcode");
-	$sth->execute;
-	my @existingframeworkloop;
-	while (my ($tot,$thisframeworkcode,$frameworktext) = $sth->fetchrow) {
-		if ($tot>0) {
-			my %line = ( value => $thisframeworkcode,
-						frameworktext => $frameworktext,
-					);
-			push @existingframeworkloop,\%line;
-		}
-	}
-	$template->param(existingframeworkloop => \@existingframeworkloop,
-					frameworkcode => $frameworkcode,
-# 					FRtext => $frameworkinfo->{frameworktext},
-					);
-################## DEFAULT ##################################
-} else { # DEFAULT
-	# here, $op can be unset or set to "framework_create_confirm".
-	if  ($searchfield ne '') {
-		 $template->param(searchfield => $searchfield);
-	}
-	my $cnt=0;
-	if ($dspchoice) {
-		#here, user only wants used tags/subfields displayed
-		my $env;
-		$searchfield=~ s/\'/\\\'/g;
-		my @data=split(' ',$searchfield);
-		my $sth=$dbh->prepare("Select holdings_tag_structure.tagfield as mts_tagfield,holdings_tag_structure.liblibrarian as mts_liblibrarian,holdings_tag_structure.libopac as mts_libopac,holdings_tag_structure.repeatable as mts_repeatable,holdings_tag_structure.mandatory as mts_mandatory,holdings_tag_structure.authorised_value as mts_authorized_value,holdings_subfield_structure.* from holdings_tag_structure LEFT JOIN holdings_subfield_structure ON (holdings_tag_structure.tagfield=holdings_subfield_structure.tagfield AND holdings_tag_structure.frameworkcode=holdings_subfield_structure.frameworkcode) where (holdings_tag_structure.tagfield >= ? and holdings_tag_structure.frameworkcode=?) AND holdings_subfield_structure.tab>=0 order by holdings_tag_structure.tagfield,holdings_subfield_structure.tagsubfield");
-		#could be ordoned by tab
-		$sth->execute($data[0], $frameworkcode);
-		my @results = ();
-		while (my $data=$sth->fetchrow_hashref){
-			push(@results,$data);
-			$cnt++;
-		}
-		$sth->finish;
-		
-		my $toggle=0;
-		my @loop_data = ();
-		my $j=1;
-		my $i=$offset;
-		while ($i < ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt)) {
-			if ($toggle eq 0){
-				$toggle=1;
-			} else {
-				$toggle=0;
-			}
-			my %row_data;  # get a fresh hash for the row data
-			$row_data{tagfield} = $results[$i]->{'mts_tagfield'};
-			$row_data{liblibrarian} = $results[$i]->{'mts_liblibrarian'};
-			$row_data{repeatable} = $results[$i]->{'mts_repeatable'};
-			$row_data{mandatory} = $results[$i]->{'mts_mandatory'};
-			$row_data{authorised_value} = $results[$i]->{'mts_authorised_value'};
-			$row_data{subfield_link} ="holdings_subfields_structure.pl?op=add_form&tagfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{toggle} = $toggle;
-			$j=$i;
-			my @internal_loop = ();
-			while (($results[$i]->{'tagfield'}==$results[$j]->{'tagfield'}) and ($j< ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt))) {
-				if ($toggle eq 0) {
-					$toggle=1;
-				} else {
-					$toggle=0;
-				}
-				my %subfield_data;
-				$subfield_data{tagsubfield} = $results[$j]->{'tagsubfield'};
-				$subfield_data{liblibrarian} = $results[$j]->{'liblibrarian'};
-				
-				$subfield_data{repeatable} = $results[$j]->{'repeatable'};
-				$subfield_data{mandatory} = $results[$j]->{'mandatory'};
-				$subfield_data{tab} = $results[$j]->{'tab'};
-				$subfield_data{seealso} = $results[$j]->{'seealso'};
-				$subfield_data{authorised_value} = $results[$j]->{'authorised_value'};
-				$subfield_data{authtypecode}= $results[$j]->{'authtypecode'};
-				$subfield_data{value_builder}= $results[$j]->{'value_builder'};
-				$subfield_data{toggle}	= $toggle;
-# 				warn "tagfield :  ".$results[$j]->{'tagfield'}." tagsubfield :".$results[$j]->{'tagsubfield'};
-				push @internal_loop,\%subfield_data;
-				$j++;
-			}
-			$row_data{'subfields'}=\@internal_loop;
-			push(@loop_data, \%row_data);
-#			undef @internal_loop;
-			$i=$j;
-		}
-		$template->param(select_display => "True",
-						loop => \@loop_data);
-		#  $sth->execute;
-		$sth->finish;
-	} else {
-		#here, normal old style : display every tags
-		my $env;
-		my ($count,$results)=StringSearch($env,$searchfield,$frameworkcode);
-		$cnt = $count;
-		my $toggle=0;
-		my @loop_data = ();
-		for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-			if ($toggle eq 0){
-				$toggle=1;
-			} else {
-				$toggle=0;
-			}
-			my %row_data;  # get a fresh hash for the row data
-			$row_data{tagfield} = $results->[$i]{'tagfield'};
-			$row_data{liblibrarian} = $results->[$i]{'liblibrarian'};
-			$row_data{repeatable} = $results->[$i]{'repeatable'};
-			$row_data{mandatory} = $results->[$i]{'mandatory'};
-			$row_data{authorised_value} = $results->[$i]{'authorised_value'};
-			$row_data{subfield_link} ="holdings_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{toggle} = $toggle;
-			push(@loop_data, \%row_data);
-		}
-		$template->param(loop => \@loop_data);
-	}
-	if ($offset>0) {
-		my $prevpage = $offset-$pagesize;
-		$template->param(isprevpage => $offset,
-						prevpage=> $prevpage,
-						searchfield => $searchfield,
-						script_name => $script_name,
-						frameworkcode => $frameworkcode,
-		);
-	}
-	if ($offset+$pagesize<$cnt) {
-		my $nextpage =$offset+$pagesize;
-		$template->param(nextpage =>$nextpage,
-						searchfield => $searchfield,
-						script_name => $script_name,
-						frameworkcode => $frameworkcode,
-		);
-	}
-} #---- END $OP eq DEFAULT
-
-$template->param(loggeninuser => $loggedinuser,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $input, $cookie, $template->output;
-
-
-#
-# the sub used for searches
-#
-sub StringSearch  {
-	my ($env,$searchstring,$frameworkcode)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from holdings_tag_structure where (tagfield >= ? and frameworkcode=?) order by tagfield");
-	$sth->execute($data[0], $frameworkcode);
-	my @results;
-	while (my $data=$sth->fetchrow_hashref){
-	push(@results,$data);
-	}
-	#  $sth->execute;
-	$sth->finish;
-	return (scalar(@results),\@results);
-}
-
-#
-
-

Index: cgi-bin/admin/institutions-careers.pl
===================================================================
RCS file: cgi-bin/admin/institutions-careers.pl
diff -N cgi-bin/admin/institutions-careers.pl
--- cgi-bin/admin/institutions-careers.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,74 +0,0 @@
-#!/usr/bin/perl
-
-# Script to manage the educational institutions and its careers.
-# written 12/04
-# Castañeda, Carlos Sebastian - seba3c at yahoo.com.ar - Physics Library UNLP Argentina
-
-# 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 CGI;
-
-use C4::Auth;
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::AcademicInfo;
-
-my $cgi = new CGI;
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/institutions-careers.tmpl",
-			     query => $cgi,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {editcatalogue => 1},
-			     debug => 1,
-			     });
-
-my $op = $cgi->param('op'); 
-my $id_institution = $cgi->param('id_institution'); 
-my $institution_name = $cgi->param('institution_name'); 
-
-if ($op eq 'add_form') {
-	$template->param(add_form => 1);
-	
-	if ($id_institution) {
-		my $info = get_educational_institution($id_institution);
-		$template->param(op => 'edit');
-		$template->param(institution_name => $info->{'institution_name'});
-		$template->param(id_institution => $id_institution);
-	} else {
-		$template->param(op => 'add');
-	}
-
-} elsif ($op eq 'add') {
-	add_educational_institution($institution_name);
-	print $cgi->redirect('/cgi-bin/koha/admin/institutions-careers.pl');
-} elsif ($op eq 'edit') {
-	update_educational_institution($id_institution, $institution_name);
-	print $cgi->redirect('/cgi-bin/koha/admin/institutions-careers.pl');
-} elsif ($op eq 'del') {
-	del_educational_institution($id_institution);
-	print $cgi->redirect('/cgi-bin/koha/admin/institutions-careers.pl');
-} else {
-	my @educ_institutions = &get_careers_by_institution();
-	$template->param(institutions => \@educ_institutions);
-}
-
-output_html_with_http_headers $cgi, $cookie, $template->output;

Index: cgi-bin/admin/issuingrules.pl
===================================================================
RCS file: cgi-bin/admin/issuingrules.pl
diff -N cgi-bin/admin/issuingrules.pl
--- cgi-bin/admin/issuingrules.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,186 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Context;
-use C4::Output;
-use C4::Auth;
-use C4::Koha;
-use C4::Interface::CGI::Output;
-
-my $input = new CGI;
-my $dbh = C4::Context->dbh;
-
-my $type=$input->param('type');
-my $branch = $input->param('branch');
-$branch="" unless $branch;
-my $op = $input->param('op');
-
-# my $flagsrequired;
-# $flagsrequired->{circulation}=1;
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/issuingrules.tmpl",
-                             query => $input,
-                             type => "intranet",
-                             authnotrequired => 0,
- 			     flagsrequired => {parameters => 1, management => 1},
-			      debug => 1,
-                             });
-# save the values entered
-if ($op eq 'save') {
-	my @names=$input->param();
-	my $sth_search = $dbh->prepare("select count(*) as total from issuingrules where branchcode=? and categorycode=? and itemtype=?");
-
-	my $sth_Finsert = $dbh->prepare("insert into issuingrules (branchcode,categorycode,itemtype,fine,firstremind,chargeperiod) values (?,?,?,?,?,?)");
-	my $sth_Fupdate=$dbh->prepare("Update issuingrules set fine=?,firstremind=?,chargeperiod=? where branchcode=? and categorycode=? and itemtype=?");
-	my $sth_Fdelete=$dbh->prepare("delete from issuingrules where branchcode=? and categorycode=? and itemtype=? and issuelength=0");
-
-	my $sth_Iinsert = $dbh->prepare("insert into issuingrules (branchcode,categorycode,itemtype,maxissueqty,issuelength) values (?,?,?,?,?)");
-	my $sth_Iupdate=$dbh->prepare("Update issuingrules set maxissueqty=?, issuelength=? where branchcode=? and categorycode=? and itemtype=?");
-	my $sth_Idelete=$dbh->prepare("delete from issuingrules where branchcode=? and categorycode=? and itemtype=? and fine=0");
-	foreach my $key (@names){
-		# ISSUES
-		if ($key =~ /I-(.*)-(.*)\.(.*)/) {
-			my $br = $1; # branch
-			my $bor = $2; # borrower category
-			my $cat = $3; # item type
-			my $data=$input->param($key);
-			my ($issuelength,$maxissueqty)=split(',',$data);
-# 			if ($maxissueqty >0) {
-				$sth_search->execute($br,$bor,$cat);
-				my $res = $sth_search->fetchrow_hashref();
-				if ($res->{total}) {
-					$sth_Iupdate->execute($maxissueqty,$issuelength,$br,$bor,$cat);
-				} else {
-					$sth_Iinsert->execute($br,$bor,$cat,$maxissueqty,$issuelength);
-				}
-# 			} else {
-# 				$sth_Idelete->execute($br,$bor,$cat);
-# 			}
-		}
-		# FINES
-		if ($key =~ /F-(.*)-(.*)\.(.*)/) {
-			my $br = $1; # branch
-			my $bor = $2; # borrower category
-			my $cat = $3; # item type
-			my $data=$input->param($key);
-			my ($fine,$firstremind,$chargeperiod)=split(',',$data);
-# 			if ($fine >0) {
-				$sth_search->execute($br,$bor,$cat);
-				my $res = $sth_search->fetchrow_hashref();
-				if ($res->{total}) {
-					$sth_Fupdate->execute($fine,$firstremind,$chargeperiod,$br,$bor,$cat);
-				} else {
-					$sth_Finsert->execute($br,$bor,$cat,$fine,$firstremind,$chargeperiod);
-				}
-# 			} else {
-# 				$sth_Fdelete->execute($br,$bor,$cat);
-# 			}
-		}
-	}
-
-}
-my $branches = GetBranches;
-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 $sth=$dbh->prepare("Select description,categorycode from categories order by description");
-$sth->execute;
- my @trow3;
-my @title_loop;
-# my $i=0;
-while (my $data=$sth->fetchrow_hashref){
-	my %row = (in_title => $data->{'description'});
-	push @title_loop,\%row;
- 	push @trow3,$data->{'categorycode'};
-# 	$i++;
-}
-
-my %row = (in_title => "*");
-push @title_loop, \%row;
-push @trow3,'*';
-
-$sth->finish;
-$sth=$dbh->prepare("Select description,itemtype from itemtypes order by description");
-$sth->execute;
-# $i=0;
-my $toggle= 1;
-my @row_loop;
-my @itemtypes;
-while (my $row=$sth->fetchrow_hashref){
-	push @itemtypes,\$row;
-}
-my $line;
-$line->{itemtype} = "*";
-$line->{description} = "*";
-push @itemtypes,\$line;
-
-foreach my $data (@itemtypes) {
-	my @trow2;
-	my @cell_loop;
-	if ( $toggle eq 1 ) {
-		$toggle = 0;
-	} else {
-		$toggle = 1;
-	}
-	for (my $i=0;$i<=$#trow3;$i++){
-		my $sth2=$dbh->prepare("select * from issuingrules where branchcode=? and categorycode=? and itemtype=?");
-		$sth2->execute($branch,$trow3[$i],$$data->{'itemtype'});
-		my $dat=$sth2->fetchrow_hashref;
-		$sth2->finish;
-		my $fine=$dat->{'fine'}+0;
-		my $maxissueqty = $dat->{'maxissueqty'}+0;
-		my $issuelength = $dat->{'issuelength'}+0;
-		my $finesvalue;
-		$finesvalue= "$fine,$dat->{'firstremind'},$dat->{'chargeperiod'}" if $fine+$dat->{'firstremind'}+$dat->{'chargeperiod'}>0;
-		my $issuingvalue;
-# 		if ($maxissueqty>0) {
-		    $issuingvalue = "$issuelength,$maxissueqty" if $issuelength+$maxissueqty>0;
-# 		}
-# 		else {		
-# 		    $issuingvalue = "$issuelength, 5";
-# 		    $maxissueqty = 5;
-# 		}
-		my %row = (finesname=> "F-$branch-$trow3[$i].$$data->{'itemtype'}",
-					finesvalue => $finesvalue,
-					issuingname => "I-$branch-$trow3[$i].$$data->{itemtype}",
-					issuingvalue => $issuingvalue,
-					toggle => $toggle,
-					);
-		push @cell_loop,\%row;
-	}
-	my %row = (categorycode => $$data->{description},
-  					cell =>\@cell_loop);
-	push @row_loop, \%row;
-}
-
-$sth->finish;
-$template->param(title => \@title_loop,
-						row => \@row_loop,
-						branchloop => \@branchloop,
-						branch => $branch);
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/admin/itemtypes.pl
===================================================================
RCS file: cgi-bin/admin/itemtypes.pl
diff -N cgi-bin/admin/itemtypes.pl
--- cgi-bin/admin/itemtypes.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,200 +0,0 @@
-#!/usr/bin/perl
-# NOTE: 4-character tabs
-
-#script to administer the categories table
-#written 20/02/2002 by paul.poulain at free.fr
-# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
-
-# ALGO :
-# this script use an $op to know what to do.
-# if $op is empty or none of the above values,
-#	- the default screen is build (with all records, or filtered datas).
-#	- the   user can clic on add, modify or delete record.
-# if $op=add_form
-#	- if primkey exists, this is a modification,so we read the $primkey record
-#	- builds the add/modify form
-# if $op=add_validate
-#	- the user has just send datas, so we create/modify the record
-# if $op=delete_form
-#	- we show the record having primkey=$primkey and ask for deletion validation form
-# if $op=delete_confirm
-#	- we delete the record having primkey=$primkey
-
-
-# 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 CGI;
-use C4::Context;
-use C4::Output;
-use C4::Search;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-
-
-sub StringSearch  {
-	my ($env,$searchstring,$type)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select * from itemtypes where (description like ?) order by itemtype");
-	$sth->execute("$data[0]%");
-	my @results;
-	while (my $data=$sth->fetchrow_hashref){
-	push(@results,$data);
-	}
-	#  $sth->execute;
-	$sth->finish;
-	return (scalar(@results),\@results);
-}
-
-my $input = new CGI;
-my $searchfield=$input->param('description');
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/admin/itemtypes.pl";
-my $itemtype=$input->param('itemtype');
-my $pagesize=20;
-my $op = $input->param('op');
-$searchfield=~ s/\,//g;
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/itemtypes.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1, management => 1},
-			     debug => 1,
-			     });
-
-if ($op) {
-$template->param(script_name => $script_name,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	#start the page and read in includes
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($itemtype) {
-		my $dbh = C4::Context->dbh;
-		my $sth=$dbh->prepare("select itemtype,description,renewalsallowed,rentalcharge,notforloan from itemtypes where itemtype=?");
-		$sth->execute($itemtype);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-	$template->param(itemtype => $itemtype,
-							description => $data->{'description'},
-							renewalsallowed => $data->{'renewalsallowed'},
-							rentalcharge => sprintf("%.2f",$data->{'rentalcharge'}),
-							notforloan => $data->{'notforloan'}
-							);
-;
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("replace itemtypes (itemtype,description,renewalsallowed,rentalcharge,notforloan) values (?,?,?,?,?)");
-	$sth->execute(
-		$input->param('itemtype'),$input->param('description'),
-		$input->param('renewalsallowed'),$input->param('rentalcharge'),
-		$input->param('notforloan')?1:0);
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=itemtypes.pl\"></html>";
-	exit;
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	#start the page and read in includes
-	my $dbh = C4::Context->dbh;
-
-	# Check both categoryitem and biblioitems, see Bug 199
-	my $total = 0;
-	for my $table ('biblio') {
-	   my $sth=$dbh->prepare("select count(*) as total from $table where itemtype=?");
-	   $sth->execute($itemtype);
-	   $total += $sth->fetchrow_hashref->{total};
-	   $sth->finish;
-	}
-
-	my $sth=$dbh->prepare("select itemtype,description,renewalsallowed,rentalcharge from itemtypes where itemtype=?");
-	$sth->execute($itemtype);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-
-	$template->param(itemtype => $itemtype,
-							description => $data->{'description'},
-							renewalsallowed => $data->{'renewalsallowed'},
-							rentalcharge => sprintf("%.2f",$data->{'rentalcharge'}),
-							total => $total);
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	#start the page and read in includes
-	my $dbh = C4::Context->dbh;
-	my $itemtype=uc($input->param('itemtype'));
-	my $sth=$dbh->prepare("delete from itemtypes where itemtype=?");
-	$sth->execute($itemtype);
-	$sth = $dbh->prepare("delete from issuingrules where itemtype=?");
-	$sth->execute($itemtype);
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=itemtypes.pl\"></html>";
-	exit;
-													# END $OP eq DELETE_CONFIRMED
-################## DEFAULT ##################################
-} else { # DEFAULT
-	my $env;
-	my ($count,$results)=StringSearch($env,$searchfield,'web');
-	my $toggle=0;
-	my @loop_data;
-	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-		my %row_data;
-		if ($toggle eq 0){
-			$toggle=1;
-		} else {
-			$toggle=0;
-		}
-		$row_data{toggle} = $toggle;
-		$row_data{itemtype} = $results->[$i]{itemtype};
-		$row_data{description} = $results->[$i]{description};
-		$row_data{renewalsallowed} = $results->[$i]{renewalsallowed};
-		$row_data{notforloan} = $results->[$i]{notforloan};
-		$row_data{rentalcharge} = sprintf("%.2f",$results->[$i]{rentalcharge});
-		push(@loop_data, \%row_data);
-	}
-	$template->param(loop => \@loop_data);
-	if ($offset>0) {
-		my $prevpage = $offset-$pagesize;
-		$template->param(previous => "$script_name?offset=".$prevpage);
-	}
-	if ($offset+$pagesize<$count) {
-		my $nextpage =$offset+$pagesize;
-		$template->param(next => "$script_name?offset=".$nextpage);
-	}
-} #---- END $OP eq DEFAULT
-output_html_with_http_headers $input, $cookie, $template->output;
-
-# Local Variables:
-# tab-width: 4
-# End:

Index: cgi-bin/admin/koha-electronic.pl
===================================================================
RCS file: cgi-bin/admin/koha-electronic.pl
diff -N cgi-bin/admin/koha-electronic.pl
--- cgi-bin/admin/koha-electronic.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,102 +0,0 @@
-#!/usr/bin/perl
-
-# Script to manage the opac news.
-# written 11/04
-# Castañeda, Carlos Sebastian - seba3c at yahoo.com.ar - Physics Library UNLP Argentina
-
-# 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 CGI;
-
-use C4::Auth;
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::NewsChannels;
-
-
-my $cgi = new CGI;
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/koha-electronic.tmpl",
-			     query => $cgi,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-
-my $op = $cgi->param('op');
-
-if ($op eq 'add_form') {
-	$template->param(add_form => 1);
-	my $id = $cgi->param("id");
-	my $edata;
-# warn "add_form";	
-	if ($id) {
-		$template->param(op => 'edit');
-		$edata = get_opac_electronic($id);
-		$template->param($edata);
-		$template->param(id => $edata->{'idelectronic'});
-	} else {
-		$template->param(op => 'add');
-	}
-	
-} elsif ($op eq 'add') {
-# warn "add";
-	my $title	= $cgi->param('title');
-	my $edata	= $cgi->param('edata');
-	my $lang	= $cgi->param('lang');
-	my $image	= $cgi->param('image');
-	my $href	= $cgi->param('href');
-	my $section	= $cgi->param('section');
-	add_opac_electronic($title, $edata, $lang,$image, $href,$section);
-	print $cgi->redirect('/cgi-bin/koha/admin/koha-electronic.pl');
-
-} elsif ($op eq 'edit') {
-# warn "edit";
-	my $id		= $cgi->param('id');
-	my $title	= $cgi->param('title');
-	my $edata	= $cgi->param('edata');
-	my $lang	= $cgi->param('lang');
-	my $image	= $cgi->param('image');
-	my $href	= $cgi->param('href');
-	my $section	= $cgi->param('section');
-	upd_opac_electronic($id, $title, $edata, $lang,$image,$href,$section);
-	print $cgi->redirect('/cgi-bin/koha/admin/koha-electronic.pl');
-
-} elsif ($op eq 'del') {
-# warn "del";
-	my @ids = $cgi->param('ids');
-	del_opac_electronic(join ",", @ids);
-	print $cgi->redirect('/cgi-bin/koha/admin/koha-electronic.pl');
-
-} else { 
-# warn "else";
-
-	my $lang = $cgi->param('lang');
-
-	my ($opac_electronic_count, $opac_electronic) = &get_opac_electronics(undef, $lang);
-	$template->param($lang => 1);
-	$template->param(opac_electronic => $opac_electronic);
-	$template->param(opac_electronic_count => $opac_electronic_count);
-
-}
-
-output_html_with_http_headers $cgi, $cookie, $template->output;

Index: cgi-bin/admin/koha_attr.pl
===================================================================
RCS file: cgi-bin/admin/koha_attr.pl
diff -N cgi-bin/admin/koha_attr.pl
--- cgi-bin/admin/koha_attr.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,321 +0,0 @@
-#!/usr/bin/perl
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Koha;
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Search;
-
-
-# retrieve parameters
-my $input = new CGI;
-
-my $searchfield=$input->param('searchfield');
-$searchfield="" unless $searchfield;
-my $id=$input->param('id');
-my $offset=$input->param('offset');
-$offset=0 unless $offset;
-my $op = $input->param('op');
-my $dspchoice = $input->param('select_display');
-my $pagesize=20;
-my @results = ();
-my $script_name="/cgi-bin/koha/admin/koha_attr.pl";
-
-my $dbh = C4::Context->dbh;
-my $sth;
-# open template
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/koha_attr.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-
-
-if ($op) {
-$template->param(script_name => $script_name,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($id) {
-		$sth=$dbh->prepare("select id,kohafield,attr,label,sorts,recordtype,tagfield,tagsubfield,opacshow,intrashow from koha_attr where id=? ");
-		$sth->execute($id);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-	my $sth = $dbh->prepare("select authorised_value from authorised_values where category='recordtype'");
-	$sth->execute;
-	my @authorised_values;
-	#push @authorised_values,"";
-	while ((my $category) = $sth->fetchrow_array) {
-		push @authorised_values, $category;
-	}
-	my $recordlist  = CGI::scrolling_list(-name=>'recordtype',
-			-values=> \@authorised_values,
-			-size=>1,
-			-multiple=>0,
-			-default => $data->{'recordtype'},
-			);
-	my $sth = $dbh->prepare("select authorised_value from authorised_values where category='mfield' order by lib");
-	$sth->execute;
-	my @authorised_values;
-	#push @authorised_values,"";
-	while ((my $category) = $sth->fetchrow_array) {
-		push @authorised_values, $category;
-	}
-	my $taglist  = CGI::scrolling_list(-name=>'tagfield',
-			-values=> \@authorised_values,
-			-size=>1,
-			-multiple=>0,
-			-default => $data->{'tagfield'},
-			);
-	my $sth = $dbh->prepare("select authorised_value from authorised_values where category='subfield' order by lib ");
-	$sth->execute;
-	my @authorised_values;
-	#push @authorised_values,"";
-	while ((my $category) = $sth->fetchrow_array) {
-		push @authorised_values, $category;
-	}
-	my $tagsublist  = CGI::scrolling_list(-name=>'tagsubfield',
-			-values=> \@authorised_values,
-			-size=>1,
-			-multiple=>0,
-			-default => $data->{'tagsubfield'},
-			);
-	
-	if ($searchfield) {
-		$template->param(action => "Modify tag",id=>$id ,searchfield => "<input type=\"hidden\" name=\"kohafield\" value=\"$searchfield\" />$searchfield");
-		$template->param('heading-modify-tag-p' => 1);
-	} else {
-		$template->param(action => "Add tag",
-								searchfield => "<input type=\"text\" name=\"kohafield\" size=\"40\" maxlength=\"80\" />");
-		$template->param('heading-add-tag-p' => 1);
-	}
-	$template->param('use-heading-flags-p' => 1);
-	$template->param(label => $data->{'label'},
-			attr=> $data->{'attr'},
-			recordtype=>$recordlist,
-			tagfield=>$taglist,
-			tagsubfield=>$tagsublist,
-			sorts => CGI::checkbox(-name=>'sorts',
-					-checked=> $data->{'sorts'}?'checked':'',
-						-value=> 1,
-						-label => '',
-						-id=> 'sorts'),
-			opacshow => CGI::checkbox(-name=>'opacshow',
-						-checked=> $data->{'opacshow'}?'checked':'',
-						-value=> 1,
-						-label => '',
-						-id=> 'opacshow'),
-			intrashow => CGI::checkbox(-name=>'intrashow',
-						-checked=> $data->{'intrashow'}?'checked':'',
-						-value=> 1,
-						-label => '',
-						-id=> 'intrashow'),
-
-
-			);
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-my $id       =$input->param('id');
-
-	$sth=$dbh->prepare("replace koha_attr  set id=?,kohafield=?,attr=?,label=?,sorts=?,recordtype=?,tagfield=?,tagsubfield=? ,opacshow=?,intrashow=? ");
-
-	
-	my $kohafield       =$input->param('kohafield');
-	my $attr       =$input->param('attr');
-	my $label  = $input->param('label');
-	my $sorts =$input->param('sorts');
-	my $opacshow =$input->param('opacshow');
-	my $intrashow =$input->param('intrashow');
-	my $recordtype =$input->param('recordtype');
-	my $tagfield =$input->param('tagfield');
-	my $tagsubfield =$input->param('tagsubfield');
-	unless (C4::Context->config('demo') eq 1) {
-		$sth->execute( $id,$kohafield,$attr,$label,$sorts?1:0,$recordtype,$tagfield,$tagsubfield,$opacshow?1:0,$intrashow?1:0);
-	}
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=koha_attr.pl?searchfield=$kohafield\"></html>";
-
-	exit;
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	$sth=$dbh->prepare("select id,kohafield,label,recordtype from koha_attr where id=? ");
-		$sth->execute($id);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(label => $data->{'label'}."/". $data->{'recordtype'},id=>$data->{'id'},
-							searchfield => $searchfield,
-							);
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-
-	unless (C4::Context->config('demo') eq 1) {
-		$dbh->do("delete from koha_attr where id=$id ");
-	}
-													# END $OP eq DELETE_CONFIRMED
-
-################## DEFAULT ##################################
-} else { # DEFAULT
-	# here, $op can be unset or set 
-	if  ($searchfield ne '') {
-		 $template->param(searchfield => $searchfield);
-	}
-	my $cnt=0;
-	if ($dspchoice) {
-		#here, user only wants used tags/subfields displayed
-		my $sth=$dbh->prepare("Select * from koha_attr where tagfield <>'' and kohafield >= ? ");
-		#could be ordoned by tab
-		$sth->execute($searchfield);
-
-		while (my $data=$sth->fetchrow_hashref){
-			push(@results,$data);
-			$cnt++;
-		}
-
-		$sth->finish;
-		
-		my $toggle=0;
-		my @loop_data = ();
-		my $j=1;
-		my $i=$offset;
-		while ($i < ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt)) {
-			if ($toggle eq 0){
-				$toggle=1;
-			} else {
-				$toggle=0;
-			}
-			my %row_data;  # get a fresh hash for the row data
-			$row_data{id} = $results[$i]->{'id'};
-			$row_data{kohafield} = $results[$i]->{'kohafield'};
-			$row_data{label} = $results[$i]->{'label'};
-			$row_data{sorts} = $results[$i]->{'sorts'};
-			$row_data{attr} = $results[$i]->{'attr'};
-			$row_data{recordtype} = $results[$i]->{'recordtype'};
-			$row_data{tagfield} = $results[$i]->{'tagfield'};
-			$row_data{tagsubfield} = $results[$i]->{'tagsubfield'};
-			$row_data{opacshow} = $results[$i]->{'opacshow'};
-			$row_data{intrashow} = $results[$i]->{'intrashow'};
-			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results[$i]->{'kohafield'}."&amp;id=".$results[$i]->{'id'};
-			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results[$i]->{'kohafield'}."&amp;id=".$results[$i]->{'id'};
-			$row_data{toggle} = $toggle;
-			push(@loop_data, \%row_data);
-			$i++;
-		}
-		$template->param(select_display => "True",
-						loop => \@loop_data);
-		$sth->finish;
-	} else {
-		#here, normal old style : display every tags
-		my ($count, at results)=StringSearch($dbh,$searchfield);
-		$cnt = $count;
-		my $toggle=0;
-		my @loop_data = ();
-		for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-			if ($toggle eq 0){
-				$toggle=1;
-			} else {
-				$toggle=0;
-			}
-			my %row_data;  # get a fresh hash for the row data
-			$row_data{id} = $results[$i]->{'id'};
-			$row_data{kohafield} = $results[$i]->{'kohafield'};
-			$row_data{label} = $results[$i]->{'label'};
-			$row_data{sorts} = $results[$i]->{'sorts'};
-			$row_data{attr} = $results[$i]->{'attr'};
-			$row_data{recordtype} = $results[$i]->{'recordtype'};
-			$row_data{tagfield} = $results[$i]->{'tagfield'};
-			$row_data{tagsubfield} = $results[$i]->{'tagsubfield'};
-			$row_data{opacshow} = $results[$i]->{'opacshow'};
-			$row_data{intrashow} = $results[$i]->{'intrashow'};
-			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results[$i]->{'kohafield'}."&amp;id=".$results[$i]->{'id'};
-			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results[$i]->{'kohafield'}."&amp;id=".$results[$i]->{'id'};
-			$row_data{toggle} = $toggle;
-			push(@loop_data, \%row_data);
-		}
-		$template->param(loop => \@loop_data);
-	}
-	if ($offset>0) {
-		my $prevpage = $offset-$pagesize;
-		$template->param(isprevpage => $offset,
-						prevpage=> $prevpage,
-						searchfield => $searchfield,
-						script_name => $script_name,
-						
-		);
-	}
-	if ($offset+$pagesize<$cnt) {
-		my $nextpage =$offset+$pagesize;
-		$template->param(nextpage =>$nextpage,
-						searchfield => $searchfield,
-						script_name => $script_name,
-						
-		);
-	}
-} #---- END $OP eq DEFAULT
-
-$template->param(loggeninuser => $loggedinuser,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $input, $cookie, $template->output;
-
-
-#
-# the sub used for searches
-#
-sub StringSearch  {
-	my ($dbh,$searchstring)=@_;
-	my $sth=$dbh->prepare("Select * from koha_attr  where kohafield >=?  order by kohafield");
-	$sth->execute($searchstring);
-	my @dataresults;
-	while (my $data=$sth->fetchrow_hashref){
-	push(@dataresults,$data);
-
-	}
-
-	$sth->finish;
-	return (scalar(@dataresults), at dataresults);
-}
-
-
-

Index: cgi-bin/admin/onlinedatabases.pl
===================================================================
RCS file: cgi-bin/admin/onlinedatabases.pl
diff -N cgi-bin/admin/onlinedatabases.pl
--- cgi-bin/admin/onlinedatabases.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,225 +0,0 @@
-#!/usr/bin/perl
-
-#script to administer the branches table
-#written 20/02/2002 by paul.poulain at free.fr
-# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
-
-# ALGO :
-# this script use an $op to know what to do.
-# if $op is empty or none of the above values,
-#	- the default screen is build (with all records, or filtered datas).
-#	- the   user can clic on add, modify or delete record.
-# if $op=add_form
-#	- if primkey exists, this is a modification,so we read the $primkey record
-#	- builds the add/modify form
-# if $op=add_validate
-#	- the user has just send datas, so we create/modify the record
-# if $op=delete_form
-#	- we show the record having primkey=$primkey and ask for deletion validation form
-# if $op=delete_confirm
-#	- we delete the record having primkey=$primkey
-
-use strict;
-use CGI;
-use C4::Search;
-use C4::Context;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-
-sub StringSearch  {
-	my ($env,$searchstring,$type)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select * from online_databases where (server like ?) ");
-	$sth->execute("$data[0]\%");
-	my @results;
-	while (my $data=$sth->fetchrow_hashref) {
-	    push(@results,$data);
-	}
-	#  $sth->execute;
-	$sth->finish;
-	$dbh->disconnect;
-	return (scalar(@results),\@results);
-}
-
-my $input = new CGI;
-my $searchfield=$input->param('searchfield');
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/admin/onlinedatabases.pl";
-
-my $pagesize=20;
-my $op = $input->param('op');
-$searchfield=~ s/\,//g;
-
-my ($template, $loggedinuser, $cookie) 
-    = get_template_and_user({template_name => "admin/onlinedatabases.tmpl",
-				query => $input,
-				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {parameters => 1},
-				debug => 1,
-				});
-
-
-$template->param(script_name => $script_name,
-                 searchfield => $searchfield);
-
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	$template->param(add_form => 1);
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($searchfield) {
-		my $dbh = C4::Context->dbh;
-		my $sth=$dbh->prepare("select * from online_databases where server = ? ");
-		$sth->execute($searchfield);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-	
-	$template->param(host => $data->{'host'},
-			 port => $data->{'port'},
-			 db   => $data->{'db'},
-			 userid => $data->{'userid'},
-			 password => $data->{'password'},
-			server => $data->{'server'},
-			 search_string => $data->{'search_string'},
-			any => $data->{'any'},
-			 title => $data->{'title'},
-			author => $data->{'author'},
-			 subject => $data->{'subject'},
-			any_query => $data->{'any_query'},
-			 title_query => $data->{'title_query'},
-			author_query => $data->{'author_query'},
-			 subject_query => $data->{'subject_query'},
-			);
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	$template->param(add_validate => 1);
-	my $dbh=C4::Context->dbh;
-	my $sth=$dbh->prepare("select * from online_databases where server=?");
-	$sth->execute($input->param('searchfield'));
-	if ($sth->rows) {
-		$sth=$dbh->prepare("update online_databases set host=?, port=?, db=?, userid=?, password=?, server=?, search_string=?,any=?,title=?,author=?,subject=?,any_query=?,title_query=?,author_query=?,subject_query=? where server=?");
-		$sth->execute($input->param('host'),
-		      $input->param('port'),
-		      $input->param('db'),
-		      $input->param('userid'),
-		      $input->param('password'),
-		      $input->param('searchfield'),
-		      $input->param('search_string'),
-		   $input->param('any'),
-			 $input->param('title'),
-		$input->param('author'),
-		$input->param('subject'),
-		 $input->param('any_query'),
-			 $input->param('title_query'),
-		$input->param('author_query'),
-		$input->param('subject_query'),
-		      $input->param('searchfield'),
-		      );
-	} else {
-		$sth=$dbh->prepare("insert into online_databases (host,port,db,userid,password,server,search_string,any,title,author,subject,any_query,title_query,author_query,subject_query) values (?,?,?,?,?,?, ?, ?, ?, ?, ?, ?, ?, ?, ? )");
-		$sth->execute($input->param('host'),
-		      $input->param('port'),
-		      $input->param('db'),
-		      $input->param('userid'),
-		      $input->param('password'),
-		      $input->param('searchfield'),
-		      $input->param('search_string'),
-		      $input->param('fulltext_field'),
-		   $input->param('any'),
-			 $input->param('title'),
-		$input->param('author'),
-		$input->param('subject'),
-		 $input->param('any_query'),
-			 $input->param('title_query'),
-		$input->param('author_query'),
-		$input->param('subject_query'),
-		      );
-	}
-	$sth->finish;
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	$template->param(delete_confirm => 1);
-	my $dbh = C4::Context->dbh;
-
-	my $sth2=$dbh->prepare("select * from online_databases where (server = ?) ");
-	$sth2->execute($searchfield);
-	my $data=$sth2->fetchrow_hashref;
-	$sth2->finish;
-
-        $template->param(host => $data->{'host'},
-			 port => $data->{'port'},
-			 db   => $data->{'db'},
-			 userid => $data->{'userid'},
-			 password => $data->{'password'},
-			server => $data->{'server'},
-			 search_string => $data->{'search_string'},
-			any => $data->{'any'},
-			 title => $data->{'title'},
-			author => $data->{'author'},
-			 subject => $data->{'subject'},
-			);
-
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	$template->param(delete_confirmed => 1);
-	my $dbh=C4::Context->dbh;
-	my $sth=$dbh->prepare("delete from online_databases where server=?");
-	$sth->execute($searchfield);
-	$sth->finish;
-													# END $OP eq DELETE_CONFIRMED
-################## DEFAULT ##################################
-} else { # DEFAULT
-	$template->param(else => 1);
-
-	my $env;
-	my ($count,$results)=StringSearch($env,$searchfield,'web');
-	my @loop;
-	my $toggle = 0;
-	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-			
-		my $urlsearchfield=$results->[$i]{name};
-		$urlsearchfield=~s/ /%20/g;
-		my %row	= ( server => $results->[$i]{'server'},
-			host => $results->[$i]{'host'},
-			port => $results->[$i]{'port'},
-			db => $results->[$i]{'db'},
-			userid =>$results->[$i]{'userid'},
-			
-			toggle => $toggle);
-		push @loop, \%row;
-
-                if ( $toggle eq 0 )
-                {
-                        $toggle = 1;
-                }
-                else
-                {
-                        $toggle = 0;
-                }
-
-	}
-	$template->param(loop => \@loop);
-	if ($offset>0) {
-		$template->param(offsetgtzero => 1,
-				prevpage => $offset-$pagesize);
-	}
-	if ($offset+$pagesize<$count) {
-		$template->param(ltcount => 1,
-				 nextpage => $offset+$pagesize);
-	}
-} #---- END $OP eq DEFAULT
-
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/admin/printers.pl
===================================================================
RCS file: cgi-bin/admin/printers.pl
diff -N cgi-bin/admin/printers.pl
--- cgi-bin/admin/printers.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,185 +0,0 @@
-#!/usr/bin/perl
-
-#script to administer the aqbudget table
-#written 20/02/2002 by paul.poulain at free.fr
-# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
-
-# ALGO :
-# this script use an $op to know what to do.
-# if $op is empty or none of the above values,
-#	- the default screen is build (with all records, or filtered datas).
-#	- the   user can clic on add, modify or delete record.
-# if $op=add_form
-#	- if primkey exists, this is a modification,so we read the $primkey record
-#	- builds the add/modify form
-# if $op=add_validate
-#	- the user has just send datas, so we create/modify the record
-# if $op=delete_form
-#	- we show the record having primkey=$primkey and ask for deletion validation form
-# if $op=delete_confirm
-#	- we delete the record having primkey=$primkey
-
-
-# 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 CGI;
-use C4::Context;
-use C4::Output;
-use C4::Search;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-
-sub StringSearch  {
-	my ($env,$searchstring,$type)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $query="";
-	my $sth=$dbh->prepare("Select printername,printqueue,printtype from printers where (printername like ?) order by printername");
-	$sth->execute("$data[0]%");
-	my @results;
-	my $cnt=0;
-	while (my $data=$sth->fetchrow_hashref){
-	push(@results,$data);
-	$cnt ++;
-	}
-	#  $sth->execute;
-	$sth->finish;
-	return ($cnt,\@results);
-}
-
-my $input = new CGI;
-my $searchfield=$input->param('searchfield');
-my $pkfield="";
-my $reqsel="";
-my $reqdel="";
-#my $branchcode=$input->param('branchcode');
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/admin/printers.pl";
-
-my $pagesize=20;
-my $op = $input->param('op');
-$searchfield=~ s/\,//g;
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/printers.tmpl",
-                             query => $input,
-                             type => "intranet",
-                             authnotrequired => 0,
- 			     flagsrequired => {parameters => 1},
-			      debug => 1,
-                             });
-
-
-$template->param(searchfield => $searchfield,
-		 script_name => $script_name);
-
-#start the page and read in includes
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	$template->param(add_form => 1);
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($searchfield) {
-		my $dbh = C4::Context->dbh;
-		my $sth=$dbh->prepare("select printername,printqueue,printtype from printers where printername=?");
-		$sth->execute($searchfield);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-
-	$template->param(printqueue => $data->{'printqueue'},
-			 printtype => $data->{'printtype'});
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	$template->param(add_validate => 1);
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("replace printers (printername,printqueue,printtype) values (?,?,?)");
-	$sth->execute($input->param('printername'),$input->param('printqueue'),$input->param('printtype'));
-	$sth->finish;
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	$template->param(delete_confirm => 1);
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select printername,printqueue,printtype from printers where printername=?");
-	$sth->execute($searchfield);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(printqueue => $data->{'printqueue'},
-			 printtype  => $data->{'printtype'});
-	
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	$template->param(delete_confirmed => 1);
-
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("delete from printers where printername=?");
-	$sth->execute($searchfield);
-	$sth->finish;
-													# END $OP eq DELETE_CONFIRMED
-################## DEFAULT ##################################
-} else { # DEFAULT
-	$template->param(else => 1);
-
-	my $env;
-	my ($count,$results)=StringSearch($env,$searchfield,'web');
-	my $toggle="white";
-	my @loop;
-	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-		my %row = ( printername => $results->[$i]{'printername'},
-			    printqueue  => $results->[$i]{'printqueue'},
-			    printtype   => $results->[$i]{'printtype'},
-			    toggle      => $toggle);
-		push @loop, \%row;
-
-                if ( $toggle eq 'white' )
-                {
-                        $toggle = '#ffffcc';
-                }
-                else
-                {
-                        $toggle = 'white';
-                }
-	}
-	
-	$template->param(loop => \@loop);
-	
-	if ($offset>0) {
-		$template->param(offsetgtzero => 1,
-				 prevpage => $offset-$pagesize);
-	}
-	print "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
-	if ($offset+$pagesize<$count) {
-		$template->param(ltcount => 1,
-				 nextpage => $offset+$pagesize);
-	}
-
-} #---- END $OP eq DEFAULT
-
-output_html_with_http_headers $input, $cookie, $template->output;
-

Index: cgi-bin/admin/systempreferences.pl
===================================================================
RCS file: cgi-bin/admin/systempreferences.pl
diff -N cgi-bin/admin/systempreferences.pl
--- cgi-bin/admin/systempreferences.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,424 +0,0 @@
-#!/usr/bin/perl
-
-#script to administer the systempref table
-#written 20/02/2002 by paul.poulain at free.fr
-# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
-
-# ALGO :
-# this script use an $op to know what to do.
-# if $op is empty or none of the above values,
-#	- the default screen is build (with all records, or filtered datas).
-#	- the   user can clic on add, modify or delete record.
-# if $op=add_form
-#	- if primkey exists, this is a modification,so we read the $primkey record
-#	- builds the add/modify form
-# if $op=add_validate
-#	- the user has just send datas, so we create/modify the record
-# if $op=delete_form
-#	- we show the record having primkey=$primkey and ask for deletion validation form
-# if $op=delete_confirm
-#	- we delete the record having primkey=$primkey
-
-
-# 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 CGI;
-use C4::Auth;
-use C4::Context;
-use C4::Koha;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Search;
-use C4::Context;
-
-my %tabsysprefs;
-# Acquisitions
-	$tabsysprefs{acquisitions}="Acquisitions";
-	$tabsysprefs{gist}="Acquisitions";
-# Admin
-	$tabsysprefs{dateformat}="Admin";
-	$tabsysprefs{insecure}="Admin";
-	$tabsysprefs{KohaAdmin}="Admin";
-# Authorities
-	$tabsysprefs{authoritysep}="Authorities";
-# Catalogue
-	$tabsysprefs{advancedMARCEditor}="Catalogue";
-	$tabsysprefs{autoBarcode}="Catalogue";
-	$tabsysprefs{hide_marc}="Catalogue";
-	$tabsysprefs{IntranetBiblioDefaultView} = "Catalogue";
-	$tabsysprefs{ISBD}="Catalogue";
-	$tabsysprefs{itemcallnumber}="Catalogue";
-	$tabsysprefs{LabelMARCView}="Catalogue";
-	$tabsysprefs{marc}="Catalogue";
-	$tabsysprefs{marcflavour}="Catalogue";
-	$tabsysprefs{serialsadditems}="Catalogue";
-	$tabsysprefs{sortbynonfiling}="Catalogue";
-	$tabsysprefs{MARCOrgCode}="Catalogue";
-	$tabsysprefs{z3950AuthorAuthFields}="Catalogue";
-	$tabsysprefs{z3950NormalizeAuthor}="Catalogue";
-	$tabsysprefs{SQLorZEBRA}="Catalogue";
-	
-# Circulation
-	$tabsysprefs{maxoutstanding}="Circulation";
-	$tabsysprefs{maxreserves}="Circulation";
-	$tabsysprefs{noissuescharge}="Circulation";
-	$tabsysprefs{patronimages}="Circulation";
-	$tabsysprefs{printcirculationslips}="Circulation";
-	$tabsysprefs{ReturnBeforeExpiry}="Circulation";
-	$tabsysprefs{allowrenewalsbefore}="Circulation";
-	$tabsysprefs{defaultBranch}="Circulation";
-	$tabsysprefs{strictrenewals}="Circulation";
-# Intranet
-	$tabsysprefs{TemplateEncoding}="Intranet";
-	$tabsysprefs{template}="Intranet";
-	$tabsysprefs{intranetstylesheet}="Intranet";
-	$tabsysprefs{IntranetNav}="Intranet";
-	$tabsysprefs{intranetcolorstylesheet}="Intranet";
-	$tabsysprefs{Activate_Log}="Intranet";
-	$tabsysprefs{allowrenewalsbefore}="Intranet";
-	
-	$tabsysprefs{zebrawait}="Intranet";
-	$tabsysprefs{retrieve_from}="Intranet";
-	$tabsysprefs{batchMode}="Intranet";
-	
-# Members
-	$tabsysprefs{automembernum}="Members";
-	$tabsysprefs{checkdigit}="Members";
-	$tabsysprefs{NotifyBorrowerDeparture}="Members";
-# OPAC
-	$tabsysprefs{AmazonAssocTag}="OPAC";
-	$tabsysprefs{AmazonContent}="OPAC";
-	$tabsysprefs{AmazonDevKey}="OPAC";
-	$tabsysprefs{AnonSuggestions}="OPAC";
-	$tabsysprefs{BiblioDefaultView}="OPAC";
-	$tabsysprefs{Disable_Dictionary}="OPAC";
-	$tabsysprefs{hidelostitems}="OPAC";
-	$tabsysprefs{LibraryName}="OPAC";
-	$tabsysprefs{opacbookbag}="OPAC";
-	$tabsysprefs{opaccolorstylesheet}="OPAC";
-	$tabsysprefs{opaccredits}="OPAC";
-	$tabsysprefs{opaclanguages}="OPAC";
-	$tabsysprefs{opaclanguagesdisplay}="OPAC";
-	$tabsysprefs{opaclargeimage}="OPAC";
-	$tabsysprefs{opaclayoutstylesheet}="OPAC";
-	$tabsysprefs{OpacNav}="OPAC";
-	$tabsysprefs{OpacPasswordChange}="OPAC";
-	$tabsysprefs{opacreadinghistory}="OPAC";
-	$tabsysprefs{opacsmallimage}="OPAC";
-	$tabsysprefs{opacstylesheet}="OPAC";
-	$tabsysprefs{opacthemes}="OPAC";
-	$tabsysprefs{opacuserlogin}="OPAC";
-	$tabsysprefs{SubscriptionHistory}="OPAC";
-	$tabsysprefs{suggestion}="OPAC";
-	$tabsysprefs{virtualshelves}="OPAC";
-	$tabsysprefs{opacheader}="OPAC";
-	$tabsysprefs{allowrenewsfromopac}="OPAC";
-
-sub StringSearch  {
-	my ($env,$searchstring,$type)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my @results;
-	my $cnt=0;
-	if ($type){
-		foreach my $syspref (sort keys %tabsysprefs){
-			if ($tabsysprefs{$syspref} eq $type){
-				my $sth=$dbh->prepare("Select variable,value,explanation,type,options from systempreferences where (variable like ?) order by variable");
-				$sth->execute($syspref);
-				while (my $data=$sth->fetchrow_hashref){
-					$data->{value} =~ s/</&lt;/g;
-					$data->{value} =~ s/>/&lt;/g;
-					$data->{value}=substr($data->{value},0,100)."..." if length($data->{value}) >100;
-					push(@results,$data);
-					$cnt++;
-				}
-				$sth->finish;
-			}
-		}
-	} else {
-		my $strsth ="Select variable,value,explanation,type,options from systempreferences where variable not in (";  
-		foreach my $syspref (keys %tabsysprefs){
-			$strsth .= $dbh->quote($syspref).",";
-		}
-		$strsth =~ s/,$/) /;
-		$strsth .= " order by variable";
-		#warn $strsth;
-		my $sth=$dbh->prepare($strsth);
-		$sth->execute();
-		while (my $data=$sth->fetchrow_hashref){
-			$data->{value}=substr($data->{value},0,100);
-			push(@results,$data);
-			$cnt++;
-		}
-		$sth->finish;
-	}
-	return ($cnt,\@results);
-}
-
-my $input = new CGI;
-my $searchfield=$input->param('searchfield');
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/admin/systempreferences.pl";
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/systempreferences.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-my $pagesize=100;
-my $op = $input->param('op');
-$searchfield=~ s/\,//g;
-
-if ($op) {
-$template->param(script_name => $script_name,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-
-if ($op eq 'update_and_reedit') {
-	foreach ($input->param) {
-	}
-	my $value='';
-	if (my $currentorder=$input->param('currentorder')) {
-		my @currentorder=split /\|/, $currentorder;
-		my $orderchanged=0;
-		foreach my $param ($input->param) {
-			if ($param=~m#up-(\d+).x#) {
-				my $temp=$currentorder[$1];
-				$currentorder[$1]=$currentorder[$1-1];
-				$currentorder[$1-1]=$temp;
-				$orderchanged=1;
-				last;
-			} elsif ($param=~m#down-(\d+).x#) {
-				my $temp=$currentorder[$1];
-				$currentorder[$1]=$currentorder[$1+1];
-				$currentorder[$1+1]=$temp;
-				$orderchanged=1;
-				last;
-			}
-		}
-		$value=join ' ', @currentorder;
-		if ($orderchanged) {
-			$op='add_form';
-			$template->param(script_name => $script_name,
-							$op              => 1); # we show only the TMPL_VAR names $op
-		} else {
-			$op='';
-			$searchfield='';
-			$template->param(script_name => $script_name,
-							else              => 1); # we show only the TMPL_VAR names $op
-		}
-	}
-	my $dbh = C4::Context->dbh;
-	my $query="select * from systempreferences where variable=?";
-	my $sth=$dbh->prepare($query);
-	$sth->execute($input->param('variable'));
-	if ($sth->rows) {
-		unless (C4::Context->config('demo') eq 1) {
-			my $sth=$dbh->prepare("update systempreferences set value=?,explanation=?,type=?,options=? where variable=?");
-			$sth->execute($value, $input->param('explanation'), $input->param('variable'), $input->param('preftype'), $input->param('prefoptions'));
-			$sth->finish;
-		}
-    } else {
-		unless (C4::Context->config('demo') eq 1) {
-			my $sth=$dbh->prepare("insert into systempreferences (variable,value,explanation) values (?,?,?,?,?)");
-			$sth->execute($input->param('variable'), $input->param('value'), $input->param('explanation'), $input->param('preftype'), $input->param('prefoptions'));
-			$sth->finish;
-		}
-	}
-	$sth->finish;
-
-}
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-
-if ($op eq 'add_form') {
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($searchfield) {
-		my $dbh = C4::Context->dbh;
-		my $sth=$dbh->prepare("select variable,value,explanation,type,options from systempreferences where variable=?");
-		$sth->execute($searchfield);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-		$template->param(modify => 1);
-	}
-
-	my @options;
-	foreach my $option (split(/\|/, $data->{'options'})) {
-		my $selected='0';
-		$option eq $data->{'value'} and $selected=1;
-		push @options, { option => $option, selected => $selected };
-	}
-	if ($data->{'type'} eq 'Choice') {
-		$template->param('type-choice' => 1);
-	} elsif ($data->{'type'} eq 'YesNo') {
-		$template->param('type-yesno' => 1);
-		$data->{'value'}=C4::Context->boolean_preference($data->{'variable'});
-		($data->{'value'} eq '1') ? ($template->param('value-yes'=>1)) : ($template->param('value-no'=>1));
-	} elsif ($data->{'type'} eq 'Integer') {
-		$template->param('type-free' => 1);
-		$template->param('fieldlength' => $data->{'options'});
-	} elsif ($data->{'type'} eq 'Textarea') {
-		$template->param('type-textarea' => 1);
-		$data->{options} =~ /(.*)\|(.*)/;
-		$template->param('cols' => $1, 'rows' => $2);;
-	} elsif ($data->{'type'} eq 'Float') {
-		$template->param('type-free' => 1);
-		$template->param('fieldlength' => $data->{'options'});
-	} elsif ($data->{'type'} eq 'Themes') {
-		$template->param('type-choice' => 1);
-		my $type='';
-		($data->{'variable'}=~m#opac#i) ? ($type='opac') : ($type='intranet');
-		@options=();
-		my $currently_selected_themes;
-		my $counter=0;
-		foreach my $theme (split /\s+/, $data->{'value'}) {
-		    push @options, { option => $theme, counter => $counter };
-		    $currently_selected_themes->{$theme}=1;
-		    $counter++;
-		}
-		foreach my $theme (getallthemes($type)) {
-			my $selected='0';
-			next if $currently_selected_themes->{$theme};
-			push @options, { option => $theme, counter => $counter };
-			$counter++;
-		}
-	} elsif ($data->{'type'} eq 'Languages') {
-		$template->param('type-choice' => 1);
-		my $type='';
-		@options=();
-		my $currently_selected_languages;
-		my $counter=0;
-		foreach my $language (split /\s+/, $data->{'value'}) {
-		    next if $language eq 'images';
-		    push @options, { option => $language, counter => $counter };
-		    $currently_selected_languages->{$language}=1;
-		    $counter++;
-		}
-		foreach my $language (getalllanguages()) {
-			next if $language eq 'images';
-			my $selected='0';
-			next if $currently_selected_languages->{$language};
-			push @options, { option => $language, counter => $counter };
-			$counter++;
-		}
-	} else {
-		$template->param('type-free' => 1);
-		$template->param('fieldlength' => $data->{'options'}>0?$data->{'options'}:60);
-	}
-	$template->param(explanation => $data->{'explanation'},
-			 value => $data->{'value'},
-			 type => $data->{'type'},
-			 options => \@options,
-			 preftype => $data->{'type'},
-			 prefoptions => $data->{'options'},
-			 searchfield => $searchfield);
-
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select * from systempreferences where variable=?");
-	$sth->execute($input->param('variable'));
-	if ($sth->rows) {
-		unless (C4::Context->config('demo') eq 1) {
-			my $sth=$dbh->prepare("update systempreferences set value=?,explanation=?,type=?,options=? where variable=?");
-			$sth->execute($input->param('value'), $input->param('explanation'), $input->param('preftype'), $input->param('prefoptions'), $input->param('variable'));
-			$sth->finish;
-		}
-	} else {
-		unless (C4::Context->config('demo') eq 1) {
-			my $sth=$dbh->prepare("insert into systempreferences (variable,value,explanation,type,options) values (?,?,?,?,?)");
-			$sth->execute($input->param('variable'), $input->param('value'), $input->param('explanation'), $input->param('preftype'), $input->param('prefoptions'));
-			$sth->finish;
-		}
-	}
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=systempreferences.pl?tab=".$tabsysprefs{$input->param('variable')}."\"></html>";
-	exit;
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select variable,value,explanation,type,options from systempreferences where variable=?");
-	$sth->execute($searchfield);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(searchfield => $searchfield,
-							Tvalue => $data->{'value'},
-							);
-
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("delete from systempreferences where variable=?");
-	$sth->execute($searchfield);
-	$sth->finish;
-													# END $OP eq DELETE_CONFIRMED
-################## DEFAULT ##################################
-} else { # DEFAULT
-	#Adding tab management for system preferences
-	my $tab=$input->param('tab');
-	
-	my $env;
-	my ($count,$results)=StringSearch($env,$searchfield,$tab);
-	my $toggle=0;
-	my @loop_data = ();
-	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-	  	if ($toggle eq 0){
-			$toggle=1;
-	  	} else {
-			$toggle=0;
-	  	}
-		my %row_data;  # get a fresh hash for the row data
-		$row_data{variable} = $results->[$i]{'variable'};
-		$row_data{value} = $results->[$i]{'value'};
-		$row_data{explanation} = $results->[$i]{'explanation'};
-		$row_data{toggle} = $toggle;
-		$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'variable'};
-		$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'variable'};
-		push(@loop_data, \%row_data);
-	}
-	$tab=($tab?$tab:"Others");
-	$template->param(loop => \@loop_data, $tab => 1);
-	if ($offset>0) {
-		my $prevpage = $offset-$pagesize;
-		$template->param("<a href=$script_name?offset=".$prevpage.'&lt;&lt; Prev</a>');
-	}
-	if ($offset+$pagesize<$count) {
-		my $nextpage =$offset+$pagesize;
-		$template->param("a href=$script_name?offset=".$nextpage.'Next &gt;&gt;</a>');
-	}
-} #---- END $OP eq DEFAULT
-$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/admin/thesaurus.pl
===================================================================
RCS file: cgi-bin/admin/thesaurus.pl
diff -N cgi-bin/admin/thesaurus.pl
--- cgi-bin/admin/thesaurus.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,266 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Context;
-use C4::Output;
-use C4::Search;
-use C4::Authorities;
-
-my $input = new CGI;
-my $search_category=$input->param('search_category');
-# $search_category=$input->param('category') unless $search_category;
-#my $toponly = $input->param('toponly');
-my $branch = $input->param('branch');
-my $searchstring = $input->param('searchstring');
-# $searchstring=~ s/\,//g;
-my $id = $input->param('id');
-my $offset=$input->param('offset');
-my $father=$input->param('father');
-
-my $reqsel="";
-my $reqdel="delete from bibliothesaurus where id='$id'";
-my $script_name="/cgi-bin/koha/admin/thesaurus.pl";
-my $dbh = C4::Context->dbh;
-my $authoritysep = C4::Context->preference("authoritysep");
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/thesaurus.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-
-my $pagesize=20;
-
-my $prevpage = $offset-$pagesize;
-my $nextpage =$offset+$pagesize;
-
-my $op = $input->param('op');
-
-if ($op) {
-$template->param(script_name => $script_name,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	my $data;
-	if ($id) {
-		my $dbh = C4::Context->dbh;
-		my $sth=$dbh->prepare("select id,category,freelib,stdlib from bibliothesaurus where id=?");
-		$sth->execute($id);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	} else {
-		$data->{'category'} = $input->param('category');
-		$data->{'stdlib'} = $input->param('stdlib');
-	}
-	if ($search_category) {
-		$template->param(action => "Modify thesaurus");
-	} else {
-		$template->param(action => "Add thesaurus");
-	}
-	$template->param(category => $data->{'category'},
-							stdlib => $data->{'stdlib'},
-							freelib => $data->{'freelib'},
-							id => $data->{'id'},
-							branch => $branch,
-#							toponly => $toponly,
-							search_category => $search_category,
-							searchstring => $searchstring,
-							offset => $offset,
-							father => $father,
-							);
-	if ($data->{'category'}) {
-		$template->param(category => "<input type=\"hidden\" name=\"category\" value='$data->{'category'}'>$data->{'category'}");
-	} else {
-		$template->param(category => "<input type=text name=\"category\" size=8 maxlength=8>");
-	}
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert data in DB
-} elsif ($op eq 'add_validate') {
-	my $dbh = C4::Context->dbh;
-	my $freelib = $input->param('freelib');
-	$freelib = $input->param('stdlib') unless ($input->param('freelib'));
-	newauthority($dbh,$input->param('category'),$input->param('father')." ".$input->param('stdlib'), $freelib,'',1,'');
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=thesaurus.pl?branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$offset\"></html>";
-	exit;
-################## MOD_VALIDATE ##################################
-# called by add_form, used to modify data in DB
-} elsif ($op eq 'mod_validate') {
-	my $dbh = C4::Context->dbh;
-	my $freelib = $input->param('freelib');
-	modauthority($dbh,$id,$freelib);
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=thesaurus.pl?branch=$branch&search_category=$search_category&offset=$offset&searchstring=".CGI::escapeHTML($searchstring)."\"></html>";
-	exit;
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select category,stdlib,freelib from bibliothesaurus where id=?");
-	$sth->execute($id);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(search_category => $search_category,
-							Tvalue => $data->{'stdlib'},
-							id =>$id,
-							);
-
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	&delauthority($id);
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=thesaurus.pl?search_category=$search_category&searchstring=$searchstring\"></html>";
-	exit;
-													# END $OP eq DELETE_CONFIRMED
-################## DETAIL_FORM ##################################
-} elsif ($op eq 'detail_form') {
-	# build categories list
-	my $sth = $dbh->prepare("select distinct category from bibliothesaurus");
-	$sth->execute;
-	my @category_list;
-	while ( my ($category) = $sth->fetchrow_array) {
-		push(@category_list,$category);
-	}
-	my $tab_list = CGI::scrolling_list(-name=>'search_category',
-			-values=> \@category_list,
-			-default=>"$search_category",
-			-size=>1,
-			-multiple=>0,
-			);
-	if (!$search_category) {
-		$search_category=$category_list[0];
-	}
-	my $env;
-	my $sth = $dbh->prepare("select father,stdlib,category,hierarchy from bibliothesaurus where id=?");
-	$sth->execute($id);
-	my ($father,$stdlib,$category,$suphierarchy) = $sth->fetchrow_array;
-	$sth->finish;
-	$sth= $dbh->prepare("select id,freelib from bibliothesaurus where father=? and stdlib=?");
-	$sth->execute($father,$stdlib);
-	my $toggle="white";
-	# builds value list
-	my @loop_data;
-	while ( my ($id,$freelib) = $sth->fetchrow_array) {
-	  	if ($toggle eq 'white'){
-			$toggle="#ffffcc";
-	  	} else {
-			$toggle="white";
-	  	}
-		my %row_data;  # get a fresh hash for the row data
-		$row_data{freelib} = $freelib;
-		$row_data{edit} = "$script_name?op=add_form&id=$id";
-		$row_data{delete} = "$script_name?op=delete_confirm&search_category=$search_category&id=$id";
-		push(@loop_data, \%row_data);
-	}
-
-	$template->param(loop => \@loop_data,
-							tab_list => $tab_list,
-							category => $search_category,
-#							toponly => $toponly,
-							searchstring => $searchstring,
-							stdlib => $stdlib,
-							category => $category);
-################## DEFAULT ##################################
-} else { # DEFAULT
-	# build categories list
-	my $sth = $dbh->prepare("select distinct category from bibliothesaurus");
-	$sth->execute;
-	my @category_list;
-	while ( my ($category) = $sth->fetchrow_array) {
-		push(@category_list,$category);
-	}
-	my $tab_list = CGI::scrolling_list(-name=>'search_category',
-			-values=> \@category_list,
-			-default=>"$search_category",
-			-size=>1,
-			-multiple=>0,
-			);
-	if (!$search_category) {
-		$search_category=$category_list[0];
-	}
-	my $env;
-	my ($count,$results)=searchauthority($env,$search_category,$branch,$searchstring,$offset,$pagesize);
-	my $toggle="white";
-	my @loop_data = ();
-	# builds value list
-	for (my $i=0; $i < $pagesize; $i++){
-		if ($results->[$i]{'stdlib'}) {
-			if ($toggle eq 'white'){
-				$toggle="#ffffcc";
-			} else {
-				$toggle="white";
-			}
-			my %row_data;  # get a fresh hash for the row data
-			$row_data{category} = $results->[$i]{'category'};
-#			$row_data{stdlib} = ("&nbsp;&nbsp;&nbsp;&nbsp;" x $results->[$i]{'level'}).$results->[$i]{'stdlib'};
-			$row_data{stdlib} = $results->[$i]{'stdlib'};
-			$row_data{freelib} = $results->[$i]{'freelib'};
-			$row_data{freelib} =~ s/($searchstring)/<b>$1<\/b>/gi;
-			$row_data{father} = $results->[$i]{'father'};
-			$row_data{dig} ="<a href=thesaurus.pl?branch=$results->[$i]{'hierarchy'}$results->[$i]{'id'}|&search_category=$search_category>";
-			$row_data{related} ="<a href=thesaurus.pl?id=$results->[$i]{'id'}&search_category=$search_category&op=detail_form>";
-			$row_data{edit} = "$script_name?op=add_form&branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$offset&id=".$results->[$i]{'id'};
-			$row_data{delete} = "$script_name?op=delete_confirm&search_category=$search_category&id=".$results->[$i]{'id'};
-			push(@loop_data, \%row_data);
-		}
-	}
-	# rebuild complete hierarchy
-	my  $sth = $dbh->prepare("select stdlib from bibliothesaurus where id=?");
-	my @hierarchy = split(/\|/,$branch);
-	my @hierarchy_loop;
-	my $x;
-	my $father;
-	for (my $xi=0;$xi<=$#hierarchy;$xi++) {
-		my %link;
-		$sth->execute($hierarchy[$xi]);
-		my ($t) = $sth->fetchrow_array;
-		$x.=$hierarchy[$xi]."|";
-		$link{'string'}=$t;
-		$link{'branch'}=$x;
-		push (@hierarchy_loop, \%link);
-		$father .= $t." $authoritysep ";
-	}
-	$template->param(loop => \@loop_data,
-							tab_list => $tab_list,
-							category => $search_category,
-#							toponly => $toponly,
-							searchstring => $searchstring,
-							hierarchy_loop => \@hierarchy_loop,
-							branch => $branch,
-							father => $father);
-	if ($offset>0) {
-		$template->param(previous => "$script_name?branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$prevpage");
-	}
-	if ($pagesize<$count) {
-		$template->param(next => "$script_name?branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$nextpage");
-	}
-} #---- END $OP eq DEFAULT
-
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/admin/viewlog.pl
===================================================================
RCS file: cgi-bin/admin/viewlog.pl
diff -N cgi-bin/admin/viewlog.pl
--- cgi-bin/admin/viewlog.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,148 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: viewlog.pl,v 1.1.2.1 2007/03/10 01:09:59 tgarip1957 Exp $
-
-# 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::Auth;
-use CGI;
-use C4::Context;
-use C4::Koha;
-use C4::Interface::CGI::Output;
-use C4::Log;
-use C4::Date;
-
-=head1 NAME
-
-plugin that shows a stats on catalogers
-
-=head1 DESCRIPTION
-
-
-=over2
-
-=cut
-
-my $input = new CGI;
-my $do_it=$input->param('do_it');
-my $fullreportname = "admin/viewlog.tmpl";
-my $modulename = $input->param("module");
-my $userfilter = $input->param("user");
-my $actionfilter = $input->param("action");
-my $fromfilter = $input->param("from");
-my $tofilter = $input->param("to");
-my $basename = $input->param("basename");
-my $mime = $input->param("MIME");
-my $del = $input->param("sep");
-my $output = $input->param("output");
-
-
-my ($template, $borrowernumber, $cookie)
-	= get_template_and_user({template_name => $fullreportname,
-				query => $input,
-				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {editcatalogue => 1},
-				debug => 1,
-				});
-$template->param(do_it => $do_it);
-if ($do_it) {
-# Displaying results
-	#building filters
-	my @filters;
-	push @filters, {name=> 'user', value=> $userfilter} if ($userfilter);
-	push @filters, {name=> 'action', value=> $actionfilter} if ($actionfilter);
-	push @filters, {name=> 'from', value=> $fromfilter} if ($fromfilter);
-	push @filters, {name=> 'to', value=> $tofilter} if ($tofilter);
-	if ($modulename eq "cataloguing"){
-		my $titlefilter = $input->param("title");
-		my $authorfilter = $input->param("author");
-		my $publisherfilter = $input->param("publisher");
-		my $callnumberfilter = $input->param("barcode");
-		
-		push @filters, {name=> 'title', value=> $titlefilter} if ($titlefilter);
-		push @filters, {name=> 'author', value=> $authorfilter} if ($authorfilter);
-		push @filters, {name=> 'publisher', value=> $publisherfilter} if ($publisherfilter);
-		push @filters, {name=> 'callnumber', value=> $callnumberfilter} if ($callnumberfilter);
-	}
-	
-	my ($count, $results) = displaylog( $modulename, @filters);
-	if ($output eq "screen"){
-# Printing results to screen
-		$template->param(modulename =>$modulename, $modulename => 1, looprow => $results,counter=>$count);
-		output_html_with_http_headers $input, $cookie, $template->output;
-		exit(1);
-	} else {
-# Printing to a csv file
-		print $input->header(-type => 'application/vnd.sun.xml.calc',
-			-attachment=>"$basename.csv",
-			-filename=>"$basename.csv" );
-		my $sep;
-		$sep =C4::Context->preference("delimiter");
-# header top-right
-# Other header
-# Table
-		foreach my $line ( @$results ) {
-			if ($modulename eq "catalogue"){
-				print $line->{timestamp}.$sep;
-				print $line->{firstname}.$sep;
-				print $line->{surname}.$sep;
-				print $line->{action}.$sep;
-				print $line->{info}.$sep;
-				print $line->{title}.$sep;
-				print $line->{author}.$sep;
-			}
- 			print "\n";
-	 	}
-# footer
-		exit(1);
-	}
-} else {
-	my $dbh = C4::Context->dbh;
-	my @values;
-	my %labels;
-	my %select;
-	my $req;
-	
-	my @mime = ( C4::Context->preference("MIME") );
-#	foreach my $mime (@mime){
-#		warn "".$mime;
-#	}
-	
-	my $CGIextChoice=CGI::scrolling_list(
-				-name     => 'MIME',
-				-id       => 'MIME',
-				-values   => \@mime,
-				-size     => 1,
-				-multiple => 0 );
-	
-	my @dels = ( C4::Context->preference("delimiter") );
-	my $CGIsepChoice=CGI::scrolling_list(
-				-name     => 'sep',
-				-id       => 'sep',
-				-values   => \@dels,
-				-size     => 1,
-				-multiple => 0 );
-	
-	$template->param(
-					CGIextChoice => $CGIextChoice,
-					CGIsepChoice => $CGIsepChoice
-					);
-output_html_with_http_headers $input, $cookie, $template->output;
-}

Index: cgi-bin/admin/z3950servers.pl
===================================================================
RCS file: cgi-bin/admin/z3950servers.pl
diff -N cgi-bin/admin/z3950servers.pl
--- cgi-bin/admin/z3950servers.pl	10 Mar 2007 01:09:59 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,228 +0,0 @@
-#!/usr/bin/perl
-
-#script to administer the branches table
-#written 20/02/2002 by paul.poulain at free.fr
-# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
-
-# ALGO :
-# this script use an $op to know what to do.
-# if $op is empty or none of the above values,
-#	- the default screen is build (with all records, or filtered datas).
-#	- the   user can clic on add, modify or delete record.
-# if $op=add_form
-#	- if primkey exists, this is a modification,so we read the $primkey record
-#	- builds the add/modify form
-# if $op=add_validate
-#	- the user has just send datas, so we create/modify the record
-# if $op=delete_form
-#	- we show the record having primkey=$primkey and ask for deletion validation form
-# if $op=delete_confirm
-#	- we delete the record having primkey=$primkey
-
-use strict;
-use C4::Output;
-use CGI;
-use C4::Search;
-use C4::Context;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-
-sub StringSearch  {
-	my ($env,$searchstring,$type)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select * from z3950servers where (name like ?) order by rank,name");
-	$sth->execute("$data[0]\%");
-	my @results;
-	while (my $data=$sth->fetchrow_hashref) {
-	    push(@results,$data);
-	}
-	#  $sth->execute;
-	$sth->finish;
-	$dbh->disconnect;
-	return (scalar(@results),\@results);
-}
-
-my $input = new CGI;
-my $searchfield=$input->param('searchfield');
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/admin/z3950servers.pl";
-
-my $pagesize=20;
-my $op = $input->param('op');
-$searchfield=~ s/\,//g;
-
-my ($template, $loggedinuser, $cookie) 
-    = get_template_and_user({template_name => "admin/z3950servers.tmpl",
-				query => $input,
-				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {parameters => 1},
-				debug => 1,
-				});
-
-
-$template->param(script_name => $script_name,
-                 searchfield => $searchfield);
-
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	$template->param(add_form => 1);
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($searchfield) {
-		my $dbh = C4::Context->dbh;
-		my $sth=$dbh->prepare("select * from z3950servers where (name = ?) order by rank,name");
-		$sth->execute($searchfield);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-	
-	$template->param(host => $data->{'host'},
-			 port => $data->{'port'},
-			 db   => $data->{'db'},
-			 userid => $data->{'userid'},
-			 password => $data->{'password'},
-		
-			opacshow => CGI::checkbox(-name=>'opacshow',
-						-checked=> $data->{'opacshow'}?'checked':'',
-						-value=> 1,
-						-label => '',
-						-id=> 'opacshow'),
-			onlinecatalog => CGI::checkbox(-name=>'onlinecatalog',
-						-checked=> $data->{'onlinecatalog'}?'checked':'',
-						-value=> 1,
-						-label => '',
-						-id=> 'onlinecatalog'),
-			checked => CGI::checkbox(-name=>'checked',
-						-checked=> $data->{'checked'}?'checked':'',
-						-value=> 1,
-						-label => '',
-						-id=> 'checked'),
-			 rank => $data->{'rank'});
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	$template->param(add_validate => 1);
-	my $dbh=C4::Context->dbh;
-	my $sth=$dbh->prepare("select * from z3950servers where name=?");
-	$sth->execute($input->param('searchfield'));
-	if ($sth->rows) {
-		$sth=$dbh->prepare("update z3950servers set host=?, port=?, db=?, userid=?, password=?, name=?, checked=?, rank=?,opacshow=?,syntax=?,onlinecatalog=? where name=?");
-		$sth->execute($input->param('host'),
-		      $input->param('port'),
-		      $input->param('db'),
-		      $input->param('userid'),
-		      $input->param('password'),
-		      $input->param('searchfield'),
-		      $input->param('checked')?1:0,
-		      $input->param('rank'),
-		   $input->param('opacshow')?1:0,
-			 $input->param('syntax'),
-		$input->param('onlinecatalog')?1:0,
-		      $input->param('searchfield'),
-		      );
-	} else {
-		$sth=$dbh->prepare("insert into z3950servers (host,port,db,userid,password,name,checked,rank,opacshow,onlinecatalog,syntax) values (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ? )");
-		$sth->execute($input->param('host'), $input->param('port'), $input->param('db'), $input->param('userid'),
-		      $input->param('password'), $input->param('searchfield'),$input->param('checked')?1:0, $input->param('rank'),
-		      $input->param('opacshow')?1:0,$input->param('onlinecatalog')?1:0,$input->param('syntax') );
-	}
-	$sth->finish;
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	$template->param(delete_confirm => 1);
-	my $dbh = C4::Context->dbh;
-
-	my $sth2=$dbh->prepare("select * from z3950servers where (name = ?) order by rank,name");
-	$sth2->execute($searchfield);
-	my $data=$sth2->fetchrow_hashref;
-	$sth2->finish;
-
-        $template->param(host => $data->{'host'},
-                         port => $data->{'port'},
-                         db   => $data->{'db'},
-                         userid => $data->{'userid'},
-                         password => $data->{'password'},
-                      checked => CGI::checkbox(-name=>'checked',
-						-checked=> $data->{'checked'}?'checked':'',
-						-value=> 1,
-						-label => '',
-						-id=> 'checked'),
-		opacshow => CGI::checkbox(-name=>'opacshow',
-						-checked=> $data->{'opacshow'}?'checked':'',
-						-value=> 1,
-						-label => '',
-						-id=> 'opacshow'),
-		onlinecatalog => CGI::checkbox(-name=>'onlinecatalog',
-						-checked=> $data->{'onlinecatalog'}?'checked':'',
-						-value=> 1,
-						-label => '',
-						-id=> 'onlinecatalog'),
-                         rank => $data->{'rank'});
-
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	$template->param(delete_confirmed => 1);
-	my $dbh=C4::Context->dbh;
-	my $sth=$dbh->prepare("delete from z3950servers where name=?");
-	$sth->execute($searchfield);
-	$sth->finish;
-													# END $OP eq DELETE_CONFIRMED
-################## DEFAULT ##################################
-} else { # DEFAULT
-	$template->param(else => 1);
-
-	my $env;
-	my ($count,$results)=StringSearch($env,$searchfield,'web');
-	my @loop;
-	my $toggle = 0;
-	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-			
-		my $urlsearchfield=$results->[$i]{name};
-		$urlsearchfield=~s/ /%20/g;
-		my %row	= ( name => $results->[$i]{'name'},
-			host => $results->[$i]{'host'},
-			port => $results->[$i]{'port'},
-			db => $results->[$i]{'db'},
-			userid =>$results->[$i]{'userid'},
-			password => ($results->[$i]{'password'}) ? ('#######') : ('&nbsp;'),
-			checked => $results->[$i]{'checked'},
-			opacshow => $results->[$i]{'opacshow'},
-			onlinecatalog => $results->[$i]{'onlinecatalog'},
-			rank => $results->[$i]{'rank'},
-			syntax => $results->[$i]{'syntax'},
-			toggle => $toggle);
-		push @loop, \%row;
-
-                if ( $toggle eq 0 )
-                {
-                        $toggle = 1;
-                }
-                else
-                {
-                        $toggle = 0;
-                }
-
-	}
-	$template->param(loop => \@loop);
-	if ($offset>0) {
-		$template->param(offsetgtzero => 1,
-				prevpage => $offset-$pagesize);
-	}
-	if ($offset+$pagesize<$count) {
-		$template->param(ltcount => 1,
-				 nextpage => $offset+$pagesize);
-	}
-} #---- END $OP eq DEFAULT
-
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/authorities/auth_finder.pl
===================================================================
RCS file: cgi-bin/authorities/auth_finder.pl
diff -N cgi-bin/authorities/auth_finder.pl
--- cgi-bin/authorities/auth_finder.pl	10 Mar 2007 01:10:53 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,157 +0,0 @@
-#!/usr/bin/perl
-# WARNING: 4-character tab stops here
-
-# 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 CGI;
-use C4::Auth;
-use C4::Context;
-use C4::Search;
-use C4::Interface::CGI::Output;
-use C4::AuthoritiesMarc;
-use C4::Koha; # XXX subfield_is_koha_internal_p
-
-my $query=new CGI;
-my $op = $query->param('op');
-my $authtypecode = $query->param('authtypecode');
-my $index = $query->param('index');
-my $resultstring = $query->param('result');
-my $dbh = C4::Context->dbh;
-
-my $startfrom=$query->param('startfrom');
-$startfrom=0 if(!defined $startfrom);
-my ($template, $loggedinuser, $cookie);
-my $resultsperpage;
-
-my $authtypes = getauthtypes;
-my @authtypesloop;
-foreach my $thisauthtype (keys %$authtypes) {
-	my $selected = 1 if $thisauthtype eq $authtypecode;
-	my %row =(value => $thisauthtype,
-				selected => $selected,
-				authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
-			  index => $index,
-			);
-	push @authtypesloop, \%row;
-}
-
-if ($op eq "do_search") {
-	my @marclist = $query->param('marclist');
-	
-	my @operator = $query->param('operator');
-	my @value = $query->param('value');
-
-	$resultsperpage= $query->param('resultsperpage');
-	$resultsperpage = 10 ;
-
-	my ($results,$total) = authoritysearch($dbh, \@marclist, \@operator, \@value,$startfrom*$resultsperpage, $resultsperpage,$authtypecode);# $orderby);
-
-	($template, $loggedinuser, $cookie)
-		= get_template_and_user({template_name => "authorities/searchresultlist-auth.tmpl",
-				query => $query,
-				type => 'intranet',
-				authnotrequired => 0,
-				flagsrequired => {borrowers => 1},
-				flagsrequired => {catalogue => 1},
-				debug => 1,
-				});
-
-	# multi page display gestion
-	my $displaynext=0;
-	my $displayprev=$startfrom;
-	if(($total - (($startfrom+1)*($resultsperpage))) > 0 ) {
-		$displaynext = 1;
-	}
-
-	my @field_data = ();
-
-
-	my @marclist_ini = $query->param('marclist'); # get marclist again, as the previous one has been modified by catalogsearch (mainentry replaced by field name
-	for(my $i = 0 ; $i <= $#marclist ; $i++) {
-		push @field_data, { term => "marclist", val=>$marclist_ini[$i] };
-		push @field_data, { term => "operator", val=>$operator[$i] };
-		push @field_data, { term => "value", val=>$value[$i] };
-	}
-
-	my @numbers = ();
-
-	if ($total>$resultsperpage) {
-		for (my $i=1; $i<$total/$resultsperpage+1; $i++) {
-			if ($i<16) {
-	    		my $highlight=0;
-	    		($startfrom==($i-1)) && ($highlight=1);
-	    		push @numbers, { number => $i,
-					highlight => $highlight ,
-					searchdata=> \@field_data,
-					startfrom => ($i-1)};
-			}
-    	}
-	}
-
-	my $from = $startfrom*$resultsperpage+1;
-	my $to;
-
- 	if($total < (($startfrom+1)*$resultsperpage)) {
-		$to = $total;
-	} else {
-		$to = (($startfrom+1)*$resultsperpage);
-	}
-	$template->param(result => $results) if $results;
-	$template->param(index => $query->param('index')."");
-	$template->param(startfrom=> $startfrom,
-							displaynext=> $displaynext,
-							displayprev=> $displayprev,
-							resultsperpage => $resultsperpage,
-							startfromnext => $startfrom+1,
-							startfromprev => $startfrom-1,
-					      		  index => $index,
-							searchdata=>\@field_data,
-							total=>$total,
-							from=>$from,
-							to=>$to,
-							numbers=>\@numbers,
-							authtypecode =>$authtypecode,
-							resultstring =>$value[0],
-							);
-} else {
-	($template, $loggedinuser, $cookie)
-		= get_template_and_user({template_name => "authorities/auth_finder.tmpl",
-				query => $query,
-				type => 'intranet',
-				authnotrequired => 0,
-				flagsrequired => {catalogue => 1},
-				debug => 1,
-				});
-
-	$template->param(index=>$query->param('index')."",
-					resultstring => $resultstring,
-					);
-}
-
-$template->param(authtypesloop => \@authtypesloop,
-				authtypecode => $authtypecode,
-				nonav=>"1",);
-
-# Print the page
-output_html_with_http_headers $query, $cookie, $template->output;
-
-# Local Variables:
-# tab-width: 4
-# End:

Index: cgi-bin/authorities/auth_linker.pl
===================================================================
RCS file: cgi-bin/authorities/auth_linker.pl
diff -N cgi-bin/authorities/auth_linker.pl
--- cgi-bin/authorities/auth_linker.pl	10 Mar 2007 01:10:53 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,161 +0,0 @@
-#!/usr/bin/perl
-# WARNING: 4-character tab stops here
-
-# 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 CGI;
-use C4::Auth;
-use C4::Context;
-use C4::Search;
-
-use C4::Interface::CGI::Output;
-use C4::AuthoritiesMarc;
-use C4::Koha; # XXX subfield_is_koha_internal_p
-
-my $query=new CGI;
-my $op = $query->param('op');
-my $authtypecode = $query->param('authtypecode');
-my $index = $query->param('index');
-# my $category = $query->param('category');
-my $resultstring = $query->param('result');
-my $dbh = C4::Context->dbh;
-
-my $startfrom=$query->param('startfrom');
-$startfrom=0 if(!defined $startfrom);
-my ($template, $loggedinuser, $cookie);
-my $resultsperpage;
-
-my $authtypes = getauthtypes;
-my @authtypesloop;
-foreach my $thisauthtype (keys %$authtypes) {
-	my $selected = 1 if $thisauthtype eq $authtypecode;
-	my %row =(value => $thisauthtype,
-				selected => $selected,
-				authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
-			  index => $index,
-			);
-	push @authtypesloop, \%row;
-}
-
-if ($op eq "do_search") {
-	my @marclist = $query->param('marclist');
-	
-	my @operator = $query->param('operator');
-	my @value = $query->param('value');
-
-	$resultsperpage= $query->param('resultsperpage');
-	$resultsperpage = 10 if(!defined $resultsperpage);
-
-	my ($results,$total) = authoritysearch($dbh, \@marclist, \@operator, \@value,$startfrom*$resultsperpage, $resultsperpage,$authtypecode) ;
-
-
-	($template, $loggedinuser, $cookie)
-		= get_template_and_user({template_name => "authorities/linkresultlist-auth.tmpl",
-				query => $query,
-				type => 'intranet',
-				authnotrequired => 0,
-				flagsrequired => {borrowers => 1},
-				flagsrequired => {catalogue => 1},
-				debug => 1,
-				});
-
-	# multi page display gestion
-	my $displaynext=0;
-	my $displayprev=$startfrom;
-	if(($total - (($startfrom+1)*($resultsperpage))) > 0 ) {
-		$displaynext = 1;
-	}
-
-	my @field_data = ();
-
-
-	my @marclist_ini = $query->param('marclist'); # get marclist again, as the previous one has been modified by authoritysearch (mainentry replaced by field name
-	for(my $i = 0 ; $i <= $#marclist ; $i++) {
-		push @field_data, { term => "marclist", val=>$marclist_ini[$i] };
-		push @field_data, { term => "operator", val=>$operator[$i] };
-		push @field_data, { term => "value", val=>$value[$i] };
-	}
-
-	my @numbers = ();
-
-	if ($total>$resultsperpage) {
-		for (my $i=1; $i<$total/$resultsperpage+1; $i++) {
-			if ($i<16) {
-	    		my $highlight=0;
-	    		($startfrom==($i-1)) && ($highlight=1);
-	    		push @numbers, { number => $i,
-					highlight => $highlight ,
-					searchdata=> \@field_data,
-					startfrom => ($i-1)};
-			}
-    	}
-	}
-
-	my $from = $startfrom*$resultsperpage+1;
-	my $to;
-
- 	if($total < (($startfrom+1)*$resultsperpage)) {
-		$to = $total;
-	} else {
-		$to = (($startfrom+1)*$resultsperpage);
-	}
-	$template->param(result => $results) if $results;
-	$template->param(index => $query->param('index')."");
-	$template->param(startfrom=> $startfrom,
-							displaynext=> $displaynext,
-							displayprev=> $displayprev,
-							resultsperpage => $resultsperpage,
-							startfromnext => $startfrom+1,
-							startfromprev => $startfrom-1,
-					        		index => $index,
-							searchdata=>\@field_data,
-							total=>$total,
-							from=>$from,
-							to=>$to,
-							numbers=>\@numbers,
-							authtypecode =>$authtypecode,
-							resultstring =>$value[0],
-							);
-} else {
-	($template, $loggedinuser, $cookie)
-		= get_template_and_user({template_name => "authorities/auth_linker.tmpl",
-				query => $query,
-				type => 'intranet',
-				authnotrequired => 0,
-				flagsrequired => {catalogue => 1},
-				debug => 1,
-				});
-
-	$template->param(index=>$query->param('index')."",
-					resultstring => $resultstring,
-				
-					);
-}
-
-$template->param(authtypesloop => \@authtypesloop,
-				authtypecode => $authtypecode,
-				nonav=>"1",);
-
-# Print the page
-output_html_with_http_headers $query, $cookie, $template->output;
-
-# Local Variables:
-# tab-width: 4
-# End:

Index: cgi-bin/authorities/authorities-home.pl
===================================================================
RCS file: cgi-bin/authorities/authorities-home.pl
diff -N cgi-bin/authorities/authorities-home.pl
--- cgi-bin/authorities/authorities-home.pl	10 Mar 2007 01:10:53 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,186 +0,0 @@
-#!/usr/bin/perl
-# WARNING: 4-character tab stops here
-
-# 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 CGI;
-use C4::Auth;
-use C4::Context;
-use C4::Interface::CGI::Output;
-use C4::AuthoritiesMarc;
-use C4::Koha; # XXX subfield_is_koha_internal_p
-use C4::Biblio;
-
-
-my $query=new CGI;
-my $op = $query->param('op');
-my $authtypecode = $query->param('authtypecode');
-my $dbh = C4::Context->dbh;
-my $mergefrom=$query->param('mergefrom');
-my $mergeto=$query->param('mergeto');
-my $startfrom=$query->param('startfrom');
-my $authid=$query->param('authid');
-$startfrom=0 if(!defined $startfrom);
-my ($template, $loggedinuser, $cookie);
-my $resultsperpage;
-
-my $authtypes = getauthtypes;
-my @authtypesloop;
-foreach my $thisauthtype (sort { $authtypes->{$a} <=> $authtypes->{$b} } keys %$authtypes) {
-	my $selected = 1 if $thisauthtype eq $authtypecode;
-	my %row =(value => $thisauthtype,
-				selected => $selected, 
-				authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
-			);
-	push @authtypesloop, \%row;
-}
-
-
-if ($op eq "do_search") {
-	my @marclist = $query->param('marclist');
-	
-	my @operator = $query->param('operator');
-	my @value = $query->param('value');
-
-	$resultsperpage= $query->param('resultsperpage');
-	$resultsperpage = 10 unless $resultsperpage;
-	my @tags;
-	my ($results,$total) = authoritysearch($dbh, \@marclist, \@operator, \@value,$startfrom*$resultsperpage, $resultsperpage,$authtypecode) ;
-	($template, $loggedinuser, $cookie)
-		= get_template_and_user({template_name => "authorities/searchresultlist.tmpl",
-				query => $query,
-				type => 'intranet',
-				authnotrequired => 0,
-				authtypecode=> $authtypecode,
-				flagsrequired => {borrowers => 1},
-				flagsrequired => {catalogue => 1},
-				debug => 1,
-				});
-
-	# multi page display gestion
-	my $displaynext=0;
-	my $displayprev=$startfrom;
-	if(($total - (($startfrom+1)*($resultsperpage))) > 0 ){
-		$displaynext = 1;
-	}
-
-	my @field_data = ();
-
-	# we must get parameters once again. Because if there is a mainentry, it has been replaced by something else during the search, thus the links next/previous would not work anymore 
-	my @marclist_ini = $query->param('marclist');
-	for(my $i = 0 ; $i <= $#marclist ; $i++)
-	{
-		push @field_data, { term => "marclist", val=>$marclist_ini[$i] };
-		push @field_data, { term => "operator", val=>$operator[$i] };
-		push @field_data, { term => "value", val=>$value[$i] };
-	}
-
-	my @numbers = ();
-
-	if ($total>$resultsperpage)
-	{
-		for (my $i=1; $i<$total/$resultsperpage+1; $i++)
-		{
-			if ($i<31)
-			{
-	    		my $highlight=0;
-	    		($startfrom==($i-1)) && ($highlight=1);
-	    		push @numbers, { number => $i,
-					highlight => $highlight ,
-					searchdata=> \@field_data,
-					startfrom => ($i-1)};
-			}
-    	}
-	}
-
-	my $from = $startfrom*$resultsperpage+1;
-	my $to;
-
- 	if($total < (($startfrom+1)*$resultsperpage))
-	{
-		$to = $total;
-	} else {
-		$to = (($startfrom+1)*$resultsperpage);
-	}
-	$template->param(result => $results) if $results;
-	$template->param(
-							startfrom=> $startfrom,
-							displaynext=> $displaynext,
-							displayprev=> $displayprev,
-							resultsperpage => $resultsperpage,
-							startfromnext => $startfrom+1,
-							startfromprev => $startfrom-1,
-							searchdata=>\@field_data,
-							total=>$total,
-							from=>$from,
-							to=>$to,
-							numbers=>\@numbers,
-							authtypecode=>$authtypecode,
-							);
-
-} elsif ($op eq "delete") {
-
-	&AUTHdelauthority($dbh,$authid);
-
-	($template, $loggedinuser, $cookie)
-		= get_template_and_user({template_name => "authorities/authorities-home.tmpl",
-				query => $query,
-				type => 'intranet',
-				authnotrequired => 0,
-				flagsrequired => {catalogue => 1},
-				debug => 1,
-				});
-
-
-}elsif ($op eq "merge") {
-
-
-	my $MARCfrom = XMLgetauthorityhash($dbh,$mergefrom);
-	my $MARCto = XMLgetauthorityhash($dbh,$mergeto);
-	merge($dbh,$mergefrom,$MARCfrom,$mergeto,$MARCto);
-	($template, $loggedinuser, $cookie)
-		= get_template_and_user({template_name => "authorities/authorities-home.tmpl",
-				query => $query,
-				type => 'intranet',
-				authnotrequired => 0,
-				flagsrequired => {catalogue => 1},
-				debug => 1,
-				});
-}else {
-	($template, $loggedinuser, $cookie)
-		= get_template_and_user({template_name => "authorities/authorities-home.tmpl",
-				query => $query,
-				type => 'intranet',
-				authnotrequired => 0,
-				flagsrequired => {catalogue => 1},
-				debug => 1,
-				});
-
-}
-
-
-
-$template->param(authtypesloop => \@authtypesloop);
-
-# Print the page
-output_html_with_http_headers $query, $cookie, $template->output;
-
-# Local Variables:
-# tab-width: 4
-# End:

Index: cgi-bin/authorities/authorities.pl
===================================================================
RCS file: cgi-bin/authorities/authorities.pl
diff -N cgi-bin/authorities/authorities.pl
--- cgi-bin/authorities/authorities.pl	10 Mar 2007 01:10:53 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,594 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: authorities.pl,v 1.1.2.1 2007/03/10 01:10:53 tgarip1957 Exp $
-
-# 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 CGI;
-use C4::Auth;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::AuthoritiesMarc;
-use C4::Biblio;
-use C4::Context;
-use C4::Koha; # XXX subfield_is_koha_internal_p
-use Encode;
-
-use vars qw( $tagslib);
-use vars qw( $authorised_values_sth);
-use vars qw( $is_a_modif );
-my $input = new CGI;
-my $z3950 = $input->param('z3950');
-my $logstatus=C4::Context->preference('Activate_log');
-my $xml;
-my $itemtype; # created here because it can be used in build_authorized_values_list sub
-
-
-
-
-
-=item build_authorized_values_list
-
-=cut
-
-sub build_authorized_values_list ($$$$$) {
-	my($tag, $subfield, $value, $dbh,$authorised_values_sth) = @_;
-
-	my @authorised_values;
-	my %authorised_lib;
-
-	# builds list, depending on authorised value...
-
-	#---- branch
-	if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
-	my $sth=$dbh->prepare("select branchcode,branchname from branches order by branchname");
-	$sth->execute;
-	push @authorised_values, ""
-		unless ($tagslib->{$tag}->{$subfield}->{mandatory});
-
-	while (my ($branchcode,$branchname) = $sth->fetchrow_array) {
-		push @authorised_values, $branchcode;
-		$authorised_lib{$branchcode}=$branchname;
-	}
-
-	#----- itemtypes
-	} elsif ($tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes") {
-		my $sth=$dbh->prepare("select itemtype,description from itemtypes order by description");
-		$sth->execute;
-		push @authorised_values, "" unless ($tagslib->{$tag}->{$subfield}->{mandatory});
-	
-		while (my ($itemtype,$description) = $sth->fetchrow_array) {
-			push @authorised_values, $itemtype;
-			$authorised_lib{$itemtype}=$description;
-		}
-		$value=$itemtype unless ($value);
-
-	#---- "true" authorised value
-	} else {
-		$authorised_values_sth->execute($tagslib->{$tag}->{$subfield}->{authorised_value});
-
-		push @authorised_values, "" unless ($tagslib->{$tag}->{$subfield}->{mandatory});
-	
-		while (my ($value,$lib) = $authorised_values_sth->fetchrow_array) {
-			push @authorised_values, $value;
-			$authorised_lib{$value}=$lib;
-		}
-    }
-    return CGI::scrolling_list( -name     => 'field_value',
-				-values   => \@authorised_values,
-				-default  => $value,
-				-labels   => \%authorised_lib,
-				-override => 1,
-				-size     => 1,
-				-multiple => 0 );
-}
-
-
-=item create_input
- builds the <input ...> entry for a subfield.
-=cut
-sub create_input () {
-	my ($tag,$subfield,$value,$i,$tabloop,$rec,$authorised_values_sth,$id) = @_;	
-	my $dbh=C4::Context->dbh;
-	$value =~ s/"/&quot;/g;
-	my %subfield_data;
-	$subfield_data{id}=$id;
-	$subfield_data{tag}=$tag;
-	$subfield_data{subfield}=$subfield;
-	$subfield_data{marc_lib}="<span id=\"error$i\">".$tagslib->{$tag}->{$subfield}->{lib}."</span>";
-	$subfield_data{marc_lib_plain}=$tagslib->{$tag}->{$subfield}->{lib};
-	$subfield_data{tag_mandatory}=$tagslib->{$tag}->{mandatory};
-	$subfield_data{mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory};
-	$subfield_data{repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable};
-	$subfield_data{index} = $i;
-	$subfield_data{visibility} = "display:none" if (substr($tagslib->{$tag}->{$subfield}->{hidden},2,1) gt "0") ; #check parity
-	# it's an authorised field
-	if ($tagslib->{$tag}->{$subfield}->{authorised_value}) {
-		$subfield_data{marc_value}= build_authorized_values_list($tag, $subfield, $value, $dbh,$authorised_values_sth);
-	# it's linking authority field to another authority
-	} elsif ($tagslib->{$tag}->{$subfield}->{link}) {
-		$subfield_data{marc_value}="<input onblur=\"this.style.backgroundColor='#ffffff';\" onfocus=\"this.style.backgroundColor='#ffffff;'\" tabindex=\"1\" type=\"text\" name=\"field_value\" id=\"field_value$id\" value=\"$value\" size=\"40\" maxlength=\"255\" DISABLE READONLY> <a  style=\"cursor: help;\" href=\"javascript:Dopop('../authorities/auth_linker.pl?index=$id',$id);\">...</a>";
-	
-		# 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
-		# (the cgidir differs)
-		my $cgidir = C4::Context->intranetdir ."/cgi-bin/value_builder";
-		unless (opendir(DIR, "$cgidir")) {
-			$cgidir = C4::Context->intranetdir."/value_builder";
-		} 
-		my $plugin=$cgidir."/".$tagslib->{$tag}->{$subfield}->{'value_builder'}; 
-		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}="<input tabindex=\"1\" type=\"text\"  name=\"field_value\" id=\"field_value$id\"  value=\"$value\" size=\"40\" maxlength=\"255\" DISABLE READONLY OnFocus=\"javascript:Focus$function_name($i)\" OnBlur=\"javascript:Blur$function_name($i); \"> <a  style=\"cursor: help;\" href=\"javascript:Clic$function_name($i)\">...</a> $javascript";
-	# it's an hidden field
-	} elsif  ($tag eq '') {
-		$subfield_data{marc_value}="<input onblur=\"this.style.backgroundColor='#ffffff';\" onfocus=\"this.style.backgroundColor='#ffffff'; \" tabindex=\"1\" type=\"hidden\" name=\"field_value\" id=\"field_value$id\"  value=\"$value\">";
-	} elsif  (substr($tagslib->{$tag}->{$subfield}->{'hidden'},2,1) gt "1") {
-
-		$subfield_data{marc_value}="<input onblur=\"this.style.backgroundColor='#ffffff';\" onfocus=\"this.style.backgroundColor='#ffffff'; \" tabindex=\"1\" type=\"text\" name=\"field_value\" id=\"field_value$id\"   value=\"$value\" size=\"40\" maxlength=\"255\" >";
-	# it's a standard field
-	} else {
-		if (length($value) >100) {
-			$subfield_data{marc_value}="<textarea tabindex=\"1\" name=\"field_value\" id=\"field_value$id\"  cols=\"40\" rows=\"5\" >$value</textarea>";
-		} else {
-			$subfield_data{marc_value}="<input onblur=\"this.style.backgroundColor='#ffffff';\" onfocus=\"this.style.backgroundColor='#ffffff'; \" tabindex=\"1\" type=\"text\" name=\"field_value\" id=\"field_value$id\"  value=\"$value\" size=\"50\">"; #"
-		}
-	}
-	return \%subfield_data;
-}
-
-sub build_tabs  ($$$;$){
-    my($template, $xmlhash, $dbh,$addedfield) = @_;
-    # fill arrays
-    my @loop_data =();
-    my $tag;
-    my $i=0;
-my $id=100;
-my ($authidtagfield,$authidtagsubfield)=MARCfind_marc_from_kohafield("authid","authorities");
-	my $authorised_values_sth = $dbh->prepare("select authorised_value,lib
-		from authorised_values
-		where category=? order by lib");
-my $author;
-my $controlfields;
-my $leader;
-if ($xmlhash){
- $author=$xmlhash->{'datafield'};
- $controlfields=$xmlhash->{'controlfield'};
- $leader=$xmlhash->{'leader'};
-}
-    my @BIG_LOOP;
-my %built;
-# loop through each tab 0 through 9
-	for (my $tabloop = 0; $tabloop <= 9; $tabloop++) {
-		my @loop_data = ();
-		foreach my $tag (sort(keys (%{$tagslib}))) {
-			my $indicator;
-				# if MARC::Record is not empty => use it as master loop, then add missing subfields that should be in the tab.
-				# if MARC::Record is empty => use tab as master loop.
-	if ($xmlhash) {
-			####
-		
-			my %tagdefined;
-			my %definedsubfields;
-			my $hiddenrequired;
-			my ($ind1,$ind2);
-			
-		 if ($tag>9){
-			next if ($tag eq $authidtagfield); #we do not want authid to duplicate
-
-			foreach my $data (@$author){							
-					$hiddenrequired=0;
-					my @subfields_data;
-					undef %definedsubfields;
-   	 			 if ($data->{'tag'} eq $tag){
-					$tagdefined{$tag}=1 ;
-					   if ($built{$tag}==1){
-						$hiddenrequired=1;
-					    }
-					    $ind1="  ";
-					      $ind2="  ";		
-					      foreach my $subfieldcode ( $data->{'subfield'}){
-		   				 foreach my $code ( @$subfieldcode){	
-							next if ($tagslib->{$tag}->{$code->{'code'}}->{tab} ne $tabloop);						
-							my $subfield=$code->{'code'}  ;
-							my $value=$code->{'content'};
-							$definedsubfields{$tag.$subfield}=1 ;
-							 $built{$tag}=1;
-							push(@subfields_data, &create_input($tag,$subfield,$value,$i,$tabloop,$xmlhash,$authorised_values_sth,$id)) ;
-							$i++ ;
-		   				}
-					      } ##each subfield
-					    $ind1=$data->{'ind1'};
-					    $ind2=	$data->{'ind2'};
-					  
-					if ($hiddenrequired && $#loop_data >=0 && $loop_data[$#loop_data]->{'tag'} eq $tag) {
-						my @hiddensubfields_data;
-						my %tag_data;
-						push(@hiddensubfields_data, &create_input('','','',$i,$tabloop,$xmlhash,$authorised_values_sth,$id));
-						$tag_data{tag} = '';
-						$tag_data{tag_lib} = '';
-						$tag_data{indicator} = '';
-						$tag_data{subfield_loop} = \@hiddensubfields_data;
-						push (@loop_data, \%tag_data);
-						$i++;
-					}
-					# now, loop again to add parameter subfield that are not in the MARC::Record
-					
-					foreach my $subfield (sort( keys %{$tagslib->{$tag}})) {
-						next if (length $subfield !=1);
-						next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
-						next if ((substr($tagslib->{$tag}->{$subfield}->{hidden},2,1) >1)  ); #check for visibility flag
-						next if ($definedsubfields{$tag.$subfield} );
-						push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$xmlhash,$authorised_values_sth,$id));
-						$definedsubfields{$tag.$subfield}=1;
-						$i++;
-					}
-					if ($#subfields_data >= 0) {
-						my %tag_data;
-						$tag_data{tag} = $tag;
-						$tag_data{tag_lib} = $tagslib->{$tag}->{lib};
-						$tag_data{repeatable} = $tagslib->{$tag}->{repeatable};
-						$tag_data{indicator} = $ind1.$ind2 if ($tag>=10);
-						$tag_data{subfield_loop} = \@subfields_data;
-						push (@loop_data, \%tag_data);
-						
-					}
-					$id++;
-  	  			     }## if tag matches
-			
-			}#eachdata
- 		}else{ ## tag <10
-			next if ($tag eq $authidtagfield); #we do not want authid to duplicate
-
-			        if ($tag eq "000" || $tag eq "LDR"){
-					my $subfield="@";
-					next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
-					my @subfields_data;
-					my $value=$leader->[0] if $leader->[0];
-					$tagdefined{$tag}=1 ;
-					push(@subfields_data, &create_input($tag,$subfield,$value,$i,$tabloop,$xmlhash,$authorised_values_sth,$id));					
-					$i++;
-					if ($#subfields_data >= 0) {
-						my %tag_data;
-						$tag_data{tag} = $tag;
-						$tag_data{tag_lib} = $tagslib->{$tag}->{lib};
-						$tag_data{repeatable} = $tagslib->{$tag}->{repeatable};
-						$tag_data{subfield_loop} = \@subfields_data;
-                                                			$tag_data{fixedfield} = 1;
-						push (@loop_data, \%tag_data);
-					}
-			         }else{
-	   			 foreach my $control (@$controlfields){
-					my $subfield="@";
-					next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
-					next if ($tagslib->{$tag} eq $authidtagfield);
-					my @subfields_data;
-					if ($control->{'tag'} eq $tag){
-						$hiddenrequired=0;
-						$tagdefined{$tag}=1;
-						 if ($built{$tag}==1){$hiddenrequired=1;}
-						my $value=$control->{'content'} ;
-						$definedsubfields{$tag.'@'}=1;
-						push(@subfields_data, &create_input($tag,$subfield,$value,$i,$tabloop,$xmlhash,$authorised_values_sth,$id));					
-						$i++;
-					
-					   	$built{$tag}=1;
-					###hiddenrequired
-					if ($#subfields_data >= 0) {
-						my %tag_data;
-						$tag_data{tag} = $tag;
-						$tag_data{tag_lib} = $tagslib->{$tag}->{lib};
-						$tag_data{repeatable} = $tagslib->{$tag}->{repeatable};
-						$tag_data{subfield_loop} = \@subfields_data;
-						$tag_data{fixedfield} = 1;
-						push (@loop_data, \%tag_data);
-					}
-					$id++;
-					}## tag matches
-	  			 }# each control
-			       }
-   			}##tag >9
-
-
-			##### Any remaining tag
-				my @subfields_data;
-				# now, loop again to add parameter subfield that are not in the MARC::Record
-					foreach my $subfield (sort( keys %{$tagslib->{$tag}})) {
-						next if ($tagdefined{$tag} );
-						next if (length $subfield !=1);
-						next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
-						next if ((substr($tagslib->{$tag}->{$subfield}->{hidden},2,1) > 1) ); #check for visibility flag
-						push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$xmlhash,$authorised_values_sth,$id));
-						$tagdefined{$tag.$subfield}=1;
-						$i++;
-					}
-					if ($#subfields_data >= 0) {
-						my %tag_data;
-						$tag_data{tag} = $tag;
-						$tag_data{tag_lib} = $tagslib->{$tag}->{lib};
-						$tag_data{repeatable} = $tagslib->{$tag}->{repeatable};
-						$tag_data{indicator} = $ind1.$ind2 if ($tag>=10);
-						$tag_data{subfield_loop} = \@subfields_data;
-						if ($tag<10) {
-                                                			$tag_data{fixedfield} = 1;
-                                        				}
-
-						push (@loop_data, \%tag_data);
-					}
-
-					
-					if ($addedfield eq $tag) {
-						my %tag_data;
-						my @subfields_data;
-						$id++;
-						$tagdefined{$tag}=1 ;
-						foreach my $subfield (sort( keys %{$tagslib->{$tag}})) {
-						next if (length $subfield !=1);
-						next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
-						next if ((substr($tagslib->{$tag}->{$subfield}->{hidden},2,1) >1)  ); #check for visibility flag
-						$addedfield="";	
-						push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$xmlhash,$authorised_values_sth,$id));
-						$i++;
-							}
-						if ($#subfields_data >= 0) {
-						$tag_data{tag} = $tag;
-						$tag_data{tag_lib} = $tagslib->{$tag}->{lib};
-						$tag_data{repeatable} = $tagslib->{$tag}->{repeatable};
-						$tag_data{indicator} = ' ' if ($tag>=10);
-						$tag_data{subfield_loop} = \@subfields_data;
-							if ($tag<10) {
-                                                				$tag_data{fixedfield} = 1;
-                                        					}
-						push (@loop_data, \%tag_data);
-											
-						}
-				
-					}
-				
-	# if breeding is empty
-			} else {
-				my @subfields_data;
-				foreach my $subfield (sort(keys %{$tagslib->{$tag}})) {
-					next if (length $subfield !=1);
-					next if ((substr($tagslib->{$tag}->{$subfield}->{hidden},2,1) >1)  ); #check for visibility flag
-					next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop);
-					push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$xmlhash,$authorised_values_sth,$id));
-					$i++;
-				}
-				if ($#subfields_data >= 0) {
-					my %tag_data;
-					$tag_data{tag} = $tag;
-					$tag_data{tag_lib} = $tagslib->{$tag}->{lib};
-					$tag_data{repeatable} = $tagslib->{$tag}->{repeatable};
-					$tag_data{indicator} = $indicator;
-					$tag_data{subfield_loop} = \@subfields_data;
-					$tag_data{tagfirstsubfield} = $tag_data{subfield_loop}[0];
-					if ($tag<10) {
-						$tag_data{fixedfield} = 1;
-					}
-					push (@loop_data, \%tag_data);
-				}
-			}
-		$id++;
-	}
-	if ($#loop_data >=0) {
-            my %big_loop_line;
-            $big_loop_line{number}=$tabloop;
-            $big_loop_line{innerloop}=\@loop_data;
-            push @BIG_LOOP,\%big_loop_line;
-            }	
-#		$template->param($tabloop."XX" =>\@loop_data);
-		$template->param(BIG_LOOP => \@BIG_LOOP);
-}## tab loop
-}
-
-
-sub build_hidden_data () {
-    # build hidden data =>
-    # we store everything, even if we show only requested subfields.
-
-    my @loop_data =();
-    my $i=0;
-    foreach my $tag (keys %{$tagslib}) {
-	my $previous_tag = '';
-
-	# loop through each subfield
-	foreach my $subfield (keys %{$tagslib->{$tag}}) {
-	    next if ($subfield eq 'lib');
-	    next if ($subfield eq 'tab');
-	    next if ($subfield eq 'mandatory');
-		next if ($subfield eq 'repeatable');
-	    next if ($tagslib->{$tag}->{$subfield}->{'tab'}  ne "-1");
-	    my %subfield_data;
-	    $subfield_data{marc_lib}=$tagslib->{$tag}->{$subfield}->{lib};
-	    $subfield_data{marc_mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory};
-	    $subfield_data{marc_repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable};
-	    $subfield_data{marc_value}="<input type=\"hidden\"  name=\"field_value[]\">";
-	    push(@loop_data, \%subfield_data);
-	    $i++
-	}
-    }
-}
-
-# ======================== 
-#          MAIN 
-#=========================
-my $input = new CGI;
-my $error = $input->param('error');
-my $authid=$input->param('authid'); # if authid exists, it's a modif, not a new authority.
-my $z3950 = $input->param('z3950');
-my $op = $input->param('op');
-my $nonav = $input->param('nonav');
-my $myindex = $input->param('index');
-my $linkid=$input->param('linkid');
-my $authtypecode = $input->param('authtypecode');
-
-my $dbh = C4::Context->dbh;
-$authtypecode = &AUTHfind_authtypecode($dbh,$authid) if !$authtypecode;
-
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "authorities/authorities.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {editcatalogue => 1},
-			     debug => 1,
-			     });
-$template->param(nonav   => $nonav,index=>$myindex,authtypecode=>$authtypecode,);
-$tagslib = AUTHgettagslib($dbh,1,$authtypecode);
-
-my $xmlhash;
-my $xml;
-$xmlhash = XMLgetauthorityhash($dbh,$authid) if ($authid);
-
-
-my ($oldauthnumtagfield,$oldauthnumtagsubfield);
-my ($oldauthtypetagfield,$oldauthtypetagsubfield);
-$is_a_modif=0;
-if ($authid) {
-	$is_a_modif=1;
-	($oldauthnumtagfield,$oldauthnumtagsubfield) = MARCfind_marc_from_kohafield("authid","authorities");
-	($oldauthtypetagfield,$oldauthtypetagsubfield) = MARCfind_marc_from_kohafield("authtypecode","authorities");
-}
-
-#------------------------------------------------------------------------------------------------------------------------------
-if ($op eq "add") {
-#------------------------------------------------------------------------------------------------------------------------------
-
-	# rebuild
-	my @tags = $input->param('tag');
-	my @subfields = $input->param('subfield');
-	my @values = $input->param('field_value');
-	# build indicator hash.
-	my @ind_tag = $input->param('ind_tag');
-	my @indicator = $input->param('indicator');
-## check for malformed xml -- non UTF-8 like (MARC8) will break xml without warning
-### This usually happens with data coming from other Z3950 servers
-## Slows the saving process so comment out at your own risk
-eval{
- $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag);	
-};
-
- if ($@){
-warn $@;
- $template->param(error             =>1,xmlerror=>1,);
-goto FINAL;
-  };	# check for a duplicate
-###Authorities need the XML header unlike biblios
-$xml='<?xml version="1.0" encoding="UTF-8"?>'.$xml;
-  my $xmlhash=XML_xml2hash_onerecord($xml);
-	my ($duplicateauthid,$duplicateauthvalue) = C4::AuthoritiesMarc::FindDuplicateauth($xmlhash,$authtypecode) if ($op eq "add") && (!$is_a_modif);
-#warn "duplicate:$duplicateauthid,$duplicateauthvalue";	
-	my $confirm_not_duplicate = $input->param('confirm_not_duplicate');
-	# it is not a duplicate (determined either by Koha itself or by user checking it's not a duplicate)
-	if (!$duplicateauthid or $confirm_not_duplicate) {
-# warn "noduplicate";
-		if ($is_a_modif ) {	
-			$authid=AUTHmodauthority($dbh,$authid,$xmlhash,$authtypecode);
-		} else {
-		$authid = AUTHaddauthority($dbh,$xmlhash,'',$authtypecode);
-
-		}
-	# now, redirect to detail page
-		if ($nonav){
-#warn ($myindex,$nonav);
-		print $input->redirect("auth_finder.pl?index=$myindex&nonav=$nonav&authtypecode=$authtypecode");
-		}else{
-		print $input->redirect("detail.pl?nonav=$nonav&authid=$authid");
-		}
-		exit;
-	} else {
-FINAL:
-#warn "duplicate";
-	# it may be a duplicate, warn the user and do nothing
-		build_tabs ($template, $xmlhash, $dbh);
-		build_hidden_data;
-		$template->param(authid =>$authid,
-			duplicateauthid				=> $duplicateauthid,
-			duplicateauthvalue				=> $duplicateauthvalue,
-			 );
-	}
-#------------------------------------------------------------------------------------------------------------------------------
-} elsif ($op eq "addfield") {
-#------------------------------------------------------------------------------------------------------------------------------
-	my $addedfield = $input->param('addfield_field');
-	my @tags = $input->param('tag');
-	my @subfields = $input->param('subfield');
-	my @values = $input->param('field_value');
-	# build indicator hash.
-	my @ind_tag = $input->param('ind_tag');
-	my @indicator = $input->param('indicator');
-	my $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag);
-	$xml='<?xml version="1.0" encoding="UTF-8"?>'.$xml;
-	my $xmlhash=XML_xml2hash_onerecord($xml);
-	# adding an empty field
-	build_tabs ($template, $xmlhash, $dbh,$addedfield);
-	build_hidden_data;
-	$template->param(
-		authid                       => $authid,);
-
-} elsif ($op eq "delete") {
-#------------------------------------------------------------------------------------------------------------------------------
-	&AUTHdelauthority($dbh,$authid);
-	if ($nonav){
-	print $input->redirect("auth_finder.pl");
-	}else{
-	print $input->redirect("authorities-home.pl?authid=0");
-	}
-		exit;
-} else {
-if ($op eq "duplicate")
-	{
-		$authid = "";
-	}
-	build_tabs ($template, $xmlhash, $dbh);
-	build_hidden_data;
-	$template->param(oldauthtypetagfield=>$oldauthtypetagfield, oldauthtypetagsubfield=>$oldauthtypetagsubfield,
-		oldauthnumtagfield=>$oldauthnumtagfield, oldauthnumtagsubfield=>$oldauthnumtagsubfield,
-		authid                      => $authid , authtypecode=>$authtypecode,	);
-}
-
-$template->param(
-	authid                       => $authid,
-	authtypecode => $authtypecode,
-	linkid=>$linkid,
-			intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		advancedMARCEditor => C4::Context->preference("advancedMARCEditor"),
-		);
-
-my $authtypes = getauthtypes;
-my @authtypesloop;
-foreach my $thisauthtype (keys %$authtypes) {
-	my $selected = 1 if $thisauthtype eq $authtypecode;
-	my %row =(value => $thisauthtype,
-				selected => $selected,
-				authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
-			);
-	push @authtypesloop, \%row;
-}
-
-$template->param(authtypesloop => \@authtypesloop,
-				authtypetext => $authtypes->{$authtypecode}{'authtypetext'},
-				nonav=>$nonav,);
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/authorities/blinddetail-biblio-search.pl
===================================================================
RCS file: cgi-bin/authorities/blinddetail-biblio-search.pl
diff -N cgi-bin/authorities/blinddetail-biblio-search.pl
--- cgi-bin/authorities/blinddetail-biblio-search.pl	10 Mar 2007 01:10:53 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,125 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-=head1 NAME
-
-
-=head1 SYNOPSIS
-
-
-=head1 DESCRIPTION
-
-This script needs an authid
-
-
-
-=head1 FUNCTIONS
-
-=over 2
-
-=cut
-
-
-use strict;
-use C4::AuthoritiesMarc;
-use C4::Auth;
-use C4::Context;
-use C4::Interface::CGI::Output;
-use CGI;
-use C4::Search;
-use C4::Koha;
-use C4::Biblio;
-my $query=new CGI;
-
-my $dbh=C4::Context->dbh;
-
-my $authid = $query->param('authid');
-my $index=$query->param('index');
-my $authtypecode = &AUTHfind_authtypecode($dbh,$authid);
-my $tagslib = &AUTHgettagslib($dbh,1,$authtypecode);
-my ($dummyfield,$linkidsubfield)=MARCfind_marc_from_kohafield("auth_biblio_link_subf","biblios");
-my $auth_type = AUTHgetauth_type($authtypecode);
-#warn "$authid =$authtypecode ".$auth_type->{auth_tag_to_report};
-
-my $record =XMLgetauthorityhash($dbh,$authid) if $authid;
-# open template
-my ($template, $loggedinuser, $cookie)
-		= get_template_and_user({template_name => "authorities/blinddetail-biblio-search.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {catalogue => 1},
-			     debug => 1,
-			     });
-
-# fill arrays
-my @loop_data =();
-my $tag;
-my @loop_data =();
-if ($authid) {
-	my @record_subs=XML_readline_withtags($record,"","",$auth_type->{auth_tag_to_report});
-	##Put the result in a hash
-	my %filled_subfield;
-	foreach my $subfield (@record_subs) {
-	$filled_subfield{$subfield->[0]}=$subfield->[1];
-	}
-			my @subfields_data;
-			
-		# loop through each subfield
-		foreach my $subfield ('a'..'z') {			
-			my %subfield_data;
-			$subfield_data{marc_value}=$filled_subfield{$subfield} ;
-			$subfield_data{marc_subfield}=$subfield;
-			$subfield_data{marc_tag}=$auth_type->{auth_tag_to_report};
-			push(@subfields_data, \%subfield_data);
-		}
-		if ($#subfields_data>=0) {
-			my %tag_data;
-			$tag_data{tag}=$auth_type->{auth_tag_to_report}.' -'. $tagslib->{$auth_type->{auth_tag_to_report}}->{lib};
-			$tag_data{subfield} = \@subfields_data;
-			push (@loop_data, \%tag_data);
-		}
-	
-} else {
-# authid is empty => the user want to empty the entry.
-	my @subfields_data;
-	foreach my $subfield ('a'..'z') {
-			my %subfield_data;
-			$subfield_data{marc_value}='';
-			$subfield_data{marc_subfield}=$subfield;
-			push(@subfields_data, \%subfield_data);
-		}
-	foreach my $subfield ('0'..'9') {
-			my %subfield_data;
-			$subfield_data{marc_value}='';
-			$subfield_data{marc_subfield}=$subfield;
-			push(@subfields_data, \%subfield_data);
-		}
-		my %tag_data;
-		$tag_data{subfield} = \@subfields_data;
-		push (@loop_data, \%tag_data);
-}
-
-$template->param("0XX" =>\@loop_data);
-
-
-
-$template->param(authid => $authid?$authid:"", linkidsubfield=>$linkidsubfield,index=>$index,);
-output_html_with_http_headers $query, $cookie, $template->output;
-

Index: cgi-bin/authorities/blinddetail-linker.pl
===================================================================
RCS file: cgi-bin/authorities/blinddetail-linker.pl
diff -N cgi-bin/authorities/blinddetail-linker.pl
--- cgi-bin/authorities/blinddetail-linker.pl	10 Mar 2007 01:10:53 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,125 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-=head1 NAME
-
-etail.pl : script to show an authority in MARC format
-
-=head1 SYNOPSIS
-
-
-=head1 DESCRIPTION
-
-This script needs an authid
-
-
-=head1 FUNCTIONS
-
-=over 2
-
-=cut
-
-
-use strict;
-use C4::AuthoritiesMarc;
-use C4::Auth;
-use C4::Context;
-use C4::Interface::CGI::Output;
-use CGI;
-use C4::Search;
-use C4::Koha;
-use C4::Biblio;
-my $query=new CGI;
-
-my $dbh=C4::Context->dbh;
-
-my $authid = $query->param('authid');
-my $index = $query->param('index');
-my $authtypecode=$query->param('authtypecode');
- $authtypecode = &AUTHfind_authtypecode($dbh,$authid) if !$authtypecode;
-my $tagslib = &AUTHgettagslib($dbh,1,$authtypecode);
-my ($linkidfield,$linkidsubfield)=MARCfind_marc_from_kohafield("linkid","authorities");
-my $auth_type = AUTHgetauth_type($authtypecode);
-
-my $record =XMLgetauthorityhash($dbh,$authid);
-# open template
-my ($template, $loggedinuser, $cookie)
-		= get_template_and_user({template_name => "authorities/blinddetail-linker.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {catalogue => 1},
-			     debug => 1,
-			     });
-
-# fill arrays
-my @loop_data =();
-my $tag;
-my @loop_data =();
-if ($authid) {
-
-#	foreach my $field ($record->field($auth_type->{auth_tag_to_report})) {
-#			my @subfields_data;
-#			my @subf=$field->subfields;
-#		# loop through each subfield
-#		for my $i (0..$#subf) {
-#			$subf[$i][0] = "@" unless $subf[$i][0];
-#			my %subfield_data;
-#			$subfield_data{marc_value}=$subf[$i][1];
-#			$subfield_data{marc_subfield}=$subf[$i][0];
-#			$subfield_data{marc_tag}=$field->tag();
-#			push(@subfields_data, \%subfield_data);
-#		}
-#		if ($#subfields_data>=0) {
-#			my %tag_data;
-#			$tag_data{tag}=$field->tag().' -'. $tagslib->{$field->tag()}->{lib};
-#			$tag_data{subfield} = \@subfields_data;
-#			push (@loop_data, \%tag_data);
-#		}
-#	}
-} else {
-# authid is empty => the user want to empty the entry.
-	my @subfields_data;
-	foreach my $subfield ('0'..'9') {
-			my %subfield_data;
-			$subfield_data{marc_value}='';
-			$subfield_data{marc_subfield}=$subfield;
-			push(@subfields_data, \%subfield_data);
-		}
-	foreach my $subfield ('a'..'z') {
-			my %subfield_data;
-			$subfield_data{marc_value}='';
-			$subfield_data{marc_subfield}=$subfield;
-			push(@subfields_data, \%subfield_data);
-		}
-	
-	if ($#subfields_data>=0) {
-		my %tag_data;
-		$tag_data{subfield} = \@subfields_data;
-		push (@loop_data, \%tag_data);
-	}
-}
-
-$template->param("0XX" =>\@loop_data);
-
-
-
-$template->param(authid => $authid?$authid:"",linkidsubfield=>$linkidsubfield, linkidfield=>$linkidfield,index => $index);
-output_html_with_http_headers $query, $cookie, $template->output;
-

Index: cgi-bin/authorities/detail-biblio-search.pl
===================================================================
RCS file: cgi-bin/authorities/detail-biblio-search.pl
diff -N cgi-bin/authorities/detail-biblio-search.pl
--- cgi-bin/authorities/detail-biblio-search.pl	10 Mar 2007 01:10:53 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,201 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-=head1 NAME
-
-etail.pl : script to show an authority in MARC format
-
-=head1 SYNOPSIS
-
-
-=head1 DESCRIPTION
-
-This script needs an authid
-
-It shows the authority in a (nice) MARC format depending on authority MARC
-parameters tables.
-
-=head1 FUNCTIONS
-
-=over 2
-
-=cut
-
-
-use strict;
-use C4::AuthoritiesMarc;
-use C4::Auth;
-use C4::Context;
-use C4::Interface::CGI::Output;
-use CGI;
-use C4::Search;
-use C4::Koha;
-
-my $query=new CGI;
-
-my $dbh=C4::Context->dbh;
-
-my $authid = $query->param('authid');
-my $index = $query->param('index');
-my $authtypecode = &AUTHfind_authtypecode($dbh,$authid);
-my $tagslib = &AUTHgettagslib($dbh,1,$authtypecode);
-
-my $record =XMLgetauthorityhash($dbh,$authid);
-# open template
-my ($template, $loggedinuser, $cookie)
-		= get_template_and_user({template_name => "authorities/detail-biblio-search.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {catalogue => 1},
-			     debug => 1,
-			     });
-
-# fill arrays
-my @loop_data =();
-my $tag;
-if ($xmlhash){
-# loop through each tab 0 through 9
-my $author=$xmlhash->{'datafield'};
-my $controlfields=$xmlhash->{'controlfield'};
-my $leader=$xmlhash->{'leader'};
-for (my $tabloop = 0; $tabloop<10;$tabloop++) {
-# loop through each tag
-	my @loop_data =();
-	my @subfields_data;
-
-	# deal with leader 
-	unless (($tagslib->{'000'}->{'@'}->{tab}  ne $tabloop)  || (substr($tagslib->{'000'}->{'@'}->{hidden},1,1)>0)) {
-		
-		my %subfield_data;
-		$subfield_data{marc_value}=$leader->[0] ;
-		push(@subfields_data, \%subfield_data);
-		my %tag_data;
-		$tag_data{tag}='000 -'. $tagslib->{'000'}->{lib};
-		my @tmp = @subfields_data;
-		$tag_data{subfield} = \@tmp;
-		push (@loop_data, \%tag_data);
-		undef @subfields_data;
-	}
-	##Controlfields
-		
-		 foreach my $control (@$controlfields){
-			my %subfield_data;
-			my %tag_data;
-			next if ($tagslib->{$control->{'tag'}}->{'@'}->{tab}  ne $tabloop);
-			next if (substr($tagslib->{$control->{'tag'}}->{'@'}->{hidden},1,1)>0);			
-			$subfield_data{marc_value}=$control->{'content'} ;
-			push(@subfields_data, \%subfield_data);
-				if (C4::Context->preference('hide_marc')) {
-					$tag_data{tag}=$tagslib->{$control->{'tag'}}->{lib};
-				} else {
-					$tag_data{tag}=$control->{'tag'}.' -'. $tagslib->{$control->{'tag'}}->{lib};
-				}			
-			my @tmp = @subfields_data;
-			$tag_data{subfield} = \@tmp;
-			push (@loop_data, \%tag_data);
-			undef @subfields_data;
-		}
-	my $previoustag;
-	my %datatags;
-	my $i=0;
-	foreach my $data (@$author){
-		$datatags{$i++}=$data->{'tag'};
-		 foreach my $subfield ( $data->{'subfield'}){
-		     foreach my $code ( @$subfield){
-			next if ($tagslib->{$data->{'tag'}}->{$code->{'code'}}->{tab}  ne $tabloop);
-			next if (substr($tagslib->{$data->{'tag'}}->{$code->{'code'}}->{hidden},1,1)>0);
-			my %subfield_data;
-			my $value=$code->{'content'};
-			$subfield_data{marc_lib}=$tagslib->{$data->{'tag'}}->{$code->{'code'}}->{lib};
-			$subfield_data{link}=$tagslib->{$data->{'tag'}}->{$code->{'code'}}->{link};
-			if ($tagslib->{$data->{'tag'}}->{$code->{'code'}}->{isurl}) {
-				$subfield_data{marc_value}="<a href=\"$value]\">$value</a>";
-			} else {
-			$subfield_data{marc_value}=get_authorised_value_desc($data->{'tag'}, $code->{'code'}, $value, '', $dbh);
-			}
-			$subfield_data{marc_subfield}=$code->{'code'};
-			$subfield_data{marc_tag}=$data->{'tag'};
-			push(@subfields_data, \%subfield_data);
-		     }### $code
-		
-		
-		if ($#subfields_data>=0) {
-			my %tag_data;
-			if (($datatags{$i} eq $datatags{$i-1}) && (C4::Context->preference('LabelMARCView') eq 'economical')) {
-				$tag_data{tag}="";
-			} else {
-				if (C4::Context->preference('hide_marc')) {
-					$tag_data{tag}=$tagslib->{$data->{'tag'}}->{lib};
-				} else {
-					$tag_data{tag}=$data->{'tag'}.' -'. $tagslib->{$data->{'tag'}}->{lib};
-				}
-			}
-			my @tmp = @subfields_data;
-			$tag_data{subfield} = \@tmp;
-			push (@loop_data, \%tag_data);
-			undef @subfields_data;
-		}
-	      }### each $subfield
-	}
-
-	$template->param($tabloop."XX" =>\@loop_data);
-}
-
-my $authtypes = getauthtypes;
-my @authtypesloop;
-foreach my $thisauthtype (keys %$authtypes) {
-	my $selected = 1 if $thisauthtype eq $authtypecode;
-	my %row =(value => $thisauthtype,
-				selected => $selected,
-				authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
-			);
-	push @authtypesloop, \%row;
-}
-
-$template->param(authid => $authid,
-				authtypesloop => \@authtypesloop, index => $index);
-}
-output_html_with_http_headers $query, $cookie, $template->output;
-
-sub get_authorised_value_desc ($$$$$) {
-   my($tag, $subfield, $value, $framework, $dbh) = @_;
-
-   #---- branch
-    if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
-       return getbranchname($value);
-    }
-
-   #---- itemtypes
-   if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
-       return ItemType($value);
-    }
-
-   #---- "true" authorized value
-   my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};
-
-   if ($category ne "") {
-       my $sth = $dbh->prepare("select lib from authorised_values where category = ? and authorised_value = ?");
-       $sth->execute($category, $value);
-       my $data = $sth->fetchrow_hashref;
-       return $data->{'lib'};
-   } else {
-       return $value; # if nothing is found return the original value
-   }
-}

Index: cgi-bin/authorities/detail.pl
===================================================================
RCS file: cgi-bin/authorities/detail.pl
diff -N cgi-bin/authorities/detail.pl
--- cgi-bin/authorities/detail.pl	10 Mar 2007 01:10:53 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,210 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-=head1 NAME
-
-etail.pl : script to show an authority in MARC format
-
-=head1 SYNOPSIS
-
-
-=head1 DESCRIPTION
-
-This script needs an authid
-
-It shows the authority in a (nice) MARC format depending on authority MARC
-parameters tables.
-
-=head1 FUNCTIONS
-
-=over 2
-
-=cut
-
-
-use strict;
-use C4::AuthoritiesMarc;
-use C4::Auth;
-use C4::Context;
-use C4::Interface::CGI::Output;
-use CGI;
-use C4::Search;
-use C4::Koha;
-
-
-my $query=new CGI;
-
-my $dbh=C4::Context->dbh;
-my $nonav = $query->param('nonav');
-my $authid = $query->param('authid');
-my $authtypecode = &AUTHfind_authtypecode($dbh,$authid);
-my $tagslib = &AUTHgettagslib($dbh,1,$authtypecode);
-
-my $xmlhash =XMLgetauthorityhash($dbh,$authid);
-
-my ($count) = AUTHcount_usage($authid);
-
-#chop;
-
-# open template
-my ($template, $loggedinuser, $cookie)
-		= get_template_and_user({template_name => "authorities/detail.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {catalogue => 1},
-			     debug => 1,
-			     });
-
-
-# fill arrays
-my @loop_data =();
-my $tag;
-if ($xmlhash){
-# loop through each tab 0 through 9
-my $author=$xmlhash->{'datafield'};
-my $controlfields=$xmlhash->{'controlfield'};
-my $leader=$xmlhash->{'leader'};
-for (my $tabloop = 0; $tabloop<10;$tabloop++) {
-# loop through each tag
-	my @loop_data =();
-	my @subfields_data;
-
-	# deal with leader 
-	unless (($tagslib->{'000'}->{'@'}->{tab}  ne $tabloop)  || (substr($tagslib->{'000'}->{'@'}->{hidden},1,1)>0)) {
-		
-		my %subfield_data;
-		$subfield_data{marc_value}=$leader->[0] ;
-		push(@subfields_data, \%subfield_data);
-		my %tag_data;
-		$tag_data{tag}='000 -'. $tagslib->{'000'}->{lib};
-		my @tmp = @subfields_data;
-		$tag_data{subfield} = \@tmp;
-		push (@loop_data, \%tag_data);
-		undef @subfields_data;
-	}
-	##Controlfields
-		
-		 foreach my $control (@$controlfields){
-			my %subfield_data;
-			my %tag_data;
-			next if ($tagslib->{$control->{'tag'}}->{'@'}->{tab}  ne $tabloop);
-			next if (substr($tagslib->{$control->{'tag'}}->{'@'}->{hidden},1,1)>0);			
-			$subfield_data{marc_value}=$control->{'content'} ;
-			push(@subfields_data, \%subfield_data);
-				if (C4::Context->preference('hide_marc')) {
-					$tag_data{tag}=$tagslib->{$control->{'tag'}}->{lib};
-				} else {
-					$tag_data{tag}=$control->{'tag'}.' -'. $tagslib->{$control->{'tag'}}->{lib};
-				}			
-			my @tmp = @subfields_data;
-			$tag_data{subfield} = \@tmp;
-			push (@loop_data, \%tag_data);
-			undef @subfields_data;
-		}
-	my $previoustag;
-	my %datatags;
-	my $i=0;
-	foreach my $data (@$author){
-		$datatags{$i++}=$data->{'tag'};
-		 foreach my $subfield ( $data->{'subfield'}){
-		     foreach my $code ( @$subfield){
-			next if ($tagslib->{$data->{'tag'}}->{$code->{'code'}}->{tab}  ne $tabloop);
-			next if (substr($tagslib->{$data->{'tag'}}->{$code->{'code'}}->{hidden},1,1)>0);
-			my %subfield_data;
-			my $value=$code->{'content'};
-			$subfield_data{marc_lib}=$tagslib->{$data->{'tag'}}->{$code->{'code'}}->{lib};
-			$subfield_data{link}=$tagslib->{$data->{'tag'}}->{$code->{'code'}}->{link};
-			if ($tagslib->{$data->{'tag'}}->{$code->{'code'}}->{isurl}) {
-				$subfield_data{marc_value}="<a href=\"$value]\">$value</a>";
-			} else {
-			$subfield_data{marc_value}=get_authorised_value_desc($data->{'tag'}, $code->{'code'}, $value, '', $dbh);
-			}
-			$subfield_data{marc_subfield}=$code->{'code'};
-			$subfield_data{marc_tag}=$data->{'tag'};
-			push(@subfields_data, \%subfield_data);
-		     }### $code
-		
-		
-		if ($#subfields_data>=0) {
-			my %tag_data;
-			if (($datatags{$i} eq $datatags{$i-1}) && (C4::Context->preference('LabelMARCView') eq 'economical')) {
-				$tag_data{tag}="";
-			} else {
-				if (C4::Context->preference('hide_marc')) {
-					$tag_data{tag}=$tagslib->{$data->{'tag'}}->{lib};
-				} else {
-					$tag_data{tag}=$data->{'tag'}.' -'. $tagslib->{$data->{'tag'}}->{lib};
-				}
-			}
-			my @tmp = @subfields_data;
-			$tag_data{subfield} = \@tmp;
-			push (@loop_data, \%tag_data);
-			undef @subfields_data;
-		}
-	      }### each $subfield
-	}
-
-	$template->param($tabloop."XX" =>\@loop_data);
-}
-my $authtypes = getauthtypes;
-my @authtypesloop;
-foreach my $thisauthtype (keys %$authtypes) {
-	my $selected = 1 if $thisauthtype eq $authtypecode;
-	my %row =(value => $thisauthtype,
-				selected => $selected,
-				authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
-			);
-	push @authtypesloop, \%row;
-}
-
-$template->param(authid => $authid,
-				count => $count,
-				authtypetext => $authtypes->{$authtypecode}{'authtypetext'},
-				authtypecode => $authtypes->{$authtypecode}{'authtypecode'},
-				authtypesloop => \@authtypesloop);
-$template->param(nonav =>$nonav);
-}### if $xmlash exist
-output_html_with_http_headers $query, $cookie, $template->output;
-
-sub get_authorised_value_desc ($$$$$) {
-   my($tag, $subfield, $value, $framework, $dbh) = @_;
-
-   #---- branch
-    if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
-       return getbranchname($value);
-    }
-
-   #---- itemtypes
-   if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
-       return ItemType($value);
-    }
-
-   #---- "true" authorized value
-   my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};
-
-   if ($category ne "") {
-       my $sth = $dbh->prepare("select lib from authorised_values where category = ? and authorised_value = ?");
-       $sth->execute($category, $value);
-       my $data = $sth->fetchrow_hashref;
-       return $data->{'lib'};
-   } else {
-       return $value; # if nothing is found return the original value
-   }
-}
\ No newline at end of file

Index: cgi-bin/authorities/merge_authority.pl
===================================================================
RCS file: cgi-bin/authorities/merge_authority.pl
diff -N cgi-bin/authorities/merge_authority.pl
--- cgi-bin/authorities/merge_authority.pl	10 Mar 2007 01:10:53 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,83 +0,0 @@
-#!/usr/bin/perl
-
-
-use strict;
-
-# Koha modules used
-use C4::Context;
-use C4::Biblio;
-use C4::AuthoritiesMarc; ###merge routine moved to there
-use Time::HiRes qw(gettimeofday);
-
-use Getopt::Long;
-my ($version, $verbose, $mergefrom,$mergeto,$noconfirm,$batch);
-GetOptions(
-    'h' => \$version,
-    'f:s' => \$mergefrom,
-    't:s' => \$mergeto,
-    'v' => \$verbose,
-	'n' => \$noconfirm,
-	'b' => \$batch,
-);
-
-if ($version || ($mergefrom eq '' && !$batch)) {
-	print <<EOF
-Script to merge an authority into another
-parameters :
-\th : this version/help screen
-\tv : verbose mode (show many things on screen)
-\tf : the authority number to merge (the one that can be deleted after the merge).
-\tt : the authority number where to merge
-\tb : batch merging.
-\tn : don't ask for confirmation (useful for batch mergings, should not be used on command line)
-
-All biblios with the authority in -t will be modified to be "connected" to authority -f
-SAMPLE :
-./merge_authority.pl -f 2457 -t 531
-
-Before doing anything, the script will show both authorities and ask for confirmation. Of course, you can merge only 2 authorities of the same kind.
-
-BATCH MODE :
-The batch mode is done to report modifs. On every authority modif, a file is generated in KOHAROOT/localfile/modified_authorities/ If this script is called with -b, it parses the directory, finding & updating biblios using the modified authority.
-
-./merge_authority.pl -b
-
-(don't forget to export PERL5LIB and KOHA_CONF. Here is my cron job :
-SHELL=/bin/bash
-*/5 * * * *       export PERL5LIB=/home/httpd/koha;export KOHA_CONF=/etc/mykoha.conf;/home/httpd/koha/scripts/misc/merge_authority.pl -b -n
-
-EOF
-;#
-exit;
-}#
-
-my $dbh = C4::Context->dbh;
-# my @subf = $subfields =~ /(##\d\d\d##.)/g;
-
-$|=1; # flushes output
-my $starttime = gettimeofday;
-if ($batch) {
-	my @authlist;
-	my $cgidir = C4::Context->intranetdir ."/cgi-bin";
-	unless (opendir(DIR, "$cgidir/localfile/modified_authorities")) {
-		$cgidir = C4::Context->intranetdir;
-		opendir(DIR, "$cgidir/localfile/modified_authorities") || die "can't opendir $cgidir/localfile/modified_authorities: $!";
-	} 
-	while (my $authid = readdir(DIR)) {
-		if ($authid =~ /\.authid$/) {
-			$authid =~ s/\.authid$//;
-			print "managing $authid\n" if $verbose;
-			my $MARCauth = XMLgetauthorityhash($dbh,$authid);
-			&merge($dbh,$authid,$MARCauth,$authid,$MARCauth) if ($MARCauth);
-			unlink $cgidir.'/localfile/modified_authorities/'.$authid.'.authid';
-		}
-	}
-	closedir DIR;
-} else {
-	my $MARCfrom = XMLgetauthorityhash($dbh,$mergefrom);
-	my $MARCto = XMLgetauthorityhash($dbh,$mergeto);
-	&merge($dbh,$mergefrom,$MARCfrom,$mergeto,$MARCto);
-}
-my $timeneeded = gettimeofday - $starttime;
-print "Done in $timeneeded seconds" unless $noconfirm;
-

Index: cgi-bin/barcodes/arial.ttf
===================================================================
RCS file: cgi-bin/barcodes/arial.ttf
diff -N cgi-bin/barcodes/arial.ttf
Binary files /tmp/cvs0W8pRJ and /dev/null differ

Index: cgi-bin/barcodes/barcodes.pl
===================================================================
RCS file: cgi-bin/barcodes/barcodes.pl
diff -N cgi-bin/barcodes/barcodes.pl
--- cgi-bin/barcodes/barcodes.pl	10 Mar 2007 01:13:01 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,379 +0,0 @@
-#!/usr/bin/perl
-
-# script to generate items barcodes-complete rewrite
-# rewritten 24/08/05 by T.Garip
-# by Veleda Matias - matias_veleda at hotmail.com - Physics Library UNLP Argentina and
-#    Castañeda Sebastian - seba3c at yahoo.com.ar - Physics Library UNLP Argentina and
-
-# 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 CGI;
-
-use C4::Auth;
-use C4::Output;
-use C4::Interface::CGI::Output;
-
-use C4::Context;
-use C4::Barcodes::PrinterConfig;
-use CGI;
-
-use C4::Output;
-
-use PDF::API2;
-use PDF::API2::Page;
-use PDF::API2::PDF::Utils;
-
-use Time::localtime; 
-
-
-# This function returns the path to deal with the correct files, considering
-# templates set and language.
-sub getPath {
-	my $type = shift @_;
-	my $templatesSet = C4::Context->preference('template');
-	my $lang = C4::Context->preference('opaclanguages');
-	if ($type eq "intranet") {
-		return "$ENV{'DOCUMENT_ROOT'}/intranet-tmpl/$templatesSet/$lang";
-	} else {
-		return "$ENV{'DOCUMENT_ROOT'}/opac-tmpl/$templatesSet/$lang";
-	}
-}
-
-# Load a configuration file. Before use this function, check if that file exists.
-sub loadConfFromFile {
-  my $fileName = shift @_;
-	my %keyValues;
-	open FILE, "<$fileName";
-	while (<FILE>) {
-		chomp;
-		if (/\s*([\w_]*)\s*=\s*([\[\]\<\>\w_\s:@,\.-]*)\s*/) {
-			$keyValues{$1} = $2;
-		}
-	}
-	close FILE;
-	return %keyValues;
-}
-
-# Save settings to a configuration file. It delete previous configuration settings.
-sub saveConfToFile {
-	my $fileName = shift @_;
-	my %keyValues = %{shift @_};
-	my $i;
-	open FILE, ">$fileName";			
-	my $i;
-	foreach $i (keys(%keyValues)) {
-    print FILE $i." = ".$keyValues{$i}."\n";
-	}
-	close FILE;
-}
-
-# Load the config file.
-
-
-my $input = new CGI;
-my $labelsconfigs=$input->param('labelsconfig');
-
-# It creates a list of posible intervals to choose codes to generate
-my %list = ('continuous' => 'Varolan Seri', 'individuals' => 'Tek tek','continuous2' => 'Yeni Seri' );
-my @listValues = keys(%list);
-my $rangeType = CGI::scrolling_list(-name => 'rangeType',
-                              		-values => \@listValues,
-			                        -labels => \%list,
-			                        -size => 1,
-									-default => ['continuous2'],
-			                        -multiple => 0,
-									-id => "rangeType",
-									-onChange =>"changeRange(this)");
-
-my $op=$input->param('op');
-
-# Takes the country codes from a file and use them to set the country list.
-my $labelCodes = &getPath("intranet")."/includes/countryCodes/labelCodes.dat";
-my %list = &loadConfFromFile($labelCodes);
- at listValues = keys(%list);
-# my $labelsconfig = CGI::scrolling_list(-name => 'labelsconfig',
-#                              		    -values => \@listValues,
-#			                            -labels   => \%list,
-#			                            -size     => 1,
-#							-id => "labelsconfig",
-#							-default => ['itemslabelconfig'],
-#							-onChange => "javascript:document.forms1.submit()",
-#			                            -multiple => 0);
-my $filenameConf;
-if ($labelsconfigs){
- $filenameConf = C4::Context->config('includes')."labelConfig/".$labelsconfigs.".conf";
-}else{
- $filenameConf = C4::Context->config('includes')."labelConfig/itemsLabelConfig.conf";
-$labelsconfigs="itemsLabelConfig";
-}
-
-my %labelConfig = &loadConfFromFile($filenameConf);
-# Defines type of page to use in the printer process
-my @labelTable = C4::Barcodes::PrinterConfig::labelsPage($labelConfig{'rows'}, $labelConfig{'columns'});
-
-# Get the template to use
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "barcodes/barcodes.tmpl",
-			                 type => "intranet",
-			                 query => $input,
-			                 authnotrequired => 0,
-			                 flagsrequired => {parameters => 1},
-					         debug => 1,
-			               });
-
-# Replace the template values with the real ones
-#$template->param(SCRIPT_NAME => $script_name);
-$template->param(PAGES => $labelConfig{'pageType'});
-$template->param(RANGE_TYPE => $rangeType);
-$template->param(LABEL_TABLE => \@labelTable);
-$template->param(COL_SPAN => $labelConfig{'columns'});
-$template->param($labelsconfigs => $labelsconfigs);
-$template->param(labelsconfigs => $labelsconfigs);
-#warn "$labelsconfig";
-if ($input->param('error')) {
-	$template->param(ERROR => 1);
-} else {
-	$template->param(ERROR => 0);
-}
-
-my $cgi = new CGI;
-my $from = $cgi->param('from');
-my $to = $cgi->param('to');
-my $individualCodes = $cgi->param('individualCodes');
-my $rangeType = $cgi->param('rangeType');
-my $pageType = $cgi->param('pages');
-my $label = $cgi->param('label');
-my $labelsconfigs = $cgi->param('labelsconfigs');
-my $text_under_label = $cgi->param('text_under_label');
-if (($op =="Generate Barcodes")&&($op)){
-
-
-
-# Load the config file.
-my $filenameConf = &getPath("intranet")."/includes/labelConfig/".$labelsconfigs.".conf";
-my %labelConfig = &loadConfFromFile($filenameConf);
-
-# Creates a CGI object and take its parameters
-
-
-
-# Takes inventary codes from database and if they are between
-# the interval specify by parameters, it generates the correspond barcodes
-
-
-barcodesGenerator($from, $to, $rangeType, $individualCodes,$text_under_label);
-}
-# Shows the template with the real values replaced
-output_html_with_http_headers $input, $cookie, $template->output;
-
-  sub calculateDigit {
-    my $code = shift @_;
-    my $sum = 0;
-	  my $odd_parity = 1;
-    my $i;
-    for ($i = length($code) - 1; $i >= 0; $i--){
-	   if ( $odd_parity ) {
-		  $sum = $sum + ( 3 * substr($code, $i, 1) );
-     } else {
-			$sum = $sum + substr($code, $i, 1); }
-		  $odd_parity = !$odd_parity;
-	   }
-    my $check_digit = 10 - ($sum%10);
-	if ($check_digit==10) {
-		$check_digit=0;
-	}
-	  return $code.$check_digit;
-  }
-# Generate the checksum from an inventary code
-sub checksum {
-
-
-
-  my $currentCode = shift @_;
-  $currentCode = &calculateDigit($currentCode);
-  return $currentCode;
-}
-
-# Assigns a temporary name to the PDF file
-sub assingFilename {
-	my ($from, $to) = @_;
-	my $ip = $cgi->remote_addr();
-	my $random = int(rand(1000000));
-    my $timeObj = localtime();
-	my ($day, $month, $year, $hour, $min, $sec) = ($timeObj->mday,
-												   $timeObj->mon + 1,
-												   $timeObj->year + 1900,
-  												   $timeObj->hour,
-												   $timeObj->min,
-												   $timeObj->sec);
-	my $tmpFileName = $random.'-'.$min.'-'.$sec.'.pdf';
-	return $tmpFileName;
-}
-
-sub barcodesGenerator {
-	my ($from, $to, $rangeType, $individualCodes,$text_under_label) = @_;
-	# Returns a database handler
-	my $dbh = C4::Context->dbh;
-$dbh->do('SET NAMES latin5');
-	# Create the query to database
-	# Assigns a temporary filename for the pdf file
-	my $tmpFileName = &assingFilename($from, $to);
-#	my $tmpFileName2 ="/uploaded-files/tmp-pdf/".$tmpFileName;
-# Set the temp directory for pdf´s files
-	my $htdocs = C4::Context->config('intranetdir');
- my $upload_dir = $htdocs."/htdocs/uploaded-files/tmp-pdf/";
-		$ENV{'TEMP'} = $upload_dir;
-my $tmpFileName2 = $ENV{'TEMP'}.$tmpFileName;
-		# Creates a PDF object
-		my $pdf = PDF::API2->new(-file => $tmpFileName2);
-	if ($rangeType eq 'continuous2') {
-		
-		
-		# Set the positions where barcodes are going to be placed
-		C4::Barcodes::PrinterConfig::setPositionsForX($labelConfig{'marginLeft'}, $labelConfig{'labelWidth'}, $labelConfig{'columns'}, $labelConfig{'pageType'});
-		C4::Barcodes::PrinterConfig::setPositionsForY($labelConfig{'marginBottom'}, $labelConfig{'labelHeigth'}, $labelConfig{'rows'}, $labelConfig{'pageType'});
-		# Creates a font object
-		my $tr = $pdf->corefont('Helvetica-Bold',-encode=>"iso-8859-9");
-		# Barcode position
-		my ($page, $gfx, $text);
-		for (my $code=$from; $code<=$to; $code++) {
-		my $random2 = int(rand(10000000));
-		my $newcode=substr($code,0,3).substr($random2,0,4).substr($code,3,3);
-			# Generetase checksum
-			my $codeC = $newcode;
-			# Generate the corresponde barcode to $code
-			my $barcode = $pdf->barcode(-font => $tr,	# The font object to use
-										-type => 'ean128',	# Standard of codification
-										-code => $codeC, # Text to codify
-										-extn	=> '012345',	# Barcode extension (if it is aplicable)
-										-umzn => 10,		# Top limit of the finished bar
-										-lmzn => 10,		# Bottom limit of the finished bar
-										-zone => 15,		# Bars size
-										-quzn => 0,		# Space destinated for legend
-										-ofwt => 0.01,	# Bars width
-										-fnsz => 8,		# Font size
-										-text => ''
-										);
-			
-			(my $x, my $y, $pdf, $page, $gfx, $text, $tr, $label) = C4::Barcodes::PrinterConfig::getLabelPosition(
-																						$label, 
-																						$pdf, 
-																						$page,
-																						$gfx,
-																						$text,
-																						$tr,
-																						$pageType);	
-			# Assigns a barcodes to $gfx
-			$gfx->barcode($barcode, $x, $y , (72/$labelConfig{'systemDpi'}));
-			# Assigns the additional information to the barcode (Legend)
-			$text->translate($x - 50, $y - 24);
-			if ($text_under_label) {
-				$text->text($text_under_label);
-			}
-		}
-		# Writes the objects added in $gfx to $page
-		$pdf->finishobjects($page,$gfx, $text);
-		# Save changes to the PDF
-		$pdf->saveas;
-		# Close the conection with the PDF file
-		$pdf->end;
-		# Show the PDF file
-$template->param(tmpFileName=>$tmpFileName);
-#$template->param(tmpFileName2=>$tmpFileName2);
-			$op="";
-	} else {
-		my $rangeCondition;
-		if ($individualCodes ne "") {
-			$rangeCondition = "AND (I.barcode IN " . $individualCodes . ")";
-		} else {
-			$rangeCondition =  "AND (I.barcode >= " . $from . " AND I.barcode <="  . $to . " )";
-		}
-			
-		my $query = "SELECT  I.barcode AS Codigo,B.* FROM biblio B, items I WHERE (I.biblionumber = B.biblionumber ) " .$rangeCondition. " AND (I.barcode <> 'FALTA') ORDER BY Codigo";
-		
-		# Prepare the query
-		my $sth = $dbh->prepare($query);
-		# Executes the query
-		$sth->execute;
-		if ($sth->rows) { # There are inventary codes
-			# Set the temp directory for pdf´s files
-				
-			
-			# Set the positions where barcodes are going to be placed
-			C4::Barcodes::PrinterConfig::setPositionsForX($labelConfig{'marginLeft'}, $labelConfig{'labelWidth'}, $labelConfig{'columns'}, $labelConfig{'pageType'});
-			C4::Barcodes::PrinterConfig::setPositionsForY($labelConfig{'marginBottom'}, $labelConfig{'labelHeigth'}, $labelConfig{'rows'}, $labelConfig{'pageType'});
-			# Creates a font object
-			my $tr = $pdf->corefont('Helvetica-Bold',-encode=>"iso-8859-9");
-			# Barcode position
-			my ($page, $gfx, $text);
-			while (my ($code,$title,$author) = $sth->fetchrow_array) {
-				# Generetase checksum
-#				$code = $code);
-				# Generate the corresponde barcode to $code
-				my $barcode = $pdf->barcode(-font => $tr,	# The font object to use
-											-type => 'ean128',	# Standard of codification
-											-code => $code, # Text to codify
-											-extn	=> '012345',	# Barcode extension (if it is aplicable)
-											-umzn => 10,		# Top limit of the finished bar
-											-lmzn => 10,		# Bottom limit of the finished bar
-											-zone => 15,		# Bars size
-											-quzn => 0,		# Space destinated for legend
-											-ofwt => 0.01,	# Bars width
-											-fnsz => 8,		# Font size
-											-text => ''
-											);
-				
-				(my $x, my $y, $pdf, $page, $gfx, $text, $tr, $label) = C4::Barcodes::PrinterConfig::getLabelPosition(
-																							$label, 
-																							$pdf, 
-																							$page,
-																							$gfx,
-																							$text,
-																							$tr,
-																							$pageType);	
-				# Assigns a barcodes to $gfx
-				$gfx->barcode($barcode, $x, $y , (72/$labelConfig{'systemDpi'}));
-				# Assigns the additional information to the barcode (Legend)
-				$text->translate($x - 50, $y - 24);
-				if ($text_under_label) {
-					$text->text($text_under_label);
-				} else {
-					$text->text(substr $title, 0, 30);
-					$text->translate($x - 50, $y - 24);
-					$text->text(substr $author, 0, 30);
-				}
-			}
-			# Writes the objects added in $gfx to $page
-			$pdf->finishobjects($page,$gfx, $text);
-			# Save changes to the PDF
-			$pdf->saveas;
-			# Close the conection with the PDF file
-			$pdf->end;
-			# Show the PDF file
-#			print $cgi->redirect("/cgi-bin/koha/barcodes/barcode.pl?tmpFileName=$tmpFileName");
-			$template->param(tmpFileName=>$tmpFileName);
-#			$template->param(tmpFileName2=>$tmpFileName2);
-			$op="";
-		} else {
-			# Rollback and shows the error legend
-		$template->param(ERROR => 1);	
-		$op="";
-
-		}
-	$sth->finish;
-	}
-}
\ No newline at end of file

Index: cgi-bin/barcodes/barcodesGenerator.pl
===================================================================
RCS file: cgi-bin/barcodes/barcodesGenerator.pl
diff -N cgi-bin/barcodes/barcodesGenerator.pl
--- cgi-bin/barcodes/barcodesGenerator.pl	10 Mar 2007 01:13:01 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,288 +0,0 @@
-#!/usr/bin/perl
-
-# script to generate items barcodes
-# written 07/04
-# by Veleda Matias - matias_veleda at hotmail.com - Physics Library UNLP Argentina and
-#    Castañeda Sebastian - seba3c at yahoo.com.ar - Physics Library UNLP Argentina and
-
-# 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
-
-require Exporter;
-
-use strict;
-
-use CGI;
-use C4::Context;
-use C4::Output;
-use PDF::API2;
-use PDF::API2::Page;
-use PDF::API2::PDF::Utils;
-use C4::Barcodes::PrinterConfig;
-use Time::localtime; 
-
-
-# This function returns the path to deal with the correct files, considering
-# templates set and language.
-sub getPath {
-	my $type = shift @_;
-	my $templatesSet = C4::Context->preference('template');
-	my $lang = C4::Context->preference('opaclanguages');
-	if ($type eq "intranet") {
-		return "$ENV{'DOCUMENT_ROOT'}/intranet-tmpl/$templatesSet/$lang";
-	} else {
-		return "$ENV{'DOCUMENT_ROOT'}/opac-tmpl/$templatesSet/$lang";
-	}
-}
-
-# Load a configuration file. Before use this function, check if that file exists.
-sub loadConfFromFile {
-  my $fileName = shift @_;
-	my %keyValues;
-	open FILE, "<$fileName";
-	while (<FILE>) {
-		chomp;
-		if (/\s*([\w_]*)\s*=\s*([\[\]\<\>\w_\s:@,\.-]*)\s*/) {
-			$keyValues{$1} = $2;
-		}
-	}
-	close FILE;
-	return %keyValues;
-}
-
-# Save settings to a configuration file. It delete previous configuration settings.
-sub saveConfToFile {
-	my $fileName = shift @_;
-	my %keyValues = %{shift @_};
-	my $i;
-	open FILE, ">$fileName";			
-	my $i;
-	foreach $i (keys(%keyValues)) {
-    print FILE $i." = ".$keyValues{$i}."\n";
-	}
-	close FILE;
-}
-
-# Load the config file.
-my $filenameConf = &getPath("intranet")."/includes/labelConfig/itemsLabelConfig.conf";
-my %labelConfig = &loadConfFromFile($filenameConf);
-
-# Creates a CGI object and take its parameters
-my $cgi = new CGI;
-my $from = $cgi->param('from');
-my $to = $cgi->param('to');
-my $individualCodes = $cgi->param('individualCodes');
-my $rangeType = $cgi->param('rangeType');
-my $pageType = $cgi->param('pages');
-my $label = $cgi->param('label');
-my $numbersystem = $cgi->param('numbersystem');
-my $text_under_label = $cgi->param('text_under_label');
-
-# Generate the checksum from an inventary code
-sub checksum {
-
-  sub calculateDigit {
-    my $code = shift @_;
-    my $sum = 0;
-	  my $odd_parity = 1;
-    my $i;
-    for ($i = length($code) - 1; $i >= 0; $i--){
-	   if ( $odd_parity ) {
-		  $sum = $sum + ( 3 * substr($code, $i, 1) );
-     } else {
-			$sum = $sum + substr($code, $i, 1); }
-		  $odd_parity = !$odd_parity;
-	   }
-    my $check_digit = 10 - ($sum%10);
-	if ($check_digit==10) {
-		$check_digit=0;
-	}
-	  return $code.$check_digit;
-  }
-
-  my $currentCode = shift @_;
-  $currentCode = &calculateDigit($currentCode);
-  return $currentCode;
-}
-
-# Assigns a temporary name to the PDF file
-sub assingFilename {
-	my ($from, $to) = @_;
-	my $ip = $cgi->remote_addr();
-	my $random = int(rand(1000000));
-    my $timeObj = localtime();
-	my ($day, $month, $year, $hour, $min, $sec) = ($timeObj->mday,
-												   $timeObj->mon + 1,
-												   $timeObj->year + 1900,
-  												   $timeObj->hour,
-												   $timeObj->min,
-												   $timeObj->sec);
-	my $tmpFileName = $random.'-'.$min.'-'.$sec.'.pdf';
-	return $tmpFileName;
-}
-# Takes inventary codes from database and if they are between
-# the interval specify by parameters, it generates the correspond barcodes
-sub barcodesGenerator {
-	my ($from, $to, $rangeType, $individualCodes,$text_under_label) = @_;
-	# Returns a database handler
-	my $dbh = C4::Context->dbh;
-	# Create the query to database
-	# Assigns a temporary filename for the pdf file
-	my $tmpFileName = &assingFilename($from, $to);
-# Set the temp directory for pdf´s files
-	my $htdocs = C4::Context->config('intranetdir');
- my $upload_dir = $htdocs."/htdocs/uploaded-files/tmp-pdf/";
-		$ENV{'TEMP'} = $upload_dir;
-	if ($rangeType eq 'continuous2') {
-		
-		$tmpFileName = $ENV{'TEMP'}.$tmpFileName;
-		# Creates a PDF object
-		my $pdf = PDF::API2->new(-file => $tmpFileName);
-		# Set the positions where barcodes are going to be placed
-		C4::Barcodes::PrinterConfig::setPositionsForX($labelConfig{'marginLeft'}, $labelConfig{'labelWidth'}, $labelConfig{'columns'}, $labelConfig{'pageType'});
-		C4::Barcodes::PrinterConfig::setPositionsForY($labelConfig{'marginBottom'}, $labelConfig{'labelHeigth'}, $labelConfig{'rows'}, $labelConfig{'pageType'});
-		# Creates a font object
-		my $tr = $pdf->corefont('Helvetica-Bold');
-		# Barcode position
-		my ($page, $gfx, $text);
-		for (my $code=$from; $code<=$to; $code++) {
-		my $random2 = int(rand(10000000));
-		my $newcode=substr($code,0,3).substr($random2,0,4).substr($code,3,3);
-			# Generetase checksum
-			my $codeC = &checksum($newcode);
-			# Generate the corresponde barcode to $code
-			my $barcode = $pdf->barcode(-font => $tr,	# The font object to use
-										-type => 'ean128',	# Standard of codification
-										-code => $codeC, # Text to codify
-										-extn	=> '012345',	# Barcode extension (if it is aplicable)
-										-umzn => 10,		# Top limit of the finished bar
-										-lmzn => 10,		# Bottom limit of the finished bar
-										-zone => 15,		# Bars size
-										-quzn => 0,		# Space destinated for legend
-										-ofwt => 0.01,	# Bars width
-										-fnsz => 8,		# Font size
-										-text => ''
-										);
-			
-			(my $x, my $y, $pdf, $page, $gfx, $text, $tr, $label) = C4::Barcodes::PrinterConfig::getLabelPosition(
-																						$label, 
-																						$pdf, 
-																						$page,
-																						$gfx,
-																						$text,
-																						$tr,
-																						$pageType);	
-			# Assigns a barcodes to $gfx
-			$gfx->barcode($barcode, $x, $y , (72/$labelConfig{'systemDpi'}));
-			# Assigns the additional information to the barcode (Legend)
-			$text->translate($x - 48, $y - 22);
-			if ($text_under_label) {
-				$text->text($text_under_label);
-			}
-		}
-		# Writes the objects added in $gfx to $page
-		$pdf->finishobjects($page,$gfx, $text);
-		# Save changes to the PDF
-		$pdf->saveas;
-		# Close the conection with the PDF file
-		$pdf->end;
-		# Show the PDF file
-		print $cgi->redirect("/cgi-bin/koha/barcodes/pdfViewer.pl?tmpFileName=$tmpFileName");
-	} else {
-		my $rangeCondition;
-		if ($individualCodes ne "") {
-			$rangeCondition = "AND (I.barcode IN " . $individualCodes . ")";
-		} else {
-			$rangeCondition =  "AND (I.barcode >= " . $from . " AND I.barcode <="  . $to . " )";
-		}
-			
-		my $query = "SELECT CONCAT('$numbersystem',REPEAT('0',((10 - LENGTH('$numbersystem')) - LENGTH(I.barcode))), I.barcode) AS Codigo, B.title, B.author FROM biblio B, items I WHERE (I.biblionumber = B.biblioNumber ) " .$rangeCondition. " AND (I.barcode <> 'FALTA') ORDER BY Codigo";
-		
-		# Prepare the query
-		my $sth = $dbh->prepare($query);
-		# Executes the query
-		$sth->execute;
-		if ($sth->rows) { # There are inventary codes
-			# Set the temp directory for pdf´s files
-			if (!defined($ENV{'TEMP'})) {
-				$ENV{'TEMP'} = '/tmp/';
-			}	
-			# Assigns a temporary filename for the pdf file
-			my $tmpFileName = &assingFilename($from, $to);
-			$tmpFileName = $ENV{'TEMP'}.$tmpFileName;
-			# Creates a PDF object
-			my $pdf = PDF::API2->new(-file => $tmpFileName);
-			# Set the positions where barcodes are going to be placed
-			C4::Barcodes::PrinterConfig::setPositionsForX($labelConfig{'marginLeft'}, $labelConfig{'labelWidth'}, $labelConfig{'columns'}, $labelConfig{'pageType'});
-			C4::Barcodes::PrinterConfig::setPositionsForY($labelConfig{'marginBottom'}, $labelConfig{'labelHeigth'}, $labelConfig{'rows'}, $labelConfig{'pageType'});
-			# Creates a font object
-			my $tr = $pdf->corefont('Helvetica-Bold');
-			# Barcode position
-			my ($page, $gfx, $text);
-			while (my ($code,$title,$author) = $sth->fetchrow_array) {
-				# Generetase checksum
-				$code = &checksum($code);
-				# Generate the corresponde barcode to $code
-				my $barcode = $pdf->barcode(-font => $tr,	# The font object to use
-											-type => 'ean128',	# Standard of codification
-											-code => $code, # Text to codify
-											-extn	=> '012345',	# Barcode extension (if it is aplicable)
-											-umzn => 10,		# Top limit of the finished bar
-											-lmzn => 10,		# Bottom limit of the finished bar
-											-zone => 15,		# Bars size
-											-quzn => 0,		# Space destinated for legend
-											-ofwt => 0.01,	# Bars width
-											-fnsz => 8,		# Font size
-											-text => ''
-											);
-				
-				(my $x, my $y, $pdf, $page, $gfx, $text, $tr, $label) = C4::Barcodes::PrinterConfig::getLabelPosition(
-																							$label, 
-																							$pdf, 
-																							$page,
-																							$gfx,
-																							$text,
-																							$tr,
-																							$pageType);	
-				# Assigns a barcodes to $gfx
-				$gfx->barcode($barcode, $x, $y , (72/$labelConfig{'systemDpi'}));
-				# Assigns the additional information to the barcode (Legend)
-				$text->translate($x - 48, $y - 22);
-				if ($text_under_label) {
-					$text->text($text_under_label);
-				} else {
-					$text->text(substr $title, 0, 30);
-					$text->translate($x - 48, $y - 29);
-					$text->text(substr $author, 0, 30);
-				}
-			}
-			# Writes the objects added in $gfx to $page
-			$pdf->finishobjects($page,$gfx, $text);
-			# Save changes to the PDF
-			$pdf->saveas;
-			# Close the conection with the PDF file
-			$pdf->end;
-			# Show the PDF file
-			print $cgi->redirect("/cgi-bin/koha/barcodes/pdfViewer.pl?tmpFileName=$tmpFileName");
-		} else {
-			# Rollback and shows the error legend
-			 print $cgi->redirect("/cgi-bin/koha/barcodes/barcodes.pl?error=1");
-			
-		}
-	$sth->finish;
-	}
-}
-
-barcodesGenerator($from, $to, $rangeType, $individualCodes,$text_under_label);
\ No newline at end of file

Index: cgi-bin/barcodes/cardConfig.pl
===================================================================
RCS file: cgi-bin/barcodes/cardConfig.pl
diff -N cgi-bin/barcodes/cardConfig.pl
--- cgi-bin/barcodes/cardConfig.pl	10 Mar 2007 01:13:01 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,115 +0,0 @@
-#!/usr/bin/perl
-
-# script to set the labels configuration for the printer process.
-# written 07/04
-# by Veleda Matias - matias_veleda at hotmail.com - Physics Library UNLP Argentina and
-
-# 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 CGI;
-
-use C4::Context;
-use C4::Output;
-use C4::Auth;
-use PDF::API2;
-use PDF::API2::Page;
-use PDF::API2::PDF::Utils;
-use C4::Interface::CGI::Output;
-
-# This function returns the path to deal with the correct files, considering
-# templates set and language.
-sub getPath {
-	my $type = shift @_;
-	my $templatesSet = C4::Context->preference('template');
-	my $lang = C4::Context->preference('opaclanguages');
-	if ($type eq "intranet") {
-		return "$ENV{'DOCUMENT_ROOT'}/intranet-tmpl/$templatesSet/$lang";
-	} else {
-		return "$ENV{'DOCUMENT_ROOT'}/opac-tmpl/$templatesSet/$lang";
-	}
-}
-
-# Load a configuration file.
-sub loadConfFromFile {
-  my $fileName = shift @_;
-	my %keyValues;
-	open FILE, "<$fileName";
-	while (<FILE>) {
-		chomp;
-		if (/\s*([\w_]*)\s*=\s*([\[\]\<\>\w_\s:@,\.-]*)\s*/) {
-			$keyValues{$1} = $2;
-		}
-	}
-	close FILE;
-	return %keyValues;
-}
-
-# Save settings to a configuration file.
-sub saveConfToFile {
-	my $fileName = shift @_;
-	my %keyValues = %{shift @_};
-	my $i;
-	open FILE, ">$fileName";			
-	my $i;
-	foreach $i (keys(%keyValues)) {
-    print FILE $i." = ".$keyValues{$i}."\n";
-	}
-	close FILE;
-}
-
-# Creates a CGI object and take his parameters
-my $input = new CGI;
-
-if ($input->param('saveSettings')) {
-	my $labelConf = &getPath("intranet")."/includes/labelConfig/cardsConfig.conf";
-	my %newConfiguration = (pageType => $input->param('pageType'), 	
-							columns => $input->param('columns'), 		
-							rows => $input->param('rows'), 	
-							systemDpi => $input->param('systemDpi'), 	
-							labelWidth => $input->param('labelWidth'), 	
-							labelHeigth => $input->param('labelHeigth'),	
-							marginBottom => $input->param('marginBottom'), 	
-							marginLeft => $input->param('marginLeft')); 	
-	saveConfToFile($labelConf, \%newConfiguration);
-	print $input->redirect('/cgi-bin/koha/barcodes/cbarcodes.pl')
-}
-
-# Get the template to use
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "barcodes/printerConfig.tmpl",
-			                 type => "intranet",
-			                 query => $input,
-			                 authnotrequired => 0,
-			                 flagsrequired => {editcatalogue => 1},
-					         debug => 1,
-			               });
-
-my $filenameConf = &getPath("intranet")."/includes/labelConfig/cardsConfig.conf";
-my %labelConfig = &loadConfFromFile($filenameConf);
-
-$template->param(COLUMNS => $labelConfig{'columns'});
-$template->param(ROWS => $labelConfig{'rows'});
-$template->param(SYSTEM_DPI => $labelConfig{'systemDpi'});
-$template->param(LABEL_WIDTH => $labelConfig{'labelWidth'});
-$template->param(LABEL_HEIGTH => $labelConfig{'labelHeigth'});
-$template->param(MARGIN_TOP => $labelConfig{'marginBottom'});
-$template->param(MARGIN_LEFT => $labelConfig{'marginLeft'});
-$template->param(SCRIPT_NAME => '/cgi-bin/koha/barcodes/cardConfig.pl');
-$template->param("$labelConfig{'pageType'}" => $labelConfig{'pageType'});
-output_html_with_http_headers $input, $cookie, $template->output;
\ No newline at end of file

Index: cgi-bin/barcodes/cbarcodes.pl
===================================================================
RCS file: cgi-bin/barcodes/cbarcodes.pl
diff -N cgi-bin/barcodes/cbarcodes.pl
--- cgi-bin/barcodes/cbarcodes.pl	10 Mar 2007 01:13:01 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,373 +0,0 @@
-#!/usr/bin/perl
-
-# script to generate members barcodes-complete rewrite
-# rewritten 24/08/05 by T.Garip
-# by Veleda Matias - matias_veleda at hotmail.com - Physics Library UNLP Argentina and
-#    Castañeda Sebastian - seba3c at yahoo.com.ar - Physics Library UNLP Argentina and
-
-# 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 CGI;
-
-use C4::Auth;
-use C4::Interface::CGI::Output;
-
-use C4::Context;
-use C4::Barcodes::PrinterConfig;
-use CGI;
-use C4::Date;
-use C4::Output;
-use C4::Accounts2;
-use PDF::API2;
-use PDF::API2::Page;
-use PDF::API2::PDF::Utils;
-use PDF::API2::UniMap;
-
-use C4::Members;
-use Time::localtime; 
-use Data::Dumper;
-
-# This function returns the path to deal with the correct files, considering
-# templates set and language.
-sub getPath {
-	my $type = shift @_;
-	my $templatesSet = C4::Context->preference('template');
-	my $lang = C4::Context->preference('opaclanguages');
-
-	if ($type eq "intranet") {
-	my $rootdir=C4::Context->config('intrahtdocs');
-		return "$rootdir/$templatesSet/$lang";
-	} else {
-	my $rootdir=C4::Context->config('opachtdocs');
-		return "$rootdir/$templatesSet/$lang";
-	}
-}
-
-# Load a configuration file. Before use this function, check if that file exists.
-sub loadConfFromFile {
-  my $fileName = shift @_;
-	my %keyValues;
-	open FILE, "<$fileName";
-	while (<FILE>) {
-		chomp;
-		if (/\s*([\w_]*)\s*=\s*([\[\]\<\>\w_\s:@,\.-]*)\s*/) {
-			$keyValues{$1} = $2;
-		}
-	}
-	close FILE;
-	return %keyValues;
-}
-
-# Save settings to a configuration file. It delete previous configuration settings.
-sub saveConfToFile {
-	my $fileName = shift @_;
-	my %keyValues = %{shift @_};
-	my $i;
-	open FILE, ">$fileName";			
-	my $i;
-	foreach $i (keys(%keyValues)) {
-    print FILE $i." = ".$keyValues{$i}."\n";
-	}
-	close FILE;
-}
-
-# Load the config file.
-my $filenameConf =  C4::Context->config('includes')."labelConfig/cardsConfig.conf";
-my %labelConfig = &loadConfFromFile($filenameConf);
-
-my $input = new CGI;
-# Defines type of page to use in the printer process
-my @labelTable = C4::Barcodes::PrinterConfig::labelsPage($labelConfig{'rows'}, $labelConfig{'columns'});
-
-# It creates a list of posible intervals to choose codes to generate
-my %list = ('continuous' => 'Continuos', 'individuals' => 'Single');
-my @listValues = keys(%list);
-my $rangeType = CGI::scrolling_list(-name => 'rangeType',
-                              		-values => \@listValues,
-			                        -labels => \%list,
-			                        -size => 1,
-									-default => ['individuals'],
-			                        -multiple => 0,
-									-id => "rangeType",
-									-onChange => "changeRange(this)");
-# It creates a list of posible standard codifications. First checks if the user has just added a new code.
-
-my $op=$input->param('op');
-
-# Takes the country codes from a file and use them to set the country list.
-
-
-
-# Get the template to use
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "barcodes/cbarcodes.tmpl",
-			                 type => "intranet",
-			                 query => $input,
-			                 authnotrequired => 0,
-			                 flagsrequired => {circulate => 1},
-					         debug => 1,
-			               });
-
-# Replace the template values with the real ones
-#$template->param(SCRIPT_NAME =>"/cgi-bin/koha/barcodes/cbarcode.pl");
-$template->param(PAGES => $labelConfig{'pageType'});
-$template->param(RANGE_TYPE => $rangeType);
-$template->param(LABEL_TABLE => \@labelTable);
-$template->param(COL_SPAN => $labelConfig{'columns'});
-if ($input->param('error')) {
-	$template->param(ERROR => 1);
-} else {
-	$template->param(ERROR => 0);
-}
-
-my $cgi = new CGI;
-my $from = $cgi->param('from');
-my $to = $cgi->param('to');
-my $individualCodes = $cgi->param('individualCodes');
-my $rangeType = $cgi->param('rangeType');
-my $pageType = $cgi->param('pages');
-my $label = $cgi->param('label');
-my $text_under_label = $cgi->param('text_under_label');
-if (($op =="Generate Barcodes")&&($op)){
-
-
-
-# Load the config file.
-my $filenameConf = C4::Context->config('includes')."labelConfig/cardsConfig.conf";
-my %labelConfig = &loadConfFromFile($filenameConf);
-
-# Creates a CGI object and take its parameters
-
-
-
-# Takes inventary codes from database and if they are between
-# the interval specify by parameters, it generates the correspond barcodes
-
-
-barcodesGenerator($from, $to, $rangeType, $individualCodes,$text_under_label);
-}
-# Shows the template with the real values replaced
-output_html_with_http_headers $input, $cookie, $template->output;
-
-  sub calculateDigit {
-    my $code = shift @_;
-    my $sum = 0;
-	  my $odd_parity = 1;
-    my $i;
-    for ($i = length($code) - 1; $i >= 0; $i--){
-	   if ( $odd_parity ) {
-		  $sum = $sum + ( 3 * substr($code, $i, 1) );
-     } else {
-			$sum = $sum + substr($code, $i, 1); }
-		  $odd_parity = !$odd_parity;
-	   }
-    my $check_digit = 10 - ($sum%10);
-	if ($check_digit==10) {
-		$check_digit=0;
-	}
-	  return $code.$check_digit;
-  }
-# Generate the checksum from an inventary code
-sub checksum {
-
-
-
-  my $currentCode = shift @_;
-  $currentCode = &calculateDigit($currentCode);
-  return $currentCode;
-}
-
-# Assigns a temporary name to the PDF file
-sub assingFilename {
-	my ($from, $to) = @_;
-	my $ip = $cgi->remote_addr();
-	my $random = int(rand(1000000));
-    my $timeObj = localtime();
-	my ($day, $month, $year, $hour, $min, $sec) = ($timeObj->mday,
-												   $timeObj->mon + 1,
-												   $timeObj->year + 1900,
-  												   $timeObj->hour,
-												   $timeObj->min,
-												   $timeObj->sec);
-	my $tmpFileName = $random.'-'.$min.'-'.$sec.'.pdf';
-	return $tmpFileName;
-}
-
-sub barcodesGenerator {
-	my ($from, $to, $rangeType, $individualCodes,$text_under_label) = @_;
-	# Returns a database handler
-	my $dbh = C4::Context->dbh;
-	$dbh->do('SET NAMES latin5');
-	# Create the query to database
-	# Assigns a temporary filename for the pdf file
-	my $tmpFileName = &assingFilename($from, $to);
-#	my $tmpFileName2 ="/uploaded-files/tmp-pdf/".$tmpFileName;
-# Set the temp directory for pdf´s files
-	my $htdocs = C4::Context->config('intranetdir');
- my $upload_dir = $htdocs."/htdocs/uploaded-files/tmp-pdf/";
-		$ENV{'TEMP'} = $upload_dir;
-my $tmpFileName2 = $ENV{'TEMP'}.$tmpFileName;
-		# Creates a PDF object
-
-		my $pdf = PDF::API2->new(-file => $tmpFileName2);
-	
-	
-		my $rangeCondition;
-		if ($individualCodes ne "") {
-			$rangeCondition = " (I.cardnumber IN " . $individualCodes . ")";
-		} else {
-			$rangeCondition =  " (I.cardnumber >= " . $from . " AND I.cardnumber <="  . $to . " )";
-		}
-			
-		my $query = "SELECT  I.cardnumber , I.surname,I.firstname,I.streetaddress,I.city,I.expiry,C.description,I.borrowernumber,I.categorycode FROM borrowers I ,categories C WHERE I.categorycode=C.categorycode AND " .$rangeCondition. "  ORDER BY I.cardnumber";
-		# Prepare the query
-		my $sth = $dbh->prepare($query);
-		# Executes the query
-		$sth->execute;
-		if ($sth->rows) { # There are inventary codes
-			# Set the temp directory for pdf´s files
-				
-			
-			# Set the positions where barcodes are going to be placed
-			C4::Barcodes::PrinterConfig::setPositionsForX($labelConfig{'marginLeft'}, $labelConfig{'labelWidth'}, $labelConfig{'columns'}, $labelConfig{'pageType'});
-			C4::Barcodes::PrinterConfig::setPositionsForY($labelConfig{'marginBottom'}, $labelConfig{'labelHeigth'}, $labelConfig{'rows'}, $labelConfig{'pageType'});
-			# Creates a font object
-			my  $tr = $pdf->corefont('Helvetica-Bold', -encode=>"iso-8859-9");
-		#		my  $tr = $pdf->ttfont('arial.ttf', -utf8);
-			# Barcode position
-			my ($page, $gfx, $text);
-			while (my ($code,$sname,$fname,$address,$city,$expiry,$desc,$borrnum,$cat) = $sth->fetchrow_array) {
-$sname=~s/\xfe/þ/g;
-$fname=~s/\xfe/þ/g;
-#get picture
-my $picture;
- my $htdocs = C4::Context->config('opacdir');
-$picture =$htdocs. "/htdocs/uploaded-files/users-photo/".$code.".jpg";
- if (-e $picture)
-{ 
-
-#   $picture= "http://library.neu.edu.tr/uploaded-files/users-photo/".$code.".jpg";
- }else{
-$picture = $htdocs. "/htdocs/uploaded-files/users-photo/nophoto.jpg";
- 
-}
-
-my $fee=C4::Context->preference('cardfee');
-if (($fee > 0)&& $cat eq "A") {
-
-    my $nextacctno = C4::Accounts2::getnextacctno("",$borrnum,$dbh);
-    my $usth = $dbh->prepare("insert into accountlines
-    (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding)
-						          values
-    (?,?,now(),?,?,'N',?)");
-    $usth->execute($borrnum,$nextacctno,$fee,'Card Charge -'. $code,$fee);
-    $usth->finish;
-  }
-my $img2=$pdf->image_jpeg($htdocs. "/htdocs/uploaded-files/users-photo/emptycard2.JPG");
-
-my $img=$pdf->image_jpeg($picture);
-
-
-				# Generetase checksum
-#				$code = $code;
-				# Generate the corresponde barcode to $code
-				my $barcode = $pdf->barcode(-font => $tr,	# The font object to use
-											-type => 'ean128',	# Standard of codification
-											-code => $code, # Text to codify
-											-extn	=> '012345',	# Barcode extension (if it is aplicable)
-											-umzn => 8,		# Top limit of the finished bar
-											-lmzn => 8,		# Bottom limit of the finished bar
-											-zone => 7,		# Bars size
-											-quzn => 1,		# Space destinated for legend
-											-ofwt => 0.01,	# Bars width
-											-fnsz => 7,		# Font size
-											-text => ''
-											);
-
-			
-				(my $x, my $y, $pdf, $page, $gfx, $text, $tr, $label) = C4::Barcodes::PrinterConfig::getLabelPosition($label,$pdf,$page,$gfx,$text,$tr,$pageType);	
-
-my $top    = $y  + ((($labelConfig{'labelHeigth'} * 72)/25.4) / 2);
-my $bottom = $y  - ((($labelConfig{'labelHeigth'} * 72)/25.4) / 2);
-
-my $left   = $x  - ((($labelConfig{'labelWidth'} * 72)/25.4) / 2);
-my $right  = $x  + ((($labelConfig{'labelWidth'} * 72)/25.4) / 2);
-#Draws the barcode and the logo.
-my $barcode_height = $barcode->height();
-my $barcode_width = $barcode->width();
-my $back_width=$img2->width();
-my $back_height=$img2->height();
-$gfx->image($img2, $left, $bottom,244,153);
-$gfx->barcode($barcode, $left+($barcode_width/2)+4, $bottom + ($barcode_height)+2, (72/72));
-my $img_width = 50;
-my $img_height=65;
-$gfx->image($img, 
-            $right-($img_width)-20, 
-			$bottom+($barcode_height)+20,
-			 $img_width,$img_height
-			);
-   
-#Draws the legend.
-
-$text->font($tr, 8);
-$text->translate($left+($barcode_width)+8, $bottom + ($barcode_height)+2);
-my $date=format_date($expiry);
-$text->text("Expires: ".$date);
-$text->font($tr, 10);
-$text->translate($x-54 , $bottom+($barcode_height)+18);
-$text->text($code);
-
-#Parses the three lines and put them into the PDF.
-my $yoffset = ($barcode_height/2);
-
-
-#$text->font($tr, 10);
-	
-  $text->translate($left+10, ($y + ($barcode_height)) - $yoffset);
-$text->text($fname.' '.$sname);
-
-  $yoffset = $yoffset + 10;
-$text->translate($left+10, ($y + ($barcode_height)) - $yoffset);
-  $yoffset = $yoffset + 10;
-	 $text->text($desc);
-  $text->translate($left+10, ($y + ($barcode_height)) - $yoffset);
-  $text->text($address);
-  $yoffset = $yoffset + 10;
-
-	
-  $text->translate($left+10, ($y + ($barcode_height)) - $yoffset);
-   $text->text($city);	
- 			}
-			# Writes the objects added in $gfx to $page
-			$pdf->finishobjects($page,$gfx, $text);
-			# Save changes to the PDF
-			$pdf->saveas;
-			# Close the conection with the PDF file
-			$pdf->end;
-			# Show the PDF file
-#			print $cgi->redirect("/cgi-bin/koha/barcodes/mbarcode.pl?tmpFileName=$tmpFileName");
-			$template->param(tmpFileName=>$tmpFileName);
-#			$template->param(tmpFileName2=>$tmpFileName2);
-			$op="";
-		} else {
-			# Rollback and shows the error legend
-		$template->param(ERROR => 1);	
-		$op="";
-
-		}
-	$sth->finish;
-	}

Index: cgi-bin/barcodes/empty_card.jpg
===================================================================
RCS file: cgi-bin/barcodes/empty_card.jpg
diff -N cgi-bin/barcodes/empty_card.jpg
Binary files /tmp/cvslICBUO and /dev/null differ

Index: cgi-bin/barcodes/mbarcodes.pl
===================================================================
RCS file: cgi-bin/barcodes/mbarcodes.pl
diff -N cgi-bin/barcodes/mbarcodes.pl
--- cgi-bin/barcodes/mbarcodes.pl	10 Mar 2007 01:13:01 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,353 +0,0 @@
-#!/usr/bin/perl
-
-# script to generate members barcodes-complete rewrite
-# rewritten 24/08/05 by T.Garip
-# by Veleda Matias - matias_veleda at hotmail.com - Physics Library UNLP Argentina and
-#    Castañeda Sebastian - seba3c at yahoo.com.ar - Physics Library UNLP Argentina and
-
-# 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 CGI;
-
-use C4::Auth;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Context;
-use C4::Barcodes::PrinterConfig;
-use CGI;
-
-use C4::Output;
-
-use PDF::API2;
-use PDF::API2::Page;
-use PDF::API2::PDF::Utils;
-use PDF::API2::UniMap;
-use Time::localtime; 
-
-
-# This function returns the path to deal with the correct files, considering
-# templates set and language.
-sub getPath {
-	my $type = shift @_;
-	my $templatesSet = C4::Context->preference('template');
-	my $lang = C4::Context->preference('opaclanguages');
-	if ($type eq "intranet") {
-		return "$ENV{'DOCUMENT_ROOT'}/intranet-tmpl/$templatesSet/$lang";
-	} else {
-		return "$ENV{'DOCUMENT_ROOT'}/opac-tmpl/$templatesSet/$lang";
-	}
-}
-
-# Load a configuration file. Before use this function, check if that file exists.
-sub loadConfFromFile {
-  my $fileName = shift @_;
-	my %keyValues;
-	open FILE, "<$fileName";
-	while (<FILE>) {
-		chomp;
-		if (/\s*([\w_]*)\s*=\s*([\[\]\<\>\w_\s:@,\.-]*)\s*/) {
-			$keyValues{$1} = $2;
-		}
-	}
-	close FILE;
-	return %keyValues;
-}
-
-# Save settings to a configuration file. It delete previous configuration settings.
-sub saveConfToFile {
-	my $fileName = shift @_;
-	my %keyValues = %{shift @_};
-	my $i;
-	open FILE, ">$fileName";			
-	my $i;
-	foreach $i (keys(%keyValues)) {
-    print FILE $i." = ".$keyValues{$i}."\n";
-	}
-	close FILE;
-}
-
-# Load the config file.
-my $filenameConf = &getPath("intranet")."/includes/labelConfig/membersConfig.conf";
-my %labelConfig = &loadConfFromFile($filenameConf);
-
-my $input = new CGI;
-# Defines type of page to use in the printer process
-my @labelTable = C4::Barcodes::PrinterConfig::labelsPage($labelConfig{'rows'}, $labelConfig{'columns'});
-
-# It creates a list of posible intervals to choose codes to generate
-my %list = ('continuous' => 'Varolan Seri', 'individuals' => 'Tek tek','continuous2'=>'Yeni Seri');
-my @listValues = keys(%list);
-my $rangeType = CGI::scrolling_list(-name => 'rangeType',
-                              		-values => \@listValues,
-			                        -labels => \%list,
-			                        -size => 1,
-									-default => ['individuals'],
-			                        -multiple => 0,
-									-id => "rangeType",
-									-onChange => "changeRange(this)");
-# It creates a list of posible standard codifications. First checks if the user has just added a new code.
-
-my $op=$input->param('op');
-
-# Takes the country codes from a file and use them to set the country list.
-
-
-
-# Get the template to use
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "barcodes/mbarcodes.tmpl",
-			                 type => "intranet",
-			                 query => $input,
-			                 authnotrequired => 0,
-			                 flagsrequired => {circulate => 1},
-					         debug => 1,
-			               });
-
-# Replace the template values with the real ones
-#$template->param(SCRIPT_NAME =>"/cgi-bin/koha/barcodes/mbarcode.pl");
-$template->param(PAGES => $labelConfig{'pageType'});
-$template->param(RANGE_TYPE => $rangeType);
-$template->param(LABEL_TABLE => \@labelTable);
-$template->param(COL_SPAN => $labelConfig{'columns'});
-if ($input->param('error')) {
-	$template->param(ERROR => 1);
-} else {
-	$template->param(ERROR => 0);
-}
-
-my $cgi = new CGI;
-my $from = $cgi->param('from');
-my $to = $cgi->param('to');
-my $individualCodes = $cgi->param('individualCodes');
-my $rangeType = $cgi->param('rangeType');
-my $pageType = $cgi->param('pages');
-my $label = $cgi->param('label');
-my $text_under_label = $cgi->param('text_under_label');
-if (($op =="Generate Barcodes")&&($op)){
-
-
-
-# Load the config file.
-my $filenameConf = &getPath("intranet")."/includes/labelConfig/membersConfig.conf";
-my %labelConfig = &loadConfFromFile($filenameConf);
-
-# Creates a CGI object and take its parameters
-
-
-
-# Takes inventary codes from database and if they are between
-# the interval specify by parameters, it generates the correspond barcodes
-
-
-barcodesGenerator($from, $to, $rangeType, $individualCodes,$text_under_label);
-}
-# Shows the template with the real values replaced
-output_html_with_http_headers $input, $cookie, $template->output;
-
-  sub calculateDigit {
-    my $code = shift @_;
-    my $sum = 0;
-	  my $odd_parity = 1;
-    my $i;
-    for ($i = length($code) - 1; $i >= 0; $i--){
-	   if ( $odd_parity ) {
-		  $sum = $sum + ( 3 * substr($code, $i, 1) );
-     } else {
-			$sum = $sum + substr($code, $i, 1); }
-		  $odd_parity = !$odd_parity;
-	   }
-    my $check_digit = 10 - ($sum%10);
-	if ($check_digit==10) {
-		$check_digit=0;
-	}
-	  return $code.$check_digit;
-  }
-# Generate the checksum from an inventary code
-sub checksum {
-
-
-
-  my $currentCode = shift @_;
-  $currentCode = &calculateDigit($currentCode);
-  return $currentCode;
-}
-
-# Assigns a temporary name to the PDF file
-sub assingFilename {
-	my ($from, $to) = @_;
-	my $ip = $cgi->remote_addr();
-	my $random = int(rand(1000000));
-    my $timeObj = localtime();
-	my ($day, $month, $year, $hour, $min, $sec) = ($timeObj->mday,
-												   $timeObj->mon + 1,
-												   $timeObj->year + 1900,
-  												   $timeObj->hour,
-												   $timeObj->min,
-												   $timeObj->sec);
-	my $tmpFileName = $random.'-'.$min.'-'.$sec.'.pdf';
-	return $tmpFileName;
-}
-
-sub barcodesGenerator {
-	my ($from, $to, $rangeType, $individualCodes,$text_under_label) = @_;
-	# Returns a database handler
-	my $dbh = C4::Context->dbh;
-	$dbh->do('SET NAMES latin5');
-	# Create the query to database
-	# Assigns a temporary filename for the pdf file
-	my $tmpFileName = &assingFilename($from, $to);
-#	my $tmpFileName2 ="/uploaded-files/tmp-pdf/".$tmpFileName;
-# Set the temp directory for pdf´s files
-	my $htdocs = C4::Context->config('intranetdir');
- my $upload_dir = $htdocs."/htdocs/uploaded-files/tmp-pdf/";
-		$ENV{'TEMP'} = $upload_dir;
-my $tmpFileName2 = $ENV{'TEMP'}.$tmpFileName;
-		# Creates a PDF object
-		my $pdf = PDF::API2->new(-file => $tmpFileName2);
-	if ($rangeType eq 'continuous2') {
-		
-		
-		# Set the positions where barcodes are going to be placed
-		C4::Barcodes::PrinterConfig::setPositionsForX($labelConfig{'marginLeft'}, $labelConfig{'labelWidth'}, $labelConfig{'columns'}, $labelConfig{'pageType'});
-		C4::Barcodes::PrinterConfig::setPositionsForY($labelConfig{'marginBottom'}, $labelConfig{'labelHeigth'}, $labelConfig{'rows'}, $labelConfig{'pageType'});
-		# Creates a font object
-		my $tr = $pdf->ttfont('arial.ttf',-encode=>"iso-8859-9");
-		# Barcode position
-		my ($page, $gfx, $text);
-		for (my $code=$from; $code<=$to; $code++) {
-			# Generetase checksum
-			my $codeC = $code;
-			# Generate the corresponde barcode to $code
-			my $barcode = $pdf->barcode(-font => $tr,	# The font object to use
-										-type => 'ean128',	# Standard of codification
-										-code => $codeC, # Text to codify
-										-extn	=> '012345',	# Barcode extension (if it is aplicable)
-										-umzn => 10,		# Top limit of the finished bar
-										-lmzn => 10,		# Bottom limit of the finished bar
-										-zone => 15,		# Bars size
-										-quzn => 0,		# Space destinated for legend
-										-ofwt => 0.01,	# Bars width
-										-fnsz => 8,		# Font size
-										-text => ''
-										);
-			
-			(my $x, my $y, $pdf, $page, $gfx, $text, $tr, $label) = C4::Barcodes::PrinterConfig::getLabelPosition(
-																						$label, 
-																						$pdf, 
-																						$page,
-																						$gfx,
-																						$text,
-																						$tr,
-																						$pageType);	
-			# Assigns a barcodes to $gfx
-			$gfx->barcode($barcode, $x, $y , (72/$labelConfig{'systemDpi'}));
-			# Assigns the additional information to the barcode (Legend)
-			$text->translate($x - 50, $y - 24);
-			if ($text_under_label) {
-				$text->text($text_under_label);
-			}
-		}
-		# Writes the objects added in $gfx to $page
-		$pdf->finishobjects($page,$gfx, $text);
-		# Save changes to the PDF
-		$pdf->saveas;
-		# Close the conection with the PDF file
-		$pdf->end;
-		# Show the PDF file
-$template->param(tmpFileName=>$tmpFileName);
-#$template->param(tmpFileName2=>$tmpFileName2);
-			$op="";
-	} else {
-		my $rangeCondition;
-		if ($individualCodes ne "") {
-			$rangeCondition = " (I.cardnumber IN " . $individualCodes . ")";
-		} else {
-			$rangeCondition =  " (I.cardnumber >= " . $from . " AND I.cardnumber <="  . $to . " )";
-		}
-			
-		my $query = "SELECT  I.cardnumber , I.surname FROM borrowers I WHERE " .$rangeCondition. "  ORDER BY I.cardnumber";
-		# Prepare the query
-		my $sth = $dbh->prepare($query);
-		# Executes the query
-		$sth->execute;
-		if ($sth->rows) { # There are inventary codes
-			# Set the temp directory for pdf´s files
-				
-			
-			# Set the positions where barcodes are going to be placed
-			C4::Barcodes::PrinterConfig::setPositionsForX($labelConfig{'marginLeft'}, $labelConfig{'labelWidth'}, $labelConfig{'columns'}, $labelConfig{'pageType'});
-			C4::Barcodes::PrinterConfig::setPositionsForY($labelConfig{'marginBottom'}, $labelConfig{'labelHeigth'}, $labelConfig{'rows'}, $labelConfig{'pageType'});
-			# Creates a font object
-			my  $tr = $pdf->ttfont('arial.ttf', -encode=>"iso-8859-9");
-			# Barcode position
-			my ($page, $gfx, $text);
-			while (my ($code,$title) = $sth->fetchrow_array) {
-				# Generetase checksum
-#				$code = $code;
-				# Generate the corresponde barcode to $code
-				my $barcode = $pdf->barcode(-font => $tr,	# The font object to use
-											-type => 'ean128',	# Standard of codification
-											-code => $code, # Text to codify
-											-extn	=> '012345',	# Barcode extension (if it is aplicable)
-											-umzn => 10,		# Top limit of the finished bar
-											-lmzn => 10,		# Bottom limit of the finished bar
-											-zone => 15,		# Bars size
-											-quzn => 0,		# Space destinated for legend
-											-ofwt => 0.01,	# Bars width
-											-fnsz => 8,		# Font size
-											-text => ''
-											);
-				
-				(my $x, my $y, $pdf, $page, $gfx, $text, $tr, $label) = C4::Barcodes::PrinterConfig::getLabelPosition(
-																							$label, 
-																							$pdf, 
-																							$page,
-																							$gfx,
-																							$text,
-																							$tr,
-																							$pageType);	
-				# Assigns a barcodes to $gfx
-				$gfx->barcode($barcode, $x, $y , (72/$labelConfig{'systemDpi'}));
-				# Assigns the additional information to the barcode (Legend)
-				$text->translate($x - 50, $y - 24);
-				if ($text_under_label) {
-					$text->text($text_under_label);
-				} else {
-					$text->text($title);
-					
-				}
-			}
-			# Writes the objects added in $gfx to $page
-			$pdf->finishobjects($page,$gfx, $text);
-			# Save changes to the PDF
-			$pdf->saveas;
-			# Close the conection with the PDF file
-			$pdf->end;
-			# Show the PDF file
-#			print $cgi->redirect("/cgi-bin/koha/barcodes/mbarcode.pl?tmpFileName=$tmpFileName");
-			$template->param(tmpFileName=>$tmpFileName);
-#			$template->param(tmpFileName2=>$tmpFileName2);
-			$op="";
-		} else {
-			# Rollback and shows the error legend
-		$template->param(ERROR => 1);	
-		$op="";
-
-		}
-	$sth->finish;
-	}
-}
\ No newline at end of file

Index: cgi-bin/barcodes/mprinterConfig.pl
===================================================================
RCS file: cgi-bin/barcodes/mprinterConfig.pl
diff -N cgi-bin/barcodes/mprinterConfig.pl
--- cgi-bin/barcodes/mprinterConfig.pl	10 Mar 2007 01:13:01 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,116 +0,0 @@
-#!/usr/bin/perl
-
-# script to set the labels configuration for the printer process.
-# written 07/04
-# by Veleda Matias - matias_veleda at hotmail.com - Physics Library UNLP Argentina and
-
-# 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
-
-require Exporter;
-
-use strict;
-
-use CGI;
-
-use C4::Context;
-use C4::Output;
-use C4::Auth;
-use PDF::API2;
-use PDF::API2::Page;
-use PDF::API2::PDF::Utils;
-use C4::Interface::CGI::Output;
-
-# This function returns the path to deal with the correct files, considering
-# templates set and language.
-sub getPath {
-	my $type = shift @_;
-	my $templatesSet = C4::Context->preference('template');
-	my $lang = C4::Context->preference('opaclanguages');
-	if ($type eq "intranet") {
-		return "$ENV{'DOCUMENT_ROOT'}/intranet-tmpl/$templatesSet/$lang";
-	} else {
-		return "$ENV{'DOCUMENT_ROOT'}/opac-tmpl/$templatesSet/$lang";
-	}
-}
-
-# Load a configuration file.
-sub loadConfFromFile {
-  my $fileName = shift @_;
-	my %keyValues;
-	open FILE, "<$fileName";
-	while (<FILE>) {
-		chomp;
-		if (/\s*([\w_]*)\s*=\s*([\[\]\<\>\w_\s:@,\.-]*)\s*/) {
-			$keyValues{$1} = $2;
-		}
-	}
-	close FILE;
-	return %keyValues;
-}
-
-# Save settings to a configuration file.
-sub saveConfToFile {
-	my $fileName = shift @_;
-	my %keyValues = %{shift @_};
-	my $i;
-	open FILE, ">$fileName";			
-	my $i;
-	foreach $i (keys(%keyValues)) {
-    print FILE $i." = ".$keyValues{$i}."\n";
-	}
-	close FILE;
-}
-
-# Creates a CGI object and take his parameters
-my $input = new CGI;
-
-if ($input->param('saveSettings')) {
-	my $labelConf = &getPath("intranet")."/includes/labelConfig/membersConfig.conf";
-	my %newConfiguration = (pageType => $input->param('pageType'), 	
-							columns => $input->param('columns'), 		
-							rows => $input->param('rows'), 	
-							systemDpi => $input->param('systemDpi'), 	
-							labelWidth => $input->param('labelWidth'), 	
-							labelHeigth => $input->param('labelHeigth'),	
-							marginBottom => $input->param('marginBottom'), 	
-							marginLeft => $input->param('marginLeft')); 	
-	saveConfToFile($labelConf, \%newConfiguration);
-	print $input->redirect('/cgi-bin/koha/barcodes/mbarcodes.pl')
-}
-
-# Get the template to use
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "barcodes/printerConfig.tmpl",
-			                 type => "intranet",
-			                 query => $input,
-			                 authnotrequired => 0,
-			                 flagsrequired => {editcatalogue => 1},
-					         debug => 1,
-			               });
-
-my $filenameConf = &getPath("intranet")."/includes/labelConfig/membersConfig.conf";
-my %labelConfig = &loadConfFromFile($filenameConf);
-
-$template->param(COLUMNS => $labelConfig{'columns'});
-$template->param(ROWS => $labelConfig{'rows'});
-$template->param(SYSTEM_DPI => $labelConfig{'systemDpi'});
-$template->param(LABEL_WIDTH => $labelConfig{'labelWidth'});
-$template->param(LABEL_HEIGTH => $labelConfig{'labelHeigth'});
-$template->param(MARGIN_TOP => $labelConfig{'marginBottom'});
-$template->param(MARGIN_LEFT => $labelConfig{'marginLeft'});
-$template->param(SCRIPT_NAME => '/cgi-bin/koha/barcodes/mprinterConfig.pl');
-$template->param("$labelConfig{'pageType'}" => $labelConfig{'pageType'});
-output_html_with_http_headers $input, $cookie, $template->output;
\ No newline at end of file

Index: cgi-bin/barcodes/pdfViewer.pl
===================================================================
RCS file: cgi-bin/barcodes/pdfViewer.pl
diff -N cgi-bin/barcodes/pdfViewer.pl
--- cgi-bin/barcodes/pdfViewer.pl	10 Mar 2007 01:13:01 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-#!/usr/bin/perl
-
-# script to show a PDF file.
-# written 07/04
-# by Veleda Matias - matias_veleda at hotmail.com - Physics Library UNLP Argentina and
-#    Castañeda Sebastian - seba3c at yahoo.com.ar - Physics Library UNLP Argentina and
-
-# 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
-
-require Exporter;
-
-use strict;
-use C4::Context;
-use CGI;
-
-
-# This script take a pdf filename as a parameter and output it to the browser.
-my $cgi = new CGI;
-my $opachtdocs=C4::Context->config('intrahtdocs');
-my $tmpFileName = $cgi->param('tmpFileName');
-print $cgi->header(-type => 'application/pdf'),
-      $cgi->start_html(-title=>"Codify to PDF");
-open fh, "<$opachtdocs.$tmpFileName" || die "no file";
-while (<fh>) {
- print;
-}
-print $cgi->end_html();
\ No newline at end of file

Index: cgi-bin/barcodes/printerConfig.pl
===================================================================
RCS file: cgi-bin/barcodes/printerConfig.pl
diff -N cgi-bin/barcodes/printerConfig.pl
--- cgi-bin/barcodes/printerConfig.pl	10 Mar 2007 01:13:01 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,121 +0,0 @@
-#!/usr/bin/perl
-
-# script to set the labels configuration for the printer process.
-# written 07/04
-# by Veleda Matias - matias_veleda at hotmail.com - Physics Library UNLP Argentina and
-
-# 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
-
-require Exporter;
-
-use strict;
-
-use CGI;
-
-use C4::Context;
-use C4::Output;
-use C4::Auth;
-use PDF::API2;
-use PDF::API2::Page;
-use PDF::API2::PDF::Utils;
-use C4::Interface::CGI::Output;
-
-# This function returns the path to deal with the correct files, considering
-# templates set and language.
-sub getPath {
-	my $type = shift @_;
-	my $templatesSet = C4::Context->preference('template');
-	my $lang = C4::Context->preference('opaclanguages');
-	if ($type eq "intranet") {
-		return "$ENV{'DOCUMENT_ROOT'}/intranet-tmpl/$templatesSet/$lang";
-	} else {
-		return "$ENV{'DOCUMENT_ROOT'}/opac-tmpl/$templatesSet/$lang";
-	}
-}
-
-# Load a configuration file.
-sub loadConfFromFile {
-  my $fileName = shift @_;
-	my %keyValues;
-	open FILE, "<$fileName";
-	while (<FILE>) {
-		chomp;
-		if (/\s*([\w_]*)\s*=\s*([\[\]\<\>\w_\s:@,\.-]*)\s*/) {
-			$keyValues{$1} = $2;
-		}
-	}
-	close FILE;
-	return %keyValues;
-}
-
-# Save settings to a configuration file.
-sub saveConfToFile {
-	my $fileName = shift @_;
-	my %keyValues = %{shift @_};
-	my $i;
-	open FILE, ">$fileName";			
-	my $i;
-	foreach $i (keys(%keyValues)) {
-    print FILE $i." = ".$keyValues{$i}."\n";
-	}
-	close FILE;
-}
-
-# Creates a CGI object and take its parameters
-my $input = new CGI;
-my $labelsconfig=$input->param('labelsconfig');
-if ($input->param('saveSettings')) {
-	my $labelConf = &getPath("intranet")."/includes/labelConfig/".$labelsconfig.".conf";
-#my $labelConf = &getPath("intranet")."/includes/labelConfig/itemsLabelConfig.conf";
-	my %newConfiguration = (pageType => $input->param('pageType'), 	
-							columns => $input->param('columns'), 		
-							rows => $input->param('rows'), 	
-							systemDpi => $input->param('systemDpi'), 	
-							labelWidth => $input->param('labelWidth'), 	
-							labelHeigth => $input->param('labelHeigth'),	
-							marginBottom => $input->param('marginBottom'), 	
-							marginLeft => $input->param('marginLeft')); 	
-	saveConfToFile($labelConf, \%newConfiguration);
-	print $input->redirect('/cgi-bin/koha/barcodes/barcodes.pl?labelsconfig='.$labelsconfig)
-}
-
-# Get the template to use
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "barcodes/printerConfig.tmpl",
-			                 type => "intranet",
-			                 query => $input,
-			                 authnotrequired => 0,
-			                 flagsrequired => {parameters => 1},
-					         debug => 1,
-			               });
-
-my $filenameConf = &getPath("intranet")."/includes/labelConfig/".$labelsconfig.".conf";
-my %labelConfig = &loadConfFromFile($filenameConf);
-$template->param(labelsconfig =>$labelsconfig);
-$template->param(COLUMNS => $labelConfig{'columns'});
-$template->param(ROWS => $labelConfig{'rows'});
-$template->param(SYSTEM_DPI => $labelConfig{'systemDpi'});
-$template->param(LABEL_WIDTH => $labelConfig{'labelWidth'});
-$template->param(LABEL_HEIGTH => $labelConfig{'labelHeigth'});
-$template->param(MARGIN_TOP => $labelConfig{'marginBottom'});
-$template->param(MARGIN_LEFT => $labelConfig{'marginLeft'});
-$template->param(SCRIPT_NAME => '/cgi-bin/koha/barcodes/printerConfig.pl');
-$template->param("$labelConfig{'pageType'}" => 1);
-$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $input, $cookie, $template->output;
\ No newline at end of file

Index: cgi-bin/bookshelves/add-biblios-to-shelves.pl
===================================================================
RCS file: cgi-bin/bookshelves/add-biblios-to-shelves.pl
diff -N cgi-bin/bookshelves/add-biblios-to-shelves.pl
--- cgi-bin/bookshelves/add-biblios-to-shelves.pl	10 Mar 2007 01:13:51 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,60 +0,0 @@
-#!/usr/bin/perl
-
-#virtual shelves management, add a set of biblionumber to a set of shelves
-# written 06/05
-# Castañeda, Carlos Sebastian - seba3c at yahoo.com.ar - Physics Library UNLP Argentina and
-#
-# 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::Search;
-use CGI;
-
-use C4::Output;
-use C4::BookShelves;
-use C4::Circulation::Circ2;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Acquisition;
-use C4::AcademicInfo;
-use C4::Koha;
-
-my $cgi = new CGI;
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "bookshelves/shelves.tmpl",
-							query => $cgi,
-							type => "intranet",
-							authnotrequired => 0,
-							flagsrequired => {cataloging => 1},
-						});
-
-my @shelfnumber = $cgi->param('shelfnumber');
-my @biblios		= split /,/, $cgi->param('biblios');
-
-foreach my $shelfnum (@shelfnumber) {
-	foreach my $bibnum (@biblios) {
-		my $data = &GetShelfInfo($shelfnum, $loggedinuser);	
-		if (!$data->{'canmanage'}) {
-			show_error($cgi, "intra");
-			exit;
-		}
-		AddToShelfExt($bibnum, $shelfnum);
-	}
-}
-	
-print $cgi->redirect($cgi->param('return_url'));
-

Index: cgi-bin/bookshelves/addbookbybiblionumber.pl
===================================================================
RCS file: cgi-bin/bookshelves/addbookbybiblionumber.pl
diff -N cgi-bin/bookshelves/addbookbybiblionumber.pl
--- cgi-bin/bookshelves/addbookbybiblionumber.pl	10 Mar 2007 01:13:51 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,126 +0,0 @@
-#!/usr/bin/perl
-#script to provide bookshelf management
-# WARNING: This file uses 4-character tabs!
-#
-# $Header: /sources/koha/koha/intranet/cgi-bin/bookshelves/Attic/addbookbybiblionumber.pl,v 1.1.2.1 2007/03/10 01:13:51 tgarip1957 Exp $
-#
-# 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::Search;
-use C4::Biblio;
-use CGI;
-use C4::BookShelves;
-use C4::Circulation::Circ2;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Context;
-my $dbh=C4::Context->dbh;
-my $env;
-my $query = new CGI;
-my $biblionumber = $query->param('biblionumber');
-my $shelfnumber = $query->param('shelfnumber');
-my $newbookshelf = $query->param('newbookshelf');
-my $category = $query->param('category');
-
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "bookshelves/addbookbybiblionumber.tmpl",
-							query => $query,
-							type => "intranet",
-							authnotrequired => 0,
-							flagsrequired => {catalogue => 1},
-						});
-
-my $x; # for trash
-($x,$x,$shelfnumber) = AddShelf('',$newbookshelf,$loggedinuser,$category) if $newbookshelf;
-
-if ($shelfnumber) {
-	&AddToShelfFromBiblio($env, $biblionumber, $shelfnumber);
-	print "Content-Type: text/html\n\n<html><body onload=\"window.close()\"></body></html>";
-	exit;
-} else {
-
-	my  (  $bibliohash )  = XMLgetbibliohash($dbh,$biblionumber);
-	my $biblios=XMLmarc2koha_onerecord($dbh,$bibliohash,"biblios");
-	my ($shelflist) = GetShelfList($loggedinuser,3);
-	my @shelvesloop;
-	my %shelvesloop;
-	foreach my $element (sort keys %$shelflist) {
-			push (@shelvesloop, $element);
-			$shelvesloop{$element} = $shelflist->{$element}->{'shelfname'};
-	}
-
-	my $CGIbookshelves=CGI::scrolling_list( -name     => 'shelfnumber',
-				-values   => \@shelvesloop,
-				-labels   => \%shelvesloop,
-				-size     => 1,
-	 			-tabindex=>'',
-				-multiple => 0 );
-
-	$template->param(biblionumber => $biblionumber,
-						title => $biblios->{'title'},
-						author => $biblios->{'author'},
-						CGIbookshelves => $CGIbookshelves,
-						intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-						);
-
-	output_html_with_http_headers $query, $cookie, $template->output;
-}
-# $Log: addbookbybiblionumber.pl,v $
-# Revision 1.1.2.1  2007/03/10 01:13:51  tgarip1957
-# fresh files for rel_TG
-#
-# Revision 1.5  2006/09/27 21:19:21  tgarip1957
-# Finalized XML version for intranet
-#
-# Revision 1.4  2006/07/04 14:36:51  toins
-# Head & rel_2_2 merged
-#
-# Revision 1.3.2.4  2006/06/20 16:21:42  oleonard
-# Adding "tabindex=''" to CGI:scrolling_lists to prevent incorrect tabbing. See Bug 1098
-#
-# Revision 1.3.2.3  2006/02/05 21:59:21  kados
-# Adds script support for IntranetNav ... see mail to koha-devel for
-# details
-#
-# Revision 1.3.2.2  2006/02/05 21:45:25  kados
-# Adds support for intranetstylesheet system pref in Koha scripts
-#
-# Revision 1.3.2.1  2006/02/04 21:26:47  kados
-# Adds support for intranetcolorstylesheet
-#
-# Revision 1.3  2004/12/15 17:28:22  tipaul
-# adding bookshelf features :
-# * create bookshelf on the fly
-# * modify a bookshelf (this being not finished, will commit the rest soon)
-#
-# Revision 1.2  2004/11/19 16:31:30  tipaul
-# bugfix for bookshelves not in official CVS
-#
-# Revision 1.1.2.2  2004/03/10 15:08:18  tipaul
-# modifying shelves : introducing category of shelf : private, public, free for all
-#
-# Revision 1.1.2.1  2004/02/19 10:14:36  tipaul
-# new feature : adding book to bookshelf from biblio detail screen.
-#
-
-# Local Variables:
-# tab-width: 4
-# End:

Index: cgi-bin/bookshelves/quicksearch.pl
===================================================================
RCS file: cgi-bin/bookshelves/quicksearch.pl
diff -N cgi-bin/bookshelves/quicksearch.pl
--- cgi-bin/bookshelves/quicksearch.pl	10 Mar 2007 01:13:51 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,87 +0,0 @@
-#!/usr/bin/perl
-use strict;
-require Exporter;
-use CGI;
-
-use C4::Search;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Acquisition;
-use C4::Biblio;
-use C4::Koha;
-use C4::Members;
-use POSIX qw(ceil floor);
-
-my $cgi = new CGI;
-my $dbh = C4::Context->dbh;
-my $op = $cgi->param('op'); #show the search form or execute the search
-
-my ($template, $borrowernumber, $cookie)
-		= get_template_and_user({template_name => "bookshelves/quicksearch.tmpl",
-					 query => $cgi,
-					 type => "intranet",
-					 authnotrequired => 1,
-				 });
-
-# get all the common search variables, 
-my @fields = ('keyword', 'isbn', 'itemnumber', 'field_name1', 'field_value1', 'ttype1', 'search_type', 'class');
-
-# collect all the fields ...
-my %search;
-my @forminputs;
-$search{'avoidquerylog'} = 1;
-foreach my $field (@fields) {
-	$search{$field} = $cgi->param($field);
-	push @forminputs, {field => $field, value => $search{$field}} if ($search{$field}); 
-}
-$template->param(forminputs => \@forminputs);
-
-#Check the param to know if there is to do the search or to show the search form. 
-if ($op eq "do_search") {
-	
-	# Get the actual branch, in case the user logged is KohaAdmin use the syspreference defaultBranch
-	my $data = borrdata('',$borrowernumber);
-	if ($data->{'branchcode'}) {
-		$search{'branch'} = $data->{'branchcode'}; 	
-	} else {
-		$search{'branch'} = C4::Context->preference("defaultBranch");
-	}
-
-	my $startfrom = $cgi->param('startfrom');
-	unless ($startfrom) { $startfrom = 0;} 
-
-	my $countshow = 10;
-
-	# do the searchs ....
-	my ($count, @results) = catalogsearch3(\%search, $countshow, $startfrom);
-
-	#process the results and find the items for each biblionumber
-	my $number = $startfrom + 1;
-	my $color = 1;
-	foreach my $biblio (@results) {
-		my @items = &ItemInfo(undef, $biblio->{'biblionumber'});
-		$biblio->{"items"} = \@items;
-		$biblio->{"color"} = $color = not $color;
-		$biblio->{"number"} = $number++;
-	}
-
-	$template->param(dosearch => 1);
-	$template->param(result_count => $count, results => \@results);
-	
-	#calculate if is necessary show the arrows to navigate throgth the results
-	if ($startfrom + $countshow < $count ) {
-		$template->param(displaynext => 1, nextstartfrom => $startfrom + $countshow);
-	} 
-	if ($startfrom > $countshow - 1) {
-		$template->param(displayprev => 1, prevstartfrom => $startfrom - $countshow);
-	}
-
-} else {
-	
-	#show the item types
-	my ($itemtypecount, at itemtypes)= C4::Biblio::getitemtypes();
-	$template->param(itemtype => \@itemtypes);
-
-}
-
-output_html_with_http_headers $cgi, $cookie, $template->output;

Index: cgi-bin/bookshelves/shelf-requests.pl
===================================================================
RCS file: cgi-bin/bookshelves/shelf-requests.pl
diff -N cgi-bin/bookshelves/shelf-requests.pl
--- cgi-bin/bookshelves/shelf-requests.pl	10 Mar 2007 01:13:51 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,134 +0,0 @@
-#!/usr/bin/perl
-#virtual shelves
-# written 09/04
-# Castañeda, Carlos Sebastian - seba3c at yahoo.com.ar - Physics Library UNLP Argentina and
-#
-# 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::Search;
-use CGI;
-
-use C4::Output;
-use C4::BookShelves;
-use C4::Circulation::Circ2;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Acquisition;
-
-
-use Mail::Sendmail;
-use MIME::QuotedPrint;
-use MIME::Base64;
-use Mail::RFC822::Address;
-
-my $cgi = new CGI;
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "bookshelves/shelf-requests.tmpl",
-							query => $cgi,
-							type => "intranet",
-							authnotrequired => 0,
-							flagsrequired => {superlibrarian => 1},
-						});
-
-
-my $op = $cgi->param('op'); 
-
-#links the file or link with a biblionumber 
-if ($op eq "link_request") {
-
-	my $idRequest		= $cgi->param('idRequest');
-	my $shelfnumber		= $cgi->param('shelfnumber');
-	my $biblionumber	= $cgi->param('biblionumber');
-
-	my $bibdata = &bibdata($biblionumber);
-	
-	#print "content-type: text/plain \n\n " . $biblionumber . $bibdata->{'biblionumber'} . " ****" . $bibdata->{'title'};
-	
-	if ($bibdata->{'title'}) {
-		CatalogueShelfRequest($idRequest, $shelfnumber, $biblionumber);
-		print $cgi->redirect('/cgi-bin/koha/bookshelves/shelf-requests.pl');
-	} else {
-		print $cgi->redirect('/cgi-bin/koha/bookshelves/shelf-requests.pl?unknown_barcode=1');	
-	}
-
-#rejects a pending file or link
-} elsif ($op eq "reject_request") {
-
-	my $idRequest = $cgi->param('idRequest');
-	RejectShelfRequest($idRequest);
-
-	my $bordata = &GetShelfRequestOwner($idRequest);
-	my $reqdata = &GetShelfRequest($idRequest);
-
-	#build and send email
-	if ($bordata->{'emailaddress'}) {
-		
-		my $from = C4::Context->preference('TechnicalServicesMail');
-		my %mail;
-		$mail{'to'} =  $bordata->{'emailaddress'};
-		$mail{'from'} = $from;
-
-		my $template = gettemplate("bookshelves/mail_request_REJECTED.tmpl","intranet");
-
-		$template->param(request_name	=> $reqdata->{'request_name'});
-		$template->param(shelfname		=> $reqdata->{'shelfname'});
-
-		# Getting template result
-		my $template_res = $template->output();
-
-		# Analysing information and getting mail properties
-		if ($template_res =~ /§SUBJECT§\n(.*)\n§END_SUBJECT§/s) { 
-			$mail{'subject'} = $1; 
-		}
-
-		my $email_header = "";
-		if ($template_res =~ /§HEADER§\n(.*)\n§END_HEADER§/s) { 
-			$email_header = $1; 
-		}
-
-		if ($template_res =~ /§MESSAGE§\n(.*)\n§END_MESSAGE§/s) { $mail{'body'} = $1; }
-
-		$mail{'content-type'} = "text/plain";
-		$mail{'charset'} = "iso-8859-1n";
-		$mail{'Content-Transfer-Encoding'} = "quoted-printable";
-
-		$email_header = encode_qp($email_header);
-
-		# Writing mail
-		$mail{'body'} = "$email_header \n$mail{'body'}";
-		sendmail(%mail);
-
-	}
-
-	print $cgi->redirect('/cgi-bin/koha/bookshelves/shelf-requests.pl');
-
-#shows all links and files in an specific state 
-} else {
-
-	my $status = $cgi->param('status');
-	my $request_type = $cgi->param('request_type');
-	$status = "PENDING" if (!$status);
-	my $requests = &GetShelfRequests(undef, $status, $request_type);
-	$template->param(requests => $requests); 
-	$template->param(explore => 1);	
-	$template->param($status => 1);	
-	$template->param($request_type => 1);	
-	$template->param(unknown_barcode => $cgi->param('unknown_barcode'));
-}
-
-output_html_with_http_headers $cgi, $cookie, $template->output;

Index: cgi-bin/bookshelves/shelves.pl
===================================================================
RCS file: cgi-bin/bookshelves/shelves.pl
diff -N cgi-bin/bookshelves/shelves.pl
--- cgi-bin/bookshelves/shelves.pl	10 Mar 2007 01:13:51 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,189 +0,0 @@
-#!/usr/bin/perl
-
-#virtual shelves -modified by TG 22/09/05
-# written 09/04
-# Castañeda, Carlos Sebastian - seba3c at yahoo.com.ar - Physics Library UNLP Argentina and
-#
-# 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::Search;
-use CGI;
-
-use C4::Output;
-use C4::BookShelves;
-use C4::Circulation::Circ2;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Acquisition;
-use C4::AcademicInfo;
-use C4::Members;
-my $cgi = new CGI;
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "bookshelves/shelves.tmpl",
-							query => $cgi,
-							type => "intranet",
-							authnotrequired => 0,
-							flagsrequired => {catalogue => 1},
-						});
-
-#Collect the params into a hash
-my %params;
-foreach my $paramname ($cgi->param) {
-	$params{$paramname} = $cgi->param($paramname); 
-}
-
-#Gets all educational institutions
-my @institutions = &get_educational_institutions();
-foreach my $row (@institutions) {
-	if ($params{'id_institution'} == $row->{'id_institution'}) {
-		$row->{'selected'} = 1;
-	}
-}
-$template->param(institutions => \@institutions);
-
-#get the faculty description for each educational institution, and select the current if there is one
-	my @institutions_c = &get_careers_by_institution();
-	foreach my $row (@institutions_c) {
-		if ($row->{'id_institution'} == $params{'id_institution'}) {
-			$row->{'selected'} = 1;
-		}
-	}
-$template->param(institutions_c => \@institutions_c);
-
-#get the shelf information
-if ($params{'shelfnumber'}) {
-	my $data = &GetShelfInfo($params{'shelfnumber'}, $loggedinuser);
-	$params{'canmanage'} = $data->{'canmanage'};
-	if ($data->{'category'} == 1) {$params{'private'} = 1;} else {$params{'public'} = 1;}
-	#get the information about the careers with the shelf is associated 
-	my @actuals_careers;
-	foreach my $id_career (@{$data->{'careers'}}) {
-		my $info = &get_career($id_career);
-		push @actuals_careers, $info;
-	}
-	$template->param(actual_careers => \@actuals_careers);
-	$template->param(shelfname => $data->{'shelfname'});
-}
-
-my @messages;
-#check the param op to know what operation the user request
-if ($params{'op'} eq 'add_form') {
-
-	$template->param($params{'op'} => 1);
-
-	#is a modification
-	if ($params{'shelfnumber'}) {
-		$params{'op'} = 'edit';
-	#is a new shelf
-	} else {
-		$params{'op'} = 'add';
-	}
-
-	#get the user information and determine if her/him can make public shelf
-	my $data = borrdata(undef, $loggedinuser);
-	my $borrcat = getborrowercategoryinfo($data->{'categorycode'});
-	$params{'make_public_shelves'} = $borrcat->{'canmakepublicshelves'};
-if ($params{'make_public_shelves'}){
-$params{'canmanage'}=1;
-}
-
-#try to add a new shelf or edit one
-} elsif ( ($params{'op'} eq 'add') ||  ($params{'op'} eq 'edit') )  {
-
-	my @careers = $cgi->param('careers');
-	my $shelfnumber;
-	
-	if ($params{'op'} eq 'add') {
-		$shelfnumber = AddShelfExt($params{'shelfname'},$loggedinuser, $params{'category'},\@careers);
-	} else {
-		$shelfnumber = EditShelfExt($params{'shelfnumber'}, $params{'shelfname'}, $params{'category'},\@careers);
-	}
-
-	if ($shelfnumber) {
-		print $cgi->redirect("/cgi-bin/koha/bookshelves/shelves.pl?id_institution=$params{'id_institution'}");
-	} else {
-		$template->param(add_form => 1);
-		my %msg;
-		$msg{'duplicated_name'} = 1;
-		push @messages, \%msg;
-		$template->param(messages => \@messages);
-	}
-
-#delete shelfs
-} elsif ($params{'op'} eq 'del') {
-
-	my @shelfnumber = $cgi->param('shelfnumber');
-	foreach my $num (@shelfnumber) {
-		RemoveShelfExt($num);	
-	}
-	print $cgi->redirect("/cgi-bin/koha/bookshelves/shelves.pl?id_institution=$params{'id_institution'}");
-
-} elsif ($params{'op'} eq 'viewcontent') {
-
-	$params{'viewshelfcontent'} = 1;	
-	my $content = GetShelfContentsExt($params{'shelfnumber'});
-	$template->param(content => $content);
-
-} elsif ($params{'op'} eq 'del_items') {
-
-	my @biblionumber = $cgi->param('biblionumber');
-	foreach my $bibnum (@biblionumber) {
-		RemoveFromShelfExt($bibnum, $params{'shelfnumber'});
-	}
-	print $cgi->redirect("/cgi-bin/koha/bookshelves/shelves.pl?op=viewcontent&shelfnumber=$params{'shelfnumber'}&id_institution=$params{'id_institution'}");
-
-} elsif ($params{'op'} eq 'add_biblio') {
-
-	my $biblionumber	= $cgi->param('biblionumber');
-	my $bibdata = &bibdata($biblionumber);
-
-	if ($bibdata->{'title'}) {
-		my $shelfnumber = $cgi->param('shelfnumber');
-		AddToShelfExt($params{'biblionumber'}, $shelfnumber);
-		print $cgi->redirect("/cgi-bin/koha/bookshelves/shelves.pl?op=viewcontent&shelfnumber=$params{'shelfnumber'}");		
-	} else {
-		print $cgi->redirect("/cgi-bin/koha/bookshelves/shelves.pl?op=viewcontent&shelfnumber=$params{'shelfnumber'}&unknown_biblio=1");		
-	}
-
-} else {
-
-	$params{'viewshelfs'} = 1;	
-
-	my @inst = &get_educational_institutions();
-	my @filtered_inst;
-	foreach my $row (@inst) {
-		my ($total_shelves, $careers_shelves) = GetShelfListExt($loggedinuser, 2, $row->{'id_institution'}, 1);
-		$row->{'careers_shelves'} = $careers_shelves;
-		$row->{'total_shelves'} = $total_shelves;
-		if ($row->{'id_institution'} == $params{'id_institution'} ) {
-			$row->{'selected'} = 1;
-		}
-		if ($total_shelves != 0) {
-			push @filtered_inst, $row;
-		}
-	}
-
-	$template->param(institutions => \@filtered_inst);
-	$template->param(biblionumber => $params{'biblionumber'});
-
-
-}
-
-$template->param(%params);
-
-output_html_with_http_headers $cgi, $cookie, $template->output;

Index: cgi-bin/catalogue/ISBDdetail.pl
===================================================================
RCS file: cgi-bin/catalogue/ISBDdetail.pl
diff -N cgi-bin/catalogue/ISBDdetail.pl
--- cgi-bin/catalogue/ISBDdetail.pl	10 Mar 2007 01:15:01 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,152 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-=head1 NAME
-
-ISBDdetail.pl : script to show a biblio in ISBD format
-
-=head1 SYNOPSIS
-
-
-=head1 DESCRIPTION
-
-This script needs a biblionumber in bib parameter (bibnumber
-from koha style DB.  Automaticaly maps to marc biblionumber).
-
-=head1 FUNCTIONS
-
-=over 2
-
-=cut
-
-
-use strict;
-
-use C4::Auth;
-use C4::Context;
-use C4::AuthoritiesMarc;
-use C4::Interface::CGI::Output;
-use CGI;
-use C4::Search;
-use C4::Biblio;
-use C4::Acquisition;
-use C4::Koha;
-
-my $query=new CGI;
-
-my $dbh=C4::Context->dbh;
-
-my $biblionumber=$query->param('biblionumber');
-
-my $itemtype = &MARCfind_frameworkcode($dbh,$biblionumber);
-my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
-
-my $record =XMLgetbibliohash($dbh,$biblionumber);
-# open template
-my ($template, $loggedinuser, $cookie)
-		= get_template_and_user({template_name => "catalogue/ISBDdetail.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 1,
-			     debug => 1,
-			     });
-
-my $ISBD = C4::Context->preference('ISBD');
-my $res;
-	my $bloc = $ISBD;
-	my $blocres;
-	foreach my $isbdfield (split /#/,$bloc) {
-		$isbdfield =~ /(\d\d\d)\|(.*)\|(.*)\|(.*)/;
-		my $fieldvalue=$1;
-		my $textbefore=$2;
-		my $analysestring=$3;
-		my $textafter=$4;
-		if ($fieldvalue>0) {
-			my $hasputtextbefore=0;
-			
-				my $calculated = $analysestring;
-				my $tag = $fieldvalue;
-				if ($tag<10) {
-				my $value=XML_readline_onerecord($record,"","",$tag);
-				my $subfieldcode = "@";
-						my $subfieldvalue = get_authorised_value_desc($tag, "", $value, '', $dbh);;
-						my $tagsubf = $tag.$subfieldcode;
-						$calculated =~ s/\{(.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue\{$1$tagsubf$2\}$2/g;
-					
-				} else {
-					my @subf = XML_readline_withtags($record,"","",$tag);
-				
-					for my $i (0..$#subf) {
-						my $subfieldcode = $subf[$i][0];
-						my $subfieldvalue = get_authorised_value_desc($tag, $subf[$i][0], $subf[$i][1], '', $dbh);;
-						my $tagsubf = $tag.$subfieldcode;
-						$calculated =~ s/\{(.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue\{$1$tagsubf$2\}$2/g;
-					}
-					# field builded, store the result
-					if ($calculated && !$hasputtextbefore) { # put textbefore if not done
-						$blocres .=$textbefore;
-						$hasputtextbefore=1
-					}
-					# remove punctuation at start
-					$calculated =~ s/^( |;|:|\.|-)*//g;
-					$blocres.=$calculated;
-				}
-			
-			$blocres .=$textafter if $hasputtextbefore;
-		} else {
-			$blocres.=$isbdfield;
-		}
-	}
-	$res.=$blocres;
-# }
-$res =~ s/\{(.*?)\}//g;
-$res =~ s/\\n/\n/g;
-$res =~ s/\n/<br\/>/g;
-# remove empty ()
-$res =~ s/\(\)//g;
-$template->param(ISBD => $res,
-				biblionumber => $biblionumber);
-
-output_html_with_http_headers $query, $cookie, $template->output;
-
-sub get_authorised_value_desc ($$$$$) {
-   my($tag, $subfield, $value, $framework, $dbh) = @_;
-
-   #---- branch
-    if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
-       return getbranchname($value);
-    }
-
-   #---- itemtypes
-   if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
-       return ItemType($value);
-    }
-
-   #---- "true" authorized value
-   my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};
-
-   if ($category ne "") {
-       my $sth = $dbh->prepare("select lib from authorised_values where category = ? and authorised_value = ?");
-       $sth->execute($category, $value);
-       my $data = $sth->fetchrow_hashref;
-       return $data->{'lib'};
-   } else {
-       return $value; # if nothing is found return the original value
-   }
-}

Index: cgi-bin/catalogue/MARCdetail.pl
===================================================================
RCS file: cgi-bin/catalogue/MARCdetail.pl
diff -N cgi-bin/catalogue/MARCdetail.pl
--- cgi-bin/catalogue/MARCdetail.pl	10 Mar 2007 01:15:01 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,331 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-=head1 NAME
-
-MARCdetail.pl : script to show a biblio in MARC format
-
-=head1 SYNOPSIS
-
-
-=head1 DESCRIPTION
-
-This script needs a biblionumber in bib parameter (bibnumber
-from koha style DB.  Automaticaly maps to marc biblionumber).
-
-It shows the biblio in a (nice) MARC format depending on MARC
-parameters tables.
-
-The template is in <templates_dir>/catalogue/MARCdetail.tmpl.
-this template must be divided into 11 "tabs".
-
-The first 10 tabs present the biblio, the 11th one presents
-the items attached to the biblio
-
-=head1 FUNCTIONS
-
-=over 2
-
-=cut
-
-
-use strict;
-use C4::Auth;
-use C4::Context;
-use C4::Interface::CGI::Output;
-use CGI;
-use C4::Search;
-use C4::Biblio;
-use C4::Acquisition;
-use C4::Serials; #uses getsubscriptionsfrombiblionumber
-use C4::Koha;
-
-my $query=new CGI;
-
-my $dbh=C4::Context->dbh;
-my $retrieve_from=C4::Context->preference('retrieve_from');
-my $biblionumber=$query->param('biblionumber');
-my $frameworkcode = $query->param('frameworkcode');
-my $popup = $query->param('popup'); # if set to 1, then don't insert links, it's just to show the biblio
-my $record;
-my @itemrecords;
-my $xmlhash;
-$frameworkcode=MARCfind_frameworkcode($dbh,$biblionumber);
-my $tagslib = &MARCgettagslib($dbh,1,$frameworkcode);
-my $itemstagslib = &MARCitemsgettagslib($dbh,1,$frameworkcode);
-
-if ($retrieve_from eq "zebra"){
-($xmlhash, at itemrecords)=ZEBRAgetrecord($biblionumber);
-
-}else{
- $record =XMLgetbiblio($dbh,$biblionumber);
-$xmlhash=XML_xml2hash_onerecord($record);
-my @itemxmls=XMLgetallitems($dbh,$biblionumber);
-	foreach my $itemrecord(@itemxmls){
-	my $itemhash=XML_xml2hash($itemrecord);
-	push @itemrecords, $itemhash;
-	}
-}
-
-my ($template, $loggedinuser, $cookie)
-		= get_template_and_user({template_name => "catalogue/MARCdetail.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {catalogue => 1},
-			     debug => 1,
-			     });
-
-#Getting the list of all frameworks
-my $queryfwk =$dbh->prepare("select frameworktext, frameworkcode from biblios_framework");
-$queryfwk->execute;
-my %select_fwk;
-my @select_fwk;
-my $curfwk;
-push @select_fwk,"Default";
-$select_fwk{"Default"} = "Default";
-while (my ($description, $fwk) =$queryfwk->fetchrow) {
-	push @select_fwk, $fwk;
-	$select_fwk{$fwk} = $description;
-}
-$curfwk=$frameworkcode;
-my $framework=CGI::scrolling_list( -name     => 'Frameworks',
-			-id => 'Frameworks',
-			-default => $curfwk,
-			-OnChange => 'Changefwk(this);',
-			-values   => \@select_fwk,
-			-labels   => \%select_fwk,
-			-size     => 1,
-			-multiple => 0 );
-
-$template->param( framework => $framework);
-# fill arrays
-my @loop_data =();
-my $tag;
-# loop through each tab 0 through 9
-##Only attempt to fill the template if we actually received a MARC record
-if ($xmlhash){
-my ($isbntag,$isbnsub)=MARCfind_marc_from_kohafield("isbn","biblios");
-my $biblio=$xmlhash->{'datafield'};
-my $controlfields=$xmlhash->{'controlfield'};
-my $leader=$xmlhash->{'leader'};
-for (my $tabloop = 0; $tabloop<10;$tabloop++) {
-# loop through each tag
-	my @loop_data =();
-	my @subfields_data;
-
-	# deal with leader 
-	unless (($tagslib->{'000'}->{'@'}->{tab}  ne $tabloop)  || (substr($tagslib->{'000'}->{'@'}->{hidden},1,1)>0)) {
-		
-		my %subfield_data;
-		$subfield_data{marc_value}=$leader->[0] ;
-		push(@subfields_data, \%subfield_data);
-		my %tag_data;
-		$tag_data{tag}='000 -'. $tagslib->{'000'}->{lib};
-		my @tmp = @subfields_data;
-		$tag_data{subfield} = \@tmp;
-		push (@loop_data, \%tag_data);
-		undef @subfields_data;
-	}
-	##Controlfields
-		
-		 foreach my $control (@$controlfields){
-			my %subfield_data;
-			my %tag_data;
-			next if ($tagslib->{$control->{'tag'}}->{'@'}->{tab}  ne $tabloop);
-			next if (substr($tagslib->{$control->{'tag'}}->{'@'}->{hidden},1,1)>0);			
-			$subfield_data{marc_value}=$control->{'content'} ;
-			push(@subfields_data, \%subfield_data);
-				if (C4::Context->preference('hide_marc')) {
-					$tag_data{tag}=$tagslib->{$control->{'tag'}}->{lib};
-				} else {
-					$tag_data{tag}=$control->{'tag'}.' -'. $tagslib->{$control->{'tag'}}->{lib};
-				}			
-			my @tmp = @subfields_data;
-			$tag_data{subfield} = \@tmp;
-			push (@loop_data, \%tag_data);
-			undef @subfields_data;
-		}
-	my $previoustag;
-	my %datatags;
-	my $i=0;
-	foreach my $data (@$biblio){
-		$datatags{$i++}=$data->{'tag'};
-		 foreach my $subfield ( $data->{'subfield'}){
-		     foreach my $code ( @$subfield){
-			next if ($tagslib->{$data->{'tag'}}->{$code->{'code'}}->{tab}  ne $tabloop);
-			next if (substr($tagslib->{$data->{'tag'}}->{$code->{'code'}}->{hidden},1,1)>0);
-			my %subfield_data;
-			my $value=$code->{'content'};
-			$subfield_data{marc_lib}=$tagslib->{$data->{'tag'}}->{$code->{'code'}}->{lib};
-			$subfield_data{link}=$tagslib->{$data->{'tag'}}->{$code->{'code'}}->{link};
-			if ($tagslib->{$data->{'tag'}}->{$code->{'code'}}->{isurl}) {
-				$subfield_data{marc_value}="<a href=\"$value\">$value</a>";
-			} elsif ($data->{'tag'} eq $isbntag && $code->{'code'} eq $isbnsub) {
-				$subfield_data{marc_value}=DisplayISBN($value);
-			} else {
-				if ($tagslib->{$data->{'tag'}}->{$code->{'code'}}->{authtypecode}) {
-				my ($authtag,$authtagsub)=MARCfind_marc_from_kohafield("auth_biblio_link_subf","biblios");
-				$subfield_data{authority}=XML_readline_onerecord($xmlhash,"","",$data->{'tag'},$authtagsub);
-				}
-			if (length($value) >100) {
-			$subfield_data{marc_value}="<textarea tabindex=\"1\"   cols=\"40\" rows=\"5\" >$value</textarea>";
-			}else{
-			$subfield_data{marc_value}=get_authorised_value_desc($data->{'tag'}, $code->{'code'}, $value, '', $dbh);
-			}
-			}
-			$subfield_data{marc_subfield}=$code->{'code'};
-			$subfield_data{marc_tag}=$data->{'tag'};
-			push(@subfields_data, \%subfield_data);
-		     }### $code
-		
-		
-		if ($#subfields_data==0) {
-		#	$subfields_data[0]->{marc_lib}='';
-		#	$subfields_data[0]->{marc_subfield}='';
-		}
-		if ($#subfields_data>=0) {
-			my %tag_data;
-			if (($datatags{$i} eq $datatags{$i-1}) && (C4::Context->preference('LabelMARCView') eq 'economical')) {
-				$tag_data{tag}="";
-			} else {
-				if (C4::Context->preference('hide_marc')) {
-					$tag_data{tag}=$tagslib->{$data->{'tag'}}->{lib};
-				} else {
-					$tag_data{tag}=$data->{'tag'}.' -'. $tagslib->{$data->{'tag'}}->{lib};
-				}
-			}
-			my @tmp = @subfields_data;
-			$tag_data{subfield} = \@tmp;
-			push (@loop_data, \%tag_data);
-			undef @subfields_data;
-		}
-	      }### each $subfield
-	}
-
-	$template->param($tabloop."XX" =>\@loop_data);
-}
-# now, build item tab !
-# the main difference is that datas are in lines and not in columns : thus, we build the <th> first, then the values...
-# loop through each tag
-# warning : we may have differents number of columns in each row. Thus, we first build a hash, complete it if necessary
-# then construct template.
-my @fields;
-my %witness; #---- stores the list of subfields used at least once, with the "meaning" of the code
-my @big_array;
-foreach my $itemrecord (@itemrecords){
-my $item=$itemrecord->{'datafield'};
-my $controlfields=$itemrecord->{'controlfield'};
-my $leader=$itemrecord->{'leader'};
-my %this_row;
-		### The leader
-		unless (substr($itemstagslib->{'000'}->{'@'}->{hidden},1,1)>0){
-			my @datasub='000@';
-			$witness{$datasub[0]} = $itemstagslib->{'000'}->{'@'}->{lib};
-			$this_row{$datasub[0]} =$leader->[0];
-		}
-		 foreach my $control (@$controlfields){
-		next if ($itemstagslib->{$control->{'tag'}}->{'@'}->{tab}  ne 10);
-			next if (substr($itemstagslib->{$control->{'tag'}}->{'@'}->{hidden},1,1)>0);
-			my @datasub=$control->{'tag'}.'@';
-			$witness{$datasub[0]} = $itemstagslib->{$control->{'tag'}}->{'@'}->{lib};
-			$this_row{$datasub[0]} =$control->{'content'};
-		}
-
-		foreach my $data (@$item){		
-		   foreach my $subfield ( $data->{'subfield'}){
-			foreach my $code ( @$subfield){
-			next if ($itemstagslib->{$data->{'tag'}}->{$code->{'code'}}->{tab}  ne 10);
-			next if (substr($itemstagslib->{$data->{'tag'}}->{$code->{'code'}}->{hidden},1,1)>0);
-			$witness{$data->{'tag'}.$code->{'code'}} = $itemstagslib->{$data->{'tag'}}->{$code->{'code'}}->{lib};
-			$this_row{$data->{'tag'}.$code->{'code'}} =$code->{'content'};
-			}			
-		    }# subfield
-		}## each field
-	if (%this_row) {
-	push(@big_array, \%this_row);
-	}
-}## each record
-my ($holdingbrtagf,$holdingbrtagsubf) = &MARCfind_marc_from_kohafield("holdingbranch","holdings");
- at big_array = sort {$a->{$holdingbrtagsubf} cmp $b->{$holdingbrtagsubf}} @big_array;
-
-#fill big_row with missing datas
-foreach my $subfield_code  (keys(%witness)) {
-	for (my $i=0;$i<=$#big_array;$i++) {
-		$big_array[$i]{$subfield_code}="&nbsp;" unless ($big_array[$i]{$subfield_code});
-	}
-}
-# now, construct template !
-my @item_value_loop;
-my @header_value_loop;
-for (my $i=0;$i<=$#big_array; $i++) {
-	my $items_data;
-	foreach my $subfield_code (keys(%witness)) {
-		$items_data .="<td>".$big_array[$i]{$subfield_code}."</td>";
-	}
-	my %row_data;
-	$row_data{item_value} = $items_data;
-	push(@item_value_loop,\%row_data);
-}
-foreach my $subfield_code (keys(%witness)) {
-	my %header_value;
-	$header_value{header_value} = $witness{$subfield_code};
-	push(@header_value_loop, \%header_value);
-}
-
-my $subscriptionsnumber = GetSubscriptionsFromBiblionumber($biblionumber);
-$template->param(item_loop => \@item_value_loop,
-						item_header_loop => \@header_value_loop,
-						biblionumber => $biblionumber,
-						subscriptionsnumber => $subscriptionsnumber,
-						popup => $popup,
-						hide_marc => C4::Context->preference('hide_marc'),
-						intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-						);
-}##if $xmlhash
-$template->param(biblionumber => $biblionumber,);
-output_html_with_http_headers $query, $cookie, $template->output;
-
-sub get_authorised_value_desc ($$$$$) {
-   my($tag, $subfield, $value, $framework, $dbh) = @_;
-
-   #---- branch
-    if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
-       return getbranchname($value);
-    }
-
-   #---- itemtypes
-   if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
-       return ItemType($value);
-    }
-
-   #---- "true" authorized value
-   my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};
-
-   if ($category ne "") {
-       my $sth = $dbh->prepare("select lib from authorised_values where category = ? and authorised_value = ?");
-       $sth->execute($category, $value);
-       my $data = $sth->fetchrow_hashref;
-       return $data->{'lib'};
-   } else {
-       return $value; # if nothing is found return the original value
-   }
-}

Index: cgi-bin/catalogue/bookcount.pl
===================================================================
RCS file: cgi-bin/catalogue/bookcount.pl
diff -N cgi-bin/catalogue/bookcount.pl
--- cgi-bin/catalogue/bookcount.pl	10 Mar 2007 01:15:01 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,173 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: bookcount.pl,v 1.1.2.1 2007/03/10 01:15:01 tgarip1957 Exp $
-
-#written 7/3/2002 by Finlay
-#script to display reports
-
-
-# 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 CGI;
-use C4::Context;
-use C4::Search;
-use C4::Circulation::Circ2;
-use C4::Interface::CGI::Output;
-use C4::Koha;
-use C4::Auth;
-use C4::Date;
-# get all the data ....
-my %env;
-my $main='#cccc99';
-my $secondary='#ffffcc';
-
-my $input = new CGI;
-my $itemnumber = $input->param('itemnumber');
-my $biblionumber = $input->param('biblionumber');
-my $branches = GetBranches();
-
-my $idata = getiteminformation(undef,$itemnumber);
-
-# my $homebranch = $branches->{$idata->{'homebranch'}}->{'branchname'};
- my $homebranch = $idata->{'homebranch'};
-my $holdingbranch = $branches->{$idata->{'holdingbranch'}}->{'branchname'};
-
-my ($lastmove, $message) = lastmove($itemnumber);
-
-my $lastdate;
-my $count;
-if (!$lastmove) {
-    $lastdate = $message;
-    $count = issuessince($itemnumber , 0);
-} else {
-    $lastdate = format_date($lastmove->{'datearrived'});
-    $count = issuessince($itemnumber ,$lastdate);
-}
-
-# make the page ...
-
-my ($template, $loggedinuser, $cookie)
-      = get_template_and_user({template_name => "catalogue/bookcount.tmpl",
-	                                 query => $input,
-	                                 type => "intranet",
-	                                 authnotrequired => 0,
-	                                 flagsrequired => {borrowers => 1},
-	                                 debug => 1,
-	                                 });
-
-
-
-my @branchloop;
-
-foreach my $branchcode (keys %$branches) {
-	my %linebranch;
-    $linebranch{issues} = issuesat($itemnumber, $branchcode);
-    my $date = lastseenat($itemnumber, $branchcode);
-    $linebranch{seen} = slashdate($date);
-	$linebranch{branchname}=$branches->{$branchcode}->{'branchname'};
-	push(@branchloop,\%linebranch);
-}
-
-$template->param(	biblionumber => $biblionumber,
-								title => $idata->{'title'},
-								author => $idata->{'author'},
-								barcode => $idata->{'barcode'},
-								homebranch =>$homebranch,
-								holdingbranch => $holdingbranch,
-								lastdate =>  $lastdate,
-								count =>  $count,
-								branchloop => \@branchloop);
-
-output_html_with_http_headers $input, $cookie, $template->output;
-
-
-##############################################
-# This stuff should probably go into C4::Search
-
-
-sub lastmove {
-      my ($itemnumber)=@_;
-      my $dbh = C4::Context->dbh;
-      my $sth =$dbh->prepare("select max(branchtransfers.datearrived) from branchtransfers where branchtransfers.itemnumber=?");
-      $sth->execute($itemnumber);
-      my ($date) = $sth->fetchrow;
-      return(0, "Item has no branch transfers record") unless $date;
-      $sth=$dbh->prepare("Select * from branchtransfers where branchtransfers.itemnumber=? and branchtransfers.datearrived=?");
-      $sth->execute($itemnumber,$date);
-      my ($data) = $sth->fetchrow_hashref;
-      return(0, "Item has no branch transfers record") unless $data;
-      $sth->finish;
-      return($data,"");
- }
-
-sub issuessince {
-      my ($itemnumber, $date)=@_;
-      my $dbh = C4::Context->dbh;
-      my $sth=$dbh->prepare("Select count(*) from issues where issues.itemnumber=? and issues.timestamp > ?");
-      $sth->execute($itemnumber,$date);
-      my $count=$sth->fetchrow_hashref;
-      $sth->finish;
-      return($count->{'count(*)'});
-}
-
-sub issuesat {
-      my ($itemnumber, $brcd)=@_;
-      my $dbh = C4::Context->dbh;
-      my $sth=$dbh->prepare("Select count(*) from issues where itemnumber=? and branchcode = ?");
-      $sth->execute($itemnumber,$brcd);
-      my ($count)=$sth->fetchrow_array;
-      $sth->finish;
-      return($count);
-}
-
-sub lastseenat {
-      my ($itemnumber, $brc)=@_;
-      my $dbh = C4::Context->dbh;
-      my $sth=$dbh->prepare("Select max(timestamp) from issues where itemnumber=? and branchcode = ?");
-      $sth->execute($itemnumber,$brc);
-      my ($date1)=$sth->fetchrow_array;
-      $sth->finish;
-      $sth=$dbh->prepare("Select max(datearrived) from branchtransfers where itemnumber=? and tobranch = ?");
-      $sth->execute($itemnumber,$brc);
-      my ($date2)=$sth->fetchrow_array;
-      $sth->finish;
-      #FIXME: MJR thinks unsafe
-      $date2 =~ s/-//g;
-      $date2 =~ s/://g;
-      $date2 =~ s/ //g;
-      my $date;
-      if ($date1 < $date2) {
-	  $date = $date2;
-      } else {
-	  $date = $date1;
-      }
-      return($date);
-}
-
-
-#####################################################
-# write date....
-sub slashdate {
-    my ($date) = @_;
-    if (not $date) {
-	return "never";
-    }
-    my ($yr, $hr) = (substr($date, 0, 10),  substr($date, 11, 5));
-    return "$hr  " . format_date($yr);
-}

Index: cgi-bin/catalogue/catalogue-search.pl
===================================================================
RCS file: cgi-bin/catalogue/catalogue-search.pl
diff -N cgi-bin/catalogue/catalogue-search.pl
--- cgi-bin/catalogue/catalogue-search.pl	10 Mar 2007 01:15:01 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,393 +0,0 @@
-#!/usr/bin/perl
-use strict;
-
-use CGI ;
-
-use C4::Search;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Biblio;
-use C4::Koha;
-use POSIX qw(ceil floor);
-my $query = CGI->new();
-my $dbh = C4::Context->dbh;
-my $op = $query->param('op'); #show the search form or execute the search
-
-my $format=$query->param('MARC');
-my ($template, $borrowernumber, $cookie);
-
-# get all the common search variables, 
-my @value=$query->param('value');
-my @kohafield=$query->param('kohafield');
-my @and_or=$query->param('and_or');
-my @relation=$query->param('relation');
-my $order=$query->param('order');
-my $reorder=$query->param('reorder');
-my $number_of_results=$query->param('number_of_results');
-my $zoom=$query->param('zoom');
-my $ascend=$query->param('asc');
-my $searchtype=$query->param('searchtype'); ## this is actual query type
-my $serverid=$query->param('serverid');
-$serverid=-1 unless($serverid eq "0"  || $serverid>0);
-my @marclist = $query->param('marclist');
-# collect all the fields ...
-my %search;
-my @forminputs;		#this is for the links to navigate among the results
-my (@searchdesc, %hashdesc,$facetsdesc); 	#this is to show the description of the current search
-my @fields = ('value', 'kohafield', 'and_or', 'relation','order','barcode','biblionumber','itemnumber','asc','from','searchtype');
-
-###Collect all the marclist values coming from old Koha MARCdetails
-## Although we can not search on all marc fields- if any is matched in Zebra we can use it 
-my $sth=$dbh->prepare("Select kohafield from koha_attr where tagfield=? and tagsubfield=? and intrashow=1");
-foreach my $marc (@marclist) {
-		if ($marc) {
-		$sth->execute(substr($marc,0,3),substr($marc,3,1));
-			if ((my $kohafield)=$sth->fetchrow){
-			push @kohafield,$kohafield;
-			push @and_or,"\@or";
-			push @value, at value[0] if @kohafield>1;
-			push @relation ,"\@attr 5=1";
-			}
-		}
-}
-#### Now   normal search routine
-foreach my $field (@fields) {
-	$search{$field} = $query->param($field);
-	my @fieldvalue = $query->param($field);
-	foreach my $fvalue (@fieldvalue) {
-		push @forminputs, { field=>$field ,value=> $fvalue} unless ($field eq 'reorder');
-		
-	  }
-}
-## Build the query for facets as well
- for (my $i=0;$i<@value;$i++){
-$facetsdesc.="&value=".$value[$i];
-$facetsdesc.="&kohafield=".$kohafield[$i];
-$facetsdesc.="&relation=".$relation[$i];
-$facetsdesc.="&and_or=".$and_or[$i];
-}
-$facetsdesc.="&order=".$order;
-$hashdesc{'query'} = join " , ", @value;
-push @searchdesc,\%hashdesc;
-
-
-############################################################################
-if ($op eq "do_search"){
- 
-#this fields is just to allow the user come back to the search form with all the values  previously entered
-$search{'search_type'} = $query->param('search_type');# this is the panel type
-push @forminputs, {field => 'search_type', value => $search{'search_type'}};
-
-
-	($template, $borrowernumber, $cookie)
-		= get_template_and_user({template_name => "catalogue/catalogue_searchresults.tmpl",
-					 query => $query,
-					 type => "intranet",
-					 authnotrequired => 1,
-	});
-
-	$search{'from'} = 'intranet';
-	$search{'borrowernumber'} = $borrowernumber;
-	$search{'remote_IP'} = $query->remote_addr();
-	$search{'remote_URL'} = $query->url(-query=>1);
-	$search{'searchdesc'} = \@searchdesc;
-	$template->param(FORMINPUTS => \@forminputs);
-	$template->param(reorder => $query->param('reorder'));
-	$template->param(facetsdesc=>$facetsdesc);
-	# do the searchs ....
-	 $number_of_results = 10 unless $number_of_results;
-	my $startfrom=$query->param('startfrom');
-	($startfrom) || ($startfrom=0);
-my ($count, at results,$facets);
-if ($serverid>0){
- my $sth=$dbh->prepare("select * from online_databases where serverid=?");
-  $sth->execute($serverid);
-
-  my  $server=$sth->fetchrow_hashref ;
-
-my	$serverquery=$server->{search_string};
-	if ($server->{$kohafield[0]} ne ""){
-	$serverquery.=$server->{$kohafield[0]."_query"}.$value[0];
-	}else{
-	$serverquery.=$server->{"any_query"}.$value[0]."&relation=$relation[0]";
-	}
-print $query->redirect($serverquery);
-  
-}##serverid>0
-if ($serverid eq "0"){
-use ZOOM;
-my @oConnection;
-my @oResult;
-my $s=0;
-my $server;							
-my @serverhost;
-my @serverquery;
-my @query;							
-my @onlineloop;
-my $numberpending;
-my $even=1;			
-  my $sth=$dbh->prepare("select * from online_databases ");
-  $sth->execute();
-
-    while ($server=$sth->fetchrow_hashref) {
-	my $noconnection=0;
-	
-							
-	my $option1=new ZOOM::Options();
-	$option1->option(async=>1);
-	$option1->option('elementSetName', 'F');
-	$option1->option('databaseName',$server->{db})  ;
-	$option1->option('user',$server->{userid})  ;
-	$option1->option('password',$server->{password})  ;
-	 $oConnection[$s]=create ZOOM::Connection($option1);
-	$oConnection[$s]->connect($server->{host}, $server->{port});
-	$serverhost[$s]=$server->{server};
-	$serverquery[$s]=$server->{search_string};
-	if ($server->{$kohafield[0]} ne ""){
-	$serverquery[$s].=$server->{$kohafield[0]."_query"}.$value[0];
-	}else{
-	$serverquery[$s].=$server->{"any_query"}.$value[0];
-	}
- $query[$s]=$server->{$kohafield[0]}." \"".$value[0]."\"";	
-
-	$s++;
-    }## while fetch
-
- 
-my $nremaining = $s;
-my $firstresult=1;
- for (my $z=0 ;$z<$s;$z++){
-$oResult[$z] = $oConnection[$z]->search_pqf($query[$z]);
-
-}
-AGAIN:
- my $k;
-my $event;
-  while (($k = ZOOM::event(\@oConnection)) != 0) {
-	$event = $oConnection[$k-1]->last_event();
-# warn ("connection ", $k-1, ": event $event (", ZOOM::event_str($event), ")\n");
-	last if $event == ZOOM::Event::ZEND;
-   }
-if ($k != 0) {
-	$k--;
-#warn $serverhost[$k];
-	 my($error, $errmsg, $addinfo, $diagset) = $oConnection[$k]->error_x();
-   	if ($error) {
-	warn "$k $serverhost[$k] error $query[$k]: $errmsg ($error) $addinfo\n";
-	goto MAYBE_AGAIN;
-  	}
-	
-	my $numresults=$oResult[$k]->size() ;								
- 									
-
-	if ($numresults>0){
-	
-		
-
-			my %row_data;
- 	
-	$row_data{even} = $even;
-	$row_data{server} = $serverhost[$k];
-	$row_data{numresults} = $numresults;
-
-	$row_data{search_string} =$serverquery[$k];
-	
-	$even=!$even;
-	push (@onlineloop, \%row_data);
-
-						
-}# $numresults
-
-}# if $k !=0
-
-
-$numberpending=$nremaining-1;
-
-MAYBE_AGAIN:
-if (--$nremaining > 0) {
-    goto AGAIN;
-}
-$template->param(onlineloop=>\@onlineloop,);
-}##serverid==0
-if (!$zoom){
-## using sql search for barcode,biblionumber or itemnumber only useful for libraian interface
-	($count, @results) =sqlsearch($dbh,\%search);
-}else{
-my $sortorder=$order.$ascend if $order;
- ($count,$facets, at results) =ZEBRAsearch_kohafields(\@kohafield,\@value, \@relation,$sortorder, \@and_or, 1,$reorder,$startfrom, $number_of_results,"intranet",$searchtype);
-}
-my $timetaken=$results[0]->{timetaken} if $count>0;
-	if ( $count eq "error"){
-	$template->param(error =>1);
-	goto "show";
-	}
-	my $num = scalar(@results) - 1;
-if ( $count == 1){
-    # if its a barcode search by definition we will only have one result.
-    # And if we have a result
-    # lets jump straight to the detail.pl page
-	if ($format eq '1') {
-    print $query->redirect("/cgi-bin/koha/catalogue/MARCdetail.pl?type=intra&biblionumber=$results[0]->{'biblionumber'}");
-	}else{
-    print $query->redirect("/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=$results[0]->{'biblionumber'}");
-	}
-}
-	# sorting out which results to display.
-		# the total results searched
-	$template->param(numrecords => $count);
-	$template->param(FORMINPUTS => \@forminputs );
-	$template->param(searchdesc => \@searchdesc );
-if ($serverid==-1){
-	# the result number to star to show
-	$template->param(startfrom => $startfrom);
-	$template->param(beginning => $startfrom+1);
-	# the result number to end to show
-	($startfrom+$num<=$count) ? ($template->param(endat => $startfrom+$num+1)) : ($template->param(endat => $count));
-
-	
- 	$template->param(SEARCH_RESULTS => \@results,timetaken=>$timetaken,);
-
-$template->param(facets_loop => $facets,) if $facets;
-	#this is to show the images numbers to navigate among the results, if it has to show the number highlighted or not
-	my $numbers;
-	@$numbers = ();
-	my $pg = 1;
-	if (defined($query->param('pg'))) {
-		$pg = $query->param('pg');
-	}
-	my $start = 0;
-	
-	$start = ($pg - 1) * $number_of_results;
-	my $pages = ceil($count / $number_of_results);
-	my $total_pages = ceil($count / $number_of_results);
-
-	if ($pg > 1) {
-		my $url = $pg - 1;
-		push @$numbers, { number => "&lt;&lt;",  forminputs=>\@forminputs,
-					      highlight => 0 , 
-					      startfrom => 1, 
-					      pg => '1' };
-		push @$numbers, { number => "&lt;", 
-						  highlight => 0 , forminputs=>\@forminputs,
-						  startfrom => ($url-1)*$number_of_results+1, 
-						  pg => $url };
-	}
-	my $current_ten = $pg / 10;
-	if ($current_ten == 0) {
-		 $current_ten = 0.1;           # In case it´s in ten = 0
-	} 
-	my $from = $current_ten * 10; # Calculate the initial page
-	my $end_ten = $from + 9;
-	my $to;
-	if ($pages > $end_ten) {
-		$to = $end_ten;
-	} else {
-		$to = $pages;
-	}
-	for (my $i = $from; $i <= $to ; $i++) {
-		if ($i == $pg) {   
-			if ($count > $number_of_results) {
-				push @$numbers, { number => $i, 
-								  highlight => 1 , forminputs=>\@forminputs,
-								  startfrom => ($i-1)*$number_of_results , 
-								  pg => $i };
-			}
-		} else {
-			push @$numbers, { number => $i, 
-							  highlight => 0 , forminputs=>\@forminputs,
-							  startfrom => ($i-1)*$number_of_results , 
-							  pg => $i };
-		}
-	}	        					
-	if ($pg < $pages) {
-		my $url = $pg + 1;
-		push @$numbers, { number => "&gt;", 
-						  highlight => 0 , forminputs=>\@forminputs,
-						  startfrom => ($url-1)*$number_of_results, 
-						  pg => $url };
-		push @$numbers, { number => "&gt;&gt;", 
-						  highlight => 0 , forminputs=>\@forminputs,
-						  startfrom => ($total_pages-1)*$number_of_results, 
-						  pg => $total_pages};
-	}
-#	push @$numbers,{forminputs=>@forminputs};
-	$template->param(numbers =>$numbers,
-			);
-	#show the virtual shelves
-	#my $results = &GetShelfList($borrowernumber);
-	#$template->param(shelvescount => scalar(@{$results}));
-	#$template->param(shelves => $results);
- 
-########
-if ($format eq '1') {
-	$template->param(script => "catalogue/MARCdetail.pl");
-}else{
-	$template->param(script => "catalogue/detail.pl");
-}
-}#serverid==-1
-}else{ ## No search yet
-($template, $borrowernumber, $cookie)
-		= get_template_and_user({template_name => "catalogue/catalogue_search.tmpl",
-					query => $query,
-					type => "intranet",
-					authnotrequired => 1,
-				});
-#show kohafields
-	my $kohafield = $query->param('kohafield');
-	my ($fieldcount, at kohafields)=getkohafields();
-	foreach my $row (@kohafields) {
-		if ($kohafield eq $row->{'kohafield'}) {
-			$row->{'sel'} = 1;
-		}
-	}
-	$template->param(kohafields => \@kohafields);
-##show sorting fields
-my @sorts;
- $order=$query->param('order');
-	foreach my $sort (@kohafields) {
-	    if ($sort->{sorts}){
-		push @sorts,$sort;
-		if ($order eq $sort->{'kohafield'}) {
-			$sort->{'sel'} = 1;
-		}
-	   }
-	}
-	$template->param(sorts => \@sorts);
-# load the branches
-my @branches = GetallBranches();
-$template->param(branchloop => \@branches,);
-
-# load the itemtypes 
-my $itemtypes=GetItemTypes();
-my (@item_type_loop);
-foreach my $thisitemtype (sort keys %$itemtypes) {
-    my %row =(itemtype => $thisitemtype,
-                 description => $itemtypes->{$thisitemtype}->{'description'},
-            );
-    push @item_type_loop, \%row;
-}
-##Show catalogues
-my $sth=$dbh->prepare("select serverid,server from online_databases");
-$sth->execute();
-my @serverloop;
-while (my $server=$sth->fetchrow_hashref) {
-my %temploop;
-$temploop{server}=$server->{server};
-$temploop{serverid}=$server->{serverid};
-
-push (@serverloop, \%temploop);
-}
-$sth->finish;
-$template->param(	servers => \@serverloop,);
-$template->param(itemtypeloop=>\@item_type_loop,);
-my $search_type = $query->param('search_type');
-	if ((!$search_type) || ($search_type eq 'zoom'))  {
-		$template->param(zoom_search => 1);
-	} else{
-		$template->param(sql_search => 1);
-	} 
-}
-
-show:
-output_html_with_http_headers($query, $cookie, $template->output());
-

Index: cgi-bin/catalogue/cyprus-search.pl
===================================================================
RCS file: cgi-bin/catalogue/cyprus-search.pl
diff -N cgi-bin/catalogue/cyprus-search.pl
--- cgi-bin/catalogue/cyprus-search.pl	10 Mar 2007 01:15:01 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,302 +0,0 @@
-#!/usr/bin/perl
-use strict;
-
-use CGI;
-#use C4::Search;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Biblio;
-use C4::Koha;
-use POSIX qw(ceil floor);
-use C4::Date;
-use utf8;
-my $query = new CGI;
-my $dbh = C4::Context->dbh;
-
-my $op = $query->param('op'); #show the search form or execute the search
-
-my $format=$query->param('MARC');
-my ($template, $borrowernumber, $cookie);
-
-# get all the common search variables, 
-my @value=$query->param('value');
-my @kohafield=$query->param('kohafield');
-my @and_or=$query->param('and_or');
-my @relation=$query->param('relation');
-my $order=$query->param('order');
-my $reorder=$query->param('reorder');
-my $number_of_results=$query->param('number_of_results');
-my $zoom=$query->param('zoom');
-my $ascend=$query->param('asc');
-my $searchtype=$query->param('searchtype'); ## this is actual query type
-my $serverid=$query->param('serverid');
-$serverid=-1 unless($serverid eq "0"  || $serverid>0);
-my @marclist = $query->param('marclist');
-# collect all the fields ...
-my %search;
-my @forminputs;		#this is for the links to navigate among the results
-my (@searchdesc, %hashdesc,$facetsdesc); 	#this is to show the description of the current search
-my @fields = ('value', 'kohafield', 'and_or', 'relation','order','barcode','biblionumber','itemnumber','asc','from','searchtype');
-
-###Collect all the marclist values coming from old Koha MARCdetails
-## Although we can not search on all marc fields- if any is matched in Zebra we can use it 
-my $sth=$dbh->prepare("Select kohafield from koha_attr where tagfield=? and tagsubfield=? and intrashow=1");
-foreach my $marc (@marclist) {
-		if ($marc) {
-		$sth->execute(substr($marc,0,3),substr($marc,3,1));
-			if ((my $kohafield)=$sth->fetchrow){
-			push @kohafield,$kohafield;
-			push @and_or,"\@or";
-			push @value, at value[0] if @kohafield>1;
-			push @relation ,"\@attr 5=1";
-			}
-		}
-}
-#### Now   normal search routine
-foreach my $field (@fields) {
-	$search{$field} = $query->param($field);
-	my @fieldvalue = $query->param($field);
-	foreach my $fvalue (@fieldvalue) {
-		push @forminputs, { field=>$field ,value=> $fvalue} unless ($field eq 'reorder');
-		
-	  }
-}
-## Build the query for facets as well
- for (my $i=0;$i<@value;$i++){
-$facetsdesc.="&value=".$value[$i];
-$facetsdesc.="&kohafield=".$kohafield[$i];
-$facetsdesc.="&relation=".$relation[$i];
-$facetsdesc.="&and_or=".$and_or[$i];
-}
-$facetsdesc.="&order=".$order;
- for (my $i=0;$i<@value;$i++){
-$hashdesc{$kohafield[$i]}.=$value[$i].", " if $value[$i];
-}
-push @searchdesc,\%hashdesc;
-
-
-############################################################################
-if ($op eq "do_search"){
- 
-#this fields is just to allow the user come back to the search form with all the values  previously entered
-$search{'search_type'} = $query->param('search_type');# this is the panel type
-push @forminputs, {field => 'search_type', value => $search{'search_type'}};
-
-
-	($template, $borrowernumber, $cookie)
-		= get_template_and_user({template_name => "catalogue/news_searchresults.tmpl",
-					 query => $query,
-					 type => "intranet",
-					 authnotrequired => 1,
-	});
-
-	$search{'from'} = 'intranet';
-	$search{'borrowernumber'} = $borrowernumber;
-	$search{'remote_IP'} = $query->remote_addr();
-	$search{'remote_URL'} = $query->url(-query=>1);
-	$search{'searchdesc'} = \@searchdesc;
-	$template->param(FORMINPUTS => \@forminputs);
-	$template->param(reorder => $query->param('reorder'));
-	$template->param(facetsdesc=>$facetsdesc);
-	# do the searchs ....
-	 $number_of_results = 10 unless $number_of_results;
-	my $startfrom=$query->param('startfrom');
-	($startfrom) || ($startfrom=0);
-my ($count, at results,$facets);
-
-
-
-my @oConnection;
-my $oResult;
-my $s=0;
-my $server;							
-my @serverhost;
-my @serverquery;
-my $serverquery;							
-my @onlineloop;
-my $numberpending;
-my $even=1;			
- 	my $noconnection=0;
-	
-							
-	
-	 $oConnection[0]=C4::Context->Zconn("cyprus");
-	
-my $keyattr=MARCfind_attr_from_kohafield($kohafield[0]) if ($kohafield[0]);
-	if (!$keyattr){$keyattr=" \@attr 1=any";}
- $serverquery=$keyattr." ".$relation[0]." \"".$value[0]."\"";		
-
-$serverquery=new ZOOM::Query::PQF($serverquery);
-
-my $firstresult=1;
- 
-
-if ($reorder){
-$serverquery->sortby($reorder);
-}else{
-$serverquery->sortby("date i>");
-}
-$oResult = $oConnection[0]->search($serverquery);
-AGAIN:
- my $k;
-my $event;
-  while (($k = ZOOM::event(\@oConnection)) != 0) {
-	$event = $oConnection[$k-1]->last_event();
-# warn ("connection ", $k-1, ": event $event (", ZOOM::event_str($event), ")\n");
-	last if $event == ZOOM::Event::ZEND;
-   }
-if ($k != 0) {
-	$k--;
-#warn $serverhost[$k];
-	 my($error, $errmsg, $addinfo, $diagset) = $oConnection[$k]->error_x();
-   	if ($error) {
-	warn "newsquery error $serverquery: $errmsg ($error) $addinfo\n";
-  	}
-	
-	my $numresults=$oResult->size() ;								
- 									
-
-	if ($numresults>0){
-	$count=$numresults;
-		
-my $ri=0;
-	my $z=0;
-
-	$ri=$startfrom if $startfrom;
-		for ( $ri; $ri<$numresults ; $ri++){
-
-		my $xmlrecord=$oResult->record($ri)->raw();
-		$xmlrecord=Encode::decode("utf8",$xmlrecord);
-			 $xmlrecord=XML_xml2hash_news($xmlrecord);
-			$z++;
-#warn unpack('U',$xmlrecord->{title});
-
-			$xmlrecord->{title}="No title" if ( unpack('U',$xmlrecord->{title})==65279) ;
-			$xmlrecord->{date}=format_date($xmlrecord->{date});
-			push @results,$xmlrecord;
-			last if ($number_of_results &&  $z>=$number_of_results);
-			
-	
-		}## for #numresults	
-
-						
-	}# $numresults
-
-}# if $k !=0
-
-
-
-
-
-
-	if ( $count eq "error"){
-	$template->param(error =>1);
-	goto "show";
-	}
-	my $num = scalar(@results) - 1;
-if ( $count == 1){
-    # if its a barcode search by definition we will only have one result.
-    # And if we have a result
-    # lets jump straight to the detail.pl page
-
-    print $query->redirect("/cgi-bin/koha/catalogue/newsdetail.pl?type=intra&id=$results[0]->{'id'}");
-	
-}
-	# sorting out which results to display.
-		# the total results searched
-	$template->param(numrecords => $count);
-	$template->param(FORMINPUTS => \@forminputs );
-	$template->param(searchdesc => \@searchdesc );
-
-	# the result number to star to show
-	$template->param(startfrom => $startfrom);
-	$template->param(beginning => $startfrom+1);
-	# the result number to end to show
-	($startfrom+$num<=$count) ? ($template->param(endat => $startfrom+$num+1)) : ($template->param(endat => $count));
-
-	
- 	$template->param(SEARCH_RESULTS => \@results,
-			);
-
-	#this is to show the images numbers to navigate among the results, if it has to show the number highlighted or not
-	my $numbers;
-	@$numbers = ();
-	my $pg = 1;
-	if (defined($query->param('pg'))) {
-		$pg = $query->param('pg');
-	}
-	my $start = 0;
-	
-	$start = ($pg - 1) * $number_of_results;
-	my $pages = ceil($count / $number_of_results);
-	my $total_pages = ceil($count / $number_of_results);
-
-	if ($pg > 1) {
-		my $url = $pg - 1;
-		push @$numbers, { number => "&lt;&lt;",  forminputs=>\@forminputs,
-					      highlight => 0 , 
-					      startfrom => 1, 
-					      pg => '1' };
-		push @$numbers, { number => "&lt;", 
-						  highlight => 0 , forminputs=>\@forminputs,
-						  startfrom => ($url-1)*$number_of_results+1, 
-						  pg => $url };
-	}
-	my $current_ten = $pg / 10;
-	if ($current_ten == 0) {
-		 $current_ten = 0.1;           # In case it´s in ten = 0
-	} 
-	my $from = $current_ten * 10; # Calculate the initial page
-	my $end_ten = $from + 9;
-	my $to;
-	if ($pages > $end_ten) {
-		$to = $end_ten;
-	} else {
-		$to = $pages;
-	}
-	for (my $i = $from; $i <= $to ; $i++) {
-		if ($i == $pg) {   
-			if ($count > $number_of_results) {
-				push @$numbers, { number => $i, 
-								  highlight => 1 , forminputs=>\@forminputs,
-								  startfrom => ($i-1)*$number_of_results , 
-								  pg => $i };
-			}
-		} else {
-			push @$numbers, { number => $i, 
-							  highlight => 0 , forminputs=>\@forminputs,
-							  startfrom => ($i-1)*$number_of_results , 
-							  pg => $i };
-		}
-	}	        					
-	if ($pg < $pages) {
-		my $url = $pg + 1;
-		push @$numbers, { number => "&gt;", 
-						  highlight => 0 , forminputs=>\@forminputs,
-						  startfrom => ($url-1)*$number_of_results, 
-						  pg => $url };
-		push @$numbers, { number => "&gt;&gt;", 
-						  highlight => 0 , forminputs=>\@forminputs,
-						  startfrom => ($total_pages-1)*$number_of_results, 
-						  pg => $total_pages};
-	}
-#	push @$numbers,{forminputs=>@forminputs};
-	$template->param(numbers =>$numbers,
-			);
-	#show the virtual shelves
-	#my $results = &GetShelfList($borrowernumber);
-	#$template->param(shelvescount => scalar(@{$results}));
-	#$template->param(shelves => $results);
- 
-########
-
-	$template->param(script => "catalogue/newsdetail.pl");
-
-
-}else{ ## No search yet
-print $query->redirect("/cgi-bin/koha/catalogue/catalogue-search.pl");
-}
-
-show:
-output_html_with_http_headers $query, $cookie, $template->output();
-

Index: cgi-bin/catalogue/detail.pl
===================================================================
RCS file: cgi-bin/catalogue/detail.pl
diff -N cgi-bin/catalogue/detail.pl
--- cgi-bin/catalogue/detail.pl	10 Mar 2007 01:15:01 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,81 +0,0 @@
-#!/usr/bin/perl
-use strict;
-use C4::Search;
-use C4::Auth;
-use C4::Serials; #uses getsubscriptionfrom biblionumber
-use C4::Interface::CGI::Output;
-use CGI;
-use C4::Biblio;
-use C4::Context;
-
-my $dbh=C4::Context->dbh;
-my $query=new CGI;
-my ($template, $borrowernumber, $cookie) 
-    = get_template_and_user({template_name => "catalogue/detail.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 1,
-			     flagsrequired => {borrow => 1},
-			     });
-
-my $biblionumber=$query->param('biblionumber');
-
-$template->param(biblionumber => $biblionumber,);
-my $retrieve_from=C4::Context->preference('retrieve_from');
-my ($record,$frameworkcode);
-my @itemrecords;
-my @items;
-if ($retrieve_from eq "zebra"){
-($record, at itemrecords)=ZEBRAgetrecord($biblionumber);
-}else{
- $record =XMLgetbiblio($dbh,$biblionumber);
-$record=XML_xml2hash_onerecord($record);
-my @itemxmls=XMLgetallitems($dbh,$biblionumber);
-	foreach my $itemrecord(@itemxmls){
-	my $itemhash=XML_xml2hash_onerecord($itemrecord);
-	push @itemrecords, $itemhash;
-	}
-}	
-
-my $dat = XMLmarc2koha_onerecord($dbh,$record,"biblios");
-$dat->{biblionumber}=$biblionumber unless $dat->{biblionumber};
-my $norequests = 1;
-foreach my $itemrecord (@itemrecords){
-
-my $item= XMLmarc2koha_onerecord($dbh,$itemrecord,"holdings");
-$item=ItemInfo($dbh,$item);
-$item->{itemtype}=$dat->{itemtype};
-  $norequests = 0 unless $item->{'notforloan'};
-   $item->{$item->{'publictype'}} = 1; ## NOT sure what this is kept from old db probably useless now
-push @items,$item;
-}
-
-my $subscriptionsnumber = GetSubscriptionsFromBiblionumber($biblionumber);
-
-$dat->{'count'}=@items;
-$template->param(count =>$dat->{'count'});
-$template->param(norequests => $norequests);
-
-  ## get notes subjects and URLS from MARC record
-	
-	my $marcflavour = C4::Context->preference("marcflavour");
-	my $marcnotesarray = &getMARCnotes($dbh,$record,$marcflavour);
-	my $marcsubjctsarray = &getMARCsubjects($dbh,$record,$marcflavour);
-	my $marcurlssarray = &getMARCurls($dbh,$record,$marcflavour);
-	$template->param(MARCURLS => $marcurlssarray);
-	$template->param(MARCNOTES => $marcnotesarray);
-	$template->param(MARCSUBJCTS => $marcsubjctsarray);
-
-
-my @results = ($dat,);
-
-my $resultsarray=\@results;
-my $itemsarray=\@items;
-
-
-$template->param(BIBLIO_RESULTS => $resultsarray,
-				ITEM_RESULTS => $itemsarray,
-				subscriptionsnumber => $subscriptionsnumber,
-);
-
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/catalogue/detailprint.pl
===================================================================
RCS file: cgi-bin/catalogue/detailprint.pl
diff -N cgi-bin/catalogue/detailprint.pl
--- cgi-bin/catalogue/detailprint.pl	10 Mar 2007 01:15:01 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,97 +0,0 @@
-#!/usr/bin/perl
-# NOTE: Use standard 8-space tabs for this file (indents are 4 spaces)
-
-# 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::Search;
-use C4::Auth;
-use C4::Serials; #uses getsubscriptionfrom biblionumber
-use C4::Interface::CGI::Output;
-use CGI;
-use C4::Biblio;
-use C4::Context;
-
-my $dbh=C4::Context->dbh;
-my $query=new CGI;
-my ($template, $borrowernumber, $cookie) 
-    = get_template_and_user({template_name => "catalogue/detailprint.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 1,
-			     flagsrequired => {borrow => 1},
-			     });
-
-my $biblionumber=$query->param('biblionumber');
-$template->param(biblionumber => $biblionumber);
-my $retrieve_from=C4::Context->preference('retrieve_from');
-my ($record,$frameworkcode);
-my @itemrecords;
-my @items;
-if ($retrieve_from eq "zebra"){
-($record, at itemrecords)=ZEBRAgetrecord($biblionumber);
-}else{
- $record =XMLgetbiblio($dbh,$biblionumber);
-$record=XML_xml2hash_onerecord($record);
-my @itemxmls=XMLgetallitems($dbh,$biblionumber);
-	foreach my $itemrecord(@itemxmls){
-	my $itemhash=XML_xml2hash_onerecord($itemrecord);
-	push @itemrecords, $itemhash;
-	}
-}	
-
-my $dat = XMLmarc2koha_onerecord($dbh,$record,"biblios");
-my $norequests = 1;
-foreach my $itemrecord (@itemrecords){
-
-my $item= XMLmarc2koha_onerecord($dbh,$itemrecord,"holdings");
-$item=ItemInfo($dbh,$item);
-$item->{itemtype}=$dat->{itemtype};
-  $norequests = 0 unless $item->{'notforloan'};
-   $item->{$item->{'publictype'}} = 1; ## NOT sure what this is kept from old db probably useless now
-push @items,$item;
-}
-
-my $subscriptionsnumber = GetSubscriptionsFromBiblionumber($biblionumber);
-
-$dat->{'count'}=@items;
-$template->param(count =>$dat->{'count'});
-$template->param(norequests => $norequests);
-
-  ## get notes subjects and URLS from MARC record
-	
-	my $marcflavour = C4::Context->preference("marcflavour");
-	my $marcnotesarray = &getMARCnotes($dbh,$record,$marcflavour);
-	my $marcsubjctsarray = &getMARCsubjects($dbh,$record,$marcflavour);
-	my $marcurlssarray = &getMARCurls($dbh,$record,$marcflavour);
-	$template->param(MARCURLS => $marcurlssarray);
-	$template->param(MARCNOTES => $marcnotesarray);
-	$template->param(MARCSUBJCTS => $marcsubjctsarray);
-
-
-my @results = ($dat,);
-
-my $resultsarray=\@results;
-my $itemsarray=\@items;
-
-
-$template->param(BIBLIO_RESULTS => $resultsarray,
-				ITEM_RESULTS => $itemsarray,
-				subscriptionsnumber => $subscriptionsnumber,
-);
-
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/catalogue/moredetail.pl
===================================================================
RCS file: cgi-bin/catalogue/moredetail.pl
diff -N cgi-bin/catalogue/moredetail.pl
--- cgi-bin/catalogue/moredetail.pl	10 Mar 2007 01:15:01 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,201 +0,0 @@
-#!/usr/bin/perl
-# NOTE: Use standard 8-space tabs for this file (indents are 4 spaces)
-
-# $Id: moredetail.pl,v 1.1.2.1 2007/03/10 01:15:01 tgarip1957 Exp $
-
-# Copyright 2000-2003 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::Koha;
-use CGI;
-use C4::Search;
-use C4::Acquisition;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Date;
-use C4::Context;
-use C4::Biblio;
-use C4::Accounts2;
-use C4::Circulation::Circ2;
-
-my $dbh=C4::Context->dbh;
-my $query=new CGI;
-
-
-my ($template, $loggedinuser, $cookie) = get_template_and_user({
-	template_name   => ( 'catalogue/moredetail.tmpl'),
-	query           => $query,
-	type            => "intranet",
-	authnotrequired => 0,
-	flagsrequired   => {catalogue => 1},
-    });
-
-# get variables
-my $op=$query->param('op');
-my $lost=$query->param('lost');
-my $withdrawn=$query->param('withdrawn');
-my $override=$query->param('override');
-my $itemnumber=$query->param('itemnumber');
-my $barcode=$query->param('barcode');
-
-my $title=$query->param('title');
-my $biblionumber=$query->param('biblionumber');
-my ($record)=XMLgetbibliohash($dbh,$biblionumber);
-my $data=XMLmarc2koha_onerecord($dbh,$record,"biblios");
-my $dewey = $data->{'dewey'};
-# FIXME Dewey is a string, not a number, & we should use a function
-$dewey =~ s/0+$//;
-if ($dewey eq "000.") { $dewey = "";};
-if ($dewey < 10){$dewey='00'.$dewey;}
-if ($dewey < 100 && $dewey > 10){$dewey='0'.$dewey;}
-if ($dewey <= 0){
-      $dewey='';
-}
-$dewey=~ s/\.$//;
-$data->{'dewey'}=$dewey;
-
-my @results;
-
-my @items;
-if ($op eq "update"){
-my $env;
-##Do Lost or Withdraw here
-my $flag=0;
-  my ($resbor,$resrec)=C4::Reserves2::CheckReserves($env,$dbh,$itemnumber);
-if ($override ne "yes"){
-  if ($resbor){
-#    print $query->header;
-    $template->param(error => "This item   has a reserve on it");
- $template->param(biblionumber =>$biblionumber);
- $template->param(itemnumber =>$itemnumber);
- $template->param(lost =>$lost);
- $template->param(withdrawn =>$withdrawn);
-    $flag=1;
-  }
-  my $sth=$dbh->prepare("Select * from issues where (itemnumber=?) and (returndate is null)");
-  $sth->execute($itemnumber);
- 
-  if (my $data=$sth->fetchrow_hashref) {
-   $template->param(biblionumber =>$biblionumber);
- $template->param(itemnumber =>$itemnumber);
- $template->param(error => "This item   is On Loan to a member");
- $template->param(lost =>$lost);
- $template->param(withdrawn =>$withdrawn);
-    $flag=2;
-  }
-  my $sth=$dbh->prepare("Select * from reserveissue where (itemnumber=?) and (rettime is null)");
-  $sth->execute($itemnumber);
- 
-  if (my $data=$sth->fetchrow_hashref) {
-   $template->param(biblionumber =>$biblionumber);
- $template->param(itemnumber =>$itemnumber);
- $template->param(error => "This item   is On Loan to a member");
- $template->param(lost =>$lost);
- $template->param(withdrawn =>$withdrawn);
-    $flag=2;
-  }
-}
-if ($flag != 0 && $override ne "yes"){
-
-  }else {
-   ##UPDATE here
-
-XMLmoditemonefield($dbh,$biblionumber,$itemnumber,'wthdrawn',$withdrawn,1);
-XMLmoditemonefield($dbh,$biblionumber,$itemnumber,'itemlost',$lost);
-
-     if ($lost ==1 && $flag ==2){
-    my $sth=$dbh->prepare("Select * from issues where (itemnumber=?) and (returndate is null)");
-    $sth->execute($itemnumber);
-    my $data=$sth->fetchrow_hashref;
-my $sth3=$dbh->prepare("Select * from reserveissue where (itemnumber=?) and (rettime is null)");
-    $sth3->execute($itemnumber);
-    my $data2=$sth3->fetchrow_hashref;
-    if ($data->{'borrowernumber'} ne '' || $data2->{'borrowernumber'} ne '') {
-my $borrowernumber=$data->{'borrowernumber'} if $data->{'borrowernumber'};
-$borrowernumber=$data2->{'borrowernumber'} if $data2->{'borrowernumber'};
-      #item on issue add replacement cost to borrowers record
-      my $accountno=getnextacctno($env,$data->{'borrowernumber'},$dbh);
-      my $item=getiteminformation($env, $itemnumber);
-	my $replacementprice=60 unless $item->{'replacementprice'};
-      my $sth2=$dbh->prepare("Insert into accountlines
-      (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding,itemnumber)
-      values
-      (?,?,now(),?,?,'L',?,?)");
-      $sth2->execute($borrowernumber,$accountno,$replacementprice,
-      "Lost Item $item->{'title'} $item->{'barcode'}",
-      $replacementprice,$itemnumber);
-      $sth2->finish;
-       $sth3->finish;
-     $sth->finish;
-    }
-    }
-	if ($flag==1){
-	foreach my $res ($resrec){
-	C4::Reserves2::CancelReseve(undef,$res->{itemnumber},$res->{borrowernumber});
-	}
-	}
-    
-  }
-}
-my @itemrecords=XMLgetallitems($dbh,$biblionumber);
-foreach my $itemrecord (@itemrecords){
-$itemrecord=XML_xml2hash_onerecord($itemrecord);
-my $items = XMLmarc2koha_onerecord($dbh,$itemrecord,"holdings");
-$items->{itemtype}=$data->{itemtype};
-$items->{biblionumber}=$biblionumber;
-$items=itemissues($dbh,$items,$items->{'itemnumber'});
-push @items,$items;
-}
-my $count=@items;
-$data->{'count'}=$count;
-my ($order,$ordernum)=GetOrder($biblionumber,$barcode);
-
-my $env;
-$env->{itemcount}=1;
-
-$results[0]=$data;
-
-foreach my $item (@items){
-    $item->{'replacementprice'}=sprintf("%.2f", $item->{'replacementprice'});
-    $item->{'datelastborrowed'}= format_date($item->{'datelastborrowed'});
-    $item->{'dateaccessioned'} = format_date($item->{'dateaccessioned'});
-    $item->{'datelastseen'} = format_date($item->{'datelastseen'});
-    $item->{'ordernumber'} = $ordernum;
-    $item->{'booksellerinvoicenumber'} = $order->{'booksellerinvoicenumber'};
-
-    if ($item->{'date_due'} gt '0000-00-00'){
-	$item->{'date_due'} = format_date($item->{'date_due'});		
-$item->{'issue'}= 1;
-		$item->{'borrowernumber'} = $item->{'borrower'};
-		$item->{'cardnumber'} = $item->{'card'};
-			
-    } else {
-	$item->{'issue'}= 0;
-    }
-}
-
-$template->param(BIBITEM_DATA => \@results);
-$template->param(ITEM_DATA => \@items);
-$template->param(loggedinuser => $loggedinuser);
-
-output_html_with_http_headers $query, $cookie, $template->output;
-
-
-# Local Variables:
-# tab-width: 8
-# End:

Index: cgi-bin/catalogue/newsdetail.pl
===================================================================
RCS file: cgi-bin/catalogue/newsdetail.pl
diff -N cgi-bin/catalogue/newsdetail.pl
--- cgi-bin/catalogue/newsdetail.pl	10 Mar 2007 01:15:01 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,92 +0,0 @@
-#!/usr/bin/perl
-use strict;
-
-use CGI;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Biblio;
-use C4::Koha;
-use C4::Date;
-my $query = new CGI;
-my $dbh = C4::Context->dbh;
-
-my $id = $query->param('id'); #show the search form or execute the search
-my ($template, $borrowernumber, $cookie);
-
-
-
-
-	($template, $borrowernumber, $cookie)
-		= get_template_and_user({template_name => "catalogue/newsdetail.tmpl",
-					 query => $query,
-					 type => "intranet",
-					 authnotrequired => 1,
-	});
-
-	
-my ($count, at results,$facets);
-
-
-
-my @oConnection;
-my $oResult;
-
-my $serverquery;							
-
-	
-							
-	
-	 $oConnection[0]=C4::Context->Zconn("cyprus");
-	
- $serverquery="\@attr 1=local-number"." \"".$id."\"";	
-
-
-$oResult = $oConnection[0]->search_pqf($serverquery);
-
- my $k;
-my $event;
-  while (($k = ZOOM::event(\@oConnection)) != 0) {
-	$event = $oConnection[$k-1]->last_event();
-# warn ("connection ", $k-1, ": event $event (", ZOOM::event_str($event), ")\n");
-	last if $event == ZOOM::Event::ZEND;
-   }
-if ($k != 0) {
-	$k--;
-	 my($error, $errmsg, $addinfo, $diagset) = $oConnection[$k]->error_x();
-   	if ($error) {
-	warn "newsquery error $serverquery: $errmsg ($error) $addinfo\n";
-  	}
-	
-	my $numresults=$oResult->size() ;								
- 									
-
-	if ($numresults>0){
-	
-		
-
-
-		my $xmlrecord=$oResult->record(0)->raw();
-		$xmlrecord=Encode::decode("utf8",$xmlrecord);
-			 $xmlrecord=XML_xml2hash_news($xmlrecord);
-			
-			$xmlrecord->{date}=format_date($xmlrecord->{date});
-			$xmlrecord->{news}=~s/\n/<br>/g;
-			$xmlrecord->{news}=~s/(<br><br>)/<br>/g;
-$template->param(title=>$xmlrecord->{title},
-		date=>$xmlrecord->{date},
-		source=>$xmlrecord->{source},
-		news=>$xmlrecord->{news});
-	
-	}# $numresults
-
-}# if $k !=0
-
-
-
-
-
-
-
-show:
-output_html_with_http_headers $query, $cookie, $template->output();
-

Index: cgi-bin/catalogue/search.pl
===================================================================
RCS file: cgi-bin/catalogue/search.pl
diff -N cgi-bin/catalogue/search.pl
--- cgi-bin/catalogue/search.pl	10 Mar 2007 01:15:01 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,419 +0,0 @@
-#!/usr/bin/perl
-use strict;
-
-use CGI;
-use C4::Search;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Biblio;
-use C4::Koha;
-use POSIX qw(ceil floor);
-#binmode ">:utf8";
-my $query = new CGI;
-my $dbh = C4::Context->dbh;
-
-my $op = $query->param('op'); #show the search form or execute the search
-
-my $format=$query->param('MARC');
-my ($template, $borrowernumber, $cookie);
-
-# get all the common search variables, 
-my @value=$query->param('value');
-my @kohafield=$query->param('kohafield');
-my @and_or=$query->param('and_or');
-my @relation=$query->param('relation');
-my $order=$query->param('order');
-my $reorder=$query->param('reorder');
-my $number_of_results=$query->param('number_of_results');
-my $zoom=$query->param('zoom');
-my $ascend=$query->param('asc');
-my $searchtype=$query->param('searchtype'); ## this is actual query type
-my $serverid=$query->param('serverid');
-$serverid=-1 unless($serverid eq "0"  || $serverid>0);
-my @marclist = $query->param('marclist');
-my $basename=$query->param('basename');
-# collect all the fields ...
-my %search;
-my @forminputs;		#this is for the links to navigate among the results
-my (@searchdesc, %hashdesc,$facetsdesc); 	#this is to show the description of the current search
-my @fields = ('value', 'kohafield', 'and_or', 'relation','order','barcode','biblionumber','itemnumber','asc','from','searchtype');
-
-###Collect all the marclist values coming from old Koha MARCdetails
-## Although we can not search on all marc fields- if any is matched in Zebra we can use it 
-my $sth=$dbh->prepare("Select kohafield from koha_attr where tagfield=? and tagsubfield=? and intrashow=1");
-foreach my $marc (@marclist) {
-		if ($marc) {
-		$sth->execute(substr($marc,0,3),substr($marc,3,1));
-			if ((my $kohafield)=$sth->fetchrow){
-			push @kohafield,$kohafield;
-			push @and_or,"\@or";
-			push @value, at value[0] if @kohafield>1;
-			push @relation ,"\@attr 5=1";
-			}
-		}
-}
-#### Now   normal search routine
-foreach my $field (@fields) {
-	$search{$field} = $query->param($field);
-	my @fieldvalue = $query->param($field);
-	foreach my $fvalue (@fieldvalue) {
-		push @forminputs, { field=>$field ,value=> $fvalue} unless ($field eq 'reorder');
-		
-	  }
-}
-## Build the query for facets as well
- for (my $i=0;$i<@value;$i++){
-$facetsdesc.="&value=".$value[$i];
-$facetsdesc.="&kohafield=".$kohafield[$i];
-$facetsdesc.="&relation=".$relation[$i];
-$facetsdesc.="&and_or=".$and_or[$i];
-}
-$facetsdesc.="&order=".$order;
-$hashdesc{'query'} = join " , ", @value;
-push @searchdesc,\%hashdesc;
-
-
-############################################################################
-if ($op eq "do_search"){
- 
-#this fields is just to allow the user come back to the search form with all the values  previously entered
-$search{'search_type'} = $query->param('search_type');# this is the panel type
-push @forminputs, {field => 'search_type', value => $search{'search_type'}};
-
-
-	($template, $borrowernumber, $cookie)
-		= get_template_and_user({template_name => "catalogue/searchresults.tmpl",
-					 query => $query,
-					 type => "intranet",
-					 authnotrequired => 1,
-	});
-
-	$search{'from'} = 'intranet';
-	$search{'borrowernumber'} = $borrowernumber;
-	$search{'remote_IP'} = $query->remote_addr();
-	$search{'remote_URL'} = $query->url(-query=>1);
-	$search{'searchdesc'} = \@searchdesc;
-	$template->param(FORMINPUTS => \@forminputs);
-	$template->param(reorder => $query->param('reorder'));
-	$template->param(facetsdesc=>$facetsdesc);
-	# do the searchs ....
-	 $number_of_results = 50 unless $number_of_results;
-	my $startfrom=$query->param('startfrom');
-	($startfrom) || ($startfrom=0);
-my ($count, at results,$facets);
-if ($serverid>0){
- my $sth=$dbh->prepare("select * from online_databases where serverid=?");
-  $sth->execute($serverid);
-
-  my  $server=$sth->fetchrow_hashref ;
-
-my	$serverquery=$server->{search_string};
-	if ($server->{$kohafield[0]} ne ""){
-	$serverquery.=$server->{$kohafield[0]."_query"}.$value[0];
-	}else{
-	$serverquery.=$server->{"any_query"}.$value[0];
-	}
-print $query->redirect($serverquery);
-  
-}##serverid>0
-if ($serverid eq "0"){
-use ZOOM;
-my @oConnection;
-my @oResult;
-my $s=0;
-my $server;							
-my @serverhost;
-my @serverquery;
-my @query;							
-my @onlineloop;
-my $numberpending;
-my $even=1;			
-  my $sth=$dbh->prepare("select * from online_databases ");
-  $sth->execute();
-
-    while ($server=$sth->fetchrow_hashref) {
-	my $noconnection=0;
-	
-							
-	my $option1=new ZOOM::Options();
-	$option1->option(async=>1);
-	$option1->option('elementSetName', 'F');
-	$option1->option('databaseName',$server->{db})  ;
-	$option1->option('user',$server->{userid})  ;
-	$option1->option('password',$server->{password})  ;
-	 $oConnection[$s]=create ZOOM::Connection($option1);
-	$oConnection[$s]->connect($server->{host}, $server->{port});
-	$serverhost[$s]=$server->{server};
-	$serverquery[$s]=$server->{search_string};
-	if ($server->{$kohafield[0]} ne ""){
-	$serverquery[$s].=$server->{$kohafield[0]."_query"}.$value[0];
-	}else{
-	$serverquery[$s].=$server->{"any_query"}.$value[0];
-	}
- $query[$s]=$server->{$kohafield[0]}." \"".$value[0]."\"";	
-
-	$s++;
-    }## while fetch
-
- 
-my $nremaining = $s;
-my $firstresult=1;
- for (my $z=0 ;$z<$s;$z++){
-$oResult[$z] = $oConnection[$z]->search_pqf($query[$z]);
-
-}
-AGAIN:
- my $k;
-my $event;
-  while (($k = ZOOM::event(\@oConnection)) != 0) {
-	$event = $oConnection[$k-1]->last_event();
-# warn ("connection ", $k-1, ": event $event (", ZOOM::event_str($event), ")\n");
-	last if $event == ZOOM::Event::ZEND;
-   }
-if ($k != 0) {
-	$k--;
-#warn $serverhost[$k];
-	 my($error, $errmsg, $addinfo, $diagset) = $oConnection[$k]->error_x();
-   	if ($error) {
-	warn "$k $serverhost[$k] error $query[$k]: $errmsg ($error) $addinfo\n";
-	goto MAYBE_AGAIN;
-  	}
-	
-	my $numresults=$oResult[$k]->size() ;								
- 									
-
-	if ($numresults>0){
-	
-		
-
-			my %row_data;
- 	
-	$row_data{even} = $even;
-	$row_data{server} = $serverhost[$k];
-	$row_data{numresults} = $numresults;
-
-	$row_data{search_string} =$serverquery[$k];
-	
-	$even=!$even;
-	push (@onlineloop, \%row_data);
-
-						
-}# $numresults
-
-}# if $k !=0
-
-
-$numberpending=$nremaining-1;
-
-MAYBE_AGAIN:
-if (--$nremaining > 0) {
-    goto AGAIN;
-}
-$template->param(onlineloop=>\@onlineloop,);
-}##serverid==0
-if (!$zoom){
-## using sql search for barcode,biblionumber or itemnumber only useful for libraian interface
-	($count, @results) =sqlsearch($dbh,\%search);
-}else{
-my $sortorder=$order.$ascend if $order;
- ($count,$facets, at results) =ZEBRAsearch_kohafields(\@kohafield,\@value, \@relation,$sortorder, \@and_or, 1,$reorder,$startfrom, $number_of_results,"intranet",$searchtype);
-}
-	if ( $count eq "error"){
-	$template->param(error =>1);
-	goto "show";
-	}
-	my $num = scalar(@results) - 1;
-if ( $count == 1){
-    # if its a barcode search by definition we will only have one result.
-    # And if we have a result
-    # lets jump straight to the detail.pl page
-	if ($format eq '1') {
-    print $query->redirect("/cgi-bin/koha/catalogue/MARCdetail.pl?type=intra&biblionumber=$results[0]->{'biblionumber'}");
-	}else{
-    print $query->redirect("/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=$results[0]->{'biblionumber'}");
-	}
-}
-	# sorting out which results to display.
-		# the total results searched
-	$template->param(numrecords => $count);
-	$template->param(FORMINPUTS => \@forminputs );
-	$template->param(searchdesc => \@searchdesc );
-if ($basename){
-# Printing to a csv file
-open(OUT,">:utf8" ,"$basename.csv") or die $!;
-#		print $query->header(-type => 'application/EXCEL',-charset=>"utf-8",
-#			-attachment=>"$basename.csv",
-#			-filename=>"$basename.csv" );
-#		
-		my $sep;
-		$sep =C4::Context->preference("delimiter");
-
-			print OUT "Title".$sep."Author".$sep."Issuecount";
-		print OUT "\n";
-# Table
-		foreach my $line ( @results) {
-		
-			print OUT $line->{title}.$sep.$line->{author}.$sep.$line->{totalissue};
-
- 			print OUT "\n";
-	 	}
-close(OUT);
-    print $query->redirect("/cgi-bin/koha/catalogue/search.pl");
-
-}
-
-if ($serverid==-1){
-	# the result number to star to show
-	$template->param(startfrom => $startfrom);
-	$template->param(beginning => $startfrom+1);
-	# the result number to end to show
-	($startfrom+$num<=$count) ? ($template->param(endat => $startfrom+$num+1)) : ($template->param(endat => $count));
-
-	
- 	$template->param(SEARCH_RESULTS => \@results,
-			facets_loop => $facets,
-			);
-
-	#this is to show the images numbers to navigate among the results, if it has to show the number highlighted or not
-	my $numbers;
-	@$numbers = ();
-	my $pg = 1;
-	if (defined($query->param('pg'))) {
-		$pg = $query->param('pg');
-	}
-	my $start = 0;
-	
-	$start = ($pg - 1) * $number_of_results;
-	my $pages = ceil($count / $number_of_results);
-	my $total_pages = ceil($count / $number_of_results);
-
-	if ($pg > 1) {
-		my $url = $pg - 1;
-		push @$numbers, { number => "&lt;&lt;", , forminputs=>\@forminputs,
-					      highlight => 0 , 
-					      startfrom =>0, 
-					      pg => '1' };
-		push @$numbers, { number => "&lt;", 
-						  highlight => 0 , forminputs=>\@forminputs,
-						  startfrom => ($url-1)*$number_of_results+1, 
-						  pg => $url };
-	}
-	my $current_ten = $pg / 10;
-	if ($current_ten == 0) {
-		 $current_ten = 0.1;           # In case it´s in ten = 0
-	} 
-	my $from = $current_ten * 10; # Calculate the initial page
-	my $end_ten = $from + 9;
-	my $to;
-	if ($pages > $end_ten) {
-		$to = $end_ten;
-	} else {
-		$to = $pages;
-	}
-	for (my $i = $from; $i <= $to ; $i++) {
-		if ($i == $pg) {   
-			if ($count > $number_of_results) {
-				push @$numbers, { number => $i, 
-								  highlight => 1 , forminputs=>\@forminputs,
-								  startfrom => ($i-1)*$number_of_results , 
-								  pg => $i };
-			}
-		} else {
-			push @$numbers, { number => $i, 
-							  highlight => 0 , forminputs=>\@forminputs,
-							  startfrom => ($i-1)*$number_of_results , 
-							  pg => $i };
-		}
-	}	        					
-	if ($pg < $pages) {
-		my $url = $pg + 1;
-		push @$numbers, { number => "&gt;", 
-						  highlight => 0 , forminputs=>\@forminputs,
-						  startfrom => ($url-1)*$number_of_results, 
-						  pg => $url };
-		push @$numbers, { number => "&gt;&gt;", 
-						  highlight => 0 , forminputs=>\@forminputs,
-						  startfrom => ($total_pages-1)*$number_of_results, 
-						  pg => $total_pages};
-	}
-#	push @$numbers,{forminputs=>@forminputs};
-	$template->param(numbers =>$numbers,
-			);
-	#show the virtual shelves
-	#my $results = &GetShelfList($borrowernumber);
-	#$template->param(shelvescount => scalar(@{$results}));
-	#$template->param(shelves => $results);
- 
-########
-if ($format eq '1') {
-	$template->param(script => "catalogue/MARCdetail.pl");
-}else{
-	$template->param(script => "catalogue/detail.pl");
-}
-}#serverid==-1
-}else{ ## No search yet
-($template, $borrowernumber, $cookie)
-		= get_template_and_user({template_name => "catalogue/search.tmpl",
-					query => $query,
-					type => "intranet",
-					authnotrequired => 1,
-				});
-#show kohafields
-	my $kohafield = $query->param('kohafield');
-	my ($fieldcount, at kohafields)=getkohafields();
-	foreach my $row (@kohafields) {
-		if ($kohafield eq $row->{'kohafield'}) {
-			$row->{'sel'} = 1;
-		}
-	}
-	$template->param(kohafields => \@kohafields);
-##show sorting fields
-my @sorts;
- $order=$query->param('order');
-	foreach my $sort (@kohafields) {
-	    if ($sort->{sorts}){
-		push @sorts,$sort;
-		if ($order eq $sort->{'kohafield'}) {
-			$sort->{'sel'} = 1;
-		}
-	   }
-	}
-	$template->param(sorts => \@sorts);
-# load the branches
-my @branches = GetallBranches();
-$template->param(branchloop => \@branches,);
-
-# load the itemtypes 
-my $itemtypes=GetItemTypes();
-my (@item_type_loop);
-foreach my $thisitemtype (sort keys %$itemtypes) {
-    my %row =(itemtype => $thisitemtype,
-                 description => $itemtypes->{$thisitemtype}->{'description'},
-            );
-    push @item_type_loop, \%row;
-}
-##Show catalogues
-my $sth=$dbh->prepare("select serverid,server from online_databases");
-$sth->execute();
-my @serverloop;
-while (my $server=$sth->fetchrow_hashref) {
-my %temploop;
-$temploop{server}=$server->{server};
-$temploop{serverid}=$server->{serverid};
-
-push (@serverloop, \%temploop);
-}
-$sth->finish;
-$template->param(	servers => \@serverloop,);
-$template->param(itemtypeloop=>\@item_type_loop,);
-my $search_type = $query->param('search_type');
-	if ((!$search_type) || ($search_type eq 'zoom'))  {
-		$template->param(zoom_search => 1);
-	} else{
-		$template->param(sql_search => 1);
-	} 
-}
-
-show:
-output_html_with_http_headers $query, $cookie, $template->output();
-1;

Index: cgi-bin/cataloguing/addbiblio.pl
===================================================================
RCS file: cgi-bin/cataloguing/addbiblio.pl
diff -N cgi-bin/cataloguing/addbiblio.pl
--- cgi-bin/cataloguing/addbiblio.pl	10 Mar 2007 01:15:48 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,291 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: addbiblio.pl,v 1.1.2.1 2007/03/10 01:15:48 tgarip1957 Exp $
-
-# 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 CGI;
-use C4::Auth;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Biblio;
-use C4::Search; # also includes Biblio.pm, Search is used to FindDuplicate
-use C4::Context;
-use C4::Koha; # XXX subfield_is_koha_internal_p
-use MARC::Record;
-use MARC::File::USMARC;
-my $format="USMARC";
-$format="UNIMARC" if (C4::Context->preference('marcflavour') eq 'UNIMARC');
-use MARC::File::XML(RecordFormat =>$format);
-use Encode;
-use C4::Biblioadd;
-####
-my $dbh = C4::Context->dbh;
-my $authorised_values_sth = $dbh->prepare("select authorised_value,lib
-		from authorised_values
-		where category=? order by lib");
-my $BIG_LOOP;
-my $addedfield;
-###Declare all globals
-my $input = new CGI;
-my $logstatus=C4::Context->preference('Activate_log');
-my $xml;
-my $itemtype; # created here because it can be used in build_authorized_values_list sub
-my $fromserials=$input->param('fromserials');## if a serial is being added do not display navigation menus
-
-my $error = $input->param('error');
-my $oldbiblionumber=$input->param('oldbiblionumber'); # if bib exists, it's a modif, not a new biblio.
-my $breedingid = $input->param('breedingid');
-my $z3950 = $input->param('z3950');
-my $DVDid=$input->param('DVDid');
-my $op = $input->param('op');
-my $duplicateok = $input->param('duplicateok');
-my $suggestionid=$input->param('suggestionid');
-my $frameworkcode = $input->param('frameworkcode');
-
-my $biblionumber;
-
-
-###Find related tags for Z3950 searches- required  by template
-my($isbntag,$isbnsub)=MARCfind_marc_from_kohafield("isbn","biblios");
-my($issntag,$issnsub)=MARCfind_marc_from_kohafield("issn","biblios");
-my($titletag,$titlesub)=MARCfind_marc_from_kohafield("title","biblios");
-my($authortag,$authorsub)=MARCfind_marc_from_kohafield("author","biblios");
-my($urltag,$urlsub)=MARCfind_marc_from_kohafield("url","biblios"); ##DVD search uses this field
-
-# ======================== 
-#          MAIN 
-#=========================
-
-
-$biblionumber=$oldbiblionumber if $oldbiblionumber;
-$frameworkcode='' if ($frameworkcode eq 'Default');
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/addbiblio.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {editcatalogue => 1},
-			     debug => 1,
-			     });
-
-#Getting the list of all frameworks
-my $queryfwk =$dbh->prepare("select frameworktext, frameworkcode from biblios_framework");
-$queryfwk->execute;
-my %select_fwk;
-my @select_fwk;
-my $curfwk;
-push @select_fwk,"Default";
-$select_fwk{"Default"} = "Default";
-while (my ($description, $fwk) =$queryfwk->fetchrow) {
-	push @select_fwk, $fwk;
-	$select_fwk{$fwk} = $description;
-}
-$curfwk=$frameworkcode;
-my $framework=CGI::scrolling_list( -name     => 'Frameworks',
-			-id => 'Frameworks',
-			-default => $curfwk,
-			-OnChange => 'Changefwk(this);',
-			-values   => \@select_fwk,
-			-labels   => \%select_fwk,
-			-size     => 1,
-			-multiple => 0 );
-$template->param( framework => $framework);
-my $xmlhash;
-my $xml;
-#####DO NOT RETRIVE FROM ZEBRA######
-my $record =XMLgetbiblio($dbh,$biblionumber) if ($biblionumber);
-$xmlhash=XML_xml2hash_onerecord($record) if ($biblionumber);
-$frameworkcode=MARCfind_frameworkcode( $dbh, $biblionumber );
-###########
-my $tagslib = &MARCgettagslib($dbh,1,$frameworkcode);
-if ($suggestionid && !$biblionumber){
-my $data=GetSuggestion($suggestionid) ;
-$xml=$data->{xml};
-$xmlhash=XML_xml2hash_onerecord($xml);
-}
-my $encoding="";
-($xmlhash,$encoding) = MARCfindbreeding($dbh,$breedingid,$oldbiblionumber) if ($breedingid);
-($xmlhash) = ImportDVD($DVDid,$oldbiblionumber) if ($DVDid);
-
-my $is_a_modif=0;
-$is_a_modif=1 if $oldbiblionumber; 
-my ($oldbiblionumtagfield,$oldbiblionumtagsubfield);
-if ($biblionumber  && !$z3950) {
-	$is_a_modif=1;
-	# if it's a modif, retrieve old biblionumber for the future modification of old-DB.
-	($oldbiblionumtagfield,$oldbiblionumtagsubfield) = &MARCfind_marc_from_kohafield($dbh,"biblionumber","biblios");
-
-	
-}
-#------------------------------------------------------------------------------------------------------------------------------
-if ($op eq "addbiblio") {
-#------------------------------------------------------------------------------------------------------------------------------
-	# rebuild
-	my @tags = $input->param('tag');
-	my @subfields =$input->param('subfield');
-	my @values=$input->param('field_value');
-	# build indicator hash.
-	my @ind_tag = $input->param('ind_tag');
-	my @indicator = $input->param('indicator');
-	my @tagindex=$input->param('tagindex');
-	
-	
-## check for malformed xml -- non UTF-8 like (MARC8) will break xml without warning
-### This usually happens with data coming from other Z3950 servers
-## Slows the saving process so comment out at your own risk
-eval{
- $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag,\@tagindex);	
-};
- if ($@){
-warn $@;
- $template->param(error             =>1,xmlerror=>1,);
-goto FINAL;
-  };
-my $xmlhash=XML_xml2hash_onerecord($xml);
-	my ($duplicatebiblionumber,$duplicatetitle) = FindDuplicate($xmlhash) if (($op eq "addbiblio") && (!$is_a_modif) && (!$duplicateok));
-	my $confirm_not_duplicate = $input->param('confirm_not_duplicate');
-	# it is not a duplicate (determined either by Koha itself or by user checking it's not a duplicate)
-	if (!$duplicatebiblionumber or $confirm_not_duplicate) {
-		# MARC::Record built => now, record in DB
-		my $oldbibnum;
-		my $oldbibitemnum;
-		if ($is_a_modif) {
-			NEWmodbiblio($dbh,$biblionumber,$xmlhash,$frameworkcode);
-
-		} else {
-
-			($biblionumber) = NEWnewbiblio($dbh,$xmlhash,$frameworkcode);
-
-		}
-	# now, redirect to additem page
-		unless ($fromserials){
-		print $input->redirect("additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode") unless $fromserials;
-		exit;
-		}else{
-		my $title=XML_readline_onerecord($xmlhash,"title","biblios");
-		$template->param(exit=>1,biblionumber=>$biblionumber,title=>$title);
-		goto FINAL;
-		}
-
-	} else {
-FINAL:
-	# it may be a duplicate, warn the user and do nothing
-		build_tabs ($template, $xmlhash, $dbh,$addedfield,$tagslib,$authorised_values_sth);
-
-		$tagslib=build_hidden_data($tagslib);
-		$template->param(fromserials=>$fromserials,
-			oldbiblionumber             => $oldbiblionumber,
-			biblionumber                      => $biblionumber,
-			oldbiblionumtagfield        => $oldbiblionumtagfield,
-			oldbiblionumtagsubfield     => $oldbiblionumtagsubfield,
-			duplicatebiblionumber		=> $duplicatebiblionumber,
-			duplicatetitle				=> $duplicatetitle,
-			 );
-	}
-#------------------------------------------------------------------------------------------------------------------------------
-} elsif ($op eq "addfield") {
-#------------------------------------------------------------------------------------------------------------------------------
-	 $addedfield = $input->param('addfield_field');
-	my @tags = $input->param('tag');
-	my @subfields = $input->param('subfield');
-	my @values = $input->param('field_value');
-	# build indicator hash.
-	my @ind_tag = $input->param('ind_tag');
-	my @indicator = $input->param('indicator');
-	my @tagindex=$input->param('tagindex');
-	my $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag,\@tagindex);
-	my $xmlhash=XML_xml2hash_onerecord($xml);
-	# adding an empty field
-	&build_tabs ($template, $xmlhash, $dbh,$addedfield,$tagslib,$authorised_values_sth);
-		$tagslib=build_hidden_data($tagslib);
-#	$template->param(BIG_LOOP=>$BIG_LOOP,);
-	$template->param(
-		oldbiblionumber             => $oldbiblionumber,
-		biblionumber                     => $biblionumber,
-		oldbiblionumtagfield        => $oldbiblionumtagfield,
-		oldbiblionumtagsubfield     => $oldbiblionumtagsubfield,
-		fromserials=>$fromserials
-		 );
-} elsif ($op eq "delete") {
-#------------------------------------------------------------------------------------------------------------------------------
-my $sth=$dbh->prepare("select iss.itemnumber from items i ,issues iss where iss.itemnumber=i.itemnumber and iss.returndate is null and  i.biblionumber=?");
- $sth->execute($biblionumber);
-my $onloan=$sth->fetchrow;
-
- 	if (!$onloan){	
-	NEWdelbiblio($dbh,$biblionumber);
-print	$input->redirect("/cgi-bin/koha/catalogue/catalogue-search.pl");
-	exit;
-	}else{
-
-$template->param(error            => 1, onloan=>1,);
-	}
-#------------------------------------------------------------------------------------------------------------------------------
-#------------------------------------------------------------------------------------------------------------------------------
-} else {
-#------------------------------------------------------------------------------------------------------------------------------
-
-	# If we're in a duplication case, we have to set to "" the  biblionumber
-	# as we'll save the biblio as a new one.
-	if ($op eq "duplicate")
-	{
-		$biblionumber = "";
-		$oldbiblionumber= "";
-	$template->param(duplicateok            => 1);
-	}
-	build_tabs($template, $xmlhash, $dbh,$addedfield,$tagslib,$authorised_values_sth);
-#		$tagslib=build_hidden_data($tagslib);
-#	$template->param(BIG_LOOP=>$BIG_LOOP,);
-#warn Dumper($xmlhash);
-	$template->param(
-		oldbiblionumber             => $oldbiblionumber,
-		biblionumber                       => $biblionumber,
-		oldbiblionumtagfield        => $oldbiblionumtagfield,
-		oldbiblionumtagsubfield     => $oldbiblionumtagsubfield,
-		fromserials=>$fromserials			
-		);
-}
-$template->param(
-		isbntag             => $isbntag,
-		isbnsub                       => $isbnsub,
-		issntag             => $isbntag,
-		issnsub                       => $issnsub,
-		titletag             => $titletag,
-		titlesub                       => $titlesub,
-		authortag             => $authortag,
-		authorsub                       => $authorsub,
-		urltag             => $urltag,
-		urlsub                       => $urlsub,
-		);
-
-$template->param(
-		frameworkcode => $frameworkcode,
-		itemtype => $frameworkcode, # HINT: if the library has itemtype = framework, itemtype is auto filled !
-		hide_marc => C4::Context->preference('hide_marc'),
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		advancedMARCEditor => C4::Context->preference("advancedMARCEditor"),
-		);
-
-output_html_with_http_headers $input, $cookie, $template->output;
-
-
-

Index: cgi-bin/cataloguing/addbooks.pl
===================================================================
RCS file: cgi-bin/cataloguing/addbooks.pl
diff -N cgi-bin/cataloguing/addbooks.pl
--- cgi-bin/cataloguing/addbooks.pl	10 Mar 2007 01:15:48 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,59 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: addbooks.pl,v 1.1.2.1 2007/03/10 01:15:48 tgarip1957 Exp $
-
-# 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 CGI;
-use C4::Auth;
-use C4::Biblio;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Koha;
-
-my $query = new CGI;
-
-my $error   = $query->param('error');
-my $success = $query->param('biblioitem');
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "cataloguing/addbooks.tmpl",
-        query           => $query,
-        type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { editcatalogue => 1 },
-        debug           => 1,
-    }
-);
-
-# get framework list
-my $frameworks = getframeworks;
-my @frameworkcodeloop;
-foreach my $thisframeworkcode (keys %$frameworks) {
-	my %row =(value => $thisframeworkcode,
-				frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
-			);
-	push @frameworkcodeloop, \%row;
-}
-
-my $marc_p = C4::Context->boolean_preference("marc");
-$template->param( NOTMARC => !$marc_p,
-				frameworkcodeloop => \@frameworkcodeloop );
-
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/cataloguing/additem.pl
===================================================================
RCS file: cgi-bin/cataloguing/additem.pl
diff -N cgi-bin/cataloguing/additem.pl
--- cgi-bin/cataloguing/additem.pl	10 Mar 2007 01:15:48 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,442 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: additem.pl,v 1.1.2.1 2007/03/10 01:15:48 tgarip1957 Exp $
-
-# 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 CGI;
-
-use C4::Auth;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Biblio;
-use C4::Context;
-use C4::Koha; # XXX subfield_is_koha_internal_p
-use C4::Search;
-use C4::Circulation::Circ2;
-use C4::Log;
-
-my $logstatus=C4::Context->preference('Activate_log');
-
-sub find_value {
-	my ($tagfield,$insubfield,$record) = @_;
-	my $result;
-	my $indicator;
-my $item=$record->{datafield};
-my $controlfield=$record->{controlfield};
-my $leader=$record->{leader};
- if ($tagfield eq '000'){
-## We are getting the leader
-$result=$leader->[0];
-return($indicator,$result);
-}
-     if ($tagfield <10){
-	foreach my $control (@$controlfield) {
-		if ($control->{tag} eq $tagfield){
-		$result.=$control->{content};
-		}
-	}
-      }else{
-	foreach my $field (@$item) {		
-	      if ($field->{tag} eq $tagfield){	
-		    foreach my $subfield ( $field->{'subfield'}){
-		       foreach my $code ( @$subfield){
-			if ($code->{code} eq $insubfield) {
-				$result .= $code->{content};
-				$indicator = $field->{ind1}.$field->{ind2};
-			}
-		      }## each code
-		  }##each subfield
-	      }## if tag
-	}### $field
-     }## tag<10
-	return($indicator,$result);
-}
-my $input = new CGI;
-my $dbh = C4::Context->dbh;
-my $error = $input->param('error');
-my $biblionumber = $input->param('biblionumber');
-my $oldbiblionumber =$biblionumber;
-my $frameworkcode=$input->param('frameworkcode');
-my $op = $input->param('op');
-my $itemnumber = $input->param('itemnumber');
-my $fromserials=$input->param('fromserials');## if a serial is being added do not display navigation menus
-my $serialid=$input->param('serialid');
-my @itemrecords; ##Builds existing items
-my $bibliorecord; #Bibliorecord relared to this item
-my $newrecord; ## the new record buing built
-my $itemrecexist; #item record we are editing
-my $xml; ## data on html
- $frameworkcode=MARCfind_frameworkcode($dbh,$biblionumber) unless $frameworkcode;
-my $tagslib = &MARCitemsgettagslib($dbh,1,$frameworkcode);
-my $itemrecord;
-my $nextop="additem";
-my @errors; # store errors found while checking data BEFORE saving item.
-
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/additem.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {editcatalogue => 1},
-			     debug => 1,
-			     });
-
-#------------------------------------------------------------------------------------------------------------------------------
-if ($op eq "additem") {
-#------------------------------------------------------------------------------------------------------------------------------
-	# rebuild
-
-	my @tags = $input->param('tag');
-	my @subfields = $input->param('subfield');
-	my @values = $input->param('field_value');
-	# build indicator hash.
-	my @ind_tag = $input->param('ind_tag');
-	my @indicator = $input->param('indicator');
-	my %indicators;
-	for (my $i=0;$i<=$#ind_tag;$i++) {
-		$indicators{$ind_tag[$i]} = $indicator[$i];
-	}
-## check for malformed xml -- non UTF-8 like (MARC8) will break xml without warning
-### This usually happens with data coming from other Z3950 servers
-## Slows the saving process so comment out at your own risk
-eval{
- $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag);	
-};
- if ($@){
-push @errors,"non_utf8" ;
-$nextop = "additem";
-goto FINAL;
-  };
- my $newrecord=XML_xml2hash_onerecord($xml);
-my $newbarcode=XML_readline_onerecord($newrecord,"barcode","holdings");	
-
-	# if autoBarcode is ON, calculate barcode...
-	if (C4::Context->preference('autoBarcode')) {	
-		unless ($newbarcode) {
-			my $sth_barcode = $dbh->prepare("select max(abs(barcode)) from items");
-			$sth_barcode->execute;
-			($newbarcode) = $sth_barcode->fetchrow;
-			$newbarcode++;
-			# OK, we have the new barcode, now create the entry in MARC record
-			$newrecord=XML_writeline( $newrecord, "barcode", $newbarcode,"holdings" );
-		}
-	}
-# check for item barcode # being unique
-	my ($oldrecord)=XMLgetitem($dbh,"",$newbarcode);
-	
-	push @errors,"barcode_not_unique" if($oldrecord);
-# MARC::Record builded => now, record in DB
-## User may be keeping serialids in marc records -- check and add it 
-if ($fromserials){
-$newrecord=XML_writeline( $newrecord, "serialid", $serialid,"holdings" );
-}
-	# if barcode exists, don't create, but report the problem.
-	unless ($oldrecord){
-	  $itemnumber=NEWnewitem($dbh,$newrecord,$biblionumber) ;
-		if ($fromserials){
-		my $holdingbranch=XML_readline_onerecord($newrecord,"holdingbranch","holdings");	
-		$template->param(exit=>1,holdingbranch=>$holdingbranch);
-		}
-	$nextop = "additem";
-	}
-	else{
-		$nextop = "additem";
-		$itemrecexist = $newrecord;
-	} 
-#------------------------------------------------------------------------------------------------------------------------------
-} elsif ($op eq "edititem") {
-#------------------------------------------------------------------------------------------------------------------------------
-# retrieve item if exist => then, it's a modif
-	 ($itemrecexist) = XMLgetitemhash($dbh,$itemnumber);## item is already in our array-getit
-	$nextop="saveitem";
-	
-#logaction($loggedinuser,"acqui.simple","modify",$oldbiblionumber,"item : ".$itemnumber) if ($logstatus);
-	
-#------------------------------------------------------------------------------------------------------------------------------
-} elsif ($op eq "delitem") {
-#------------------------------------------------------------------------------------------------------------------------------
-# retrieve item if exist => then, it's a modif
-my $sth=$dbh->prepare("select * from issues i where i.returndate is null and i.itemnumber=?");
- $sth->execute($itemnumber);
-my $onloan=$sth->fetchrow;
-push @errors,"book_on_loan" if ($onloan);
-	if ($onloan){
-	$nextop = "additem";
-}else{
-	&NEWdelitem($dbh,$itemnumber);
-	$nextop="additem";
-}
-#------------------------------------------------------------------------------------------------------------------------------
-} elsif ($op eq "saveitem") {
-#------------------------------------------------------------------------------------------------------------------------------
-	# rebuild
-#warn "save item";
-	my @tags = $input->param('tag');
-	my @subfields = $input->param('subfield');
-	my @values = $input->param('field_value');
-	# build indicator hash.
-	my @ind_tag = $input->param('ind_tag');
-	my @indicator = $input->param('indicator');
-	my $itemnumber = $input->param('itemnumber');
-	my %indicators;
-	for (my $i=0;$i<=$#ind_tag;$i++) {
-		$indicators{$ind_tag[$i]} = $indicator[$i];
-	}
-## check for malformed xml -- non UTF-8 like (MARC8) will break xml without warning
-### This usually happens with data coming from other Z3950 servers
-## Slows the saving process so comment out at your own risk
-eval{
- $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag);	
-};
-	 if ($@){
-push @errors,"non_utf8" ;
-$nextop = "edititem";
-goto FINAL;
-  };
- my $newrecord=XML_xml2hash_onerecord($xml);
-	my $newbarcode=XML_readline_onerecord($newrecord,"barcode","holdings");
-	my ($oldrecord)=XMLgetitem($dbh,"",$newbarcode);
-	$oldrecord=XML_xml2hash_onerecord($oldrecord);
-	my $exist=XML_readline_onerecord($oldrecord,"itemnumber","holdings") if $oldrecord;
-	if ($exist && ($exist ne $itemnumber)){
-	push @errors,"barcode_not_unique" ; ## Although editing user may have changed the barcode
-	$nextop="edititem";
-	}else{
-	 NEWmoditem($dbh,$newrecord,$biblionumber,$itemnumber);
-	$itemnumber="";
-	$nextop="additem";
-
-	}
-}
-
-#
-#------------------------------------------------------------------------------------------------------------------------------
-# build screen with existing items. and "new" one
-#------------------------------------------------------------------------------------------------------------------------------
-FINAL:
-my %indicators;
-$indicators{995}='  ';
-# now, build existing item list
-###DO NOT CHANGE TO RETRIVE FROM ZEBRA#####
-my $record =XMLgetbiblio($dbh,$biblionumber);
-$bibliorecord=XML_xml2hash_onerecord($record);
-my @itemxmls=XMLgetallitems($dbh,$biblionumber);
-	foreach my $itemrecord(@itemxmls){
-	my $itemhash=XML_xml2hash($itemrecord);
-	push @itemrecords, $itemhash;
-	}
-####
-
-
-
-my ($itemtagfield,$itemtagsubfield) = &MARCfind_marc_from_kohafield("itemnumber","holdings");
-my @itemnums;
-my @fields;
-my %witness; #---- stores the list of subfields used at least once, with the "meaning" of the code
-my @big_array;
-my @item_value_loop;
-my @header_value_loop;
-unless($fromserials){ ## do not display existing items if adding a serial. It could be a looong list
-foreach my $itemrecord (@itemrecords){
-
-my $item=$itemrecord->{datafield};
-my $controlfield=$itemrecord->{controlfield};
-my $leader=$itemrecord->{leader};
-my %this_row;
-	### The leader
-	unless ($tagslib->{'000'}->{'@'}->{tab}  ne 10 || substr($tagslib->{'000'}->{'@'}->{hidden},1,1)>0){
-	my @datasub='000@';
-	$witness{$datasub[0]} = $tagslib->{'000'}->{'@'}->{lib};
-	$this_row{$datasub[0]} =$leader->[0];
-	}## leader
-	foreach my $control (@$controlfield){
-		push @itemnums,$control->{content} if ($control->{tag} eq $itemtagfield);
-		next if ($tagslib->{$control->{tag}}->{'@'}->{tab}  ne 10);
-		next if (substr($tagslib->{$control->{tag}}->{'@'}->{hidden},1,1)>0);	
-					
-			my @datasub=$control->{tag}.'@';
-			$witness{$datasub[0]} = $tagslib->{$control->{tag}}->{'@'}->{lib};
-			$this_row{$datasub[0]} =$control->{content};		     	
-	}## Controlfields 
-	foreach my $data (@$item){
-		foreach my $subfield ( $data->{'subfield'}){
-		   	foreach my $code ( @$subfield){	
-			# loop through each subfield			
-			push @itemnums,$code->{content} if ($data->{tag} eq $itemtagfield && $code->{code} eq $itemtagsubfield);
-			next if ($tagslib->{$data->{tag}}->{$code->{code}}->{tab}  ne 10);
-			next if (substr($tagslib->{$data->{tag}}->{$code->{code}}->{hidden},1,1)>0);
-			$witness{$data->{tag}.$code->{code}} = $tagslib->{$data->{tag}}->{$code->{code}}->{lib};
-			$this_row{$data->{tag}.$code->{code}} =$code->{content};
-			}
-			
-		}# subfield
-	
-	}## each data
-	if (%this_row) {
-	push(@big_array, \%this_row);
-	}
-}## each record
-#fill big_row with missing datas
-foreach my $subfield_code  (keys(%witness)) {
-	for (my $i=0;$i<=$#big_array;$i++) {
-		$big_array[$i]{$subfield_code}="&nbsp;" unless ($big_array[$i]{$subfield_code});
-	}
-}
-# now, construct template !
-
-for (my $i=0;$i<=$#big_array; $i++) {
-	my $items_data;
-	foreach my $subfield_code (sort keys(%witness)) {
-		$items_data .="<td>".$big_array[$i]{$subfield_code}."</td>";
-	}
-	my %row_data;
-	$row_data{item_value} = $items_data;
-	$row_data{itemnumber} = $itemnums[$i];
-	push(@item_value_loop,\%row_data);
-}
-foreach my $subfield_code (sort keys(%witness)) {
-	my %header_value;
-	$header_value{header_value} = $witness{$subfield_code};
-	push(@header_value_loop, \%header_value);
-}
-}## unless from serials
-# next item form
-my @loop_data =();
-my $i=0;
-my $authorised_values_sth = $dbh->prepare("select authorised_value,lib from authorised_values where category=? order by lib");
-
-foreach my $tag (sort keys %{$tagslib}) {
- if ($itemtagfield <10){
-next if($tag==$itemtagfield);
-}
-	my $previous_tag = '';
-# loop through each subfield
-	foreach my $subfield (sort keys %{$tagslib->{$tag}}) {
-		next if subfield_is_koha_internal_p($subfield);
-		next if ($tagslib->{$tag}->{$subfield}->{'tab'}  ne "10");
-		next if  ($tagslib->{$tag} eq $itemtagfield && $tagslib->{$tag}->{$subfield} eq $itemtagsubfield);
-		my %subfield_data;
-		$subfield_data{tag}=$tag;
-		$subfield_data{subfield}=$subfield;
-		$subfield_data{marc_lib}="<span id=\"error$i\">".$tagslib->{$tag}->{$subfield}->{lib}."</span>";
-		$subfield_data{mandatory}=$tagslib->{$tag}->{$subfield}->{mandatory};
-		$subfield_data{repeatable}=$tagslib->{$tag}->{$subfield}->{repeatable};
-	$subfield_data{hidden}= "display:none" if (substr($tagslib->{$tag}->{$subfield}->{hidden},2,1)>0);
-	
-		my ($x,$value);
-		($x,$value) = find_value($tag,$subfield,$itemrecexist) if ($itemrecexist);
-		# search for itemcallnumber if applicable
-		my ($itemcntag,$itemcntagsub)=MARCfind_marc_from_kohafield("itemcallnumber","holdings");
-		if ($tag eq $itemcntag && $subfield eq $itemcntagsub && C4::Context->preference('itemcallnumber')) {
-			my $CNtag = substr(C4::Context->preference('itemcallnumber'),0,3);
-			my $CNsubfield = substr(C4::Context->preference('itemcallnumber'),3,1);
-			my $CNsubfield2 = substr(C4::Context->preference('itemcallnumber'),4,1);
-			my $temp1 = XML_readline_onerecord($bibliorecord,"","",$CNtag,$CNsubfield);
-			my $temp2 = XML_readline_onerecord($bibliorecord,"","",$CNtag,$CNsubfield2);
-			$value = $temp1.' '.$temp2;
-			$value=~s/^\s+|\s+$//g;
-			
-		}
-		if ($tagslib->{$tag}->{$subfield}->{authorised_value}) {
-			my @authorised_values;
-			my %authorised_lib;
-			# builds list, depending on authorised value...
-			#---- branch
-			if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
-				my $sth=$dbh->prepare("select branchcode,branchname from branches order by branchname");
-				$sth->execute;
-				push @authorised_values, "" unless ($tagslib->{$tag}->{$subfield}->{mandatory});
-				while (my ($branchcode,$branchname) = $sth->fetchrow_array) {
-					push @authorised_values, $branchcode;
-					$authorised_lib{$branchcode}=$branchname;
-				}
-			#----- itemtypes
-			} elsif ($tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes") {
-				my $sth=$dbh->prepare("select itemtype,description from itemtypes order by description");
-				$sth->execute;
-				push @authorised_values, "" unless ($tagslib->{$tag}->{$subfield}->{mandatory});
-				while (my ($itemtype,$description) = $sth->fetchrow_array) {
-					push @authorised_values, $itemtype;
-					$authorised_lib{$itemtype}=$description;
-				}
-			#---- "true" authorised value
-			} else {
-				$authorised_values_sth->execute($tagslib->{$tag}->{$subfield}->{authorised_value});
-				push @authorised_values, "" unless ($tagslib->{$tag}->{$subfield}->{mandatory});
-				while (my ($value,$lib) = $authorised_values_sth->fetchrow_array) {
-					push @authorised_values, $value;
-					$authorised_lib{$value}=$lib;
-				}
-			}
-			$subfield_data{marc_value}= CGI::scrolling_list(-name=>'field_value',
-																		-values=> \@authorised_values,
-																		-default=>"$value",																		-labels => \%authorised_lib,																		-size=>1,
-																		-multiple=>0,												);
-		} elsif ($tagslib->{$tag}->{$subfield}->{thesaurus_category}) {
-			$subfield_data{marc_value}="<input type=\"text\" name=\"field_value\"  size=47 maxlength=255 DISABLE READONLY> <a href=\"javascript:Dopop('../authorities/auth_finder.pl?authtypecode=".$tagslib->{$tag}->{$subfield}->{authtypecode}."&index=$i',$i)\">...</a>";
-			#"
-		} elsif ($tagslib->{$tag}->{$subfield}->{'value_builder'}) {
-		my $cgidir = C4::Context->intranetdir ."/cgi-bin/value_builder";
-		unless (opendir(DIR, "$cgidir")) {
-			$cgidir = C4::Context->intranetdir."/value_builder";
-		} 
-		my $plugin=$cgidir."/".$tagslib->{$tag}->{$subfield}->{'value_builder'}; 
-		 do $plugin;
-		my $extended_param = plugin_parameters($dbh,$newrecord,$tagslib,$i,0);
-		my ($function_name,$javascript) = plugin_javascript($dbh,$newrecord,$tagslib,$i,0);
-		$subfield_data{marc_value}="<input type=\"text\" name=\"field_value\"  value=\"$value\" size=\"47\" maxlength=\"255\" DISABLE READONLY OnFocus=\"javascript:Focus$function_name($i)\" OnBlur=\"javascript:Blur$function_name($i)\"> <a href=\"javascript:Clic$function_name($i)\">...</a> $javascript";
-		} else {
-			$subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" value=\"$value\" size=50 maxlength=255>";
-		}
-#		$subfield_data{marc_value}="<input type=\"text\" name=\"field_value\">";
-		push(@loop_data, \%subfield_data);
-		$i++
-	}
-}
-
-
-# what's the next op ? it's what we are not in : an add if we're editing, otherwise, and edit.
-$template->param(item_loop => \@item_value_loop,
-						item_header_loop => \@header_value_loop,
-						biblionumber =>$biblionumber,
-						title => &XML_readline_onerecord($bibliorecord,"title","biblios"),
-						author => &XML_readline_onerecord($bibliorecord,"author","biblios"),
-						item => \@loop_data,
-						itemnumber => $itemnumber,
-						itemtagfield => $itemtagfield,
-						itemtagsubfield =>$itemtagsubfield,
-						op => $nextop,
-						opisadd => ($nextop eq "saveitem")?0:1,
-						fromserials=>$fromserials, serialid=>$serialid,);
-foreach my $error (@errors) {
-	$template->param($error => 1);
-
-}
-output_html_with_http_headers $input, $cookie, $template->output;
-
-sub XMLfinditem {
-my ($itemnumber, at itemrecords)=@_;
-foreach my $record (@itemrecords){
-my $inumber=XML_readline_onerecord($record,"itemnumber","holdings");
-	if ($inumber ==$itemnumber){
-	return $record;
-	}
-}
-}

Index: cgi-bin/cataloguing/get-imdb.php
===================================================================
RCS file: cgi-bin/cataloguing/get-imdb.php
diff -N cgi-bin/cataloguing/get-imdb.php
--- cgi-bin/cataloguing/get-imdb.php	10 Mar 2007 01:23:04 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,98 +0,0 @@
-<?php
-/*
-*The filepaths at the bottom of file are hardcode--change as necessary
-* note: allow_url_fopen = On in your php.ini should be On
-* safemode off --TG
-*/
-
-$website=$_GET['website'];
-$oldbiblionumber=$_GET['oldbiblionumber'];
-$websitesummary=$website."/plotsummary";
-$imdb_website_summary = file_get_contents("${websitesummary}"); //movie Summary
-
-$imdb_website = file_get_contents("${website}"); //movie PI
-
-$filename=substr($website,27,9).".xml";
-//include the parser-class
-require("classes/class.imdb_parser.php");
-
-//init the class
-$IMDB_Parser = new IMDB_Parser;
-
-// output movie-picture (html)
-print "<p>".$IMDB_Parser->getMoviePictureHtml($imdb_website)."</p>";
-
-// output movie-languages (array)
- $xml='<?xml version="1.0" encoding="UTF-8"?>';
-$xml=$xml.'<record>';
-$xml.="<leader>     naa a22     7ar4500</leader>";
-foreach($IMDB_Parser->getMovieLanguage($imdb_website) as $value)
-{
-   $xml=$xml.'<datafield tag="40"><subfield code="a">'.$value.'</subfield></datafield>';
-}
-// output movie-title 
-$title=$IMDB_Parser->getMovieTitle($imdb_website);
-$date=substr($title,strlen($title)-5,4);
-$title= '<datafield tag="245"><subfield code="a">'.substr($title,0,strlen($title)-6).'</subfield>';
-$xml=$xml.$title;
-// output movie-directed by
- $xml=$xml.'<subfield code="c">'.$IMDB_Parser->getMovieDirectedBy($imdb_website).'</subfield><subfield code="h">DVD</subfield></datafield>';
-// output movie-country (array)
-
-foreach($IMDB_Parser->getMovieCountry($imdb_website) as $value)
-{
-   $xml=$xml.'<datafield tag="260"><subfield code="a">'.$value.'</subfield><subfield code="c">'.$date.'</subfield></datafield>';
-}
-
-
-// output movie-tagline
-$xml=$xml.'<datafield tag="500"> <subfield code="a">'.$IMDB_Parser->getMovieTagline($imdb_website).'</subfield></datafield>';
-
-// output movie-plot
-$xml=$xml.'<datafield tag="520"> <subfield code="a">'.$IMDB_Parser->getMoviePlot($imdb_website).'</subfield></datafield>';
-// output movie-summary
-foreach($IMDB_Parser->getMovieSummary($imdb_website_summary) as $value)
-{
-$xml=$xml.'<datafield tag="520"> <subfield code="a">'.$value.'</subfield></datafield>';
-}
-// output movie-genres (array)
-
-foreach($IMDB_Parser->getMovieGenres($imdb_website) as $value)
-{
-   $xml=$xml.'<datafield tag="650"> <subfield code="a">'.$value.'</subfield></datafield>';
-}
-
-// output movie-actors (array)
-foreach($IMDB_Parser->getMovieActors($imdb_website) as $value)
-{
- $xml=$xml.'<datafield tag="700"><subfield code="a">'.$value.'</subfield></datafield>';
-}
-
-
-
-
-// output movie-color
-//print "<br />Color: ".$IMDB_Parser->getMovieColor($imdb_website);
-
-$xml=$xml.'<datafield tag="856"><subfield code="u">'.$website.'</subfield></datafield>';
-
-// output movie-picture path
- $xml=$xml.'<datafield tag="956"> <subfield code="u">'.$IMDB_Parser->getMoviePicture($imdb_website).'</subfield></datafield>';
-$xml=$xml.'</record>';
-
-$dvd=fopen('c:/webservices/koha/intranet/htdocs/uploaded-files/tmp-pdf/'.$filename,'w');
-fwrite($dvd,$xml);
-fclose($dvd);
-
-
-print  "<a href=\"javascript:Import()\">Get: $title</a>
-<script language=\"JavaScript\" type=\"text/javascript\">
-	function Import() {
-		opener.document.location=\"cataloguing/addbiblio.pl?z3950=1&DVDid=$filename&oldbiblionumber=$oldbiblionumber\";
-		self.close();
-		return false;
-	}
-</script>"
-;
-//header("Location: /cgi-bin/koha/mainpage.pl?xml=$xml");
-?>

Index: cgi-bin/cataloguing/isbnsearch.pl
===================================================================
RCS file: cgi-bin/cataloguing/isbnsearch.pl
diff -N cgi-bin/cataloguing/isbnsearch.pl
--- cgi-bin/cataloguing/isbnsearch.pl	10 Mar 2007 01:15:48 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,190 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-
-use C4::Auth;
-use C4::Biblio;
-use C4::Search;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Breeding;
-use C4::Koha;
-
-my $input      = new CGI;
-my $isbn       = $input->param('isbn');
-my $title      = $input->param('title');
-my $offset     = $input->param('offset');
-my $num        = $input->param('num');
-my $showoffset = $offset + 1;
-my $total;
-my $count;
-my @results;
-my $facets;
-my %search;
-my $toggle;
-my $marc_p = C4::Context->boolean_preference("marc");
-my $SQLorZEBRA=C4::Context->preference("SQLorZEBRA");
-if ( !$isbn && !$title ) {
-    print $input->redirect('addbooks.pl');
-}
-else {
-    my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-        {
-            template_name   => "cataloguing/isbnsearch.tmpl",
-            query           => $input,
-            type            => "intranet",
-            authnotrequired => 0,
-            flagsrequired   => { editcatalogue => 1 },
-            debug           => 1,
-        }
-    );
-
-    # fill with books in ACTIVE DB (biblio)
-    if ( !$offset ) {
-        $offset     = 0;
-        $showoffset = 1;
-    }
-    if ( !$num ) { $num = 10 }
-my @kohafield;
-my @value;
-my @relation;
-my @and_or;
-my $order="title,1";
-if ($isbn){
-$search{'isbn'}=$isbn;
-push @kohafield, "isbn";
-push @value,$isbn;
-}else{
-$search{'title'}=$title;
-push @kohafield, "title";
-push @value,$title;
-push @relation, "\@attr 5=1 \@attr 6=3 \@attr 4=1 \@attr 3=1 ";
-  }
-$search{avoidquerylog}=1;
-if ($SQLorZEBRA eq "sql"){
-($count, @results) =cataloguing_search(\%search,$num,$offset);
-}else{
-($count,$facets, at results) =ZEBRAsearch_kohafields(\@kohafield,\@value, \@relation,$order, \@and_or, 1,"",$offset, $num,"intranet");
-
-}
-my $grandtotal=$count;
-    if ( $count < ( $offset + $num ) ) {
-        $total = $count;
-    }
-    else {
-        $total = $offset + $num;
-    }    # else
-
-    my @loop_data;
- 
- @loop_data=@results if $count >0;;
-    $template->param( startfrom => $offset + 1 );
-    ( $offset + $num <= $count )
-      ? ( $template->param( endat => $offset + $num ) )
-      : ( $template->param( endat => $count ) );
-    $template->param( numrecords => $count );
-    my $nextstartfrom = ( $offset + $num < $count ) ? ( $offset + $num ) : (-1);
-    my $prevstartfrom = ( $offset - $num >= 0 ) ? ( $offset - $num ) : (-1);
-    $template->param( nextstartfrom => $nextstartfrom );
-    my $displaynext = 1;
-    my $displayprev = 0;
-    ( $nextstartfrom == -1 ) ? ( $displaynext = 0 ) : ( $displaynext = 1 );
-    ( $prevstartfrom == -1 ) ? ( $displayprev = 0 ) : ( $displayprev = 1 );
-    $template->param( displaynext => $displaynext );
-    $template->param( displayprev => $displayprev );
-    my @numbers = ();
-    my $term;
-    my $value;
-
-    if ($isbn) {
-        $term  = "isbn";
-        $value = $isbn;
-    }
-    else {
-        $term  = "title";
-        $value = $title;
-    }
-    if ( $count > 10 ) {
-        for ( my $i = 1 ; $i < $count / 10 + 1 ; $i++ ) {
-            if ( $i < 16 ) {
-                my $highlight = 0;
-                ( $offset == ( $i - 1 ) * 10 ) && ( $highlight = 1 );
-                push @numbers,
-                  {
-                    number    => $i,
-                    highlight => $highlight,
-                    term      => $term,
-                    value     => $value,
-                    startfrom => ( $i - 1 ) * 10
-                };
-            }
-        }
-    }
-
-    # fill with books in breeding farm
-    ( $count, @results ) = BreedingSearch( $title, $isbn );
-    my @breeding_loop = ();
-    for ( my $i = 0 ; $i <= $#results ; $i++ ) {
-        my %row_data;
-        if ( $i % 2 ) {
-            $toggle = "#ffffcc";
-        }
-        else {
-            $toggle = "white";
-        }
-        $row_data{toggle} = $toggle;
-        $row_data{id}     = $results[$i]->{'id'};
-        $row_data{isbn}   = $results[$i]->{'isbn'};
-        $row_data{file}   = $results[$i]->{'file'};
-        $row_data{title}  = $results[$i]->{'title'};
-        $row_data{author} = $results[$i]->{'author'};
-	$row_data{classification} = $results[$i]->{'classification'};
-	$row_data{subclass} = $results[$i]->{'subclass'};
-          push ( @breeding_loop, \%row_data );
-    }
-# get framework list
-	my $frameworks = getframeworks;
-	my @frameworkcodeloop;
-	foreach my $thisframeworkcode (keys %$frameworks) {
-		my %row =(value => $thisframeworkcode,
-					frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
-				);
-		push @frameworkcodeloop, \%row;
-	}
-
-
-    $template->param(
-        isbn          => $isbn,
-        title         => $title,
-        showoffset    => $showoffset,
-        total         => $total,
-	grandtotal         => $grandtotal,
-        offset        => $offset,
-        results_loop          => \@loop_data,
-        breeding_loop => \@breeding_loop,
-        numbers       => \@numbers,
-        term          => $term,
-        value         => $value,
-  	frameworkcodeloop => \@frameworkcodeloop
-    );
-
-  output_html_with_http_headers $input, $cookie, $template->output;
-}    # else

Index: cgi-bin/circ/branchreserves.pl
===================================================================
RCS file: cgi-bin/circ/branchreserves.pl
diff -N cgi-bin/circ/branchreserves.pl
--- cgi-bin/circ/branchreserves.pl	10 Mar 2007 11:54:16 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,136 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: branchreserves.pl,v 1.1.2.1 2007/03/10 11:54:16 tgarip1957 Exp $
-
-# 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 CGI;
-use C4::Auth;
-use C4::Date;
-use C4::Circulation::Circ2;
-use C4::Reserves2;
-use C4::Search;
-use C4::Koha;
-
-my $input = new CGI;
-
-my $item=$input->param('itemnumber');
-my $borrowernumber=$input->param('borrowernumber');
-my $fbr=$input->param('fbr');
-my $tbr=$input->param('tbr');
-
-my $cancel;
-
-
-my $theme = $input->param('theme'); # only used if allowthemeoverride is set
-
-my ($template, $loggedinuser, $cookie)
-      = get_template_and_user({template_name => "circ/branchreserves.tmpl",
-	                                 query => $input,
-	                                 type => "intranet",
-	                                 authnotrequired => 0,
-	                                 flagsrequired => {borrowers => 1},
-	                                 debug => 1,
-	                                 });
-
-my $default = C4::Context->userenv->{'branch'};
-my $dbh=C4::Context->dbh;
-my $todaysdate = get_today();
-
-
-# if we have a return from the form we launch the subroutine CancelReserve
-	if ($item){
-		my $messages;
-		my $nextreservinfo;
-		my %env;
-		my $waiting;
-		($messages,$nextreservinfo) = GlobalCancel($item,$borrowernumber);
-# 		if we have a result 
-		if ($nextreservinfo){
-			my $borrowerinfo = getpatroninformation(\%env,$nextreservinfo);
-			my $iteminfo = C4::Circulation::Circ2::getiteminformation(\%env,$item);
-			if ($messages->{'transfert'}){
-			my $branchname = getbranchname($messages->{'transfert'});
-				$template->param(
-					messagetransfert => $messages->{'transfert'},
-					branchname 	=> $branchname,
-				);
-			}
-			if ($messages->{'waiting'}){
-			$waiting = 1;
-			}
-
-				$template->param(
-					message			=> 1,
-					nextreservnumber  =>  $nextreservinfo,
-					nextreservsurname => $borrowerinfo->{'surname'},
-					nextreservfirstname => $borrowerinfo->{'firstname'},
-					nextreservitem		=> $item,
-					nextreservtitle		=> $iteminfo->{'title'},
-					waiting 		=> $waiting
-				);
-			}
-# 		if the document is not in his homebranch location and there is not reservation after, we transfer it
-		if (($fbr ne $tbr) and (not $nextreservinfo)){
-			C4::Circulation::Circ2::dotransfer($item,$fbr,$tbr);
-			C4::Circulation::Circ2::itemseen($dbh,$itm);
-		}
-	}
-	
-my @reservloop;
-my @getreserves = GetReservesForBranch($default);
-foreach my $num (@getreserves) {
-	my %getreserv;
-	my %env;
-	my $gettitle = getiteminformation(\%env,$num->{'itemnumber'});
-	my $getborrower = getpatroninformation (\%env,$num->{'borrowernumber'});
-	my $itemtypeinfo = getitemtypeinfo($gettitle->{'ctype'});
-	$getreserv{'waitingdate'} = format_date($num->{'waitingdate'});
-	my $calcDate=DateCalc($num->{'waitingdate'},"+".C4::Context->preference('ReservesMaxPickUpDelay')."  days");
-	my $warning=Date_Cmp(ParseDate("today"),$calcDate);
-	if ($warning>0){
-		$getreserv{'messcompa'} = 1;
-	}
-	$getreserv{'title'} = $gettitle->{'title'};
-	$getreserv{'itemnumber'} = $gettitle->{'itemnumber'};
-	$getreserv{'biblionumber'} = $gettitle->{'biblionumber'};
-	$getreserv{'barcode'} = $gettitle->{'barcode'};
-	$getreserv{'itemtype'} = $itemtypeinfo->{'description'};
-	$getreserv{'homebranch'} = $gettitle->{'homebranch'};
-	$getreserv{'holdingbranch'} = $gettitle->{'holdingbranch'};
-	if ($gettitle->{'homebranch'} ne $gettitle->{'holdingbranch'}){
-		$getreserv{'dotransfer'} = 1;
-		}
-	$getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'};
-	$getreserv{'borrowernum'} = $getborrower->{'borrowernumber'};
-	$getreserv{'borrowername'} = $getborrower->{'surname'};
-	$getreserv{'borrowerfirstname'} =  $getborrower->{'firstname'} ;
-	if ($getborrower->{'emailaddress'}){
-		$getreserv{'borrowermail'} =  $getborrower->{'emailaddress'} ;
-	}
-	$getreserv{'borrowerphone'} = $getborrower->{'phone'};
-	push(@reservloop, \%getreserv);
-}
-
-	$template->param( reserveloop       => \@reservloop,
-			show_date	=> format_date($todaysdate),	
-			 );
-	
-output_html_with_http_headers $input, $cookie, $template->output;
\ No newline at end of file

Index: cgi-bin/circ/branchtransfers.pl
===================================================================
RCS file: cgi-bin/circ/branchtransfers.pl
diff -N cgi-bin/circ/branchtransfers.pl
--- cgi-bin/circ/branchtransfers.pl	10 Mar 2007 11:54:16 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,283 +0,0 @@
-#!/usr/bin/perl
-# WARNING: This file uses 4-character tabs!
-
-#written 11/3/2002 by Finlay
-#script to execute branch transfers of books
-
-
-# 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 CGI;
-use C4::Circulation::Circ2;
-use C4::Reserves2;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Koha;
-use C4::Members;
-###############################################
-# constants
-
-my %env;
-my $linecolor1='#ffffcc';
-my $linecolor2='white';
-
-my $branches = GetBranches();
-my $printers = getprinters(\%env);
-
-
-###############################################
-#  Getting state
-
-my $query=new CGI;
-
-
-my $branch = getbranch($query, $branches);
-my $printer = getprinter($query, $printers);
-
-my $genbrname = $branches->{$branch}->{'branchname'} ;
-my $genprname = $printers->{$printer}->{'printername'};
-
-my $messages;
-my $found;
-my $reserved;
-my $waiting;
-my $reqmessage;
-my $cancelled;
-my $setwaiting;
-my $reqbrchname;
-my $user=$query->param('loggedinuser');
-my $request=$query->param('request');
-my $borrnum = $query->param('borrowernumber');
-
-my $tobranchcd=$query->param('tobranchcd');
-my $frbranchcd='';
-my $dbh=C4::Context->dbh;
-############
-# Deal with the requests....
-if ($request eq "KillWaiting") {
-    my $item = $query->param('itemnumber');
-    CancelReserve(0, $item, $borrnum);
-	$cancelled = 1;
-	$reqmessage =1;
-}
-
-my $ignoreRs = 0;
-if ($request eq "SetWaiting") {
-    my $item = $query->param('itemnumber');
-    $tobranchcd = ReserveWaiting($item, $borrnum);
-	$reqbrchname = $branches->{$tobranchcd}->{'branchname'};
-    $ignoreRs = 1;
-	$setwaiting = 1;
-	$reqmessage =1;
-}
-if ($request eq 'KillReserved'){
-    my $biblio = $query->param('biblionumber');
-    CancelReserve($biblio, 0, $borrnum);
-	$cancelled = 1;
-	$reqmessage =1;
-}
-
-
-
-# set up the branchselect options....
-my @branchoptionloop;
-foreach my $br (keys %$branches) {
-    #(next) unless $branches->{$br}->{'CU'}; #FIXME disabled to fix bug 202
-    my %branch;
-    $branch{selected}=($br eq $tobranchcd);
-	$branch{code}=$br;
-	$branch{name}=$branches->{$br}->{'branchname'};
-	push (@branchoptionloop, \%branch);
-}
-
-
-# collect the stack of books already transfered so they can printed...
-my @trsfitemloop;
-my %transfereditems;
-my %frbranchcds;
-my %tobranchcds;
-my $color=$linecolor2;
-
-my $barcode = $query->param('barcode');
-if ($barcode) {
-	my $transfered;
-	my $iteminformation;
-	($transfered, $messages, $iteminformation)
-			= transferbook($tobranchcd, $barcode, $ignoreRs,$user);
-	$found = $messages->{'ResFound'};
-	if ($transfered) {
-		my %item;
-		my $frbranchcd = $iteminformation->{'holdingbranch'};
-		if (not ($found)) {
-			($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
-			$item{'color'}=$color;
-			$item{'biblionumber'}=$iteminformation->{'biblionumber'};
-			$item{'title'}=$iteminformation->{'title'};
-			$item{'author'}=$iteminformation->{'author'};
-			$item{'itemtype'}=$iteminformation->{'ctype'};
-			$item{'frbrname'}=$branches->{$frbranchcd}->{'branchname'};
-			$item{'tobrname'}=$branches->{$tobranchcd}->{'branchname'};
-		}
-		$item{counter}=0;
-		$item{barcode}=$barcode;
-		$item{frombrcd}=$frbranchcd;
-		$item{tobrcd}=$tobranchcd;
-##########
-#Are these lines still useful ???
-		$transfereditems{0}=$barcode;
-		$frbranchcds{0}=$frbranchcd;
-		$tobranchcds{0}=$tobranchcd;
-##########
-		push (@trsfitemloop, \%item);
-	}
-}
-
-foreach ($query->param){
-	(next) unless (/bc-(\d*)/);
-	my $counter=$1;
-	my %item;
-	my $bc=$query->param("bc-$counter");
-	my $frbcd=$query->param("fb-$counter");
-	my $tobcd=$query->param("tb-$counter");
-	$counter++;
-	$item{counter}=$counter;
-	$item{barcode}=$bc;
-	$item{frombrcd}=$frbcd;
-	$item{tobrcd}=$tobcd;
-	my ($iteminformation) = getiteminformation(\%env, 0, $bc);
-	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
-	$item{'color'}=$color;
-	$item{'biblionumber'}=$iteminformation->{'biblionumber'};
-	$item{'title'}=$iteminformation->{'title'};
-	$item{'author'}=$iteminformation->{'author'};
-	$item{'itemtype'}=$iteminformation->{'ctype'};
-	$item{'frbrname'}=$branches->{$frbcd}->{'branchname'};
-	$item{'tobrname'}=$branches->{$tobcd}->{'branchname'};
-##########
-#Are these lines still useful ???
-	$transfereditems{$counter}=$bc;
-	$frbranchcds{$counter}=$frbcd;
-	$tobranchcds{$counter}=$tobcd;
-#########
-	push (@trsfitemloop, \%item);
-}
-
-
-my $name;
-my $bornum;
-my $borcnum;
-my $itemnumber;
-my $biblionum;
-my $branchname;
-
-
-#####################
-
-if ($found) {
-    my $res = $messages->{'ResFound'};
-	$branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
-	my ($borr) = getpatroninformation(\%env, $res->{'borrowernumber'}, 0);
-	$name = name($borr);
-	$bornum = $borr->{'borrowernumber'}; #Hopefully, borr->{borrowernumber}=res->{borrowernumber}
-	$borcnum = $borr->{'cardnumber'};
-	$itemnumber = $res->{'itemnumber'};
-
-	if ($res->{'ResFound'} eq "Waiting") {
-		$waiting = 1;
-	}
-	if ($res->{'ResFound'} eq "Reserved") {
-		$reserved = 1;
-		$biblionum = $res->{'biblionumber'};
-	}
-}
-
-#####################
-
-my @errmsgloop;
-foreach my $code (keys %$messages) {
-	my %err;
-    $err{errbadcode} = ($code eq 'BadBarcode');
-	if ($code eq 'BadBarcode') {
-		$err{msg}=$messages->{'BadBarcode'};
-	}
-
-    $err{errispermanent} = ($code eq 'IsPermanent');
-    if ($code eq 'IsPermanent'){
-		$err{msg} = $branches->{$messages->{'IsPermanent'}}->{'branchname'};
-		# Here, msg contains the branchname
-		# Not so satisfied with this... But should work
-    }
-    $err{errdesteqholding} = ($code eq 'DestinationEqualsHolding');
-
-	$err{errwasreturned} = ($code eq 'WasReturned');
-	if ($code eq 'WasReturned') {
-		my ($borrowerinfo) = getpatroninformation(\%env, $messages->{'WasReturned'}, 0);
-		$name =name($borrowerinfo);
-		$bornum =$borrowerinfo->{'borrowernumber'};
-		$borcnum =$borrowerinfo->{'cardnumber'};
-    }
-    if ($code eq 'WasTransfered'){
-# Put code here if you want to notify the user that item was transfered...
-    }
-	push (@errmsgloop, \%err);
-}
-
-
-#######################################################################################
-# Make the page .....
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "circ/branchtransfers.tmpl",
-							query => $query,
-                            type => "intranet",
-                            authnotrequired => 0,
-                            flagsrequired => {editcatalogue => 1},
-                         });
-$template->param(	genbrname => $genbrname,
-								genprname => $genprname,
-								branch => $branch,
-								printer => $printer,
-								found => $found,
-								reserved => $reserved,
-								waiting => $waiting,
-								name => $name,
-								bornum => $bornum,
-								borcnum => $borcnum,
-								branchname => $branchname,
-								itemnumber => $itemnumber,
-								barcode => $barcode,
-								biblionumber => $biblionum,
-								tobranchcd => $tobranchcd,
-								reqmessage => $reqmessage,
-								cancelled => $cancelled,
-								setwaiting => $setwaiting,
-								trsfitemloop => \@trsfitemloop,
-								branchoptionloop => \@branchoptionloop,
-								errmsgloop => \@errmsgloop
-							);
-output_html_with_http_headers $query, $cookie, $template->output;
-
-
-sub name {
-	my ($borinfo) = @_;
-	return $borinfo->{'surname'}." ".$borinfo->{'title'}." ".$borinfo->{'firstname'};
-}
-
-# Local Variables:
-# tab-width: 4
-# End:

Index: cgi-bin/circ/circulation.pl
===================================================================
RCS file: cgi-bin/circ/circulation.pl
diff -N cgi-bin/circ/circulation.pl
--- cgi-bin/circ/circulation.pl	10 Mar 2007 11:54:16 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,486 +0,0 @@
-#!/usr/bin/perl
-
-# Please use 8-character tabs for this file (indents are every 4 characters)
-
-#written 8/5/2002 by Finlay
-#script to execute issuing of books
-# New functions (renew etc.) added 07-08-2005 Tumer Garip tgarip at neu.edu.tr
-
-# 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 CGI;
-use C4::Circulation::Circ2;
-use C4::Search;
-use C4::Output;
-use C4::Print;
-
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Koha;
-
-use C4::Date;
-use C4::Context;
-use C4::Members;
-# PARAMETERS READING
-#
-my $query=new CGI;
-
-my ($template, $loggedinuser, $cookie) = get_template_and_user
-    ({
-	template_name	=> 'circ/circulation.tmpl',
-	query		=> $query,
-	type		=> "intranet",
-	authnotrequired	=> 0,
-	flagsrequired	=> { circulate => 1 },
-    });
-my $branches = GetBranches();
-my $printers = getprinters();
-#my $branch = getbranch($query, $branches);
-my $branch=C4::Context->preference("defaultBranch");
-my $printer = getprinter($query, $printers);
-
-my $findborrower = $query->param('findborrower');
-
-$findborrower =~ s|,| |g;
-$findborrower =~ s|'| |g;
-my $borrowernumber = $query->param('borrnumber');
-
-my $print=$query->param('print');
-my $barcode = $query->param('barcode');
-my $year=$query->param('year');
-my $month=$query->param('month');
-my $day=$query->param('day');
-my $stickyduedate=$query->param('stickyduedate');
-my $issueconfirmed = $query->param('issueconfirmed');
-my $cancelreserve = $query->param('cancelreserve');
-my %error;
-my  $errorflag=$query->param('error');
-## The following er
-if ( $errorflag gt "1"){
-%error=(TOO_EARLY=>{1},) if ($errorflag eq "2");
-%error=(NO_MORE_RENEWALS=>{1},) if ($errorflag eq "3");
-%error=(RESERVE_FOUND=>{1},) if ($errorflag eq "4");
-}elsif ( $errorflag eq "1"){
-%error=(SUCCESFULL_RENEW=>{1},)
-}
-#set up cookie.....
-my $branchcookie;
-my $printercookie;
-#if ($query->param('setcookies')) {
-#	$branchcookie = $query->cookie(-name=>'branch', -value=>"$branch", -expires=>'+1y');
-#	$printercookie = $query->cookie(-name=>'printer', -value=>"$printer", -expires=>'+1y');
-#}
-
-my %env; # FIXME env is used as an "environment" variable. Could be dropped probably...
-
-$env{'branchcode'}=$branch;
-$env{'printer'}=$printer;
-$env{'queue'}=$printer;
-
-
-my $todaysdate =get_today();
-
-
-# check and see if we should print
- if ($barcode eq ''  && $print eq 'maybe'){
- 	$print = 'yes';
- }
- if ($print eq 'yes' && $borrowernumber ne ''){
- 	printslip(\%env,$borrowernumber);
- 	$query->param('borrnumber','');
- 	$borrowernumber='';
- }
-
-#
-# STEP 2 : FIND BORROWER
-# if there is a list of find borrowers....
-#
-my $borrowerslist;
-my $message;
-if ($findborrower) {
-	my ($count,$borrowers)=BornameSearch(\%env,$findborrower,'cardnumber','web');
-	my @borrowers=@$borrowers;
-	if ($#borrowers == -1) {
-		$query->param('findborrower', '');
-		$message =  "'$findborrower'";
-	} elsif ($#borrowers == 0) {
-		$query->param('borrnumber', $borrowers[0]->{'borrowernumber'});
-		$query->param('barcode','');
-		$borrowernumber=$borrowers[0]->{'borrowernumber'};
-	} else {
-		$borrowerslist = \@borrowers;
-	}
-}
-
-# get the borrower information.....
-my $borrower;
-my $bornum=$query->param('bornum');
-if ($bornum){
-$borrowernumber=$bornum;
-}
-my $issues;
-if ($borrowernumber) {
-	$borrower = getpatroninformation(\%env,$borrowernumber,0);
-	my ($od,$issue,$fines)=borrdata2(\%env,$borrowernumber);
-	my ($resod,$resissue,$fines,$resfine)=borrdata3(\%env,$borrowernumber);
-
-	$template->param(overduecount => $od,resoverdue=>$resod,resissuecount=>$resissue,resfine=>$resfine,
-							issuecount => $issue,
-							finetotal => $fines);
-$issues=$issue;
-my $picture;
- my $htdocs = C4::Context->config('opacdir');
-
-$picture =$htdocs. "/htdocs/uploaded-files/users-photo/".$borrower->{'cardnumber'}.".jpg";
- if (-e $picture)
-{ 
-   $template->param(borrowerphoto => "http://library.neu.edu.tr/uploaded-files/users-photo/".$borrower->{'cardnumber'}.".jpg");
- }else{
-$picture = "http://cc.neu.edu.tr/stdpictures/".$borrower->{'cardnumber'}.".jpg";
-  $template->param(borrowerphoto => $picture);
-}
-}
-
-#
-# STEP 3 : ISSUING
-#
-#Try to  issue
-
-
-if ($barcode) {
-
-	$barcode = cuecatbarcodedecode($barcode);
-	my ($datedue, $invalidduedate) = fixdate($year, $month, $day);
-	if ($issueconfirmed) {
-		issuebook(\%env, $borrower, $barcode, $datedue,$cancelreserve);
-		my ($od,$issue,$fines)=borrdata2(\%env,$borrowernumber);
-
-
-	$template->param(overduecount => $od,
-							issuecount => $issue,
-							finetotal => $fines);	
-
-	} else {
-		my ($error, $question) = canbookbeissued(\%env, $borrower, $barcode, $year, $month, $day) unless %error;
-		$error=\%error if %error;
-
-		my $noerror=1;
-		my $noquestion = 1;
-		foreach my $impossible (keys %$error) {
-			$template->param($impossible => $$error{$impossible},
-							IMPOSSIBLE => 1) unless ($impossible eq 'SUCCESFULL_RENEW');
-			$noerror = 0;
-		}
-		foreach my $needsconfirmation (keys %$question) {
-			$template->param($needsconfirmation => $$question{$needsconfirmation},
-							NEEDSCONFIRMATION => 1);
-			$noquestion = 0;
-		}
-		$template->param(day => $day,
-						month => $month,
-						year => $year);
-		if ($noerror && ($noquestion || $issueconfirmed)) {
-
-			issuebook(\%env, $borrower, $barcode, $datedue);
-		my ($od,$issue,$fines)=borrdata2(\%env,$borrowernumber);
-	
-
-	$template->param(overduecount => $od,
-							issuecount => $issue,
-							finetotal => $fines);
-		}
-	}
-
-}
-
-
-
-
-##################################################################################
-# BUILD HTML
-
-# make the issued books table.....
-my $todaysissues='';
-my $previssues='';
-my @realtodayissues;
-my @realprevissues;
-#my @renewissues;
-my $allowborrow;
-if ($borrower) {
-
-# get each issue of the borrower & separate them in todayissues & previous issues
-	my @todaysissues;
-	my @previousissues;
-	my $issueslist = getissues($borrower);
-	# split in 2 arrays for today & previous
-	foreach my $it (keys %$issueslist) {
-		my $issuedate = $issueslist->{$it}->{'issue_date'};
-#		$issuedate = substr($issuedate, 0, 10);
-	
-		if ($todaysdate eq $issuedate) {
-			push @todaysissues, $issueslist->{$it};
-		} else { 
-			push @previousissues, $issueslist->{$it};
-		}
-    }
-
-
-	my $od; # overdues
-	my $i = 0;
-	my $togglecolor;
-	# parses today & build Template array
-	foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @todaysissues){
-		my $dd = $book->{'date_due'};
-		my $datedue = $book->{'date_due'};
-
-		$dd=format_date($dd);
-#		$datedue=~s/-//g;
-		if ($datedue lt $todaysdate) {
-			$od = 1;
-		} else {
-			$od=0;
-		}
-		$book->{'od'}=$od;
-		$book->{'dd'}=$dd;
-		
-		if ($togglecolor) {
-			$togglecolor=0;
-		} else {
-			$togglecolor=1;
-		}
-		$book->{'tcolor'}=$togglecolor;
-		if ($book->{'author'} eq ''){
-			$book->{'author'}=' ';
-		}    
-		push @realtodayissues,$book;
-	$i++;
-	}
-
-
-
-	# parses previous & build Template array
-	$i=0;
-    foreach my $book (sort {$a->{'date_due'} cmp $b->{'date_due'}} @previousissues){
-		my $dd = $book->{'date_due'};
-		my $datedue = $book->{'date_due'};
-		$dd=format_date($dd);
-		my $pcolor = '';
-		my $od = '';
-#		$datedue=~s/-//g;
-		if ($datedue lt $todaysdate) {
-		
-			$od = 1;
-		} else {
-			$od = 0;
-		}
-	
-		if ($togglecolor) {
-			$togglecolor=0;
-		} else {
-			$togglecolor=1;
-		}
-	$book->{'tcolor'}=$togglecolor;
-		$book->{'dd'}=$dd; 
-		$book->{'od'}=$od;
-		#$book->{'tcolor'}=$pcolor;
-		if ($book->{'author'} eq ''){
-			$book->{'author'}=' ';
-		}    
-
-		push @realprevissues,$book;
-	$i++;
-	}
-
-}#borrower
-
-
-my @values;
-my %labels;
-my $CGIselectborrower;
-if ($borrowerslist) {
-	foreach (sort {$a->{'surname'}.$a->{'firstname'} cmp $b->{'surname'}.$b->{'firstname'}} @$borrowerslist){
-		push @values,$_->{'borrowernumber'};
-		$labels{$_->{'borrowernumber'}} ="$_->{'surname'}, $_->{'firstname'} ... ($_->{'cardnumber'} - $_->{'categorycode'}) ...  $_->{'streetaddress'} ";
-	}
-	$CGIselectborrower=CGI::scrolling_list( -name     => 'borrnumber',
-				-values   => \@values,
-				-labels   => \%labels,
-				-size     => 7,
-				-multiple => 0 );
-}
-#title
-
-my ($patrontable, $flaginfotable) = patrontable($borrower);
-my $amountold=$borrower->{flags}->{'CHARGES'}->{'message'};
-my @temp=split(/\$/,$amountold);
-$amountold=$temp[1];
-$template->param( today=>format_date($todaysdate),
-		findborrower => $findborrower,
-		borrower => $borrower,
-		borrowernumber => $borrowernumber,
-		branch => $branch,
-		printer => $printer,
-		branchname => $branches->{$branch}->{'branchname'},
-		printername => $printers->{$printer}->{'printername'},
-		firstname => $borrower->{'firstname'},
-		surname => $borrower->{'surname'},
-		categorycode => getborrowercategory($borrower->{'categorycode'}),
-		streetaddress => $borrower->{'streetaddress'},
-		emailaddress => $borrower->{'emailaddress'},
-		borrowernotes => $borrower->{'borrowernotes'},
-		city => $borrower->{'city'},
-		phone => $borrower->{'phone'},
-		cardnumber => $borrower->{'cardnumber'},
-		amountold => $amountold,
-		barcode => $barcode,
-		stickyduedate => $stickyduedate,
-		message => $message,
-		CGIselectborrower => $CGIselectborrower,
-		todayissues => \@realtodayissues,
-		previssues => \@realprevissues,
-		
-	);
-# set return date if stickyduedate
-if ($stickyduedate) {
-	my $t_year = "year".$year;
-	my $t_month = "month".$month;
-	my $t_day = "day".$day;
-	$template->param(
-		$t_year => 1,
-		$t_month => 1,
-		$t_day => 1,
-	);
-}
-
-
-if ($branchcookie) {
-    $cookie=[$cookie, $branchcookie, $printercookie];
-}
-
-output_html_with_http_headers $query, $cookie, $template->output;
-
-####################################################################
-# Extra subroutines,,,
-
-sub patrontable {
-    my ($borrower) = @_;
-    my $flags = $borrower->{'flags'};
-    my $flaginfotable='';
-    my $flaginfotext;
-    #my $flaginfotext='';
-    my $flag;
-    my $color='';
-    foreach $flag (sort keys %$flags) {
-#    	my @itemswaiting='';
-	$flags->{$flag}->{'message'}=~s/\n/<br>/g;
-	if ($flags->{$flag}->{'noissues'}) {
-		$template->param(
-			flagged => 1,
-			noissues => 'true',
-			 );
-		if ($flag eq 'GNA'){
-			$template->param(
-				gna => 'true'
-				);
-			}
-		if ($flag eq 'LOST'){
-			$template->param(
-				lost => 'true'
-			);
-			}
-		if ($flag eq 'DBARRED'){
-			$template->param(
-				dbarred => 'true'
-			);
-			}
-		if ($flag eq 'CHARGES') {
-			$template->param(
-				charges => 'true',
-				chargesmsg => $flags->{'CHARGES'}->{'message'}
-				 );
-		}
-	} else {
-		 if ($flag eq 'CHARGES') {
-			$template->param(
-				charges => 'true',
-				flagged => 1,
-				chargesmsg => $flags->{'CHARGES'}->{'message'}
-			 );
-		}
-	    	if ($flag eq 'WAITING') {
-			my $items=$flags->{$flag}->{'itemlist'};
-		        my @itemswaiting;
-			foreach my $item (@$items) {
-			my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
-			$iteminformation->{'branchname'} = $branches->{$iteminformation->{'holdingbranch'}}->{'branchname'};
-			push @itemswaiting, $iteminformation;
-			}
-			$template->param(
-				flagged => 1,
-				waiting => 'true',
-				waitingmsg => $flags->{'WAITING'}->{'message'},
-				itemswaiting => \@itemswaiting,
-				 );
-		}
-		if ($flag eq 'ODUES') {
-			$template->param(
-				odues => 'true',
-				flagged => 1,
-				oduesmsg => $flags->{'ODUES'}->{'message'}
-				 );
-
-			my $items=$flags->{$flag}->{'itemlist'};
-			{
-			    my @itemswaiting;
-			foreach my $item (@$items) {
-				my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
-				push @itemswaiting, $iteminformation;
-			}
-			}
-			if ($query->param('module') ne 'returns'){
-				$template->param( nonreturns => 'true' );
-			}
-		}
-		if ($flag eq 'NOTES') {
-			$template->param(
-				notes => 'true',
-				flagged => 1,
-				notesmsg => $flags->{'NOTES'}->{'message'}
-				 );
-		}
-	}
-    }
-    return($patrontable, $flaginfotext);
-}
-
-sub cuecatbarcodedecode {
-    my ($barcode) = @_;
-    chomp($barcode);
-    my @fields = split(/\./,$barcode);
-    my @results = map(decode($_), @fields[1..$#fields]);
-    if ($#results == 2){
-  	return $results[2];
-    } else {
-	return $barcode;
-    }
-}
-
-# Local Variables:
-# tab-width: 8
-# End:

Index: cgi-bin/circ/currenttransfers.pl
===================================================================
RCS file: cgi-bin/circ/currenttransfers.pl
diff -N cgi-bin/circ/currenttransfers.pl
--- cgi-bin/circ/currenttransfers.pl	10 Mar 2007 11:54:16 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,123 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: currenttransfers.pl,v 1.1.2.1 2007/03/10 11:54:16 tgarip1957 Exp $
-
-# 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::Interface::CGI::Output;
-use CGI;
-use C4::Auth;
-use C4::Date;
-use C4::Circulation::Circ2;
-use C4::Date;
-use C4::Koha;
-use C4::Search;
-use C4::Reserves2;
-
-my $input = new CGI;
-
-my $theme = $input->param('theme'); # only used if allowthemeoverride is set
-my $itemnumber = $input->param('itemnumber');
-# if we have a resturn of the form to delete the transfer, we launch the subrroutine
-if ($itemnumber){
-	C4::Circulation::Circ2::DeleteTransfer($itemnumber);
-}
-
-my ($template, $loggedinuser, $cookie)
-      = get_template_and_user({template_name => "circ/currenttransfers.tmpl",
-	                                 query => $input,
-	                                 type => "intranet",
-	                                 authnotrequired => 0,
-	                                 flagsrequired => {borrowers => 1},
-	                                 debug => 1,
-	                                 });
-
-
-# set the userenv branch
-my $default = C4::Context->userenv->{'branch'};
-
-
-
-my $todaysdate = get_today();
-
-# get the all the branches for reference
-my $branches = GetBranches();
-my @branchesloop;
-foreach my $br (keys %$branches) {
-	my @transferloop;
-	my %branchloop;
-	$branchloop{'branchname'} = $branches->{$br}->{'branchname'};
-	$branchloop{'branchcode'} = $branches->{$br}->{'branchcode'};
-	# # # # # # # # # # # # # # # # # # # # # # 
-	my @gettransfers = GetTransfersFromBib($branches->{$br}->{'branchcode'},$default);
-		if (@gettransfers){
-		foreach my $num (@gettransfers) {
-			my %getransf;
-			my %env;
-			my $calcDate=DATE_Add($num->{'datesent'},C4::Context->preference('TransfersMaxDaysWarning'));
-			my $warning=DATE_Diff($todaysdate,$calcDate);
-			if ($warning>0){
-				$getransf{'messcompa'} = 1;
-			}
-			my $gettitle = getiteminformation(\%env,$num->{'itemnumber'});
-			my $itemtypeinfo = getitemtypeinfo($gettitle->{'ctype'});
-			
-				$getransf{'title'} = $gettitle->{'title'};
-				$getransf{'datetransfer'} = format_date($num->{'datesent'});
-				$getransf{'biblionumber'} = $gettitle->{'biblionumber'};
-				$getransf{'itemnumber'} = $gettitle->{'itemnumber'};
-				$getransf{'barcode'} = $gettitle->{'barcode'};
-				$getransf{'itemtype'} = $itemtypeinfo->{'description'};
-				$getransf{'homebranch'} = $gettitle->{'homebranch'};
-				$getransf{'holdingbranch'} = $gettitle->{'holdingbranch'};
-				$getransf{'itemcallnumber'} = $gettitle->{'itemcallnumber'};
-
-# 				we check if we have a reserv for this transfer
-				my @checkreserv = FastFindReserves($num->{'itemnumber'});
-				if (@checkreserv[0]){
-					my $getborrower = getpatroninformation (\%env,$checkreserv[1]);
-					$getransf{'borrowernum'} = $getborrower->{'borrowernumber'};
-					$getransf{'borrowername'} = $getborrower->{'surname'};
-					$getransf{'borrowerfirstname'} =  $getborrower->{'firstname'};
-						if ($getborrower->{'emailaddress'}){
-							$getransf{'borrowermail'} =  $getborrower->{'emailaddress'} ;
-						}
-					$getransf{'borrowerphone'} = $getborrower->{'phone'};	
-
-				}
-				push(@transferloop, \%getransf);
-			}
-# 		If we have a return of reservloop we put it in the branchloop sequence
-		$branchloop{'reserv'} = \@transferloop ;
-		}		
-	else {
-# 	if we don't have a retrun from reservestobranch we unset branchname and branchcode
-	$branchloop{'branchname'} = 0;
-	$branchloop{'branchcode'} = 0;
-	}
-push(@branchesloop, \%branchloop);
-}
-	$template->param( branchesloop  => \@branchesloop,
-			show_date	=> format_date($todaysdate)	
-			 );
-	
-output_html_with_http_headers $input, $cookie, $template->output;
-
-

Index: cgi-bin/circ/renewscript.pl
===================================================================
RCS file: cgi-bin/circ/renewscript.pl
diff -N cgi-bin/circ/renewscript.pl
--- cgi-bin/circ/renewscript.pl	10 Mar 2007 11:54:16 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,78 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: renewscript.pl,v 1.1.2.1 2007/03/10 11:54:16 tgarip1957 Exp $
-
-#written 18/1/2000 by chris at katipo.co.nz
-#script to renew items from the web
-
-
-# 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 CGI;
-use C4::Circulation::Circ2;
-use C4::Date;
-use C4::Members;
-use C4::Log;
-use C4::Context;
-use C4::Auth;
-#get input
-my $input= new CGI;
-my $flagsrequired;
-# $flagsrequired->{circulation}=1;
-#my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired);
-
-my @names=$input->param();
-my $count=@names;
-my %data;
-my $dbh = C4::Context->dbh;
-for (my $i=0;$i<$count;$i++){
-  if ($names[$i] =~ /renew/){
-    my $temp=$names[$i];
-    $temp=~ s/renew_item_//;
-    $data{$temp}=$input->param($names[$i]);
-  }
-}
-my %env;
-my $barcode;
-my $destination = $input->param("destination");
-my $cardnumber = $input->param("cardnumber");
-my $bornum=$input->param("bornum");
-my $error;
-my $status=0;
-
-while ( my ($itemno, $value) = each %data) {
-
-   if ($value eq 'y'){
-my $iteminformation = getiteminformation($env, $itemno,0);
-$barcode=$iteminformation->{'barcode'};
-	 $status=renewstatus(\%env,$bornum,$itemno);
-	if ($status==1){
-     renewbook($env,$bornum,$itemno);	
-
-# logaction($loggedinuser,"circulation","renew",$barcode,$bornum) if (&logstatus);
-	}else{
-	last;
-	}   
-}
-}
-
-if($destination eq "circ" || $status>1){
-	print $input->redirect("/cgi-bin/koha/circ/circulation.pl?bornum=$bornum&error=$status&barcode=$barcode");
-} else {
-	print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
-}
\ No newline at end of file

Index: cgi-bin/circ/rescirculation.pl
===================================================================
RCS file: cgi-bin/circ/rescirculation.pl
diff -N cgi-bin/circ/rescirculation.pl
--- cgi-bin/circ/rescirculation.pl	10 Mar 2007 11:54:16 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,465 +0,0 @@
-#!/usr/bin/perl
-
-# Please use 8-character tabs for this file (indents are every 4 characters)
-
-#written 8/5/2002 by Finlay
-#script to execute issuing of books
-# New functions added 07-08-2005 Tumer Garip tgarip at neu.edu.tr
-
-# 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 CGI;
-use C4::Circulation::Circ3;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Koha;
-use C4::Date;
-use C4::Context;
-use C4::Members;
-use C4::Print;
-use C4::Log;
-#
-# PARAMETERS READING
-#
-my $query=new CGI;
-
-my ($template, $loggedinuser, $cookie) = get_template_and_user
-    ({
-	template_name	=> 'circ/rescirculation.tmpl',
-	query		=> $query,
-	type		=> "intranet",
-	authnotrequired	=> 0,
-	flagsrequired	=> { circulate => 1 },
-    });
-my $branches = GetBranches();
-my $printers = getprinters();
-my $branch=C4::Context->preference("defaultBranch");
-my $printer = getprinter($query, $printers);
-
-my $findborrower = $query->param('findborrower');
-$findborrower =~ s|,| |g;
-$findborrower =~ s|'| |g;
-my $borrowernumber = $query->param('borrnumber');
-
-my $print=$query->param('print');
-my $barcode = $query->param('barcode');
-my $year=$query->param('year');
-my $month=$query->param('month');
-my $day=$query->param('day');
-my $stickyduedate=$query->param('stickyduedate');
-my $issueconfirmed = $query->param('issueconfirmed');
-my $cancelreserve = $query->param('cancelreserve');
-
-my $renew=0;
- 
-#set up cookie.....
-my $branchcookie;
-my $printercookie;
-#if ($query->param('setcookies')) {
-#	$branchcookie = $query->cookie(-name=>'branch', -value=>"$branch", -expires=>'+1y');
-#	$printercookie = $query->cookie(-name=>'printer', -value=>"$printer", -expires=>'+1y');
-#}
-
-my %env; # FIXME env is used as an "environment" variable. Could be dropped probably...
-
-$env{'branchcode'}=$branch;
-$env{'printer'}=$printer;
-$env{'queue'}=$printer;
-
-my $todaysdate =get_today();
-
-
-# check and see if we should print
- if ($barcode eq ''  && $print eq 'maybe'){
- 	$print = 'yes';
- }
- if ($print eq 'yes' && $borrowernumber ne ''){
- 	printslip(\%env,$borrowernumber);
- 	$query->param('borrnumber','');
- 	$borrowernumber='';
- }
-
-#
-# STEP 2 : FIND BORROWER
-# if there is a list of find borrowers....
-#
-my $borrowerslist;
-my $message;
-if ($findborrower) {
-	my ($count,$borrowers)=BornameSearch(\%env,$findborrower,'cardnumber','web');
-	my @borrowers=@$borrowers;
-	if ($#borrowers == -1) {
-		$query->param('findborrower', '');
-		$message =  "'$findborrower'";
-	} elsif ($#borrowers == 0) {
-		$query->param('borrnumber', $borrowers[0]->{'borrowernumber'});
-		$query->param('barcode','');
-		$borrowernumber=$borrowers[0]->{'borrowernumber'};
-	} else {
-		$borrowerslist = \@borrowers;
-	}
-}
-
-# get the borrower information.....
-my $borrower;
-my $bornum=$query->param('bornum');
-if ($bornum){
-$borrowernumber=$bornum;
-}
-
-if ($borrowernumber) {
-	$borrower = C4::Members::getpatroninformation(\%env,$borrowernumber,0);
-	my ($od,$issue,$fines,$resfine)=borrdata3(\%env,$borrowernumber);
-if ($resfine >0 || $fines) {
-$template->param(
-			flagged => 1,
-			noissues => 'true',
-			 );
-}
-	$template->param(overduecount => $od,
-							issuecount => $issue,
-							finetotal => $fines,
-							resfine => $resfine);
-my $picture;
- my $htdocs = C4::Context->config('opacdir');
-
-$picture =$htdocs. "/htdocs/uploaded-files/users-photo/".$borrower->{'cardnumber'}.".jpg";
- if (-e $picture)
-{ 
-
-   $template->param(borrowerphoto => "http://library.neu.edu.tr/uploaded-files/users-photo/".$borrower->{'cardnumber'}.".jpg");
- }else{
-$picture = "http://cc.neu.edu.tr/stdpictures/".$borrower->{'cardnumber'}.".jpg";
-  $template->param(borrowerphoto => $picture);
-}
-}
-$renew=$query->param('renew');
-
-#
-# STEP 3 : ISSUING
-#
-#Try to issue
-
-if ($barcode) {
-
-	$barcode = cuecatbarcodedecode($barcode);
-#	my ($datedue, $invalidduedate) = fixdate($year, $month, $day);
-	if ($issueconfirmed) {
-			issuebookr(\%env, $borrower, $barcode, $cancelreserve);
-my ($od,$issue,$fines,$resfine)=borrdata3(\%env,$borrowernumber);
-	$template->param(overduecount => $od,
-							issuecount => $issue,
-							finetotal => $fines,
-							resfine => $resfine);
-logaction($loggedinuser,"circulation","issue",$barcode,$borrowernumber) if (&logstatus);
-
-	} else {
-		my ($error, $question) = canbookbeissuedr(\%env, $borrower, $barcode, $year, $month, $day);
-		my $noerror=1;
-		my $noquestion = 1;
-		foreach my $impossible (keys %$error) {
-			$template->param($impossible => $$error{$impossible},
-							IMPOSSIBLE => 1);
-			$noerror = 0;
-		}
-		foreach my $needsconfirmation (keys %$question) {
-			$template->param($needsconfirmation => $$question{$needsconfirmation},
-							NEEDSCONFIRMATION => 1);
-			$noquestion = 0;
-		}
-		$template->param(day => $day,
-						month => $month,
-						year => $year);
-		if ($noerror && ($noquestion || $issueconfirmed)) {
-			issuebookr(\%env, $borrower, $barcode);
-		logaction($loggedinuser,"circulation","issue",$barcode,$borrowernumber) if (&logstatus);
-
-			my ($od,$issue,$fines,$resfine)=borrdata3(\%env,$borrowernumber);
-				$template->param(overduecount => $od,
-							issuecount => $issue,
-							finetotal => $fines,
-							resfine => $resfine);
-		}
-	}
-	}#barcode
-
-
-
-
-
-##################################################################################
-# BUILD HTML
-
-# make the issued books table.....
-my $todaysissues='';
-my $previssues='';
-my @realtodayissues;
-my @realprevissues;
-my $allowborrow;
-if ($borrower) {
-# get each issue of the borrower & separate them in todayissues & previous issues
-	my @todaysissues;
-	my @previousissues;
-	my $issueslist = getissuesr($borrower);
-	
-	# split in 2 arrays for today & previous
-	foreach my $it (keys %$issueslist) {
-		my $issuedate = $issueslist->{$it}->{'timestamp'};
-		$issuedate = substr($issuedate, 0, 10);
-#warn "$todaysdate,$issuedate";
-		if ($todaysdate == $issuedate) {
-			push @todaysissues, $issueslist->{$it};
-		} else {
-			push @previousissues, $issueslist->{$it};
-		}
-    }
-
-
-	my $od; # overdues
-	my $togglecolor;
-	# parses today & build Template array
-	foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @todaysissues){
-		my $dd = $book->{'duetime'};
-		my $overdue = $book->{'overdue'};
-#		$dd=format_date($dd);
-#		$datedue=~s/-//g;
-		if ($overdue) {
-			$od = 1;
-		} else {
-			$od=0;
-		}
-		$book->{'od'}=$od;
-		$book->{'dd'}=$dd;
-		
-		if ($togglecolor) {
-			$togglecolor=0;
-		} else {
-			$togglecolor=1;
-		}
-		$book->{'tcolor'}=$togglecolor;
-		if ($book->{'author'} eq ''){
-			$book->{'author'}=' ';
-		}    
-		push @realtodayissues,$book;
-	}
-
-	# parses previous & build Template array
-    foreach my $book (sort {$a->{'date_due'} cmp $b->{'date_due'}} @previousissues){
-		my $dd = $book->{'duedate'};
-		my $overdue = $book->{'overdue'};
-#		$dd=format_date($dd);
-		my $pcolor = '';
-		my $od = '';
-#		$datedue=~s/-//g;
-		if ($overdue) {
-			$od = 1;
-		} else {
-			$od = 0;
-		}
-		
-		if ($togglecolor) {
-			$togglecolor=0;
-		} else {
-			$togglecolor=1;
-		}
-		$book->{'dd'}=$dd; 
-		$book->{'od'}=$od;
-		$book->{'tcolor'}=$togglecolor;
-		if ($book->{'author'} eq ''){
-			$book->{'author'}=' ';
-		}    
-		push @realprevissues,$book
-	}
-}
-
-
-my @values;
-my %labels;
-my $CGIselectborrower;
-if ($borrowerslist) {
-	foreach (sort {$a->{'surname'}.$a->{'firstname'} cmp $b->{'surname'}.$b->{'firstname'}} @$borrowerslist){
-		push @values,$_->{'borrowernumber'};
-		$labels{$_->{'borrowernumber'}} ="$_->{'surname'}, $_->{'firstname'} ... ($_->{'cardnumber'} - $_->{'categorycode'}) ...  $_->{'streetaddress'} ";
-	}
-	$CGIselectborrower=CGI::scrolling_list( -name     => 'borrnumber',
-				-values   => \@values,
-				-labels   => \%labels,
-				-size     => 7,
-				-multiple => 0 );
-}
-#title
-
-my ($patrontable, $flaginfotable) = patrontable($borrower);
-my $amountold=$borrower->{flags}->{'CHARGES'}->{'message'};
-my @temp=split(/\$/,$amountold);
-$amountold=$temp[1];
-$template->param( today=>format_date($todaysdate),
-		findborrower => $findborrower,
-		borrower => $borrower,
-		borrowernumber => $borrowernumber,
-		branch => $branch,
-		printer => $printer,
-		branchname => $branches->{$branch}->{'branchname'},
-		printername => $printers->{$printer}->{'printername'},
-		firstname => $borrower->{'firstname'},
-		surname => $borrower->{'surname'},
-		categorycode => getborrowercategory($borrower->{'categorycode'}),
-		streetaddress => $borrower->{'streetaddress'},
-		emailaddress => $borrower->{'emailaddress'},
-		borrowernotes => $borrower->{'borrowernotes'},
-		city => $borrower->{'city'},
-		phone => $borrower->{'phone'},
-		cardnumber => $borrower->{'cardnumber'},
-		amountold => $amountold,
-		barcode => $barcode,
-		renew=>$renew,
-		stickyduedate => $stickyduedate,
-		message => $message,
-		CGIselectborrower => $CGIselectborrower,
-		todayissues => \@realtodayissues,
-		previssues => \@realprevissues,
-	);
-# set return date if stickyduedate
-if ($stickyduedate) {
-	my $t_year = "year".$year;
-	my $t_month = "month".$month;
-	my $t_day = "day".$day;
-	$template->param(
-		$t_year => 1,
-		$t_month => 1,
-		$t_day => 1,
-	);
-}
-
-
-if ($branchcookie) {
-    $cookie=[$cookie, $branchcookie, $printercookie];
-}
-
-output_html_with_http_headers $query, $cookie, $template->output;
-
-####################################################################
-# Extra subroutines,,,
-
-sub patrontable {
-    my ($borrower) = @_;
-    my $flags = $borrower->{'flags'};
-    my $flaginfotable='';
-    my $flaginfotext;
-    #my $flaginfotext='';
-    my $flag;
-    my $color='';
-    foreach $flag (sort keys %$flags) {
-#    	my @itemswaiting='';
-	$flags->{$flag}->{'message'}=~s/\n/<br>/g;
-	if ($flags->{$flag}->{'noissues'}) {
-		$template->param(
-			flagged => 1,
-			noissues => 'true',
-			 );
-		if ($flag eq 'GNA'){
-			$template->param(
-				gna => 'true'
-				);
-			}
-		if ($flag eq 'LOST'){
-			$template->param(
-				lost => 'true'
-			);
-			}
-		if ($flag eq 'DBARRED'){
-			$template->param(
-				dbarred => 'true'
-			);
-			}
-		if ($flag eq 'CHARGES') {
-			$template->param(
-				charges => 'true',
-				chargesmsg => $flags->{'CHARGES'}->{'message'}
-				 );
-		}
-	} else {
-		 if ($flag eq 'CHARGES') {
-			$template->param(
-				charges => 'true',
-				flagged => 1,
-				chargesmsg => $flags->{'CHARGES'}->{'message'}
-			 );
-		}
-	    	if ($flag eq 'WAITING') {
-			my $items=$flags->{$flag}->{'itemlist'};
-		        my @itemswaiting;
-			foreach my $item (@$items) {
-			my ($iteminformation) = C4::Circulation::Circ2::getiteminformation(\%env, $item->{'itemnumber'}, 0);
-			$iteminformation->{'branchname'} = $branches->{$iteminformation->{'holdingbranch'}}->{'branchname'};
-			push @itemswaiting, $iteminformation;
-			}
-			$template->param(
-				flagged => 1,
-				waiting => 'true',
-				waitingmsg => $flags->{'WAITING'}->{'message'},
-				itemswaiting => \@itemswaiting,
-				 );
-		}
-		if ($flag eq 'ODUES') {
-			$template->param(
-				odues => 'true',
-				flagged => 1,
-				oduesmsg => $flags->{'ODUES'}->{'message'}
-				 );
-
-			my $items=$flags->{$flag}->{'itemlist'};
-			{
-			    my @itemswaiting;
-			foreach my $item (@$items) {
-				my ($iteminformation) = C4::Circulation::Circ2::getiteminformation(\%env, $item->{'itemnumber'}, 0);
-				push @itemswaiting, $iteminformation;
-			}
-			}
-			if ($query->param('module') ne 'returns'){
-				$template->param( nonreturns => 'true' );
-			}
-		}
-		if ($flag eq 'NOTES') {
-			$template->param(
-				notes => 'true',
-				flagged => 1,
-				notesmsg => $flags->{'NOTES'}->{'message'}
-				 );
-		}
-	}
-    }
-    return($patrontable, $flaginfotext);
-}
-
-sub cuecatbarcodedecode {
-    my ($barcode) = @_;
-    chomp($barcode);
-    my @fields = split(/\./,$barcode);
-    my @results = map(decode($_), @fields[1..$#fields]);
-    if ($#results == 2){
-  	return $results[2];
-    } else {
-	return $barcode;
-    }
-}
-
-# Local Variables:
-# tab-width: 8
-# End:

Index: cgi-bin/circ/resreturns.pl
===================================================================
RCS file: cgi-bin/circ/resreturns.pl
diff -N cgi-bin/circ/resreturns.pl
--- cgi-bin/circ/resreturns.pl	10 Mar 2007 11:54:16 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,480 +0,0 @@
-#!/usr/bin/perl
-# WARNING: This file contains mixed-sized tabs! (some 4-character, some 8)
-# WARNING: Currently, 4-character tabs seem to be dominant
-# WARNING: But there are still lots of 8-character tabs
-
-#written 11/3/2002 by Finlay
-#script to execute returns of books
-
-# 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 CGI;
-use C4::Circulation::Circ3;
-use C4::Search;
-use C4::Output;
-use C4::Print;
-use C4::Reserves2;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Log;
-use C4::Koha;
-use C4::Members;
-my $query = new CGI;
-
-#getting the template
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "circ/resreturns.tmpl",
-        query           => $query,
-        type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { circulate => 1 },
-    }
-);
-
-#####################
-#Global vars
-my %env;
-my $headerbackgroundcolor = '#99cc33';
-my $linecolor1            = '#ffffcc';
-my $linecolor2            = 'white';
-
-my $branches = GetBranches();
-my $printers = getprinters( \%env );
-
-# my $branch  = getbranch( $query,  $branches );
-my $printer = getprinter( $query, $printers );
-
-#
-# Some code to handle the error if there is no branch or printer setting.....
-#
-my $branch=C4::Context->preference("defaultBranch");
-$env{'branchcode'} = $branch;
-$env{'printer'}    = $printer;
-$env{'queue'}      = $printer;
-
-# Set up the item stack ....
-my %returneditems;
-my %riduedate;
-my %riborrowernumber;
-my @inputloop;
-foreach ( $query->param ) {
-    (next) unless (/ri-(\d*)/);
-    my %input;
-    my $counter = $1;
-    (next) if ( $counter > 20 );
-    my $barcode        = $query->param("ri-$counter");
-    my $duedate        = $query->param("dd-$counter");
-    my $borrowernumber = $query->param("bn-$counter");
-    $counter++;
-
-    # decode cuecat
-    $barcode = cuecatbarcodedecode($barcode);
-
-    ######################
-    #Are these lines still useful ?
-    $returneditems{$counter}    = $barcode;
-    $riduedate{$counter}        = $duedate;
-    $riborrowernumber{$counter} = $borrowernumber;
-
-    #######################
-    $input{counter} = $counter;
-    $input{barcode} = $barcode;
-    $input{duedate} = $duedate;
-    $input{bornum}  = $borrowernumber;
-    push ( @inputloop, \%input );
-}
-
-############
-# Deal with the requests....
-if ( $query->param('resbarcode') ) {
-    my $item       = $query->param('itemnumber');
-    my $borrnum    = $query->param('borrowernumber');
-    my $resbarcode = $query->param('resbarcode');
-
-    # set to waiting....
-    my $iteminfo = C4::Circulation::Circ2::getiteminformation( \%env, $item );
-    my $tobranchcd = ReserveWaiting( $item, $borrnum );
-    my $branchname = $branches->{$tobranchcd}->{'branchname'};
-    my ($borr) = getpatroninformation( \%env, $borrnum, 0 );
-    my $borcnum = $borr->{'cardnumber'};
-    my $name    =
-      $borr->{'surname'} . " " . $borr->{'title'} . " " . $borr->{'firstname'};
-    my $slip = $query->param('resslip');
-    printslip( \%env, $slip ); #removed by paul
-
-    if ( $tobranchcd ne $branch ) {
-        $template->param(
-            itemtitle  => $iteminfo->{'title'},
-            iteminfo   => $iteminfo->{'author'},
-            branchname => $branchname,
-            name       => $name,
-            bornum     => $borrnum,
-            borcnum    => $borcnum,
-            diffbranch => 1
-        );
-    }
-}
-
-my $iteminformation;
-my $borrower;
-my $returned = 0;
-my $messages;
-
-my $barcode = $query->param('barcode');
-
-# actually return book and prepare item table.....
-if ($barcode) {
-
-    # decode cuecat
-    $barcode = cuecatbarcodedecode($barcode);
-    ( $returned, $messages, $iteminformation, $borrower ) =
-      returnbookr( $barcode, $branch );
-    if ($returned) {
-        $returneditems{0}    = $barcode;
-        $riborrowernumber{0} = $borrower->{'borrowernumber'};
-        $riduedate{0}        = $iteminformation->{'date_due'};
-        my %input;
-        $input{counter} = 0;
-        $input{first}   = 1;
-        $input{barcode} = $barcode;
-        $input{duedate} = $riduedate{0};
-        $input{bornum}  = $riborrowernumber{0};
-        push ( @inputloop, \%input );
-logaction($loggedinuser,"circulation","return",$barcode,$borrower->{'borrowernumber'}) if (&logstatus);
-
-    }
-    elsif ( !$messages->{'BadBarcode'} ) {
-		if ( $messages->{'NotIssued'} ) {
-		my $dbh = C4::Context->dbh;
-		my $sth=$dbh->prepare("select date_due from issues where itemnumber=? and isnull(returndate)");
-		$sth->execute($iteminformation->{'itemnumber'});
-		my ($date_due) = $sth->fetchrow;
-		
-		$sth->finish;
-			if ($date_due){	
-			print $query->redirect("/cgi-bin/koha/circ/returns.pl?barcode=$barcode");
-			}
-		}
-        my %input;
-        $input{counter} = 0;
-        $input{first}   = 1;
-        $input{barcode} = $barcode;
-        $input{duedate} = 0;
-
-        $returneditems{0} = $barcode;
-        $riduedate{0}     = 0;
-        if ( $messages->{'wthdrawn'} ) {
-            $input{withdrawn} = 1;
-            $input{bornum}    = "Item Cancelled";
-            $riborrowernumber{0} = 'Item Cancelled';
-        }
-        else {
-            $input{bornum} = "&nbsp;";
-            $riborrowernumber{0} = '&nbsp;';
-        }
-        push ( @inputloop, \%input );
-    }
-    $template->param(
-        returned  => $returned,
-        itemtitle => $iteminformation->{'title'},
-
-        #									itembc => $iteminformation->{'barcode'},
-        #									itemdatedue => $iteminformation->{'date_due'},
-        itemauthor => $iteminformation->{'author'}
-    );
-}
-$template->param( inputloop => \@inputloop );
-
-my $found    = 0;
-my $waiting  = 0;
-my $reserved = 0;
-
-if ( $messages->{'ResFound'} ) {
-    my $res        = $messages->{'ResFound'};
-    my $branchname = $branches->{ $res->{'branchcode'} }->{'branchname'};
-    my ($borr) = getpatroninformation( \%env, $res->{'borrowernumber'}, 0 );
-    my $name =
-      $borr->{'surname'} . " " . $borr->{'title'} . " " . $borr->{'firstname'};
-    my ($iteminfo) = getiteminformation( \%env, 0, $barcode );
-
-    if ( $res->{'ResFound'} eq "Waiting" ) {
-        $template->param(
-            found         => 1,
-            name          => $name,
-            borfirstname  => $borr->{'firstname'},
-            borsurname    => $borr->{'surname'},
-            bortitle      => $borr->{'title'},
-            borphone      => $borr->{'phone'},
-            borstraddress => $borr->{'streetaddress'},
-            borcity       => $borr->{'city'},
-            borzip        => $borr->{'zipcode'},
-            bornum        => $res->{'borrowernumber'},
-            borcnum       => $borr->{'cardnumber'},
-            branchname  => $branches->{ $res->{'branchcode'} }->{'branchname'},
-            waiting     => 1,
-            itemnumber  => $res->{'itemnumber'},
-            itemtitle   => $iteminfo->{'title'},
-            itemauthor  => $iteminfo->{'author'},
-            itembarcode => $iteminfo->{'barcode'},
-            itemtype    => $iteminfo->{'ctype'},
-            itembiblionumber => $iteminfo->{'biblionumber'}
-        );
-
-    }
-    if ( $res->{'ResFound'} eq "Reserved" ) {
-        my @da         = localtime( time() );
-        my $todaysdate =
-          sprintf( "%0.2d", ( $da[3] + 1 ) ) . "/"
-          . sprintf( "%0.2d", ( $da[4] + 1 ) ) . "/"
-          . ( $da[5] + 1900 );
-        $template->param(
-            found       => 1,
-            branchname  => $branches->{ $res->{'branchcode'} }->{'branchname'},
-            reserved    => 1,
-            today       => $todaysdate,
-            itemnumber  => $res->{'itemnumber'},
-            itemtitle   => $iteminfo->{'title'},
-            itemauthor  => $iteminfo->{'author'},
-            itembarcode => $iteminfo->{'barcode'},
-            itemtype    => $iteminfo->{'ctype'},
-            itembiblionumber => $iteminfo->{'biblionumber'},
-            borsurname       => $borr->{'surname'},
-            bortitle         => $borr->{'title'},
-            borfirstname     => $borr->{'firstname'},
-            bornum           => $res->{'borrowernumber'},
-            borcnum          => $borr->{'cardnumber'},
-            borphone         => $borr->{'phone'},
-            borstraddress    => $borr->{'streetaddress'},
-            borsub           => $borr->{'suburb'},
-            borcity          => $borr->{'city'},
-            borzip           => $borr->{'zipcode'},
-            boremail         => $borr->{'emailadress'},
-            barcode          => $barcode
-        );
-    }
-}
-
-# Error Messages
-my @errmsgloop;
-foreach my $code ( keys %$messages ) {
-
-   #     warn $code;
-    my %err;
-    my $exit_required_p = 0;
-    if ( $code eq 'BadBarcode' ) {
-        $err{badbarcode} = 1;
-        $err{msg}        = $messages->{'BadBarcode'};
-    }
-    elsif ( $code eq 'NotIssued' ) {
-        $err{notissued} = 1;
-        $err{msg} = $branches->{ $messages->{'IsPermanent'} }->{'branchname'};
-    }
-    elsif ( $code eq 'WasLost' ) {
-        $err{waslost} = 1;
-    }
-    elsif ( $code eq 'ResFound' ) {
-        ;    # FIXME... anything to do here?
-    }
-    elsif ( $code eq 'WasReturned' ) {
-        ;    # FIXME... anything to do here?
-    }
-    elsif ( $code eq 'WasTransfered' ) {
-        ;    # FIXME... anything to do here?
-    }
-    elsif ( $code eq 'wthdrawn' ) {
-        $err{withdrawn} = 1;
-        $exit_required_p = 1;
-    }
-    elsif ( ( $code eq 'IsPermanent' ) && ( not $messages->{'ResFound'} ) ) {
-        if ( $messages->{'IsPermanent'} ne $branch ) {
-            $err{ispermanent} = 1;
-            $err{msg}         =
-              $branches->{ $messages->{'IsPermanent'} }->{'branchname'};
-        }
-    }
-    else {
-        die "Unknown error code $code";    # XXX
-    }
-    if (%err) {
-        push ( @errmsgloop, \%err );
-    }
-    last if $exit_required_p;
-}
-$template->param( errmsgloop => \@errmsgloop );
-
-# patrontable ....
-if ($borrower) {
-    my $flags = $borrower->{'flags'};
-    my $color = '';
-    my @flagloop;
-    my $flagset;
-    foreach my $flag ( sort keys %$flags ) {
-        my %flaginfo;
-        ( $color eq $linecolor1 ) 
-          ? ( $color = $linecolor2 )
-          : ( $color = $linecolor1 );
-        unless ($flagset) { $flagset = 1; }
-        $flaginfo{color}   = $color;
-        $flaginfo{redfont} = ( $flags->{$flag}->{'noissues'} );
-        $flaginfo{flag}    = $flag;
-        if ( $flag eq 'CHARGES' ) {
-            $flaginfo{msg}     = $flag;
-            $flaginfo{charges} = 1;
-	    $flaginfo{bornum} = $borrower->{borrowernumber};
-        }
-        elsif ( $flag eq 'WAITING' ) {
-            $flaginfo{msg}     = $flag;
-            $flaginfo{waiting} = 1;
-            my @waitingitemloop;
-            my $items = $flags->{$flag}->{'itemlist'};
-            foreach my $item (@$items) {
-                my ($iteminformation) =
-                  getiteminformation( \%env, $item->{'itemnumber'}, 0 );
-                my %waitingitem;
-                $waitingitem{biblionum} = $iteminformation->{'biblionumber'};
-                $waitingitem{barcode}   = $iteminformation->{'barcode'};
-                $waitingitem{title}     = $iteminformation->{'title'};
-                $waitingitem{brname}    =
-                  $branches->{ $iteminformation->{'holdingbranch'} }->{
-                  'branchname'};
-                push ( @waitingitemloop, \%waitingitem );
-            }
-            $flaginfo{itemloop} = \@waitingitemloop;
-        }
-        elsif ( $flag eq 'ODUES' ) {
-            my $items = $flags->{$flag}->{'itemlist'};
-            my @itemloop;
-            foreach my $item ( sort { $a->{'date_due'} cmp $b->{'date_due'} }
-                @$items )
-            {
-                my ($iteminformation) =
-                  getiteminformation( \%env, $item->{'itemnumber'}, 0 );
-                my %overdueitem;
-                $overdueitem{duedate}   = $item->{'date_due'};
-                $overdueitem{biblionum} = $iteminformation->{'biblionumber'};
-                $overdueitem{barcode}   = $iteminformation->{'barcode'};
-                $overdueitem{title}     = $iteminformation->{'title'};
-                $overdueitem{brname}    =
-                  $branches->{ $iteminformation->{'holdingbranch'} }->{
-                  'branchname'};
-                push ( @itemloop, \%overdueitem );
-            }
-            $flaginfo{itemloop} = \@itemloop;
-            $flaginfo{overdue}  = 1;
-        }
-        else {
-            $flaginfo{other} = 1;
-            $flaginfo{msg}   = $flags->{$flag}->{'message'};
-        }
-        push ( @flagloop, \%flaginfo );
-    }
-    $template->param(
-        flagset        => $flagset,
-        flagloop       => \@flagloop,
-        ribornum       => $borrower->{'borrowernumber'},
-        riborcnum      => $borrower->{'cardnumber'},
-        riborsurname   => $borrower->{'surname'},
-        ribortitle     => $borrower->{'title'},
-        riborfirstname => $borrower->{'firstname'}
-    );
-}
-
-my $color = '';
-
-#set up so only the last 8 returned items display (make for faster loading pages)
-my $count = 0;
-my @riloop;
-foreach ( sort { $a <=> $b } keys %returneditems ) {
-    my %ri;
-    if ( $count < 8 ) {
-        ( $color eq $linecolor1 ) 
-          ? ( $color = $linecolor2 )
-          : ( $color = $linecolor1 );
-        $ri{color} = $color;
-        my $barcode = $returneditems{$_};
-        my $duedate = $riduedate{$_};
-        my $overduetext;
-        my $borrowerinfo;
-        if ($duedate) {
-            my @tempdate = split ( /-/, $duedate );
-	    $ri{year}=$tempdate[0];
-	    $ri{month}=$tempdate[1];
-	    $ri{day}=$tempdate[2];
-            my $duedatenz  = "$tempdate[2]/$tempdate[1]/$tempdate[0]";
-            my @datearr    = localtime( time() );
-            my $todaysdate =
-              $datearr[5] . '-'
-              . sprintf( "%0.2d", ( $datearr[4] + 1 ) ) . '-'
-              . sprintf( "%0.2d", $datearr[3] );
-	    $ri{duedate}=$duedate;
-            my ($borrower) =              getpatroninformation( \%env, $riborrowernumber{$_}, 0 );
-            $ri{bornum}       = $borrower->{'borrowernumber'};
-            $ri{borcnum}      = $borrower->{'cardnumber'};
-            $ri{borfirstname} = $borrower->{'firstname'};
-            $ri{borsurname}   = $borrower->{'surname'};
-            $ri{bortitle}     = $borrower->{'title'};
-        }
-        else {
-            $ri{bornum} = $riborrowernumber{$_};
-        }
-#        my %ri;
-        my ($iteminformation) =C4::Circulation::Circ2::getiteminformation( \%env, 0, $barcode );
-        $ri{color}            = $color;
-        $ri{itembiblionumber} = $iteminformation->{'biblionumber'};
-        $ri{itemtitle}        = $iteminformation->{'title'};
-        $ri{itemauthor}       = $iteminformation->{'author'};
-        $ri{itemtype}         = $iteminformation->{'ctype'};
-        $ri{barcode}          = $barcode;
-    }
-    else {
-        last;
-    }
-    $count++;
-    push ( @riloop, \%ri );
-}
-$template->param( riloop => \@riloop );
-
-$template->param(
-    genbrname  => $branches->{$branch}->{'branchname'},
-    genprname  => $printers->{$printer}->{'printername'},
-    branch     => $branch,
-    printer    => $printer,
-    errmsgloop => \@errmsgloop
-);
-
-# actually print the page!
-output_html_with_http_headers $query, $cookie, $template->output;
-
-sub cuecatbarcodedecode {
-    my ($barcode) = @_;
-    chomp($barcode);
-    my @fields = split ( /\./, $barcode );
-    my @results = map( decode($_), @fields[ 1 .. $#fields ] );
-    if ( $#results == 2 ) {
-        return $results[2];
-    }
-    else {
-        return $barcode;
-    }
-}
-
-# Local Variables:
-# tab-width: 4
-# End:

Index: cgi-bin/circ/returns.pl
===================================================================
RCS file: cgi-bin/circ/returns.pl
diff -N cgi-bin/circ/returns.pl
--- cgi-bin/circ/returns.pl	10 Mar 2007 11:54:16 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,474 +0,0 @@
-#!/usr/bin/perl
-# WARNING: This file contains mixed-sized tabs! (some 4-character, some 8)
-# WARNING: Currently, 4-character tabs seem to be dominant
-# WARNING: But there are still lots of 8-character tabs
-
-#written 11/3/2002 by Finlay
-#script to execute returns of books
-
-# 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 CGI;
-use C4::Circulation::Circ2;
-use C4::Search;
-use C4::Output;
-use C4::Print;
-use C4::Reserves2;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Koha;
-use C4::Members;
-use C4::Date;
-use C4::Log;
-my $query = new CGI;
-
-#getting the template
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "circ/returns.tmpl",
-        query           => $query,
-        type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { circulate => 1 },
-    }
-);
-
-#####################
-#Global vars
-my %env;
-my $headerbackgroundcolor = '#99cc33';
-my $linecolor1            = '#ffffcc';
-my $linecolor2            = 'white';
-my $todaysdate =get_today();
-my $branches = GetBranches();
-my $printers = getprinters( \%env );
-
-# my $branch  = getbranch( $query,  $branches );
-my $printer = getprinter( $query, $printers );
-
-#
-# Some code to handle the error if there is no branch or printer setting.....
-#
-my $branch=C4::Context->preference("defaultBranch");
-$env{'branchcode'} = $branch;
-$env{'printer'}    = $printer;
-$env{'queue'}      = $printer;
-
-# Set up the item stack ....
-my %returneditems;
-my %riduedate;
-my %riborrowernumber;
-my @inputloop;
-foreach ( $query->param ) {
-    (next) unless (/ri-(\d*)/);
-    my %input;
-    my $counter = $1;
-    (next) if ( $counter > 20 );
-    my $barcode        = $query->param("ri-$counter");
-    my $duedate        = $query->param("dd-$counter");
-    my $borrowernumber = $query->param("bn-$counter");
-    $counter++;
-
-    # decode cuecat
-    $barcode = cuecatbarcodedecode($barcode);
-
-    ######################
-    #Are these lines still useful ?
-    $returneditems{$counter}    = $barcode;
-    $riduedate{$counter}        = $duedate;
-    $riborrowernumber{$counter} = $borrowernumber;
-
-    #######################
-    $input{counter} = $counter;
-    $input{barcode} = $barcode;
-    $input{duedate} = $duedate;
-    $input{bornum}  = $borrowernumber;
-    push ( @inputloop, \%input );
-}
-
-############
-my $item;
-# Deal with the requests....
-if ( $query->param('resbarcode') ) {
-    $item       = $query->param('itemnumber');
-    my $borrnum    = $query->param('borrowernumber');
-    my $resbarcode = $query->param('resbarcode');
-
-    # set to waiting....
-    my $iteminfo = getiteminformation( \%env, $item );
-    my $tobranchcd = ReserveWaiting( $item, $borrnum );
-    my $branchname = $branches->{$tobranchcd}->{'branchname'};
-    my ($borr) = getpatroninformation( \%env, $borrnum, 0 );
-    my $borcnum = $borr->{'cardnumber'};
-    my $name    =
-      $borr->{'surname'} . " " . $borr->{'title'} . " " . $borr->{'firstname'};
-    my $slip = $query->param('resslip');
-    printslip( \%env, $slip ); #removed by paul
-
-    if ( $tobranchcd ne $branch ) {
-        $template->param(
-            itemtitle  => $iteminfo->{'title'},
-            iteminfo   => $iteminfo->{'author'},
-            branchname => $branchname,
-            name       => $name,
-            bornum     => $borrnum,
-            borcnum    => $borcnum,
-            diffbranch => 1
-        );
-    }
-}
-
-my $iteminformation;
-my $borrower;
-my $returned = 0;
-my $messages;
-my $barcode = $query->param('barcode');
-
-# actually return book and prepare item table.....
-if ($barcode) {
-
-    # decode cuecat
-    $barcode = cuecatbarcodedecode($barcode);
-    ( $returned, $messages, $iteminformation, $borrower ) =      returnbook( $barcode, $branch );
-    if ($returned) {
-        $returneditems{0}    = $barcode;
-        $riborrowernumber{0} = $borrower->{'borrowernumber'};
-        $riduedate{0}        = $iteminformation->{'date_due'};
-        my %input;
-        $input{counter} = 0;
-        $input{first}   = 1;
-        $input{barcode} = $barcode;
-        $input{duedate} = $riduedate{0};
-        $input{bornum}  = $riborrowernumber{0};
-        push ( @inputloop, \%input );
-logaction($loggedinuser,"circulation","return",$barcode,$borrower->{'borrowernumber'}) if (&logstatus);
-
-    }
-    elsif ( !$messages->{'BadBarcode'} ) {
-		if ( $messages->{'NotIssued'} ) {
-		my $dbh = C4::Context->dbh;
-		my $sth=$dbh->prepare("select duetime from reserveissue where itemnumber=? and isnull(rettime)");
-		$sth->execute($iteminformation->{'itemnumber'});
-		my ($date_due) = $sth->fetchrow;
-		
-		$sth->finish;
-			if ($date_due){
-#				$messages->{'ReserveIssued'} =$barcode;			
-			print $query->redirect("/cgi-bin/koha/circ/resreturns.pl?barcode=$barcode");
-			}
-		}
-        my %input;
-        $input{counter} = 0;
-        $input{first}   = 1;
-        $input{barcode} = $barcode;
-        $input{duedate} = 0;
-
-        $returneditems{0} = $barcode;
-        $riduedate{0}     = 0;
-        if ( $messages->{'wthdrawn'} ) {
-            $input{withdrawn} = 1;
-            $input{bornum}    = "Item Cancelled";
-            $riborrowernumber{0} = 'Item Cancelled';
-        }
-        else {
-            $input{bornum} = "&nbsp;";
-            $riborrowernumber{0} = '&nbsp;';
-        }
-        push ( @inputloop, \%input );
-    }
-    $template->param(
-        returned  => $returned,
-        itemtitle => $iteminformation->{'title'},
-
-        #									itembc => $iteminformation->{'barcode'},
-        #									itemdatedue => $iteminformation->{'datedue'},
-        itemauthor => $iteminformation->{'author'}
-    );
-}
-$template->param( inputloop => \@inputloop );
-
-my $found    = 0;
-my $waiting  = 0;
-my $reserved = 0;
-
-if ( $messages->{'ResFound'} ) {
-    my $res        = $messages->{'ResFound'};
-    my $branchname = $branches->{ $res->{'branchcode'} }->{'branchname'};
-    my ($borr) = getpatroninformation( \%env, $res->{'borrowernumber'}, 0 );
-    my $name =
-      $borr->{'surname'} . " " . $borr->{'title'} . " " . $borr->{'firstname'};
-    my ($iteminfo) = getiteminformation( \%env, 0, $barcode );
-
-    if ( $res->{'ResFound'} eq "Waiting" ) {
-        $template->param(
-            found         => 1,
-            name          => $name,
-            borfirstname  => $borr->{'firstname'},
-            borsurname    => $borr->{'surname'},
-            bortitle      => $borr->{'title'},
-            borphone      => $borr->{'phone'},
-            borstraddress => $borr->{'streetaddress'},
-            borcity       => $borr->{'city'},
-            borzip        => $borr->{'zipcode'},
-            bornum        => $res->{'borrowernumber'},
-            borcnum       => $borr->{'cardnumber'},
-            branchname  => $branches->{ $res->{'branchcode'} }->{'branchname'},
-            waiting     => 1,
-            itemnumber  => $res->{'itemnumber'},
-            itemtitle   => $iteminfo->{'title'},
-            itemauthor  => $iteminfo->{'author'},
-            itembarcode => $iteminfo->{'barcode'},
-            itemtype    => $iteminfo->{'ctype'},
-            itembiblionumber => $iteminfo->{'biblionumber'}
-        );
-
-    }
-    if ( $res->{'ResFound'} eq "Reserved" ) {
-      
-        $template->param(
-            found       => 1,
-            branchname  => $branches->{ $res->{'branchcode'} }->{'branchname'},
-            reserved    => 1,
-            today       =>format_date( $todaysdate),
-            itemnumber  => $res->{'itemnumber'},
-            itemtitle   => $iteminfo->{'title'},
-            itemauthor  => $iteminfo->{'author'},
-            itembarcode => $iteminfo->{'barcode'},
-            itemtype    => $iteminfo->{'ctype'},
-            itembiblionumber => $iteminfo->{'biblionumber'},
-            borsurname       => $borr->{'surname'},
-            bortitle         => $borr->{'title'},
-            borfirstname     => $borr->{'firstname'},
-            bornum           => $res->{'borrowernumber'},
-            borcnum          => $borr->{'cardnumber'},
-            borphone         => $borr->{'phone'},
-            borstraddress    => $borr->{'streetaddress'},
-            borsub           => $borr->{'suburb'},
-            borcity          => $borr->{'city'},
-            borzip           => $borr->{'zipcode'},
-            boremail         => $borr->{'emailadress'},
-            barcode          => $barcode
-        );
-    }
-}
-
-# Error Messages
-my @errmsgloop;
-foreach my $code ( keys %$messages ) {
-
-    #    warn $code;
-    my %err;
-    my $exit_required_p = 0;
-    if ( $code eq 'BadBarcode' ) {
-        $err{badbarcode} = 1;
-        $err{msg}        = $messages->{'BadBarcode'};
-    }
-    elsif ( $code eq 'NotIssued' ) {
-        $err{notissued} = 1;
-        $err{msg} = $branches->{ $messages->{'IsPermanent'} }->{'branchname'};
-    }
-    elsif ( $code eq 'WasLost' ) {
-        $err{waslost} = 1;
-    }
-    elsif ( $code eq 'ResFound' ) {
-        ;    # FIXME... anything to do here?
-    }
-    elsif ( $code eq 'WasReturned' ) {
-        ;    # FIXME... anything to do here?
-    }
-    elsif ( $code eq 'WasTransfered' ) {
-        ;    # FIXME... anything to do here?
-    }
-	elsif ( $code eq 'ReserveIssued' ) {
-        $err{reserveissued} = 1;
-    }
-    elsif ( $code eq 'wthdrawn' ) {
-        $err{withdrawn} = 1;
-        $exit_required_p = 1;
-    }
-    elsif ( ( $code eq 'IsPermanent' ) && ( not $messages->{'ResFound'} ) ) {
-        if ( $messages->{'IsPermanent'} ne $branch ) {
-            $err{ispermanent} = 1;
-            $err{msg}         =
-              $branches->{ $messages->{'IsPermanent'} }->{'branchname'};
-        }
-    }
-    else {
-        die "Unknown error code $code";    # XXX
-    }
-    if (%err) {
-        push ( @errmsgloop, \%err );
-    }
-    last if $exit_required_p;
-}
-$template->param( errmsgloop => \@errmsgloop );
-
-# patrontable ....
-if ($borrower) {
-    my $flags = $borrower->{'flags'};
-    my $color = '';
-    my @flagloop;
-    my $flagset;
-    foreach my $flag ( sort keys %$flags ) {
-        my %flaginfo;
-        ( $color eq $linecolor1 ) 
-          ? ( $color = $linecolor2 )
-          : ( $color = $linecolor1 );
-        unless ($flagset) { $flagset = 1; }
-        $flaginfo{color}   = $color;
-        $flaginfo{redfont} = ( $flags->{$flag}->{'noissues'} );
-        $flaginfo{flag}    = $flag;
-        if ( $flag eq 'CHARGES' ) {
-            $flaginfo{msg}     = $flag;
-            $flaginfo{charges} = 1;
-	    $flaginfo{bornum} = $borrower->{borrowernumber};
-        }
-        elsif ( $flag eq 'WAITING' ) {
-            $flaginfo{msg}     = $flag;
-            $flaginfo{waiting} = 1;
-            my @waitingitemloop;
-            my $items = $flags->{$flag}->{'itemlist'};
-            foreach my $item (@$items) {
-                my ($iteminformation) =
-                  getiteminformation( \%env, $item->{'itemnumber'}, 0 );
-                my %waitingitem;
-                $waitingitem{biblionum} = $iteminformation->{'biblionumber'};
-                $waitingitem{barcode}   = $iteminformation->{'barcode'};
-                $waitingitem{title}     = $iteminformation->{'title'};
-                $waitingitem{brname}    =
-                  $branches->{ $iteminformation->{'holdingbranch'} }->{
-                  'branchname'};
-                push ( @waitingitemloop, \%waitingitem );
-            }
-            $flaginfo{itemloop} = \@waitingitemloop;
-        }
-        elsif ( $flag eq 'ODUES' ) {
-            my $items = $flags->{$flag}->{'itemlist'};
-            my @itemloop;
-            foreach my $item ( sort { $a->{'date_due'} cmp $b->{'date_due'} }
-                @$items )
-            {
-                my ($iteminformation) =
-                  getiteminformation( \%env, $item->{'itemnumber'}, 0 );
-                my %overdueitem;
-                $overdueitem{duedate}   = $item->{'date_due'};
-                $overdueitem{biblionum} = $iteminformation->{'biblionumber'};
-                $overdueitem{barcode}   = $iteminformation->{'barcode'};
-                $overdueitem{title}     = $iteminformation->{'title'};
-                $overdueitem{brname}    =
-                  $branches->{ $iteminformation->{'holdingbranch'} }->{
-                  'branchname'};
-                push ( @itemloop, \%overdueitem );
-            }
-            $flaginfo{itemloop} = \@itemloop;
-            $flaginfo{overdue}  = 1;
-        }
-        else {
-            $flaginfo{other} = 1;
-            $flaginfo{msg}   = $flags->{$flag}->{'message'};
-        }
-        push ( @flagloop, \%flaginfo );
-    }
-    $template->param(
-        flagset        => $flagset,
-        flagloop       => \@flagloop,
-        ribornum       => $borrower->{'borrowernumber'},
-        riborcnum      => $borrower->{'cardnumber'},
-        riborsurname   => $borrower->{'surname'},
-        ribortitle     => $borrower->{'title'},
-        riborfirstname => $borrower->{'firstname'}
-    );
-}
-
-my $color = '';
-
-#set up so only the last 8 returned items display (make for faster loading pages)
-my $count = 0;
-my @riloop;
-foreach ( sort { $a <=> $b } keys %returneditems ) {
-    my %ri;
-    if ( $count < 8 ) {
-        ( $color eq $linecolor1 ) 
-          ? ( $color = $linecolor2 )
-          : ( $color = $linecolor1 );
-        $ri{color} = $color;
-        my $barcode = $returneditems{$_};
-        my $duedate = $riduedate{$_};
-        my $overduetext;
-        my $borrowerinfo;
-        if ($duedate) {
-           
-           
-	    $ri{duedate}=format_date($duedate);
-            my ($borrower) =
-              getpatroninformation( \%env, $riborrowernumber{$_}, 0 );
-            $ri{bornum}       = $borrower->{'borrowernumber'};
-            $ri{borcnum}      = $borrower->{'cardnumber'};
-            $ri{borfirstname} = $borrower->{'firstname'};
-            $ri{borsurname}   = $borrower->{'surname'};
-            $ri{bortitle}     = $borrower->{'title'};
-        }
-        else {
-            $ri{bornum} = $riborrowernumber{$_};
-        }
-#        my %ri;
-        my ($iteminformation) = getiteminformation( \%env, 0, $barcode );
-        $ri{color}            = $color;
-        $ri{itembiblionumber} = $iteminformation->{'biblionumber'};
-        $ri{itemtitle}        = $iteminformation->{'title'};
-        $ri{itemauthor}       = $iteminformation->{'author'};
-        $ri{itemtype}         = $iteminformation->{'ctype'};
-        $ri{barcode}          = $barcode;
-    }
-    else {
-        last;
-    }
-    $count++;
-    push ( @riloop, \%ri );
-}
-$template->param( riloop => \@riloop );
-
-$template->param(
-    genbrname  => $branches->{$branch}->{'branchname'},
-    genprname  => $printers->{$printer}->{'printername'},
-    branch     => $branch,
-    printer    => $printer,
-    errmsgloop => \@errmsgloop
-);
-
-# actually print the page!
-output_html_with_http_headers $query, $cookie, $template->output;
-
-sub cuecatbarcodedecode {
-    my ($barcode) = @_;
-$barcode=~s/ //g;
-    chomp($barcode);
-    my @fields = split ( /\./, $barcode );
-    my @results = map( decode($_), @fields[ 1 .. $#fields ] );
-    if ( $#results == 2 ) {
-        return $results[2];
-    }
-    else {
-        return $barcode;
-    }
-}
-
-# Local Variables:
-# tab-width: 4
-# End:

Index: cgi-bin/circ/selectbranchprinter.pl
===================================================================
RCS file: cgi-bin/circ/selectbranchprinter.pl
diff -N cgi-bin/circ/selectbranchprinter.pl
--- cgi-bin/circ/selectbranchprinter.pl	10 Mar 2007 11:54:16 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,145 +0,0 @@
-#!/usr/bin/perl
-# WARNING: This file uses 4-character tabs!
-
-
-# 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 CGI;
-use C4::Circulation::Circ2;
-use C4::Output;
-use C4::Auth;
-use C4::Print;
-use C4::Interface::CGI::Output;
-use C4::Koha;
-
-
-# this is a reorganisation of circulationold.pl
-# dividing it up into three scripts......
-# this will be the first one that chooses branch and printer settings....
-
-#general design stuff...
-my $headerbackgroundcolor='#99cc33';
-my $circbackgroundcolor='#ffffcc';
-my $circbackgroundcolor='white';
-my $linecolor1='#ffffcc';
-my $linecolor2='white';
-my $backgroundimage="/images/background-mem.gif";
-
-# try to get the branch and printer settings from the http....
-my %env;
-my $query=new CGI;
-my $branches=GetBranches('IS');
-my $printers=getprinters(\%env);
-my $branch=$query->param('branch');
-my $printer=$query->param('printer');
-
-($branch) || ($branch=$query->cookie('branch'));
-($printer) || ($printer=$query->cookie('printer'));
-
-($branches->{$branch}) || ($branch=(keys %$branches)[0]);
-($printers->{$printer}) || ($printer=(keys %$printers)[0]);
-
-
-# is you force a selection....
-my $oldbranch = $branch;
-my $oldprinter = $printer;
-
-#$branch='';
-#$printer='';
-
-
-$env{'branchcode'}=$branch;
-$env{'printer'}=$printer;
-$env{'queue'}=$printer;
-
-# set up select options....
-my $branchcount=0;
-my $printercount=0;
-my @branchloop;
-foreach my $br (keys %$branches) {
-    next unless $br =~ /\S/;
-    #(next) unless ($branches->{$_}->{'IS'}); # FIXME disabled to fix bug 202
-    $branchcount++;
-	my %branch;
-	$branch{selected}=($br eq $oldbranch);
-	$branch{name}=$branches->{$br}->{'branchname'};
-	$branch{value}=$br;
-    push(@branchloop,\%branch);
-}
-my @printerloop;
-foreach (keys %$printers) {
-    (next) unless ($_);
-    $printercount++;
-	my %printer;
-	$printer{selected}=($_ eq $oldprinter);
-	$printer{name}=$printers->{$_}->{'printername'};
-	$printer{value}=$_;
-    push(@printerloop,\%printer);
-}
-
-# if there is only one....
-my $printername;
-my $branchname;
-
-my $oneprinter=($printercount==1) ;
-my $onebranch=($branchcount==1) ;
-if ($printercount==1) {
-    my ($tmpprinter)=keys %$printers;
-	$printername=$printers->{$tmpprinter}->{printername};
-}
-if ($branchcount==1) {
-    my ($tmpbranch)=keys %$branches;
-	$branchname=$branches->{$tmpbranch}->{branchname};
-}
-
-
-#############################################################################################
-# Start writing page....
-# set header with cookie....
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "circ/selectbranchprinter.tmpl",
-							query => $query,
-                            type => "intranet",
-                            authnotrequired => 0,
-                            flagsrequired => {circulate => 1},
-                         });
-$template->param(headerbackgroundcolor => $headerbackgroundcolor,
-							backgroundimage => $backgroundimage,
-							oneprinter => $oneprinter,
-							onebranch => $onebranch,
-							printername => $printername,
-							branchname => $branchname,
-							printerloop => \@printerloop,
-							branchloop => \@branchloop,
-							intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-							);
-
-my $branchcookie=$query->cookie(-name => 'branch', -value => "$branch", -expires => '+1y');
-my $printercookie=$query->cookie(-name => 'printer', -value => "$printer", -expires => '+1y');
-
-my $cookies=[$cookie,$branchcookie, $printercookie]; 
-output_html_with_http_headers $query, $cookies, $template->output;
-
-
-# Local Variables:
-# tab-width: 4
-# End:

Index: cgi-bin/circ/waitingreservestransfers.pl
===================================================================
RCS file: cgi-bin/circ/waitingreservestransfers.pl
diff -N cgi-bin/circ/waitingreservestransfers.pl
--- cgi-bin/circ/waitingreservestransfers.pl	10 Mar 2007 11:54:16 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,124 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: waitingreservestransfers.pl,v 1.1.2.1 2007/03/10 11:54:16 tgarip1957 Exp $
-
-# 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::Interface::CGI::Output;
-use CGI;
-use C4::Auth;
-use C4::Date;
-use C4::Circulation::Circ2;
-use C4::Koha;
-use C4::Biblio;
-
-my $input = new CGI;
-
-my $theme = $input->param('theme'); # only used if allowthemeoverride is set
-
-my ($template, $loggedinuser, $cookie)
-      = get_template_and_user({template_name => "circ/waitingreservestransfers.tmpl",
-	                                 query => $input,
-	                                 type => "intranet",
-	                                 authnotrequired => 0,
-	                                 flagsrequired => {borrowers => 1},
-	                                 debug => 1,
-	                                 });
-
-
-# set the userenv branch
-my $default = C4::Context->userenv->{'branch'};
-
-
-my $todaysdate =get_today();
-
-my $item=$input->param('itemnumber');
-my $fbr=$input->param('fbr');
-my $tbr=$input->param('tbr');
-# If we have a return of the form dotransfer, we launch the subroutine dotransfer
-if ($item){
-	C4::Circulation::Circ2::dotransfer($item,$fbr,$tbr);
-}
-
-# get the all the branches for reference
-my $branches = GetBranches();
-my @branchesloop;
-foreach my $br (keys %$branches) {
-	my @reservloop;
-	my %branchloop;
-	$branchloop{'branchname'} = $branches->{$br}->{'branchname'};
-	$branchloop{'branchcode'} = $branches->{$br}->{'branchcode'};
-	my @getreserves = GetReservesToBranch($branches->{$br}->{'branchcode'},$default);
-		if (@getreserves){
-		foreach my $num (@getreserves) {
-			my %getreserv;
-			my %env;
-			my $gettitle = getiteminformation(\%env,$num->{'itemnumber'});
-			my $itemtypeinfo = getitemtypeinfo($gettitle->{'itemtype'});
-			if ($gettitle->{'holdingbranch'} eq $default){
-				my $getborrower = getpatroninformation (\%env,$num->{'borrowernumber'});
-				$getreserv{'reservedate'} = format_date($num->{'reservedate'});
-				my $calcDate=DATE_Add($num->{'reservedate'},C4::Context->preference('TransfersMaxDaysWarning'));
-				my $warning=DATE_Diff($todaysdate,$calcDate);
-				if ($warning>0){
-					$getreserv{'messcompa'} = 1;
-				}
-				$getreserv{'title'} = $gettitle->{'title'};
-				$getreserv{'biblionumber'} = $gettitle->{'biblionumber'};
-				$getreserv{'itemnumber'} = $gettitle->{'itemnumber'};
-				$getreserv{'barcode'} = $gettitle->{'barcode'};
-				$getreserv{'itemtype'} = $itemtypeinfo->{'description'};
-				$getreserv{'holdingbranch'} = $gettitle->{'holdingbranch'};
-				$getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'};
-				$getreserv{'borrowernum'} = $getborrower->{'borrowernumber'};
-				$getreserv{'borrowername'} = $getborrower->{'surname'};
-				$getreserv{'borrowerfirstname'} =  $getborrower->{'firstname'} ;
-				if ($getborrower->{'emailaddress'}){
-					$getreserv{'borrowermail'} =  $getborrower->{'emailaddress'} ;
-				}
-				$getreserv{'borrowerphone'} = $getborrower->{'phone'};
-				push(@reservloop, \%getreserv);
-			}
-		}
-# 		If we have a return of reservloop we put it in the branchloop sequence
-		if (@reservloop){
-		$branchloop{'reserv'} = \@reservloop ;
-		}
-# 		else, we unset the value of the branchcode .
-		else{
-		$branchloop{'branchcode'} = 0;
-		}
-	}
-	else {
-# 	if we don't have a retrun from reservestobranch we unset branchname and branchcode
-	$branchloop{'branchname'} = 0;
-	$branchloop{'branchcode'} = 0;
-	}
-	push(@branchesloop, \%branchloop);
-}
-
-	$template->param( branchesloop  => \@branchesloop,
-			show_date	=> format_date($todaysdate)	
-			 );
-	
-	print "Content-Type: text/html\n\n", $template->output;
-
-
-

Index: cgi-bin/classes/class.imdb_parser.php
===================================================================
RCS file: cgi-bin/classes/class.imdb_parser.php
diff -N cgi-bin/classes/class.imdb_parser.php
--- cgi-bin/classes/class.imdb_parser.php	10 Mar 2007 01:18:01 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,197 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
-* class.imdb_parser.php (php4)
-* Parse information of any film - need a fetched imdb.com video-detail-site
-* @author       Bernd Essl <bernd at ak47.at>
-* @copyright    Bernd Essl <bernd at ak47.at>
-* @license      license   http://gnu.org/copyleft/gpl.html GNU GPL
-* @version      SVN: 4
-* @link         http://ak-47.at/
-*/
-
-
-class IMDB_Parser
-{
-
-    function getMovieActors($imdb_website)
-    {
-       if (preg_match('/<table class="cast">  <tr class="odd"><td class="hs">(.+)<\/tr><\/table><a class="tn15more" href="fullcredits#cast">more<\/a>/', $imdb_website, $hit))
-       {	
-            if (preg_match_all('/<a href="\/name\/nm\d{1,8}\/">(.+?)<\/a>/',$hit[0],$results, PREG_PATTERN_ORDER))
-            {
-                return $results[1];
-            }else
-            {
-                return FALSE;
-      	} 
-           
-     } else
-            {
-                return FALSE;
-      } 
-    }
-
-
-    function getMovieDirectedBy($imdb_website)
-    {
-        if (preg_match( '/<h5>Directed by<\/h5>\
-<a href="\/name\/nm\d{1,8}\/">(.+?)<\/a><br\/>/', $imdb_website, $hit)) 
-        {
-            return $hit[1];
-        }
-        else
-        {
-            return FALSE;
-        }
-    }
-    
-    
-    function getMovieColor($imdb_website)
-    {
-        if (preg_match('/<a href="\/List\?color-info=.+">(.+)<\/a>/', $imdb_website, $hit)) 
-        {
-            return $hit[1];
-        }
-        else
-        {
-            return FALSE;
-        }
-    }
-    
-    
-    function getMovieCountry($imdb_website)
-    {
-        if (preg_match_all('/<a href="\/Sections\/Countries\/([a-z]+)\/">/i',$imdb_website,$results, PREG_PATTERN_ORDER))
-        {
-            return $results[1];
-        }
-        else
-        {
-            return FALSE;
-        }
-    }
-    
-    
-    function getMovieLanguage($imdb_website)
-    {
-        if (preg_match_all('/<a href="\/Sections\/Languages\/([a-z]+)\/">/i',$imdb_website,$results, PREG_PATTERN_ORDER))
-        {
-            return $results[1];
-        }
-        else
-        {
-            return FALSE;
-        }
-    }
-    
-    
-    function getMovieRating($imdb_website)
-    {
-        if (preg_match('/<b>([0-9]{1,2}\.[0-9]{1,2})\/10<\/b> \(.+ votes\)/', $imdb_website, $hit)) 
-        {
-            return $hit[1];
-        }
-        else
-        {
-            return FALSE;
-        }
-    }
-    
-    
-    function getMovieGenres($imdb_website)
-    {
-        if (preg_match_all('/\/Sections\/Genres\/(.+?)\//', $imdb_website, $hit, PREG_PATTERN_ORDER)) 
-        {
-            return $hit[1];
-        }
-        else
-        {
-            return FALSE;
-        }
-    }
-    
-    
-    function getMoviePlot($imdb_website)
-    {
-    //sometimes "Plot Outline" or "Plot Summary"
-        if (preg_match('/\<h5\>Plot Outline:\<\/h5\>
-(.+?)\<a class="tn15more inline"/', $imdb_website, $hit)) 
-        {
-            return $hit['2'];
-        }
-        else
-        {
-            return FALSE;
-        }
-    }
-    
- function getMovieSummary($imdb_website_summary)
-    {
-        if (preg_match_all('/\<p class="plotpar"\>\
-(.+)\
-\<i\>/', $imdb_website_summary, $hit, PREG_PATTERN_ORDER)) 
-        {
-          return $hit[1];
-        }
-        else
-        {
-            return FALSE;
-        }
-    }
-    
-    function getMovieTagline($imdb_website)
-    {
-        if (preg_match('/\<h5\>Tagline:\<\/h5\>
-(.+?)\<a class="tn15more inline"/', $imdb_website, $hit)) 
-        {
-            return $hit[1];
-        }
-        else
-        {
-            return FALSE;
-        }
-    }
-    
-    
-    function getMovieTitle($imdb_website)
-    {
-        if (preg_match('/\<title\>([^"]*)\<\/title\>/', $imdb_website, $hit)) 
-        {
-            return $hit[1];
-        }
-        else
-        {
-            return FALSE;
-        }
-    }
-    
-    
-    function getMoviePictureHtml($imdb_website)
-    {
-        if (preg_match('/<a name="poster".+title=".+">(.+)<\/a>/', $imdb_website, $hit)) 
-        {
-            return $hit[1];
-        }
-        else
-        {
-            return FALSE;
-        }
-    }
-
-
-    function getMoviePicture($imdb_website)
-    {
-        if (preg_match('/ src="([^"]*)/', $this->getMoviePictureHtml($imdb_website), $hit))
-        {
-            return $hit[1];
-        }
-        else
-        {
-            return FALSE;
-        }
-    }
-}  
-?>
\ No newline at end of file

Index: cgi-bin/members/boraccount.pl
===================================================================
RCS file: cgi-bin/members/boraccount.pl
diff -N cgi-bin/members/boraccount.pl
--- cgi-bin/members/boraccount.pl	10 Mar 2007 01:19:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,103 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: boraccount.pl,v 1.1.2.1 2007/03/10 01:19:29 tgarip1957 Exp $
-
-#writen 11/1/2000 by chris at katipo.oc.nz
-#script to display borrowers account details
-
-
-# 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::Auth;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Date;
-use CGI;
-use C4::Search;
-use C4::Members;
-my $input=new CGI;
-
-my $theme = $input->param('theme'); # only used if allowthemeoverride is set
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/boraccount.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {borrowers => 1},
-			     debug => 1,
-			     });
-
-my $bornum=$input->param('bornum');
-#get borrower details
-my $data=borrdata('',$bornum);
-
-#get account details
-my %bor;
-$bor{'borrowernumber'}=$bornum;
-my ($numaccts,$accts,$total)=getboracctrecord('',\%bor);
-my $totalcredit;
-if($total <= 0){
-	$totalcredit = 1;
-}
-my @accountrows; # this is for the tmpl-loop
-
-my $toggle;
-for (my $i=0;$i<$numaccts;$i++){
-	if($i%2){
-		$toggle = 0;
-	} else {
-		$toggle = 1;
-	}
-  $accts->[$i]{'toggle'} = $toggle;
-  $accts->[$i]{'amount'}+=0.00;
-  if($accts->[$i]{'amount'} <= 0){
-  	$accts->[$i]{'amountcredit'} = 1;
-  }
-  $accts->[$i]{'amountoutstanding'}+=0.00;
-  if($accts->[$i]{'amountoutstanding'} <= 0){
-  	$accts->[$i]{'amountoutstandingcredit'} = 1;
-  }
-  my %row = (   'date'              => format_date($accts->[$i]{'date'}),
-		'accountid' => $accts->[$i]{'accountid'},
-		'itemnum' => $accts->[$i]{'itemnumber'},
-  		'amountcredit' => $accts->[$i]{'amountcredit'},
-  		'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'},
-  		'toggle' => $accts->[$i]{'toggle'},
-		'description'       => $accts->[$i]{'description'},
-  		'amount'            => sprintf("%.2f",$accts->[$i]{'amount'}),
-		'accounttype'	=>$accts->[$i]{'accounttype'},
-		'amountoutstanding' => sprintf("%.2f",$accts->[$i]{'amountoutstanding'}) );
-		
-  if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){
-    $row{'printtitle'}=1;
-    $row{'title'} = $accts->[$i]{'title'};
-  }
-
-  push(@accountrows, \%row);
-}
-
-$template->param(
-			firstname       => $data->{'firstname'},
-			surname         => $data->{'surname'},
-			bornum          => $bornum,
-			total           => sprintf("%.2f",$total),
-			totalcredit => $totalcredit,
-			accounts        => \@accountrows );
-
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/members/borrowers_details.pl
===================================================================
RCS file: cgi-bin/members/borrowers_details.pl
diff -N cgi-bin/members/borrowers_details.pl
--- cgi-bin/members/borrowers_details.pl	10 Mar 2007 01:19:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,86 +0,0 @@
-#!/usr/bin/perl
-# NOTE: This file uses standard 8-space tabs
-#       DO NOT SET TAB SIZE TO 4
-
-# $Id: borrowers_details.pl,v 1.1.2.1 2007/03/10 01:19:29 tgarip1957 Exp $
-
-#script to set up screen for modification of borrower details
-#written 20/12/99 by chris at katipo.co.nz
-
-
-# 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::Auth;
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use CGI;
-use C4::Search;
-use C4::Members;
-use C4::Koha;
-use HTML::Template;
-use Date::Manip;
-use C4::Date;
-use C4::Input;
-use C4::Log;
-my $input = new CGI;
-my $dbh = C4::Context->dbh;
-my %data;
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/borrowers_details.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {borrowers => 1},
-			     debug => 1,
-			     });
-
-my $data;
-my $categorycode=$input->param('categorycode');
-my $borrowernumber=$input->param('borrowernumber');
-my $description=$input->param('description');
-my $category_type=$input->param('category_type');
-
- if ( $data{'surname'} eq '') 
- 	{
- 		$data=borrdata('',$borrowernumber);
- 		%data=%$data;
- 	}
- my ($category_type,$description) = getcategorytype($data{'categorycode'});	
-
-$template->param(		borrowernumber  => $borrowernumber,#register number
-				#transform value  in capital or capital for first letter of the word
- 				firstname       => ucfirst($data{'firstname'}),
- 				surname         => uc($data{'surname'}),
- 				categorycode 	=> $data{'categorycode'},
-				title 		=> $data{'title'},
-				category_type	=> $category_type,
-	# # 			
- 				"title_".$data{'title'} 	    => " SELECTED ",			
- 				dateofbirth	=> format_date($data{'dateofbirth'}),
- 				description	=>$description
-# 				
-				);
-	$template->param(Institution => 1) if ($category_type eq "I");
-	output_html_with_http_headers $input, $cookie, $template->output;
-
-# Local Variables:
-# tab-width: 8
-# End:
\ No newline at end of file

Index: cgi-bin/members/deletemem.pl
===================================================================
RCS file: cgi-bin/members/deletemem.pl
diff -N cgi-bin/members/deletemem.pl
--- cgi-bin/members/deletemem.pl	10 Mar 2007 01:19:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,134 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: deletemem.pl,v 1.1.2.1 2007/03/10 01:19:29 tgarip1957 Exp $
-
-#script to delete items
-#written 2/5/00
-#by chris at katipo.co.nz
-
-
-# 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 CGI;
-use C4::Context;
-use C4::Search;
-use C4::Interface::CGI::Output;
-use C4::Output;
-use C4::Circulation::Circ2;
-use C4::Auth;
-use C4::Members;
-use C4::Log;
-my $input = new CGI;
-
-my $flagsrequired;
-# $flagsrequired->{borrower}=1;
-# my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired);
-my ($template, $loggedinuser, $cookie)
-		= get_template_and_user({template_name => "members/deletemem.tmpl",
-					query => $input,
-					type => "intranet",
-					authnotrequired => 0,
-					flagsrequired => {borrowers => 1},
-					debug => 1,
-					});
-
-
-#print $input->header;
-my $member=$input->param('member');
-my %env;
-$env{'nottodayissues'}=1;
-my %member2;
-$member2{'borrowernumber'}=$member;
-my $issues=currentissues(\%env,\%member2);
-my $i=0;
-foreach (sort keys %$issues) {
-	$i++;
-}
-my ($bor,$flags)=getpatroninformation(\%env, $member,'');
-if (C4::Context->preference("IndependantBranches")) {
-	my $userenv = C4::Context->userenv;
-	unless ($userenv->{flags} == 1){
-		unless ($userenv->{'branch'} eq $bor->{'branchcode'}){
-#			warn "user ".$userenv->{'branch'} ."borrower :". $bor->{'branchcode'};
-			print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$member");
-			exit 1;
-		}
-	}
-}
-my $dbh = C4::Context->dbh;
-my $sth=$dbh->prepare("Select * from borrowers where guarantor=?");
-$sth->execute($member);
-my $data=$sth->fetchrow_hashref;
-$sth->finish;
-
-
-if ($i > 0 || $flags->{'CHARGES'} ne '' || $data ne ''){
-	
-	#   print $input->header;
-	$template->param(bornum => $member);
-	if ($i >0) {
-		$template->param(ItemsOnIssues => $i);
-	}
-	if ($flags->{'CHARGES'} ne '') {
-		$template->param(charges => $flags->{'CHARGES'}->{'message'});
-	}
-	if ($data ne '') {
-		$template->param(guarantees => 1);
-	}
-# 	print "<table border=1>";
-# 	if ($i > 0){
-# 		print "<TR><TD>Items on Issue</td><td align=right>$i</td></tr>";
-# 	}
-# 	if ($flags->{'CHARGES'} ne ''){
-# 		print "<TR><TD>Charges</td><td>$flags->{'CHARGES'}->{'message'}</tr>";
-# 	}
-# 	if ($data ne ''){
-# 		print "<TR><TD>Guarantees</td></tr>";
-# 	}
-# 	print "</table>";
-$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $input, $cookie, $template->output;
-
-} else {
-	delmember($member);
-		logaction($loggedinuser,"members","delete",$member,"$bor->{'firstname'} $bor->{'surname'}" ) if (&logstatus);
-	print $input->redirect("/cgi-bin/koha/members/members-home.pl");
-}
-
-sub delmember{
-	my ($member)=@_;
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("Select * from borrowers where borrowernumber=?");
-	$sth->execute($member);
-	my @data=$sth->fetchrow_array;
-	$sth->finish;
-	$sth=$dbh->prepare("Insert into deletedborrowers values (".("?,"x(scalar(@data)-1))."?)");
-	$sth->execute(@data);
-	$sth->finish;
-	$sth=$dbh->prepare("Delete from borrowers where borrowernumber=?");
-	$sth->execute($member);
-	$sth->finish;
-	$sth=$dbh->prepare("Delete from reserves where borrowernumber=?");
-	$sth->execute($member);
-	$sth->finish;
-}

Index: cgi-bin/members/guarantor_search.pl
===================================================================
RCS file: cgi-bin/members/guarantor_search.pl
diff -N cgi-bin/members/guarantor_search.pl
--- cgi-bin/members/guarantor_search.pl	10 Mar 2007 01:19:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,109 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: guarantor_search.pl,v 1.1.2.1 2007/03/10 01:19:29 tgarip1957 Exp $
-
-# script to find a guarantor
-
-# Copyright 2006 OUEST PROVENCE
-#
-# 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::Auth;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use CGI;
-use C4::Search;
-use HTML::Template;
-#op
-use C4::Date;
-use C4::Members;
-
-my $input = new CGI;
-my ($template, $loggedinuser, $cookie);
-
-	($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/guarantor_search.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {borrowers => 1},
-			     debug => 1,
-			     });
-# }
-my $theme = $input->param('theme') || "default";
-			# only used if allowthemeoverride is set
-
-
-my $member=$input->param('member');
-my $orderby=$input->param('orderby');
-$orderby = "surname,firstname" unless $orderby;
-$member =~ s/,//g;   #remove any commas from search string
-$member =~ s/\*/%/g;
-if ($member eq ''){
-		$template->param(results=>0);
-}else{
-		$template->param(results=>1);
-}	
-my $env;
-
-my ($count,$results);
-my @resultsdata;
-my $background = 0;
-
-if ($member ne ''){
-	if(length($member) == 1)
-	{
-		($count,$results)=GuarantornameSearch($env,$member,$orderby,"simple");
-	}
-	else
-	{
-		($count,$results)=GuarantornameSearch($env,$member,$orderby,"advanced");
-	}
-	for (my $i=0; $i < $count; $i++){
-	#find out stats
-	my ($od,$issue,$fines)=borrdata2($env,$results->[$i]{'borrowerid'});
-	
-	my %row = (
-		background => $background,
-		count => $i+1,
-		borrowernumber => $results->[$i]{'borrowernumber'},
-		cardnumber => $results->[$i]{'cardnumber'},
-		surname => $results->[$i]{'surname'},
-		firstname => $results->[$i]{'firstname'},
-		categorycode => $results->[$i]{'categorycode'},
-		address => $results->[$i]{'address'},
-		city => $results->[$i]{'city'},
-		branchcode => $results->[$i]{'branchcode'},
-		
-		#op
-		dateofbirth =>format_date($results->[$i]{'dateofbirth'}),
-		#fi op	
-		
-		odissue => "$od/$issue",
-		fines => $fines,
-		borrowernotes => $results->[$i]{'borrowernotes'});
-	if ( $background ) { $background = 0; } else {$background = 1; }
-	push(@resultsdata, \%row);
-		}
-}
-$template->param( 
-			member          => $member,
-			numresults		=> $count,
-			
-			resultsloop     => \@resultsdata );
-
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/members/imemberentry.pl
===================================================================
RCS file: cgi-bin/members/imemberentry.pl
diff -N cgi-bin/members/imemberentry.pl
--- cgi-bin/members/imemberentry.pl	10 Mar 2007 01:19:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,107 +0,0 @@
-#!/usr/bin/perl
-# NOTE: standard 8-space tabs here
-
-#script to set up screen for modification of borrower details
-#written 20/12/99 by chris at katipo.co.nz
-
-
-# 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::Auth;
-use C4::Output;
-use CGI;
-use C4::Search;
-use C4::Interface::CGI::Output;
-use C4::Koha;
-use C4::Members;
-use C4::Date;
-
-my $input = new CGI;
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/imemberentry.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {borrowers => 1},
-			     debug => 1,
-			     });
-
-
-my $member=$input->param('bornum');
-if ($member eq ''){
-  $member=NewBorrowerNumber();
-}
-my $type=$input->param('type');
-
-my $data=borrdata('',$member);
-
-my $cardnumber=C4::Members::fixup_cardnumber($data->{'cardnumber'});
-
-my @branches;
-my @select_branch;
-my %select_branches;
-my $branches=GetBranches();
-foreach my $branch (keys %$branches) {
-	push @select_branch, $branch;
-  	$select_branches{$branch} = $branches->{$branch}->{'branchname'};
-}
-my $CGIbranch=CGI::scrolling_list( -name     => 'branchcode',
-			-id => 'branchcode',
-			-values   => \@select_branch,
-			-default  => $data->{'branchcode'},
-			-labels   => \%select_branches,
-			-size     => 1,
-			-multiple => 0 );
-
-$template->param(member => $member,
-				member          => $member,
-				address         => $data->{'streetaddress'},
-				firstname       => $data->{'firstname'},
-				surname         => $data->{'surname'},
-				othernames	=> $data->{'othernames'},
-				streetaddress   => $data->{'streetaddress'},
-				streetcity      => $data->{'streetcity'},
-				zipcode => $data->{'zipcode'},
-				homezipcode => $data->{'homezipcode'},
-				city		=> $data->{'city'},
-				phone           => $data->{'phone'},
-				phoneday        => $data->{'phoneday'},
-				faxnumber       => $data->{'faxnumber'},
-				emailaddress    => $data->{'emailaddress'},
-				textmessaging   => $data->{'textmessaging'},
-				contactname     => $data->{'contactname'},
-				altphone        => $data->{'altphone'},
-				altnotes	=> $data->{'altnotes'},
-				borrowernotes	=> $data->{'borrowernotes'},
-				"title_".$data->{'title'} => " SELECTED ",
-				dateenrolled	=> $data->{'dateenrolled'},
-				expiry		=> $data->{'expiry'},
-				joining	=> format_date($data->{'dateenrolled'}),
-				cardnumber	=> $cardnumber,
-				dateofbirth	=> $data->{'dateofbirth'},
-				dateformat      => display_date_format(),
-				cardnumber_institution => $cardnumber,
-				CGIbranch => $CGIbranch);
-
-output_html_with_http_headers $input, $cookie, $template->output;
-
-# Local Variables:
-# tab-width: 8
-# End:

Index: cgi-bin/members/insertdata.pl
===================================================================
RCS file: cgi-bin/members/insertdata.pl
diff -N cgi-bin/members/insertdata.pl
--- cgi-bin/members/insertdata.pl	10 Mar 2007 01:19:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,111 +0,0 @@
-#!/usr/bin/perl
-
-#script to enter borrower data into the data base
-#needs to be moved into a perl module
-# written 9/11/99 by chris at katipo.co.nz
-
-
-# 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 CGI;
-use C4::Context;
-use C4::Input;
-use C4::Search;
-use Date::Manip;
-use C4::Date;
-use strict;
-use C4::Members;
-my $input= new CGI;
-
-#get all the data into a hash
-my @names=$input->param;
-my %data;
-my $keyfld;
-my $keyval;
-my $problems;
-my $env;
-foreach my $key (@names){
-  $data{$key}=$input->param($key);
-  $data{$key}=~ s/\'/\\\'/g;
-  $data{$key}=~ s/\"/\\\"/g;
-}
-my $dbh = C4::Context->dbh;
-my $query="Select * from borrowers where borrowernumber=?";
-my $sth=$dbh->prepare($query);
-$sth->execute($data{'borrowernumber'});
-if (my $data2=$sth->fetchrow_hashref){
-  $data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'});
-  $data{'joining'}=format_date_in_iso($data{'joining'});
-  $data{'expiry'}=format_date_in_iso($data{'expiry'});
-  $query="update borrowers set title='$data{'title'}',expiry='$data{'expiry'}',
-  cardnumber='$data{'cardnumber'}',sex='$data{'sex'}',ethnotes='$data{'ethnicnotes'}',
-  streetaddress='$data{'address'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}',
-  altnotes='$data{'altnotes'}',dateofbirth='$data{'dateofbirth'}',contactname='$data{'contactname'}',
-  emailaddress='$data{'emailaddress'}',dateenrolled='$data{'joining'}',streetcity='$data{'streetcity'}',
-  altrelationship='$data{'altrelationship'}',othernames='$data{'othernames'}',phoneday='$data{'phoneday'}',
-  categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}',
-  borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'surname'}',
-  initials='$data{'initials'}',physstreet='$data{'streetaddress'}',ethnicity='$data{'ethnicity'}',
-  gonenoaddress='$data{'gna'}',lost='$data{'lost'}',debarred='$data{'debarred'}',
-  textmessaging='$data{'textmessaging'}', branchcode = '$data{'branchcode'}',
-  zipcode = '$data{'zipcode'}',homezipcode='$data{'homezipcode'}'
-  where borrowernumber=$data{'borrowernumber'}";
-
-}else{
-  $data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'});
-  $data{'joining'}=format_date_in_iso($data{'joining'});
-  $data{'expiry'}=format_date_in_iso($data{'expiry'});
-    $data{'borrowernumber'}=NewBorrowerNumber();
-  $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber,
-  firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity,
-  altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname,
-  initials,ethnicity,physstreet,branchcode,zipcode,homezipcode) values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}',
-  '$data{'sex'}','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}',
-  '$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}',
-  '$data{'joining'}','$data{'streetcity'}','$data{'altrelationship'}','$data{'othernames'}',
-  '$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}',
-  '$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}',
-  '$data{'ethnicity'}','$data{'streetaddress'}','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}')";
-}
-# ok if its an adult (type) it may have borrowers that depend on it as a guarantor
-# so when we update information for an adult we should check for guarantees and update the relevant part
-# of their records, ie addresses and phone numbers
-
-if ($data{'categorycode'} eq 'A' || $data{'categorycode'} eq 'W'){
-    # is adult check guarantees;
-    my ($count,$guarantees)=findguarantees($data{'borrowernumber'});
-    for (my $i=0;$i<$count;$i++){
-	# FIXME
-	# It looks like the $i is only being returned to handle walking through
-	# the array, which is probably better done as a foreach loop.
-	#
-	my $guaquery="update borrowers set streetaddress='$data{'address'}',faxnumber='$data{'faxnumber'}',
-        streetcity='$data{'streetcity'}',phoneday='$data{'phoneday'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}'
-        ,streetaddress='$data{'address'}'
-        where borrowernumber='$guarantees->[$i]->{'borrowernumber'}'";
-        my $sth3=$dbh->prepare($guaquery);
-        $sth3->execute;
-        $sth3->finish;
-     }
-}
-
-  my $sth2=$dbh->prepare($query);
-  $sth2->execute;
-  $sth2->finish;
-$sth->finish;
-print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$data{'borrowernumber'}");

Index: cgi-bin/members/insertidata.pl
===================================================================
RCS file: cgi-bin/members/insertidata.pl
diff -N cgi-bin/members/insertidata.pl
--- cgi-bin/members/insertidata.pl	10 Mar 2007 01:19:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,104 +0,0 @@
-#!/usr/bin/perl
-
-#script to enter borrower data into the data base
-#needs to be moved into a perl module
-# written 9/11/99 by chris at katipo.co.nz
-
-
-# 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 CGI;
-use C4::Context;
-use C4::Input;
-use Date::Manip;
-use strict;
-use C4::Members;
-my $input= new CGI;
-
-my @names=$input->param;
-my %data;
-my $keyfld;
-my $keyval;
-my $problems;
-my $env;
-my $sth2;
-foreach my $key (@names){
-  $data{$key}=$input->param($key);
-}
-my $dbh = C4::Context->dbh;
-my $sth=$dbh->prepare("Select * from borrowers where borrowernumber=?");
-$sth->execute($data{'borrowernumber'});
-if (my $data2=$sth->fetchrow_hashref){
-	$sth2=$dbh->prepare("update borrowers set title=?,expiry=?,
-	cardnumber=?,sex=?,ethnotes=?,
-	streetaddress=?,faxnumber=?,firstname=?,
-	altnotes=?,dateofbirth=?,contactname=?,
-	emailaddress=?,dateenrolled=?,streetcity=?,
-	altrelationship=?,othernames=?,phoneday=?,
-	city=?,area=?,phone=?,
-	borrowernotes=?,altphone=?,surname=?,
-	initials=?,physstreet=?,ethnicity=?,
-	gonenoaddress=?,lost=?,debarred=?,
-	textmessaging=?, branchcode = ?,
-	zipcode = ?,homezipcode=?
-	where borrowernumber=?");
-	$sth2->execute($data{'title'},$data{'expiry'},
-	$data{'cardnumber_institution'},$data{'sex'},$data{'ethnicnotes'},
-	$data{'address'},$data{'faxnumber'},$data{'firstname'},
-	$data{'altnotes'},$data{'dateofbirth'},$data{'contactname'},
-	$data{'emailaddress'},$data{'joining'},$data{'streetcity'},
-	$data{'altrelationship'},$data{'othernames'},$data{'phoneday'},
-	$data{'city'},$data{'area'},$data{'phone'},
-	$data{'borrowernotes'},$data{'altphone'},$data{'institution_name'},
-	$data{'initials'},$data{'streetaddress'},$data{'ethnicity'},
-	$data{'gna'},$data{'lost'},$data{'debarred'},
-	$data{'textmessaging'},$data{'branchcode'},
-	$data{'zipcode'},$data{'homezipcode'},
-	$data{'borrowernumber'});
-} else {
-	my $surname=$data{'institution_name'};
-	# note for code reading : 5 on each line
-	$sth2=$dbh->prepare("insert into borrowers (
-			title,			expiry,		cardnumber,	sex,		ethnotes,
-			streetaddress,	faxnumber,	firstname,		altnotes,	dateofbirth,
-			contactname,	emailaddress,	dateenrolled,	streetcity,	altrelationship,
-			othernames,	phoneday,		categorycode,	city,		area,
-			phone,		borrowernotes,	altphone,		surname,	initials,
-			ethnicity,		borrowernumber,guarantor,		school,	branchcode,
-			zipcode,		homezipcode)
-	values (	?,?,?,?,?,
-			?,?,?,?,?,
-			?,?,now(),?,?,
-			?,?,?,?,?,
-			?,?,?,?,?,
-			?,?,?,?,?,
-			?,?
-			)");
-	$sth2->execute('',				$data{'expiry'},			$data{'cardnumber_institution'},	'',				$data{'ethnotes'},
-				$data{'address'},	$data{'faxnumber'},		$surname,					$data{'altnotes'},	'',
-				$data{'contactname'},$data{'emailaddress'},	$data{'streetcity'},			$data{'altrelationship'}, # only 4 because of now()
-				$data{'othernames'},	$data{'phoneday'},		'I',						$data{'city'},		$data{'area'},
-				''.$data{'phone'},		$data{'borrowernotes'},	$data{'altphone'},			$surname,			''.$data{'initials'},
-				$data{'ethnicity'},	$data{'borrowernumber'},	'',						'',				$data{'branchcode'},
-				$data{'zipcode'},	$data{'homezipcode'});
-}
-
-$sth2->finish;
-$sth->finish;
-
-print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$data{'borrowernumber'}");

Index: cgi-bin/members/insertjdata.pl
===================================================================
RCS file: cgi-bin/members/insertjdata.pl
diff -N cgi-bin/members/insertjdata.pl
--- cgi-bin/members/insertjdata.pl	10 Mar 2007 01:19:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,97 +0,0 @@
-#!/usr/bin/perl
-
-#script to enter borrower data into the data base
-#needs to be moved into a perl module
-# written 9/11/99 by chris at katipo.co.nz
-
-
-# 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 CGI;
-use C4::Context;
-use C4::Input;
-use Date::Manip;
-use strict;
-use C4::Members;
-
-my $input= new CGI;
-get all the data into a hash
-my @names=$input->param;
-my %data;
-my $keyfld;
-my $keyval;
-my $problems;
-my $env;
-foreach my $key (@names){
-	$data{$key}=$input->param($key);
-}
-my $dbh = C4::Context->dbh;
-my $query;
-for (my $i=0;$i<1;$i++){
-	my $sth=$dbh->prepare("Select * from borrowers where borrowernumber=?");
-	$sth->execute($data{'bornumber_child_$i'});
-	if (my $data=$sth->fetchrow_hashref){
-		$query="update borrowers set title='$data{'title'}',expiry='$data{'expiry'}',
-		cardnumber='$data{'cardnumber'}',sex='$data{'sex'}',ethnotes='$data{'ethnicnotes'}',
-		streetaddress='$data{'address'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}',
-		altnotes='$data{'altnotes'}',dateofbirth='$data{'dateofbirth'}',contactname='$data{'contactname'}',
-		emailaddress='$data{'emailaddress'}',dateenrolled='$data{'joining'}',streetcity='$data{'streetcity'}',
-		altrelationship='$data{'altrelationship'}',othernames='$data{'othernames'}',phoneday='$data{'phoneday'}',
-		categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}',
-		borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'surname'}',
-		initials='$data{'initials'}',streetaddress='$data{'streetaddress'}',ethnicity='$data{'ethnicity'}',physstreet='$data{'physstreet'}',sort1='$data{sort1}',sort2='$data{'sort2'}'
-		where borrowernumber=$data{'borrowernumber'}";
-		#  print $query;
-	}elsif ($data{"cardnumber_child_$i"} ne ''){
-		my $dob=$data{"dateofbirth_child_$i"};
-		$dob=ParseDate($dob);
-		$dob=UnixDate($dob,'%Y-%m-%d');
-		$data{'joining'}=ParseDate("today");
-		$data{'joining'}=UnixDate($data{'joining'},'%Y-%m-%d');
-		my $cardnumber=$data{"cardnumber_child_$i"};
-		my $bornum=$data{"bornumber_child_$i"};
-		my $firstname=$data{"firstname_child_$i"};
-		my $surname=$data{"surname_child_$i"};
-		my $school=$data{"school_child_$i"};
-		my $guarant=$data{'borrowernumber'};
-		my $notes=$data{"altnotes_child_$i"};
-		my $sex=$data{"sex_child_$i"};
-		$data{'contactname'}=$data{'firstname_guardian'}." ".$data{'surname_guardian'};
-		$data{'altrelationship'}="Guarantor";
-		$data{'altphone'}=$data{'phone'};
-		$query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber,
-		firstname,altnotes,dateofbirth,contactname,emailaddress,dateenrolled,streetcity,
-		altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname,
-		initials,ethnicity,borrowernumber,guarantor,school,physstreet,sort1,sort2)
-		values ('','$data{'expiry'}',
-		'$cardnumber',
-		'$sex','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}',
-		'$firstname','$data{'altnotes'}','$dob','$data{'contactname'}','$data{'emailaddress'}',
-		'$data{'joining'}','$data{'streetcity'}','$data{'altrelationship'}','$data{'othernames'}',
-		'$data{'phoneday'}','C','$data{'city'}','$data{'area'}','$data{'phone'}',
-		'$notes','$data{'altphone'}','$surname','$data{'initials'}',
-		'$data{'ethnicity'}','$bornum','$guarant','$school','$data{'physstreet'}','$data{'sort1'}','$data{'sort2'}')";
-
-	}
-	#print $query;
-	my $sth2=$dbh->prepare($query);
-	$sth2->execute;
-	$sth2->finish;
-	$sth->finish;
-}
-print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$data{'borrowernumber'}");

Index: cgi-bin/members/jmemberentry.pl
===================================================================
RCS file: cgi-bin/members/jmemberentry.pl
diff -N cgi-bin/members/jmemberentry.pl
--- cgi-bin/members/jmemberentry.pl	10 Mar 2007 01:19:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,100 +0,0 @@
-#!/usr/bin/perl
-
-#script to set up screen for modification of borrower details
-#written 20/12/99 by chris at katipo.co.nz
-
-
-# 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::Auth;
-
-use CGI;
-use C4::Search;
-use C4::Interface::CGI::Output;
-use C4::Date;
-use C4::Members;
-
-my $input = new CGI;
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/jmemberentry.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {borrowers => 1},
-			     debug => 1,
-			     });
-
-my $member=$input->param('bornum');
-if ($member eq ''){
-  $member=NewBorrowerNumber();
-}
-my $type=$input->param('type');
-
-my $data=borrdata('',$member);
-
-my @titles = ('Miss', 'Mrs', 'Ms', 'Mr', 'Dr', 'Sir');
-	# FIXME - Assumes English. This ought to be made part of i18n.
-my @titledata;
-while (@titles) {
-  my $title = shift @titles;
-  my %row = ('title' => $title);
-  if ($data->{'title'} eq $title) {
-    $row{'selected'}=' selected';
-  } else {
-    $row{'selected'}='';
-  }
-  push(@titledata, \%row);
-}
-
-# get the data for children
-my $cmember1=NewBorrowerNumber();
-my @cmemdata;
-for (my $i=0;$i<1;$i++){
-  my %row;
-  $row{'cmember'}=$cmember1+$i;
-  $row{'i'}=$i;
-  $row{'count'}=$i+1;
-  push(@cmemdata, \%row);
-}
-
-my $jcardnumber=C4::Members::fixup_cardnumber("");
-
-$template->param( member => $member,
-			firstname       => $data->{'firstname'},
-			surname         => $data->{'surname'},
-			cardnumber      => $data->{'cardnumber'},
-			jcardnumber	=> $jcardnumber,
-			area            => $data->{'area'},
-			city            => $data->{'city'},
-			physstreet         => $data->{'physstreet'},
-			streetaddress   => $data->{'streetaddress'},
-			streetcity      => $data->{'streetcity'},
-			phone           => $data->{'phone'},
-			phoneday        => $data->{'phoneday'},
-			faxnumber       => $data->{'faxnumber'},
-			emailaddress    => $data->{'emailaddress'},
-			contactname     => $data->{'contactname'},
-			altphone        => $data->{'altphone'},
-			dateformat      => display_date_format(),
-			titleloop       => \@titledata,
-			cmemloop        => \@cmemdata );
-
-
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/members/mancredit.pl
===================================================================
RCS file: cgi-bin/members/mancredit.pl
diff -N cgi-bin/members/mancredit.pl
--- cgi-bin/members/mancredit.pl	10 Mar 2007 01:19:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,85 +0,0 @@
-#!/usr/bin/perl
-
-#wrriten 18/09/2005 by TG
-#script to display borrowers account details
-
-
-# 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::Auth;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use CGI;
-
-use C4::Search;
-use C4::Accounts2;
-use C4::Members;
-my $input=new CGI;
-  my $accounttype=$input->param('accounttype');
- my $accountid=$input->param('accountid');
-my $amount=$input->param('amount');
-my $itemnum=$input->param('itemnum');
-my $error=0;
-my $bornum=$input->param('bornum');
-#get borrower details
-my $data=borrdata('',$bornum);
-my $user=$data->{firstname}.",".$data->{surname}."-".$data->{cardnumber};
-my $add=$input->param('add');
-# $error=$input->param('error');
-my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "members/mancredit.tmpl",
-					query => $input,
-					type => "intranet",
-					authnotrequired => 0,
-					flagsrequired => {borrowers => 1},
-					debug => 1,
-					});
-	$template->param(user => $user);
-	$template->param( bornum => $bornum);
-	$template->param( itemnum => $itemnum);
-	$template->param( amount => $amount);
-	$template->param( accounttype => $accounttype);
-	$template->param( accountid => $accountid);
-if ($add){
-if ($accounttype eq "F" || $accounttype eq "FU"){
-$accounttype="CF";
-}else{
-$accounttype="C".$accounttype;
-}
-	
-  my $desc=$input->param('desc');
-  my $amount=$input->param('amount');
-  $amount = -$amount;
-my $loggeduser=$input->param('loggedinuser');
-my   $error=manualcredit($bornum,$accountid,$desc,$accounttype,$amount,$loggeduser);
-	if ($error>0 ) {
-	$template->param( error => "1");
-	$template->param(user => $user);
-	$template->param( bornum => $bornum);
-	$template->param( itemnum => $itemnum);
-	$template->param( amount => $amount);
-	$template->param( accounttype => $accounttype);
-	$template->param( accountid => $accountid);
-	} else {
-	print $input->redirect("/cgi-bin/koha/members/boraccount.pl?bornum=$bornum");
-	}
-} 
-	
-
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/members/maninvoice.pl
===================================================================
RCS file: cgi-bin/members/maninvoice.pl
diff -N cgi-bin/members/maninvoice.pl
--- cgi-bin/members/maninvoice.pl	10 Mar 2007 01:19:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,60 +0,0 @@
-#!/usr/bin/perl
-
-#wrriten 11/1/2000 by chris at katipo.oc.nz
-#script to display borrowers account details
-
-
-# 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::Auth;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use CGI;
-use C4::Search;
-use C4::Accounts2;
-use C4::Members;
-
-
-my $input=new CGI;
-
-my $bornum=$input->param('bornum');
-#get borrower details
-my $data=borrdata('',$bornum);
-my $user=$data->{firstname}.",".$data->{surname}."-".$data->{cardnumber};
-my $add=$input->param('add');
-if ($add){
-#  print $input->header;
-  my $desc=$input->param('desc');
-  my $amount=$input->param('amount');
-  my $type=$input->param('type');
-  manualinvoice($bornum,$desc,$type,$amount);
-  print $input->redirect("/cgi-bin/koha/members/boraccount.pl?bornum=$bornum");
-} else {
-	my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "members/maninvoice.tmpl",
-					query => $input,
-					type => "intranet",
-					authnotrequired => 0,
-					flagsrequired => {borrowers => 1},
-					debug => 1,
-					});
-	$template->param(bornum => $bornum);
-	$template->param(user => $user);
-	output_html_with_http_headers $input, $cookie, $template->output;
-}

Index: cgi-bin/members/manualcredit.pl
===================================================================
RCS file: cgi-bin/members/manualcredit.pl
diff -N cgi-bin/members/manualcredit.pl
--- cgi-bin/members/manualcredit.pl	10 Mar 2007 01:19:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,60 +0,0 @@
-#!/usr/bin/perl
-
-#wrriten 18/09/2005 by TG
-#script to display borrowers account details
-
-
-# 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::Auth;
-use CGI;
-use C4::Accounts2;
-
-my $input=new CGI;
-my $dbh=C4::Context->dbh;
-my $me= C4::Context->userenv;
-my $user=$me->{'cardnumber'} if ($me);
-$user="system" unless $user;
-my $sth=$dbh->prepare("SELECT * FROM accountlines a
-left join borrowers b on a.borrowernumber=b.borrowernumber
-where amountoutstanding>0 and categorycode='F' ");
-$sth->execute();
-my ($bornum,$itemnum,$desc,$accounttype,$amount);
-while (my $data=$sth->fetchrow_hashref){
-	if ($data->{'accounttype'}  eq "FU"){
-	$accounttype="CF";
-	}else{
-	$accounttype="C".$data->{'accounttype'};
-	}
-  my $accountno=getnextacctno('',$data->{borrowernumber},$dbh);	
-  my $desc="Automatic -credit for Faculty";
-  my $amount=$data->{amountoutstanding};
-  $amount = -$amount;
-my $sth3=$dbh->prepare("update accountlines set amountoutstanding=0 where accountid=?");
-$sth3->execute($data->{accountid});
- my $sth2=$dbh->prepare("INSERT INTO	accountlines
-			(borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding,offset)
-			VALUES (?, ?, now(), ?, ?, ?, ?,?)");
-    	$sth2->execute($data->{borrowernumber}, $accountno, $amount, $desc, $accounttype, 0,$data->{amountoutstanding});
-
-
-} 
-	
-print $input->redirect("/cgi-bin/koha/mainpage.pl");
-

Index: cgi-bin/members/member-flags.pl
===================================================================
RCS file: cgi-bin/members/member-flags.pl
diff -N cgi-bin/members/member-flags.pl
--- cgi-bin/members/member-flags.pl	10 Mar 2007 01:19:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,91 +0,0 @@
-#!/usr/bin/perl
-
-# script to edit a member's flags
-# Written by Steve Tonnesen
-# July 26, 2002 (my birthday!)
-
-use strict;
-
-use C4::Search;
-use CGI;
-use C4::Output;
-use C4::Auth;
-use C4::Context;
-use C4::Circulation::Circ2;
-use C4::Members;
-use C4::Interface::CGI::Output;
-
-my $input = new CGI;
-
-my $flagsrequired;
-$flagsrequired->{borrowers}=1;
-$flagsrequired->{permissions}=1;
-
-my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "members/member-flags.tmpl",
-				query => $input,
-				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {superlibrarian => 1},
-				debug => 1,
-				});
-
-
-
-
-my $member=$input->param('member');
-my %env;
-$env{'nottodayissues'}=1;
-my %member2;
-$member2{'borrowernumber'}=$member;
-my $issues=currentissues(\%env,\%member2);
-my $i=0;
-foreach (sort keys %$issues) {
-    $i++;
-}
-
-if ($input->param('newflags')) {
-    my $dbh=C4::Context->dbh();
-    my $flags=0;
-    foreach ($input->param) {
-	if (/flag-(\d+)/) {
-	    my $flag=$1;
-	    $flags=$flags+2**$flag;
-	}
-    }
-    my $sth=$dbh->prepare("update borrowers set flags=? where borrowernumber=?");
-    $sth->execute($flags, $member);
-    print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$member");
-} else {
-#     my ($bor,$flags,$accessflags)=getpatroninformation(\%env, $member,'');
-    my $bor = getpatroninformation(\%env, $member,'');
-    my $flags = $bor->{'flags'};
-    my $accessflags = $bor->{'authflags'};
-    my $dbh=C4::Context->dbh();
-    my $sth=$dbh->prepare("select bit,flag,flagdesc from userflags order by bit");
-    $sth->execute;
-    my @loop;
-    while (my ($bit, $flag, $flagdesc) = $sth->fetchrow) {
-	my $checked='';
-	if ($accessflags->{$flag}) {
-	    $checked='checked';
-	}
-	my %row = ( bit => $bit,
-		 flag => $flag,
-		 checked => $checked,
-		 flagdesc => $flagdesc );
-	push @loop, \%row;
-    }
-
-    $template->param(member => $member,
-			surname => $bor->{'surname'},
-			firstname => $bor->{'firstname'},
-			loop => \@loop,
-			intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-			);
-
-    output_html_with_http_headers $input, $cookie, $template->output;
-
-}

Index: cgi-bin/members/member-password.pl
===================================================================
RCS file: cgi-bin/members/member-password.pl
diff -N cgi-bin/members/member-password.pl
--- cgi-bin/members/member-password.pl	10 Mar 2007 01:19:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,88 +0,0 @@
-#!/usr/bin/perl
-#script to set the password, and optionally a userid, for a borrower
-#written 2/5/00
-#by chris at katipo.co.nz
-#converted to using templates 3/16/03 by mwhansen at hmc.edu
-
-use strict;
-use C4::Auth;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Search;
-use C4::Context;
-use C4::Members;
-use C4::Circulation::Circ2;
-use CGI;
-use Digest::MD5 qw(md5_base64);
-
-my $input = new CGI;
-
-my $theme = $input->param('theme') || "default";
-			# only used if allowthemeoverride is set
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/member-password.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {borrowers => 1},
-			     debug => 1,
-			     });
-
-my $flagsrequired;
-$flagsrequired->{borrowers}=1;
-my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired);
-
-my $member=$input->param('member');
-my %env;
-$env{'nottodayissues'}=1;
-my %member2;
-$member2{'borrowernumber'}=$member;
-my $issues=currentissues(\%env,\%member2);
-my $i=0;
-foreach (sort keys %$issues) {
-    $i++;
-}
-
-my ($bor,$flags)=getpatroninformation(\%env, $member,'');
-my $newpassword = $input->param('newpassword');
-
-if ( $newpassword ) {
-	my $digest=md5_base64($input->param('newpassword'));
-	my $uid = $input->param('newuserid');
-	my $dbh=C4::Context->dbh;
-	if (change_user_pass($uid,$member,$digest)) {
-		$template->param(newpassword => $newpassword);
-		print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$member");
-	} else {
-        $template->param(othernames => $bor->{'othernames'},
-						surname     => $bor->{'surname'},
-						firstname   => $bor->{'firstname'},
-						userid      => $bor->{'userid'},
-						defaultnewpassword => $newpassword );
-	}
-} else {
-    my $userid = $bor->{'userid'};
-
-    my $chars='abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-    my $length=int(rand(2))+4;
-    my $defaultnewpassword='';
-    for (my $i=0; $i<$length; $i++) {
-	$defaultnewpassword.=substr($chars, int(rand(length($chars))),1);
-    }
-	$template->param(	othernames => $bor->{'othernames'},
-			surname     => $bor->{'surname'},
-			firstname   => $bor->{'firstname'},
-			userid      => $bor->{'userid'},
-			defaultnewpassword => $defaultnewpassword );
-
-
-}
-
-$template->param( member => $member,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/members/member-picupload.pl
===================================================================
RCS file: cgi-bin/members/member-picupload.pl
diff -N cgi-bin/members/member-picupload.pl
--- cgi-bin/members/member-picupload.pl	10 Mar 2007 01:19:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,83 +0,0 @@
-#!/usr/bin/perl
- 
- # $Id: member-picupload.pl,v 1.1.2.1 2007/03/10 01:19:30 tgarip1957 Exp $
- 
- # script to upload a picture to a borrowerimages directory.
- # checks to see if its either displaying the upload form
- # or doing the actual upload.
- # written by Waylon Robertson (genjimoto at sourceforge) 2005/08/22
- 
- 
- # 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::Auth;
- use C4::Context;
- use C4::Output;
- use CGI;
- use C4::Interface::CGI::Output;
- use C4::Members;
-
- my $input = new CGI;
- my $name = $input->param('name');
- my $cardnum = $input->param('cardnum');
- my $bornum = $input->param('bornum');
- my $photo = $input->param('photo');
- 
- my $template_name;
-
- my $htdocs = C4::Context->config('opacdir');
- my $upload_dir = $htdocs."/htdocs/uploaded-files/users-photo";
- if($photo eq  ""){
- 	$template_name = "members/member-picupload.tmpl";
- } else {
- 	$template_name = "members/moremember.tmpl";
- }
- 
- my ($template, $loggedinuser, $cookie)
-     = get_template_and_user({template_name => $template_name,
- 			     query => $input,
- 			     type => "intranet",
- 			     authnotrequired => 0,
- 			     flagsrequired => {borrowers => 1},
- 			     debug => 1,
- 			     });
- if ($photo){
- 
- 	my $filename=$cardnum.'.jpg';
- 	my $upload_filehandle = $input->upload("photo");
- 	open UPLOADFILE, ">$upload_dir/$filename";
- 	binmode UPLOADFILE;
- 	while ( <$upload_filehandle> )
- 	{
- 		print UPLOADFILE;
- 	}
- 	close UPLOADFILE;
-print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
- }
- else {
- 	$template->param(
- 		 bornum => $bornum,
-		cardnum => $cardnum,
- 		 name => $name
- 		 );
- 	 output_html_with_http_headers $input, $cookie, $template->output;
- }
-
-
-

Index: cgi-bin/members/member.pl
===================================================================
RCS file: cgi-bin/members/member.pl
diff -N cgi-bin/members/member.pl
--- cgi-bin/members/member.pl	10 Mar 2007 01:19:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,103 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: member.pl,v 1.1.2.1 2007/03/10 01:19:30 tgarip1957 Exp $
-
-#script to do a borrower enquiery/brin up borrower details etc
-#written 20/12/99 by chris at katipo.co.nz
-
-
-# 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::Auth;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use CGI;
-use C4::Members;
-
-my $input = new CGI;
-my $quicksearch = $input->param('quicksearch');
-my ($template, $loggedinuser, $cookie);
-if($quicksearch){
-	($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/member-quicksearch-results.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {borrowers => 1},
-			     debug => 1,
-			     });
-} else {
-	($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/member.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {borrowers => 1},
-			     debug => 1,
-			     });
-}
-my $theme = $input->param('theme') || "default";
-
-
-my $member=$input->param('member');
-my $orderby=$input->param('orderby');
-$orderby = "surname,firstname" unless $orderby;
-$member =~ s/,//g;   #remove any commas from search string
-
-my $env;
-
-my ($count,$results);
-
-if(length($member) == 1)
-{
-	($count,$results)=BornameSearch($env,$member,$orderby,"simple");
-}
-else
-{
-	($count,$results)=BornameSearch($env,$member,$orderby,"advanced");
-}
-
-
-my @resultsdata;
-my $background = 0;
-for (my $i=0; $i < $count; $i++){
-  #find out stats
-  my ($od,$issue,$fines)=borrdata2($env,$results->[$i]{'borrowernumber'});
-
-  my %row = (
-  	background => $background,
-        borrowernumber => $results->[$i]{'borrowernumber'},
-        cardnumber => $results->[$i]{'cardnumber'},
-        surname => $results->[$i]{'surname'},
-        firstname => $results->[$i]{'firstname'},
-        categorycode => $results->[$i]{'categorycode'},
-        streetaddress => $results->[$i]{'streetaddress'},
-        city => $results->[$i]{'city'},
-        odissue => "$od/$issue",
-        fines => $fines,
-        borrowernotes => $results->[$i]{'borrowernotes'});
-  if ( $background ) { $background = 0; } else {$background = 1; }
-  push(@resultsdata, \%row);
-}
-
-$template->param( 
-			member          => $member,
-			resultsloop     => \@resultsdata );
-
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/members/memberentry.pl
===================================================================
RCS file: cgi-bin/members/memberentry.pl
diff -N cgi-bin/members/memberentry.pl
--- cgi-bin/members/memberentry.pl	10 Mar 2007 01:19:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,299 +0,0 @@
-#!/usr/bin/perl
-# NOTE: This file uses standard 8-space tabs
-#       DO NOT SET TAB SIZE TO 4
-
-# $Id: memberentry.pl,v 1.1.2.1 2007/03/10 01:19:30 tgarip1957 Exp $
-
-#script to set up screen for modification of borrower details
-#written 20/12/99 by chris at katipo.co.nz
-
-
-# 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::Auth;
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use CGI;
-use C4::Search;
-use C4::Members;
-use C4::Koha;
-use C4::Date;
-use C4::Input;
-use C4::Log;
-
-my $input = new CGI;
-
-my $dbh = C4::Context->dbh;
-my $cardnumber;
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/memberentry.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {borrowers => 1},
-			     debug => 1,
-			     });
-
-my $borrowernumber=$input->param('borrowernumber');
-my $actionType=$input->param('actionType') || '';
-my $modify=$input->param('modify');
-my $delete=$input->param('delete');
-my $op=$input->param('op');
-my $categorycode=$input->param('categorycode');
-my $destination=$input->param('destination');
-my $defaultbranch=C4::Context->preference('defaultBranch');
- my $autonumber_members = C4::Context->boolean_preference('autoMemberNum');
-
-my $nok;
-# if a add or modify is requested => check validity of data.
-if ($op eq 'add' or $op eq 'modify') {
-	my %data;
-
-	my @names=$input->param;
-	foreach my $key (@names){
-		$data{$key}=$input->param($key);
-		$data{$key}=~ s/\'/\\\'/g;
-		$data{$key}=~ s/\"/\\\"/g;
-	}
-
-if ($op eq 'add'){	 $cardnumber=C4::Members::fixupneu_cardnumber($data{'cardnumber'},$data{'categorycode'});
-	$data{'cardnumber'}=$cardnumber;}
-	my @errors;
-	if ($data{'cardnumber'} eq '' && ! $autonumber_members){
-		push @errors,"ERROR_cardnumber";
-		$nok=1;
-	} else {
-		#check cardnumber is valid
-		my $nounique;
-		if ( $op eq "add" )    {
-			$nounique = 0;
-		} else {
-			$nounique = 1;
-		}
-		my $valid=checkdigit('',$data{'cardnumber'}, $nounique);
-		if ($valid != 1){
-			$nok=1;
-			push @errors, "ERROR_invalid_cardnumber";
-		}
-	}
-	if ($data{'sex'} eq '' && $categorycode ne "I"){
-		push @errors, "ERROR_gender";
-		$nok=1;
-	}
-	if ($data{'firstname'} eq '' && $categorycode ne "I"){
-		push @errors,"ERROR_firstname";
-		$nok=1;
-	}
-	if ($data{'surname'} eq ''){
-		push @errors,"ERROR_surname";
-		$nok=1;
-	}
-	if ($data{'streetaddress'} eq ''){
-		push @errors, "ERROR_address";
-		$nok=1;
-	}
-	if ($data{'city'} eq ''){
-		push @errors, "ERROR_city";
-		$nok=1;
-	}
-	if ($nok) {
-		foreach my $error (@errors) {
-			$template->param( $error => 1);
-		}
-		$template->param(NOK => 1);
-	} else {
-		my $query="Select * from borrowers where borrowernumber=?";
-		my $sth=$dbh->prepare($query);
-		$sth->execute($data{'borrowernumber'});
-		if (my $data2=$sth->fetchrow_hashref){
-
-			&modmember(%data);
-	logaction($loggedinuser,"members","modify",$data{'borrowernumber'},"expiry:$data{'expiry'},userid:$data{'userid'},debarred:$data{'debarred'},gone:$data{'gna'}") if (&logstatus);
-		}else{
-
-			$borrowernumber = &newmember(%data);
-		logaction($loggedinuser,"members","add",$borrowernumber,"expiry:$data{'expiry'},userid:$data{'userid'}") if (&logstatus);
-	
-		}
-		
-	if($destination eq "circ"){
-		print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}");
-	} else {
-		print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
-		}
-	}
-}
-if ($delete){
-	print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$borrowernumber");
-} else {  # this else goes down the whole script
-	if ($actionType eq 'Add'){
-		$template->param( addAction => 1);
-
-	} else {
-		$template->param( addAction =>0);
-
-	}
-	# retrieve previous values : either in DB or in CGI, in case of errors in values
-	my $data;
-	if ($nok) {
-		my @names=$input->param;
-		foreach my $key (@names){
-			$data->{$key}=$input->param($key);
-		}
-	} else {
-		$data=borrdata('',$borrowernumber);
-	}
-	if ($actionType eq 'Add'){
-		$template->param( updtype => 'I');
-	} else {
-		$template->param( updtype => 'M');
-	}
-##Cardnumber was here
-if ($modify){ $cardnumber=($data->{'cardnumber'})};
-		
-	if ($data->{'sex'} eq 'F'){
-		$template->param(female => 1);
-	}
-	my ($categories,$labels)=ethnicitycategories();
-	my $ethnicitycategoriescount=$#{$categories};
-	my $ethcatpopup;
-	if ($ethnicitycategoriescount>=0) {
-		$ethcatpopup = CGI::popup_menu(-name=>'ethnicity',
-					-id => 'ethnicity',
-					-values=>$categories,
-					-default=>$data->{'ethnicity'},
-					-labels=>$labels);
-		$template->param(ethcatpopup => $ethcatpopup); # bad style, has to be fixed
-	}
-
-	($categories,$labels)=borrowercategories();
-	my $catcodepopup = CGI::popup_menu(-name=>'categorycode',
-					-id => 'categorycode',
-					-values=>$categories,
-					-default=>$data->{'categorycode'},
-					-labels=>$labels);
-
-	my @relationships = ('','workplace', 'relative','friend', 'neighbour');
-	my @relshipdata;
-	while (@relationships) {
-		my $relship = shift @relationships;
-		my %row = ('relationship' => $relship);
-		if ($data->{'altrelationship'} eq $relship) {
-			$row{'selected'}=' selected';
-		} else {
-			$row{'selected'}='';
-		}
-		push(@relshipdata, \%row);
-	}
-
-	# %flags: keys=$data-keys, datas=[formname, HTML-explanation]
-	my %flags = ('gonenoaddress' => ['gna', 'Gone/Graduated'],
-				'lost'          => ['lost', 'Lost'],
-				'debarred'      => ['debarred', 'Debarred']);
-
-	my @flagdata;
-	foreach (keys(%flags)) {
-	my $key = $_;
-	my %row =  ('key'   => $key,
-			'name'  => $flags{$key}[0],
-			'html'  => $flags{$key}[1]);
-	if ($data->{$key}) {
-		$row{'yes'}=' checked';
-		$row{'no'}='';
-	} else {
-		$row{'yes'}='';
-		$row{'no'}=' checked';
-	}
-	push(@flagdata, \%row);
-	}
-
-	if ($modify){
-	$template->param( modify => 1 );
-	}
-
-	#Convert dateofbirth to correct format
-	$data->{'dateofbirth'} = format_date($data->{'dateofbirth'});
-	$data->{'expiry'} = format_date($data->{'expiry'});
-
-	my @branches;
-	my @select_branch;
-	my %select_branches;
-	my $branches=GetBranches();
-	foreach my $branch (keys %$branches) {
-		push @select_branch, $branch;
-		$select_branches{$branch} = $branches->{$branch}->{'branchname'};
-	}
-	my $CGIbranch=CGI::scrolling_list( -name     => 'branchcode',
-				-id => 'branchcode',
-				-values   => \@select_branch,
-				-default  => $defaultbranch,
-				-labels   => \%select_branches,
-				-size     => 1,
-				-multiple => 0 );
-
-	$template->param(	actionType 		=> $actionType,
-				destination => $destination,
-				borrowernumber          => $borrowernumber,
-				address         => $data->{'streetaddress'},
-				firstname       => $data->{'firstname'},
-				surname         => $data->{'surname'},
-				othernames	=> $data->{'othernames'},
-				initials	=> $data->{'initials'},
-				ethcatpopup	=> $ethcatpopup,
-				catcodepopup	=> $catcodepopup,
-				streetaddress   => $data->{'streetaddress'},
-				physstreet   => $data->{'physstreet'},
-				zipcode => $data->{'zipcode'},
-				streetcity      => $data->{'streetcity'},
-				homezipcode => $data->{'homezipcode'},
-				city		=> $data->{'city'},
-				phone           => $data->{'phone'},
-				phoneday        => $data->{'phoneday'},
-				faxnumber       => $data->{'faxnumber'},
-				emailaddress    => $data->{'emailaddress'},
-				preferredcont    => $data->{'preferredcont'},
-				$data->{'preferredcont'} =>1,
-				textmessaging   => $data->{'textmessaging'},
-				contactname     => $data->{'contactname'},
-				altphone        => $data->{'altphone'},
-				altnotes	=> $data->{'altnotes'},
-				borrowernotes	=> $data->{'borrowernotes'},
-				flagloop	=> \@flagdata,
-				relshiploop	=> \@relshipdata,
-				"title_".$data->{'title'} => " SELECTED ",
-				joining	=> format_date($data->{'dateenrolled'}),
-				expiry		=> $data->{'expiry'},
-				cardnumber	=> $cardnumber,
-				dateofbirth	=> $data->{'dateofbirth'},
-				sort1 => $data->{'sort1'},
-				sort2 => $data->{'sort2'},
-				dateformat      => display_date_format(),
-			        modify          => $modify,
-				CGIbranch => $CGIbranch);
-	$template->param(Institution => 1) if ($categorycode eq "I");
-
-	output_html_with_http_headers $input, $cookie, $template->output;
-
-
-}
-
-# Local Variables:
-# tab-width: 8
-# End:

Index: cgi-bin/members/members-home.pl
===================================================================
RCS file: cgi-bin/members/members-home.pl
diff -N cgi-bin/members/members-home.pl
--- cgi-bin/members/members-home.pl	10 Mar 2007 01:19:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Context;
-use C4::Members;
-my $query = new CGI;
-my $quicksearch = $query->param('quicksearch');
-my ($template, $loggedinuser, $cookie);
-my $template_name;
-
-if($quicksearch){
-($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/member-quicksearch.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {borrowers => 1},
-			     debug => 1,
-			     });
-} else {
-($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/members-home.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {borrowers => 1},
-			     debug => 1,
-			     });
-}
-
-$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/members/moremember.pl
===================================================================
RCS file: cgi-bin/members/moremember.pl
diff -N cgi-bin/members/moremember.pl
--- cgi-bin/members/moremember.pl	10 Mar 2007 01:19:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,199 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: moremember.pl,v 1.1.2.1 2007/03/10 01:19:30 tgarip1957 Exp $
-
-# script to do a borrower enquiry/bring up borrower details etc
-# Displays all the details about a borrower
-# written 20/12/99 by chris at katipo.co.nz
-# last modified 21/1/2000 by chris at katipo.co.nz
-# modified 31/1/2001 by chris at katipo.co.nz
-#   to not allow items on request to be renewed
-#
-# needs html removed and to use the C4::Output more, but its tricky
-#
-
-
-# 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::Auth;
-use C4::Context;
-use C4::Interface::CGI::Output;
-use CGI;
-use C4::Search;
-use C4::Date;
-use C4::Reserves2;
-use C4::Circulation::Circ2;
-use C4::Koha;
-use C4::Members;
-use C4::Accounts2;
-my $dbh = C4::Context->dbh;
-
-my $input = new CGI;
-my $print = $input->param('print');
-my $template_name;
-
-if($print eq "page"){
-	$template_name = "members/moremember-print.tmpl";
-} elsif($print eq "slip"){
-	$template_name = "members/moremember-receipt.tmpl";
-} else {
-	$template_name = "members/moremember.tmpl";
-}
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => $template_name,
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {borrowers => 1},
-			     debug => 1,
-			     });
-
-my $bornum=$input->param('bornum');
-
-#start the page and read in includes
-
-my $data=borrdata('',$bornum);
-
-$template->param($data->{'categorycode'} => 1); # in template <TMPL_IF name="I"> => instutitional (A for Adult & C for children)
-my $picture;
- my $htdocs = C4::Context->config('opacdir');
-
-$picture =$htdocs. "/htdocs/uploaded-files/users-photo/".$data->{'cardnumber'}.".jpg";
- if (-e $picture)
-{ 
-
-   $template->param(borrowerphoto => "http://library.neu.edu.tr/uploaded-files/users-photo/".$data->{'cardnumber'}.".jpg");
- }else{
-$picture = "http://cc.neu.edu.tr/stdpictures/".$data->{'cardnumber'}.".jpg";
-  $template->param(borrowerphoto => $picture);
-}
-$data->{'dateenrolled'} = format_date($data->{'dateenrolled'});
-$data->{'expiry'} = format_date($data->{'expiry'});
-$data->{'dateofbirth'} = format_date($data->{'dateofbirth'});
-$data->{'IS_ADULT'} = ($data->{'categorycode'} ne 'I');
-
-if($data->{'debarred'} || $data->{'gonenoaddress'} || $data->{'lost'} || $data->{'borrowernotes'}){
-	$template->param(flagged =>1);
-}
-
-$data->{'ethnicity'} = fixEthnicity($data->{'ethnicity'});
-
-$data->{&expand_sex_into_predicate($data->{'sex'})} = 1;
-
-if ($data->{'categorycode'} eq 'C'){
-	my $data2=borrdata('',$data->{'guarantor'});
-	$data->{'streetaddress'}=$data2->{'streetaddress'};
-	$data->{'city'}=$data2->{'city'};
-	$data->{'physstreet'}=$data2->{'physstreet'};
-	$data->{'streetcity'}=$data2->{'streetcity'};
-	$data->{'phone'}=$data2->{'phone'};
-	$data->{'phoneday'}=$data2->{'phoneday'};
-	$data->{'zipcode'} = $data2->{'zipcode'};
-}
-
-
-if ($data->{'ethnicity'} || $data->{'ethnotes'}) {
-	$template->param(printethnicityline => 1);
-}
-
-if ($data->{'categorycode'} ne 'C'){
-	$template->param(isguarantee => 1);
-	# FIXME
-	# It looks like the $i is only being returned to handle walking through
-	# the array, which is probably better done as a foreach loop.
-	#
-	my ($count,$guarantees)=findguarantees($data->{'borrowernumber'});
-	my @guaranteedata;
-	for (my $i=0;$i<$count;$i++){
-		push (@guaranteedata, {borrowernumber => $guarantees->[$i]->{'borrowernumber'},
-					cardnumber => $guarantees->[$i]->{'cardnumber'},
-					name => $guarantees->[$i]->{'firstname'} . " " . $guarantees->[$i]->{'surname'}});
-	}
-	$template->param(guaranteeloop => \@guaranteedata);
-
-} else {
-	my ($guarantor)=findguarantor($data->{'borrowernumber'});
-	unless ($guarantor->{'borrowernumber'} == 0){
-		$template->param(guarantorborrowernumber => $guarantor->{'borrowernumber'}, guarantorcardnumber => $guarantor->{'cardnumber'});
-	}
-}
-
-my %bor;
-$bor{'borrowernumber'}=$bornum;
-
-# Converts the branchcode to the branch name
-$data->{'branchcode'} = &getbranchname($data->{'branchcode'});
-
-# Converts the categorycode to the description
-$data->{'categorycode'} = &getborrowercategory($data->{'categorycode'});
-
-my ($numaccts,$accts,$total)=getboracctrecord('',\%bor);
-
-my ($count,$issue)=borrissues($bornum);
-my $today=get_today();
-my @issuedata;
-my $totalprice = 0;
-
-for (my $i=0;$i<$count;$i++){
-
-	my $datedue=$issue->[$i]{'date_due'};
-	$issue->[$i]{'date_due'} = format_date($issue->[$i]{'date_due'});
-	my %row = %{$issue->[$i]};
-	$totalprice += $issue->[$i]{'replacementprice'};
-	$row{'replacementprice'}=$issue->[$i]{'replacementprice'};
-	if ($datedue lt $today){
-		$row{'red'}=1; #print "<font color=red>";
-	}
-	#find the charge for an item
-	
-	my ($charge,$itemtype)=C4::Accounts2::calc_charges($dbh,$issue->[$i]{'itemnumber'},$bornum);
-	
-	$row{'itemtype'}=ItemType($itemtype);
-	$row{'charge'}=$charge;
-
-	#check item is not reserved
-	my ($restype,$reserves)=CheckReserves($issue->[$i]{'itemnumber'});
-	if ($restype){
-#		print "<TD><a href=/cgi-bin/koha/request.pl?bib=$issue->[$i]{'biblionumber'}>On Request - no renewals</a></td></tr>";
-		#  } elsif ($issue->[$i]->{'renewals'} > 0) {
-		#      print "<TD>Previously Renewed - no renewals</td></tr>";
-	    		$row{'norenew'}=1;
-	} else {
-		$row{'norenew'}=0;
-	}
-	push (@issuedata, \%row);
-
-}
-my ($rescount,$reserves)=FindReserves('',$bornum); #From C4::Reserves2
-
-foreach my $reserveline (@$reserves) {
-	$reserveline->{'reservedate'} = format_date($reserveline->{'reservedate'});
-	
-}
-
-$template->param($data);
-$template->param(today=>format_date($today),
-		 bornum          => $bornum,
-		 totalprice =>$totalprice,
-		 totaldue =>$total,
-		 issueloop       => \@issuedata,
-		 reserveloop     => $reserves);
-
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/members/newimember.pl
===================================================================
RCS file: cgi-bin/members/newimember.pl
diff -N cgi-bin/members/newimember.pl
--- cgi-bin/members/newimember.pl	10 Mar 2007 01:19:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,140 +0,0 @@
-#!/usr/bin/perl
-# Note: This file now uses standard 8-space tabs
-
-# $Id: newimember.pl,v 1.1.2.1 2007/03/10 01:19:30 tgarip1957 Exp $
-
-#script to print confirmation screen,
-#then if accepted calls itself to insert data
-#modified 2002/12/16 by hdl at ifrance.com : Templating
-#the "parent" is imemberentry.pl
-
-
-# Copyright 2000-2003 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::Output;
-use C4::Input;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Members;
-use CGI;
-use Date::Manip;
-use C4::Members;
-my %env;
-my $input = new CGI;
-#get varibale that tells us whether to show confirmation page
-#or insert data
-my $insert=$input->param('insert');
-
-my ($template, $loggedinuser, $cookie) = get_template_and_user({
-	template_name => "members/newimember.tmpl",
-	query => $input,
-	type => "intranet",
-	authnotrequired => 0,
-	flagsrequired => {borrowers => 1},
-	debug => 1,
-  });
-
-#get rest of data
-my %data;
-my @names=$input->param;
-foreach my $key (@names){
-  $data{$key}=$input->param($key);
-}
-
-my $missing=0;
-
-my $string="The following compulsary fields have been left blank. Please push the back button
-and try again<p>";
-if ($data{'cardnumber_institution'} !~ /\S/){
-  $string.="Cardnumber<br>";
-  $missing=1;
-}
-if ($data{'institution_name'} !~ /\S/){
-  $string.="Institution Name<br>";
-  $missing=1;
-}
-if ($data{'address'} !~ /\S/){
-  $string.="Postal Address<br>";
-  $missing=1;
-}
-if ($data{'city'} !~ /\S/){
-  $string.="City<br>";
-  $missing=1;
-}
-if ($data{'contactname'} !~ /\S/){
-  $string.="Contact Name";
-  $missing=1;
-}
-
-$template->param( missingloop => ($missing==1));
-$template->param( string => $string);
-if ($missing !=1) {
-    $data{'cardnumber_institution'} = C4::Members::fixup_cardnumber
-	    ($data{'cardnumber_institution'});
-
-    #check cardnumber is valid
-    my $nounique;
-    if ( $data{'type'} ne "Add" )    {
-	$nounique = 0;
-    } else {
-	$nounique = 1;
-    }
-    my $valid=checkdigit(\%env,$data{'cardnumber'}, $nounique);
-
-    $template->param( invalid => ($valid !=1));
-
-    if ($valid) {
-	my @inputs;
-	while (my ($key, $value) = each %data) {
-	    push(@inputs, { 'key'	=> $key,
-			    'value'	=> CGI::escapeHTML($value) });
-	}
-    $template->param(institution_name => $data{institution_name},
-		     bornum => $data{'borrowernumber'},
-		     cardnumber_institution => $data{'cardnumber_institution'},
-		     memcat => $data{'categorycode'},
-		     branchcode => $data{'branchcode'},
-		     sex => $data{sex},
-		     postal => $data{postal},
-		     home => $data{home},
-			zipcode => $data{'zipcode'},
-			homezipcode => $data{'homezipcode'},
-		     phone => $data{'phone'},
-		     phoneday => $data{'phoneday'},
-		     faxnumber => $data{'faxnumber'},
-		     emailaddress => $data{'emailaddress'},
-			textmessaging => $data{'textmessaging'},
-		     contactname => $data{'contactname'},
-		     altphone => $data{'altphone'},
-		     altrelationship => $data{'altrelationship'},
-		     altnotes => $data{'altnotes'},
-		     bornotes => $data{'borrowernotes'},
-		     inputsloop => \@inputs);
-    }
-}
-$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $input, $cookie, $template->output;
-
-
-# Local Variables:
-# tab-width: 8
-# End:

Index: cgi-bin/members/newjmember.pl
===================================================================
RCS file: cgi-bin/members/newjmember.pl
diff -N cgi-bin/members/newjmember.pl
--- cgi-bin/members/newjmember.pl	10 Mar 2007 01:19:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,153 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: newjmember.pl,v 1.1.2.1 2007/03/10 01:19:30 tgarip1957 Exp $
-
-# script to print confirmation screen, then if accepted calls itself to insert data
-# FIXME - Yes, but what does it _do_?
-# 2002/12/18 hdl at ifrance.comTemplating
-
-# 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::Auth;
-use C4::Context;
-use C4::Input;
-use C4::Interface::CGI::Output;
-
-use C4::Koha;
-use CGI;
-use Date::Manip;
-use C4::Members;
-my %env;
-my $input = new CGI;
-#get varibale that tells us whether to show confirmation page
-#or insert data
-my $insert=$input->param('insert');
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/newjmember.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {borrowers => 1},
-			     debug => 1,
-			     });
-
-#get rest of data
-my %data;
-my @names=$input->param;
-foreach my $key (@names){
-  $data{$key}=$input->param($key);
-}
-my $missing=0;
-
-for (my $i=0;$i<3;$i++){
-  my $number=$data{"cardnumber_child_$i"};
-  my $firstname=$data{"firstname_child_$i"};
-  my $surname=$data{"surname_child_$i"};
-  my $dob=$data{"dateofbirth_child_$i"};
-  my $sex=$data{"sex_child_$i"};
-  if ($number eq ''){
-    if ($i == 0){
-		$template->param(cardnumber_missing => 1);
-		$missing=1;
-		    if ($firstname eq ''){
-		$template->param(firstname_missing => 1);
-		$missing=1;
-    }
-    if ($surname eq ''){
-		$template->param(surname_missing => 1);
-		$missing=1;
-    }
-    if ($dob eq ''){
-		$template->param(dob_missing => 1);
-		$missing=1;
-    }
-    if ($sex eq ''){
-		$template->param(gender_missing => 1);
-		$missing=1;
-    }
-    }
-  } else {
-    if ($firstname eq ''){
-		$template->param(firstname_missing => 1);
-		$missing=1;
-    }
-    if ($surname eq ''){
-		$template->param(surname_missing => 1);
-		$missing=1;
-    }
-    if ($dob eq ''){
-		$template->param(dob_missing => 1);
-		$missing=1;
-    }
-    if ($sex eq ''){
-		$template->param(gender_missing => 1);
-		$missing=1;
-    }
-    #check cardnumber is valid
-    my $nounique;
-    if ( $data{'type'} ne "Add" )    {
-		$nounique = 0;
-    } else {
-		$nounique = 1;
-    }
-    my $valid=checkdigit(\%env,$number, $nounique);
-    if ($valid != 1){
-		$template->param(missing =>1);
-		$template->param(invalid_cardnumber => 1);
-		$missing=1;
-    }
-  }
-}
-	my @identsloop;
-	for (my $i=0;$i<3;$i++){
-		my %ident;
-#		$ident{'main'}=$main;
-#		$ident{'image'}=$image;
-		$ident{'cardchild'}=$data{"cardnumber_child_$i"};
-		if ($data{"cardnumber_child_$i"} ne ''){
-			my $name=$data{"firstname_child_$i"} . " " . $data{"surname_child_$i"};
-			$ident{'name'}=$name;
-			$ident{'bornum'}=$data{"bornumber_child_$i"};
-			$ident{'dob'}=$data{"dateofbirth_child_$i"};
-			($data{"sex_child_$i"} eq 'M') ? ($ident{'sex'}="Male") : ($ident{'sex'}="Female") ;
-			$ident{'school'}=$data{"school_child_$i"};
-			$ident{'notes'}=$data{"altnotes_child_$i"};
-			push(@identsloop, \%ident);
-		}
-	}
-	my @inputsloop;
-	while (my ($key, $value) = each %data) {
-		$value=~ s/\"/%22/g;
-		my %line;
-		$line{'key'}=$key;
-		$line{'value'}=$value;
-		push(@inputsloop, \%line);
-	}
-
-# FIXME IF main and image are not fetched by HTML::TEMPLATE get them into identsloop
-$template->param(NOK => ($missing==1),
-		identsloop => \@identsloop,
-		inputsloop => \@inputsloop,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/members/newmember.pl
===================================================================
RCS file: cgi-bin/members/newmember.pl
diff -N cgi-bin/members/newmember.pl
--- cgi-bin/members/newmember.pl	10 Mar 2007 01:19:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,213 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: newmember.pl,v 1.1.2.1 2007/03/10 01:19:30 tgarip1957 Exp $
-
-#script to print confirmation screen, then if accepted calls itself to insert data
-# FIXME - Yes, but what does it _do_?
-# 2002/12/18 hdl at ifrance.com templating
-
-# 2003/01/20 acli at ada.dhs.org XXX it seems to do the following:
-# * "insert" seems to do nothing; in 1.2.2 the script just returns a blank
-#   page (with the headers etc.) if "insert" has anything in it
-# * $ok has the opposite meaning of what one expects; $ok == 1 means "not ok"
-# * if ($ok == 0) considers the "ok" case; it displays a confirmation page
-#   for the user to "click to confirm that everything is entered correctly"
-# * The "else" case for ($ok == 0) handles the "not ok" case; $string is the
-#   error message to display
-
-# FIXME - What is the correct value of "flagsrequired"?
-
-# 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::Auth;
-use C4::Input;
-use C4::Interface::CGI::Output;
-use CGI;
-use Date::Manip;
-use C4::Date;
-use C4::Members;
-my %env;
-my $input = new CGI;
-
-#get rest of data
-my %data;
-my @names=$input->param;
-foreach my $key (@names){
-  $data{$key}=$input->param($key);
-}
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "members/newmember.tmpl",
-			     query => $input,
-                             type => "intranet",
-                             authnotrequired => 0,
-                             flagsrequired => {parameters => 1},
-                         });
-
-#Get the database handle
-my $dbh = C4::Context->dbh;
-
-# Check that all compulsary fields are entered
-# If everything is ok, set $ok = 0
-# Otherwise set $ok = 1 and $string to the error message to display.
-
-my $ok=0;
-my $string = "The following compulsary fields have been left blank. "
-	. "Please push the back button and try again<p>";
-my @errors;
-if ($data{'cardnumber'} eq ''){
-	push @errors,"cardnumber";
-    $ok=1;
-} else {
-    #check cardnumber is valid
-    my $nounique;
-    if ( $data{'type'} eq "Add" )    {
-	$nounique = 0;
-    } else {
-	$nounique = 1;
-    }
-    my $valid=checkdigit(\%env,$data{'cardnumber'}, $nounique);
-    if ($valid != 1){
-        $ok=1;
-    	push @errors, "invalid_cardnumber";
-    }
-}
-if ($data{'sex'} eq ''){
-    push @errors, "gender";
-    $ok=1;
-}
-if ($data{'firstname'} eq ''){
-    push @errors,"firstname";
-    $ok=1;
-}
-if ($data{'surname'} eq ''){
-    push @errors,"surname";
-    $ok=1;
-}
-if ($data{'address'} eq ''){
-    push @errors, "address";
-    $ok=1;
-}
-if ($data{'city'} eq ''){
-    push @errors, "city";
-    $ok=1;
-}
-
-# Pass the ok/not ok status and the error message to the template
-$template->param(	OK=> ($ok==0));
-foreach my $error (@errors) {
-	$template->param( $error => 1);
-}
-
-# If things are ok, display the confirmation page
-if ($ok == 0) {
-    my $name=$data{'title'}." ";
-    if ($data{'othernames'} ne ''){
-	$name.=$data{'othernames'}." ";
-    } else {
-	$name.=$data{'firstname'}." ";
-    }
-    $name.="$data{'surname'} ( $data{'firstname'}, $data{'initials'})";
-    my $sex;
-    if ($data{'sex'} eq 'M'){
-	$sex=1;
-    } else {
-	$sex=0;
-    }
-    if ($data{'joining'} eq ''){
-	$data{'joining'}=ParseDate('today');
-	$data{'joining'}=format_date($data{'joining'});
-    }
-    if ($data{'expiry'} eq ''){
-    	my $get_enrolmentperiod = $dbh->prepare(q{SELECT enrolmentperiod FROM categories WHERE categorycode = ?});
-	$get_enrolmentperiod->execute($data{'categorycode'});
-	my ( $period ) = $get_enrolmentperiod->fetchrow;
-	if ( ($period)  && ($period != 1))
-	{
-		$data{'expiry'}=ParseDate("in $period years");
-		$data{'expiry'}=format_date($data{'expiry'});
-	}
-	else
-	{
-		$data{'expiry'}=ParseDate('in 1 year');
-		$data{'expiry'}=format_date($data{'expiry'});
-	}
-    }
-    my $ethnic=$data{'ethnicity'}." ".$data{'ethnicnotes'};
-    my $postal=$data{'address'}."<br>".$data{'city'};
-    my $home;
-    if ($data{'streetaddress'} ne ''){
-	$home=$data{'streetaddress'}."<br>".$data{'streetcity'};
-    } else {
-	$home=$postal;
-    }
-    my @inputsloop;
-    while (my ($key, $value) = each %data) {
-	$value=~ s/\"/%22/g;
-	my %line;
-	$line{'key'}=$key;
-	$line{'value'}=$value;
-	push(@inputsloop, \%line);
-    }
-
-    #Get the fee
-    my $sth = $dbh->prepare("SELECT enrolmentfee FROM categories WHERE categorycode = ?");
-    $sth->execute($data{'categorycode'});
-    my ($fee) = $sth->fetchrow;
-    $sth->finish;
-
-    $template->param(name => $name,
-		     bornum => $data{'borrowernumber'},
-		     cardnum => $data{'cardnumber'},
-		     memcat => $data{'categorycode'},
-		     fee => $fee,
-		     joindate => format_date($data{'joining'}),
-		     expdate => format_date($data{'expiry'}),
-		     branchcode => $data{'branchcode'},
-		     ethnic => $ethnic,
-		     dob => format_date($data{'dateofbirth'}),
-		     sex => $sex,
-		     postal => $postal,
-		     home => $home,
-			zipcode => $data{'zipcode'},
-			homezipcode => $data{'homezipcode'},
-		     phone => $data{'phone'},
-		     phoneday => $data{'phoneday'},
-		     faxnumber => $data{'faxnumber'},
-		     emailaddress => $data{'emailaddress'},
-			textmessaging => $data{'textmessaging'},
-		     contactname => $data{'contactname'},
-		     altphone => $data{'altphone'},
-		     altrelationship => $data{'altrelationship'},
-		     altnotes => $data{'altnotes'},
-		     bornotes => $data{'borrowernotes'},
-		     inputsloop => \@inputsloop);
-
-# If things are not ok, display the error message
-} else {
-    # Nothing to do; the "OK" and "string" variables have already been set
-    ;
-}
-$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $input, $cookie, $template->output;
-
-

Index: cgi-bin/members/pay.pl
===================================================================
RCS file: cgi-bin/members/pay.pl
diff -N cgi-bin/members/pay.pl
--- cgi-bin/members/pay.pl	10 Mar 2007 01:19:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,163 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: pay.pl,v 1.1.2.1 2007/03/10 01:19:30 tgarip1957 Exp $
-
-# written 11/1/2000 by chris at katipo.oc.nz
-# part of the koha library system, script to facilitate paying off fines
-
-
-# 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::Auth;
-use C4::Interface::CGI::Output;
-use CGI;
-use C4::Search;
-use C4::Accounts2;
-use C4::Stats;
-use C4::Members;
-
-my $input=new CGI;
-my ($template, $loggedinuser, $cookie)
-		= get_template_and_user ({ template_name => "members/pay.tmpl",
-					   query => $input,
-					   type => "intranet",
-					   authnotrequired => 0,
-					   flagsrequired => {borrowers => 1},
-					   debug => 1,
-					 });
-
-my $bornum=$input->param('bornum');
-if ($bornum eq ''){
-	$bornum=$input->param('bornum0');
-}
-#get borrower details
-my $data=borrdata('',$bornum);
-my $user=C4::Context->preference('defaultBranch');
-my $me=borrdata('',$loggedinuser);
-my $accountant=$me->{'firstname'}.' '.$me->{'surname'};
-#get account details
-my %bor;
-$bor{'borrowernumber'}=$bornum;
-
-my @names=$input->param;
-my %inp;
-my $check=0;
-my $type;
-my $totalamount;
-my $totaldesc;
-my $totalaccounttype;
-
-for (my $i=0;$i<@names;$i++){
-	my$temp=$input->param($names[$i]);
-	if ($temp eq 'wo'){
-		$type="W";
-		$check=2;
-	}
-if ($temp eq 'yes'){
-		$type="Pay";
-		$check=2;
-	}
-	if ($temp eq 'yes' || $temp eq 'wo'){
-		
-		my $desc=$input->param($names[$i+7]);
-		my $accounttype=$input->param($names[$i+2]);
-		my $amount=$input->param($names[$i+4]);
-		my $bornum=$input->param($names[$i+5]);
-		my $accountno=$input->param($names[$i+6]);
-		my $amounttopay=$input->param($names[$i+8]);
-
-		makepayment($bornum,$accountno,$amounttopay,$accountant, $type);
-		$totalamount=$totalamount+$amounttopay;
-		$totaldesc .="<br> ".$desc."-  Fee:".$amounttopay;
-		$totalaccounttype .="<br> ".$accounttype;
-		$check=2;
-	}
-}
-if ($type eq "Pay" || $type eq "W"){
-print $input->redirect("/cgi-bin/koha/members/payprint.pl?bornum=$bornum&accounttype=$totalaccounttype&amount=$totalamount&desc=$totaldesc");
-}
-my %env;
-   
-
-$env{'branchcode'}=C4::Context->preference('defaultBranch');
-my $total=$input->param('total');
-if ($check ==0){
-	
-	if ($total ne ''){
-		recordpayment(\%env,$bornum,$total);
-	}
-	my ($numaccts,$accts,$total)=getboracctrecord('',\%bor);
-
-	my @loop_pay;
-	for (my $i=0;$i<$numaccts;$i++){
-		if ($accts->[$i]{'amountoutstanding'} > 0){
-			$accts->[$i]{'amount'}+=0.00;
-			$accts->[$i]{'amountoutstanding'}+=0.00;
-			my %line;
-			$line{i}=$i;
-			$line{itemnumber} = $accts->[$i]{'itemnumber'};
-			$line{accounttype} = $accts->[$i]{'accounttype'};
-			$line{amount} = sprintf("%.2f",$accts->[$i]{'amount'});
-			$line{amountoutstanding} = sprintf("%.2f",$accts->[$i]{'amountoutstanding'});
-			$line{bornum} = $bornum;
-			$line{accountno} = $accts->[$i]{'accountno'};
-			$line{description} = $accts->[$i]{'description'};
-			$line{title} = $accts->[$i]{'title'};
-			push(@loop_pay, \%line);
-		}
-	}
-	$template->param(firstname => $data->{'firstname'},
-							surname => $data->{'surname'},
-							bornum => $bornum,
-							loop_pay => \@loop_pay,
-							total => sprintf("%.2f",$total),
-							totalamountopay => sprintf("%.2f",$total));
-output_html_with_http_headers $input, $cookie, $template->output;
-
-} else {
-	my%inp;
-	my @name=$input->param;
-	for (my $i=0;$i<@name;$i++){
-		my $test=$input->param($name[$i]);
-		if ($test eq 'wo'){
-		my $temp=$name[$i];
-		$temp=~ s/payfine//;
-		$inp{$name[$i]}=$temp;
-		}
-	}
-	my $bornum;
-	while ( my ($key, $value) = each %inp){
-		#  print $key,$value;
-		my $accounttype=$input->param("accounttype$value");
-		$bornum=$input->param("bornum$value");
-		my $itemno=$input->param("itemnumber$value");
-		my $amount=$input->param("amount$value");
-		
-	}
-	$bornum=$input->param('bornum');
-	print $input->redirect("/cgi-bin/koha/members/pay.pl?bornum=$bornum");
-}
-
-
-
-
-# Local Variables:
-# tab-width: 4
-# End:

Index: cgi-bin/members/payprint.pl
===================================================================
RCS file: cgi-bin/members/payprint.pl
diff -N cgi-bin/members/payprint.pl
--- cgi-bin/members/payprint.pl	10 Mar 2007 01:19:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,85 +0,0 @@
-#!/usr/bin/perl
-# WARNING: Not enough context to figure out the correct tabstop size
-# WARNING: Assume that this file uses 4-character tabs
-
-# $Id: payprint.pl,v 1.1.2.1 2007/03/10 01:19:30 tgarip1957 Exp $
-
-#written 11/1/2000 by chris at katipo.oc.nz
-#part of the koha library system, script to facilitate paying off fines
-
-
-# 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::Auth;
-use C4::Interface::CGI::Output;
-use CGI;
-use C4::Search;
-use C4::Date;
-use C4::Members;
-my $input=new CGI;
-
-#print $input->header;
-my $bornum=$input->param('bornum');
-
-#get borrower details
-my $data=borrdata('',$bornum);
-#my $user=C4::Context->preference('defaultbranch');
-my $amount=$input->param('amount');
-my $accounttype=$input->param('accounttype');
-my $desc=$input->param('desc');
-
-if ($accounttype eq "FU"){
-$accounttype="Overdue item";
-}elsif ($accounttype eq "L"){
-$accounttype="Very Overdue or Lost item";
-}else{
-$accounttype="Miscelenaous Fees";
-}
-	my($template, $loggedinuser, $cookie)
-		= get_template_and_user ({ template_name => "members/payprint.tmpl",
-					   query => $input,
-					   type => "intranet",
-					   authnotrequired => 0,
-					   flagsrequired => {borrowers => 1},
-					   debug => 1,
-					 });
-	my $user=borrdata('',$loggedinuser);
-my @datearr = localtime(time());
-my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
-	$template->param(firstname => $data->{'firstname'}, date=>format_date($todaysdate),
-							surname => $data->{'surname'},
-							cardnumber => $data->{'cardnumber'},
-							street => $data->{'street'},
-							city => $data->{'city'},
-							phone => $data->{'phone'},
-							email => $data->{'email'},
-							amount=> $amount,
-							desc=> $desc,
-							accounttype=> $accounttype,
-							bornum=>$bornum,
-							loggeduser=>$user->{'firstname'}.' '.$user->{'surname'},
-							);
-	output_html_with_http_headers $input, $cookie, $template->output;
-
-
-
-# Local Variables:
-# tab-width: 4
-# End:

Index: cgi-bin/members/readingrec.pl
===================================================================
RCS file: cgi-bin/members/readingrec.pl
diff -N cgi-bin/members/readingrec.pl
--- cgi-bin/members/readingrec.pl	10 Mar 2007 01:19:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,89 +0,0 @@
-#!/usr/bin/perl
-
-# written 27/01/2000
-# script to display borrowers reading record
-
-# 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::Auth;
-use C4::Interface::CGI::Output;
-use CGI;
-use C4::Search;
-use C4::Date;
-use C4::Members;
-my $input=new CGI;
-
-
-my $bornum=$input->param('bornum');
-#get borrower details
-my $data=borrdata('',$bornum);
-my $order=$input->param('order');
-my $order2=$order;
-if ($order2 eq ''){
-  $order2="date_due desc";
-}
-my $limit=$input->param('limit');
-if ($limit eq 'full' || $limit eq 0){
-  $limit=0;
-} else {
-  $limit=50;
-}
-my ($count,$issues)=allissues($bornum,$order2,$limit);
-
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "members/readingrec.tmpl",
-				query => $input,
-				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {borrowers => 1},
-				debug => 1,
-				});
-
-my @loop_reading;
-
-for (my $i=0;$i<$count;$i++){
- 	my %line;
-	if($i%2){
-		$line{'toggle'} = 1;
-	}
-	$line{biblionumber}=$issues->[$i]->{'biblionumber'};
-	$line{title}=$issues->[$i]->{'title'};
-	$line{author}=$issues->[$i]->{'author'};
-	$line{classification} = $issues->[$i]->{'classification'};
-	$line{date_due}=format_date($issues->[$i]->{'date_due'});
-	$line{returndate}=format_date($issues->[$i]->{'returndate'});
-	$line{volumeddesc}=$issues->[$i]->{'volumeddesc'};
-	push(@loop_reading,\%line);
-}
-
-$template->param(
-						biblionumber => $data->{'biblionumber'},
-						title => $data->{'title'},
-						initials => $data->{'initials'},
-						surname => $data->{'surname'},
-						bornum => $bornum,
-						limit => $limit,
-						firstname => $data->{'firstname'},
-						cardnumber => $data->{'cardnumber'},
-						showfulllink => ($count > 50),					
-						loop_reading => \@loop_reading);
-output_html_with_http_headers $input, $cookie, $template->output;
-
-
-

Index: cgi-bin/members/setdebar.pl
===================================================================
RCS file: cgi-bin/members/setdebar.pl
diff -N cgi-bin/members/setdebar.pl
--- cgi-bin/members/setdebar.pl	10 Mar 2007 01:19:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,53 +0,0 @@
-#!/usr/bin/perl
-
-#script to set or lift debarred status
-#written 2/8/04
-#by oleonard at athenscounty.lib.oh.us
-
-
-# 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 CGI;
-use C4::Context;
-use C4::Auth;
-use C4::Members;
-
-my $input = new CGI;
-
-my $flagsrequired;
-$flagsrequired->{borrower}=1;
-my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired);
-
-my $destination = $input->param("destination");
-my $cardnumber = $input->param("cardnumber");
-my $borrowernumber=$input->param('borrowernumber');
-my $status = $input->param('status');
-
-my $dbh = C4::Context->dbh;
-my $sth=$dbh->prepare("Update borrowers set debarred = ? where borrowernumber = ?");
-$sth->execute($status,$borrowernumber);
-my $data=$sth->fetchrow_hashref;
-$sth->finish;
-
-if($destination eq "circ"){
-	print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber");
-} else {
-	print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
-}

Index: cgi-bin/reserve/modrequest.pl
===================================================================
RCS file: cgi-bin/reserve/modrequest.pl
diff -N cgi-bin/reserve/modrequest.pl
--- cgi-bin/reserve/modrequest.pl	10 Mar 2007 01:20:35 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,50 +0,0 @@
-#!/usr/bin/perl
-
-#script to modify reserves/requests
-#written 2/1/00 by chris at katipo.oc.nz
-#last update 27/1/2000 by chris at katipo.co.nz
-
-
-# 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::Search;
-use CGI;
-use C4::Output;
-use C4::Reserves2;
-use C4::Members;
-my $input = new CGI;
-
-my @rank=$input->param('rank-request');
-my @biblionumber=$input->param('biblionumber');
-my @borrower=$input->param('borrowernumber');
-my @branch=$input->param('pickup');
-my $count=@rank;
-my $cataloger=$input->param('loggedinuser');
-# goes through and manually changes the reserves record....
-# no attempt is made to check consistency.
-for (my $i=0;$i<$count;$i++){
-    UpdateReserves($rank[$i],$biblionumber[$i],$borrower[$i],$branch[$i],$cataloger); #from C4::Reserves2
-}
-
-my $from=$input->param('from');
-if ($from eq 'borrower'){
-  print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrower[0]");
- } else {
-   print $input->redirect("/cgi-bin/koha/reserve/request.pl?biblionumber=$biblionumber[0]");
-}

Index: cgi-bin/reserve/placerequest.pl
===================================================================
RCS file: cgi-bin/reserve/placerequest.pl
diff -N cgi-bin/reserve/placerequest.pl
--- cgi-bin/reserve/placerequest.pl	10 Mar 2007 01:20:35 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@
-#!/usr/bin/perl
-
-#script to place reserves/requests
-#writen 2/1/00 by chris at katipo.oc.nz
-
-
-# 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::Search;
-use CGI;
-use C4::Output;
-use C4::Reserves2;
-use C4::Members;
-my $input = new CGI;
-my $itemnumber=$input->param('itemnumber');
-my @bibitems=$input->param('biblioitem');
-my @reqbib=$input->param('reqbib');
-my $biblionumber=$input->param('biblionumber');
-my $borrower=$input->param('member');
-my $notes=$input->param('notes');
-my $branch=$input->param('pickup');
-my @rank=$input->param('rank-request');
-my $type=$input->param('type');
-my $title=$input->param('title');
-my $bornum=borrdata($borrower,'');
-my $cataloger=$input->param('loggedinuser');
-
-if ($type eq 'str8' && $bornum ne ''){
-    my $count=@bibitems;
-    @bibitems=sort @bibitems;
-    my $i2=1;
-    my @realbi;
-    $realbi[0]=$bibitems[0];
-for (my $i=1;$i<$count;$i++){
-    my $i3=$i2-1;
-    if ($realbi[$i3] ne $bibitems[$i]){
-	$realbi[$i2]=$bibitems[$i];
-	$i2++;
-    }
-}
-
-my $env;
-
-my $const;
-
-
-for (my $i=0; $i<@reqbib; $i++){
-if ($reqbib[$i] ne ''){
-  $const='o';
-  CreateReserve(\$env,$bornum->{'borrowernumber'},$cataloger,$biblionumber,'','',$branch,$const,$rank[0],$notes,$title,"",$reqbib[$i]);
-}
-}
-
-print $input->redirect("request.pl?biblionumber=$biblionumber");
-} elsif ($bornum eq ''){
-  print $input->header();
-  print "Invalid card number please try again";
-  print $input->Dump;
-}

Index: cgi-bin/reserve/request.pl
===================================================================
RCS file: cgi-bin/reserve/request.pl
diff -N cgi-bin/reserve/request.pl
--- cgi-bin/reserve/request.pl	10 Mar 2007 01:20:35 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,203 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: request.pl,v 1.1.2.1 2007/03/10 01:20:35 tgarip1957 Exp $
-
-#script to place reserves/requests
-#writen 2/1/00 by chris at katipo.oc.nz
-
-
-# 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::Search;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Auth;
-use C4::Reserves2;
-use C4::Biblio;
-use C4::Koha;
-use C4::Circulation::Circ2;
-use C4::Acquisition;
-use CGI;
-use C4::Date;
-
-my $input = new CGI;
-my $dbh=C4::Context->dbh;
-# get biblio information....
-my $biblionumber = $input->param('biblionumber');
-my ($record) = XMLgetbiblio($dbh,$biblionumber);
-$record=XML_xml2hash_onerecord($record);
-my $dat=XMLmarc2koha_onerecord($dbh,$record,"biblios");
-# get existing reserves .....
-my ($count,$reserves) = FindReserves($biblionumber);
-my $totalcount = $count;
-foreach my $res (@$reserves) {
-    if ($res->{'found'} eq 'W') {
-	$count--;
-    }
-}
-
-# make priorities options
-my $num = $count + 1;
-
-#priorityoptions building
-my @optionloop;
-for (my $i=1; $i<=$num; $i++){
-	my %option;
-	$option{num}=$i;
-	$option{selected}=($i==$num);
-	push(@optionloop, \%option);
-}
-
-# todays date
-
-my $date=format_date(get_today());
-my $time=localtime(time);
-my @bibitemloop;
-
-	my %abibitem;
-	my @barcodeloop;
-    my @barcodes = barcodes($biblionumber);
-#warn @barcodes;
-    foreach my $num (@barcodes) {
-		my %barcode;
-		$barcode{'date_due'}=$num->{'date_due'} if $num->{'date_due'} gt "0000-00-00" ;
-		$barcode{'barcode'}=$num->{'barcode'};
-		$barcode{'itemnumber'}=$num->{'itemnumber'};
-		$barcode{'message'}=$num->{'itemlost'} == 1 ? "(lost)" :
-	  	$num->{'itemlost'} == 2 ? "(long overdue)" : "";
-		$barcode{'class'}=$num->{'itemcallnumber'};
-		$abibitem{'itemlost'}=(($num->{'notforloan'})|| ($num->{'itemlost'} == 1)) ;
-		$abibitem{'itemlost'}=($num->{'wthdrawn'}) ;
-		push(@barcodeloop, \%barcode);
-    }
-#	
-    	$abibitem{'class'}="$dat->{'classification'}$dat->{'dewey'}$dat->{'subclass'}";
-	$abibitem{'biblionumber'}=$dat->{'biblionumber'};
-	$abibitem{'description'}=$dat->{'itemtype'};
-	$abibitem{'volumeddesc'}=$dat->{'volumeddesc'};
-	$abibitem{'publicationyear'}=$dat->{'publicationyear'};
-
-	$abibitem{'barcodeloop'}=\@barcodeloop;
-	push(@bibitemloop,\%abibitem);
-
-
-
-
-#existingreserves building
-my @reserveloop;
-my $branches = GetBranches();
-
-foreach my $res (sort {$a->{'found'} cmp $b->{'found'}} @$reserves){
-	my %reserve;
-if ($res->{'priority'}>$totalcount){$totalcount=$res->{'priority'};}
-#    my $prioropt = priorityoptions($totalcount, $res->{'priority'});
-	my @optionloop;
-	for (my $i=1; $i<=$totalcount; $i++){
-		my %option;
-		$option{num}=$i;
-		$option{selected}=($i==$res->{'priority'});
-		push(@optionloop, \%option);
-	}
-	my @branchloop;
-
-	foreach my $br (keys %$branches) {
-
-
-
-		(next) unless $branches->{$br}->{'IS'};
-
-				# Only branches with the 'IS' branchrelation
-				# can issue books
-		my %abranch;
-		$abranch{'selected'}=($br eq $res->{'branchcode'});
-		$abranch{'branch'}=$br;
-		$abranch{'branchname'}=$branches->{$br}->{'branchname'};
-		push(@branchloop,\%abranch);
-	}
-my %env;
-#		my $item = $res->{'itemnumber'};
-#		$item = getiteminformation(\%env,$item);
-
-    if ($res->{'found'} eq 'W') {
-		
-		$reserve{'holdingbranch'}=$res->{'holdingbranch'};
-		$reserve{'barcode'}=$res->{'barcode'};
-		$reserve{'biblionumber'}=$res->{'biblionumber'};
-		$reserve{'wbrcode'} = $res->{'branchcode'};
-		$reserve{'wbrname'} = $branches->{$res->{'branchcode'}}->{'branchname'};
-		if($reserve{'holdingbranch'} eq $reserve{'wbrcode'}){
-			$reserve{'atdestination'} = 1;
-		}
-    }
-	$reserve{'barcode'}=$res->{'barcode'};
-  	$reserve{'date'} = format_date($res->{'reservedate'});
-	$reserve{'borrowernumber'}=$res->{'borrowernumber'};
-	$reserve{'biblionumber'}=$res->{'biblionumber'};
-	$reserve{'bornum'}=$res->{'borrowernumber'};
-	$reserve{'firstname'}=$res->{'firstname'};
-	$reserve{'surname'}=$res->{'surname'};
-	$reserve{'bornum'}=$res->{'borrowernumber'};
-	$reserve{'notes'}=$res->{'reservenotes'};
-	$reserve{'wait'}=($res->{'found'} eq 'W');
-	$reserve{'constrainttypea'}=($res->{'constrainttype'} eq 'a');
-	$reserve{'constrainttypeo'}=($res->{'constrainttype'} eq 'o');
-	$reserve{'voldesc'}=$res->{'volumeddesc'};
-	$reserve{'itemtype'}=$res->{'ctype'};
-	$reserve{'branchloop'}=\@branchloop;
-	$reserve{'optionloop'}=\@optionloop;
-	push(@reserveloop,\%reserve);
-}
-
-my @branches;
-my @select_branch;
-my %select_branches;
-my $branches=GetBranches;
-#my $count2=scalar(@branches);
-foreach my $br (keys %$branches) {
-
-	push @select_branch, $br;
-	$select_branches{$br}= $branches->{$br}->{'branchname'};
-}
-my $CGIbranch=CGI::scrolling_list( -name     => 'pickup',
-			-values   => \@select_branch,
-			-labels   => \%select_branches,
-			-size     => 1,
-			-multiple => 0 );
-
-#get the time for the form name...
-my $time = time();
-
-#setup colours
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "reserve/request.tmpl",
-							query => $input,
-                            type => "intranet",
-                            authnotrequired => 0,
-                            flagsrequired => {borrowers => 1},
-                         });
-$template->param(	optionloop =>\@optionloop,
-								CGIbranch => $CGIbranch,
-								reserveloop => \@reserveloop,
-								'time' => $time,
-								bibitemloop => \@bibitemloop,
-								date => $date,
-								biblionumber => $biblionumber,
-								title =>$dat->{title});
-# printout the page
-output_html_with_http_headers $input, $cookie, $template->output;
\ No newline at end of file

Index: cgi-bin/reviews/reviewswaiting.pl
===================================================================
RCS file: cgi-bin/reviews/reviewswaiting.pl
diff -N cgi-bin/reviews/reviewswaiting.pl
--- cgi-bin/reviews/reviewswaiting.pl	10 Mar 2007 01:25:18 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Context;
-use C4::Review;
-
-my $query = new CGI;
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "reviews/reviewswaiting.tmpl",
-        query           => $query,
-        type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { catalogue => 1 },
-        debug           => 1,
-    }
-);
-
-my $op       = $query->param('op');
-my $reviewid = $query->param('reviewid');
-
-if ( $op eq 'approve' ) {
-    approvereview($reviewid);
-}
-elsif ( $op eq 'delete' ) {
-    deletereview($reviewid);
-}
-
-my $reviews = getallreviews(0);
-$template->param( reviews => $reviews );
-
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/serials/acqui-search-result.pl
===================================================================
RCS file: cgi-bin/serials/acqui-search-result.pl
diff -N cgi-bin/serials/acqui-search-result.pl
--- cgi-bin/serials/acqui-search-result.pl	10 Mar 2007 01:27:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,102 +0,0 @@
-#!/usr/bin/perl
-
-#script to show suppliers and orders
-#written by chris at katipo.co.nz 23/2/2000
-
-# 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
-
-# $Id: acqui-search-result.pl,v 1.1.2.1 2007/03/10 01:27:27 tgarip1957 Exp $
-
-=head1 NAME
-
-acqui-search-result.pl
-
-=head1 DESCRIPTION
- TODO
- 
-=head1 PARAMETERS
-
-=over 4
-
-=item supplier
-
-=back
-
-=cut
-
-
-use strict;
-use C4::Auth;
-use C4::Biblio;
-use CGI;
-use C4::Interface::CGI::Output;
-use C4::Acquisition;
-use C4::Date;
-use C4::Bookseller;
-use C4::Acquisition;
-
-my $query=new CGI;
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "serials/acqui-search-result.tmpl",
-                 query => $query,
-                 type => "intranet",
-                 authnotrequired => 0,
-                 flagsrequired => {acquisition => 1},
-                 debug => 1,
-                 });
-
-my $supplier=$query->param('supplier');
-my @suppliers = GetBookSeller($supplier);
-my $count = scalar @suppliers;
-
-#build result page
-my $toggle=0;
-my @loop_suppliers;
-for (my $i=0; $i<$count; $i++) {
-    my $orders = GetPendingOrders($suppliers[$i]->{'id'});
-    my $ordcount = scalar @$orders;
-    
-    my %line;
-    if ($toggle==0){
-        $line{even}=1;
-        $toggle=1;
-    } else {
-        $line{even}=0;
-        $toggle=0;
-    }
-    $line{aqbooksellerid} =$suppliers[$i]->{'id'};
-    $line{name} = $suppliers[$i]->{'name'};
-    $line{active} = $suppliers[$i]->{'active'};
-    my @loop_basket;
-    for (my $i2=0;$i2<$ordcount;$i2++){
-        my %inner_line;
-        $inner_line{basketno} =$orders->[$i2]->{'basketno'};
-        $inner_line{total} =$orders->[$i2]->{'count(*)'};
-        $inner_line{authorisedby} = $orders->[$i2]->{'authorisedby'};
-        $inner_line{creationdate} = format_date($orders->[$i2]->{'creationdate'});
-        $inner_line{closedate} = format_date($orders->[$i2]->{'closedate'});
-        push @loop_basket, \%inner_line;
-    }
-    $line{loop_basket} = \@loop_basket;
-    push @loop_suppliers, \%line;
-}
-$template->param(loop_suppliers => \@loop_suppliers,
-                        supplier => $supplier,
-                        count => $count);
-
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/serials/acqui-search.pl
===================================================================
RCS file: cgi-bin/serials/acqui-search.pl
diff -N cgi-bin/serials/acqui-search.pl
--- cgi-bin/serials/acqui-search.pl	10 Mar 2007 01:27:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,97 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-# $Id: acqui-search.pl,v 1.1.2.1 2007/03/10 01:27:27 tgarip1957 Exp $
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Output;
-use C4::Interface::CGI::Output;
-
-use C4::Bookfund;
-use C4::Acquisition;
-my $query = new CGI;
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "serials/acqui-search.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {acquisition => 1},
-			     debug => 1,
-			     });
-
-
-
-
-# budget
-my $dbh = C4::Context->dbh;
-my $sthtemp = $dbh->prepare("Select flags, branchcode from borrowers where borrowernumber = ?");
-$sthtemp->execute($loggedinuser);
-my ($flags, $homebranch)=$sthtemp->fetchrow;
-my @results=GetBookFunds($homebranch);
-my $count = scalar(@results);
-
-my $classlist='';
-my $total=0;
-my $totspent=0;
-my $totcomtd=0;
-my $totavail=0;
-my @loop_budget = ();
-for (my $i=0;$i<$count;$i++){
-	my ($spent,$comtd)=GetBookFundBreakdown($results[$i]->{'bookfundid'});
-	my $avail=$results[$i]->{'budgetamount'}-($spent+$comtd);
-	my %line;
-	$line{bookfundname} = $results[$i]->{'bookfundname'};
-	$line{budgetamount} = $results[$i]->{'budgetamount'};
-	$line{spent} = sprintf  ("%.2f", $spent);
-	$line{comtd} = sprintf  ("%.2f",$comtd);
-	$line{avail}  = sprintf  ("%.2f",$avail);
-	push @loop_budget, \%line;
-	$total+=$results[$i]->{'budgetamount'};
-	$totspent+=$spent;
-	$totcomtd+=$comtd;
-	$totavail+=$avail;
-}
-#currencies
-my @rates=GetCurrencies();
-my $count = scalar @rates;
-
-my @loop_currency = ();
-for (my $i=0;$i<$count;$i++){
-	my %line;
-	$line{currency} = $rates[$i]->{'currency'};
-	$line{rate} = $rates[$i]->{'rate'};
-	push @loop_currency, \%line;
-}
-$template->param(classlist => $classlist,
-						type => 'intranet',
-						loop_budget => \@loop_budget,
-						loop_currency => \@loop_currency,
-						total => sprintf("%.2f",$total),
-						totspent => sprintf("%.2f",$totspent),
-						totcomtd => sprintf("%.2f",$totcomtd),
-						totavail => sprintf("%.2f",$totavail),
-						intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-						);
-
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/serials/claims.pl
===================================================================
RCS file: cgi-bin/serials/claims.pl
diff -N cgi-bin/serials/claims.pl
--- cgi-bin/serials/claims.pl	10 Mar 2007 01:27:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,83 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Serials;
-use C4::Acquisition;
-
-use C4::Interface::CGI::Output;
-use C4::Context;
-
-
-my $query = new CGI;
-
-my $serialid = $query->param('serialid');
-my $op = $query->param('op');
-my $claimletter = $query->param('claimletter');
-my $supplierid = $query->param('supplierid');
-my %supplierlist = GetSuppliersWithLateIssues;
-my @select_supplier;
-
-foreach my $supplierid (keys %supplierlist){
-        my ($count, @dummy) = GetMissingIssues($supplierid);
-        my $counting = $count;
-        $supplierlist{$supplierid} = $supplierlist{$supplierid}." ($counting)";
-	push @select_supplier, $supplierid
-}
-
-my @select_letter = (1,2,3,4);
-my %letters = (1=>'Claim Form 1',2=>'Claim Form 2',3=>'Claim Form 3',4=>'Claim Form 4');
-my ($count2, @missingissues) = GetMissingIssues($supplierid,$serialid);
-
-my $CGIsupplier=CGI::scrolling_list( -name     => 'supplierid',
-			-values   => \@select_supplier,
-			-default  => $supplierid,
-			-labels   => \%supplierlist,
-			-size     => 1,
-			-multiple => 0 );
-
-my $CGIletter=CGI::scrolling_list( -name     => 'claimletter',
-			-values   => \@select_letter,
-			-default  => $claimletter,
-			-labels   => \%letters,
-			-size     => 1,
-			-multiple => 0 );
-my ($singlesupplier, at supplierinfo);
-if($supplierid){
-   ($singlesupplier, at supplierinfo)=bookseller($supplierid);
-} else { # set up supplierid for the claim links out of main table if all suppliers is chosen
-   for(my $i=0; $i<@missingissues;$i++){
-       $missingissues[$i]->{'supplierid'} = getsupplierbyserialid($missingissues[$i]->{'serialid'});
-   }
-}
-
-
-my $preview=0;
-if($op eq 'preview'){
-    $preview = 1;
-}
-
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/claims.tmpl",
-				query => $query,
-				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {catalogue => 1},
-				debug => 1,
-				});
-
-$template->param(
-	CGIsupplier => $CGIsupplier,
-    	CGIletter => $CGIletter,
-        preview => $preview,
-        missingissues => \@missingissues,
-        supplierid => $supplierid,
-        claimletter => $claimletter,
-        singlesupplier => $singlesupplier,
-        supplierloop => \@supplierinfo,
-	intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-	);
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/serials/distributedto.pl
===================================================================
RCS file: cgi-bin/serials/distributedto.pl
diff -N cgi-bin/serials/distributedto.pl
--- cgi-bin/serials/distributedto.pl	10 Mar 2007 01:27:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,105 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-# $Id: distributedto.pl,v 1.1.2.1 2007/03/10 01:27:27 tgarip1957 Exp $
-
-=head1 NAME
-
-distributedto
-
-=head1 DESCRIPTION
-
-this script is launched as a popup. It allows to choose for who the subscription can be distributed.
-
-=head1 PARAMETERS
-
-=over 4
-
-=item searchfield
-to filter on the members.
-
-=item distributedto
-to know if there are already some members to in the distributed list
-
-=item subscriptionid
-to know what subscription this scrpit have to distribute.
-
-=item SaveList
-
-=back
-
-=cut
-
-
-use strict;
-use CGI;
-use C4::Date;
-use C4::Auth;
-use C4::Context;
-
-use C4::Interface::CGI::Output;
-use C4::Search;
-
-use C4::Serials;
-use C4::Members;
-
-my $input = new CGI;
-my $searchfield=$input->param('searchfield');
-defined $searchfield or $searchfield='';
-my $distributedto=$input->param('distributedto');
-my $subscriptionid = $input->param('subscriptionid');
-$searchfield=~ s/\,//g;
-my $SaveList=$input->param('SaveList');
-my $dbh = C4::Context->dbh;
-
-$distributedto = GetDistributedTo($subscriptionid) unless $distributedto;
-
-SetDistributedto($distributedto,$subscriptionid) if ($SaveList) ;
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "serials/distributedto.tmpl",
-                 query => $input,
-                 type => "intranet",
-                 authnotrequired => 0,
-                 flagsrequired => {cataloguing => 1},
-                 debug => 1,
-                 });
-
-my ($count,$results)=GetBorrowersFromSurname($searchfield) if $searchfield;
-my $toggle="0";
-my @loop_data =();
-for (my $i=0; $i < $count; $i++){
-    if ($i % 2){
-            $toggle=1;
-    } else {
-            $toggle=0;
-    }
-    my %row_data;
-    $row_data{toggle} = $toggle;
-    $row_data{firstname} = $results->[$i]{'firstname'};
-    $row_data{surname} = $results->[$i]{'surname'};
-    push(@loop_data, \%row_data);
-}
-$template->param(borlist => \@loop_data,
-                searchfield => $searchfield,
-                distributedto => $distributedto,
-                SaveList => $SaveList,
-                subscriptionid => $subscriptionid,
-                );
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/serials/lateissues-excel.pl
===================================================================
RCS file: cgi-bin/serials/lateissues-excel.pl
diff -N cgi-bin/serials/lateissues-excel.pl
--- cgi-bin/serials/lateissues-excel.pl	10 Mar 2007 01:27:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,119 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Serials;
-use C4::Acquisition;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Context;
-
-use Text::CSV_XS;
-
-
-
-
-my $csv = Text::CSV_XS->new(
-        {
-            'quote_char'  => '"',
-            'escape_char' => '"',
-            'sep_char'    => ',',
-            'binary'      => 1
-        }
-    );
-
-
-my $query = new CGI;
-my $supplierid = $query->param('supplierid');
-my @serialid = $query->param('serialid');
-my $op = $query->param('op');
-my $serialidcount = @serialid;
-
-my %supplierlist = GetSuppliersWithLateIssues;
-my @select_supplier;
-
-my @loop1;
-my ($count, @lateissues);
-if($op ne 'claims'){
-    ($count, @lateissues) = GetLateIssues($supplierid);
-    for (my $i=0;$i<@lateissues;$i++){
-        my @rows1 = ($lateissues[$i]->{'name'},          # lets build up a row
-            	     $lateissues[$i]->{'title'}, 
-                     $lateissues[$i]->{'serialseq'},
-                     $lateissues[$i]->{'planneddate'},
-                     );
-        push (@loop1, \@rows1);
-    }
-}
-my $totalcount2 = 0;
-my @loop2;
-my ($count2, @missingissues);
-for (my $k=0;$k<@serialid;$k++){
-    ($count2, @missingissues) = GetMissingIssues($supplierid, $serialid[$k]);
-
-    for (my $j=0;$j<@missingissues;$j++){
-	my @rows2 = ($missingissues[$j]->{'name'},          # lets build up a row
-	             $missingissues[$j]->{'title'}, 
-                     $missingissues[$j]->{'serialseq'},
-                     $missingissues[$j]->{'planneddate'},
-                     );
-        push (@loop2, \@rows2);
-    }
-    $totalcount2 = $totalcount2 + $count2;
-    # update claim date to let one know they have looked at this missing item
-    updateClaim($serialid[$k]);
-}
-
-my $heading ='';
-my $filename ='';
-if($supplierid){
-    if($missingissues[0]->{'name'}){ # if exists display supplier name in heading for neatness
-	# not necessarily needed as the name will appear in supplier column also
-        $heading = "FOR $missingissues[0]->{'name'}";
-	$filename = "_$missingissues[0]->{'name'}"; 
-    }
-}
-
-print $query->header(
-        -type       => 'application/vnd.ms-excel',
-        -attachment => "claims".$filename.".csv",
-    );
-
-if($op ne 'claims'){
-    print "LATE ISSUES ".$heading."\n\n";
-    print "SUPPLIER,TITLE,ISSUE NUMBER,LATE SINCE\n";
-
-    for my $row ( @loop1 ) {
-    
-        $csv->combine(@$row);
-        my $string = $csv->string;
-        print $string, "\n";
-    }
-
-    print ",,,,,,,\n\n";
-}
-if($serialidcount == 1){
-    print "MISSING ISSUE ".$heading."\n\n";
-} else {
-    print "MISSING ISSUES ".$heading."\n\n";
-}
-print "SUPPLIER,TITLE,ISSUE NUMBER,LATE SINCE\n";
-
-for my $row ( @loop2 ) {
-    
-        $csv->combine(@$row);
-        my $string = $csv->string;
-        print $string, "\n";
-    }
-
-print ",,,,,,,\n";
-print ",,,,,,,\n";
-if($op ne 'claims'){
-    print ",,Total Number Late, $count\n";
-}
-if($serialidcount == 1){
-
-} else {
-    print ",,Total Number Missing, $totalcount2\n";
-}

Index: cgi-bin/serials/lateissues.pl
===================================================================
RCS file: cgi-bin/serials/lateissues.pl
diff -N cgi-bin/serials/lateissues.pl
--- cgi-bin/serials/lateissues.pl	10 Mar 2007 01:27:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,90 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-# $Id: lateissues.pl,v 1.1.2.1 2007/03/10 01:27:27 tgarip1957 Exp $
-
-=head1 NAME
-
-lateissues
-
-=head1 DESCRIPTION
-
-this script display late issue by types.
-
-=head1 PARAMETERS
-
-=over 4
-
-=item supplierid
-the id of the supplier this script has to search late issues.
-
-=back
-
-=cut
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Serials;
-use C4::Acquisition;
-use C4::Interface::CGI::Output;
-use C4::Context;
-use C4::Bookseller;
-
-my $query = new CGI;
-# my $title = $query->param('title');
-# my $ISSN = $query->param('ISSN');
-# my @subscriptions = GetSubscriptions($title,$ISSN);
-
-my $supplierid = $query->param('supplierid');
-my %supplierlist = GetSuppliersWithLateIssues;
-my @select_supplier;
-push @select_supplier,"";
-foreach my $supplier (keys %supplierlist){
-    push @select_supplier, $supplier
-}
-my $CGIsupplier=CGI::scrolling_list(
-            -name     => 'supplierid',
-            -values   => \@select_supplier,
-            -default  => $supplierid,
-            -labels   => \%supplierlist,
-            -size     => 1,
-            -multiple => 0 );
-
-my ($count, at lateissues);
-($count, at lateissues) = GetLateIssues($supplierid) ;
-my @supplierinfo=GetBookSeller($supplierid) if $supplierid;
-
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/lateissues.tmpl",
-                query => $query,
-                type => "intranet",
-                authnotrequired => 0,
-                flagsrequired => {catalogue => 1},
-                debug => 1,
-                });
-
-$template->param(
-    CGIsupplier => $CGIsupplier,
-    lateissues => \@lateissues,
-    phone => $supplierinfo[0]->{phone},
-    booksellerfax => $supplierinfo[0]->{booksellerfax},
-    bookselleremail => $supplierinfo[0]->{bookselleremail},
-    );
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/serials/member-search.pl
===================================================================
RCS file: cgi-bin/serials/member-search.pl
diff -N cgi-bin/serials/member-search.pl
--- cgi-bin/serials/member-search.pl	10 Mar 2007 01:27:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-#!/usr/bin/perl
-
-# Member Search.pl script used to search for members to add to a routing list
-use strict;
-use CGI;
-use C4::Koha;
-use C4::Auth;
-use C4::Date;
-use C4::Acquisition;
-use C4::Interface::CGI::Output;
-use C4::Context;
-use C4::Search;
-use C4::Serials;
-
-my $query = new CGI;
-my $subscriptionid = $query->param('subscriptionid');
-my $op = $query->param('op');
-my $searchstring = $query->param('member');
-my $dbh = C4::Context->dbh;
-
-my $env;    
-    
-    my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/member-search.tmpl",
-				query => $query,
-				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {catalogue => 1},
-				debug => 1,
-				});
-
-
-if($searchstring){
-    my ($count, $members) = &BornameSearch($env, $searchstring, "surname", "advanced");
-    
-    $template->param(
-	subscriptionid => $subscriptionid,
- 	    memberloop => $members,
-	        member => $searchstring,
-    );
-} else {
-    $template->param(
-	subscriptionid => $subscriptionid,
-    );
-}
-        output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/serials/printlist.pl
===================================================================
RCS file: cgi-bin/serials/printlist.pl
diff -N cgi-bin/serials/printlist.pl
--- cgi-bin/serials/printlist.pl	10 Mar 2007 01:27:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,83 +0,0 @@
-#!/usr/bin/perl
-# NOTE: Use standard 8-space tabs for this file (indents are 4 spaces)
-
-# 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
-# 
-# $Id: printlist.pl,v 1.1.2.1 2007/03/10 01:27:27 tgarip1957 Exp $
-
-=head1 NAME
-
-printlist.pl
-
-=head1 DESCRIPTION
-
-this script print the list of members who have reserved the subscription given on input arg.
-
-=head1 PARAMETERS
-
-=over 4
-
-=item serialseq
-
-=item subscriptionid
-
-=back
-
-=cut
-
-
-use strict;
-require Exporter;
-use C4::Context;
-use CGI;
-use C4::Auth;
-use C4::Serials;
-use C4::Interface::CGI::Output;
-use C4::Koha;
-
-my $query=new CGI;
-
-my $serialseq=$query->param('serialseq');
-my $subscriptionid=$query->param('subscriptionid');
-my $subscription = GetSubscription($subscriptionid);
-$subscription->{'distributedto'} =~ s/\n/<br\/>/g;
-
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/printlist.tmpl",
-                query => $query,
-                type => "intranet",
-                authnotrequired => 0,
-                flagsrequired => {catalogue => 1},
-                debug => 1,
-                });
-$template->param(serialseq => $serialseq,
-                title => $subscription->{bibliotitle},
-                branchname => getbranchdetail(C4::Context->userenv->{'branch'})->{branchname},
-                branchaddress1 => getbranchdetail(C4::Context->userenv->{'branch'})->{address1},
-                branchaddress2 => getbranchdetail(C4::Context->userenv->{'branch'})->{address2},
-                branchaddress3 => getbranchdetail(C4::Context->userenv->{'branch'})->{address3},
-                branchphone => getbranchdetail(C4::Context->userenv->{'branch'})->{branchphone},
-                branchemail => getbranchdetail(C4::Context->userenv->{'branch'})->{branchemail},
-                distributedto => $subscription->{'distributedto'},
-                );
-output_html_with_http_headers $query, $cookie, $template->output;
-
-
-# Local Variables:
-# tab-width: 8
-# End:

Index: cgi-bin/serials/reorder_members.pl
===================================================================
RCS file: cgi-bin/serials/reorder_members.pl
diff -N cgi-bin/serials/reorder_members.pl
--- cgi-bin/serials/reorder_members.pl	10 Mar 2007 01:27:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-#!/usr/bin/perl
-
-# Routing.pl script used to create a routing list for a serial subscription
-# In this instance it is in fact a setting up of a list of reserves for the item
-# where the hierarchical order can be changed on the fly and a routing list can be
-# printed out
-use strict;
-use CGI;
-
-use C4::Acquisition;
-use C4::Interface::CGI::Output;
-
-use C4::Serials;
-
-
-my $query = new CGI;
-my $subscriptionid = $query->param('subscriptionid');
-my $routingid = $query->param('routingid');
-my $rank = $query->param('rank');
-
-reorder_members($subscriptionid,$routingid,$rank);
-
-print $query->redirect("/cgi-bin/koha/serials/routing.pl?subscriptionid=$subscriptionid");
-

Index: cgi-bin/serials/routing-preview.pl
===================================================================
RCS file: cgi-bin/serials/routing-preview.pl
diff -N cgi-bin/serials/routing-preview.pl
--- cgi-bin/serials/routing-preview.pl	10 Mar 2007 01:27:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,121 +0,0 @@
-#!/usr/bin/perl
-
-# Routing Preview.pl script used to view a routing list after creation
-# lets one print out routing slip and create (in this instance) the heirarchy
-# of reserves for the serial
-use strict;
-use CGI;
-use C4::Koha;
-use C4::Auth;
-use C4::Date;
-use C4::Output;
-use C4::Acquisition;
-use C4::Reserves2;
-use C4::Circulation::Circ2;
-use C4::Interface::CGI::Output;
-use C4::Context;
-use C4::Search;
-use C4::Serials;
-
-my $query = new CGI;
-my $subscriptionid = $query->param('subscriptionid');
-my $issue = $query->param('issue');
-my $routingid;
-my $ok = $query->param('ok');
-my $edit = $query->param('edit');
-my $delete = $query->param('delete');
-my $dbh = C4::Context->dbh;
-
-if($delete){
-    delroutingmember($routingid,$subscriptionid);
-    my $sth = $dbh->prepare("UPDATE serial SET routingnotes = NULL WHERE subscriptionid = ?");
-    $sth->execute($subscriptionid);    
-    print $query->redirect("routing.pl?subscriptionid=$subscriptionid&op=new");    
-}
-
-if($edit){
-    print $query->redirect("routing.pl?subscriptionid=$subscriptionid");
-}
-    
-my ($routing, @routinglist) = getroutinglist($subscriptionid);
-my $subs = GetSubscription($subscriptionid);
-my ($count, at serials) = GetSerials($subscriptionid);
-my ($template, $loggedinuser, $cookie);
-
-if($ok){
-    my $env;
-    # get biblio information....
-    my $biblio = $subs->{'biblionumber'};
-    
-    # get existing reserves .....
-    my ($count,$reserves) = FindReserves($biblio);
-    my $totalcount = $count;
-    foreach my $res (@$reserves) {
-        if ($res->{'found'} eq 'W') {
-	    $count--;
-        }
-    }
-    my ($count2, at bibitems) = bibitems($biblio);
-    my @itemresults = ItemInfo($env, $subs->{'biblionumber'}, 'intra');    
-    my $branch = $itemresults[0]->{'holdingbranch'};
-    my $const = 'o';
-    my $notes;
-    my $title = $subs->{'bibliotitle'};
-    for(my $i=0;$i<$routing;$i++){
-	my $sth = $dbh->prepare("SELECT * FROM reserves WHERE biblionumber = ? AND borrowernumber = ? 
-                                 AND cancellationdate is NULL AND (found <> 'F' or found is NULL)");
-        $sth->execute($biblio,$routinglist[$i]->{'borrowernumber'});
-        my $data = $sth->fetchrow_hashref;
-#	warn Dumper($data);
-#       warn "$routinglist[$i]->{'borrowernumber'} is the same as $data->{'borrowernumber'}";
-	if($routinglist[$i]->{'borrowernumber'} == $data->{'borrowernumber'}){
-	    UpdateReserve($routinglist[$i]->{'ranking'},$biblio,$routinglist[$i]->{'borrowernumber'},$branch);
-        } else {
-            CreateReserve(\$env,$branch,$routinglist[$i]->{'borrowernumber'},$biblio,$const,\@bibitems,$routinglist[$i]->{'ranking'},$notes,$title);
-	}
-    }
-    
-    
-    ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/routing-preview-slip.tmpl",
-				query => $query,
-				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {catalogue => 1},
-				debug => 1,
-				});    
-} else {
-    ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/routing-preview.tmpl",
-				query => $query,
-				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {catalogue => 1},
-				debug => 1,
-				});
-}    
-
-# my $firstdate = "$serials[0]->{'serialseq'} ($serials[0]->{'planneddate'})";
-my @results;
-my $data;
-for(my $i=0;$i<$routing;$i++){
-    $data=borrdata('',$routinglist[$i]->{'borrowernumber'});
-    $data->{'location'}=$data->{'streetaddress'};
-    $data->{'name'}="$data->{'firstname'} $data->{'surname'}";
-    $data->{'routingid'}=$routinglist[$i]->{'routingid'};
-    $data->{'subscriptionid'}=$subscriptionid;
-    push(@results, $data);
-}
-
-my $routingnotes = $serials[0]->{'routingnotes'};
-$routingnotes =~ s/\n/\<br \/\>/g;
-  
-$template->param(
-    title => $subs->{'bibliotitle'},
-    issue => $issue,
-    subscriptionid => $subscriptionid,
-    memberloop => \@results,    
-    routingnotes => $routingnotes,
-    );
-
-        output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/serials/routing.pl
===================================================================
RCS file: cgi-bin/serials/routing.pl
diff -N cgi-bin/serials/routing.pl
--- cgi-bin/serials/routing.pl	10 Mar 2007 01:27:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,122 +0,0 @@
-#!/usr/bin/perl
-
-# Routing.pl script used to create a routing list for a serial subscription
-# In this instance it is in fact a setting up of a list of reserves for the item
-# where the hierarchical order can be changed on the fly and a routing list can be
-# printed out
-use strict;
-use CGI;
-use C4::Koha;
-use C4::Auth;
-use C4::Date;
-use C4::Acquisition;
-use C4::Interface::CGI::Output;
-use C4::Context;
-use C4::Search;
-use C4::Serials;
-
-my $query = new CGI;
-my $subscriptionid = $query->param('subscriptionid');
-my $serialseq = $query->param('serialseq');
-my $routingid = $query->param('routingid');
-my $bornum = $query->param('bornum');
-my $notes = $query->param('notes');
-my $op = $query->param('op');
-my $date_selected = $query->param('date_selected');
-my $dbh = C4::Context->dbh;
-
-if($op eq 'delete'){
-    delroutingmember($routingid,$subscriptionid);
-}
-
-if($op eq 'add'){
-    addroutingmember($bornum,$subscriptionid);
-}
-if($op eq 'save'){
-    my $sth = $dbh->prepare("UPDATE serial SET routingnotes = ? WHERE subscriptionid = ?");
-    $sth->execute($notes,$subscriptionid);
-    print $query->redirect("routing-preview.pl?subscriptionid=$subscriptionid&issue=$date_selected");
-}
-    
-my ($routing, @routinglist) = getroutinglist($subscriptionid);
-my $subs = GetSubscription($subscriptionid);
-my ($count, at serials) = old_getserials($subscriptionid);
-my ($serialdates) = GetLatestSerials($subscriptionid,$count);
-
-my @dates;
-my $i=0;
-foreach my $dateseq (@$serialdates) {
-        $dates[$i]->{'planneddate'} = $dateseq->{'planneddate'};
-        $dates[$i]->{'serialseq'} = $dateseq->{'serialseq'};
-        $dates[$i]->{'serialid'} = $dateseq->{'serialid'};
-        if($date_selected eq $dateseq->{'serialid'}){
-            $dates[$i]->{'selected'} = ' selected';
-        } else {
-            $dates[$i]->{'selected'} = '';
-        }
-        $i++;
-}
-
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/routing.tmpl",
-				query => $query,
-				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {catalogue => 1},
-				debug => 1,
-				});
-# my $date;
-# if($serialseq){
-#    for(my $i = 0;$i<@serials; $i++){
-#	if($serials[$i]->{'serialseq'} eq $serialseq){
-#	    $date = $serials[$i]->{'planneddate'}
-#	}
-#    }
-# } else {
-#    $serialseq = $serials[0]->{'serialseq'};
-#    $date = $serials[0]->{'planneddate'};
-# }
-
-# my $issue = "$serialseq ($date)";
-  
-my @results;
-my $data;
-for(my $i=0;$i<$routing;$i++){
-    $data=borrdata('',$routinglist[$i]->{'borrowernumber'});
-    $data->{'location'}=$data->{'streetaddress'};
-    $data->{'name'}="$data->{'firstname'} $data->{'surname'}";
-    $data->{'routingid'}=$routinglist[$i]->{'routingid'};
-    $data->{'subscriptionid'}=$subscriptionid;
-    my $rankingbox = '<select name="itemrank" onchange="reorder_item('.$subscriptionid.','.$routinglist[$i]->{'routingid'}.',this.options[this.selectedIndex].value)">';
-    for(my $j=1; $j <= $routing; $j++) {
-	$rankingbox .= "<option ";
-	if($routinglist[$i]->{'ranking'} == $j){
-	    $rankingbox .= " selected='SELECTED'";
-	}
-	$rankingbox .= " value='$j'>$j</option>";
-    }
-    $rankingbox .= "</select>";
-    $data->{'routingbox'} = $rankingbox;
-    
-    push(@results, $data);
-}
-# warn Dumper(@results);
-# for adding routing list
-my $new;
-if ($op eq 'new') {
-    $new = 1;
-} else {
-# for modify routing list default
-    $new => 0;
-}
-
-$template->param(
-    title => $subs->{'bibliotitle'},
-    subscriptionid => $subscriptionid,
-    memberloop => \@results,    
-    op => $new,
-    dates => \@dates,
-    routingnotes => $serials[0]->{'routingnotes'},
-    );
-
-        output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/serials/serial-issues.pl
===================================================================
RCS file: cgi-bin/serials/serial-issues.pl
diff -N cgi-bin/serials/serial-issues.pl
--- cgi-bin/serials/serial-issues.pl	10 Mar 2007 01:27:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,117 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-# $Id: serial-issues.pl,v 1.1.2.1 2007/03/10 01:27:27 tgarip1957 Exp $
-
-=head1 NAME
-
-serial-issue.pl
-
-=head1 DESCRIPTION
-
-this script give more information about a susbcription given on input arg.
-
-=head1 PARAMETERS
-
-=over 4
-
-=item selectview
-can be equal to "full" or not.
-
-=item biblionumber
-the biblionumber this script has to give more infos.
-
-=back
-
-
-=cut
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Koha;
-use C4::Date;
-use C4::Serials;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Context;
-
-
-my $query = new CGI;
-my $dbh = C4::Context->dbh;
-my $selectview = $query->param('selectview');
-$selectview = C4::Context->preference("SubscriptionHistory") unless $selectview;
-
-my $sth;
-# my $id;
-my ($template, $loggedinuser, $cookie);
-my $biblionumber = $query->param('biblionumber');
-if ($selectview eq "full"){
-    my $subscriptions = GetFullSubscriptionsFromBiblionumber($biblionumber);
-
-    my $title = $subscriptions->[0]{bibliotitle};
-    my $yearmin=$subscriptions->[0]{year};
-    my $yearmax=$subscriptions->[scalar(@$subscriptions)-1]{year};
-
-    ($template, $loggedinuser, $cookie)
-     = get_template_and_user({template_name => "serials/serial-issues-full.tmpl",
-     query => $query,
-     type => "intranet",
-     authnotrequired => 1,
-     debug => 1,
-     });
- 
- # replace CR by <br> in librarian note
- # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
- 
-    $template->param(
-        biblionumber => $query->param('biblionumber'),
-        years => $subscriptions,
-        yearmin => $yearmin,
-        yearmax =>$yearmax,
-        bibliotitle => $title,
-        suggestion => C4::Context->preference("suggestion"),
-        virtualshelves => C4::Context->preference("virtualshelves"),
-    );
-
-} else {
-    my $subscriptions = GetSubscriptionsFromBiblionumber($biblionumber);
-    ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "serials/serial-issues.tmpl",
-        query => $query,
-        type => "intranet",
-        authnotrequired => 1,
-        debug => 1,
-     });
-
- # replace CR by <br> in librarian note
- # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
-
-    $template->param(
-        biblionumber => "".$query->param('biblionumber'),
-        subscription_LOOP => $subscriptions,
-        suggestion => "".C4::Context->preference("suggestion"),
-        virtualshelves => "".C4::Context->preference("virtualshelves"),
-    );
-}
-$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/serials/serials-home.pl
===================================================================
RCS file: cgi-bin/serials/serials-home.pl
diff -N cgi-bin/serials/serials-home.pl
--- cgi-bin/serials/serials-home.pl	10 Mar 2007 01:27:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,90 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-# $Id: serials-home.pl,v 1.1.2.1 2007/03/10 01:27:27 tgarip1957 Exp $
-
-=head1 NAME
-
-serials-home.pl
-
-=head1 DESCRIPTION
-
-this script is the main page for serials/
-
-=head1 PARAMETERS
-
-=over 4
-
-=item title
-
-=item ISSN
-
-=item biblionumber
-
-=back
-
-=cut
-
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Serials;
-use C4::Interface::CGI::Output;
-use C4::Context;
-
-my $query = new CGI;
-my $title = $query->param('title');
-my $ISSN = $query->param('ISSN');
-my $supplierid = $query->param('supplierid');
-my $routing = $query->param('routing');
-my $searched = $query->param('searched');
-my $biblionumber = $query->param('biblionumber');
-my $alt_links = 0;
-if(C4::Context->preference("RoutingSerials")){
-    $alt_links = 0;
-}
-my @subscriptions = GetSubscriptions($title,$ISSN,$biblionumber,$supplierid);
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/serials-home.tmpl",
-				query => $query,
-				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {catalogue => 1},
-				debug => 1,
-				});
-
-# to toggle between create or edit routing list options
-if($routing){ 
-    for(my $i=0;$i<@subscriptions;$i++){
-	my $checkrouting = check_routing($subscriptions[$i]->{'subscriptionid'});
-	$subscriptions[$i]->{'routingedit'} = $checkrouting;
-	# warn "check $checkrouting";
-    }
-}
-
-$template->param(
-	subscriptions => \@subscriptions,
-	title => $title,
-	ISSN => $ISSN,
-        done_searched => $searched,
-        routing => $routing,
-        alt_links => $alt_links,
-	);
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/serials/serials-receive.pl
===================================================================
RCS file: cgi-bin/serials/serials-receive.pl
diff -N cgi-bin/serials/serials-receive.pl
--- cgi-bin/serials/serials-receive.pl	10 Mar 2007 01:27:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,223 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-# $Id: serials-receive.pl,v 1.1.2.1 2007/03/10 01:27:27 tgarip1957 Exp $
-
-=head1 NAME
-
-serials-receive.pl
-
-=head1 Parameters
-
-=over 4
-
-=item op
- op can be :
-    * modsubscriptionhistory :to modify the subscription history 
-    * serialchangestatus     :to modify the status of this subscription
-
-=item subscriptionid
-
-=item user
-
-=item histstartdate
-
-=item enddate
-
-=item receivedlist
-
-=item missinglist
-
-=item opacnote
-
-=item librariannote
-
-=item serialid
-
-=item serialseq
-
-=item planneddate
-
-=item notes
-
-=item status
-
-=back
-
-=cut
-
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Date;
-use C4::Biblio;
-use C4::Koha;
-use C4::Interface::CGI::Output;
-use C4::Context;
-use C4::Serials;
-
-my $query = new CGI;
-my $op = $query->param('op');
-my $dbh = C4::Context->dbh;
-my $subscriptionid = $query->param('subscriptionid');
-my $histstartdate = format_date_in_iso($query->param('histstartdate'));
-my $enddate = format_date_in_iso($query->param('enddate'));
-my $receivedlist = $query->param('receivedlist');
-my $missinglist = $query->param('missinglist');
-my $opacnote = $query->param('opacnote');
-my $librariannote = $query->param('librariannote');
-my @serialids = $query->param('serialid');
-my @serialseqs = $query->param('serialseq');
-my @planneddates = $query->param('planneddate');
-my @publisheddates = $query->param('publisheddate');
-my @status = $query->param('status');
-my @notes = $query->param('notes');
-my @barcodes = $query->param('barcode');
-my @itemcallnumbers = $query->param('itemcallnumber');
-my @locations = $query->param('location');
-my @itemstatus = $query->param('itemstatus');
-my @holdingbranches = $query->param('holdingbranch');
-my $hassubscriptionexpired = HasSubscriptionExpired($subscriptionid);
-my $abouttoexpire = abouttoexpire($subscriptionid);
-my @itemnumbers=$query->param('itemnumber');
-my $subscription=GetSubscription($subscriptionid);
-
-my $auser = $subscription->{'librarian'}; # bob
-my $routing = check_routing($subscriptionid); # to see if routing list exists
-my $manualdate ='';
-my $manualissue ='';
-my $manualstatus =0;
-my $manualid ='';
-if ($op eq 'found'){
-    $manualdate = $query->param('planneddate');
-    $manualissue = $query->param('missingissue');
-    $manualstatus = 1;
-    my $sth = $dbh->prepare("select serialid from serial where subscriptionid = ? AND serialseq = ? AND planneddate = ?");
-    $sth->execute($subscriptionid,$manualissue,format_date_in_iso($manualdate));
-    $manualid = $sth->fetchrow;
-}
-if ($op eq 'modsubscriptionhistory') {
-	ModSubscriptionHistory($subscriptionid,$histstartdate,$enddate,$receivedlist,$missinglist,$opacnote,$librariannote);
-}
-
-# change status except, if subscription has expired, for the "waited" issue.
-if ($op eq 'serialchangestatus') {
-	my $sth = $dbh->prepare("select status from serial where serialid=?");
-	for (my $i=0;$i<=$#serialids;$i++) {
-		$sth->execute($serialids[$i]);
-		my $today=get_today();
-		my ($oldstatus) = $sth->fetchrow;
-		if ($serialids[$i]) {
-	 my $planneddate = ($planneddates[$i]?format_date_in_iso($planneddates[$i]):$today) if ($status[$i]==2);
-			ModSerialStatus($serialids[$i],$serialseqs[$i],format_date_in_iso($publisheddates[$i]),format_date_in_iso($planneddates[$i]),$status[$i],$notes[$i],$itemnumbers[$i]) unless ($hassubscriptionexpired && $oldstatus ==1 );
-			if (($status[$i]==2) && $itemnumbers[$i]){
-				my %info;
-				my $status2;
-			        my $sth2 = $dbh->prepare("UPDATE subscriptionhistory SET lastbranch = ? WHERE subscriptionid = ?");
-			        $sth2->execute($holdingbranches[$i],$subscriptionid);
-			        $sth2->finish;			    
-			        # remove from missing list if item being checked in is on it
-				    removeMissingIssue($serialseqs[$i],$subscriptionid);
-			}
-		} else {
-			# add a special issue
-			if ($serialseqs[$i]) {
-				NewIssue($serialseqs[$i],$subscriptionid,$subscription->{biblionumber},$status[$i],format_date_in_iso($publisheddates[$i]), format_date_in_iso($planneddates[$i]),$itemnumbers[$i]);
-			}
-			if (($status[$i]==2) &&  $itemnumbers[$i] && !$hassubscriptionexpired){
-				my %info;
-				my $status2;
-			        my $sth2 = $dbh->prepare("UPDATE subscriptionhistory SET lastbranch = ? WHERE subscriptionid = ?");
-			        $sth2->execute($holdingbranches[$i],$subscriptionid);
-			        $sth2->finish;
-			        # remove from missing list if item being checked in is on it
-			       
-				    removeMissingIssue($serialseqs[$i],$subscriptionid);
-			       
-			}
-
-		}
-	}
-
-}
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/serials-receive.tmpl",
-				query => $query,
-				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {catalogue => 1},
-				debug => 1,
-				});
-
-my $subs = &GetSubscription($subscriptionid);
-my ($totalissues, at serialslist) = GetSerials($subscriptionid);
-my $count = @serialslist;
-for(my $i=0;$i<$count;$i++){
-    $serialslist[$i]->{'callnumber'} = $subscription->{'callnumber'};
-    my $temp = rand(10000000);
-    $serialslist[$i]->{'barcode'} = "TEMP" . sprintf("%.0f",$temp);
-}
-# use Data::Dumper;
-# warn Dumper(@serialslist);
-
-my $sth= C4::Serials::GetSubscriptionHistoryFromSubscriptionId();
-
-$sth->execute($subscriptionid);
-my $solhistory = $sth->fetchrow_hashref;
-
-my $subs = &GetSubscription($subscriptionid);
-my ($totalissues, at serialslist) = GetSerials($subscriptionid);
-
-if (C4::Context->preference("serialsadditems")){
-    $template->param(scriptaddserials=>"/cgi-bin/koha/cataloguing/additem.pl?biblionumber=  $serialslist[0]->{'biblionumber'}&fromserials=1&serialid=",
-				serialsadditems=>1	) ;
-}
-
-my $sth= C4::Serials::GetSubscriptionHistoryFromSubscriptionId();
-$sth->execute($subscriptionid);
-my $solhistory = $sth->fetchrow_hashref;
-
-    
-$template->param(
-                        user => $auser,
-			serialslist => \@serialslist,
-                        count => $count,
-			biblionumber => $subscription->{biblionumber},
-			histstartdate => format_date($solhistory->{'histstartdate'}),
-			enddate => format_date($solhistory->{'enddate'}),
-			receivedlist => $solhistory->{'receivedlist'},
-			missinglist => $solhistory->{'missinglist'},
-			opacnote => $solhistory->{'opacnote'},
-			librariannote => $solhistory->{'librariannote'},
-			subscriptionid => $subscriptionid,
-			bibliotitle => $subs->{bibliotitle},
-			biblionumber => $subs->{biblionumber},
-			hassubscriptionexpired =>$hassubscriptionexpired,
-			abouttoexpire =>$abouttoexpire,    
-			intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-			intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-			IntranetNav => C4::Context->preference("IntranetNav"),
-                        routing => $routing,
-                        missingseq => $manualissue,
-                        frommissing => $manualstatus,
-                        missingdate => $manualdate,
-                        missingid => $manualid,
-		);
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/serials/subscription-add-new.pl
===================================================================
RCS file: cgi-bin/serials/subscription-add-new.pl
diff -N cgi-bin/serials/subscription-add-new.pl
--- cgi-bin/serials/subscription-add-new.pl	10 Mar 2007 01:27:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,309 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2003 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
-
-# $Id: subscription-add-new.pl,v 1.1.2.1 2007/03/10 01:27:27 tgarip1957 Exp $
-
-=head1 NAME
-
-subscription-add.pl
-
-=head1 DESCRIPTION
-
-this script add a subscription into the database.
-
-=head1 PARAMETERS
-
-=over 4
-
-=item op
-op use to know the operation to do on this template.
- * mod : to modify an existing subscription
- * addsubscription : to add a subscription
-
-Note that if op = mod or addsubscription there are a lot of other params.
-
-
-=back
-
-=cut
-
-
-use strict;
-use CGI;
-use C4::Koha;
-use C4::Auth;
-use C4::Date;
-use Date::Calc qw(:all);
-use C4::Serials;
-use C4::Bookfund;
-use C4::Interface::CGI::Output;
-use C4::Context;
-use C4::Letters;
-use C4::Members;
-my $query = new CGI;
-my $op = $query->param('op');
-my $dbh = C4::Context->dbh;
-my ($subscriptionid,$auser,$librarian,$cost,$aqbooksellerid, $aqbooksellername,$aqbudgetid, $bookfundid, $startdate, $periodicity,
-    $publisheddate,$dow,$irregularity, $numberpattern, $numberlength, $weeklength, $monthlength, $sublength,
-    $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
-    $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
-    $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
-    $numberingmethod, $status, $biblionumber,
-    $title, $notes, $letter,$callnumber,$hemisphere);
-
-    my @budgets;
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/subscription-add.tmpl",
-                query => $query,
-                type => "intranet",
-                authnotrequired => 0,
-                flagsrequired => {catalogue => 1},
-                debug => 1,
-                });
-
-my $weekarrayjs='';
-my $count = 0;
-my $today=get_today();
-my ($year,$month,$day)=split /-|\/|\.|:/,$today ;
-my $firstday = Day_of_Year($year,$month,$day);
-my ($wkno,$dyear) = Week_of_Year($year,$month,$day); 
-my $weekno = $wkno;
-for(my $i=$firstday;$i<($firstday+365);$i=$i+7){
-        $count = $i;
-        if($wkno > 52){$year++; $wkno=1;}
-        if($count>365){$count=$i-365;}    
-     my @newdate= Add_Delta_Days($year,$month,$day, $count);
-
-        $weekarrayjs .= "'Wk $wkno: ".format_date($newdate[0]."-".$newdate[1]."-".$newdate[2])."',";
-        $wkno++;    
-}
-chop($weekarrayjs);
-# warn $weekarrayjs;
-
-my $sub_on;
-my @subscription_types = (
-            'issues', 'weeks', 'months'
-        ); 
-my @sub_type_data;
-if ($op eq 'mod') {
-    my $subscriptionid = $query->param('subscriptionid');
-    my $subs = &GetSubscription($subscriptionid);
-    $auser = $subs->{'user'};
-    $librarian = $subs->{'librarian'};
-    $cost = $subs->{'cost'};
-    $aqbooksellerid = $subs->{'aqbooksellerid'};
-    $aqbooksellername = $subs->{'aqbooksellername'};
-    $bookfundid = $subs->{'bookfundid'};
-    $aqbudgetid = $subs->{'aqbudgetid'};
-    defined $aqbudgetid or $aqbudgetid='';
-    $startdate = $subs->{'startdate'};
-   $publisheddate = $subs->{'publisheddate'};
-    $periodicity = $subs->{'periodicity'};
-    $dow = $subs->{'dow'};
-        $irregularity = $subs->{'irregularity'};
-        $numberpattern = $subs->{'numberpattern'};
-    $numberlength = $subs->{'numberlength'};
-    $weeklength = $subs->{'weeklength'};
-    $monthlength = $subs->{'monthlength'};
-       if($monthlength > 0){
-	    $sublength = $monthlength;
-	    $sub_on = $subscription_types[2];
-	} elsif ($weeklength>0){
-	    $sublength = $weeklength;
-	    $sub_on = $subscription_types[1];
-	} else {
-	    $sublength = $numberlength;
-	    $sub_on = $subscription_types[0];
-	}
-        
-
-        while (@subscription_types) {
-           my $sub_type = shift @subscription_types;
-           my %row = ( 'name' => $sub_type );
-           if ( $sub_on eq $sub_type ) {
-	     $row{'selected'} = ' selected';
-           } else {
-	     $row{'selected'} = '';
-           }
-           push( @sub_type_data, \%row );
-        }
-    $add1 = $subs->{'add1'};
-    $every1 = $subs->{'every1'};
-    $whenmorethan1 = $subs->{'whenmorethan1'};
-    $setto1 = $subs->{'setto1'};
-    $lastvalue1 = $subs->{'lastvalue1'};
-    $innerloop1 = $subs->{'innerloop1'};
-    $add2 = $subs->{'add2'};
-    $every2 = $subs->{'every2'};
-    $whenmorethan2 = $subs->{'whenmorethan2'};
-    $setto2 = $subs->{'setto2'};
-    $lastvalue2 = $subs->{'lastvalue2'};
-    $innerloop2 = $subs->{'innerloop2'};
-    $add3 = $subs->{'add3'};
-    $every3 = $subs->{'every3'};
-    $whenmorethan3 = $subs->{'whenmorethan3'};
-    $setto3 = $subs->{'setto3'};
-    $lastvalue3 = $subs->{'lastvalue3'};
-    $innerloop3 = $subs->{'innerloop3'};
-    $numberingmethod = $subs->{'numberingmethod'};
-    $status = $subs->{status};
-    $biblionumber = $subs->{'biblionumber'};
-    $title = $subs->{'title'},
-           $callnumber = $subs->{'callnumber'};
-           $hemisphere = $subs->{'hemisphere'};
-    $notes = $subs->{'notes'};
-    $letter = $subs->{'letter'};
-    defined $letter or $letter='';
-    $template->param(
-        $op => 1,
-        user => $auser,
-        librarian => $librarian,
-        aqbooksellerid => $aqbooksellerid,
-        aqbooksellername => $aqbooksellername,
-        cost => $cost,
-        aqbudgetid => $aqbudgetid,
-        bookfundid => $bookfundid,
-        startdate => format_date($startdate),    
-         publisheddate => format_date($publisheddate),    
-        periodicity => $periodicity,
-        numberpattern=>$numberpattern,
-        dow => $dow,
-        numberlength => $numberlength,
-        weeklength => $weeklength,
-        monthlength => $monthlength,
-	sublength=>$sublength,
-        add1 => $add1,
-        every1 => $every1,
-        whenmorethan1 => $whenmorethan1,
-        setto1 => $setto1,
-        lastvalue1 => $lastvalue1,
-        innerloop1 => $innerloop1,
-        add2 => $add2,
-        every2 => $every2,
-        whenmorethan2 => $whenmorethan2,
-        setto2 => $setto2,
-        lastvalue2 => $lastvalue2,
-        innerloop2 => $innerloop2,
-        add3 => $add3,
-        every3 => $every3,
-        whenmorethan3 => $whenmorethan3,
-        setto3 => $setto3,
-        lastvalue3 => $lastvalue3,
-        innerloop3 => $innerloop3,
-        numberingmethod => $numberingmethod,
-        status => $status,
-        biblionumber => $biblionumber,
-        title => $title,
-               callnumber => $callnumber,
-        notes => $notes,
-        letter => $letter,
-        subscriptionid => $subscriptionid,
-        weekarrayjs => $weekarrayjs,
-	        weekno => $weekno,
-	        hemisphere => $hemisphere,
-        "periodicity$periodicity" => 1,
-        "dow$dow" => 1,
-        "numberpattern$numberpattern" => 1,
-        );
-}
-
-my @letterlist = GetLetterList('serial');
-for (my $i=0;$i<=$#letterlist;$i++) {
-    $letterlist[$i]->{'selected'} =1 if $letterlist[$i]->{'code'} eq $letter;
-}
-$template->param(letters => \@letterlist);
-
-if ($op eq 'addsubscription') {
-  my @irregular = $query->param('irregular');
-        my $irregular_count = @irregular;
-        for(my $i =0;$i<$irregular_count;$i++){
-            $irregularity .=$irregular[$i]."|";
-        }
-        $irregularity =~ s/\|$//;
-        
-    my $auser = $query->param('user');
-    my $aqbooksellerid = $query->param('aqbooksellerid');
-    my $cost = $query->param('cost');
-    my $aqbudgetid = $query->param('aqbudgetid');
-    my $startdate = $query->param('startdate');
-     my $publisheddate = $query->param('publisheddate');
-    my $callnumber=$query->param('callnumber');	  
-    my $periodicity = $query->param('periodicity');
-    my $dow = $query->param('dow');
-	my $numberlength = 0;
-	my $weeklength = 0;
-	my $monthlength = 0;
-        my $numberpattern = $query->param('numbering_pattern');
-        my $sublength = $query->param('sublength');
-        my $subtype = $query->param('subtype');
-        if ($subtype eq 'months'){
-	    $monthlength = $sublength;
-	} elsif ($subtype eq 'weeks'){
-	    $weeklength = $sublength;
-	} else {
-	    $numberlength = $sublength;
-	}
-
-
-	my $add1 = $query->param('add1');
-	my $every1 = $query->param('every1');
-	my $whenmorethan1 = $query->param('whenmorethan1');
-	my $setto1 = $query->param('setto1');
-	my $lastvalue1 = $query->param('lastvalue1');
-	my $add2 = $query->param('add2');
-	my $every2 = $query->param('every2');
-	my $whenmorethan2 = $query->param('whenmorethan2');
-	my $setto2 = $query->param('setto2');
-	my $lastvalue2 = $query->param('lastvalue2');
-	my $add3 = $query->param('add3');
-	my $every3 = $query->param('every3');
-	my $whenmorethan3 = $query->param('whenmorethan3');
-	my $setto3 = $query->param('setto3');
-	my $lastvalue3 = $query->param('lastvalue3');
-	my $numberingmethod = $query->param('numberingmethod');
-	my $status = 1;
-    my $biblionumber = $query->param('biblionumber');
-    my $notes = $query->param('notes');
-    my $letter = $query->param('letter');
-            my $hemisphere = $query->param('hemisphere') || 1;
-
-    my $subscriptionid = NewSubscription($auser,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
-                    $startdate,$periodicity,$dow,$numberlength,$weeklength,$monthlength,
-                    $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,
-                    $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
-                    $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
-                    $numberingmethod, $status, $notes, $letter,$irregularity,$hemisphere,$callnumber,$numberpattern,$publisheddate    );
-    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
-} else {
-     while (@subscription_types) {
-           my $sub_type = shift @subscription_types;
-           my %row = ( 'name' => $sub_type );
-           if ( $sub_on eq $sub_type ) {
-	     $row{'selected'} = ' selected';
-           } else {
-	     $row{'selected'} = '';
-           }
-           push( @sub_type_data, \%row );
-        }    
-    $template->param(subtype => \@sub_type_data,
- 	         weekarrayjs => $weekarrayjs,
-	         weekno => $weekno,
-	);
-    output_html_with_http_headers $query, $cookie, $template->output;
-}

Index: cgi-bin/serials/subscription-add.pl
===================================================================
RCS file: cgi-bin/serials/subscription-add.pl
diff -N cgi-bin/serials/subscription-add.pl
--- cgi-bin/serials/subscription-add.pl	11 Mar 2007 20:28:12 -0000	1.1.2.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,309 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2003 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
-
-# $Id: subscription-add.pl,v 1.1.2.2 2007/03/11 20:28:12 tgarip1957 Exp $
-
-=head1 NAME
-
-subscription-add.pl
-
-=head1 DESCRIPTION
-
-this script add a subscription into the database.
-
-=head1 PARAMETERS
-
-=over 4
-
-=item op
-op use to know the operation to do on this template.
- * mod : to modify an existing subscription
- * addsubscription : to add a subscription
-
-Note that if op = mod or addsubscription there are a lot of other params.
-
-
-=back
-
-=cut
-
-
-use strict;
-use CGI;
-use C4::Koha;
-use C4::Auth;
-use C4::Date;
-use C4::Serials;
-use C4::Bookfund;
-use C4::Interface::CGI::Output;
-use C4::Context;
-use C4::Letters;
-use C4::Members;
-use Date::Calc qw(:all);
-my $query = new CGI;
-my $op = $query->param('op');
-my $dbh = C4::Context->dbh;
-my ($subscriptionid,$auser,$librarian,$cost,$aqbooksellerid, $aqbooksellername,$aqbudgetid, $bookfundid, $startdate, $periodicity,
-    $publisheddate,$dow,$irregularity, $numberpattern, $numberlength, $weeklength, $monthlength, $sublength,
-    $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
-    $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
-    $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
-    $numberingmethod, $status, $biblionumber,
-    $title, $notes, $letter,$callnumber,$hemisphere);
-
-    my @budgets;
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/subscription-add.tmpl",
-                query => $query,
-                type => "intranet",
-                authnotrequired => 0,
-                flagsrequired => {catalogue => 1},
-                debug => 1,
-                });
-
-my $weekarrayjs='';
-my $count = 0;
-my $today=get_today();
- my ($year,$month,$day)=split /-|\/|\.|:/,$today;
-  
-my $firstday = Day_of_Year($year,$month,$day);
-my $wkno = Week_of_Year($year,$month,$day);  
-my $weekno = $wkno;
-for(my $i=$firstday;$i<($firstday+365);$i=$i+7){
-        $count = $i;
-        if($wkno > 52){$year++; $wkno=1;}
-        if($count>365){$count=$i-365;}    
-     my ($nyear,$nmonth,$nday)=Add_Delta_Days($year,1,$count);
-        $weekarrayjs .= "'Wk $wkno: ".format_date($nyear."-"$nmonth."-"$nday)."',";
-        $wkno++;    
-}
-chop($weekarrayjs);
-# warn $weekarrayjs;
-
-my $sub_on;
-my @subscription_types = (
-            'issues', 'weeks', 'months'
-        ); 
-my @sub_type_data;
-if ($op eq 'mod') {
-    my $subscriptionid = $query->param('subscriptionid');
-    my $subs = &GetSubscription($subscriptionid);
-    $auser = $subs->{'user'};
-    $librarian = $subs->{'librarian'};
-    $cost = $subs->{'cost'};
-    $aqbooksellerid = $subs->{'aqbooksellerid'};
-    $aqbooksellername = $subs->{'aqbooksellername'};
-    $bookfundid = $subs->{'bookfundid'};
-    $aqbudgetid = $subs->{'aqbudgetid'};
-    defined $aqbudgetid or $aqbudgetid='';
-    $startdate = $subs->{'startdate'};
-   $publisheddate = $subs->{'publisheddate'};
-    $periodicity = $subs->{'periodicity'};
-    $dow = $subs->{'dow'};
-        $irregularity = $subs->{'irregularity'};
-        $numberpattern = $subs->{'numberpattern'};
-    $numberlength = $subs->{'numberlength'};
-    $weeklength = $subs->{'weeklength'};
-    $monthlength = $subs->{'monthlength'};
-       if($monthlength > 0){
-	    $sublength = $monthlength;
-	    $sub_on = $subscription_types[2];
-	} elsif ($weeklength>0){
-	    $sublength = $weeklength;
-	    $sub_on = $subscription_types[1];
-	} else {
-	    $sublength = $numberlength;
-	    $sub_on = $subscription_types[0];
-	}
-        
-
-        while (@subscription_types) {
-           my $sub_type = shift @subscription_types;
-           my %row = ( 'name' => $sub_type );
-           if ( $sub_on eq $sub_type ) {
-	     $row{'selected'} = ' selected';
-           } else {
-	     $row{'selected'} = '';
-           }
-           push( @sub_type_data, \%row );
-        }
-    $add1 = $subs->{'add1'};
-    $every1 = $subs->{'every1'};
-    $whenmorethan1 = $subs->{'whenmorethan1'};
-    $setto1 = $subs->{'setto1'};
-    $lastvalue1 = $subs->{'lastvalue1'};
-    $innerloop1 = $subs->{'innerloop1'};
-    $add2 = $subs->{'add2'};
-    $every2 = $subs->{'every2'};
-    $whenmorethan2 = $subs->{'whenmorethan2'};
-    $setto2 = $subs->{'setto2'};
-    $lastvalue2 = $subs->{'lastvalue2'};
-    $innerloop2 = $subs->{'innerloop2'};
-    $add3 = $subs->{'add3'};
-    $every3 = $subs->{'every3'};
-    $whenmorethan3 = $subs->{'whenmorethan3'};
-    $setto3 = $subs->{'setto3'};
-    $lastvalue3 = $subs->{'lastvalue3'};
-    $innerloop3 = $subs->{'innerloop3'};
-    $numberingmethod = $subs->{'numberingmethod'};
-    $status = $subs->{status};
-    $biblionumber = $subs->{'biblionumber'};
-    $title = $subs->{'title'},
-           $callnumber = $subs->{'callnumber'};
-           $hemisphere = $subs->{'hemisphere'};
-    $notes = $subs->{'notes'};
-    $letter = $subs->{'letter'};
-    defined $letter or $letter='';
-    $template->param(
-        $op => 1,
-        user => $auser,
-        librarian => $librarian,
-        aqbooksellerid => $aqbooksellerid,
-        aqbooksellername => $aqbooksellername,
-        cost => $cost,
-        aqbudgetid => $aqbudgetid,
-        bookfundid => $bookfundid,
-        startdate => format_date($startdate),    
-         publisheddate => format_date($publisheddate),    
-        periodicity => $periodicity,
-        numberpattern=>$numberpattern,
-        dow => $dow,
-        numberlength => $numberlength,
-        weeklength => $weeklength,
-        monthlength => $monthlength,
-	sublength=>$sublength,
-        add1 => $add1,
-        every1 => $every1,
-        whenmorethan1 => $whenmorethan1,
-        setto1 => $setto1,
-        lastvalue1 => $lastvalue1,
-        innerloop1 => $innerloop1,
-        add2 => $add2,
-        every2 => $every2,
-        whenmorethan2 => $whenmorethan2,
-        setto2 => $setto2,
-        lastvalue2 => $lastvalue2,
-        innerloop2 => $innerloop2,
-        add3 => $add3,
-        every3 => $every3,
-        whenmorethan3 => $whenmorethan3,
-        setto3 => $setto3,
-        lastvalue3 => $lastvalue3,
-        innerloop3 => $innerloop3,
-        numberingmethod => $numberingmethod,
-        status => $status,
-        biblionumber => $biblionumber,
-        title => $title,
-               callnumber => $callnumber,
-        notes => $notes,
-        letter => $letter,
-        subscriptionid => $subscriptionid,
-        weekarrayjs => $weekarrayjs,
-	        weekno => $weekno,
-	        hemisphere => $hemisphere,
-        "periodicity$periodicity" => 1,
-        "dow$dow" => 1,
-        "numberpattern$numberpattern" => 1,
-        );
-}
-
-my @letterlist = GetLetterList('serial');
-for (my $i=0;$i<=$#letterlist;$i++) {
-    $letterlist[$i]->{'selected'} =1 if $letterlist[$i]->{'code'} eq $letter;
-}
-$template->param(letters => \@letterlist);
-
-if ($op eq 'addsubscription') {
-  my @irregular = $query->param('irregular');
-        my $irregular_count = @irregular;
-        for(my $i =0;$i<$irregular_count;$i++){
-            $irregularity .=$irregular[$i]."|";
-        }
-        $irregularity =~ s/\|$//;
-        
-    my $auser = $query->param('user');
-    my $aqbooksellerid = $query->param('aqbooksellerid');
-    my $cost = $query->param('cost');
-    my $aqbudgetid = $query->param('aqbudgetid');
-    my $startdate = $query->param('startdate');
-     my $publisheddate = $query->param('publisheddate');
-    my $callnumber=$query->param('callnumber');	  
-    my $periodicity = $query->param('periodicity');
-    my $dow = $query->param('dow');
-	my $numberlength = 0;
-	my $weeklength = 0;
-	my $monthlength = 0;
-        my $numberpattern = $query->param('numbering_pattern');
-        my $sublength = $query->param('sublength');
-        my $subtype = $query->param('subtype');
-        if ($subtype eq 'months'){
-	    $monthlength = $sublength;
-	} elsif ($subtype eq 'weeks'){
-	    $weeklength = $sublength;
-	} else {
-	    $numberlength = $sublength;
-	}
-
-
-	my $add1 = $query->param('add1');
-	my $every1 = $query->param('every1');
-	my $whenmorethan1 = $query->param('whenmorethan1');
-	my $setto1 = $query->param('setto1');
-	my $lastvalue1 = $query->param('lastvalue1');
-	my $add2 = $query->param('add2');
-	my $every2 = $query->param('every2');
-	my $whenmorethan2 = $query->param('whenmorethan2');
-	my $setto2 = $query->param('setto2');
-	my $lastvalue2 = $query->param('lastvalue2');
-	my $add3 = $query->param('add3');
-	my $every3 = $query->param('every3');
-	my $whenmorethan3 = $query->param('whenmorethan3');
-	my $setto3 = $query->param('setto3');
-	my $lastvalue3 = $query->param('lastvalue3');
-	my $numberingmethod = $query->param('numberingmethod');
-	my $status = 1;
-    my $biblionumber = $query->param('biblionumber');
-    my $notes = $query->param('notes');
-    my $letter = $query->param('letter');
-            my $hemisphere = $query->param('hemisphere') || 1;
-
-    my $subscriptionid = NewSubscription($auser,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
-                    $startdate,$periodicity,$dow,$numberlength,$weeklength,$monthlength,
-                    $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,
-                    $add2,$every2,$whenmorethan2,$setto2,$lastvalue2,
-                    $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,
-                    $numberingmethod, $status, $notes, $letter,$irregularity,$hemisphere,$callnumber,$numberpattern,$publisheddate    );
-    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
-} else {
-     while (@subscription_types) {
-           my $sub_type = shift @subscription_types;
-           my %row = ( 'name' => $sub_type );
-           if ( $sub_on eq $sub_type ) {
-	     $row{'selected'} = ' selected';
-           } else {
-	     $row{'selected'} = '';
-           }
-           push( @sub_type_data, \%row );
-        }    
-    $template->param(subtype => \@sub_type_data,
- 	         weekarrayjs => $weekarrayjs,
-	         weekno => $weekno,
-	);
-    output_html_with_http_headers $query, $cookie, $template->output;
-}

Index: cgi-bin/serials/subscription-bib-search.pl
===================================================================
RCS file: cgi-bin/serials/subscription-bib-search.pl
diff -N cgi-bin/serials/subscription-bib-search.pl
--- cgi-bin/serials/subscription-bib-search.pl	10 Mar 2007 01:27:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,172 +0,0 @@
-#!/usr/bin/perl
-# WARNING: 4-character tab stops here
-
-# 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 CGI;
-use C4::Koha;
-use C4::Auth;
-use C4::Context;
-use C4::Search;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Biblio;
-use C4::Acquisition;
-use C4::Koha; # XXX subfield_is_koha_internal_p
-
-
-# Creates a scrolling list with the associated default value.
-# Using more than one scrolling list in a CGI assigns the same default value to all the
-# scrolling lists on the page !?!? That's why this function was written.
-
-my $query=new CGI;
-my $type=$query->param('type');
-my $op = $query->param('op');
-my $dbh = C4::Context->dbh;
-
-my $startfrom=$query->param('startfrom');
-$startfrom=0 if(!defined $startfrom);
-my ($template, $loggedinuser, $cookie);
-my $resultsperpage;
-
-if ($op eq "do_search") {
-	my @kohafield = $query->param('kohafield');
-	my @and_or = $query->param('and_or');
-	my @relation = $query->param('relation');
-	my @value = $query->param('value');
-	my $order=$query->param('order');
-	$resultsperpage= $query->param('resultsperpage');
-	$resultsperpage = 9 if(!defined $resultsperpage);
-	# builds tag and subfield arrays
-	
-	my ($total,$facets, at results) = ZEBRAsearch_kohafields(\@kohafield,\@value,\@relation,$order,\@and_or,1,"",$startfrom,$resultsperpage,"intranet");
- 										
-	($template, $loggedinuser, $cookie)
-		= get_template_and_user({template_name => "serials/result.tmpl",
-				query => $query,
-				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {borrowers => 1},
-				flagsrequired => {catalogue => 1},
-				debug => 1,
-				});
-
-	# multi page display gestion
-	my $displaynext=0;
-	my $displayprev=$startfrom;
-	if(($total - (($startfrom+1)*($resultsperpage))) > 0 ){
-		$displaynext = 1;
-	}
-
-	my @field_data = ();
-
-
-	for(my $i = 0 ; $i <= $#value ; $i++)
-	{
-		push @field_data, { term => "kohafield", val=>$kohafield[$i] };
-		push @field_data, { term => "and_or", val=>$and_or[$i] };
-		push @field_data, { term => "relation", val=>$relation[$i] };
-		push @field_data, { term => "value", val=>$value[$i] };
-	}
-
-	my @numbers = ();
-
-	if ($total>$resultsperpage)
-	{
-		for (my $i=1; $i<$total/$resultsperpage+1; $i++)
-		{
-			if ($i<16)
-			{
-	    		my $highlight=0;
-	    		($startfrom==($i-1)) && ($highlight=1);
-	    		push @numbers, { number => $i,
-					highlight => $highlight ,
-					searchdata=> \@field_data,
-					startfrom => ($i-1)};
-			}
-    	}
-	}
-
-	my $from = $startfrom*$resultsperpage+1;
-	my $to;
-
- 	if($total < (($startfrom+1)*$resultsperpage))
-	{
-		$to = $total;
-	} else {
-		$to = (($startfrom+1)*$resultsperpage);
-	}
-	$template->param(result => \@results,
-							startfrom=> $startfrom,
-							displaynext=> $displaynext,
-							displayprev=> $displayprev,
-							resultsperpage => $resultsperpage,
-							startfromnext => $startfrom+1,
-							startfromprev => $startfrom-1,
-							searchdata=>\@field_data,
-							total=>$total,
-							from=>$from,
-							to=>$to,
-							numbers=>\@numbers,
-							);
-} else {
-	($template, $loggedinuser, $cookie)
-		= get_template_and_user({template_name => "serials/subscription-bib-search.tmpl",
-				query => $query,
-				type => "intranet",
-				authnotrequired => 0,
-				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,
-	 			-tabindex=>'',
-				-multiple => 0 );
-	$sth->finish;
-
-	$template->param(
-			CGIitemtype => $CGIitemtype,
-			);
-}
-
-
-# Print the page
-$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $query, $cookie, $template->output;
-
-# Local Variables:
-# tab-width: 4
-# End:

Index: cgi-bin/serials/subscription-detail-new.pl
===================================================================
RCS file: cgi-bin/serials/subscription-detail-new.pl
diff -N cgi-bin/serials/subscription-detail-new.pl
--- cgi-bin/serials/subscription-detail-new.pl	10 Mar 2007 01:27:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,128 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Koha;
-use C4::Date;
-use C4::Serials;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Context;
-use Date::Calc qw(:all);
-my $query = new CGI;
-my $op = $query->param('op');
-my $dbh = C4::Context->dbh;
-my $sth;
-# my $id;
-my ($template, $loggedinuser, $cookie, $subs);
-my ($subscriptionid,$auser,$librarian,$cost,$aqbooksellerid, $aqbooksellername,$aqbudgetid, $bookfundid, $startdate, $periodicity,
-	$publisheddate, $dow, $irregularity, $sublength, $subtype, $numberpattern, $numberlength, $weeklength, $monthlength,
-	$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
-	$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
-	$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
-	$numberingmethod, $status, $biblionumber, $bibliotitle, $callnumber, $notes, $hemisphere);
-
-$subscriptionid = $query->param('subscriptionid');
-
-
-if ($op eq 'del') {
-$biblionumber = $query->param('biblionumber');
-	&DelSubscription($subscriptionid,$biblionumber);
-print	$query->redirect("/cgi-bin/koha/serials/serials-home.pl");
-#	exit;
-
-}
-my $subs = &GetSubscription($subscriptionid);
-my ($routing, @routinglist) = getroutinglist($subscriptionid);
-my ($totalissues, at serialslist) = GetSerials($subscriptionid);
-$totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
-# the subscription must be deletable if there is NO issues for a reason or another (should not happend, but...)
-
-($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/subscription-detail.tmpl",
-				query => $query,
-				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {catalogue => 1},
-				debug => 1,
-				});
-
-my ($user, $cookie, $sessionID, $flags)
-	= checkauth($query, 0, {catalogue => 1}, "intranet");
-my $weekarrayjs='';
-my $count = 0;
-my $today=get_today();
-my ($year,$month,$day)=split /-|\/|\.|:/,$today ;
-my $firstday = Day_of_Year($year,$month,$day);
-
-my ($wkno,$dyear) = Week_of_Year($year,$month,$day); 
-my $weekno = $wkno;
-for(my $i=$firstday;$i<($firstday+365);$i=$i+7){
-        $count = $i;
-        if($wkno > 52){$year++; $wkno=1;}
-        if($count>365){$count=$i-365;}    
-     my @newdate= Add_Delta_Days($year,$month,$day, $count);
-
-        $weekarrayjs .= "'Wk $wkno: ".format_date($newdate[0]."-".$newdate[1]."-".$newdate[2])."',";
-        $wkno++;    
-}
-chop($weekarrayjs);
-
-$template->param(
-        routing => $routing,
-	user => $subs->{auser},
-	librarian => $subs->{librarian},
-	aqbooksellerid => $subs->{aqbooksellerid},
-	aqbooksellername => $subs->{aqbooksellername},
-	cost => $subs->{cost},
-	aqbudgetid => $subs->{aqbudgetid},
-	bookfundid => $subs->{bookfundid},
-	startdate => format_date($subs->{startdate}),
-	publisheddate => format_date($subs->{publisheddate}),    
-	periodicity => $subs->{periodicity},
-	dow => $subs->{dow},
-        irregularity => $subs->{irregularity},
-	numberlength => $subs->{numberlength},
-	weeklength => $subs->{weeklength},
-	monthlength => $subs->{monthlength},
-        numberpattern => $subs->{numberpattern},
-	add1 => $subs->{add1},
-	every1 => $subs->{every1},
-	whenmorethan1 => $subs->{whenmorethan1},
-	innerloop1 => $subs->{innerloop1},
-	setto1 => $subs->{setto1},
-	lastvalue1 => $subs->{lastvalue1},
-	add2 => $subs->{add2},
-	every2 => $subs->{every2},
-	whenmorethan2 => $subs->{whenmorethan2},
-	setto2 => $subs->{setto2},
-	lastvalue2 => $subs->{lastvalue2},
-	innerloop2 => $subs->{innerloop2},
-	add3 => $subs->{add3},
-	every3 => $subs->{every3},
-	whenmorethan3 => $subs->{whenmorethan3},
-	setto3 => $subs->{setto3},
-	lastvalue3 => $subs->{lastvalue3},
-	innerloop3 => $subs->{innerloop3},
-        weekarrayjs => $weekarrayjs,
-	numberingmethod => $subs->{numberingmethod},
-	status => $subs->{status},
-	biblionumber => $subs->{biblionumber},
-	bibliotitle => $subs->{bibliotitle},
-        callnumber => $subs->{callnumber},
-	notes => $subs->{notes},
-	subscriptionid => $subs->{subscriptionid},
-	serialslist => \@serialslist,
-	totalissues => $totalissues,
-        hemisphere => $hemisphere,
-	);
-$template->param(
-			"periodicity$subs->{periodicity}" => 1,
-			"arrival$subs->{dow}" => 1,
-                        "numberpattern$subs->{numberpattern}" => 1,
-			intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-			intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), 
-			);
-
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/serials/subscription-detail.pl
===================================================================
RCS file: cgi-bin/serials/subscription-detail.pl
diff -N cgi-bin/serials/subscription-detail.pl
--- cgi-bin/serials/subscription-detail.pl	10 Mar 2007 01:27:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,131 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Koha;
-use C4::Date;
-use C4::Serials;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Context;
-use DateTime;
-
-my $query = new CGI;
-my $op = $query->param('op');
-my $dbh = C4::Context->dbh;
-my $sth;
-# my $id;
-my ($template, $loggedinuser, $cookie, $subs);
-my ($subscriptionid,$auser,$librarian,$cost,$aqbooksellerid, $aqbooksellername,$aqbudgetid, $bookfundid, $startdate, $periodicity,
-	$publisheddate, $dow, $irregularity, $sublength, $subtype, $numberpattern, $numberlength, $weeklength, $monthlength,
-	$add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
-	$add2,$every2,$whenmorethan2,$setto2,$lastvalue2,$innerloop2,
-	$add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
-	$numberingmethod, $status, $biblionumber, $bibliotitle, $callnumber, $notes, $hemisphere);
-
-$subscriptionid = $query->param('subscriptionid');
-
-
-if ($op eq 'del') {
-$biblionumber = $query->param('biblionumber');
-	&DelSubscription($subscriptionid,$biblionumber);
-print	$query->redirect("/cgi-bin/koha/serials/serials-home.pl");
-#	exit;
-
-}
-my $subs = &GetSubscription($subscriptionid);
-my ($routing, @routinglist) = getroutinglist($subscriptionid);
-my ($totalissues, at serialslist) = GetSerials($subscriptionid);
-$totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
-# the subscription must be deletable if there is NO issues for a reason or another (should not happend, but...)
-
-($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/subscription-detail.tmpl",
-				query => $query,
-				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {catalogue => 1},
-				debug => 1,
-				});
-
-my ($user, $cookie, $sessionID, $flags)
-	= checkauth($query, 0, {catalogue => 1}, "intranet");
-
-my $weekarrayjs='';
-my $count = 0;
-my $today=get_today();
- my $dateobj=DATE_obj($today);
-  my $year=$dateobj->year;
-  my $month=$dateobj->month;
-  my $day=$dateobj->day_of_month;
-my $firstday = $dateobj->day_of_year;
-my $wkno = $dateobj->week_number;
-my $weekno = $wkno;
-for(my $i=$firstday;$i<($firstday+365);$i=$i+7){
-        $count = $i;
-        if($wkno > 52){$year++; $wkno=1;}
-        if($count>365){$count=$i-365;}    
-     my $newdate=DateTime->from_day_of_year(year=>$year,day_of_year=>$count);
-        $weekarrayjs .= "'Wk $wkno: ".format_date($newdate->ymd)."',";
-        $wkno++;    
-}
-chop($weekarrayjs);
-
-$template->param(
-        routing => $routing,
-	user => $subs->{auser},
-	librarian => $subs->{librarian},
-	aqbooksellerid => $subs->{aqbooksellerid},
-	aqbooksellername => $subs->{aqbooksellername},
-	cost => $subs->{cost},
-	aqbudgetid => $subs->{aqbudgetid},
-	bookfundid => $subs->{bookfundid},
-	startdate => format_date($subs->{startdate}),
-	publisheddate => format_date($subs->{publisheddate}),    
-	periodicity => $subs->{periodicity},
-	dow => $subs->{dow},
-        irregularity => $subs->{irregularity},
-	numberlength => $subs->{numberlength},
-	weeklength => $subs->{weeklength},
-	monthlength => $subs->{monthlength},
-        numberpattern => $subs->{numberpattern},
-	add1 => $subs->{add1},
-	every1 => $subs->{every1},
-	whenmorethan1 => $subs->{whenmorethan1},
-	innerloop1 => $subs->{innerloop1},
-	setto1 => $subs->{setto1},
-	lastvalue1 => $subs->{lastvalue1},
-	add2 => $subs->{add2},
-	every2 => $subs->{every2},
-	whenmorethan2 => $subs->{whenmorethan2},
-	setto2 => $subs->{setto2},
-	lastvalue2 => $subs->{lastvalue2},
-	innerloop2 => $subs->{innerloop2},
-	add3 => $subs->{add3},
-	every3 => $subs->{every3},
-	whenmorethan3 => $subs->{whenmorethan3},
-	setto3 => $subs->{setto3},
-	lastvalue3 => $subs->{lastvalue3},
-	innerloop3 => $subs->{innerloop3},
-        weekarrayjs => $weekarrayjs,
-	numberingmethod => $subs->{numberingmethod},
-	status => $subs->{status},
-	biblionumber => $subs->{biblionumber},
-	bibliotitle => $subs->{bibliotitle},
-        callnumber => $subs->{callnumber},
-	notes => $subs->{notes},
-	subscriptionid => $subs->{subscriptionid},
-	serialslist => \@serialslist,
-	totalissues => $totalissues,
-        hemisphere => $hemisphere,
-	);
-$template->param(
-			"periodicity$subs->{periodicity}" => 1,
-			"arrival$subs->{dow}" => 1,
-                        "numberpattern$subs->{numberpattern}" => 1,
-			intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-			intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), 
-			);
-
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/serials/subscription-renew.pl
===================================================================
RCS file: cgi-bin/serials/subscription-renew.pl
diff -N cgi-bin/serials/subscription-renew.pl
--- cgi-bin/serials/subscription-renew.pl	10 Mar 2007 01:27:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,100 +0,0 @@
-#!/usr/bin/perl
-# WARNING: 4-character tab stops here
-
-# 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
-
-# $Id: subscription-renew.pl,v 1.1.2.1 2007/03/10 01:27:27 tgarip1957 Exp $
-
-=head1 NAME
-
-subscription-renew.pl
-
-=head1 DESCRIPTION
-
-this script renew an existing subscription.
-
-=head1 Parameters
-
-=over 4
-
-=item op
-op use to know the operation to do on this template.
- * renew : to renew the subscription.
-
-Note that if op = modsubscription there are a lot of other parameters.
-
-=item subscriptionid
-Id of the subscription this script has to renew
-
-=back
-
-=cut
-
-
-use strict;
-require Exporter;
-use CGI;
-use C4::Koha;
-use C4::Auth;
-use C4::Date;
-use C4::Context;
-use C4::Search;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Serials;
-
-my $query = new CGI;
-my $dbh = C4::Context->dbh;
-
-my $op = $query->param('op');
-my $subscriptionid = $query->param('subscriptionid');
-my $done = 0; # for after form has been submitted
-my ($template, $loggedinuser, $cookie)
-        = get_template_and_user({template_name => "serials/subscription-renew.tmpl",
-                query => $query,
-                type => "intranet",
-                authnotrequired => 0,
-                flagsrequired => {catalogue => 1},
-                debug => 1,
-                });
-if ($op eq "renew") {
-    ReNewSubscription($subscriptionid,$loggedinuser,$query->param('startdate'),$query->param('numberlength'),$query->param('weeklength'),$query->param('monthlength'),$query->param('note'));
-    $done = 1;
-}
-
-my $subscription= GetSubscription($subscriptionid);
-
-$template->param(startdate => format_date(GetSubscriptionExpirationDate($subscriptionid)),
-                numberlength => $subscription->{numberlength},
-                weeklength => $subscription->{weeklength},
-                monthlength => $subscription->{monthlength},
-                subscriptionid => $subscriptionid,
-                bibliotitle => $subscription->{bibliotitle},
-                $op => 1,
-                done => $done,
-                intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-                intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-                IntranetNav => C4::Context->preference("IntranetNav"),
-            );
-
-# Print the page
-output_html_with_http_headers $query, $cookie, $template->output;
-
-# Local Variables:
-# tab-width: 4
-# End:

Index: cgi-bin/serials/viewalerts.pl
===================================================================
RCS file: cgi-bin/serials/viewalerts.pl
diff -N cgi-bin/serials/viewalerts.pl
--- cgi-bin/serials/viewalerts.pl	10 Mar 2007 01:27:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,60 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: viewalerts.pl,v 1.1.2.1 2007/03/10 01:27:27 tgarip1957 Exp $
-
-# 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::Auth;
-use C4::Context;
-
-use CGI;
-use C4::Interface::CGI::Output;
-
-use C4::Koha;
-use C4::Letters;
-use C4::Serials;
-
-my $dbh = C4::Context->dbh;
-
-my $input = new CGI;
-my $print = $input->param('print');
-
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => 'serials/viewalerts.tmpl',
-                 query => $input,
-                 type => "intranet",
-                 authnotrequired => 0,
-                 flagsrequired => {catalogue => 1},
-                 debug => 1,
-                 });
-
-my $subscriptionid=$input->param('subscriptionid');
-
-my $borrowers = getalert('','issue',$subscriptionid);
-my $subscription = GetSubscription($subscriptionid);
-
-foreach (@$borrowers) {
-    $_->{name} = findrelatedto('borrower',$_->{borrowernumber});
-}
-$template->param(alertloop => $borrowers,
-                bibliotitle => $subscription->{bibliotitle},
-                subscriptionid => $subscriptionid);
-
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/sms/sms.pl
===================================================================
RCS file: cgi-bin/sms/sms.pl
diff -N cgi-bin/sms/sms.pl
--- cgi-bin/sms/sms.pl	10 Mar 2007 01:29:01 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use CGI;
-use C4::SMS;
-use C4::Interface::CGI::Output;
-use C4::Auth;
-my ($res,$ua);
-my %commands;
-my $query = new CGI;
-my $message=$query->param('message');
-my $phone=$query->param('phone');
-my $operation=$query->param('operation');
-my $result;
-my $errorcode;
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "sms/sms-home.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {circulate => 1},
-			     debug => 1,
-			     });
-if ($operation eq"sendsms"){
- $phone=parse_phone($phone);
-  if ($phone>0){
-##write to a queue and exit
-my $me=C4::Context->userenv;
-my $card=$me->{cardnumber};
-	 $result=write_sms($card,$message,$phone);
-
-  }else{
-  $errorcode=-1104;
- }
-}
-my $error=error_codes($errorcode);
-$template->param(error=>$error);
-output_html_with_http_headers $query, $cookie, $template->output;
-
-
-
-
-

Index: cgi-bin/suggestion/acceptorreject.pl
===================================================================
RCS file: cgi-bin/suggestion/acceptorreject.pl
diff -N cgi-bin/suggestion/acceptorreject.pl
--- cgi-bin/suggestion/acceptorreject.pl	10 Mar 2007 01:29:55 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,126 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-# $Id: acceptorreject.pl,v 1.1.2.1 2007/03/10 01:29:55 tgarip1957 Exp $
-
-=head1 NAME
-
-acceptorreject.pl
-
-=head1 DESCRIPTION
-
-this script modify the status of a subscription to ACCEPTED or to REJECTED
-
-=head1 PARAMETERS
-
-=over 4
-
-=item title
-
-=item author
-
-=item note
-
-=item copyrightdate
-
-=item publishercode
-
-=item volumedesc
-
-=item publicationyear
-
-=item place
-
-=item isbn
-
-=item status
-
-=item suggestedbyme
-
-=item op
-op can be :
- * aorr_confirm : to confirm accept or reject
- * delete_confirm : to confirm the deletion
-
-=back
-
-
-=cut
-
-
-use strict;
-require Exporter;
-use CGI;
-use C4::Auth;       # get_template_and_user
-use C4::Interface::CGI::Output;
-use C4::Suggestions;
-
-my $input = new CGI;
-my $title = $input->param('title');
-my $author = $input->param('author');
-my $note = $input->param('note');
-my $copyrightdate =$input->param('copyrightdate');
-my $publishercode = $input->param('publishercode');
-my $volumedesc = $input->param('volumedesc');
-my $publicationyear = $input->param('publicationyear');
-my $place = $input->param('place');
-my $isbn = $input->param('isbn');
-my $status = $input->param('status');
-my $suggestedbyme = $input->param('suggestedbyme');
-my $op = $input->param('op');
-$op = 'else' unless $op;
-
-my $dbh = C4::Context->dbh;
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "suggestion/acceptorreject.tmpl",
-			    query           => $input,
-        			type            => "intranet",
-       			 authnotrequired => 0,
-       			 flagsrequired   => { acquisition => 1 },
-       			debug           => 1,
-  			  });
-if ($op eq "aorr_confirm") {
-	my @suggestionlist = $input->param("aorr");
-	foreach my $suggestion (@suggestionlist) {
-		if ($suggestion =~ /(A|R)(.*)/) {
-			my ($newstatus,$suggestionid) = ($1,$2);
-			$newstatus="REJECTED" if $newstatus eq "R";
-			$newstatus="ACCEPTED" if $newstatus eq "A";
-			ModStatus($suggestionid,$newstatus,$loggedinuser,'',$input);
-		}
-	}
-	$op="else";
-}
-
-if ($op eq "delete_confirm") {
-	my @delete_field = $input->param("delete_field");
-	foreach my $delete_field (@delete_field) {
-		&DelSuggestion($loggedinuser,$delete_field);
-	}
-	$op='else';
-}
-
-my $suggestions_loop= &SearchSuggestion("","","","",'ASKED',"");
-$template->param(suggestions_loop => $suggestions_loop,
-		"op_$op" => 1,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-);
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/tools/barcodes.pl
===================================================================
RCS file: cgi-bin/tools/barcodes.pl
diff -N cgi-bin/tools/barcodes.pl
--- cgi-bin/tools/barcodes.pl	10 Mar 2007 01:31:04 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,143 +0,0 @@
-#!/usr/bin/perl
-
-# script to generate items barcodes
-# written 07/04
-# by Veleda Matias - matias_veleda at hotmail.com - Physics Library UNLP Argentina and
-#    Castañeda Sebastian - seba3c at yahoo.com.ar - Physics Library UNLP Argentina and
-
-# 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 CGI;
-use C4::Auth;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Database;
-use HTML::Template;
-use C4::Context;
-use C4::Barcodes::PrinterConfig;
-
-
-
-# This function returns the path to deal with the correct files, considering
-# templates set and language.
-sub getPath {
-	my $type = shift @_;
-	my $templatesSet = C4::Context->preference('template');
-	my $lang = C4::Context->preference('opaclanguages');
-	if ($type eq "intranet") {
-		return "$ENV{'DOCUMENT_ROOT'}/intranet-tmpl/$templatesSet/$lang";
-	} else {
-		return "$ENV{'DOCUMENT_ROOT'}/opac-tmpl/$templatesSet/$lang";
-	}
-}
-
-# Load a configuration file. Before use this function, check if that file exists.
-sub loadConfFromFile {
-  my $fileName = shift @_;
-	my %keyValues;
-	open FILE, "<$fileName";
-	while (<FILE>) {
-		chomp;
-		if (/\s*([\w_]*)\s*=\s*([\[\]\<\>\w_\s:@,\.-]*)\s*/) {
-			$keyValues{$1} = $2;
-		}
-	}
-	close FILE;
-	return %keyValues;
-}
-
-# Save settings to a configuration file. It delete previous configuration settings.
-sub saveConfToFile {
-	my $fileName = shift @_;
-	my %keyValues = %{shift @_};
-	my $i;
-	open FILE, ">$fileName";			
-	my $i;
-	foreach $i (keys(%keyValues)) {
-    print FILE $i." = ".$keyValues{$i}."\n";
-	}
-	close FILE;
-}
-
-# Load the config file.
-my $filenameConf = &getPath("intranet")."/includes/labelConfig/itemsLabelConfig.conf";
-my %labelConfig = &loadConfFromFile($filenameConf);
-
-my $input = new CGI;
-# Defines type of page to use in the printer process
-my @labelTable = C4::Barcodes::PrinterConfig::labelsPage($labelConfig{'rows'}, $labelConfig{'columns'});
-
-# It creates a list of posible intervals to choose codes to generate
-my %list = ('continuous' => 'Continuous Range of items', 'individuals' => 'Individual Codes');
-my @listValues = keys(%list);
-my $rangeType = CGI::scrolling_list(-name => 'rangeType',
-                              		-values => \@listValues,
-			                        -labels => \%list,
-			                        -size => 1,
-									-default => ['continuous'],
-			                        -multiple => 0,
-									-id => "rangeType",
-									-onChange => "changeRange(this)");
-# It creates a list of posible standard codifications. First checks if the user has just added a new code.
-if ($input->param('addCode')) {
-	my $newCountryName = $input->param('countryName');
-	my $newCountryCode = $input->param('countryCode'); 
-
-	my $countryCodesFilename = &getPath("intranet")."/includes/countryCodes/countryCodes.dat";
-	open COUNTRY_CODES, ">>$countryCodesFilename";			
-    print COUNTRY_CODES $newCountryCode." = ".$newCountryName."\n";
-	close COUNTRY_CODES;
-}
-
-# Takes the country codes from a file and use them to set the country list.
-my $countryCodes = &getPath("intranet")."/includes/countryCodes/countryCodes.dat";
-my %list = &loadConfFromFile($countryCodes);
- at listValues = keys(%list);
-my $number_system = CGI::scrolling_list(-name => 'numbersystem',
-                              		    -values => \@listValues,
-			                            -labels   => \%list,
-			                            -size     => 1,
-			                            -multiple => 0);
-
-# Set the script name
-my $script_name = "/cgi-bin/koha/tools/barcodesGenerator.pl";
-
-
-# Get the template to use
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "barcodes/barcodes.tmpl",
-			                 type => "intranet",
-			                 query => $input,
-			                 authnotrequired => 0,
-			                 flagsrequired => {parameters => 1},
-					         debug => 1,
-			               });
-
-# Replace the template values with the real ones
-$template->param(SCRIPT_NAME => $script_name);
-$template->param(NUMBER_SYSTEM => $number_system);
-$template->param(PAGES => $labelConfig{'pageType'});
-$template->param(RANGE_TYPE => $rangeType);
-$template->param(LABEL_TABLE => \@labelTable);
-$template->param(COL_SPAN => $labelConfig{'columns'});
-if ($input->param('error')) {
-	$template->param(ERROR => 1);
-} else {
-	$template->param(ERROR => 0);
-}
-# Shows the template with the real values replaced
-output_html_with_http_headers $input, $cookie, $template->output;
\ No newline at end of file

Index: cgi-bin/tools/barcodesGenerator.pl
===================================================================
RCS file: cgi-bin/tools/barcodesGenerator.pl
diff -N cgi-bin/tools/barcodesGenerator.pl
--- cgi-bin/tools/barcodesGenerator.pl	10 Mar 2007 01:31:04 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,302 +0,0 @@
-#!/usr/bin/perl
-
-# script to generate items barcodes
-# written 07/04
-# by Veleda Matias - matias_veleda at hotmail.com - Physics Library UNLP Argentina and
-#    Castañeda Sebastian - seba3c at yahoo.com.ar - Physics Library UNLP Argentina and
-
-# 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
-
-require Exporter;
-
-use strict;
-
-use CGI;
-use C4::Context;
-use C4::Output;
-use HTML::Template;
-use PDF::API2;
-use PDF::API2::Page;
-use PDF::API2::PDF::Utils;
-use C4::Barcodes::PrinterConfig;
-use Time::localtime; 
-
-
-# This function returns the path to deal with the correct files, considering
-# templates set and language.
-sub getPath {
-	my $type = shift @_;
-	my $templatesSet = C4::Context->preference('template');
-	my $lang = C4::Context->preference('opaclanguages');
-	if ($type eq "intranet") {
-		return "$ENV{'DOCUMENT_ROOT'}/intranet-tmpl/$templatesSet/$lang";
-	} else {
-		return "$ENV{'DOCUMENT_ROOT'}/opac-tmpl/$templatesSet/$lang";
-	}
-}
-
-# Load a configuration file. Before use this function, check if that file exists.
-sub loadConfFromFile {
-  my $fileName = shift @_;
-	my %keyValues;
-	open FILE, "<$fileName";
-	while (<FILE>) {
-		chomp;
-		if (/\s*([\w_]*)\s*=\s*([\[\]\<\>\w_\s:@,\.-]*)\s*/) {
-			$keyValues{$1} = $2;
-		}
-	}
-	close FILE;
-	return %keyValues;
-}
-
-# Save settings to a configuration file. It delete previous configuration settings.
-sub saveConfToFile {
-	my $fileName = shift @_;
-	my %keyValues = %{shift @_};
-	my $i;
-	open FILE, ">$fileName";			
-	my $i;
-	foreach $i (keys(%keyValues)) {
-    print FILE $i." = ".$keyValues{$i}."\n";
-	}
-	close FILE;
-}
-
-# Load the config file.
-my $filenameConf = &getPath("intranet")."/includes/labelConfig/itemsLabelConfig.conf";
-my %labelConfig = &loadConfFromFile($filenameConf);
-
-# Creates a CGI object and take its parameters
-my $cgi = new CGI;
-my $from = $cgi->param('from');
-my $to = $cgi->param('to');
-my $individualCodes = $cgi->param('individualCodes');
-my $rangeType = $cgi->param('rangeType');
-my $pageType = $cgi->param('pages');
-my $label = $cgi->param('label');
-my $numbersystem = $cgi->param('numbersystem');
-my $text_under_label = $cgi->param('text_under_label');
-
-# Generate the checksum from an inventary code
-sub checksum {
-
-  sub calculateDigit {
-    my $code = shift @_;
-    my $sum = 0;
-	  my $odd_parity = 1;
-    my $i;
-    for ($i = length($code) - 1; $i >= 0; $i--){
-	   if ( $odd_parity ) {
-		  $sum = $sum + ( 3 * substr($code, $i, 1) );
-     } else {
-			$sum = $sum + substr($code, $i, 1); }
-		  $odd_parity = !$odd_parity;
-	   }
-    my $check_digit = 10 - ($sum%10);
-	if ($check_digit==10) {
-		$check_digit=0;
-	}
-	  return $code.$check_digit;
-  }
-
-  my $currentCode = shift @_;
-  $currentCode = &calculateDigit($currentCode);
-  return $currentCode;
-}
-
-# Assigns a temporary name to the PDF file
-sub assingFilename {
-	my ($from, $to) = @_;
-	my $ip = $cgi->remote_addr();
-	my $random = int(rand(1000000));
-    my $timeObj = localtime();
-	my ($day, $month, $year, $hour, $min, $sec) = ($timeObj->mday,
-												   $timeObj->mon + 1,
-												   $timeObj->year + 1900,
-  												   $timeObj->hour,
-												   $timeObj->min,
-												   $timeObj->sec);
-	my $tmpFileName = $random.'-'.$ip.'-(From '.$from.' to '.$to.')-['.$day.'.'.$month.'.'.$year.']-['.$hour.':'.$min.':'.$sec.'].pdf';
-	return $tmpFileName;
-}
-sub getCallnum {
-#grabs a callnumber for the specified barcode
-my ($barcode) = @_;
-my $query = "select dewey from items,biblioitems where items.biblionumber=biblioitems.biblionumber and items.barcode=?";
-my $dbh = C4::Context->dbh;
-my $sth = $dbh->prepare($query);
-$sth->execute($barcode);
-my ($callnum) = $sth->fetchrow_array();
-warn "Call number is:".$barcode;
-return $callnum;
-}
-# Takes inventary codes from database and if they are between
-# the interval specify by parameters, it generates the correspond barcodes
-sub barcodesGenerator {
-	my ($from, $to, $rangeType, $individualCodes,$text_under_label) = @_;
-	# Returns a database handler
-	my $dbh = C4::Context->dbh;
-	# Create the query to database
-	# Assigns a temporary filename for the pdf file
-	my $tmpFileName = &assingFilename($from, $to);
-	# warn "range type: ".$rangeType;
-	if ($rangeType eq 'continuous') {
-		# Set the temp directory for pdf´s files
-		if (!defined($ENV{'TEMP'})) {
-			$ENV{'TEMP'} = '/tmp/';
-		}	
-		$tmpFileName = $ENV{'TEMP'}.$tmpFileName;
-		# Creates a PDF object
-		my $pdf = PDF::API2->new(-file => $tmpFileName);
-		# Set the positions where barcodes are going to be placed
-		C4::Barcodes::PrinterConfig::setPositionsForX($labelConfig{'marginLeft'}, $labelConfig{'labelWidth'}, $labelConfig{'columns'}, $labelConfig{'pageType'});
-		C4::Barcodes::PrinterConfig::setPositionsForY($labelConfig{'marginBottom'}, $labelConfig{'labelHeigth'}, $labelConfig{'rows'}, $labelConfig{'pageType'});
-		# Creates a font object
-		my $tr = $pdf->corefont('Helvetica-Bold');
-		# Barcode position
-		my ($page, $gfx, $text);
-		for (my $code=$from; $code<=$to; $code++) {
-			# Generetase checksum
-			my $codeC = &checksum($code);
-			# Generate the corresponde barcode to $code
-			# warn "Code is :-->".$codeC."<--";
-			my $barcode = $pdf->barcode(-font => $tr,	# The font object to use
-										-type => 'ean128',	# Standard of codification
-										-code => $codeC, # Text to codify
-										-extn	=> '012345',	# Barcode extension (if it is aplicable)
-										-umzn => 10,		# Top limit of the finished bar
-										-lmzn => 10,		# Bottom limit of the finished bar
-										-zone => 15,		# Bars size
-										-quzn => 0,		# Space destinated for legend
-										-ofwt => 0.01,	# Bars width
-										-fnsz => 8,		# Font size
-										-text => ''
-										);
-			
-			(my $x, my $y, $pdf, $page, $gfx, $text, $tr, $label) = C4::Barcodes::PrinterConfig::getLabelPosition(
-																						$label, 
-																						$pdf, 
-																						$page,
-																						$gfx,
-																						$text,
-																						$tr,
-																						$pageType);	
-			# Assigns a barcodes to $gfx
-			$gfx->barcode($barcode, $x, $y , (72/$labelConfig{'systemDpi'}));
-			# Assigns the additional information to the barcode (Legend)
-			$text->translate($x - 48, $y - 22);
-			warn "code is ".$codeC;
-			if ($text_under_label) {
-				$text->text($text_under_label);
-			} else {
-			$text->text(getCallnum($code));
-			}
-		}
-		# Writes the objects added in $gfx to $page
-		$pdf->finishobjects($page,$gfx, $text);
-		# Save changes to the PDF
-		$pdf->saveas;
-		# Close the conection with the PDF file
-		$pdf->end;
-		# Show the PDF file
-		print $cgi->redirect("/cgi-bin/koha/barcodes/pdfViewer.pl?tmpFileName=$tmpFileName");
-	} else {
-		my $rangeCondition;
-		if ($individualCodes ne "") {
-			$rangeCondition = "AND (I.barcode IN " . $individualCodes . ")";
-		} else {
-			$rangeCondition =  "AND (I.barcode >= " . $from . " AND I.barcode <="  . $to . " )";
-		}
-		warn "above the query";	
-		my $query = "SELECT CONCAT('$numbersystem',REPEAT('0',((12 - LENGTH('$numbersystem')) - LENGTH(I.barcode))), I.barcode) AS Codigo, I.dewey as dewey B.title, B.author FROM biblio B, items I WHERE (I.biblionumber = B.biblioNumber ) " .$rangeCondition. " AND (I.barcode <> 'FALTA') ORDER BY Codigo";
-		
-		# Prepare the query
-		my $sth = $dbh->prepare($query);
-		# Executes the query
-		$sth->execute;
-		if ($sth->rows) { # There are inventary codes
-			# Set the temp directory for pdf´s files
-			if (!defined($ENV{'TEMP'})) {
-				$ENV{'TEMP'} = '/tmp/';
-			}	
-			# Assigns a temporary filename for the pdf file
-			my $tmpFileName = &assingFilename($from, $to);
-			$tmpFileName = $ENV{'TEMP'}.$tmpFileName;
-			# Creates a PDF object
-			my $pdf = PDF::API2->new(-file => $tmpFileName);
-			# Set the positions where barcodes are going to be placed
-			C4::Barcodes::PrinterConfig::setPositionsForX($labelConfig{'marginLeft'}, $labelConfig{'labelWidth'}, $labelConfig{'columns'}, $labelConfig{'pageType'});
-			C4::Barcodes::PrinterConfig::setPositionsForY($labelConfig{'marginBottom'}, $labelConfig{'labelHeigth'}, $labelConfig{'rows'}, $labelConfig{'pageType'});
-			# Creates a font object
-			my $tr = $pdf->corefont('Helvetica-Bold');
-			# Barcode position
-			my ($page, $gfx, $text);
-			while (my ($code,$dewey,$title,$author) = $sth->fetchrow_array) {
-				# Generetase checksum
-				$code = &checksum($code);
-				# Generate the corresponde barcode to $code
-				my $barcode = $pdf->barcode(-font => $tr,	# The font object to use
-											-type => 'ean13',	# Standard of codification
-											-code => $code, # Text to codify
-											-extn	=> '012345',	# Barcode extension (if it is aplicable)
-											-umzn => 10,		# Top limit of the finished bar
-											-lmzn => 10,		# Bottom limit of the finished bar
-											-zone => 15,		# Bars size
-											-quzn => 0,		# Space destinated for legend
-											-ofwt => 0.01,	# Bars width
-											-fnsz => 8,		# Font size
-											-text => ''
-											);
-				
-				(my $x, my $y, $pdf, $page, $gfx, $text, $tr, $label) = C4::Barcodes::PrinterConfig::getLabelPosition(
-																							$label, 
-																							$pdf, 
-																							$page,
-																							$gfx,
-																							$text,
-																							$tr,
-																							$pageType);	
-				# Assigns a barcodes to $gfx
-				$gfx->barcode($barcode, $x, $y , (72/$labelConfig{'systemDpi'}));
-				# Assigns the additional information to the barcode (Legend)
-				$text->translate($x - 48, $y - 22);
-				if ($text_under_label) {
-					$text->text($text_under_label);
-				} else {
-					warn "here a dewey:".$dewey;
-					$text->text(substr $dewey, 0, 30);
-					$text->translate($x - 48, $y - 29);
-					#$text->text(substr $author, 0, 30);
-				}
-			}
-			# Writes the objects added in $gfx to $page
-			$pdf->finishobjects($page,$gfx, $text);
-			# Save changes to the PDF
-			$pdf->saveas;
-			# Close the conection with the PDF file
-			$pdf->end;
-			# Show the PDF file
-			print $cgi->redirect("/cgi-bin/koha/tools/pdfViewer.pl?tmpFileName=$tmpFileName");
-		} else {
-			# Rollback and shows the error legend
-			print $cgi->redirect("/cgi-bin/koha/tools/barcodes.pl?error=1");
-		}
-	$sth->finish;
-	}
-}
-
-barcodesGenerator($from, $to, $rangeType, $individualCodes,$text_under_label);

Index: cgi-bin/tools/exceptionHolidays.pl
===================================================================
RCS file: cgi-bin/tools/exceptionHolidays.pl
diff -N cgi-bin/tools/exceptionHolidays.pl
--- cgi-bin/tools/exceptionHolidays.pl	10 Mar 2007 01:31:04 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use CGI;
-
-use C4::Auth;
-
-use C4::Interface::CGI::Output;
-use C4::Calendar::Calendar;
-
-my $input = new CGI;
-my $dbh = C4::Context->dbh();
-
-my $branchcode = $input->param('showBranchName');
-my $weekday = $input->param('showWeekday');
-my $day = $input->param('showDay');
-my $month = $input->param('showMonth');
-my $year = $input->param('showYear');
-my $title = $input->param('showTitle');
-my $description = $input->param('showDescription');
-
-my $calendar = C4::Calendar::Calendar->new(branchcode => $branchcode);
-
-if ($input->param('showOperation') eq 'exception') {
-	$calendar->insert_exception_holiday(day => $day,
-										month => $month,
-									    year => $year,
-						                title => $title,
-						                description => $description);
-} elsif ($input->param('showOperation') eq 'delete') {
-	$calendar->delete_holiday(weekday => $weekday,
-	                          day => $day,
-  	                          month => $month,
-				              year => $year);
-}
-print $input->redirect("/cgi-bin/koha/tools/holidays.pl?branch=$branchcode");

Index: cgi-bin/tools/export.pl
===================================================================
RCS file: cgi-bin/tools/export.pl
diff -N cgi-bin/tools/export.pl
--- cgi-bin/tools/export.pl	10 Mar 2007 01:31:04 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-#!/usr/bin/perl
-use strict;
-
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Biblio;
-use CGI;
-use C4::Auth;
-use MARC::Record;
-use MARC::File::XML;
-my $query = new CGI;
-my $op=$query->param("op");
-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;
-	if ($start_bib && $end_bib) {
-		$sth=$dbh->prepare("select marcxml from biblio where biblionumber >=? and biblionumber <=? order by biblionumber");
-		$sth->execute($start_bib,$end_bib);
-	} elsif ($start_bib ) {
-		$sth=$dbh->prepare("select marcxml from biblio where biblionumber >=?  order by biblionumber");
-		$sth->execute($start_bib);
-	}else {
-		$sth=$dbh->prepare("select marcxml from biblio order by biblionumber");
-		$sth->execute();
-	}
-	while (my ($marc) = $sth->fetchrow) {
-my $record=MARC::Record->new_from_xml($marc,"UTF-8");
-	
-		print $record->as_usmarc;;
-	
-	}
-} else {
-	my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "tools/marc.tmpl",
-					query => $query,
-					type => "intranet",
-					authnotrequired => 0,
-					flagsrequired => {parameters => 1, management => 1, tools => 1},
-					debug => 1,
-					});
-	output_html_with_http_headers $query, $cookie, $template->output;
-}
-

Index: cgi-bin/tools/fines2.pl
===================================================================
RCS file: cgi-bin/tools/fines2.pl
diff -N cgi-bin/tools/fines2.pl
--- cgi-bin/tools/fines2.pl	10 Mar 2007 01:31:04 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,139 +0,0 @@
-#!/usr/bin/perl
-
-#  This script loops through each overdue item, determines the fine,
-#  and updates the total amount of fines due by each user.  It relies on
-#  the existence of /tmp/fines, which is created by ???
-# Doesnt really rely on it, it relys on being able to write to /tmp/
-# It creates the fines file
-#
-#  This script is meant to be run nightly out of cron.
-
-# 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
-
-# $Id: fines2.pl,v 1.1.2.1 2007/03/10 01:31:04 tgarip1957 Exp $
-
-use C4::Context;
-use C4::Search;
-use C4::Circulation::Circ2;
-use C4::Circulation::Fines;
-use C4::Accounts2;
-use C4::Date;
-use C4::Biblio;
-
-#
-my ($numOverdueItems,$data)=Getoverdues();
-
-my $overdueItemsCounted=0 if $DEBUG;
-
-# FIXME - There's got to be a better way to figure out what day
-# today is.
-
-
-my $date=get_today();
-
-
-
-my $bornum;
-
-# FIXME
-# $total isn't used anywhere else in the file,
-# can we delete it?
-#
-my $total=0;
-
-# FIXME
-# this probably ought to be a global variable or constant
-# defined in a central place
-#
-# Yep
-my $maxFine=30;
-
-
-
-
-for (my $i=0;$i<$numOverdueItems;$i++){
-  my @dates=split('-',$data->[$i]->{'date_due'});
-  my $date2=$data->[$i]->{'date_due'};
-  my $due=format_date($date2);
-  my $borrower=BorType($data->[$i]->{'borrowernumber'});
-  if ($date2 lt $date){
-    $overdueItemsCounted++ if $DEBUG;
-my $difference;
-eval {
-   $difference=DATE_subtract($date,$date2);
-};
-    my ($amount,$type,$printout)=
-	CalcFine($data->[$i]->{'itemnumber'},
-		 $borrower->{'categorycode'},
-		 $difference);
-    if ($amount > $maxFine){
-      $amount=$maxFine;
-    }
-    if ($amount > 0){
-      UpdateFine($data->[$i]->{'itemnumber'},$data->[$i]->{'borrowernumber'},$amount,$type,$due);
-
-
-
-       if ($borrower->{'categorycode'} eq 'C'){ 
-	 my $dbh = C4::Context->dbh;
-	 my $sth=$dbh->prepare("Select * from borrowers where borrowernumber=?");
-	 $sth->execute($borrower->{'guarantor'});
-	 my $tdata=$sth->fetchrow_hashref;
-	 $sth->finish;
-	 $borrower->{'phone'}=$tdata->{'phone'};
-       }
-#       print "$printout\t$borrower->{'cardnumber'}\t$borrower->{'categorycode'}\t$borrower->{'firstname'}\t$borrower->{'surname'}\t$data->[$i]->{'date_due'}\t$type\t$difference\t$borrower->{'emailaddress'}\t$borrower->{'phone'}\t$borrower->{'streetaddress'}\t$borrower->{'city'}\t$amount\n";
-    } 
-
-
-    if ($amount ==$maxFine){ # FIXME
-	                    # this should be a separate function
-                            #
-      my $borrower=BorType($data->[$i]->{'borrowernumber'});
-      if ($borrower->{'cardnumber'} ne ''){
-       my $cost=ReplacementCost($data->[$i]->{'itemnumber'});
-	 $cost=$maxFine unless $cost;
-	my $dbh = C4::Context->dbh;
-	my $env;
-	my $accountno=getnextacctno($env,$data->[$i]->{'borrowernumber'},$dbh);
-	
-	 my $item=getiteminformation("",$data->[$i]->{'itemnumber'});
-	
-	if ($item->{'itemlost'} ne '1' && $item->{'itemoverdue'} ne '1' ){
-
-
-	  my $sth=$dbh->prepare("Insert into accountlines
-	  (borrowernumber,itemnumber,accountno,date,amount,
-	  description,accounttype,amountoutstanding) values
-	  (?,?,?,now(),?,?,'L',?)");
-	  $sth->execute($data->[$i]->{'borrowernumber'},$data->[$i]->{'itemnumber'},
-	  $accountno,$cost,"Very overdue  fee  $item->{'title'} $due",$cost);
-	  $sth->finish;
-	 XMLmoditemonefield($dbh,$item->{'biblionumber'},$item->{'itemnumber'},"itemoverdue","1");
-	}
-	
-      }
-    }
-
-  }
-}
-
-
-
-close FILE;
-

Index: cgi-bin/tools/holidays.pl
===================================================================
RCS file: cgi-bin/tools/holidays.pl
diff -N cgi-bin/tools/holidays.pl
--- cgi-bin/tools/holidays.pl	10 Mar 2007 01:31:04 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,100 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use CGI;
-
-use C4::Auth;
-
-use C4::Interface::CGI::Output;
-
-use C4::Calendar::Calendar;
-
-my $input = new CGI;
-my $branch = $input->param('branch');
-$branch=C4::Context->preference('defaultBranch') unless $branch;
-my $dbh = C4::Context->dbh();
-
-# Set all the branches.
-my $branches = $dbh->prepare("select branchcode, branchname from branches");
-$branches->execute;
-# It creates a list of branches
-my %list;
-while (my ($branchcode, $branchname) = $branches->fetchrow) {
-	$list{$branchcode} = $branchname;
-}
-my @listValues = keys(%list);
-if (!defined($branch)) {
-	$branch =$listValues[4];
-}
-my $branchesList = CGI::scrolling_list(-name => 'branch', -id=>'branch',
-                           		       -values => \@listValues,
-			                           -labels => \%list,
-			                           -size => 1,
-					 -default => [$branch],
-			                           -multiple => 0,
-					 -onChange => "changeBranch()");
-
-$branches->finish;
-
-# Get all the holidays
-my $calendar = C4::Calendar::Calendar->new(branchcode => $branch);
-my $week_days_holidays = $calendar->get_week_days_holidays();
-my @week_days;
-foreach my $weekday (keys %$week_days_holidays) {
-	my %week_day;
-	%week_day = (KEY => $weekday,
-		         TITLE => $week_days_holidays->{$weekday}{title},
-		         DESCRIPTION => $week_days_holidays->{$weekday}{description});
-	push @week_days, \%week_day;
-}
-
-my $day_month_holidays = $calendar->get_day_month_holidays();
-my @day_month_holidays;
-foreach my $monthDay (keys %$day_month_holidays) {
-	my %day_month;
-	%day_month = (KEY => $monthDay,
-		          TITLE => $day_month_holidays->{$monthDay}{title},
-		          DESCRIPTION => $day_month_holidays->{$monthDay}{description});
-	push @day_month_holidays, \%day_month;
-}
-
-my $exception_holidays = $calendar->get_exception_holidays();
-my @exception_holidays;
-foreach my $yearMonthDay (keys %$exception_holidays) {
-	my %exception_holiday;
-	%exception_holiday = (KEY => $yearMonthDay,
-		                  TITLE => $exception_holidays->{$yearMonthDay}{title},
-		                  DESCRIPTION => $exception_holidays->{$yearMonthDay}{description});
-	push @exception_holidays, \%exception_holiday;
-}
-
-my $single_holidays = $calendar->get_single_holidays();
-my @holidays;
-foreach my $yearMonthDay (keys %$single_holidays) {
-	my %holiday;
-	%holiday = (KEY => $yearMonthDay,
-		        TITLE => $single_holidays->{$yearMonthDay}{title},
-		        DESCRIPTION => $single_holidays->{$yearMonthDay}{description});
-	push @holidays, \%holiday;
-}
-
-# Get the template to use
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "tools/holidays.tmpl",
-			                 type => "intranet",
-			                 query => $input,
-			                 authnotrequired => 0,
-			                 flagsrequired => {parameters => 1},
-					         debug => 1,
-			               });
-
-# Replace the template values with the real ones
-$template->param(BRANCHES => $branchesList);
-$template->param(WEEK_DAYS_LOOP => \@week_days);
-$template->param(HOLIDAYS_LOOP => \@holidays);
-$template->param(EXCEPTION_HOLIDAYS_LOOP => \@exception_holidays);
-$template->param(DAY_MONTH_HOLIDAYS_LOOP => \@day_month_holidays);
-$template->param(branch => $branch);
-
-# Shows the template with the real values replaced
-output_html_with_http_headers $input, $cookie, $template->output;
\ No newline at end of file

Index: cgi-bin/tools/import.pl
===================================================================
RCS file: cgi-bin/tools/import.pl
diff -N cgi-bin/tools/import.pl
--- cgi-bin/tools/import.pl	10 Mar 2007 01:31:04 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,106 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: import.pl,v 1.1.2.1 2007/03/10 01:31:04 tgarip1957 Exp $
-
-# Script for handling import of MARC data into Koha db
-#   and Z39.50 lookups
-
-# Koha library project  www.koha.org
-
-# Licensed under the GPL
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-
-# standard or CPAN modules used
-use CGI;
-
-# Koha modules used
-use C4::Context;
-use C4::Interface::CGI::Output;
-use C4::Auth;
-use C4::Breeding;
-
-#------------------
-# Constants
-
-
-
-# HTML colors for alternating lines
-my $lc1='#dddddd';
-my $lc2='#ddaaaa';
-
-#-------------
-#-------------
-# Initialize
-
-my $userid=$ENV{'REMOTE_USER'};
-
-my $input = new CGI;
-my $dbh = C4::Context->dbh;
-
-my $uploadmarc=$input->param('uploadmarc');
-my $overwrite_biblio = $input->param('overwrite_biblio');
-my $filename = $input->param('filename');
-my $syntax = $input->param('syntax');
-my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "tools/import.tmpl",
-					query => $input,
-					type => "intranet",
-					authnotrequired => 0,
-					flagsrequired => {parameters => 1, management => 1, tools => 1},
-					debug => 1,
-					});
-
-$template->param(SCRIPT_NAME => $ENV{'SCRIPT_NAME'},
-						uploadmarc => $uploadmarc);
-if ($uploadmarc && length($uploadmarc)>0) {
-	my $marcrecord='';
-	while (<$uploadmarc>) {
-		$marcrecord.=$_;
-	}
-	my ($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported) = ImportBreeding($marcrecord,$overwrite_biblio,$filename,$syntax,"");
-
-	$template->param(imported => $imported,
-							alreadyindb => $alreadyindb,
-							alreadyinfarm => $alreadyinfarm,
-							notmarcrecord => $notmarcrecord,
-							total => $imported+$alreadyindb+$alreadyinfarm+$notmarcrecord,
-							);
-
-}
-
-output_html_with_http_headers $input, $cookie, $template->output;
-my $menu;
-my $file;
-
-
-#---------------
-# log cleared, as marcimport is (almost) rewritten from scratch.
-# $Log: import.pl,v $
-# Revision 1.1.2.1  2007/03/10 01:31:04  tgarip1957
-# fresh files for rel_TG
-#
-# Revision 1.3  2006/09/27 21:19:22  tgarip1957
-# Finalized XML version for intranet
-#
-# Revision 1.2.4.1  2005/04/07 10:10:52  tipaul
-# copying processz3950queue from 2.0 branch. The 2.2 version misses an important fix
-#

Index: cgi-bin/tools/koha-news.pl
===================================================================
RCS file: cgi-bin/tools/koha-news.pl
diff -N cgi-bin/tools/koha-news.pl
--- cgi-bin/tools/koha-news.pl	10 Mar 2007 01:31:04 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,98 +0,0 @@
-#!/usr/bin/perl
-
-# Script to manage the opac news.
-# written 11/04
-# Castañeda, Carlos Sebastian - seba3c at yahoo.com.ar - Physics Library UNLP Argentina
-# Modified to include news to KOHA intranet - tgarip at neu.edu.tr NEU library -Cyprus
-# 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 CGI;
-
-use C4::Auth;
-use C4::Koha;
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::NewsChannels;
-
-
-my $cgi = new CGI;
-
-my $id		= $cgi->param('id');
-my $title	= $cgi->param('title');
-my $new		= $cgi->param('new');
-my $lang	= $cgi->param('lang');
-my $new_detail = get_opac_new($id);
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "tools/koha-news.tmpl",
-			     query => $cgi,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {management => 1},
-			     debug => 1,
-			     });
-
-# get lang list
-my @lang_list;
-
-foreach my $language (getalllanguages()) {
-	push @lang_list, { language => $language,
-						selected => ($new_detail->{lang} eq $language?1:0),
-					};
-}
-$template->param(lang_list => \@lang_list);
-
-my $op = $cgi->param('op');
-
-if ($op eq 'add_form') {
-	$template->param(add_form => 1);
-	if ($id) {
-		$template->param(op => 'edit');
-		$template->param($new_detail);
-		$template->param(id => $new_detail->{'idnew'});
-	} else {
-		$template->param(op => 'add');
-	}
-	
-} elsif ($op eq 'add') {
-
-	add_opac_new($title, $new, $lang);
-#	print $cgi->redirect('/cgi-bin/koha/tools/koha-news.pl');
-
-} elsif ($op eq 'edit') {
-
-	upd_opac_new($id, $title, $new, $lang);
-#	print $cgi->redirect('/cgi-bin/koha/tools/koha-news.pl');
-
-} elsif ($op eq 'del') {
-	my @ids = $cgi->param('ids');
-	del_opac_new(join ",", @ids);
-#	print $cgi->redirect('/cgi-bin/koha/tools/koha-news.pl');
-
-} 
-
-	my ($opac_news_count, $opac_news) = &get_opac_news(undef, $lang);
-	$template->param($lang => 1);
-	$template->param(opac_news => $opac_news);
-	$template->param(opac_news_count => $opac_news_count);
-
-
-
-output_html_with_http_headers $cgi, $cookie, $template->output;

Index: cgi-bin/tools/letter.pl
===================================================================
RCS file: cgi-bin/tools/letter.pl
diff -N cgi-bin/tools/letter.pl
--- cgi-bin/tools/letter.pl	10 Mar 2007 01:31:04 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,229 +0,0 @@
-#!/usr/bin/perl
-
-#script to administer the aqbudget table
-#written 20/02/2002 by paul.poulain at free.fr
-# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
-
-# ALGO :
-# this script use an $op to know what to do.
-# if $op is empty or none of the above values,
-#	- the default screen is build (with all records, or filtered datas).
-#	- the   user can clic on add, modify or delete record.
-# if $op=add_form
-#	- if primkey exists, this is a modification,so we read the $primkey record
-#	- builds the add/modify form
-# if $op=add_validate
-#	- the user has just send datas, so we create/modify the record
-# if $op=delete_form
-#	- we show the record having primkey=$primkey and ask for deletion validation form
-# if $op=delete_confirm
-#	- we delete the record having primkey=$primkey
-
-
-# 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 CGI;
-use C4::Date;
-use C4::Auth;
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Search;
-use HTML::Template;
-
-sub StringSearch  {
-	my ($env,$searchstring,$type)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select * from letter where (code like ?) order by module,code");
-	$sth->execute("$data[0]%");
-	my @results;
-	my $cnt=0;
-	while (my $data=$sth->fetchrow_hashref){
-	push(@results,$data);
-	$cnt ++;
-	}
-	#  $sth->execute;
-	$sth->finish;
-	return ($cnt,\@results);
-}
-
-my $input = new CGI;
-my $searchfield=$input->param('searchfield');
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/tools/letter.pl";
-my $code=$input->param('code');
-my $module = $input->param('module');
-my $pagesize=20;
-my $op = $input->param('op');
-$searchfield=~ s/\,//g;
-my $dbh = C4::Context->dbh;
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "tools/letter.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {tools => 1},
-			     debug => 1,
-			     });
-
-if ($op) {
-$template->param(script_name => $script_name,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-
-$template->param(action => $script_name);
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $letter;
-	if ($code) {
-		my $sth=$dbh->prepare("select * from letter where module=? and code=?");
-		$sth->execute($module,$code);
-		$letter=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-	# build field list
-	my @SQLfieldname;
-	my %line = ('value' => "LibrarianFirstname", 'text' => 'LibrarianFirstname');
-	push @SQLfieldname, \%line;
-	my %line = ('value' => "LibrarianSurname", 'text' => 'LibrarianSurname');
-	push @SQLfieldname, \%line;
-	my %line = ('value' => "LibrarianEmailaddress", 'text' => 'LibrarianEmailaddress');
-	push @SQLfieldname, \%line;
-	my $sth2=$dbh->prepare("SHOW COLUMNS from branches");
-	$sth2->execute;
-	my %line = ('value' => "", 'text' => '---BRANCHES---');
-	push @SQLfieldname, \%line;
-	while ((my $field) = $sth2->fetchrow_array) {
-		my %line = ('value' => "branches.".$field, 'text' => "branches.".$field);
-		push @SQLfieldname, \%line;
-	}
-	my $sth2=$dbh->prepare("SHOW COLUMNS from biblio");
-	$sth2->execute;
-	my %line = ('value' => "", 'text' => '---BIBLIO---');
-
-	push @SQLfieldname, \%line;
-	while ((my $field) = $sth2->fetchrow_array) {
-		# note : %line is redefined, otherwise \%line contains the same value for every entry of the list
-		my %line = ('value' => "biblio.".$field, 'text' => "biblio.".$field);
-		push @SQLfieldname, \%line;
-	}
-	my $sth2=$dbh->prepare("SHOW COLUMNS from biblioitems");
-	$sth2->execute;
-	my %line = ('value' => "", 'text' => '---BIBLIOITEMS---');
-	push @SQLfieldname, \%line;
-	while ((my $field) = $sth2->fetchrow_array) {
-		my %line = ('value' => "biblioitems.".$field, 'text' => "biblioitems.".$field);
-		push @SQLfieldname, \%line;
-	}
-	my %line = ('value' => "", 'text' => '---ITEMS---');
-	push @SQLfieldname, \%line;
-	my %line = ('value' => "items.content", 'text' => 'items.content');
-	push @SQLfieldname, \%line;
-	
-	my $sth2=$dbh->prepare("SHOW COLUMNS from borrowers");
-	$sth2->execute;
-	my %line = ('value' => "", 'text' => '---BORROWERS---');
-	push @SQLfieldname, \%line;
-	while ((my $field) = $sth2->fetchrow_array) {
-		my %line = ('value' => "borrowers.".$field, 'text' => "borrowers.".$field);
-		push @SQLfieldname, \%line;
-	}
-	if ($code) {
-	    $template->param(modify => 1);
-	    $template->param(code => $letter->{code});
-	} else {
-	    $template->param(adding => 1);
-	}
-	$template->param(name => $letter->{name},title => $letter->{title},
-					content => $letter->{content},
-					$letter->{module} => 1,
-					SQLfieldname => \@SQLfieldname,);
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("replace letter (module,code,name,title,content) values (?,?,?,?,?)");
-	$sth->execute($input->param('module'),$input->param('code'),$input->param('name'),$input->param('title'),$input->param('content'));
-	$sth->finish;
-	 print $input->redirect("letter.pl");
-	 exit;
-# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select * from letter where code=?");
-	$sth->execute($code);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(module => $data->{module});
-	$template->param(code => $code);
-	$template->param(name => $data->{'name'});
-	$template->param(content => $data->{'content'});
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	my $dbh = C4::Context->dbh;
-	my $code=uc($input->param('code'));
-	my $module=$input->param('module');
-	my $sth=$dbh->prepare("delete from letter where module=? and code=?");
-	$sth->execute($module,$code);
-	$sth->finish;
-	 print $input->redirect("letter.pl");
-	 return;
-													# END $OP eq DELETE_CONFIRMED
-################## DEFAULT ##################################
-} else { # DEFAULT
-	if  ($searchfield ne '') {
-	        $template->param(search => 1);
-		$template->param(searchfield => $searchfield);
-	}
-	my $env;
-	my ($count,$results)=StringSearch($env,$searchfield,'web');
-	my $toggle="white";
-	my @loop_data =();
-	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-	  	if ($toggle eq 'white'){
-	    		$toggle="#ffffcc";
-	  	} else {
-	    		$toggle="white";
-	  	}
-	   my %row_data;
-	   $row_data{toggle} = $toggle;
-	   $row_data{module} = $results->[$i]{'module'};
-	   $row_data{code} = $results->[$i]{'code'};
-	   $row_data{name} = $results->[$i]{'name'};
-	   push(@loop_data, \%row_data);
-	}
-	$template->param(letter => \@loop_data);
-} #---- END $OP eq DEFAULT
-
-output_html_with_http_headers $input, $cookie, $template->output;
-

Index: cgi-bin/tools/newHolidays.pl
===================================================================
RCS file: cgi-bin/tools/newHolidays.pl
diff -N cgi-bin/tools/newHolidays.pl
--- cgi-bin/tools/newHolidays.pl	10 Mar 2007 01:31:04 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use CGI;
-
-use C4::Auth;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Calendar::Calendar;
-
-my $input = new CGI;
-my $dbh = C4::Context->dbh();
-
-my $branchcode = $input->param('newBranchName');
-my $weekday = $input->param('newWeekday');
-my $day = $input->param('newDay');
-my $month = $input->param('newMonth');
-my $year = $input->param('newYear');
-my $title = $input->param('newTitle');
-my $description = $input->param('newDescription');
-
-my $calendar = C4::Calendar::Calendar->new(branchcode => $branchcode);
-
-if ($input->param('newOperation') eq 'weekday') {
-	$calendar->insert_week_day_holiday(weekday => $weekday,
-							           title => $title,
-							           description => $description);
-} elsif ($input->param('newOperation') eq 'repeatable') {
-	$calendar->insert_day_month_holiday(day => $day,
-	                                    month => $month,
-							            title => $title,
-							            description => $description);
-} elsif ($input->param('newOperation') eq 'holiday') {
-	$calendar->insert_single_holiday(day => $day,
-	                                 month => $month,
-						             year => $year,
-						             title => $title,
-						             description => $description);
-
-}
-print $input->redirect("/cgi-bin/koha/tools/holidays.pl?branch=$branchcode");
\ No newline at end of file

Index: cgi-bin/tools/overduerules.pl
===================================================================
RCS file: cgi-bin/tools/overduerules.pl
diff -N cgi-bin/tools/overduerules.pl
--- cgi-bin/tools/overduerules.pl	10 Mar 2007 01:31:04 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,202 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Context;
-use C4::Auth;
-use C4::Koha;
-use C4::Interface::CGI::Output;
-
-
-my $input = new CGI;
-my $dbh = C4::Context->dbh;
-
-my $type=$input->param('type');
-my $branch = $input->param('branch');
-$branch="" unless $branch;
-my $op = $input->param('op');
-
-# my $flagsrequired;
-# $flagsrequired->{circulation}=1;
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "tools/overduerules.tmpl",
-                             query => $input,
-                             type => "intranet",
-                             authnotrequired => 0,
- 			     flagsrequired => {parameters => 1, tools => 1},
-			      debug => 1,
-                             });
-my $err=0;
-
-# save the values entered into tables
-my %temphash;
-if ($op eq 'save') {
-	my @names=$input->param();
-	my $sth_search = $dbh->prepare("select count(*) as total from overduerules where branchcode=? and categorycode=?");
-
-	my $sth_insert = $dbh->prepare("insert into overduerules (branchcode,categorycode, delay1,letter1,debarred1, delay2,letter2,debarred2, delay3,letter3,debarred3) values (?,?,?,?,?,?,?,?,?,?,?)");
-	my $sth_update=$dbh->prepare("Update overduerules set delay1=?, letter1=?, debarred1=?, delay2=?, letter2=?, debarred2=?, delay3=?, letter3=?, debarred3=? where branchcode=? and categorycode=?");
-	my $sth_delete=$dbh->prepare("delete from overduerules where branchcode=? and categorycode=?");
-	foreach my $key (@names){
-		# ISSUES
-		if ($key =~ /(.*)([1-3])-(.*)/) {
-			my $type = $1; # data type
-			my $num = $2; # From 1 to 3
-			my $bor = $3; # borrower category
-			$temphash{$bor}->{"$type$num"}=$input->param("$key") if (($input->param("$key") ne "") or ($input->param("$key")>0));
-		}
-	}
-	foreach my $bor (keys %temphash){
-		# Do some Checking here : delay1 < delay2 <delay3 all of them being numbers
-		# Raise error if not true
-		if ($temphash{$bor}->{delay1}=~/[^0-9]/ and $temphash{$bor}->{delay1} ne ""){
-			$template->param("ERROR"=>1,"ERRORDELAY"=>"delay1","BORERR"=>$bor);
-			$err=1;
-		} elsif ($temphash{$bor}->{delay2}=~/[^0-9]/ and $temphash{$bor}->{delay2} ne ""){
-			$template->param("ERROR"=>1,"ERRORDELAY"=>"delay2","BORERR"=>$bor);
-			$err=1;
-		} elsif ($temphash{$bor}->{delay3}=~/[^0-9]/ and $temphash{$bor}->{delay3} ne ""){
-			$template->param("ERROR"=>1,"ERRORDELAY"=>"delay3","BORERR"=>$bor);
-			$err=1;
-		}elsif ($temphash{$bor}->{delay3} and ($temphash{$bor}->{delay3}<=$temphash{$bor}->{delay2}
-			or $temphash{$bor}->{delay3}<=$temphash{$bor}->{delay1})
-			or $temphash{$bor}->{delay2} and ($temphash{$bor}->{delay2}<=$temphash{$bor}->{delay1})){
-				$template->param("ERROR"=>1,"ERRORORDER"=>1,"BORERR"=>$bor);
-				$err=1;
-		}
-		unless ($err){
-			if (($temphash{$bor}->{delay1} and ($temphash{$bor}->{"letter1"} or $temphash{$bor}->{"debarred1"}))
-				or ($temphash{$bor}->{delay2} and ($temphash{$bor}->{"letter2"} or $temphash{$bor}->{"debarred2"}))
-				or ($temphash{$bor}->{delay3} and ($temphash{$bor}->{"letter3"} or $temphash{$bor}->{"debarred3"}))) {
-				$sth_search->execute($branch,$bor);
-				my $res = $sth_search->fetchrow_hashref();
-				if ($res->{'total'}>0) {
-					$sth_update->execute(
-						($temphash{$bor}->{"delay1"}?$temphash{$bor}->{"delay1"}:0),
-						($temphash{$bor}->{"letter1"}?$temphash{$bor}->{"letter1"}:""),
-						($temphash{$bor}->{"debarred1"}?$temphash{$bor}->{"debarred1"}:0),
-						($temphash{$bor}->{"delay2"}?$temphash{$bor}->{"delay2"}:0),
-						($temphash{$bor}->{"letter2"}?$temphash{$bor}->{"letter2"}:""),
-						($temphash{$bor}->{"debarred2"}?$temphash{$bor}->{"debarred2"}:0),
-						($temphash{$bor}->{"delay3"}?$temphash{$bor}->{"delay3"}:0),
-						($temphash{$bor}->{"letter3"}?$temphash{$bor}->{"letter3"}:""),
-						($temphash{$bor}->{"debarred3"}?$temphash{$bor}->{"debarred3"}:0),
-						$branch ,$bor
-						);
-				} else {
-					$sth_insert->execute($branch,$bor,
-						($temphash{$bor}->{"delay1"}?$temphash{$bor}->{"delay1"}:0),
-						($temphash{$bor}->{"letter1"}?$temphash{$bor}->{"letter1"}:""),
-						($temphash{$bor}->{"debarred1"}?$temphash{$bor}->{"debarred1"}:0),
-						($temphash{$bor}->{"delay2"}?$temphash{$bor}->{"delay2"}:0),
-						($temphash{$bor}->{"letter2"}?$temphash{$bor}->{"letter2"}:""),
-						($temphash{$bor}->{"debarred2"}?$temphash{$bor}->{"debarred2"}:0),
-						($temphash{$bor}->{"delay3"}?$temphash{$bor}->{"delay3"}:0),
-						($temphash{$bor}->{"letter3"}?$temphash{$bor}->{"letter3"}:""),
-						($temphash{$bor}->{"debarred3"}?$temphash{$bor}->{"debarred3"}:0)
-						);
-				}
-			}
-		}
-	}
-	unless ($err) {$template->param(datasaved=>1);}
-}
-my $branches = getbranches;
-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 ($countletters,$letters) = getletters("circulation");
-
-my $sth=$dbh->prepare("Select description,categorycode from categories where overduenoticerequired>0 order by description");
-$sth->execute;
-my @line_loop;
-my $toggle= 1;
-# my $i=0;
-while (my $data=$sth->fetchrow_hashref){
-	if ( $toggle eq 1 ) {
-		$toggle = 0;
-	} else {
-		$toggle = 1;
-	}
-	my %row = ( overduename => $data->{'categorycode'},
-				toggle => $toggle,
-				line => $data->{'description'}
-				);
-	if (%temphash){
-		for (my $i=1;$i<=3;$i++){
-			$row{"delay$i"}=$temphash{$data->{'categorycode'}}->{"delay$i"};
-			$row{"debarred$i"}=$temphash{$data->{'categorycode'}}->{"debarred$i"};
-			if ($countletters){
-				my @letterloop;
-				foreach my $thisletter (keys %$letters) {
-					my $selected = 1 if $thisletter eq $temphash{$data->{'categorycode'}}->{"letter$i"};
-					my %letterrow =(value => $thisletter,
-								selected => $selected,
-								lettername => $letters->{$thisletter},
-							);
-					push @letterloop, \%letterrow;
-				}
-				$row{"letterloop$i"}=\@letterloop;
-			} else {
-				$row{"noletter"}=1;
-				$row{"letter$i"}=$temphash{$data->{'categorycode'}}->{"letter$i"};
-			}
-		}
-	} else {
-	#getting values from table
-		my $sth2=$dbh->prepare("SELECT * from overduerules WHERE branchcode=? and categorycode=?");
-		$sth2->execute($branch,$data->{'categorycode'});
-		my $dat=$sth2->fetchrow_hashref;
-		for (my $i=1;$i<=3;$i++){
-			if ($countletters){
-				my @letterloop;
-				foreach my $thisletter (keys %$letters) {
-					my $selected = 1 if $thisletter eq $dat->{"letter$i"};
-					my %letterrow =(value => $thisletter,
-								selected => $selected,
-								lettername => $letters->{$thisletter},
-							);
-					push @letterloop, \%letterrow;
-				}
-				$row{"letterloop$i"}=\@letterloop;
-			} else {
-				$row{"noletter"}=1;
-				if ($dat->{"letter$i"}){$row{"letter$i"}=$dat->{"letter$i"};}
-			}
-			if ($dat->{"delay$i"}){$row{"delay$i"}=$dat->{"delay$i"};}
-			if ($dat->{"debarred$i"}){$row{"debarred$i"}=$dat->{"debarred$i"};}
-		}
-		$sth2->finish;
-	}
-	push @line_loop,\%row;
-}
-$sth->finish;
-
-$template->param(table=> \@line_loop,
-						branchloop => \@branchloop,
-						branch => $branch);
-output_html_with_http_headers $input, $cookie, $template->output;

Index: cgi-bin/tools/pdfViewer.pl
===================================================================
RCS file: cgi-bin/tools/pdfViewer.pl
diff -N cgi-bin/tools/pdfViewer.pl
--- cgi-bin/tools/pdfViewer.pl	10 Mar 2007 01:31:04 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-#!/usr/bin/perl
-
-# script to show a PDF file.
-# written 07/04
-# by Veleda Matias - matias_veleda at hotmail.com - Physics Library UNLP Argentina and
-#    Castañeda Sebastian - seba3c at yahoo.com.ar - Physics Library UNLP Argentina and
-
-# 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
-
-require Exporter;
-
-use strict;
-use C4::Context;
-use CGI;
-
-# This script take a pdf filename as a parameter and output it to the browser.
-my $cgi = new CGI;
-my $filename = "barcodes.pdf";
-my $tmpFileName = $cgi->param('tmpFileName');
-print "Content-Disposition: attachment; filename = $filename\n\n";
-print $cgi->header(-type => 'application/pdf'),
-      $cgi->start_html(-title=>"Codify to PDF");
-open fh, "<$tmpFileName";
-while (<fh>) {
- print;
-}
-print $cgi->end_html();

Index: cgi-bin/tools/printerConfig.pl
===================================================================
RCS file: cgi-bin/tools/printerConfig.pl
diff -N cgi-bin/tools/printerConfig.pl
--- cgi-bin/tools/printerConfig.pl	10 Mar 2007 01:31:04 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,115 +0,0 @@
-#!/usr/bin/perl
-
-# script to set the labels configuration for the printer process.
-# written 07/04
-# by Veleda Matias - matias_veleda at hotmail.com - Physics Library UNLP Argentina and
-
-# 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
-
-require Exporter;
-
-use strict;
-
-use CGI;
-use C4::Context;
-use C4::Output;
-use C4::Auth;
-use PDF::API2;
-use PDF::API2::Page;
-use PDF::API2::PDF::Utils;
-use C4::Interface::CGI::Output;
-
-# This function returns the path to deal with the correct files, considering
-# templates set and language.
-sub getPath {
-	my $type = shift @_;
-	my $templatesSet = C4::Context->preference('template');
-	my $lang = C4::Context->preference('opaclanguages');
-	if ($type eq "intranet") {
-		return "$ENV{'DOCUMENT_ROOT'}/intranet-tmpl/$templatesSet/$lang";
-	} else {
-		return "$ENV{'DOCUMENT_ROOT'}/opac-tmpl/$templatesSet/$lang";
-	}
-}
-
-# Load a configuration file.
-sub loadConfFromFile {
-  my $fileName = shift @_;
-	my %keyValues;
-	open FILE, "<$fileName";
-	while (<FILE>) {
-		chomp;
-		if (/\s*([\w_]*)\s*=\s*([\[\]\<\>\w_\s:@,\.-]*)\s*/) {
-			$keyValues{$1} = $2;
-		}
-	}
-	close FILE;
-	return %keyValues;
-}
-
-# Save settings to a configuration file.
-sub saveConfToFile {
-	my $fileName = shift @_;
-	my %keyValues = %{shift @_};
-	my $i;
-	open FILE, ">$fileName";			
-	my $i;
-	foreach $i (keys(%keyValues)) {
-    print FILE $i." = ".$keyValues{$i}."\n";
-	}
-	close FILE;
-}
-
-# Creates a CGI object and take his parameters
-my $input = new CGI;
-
-if ($input->param('saveSettings')) {
-	my $labelConf = &getPath("intranet")."/includes/labelConfig/itemsLabelConfig.conf";
-	my %newConfiguration = (pageType => $input->param('pageType'), 	
-							columns => $input->param('columns'), 		
-							rows => $input->param('rows'), 	
-							systemDpi => $input->param('systemDpi'), 	
-							labelWidth => $input->param('labelWidth'), 	
-							labelHeigth => $input->param('labelHeigth'),	
-							marginBottom => $input->param('marginBottom'), 	
-							marginLeft => $input->param('marginLeft')); 	
-	saveConfToFile($labelConf, \%newConfiguration);
-	print $input->redirect('/cgi-bin/koha/barcodes/barcodes.pl')
-}
-
-# Get the template to use
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "tools/printerConfig.tmpl",
-			                 type => "intranet",
-			                 query => $input,
-			                 authnotrequired => 0,
-			                 flagsrequired => {parameters => 1},
-					         debug => 1,
-			               });
-
-my $filenameConf = &getPath("intranet")."/includes/labelConfig/itemsLabelConfig.conf";
-my %labelConfig = &loadConfFromFile($filenameConf);
-
-$template->param(COLUMNS => $labelConfig{'columns'});
-$template->param(ROWS => $labelConfig{'rows'});
-$template->param(SYSTEM_DPI => $labelConfig{'systemDpi'});
-$template->param(LABEL_WIDTH => $labelConfig{'labelWidth'});
-$template->param(LABEL_HEIGTH => $labelConfig{'labelHeigth'});
-$template->param(MARGIN_TOP => $labelConfig{'marginBottom'});
-$template->param(MARGIN_LEFT => $labelConfig{'marginLeft'});
-$template->param(SCRIPT_NAME => '/cgi-bin/koha/tools/printerConfig.pl');
-$template->param("$labelConfig{'pageType'}" => 1);
-output_html_with_http_headers $input, $cookie, $template->output;
\ No newline at end of file

Index: cgi-bin/tools/tools-home.pl
===================================================================
RCS file: cgi-bin/tools/tools-home.pl
diff -N cgi-bin/tools/tools-home.pl
--- cgi-bin/tools/tools-home.pl	10 Mar 2007 01:31:04 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-
-
-my $query = new CGI;
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "tools/tools-home.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {tools => 1},
-			     debug => 1,
-			     });
-
-output_html_with_http_headers $query, $cookie, $template->output;

Index: cgi-bin/value_builder/marc21_008_holdings.pl
===================================================================
RCS file: cgi-bin/value_builder/marc21_008_holdings.pl
diff -N cgi-bin/value_builder/marc21_008_holdings.pl
--- cgi-bin/value_builder/marc21_008_holdings.pl	10 Mar 2007 01:32:08 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,137 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: marc21_008_holdings.pl,v 1.1.2.1 2007/03/10 01:32:08 tgarip1957 Exp $
-
-# 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::Auth;
-use CGI;
-use C4::Context;
-
-=head1
-
-plugin_parameters : other parameters added when the plugin is called by the dopop function
-
-=cut
-# find today's date
-my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time); 
-
-$year +=1900; $mon +=1;
-my $dateentered = substr($year,2,2).sprintf ("%0.2d", $mon).sprintf ("%0.2d",$mday);
-
-sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
-}
-
-sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
-my $res="
-<script>
-function Focus$function_name(subfield_managed) {
-    for (i=0 ; i<document.f.field_value.length ; i++) {
-        if (document.f.tag[i].value == '008') {
-            if (!document.f.field_value[i].value) {
-                document.f.field_value[i].value = '$dateentered' + '1p||||8|||401ab|||0000000';
-            }
-        }
-    }
-return 1;
-}
-
-function Blur$function_name(subfield_managed) {
-	return 1;
-}
-
-function Clic$function_name(i) {
-
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"../plugin_launcher.pl?plugin_name=marc21_008_holdings.pl&index=\"+i+\"&result=\"+defaultvalue,\"008\",'width=400,height=600,toolbar=false,scrollbars=yes');
-
-}
-</script>
-";
-
-return ($function_name,$res);
-}
-sub plugin {
-my ($input) = @_;
-	my %env;
-
-#	my $input = new CGI;
-	my $index= $input->param('index');
-	my $result= $input->param('result');
-
-
-	my $dbh = C4::Context->dbh;
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "value_builder/marc21_008_holdings.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {editcatalogue => 1},
-			     debug => 1,
-			     });
-	$result = '$dateentered' + '1p||||8|||401ab|||0000000';
-	my $f1 = substr($result,0,6);
-	my $f6 = substr($result,6,1);
-	my $f710 = substr($result,7,4);
-	my $f1114 = substr($result,11,4);
-	my $f1517 = substr($result,15,3);
-	my $f1821 = substr($result,18,4);
-	my $f22 = substr($result,22,1);
-	my $f23 = substr($result,23,1);
-	my $f2427 = substr($result,24,4);
-	my $f28 = substr($result,28,1);
-	my $f29 = substr($result,29,1);
-	my $f30 = substr($result,30,1);
-	
-if (!$f1){
-	$f1=$dateentered
-}
-
-	$template->param(				index => $index,
-							f1 => $f1,
-							f6 => $f6,
-							"f6$f6" => $f6,
-							f710 => $f710,
-							f1114 => $f1114,
-							f1517 => $f1517,
-							f1821 => $f1821,
-							f22 => $f22,
-							"f22$f22" => $f22,
-							f23 => $f23,
-                                                        "f23$f23" => $f23,
-							f2427 => $f2427,
-							"f24$f2427" => $f2427,
-							f28 => $f28,
-                                                        "f28$f28" => $f28,
-							f29 => $f29,
-                                                        "f29$f29" => $f29,
-							f30 => $f30,
-                                                        "f30$f30" => $f30,
-				
-                                                      
-					);
-	print $input->header(-cookie => $cookie),$template->output;
-}
-
-1;

Index: cgi-bin/value_builder/marc21_field_003.pl
===================================================================
RCS file: cgi-bin/value_builder/marc21_field_003.pl
diff -N cgi-bin/value_builder/marc21_field_003.pl
--- cgi-bin/value_builder/marc21_field_003.pl	10 Mar 2007 01:32:08 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,88 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: marc21_field_003.pl,v 1.1.2.1 2007/03/10 01:32:08 tgarip1957 Exp $
-
-# 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 C4::Auth;
-use C4::Context;
-
-=head1
-
-plugin_parameters : other parameters added when the plugin is called by the dopop function
-
-=cut
-sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
-}
-
-=head1
-
-plugin_javascript : the javascript function called when the user enters the subfield.
-contain 3 javascript functions :
-* one called when the field is entered (OnFocus). Named FocusXXX
-* one called when the field is leaved (onBlur). Named BlurXXX
-* one called when the ... link is clicked (<a href="javascript:function">) named ClicXXX
-
-returns :
-* XXX
-* a variable containing the 3 scripts.
-the 3 scripts are inserted after the <input> in the html code
-
-=cut
-sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "003".(int(rand(100000))+1);
-
-# find today's date
-my $org = C4::Context->preference('MARCOrgCode');
-my $res  = "
-<script>
-function Blur$function_name(index) {
-//need this?
-}
-
-function Focus$function_name(subfield_managed) {
-	for (i=0 ; i<document.f.field_value.length ; i++) {
-                if (document.f.tag[i].value == '003') {
-                        document.f.field_value[i].value = '$org';
-                }
-        }
-return 0;
-}
-
-function Clic$function_name(subfield_managed) {
-}
-</script>
-";
-return ($function_name,$res);
-}
-
-=head1
-
-plugin : the true value_builded. The screen that is open in the popup window.
-
-=cut
-
-sub plugin {
-my ($input) = @_;
-return "";
-}
-
-1;

Index: cgi-bin/value_builder/marc21_field_005.pl
===================================================================
RCS file: cgi-bin/value_builder/marc21_field_005.pl
diff -N cgi-bin/value_builder/marc21_field_005.pl
--- cgi-bin/value_builder/marc21_field_005.pl	10 Mar 2007 01:32:08 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,104 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: marc21_field_005.pl,v 1.1.2.1 2007/03/10 01:32:08 tgarip1957 Exp $
-
-# 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 C4::Auth;
-use C4::Context;
-use C4::Interface::CGI::Output;
-use CGI;
-
-
-=head1
-
-plugin_parameters : other parameters added when the plugin is called by the dopop function
-
-=cut
-sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
-}
-
-=head1
-
-plugin_javascript : the javascript function called when the user enters the subfield.
-contain 3 javascript functions :
-* one called when the field is entered (OnFocus). Named FocusXXX
-* one called when the field is leaved (onBlur). Named BlurXXX
-* one called when the ... link is clicked (<a href="javascript:function">) named ClicXXX
-
-returns :
-* XXX
-* a variable containing the 3 scripts.
-the 3 scripts are inserted after the <input> in the html code
-
-=cut
-sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "005".(int(rand(100000))+1);
-
-# find today's date
-my ($sec,$min,$hour,$mday,$mon,$year) = localtime();
-	$year += 1900;
-	$mon += 1;
-	my $timestamp = sprintf("%4d%02d%02d%02d%02d%02d.0",
-		$year,$mon,$mday,$hour,$min,$sec);
-
-
-
-my $res  = "
-<script>
-function Blur$function_name(subfield_managed) {
-for (i=0 ; i<document.f.field_value.length ; i++) {
-               if (document.f.tag[i].value == '005') {
-                        document.f.field_value[i].value = '$timestamp';
-               }
-        }
-return 0;
-}
-
-function Focus$function_name(subfield_managed) {
-	for (i=0 ; i<document.f.field_value.length ; i++) {
-               if (document.f.tag[i].value == '005') {
-                        document.f.field_value[i].value = '$timestamp';
-               }
-        }
-return 0;
-}
-
-function Clic$function_name(subfield_managed) {
-
-}
-</script>
-";
-return ($function_name,$res);
-}
-
-=head1
-
-plugin : the true value_builded. The screen that is open in the popup window.
-
-=cut
-
-sub plugin {
-my ($input) = @_;
-return "";
-}
-
-1;

Index: cgi-bin/value_builder/marc21_field_006.pl
===================================================================
RCS file: cgi-bin/value_builder/marc21_field_006.pl
diff -N cgi-bin/value_builder/marc21_field_006.pl
--- cgi-bin/value_builder/marc21_field_006.pl	10 Mar 2007 01:32:08 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,124 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: marc21_field_006.pl,v 1.1.2.1 2007/03/10 01:32:08 tgarip1957 Exp $
-
-# 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::Auth;
-use CGI;
-use C4::Context;
-
-
-=head1
-
-plugin_parameters : other parameters added when the plugin is called by the dopop function
-
-=cut
-sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
-}
-
-sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
-my $res="
-<script>
-function Focus$function_name(subfield_managed) {
-return 1;
-}
-
-function Blur$function_name(subfield_managed) {
-	return 1;
-}
-
-function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"../plugin_launcher.pl?plugin_name=marc21_field_006.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
-
-}
-</script>
-";
-
-return ($function_name,$res);
-}
-sub plugin {
-my ($input) = @_;
-	my %env;
-
-#	my $input = new CGI;
-	my $index= $input->param('index');
-	my $result= $input->param('result');
-
-
-	my $dbh = C4::Context->dbh;
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "value_builder/marc21_field_006.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {editcatalogue => 1},
-			     debug => 1,
-			     });
-	$result = "a|||||r|||| 00| 0 " unless $result;
-#	$result = "a     r     00  0 " unless $result;
-	my $f0 = substr($result,0,1);
-	my $f014 = substr($result,1,4);
-	my $f5 = substr($result,5,1);
-	my $f6 = substr($result,6,1);
-	my $f710 = substr($result,7,4);
-	my $f11 = substr($result,11,1);
-	my $f12 = substr($result,12,1);
-	my $f13 = substr($result,13,1);
-	my $f14 = substr($result,14,1);
-	my $f15 = substr($result,15,1);
-	my $f16 = substr($result,16,1);
-	my $f17 = substr($result,17,1);
-
-	$template->param(				index => $index,
-							f0 => $f0,
-							"f0$f0" => $f0,
-							f014 => $f014,
-							"f014$f014" => $f014,
-							f5 => $f5,
-							"f5$f5" => $f5,
-							f6 => $f6,
-							"f6$f6" => $f6,
-							f710 => $f710,
-							"f710$f710" => $f710,
-							f11 => $f11,
-                                                        "f11$f11" => $f11,
-							f12 => $f12,
-							"f12$f12" => $f12,
-							f13 => $f13,
-                                                        "f13$f13" => $f13,
-							f14 => $f14,
-                                                        "f14$f14" => $f14,
-							f15 => $f15,
-                                                        "f15$f15" => $f15,
-							f16 => $f16,
-                                                        "f16$f16" => $f16,
-							f17 => $f17,
-							"f17$f17" => $f17,
-					);
-	print $input->header(-cookie => $cookie),$template->output;
-}
-
-1;

Index: cgi-bin/value_builder/marc21_field_007.pl
===================================================================
RCS file: cgi-bin/value_builder/marc21_field_007.pl
diff -N cgi-bin/value_builder/marc21_field_007.pl
--- cgi-bin/value_builder/marc21_field_007.pl	10 Mar 2007 01:32:08 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,93 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: marc21_field_007.pl,v 1.1.2.1 2007/03/10 01:32:08 tgarip1957 Exp $
-
-# 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::Auth;
-use CGI;
-use C4::Context;
-
-
-=head1
-
-plugin_parameters : other parameters added when the plugin is called by the dopop function
-
-=cut
-sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
-}
-
-sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
-my $res="
-<script>
-function Focus$function_name(subfield_managed) {
-return 1;
-}
-
-function Blur$function_name(subfield_managed) {
-	return 1;
-}
-
-function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"../plugin_launcher.pl?plugin_name=marc21_field_007.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
-
-}
-</script>
-";
-
-return ($function_name,$res);
-}
-sub plugin {
-my ($input) = @_;
-	my %env;
-
-#	my $input = new CGI;
-	my $index= $input->param('index');
-	my $result= $input->param('result');
-
-
-	my $dbh = C4::Context->dbh;
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "value_builder/marc21_field_007.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {editcatalogue => 1},
-			     debug => 1,
-			     });
-	$result = "ta" unless $result;
-	my $f0 = substr($result,0,1);
-	my $f1 = substr($result,1,4);
-
-	$template->param(				index => $index,
-							f0 => $f0,
-							"f0$f0" => $f0,
-							f1 => $f1,
-                                                        "f1$f1" => $f1,
-					);
-	print $input->header(-cookie => $cookie),$template->output;
-}
-
-1;

Index: cgi-bin/value_builder/marc21_field_008.pl
===================================================================
RCS file: cgi-bin/value_builder/marc21_field_008.pl
diff -N cgi-bin/value_builder/marc21_field_008.pl
--- cgi-bin/value_builder/marc21_field_008.pl	10 Mar 2007 01:32:08 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,151 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: marc21_field_008.pl,v 1.1.2.1 2007/03/10 01:32:08 tgarip1957 Exp $
-
-# 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::Auth;
-use CGI;
-use C4::Context;
-
-=head1
-
-plugin_parameters : other parameters added when the plugin is called by the dopop function
-
-=cut
-# find today's date
-my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time); 
-
-$year +=1900; $mon +=1;
-my $dateentered = substr($year,2,2).sprintf ("%0.2d", $mon).sprintf ("%0.2d",$mday);
-sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
-}
-
-sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
-my $res="
-<script>
-function Focus$function_name(subfield_managed) {
-    for (i=0 ; i<document.f.field_value.length ; i++) {
-        if (document.f.tag[i].value == '008') {
-            if (!document.f.field_value[i].value) {
-                document.f.field_value[i].value = '$dateentered' + 's        xxu||||| |||| 00| 0 ||| d';
-            }
-        }
-    }
-return 1;
-}
-
-function Blur$function_name(subfield_managed) {
-	return 1;
-}
-
-function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"../plugin_launcher.pl?plugin_name=marc21_field_008.pl&index=\"+i+\"&result=\"+defaultvalue,\"008\",'width=400,height=600,toolbar=false,scrollbars=yes');
-
-}
-</script>
-";
-
-return ($function_name,$res);
-}
-sub plugin {
-my ($input) = @_;
-	my %env;
-
-#	my $input = new CGI;
-	my $index= $input->param('index');
-	my $result= $input->param('result');
-
-
-	my $dbh = C4::Context->dbh;
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "value_builder/marc21_field_008.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {editcatalogue => 1},
-			     debug => 1,
-			     });
-#	$result = "      t        xxu           00  0 eng d" unless $result;
-	$result = "$dateentered"."t        xxu||||| |||| 00| 0 ||| d" unless $result;
-	my $f1 = substr($result,0,6);
-	my $f6 = substr($result,6,1);
-	my $f710 = substr($result,7,4);
-	my $f1114 = substr($result,11,4);
-	my $f1517 = substr($result,15,3);
-	my $f1821 = substr($result,18,4);
-	my $f22 = substr($result,22,1);
-	my $f23 = substr($result,23,1);
-	my $f2427 = substr($result,24,4);
-	my $f28 = substr($result,28,1);
-	my $f29 = substr($result,29,1);
-	my $f30 = substr($result,30,1);
-	my $f31 = substr($result,31,1);
-	my $f33 = substr($result,33,1);
-	my $f34 = substr($result,34,1);
-	my $f3537 = substr($result,35,3);
-	my $f38 = substr($result,38,1);
-	my $f39 = substr($result,39,1);
-
-if (!$f1){
-	$f1=$dateentered
-}
-
-	$template->param(				index => $index,
-							f1 => $f1,
-							f6 => $f6,
-							"f6$f6" => $f6,
-							f710 => $f710,
-							f1114 => $f1114,
-							f1517 => $f1517,
-							f1821 => $f1821,
-							f22 => $f22,
-							"f22$f22" => $f22,
-							f23 => $f23,
-                                                        "f23$f23" => $f23,
-							f2427 => $f2427,
-							"f24$f2427" => $f2427,
-							f28 => $f28,
-                                                        "f28$f28" => $f28,
-							f29 => $f29,
-                                                        "f29$f29" => $f29,
-							f30 => $f30,
-                                                        "f230$f30" => $f30,
-							f31 => $f31,
-                                                        "f31$f31" => $f31,
-							f33 => $f33,
-                                                        "f33$f33" => $f33,
-							f34 => $f34,
-                                                        "f34$f34" => $f34,
-							f3537 => $f3537,
-							f38 => $f38,
-							"f38$f38" => $f38,
-							f39 => $f39,
-							"f39$f39" => $f39,
-					);
-	print $input->header(-cookie => $cookie),$template->output;
-}
-
-1;

Index: cgi-bin/value_builder/marc21_leader.pl
===================================================================
RCS file: cgi-bin/value_builder/marc21_leader.pl
diff -N cgi-bin/value_builder/marc21_leader.pl
--- cgi-bin/value_builder/marc21_leader.pl	10 Mar 2007 01:32:08 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,111 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: marc21_leader.pl,v 1.1.2.1 2007/03/10 01:32:08 tgarip1957 Exp $
-
-# 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::Auth;
-use CGI;
-use C4::Context;
-
-
-=head1
-
-plugin_parameters : other parameters added when the plugin is called by the dopop function
-
-=cut
-sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
-}
-
-sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
-my $res="
-<script>
-function Focus$function_name(subfield_managed) {
-    for (i=0 ; i<document.f.field_value.length ; i++) {
-		if (document.f.tag[i].value == '000') {
-			if (!document.f.field_value[i].value) {
-				document.f.field_value[i].value = '     naa a22     7ar4500';
-			}
-		}
-	}
-return 1;
-}
-
-function Blur$function_name(subfield_managed) {
-	return 1;
-}
-
-function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"../plugin_launcher.pl?plugin_name=marc21_leader.pl&index=\"+i+\"&result=\"+defaultvalue,\"\",'width=400,height=400,toolbar=false,scrollbars=yes');
-
-}
-</script>
-";
-
-return ($function_name,$res);
-}
-sub plugin {
-my ($input) = @_;
-	my %env;
-
-#	my $input = new CGI;
-	my $index= $input->param('index');
-	my $result= $input->param('result');
-
-
-	my $dbh = C4::Context->dbh;
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "value_builder/marc21_leader.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {editcatalogue => 1},
-			     debug => 1,
-			     });
-	$result = "     naa a22     7ar4500" unless $result;
-	my $f5 = substr($result,5,1);
-	my $f6 = substr($result,6,1);
-	my $f7 = substr($result,7,1);
-	my $f8 = substr($result,8,1);
-	my $f9 = substr($result,9,1);
-	my $f17 = substr($result,17,1);
-	my $f18 = substr($result,18,1);
-	my $f19 = substr($result,19,1);
-	my $f2023 = substr($result,20,4);
-	$template->param(index => $index,
-							"f5$f5" => 1,
-							"f6$f6" => 1,
-							"f7$f7" => 1,
-							"f8$f8" => 1,
-							"f9$f9" => 1,
-							"f17$f17" => 1,
-							"f18$f18" => 1,
-							"f19$f19" => 1,
-							"f2023" => $f2023,
-					);
-	print $input->header(-cookie => $cookie),$template->output;
-}
-
-1;

Index: cgi-bin/value_builder/marc21_leader_authorities.pl
===================================================================
RCS file: cgi-bin/value_builder/marc21_leader_authorities.pl
diff -N cgi-bin/value_builder/marc21_leader_authorities.pl
--- cgi-bin/value_builder/marc21_leader_authorities.pl	10 Mar 2007 01:32:08 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,109 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: marc21_leader_authorities.pl,v 1.1.2.1 2007/03/10 01:32:08 tgarip1957 Exp $
-
-# 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::Auth;
-use CGI;
-use C4::Context;
-
-
-=head1
-
-plugin_parameters : other parameters added when the plugin is called by the dopop function
-
-=cut
-sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
-}
-
-sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
-my $res="
-<script>
-function Focus$function_name(subfield_managed) {
-    for (i=0 ; i<document.f.field_value.length ; i++) {
-		if (document.f.tag[i].value == '000') {
-			if (!document.f.field_value[i].value) {
-				document.f.field_value[i].value = '     nz||a22     o||4500';
-			}
-		}
-	}
-return 1;
-}
-
-function Blur$function_name(subfield_managed) {
-	return 1;
-}
-
-function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"../plugin_launcher.pl?plugin_name=marc21_leader_authorities.pl&index=\"+i+\"&result=\"+defaultvalue,\"\",'width=400,height=400,toolbar=false,scrollbars=yes');
-
-}
-</script>
-";
-
-return ($function_name,$res);
-}
-sub plugin {
-my ($input) = @_;
-	my %env;
-
-#	my $input = new CGI;
-	my $index= $input->param('index');
-	my $result= $input->param('result');
-
-
-	my $dbh = C4::Context->dbh;
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "value_builder/marc21_leader_authorities.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {editcatalogue => 1},
-			     debug => 1,
-			     });
-	$result = "     nz||a22     o||4500" unless $result;
-	my $f5 = substr($result,5,1);
-	my $f6 = substr($result,6,1);
-	
-	
-	my $f9 = substr($result,9,1);
-	my $f17 = substr($result,17,1);
-	
-	
-	$template->param(index => $index,
-							"f5$f5" => 1,
-							"f6$f6" => 1,
-							
-							"f9$f9" => 1,
-							"f17$f17" => 1,
-							
-							
-							
-					);
-	print $input->header(-cookie => $cookie),$template->output;
-}
-
-1;

Index: cgi-bin/value_builder/marc21_leader_holdings.pl
===================================================================
RCS file: cgi-bin/value_builder/marc21_leader_holdings.pl
diff -N cgi-bin/value_builder/marc21_leader_holdings.pl
--- cgi-bin/value_builder/marc21_leader_holdings.pl	10 Mar 2007 01:32:08 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,109 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: marc21_leader_holdings.pl,v 1.1.2.1 2007/03/10 01:32:08 tgarip1957 Exp $
-
-# 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::Auth;
-use CGI;
-use C4::Context;
-
-
-=head1
-
-plugin_parameters : other parameters added when the plugin is called by the dopop function
-
-=cut
-sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
-}
-
-sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "100".(int(rand(100000))+1);
-my $res="
-<script>
-function Focus$function_name(subfield_managed) {
-    for (i=0 ; i<document.f.field_value.length ; i++) {
-		if (document.f.tag[i].value == '000') {
-			if (!document.f.field_value[i].value) {
-				document.f.field_value[i].value = '     nx||a22     1i|4500';
-			}
-		}
-	}
-return 1;
-}
-
-function Blur$function_name(subfield_managed) {
-	return 1;
-}
-
-function Clic$function_name(i) {
-	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(\"../plugin_launcher.pl?plugin_name=marc21_leader_holdings.pl&index=\"+i+\"&result=\"+defaultvalue,\"\",'width=400,height=400,toolbar=false,scrollbars=yes');
-
-}
-</script>
-";
-
-return ($function_name,$res);
-}
-sub plugin {
-my ($input) = @_;
-	my %env;
-
-#	my $input = new CGI;
-	my $index= $input->param('index');
-	my $result= $input->param('result');
-
-
-	my $dbh = C4::Context->dbh;
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "value_builder/marc21_leader_holdings.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {editcatalogue => 1},
-			     debug => 1,
-			     });
-	$result = "     nx||a22     1i|4500" unless $result;
-	my $f5 = substr($result,5,1);
-	my $f6 = substr($result,6,1);
-	
-	
-	my $f9 = substr($result,9,1);
-	my $f17 = substr($result,17,1);
-	my $f18 = substr($result,18,1);
-	
-	$template->param(index => $index,
-							"f5$f5" => 1,
-							"f6$f6" => 1,
-							
-							"f9$f9" => 1,
-							"f17$f17" => 1,
-							"f18$f18" => 1,
-							
-							
-					);
-	print $input->header(-cookie => $cookie),$template->output;
-}
-
-1;

Index: cgi-bin/value_builder/usmarc_field_952d.pl
===================================================================
RCS file: cgi-bin/value_builder/usmarc_field_952d.pl
diff -N cgi-bin/value_builder/usmarc_field_952d.pl
--- cgi-bin/value_builder/usmarc_field_952d.pl	10 Mar 2007 01:32:08 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,92 +0,0 @@
-#!/usr/bin/perl
-
-# $Id: usmarc_field_952d.pl,v 1.1.2.1 2007/03/10 01:32:08 tgarip1957 Exp $
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-
-# 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 C4::Auth;
-use C4::Context;
-use C4::Date;
-use CGI;
-
-
-=head1
-
-plugin_parameters : other parameters added when the plugin is called by 
-the dopop function
-
-=cut
-sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
-}
-
-=head1
-
-plugin_javascript : the javascript function called when the user enters 
-the subfield. contain 3 javascript functions :
-* one called when the field is entered (OnFocus). Named FocusXXX
-* one called when the field is leaved (onBlur). Named BlurXXX
-* one called when the ... link is clicked (<a 
-href="javascript:function">) named ClicXXX
-
-returns :
-* XXX
-* a variable containing the 3 scripts.
-the 3 scripts are inserted after the <input> in the html code
-
-=cut
-sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "952v".(int(rand(100000))+1);
-
-# find today's date
-
-my $date =get_today();
-my $res  = "
-<script>
-function Blur$function_name(index) {
-//need this?
-}
-
-function Focus$function_name(subfield_managed) {
-	for (i=0 ; i<document.f.field_value.length ; i++) {
-                if (document.f.tag[i].value == '952' && document.f.subfield[i].value == 'd') {
-                        document.f.field_value[i].value = '$date';
-                }
-        }
-return 0;
-}
-
-function Clic$function_name(subfield_managed) {
-}
-</script>
-";
-return ($function_name,$res);
-}
-
-=head1
-
-plugin : the true value_builded. The screen that is open in the popup 
-window.
-
-=cut
-
-sub plugin {
-my ($input) = @_;
-return "";
-}
-
-1;

Index: cgi-bin/z3950/search.pl
===================================================================
RCS file: cgi-bin/z3950/search.pl
diff -N cgi-bin/z3950/search.pl
--- cgi-bin/z3950/search.pl	10 Mar 2007 01:33:07 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,224 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Biblio;
-use C4::Context;
-use C4::Breeding;
-use MARC::File::USMARC;
-use MARC::File::XML;
-use ZOOM;
-use Encode;;
-
-my $input = new CGI;
-my $dbh = C4::Context->dbh;
-my $error = $input->param('error');
-my $oldbiblionumber=$input->param('oldbiblionumber');
-$oldbiblionumber=0 unless $oldbiblionumber;
-my $title = $input->param('title');
-my $author = $input->param('author');
-my $isbn = $input->param('isbn');
-my $issn = $input->param('issn');
-my $random = $input->param('random');
-my $op=$input->param('op');
-my $noconnection;
-my $numberpending;
-my $attr='';
-my $term;
-my $host;
-my $server;
-my $database;
-my $port;
-my $marcdata;
-my @encoding;
-my @results;
-my $count;
-my $toggle;
-my $record;
-my $oldbiblio;
-my $dbh = C4::Context->dbh;
-my $errmsg;
-my @serverloop=();
-my @serverhost;
-my @breeding_loop = ();
-
-unless ($random) { # this var is not useful anymore just kept to keep rel2_2 compatibility
-$random =rand(1000000000);
-}
-
-
-my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "z3950/searchresult.tmpl",
-				query => $input,
-				type => "intranet",
-				authnotrequired => 1,
-				flagsrequired => {catalogue => 1},
-				debug => 1,
-				});
-
-if ($op ne "do_search"){
-
-my $sth=$dbh->prepare("select id,name,checked from z3950servers  order by host");
-$sth->execute();
-while ($server=$sth->fetchrow_hashref) {
-my %temploop;
-$temploop{server}=$server->{name};
-$temploop{id}=$server->{id};
-$temploop{checked}=$server->{checked};
-push (@serverloop, \%temploop);
-}
-
-$template->param(isbn=>$isbn, issn=>$issn,title=>$title,author=>$author,
-						serverloop => \@serverloop,
-						opsearch => "search",
-						oldbiblionumber => $oldbiblionumber,
-						);
-output_html_with_http_headers $input, $cookie, $template->output;
-
-}else{
-
-my @id=$input->param('id');
-my @oConnection;
-my @oResult;
-my $s=0;
-							if ($isbn ne "/" || $issn ne "/") {
-								$attr='1=7';
-							$term=$isbn if ($isbn ne"/");
-							$term=$issn if ($issn ne"/");
-							} elsif ($title ne"/") {
-								$attr='1=4 @attr 4=1  ';
-							$term=$title;
-							} elsif ($author ne "/") {
-								$attr='1=1003';
-							$term=$author;
-							} 
-
-							
-my $query="\@attr $attr \"$term\"";	
-			
-  foreach my $servid ( @id){
-  my $sth=$dbh->prepare("select * from z3950servers where id=?");
-  $sth->execute($servid);
-
-    while ($server=$sth->fetchrow_hashref) {
-	my $noconnection=0;
-	#$numberpending=1;
-							
-	my $option1=new ZOOM::Options();
-	$option1->option(async=>1);
-	$option1->option('elementSetName', 'F');
-	$option1->option('databaseName',$server->{db})  ;
-	$option1->option('user',$server->{userid})  ;
-	$option1->option('password',$server->{password})  ;
-	$option1->option('preferredRecordSyntax', $server->{syntax});
-	 $oConnection[$s]=create ZOOM::Connection($option1);
-	$oConnection[$s]->connect($server->{host}, $server->{port});
-	$serverhost[$s]=$server->{name};
-	$encoding[$s]=$server->{syntax};
-	$s++;
-    }## while fetch
-
-  }# foreach
-my $nremaining = $s;
-my $firstresult=1;
- for (my $z=0 ;$z<$s;$z++){
-$oResult[$z] = $oConnection[$z]->search_pqf($query);
-
-}
-AGAIN:
- my $k;
-my $event;
-  while (($k = ZOOM::event(\@oConnection)) != 0) {
-	$event = $oConnection[$k-1]->last_event();
-# warn ("connection ", $k-1, ": event $event (", ZOOM::event_str($event), ")\n");
-	last if $event == ZOOM::Event::ZEND;
-   }
-if ($k != 0) {
-	$k--;
-#warn $serverhost[$k];
-	 my($error, $errmsg, $addinfo, $diagset) = $oConnection[$k]->error_x();
-   	if ($error) {
-
-#	warn "$k $serverhost[$k] error $query: $errmsg ($error) $addinfo\n";
-	goto MAYBE_AGAIN;
-  	}
-	
-	my $numresults=$oResult[$k]->size() ;								
- 									
-	my $i;
-	my $result='';
- @breeding_loop = ();
-
-   if ($numresults>0){
-       for ($i=0; $i<(($numresults<5) ? ($numresults) : (5)) ; $i++) {
-			my $rec=$oResult[$k]->record($i); 										
-			my $marcrecord;
-			$marcdata = $rec->raw();											
-			$marcrecord = MARC::File::USMARC::decode($marcdata);
-			
-			my $marcxml=$marcrecord->as_xml_record($marcrecord);
-			$marcxml=Encode::encode('utf8',$marcxml);
-			#$marcxml=Encode::decode('utf8',$marcxml);
-			my $xmlhash=XML_xml2hash_onerecord($marcxml);						
-		my $oldbiblio = XMLmarc2koha_onerecord($dbh,$xmlhash,'biblios');
-				$oldbiblio->{isbn} =~ s/ |-|\.//g,
-			$oldbiblio->{issn} =~ s/ |-|\.//g,
-			
-my ($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported,$bid)=ImportBreeding($marcdata,1,$serverhost[$k],$encoding[$k],$random);
-			my %row_data;
-	if ($i % 2) {
-		$toggle="#ffffcc";
-	} else {
-		$toggle="white";
-	}
-	$row_data{toggle} = $toggle;
-	$row_data{server} = $serverhost[$k];
-	$row_data{isbn} = $oldbiblio->{isbn};
-
-	$row_data{title} =$oldbiblio->{title};
-	$row_data{author} = $oldbiblio->{author};
-	$row_data{id} = $bid;
-	$row_data{oldbiblionumber}=$oldbiblionumber;
-	push (@breeding_loop, \%row_data);
-
-
-         }# upto 5 results
-     }#$numresults
-}# if $k !=0
-
-
-$numberpending=$nremaining-1;
-				$template->param(breeding_loop => \@breeding_loop,server=>$serverhost[$k],
-						numberpending => $numberpending,
-						);
-output_html_with_http_headers $input, "", $template->output if $firstresult==1;
-
-print  $template->output  if $firstresult !=1;
-$firstresult++;
-
-MAYBE_AGAIN:
-if (--$nremaining > 0) {
-    goto AGAIN;
-}
-$template->param(	numberpending => "No",);
-print  $template->output;
-} ## if op=search

Index: cgi-bin/z3950/zebraqueue_start.pl
===================================================================
RCS file: cgi-bin/z3950/zebraqueue_start.pl
diff -N cgi-bin/z3950/zebraqueue_start.pl
--- cgi-bin/z3950/zebraqueue_start.pl	10 Mar 2007 01:33:07 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,62 +0,0 @@
-#!/usr/bin/perl
-# script that starts the zebraquee
-#  Written by TG on 01/08/2006
-use strict;
-
-
-use C4::Context;
-use C4::Biblio;
-use C4::AuthoritiesMarc;
-use XML::Simple;
-
-### ZEBRA SERVER UPDATER
-my $dbh=C4::Context->dbh;
-AGAIN:
-my $readsth=$dbh->prepare("select id,biblio_auth_number,operation,server from zebraqueue");
-my $delsth=$dbh->prepare("delete from zebraqueue where id =?");
-
-my $wait=C4::Context->preference('zebrawait');
- $wait=120 unless $wait;
-my ($id,$biblionumber,$operation,$server,$marcxml);
-$readsth->execute;
-while (($id,$biblionumber,$operation,$server)=$readsth->fetchrow){
-if (!$biblionumber){
-$delsth->execute($id);
-next;
-}
-if ($server eq "biblioserver"){
-	($marcxml) =ZEBRA_readyXML($dbh,$biblionumber);
-	}elsif($server eq "authorityserver"){
-	$marcxml =C4::AuthoritiesMarc::XMLgetauthority($dbh,$biblionumber);
-	} 
-
-eval {
-my $hashed=XMLin($marcxml);
-}; ### is it a proper xml? broken xml may crash ZEBRA- slow but safe
-
-if ($@){
-warn $@;
-## Broken XML-- Should not reach here-- but if it does -lets protect ZEBRA
-$delsth->execute($id);
-next;
-}
-my $ok;
-eval{
- $ok=ZEBRAopserver($marcxml,$operation,$server,$biblionumber);
-};
- ## If a delete operation delete the SQL DB as well
-	if ($operation eq "recordDelete"  ){
-		if ($server eq "biblioserver"){
-		ZEBRAdelbiblio($dbh,$biblionumber);
-		}elsif ($server eq "authorityserver"){
-		ZEBRAdelauthority($dbh,$biblionumber);
-		}
-	}
-$delsth->execute($id) if ($ok==1|| $operation eq "recordDelete" );
-
-}
-ZEBRAopcommit($server);
-$delsth->finish;
-$readsth->finish;
-sleep $wait;
-goto AGAIN;
\ No newline at end of file

Index: cgi-bin/z3950/zebraqueue_windows_start.pl
===================================================================
RCS file: cgi-bin/z3950/zebraqueue_windows_start.pl
diff -N cgi-bin/z3950/zebraqueue_windows_start.pl
--- cgi-bin/z3950/zebraqueue_windows_start.pl	10 Mar 2007 01:33:07 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-#!/usr/bin/perl
-# script that starts the zebraquee
-#  Written by TG on 01/08/2006
-use strict;
-
-use Win32::Process;
-use Win32;
-use C4::Context;
-use CGI;
-my $input=new CGI;
-my $pid;
-my $fileplace=C4::Context->config('intranetdir');
-my $fullpath=$fileplace."/cgi-bin/z3950";
-open(IN,"<" ,"C:/etc/zebra.pid") or goto NEW;
-while (<IN>){
- $pid=$_;
-my $exitcode;
-Win32::Process::KillProcess($pid, $exitcode);
-}
-close(IN);
-
-NEW:
-my $ZebraObj;
- my $ret=Win32::Process::Create($ZebraObj,	"C:/usr/bin/perl.exe",'perl zebraqueue_start.pl',	0, DETACHED_PROCESS,$fullpath)  ;
-$pid=$ZebraObj->GetProcessID();
-
-open(OUT,">" ,"C:/etc/zebra.pid");
-print OUT $pid;
-close(OUT);
-print $input->redirect("/cgi-bin/koha/mainpage.pl?pid=$pid");
-1;
-

Index: htdocs/favicon.ico
===================================================================
RCS file: htdocs/favicon.ico
diff -N htdocs/favicon.ico
Binary files /tmp/cvsYghd7f and /dev/null differ

Index: htdocs/index.html
===================================================================
RCS file: htdocs/index.html
diff -N htdocs/index.html
--- htdocs/index.html	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-<html>
-<head>
-<meta http-equiv="refresh" content="0 ; url=/cgi-bin/koha/mainpage.pl" >
-
-</head>
-<body bgcolor=white>
-<table border=0 width=100% height=100%>
-<tr><td align=center valign=center>
-WELCOME TO  GRAND LIBRARY NEULIS
-</td></tr>
-</table>
-</body>
-</html>

Index: htdocs/intranet-tmpl/default/en/about.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/about.tmpl
diff -N htdocs/intranet-tmpl/default/en/about.tmpl
--- htdocs/intranet-tmpl/default/en/about.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,103 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- About Koha
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main"><!-- TMPL_VAR NAME="about" -->
-<h1>About Koha</h1>
-<p>Data about the current version of Koha for bug reports (or general 
-interest).</p>
-<div class="table items"><table>
-  <tr>
-      <th>Koha version:</th>
-      <td><!-- TMPL_VAR ESCAPE="html" NAME="kohaVersion" --></td>
-  </tr>
-  <tr>
-      <th>OS version (from 'uname -a'):</th>
-      <td><!-- TMPL_VAR ESCAPE="html" NAME="osVersion" --></td>
-  </tr>
-  <tr>
-      <th>Perl version:</th>
-      <td><!-- TMPL_VAR ESCAPE="html" NAME="perlVersion" --></td>
-  </tr>
-  <tr>
-      <th>MySQL version:</th>
-      <td><!-- TMPL_VAR ESCAPE="html" NAME="mysqlVersion" --></td>
-  </tr>
-  <tr>
-      <th>Apache version:</th>
-      <td><!-- TMPL_VAR ESCAPE="html" NAME="apacheVersion" --></td>
-  </tr>
- </table></div>
-
- <table>
- <caption>Credits</caption>
-	<tr><th>Special thanks to the following funders</th></tr>
-			<tr><td><ul><li><b>Horowhenua Library Trust</b> and Rosalie Blake, Head of Libraries, (Koha 1.0)</li>
-		<li>The <b>Nelsonville Public Library</b>, USA, Ohio (MARC support funding)</li>
-		<li><b>EMN (Ecole des Mines de Nantes)</b>, France (Suggestion, stats modules and improved ldap support funding)</li>
-		<li><b>ENSMP (Ecole Nationale Supérieure des Mines de Paris)</b>, France (biblio frameworks, MARC authorities, OPAC basket, Serials support funding)</li></ul></td></tr>
-		<li><b>NEU Grand Library</b>, Cyprus (complete new MARC XML interface and ZOOM support)</li></ul></td></tr>
-  	
-<tr>
-	<th>Core Team for 3.2</th></tr>
-	<tr><td>
-<ul>
-	<li><b>Rachel Hamilton-Williams</b>, Kaitiaki</li>
-		<li><b>Joshua Ferraro</b>, 3.2 release manager (Liblime) </li>
-		<li><b>Tumer Garip</b>, Asst. release manager (NEU Grand Library) </li>
-
-		<li>Stephen Hedges, Owen Leonard,  (<b>Nelsonville Public Library</b>)</li>
-		<li><b>Katipo Communications</b> (Koha 1.0 developers)</li>
-		<ul>
-			<li>Rachel Hamilton-Williams, General Manager (Webmistress)</li>
-			<li>Chris Cormack, 1.2 release manager</li>
-			<li>and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson, Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</li></ul>
-		<li>Emiliano Marmonti, Matías Veleda &amp; Sebastian Catañeda <b>La Plata University, Argentina</b> (barcode printing)</li>
-		<li>MJ Ray and <b>Turo Technology LLP</b>, (quality control, installer &amp; updater, 2.0 release maintainer)</li>
-		<li>Nicholas Rosasco, (Documentation Compiler)</li>
-		<li>Mike Hansen</li>
-		<li><b>Pate Eyler</b> (Kaitiaki from 2002 to 2004)</li>
-					</td>
-				</tr>
-<tr><th>Thanks to</th></tr>
-				<tr>
-					<td>
-<ul>
-					<li>Adam Thick</li>
-					<li>Andrew Hooper</li>
-					<li>Al Banks</li>
-					<li>Ambrose Li (translation tool)</li>
-					<li>Andrew Arensburger (the small and great C4::Context module)</li>
-					<li>Benedykt P. Barszcz (Polish for 2.0)</li>
-					<li>Brig C. McCoy</li>
-					<li>Daniel Holth</li>
-					<li>David Strainchamps</li>
-					<li>Dorian Meid (German translation)</li>
-					<li>doXulting (Matthieu Branlat) OPAC basket</li>
-					<li>Ed Summers (Some code and Perl packages like MARC::Record)</li>
-					<li>Esiee School (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)</li>
-					<li>Florian Bischof</li>
-					<li>Francisco M. Marzoa Alonso</li>
-					<li>Glen Stewart</li>
-					<li>Henri-Damien Laurent</li>
-					<li>Jo Ransom</li>
-					<li>Kip DeGraaf</li>
-					<li>Marco Gaiarin</li>
-					<li>Md. Aftabuddin</li>
-					<li>Michaes Herman</li>
-					<li>Mike Johnson</li>
-					<li>Mike Mylonas</li>
-					<li>Nicolas Morin (French Translation in 2.0)</li>
-					<li>Pawel Skuza (Polish for 1.2)</li>
-					<li>Regula Sebastiao</li>
-					<li>Roger Buck</li>
-					<li>Ron Wickersham</li>
-					<li>Sebastiaan Durand</li>
-					<li>Steve Tonnesen (early MARC work, Virtual Bookshelves concept, KohaCD)</li>
-					<li>Universidad ORT Uruguay (Ernesto Silva, Andres Tarallo)</li></ul>					</td>
-				</tr>
-			</table>
-</div>
-</div>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/auth.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/auth.tmpl
diff -N htdocs/intranet-tmpl/default/en/auth.tmpl
--- htdocs/intranet-tmpl/default/en/auth.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,47 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- <!-- TMPL_IF NAME="nopermission" -->Access Denied<!-- /TMPL_IF --><!-- TMPL_IF NAME="timed_out" -->Session Timed Out --<!-- /TMPL_IF --><!-- TMPL_IF NAME="different_ip" -->IP Change -- <!-- /TMPL_IF --><!-- TMPL_IF NAME="invalid_username_or_password" -->Invalid Username or Password -- <!-- /TMPL_IF --><!-- TMPL_IF NAME="loginprompt" -->Log in to NEULIS<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<div id="auth">
-
-<!-- TMPL_IF NAME="nopermission" -->
-<div class="error"><!-- This is what is displayed if user doesn"t have permission --><h3>Login Error</h3>
-Sorry, NEULIS doesn't think you have permission for this page.</div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="timed_out" -->
-<div class="error"><!-- This is what is displayed if login has timed out -->
-<h3>Login Error</h3>Sorry, your session has timed out.  Please login again.</div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="different_ip" -->
-<div class="error"><!-- This is what is displayed if user"s IP has changed -->
-<h3>Login Error</h3>You are accessing NEULIS from a different ip address! Please login again.</div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="invalid_username_or_password" -->
-<div class="error"><!-- This is what is displayed if the username or password doesn"t work -->
-<h3>Login Error</h3>You entered an incorrect username or password.  Please try again.</div>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF NAME="loginprompt" -->
-<!-- login prompt time-->
-
-<form action="<!-- TMPL_VAR NAME="url" -->" method="post" name="mainform" id="mainform">
-<!-- TMPL_LOOP NAME="INPUTS" -->
-  <input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->" />
-<!-- /TMPL_LOOP -->
-
-<table>
-<div class="details"><table>
-	<h1>Log In to NEULIS</h1><br>
-    <tr><th><label for="userid">Cardnumber:</label></th><td><input name="userid" id="userid" /></td></tr>
-    <tr><th><label for="password">Password:</label></th><td><input type="password" name="password" id="password" /></td></tr>
-    </table>
-<p><input type="submit" value="Submit" class="submit" /></p></div>
-</table>
-
-</form>
-<!-- /TMPL_IF -->
-</div>
-
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/intranet-main.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/intranet-main.tmpl
diff -N htdocs/intranet-tmpl/default/en/intranet-main.tmpl
--- htdocs/intranet-tmpl/default/en/intranet-main.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!--TMPL_VAR NAME="LibraryName"--><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" --><!-- TMPL_INCLUDE NAME="intranet-nav.inc" --><div id="main"><div class="error">				<!-- TMPL_IF NAME="error" -->						<ul >								<li>Sistemde HATA VAR Kayıt kaybetmemek için durduruldu</li>									<li>OTOMASYONA HABER VERINIZ</li>								</ul>												<!-- /TMPL_IF -->				<!-- TMPL_IF NAME="counter" -->						<ul >								<li>Number of books cataloged today:<!-- TMPL_VAR NAME="counter" --></li>															</ul>												<!-- /TMPL_IF -->							<!-- TMPL_IF NAME="count_pending_request" --><p>								<span class="style5">Pending Cataloguings</span><br>																			<ul>												<li>												<a href="/cgi-bin/koha/bookshelves/shelf-requests.pl" 												   class="style5"> 												   There are <!-- TMPL_VAR NAME="count_pending_request" --> new file/s												   pending for cataloguings.												 </a>											</li>										</ul></p>																		<!-- /TMPL_IF -->														<!--TMPL_IF NAME="new_suggestions"-->Yanıt bekleyen kitap önerisi toplam:<!--TMPL_VAR NAME="new_suggestions"--><!--/TMPL_IF--></div><table width="100%"  border="0" align="center" cellpadding="4" cellspacing="2">            <tr>              <td bgcolor="#06B4D2" class="style5"><b>Messages</b></td>            </tr>            <tr>              <td>			    <!-- TMPL_LOOP name="opac_news" -->						<table width="600"  border="0" align="center" cellpadding="2" cellspacing="2" bgcolor="#F2F0E9">						  <tr bgcolor="#DCD9CF">							<td height="20" colspan="2" bgcolor="#DCD9CF"> 								<div align="left" class="style5"> 								  <table width="100%" border="0">									<tr>									  <td class="style2"><!-- TMPL_VAR NAME="title" --></td>									  <td class="style5">&nbsp;</td>									</tr>								  </table> 								 </div>							 </td> 						  </tr>						  <tr valign="top">						 	 <td colspan="2" width="730">								<!-- TMPL_VAR NAME="new" --> 							 </td>						  </tr>						  <tr>						    <td bgcolor="#F9F8F7" class="style2">							  <div align="right" class="style7">							  	  <!-- TMPL_VAR NAME="newdate" --> 							  </div>						     </td>						  </tr>					  </table>					  <hr width="600" size="1" class="style5">  				<!-- /TMPL_LOOP -->               </td>            </tr>          </table></div><!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/acqui/acqui-home.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/acqui/acqui-home.tmpl
diff -N htdocs/intranet-tmpl/default/en/acqui/acqui-home.tmpl
--- htdocs/intranet-tmpl/default/en/acqui/acqui-home.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,104 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="menu-acqui.inc" -->
-
-<div id="main">
-
-<h1>Acquisitions</h1>
-<div id="acqui_acqui_home_order">
-	<!-- TMPL_IF name="nobudget" -->
-		You must define a budget in parameters
-	<!-- TMPL_ELSE -->
-		<form action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
-			<h2>Start, recieve, or modify any order</h2>
-			<p><label for="supplier">Supplier ID or name</label><input type="text" size="25" name="supplier" id="supplier" />
-			<input type="submit" value="Search" />
-			</p>
-		</form>
-	<!-- /TMPL_IF -->
-</div>
-
-
-<div id="acqui_acqui_home_currency">
-<!-- TMPL_IF NAME="loop_currency" -->
-	<h2>Exchange rates</h2>
-	<form action="/cgi-bin/koha/acqui/currency.pl">
-	<table>
-		<tr>
-			<th>Currency</th>
-			<th>Rate</th>
-		</tr>
-		<!-- TMPL_LOOP name="loop_currency" -->
-			<tr>
-				<td>
-					<label for="<!-- TMPL_VAR name="currency" -->"><!-- TMPL_VAR name="currency" --></label>
-				</td>
-				<td>
-						<input type="hidden" name="type" value="change" />
-						<input type="text" size="10" id="<!-- TMPL_VAR name="currency" -->" name="<!-- TMPL_VAR name="currency" -->" value="<!-- TMPL_VAR name="rate" -->" />
-				</td>
-			</tr>
-		<!-- /TMPL_LOOP -->
-	</table>
-	<input type="submit" value="Save Exchange Rate" />
-	</form>
-<!-- TMPL_ELSE -->
-	<form action="/cgi-bin/koha/admin/currency.pl" method="post">
-	<input type="hidden" name="op" value="add_form" /><input type="submit" value="Add Currency" />
-	</form>
-<!-- /TMPL_IF -->
-</div>
-
-<div id="acqui_acqui_home_suggestions">
-	<h2>Pending Suggestions</h2>
-		<!-- TMPL_IF name="suggestion" -->
-			<!--TMPL_VAR NAME="suggestion" --> suggestions waiting <a href="/cgi-bin/koha/suggestion/acceptorreject.pl">Manage suggestions</a>
-		<!-- TMPL_ELSE -->
-			<p>No suggestions waiting</p>
-		<!-- /TMPL_IF -->
-</div>
-
-<div id="acqui_acqui_home_budgets">
-	<!-- TMPL_IF name="nobudget" -->
-		<p>You must define a budget in parameters</p>
-	<!-- TMPL_ELSE -->
-	<h2>Budgets and bookfunds</h2>
-	<table>
-		<tr>
-			<th>Budgets</th>
-			<th>Total</th>
-			<th>Spent</th>
-			<th>Comtd</th>
-			<th>Avail</th>
-		</tr>
-		<!-- TMPL_LOOP name="loop_budget" -->
-			<tr>
-				<td><!-- TMPL_VAR name="bookfundname" --></td>
-				<td><!-- TMPL_VAR name="budgetamount" --></td>
-				<td><!-- TMPL_VAR name="spent" --></td>
-				<td><!-- TMPL_VAR name="comtd" --></td>
-				<td><!-- TMPL_VAR name="avail" --></td>
-			</tr>
-		<!-- /TMPL_LOOP -->
-		<tr>
-			<td>Total</td>
-			<td><!-- TMPL_VAR name="total" --></td>
-			<td><!-- TMPL_VAR name="totspent" --></td>
-			<td><!-- TMPL_VAR name="totcomtd" --></td>
-			<td><!-- TMPL_VAR name="totavail" --></td>
-		</tr>
-	</table><!-- /TMPL_IF -->
-</div>
-<div id="acqui_acqui_home_hints">
-	<p>Use your reload button [ctrl + r] to get the most recent figures.
-	Committed figures are approximate only, as exchange rates will affect the amount actually paid.</p>
-	
-	<h2>Help</h2>
-	<p>To start an acquisition, whether an order, local purchase or donation first search on the supplier, (set donations as a supplier if you wish), and click add order which  will set up a "shopping basket" for you.</p>
-	<p>To place an order you need to establish whether a biblio already exists for it, or set up a new biblio from scratch or from a suggestion.  </p>
-	<p>To close  a shopping basket  click on "confirm Close Basket". After closing a basket it can not be modified or deleted</p>
-	<p>To receive an order (a parcel)  search for the supplier and click receive. After confirming invoice details you will be asked to create items for the order</p>
-	
-</div>
-
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/acqui/basket.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/acqui/basket.tmpl
diff -N htdocs/intranet-tmpl/default/en/acqui/basket.tmpl
--- htdocs/intranet-tmpl/default/en/acqui/basket.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,149 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket (<!-- TMPL_VAR NAME="basketno" -->) for <!-- TMPL_VAR NAME="name" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="intranet-nav-brief.inc" -->
-
-<div id="main">
-<script>
-function Searchrecord()
-{
-	 window.open('/cgi-bin/koha/serials/subscription-bib-search.pl','FindABibIndex','width=500,height=400,toolbar=no,scrollbars=yes');
-}
-</script>
-	<h1><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket <!-- TMPL_VAR NAME="basketno" --> for <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
-	<div id="acqui_basket_summary">
-		<h2>Basket Details</h2>
-		<table>
-		<tr><th>Basket Number:</th><td><!-- TMPL_VAR NAME="basketno" --></td></tr>
-		<tr><th>Managed By:</th><td><!-- TMPL_VAR NAME="authorisedbyname" --></td></tr>
-		<tr><th>Open On:</th><td><!-- TMPL_VAR NAME="creationdate" --></td></tr>
-		<tr><th>For:</th><td>Supplier Id <!-- TMPL_VAR NAME="booksellerid" --></td></tr>
-		<tr><th>Invoice Number:</th><td><!-- TMPL_VAR NAME="booksellerinvoicenumber" --></td></tr>
-		<tr><th>Purchase Order Number:</th><td><!-- TMPL_VAR NAME="purchaseordernumber" --></td></tr>
-		<!-- TMPL_IF name="closedate" --><tr><th>Closed On:</th><td> <!-- TMPL_VAR name="closedate" --></td></tr><!-- /TMPL_IF -->
-		</table>
-		<!-- TMPL_UNLESS name="closedate" -->
-		<!-- TMPL_IF NAME="basketno" -->
-		<form action="/cgi-bin/koha/acqui/booksellers.pl" method="get">
-			<input type="hidden" name="op" value="close" />
-			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
-			<input type="hidden" name="supplier" value="<!-- TMPL_VAR name="booksellerid" -->" />
-			<input type="submit" value="Confirm Close this Basket" />
-		</form>
-		<!-- /TMPL_IF-->
-		<!-- /TMPL_UNLESS -->
-	</div>
-	
-	<div id="acqui_basket_content">
-	<h2>Order Details</h2>
-	<!-- TMPL_IF name="books_loop" -->
-		<table>
-			<tr>
-				<th scope="col">Order</th>
-				<th scope="col">Publisher</th>
-				<th scope="col"><a href="basket.pl?basketno=<!-- TMPL_VAR name="basketno" -->&amp;order=biblio.title">Title</a></th>
-				<th scope="col">RRP</th>
-				<th scope="col">Qty.</th>
-				<th scope="col">Total</th>
-				<th scope="col"><a href="basket.pl?basketno=<!-- TMPL_VAR name="basketno" -->&amp;order=aqorderbreakdown.bookfundid">Fund</a></th>
-<!-- TMPL_IF name="active" -->
-<!-- TMPL_UNLESS name="closedate" -->
-					<th scope="col">Remove</th>
-				<!-- /TMPL_UNLESS -->
-					<!-- /TMPL_IF -->
-			</tr>
-			<!-- TMPL_LOOP NAME="books_loop" -->
-				<!-- TMPL_IF NAME="highlight" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-							<td><!-- TMPL_VAR NAME="ordernumber" --></td>
-					<td><!-- TMPL_VAR NAME="publishercode" --></td>
-					<!-- TMPL_IF name="closedate" -->
-						<td><p>
-							<!-- TMPL_VAR NAME="title" --><br/>
-								<!-- TMPL_VAR NAME="author" -->
-								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
-								<!-- TMPL_IF name="notes" --></p><p><!--TMPL_VAR name="notes" --><!-- /TMPL_IF -->
-							</p>
-						</td>
-					<!-- TMPL_ELSE -->
-						<td>
-							<p>
-							<a href="neworderempty.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
-								<!-- TMPL_VAR NAME="author" -->
-								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
-								<!-- TMPL_IF name="notes" --></p><p><!--TMPL_VAR name="notes" --><!-- /TMPL_IF -->
-							</p>
-						</td>
-					<!-- /TMPL_IF -->
-					<td><!-- TMPL_VAR NAME="rrp" --></td>					
-					<td><!-- TMPL_VAR NAME="quantity" --></td>
-					<td><!-- TMPL_VAR NAME="line_total" --></td>
-					<td><!-- TMPL_VAR NAME="bookfundid" --></td>
-					<!-- TMPL_IF name="active" -->
-					<!-- TMPL_UNLESS name="closedate" -->
-					<!-- TMPL_UNLESS name="donotdelete" -->
-					<td>
-							<form action="addorder.pl" method="get">
-								<input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordernumber" -->" />
-								<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
-								<input type="hidden" name="quantity" value="0" />
-								<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-								<input type="submit" class="delete" value="Delete" />
-							</form>
-						</td>
-					<!-- /TMPL_UNLESS -->
-					<!-- /TMPL_UNLESS -->
-					<!-- /TMPL_IF -->
-				</tr>
-			<!-- /TMPL_LOOP -->
-			
-			<tr>
-				<td colspan="2" rowspan="3">
-					<input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" />
-					<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
-				</td>
-				<th align="right">SubTotal</th>
-				<th><!-- TMPL_VAR NAME="sub_total_est" --></th>
-				<th><!-- TMPL_VAR name="qty_total" --></th>				
-			</tr>
-			<!--TMPL_IF NAME="disc_est"-->
-			<tr>
-				<th align="right">Discount</th>
-				<th>-<!-- TMPL_VAR NAME="disc_est" --></th>
-			</tr>
-			<!--/TMPL_IF-->
-			<!--TMPL_IF NAME="gist"-->
-			<tr>
-				<th align="right">Tax</th>
-				<th><!-- TMPL_VAR NAME="gist_est" --></th>
-			</tr>
-			<!--/TMPL_IF-->
-			<tr><td></td><td></td>
-				<th align="right">TOTAL</th>
-				<th><!-- TMPL_VAR NAME="grand_total_est" --></th>
-			</tr>
-		</table>
-	<!-- TMPL_ELSE -->
-		<table>
-			<tr><td>Basket empty</td></tr>
-		</table>
-	<!-- /TMPL_IF -->
-	
-	<!-- TMPL_UNLESS name="closedate" -->
-	</div>
-	<div id="acqui_basket_add">
-		<h2>Add To Order</h2>
-		<form action="/cgi-bin/koha/acqui/neworderempty.pl" method="get" name="f" id="f">
-			<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" />
-			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
-			To add from an existing record:
-			<li>Enter an existing  biblionumber: <input type="text"  size="25"   name="biblionumber" />
-			<input type="submit" value="Add order" /></li>
-			<li>or <a href="#" onClick="Searchrecord()">Search for an existing Biblio</a></li>
-			<ul><li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->">From a Suggestion</a></li>
-			<li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->">New Record</a></li>
-			</ul>
-		</form>
-	</div>
-	<!-- /TMPL_UNLESS -->
-</div>
-
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/acqui/booksellers.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/acqui/booksellers.tmpl
diff -N htdocs/intranet-tmpl/default/en/acqui/booksellers.tmpl
--- htdocs/intranet-tmpl/default/en/acqui/booksellers.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,84 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Search supplier <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
-<div id="main">
-<h1>You searched on <b>supplier: <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> baskets found</h1>
-<div id="acqui_order_supplierlist">
-	<table>
-	<tr>
-		<th>Order</th>
-		<th>Company</th>
-		<th>&nbsp;</th>
-		
-	</tr>
-	
-	<!-- TMPL_LOOP name="loop_suppliers" -->
-		<tr>
-			<td>
-				<!-- TMPL_IF name="active" -->
-					<a href="basket.pl?supplierid=<!-- TMPL_VAR name=supplierid -->">Add order</a>
-				<!-- TMPL_ELSE -->
-					Inactive
-				<!-- /TMPL_IF -->
-			</td>
-			
-			<td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><!-- TMPL_VAR name="name" --></a></td>
-			
-			<!--TMPL_IF NAME="ordcount"-->
-				<td>
-				<a href="parcel.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">Recieve All orders</a>
-				</td>
-			<!--/TMPL_IF-->
-			
-				<td>
-				<table><!--TMPL_IF NAME="ordcount"-->
-					<th>Basket</th>
-					<th>Purchase order</th>
-					<th>Created by</th>
-					<th>Date</th>
-					<th>&nbsp;</th>
-					<!--/TMPL_IF-->	
-						<!-- TMPL_LOOP NAME="loop_basket" -->
-							<tr>
-								<td><!-- TMPL_VAR NAME="basketno" --></td>
-								<td><TMPL_VAR NAME="purchaseordernumber"></td>
-								<td>
-									<!-- TMPL_VAR name="firstname" -->
-										<!-- TMPL_VAR name="surname" -->
-								</td>
-								<td><!-- TMPL_VAR NAME="creationdate" --></td>
-								<td>
-									<!-- TMPL_IF name="closedate" -->
-										closed on <!-- TMPL_VAR NAME="closedate" -->
-										<a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">View</a>
-									<!-- TMPL_ELSE -->
-										<!-- TMPL_IF name="active" -->
-											<a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">modify</a>
-										<!-- TMPL_ELSE -->
-											<a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">View</a>
-										<!-- /TMPL_IF -->
-									<!-- /TMPL_IF -->
-								</td>
-								<td>
-								<!--TMPL_IF NAME="ordcount"-->
-								
-								<a href="parcel.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">Recieve this order</a>
-								
-								<!--/TMPL_IF-->
-								</td>
-							</tr>
-						<!-- /TMPL_LOOP -->
-					</table>
-			</td>
-			</tr>
-		<!-- /TMPL_LOOP -->
-		</table>
-</div>
-<div id="acqui_order_add_supplier">
-	<form action="supplier.pl">
-		<input type="hidden" name="supplierid" value="0" />
-		<input type="submit" value="Add supplier" />
-	</form>
-</div>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/acqui/finishreceive.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/acqui/finishreceive.tmpl
diff -N htdocs/intranet-tmpl/default/en/acqui/finishreceive.tmpl
--- htdocs/intranet-tmpl/default/en/acqui/finishreceive.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receipt Summary for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Invoice, <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
-
-
-<h1>Finish Receiveing Order </h1>
-
-
-
-
-   
-<div id="acqui_acquire_orderlist">
-    <table><tr><th colspan="5">Use these values to create the items for this order</th><tr>
-    <tr>
-        <th>Title</th>
-        <th>Supplier</th>
-        <th>Replacement</th>
-        <th>Qty</th>
-        
-    </tr>
-    <!-- TMPL_LOOP name="loopbiblios" -->
-        <tr><input type="hidden" name="bibliocount" value="<!--TMPL_VAR NAME="biblionumber"-->"/>
-            <td><!-- TMPL_VAR NAME="title" --></td>
-            <td><!-- TMPL_VAR NAME="supplier" --></td>
-             <td><!-- TMPL_VAR NAME="rrp" --></td>
-            <td><input type="text" name="itemcount" size="1" value="<!-- TMPL_VAR NAME="itemcount" -->" READONLY/></td>
-            <td><div id="<!--TMPL_VAR NAME="biblionumber"-->"><a href="#" onClick="AddItem(<!--TMPL_VAR NAME="biblionumber"-->)">Add item</a></div></td>
-        </tr>
-    <!-- /TMPL_LOOP -->
-    </table>
-</div>
-
-<script type="text/javascript">
-function AddItem(biblionumber) {
-     window.open("/cgi-bin/koha/cataloguing/additem.pl?fromserials=1&serialid=000&biblionumber="+biblionumber,"AddItem",'width=700,height=400,toolbar=no,scrollbars=yes,status=yes');
-
-}
-</script>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
-

Index: htdocs/intranet-tmpl/default/en/acqui/histsearch.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/acqui/histsearch.tmpl
diff -N htdocs/intranet-tmpl/default/en/acqui/histsearch.tmpl
--- htdocs/intranet-tmpl/default/en/acqui/histsearch.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,105 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Order Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
-
-<div id="main">
-	<h1>Order search</h1>
-	<div id="acqui_histsearch">
-		<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
-		<table>
-			<tr>
-				<th>&nbsp;</th>
-				<th>Title</th>
-				<th>Author</th>
-				<th>Supplier</th>
-				<th>Placed on</th>
-				<th>Recieved on</th>
-				<th>Quantity ordered</th>
-				<th>Unit cost</th>
-				<th>&nbsp;</th>
-			</tr>
-			<tr>
-					<th>Filter By:</th>
-					<th><input type="text" name="title" value="<!-- TMPL_VAR name="title"-->" /></th>
-					<th><input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
-					<th><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
-					<th>From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" alt="calendar" />
-						<input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->" />
-						<script language="JavaScript" type="text/javascript">
-							function validate1(date) {
-								var day = date.getDate();
-								var month = date.getMonth() + 1;
-								var year = date.getFullYear();
-								var weekDay = date.getDay();
-								var dayMonth = month + '-' + day;
-								var dateString = year + '-' + month + '-' + day;
-								var dateTo = document.getElementById('to').value.split("-");
-								var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
-								if (date > limitDate) {
-									return true;
-								} else {
-									return false;
-								}
-							}
-							Calendar.setup(
-								{
-									inputField : "from",
-									ifFormat : "%Y-%m-%d",
-									button : "openCalendarFrom",
-									disableFunc : validate1,
-									dateStatusFunc : validate1
-								}
-							);
-						</script>
-						To <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" alt="calendar" />
-						<input readonly="readonly" size="10" id="to" name="toplacedon" value="<!-- TMPL_VAR name="to_placed_on" -->" type="text" />
-						<script type="text/javascript">
-							function validate2(date) {
-								var day = date.getDate();
-								var month = date.getMonth() + 1;
-								var year = date.getFullYear();
-								var weekDay = date.getDay();
-								var dayMonth = month + '-' + day;
-								var dateString = year + '-' + month + '-' + day;
-								var dateFrom = document.getElementById('from').value.split("-");
-								var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
-								if (limitDate > date) {
-									return true;
-								} else {
-									return false;
-								}
-							}
-	
-							Calendar.setup(
-								{
-									inputField : "to",
-									ifFormat : "%Y-%m-%d",
-									button : "openCalendarTo",
-									disableFunc : validate2,
-									dateStatusFunc : validate2
-								}
-							);
-						</script></th>
-					<th>&nbsp;</th>
-					<th>&nbsp;</th>
-					<th>&nbsp;</th>
-					<th><input type="submit" value="Set Filter" /></th>
-			</tr>
-			<!-- TMPL_LOOP NAME="suggestions_loop" -->
-				<tr>
-					<td>&nbsp;</td>
-					<td><a href="basket.pl?basketno=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
-					<td><!-- TMPL_VAR NAME="author" --></td>
-					<td><!-- TMPL_VAR NAME="name" --></td>
-					<td><!-- TMPL_VAR name="creationdate" --></td>
-					<td><!-- TMPL_VAR name="datereceived" --></td>
-					<td><!-- TMPL_VAR name="quantity" --></td>
-					<td><!-- TMPL_VAR name="ecost" --></td>
-					<td>&nbsp;</td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-		</table>
-		</form>
-	</div>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/acqui/lateorders.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/acqui/lateorders.tmpl
diff -N htdocs/intranet-tmpl/default/en/acqui/lateorders.tmpl
--- htdocs/intranet-tmpl/default/en/acqui/lateorders.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,110 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
-<div id="main">
-<h1 ><!-- TMPL_IF name="Supplier" --><!-- TMPL_VAR name="Supplier" --> : <!--/TMPL_IF -->Late issues</h1>
-	<div id="acqui_lateorders">
-		<form action="lateorders.pl" method="post">
-		<table>
-			<tr>
-				<th>Supplier</th>
-				<th>Order Date</th>
-				<th>Ordered for</th>
-				<th>Including Basket</th>
-				<th>Book information</th>
-				<th>Branch</th>
-				<th>Estimated Unit Price</th>
-				<th>Retailer Catalogue Unit Price</th>
-				<th>Quantity</th>
-				<th>Total cost</th>
-				<th>Budget</th>
-				<th>&nbsp;</th>
-			</tr>
-			<tr>
-					<td class="doNotPrint">
-						<!-- TMPL_VAR name="CGIsupplier" -->
-					</td>
-					<td> &nbsp;</td>
-					<td align="center" class="doNotPrint">
-						<input align="right" size="4" maxlength="3" type="text" name="delay" value="<!--TMPL_VAR Name="delay" -->" /> days
-					</td>
-					<td colspan="2">
-						&nbsp;
-					</td>
-					<td class="doNotPrint">
-						<select name="branch">
-						<!-- TMPL_LOOP name="branchloop" -->
-							<option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="branchname" --></option>
-						<!-- /TMPL_LOOP -->
-						</select>
-					</td>
-					<td colspan="5">
-						&nbsp;
-					</td>
-					
-					<td class="doNotPrint">
-						<input type="submit" value="filter" />
-					</td>
-			</tr>
-			<!-- TMPL_LOOP name="lateorders" -->
-				<!--TMPL_IF Name="hilighted" --> <tr class="hilighted"> <!--TMPL_ELSE--> <tr> <!-- /TMPL_IF -->
-					<td class="doNotPrint">
-						<!-- TMPL_VAR name="supplier" -->
-					</td>
-					<td>
-						<!-- TMPL_VAR name="orderdate" -->
-					</td>
-					<td class="number" align="right">
-						<!-- TMPL_VAR name="latesince" -->
-					</td>
-					<td align="center" class="doNotPrint">
-						<!-- TMPL_VAR name="basketno" -->
-					</td>
-					<td >
-						<b><!-- TMPL_VAR name="title" --></b>
-					<!-- TMPL_IF name="author" --><br/><i>Author:</i> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
-					<!-- TMPL_IF name="publisher" --><br/><i>Published by:</i> <!-- TMPL_VAR NAME="publisher" --><!-- TMPL_IF name="publicationyear" --><i> in </i><!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
-					</td>
-					<td class="doNotPrint">
-						<!-- TMPL_VAR name="branch" -->
-					</td>
-					<td align="right" class="doNotPrint">
-						<!-- TMPL_VAR name="unitpricelib" -->
-					</td>
-					<td align="right">
-						<!-- TMPL_VAR name="unitpricesupplier" -->
-					</td>
-					<td align="right">
-						<!-- TMPL_VAR name="quantity" -->
-					</td>
-					<td align="right">
-						<!-- TMPL_VAR name="subtotal" -->
-					</td>
-					<td class="doNotPrint">
-						<!-- TMPL_VAR name="budget" -->
-					</td>
-					<td class="doNotPrint">
-						&nbsp;
-					</td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-			<tr> 
-					<th>
-						Total
-					</th>
-					<th colspan="2">
-						&nbsp;
-					</th>
-					<th class="doNotPrint"> &nbsp;</th>
-					<th colspan="5">
-						&nbsp;
-					</th>
-					
-					<th>
-						<!-- TMPL_VAR name="total" -->
-					</th>
-			</tr>
-		</table>
-		</form>
-	</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-

Index: htdocs/intranet-tmpl/default/en/acqui/neworderempty.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/acqui/neworderempty.tmpl
diff -N htdocs/intranet-tmpl/default/en/acqui/neworderempty.tmpl
--- htdocs/intranet-tmpl/default/en/acqui/neworderempty.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,256 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Shopping Basket For: <!-- TMPL_VAR name="booksellername" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
-
-<script language="javascript" type="text/javascript">
-
-function update(f){
-  //collect values
-  quantity=f.quantity.value
-  if (quantity ==0) {
-  	alert("Quantity must be >0");
-  }
-  discount=f.discount.value
-  listinc=parseInt(f.listinc.value)
-  currency=f.currency.value
-  applygst=parseInt(f.applygst.value)
-  listprice=f.list_price.value
-  //  rrp=f.rrp.value
-  //  ecost=f.ecost.value  //budgetted cost
-  //  GST=f.GST.value
-  //  total=f.total.value
-  //make useful constants out of the above
-  exchangerate=f.elements[currency].value      //get exchange rate
-  gst_on=(applygst);
-  //do real stuff
-   if (listinc){
-listprice=listprice*100/(100+f.gstrate.value)
-}
-  rrp=listprice*exchangerate;
-  ecost=rrp*(100-discount)/100
-  GST=0;
-  if (gst_on){
- //   rrp=rrp*(1+f.gstrate.value/100);
-    GST=ecost*(f.gstrate.value)/100;
-  }
-
-  total=(ecost+GST)*quantity
-
-  f.rrp.value=rrp;
-  f.ecost.value=ecost;
-  f.unitprice.value=ecost+GST
-  f.GST.value=GST;
-  f.total.value=total;
-  return true;
-}
-
-
-
-function messenger(X,Y,etc){
-	win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
-	win.focus();
-	win.document.close();
-	win.document.write("<body link='#333333' bgcolor='#ffffff' text='#000000'><font size='2'><p><br>");
-	win.document.write(etc);
-	win.document.write("<center><form><input type=button onclick='self.close()' value='Close'></form></center>");
-	win.document.write("</font></body></html>");
-}
-
-function check(f) {
-  quantity=f.quantity.value;
-  title=f.title.value;
- biblio=f.biblionumber.value;
- invoice=f.purchaseordernumber.value;
-suggestionid="<!--TMPL_VAR NAME="suggestionid"-->";
-  if (title == "") {
-  	alert("Title can't be empty- Have you created the biblio?");
-	return false;
-  }
- if (biblio == "" && suggestionid=="") {
-  	alert("A biblio is not created- please create the biblio first?");
-	return false;
-  }
-  if (quantity ==0) {
-  	alert("Quantity must be >0");
-	return false;
-  }
-
-	document.frusin.submit();
-}
-function AddBiblio() {
-     window.open("/cgi-bin/koha/cataloguing/addbiblio.pl?fromserials=1&popup=1&suggestionid=<!--TMPL_VAR NAME="suggestionid"-->","AddBiblio",'width=700,height=400,toolbar=no,scrollbars=yes,status=yes');
-
-}
-</script>
-<div id="main">
-<h1>
-	<!-- TMPL_IF name="ordnum" -->
-		Modify order details (line #<!-- TMPL_VAR NAME="ordnum" -->)
-	<!-- TMPL_ELSE -->
-		New order
-	<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="suggestionid" -->(defined from suggestion #<!-- TMPL_VAR NAME="suggestionid" -->)<!-- /TMPL_IF -->
-</h1>
-	<div id="acqui_basket_summary">
-		<h2>Basket Details</h2>
-		<table>
-		<tr><th>Basket Number:</th><td><!-- TMPL_VAR NAME="basketno" --></td></tr>
-		<tr><th>Managed By:</th><td><!-- TMPL_VAR NAME="authorisedbyname" --></td></tr>
-		<tr><th>Open On:</th><td><!-- TMPL_VAR NAME="creationdate" --></td></tr>
-		<tr><th>For:</th><td>Supplier Id <!-- TMPL_VAR NAME="booksellerid" --></td></tr>
-		<tr><th>Invoice Number:</th><td><!-- TMPL_VAR NAME="booksellerinvoicenumber" --></td></tr>
-		<tr><th>Purchase Order Number:</th><td><!-- TMPL_VAR NAME="purchaseordernumber" --></td></tr>
-		<!-- TMPL_IF name="closedate" --><tr><th>Closed On:</th><td> <!-- TMPL_VAR name="closedate" --></td></tr><!-- /TMPL_IF -->
-		</table>
-	</div>
-
-<div id="acqui_newbiblio_edit_catalogue">
-	<h2>catalogue details</h2>
-	<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" name="frusin">
-	<!-- TMPL_UNLESS name="existing" -->
-		<input type="hidden" name="existing" value="no" >
-	<!-- /TMPL_UNLESS -->
-	<input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordnum" -->" />
-	<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
-	<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" />
-	<input type="hidden" name="biblionumber" id="biblionumber"  value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-	<input type="hidden" name="oldtype" value="<!-- TMPL_VAR NAME="itemtype" -->" />
-	<input type="hidden" name="listinc" value="<!-- TMPL_VAR NAME="listincgst" -->" />
-	<input type="hidden" name="currency" value="<!-- TMPL_VAR NAME="currency" -->" />
-	<input type="hidden" name="applygst" value="<!-- TMPL_VAR NAME="gstreg" -->" />
-	<input type="hidden" name="suggestionid" value="<!-- TMPL_VAR NAME="suggestionid" -->" />
-	<!-- TMPL_LOOP NAME="loop_currencies" -->
-		<input type="hidden" name="<!-- TMPL_VAR NAME="currency" -->" value="<!-- TMPL_VAR NAME="rate" -->" />
-	<!-- /TMPL_LOOP -->
-	
-	<p> 
-		<label><b>Title *</b></label>
-		
-			<input type="text" size="20" name="title" id="title" value="<!-- TMPL_VAR NAME="title" -->" READONLY/>Auto filled
-	</p>
-	<!-- TMPL_IF name="biblionumber" -->
-	<p>
-		<label>Author</label>
-			<input type="hidden" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" /><!-- TMPL_VAR NAME="author" -->
-	</p>
-	<p>
-		<label> Publisher</label>
-			<input type="hidden" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" /><!-- TMPL_VAR NAME="publishercode" -->
-	</p>
-	<p>
-		<label>Copyright Date</label>
-			<input type="hidden" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" /><!-- TMPL_VAR NAME="copyrightdate" -->
-		
-	</p>
-	<p>
-		<label>Format</label>
-		<!-- TMPL_VAR NAME="itemtype" -->
-	</p>
-	<p>
-		<label>ISBN</label>
-			<input type="hidden" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /><!-- TMPL_VAR NAME="isbn" -->
-		
-	</p>
-	<p>
-		<label>Series</label>
-			<input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /><!-- TMPL_VAR NAME="seriestitle" -->
-	</p>
-	<!--TMPL_ELSE-->
-	<!--TMPL_UNLESS NAME="suggestionid"--><p><a href="#" onClick="AddBiblio()">First Create a Biblio for this order</a></p><!--/TMPL_UNLESS-->
-	<!--/TMPL_IF-->
-		
-	<h2>Accounting details</h2>
-		<p>
-		<label>Branch</label>
-		<select name="branch">
-		<!-- TMPL_LOOP name="branchloop" -->
-			<option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="branchname" --></option>
-		<!-- /TMPL_LOOP -->
-		</select>
-	</p>
-		<p>
-			<label>Quantity</label>
-			
-				<input type="text" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" onchange="update(this.form);" <!-- TMPL_IF name="close" -->readonly<!--/TMPL_IF--/>
-		
-		</p>
-		<p>
-			<label>Bookfund</label>
-			<!-- TMPL_IF name="close" -->
-				<input type="hidden" size="20" name="bookfundid" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundname" -->
-			<!-- TMPL_ELSE -->
-				<!-- TMPL_VAR NAME="CGIbookfund" -->
-		  	<!--/TMPL_IF-->
-		</p>
-		Note: All figures are in local currency, except the suppliers list price which is indicated.Currency conversion is done automatically
-		<!-- TMPL_IF NAME="gstreg" -->
-		<p>
-		 <label> Applicable Tax rate</label>
-		<input type="text" size="20" name="gstrate" value="<!--TMPL_VAR NAME="gstrate"-->" onchange="update(this.form)" />%
-		</p>
-		<!--/TMPL_IF-->
-		<p>
-			<label>Suppliers List Price</label>
-	
-				<input type="text" size="20" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" onchange="update(this.form)" <!-- TMPL_IF name="close" -->readonly<!--/TMPL_IF-->/><!-- TMPL_VAR NAME="currency" -->
-		  	
-		</p>
-		<p>
-			<label>Replacement Cost </label>
-				<input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" <!-- TMPL_IF name="close" -->readonly<!--/TMPL_IF--> />
-		  	
-		</p>
-		<p>
-			<label>Discount Applied</label>
-			<input type="text" size="20" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" onchange="update(this.form)" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />%
-		</p>
-		<p>
-			<label>Budgeted Cost</label>
-			<input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
-		</p>
-		<!--TMPL_IF NAME="gstreg"-->
-		<p>
-			<label>Budgeted GST</label>
-			<input type="text" size="20" name="GST" value="<!-- TMPL_VAR NAME="gst" -->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
-		</p>
-		<!--/TMPL_IF-->
-		<p>
-			<label><b>BUDGETED TOTAL</b></label>
-			<input type="text" size="20" name="total" value="<!-- TMPL_VAR name="total"-->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
-		</p>
-		<p>
-			<label>Unit Cost</label>
-			<input type="text" size="20" name="unitprice" value="<!-- TMPL_VAR name="unitprice"-->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> /><!--TMPL_IF NAME="gstreg"-->includes any applicable tax less any discount<!--/TMPL_IF-->
-		</p>
-		<p>
-			<label>Purchase Order No </label>
-			<input type="text" size="20" name="purchaseordernumber"  value="<!-- TMPL_VAR name="purchaseordernumber" -->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> /> (using recommended!)
-		</p>
-		<p>
-			<label>Notes</label>
-			<input type="text" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" />
-		</p>
-		<p>The 2 following fields are available for your own usage. They can be useful for stat purposes</p>
-		<p>
-			<label>Sort field 1</label>
-			<!-- TMPL_IF Name="CGIsort1" -->
-				<!-- TMPL_VAR Name="CGIsort1" -->
-			<!-- TMPL_ELSE -->
-				<input type="text" size="20" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
-			<!--/TMPL_IF -->
-		</p>
-		<p>
-			<label>Sort field 2</label>
-			<!-- TMPL_IF Name="CGIsort2" -->
-				<!-- TMPL_VAR Name="CGIsort2" -->
-			<!-- TMPL_ELSE -->
-				<input type="text" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
-			<!--/TMPL_IF -->
-		</p>
-		<p>
-			<input type="button" value="OK" onclick="check(this.form)" />
-		</p>
-	</form>
-</div>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/acqui/newordersuggestion.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/acqui/newordersuggestion.tmpl
diff -N htdocs/intranet-tmpl/default/en/acqui/newordersuggestion.tmpl
--- htdocs/intranet-tmpl/default/en/acqui/newordersuggestion.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,66 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Add order from suggestion: <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
-<div id="main">
-<h1>Suggestions</h1>
-<div id="acqui_suggestion_select">
-	<form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get">
-	<table>
-		<tr>
-			<th>Suggestion</th>
-			<th>Suggested by</th>
-			<th>Accepted by</th>
-			<th>&nbsp;</th>
-		</tr>
-		<tr>
-			<th>
-				<p>Filter on :
-				title: <input type="text" name="title" value="<!-- TMPL_VAR NAME="title"-->" />
-				author: <input type="text" name="author" value="<!-- TMPL_VAR NAME="author" -->" />
-				publisher: <input type="text" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode"-->" /></p>
-			</th>
-			<th>
-				&nbsp;
-			</th>
-			<th>
-				&nbsp;
-			</th>
-			<th>
-				<input type="submit" class="button acquisition" value="Set Filter" />
-			</th>
-		</tr>
-		<!-- TMPL_LOOP NAME="suggestions_loop" -->
-			<tr>
-				<td>
-					<p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
-					<p>
-						<!-- TMPL_IF name="copyrightdate" -->copy. year:<!-- TMPL_VAR NAME="copyrightdate" --> <!-- /TMPL_IF -->
-						<!-- TMPL_IF name="volumedesc" -->volume:<i><!-- TMPL_VAR NAME="volumedesc" --></i> <!-- /TMPL_IF -->
-						<!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR NAME="isbn" --></i> <!-- /TMPL_IF -->
-						<!-- TMPL_IF name="publishercode" --><br/>published by:<!-- TMPL_VAR NAME="publishercode" --> <!-- /TMPL_IF -->
-						<!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR NAME="publicationyear" --></i> <!-- /TMPL_IF -->
-						<!-- TMPL_IF name="place" --> at <i><!-- TMPL_VAR NAME="place" --></i> <!-- /TMPL_IF -->
-						<!-- TMPL_IF name="note" --><p><i>(<!-- TMPL_VAR NAME="note" -->)</i></p> <!-- /TMPL_IF -->
-					</p>
-				</td>
-				<td>
-					<!-- TMPL_VAR NAME="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="firstnamesuggestedby" -->
-				</td>
-				<td>
-					<!-- TMPL_VAR NAME="surnamemanagedby" --><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="firstnamemanagedby" -->
-				</td>
-				<td>
-					<!-- TMPL_IF name="biblionumber" -->
-						<a href="neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->&biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button acquisition">Order</a>
-					<!-- TMPL_ELSE -->
-						<a href="neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->" class="button acquisition">Order</a>
-					<!-- /TMPL_IF -->
-				</td>
-			</tr>
-		<!-- /TMPL_LOOP -->
-	</table>
-	</form>
-</div>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/acqui/parcel.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/acqui/parcel.tmpl
diff -N htdocs/intranet-tmpl/default/en/acqui/parcel.tmpl
--- htdocs/intranet-tmpl/default/en/acqui/parcel.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,174 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Recieve <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="intranet-nav-brief.inc" -->
-
-<div id="main">
-<script type="text/javascript">
-function docalculate(){
-  //collect values
-received=document.getElementsByName('received');
- actual=document.getElementsByName('actual');
- freight=document.getElementsByName('freight');
-discounts=document.getElementsByName('discount');
-gstrate=document.getElementsByName('gstrate');
-totalreceived=0;
-totalactual=0;
-totalfreight=0;
-totaldiscount=0;
-totalgst=0;
-	for (var s=0; s<received.length; s++){
-		receivedvalue =received.item(s).value;	
-		totalreceived +=(receivedvalue*1);
-		thisactual =actual.item(s).value*receivedvalue;
-		totalactual +=thisactual;
-		totalfreight +=freight.item(s).value*receivedvalue;
-		thisdiscount =thisactual*discounts.item(s).value/100;
-		totaldiscount +=thisdiscount;
-		totalgst +=(thisactual - thisdiscount)*gstrate.item(s).value/100;
-	}
- document.f.totalreceived.value=totalreceived*1;
- document.f.totalactual.value=totalactual;
- document.f.totalfreight.value=totalfreight*1;
-document.f.actualdiscount.value=totaldiscount;
-includesgst=parseInt(document.f.incgst.value);
- if(includesgst>0){
- document.f.actualgst.value="-inc.-";
- }else{
- document.f.actualgst.value=totalgst;
-}
-document.f.freightgst.value=totalfreight*document.f.freightgstrate.value/100;
-disct=0;
- if ( document.f.actualgst.value>0){
-disct= document.f.actualgst.value;
-}
-document.f.actualtotal.value=totalactual + -totaldiscount +disct*1;
-document.f.actualfreight.value=totalfreight+ document.f.freightgst.value*1;
-document.f.invoicetotal.value=document.f.actualfreight.value*1 +document.f.actualtotal.value*1;
-<!--TMPL_IF NAME="invcurrency"-->
-document.f.localtotal.value=document.f.invoicetotal.value*<!--TMPL_VAR NAME="currencyrate"-->;
-<!--/TMPL_IF-->
-  return true;
-}
-function updatetotal(){
-document.f.actualtotal.value= document.f.totalactual.value - document.f.actualdiscount.value + document.f.actualgst.value*1;
-document.f.invoicetotal.value=document.f.actualfreight.value*1+document.f.actualtotal.value*1;
-<!--TMPL_IF NAME="invcurrency"-->
-document.f.localtotal.value=document.f.invoicetotal.value*<!--TMPL_VAR NAME="currencyrate"-->;
-<!--/TMPL_IF-->
-  return true;
-}
-function checkform(){
-if (document.f.invoice.value==""){
-alert ("You need a suppliers Invoice number!");
-return false;
-}
-if ( document.f.totalreceived.value==0 || document.f.totalreceived.value==""){
-alert ("no items entered as received !");
-return false;
-}
-document.f.submit();
-}
-</script>
-    <h1>
-                 Orders being recieved from <!-- TMPL_VAR NAME="name" -->
-      
-    </h1>
- <form action="finishreceive.pl" method="post" name="orderform" id="f">
-<input type="hidden" name="supplierid" value="<!--TMPL_VAR NAME="supplierid"-->" />
-<div >
-<p>Received By: <!-- TMPL_VAR NAME="user" --></p>
-<p>   Suppliers Invoice No: <input type="text" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->" />
-    
-    Date received:  <input type="text" name="datereceived" value="<!-- TMPL_VAR NAME="date" -->" /></p>
-</div>
-<div >
-    <h2>Recieve list</h2>
-   <input type="hidden" name="incgst" value="<!--TMPL_VAR NAME="incgst"-->" />
-  <input type="hidden" name="currencyrate" value="<!--TMPL_VAR NAME="currencyrate"-->" />
-    <table >
-	<tr>Rate of tax used for P&P:<input type="text" size="2" name="freightgstrate" value="<!--TMPL_VAR NAME="gstrate"-->" />%</td>
-        <tr> <th align="left">Basket/Order</th>
-             <th class="acquisition">ISBN</th>
-            <th class="acquisition">Title</th>
-            <th class="acquisition">Price</th>
-	  <th class="acquisition">Actual <!--TMPL_VAR NAME="invcurrency"--></th>
-            <th class="acquisition">P&amp;P <!--TMPL_VAR NAME="invcurrency"--></th>
-            <th class="acquisition">Qty</th>
-	 <th class="acquisition">Received</th>
-            
-        </tr>
-        <!-- TMPL_LOOP NAME="loop_orders" -->
-            <tr><input type="hidden" name="ordernumber" value="<!-- TMPL_VAR NAME="ordernumber" -->" />
-	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-	<input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
-                <td ><!-- TMPL_VAR NAME="basketno" -->/<!-- TMPL_VAR NAME="ordernumber" --></td>
-                <td><!-- TMPL_VAR NAME="isbn" --></td>
-                <td><!-- TMPL_VAR NAME="title" --></td>
-                <td align="right"><!-- TMPL_VAR NAME="rrp" --></td>
-                <td align="right"> <input type="text" size="2" name="actual" value="<!-- TMPL_VAR NAME="actualrrp" -->" onChange="docalculate();"/></td>
-	  <td align="right"> <input type="text" size="2" name="freight" value="0.00" onChange="docalculate();"/></td>
-                <td><!-- TMPL_VAR NAME="quantity" --></td>
-	<td> <input type="text" size="2" name="received" value="<!-- TMPL_VAR NAME="toreceive" -->" onChange="docalculate();"/></td>
-                <input type="hidden" name="discount" value="<!--TMPL_VAR NAME="discount"-->" />
-	<input type="hidden" name="gstrate" value="<!--TMPL_VAR NAME="gst"-->" />
-            </tr>
-        <!-- /TMPL_LOOP -->
-        <tr>
-            <td ></td>
-            <td></td>
-            <th class="acquisition" align="right">SubTotals</th>
-            <td align="right"><b><!-- TMPL_VAR NAME="totalprice" --></b></td>
-	<td align="right"><b><input type="text" name="totalactual" size="2" value="<!-- TMPL_VAR NAME="totalactual" -->" /></b></td>
-            <td align="right"><b><input type="text" size="2" name="totalfreight" /></b></th>
-            <td ><b><!-- TMPL_VAR NAME="totalquantity" --></b></td>
-	 <td ><b><input type="text" size="2" name="totalreceived" value="<!-- TMPL_VAR NAME="totaltoreceive" -->" READONLY /></b></td>
-          
-        </tr>
-	 <!--TMPL_IF NAME="totaldiscount"-->    <tr>
-           <td >&nbsp;</td>
-            <td>&nbsp;</td>
-  <th class="acquisition" align="right">- Discount</th>
-            <td align="right"><b><!-- TMPL_VAR NAME="totaldiscount" --></b></td>
-	<td align="right"><b><input type="text" name="actualdiscount" size="2" value="<!-- TMPL_VAR NAME="actualdiscount" -->" onChange="updatetotal();"/></b></td>
-        </tr><!--/TMPL_IF-->
-     <!--TMPL_IF NAME="gstreg"-->    <tr>
-           <td >&nbsp;</td>
-            <td>&nbsp;</td>
-  <th class="acquisition" align="right">Tax</th>
-            <td align="right"><b><!-- TMPL_VAR NAME="totalgst" --></b></td>
-	<td align="right"><b><input type="text" name="actualgst" size="2" value="<!-- TMPL_VAR NAME="actualgst" -->"/></b></td>
-	<td align="right"><b><input type="text" name="freightgst" size="2"  /></td></b>
-        </tr><!--/TMPL_IF-->
-        <tr>
-	 <td >&nbsp;</td>
-            <td>&nbsp;</td>
-            <th class="acquisition" align="right">Totals</th>
-            <td align="right"><b><!-- TMPL_VAR NAME="total" --></b></td>
-	<td align="right"><b><input type="text" name="actualtotal" size="2" value="<!-- TMPL_VAR NAME="actualtotal" -->"   onChange="updatetotal();"/></b></td>
-	<td align="right"><b><input type="text" name="actualfreight" size="2"  onChange="updatetotal();"/></b></td>
-        </tr>
-	<tr>
-	<td >&nbsp;</td>
-	<td >&nbsp;</td>
-            <th class="acquisition" align="right" colspan="5">Invoice Total <!--TMPL_VAR NAME="invcurrency"--></th>         
-	<td ><b><input type="text" name="invoicetotal" size="4"  /></b></td>
-        </tr>
-	<!--TMPL_IF NAME="invcurrency"-->
-	<tr>
-	<td >&nbsp;</td>
-	<td >&nbsp;</td>
-            <th class="acquisition" align="right" colspan="5">Invoice Total </th>         
-	<td ><b><input type="text" name="localtotal" size="4"  /></b></td>
-        </tr>
-	<!--/TMPL_IF-->
-    </table>
-Note: P&P is per item. If you have a total freight fill the Total P&P only.!
-	<p><input type="button" value="Receive" onClick="checkform();" /></p>
-    </form>
-</div>
-<script>
-updatetotal();
-</script>
-</div>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
- 

Index: htdocs/intranet-tmpl/default/en/acqui/parcels.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/acqui/parcels.tmpl
diff -N htdocs/intranet-tmpl/default/en/acqui/parcels.tmpl
--- htdocs/intranet-tmpl/default/en/acqui/parcels.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,105 +0,0 @@
- <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Recieve <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
-<div id="main">
-<h1 class="acquisition">Receive parcel from supplier <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
-
-<!-- TMPL_IF NAME="count" --><p> <!-- TMPL_VAR NAME="count" --> parcels found</p><!--/TMPL_IF-->
-<div id="resultnumber">
-<!-- Row of numbers corresponding to search result pages -->
-<!-- TMPL_IF NAME="displayprev" -->
-	<a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="prevstartfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0"></a>
-<!-- TMPL_ELSE -->
-	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
-<!-- /TMPL_IF -->
-<!-- TMPL_LOOP NAME="numbers" -->
-	<!-- TMPL_IF NAME="highlight" -->
-	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
-	<!-- TMPL_ELSE -->
-	<a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
-	<!-- /TMPL_IF -->
-<!-- /TMPL_LOOP -->
-<!-- TMPL_IF NAME="displaynext" -->
-	<a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0"></a>
-<!-- TMPL_ELSE -->
-	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
-<!-- /TMPL_IF -->
-</div>
-
-<div id="resultlist">
-<!-- Search Results Table -->
-
-<form method="post" action="parcels.pl">
-	<table class="small">
-		<tr>
-			<th class="acquisition">Line</th>
-			<th class="acquisition">Code</th>
-			<th class="acquisition">Date Received</th>
-			<th class="acquisition">Item Count</th>
-			<th class="acquisition">Biblio count</th>
-			<th class="acquisition">Items expected</th>
-		</tr>
-		<tr>
-			<th class="acquisition">
-				&nbsp;
-				<input type="hidden" name="supplierid" value=<!-- TMPL_VAR NAME="supplierid" -->>
-			</th>
-			<th class="acquisition">
-				<input type="text" size="20" name="filter" value="<!-- TMPL_VAR NAME="filter" -->">
-			</th>
-			<th class="acquisition">
-				From :<input type="text" size="9" name="datefrom" value="<!-- TMPL_VAR NAME="datefrom" -->"> 
-				<p>To :<input type="text" size="9" name="dateto" value="<!-- TMPL_VAR NAME="dateto" -->">
-			</th>
-			<th class="acquisition">
-				&nbsp;
-			</th>
-			<th class="acquisition">
-				Sort by :<select name="orderby" size="1">
-				<option value="aqorders.booksellerinvoicenumber"> Invoice- Ascending order</option>
-				<option value="datereceived"> Date Received</option>
-				<option value="datereceived desc"> Date Received reverse</option>
-				<option value="aqorders.booksellerinvoicenumber desc"> Invoice reverse</option>
-				</select><br />
-				Results per page :<select name="resultsperpage" value ="<!--TMPL_VAR Name="resultsperpage"-->" size="1">
-				<option value="20">20</option>
-				<option value="30">30</option>
-				<option value="50">50</option>
-				<option value="100">100</option>
-				</select>
-			</th>
-			<th class="acquisition">
-				<input type="submit" class="button acquisition" value="Filter">
-			</th>
-		</tr>
-<!-- Actual Search Results -->
-<!-- TMPL_LOOP NAME="searchresults" -->
-	<tr>
-		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-			<!-- TMPL_VAR NAME="number" -->
-		</td>
-		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
-			<!--TMPL_IF Name="code"--><!--TMPL_VAR Name="code" --><!--/TMPL_IF-->
-		</td>
-		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number">
-		<!-- /TMPL_IF -->
-			<a href="/cgi-bin/koha/acqui/parcel.pl?type=intra&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" ESCAPE=URL -->&amp;datereceived=<!-- TMPL_VAR NAME="raw_datereceived" ESCAPE=URL --><!--TMPL_IF Name="code"-->&amp;code=<!--TMPL_VAR Name="code" ESCAPE=URL --><!--/TMPL_IF-->">
-				<!-- TMPL_VAR NAME="datereceived" -->
-			</a>
-		</td>
-		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number">
-		<!-- /TMPL_IF -->
-			<!-- TMPL_VAR NAME="reccount" --> 
-		</td>
-		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
-			<!-- TMPL_VAR NAME="bibcount" -->
-		</td>
-		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
-			<!-- TMPL_VAR NAME="itemcount" -->
-		</td>
-	</tr>
-<!-- /TMPL_LOOP -->
-</table>
-</form>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/acqui/supplier.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/acqui/supplier.tmpl
diff -N htdocs/intranet-tmpl/default/en/acqui/supplier.tmpl
--- htdocs/intranet-tmpl/default/en/acqui/supplier.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,143 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF NAME=id -->Update: <!-- TMPL_VAR name="name" --><!-- TMPL_ELSE -->Add supplier<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
-
-<div id="main">	
-<!-- TMPL_IF name="id" -->
-		<h1>Update: <!-- TMPL_VAR NAME="name" --></h1>
-	<!-- TMPL_ELSE -->
-		<h1>Add supplier</h1>
-	<!-- /TMPL_IF -->
-	<form action="updatesupplier.pl" method="post">
-	<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
-	<div id="acqui_supplier_company">
-		<h2>COMPANY DETAILS</h2>
-		<p>
-			<label>Company Name</label>
-			<input type="text" size="40" name="company" value="<!-- TMPL_VAR NAME="name" -->" />
-		</p>
-		<p>
-			<label>Postal Address</label>
-				<textarea name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea>
-		</p>
-		<p>
-			<label>Physical Address</label>
-			<textarea name="physical" cols="40" rows="4"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea>
-		</p>
-		<p>
-			<label>Phone</label>
-			<input type="text" size="20" name="company_phone" value="<!-- TMPL_VAR NAME="phone" -->" />
-		</p>
-		<p>
-			<label>Fax</label>
-			<input type="text" size="20" name="company_fax" value="<!-- TMPL_VAR NAME="fax" -->" />
-		</p>
-		<p>
-			<label>Website</label>
-			<input type="text" size="40" name="website" value="<!-- TMPL_VAR NAME="url" -->" />
-		</p>
-		<h2 class="acquisition">CONTACT DETAILS</h2>
-		<p>
-			<label>Contact Name</label>
-			<input type="text" size="40" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->" />
-		</p>
-		<p>
-			<label>Position</label>
-			<input type="text" size="40" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->" />
-		</p>
-		<p>
-			<label>Phone</label>
-			<input type="text" size="20" name="contact_phone" value="<!-- TMPL_VAR NAME="contphone" -->" />
-		</p>
-		<p>
-			<label>Alternative phone</label>
-			<input type="text" size="20" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->" />
-		</p>
-		<p>
-			<label>Fax</label>
-			<input type="text" size="20" name="contact_fax" value="<!-- TMPL_VAR NAME="contfax" -->" />
-		</p>
-		<p>
-			<label>E-mail</label>
-			<input type="text" size="40" name="company_email" value="<!-- TMPL_VAR NAME="contemail" -->" />
-		</p>
-		<p>
-			<label>Notes</label>
-			<textarea name="notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea>
-		</p>
-	</div>
-	<div id="acqui_supplier_status">
-		<h2>CURRENT STATUS</h2>
-		<p>
-			<label>Supplier is</label>
-				<!-- TMPL_IF name="active" -->
-					<input type="radio" name="status" value="1" checked="checked" />Active
-					<input type="radio" name="status" value="0" />Inactive
-				<!-- TMPL_ELSE -->
-					<input type="radio" name="status" value="1" />Active
-					<input type="radio" name="status" value="0" checked="checked" />Inactive
-				<!-- /TMPL_IF -->
-		</p>
-	</div>
-	<div id="acqui_supplier_ordering">
-		<h2>ORDERING INFORMATION</h2>
-		<p>
-			<label>Publishers and Imprints</label>
-			<textarea name="publishers_imprints" cols="20" rows="4"><!-- TMPL_VAR NAME="specialty" --></textarea>
-		</p>
-		<p>
-			<label>List Prices are</label>
-				<select name="list_currency" size="1">
-				<!-- TMPL_LOOP NAME="loop_pricescurrency" -->
-					<!-- TMPL_VAR NAME="currency" -->
-				<!-- /TMPL_LOOP -->
-				</select>
-		</p>
-		<p>
-			<label>Invoice Prices are</label>
-				<select name="invoice_currency" size="1">
-				<!-- TMPL_LOOP NAME="loop_invoicecurrency" -->
-					<!-- TMPL_VAR NAME="currency" -->
-				<!-- /TMPL_LOOP -->
-				</select>
-		</p>
-		<p>
-			<label>GST Registered</label>
-				<!-- TMPL_IF name="gstreg" -->
-					<input type="radio" name="gst" value="1" checked="checked" /> Yes
-					<input type="radio" name="gst" value="0" /> No
-				<!-- TMPL_ELSE -->
-					<input type="radio" name="gst" value="1" /> Yes
-					<input type="radio" name="gst" value="0" checked="checked" /> No
-				<!-- /TMPL_IF -->
-		</p>
-		<p>
-			<label>List Item Price Includes GST</label>
-				<!-- TMPL_IF name="listincgst" -->
-					<input type="radio" name="list_gst" value="1" checked="checked" /> Yes
-					<input type="radio" name="list_gst" value="0" /> No
-				<!-- TMPL_ELSE -->
-					<input type="radio" name="list_gst" value="1" /> Yes
-					<input type="radio" name="list_gst" value="0" checked="checked" /> No
-				<!-- /TMPL_IF -->
-		</p>
-		<p>
-			<label>Invoice Item Price Includes GST</label>
-				<!-- TMPL_IF name="invoiceincgst" -->
-					<input type="radio" name="invoiceincgst" value="1" checked="checked" /> Yes
-					<input type="radio" name="invoiceincgst" value="0" /> No
-				<!-- TMPL_ELSE -->
-					<input type="radio" name="invoiceincgst" value="1" /> Yes
-					<input type="radio" name="invoiceincgst" value="0" checked="checked" /> No
-				<!-- /TMPL_IF -->
-		</p>
-		<p>
-			<label>Discount</label>
-			<input type="text" size="3" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %
-		</p>
-	</div>
-	<input type="submit"  name="submit" value="save" />
-	</form>
-</div>
-
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/admin-careers.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/admin-careers.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/admin-careers.tmpl
--- htdocs/intranet-tmpl/default/en/admin/admin-careers.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<div id="main">
-
-	<h1><!-- TMPL_VAR NAME="institution_name" --> (<!-- TMPL_IF NAME="add" -->Add<!-- TMPL_ELSE -->Edit<!-- /TMPL_IF --> Course)</h1>
-	
-	    <form action="/cgi-bin/koha/admin/admin-careers.pl">
-	        <input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->">
-	        <input type="hidden" name="id_institution" value="<!-- TMPL_VAR NAME="id_institution" -->">
-            <input type="hidden" name="id_career" value="<!-- TMPL_VAR NAME="id_career" -->">
-			Course name:&nbsp;&nbsp;
-			<input size="50" type="text" name="career_name" value="<!-- TMPL_VAR NAME="career_name" -->"
-	        <br><br>
-	        <input type="submit" class="button" value="Save">
-	        <input type="button" class="button" value="Cancel" onclick="document.location.href='/cgi-bin/koha/admin/institutions-careers.pl'">
-	    </form>
-	
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/admin-home.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/admin-home.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/admin-home.tmpl
--- htdocs/intranet-tmpl/default/en/admin/admin-home.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,164 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1>NEULIS Administration</h1>
-<div class="menu">
-<table>
-<caption>System Preferences</caption>
-<tr>
-	<th><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></th>
-	<td>Change essential system preferences like MARC flavor, date format, administrator e-mail, and templates.</td>
-</tr>
-</table>
-<table>
-<caption>System parameters </caption>
-<tr>
-<th class="header" colspan="2">For best results, configure these parameters in the order they appear</th>
-</tr>
-<tr>
-	<th><a href="/cgi-bin/koha/tools/koha-news.pl">OPAC news</a></th>
-	<td>Manage the news in the OPAC main page.</td>
-</tr>
-<tr>
-	<th><a href="/cgi-bin/koha/admin/koha-electronic.pl">OPAC electronic</a></th>
-	<td>Manage the online OPAC databases.</td>
-</tr>
-	<tr>
-	<th><a href="/cgi-bin/koha/admin/institutions-careers.pl">Faculties-courses</a></th>
-	<td>Add courses to faculties.</td>
-</tr>
-
-<tr>
-	<th><a href="/cgi-bin/koha/tools/holidays.pl?branch=MAIN">Holiday Management</a></th>
-	<td>Set the days library is closed for circulation purposes.</td>
-</tr>
-<tr>
-	<th><a href="/cgi-bin/koha/admin/branches.pl">Library branches</a></th>
-	<td>The different branches you manage with this Koha server.</td>
-</tr>
-<tr>
-	<th><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book funds</a></th>
-	<td>Book fund administration. Remember to edit your book funds before you start editing the budgets.</td>
-</tr>
-<tr>
-	<th><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></th>
-	<td>Define exchange rates.</td>
-</tr>
-<tr>
-	<th><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></th>
-	<td>Define item types.</td>
-</tr>
-<tr>
-	<th><a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a></th>
-	<td>Define the categories of borrowers.</td>
-</tr>
-<tr>
-	<th><a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a></th>
-	<td>Define issuing rules for branches / borrowers / item types (nb of issues, duration, cost...)</td>
-</tr>
-<tr>
-	<th><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a></th>
-	<td>Define categories and authorised values for them. Authorised values are used in MARC form to limit and help editing MARC biblios.</td>
-</tr>
-<tr>
-	<th><a href="/cgi-bin/koha/admin/authtypes.pl">Authorities Structure</a></th>
-	<td>Define categories and thesaurus/authority MARC structure.</td>
-</tr>
-<tr>
-	<th><a href="/cgi-bin/koha/admin/biblios_framework.pl">Biblio framework (MARC structure)</a></th>
-	<td>the frameworks defined for the MARC editor. Create frameworks, then define the MARC structure (fields &amp; subfields)</td>
-</tr>
-<tr>
-	<th><a href="/cgi-bin/koha/admin/holdingstagstructure.pl">Holdings framework (MARC structure)</a></th>
-	<td>the frameworks defined for theholdings MARC editor. (Complements the Biblios framework)</td>
-</tr>
-<tr>
-	<th><a href="/cgi-bin/koha/admin/koha_attr.pl">Links MARC - ZEBRA</a></th>
-	<td>Define links between the ZEBRA DB and the MARC one. </td>
-</tr>
-<tr>
-	<th><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a></th>
-	<td>Checks the MARC structure. USE IT before working with real data. It will show mistakes that can BREAK Koha's database!</td></tr>
-
-<tr>
-<th colspan="2" class="header">Various parameters</th>
-</tr>
-<tr>
-	<th><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></th>
-	<td>Printers (UNIX paths).</td>
-</tr>
-
-<tr>
-	<th><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a></th>
-	<td>Servers to query for MARC data.</td>
-</tr>
-<tr>
-	<th><a href="/cgi-bin/koha/admin/onlinedatabases.pl">Online electronic databases</a></th>
-	<td>Servers to query as library catalogue.</td>
-</tr>
-</table>
-
-<table>
-	<caption>Tools</caption>
-<tr>
-	<th colspan="2" class="header">Update Accounts</th>
-	</tr>
-	<tr>
-		<th><a href="/cgi-bin/koha/tools/fines_windows_start.pl">Update Accounts</a></th>
-		<td> Run this if fines are not uptodate.</td>
-	</tr>
-	<tr>
-	<th colspan="2" class="header">Background Processes</th>
-	</tr>
-	<tr>
-		<th><a href="/cgi-bin/koha/z3950/zebraqueue_windows_start.pl">Zebra update start</a></th>
-		<td> Zebra background updater.</td>
-	</tr>
-	<tr>
-	<th colspan="2" class="header">Export</th>
-	</tr>
-	<tr>
-		<th><a href="/cgi-bin/koha/export/marc.pl">MARC bibliographic export</a></th>
-		<td> Exporting in MARC format.</td>
-	</tr>
-	<tr>
-		<th><a href="/cgi-bin/koha/export/marc-time.pl">MARC bibliographic export by date</a></th>
-		<td> Exporting in MARC format by date.</td>
-	</tr>
-	<tr>
-		<th><a href="/cgi-bin/koha/export/marc-item.pl">MARC holdings export</a></th>
-		<td> Exporting holdings in MARC format .</td>
-	</tr>
-	<tr>
-	<th colspan="2" class="header">Import</th>
-	</tr>
-	<tr>
-		<th><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records to the reservoir</a></th>
-		<td>The reservoir is a table where imported MARC records are stored. A MARC record is stored in the reservoir as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the reservoir. If it is found, the biblio is added to Koha active table.
-		</td>
-	</tr>
-	<th colspan="2" class="header">Barcode generator</th>
-	</tr>
-	<tr>
-		<th><a href="/cgi-bin/koha/barcodes/barcodes.pl">Generate barcodes</a></th>
-		<td>the barcode generator deals with generating barcodes for items you acquire
-		</td>
-	</tr>
-	<tr><th colspan="2" class="header">Membership Cards</th></tr>
-		<tr>
-		<th><a href="/cgi-bin/koha/barcodes/cbarcodes.pl">Membership cards</a></th>
-		<td>create membership cards from member cardnumbers
-		</td>
-	</tr>
-<tr><th colspan="2" class="header">Circulation Logs</th></tr>
-		<tr>
-		<th><a href="/cgi-bin/koha/admin/viewlog.pl">Circulation Logs</a></th>
-		<td>view details of circulation
-		</td>
-	</tr>
-</table>
-</div>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/aqbookfund.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/aqbookfund.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/aqbookfund.tmpl
--- htdocs/intranet-tmpl/default/en/admin/aqbookfund.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,151 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF name="else" -->Book Funds<!-- /TMPL_IF -->
-<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="header" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="add_validate" -->Data Recorded<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Fund '<!-- TMPL_VAR name="bookfundname" -->'<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main"><!-- TMPL_IF name="else" -->
-<h1>Book Fund Administration</h1>
-<!-- TMPL_IF NAME="bookfund" --><form action="<!-- TMPL_VAR name=scriptname -->" method="post">
-<input type="text" name="searchfield" value="" /> <input type="submit" name="search" value="Search" class="submit" /></form>
-<!-- TMPL_IF name="search" -->
-	<div id="results">You Searched for <span class="ex"><!-- TMPL_VAR name="searchfield" --></span></div>
-<!-- /TMPL_IF -->
-
-<table>
-<tr>
-	<th>Book Fund</th>
-	<th>Name</th>
-	<th>Edit</th>
-	<th>Delete</th>
-	</tr>
-<!-- TMPL_LOOP name="bookfund" -->
-	<tr>
-		<td><a href="<!-- TMPL_VAR name="action" -->?op=add_form&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" --> "><!-- TMPL_VAR name="bookfundid" --></a></td>
-		<td><!-- TMPL_VAR name="bookfundname" --></td>
-		<td><form action="<!-- TMPL_VAR name="action" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" class="submit" value="Edit" /></form></td>
-		<td><form action="<!-- TMPL_VAR name="action" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" class="delete" value="Delete" /></form></td>
-	</tr>
-		<tr>
-		<td>&nbsp;</td>
-		<td><b>Budget</b></td>
-		<td><form action="aqbudget.pl" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" class="submit" value="Add Budget" /></form></td>
-		<td></td>
-	</tr>
-	<!-- TMPL_LOOP name="budget" -->
-		<tr>
-			<td>&nbsp;</td>
-			<td>
-				<!-- TMPL_VAR name="startdate" --> - <!-- TMPL_VAR name="enddate" --> : <b><!-- TMPL_VAR name="budgetamount" --></b>
-			</td>
-			<td><form action="/cgi-bin/koha/admin/aqbudget.pl" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR name="aqbudgetid" -->" /><input type="submit" class="submit" value="Edit" /></form></td>
-			<td><form action="/cgi-bin/koha/admin/aqbudget.pl" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR name="aqbudgetid" -->" /><input type="submit" class="delete" value="Delete" /></form></td>
-
-		</tr>
-	<!-- /TMPL_LOOP -->
-<!-- /TMPL_LOOP -->
-</table><!-- /TMPL_IF -->
-<form action="<!-- TMPL_VAR name=scriptname -->" method="post">
-	<p><input type="hidden" name="op" value="add_form" /></p>
-<input type="submit"value="Add bookfund" class="submit" /></form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="add_form" -->
-<script>
-	//
-	function isNotNull(f,noalert) {
-		if (f.value.length ==0) {
-   return false;
-		}
-		return true;
-	}
-	//
-	function toUC(f) {
-		var x=f.value.toUpperCase();
-		f.value=x;
-		return true;
-	}
-	//
-	function isNum(v,maybenull) {
-	var n = new Number(v.value);
-	if (isNaN(n)) {
-		return false;
-		}
-	if (maybenull==0 && v.value=="") {
-		return false;
-	}
-	return true;
-	}
-	//
-	function isDate(f) {
-		var t = Date.parse(f.value);
-		if (isNaN(t)) {
-			return false;
-		}
-	}
-	//
-	function Check(f) {
-		var ok=1;
-		var _alertString="";
-		var alertString2;
-		if (f.bookfundid.value.length==0) {
-			_alertString += "- bookfundid missing\n";
-		}
-		if (f.bookfundname.value.length==0) {
-			_alertString += "- bookfundname missing\n";
-		}
-		if (_alertString.length==0) {
-			document.Aform.submit();
-		} else {
-			alertString2 = "Form not submitted because of the following problem(s)\n";
-			alertString2 += "------------------------------------------------------------------------------------\n\n";
-			alertString2 += _alertString;
-			alert(alertString2);
-		}
-	}
-	</SCRIPT>
-<form action="<!-- TMPL_VAR name="action" -->" name="Aform" method="post">
-<input type="hidden" name="op" value="add_validate" />
-<input type="hidden" name="checked" value="0" />
-<div class="data">
-<table>
-<caption><!-- TMPL_VAR name="header" --></caption>
-<!-- TMPL_IF name="add_or_modify" -->
-<tr><th>Book fund</th><td><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><!-- TMPL_VAR name="bookfundid" --></td></tr>
-<!-- TMPL_ELSE -->
-<tr><th>Book fund</th><td><input type="text" name="bookfundid" size="5" maxlength="5" onblur="toUC(this)" /></td></tr>
-<!-- /TMPL_IF -->
-<tr><th>Name</th><td><input type="text" name="bookfundname" size="40" maxlength="80" value="<!-- TMPL_VAR name="bookfundname" escape="HTML" -->" /></td></tr>
-</table>
-</div>
-<p><input type="button" value="<!-- TMPL_VAR name="header" -->" onclick="Check(this.form); return false;" class="submit" /> <input type="submit" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR name="action" -->'; return false;" /></p>
-</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="add_validate" -->
-<h3>Data Recorded</h3>
-<form action="<!-- TMPL_VAR name="action" -->" method="post">
-<input type="submit" value="OK" class="submit" />
-</form></td></tr></table>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="delete_confirm" -->
-<h3>Confirm Deletion of Fund <em><!-- TMPL_VAR name="bookfundid" --></em></h3>
-<div class="data"><table>
-<tr><th>Book fund</th><td><!-- TMPL_VAR name="bookfundid" --></td></tr>
-<tr><th>Name</th><td><!-- TMPL_VAR name="bookfundname" --></td></tr><tr><th>Group</th><td><!-- TMPL_VAR name="bookfundgroup" --></td></tr>
-</table></div><div class="tabitem"><form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" value="Delete this Fund" class="cancel" /></form> <form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="submit" value="Do not Delete" class="submit" /></form></div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="delete_confirmed" -->
-<h3>Data Deleted</h3>
-<div class="form"><form action="<!-- TMPL_VAR name="action" -->" method="post">
-<input type="submit" value="OK" class="submit" /></form></div>
-<!-- /TMPL_IF -->
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/aqbudget.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/aqbudget.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/aqbudget.tmpl
--- htdocs/intranet-tmpl/default/en/admin/aqbudget.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,137 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF name="else" -->Budget admin<!-- /TMPL_IF -->
-<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR NAME="header" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="add_validate" -->Budget Data Recorded<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->Delete Book Fund '<!-- TMPL_VAR NAME="bookfundid" -->'<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirmed" -->Book fund deleted<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<!-- TMPL_IF name="else" -->
-<h1>Budget admin</h1><form action="/cgi-bin/koha/admin/aqbudget.pl" method="post">
-	<input type="text" name="searchfield" value="" /> <input type="submit" name="search" value="Search" class="submit" /></form>
-	<!-- TMPL_IF name="search" -->
-	<div id="results">You Searched for <span class="ex"><!-- TMPL_VAR NAME="searchfield" --></span></div>
-	<!-- /TMPL_IF -->
-<table>
-	<tr><th>Book fund</th><th>Start date</th><th>End date</th><th>Budget amount</th><th colspan="2">&nbsp;</th></tr>
-	<!-- TMPL_LOOP name="budget" -->
-		<tr>
-			<td><!-- TMPL_VAR NAME="bookfundid" --> (<!-- TMPL_VAR NAME="bookfundname" -->)</td>
-			<td><!-- TMPL_VAR NAME="startdate" --></td>
-			<td><!-- TMPL_VAR NAME="enddate" --></td>
-			<td><!-- TMPL_VAR NAME="budgetamount" --></td>
-			<td><a class="edit" href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" -->&amp;aqbudgetid=<!-- TMPL_VAR NAME="aqbudgetid" -->">Edit</a></td>
-			<td><a class="delete" href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" -->">Delete</a></td>
-		</tr>
-	<!-- /TMPL_LOOP -->
-	</table>
-	<form action="/cgi-bin/koha/admin/aqbudget.pl" method="post">
-	<p><input type="hidden" name="op" value="add_form" /><input type="submit" class="submit" value="Add Budget" /></p></form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="add_form" -->
-<script language="JavaScript" type="text/javascript">
-	//
-	function isNotNull(f,noalert) {
-		if (f.value.length ==0) {
-   return false;
-		}
-		return true;
-	}
-	//
-	function toUC(f) {
-		var x=f.value.toUpperCase();
-		f.value=x;
-		return true;
-	}
-	//
-	function isNum(v,maybenull) {
-	var n = new Number(v.value);
-	if (isNaN(n)) {
-		return false;
-		}
-	if (maybenull==0 && v.value=='') {
-		return false;
-	}
-	return true;
-	}
-	//
-	function isDate(f) {
-		var t = Date.parse(f.value);
-		if (isNaN(t)) {
-			return false;
-		}
-	}
-	//
-	function Check(f) {
-		var ok=1;
-		var _alertString="";
-		var alertString2;
-//		if (f.bookfundid.value.length==0) {
-//			_alertString += "- bookfundid missing\n";
-//		}
-		if (!(isNotNull(window.document.Aform.budgetamount,1))) {
-			_alertString += "- Budget missing\n";
-		}
-		if (_alertString.length==0) {
-			document.Aform.submit();
-		} else {
-			alertString2 = "Form not submitted because of the following problem(s)\n";
-			alertString2 += "------------------------------------------------------------------------------------\n\n";
-			alertString2 += _alertString;
-			alert(alertString2);
-		}
-	}
-	</script>
-
-<form action="/cgi-bin/koha/admin/aqbudget.pl" name="Aform" method="post">
-<input type="hidden" name="op" value="add_validate" />
-<input type="hidden" name="checked" value="0" />
-<h1><!-- TMPL_VAR NAME="header" --></h1>
-<div class="data">
-<table>
-<!-- TMPL_IF name="modify" -->
-<tr><th>Book fund</th><td><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundid" --></td></tr>
-<tr><th>Book fund name</th><td><!-- TMPL_VAR NAME="bookfundname" --></td></tr>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="adding" -->
-<tr><th><label for="bookfundid">Bookfund</label></th><td><input type="hidden" name="bookfundid" id="bookfundid" size="5" maxlength="5" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundid" --></td></tr>
-<!-- /TMPL_IF -->
-
-<tr><th><label for="startdate">Start date (<!-- TMPL_VAR NAME="dateformat" -->)</label></th><td><input type="text" id="startdate" name="startdate" value="<!-- TMPL_VAR NAME="startdate" -->" />&nbsp;</td></tr>
-<tr><th><label for="enddate">End date (<!-- TMPL_VAR NAME="dateformat" -->)</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR NAME="enddate" -->" /></td></tr>
-<tr><th><label for="budgetamount">Budget amount</label></th><td><input type="text" name="budgetamount" id="budgetamount" value="<!-- TMPL_VAR NAME="budgetamount" -->" /></td></tr>
-</table></div>
-<input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->" /><input type="button" value="OK"  class="submit" onclick="Check(this.form)" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='/cgi-bin/koha/admin/aqbudget.pl'; return false;" /></form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="add_validate" -->
-<h3>Budget Data Recorded</h3><table><tr><td>
-<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
-<input type="submit" value="Continue" class="submit" />
-</form></td></tr></table>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="delete_confirm" -->
-<h3>Delete Book Budget?</h3>
-<div class="data"><table>
-<tr><th>Start date</th><td><!-- TMPL_VAR NAME="startdate" --></td></tr>
-<tr><th>End date</th><td><!-- TMPL_VAR NAME="enddate" --></td></tr>
-<tr><th>Budget Amount</th><td><!-- TMPL_VAR NAME="budgetamount" --></td></tr>
-</table></div>
-
-<div class="tabitem"><form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->" /><input type="submit" value="Delete this Book Fund" class="cancel" /></form> <form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="submit" value="Do Not Delete" class="submit" /></form></div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="delete_confirmed" -->
-<h3>Budget deleted</h3>
-<div class="form"><form action="<!-- TMPL_VAR NAME="action" -->" method="post">
-<input type="submit" value="Continue" class="submit" />
-</form></div>
-<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/auth_group_structure.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/auth_group_structure.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/auth_group_structure.tmpl
--- htdocs/intranet-tmpl/default/en/admin/auth_group_structure.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,166 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<script language="javascript" type="text/javascript">
-function _(s) { return s } // dummy function for gettext
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function isNotNull(f,noalert) {
-	if (f.value.length ==0) {
-		return false;
-	}
-	return true;
-}
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function toUC(f) {
-	var x=f.value.toUpperCase();
-	f.value=x;
-	return true;
-}
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function isNum(v,maybenull) {
-var n = new Number(v.value);
-if (isNaN(n)) {
-	return false;
-	}
-if (maybenull==0 && v.value=='') {
-	return false;
-}
-return true;
-}
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function isDate(f) {
-	var t = Date.parse(f.value);
-	if (isNaN(t)) {
-		return false;
-	}
-}
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function Check(f) {
-	var ok=1;
-	var _alertString="";
-	var alertString2;
-	if (f.authtypecode.value.length==0) {
-		_alertString += "\n- " + _("Authority type : code missing");
-	}
-	if (!(isNotNull(window.document.Aform.authtypetext,1))) {
-		_alertString += "\n- " + _("Description missing");
-	}
-	if (_alertString.length==0) {
-		document.Aform.submit();
-	} else {
-		alertString2  = _("Form not submitted because of the following problem(s)");
-		alertString2 += "\n------------------------------------------------------------------------------------\n";
-		alertString2 += _alertString;
-		alert(alertString2);
-	}
-}
-</script>
-<div id="main">
-<!-- TMPL_IF NAME="add_form" -->
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-<div class="data"><table>
-	<!-- TMPL_IF NAME="authtypecode" -->
-		<caption>Modify authority type</caption>
-	<!-- TMPL_ELSE -->
-		<caption>Add authority type</caption>
-	<!-- /TMPL_IF -->
-	
-		<input type="hidden" name="op" value="add_validate" />
-		<input type="hidden" name="checked" value="0" />
-			<!-- TMPL_IF NAME="authtypecode" -->
-				<tr><th><label for="authtypecode">Authority type<label><input type="hidden" id="authtypecode" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" /></th><td><!-- TMPL_VAR NAME="authtypecode" --></td></tr>
-			<!-- TMPL_ELSE -->
-				<tr><th><label for="authtypecode">Authority type<label></th><td><input type="text" id="authtypecode" name="authtypecode" size="10" maxlength="10" onblur="toUC(this)" /></td></tr>
-			<!-- /TMPL_IF -->
-			<tr><th>
-				<label for="authtypetext">Description</label></th><td>
-				<input type="text" id="authtypetext" name="authtypetext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="authtypetext" escape=HTML -->" />
-			</td></tr>
-			<tr><th>
-				<label for="summary">Summary</label></th><td>
-				<textarea id="summary" name="summary" cols="40" rows="10"><!-- TMPL_VAR NAME="summary" --></textarea>
-			</td></tr>
-			<tr><th><label for="auth_tag_to_report">Report tag</label></th><td>
-				<input type="text" id="auth_tag_to_report" name="auth_tag_to_report" size="5" maxlength="3" value="<!-- TMPL_VAR NAME="auth_tag_to_report">" />
-				<div class="help">Enter here the number of the tag that will be reported in the biblio (subfield by subfield). For example, in UNIMARC, enter 200 to report every 200 subfield in the 70x biblio</div></td></tr>
-			</td></tr></table>
-			<p>
-				<!-- TMPL_IF NAME="authtypecode" -->
-		<input type="submit" value="Update Authority Type" class="submit" onclick="Check(this.form); return false;" />
-	<!-- TMPL_ELSE -->
-		<input type="submit" value="Add Authority Type" class="submit" onclick="Check(this.form); return false;" />
-	<!-- /TMPL_IF -->
-				
-			</p>
-			</div>
-	</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirm" -->
-<div class="details">
-	<h2>Authority structure definition for <!-- TMPL_VAR NAME="authtypetext" --> (<!-- TMPL_VAR NAME="authtypecode" -->)</h2>
-	<!-- TMPL_IF NAME="total" -->
-		<p>
-			<b>This record is used <!-- TMPL_VAR NAME="total" --> times</b>
-		</p>
-	<!-- /TMPL_IF -->
-	<h3>Are you sure you want to delete this Authority Type?</h3>
-	<p>
-		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="hidden" name="op" value="delete_confirmed" />
-			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-			<input type="submit" value="Yes, Delete It" class="cancel" />
-		</form>
-		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="submit" value="No, Don't Delete It" class="submit" />
-		</form>
-	</p>
-</div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="else" -->
-<h1>Auth type Admin</h1>
-<p>Define authority types, then authority MARC structure in the same way you define itemtypes and biblio MARC tag structure. Authority values are managed through plugins</p>
-<table>
-	<tr>
-		<th>Code</th>
-		<th>Description</th>
-		<th>summary</th>
-		<th>Tag reported</th>
-		<th>&nbsp;</th>
-		<th>Edit</th>
-		<th>Delete</th>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td>Default framework</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td><a href="auth_tag_structure.pl">MARC structure</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-	</tr>
-	
-	<!-- TMPL_LOOP NAME="loop" -->
-		<tr>
-			<td><!-- TMPL_VAR NAME="authtypecode" --></td>
-			<td><!-- TMPL_VAR NAME="authtypetext" --></td>
-			<td><!-- TMPL_VAR NAME="summary" --></td>
-			<td><!-- TMPL_VAR NAME="auth_tag_to_report" --></td>
-			<td><a href="auth_tag_structure.pl?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->" class="button parameters" >MARC structure</a></td>
-			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" escape="HTML" -->">Edit</a></td>
-			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" escape="HTML" -->">Delete</a></td>
-		</tr>
-	<!-- /TMPL_LOOP -->
-</table>
-<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-	<input type="hidden" name="op" value="add_form" />
-	<input type="submit" class="submit" value="Add authority type" />
-</form>
-	<!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF -->
-</div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/auth_subfields_structure.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/auth_subfields_structure.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/auth_subfields_structure.tmpl
--- htdocs/intranet-tmpl/default/en/admin/auth_subfields_structure.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,135 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
-<!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="modify" -->Modify system preference '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add a system preference<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="add_validate" -->Data Added<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Parameter '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" -->Parameter Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Preferences<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<!-- TMPL_IF NAME="add_form" -->
-
-	<h1><!-- TMPL_IF NAME="use-heading-flags-p" -->
-	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints<!-- /TMPL_IF -->
-	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></h1>
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-	<input type="hidden" name="op" value="add_validate" />
-	<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-	<!-- TMPL_LOOP NAME="loop" -->
-	<div class="data <!-- TMPL_VAR NAME="toggle" -->"><h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
-	<table>
-	<caption>MARC constraints</caption>
-	<tr><th><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable:</label></th><td><!-- TMPL_VAR NAME="repeatable" --></td></tr>
-	<tr><th><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory:</label></th><td><!-- TMPL_VAR NAME="mandatory" --> </td></tr>
-	<tr><th><label for="seealso<!-- TMPL_VAR NAME="row" -->">Search also:</label></th><td><input type="text" id="seealso<!-- TMPL_VAR NAME="row" -->" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" /> (example for 200a: '200c','200d','200e'...)</td></tr>
-			</table>
-	<table>
-	<caption>Editor constaints</caption>
-	<tr><th><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for librarian:</label></th><td><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></td></tr>
-	<tr><th><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC:</label></th><td><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></td></tr>
-	<tr><th><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab:</label></th><td><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</td></tr>
-
-	<tr><th><label for="hidden<!-- TMPL_VAR NAME="row" -->">Hidden:</label></th><td> Opac:<!-- TMPL_VAR name="ohidden" -->  Intranet:<!-- TMPL_VAR name="ihidden" --> Editor:<!-- TMPL_VAR name="ehidden" --> (see online help)</td></tr>
-
-	<tr><th><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL: </label></th><td><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is an URL and can be clicked</td></tr>
-	<tr><th><label for="link<!-- TMPL_VAR NAME="row" -->">Is a Linking field: </label></th><td><!-- TMPL_VAR NAME="link" --> (if checked, it means that the subfield is used for linking authorities</td></tr>
-
-<tr><th><label>Default Options: <p>(choose one)</p></label></th><td>
-<ul>
-	<li>Authorized Value: <!-- TMPL_VAR NAME="authorised_value" --></li>
-	<li>Thesaurus: <!-- TMPL_VAR NAME="authtypecode" --></li>
-	<li>Plugin: <!-- TMPL_VAR NAME="value_builder" --></li>
-</ul>
-</td></tr>	 
-		</table>
-		</div>
-	<!-- /TMPL_LOOP -->
-	<input type="submit" class="submit" value="Save Changes" />
-	<p>Note: in the last column, you can choose:
-	<ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
-	<li>A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table.</li>
-	<li>A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.</li>
-	</ul>
-	</p>
-	</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirm" -->
-
-<div class="data"><table>
-<caption>Confirm Deletion of Subfield <span class="ex"><!-- TMPL_VAR NAME="tagsubfield" -->?</span></caption>
-	<tr>
-		<th>Subfield</th>
-		<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
-	</tr>
-	<tr><th>Description</th><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
-</table></div>
-			<form class="inline" action="<!-- TMPL_VAR NAME="delete_link" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" />
-				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-				<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" /><input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" /><input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" /><input type="submit" class="cancel" value="Yes, Delete this Subfield" />
-			</form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">	<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />	<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />	<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />	<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />	<input type="submit" class="submit" value="No, Do Not Delete" />
-			</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirmed" -->
-
-	Data deleted
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
-	<input type="submit" class="submit" value="OK" />
-	</form>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF NAME="else" -->
-<h1>Authority MARC subfield structure admin for <!-- TMPL_VAR NAME="tagfield" --> (authority: <!--TMPL_VAR NAME="authtypecode" -->)</h1>
-<p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>
-
-<table>
-<tr>
-	<th>Subfield</th>
-	<th>Text</th>
-	<th>Constraints</th>
-	<th>Delete</th>
-<!-- TMPL_LOOP NAME="loop" -->
-<!-- TMPL_IF NAME="toggle" --><tr class="highlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
-	<td>
-		<!-- TMPL_IF NAME="subfield_ignored" -->
-			<i><!-- TMPL_VAR NAME="liblibrarian" --></i>
-		<!-- TMPL_ELSE -->
-			<!-- TMPL_VAR NAME="liblibrarian" -->
-		<!-- /TMPL_IF -->
-	</td>
-	<td>
-		<!-- TMPL_IF NAME="subfield_ignored" -->
-			<i>subfield ignored</i>
-		<!-- TMPL_ELSE -->
-			<strong>Tab:</strong><!-- TMPL_VAR NAME="tab" -->,
-			<!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="seealso" --> | <strong>See Also:</strong> <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="authorised_value" --> | <strong>Auth value:</strong><!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="authtypecode" --> | <strong>Authority:</strong><!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="value_builder" --> | <strong>Plugin:</strong><!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="link" --> | <strong>Link:</strong><!-- TMPL_VAR NAME="link" -->,<!-- /TMPL_IF -->
-		<!-- /TMPL_IF -->
-	</td>
-	<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
-</tr>
-<!-- /TMPL_LOOP -->
-</table>
-<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="edit_tagfield" -->" /><input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="edit_authtypecode" -->" /><input type="submit" class="submit" value="Edit Subfields" /></form> <form class="inline" action="auth_tag_structure.pl" method="get"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="tagfield" -->" /><input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" /><input type="submit" class="submit" value="Return to Auth Structure" /></form>
-<!-- TMPL_IF NAME="previous" -->
-	<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0" >
-	</a><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="next" -->
-	<!-- TMPL_VAR NAME="next" -->
-		<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0" />
-	</a>
-<!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/auth_tag_structure.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/auth_tag_structure.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/auth_tag_structure.tmpl
--- htdocs/intranet-tmpl/default/en/admin/auth_tag_structure.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,178 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1>Authority MARC framework for <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE -->default framework<!-- /TMPL_IF --></h1>
-<script language="javascript" type="text/javascript">
-	function _(s) { return s } // dummy function for gettext
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function isNotNull(f,noalert) {
-		if (f.value.length ==0) {
-   return false;
-		}
-		return true;
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function toUC(f) {
-		var x=f.value.toUpperCase();
-		f.value=x;
-		return true;
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function isNum(v,maybenull) {
-	var n = new Number(v.value);
-	if (isNaN(n)) {
-		return false;
-		}
-	if (maybenull==0 && v.value=='') {
-		return false;
-	}
-	return true;
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function isDate(f) {
-		var t = Date.parse(f.value);
-		if (isNaN(t)) {
-			return false;
-		}
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function Check(f) {
-		var ok=1;
-		var _alertString="";
-		var alertString2;
-		if (f.tagfield.value.length==0) {
-			_alertString += "\n- " + _("tag number missing");
-		}
-		if (_alertString.length==0) {
-			document.Aform.submit();
-		} else {
-			alertString2  = _("Form not submitted because of the following problem(s)");
-			alertString2 += "\n------------------------------------------------------------------------------------\n";
-			alertString2 += _alertString;
-			alert(alertString2);
-		}
-	}
-	</script>
-
-<!-- TMPL_IF NAME="add_form" -->
-
-	<h1>
-	<!-- TMPL_IF NAME="use-heading-flags-p" -->
-	<!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF -->
-	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
-	</h1>
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-		<input type="hidden" name="op" value="add_validate" />
-		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-		<p><label>Tag<label><!-- TMPL_VAR NAME="searchfield" --></p>
-		<p><label>Text for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100" /></p>
-		<p><label>Text for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100" /></p>
-		<p><label>Repeatable</label><!-- TMPL_VAR NAME="repeatable" --></p>
-		<p><label>Mandatory</label><!-- TMPL_VAR NAME="mandatory" --></p>
-		<p><label>Authorised value</label><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</p>
-		<p><label>&nbsp;</label><input type="button" value="OK" class="button" onclick="Check(this.form)" /></p>
-	</form>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF NAME="delete_confirm" -->
-
-<table>
-	<tr>
-		<td>tag</td>
-		<td><!-- TMPL_VAR NAME="searchfield" --></td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td>
-	</tr>
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="hidden" name="op" value="delete_confirmed" />
-		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
-		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
-	<tr><td><input type="submit" value="YES"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="submit" /></form></td></tr>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirmed" -->
-
-	Data deleted
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-	<input type="submit" value="OK" class="submit" />
-	</form>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="authtype_create" -->
-
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="hidden" name="op" value="authtype_create_confirm" />
-		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-		Create authority framework for <!-- TMPL_VAR NAME="authtypecode" --> using
-		<select name="existingauthtypecode">
-			<option value="">Default</option>
-		<!-- TMPL_LOOP NAME="existingauthtypeloop" -->
-			<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="authtypetext" --></option>
-		<!-- /TMPL_LOOP -->
-		</select>
-		<input type="submit" value="OK" class="submit" />
-	</form>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF NAME="else" -->
-<div id="bloc25">
-<h2>Select an authority framework</h2>
-<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-	<select name="authtypecode">
-		<option value="">Default</option>
-	<!-- TMPL_LOOP NAME="authtypeloop" -->
-		<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->>
-			<!-- TMPL_VAR NAME="authtypetext" -->
-		</option>
-	<!-- /TMPL_LOOP -->
-	</select>
-	<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-	<input type="submit" value="OK" class="submit" />
-</form>
-</div>
-<div id="bloc100">
-	<table>
-	<tr>
-		<th>Tag</th>
-		<th>Lib</th>
-		<th>Repeatable</th>
-		<th>Mandatory</th>
-		<th>Authorised<br />value</th>
-		<th>Subfields</th>
-		<th>Edit</th>
-		<th>Delete</th>
-	<!-- TMPL_LOOP NAME="loop" -->
-	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
-		<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
-		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
-		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
-		<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
-		<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
-		<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
-	</tr>
-	<!-- /TMPL_LOOP -->
-	</table>
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="hidden" name="op" value="add_form" />
-		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-		<input type="hidden" name="op" value="add_form" />
-		<input type="submit" class="submit" value="Add Tag" />
-		<!-- TMPL_IF NAME="isprevpage" -->
-			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&authtypecode=<!-- TMPL_VAR NAME="authtypecode" --> ">Previous Page</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="nextpage" -->
-			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&authtypecode=<!-- TMPL_VAR NAME="authtypecode" --> ">Next Page</a>
-		<!-- /TMPL_IF -->
-	</form>
-</div>
-<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/authorised_values.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/authorised_values.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/authorised_values.tmpl
--- htdocs/intranet-tmpl/default/en/admin/authorised_values.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,97 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion<!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->Authorised values admin<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<!-- TMPL_IF name="add_form" -->
-	<form class="inline" action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
-	<input type="hidden" name="op" value="add_validate" />
-	<div class="data"><table>
-	<caption><!-- TMPL_VAR name="action" --></caption>
-	<tr>
-		<th><label for="category">Category</label></th>
-		<td><!-- TMPL_VAR name="category" --></td>
-	</tr>
-	<tr>
-		<th><label for="authorised_value">Authorised value</label></th>
-		<td><input type="text" id="authorised_value" name="authorised_value" value="<!-- TMPL_VAR name="authorised_value" -->" /></td>
-	</tr>
-	<tr>
-		<th><label for="lib">Description</label></th>
-		<td><input type="text" name="lib" id="lib" value="<!-- TMPL_VAR name="lib" -->" /></td>
-	</tr>
-	</table></div><input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
-			<input type="submit" value="<!-- TMPL_VAR name="action" -->" class="submit" /></form> <form class="inline" action="/cgi-bin/koha/admin/authorised_values.pl" method="get"><input type="submit" class="cancel" value="Cancel and Return to Authorized Values" /></form>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF name="delete_confirm" -->
-<!-- -->
-<h3>Confirm Deletion</h3>
-<table>
-	<tr>
-		<td><b>Variable</b></td>
-		<td><b>Description</b></td>
-		<td><b><!-- TMPL_VAR name="searchfield" --></b></td>
-	</tr>
-	<tr><td>Value</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
-	</table>
-<div class="tabitem">	<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-		<input type="hidden" name="op" value="delete_confirmed" />
-		<input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
-		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->" /><input type="submit" class="cancel" value="Confirm Deletion" /></form> <form class="inline" action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" class="submit" value="Do Not Delete" /></form>
-</div><!-- /TMPL_IF -->
-
-<!-- -->
-<!-- TMPL_IF name="else" -->
-
-<h1>Authorised values admin</h1>
-<p>This table is used in MARC definition. You can define as many categories as you want, and as many authorised values as you want in each category.</p>
-<p>When you define the MARC subfield structure, you can link a subfield to a authorised-value category. When the user ask for adding of modifying a biblio,
-the subfield is not entered through a free field, but though a list of authorised values</p>
-<form action="/cgi-bin/koha/admin/authorised_values.pl" method="post"><label for="searchfield">Show Category: </label><!-- TMPL_VAR name="tab_list" --> <input type="submit" value="Submit" class="submit" /></form>
-<table>
-<tr>
-	<th>Category</th>
-	<th>Authorised value</th>
-	<th>Description</th>
-	<th>Edit</th>
-	<th>Delete</th>
-	</tr>
-<!-- TMPL_LOOP name="loop" -->
-<tr>
-	<td><!-- TMPL_VAR name="category" --></td>
-	<td><!-- TMPL_VAR name="authorised_value" --></td>
-	<td><!-- TMPL_VAR name="lib" --></td>
-	<td><a href="<!-- TMPL_VAR name="edit" -->">Edit</a></td>
-	<td><a href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
-</tr>
-<!-- /TMPL_LOOP -->
-</table>
-
-<!-- TMPL_IF NAME="isprevpage" -->
-<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevpage" -->" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-	<input type="submit" class="submit" value="&lt;&lt; Previous Page" /></form>
-<!-- /TMPL_IF --> 
-
-<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-<input type="hidden" name="op" value="add_form">
-<input type="hidden" name="category" value="<!-- TMPL_VAR NAME="category" -->">
-<input type="submit" class="submit" value="Add Authorised value" /></form> 
-
-<form class="inline" action="/cgi-bin/koha/admin/authorised_values.pl" method="get"><input type="hidden" value="add_form" name="op" /><input type="submit" class="submit" value="Add New Category" /></form>
-
-<!-- TMPL_IF NAME="nextpage" -->
-<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextpage" -->" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-	<input type="submit" class="submit" value="Next Page &gt;&gt;" /></form>
-<!-- /TMPL_IF -->
-
-<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/authtgroups.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/authtgroups.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/authtgroups.tmpl
--- htdocs/intranet-tmpl/default/en/admin/authtgroups.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,152 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<script language="javascript" type="text/javascript">
-function _(s) { return s } // dummy function for gettext
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function isNotNull(f,noalert) {
-	if (f.value.length ==0) {
-		return false;
-	}
-	return true;
-}
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function toUC(f) {
-	var x=f.value.toUpperCase();
-	f.value=x;
-	return true;
-}
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function isNum(v,maybenull) {
-var n = new Number(v.value);
-if (isNaN(n)) {
-	return false;
-	}
-if (maybenull==0 && v.value=='') {
-	return false;
-}
-return true;
-}
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function isDate(f) {
-	var t = Date.parse(f.value);
-	if (isNaN(t)) {
-		return false;
-	}
-}
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function Check(f) {
-	var ok=1;
-	var _alertString="";
-	var alertString2;
-	if (f.authtypegroup.value.length==0) {
-		_alertString += "\n- " + _("Authority type : code missing");
-	}
-	if (!(isNotNull(window.document.Aform.authgrouptext,1))) {
-		_alertString += "\n- " + _("Description missing");
-	}
-	if (_alertString.length==0) {
-		document.Aform.submit();
-	} else {
-		alertString2  = _("Form not submitted because of the following problem(s)");
-		alertString2 += "\n------------------------------------------------------------------------------------\n";
-		alertString2 += _alertString;
-		alert(alertString2);
-	}
-}
-</script>
-<div id="main">
-<!-- TMPL_IF NAME="add_form" -->
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-<div class="data"><table>
-	<!-- TMPL_IF NAME="authtypegroup" -->
-		<caption>Modify authority group type</caption>
-	<!-- TMPL_ELSE -->
-		<caption>Add authority group type</caption>
-	<!-- /TMPL_IF -->
-	
-		<input type="hidden" name="op" value="add_validate" />
-		<input type="hidden" name="checked" value="0" />
-			<!-- TMPL_IF NAME="authtypegroup" -->
-				<tr><th><label for="authtypegroup">Authority type<label><input type="hidden" id="authtypegroup" name="authtypegroup" value="<!-- TMPL_VAR NAME="authtypegroup" -->" /></th><td><!-- TMPL_VAR NAME="authtypegroup" --></td></tr>
-			<!-- TMPL_ELSE -->
-				<tr><th><label for="authtypegroup">Authority type<label></th><td><input type="text" id="authtypegroup" name="authtypegroup" size="10" maxlength="10" onblur="toUC(this)" /></td></tr>
-			<!-- /TMPL_IF -->
-			<tr><th>
-				<label for="authgrouptext">Description</label></th><td>
-				<input type="text" id="authgrouptext" name="authgrouptext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="authgrouptext" escape=HTML -->" />
-			</td></tr>
-			<tr><th>
-				<label for="authtypes">Authtypes</label></th><td>
-				<!-- TMPL_VAR NAME="authtypeloop">
-			</td></tr>
-			</table>
-			<p>
-				<!-- TMPL_IF NAME="authtypegroup" -->
-		<input type="submit" value="Update Authority Group Type" class="submit" onclick="Check(this.form); return false;" />
-	<!-- TMPL_ELSE -->
-		<input type="submit" value="Add Authority Group Type" class="submit" onclick="Check(this.form); return false;" />
-	<!-- /TMPL_IF -->
-				
-			</p>
-			</div>
-	</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirm" -->
-<div class="details">
-	<h2>Authority structure definition for <!-- TMPL_VAR NAME="authgrouptext" --> (<!-- TMPL_VAR NAME="authtypegroup" -->)</h2>
-	<!-- TMPL_IF NAME="total" -->
-		<p>
-			<b>This record is used <!-- TMPL_VAR NAME="total" --> times</b>
-		</p>
-	<!-- /TMPL_IF -->
-	<h3>Are you sure you want to delete this Authority Group Type?</h3>
-	<p>
-		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="hidden" name="op" value="delete_confirmed" />
-			<input type="hidden" name="authtypegroup" value="<!-- TMPL_VAR NAME="authtypegroup" -->" />
-			<input type="submit" value="Yes, Delete It" class="cancel" />
-		</form>
-		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="submit" value="No, Don't Delete It" class="submit" />
-		</form>
-	</p>
-</div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="else" -->
-<h1>Auth type Admin</h1>
-<p>Define authority types, then authority MARC structure in the same way you define itemtypes and biblio MARC tag structure. Authority values are managed through plugins</p>
-<table>
-	<tr>
-		<th>Code</th>
-		<th>Description</th>
-		
-		<th>Authtypes</th>
-		<th>Edit</th>
-		<th>Delete</th>
-	</tr>
-	
-	
-	<!-- TMPL_LOOP NAME="loop" -->
-		<tr>
-			<td><!-- TMPL_VAR NAME="authtypegroup" --></td>
-			<td><!-- TMPL_VAR NAME="authgrouptext" --></td>
-			<td><!-- TMPL_VAR NAME="aauthtypecode" --></td>
-			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;authtypegroup=<!-- TMPL_VAR NAME="authtypegroup" escape="HTML" -->">Edit</a></td>
-			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;authtypegroup=<!-- TMPL_VAR NAME="authtypegroup" escape="HTML" -->">Delete</a></td>
-		</tr>
-	<!-- /TMPL_LOOP -->
-</table>
-<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-	<input type="hidden" name="op" value="add_form" />
-	<input type="submit" class="submit" value="Add authority group type" />
-</form>
-	<!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF -->
-</div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/authtypes.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/authtypes.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/authtypes.tmpl
--- htdocs/intranet-tmpl/default/en/admin/authtypes.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,166 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<script language="javascript" type="text/javascript">
-function _(s) { return s } // dummy function for gettext
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function isNotNull(f,noalert) {
-	if (f.value.length ==0) {
-		return false;
-	}
-	return true;
-}
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function toUC(f) {
-	var x=f.value.toUpperCase();
-	f.value=x;
-	return true;
-}
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function isNum(v,maybenull) {
-var n = new Number(v.value);
-if (isNaN(n)) {
-	return false;
-	}
-if (maybenull==0 && v.value=='') {
-	return false;
-}
-return true;
-}
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function isDate(f) {
-	var t = Date.parse(f.value);
-	if (isNaN(t)) {
-		return false;
-	}
-}
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function Check(f) {
-	var ok=1;
-	var _alertString="";
-	var alertString2;
-	if (f.authtypecode.value.length==0) {
-		_alertString += "\n- " + _("Authority type : code missing");
-	}
-	if (!(isNotNull(window.document.Aform.authtypetext,1))) {
-		_alertString += "\n- " + _("Description missing");
-	}
-	if (_alertString.length==0) {
-		document.Aform.submit();
-	} else {
-		alertString2  = _("Form not submitted because of the following problem(s)");
-		alertString2 += "\n------------------------------------------------------------------------------------\n";
-		alertString2 += _alertString;
-		alert(alertString2);
-	}
-}
-</script>
-<div id="main">
-<!-- TMPL_IF NAME="add_form" -->
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-<div class="data"><table>
-	<!-- TMPL_IF NAME="authtypecode" -->
-		<caption>Modify authority type</caption>
-	<!-- TMPL_ELSE -->
-		<caption>Add authority type</caption>
-	<!-- /TMPL_IF -->
-	
-		<input type="hidden" name="op" value="add_validate" />
-		<input type="hidden" name="checked" value="0" />
-			<!-- TMPL_IF NAME="authtypecode" -->
-				<tr><th><label for="authtypecode">Authority type<label><input type="hidden" id="authtypecode" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" /></th><td><!-- TMPL_VAR NAME="authtypecode" --></td></tr>
-			<!-- TMPL_ELSE -->
-				<tr><th><label for="authtypecode">Authority type<label></th><td><input type="text" id="authtypecode" name="authtypecode" size="10" maxlength="10" onblur="toUC(this)" /></td></tr>
-			<!-- /TMPL_IF -->
-			<tr><th>
-				<label for="authtypetext">Description</label></th><td>
-				<input type="text" id="authtypetext" name="authtypetext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="authtypetext" escape=HTML -->" />
-			</td></tr>
-			<tr><th>
-				<label for="summary">Summary</label></th><td>
-				<textarea id="summary" name="summary" cols="40" rows="10"><!-- TMPL_VAR NAME="summary" --></textarea>
-			</td></tr>
-			<tr><th><label for="auth_tag_to_report">Report tag</label></th><td>
-				<input type="text" id="auth_tag_to_report" name="auth_tag_to_report" size="5" maxlength="3" value="<!-- TMPL_VAR NAME="auth_tag_to_report">" />
-				<div class="help">Enter here the number of the tag that will be reported in the biblio (subfield by subfield). For example, in UNIMARC, enter 200 to report every 200 subfield in the 70x biblio</div></td></tr>
-			</td></tr></table>
-			<p>
-				<!-- TMPL_IF NAME="authtypecode" -->
-		<input type="submit" value="Update Authority Type" class="submit" onclick="Check(this.form); return false;" />
-	<!-- TMPL_ELSE -->
-		<input type="submit" value="Add Authority Type" class="submit" onclick="Check(this.form); return false;" />
-	<!-- /TMPL_IF -->
-				
-			</p>
-			</div>
-	</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirm" -->
-<div class="details">
-	<h2>Authority structure definition for <!-- TMPL_VAR NAME="authtypetext" --> (<!-- TMPL_VAR NAME="authtypecode" -->)</h2>
-	<!-- TMPL_IF NAME="total" -->
-		<p>
-			<b>This record is used <!-- TMPL_VAR NAME="total" --> times</b>
-		</p>
-	<!-- /TMPL_IF -->
-	<h3>Are you sure you want to delete this Authority Type?</h3>
-	<p>
-		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="hidden" name="op" value="delete_confirmed" />
-			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-			<input type="submit" value="Yes, Delete It" class="cancel" />
-		</form>
-		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="submit" value="No, Don't Delete It" class="submit" />
-		</form>
-	</p>
-</div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="else" -->
-<h1>Auth type Admin</h1>
-<p>Define authority types, then authority MARC structure in the same way you define itemtypes and biblio MARC tag structure. Authority values are managed through plugins</p>
-<table>
-	<tr>
-		<th>Code</th>
-		<th>Description</th>
-		<th>summary</th>
-		<th>Tag reported</th>
-		<th>&nbsp;</th>
-		<th>Edit</th>
-		<th>Delete</th>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td>Default framework</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td><a href="auth_tag_structure.pl">MARC structure</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-	</tr>
-	
-	<!-- TMPL_LOOP NAME="loop" -->
-		<tr>
-			<td><!-- TMPL_VAR NAME="authtypecode" --></td>
-			<td><!-- TMPL_VAR NAME="authtypetext" --></td>
-			<td><!-- TMPL_VAR NAME="summary" --></td>
-			<td><!-- TMPL_VAR NAME="auth_tag_to_report" --></td>
-			<td><a href="auth_tag_structure.pl?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->" class="button parameters" >MARC structure</a></td>
-			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" escape="HTML" -->">Edit</a></td>
-			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" escape="HTML" -->">Delete</a></td>
-		</tr>
-	<!-- /TMPL_LOOP -->
-</table>
-<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-	<input type="hidden" name="op" value="add_form" />
-	<input type="submit" class="submit" value="Add authority type" />
-</form>
-	<!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF -->
-</div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/biblios_framework.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/biblios_framework.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/biblios_framework.tmpl
--- htdocs/intranet-tmpl/default/en/admin/biblios_framework.tmpl	10 Mar 2007 01:54:26 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,132 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Biblio Framework<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<script language="javascript" type="text/javascript">
-function _(s) { return s } // dummy function for gettext
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function isNotNull(f,noalert) {
-	if (f.value.length ==0) {
-		return false;
-	}
-	return true;
-}
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function toUC(f) {
-	var x=f.value.toUpperCase();
-	f.value=x;
-	return true;
-}
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function isNum(v,maybenull) {
-var n = new Number(v.value);
-if (isNaN(n)) {
-	return false;
-	}
-if (maybenull==0 && v.value=='') {
-	return false;
-}
-return true;
-}
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function isDate(f) {
-	var t = Date.parse(f.value);
-	if (isNaN(t)) {
-		return false;
-	}
-}
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-function Check(f) {
-	var ok=1;
-	var _alertString="";
-	var alertString2;
-	if (f.frameworkcode.value.length==0) {
-		_alertString += "\n- " + _("Framework code missing");
-	}
-	if (!(isNotNull(window.document.Aform.frameworktext,1))) {
-		_alertString += "\n- " + _("Description missing");
-	}
-	if (_alertString.length==0) {
-		document.Aform.submit();
-	} else {
-		alertString2  = _("Form not submitted because of the following problem(s)");
-		alertString2 += "\n------------------------------------------------------------------------------------\n";
-		alertString2 += _alertString;
-		alert(alertString2);
-	}
-}
-</script>
-<div id="main">
-<!-- TMPL_IF NAME="add_form" -->
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-		<input type="hidden" name="op" value="add_validate" />
-		<input type="hidden" name="checked" value="0" />
-	<table>
-	<caption><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --></caption>
-	<tr>
-			<!-- TMPL_IF NAME="frameworkcode" -->
-				<td><label for="frameworkcode">Framework Code<label></td><td><input type="hidden" id="frameworkcode" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><!-- TMPL_VAR NAME="frameworkcode" --></td>
-			<!-- TMPL_ELSE -->
-				<td><label for="frameworkcode">Framework Code<label></td><td><input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" onblur="toUC(this)" /></td>
-			<!-- /TMPL_IF -->
-			</tr>
-			<tr>
-				<td><label for="description">Description</label></td><td>
-				<input type="text" name="frameworktext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="frameworktext" escape=HTML -->" /></td>
-</tr></table>
-			<p>	<input type="button" value="Submit"class="submit" onclick="Check(this.form)" /></p>
-	</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirm" -->
-<h3>Delete framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?</h3>
-	<!-- TMPL_IF NAME="total" -->
-		<div class="error">This framework is used <!-- TMPL_VAR NAME="total" --> times</div>
-	<!-- /TMPL_IF -->
-	<p>
-		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" value="Yes, Delete this Framework!" class="cancel" />
-		</form>
-		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do not Delete!" class="submit" /></form>
-	</p>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="else" -->
-<h1>Biblio framework</h1>
-<p>Framework name, then go to MARC biblio to set MARC editor parameters</p>
-<table>
-	<tr>
-		<th>Code</th>
-		<th>Description</th>
-		<th>&nbsp;</th>
-		<th>Edit</th>
-		<th>Delete</th>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td>Default framework</td>
-		<td><a href="bibliostagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">MARC structure</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-	</tr>
-	
-	<!-- TMPL_LOOP NAME="loop" -->
-		<tr>
-			<td><!-- TMPL_VAR name="frameworkcode" --></td>
-			<td><!-- TMPL_VAR name="frameworktext" --></td>
-			<td><a href="bibliostagstructure.pl?frameworkcode=<!-- TMPL_VAR name="frameworkcode" -->" >MARC structure</a></td>
-			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;frameworkcode=<!-- TMPL_VAR name="frameworkcode" escape="HTML" -->">Edit</a></td>
-			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=delete_confirm&amp;frameworkcode=<!-- TMPL_VAR name="frameworkcode" escape="HTML" -->">Delete</a></td>
-		</tr>
-	<!-- /TMPL_LOOP -->
-</table>
-<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-	<input type="hidden" name="op" value="add_form" />
-	<input type="submit" class="submit" value="Add framework" />
-	<td><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --></td>
-	<td><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF --></td>
-</form>
-</div>
-<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/biblios_subfields_structure.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/biblios_subfields_structure.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/biblios_subfields_structure.tmpl
--- htdocs/intranet-tmpl/default/en/admin/biblios_subfields_structure.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,135 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
-<!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="modify" -->Modify system preference '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add a system preference<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="add_validate" -->Data Added<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Parameter '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" -->Parameter Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Preferences<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<!-- TMPL_IF NAME="add_form" -->
-
-	<h1><!-- TMPL_IF NAME="use-heading-flags-p" -->
-	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints<!-- /TMPL_IF -->
-	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></h1>
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-	<input type="hidden" name="op" value="add_validate" />
-	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-	<!-- TMPL_LOOP NAME="loop" -->
-	<div class="data <!-- TMPL_VAR NAME="toggle" -->"><h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
-	<table>
-	<caption>MARC constraints</caption>
-	<tr><th><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable:</label></th><td><!-- TMPL_VAR NAME="repeatable" --></td></tr>
-	<tr><th><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory:</label></th><td><!-- TMPL_VAR NAME="mandatory" --> </td></tr>
-	<tr><th><label for="seealso<!-- TMPL_VAR NAME="row" -->">Search also:</label></th><td><input type="text" id="seealso<!-- TMPL_VAR NAME="row" -->" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" /> (example for 200a: '200c','200d','200e'...)</td></tr>
-			</table>
-	<table>
-	<caption>Editor constaints</caption>
-	<tr><th><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for librarian:</label></th><td><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></td></tr>
-	<tr><th><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC:</label></th><td><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></td></tr>
-	<tr><th><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab:</label></th><td><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</td></tr>
-
-	<tr><th><label for="hidden<!-- TMPL_VAR NAME="row" -->">Hidden:</label></th><td> Opac:<!-- TMPL_VAR name="ohidden" -->  Intranet:<!-- TMPL_VAR name="ihidden" --> Editor:<!-- TMPL_VAR name="ehidden" --> (see online help)</td></tr>
-
-	<tr><th><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL: </label></th><td><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is an URL and can be clicked</td></tr>
-<tr><th><label>Default Options: <p>(choose one)</p></label></th><td>
-<ul>
-	<li>Authorized Value: <!-- TMPL_VAR NAME="authorised_value" --></li>
-	<li>Thesaurus: <!-- TMPL_VAR NAME="authtypes" --></li>
-	<li>Plugin: <!-- TMPL_VAR NAME="value_builder" --></li>
-	<li>Link: <input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5" /> (exemple:200b)</li>
-</ul>
-</td></tr>	 
-		</table>
-		</div>
-	<!-- /TMPL_LOOP -->
-	<input type="submit" class="submit" value="Save Changes" />
-	<p>Note: in the last column, you can choose:
-	<ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
-	<li>A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table.</li>
-	<li>A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.</li>
-	</ul>
-	</p>
-	</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirm" -->
-
-<div class="data"><table>
-<caption>Confirm Deletion of Subfield <span class="ex"><!-- TMPL_VAR NAME="tagsubfield" -->?</span></caption>
-	<tr>
-		<th>Subfield</th>
-		<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
-	</tr>
-	<tr><th>Description</th><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
-</table></div>
-			<form class="inline" action="<!-- TMPL_VAR NAME="delete_link" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" />
-				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-				<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" /><input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" class="cancel" value="Yes, Delete this Subfield" />
-			</form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">	<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />	<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />	<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />	<input type="submit" class="submit" value="No, Do Not Delete" />
-			</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirmed" -->
-
-	Data deleted
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
-	<input type="submit" class="submit" value="OK" />
-	</form>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF NAME="else" -->
-<h1>MARC subfield structure admin for <!-- TMPL_VAR NAME="tagfield" --> (framework <!--TMPL_VAR NAME="frameworkcode" -->)</h1>
-<p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>
-
-
-<table>
-<tr>
-	<th>Subfield</th>
-	<th>Text</th>
-	<th>Constraints</th>
-	<th>Delete</th>
-<!-- TMPL_LOOP NAME="loop" -->
-<!-- TMPL_IF NAME="toggle" --><tr class="highlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
-	<td>
-		<!-- TMPL_IF NAME="subfield_ignored" -->
-			<i><!-- TMPL_VAR NAME="liblibrarian" --></i>
-		<!-- TMPL_ELSE -->
-			<!-- TMPL_VAR NAME="liblibrarian" -->
-		<!-- /TMPL_IF -->
-	</td>
-	<td>
-		<!-- TMPL_IF NAME="subfield_ignored" -->
-			<i>subfield ignored</i>
-		<!-- TMPL_ELSE -->
-			<strong>Tab:</strong><!-- TMPL_VAR NAME="tab" -->,
-			<!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="seealso" --> | <strong>See Also:</strong> <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="authorised_value" --> | <strong>Auth value:</strong><!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="authtypecode" --> | <strong>Authority:</strong><!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="value_builder" --> | <strong>Plugin:</strong><!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="link" --> | <strong>Link:</strong><!-- TMPL_VAR NAME="link" -->,<!-- /TMPL_IF -->
-		<!-- /TMPL_IF -->
-	</td>
-	<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
-</tr>
-<!-- /TMPL_LOOP -->
-</table>
-<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="edit_tagfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="edit_frameworkcode" -->" /><input type="submit" class="submit" value="Edit Subfields" /></form> <form class="inline" action="bibliostagstructure.pl" method="get"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="tagfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" class="submit" value="Return to Marc Structure" /></form>
-<!-- TMPL_IF NAME="previous" -->
-	<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0" >
-	</a><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="next" -->
-	<!-- TMPL_VAR NAME="next" -->
-		<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0" />
-	</a>
-<!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/bibliostagstructure.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/bibliostagstructure.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/bibliostagstructure.tmpl
--- htdocs/intranet-tmpl/default/en/admin/bibliostagstructure.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,208 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
-<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Tag '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->MARC tag Structure<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1>MARC tag structure admin for <!-- TMPL_IF NAME="frameworkcode" --><!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)<!-- TMPL_ELSE -->default MARC framework<!-- /TMPL_IF --></h1>
-<script language="javascript" type="text/javascript">
-	function _(s) { return s } // dummy function for gettext
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function isNotNull(f,noalert) {
-		if (f.value.length ==0) {
-   return false;
-		}
-		return true;
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function toUC(f) {
-		var x=f.value.toUpperCase();
-		f.value=x;
-		return true;
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function isNum(v,maybenull) {
-	var n = new Number(v.value);
-	if (isNaN(n)) {
-		return false;
-		}
-	if (maybenull==0 && v.value=='') {
-		return false;
-	}
-	return true;
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function isDate(f) {
-		var t = Date.parse(f.value);
-		if (isNaN(t)) {
-			return false;
-		}
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function Check(f) {
-		var ok=1;
-		var _alertString="";
-		var alertString2;
-		if (f.tagfield.value.length==0) {
-			_alertString += "\n- " + _("tag number missing");
-		}
-		if (_alertString.length==0) {
-			document.Aform.submit();
-		} else {
-			alertString2  = _("Form not submitted because of the following problem(s)");
-			alertString2 += "\n------------------------------------------------------------------------------------\n";
-			alertString2 += _alertString;
-			alert(alertString2);
-		}
-	}
-	</script>
-
-<!-- TMPL_IF NAME="add_form" -->
-<!-- ------------------------------------------------------------------------ -->
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-		<input type="hidden" name="op" value="add_validate" />
-		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-	<div class="data"><table>
-		<caption><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF --><!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></caption>
-	<tr><th><label>Tag<label></th><td><!-- TMPL_VAR NAME="searchfield" --></td></tr>
-	<tr><th><label for="liblibrarian">Tag Label in Intranet</label></th><td><input type="text" id="liblibrarian" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
-	<tr><th><label for="libopac">Tag Label in OPAC</label></th><td><input type="text" id="libopac" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100" /></td></tr>
-	<tr><th><label for="repeatable">Repeatable</label></th><td><!-- TMPL_VAR NAME="repeatable" --></td></tr>
-	<tr><th><label for="mandatory">Mandatory</label></th><td><!-- TMPL_VAR NAME="mandatory" --></td></tr>
-	<tr><th><label for="authorised_value">Authorized value</label></th><td><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</td></tr>
-	</table></div>
-		<p><input type="submit" value="Save Changes" class="submit" onclick="Check(this.form)" /></p>
-	<p><input type="submit" value="Cancel and Return to MARC Tag Structure" class="cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->'; return false;" /></p>
-	</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirm" -->
-<!-- ------------------------------------------------------------------------ -->
-<div class="data"><table>
-<caption>Confirm Deletion of Tag <em><!-- TMPL_VAR NAME="searchfield" --></em>?</caption>
-	<tr><th>Tag: </th><td><!-- TMPL_VAR NAME="searchfield" --></td></tr>
-	<tr><th>Description: </th><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
-	</table></div>
-	<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />	<input type="submit" class="cancel" value="Yes, Delete this Tag" /></form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" class="submit" value="No, Do Not Delete" /></form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirmed" -->
-<!-- ------------------------------------------------------------------------ -->
-	<div class="details"><h3>Tag Deleted</h3>
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-	<input type="submit" class="submit" value="Return to MARC Tag Structure" />
-	</form></div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="framework_create" -->
-<!-- ------------------------------------------------------------------------ -->
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="hidden" name="op" value="framework_create_confirm" />
-		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-		Create framework for <!-- TMPL_VAR NAME="frameworkcode" --> (<!-- TMPL_VAR NAME="frameworktext" -->) using
-		<select name="existingframeworkcode">
-			<option value="">Default</option>
-		<!-- TMPL_LOOP NAME="existingframeworkloop" -->
-			<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
-		<!-- /TMPL_LOOP -->
-		</select>
-		<input type="submit" value="OK" class="submit" />
-	</form>
-<!-- /TMPL_IF -->
-<!-- ------------------------------------------------------------------------ -->
-<!-- TMPL_IF NAME="else" -->
-	<form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><label for="frameworkcode">Select a framework: </label>
-		<select name="frameworkcode" id="frameworkcode">
-			<option value="">Default</option>
-		<!-- TMPL_LOOP NAME="frameworkloop" -->
-			<!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="value" -->"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="frameworktext" --></option>
-		<!-- /TMPL_LOOP -->
-		</select>
-		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" size="5" />
-		<input type="submit" value="Tag Search" class="submit" />
-		<p><!-- TMPL_IF Name="select_display"-->
-				<label for="onlyused">Display only used Tags/Subfields</label><input type="checkbox" name="select_display" id="onlyused" value="True" checked="checked" onchange="document.f.submit()" />
-			<!-- TMPL_ELSE -->
-				<label for="onlyused">Display only used Tags/Subfields</label><input type="checkbox" name="select_display"  id="onlyused" value="True" onchange="document.f.submit()" />
-			<!--/TMPL_IF --> 
-		</p>
-	</form>
-	<div class="help">NOTE : Framework consists of 2 parts biblio & holdings. This is for BIBLIOGRAPHIC definitions, and main framework definer</div>
-
-	<div class="data">
-	<table>
-		<tr>
-			<th scope="col">Tag</th>
-			<th scope="col">Label</th>
-			<th scope="col">Repeatable</th>
-			<th scope="col">Mandatory</th>
-			<th scope="col">Authorized value</th>
-			<th scope="col">Subfields</th>
-			<th scope="col">&nbsp;</th>
-		</tr>
-	<!-- TMPL_IF NAME="select_display" -->
-		<!-- TMPL_LOOP NAME="loop" -->
-		<tr class="highlight">
-			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
-			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
-			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
-			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->">Edit Subfields</a></td>
-			<td><a class="edit" href="<!-- TMPL_VAR NAME="edit" -->">Edit Tag</a> <a class="delete" href="<!-- TMPL_VAR NAME="delete" -->">Delete Tag</a></td>
-		</tr>
-		<tr>
-			<td>
-				&nbsp;
-			</td>
-			<td colspan="6">
-				<ul>
-				<!-- TMPL_LOOP NAME="subfields" -->
-					<li>Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
-							<!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
-					</li>
-				<!-- /TMPL_LOOP -->
-				</ul>
-			</td>
-		</tr>
-		<!-- /TMPL_LOOP -->
-	<!-- TMPL_ELSE -->
-		<!-- TMPL_LOOP NAME="loop" -->
-		<!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
-			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
-			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
-			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->">View Subfields</a></td>
-			<td><a class="edit" href="<!-- TMPL_VAR NAME="edit" -->">Edit Tag</a> <a class="delete" href="<!-- TMPL_VAR NAME="delete" -->">Delete Tag</a></td>
-		</tr>
-		<!-- /TMPL_LOOP -->
-	<!--/TMPL_IF -->
-	</table>
-	<div class="tabitem">
-		<!-- TMPL_IF NAME="isprevpage" -->
-		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
-		<input type="hidden" value="<!-- TMPL_VAR NAME="prevpage" -->" name="offset" /><input type="hidden" value="<!-- TMPL_VAR NAME="searchfield" -->" name="searchfield" /><input type="hidden" value="<!-- TMPL_VAR NAME="frameworkcode" -->" name="frameworkcode" /><!--TMPL_IF Name="select_display"--><input type="hidden" value="select_display" name="True" /><!--/TMPL_IF --><input type="submit" value="&lt;&lt; Previous Page" class="submit" /></form>
-		<!-- /TMPL_IF -->	
-		
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="hidden" name="op" value="add_form" />
-	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-		<input type="submit" value="Add New MARC Tag" class="submit" /></form>
-		
-		<!-- TMPL_IF NAME="nextpage" -->
-		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextpage" -->" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><!--TMPL_IF Name="select_display"--><input type="hidden" name="select_display" value="True" /><!--/TMPL_IF --><input type="submit" class="submit" value="Next Page &gt;&gt;" /></form>
-		<!-- /TMPL_IF -->
-</div>
-</div>
-<!-- /TMPL_IF -->
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/branches.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/branches.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/branches.tmpl
--- htdocs/intranet-tmpl/default/en/admin/branches.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,219 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF name="add" --><!-- TMPL_VAR name="head" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->Confirm deletion of branch '<!-- TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" --><!-- TMPL_VAR name="head" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_category" -->Confirm deletion of category<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main"><!-- TMPL_IF name="add" -->
-<h1><!-- TMPL_VAR name="head" --></h1>
-<form action="<!-- TMPL_VAR name="action" -->" name="Aform" method="post">
-<input type="hidden" name="op" value="add_validate" />
-<table>
-	<tr>
-		<td>Branch code</td>
-		<td>
-			<!-- TMPL_IF name="branchcode" -->
-				<input type="hidden" name="branchcode" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
-				<!-- TMPL_VAR name="branchcode" -->
-			<!-- TMPL_ELSE -->
-				<input type="text" name="branchcode" size="5" maxlength="5" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
-			<!-- /TMPL_IF -->
-		</td>
-	</tr>
-	<tr>
-		<td>Name</td>
-		<td><input type="text" name="branchname" size="40" maxlength="80" value="<!-- TMPL_VAR name="branchname" escape="HTML" -->" />&nbsp;</td>
-	</tr>
-<!-- TMPL_LOOP name="categoryloop" -->
-					<tr>
-						<td><!-- TMPL_VAR name="categoryname" --></td>
-						<td><input type="checkbox" name="<!-- TMPL_VAR name="categorycode" -->" <!-- TMPL_VAR name="checked" --> /><!-- TMPL_VAR name="codedescription" --></td>
-					</tr>
-				<!-- /TMPL_LOOP -->
-<tr>
-		<td>Address</td>
-		<td><input type="text" name="branchaddress1" value="<!-- TMPL_VAR name="branchaddress1" escape="HTML" -->" /></td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td><input type="text" name="branchaddress2" value="<!-- TMPL_VAR name="branchaddress2" escape="HTML" -->" /></td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td><input type="text" name="branchaddress3" value="<!-- TMPL_VAR name="branchaddress3" escape="HTML" -->" /></td>
-	</tr>
-	<tr>
-		<td>Phone</td>
-		<td><input type="text" name="branchphone" value="<!-- TMPL_VAR name="branchphone" escape="HTML" -->" /></td>
-	</tr>
-	<tr>
-		<td>Fax</td>
-		<td><input type="text" name="branchfax" value="<!-- TMPL_VAR name="branchfax" escape="HTML" -->" /></td>
-	</tr>
-	<tr>
-		<td>E-mail</td>
-		<td><input type="text" name="branchemail" value="<!-- TMPL_VAR name="branchemail" escape="HTML" -->" /></td>
-	</tr>
-</table><p><input type="submit" class="submit" value="Submit" /></p>
-</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="delete_confirm" -->
-	<h3>Confirm deletion of <!-- TMPL_VAR NAME="branchname" --> (<!-- TMPL_VAR NAME="branchcode" -->)?</h3>
-	<div class="tabitem"><span class="form"><form action="<!-- TMPL_VAR name="action" -->" method="post">
-		<input type="hidden" name="op" value="delete_confirmed" />
-		<input type="hidden" name="branchcode" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
-			<input type="hidden" name="branchname" value="<!-- TMPL_VAR NAME="branchname" escape="HTML" -->">
-		<input type="submit" value="Delete Branch" class="cancel" />
-	</form> 
-	<form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="hidden" name="op" value="">
-		<input type="submit" value="Do Not Delete" class="submit" />
-	</form></span></div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="else" -->
-	
-	<!-- TMPL_IF NAME="message" --><div class="error"><!-- TMPL_VAR name="message" --></div><!-- /TMPL_IF -->
-	<table>
-	<caption><!-- TMPL_VAR name="head" --></caption>
-		<tr>
-			<th>Name</th>
-			<th>Code</th>
-			<th>Address</th>
-			<th>Category</th>
-			<th>&nbsp;</th>
-			<th>&nbsp;</th>
-		</tr>
-		<!-- TMPL_LOOP name="branches" -->
-			<tr>
-				<td><!-- TMPL_VAR name="branch_name" escape="HTML" --></td>
-				<td><!-- TMPL_VAR name="branch_code" escape="HTML" --></td>
-				<td>
-					<!-- TMPL_IF name="address-empty-p" -->
-						(nothing entered)
-					<!-- TMPL_ELSE -->
-						<!-- TMPL_IF name="branchaddress1" -->
-							<!-- TMPL_VAR name="branchaddress1" escape="HTML" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="branchaddress2" -->
-							<br /><!-- TMPL_VAR name="branchaddress2" escape="HTML" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="branchaddress3" -->
-							<br /><!-- TMPL_VAR name="branchaddress3" escape="HTML" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name=branchphone -->
-							<br />Ph: <!-- TMPL_VAR name="branchphone" escape="HTML" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="branchfax" -->
-							<br />Fax: <!-- TMPL_VAR name="branchfax" escape="HTML" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="branchemail" -->
-							<br />Email: <!-- TMPL_VAR name="branchemail" escape="HTML" --><!-- /TMPL_IF -->
-					<!-- /TMPL_IF -->
-				</td>
-				<td>
-					<!-- TMPL_IF name="no-categories-p" -->
-						(no categories set)
-					<!-- TMPL_ELSE -->
-						<!-- TMPL_LOOP name="category_list" -->
-							<!-- TMPL_VAR name="categoryname" --><br />
-						<!-- /TMPL_LOOP -->
-					<!-- /TMPL_IF -->
-				</td>
-				<td>
-					<form action="<!-- TMPL_VAR name=action -->" method="post">
-					<input type="hidden" name="op" value="edit" />
-					<input type="hidden" name="branchcode" value="<!-- TMPL_VAR name=value escape="HTML" -->" />
-					<input type="submit" value="Edit" class="submit" />
-					</form>
-				</td>
-				<td>
-					<form action="<!-- TMPL_VAR name=action -->" method="post">
-					<input type="hidden" name="branchcode" value="<!-- TMPL_VAR name=value escape="HTML" -->" />
-<input type="hidden" name="branchname" value="<!-- TMPL_VAR NAME="branch_name" escape="HTML" -->">
-					<input type="hidden" name="op" value="delete" /><input type="submit" value="Delete" class="cancel" />
-					</form>
-				</td>
-			</tr>
-		<!-- /TMPL_LOOP -->
-	</table>
-<form action="<!-- TMPL_VAR name=action -->" method="post">
-		<p><input type="hidden" name="op" value="add" />
-		<input type="submit" class="submit" value="Add New Branch" /></p>
-	</form>
-	
-	<table>
-	<caption>Branches Categories</caption>
-	<tr>
-		<th>Name</th>
-		<th>Code</th>
-		<th>Description</th>
-		<th>&nbsp;</th>
-		<th>&nbsp;</th>
-	</tr>
-	<!-- TMPL_LOOP name="branchcategories" -->
-		<tr>
-		<td><!-- TMPL_VAR name="categoryname" --></td>
-		<td><!-- TMPL_VAR name="categorycode" --></td>
-		<td><!-- TMPL_VAR name="codedescription" --></td>
-		<td>
-			<form action="<!-- TMPL_VAR name=action -->" method="post">
-			<input type="hidden" name="op" value="editcategory" />
-			<input type="hidden" name="categorycode" value="<!-- TMPL_VAR name=categorycode escape="HTML" -->" />
-			<input type="submit" value="Edit" class="submit" />
-			</form>
-		</td>
-		<td>
-			<form action="<!-- TMPL_VAR name=action -->" method="post">
-			<input type="hidden" name="categorycode" value="<!-- TMPL_VAR name=categorycode escape="HTML" -->" />
-			<input type="hidden" name="op" value="delete_category" /><input type="submit" value="Delete" class="cancel" />
-			</form>
-		</td>
-		</tr>
-	<!-- /TMPL_LOOP -->
-	</table><form action="<!-- TMPL_VAR name="action" -->" method="post"><p>
-		<input type="hidden" name="op" value="editcategory" />
-		<input type="submit" class="submit" value="Add New Category" /></p>
-	</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="editcategory" -->
-	
-	<form action="<!-- TMPL_VAR name=action -->" name="Aform" method="post">
-	<input type="hidden" name=op value="addcategory_validate" />
-	<table>
-		<caption><!-- TMPL_VAR name="head" --></caption>
-		<tr>
-			<td>Category code</td>
-			<td>
-				<!-- TMPL_IF name="categorycode" -->
-					<input type="hidden" name="categorycode" value="<!-- TMPL_VAR name=categorycode escape="HTML" -->" />
-					<!-- TMPL_VAR name="categorycode" -->
-				<!-- TMPL_ELSE -->
-					<input type="text" name="categorycode" size="5" maxlength="5" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
-				<!-- /TMPL_IF -->
-			</td>
-		</tr>
-		<tr>
-			<td>Name</td>
-			<td><input type="text" name="categoryname" size="40" maxlength="80" value="<!-- TMPL_VAR name=categoryname escape="HTML" -->" />&nbsp;</td>
-		</tr>
-		<tr>
-			<td>Description</td>
-			<td><input type="text" name="codedescription" size="40" maxlength="80" value="<!-- TMPL_VAR name="codedescription" escape="HTML" -->" />&nbsp;</td>
-		</tr>
-	</table><input type="submit" value="Update" class="submit" />
-	</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="delete_category" -->
-	Confirm delete:
-<div class="tabitem">	<form action="<!-- TMPL_VAR name=action -->" method="post">
-		<input type="hidden" name="op" value="categorydelete_confirmed" />
-		<input type="hidden" name="categorycode" value="<!-- TMPL_VAR name=categorycode escape="HTML" -->" />
-		<input type="submit" value="YES" class="submit" />
-	</form>
-	<form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="hidden" name="op" value="">
-		<input type="submit" value="NO" class="cancel" />
-	</form></div>
-<!-- /TMPL_IF --></div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/categorie.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/categorie.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/categorie.tmpl
--- htdocs/intranet-tmpl/default/en/admin/categorie.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,372 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF NAME="categorycode" -->Modify category<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-	<!-- TMPL_IF NAME="add_form" -->
-		<script language="javascript" type="text/javascript">
-		function _(s) { return s } // dummy function for gettext
-		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-		function isNotNull(f,noalert) {
-			if (f.value.length ==0) {
-	return false;
-			}
-			return true;
-		}
-		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-		function toUC(f) {
-			var x=f.value.toUpperCase();
-			f.value=x;
-			return true;
-		}
-		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-		function isNum(v,maybenull) {
-		var n = new Number(v.value);
-		if (isNaN(n)) {
-			return false;
-			}
-		if (maybenull==0 && v.value=='') {
-			return false;
-		}
-		return true;
-		}
-		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-		function isDate(f) {
-			var t = Date.parse(f.value);
-			if (isNaN(t)) {
-				return false;
-			}
-		}
-		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-		function Check(f) {
-			var ok=1;
-			var _alertString="";
-			var alertString2;
-			if (f.categorycode.value.length==0) {
-				_alertString += "\n- " + _("Categorycode missing");
-			}
-	//		alert(window.document.Aform.description.value);
-			if (!(isNotNull(window.document.Aform.description,1))) {
-				_alertString += "\n- " + _("Description missing");
-			}
-			if (!isNum(f.upperagelimit,0)) {
-				_alertString += "\n- " + _("Upper age is not a number");
-			}
-			if (_alertString.length==0) {
-				document.Aform.submit();
-			} else {
-				alertString2  = _("Form not submitted because of the following problem(s)");
-				alertString2 += "\n------------------------------------------------------------------------------------\n";
-				alertString2 += _alertString;
-				alert(alertString2);
-			}
-		}
-		</script>
-
-		<!-- TMPL_IF NAME="categorycode" -->
-			<h1>Edit user category</h1>
-		<!-- TMPL_ELSE -->
-			<h1>Add user category</h1>
-		<!-- /TMPL_IF -->
-
-		<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-		<input type="hidden" name="op" value="add_validate">
-		<input type="hidden" name="checked" value="0">
-
-		<table style="border:0;border-collapse:separate;border-spacing:3px">
-		<!-- TMPL_IF NAME="categorycode" -->
-			<tr>
-				<td>Category code</td>
-				<td>
-					<b><!-- TMPL_VAR NAME="categorycode" --></b>
-					<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->">
-				</td>
-			</tr>
-		<!-- TMPL_ELSE -->
-			<tr>
-				<td>Category code</td>
-				<td>
-					<input type="text" name="categorycode" size="3" maxlength="2" onblur="toUC(this)">
-				</td>
-			</tr>
-		<!-- /TMPL_IF -->
-
-			<tr>
-				<td>Description</td>
-				<td>
-					<input type="text" name="description" size="60" maxlength="80" value="<!-- TMPL_VAR NAME="description" escape=HTML -->">
-					&nbsp;
-				</td>
-			</tr>
-			<tr>
-				<td>Validy period</td>
-				<td>
-					<input type="text" name="enrolmentperiod" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->">
-				</td>
-			</tr>
-			<tr>
-				<td>Upper age limit</td>
-				<td>
-					<input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME="upperagelimit" -->">
-				</td>
-			</tr>
-			<tr>
-				<td>Age required</td>
-				<td>
-					<input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME="dateofbirthrequired" -->" size="3" maxlength="2">
-				</td>
-			</tr>
-			<tr>
-				<td>Enrolment fee</td>
-				<td>
-					<input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME="enrolmentfee" -->">
-				</td>
-			</tr>
-			<tr>
-				<td>Overdue notice</td>
-				<td>
-					<select name="overduenoticerequired">
-						<option<!-- TMPL_UNLESS name="overduenoticerequired" --> selected<!-- /TMPL_UNLESS --> value="0">No</option>
-						<option<!-- TMPL_IF NAME="overduenoticerequired" --> selected<!-- /TMPL_IF --> value="1">Yes</option>
-					</select>
-				</td>
-			</tr>
-			<tr>
-				<td>Issue limit</td>
-				<td>
-					<input type="text" name="issuelimit" value="<!-- TMPL_VAR NAME="issuelimit" -->">
-				</td>
-			</tr>
-			<tr>
-				<td>Reserve fee</td>
-				<td>
-					<input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->">
-				</td>
-			</tr>
-			<tr>
-				<td>Add public shelves</td>
-				<td>
-					<select name="canmakepublicshelves">
-						<option<!-- TMPL_UNLESS name="canmakepublicshelves" --> selected<!-- /TMPL_UNLESS --> value="0">No</option>
-						<option<!-- TMPL_IF NAME="canmakepublicshelves" --> selected<!-- /TMPL_IF --> value="1">Yes</option>
-					</select>
-				</td>
-			</tr>
-			<tr>
-				<td>Make requirements for virtual shelves</td>
-				<td>
-					<select name="addRequestToShelves">
-						<option<!-- TMPL_UNLESS name="addRequestToShelves" --> selected<!-- /TMPL_UNLESS --> value="0">No</option>
-						<option<!-- TMPL_IF NAME="addRequestToShelves" --> selected<!-- /TMPL_IF --> value="1">Yes</option>
-					</select>
-				</td>
-			</tr>
-			<tr>
-				<td>Renews from OPAC</td>
-				<td>
-					<select name="allowrenewsfromopac">
-						<option<!-- TMPL_UNLESS name="allowrenewsfromopac" --> selected<!-- /TMPL_UNLESS --> value="0">No</option>
-						<option<!-- TMPL_IF NAME="allowrenewsfromopac" --> selected<!-- /TMPL_IF --> value="1">Yes</option>
-					</select>
-				</td>
-			</tr>
-		</table>
-		    <br>
-		    <input type="button" value="Accept" onclick="Check(this.form)" class="button">
-		    <input type="button" value="Cancel" onclick="document.location.href='/cgi-bin/koha/admin/categorie.pl'" class="button">
-		</form>
-
-	<!-- /TMPL_IF -->
-
-	<!-- TMPL_IF NAME="add_validate" -->
-	    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<h6 style="float:left;margin-rigth:10px;">Information saved</h6>
-			<input type="submit" value="Accept" class="button">
-		</form>
-	<!-- /TMPL_IF -->
-
-	<!-- TMPL_IF NAME="delete_confirm" -->
-	    <h1>Delete user category</h1>
-		<h6>Total user with this category <!-- TMPL_VAR NAME="categorycode" --> = <!-- TMPL_VAR NAME="total" --></h6>
-
-		<table border="0" cellspacing="0" cellpadding="5" style="float:left;width:50%;margin-right:10px;">
-			<tr>
-				<th colspan="2">
-					<b>Category
-					<!-- TMPL_VAR NAME="categorycode" --></b>
-				</th>
-			</tr>
-   
-			<tr>
-				<td>Description</td>
-				<td><!-- TMPL_VAR NAME="description" --></td>
-			</tr>
-			<tr>
-				<td>Validty period</td>
-				<td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
-			</tr>
-			<tr>
-				<td>Upper age limit</td>
-				<td><!-- TMPL_VAR NAME="upperagelimit" --></td>
-			</tr>
-			<tr>
-				<td>Age required</td>
-				<td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
-			</tr>
-			<tr>
-				<td>Enrolment fee</td>
-				<td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
-			</tr>
-			<tr>
-				<td>Overdue notice</td>
-				<td><!-- TMPL_IF NAME="overduenoticerequired" -->Si<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-			</tr>
-			<tr>
-				<td>Issue limit</td>
-				<td><!-- TMPL_VAR NAME="issuelimit" --></td>
-			</tr>
-			<tr>
-				<td>Reserve fee</td>
-				<td><!-- TMPL_VAR NAME="reservefee" --></td>
-			</tr>
-			<tr>
-				<td>Add public shelves</td>
-				<td><!-- TMPL_IF NAME="canmakepublicshelves" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-			</tr>
-			
-			<tr>
-				<td>Make requirements for virtual shelves</td>
-				<td><!-- TMPL_IF NAME="addRequestToShelves" -->Si<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-			</tr>
-			
-			
-   		    <tr>
-				<td>Renews from OPAC</td>
-				<td><!-- TMPL_IF NAME="allowrenewsfromopac" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-			</tr>
-		</table>
-			
-		<table style="width:45%">
-			<!-- TMPL_IF NAME="totalgtzero" -->
-			<tr>
-				<td colspan="2" align="center"><h6 id="warning">This category is assigned to <!-- TMPL_VAR NAME="total" --> users. You can't delete it.</h6></td>
-			</tr>
-			<tr>
-				<td colspan="2" align="center">
-					<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-						<input type="submit" value="Accept" class="button">
-					</form>
-				</td>
-			</tr>
-			<!-- TMPL_ELSE -->
-			<tr>
-				<td colspan="2" align="center"><h6 id="warning">Confirm delete</h6></td>
-			</tr>
-			<tr>
-				<td align="right" width="50%">
-				    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-						<input type="hidden" name="op" value="delete_confirmed">
-						<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->">
-						<input type="submit" value="Yes" class="button">
-					</form>
-				</td>
-				<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No" class="button"></form></td>
-			</tr>
-			<!-- /TMPL_IF -->
-		</table>
-
-	<!-- /TMPL_IF -->
-
-	<!-- TMPL_IF NAME="delete_confirmed" -->
-	    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<h6 style="float:left;margin-rigth:10px;">Information deleted</h6>
-		<input type="submit" value="Accept" class="button">
-		</form>
-
-	<!-- /TMPL_IF -->
-
-	<!-- TMPL_IF NAME="else" -->
-		<h1>User categories</h1>
-		<!-- TMPL_IF NAME="searchfield" -->
-			<h6>You searched: <!-- TMPL_VAR NAME="searchfield" --></h6>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_UNLESS name="categoryChild" -->
-		<!--	<h6 id="warning">Warning : Debe tener un codigo de categoría = C para niños</h6>-->
-		<!-- /TMPL_UNLESS -->
-		<!-- TMPL_UNLESS name="categoryInstitution" -->
-		<!--	<h6 id="warning">Atención : Debe tener un codigo de categoría = I para instituciones</h6> -->
-		<!-- /TMPL_UNLESS -->
-		<form action="<TMPL_VAR NAME="script_name">" method="post">
-			<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
-			<input type="submit" name="submit" value="Accept" class="button">
-		</form>
-
-		<table border="0" cellspacing="0" cellpadding="5">
-			<tr bgcolor="#99cc33">
-				<th>Code</th>
-				<th>Description</th>
-				<th>Validity period</th>
-				<th>Enrolment fee</th>
-				<th>Upper age limit</th>
-				<th>Age required</th>
-				<!-- <th>Creditos</th> -->
-				<th>Overdue notice</th>
-				<th>Issue limit</th>
-				<th>Reserve fee</th>
-				<th>Add public shelves</th>
-				<th>Make requirements for virtual shelves</th>
-				<th>Renews from OPAC</th>
-				<th colspan="2"> </th>
-			</tr>
-			<!-- TMPL_LOOP NAME="loop" -->
-			<tr <!-- TMPL_IF NAME="toggle" -->bgcolor="#ffffcc"<!-- TMPL_ELSE -->bgcolor="#FFFFFF" <!-- /TMPL_IF --> >
-				<td align="center"><!-- TMPL_VAR NAME="categorycode" --></td>
-				<td><!-- TMPL_VAR NAME="description" --></td>
-				<td align="center"><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
-				<td align="center"><!-- TMPL_VAR NAME="enrolmentfee" --></td>
-				<td align="center"><!-- TMPL_VAR NAME="upperagelimit" --></td>
-				<td align="center"><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
-			<!--	<td align="center"><!- TMPL_VAR NAME="finetype" --> 	<!--</td> -->
-				<td align="center"><!-- TMPL_IF NAME="overduenoticerequired" -->
-						<i>Yes</i>
-					<!-- TMPL_ELSE -->
-						<i>No</i>
-					<!-- /TMPL_IF -->
-				</td>
-				<td align="center"><!-- TMPL_VAR NAME="issuelimit" --></td>
-				<td align="center"><!-- TMPL_VAR NAME="reservefee" --></td>
-				<td align="center"><!-- TMPL_IF NAME="canmakepublicshelves" -->
-						<i>Yes</i>
-					<!-- TMPL_ELSE -->
-						<i>No</i>
-					<!-- /TMPL_IF -->
-				</td>
-				
-				<td align="center"><!-- TMPL_IF NAME="addRequestToShelves" -->
-						<i>Yes</i>
-					<!-- TMPL_ELSE -->
-						<i>No</i>
-					<!-- /TMPL_IF -->
-				</td>
-				
-				<td align="center"><!-- TMPL_IF NAME="allowrenewsfromopac" -->
-						<i>Yes</i>
-					<!-- TMPL_ELSE -->
-						<i>No</i>
-					<!-- /TMPL_IF -->
-				</td>
-				
-				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
-				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" border="0"></a></td>
-			</tr>
-			<!-- /TMPL_LOOP -->
-
-		</table>
-		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="hidden" name="op" value="add_form">
-			<input type="submit" class="button" value="Add category" alt="Add category"><br>
-		</form>
-	<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/categoryitem.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/categoryitem.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/categoryitem.tmpl
--- htdocs/intranet-tmpl/default/en/admin/categoryitem.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,299 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF NAME="categorycode" -->Modify category<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-
-<!-- TMPL_IF NAME="add_form" -->
-        <script language="javascript" type="text/javascript">
-	function _(s) { return s } // dummy function for gettext
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        function isNotNull(f,noalert) {
-                if (f.value.length ==0) {
-   return false;
-                }
-                return true;
-        }
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        function toUC(f) {
-                var x=f.value.toUpperCase();
-                f.value=x;
-                return true;
-        }
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        function isNum(v,maybenull) {
-        var n = new Number(v.value);
-        if (isNaN(n)) {
-                return false;
-                }
-        if (maybenull==0 && v.value=='') {
-                return false;
-        }
-        return true;
-        }
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        function isDate(f) {
-                var t = Date.parse(f.value);
-                if (isNaN(t)) {
-                        return false;
-                }
-        }
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        function Check(f) {
-                var ok=1;
-                var _alertString="";
-                var alertString2;
-                if (f.categorycode.value.length==0) {
-                        _alertString += "\n- " + _("categorycode missing");
-                }
-//              alert(window.document.Aform.description.value);
-                if (!(isNotNull(window.document.Aform.description,1))) {
-                        _alertString += "\n- " + _("falta descripcion");
-                }
-                if (!isNum(f.upperagelimit,0)) {
-                        _alertString += "\n- " + _("edad maxima no es un numero");
-                }
-                if (_alertString.length==0) {
-                        document.Aform.submit();
-                } else {
-                        alertString2  = _("Form not submitted because of the following problem(s)");
-                        alertString2 += "\n------------------------------------------------------------------------------------\n";
-                        alertString2 += _alertString;
-                }
-        }
-        </script>
-
-        <!-- TMPL_IF NAME="categorycode" -->
-                <h1>Modify category</h1>
-        <!-- TMPL_ELSE -->
-                <h1>Agregar Categr&iacute;a</h1>
-        <!-- /TMPL_IF -->
-
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-        <input type="hidden" name="op" value="add_validate">
-        <input type="hidden" name="checked" value="0">
-                        
-        <table>  
-        <!-- TMPL_IF NAME="categorycode" -->
-                <tr>
-                        <td>Codigo Categoria</td>
-                        <td>
-                                <input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->">
-                        </td>
-                </tr>
-        <!-- TMPL_ELSE -->
-                <tr>
-                        <td>Codigo Categoria</td>
-                        <td>
-                                <input type="text" name="categorycode" size="3" maxlength="2" onblur="toUC(this)">
-                        </td>
-                </tr>
-        <!-- /TMPL_IF -->
-                <tr>
-                        <td>Descripci&oacute;n</td>
-                        <td>
-                                <input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" escape=HTML -->">
-                                &nbsp;
-                        </td>
-                </tr>
-                <tr>
-                        <td>Periodo de Enrolamiento</td>
-                        <td>
-                                <input type="text" name="enrolmentperiod" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->">
-                        </td>
-                </tr>
-                <tr>
-                        <td>Limite maximo de edad</td>
-                        <td>
-                                <input type="text" name="upperagelimit" value="<!-- TMPL_VAR NAME="upperagelimit" -->">
-                        </td>
-                </tr>
-                <tr>
-                        <td>Edad Requerida</td>
-                        <td>
-                                <input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME="dateofbirthrequired" -->">
-                        </td>
-                </tr>
-                <tr>
-                        <td>tipo Credito</td>
-                        <td>
-                                <input type="text" name="finetype" size="30" maxlength="30" value="<!-- TMPL_VAR NAME="finetype" -->">
-                        </td>
-                </tr>
-                <tr>
-                        <td>Bulk</td>
-                        <td>
-                                <input type="text" name="bulk" value="<!-- TMPL_VAR NAME="bulk" -->">
-                        </td>
-                </tr>
-                <tr>
-                        <td>Monto Enrolamiento</td>
-                        <td>
-                                <input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME="enrolmentfee" -->">
-                        </td>
-                </tr>
-                <tr>
-                        <td>Overdue notice required</td>
-                        <td>
-                                <input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->">
-                        </td>
-                </tr>
-                <tr>
-                        <td>Reserve fee</td>
-                        <td>
-                                <input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->">
-                        </td>
-                </tr>
-                <tr>
-                        <td>&nbsp;</td>
-                        <td>
-                                <input type="button" value="Aceptar" onclick="Check(this.form)">
-                        </td>
-                </tr>
-        </table>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="add_validate" -->
-        Informacion Almacenada
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="submit" value="Aceptar">
-        </form>
-<!-- /TMPL_IF -->
-
-        TOTAL : <!-- TMPL_VAR NAME="categorycode" --> : <!-- TMPL_VAR NAME="total" --><br>
-                    
-        <table border="0" cellspacing="0" cellpadding="5">
-                <tr bgcolor="#99cc33">
-                        <td background="/images/background-mem.gif">
-                                <b>Codigo Categoria</b>
-                        </td>
-                        <td background="/images/background-mem.gif">
-                                <!-- TMPL_VAR NAME="categorycode" -->
-                        </td>
-                </tr>
-                <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                        <input type="hidden" name="op" value="delete_confirmed">
-                        <input type="hidden" name="categorycode" value=<!-- TMPL_VAR NAME="categorycode" -->>
-                <tr>
-                        <td>Descripci&oacute;n</td>
-                        <td><!-- TMPL_VAR NAME="description" --></td>
-                </tr>
-                <tr>
-                        <td>Periodo de Enrolamiento</td>
-                        <td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
-                </tr>
-                <tr>
-                        <td>Limite maximo de edad</td>
-                        <td><!-- TMPL_VAR NAME="upperagelimit" --></td>
-                </tr>
-                <tr>
-                        <td>Edad Requerida</td>
-                        <td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
-                </tr>
-                <tr>
-                        <td>tipo Credito</td>
-                        <td><!-- TMPL_VAR NAME="finetype" --></td>
-                </tr>
-                <tr>
-                        <td>Bulk</td>
-                        <td><!-- TMPL_VAR NAME="bulk" --></td>
-                </tr>
-                <tr>
-                        <td>Monto Enrolamiento</td>
-                        <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
-                </tr>
-                <tr>
-                        <td>Overdue notice required</td>
-                        <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
-                </tr>
-                <tr>
-                        <td>Reserve fee</td>
-                        <td><!-- TMPL_VAR NAME="reservefee" --></td>
-                </tr>
-                <!-- TMPL_IF NAME="totalgtzero" -->
-                <tr>
-                        <td colspan="2" align="center"><b>This record is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</b></td>
-                </tr>
-               <tr>
-                        <td colspan="2">
-                                </form><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                                <input type="submit" value="Aceptar">
-                                </form>
-                        </td>
-                </tr>
-                <!-- TMPL_ELSE -->
-                <tr>
-                        <td colspan="2" align="center">CONFIRM DELETION</td>
-                </tr>
-                <tr>
-                        <td><input type="submit" value="SI"></form></td>
-                        <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO"></form></td>
-                </tr>
-                <!-- /TMPL_IF -->
-
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirmed" -->
-        Informacion Eliminada
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="submit" value="Aceptar">
-        </form>
-
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="else" -->
-        <h2>Admin Categoria</h2>
-        <!-- TMPL_IF NAME="searchfield" -->
-                Usted ha buscado para <!-- TMPL_VAR NAME="searchfield" -->
-        <!-- /TMPL_IF -->
-
-        <form action="<!-- TMPL_VAR NAME="script_name">" method="post">
-                <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
-                <input type="reset" name="reset" value="Limpiar">
-        </form>
-
-        <table border="0" cellspacing="0" cellpadding="5">
-                <tr bgcolor="#99cc33">
-                        <td background="/images/background-mem.gif"><b>Categoria</b></td>
-                        <td background="/images/background-mem.gif"><b>Descripci&oacute;n</b></td>
-                        <td background="/images/background-mem.gif"><b>Enrolamiento</b></td>
-                        <td background="/images/background-mem.gif"><b>Limite maximo de edad</b></td>
-                        <td background="/images/background-mem.gif"><b>Edad Requerida</b></td>
-                        <td background="/images/background-mem.gif"><b>Creditos</b></td>
-                        <td background="/images/background-mem.gif"><b>Bulk</b></td>
-                        <td background="/images/background-mem.gif"><b>Pagos Economicos</b></td>
-                        <td background="/images/background-mem.gif"><b>Overdue</b></td>
-                        <td background="/images/background-mem.gif"><b>Reserve</b></td>
-                        <td background="/images/background-mem.gif"> </td>
-                        <td background="/images/background-mem.gif"> </td>
-                </tr>
-                <!-- TMPL_LOOP NAME="loop" -->
-                <tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
-                        <td><!-- TMPL_VAR NAME="categorycode" --></td>
-                        <td><!-- TMPL_VAR NAME="description" --></td>
-                        <td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
-                        <td><!-- TMPL_VAR NAME="upperagelimit" --></td>
-                        <td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
-                        <td><!-- TMPL_VAR NAME="finetype" --></td>
-                        <td><!-- TMPL_VAR NAME="bulk" --></td>
-                        <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
-                        <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
-                        <td><!-- TMPL_VAR NAME="reservefee" --></td>
-                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Editar</a></td>
-                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Eliminar</a></td>
-		</tr>
-                <!-- /TMPL_LOOP -->
-
-        </table>
-        <p><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="hidden" name="op" value="add_form">
-                <input type="submit" class="button" value="Agregar Categr&iacute;a" alt="Agregar Categr&iacute;a"><br>
-        </form></p>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
-
-
-

Index: htdocs/intranet-tmpl/default/en/admin/charges.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/charges.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/charges.tmpl
--- htdocs/intranet-tmpl/default/en/admin/charges.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: Fines
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h2>Calculating Fines</h2>
-<p>Each box needs to be filled in with fine,time to start charging,charging cycle</p>
-<p>eg 1,7,7 = $1 fine, after 7 days, every 7 days</p>
-<p>Note : fines are calculated by the <span class="ex">fines2.pl</span> script, located in <span class="ex">misc</span> directory. Ask your administrator to put this script in crontab (after midnight) to have fines calculated every night</p>
-<form action="/cgi-bin/koha/admin/updatecharges.pl" method="post">
-<div class="table"><table>
-<tr>
-	<th>&nbsp;</th><!-- TMPL_LOOP NAME="title" --><th><!-- TMPL_VAR NAME="in_title" --></th><!-- /TMPL_LOOP -->
-</tr>
-<!-- TMPL_LOOP NAME="row" -->
-	<tr>
-		<th>
-			<!-- TMPL_VAR NAME="categorycode" -->
-		</th>
-		<!-- TMPL_LOOP NAME="cell" -->
-			<td bgcolor="<!-- TMPL_VAR name="toggle" -->">
-				<input name="<!-- TMPL_VAR name="inputname" -->" value="<!-- TMPL_VAR name="inputvalue" -->" size="6" maxlength="10">
-			</td>
-		<!-- /TMPL_LOOP -->
-	</TR>
-<!-- /TMPL_LOOP -->
-</table></div>
-<input type="submit" class="submit" value="Submit Changes">
-</form>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/checkmarc.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/checkmarc.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/checkmarc.tmpl
--- htdocs/intranet-tmpl/default/en/admin/checkmarc.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,125 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: MARC Check: 
-<!-- TMPL_IF name="total" --><!-- TMPL_VAR name="total" --> errors found<!-- TMPL_ELSE -->Configuration OK!<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1>MARC Checks</h1>
-<table>
-	<tr>
-		<th>Test</th>
-		<th>Result</th>
-	</tr>
-<!-- TMPL_IF name="biblionumber" -->
-	<tr>
-		<td> biblionumber</td>
-		<td>The biblio.biblionumber  and items.biblionumber fields MUST :
-			<ul><li>each be mapped to a MARC field/subfield,</li>
-			</ul></td>
-	</tr>
-<!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td>biblionumber  mapped correctly</td>
-	</tr>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF name="itemnumber" -->
-	<tr>
-		<td>itemnum</td>
-		<td><ul><li>The field itemnumber MUST be mapped </li>
-			<li>The corresponding fileld or subfield MUST be in tab 10 and may be hidden</li></ul></td>
-	</tr>
-<!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td>The field itemnumber is mapped to a  MARC field </td>
-	</tr>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="barcode" -->
-	<tr>
-		<td>itemnum</td>
-		<td><ul><li>The field barcodde MUST be mapped </li>
-			<li>The corresponding field or subfield MUST be in tab 10 and may be hidden</li></ul></td>
-	</tr>
-<!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td>The field barcode is mapped to a  MARC field </td>
-	</tr>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF name="isbn" -->
-	<tr>
-		<td>ISBN NOT mapped</td>
-		<td>isbn  MUST :<br />
-			<ul><li>be mapped to a MARC subfield,</li>
-		 </ul></td>
-	</tr>
-<!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td>ISBN defined</td>
-	</tr>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF name="itemtype" -->
-	<tr>
-		<td>itemtype NOT mapped</td>
-		<td>itemtype field MUST :<br />
-			<ul><li>be mapped to a MARC subfield, </li>
-			<li>the correspounding subfield MUST have authorised_value=itemtype</li></ul></td>
-	</tr>
-<!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td>itemtype mapped</td>
-	</tr>
-<!-- /TMPL_IF -->
-<!-- -->
-<!-- TMPL_IF name="branch" -->
-	<tr>
-		<td>homebranch NOT mapped</td>
-		<td>homebranch  MUST :<br />
-			<ul><li>be mapped to a MARC subfield,</li>
-		 </ul></td>
-	</tr>
-<!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td>homebranch defined</td>
-	</tr>
-<!-- /TMPL_IF -->
-<!-- -->
-<!-- TMPL_IF name="holdingbranch" -->
-	<tr>
-		<td>holdingbranch NOT mapped</td>
-		<td>the holdingbranch  MUST :<br />
-			<ul><li>be mapped to a MARC subfield, </li>
-			<li>the correspounding subfield MUST have authorised value=branches</li></ul></td>
-	</tr>
-<!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td>holdingbranch defined</td>
-	</tr>
-<!-- /TMPL_IF -->
-<!-- -->
-
-<!-- -->
-<!-- TMPL_IF name="total" -->
-	<tr>
-		<td>TOTAL</td>
-		<td>You have <!-- TMPL_VAR name="total" --> error(s) in your MARC configuration. Please fix them before using Koha</td>
-	</tr>
-</table>
-<!-- TMPL_ELSE -->
-	</table>
-		<p>Configuration OK, you don't have errors in your MARC parameters </p>
-<!-- /TMPL_IF -->
-
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/cities.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/cities.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/cities.tmpl
--- htdocs/intranet-tmpl/default/en/admin/cities.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,176 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System administration: cities
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
-
-<!-- TMPL_IF NAME="add_form" -->
-	<!-- TMPL_IF NAME="cityid" -->
-		<h1>Modify a city</h1>
-	<!-- TMPL_ELSE -->
-		<h1>Add a city</h1>
-	<!-- /TMPL_IF -->
-
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-	<input type="hidden" name="op" value="add_validate">
-	<input type="hidden" name="checked" value="0">
-	<input type="hidden" name="cityid" value="<!-- TMPL_VAR NAME="cityid" -->">
-
-	<!-- TMPL_IF NAME="cityid" -->
-		<p class="p_borrowers">
-	
-		<label>City id</label>
-		<label><b><!-- TMPL_VAR NAME="cityid" --></b></label>
-		</p>
-	<!-- /TMPL_IF -->
-	<p>
-	<label>City name</label>
-	<input  type="text" name="city_name" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="city_name" escape=HTML -->">&nbsp;
-	</p>
-	<p>				
-	<label>City zipcode</label>
-	<input type="text" name="city_zipcode" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="city_zipcode" -->">
-	</p>
-	
-	<p>
-	<div >
-		<input class="button" type="button" onclick="Check(this.form)" value="OK">
-	</div>	
-	</p>
-	</form>
-
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirm" -->
-	<table>
-		<tr>
-			<td>
-				<b>City id</b>
-			</td>
-			<td>
-				<!-- TMPL_VAR NAME="cityid" -->
-			</td>
-		</tr>
-		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="hidden" name="op" value="delete_confirmed">
-			<input type="hidden" name="cityid" value="<!-- TMPL_VAR NAME="cityid" -->">        
-		<tr>
-			<td>city name</td>
-			<td><!-- TMPL_VAR NAME="city_name" --></td>
-		</tr>
-		<tr>
-			<td>City zipcode</td>
-			<td><!-- TMPL_VAR NAME="city_zipcode" --></td>
-		</tr>
-		</tr>
-		<!-- TMPL_IF NAME="totalgtzero" -->
-		<tr>
-			<td colspan="2" align="center" class="problem">This record is used <!-- TMPL_VAR NAME="total" --> times. Impossible to delete it</td>
-		</tr>
-	<tr>
-			<td colspan="2">
-				</form><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-				<input type="submit" value="OK">
-				</form>
-			</td>
-		</tr>
-		<!-- TMPL_ELSE -->
-		<tr>
-			<td colspan="2" align="center">confirm deletion</td>
-		</tr>
-		<tr>
-			<td><input type="submit" value="YES"></form></td>
-			<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="submit" value="NO"></form></td>
-		</tr>
-		<!-- /TMPL_IF -->
-</table>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="else" -->
-	<h2>Cities management</h2>
-	<!-- TMPL_IF NAME="searchfield" -->
-		Searching: <!-- TMPL_VAR NAME="searchfield" -->
-	<!-- /TMPL_IF -->
-	<form action="<TMPL_VAR NAME="script_name">" method="post">
-		<input type="text" name="city_name" value="<!-- TMPL_VAR NAME="searchfield" -->">
-		<input type="submit" name="submit" value="OK" class="button">
-	</form>
-
-	<table>
-		<tr>
-			<th>City id</th>
-			<th>City name</th>
-			<th>City zipcode</th>
-			<th> </th>
-			<th> </th>
-			
-		</tr>
-		<!-- TMPL_LOOP NAME="loop" -->
-		<!-- TMPL_IF NAME="toggle" -->
-		<tr class="hilighted">
-		<!-- TMPL_ELSE -->
-		<tr>
-		<!-- /TMPL_IF -->
-			<td><!-- TMPL_VAR NAME="cityid" --></td>
-			<td><!-- TMPL_VAR NAME="city_name" --></td>
-			<td><!-- TMPL_VAR NAME="city_zipcode" --></td>
-			
-			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;cityid=<!-- TMPL_VAR NAME="cityid" -->">edit</a></td>
-			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;cityid=<!-- TMPL_VAR NAME="cityid" -->">delete</a></td>
-		</tr>
-		<!-- /TMPL_LOOP -->
-
-	</table>
-	<p><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="hidden" name="op" value="add_form">
-		<input type="submit" class="button" value="Add a city"  alt="Add city"><br>
-	</form></p>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-<script language="javascript" type="text/javascript">
-		function _(s) { return s } // dummy function for gettext
-		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-		function isNotNull(f,noalert) {
-			if (f.value.length == 0) {
-		return false;
-			}
-		return true;
-		}
-		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-		function toUC(f) {
-			var x=f.value.toUpperCase();
-			f.value=x;
-			return true;
-		}
-		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-		function isNum(v,maybenull) {
-		var n = new Number(v.value);
-		if (isNaN(n)) {
-			return false;
-			}
-		if (maybenull == 0 && v.value =='') {
-			return false;
-		}
-		return true;
-		}
-		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-		function isDate(f) {
-			var t = Date.parse(f.value);
-			if (isNaN(t)) {
-				return false;
-			}
-		}
-		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-		function Check(f) {
-			var ok=1;
-			var _alertString="";
-			var alertString2;
-			if (f.city_zipcode.value.length == 0 && f.city_name.value.length == 0 ) {
-				_alertString += "\n- " + _("City name & zipcode missing");
-				alert(_alertString);	
-			}
-			else{
-			document.Aform.submit();
-			}
-		}
-</script>

Index: htdocs/intranet-tmpl/default/en/admin/currency.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/currency.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/currency.tmpl
--- htdocs/intranet-tmpl/default/en/admin/currency.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,194 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
-<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify currency '<!-- TMPL NAME="searchfield" -->'<!-- TMPL_ELSE -->Add currency<!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_validate" -->Data Recorded<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Currency '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirmed" -->Currency Deleted<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="else" -->Currencies<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<!-- TMPL_IF NAME=add_form -->
-        <script>
-        //
-        function isNotNull(f,noalert) {
-                if (f.value.length ==0) {
-   return false;
-                }
-                return true;
-        }
-        //
-        function toUC(f) {
-                var x=f.value.toUpperCase();
-                f.value=x;
-                return true;
-        }
-        //
-        function isNum(v,maybenull) {
-        var n = new Number(v.value);
-        if (isNaN(n)) {
-                return false;
-                }
-        if (maybenull=="0" && v.value=="") {
-                return false;
-        }
-        return true;
-        }
-        //
-        function isDate(f) {
-                var t = Date.parse(f.value);
-                if (isNaN(t)) {
-                        return false;
-                }
-        }
-        //
-        function Check(f) {
-                var ok=1;
-                var _alertString="";
-                var alertString2;
-                if (f.currency.value.length==0) {
-                        _alertString += "- Currency name missing\\n";
-                }
-                if (f.rate.value.length==0) {
-                        _alertString += "- Rate missing\\n";
-                }
-                if (_alertString.length==0) {
-                        document.Aform.submit();
-                } else {
-                        alertString2 = "Form not submitted because of the following problem(s)\\n";
-                        alertString2 += "------------------------------------------------------------------------------------\\n\\n";
-                        alertString2 += _alertString;
-                        alert(alertString2);
-                }
-        }
-        </SCRIPT>
-
-        <form action="<!-- TMPL_VAR NAME=script_name -->" name="Aform" method="post">
-        <input type="hidden" name="op" value="add_validate" />
-
-<div class="data">	<table>
-	<caption><!-- TMPL_IF NAME=searchfield -->
-		Modify currency
-	<!-- TMPL_ELSE -->
-		Add currency
-	<!-- /TMPL_IF --></caption>
-	<!-- TMPL_IF NAME="searchfield" -->
-		<tr>
-			<th>Currency</th>
-			<td>
-				<input type="hidden" name="currency" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
-			</td>
-		</tr>
-	<!-- TMPL_ELSE -->
-		<tr>
-			<th>Currency</th>
-			<td>
-				<input type="text" name="currency" size="50" maxlength="50" onblur="toUC(this);" />
-			</td>
-		</tr>
-	<!-- /TMPL_IF -->
-
-        	<tr>
-			<th>Rate</th	>
-			<td>
-				<input type="text" name="rate" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="rate" -->" />
-			</td>
-		</tr>
-        </table></div>
-		
-		<input type="button" value="Update" onClick="Check(this.form)" class="submit" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" />
-        </form>
-
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="add_validate" -->
-<h3>Data Recorded</h3>
-<div class="form"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="OK" class="submit" />
-        </form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirm" -->
-<div class="table details">	<table><caption>Confirm Deletion of Currency <em><!-- TMPL_VAR NAME="searchfield" --></em></caption>
-
-		<tr>
-			<th>Currency</th>
-			<td><!-- TMPL_VAR NAME="searchfield" --></td>
-		</tr>
-
-
-        
-        	<tr>
-			<th>Rate</th>
-			<td><!-- TMPL_VAR NAME="rate" --></td>
-		</tr>
-		</table></div>
-		<!-- TMPL_IF NAME="totalgtzero" -->
-
-				<span class="alert">This currency is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</span>
-				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-					<input type="submit" value="OK" class="submit" />
-				</form>
-		<!-- TMPL_ELSE -->
-<div class="tabitem">     	<form action="<!-- TMPL_VAR NAME=script_name -->" method="post">
-			<input type="hidden" name="op" value="delete_confirmed" />
-			<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-				<input type="submit" value="Delete this Currency" class="cancel" />
-				</form>
-				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-					<input type="submit" value="Do Not Delete" class="submit" />
-				</form></div>
-		<!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirmed" -->
-<h3>Currency Deleted</h3>
-<div class="form"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="submit" value="OK" class="submit" />
-	</form></div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="else" -->
-
-<h2>Currencies Management</h2>
-	<!-- TMPL_IF NAME="searchfield" -->
-		You searched for <span class="ex"><!-- TMPL_VAR NAME="searchfield" --></span>
-	<!-- /TMPL_IF -->	
-        <form action="<!-- TMPL_VAR NAME=script_name -->" method="post">
-                <input type="text" name="description" value="<!-- TMPL_VAR NAME=searchfield -->" />
-                <input type="submit" name="Search" value="Search" class="submit" />
-        </form>	
-	<div class="table"><table>
-		<tr>
-			<th>Currency</th>
-			<th>Rate</th>
-			<th colspan="2">&nbsp;</th>
-		</tr>
-		<!-- TMPL_LOOP NAME="loop" -->
-		<tr>
-			<td><!-- TMPL_VAR NAME="currency" --></td>
-			<td><!-- TMPL_VAR NAME="rate" --></td>
-			<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="currency" -->" /><input type="submit" class="submit" value="Edit" /></form></td>
-                        <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="currency" -->" /><input type="submit" value="Delete" class="delete" /></form></td>
-		</tr>
-		<!-- /TMPL_LOOP -->
-	</table></div>
-<form action="<!-- TMPL_VAR NAME=script_name -->" method="post">
-        <input type="hidden" name="op" value="add_form" /><input type="submit" class="submit" value="Add Currency" />
-        </form>
-
-	
-	<!-- TMPL_IF NAME="offsetgtzero" -->
-		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
-	<!-- /TMPL_IF -->
-
-
-	<!-- TMPL_IF NAME="ltcount" -->
-		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>	
-	<!-- /TMPL_iF -->
-
-<!-- /TMPL_IF --></div>
-
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/holdings_subfields_structure.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/holdings_subfields_structure.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/holdings_subfields_structure.tmpl
--- htdocs/intranet-tmpl/default/en/admin/holdings_subfields_structure.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,134 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
-<!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="modify" -->Modify system preference '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add a system preference<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="add_validate" -->Data Added<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Parameter '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" -->Parameter Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Preferences<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<!-- TMPL_IF NAME="add_form" -->
-
-	<h1><!-- TMPL_IF NAME="use-heading-flags-p" -->
-	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints<!-- /TMPL_IF -->
-	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></h1>
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-	<input type="hidden" name="op" value="add_validate" />
-	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-	<!-- TMPL_LOOP NAME="loop" -->
-	<div class="data <!-- TMPL_VAR NAME="toggle" -->"><h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
-	<table>
-	<caption>MARC constraints</caption>
-	<tr><th><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable:</label></th><td><!-- TMPL_VAR NAME="repeatable" --></td></tr>
-	<tr><th><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory:</label></th><td><!-- TMPL_VAR NAME="mandatory" --> </td></tr>
-	<tr><th><label for="seealso<!-- TMPL_VAR NAME="row" -->">Search also:</label></th><td><input type="text" id="seealso<!-- TMPL_VAR NAME="row" -->" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" /> (example for 200a: '200c','200d','200e'...)</td></tr>
-			</table>
-	<table>
-	<caption>Editor constaints</caption>
-	<tr><th><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for librarian:</label></th><td><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></td></tr>
-	<tr><th><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC:</label></th><td><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></td></tr>
-	<tr><th><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab:</label></th><td><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</td></tr>
-
-	<tr><th><label for="hidden<!-- TMPL_VAR NAME="row" -->">Hidden:</label></th><td> Opac:<!-- TMPL_VAR name="ohidden" -->  Intranet:<!-- TMPL_VAR name="ihidden" --> Editor:<!-- TMPL_VAR name="ehidden" --> (see online help)</td></tr>
-
-	<tr><th><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL: </label></th><td><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is an URL and can be clicked</td></tr>
-<tr><th><label>Default Options: <p>(choose one)</p></label></th><td>
-<ul>
-	<li>Authorized Value: <!-- TMPL_VAR NAME="authorised_value" --></li>
-	<li>Thesaurus: <!-- TMPL_VAR NAME="authtypes" --></li>
-	<li>Plugin: <!-- TMPL_VAR NAME="value_builder" --></li>
-	<li>Link: <input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5" /> (exemple:200b)</li>
-</ul>
-</td></tr>	 
-		</table>
-		</div>
-	<!-- /TMPL_LOOP -->
-	<input type="submit" class="submit" value="Save Changes" />
-	<p>Note: in the last column, you can choose:
-	<ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
-	<li>A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table.</li>
-	<li>A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.</li>
-	</ul>
-	</p>
-	</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirm" -->
-
-<div class="data"><table>
-<caption>Confirm Deletion of Subfield <span class="ex"><!-- TMPL_VAR NAME="tagsubfield" -->?</span></caption>
-	<tr>
-		<th>Subfield</th>
-		<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
-	</tr>
-	<tr><th>Description</th><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
-</table></div>
-			<form class="inline" action="<!-- TMPL_VAR NAME="delete_link" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" />
-				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-				<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" /><input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" class="cancel" value="Yes, Delete this Subfield" />
-			</form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">	<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />	<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />	<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />	<input type="submit" class="submit" value="No, Do Not Delete" />
-			</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirmed" -->
-
-	Data deleted
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
-	<input type="submit" class="submit" value="OK" />
-	</form>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF NAME="else" -->
-<h1>Holdings MARC subfield structure admin for <!-- TMPL_VAR NAME="tagfield" --> (framework <!--TMPL_VAR NAME="frameworkcode" -->)</h1>
-<p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>
-
-<table>
-<tr>
-	<th>Subfield</th>
-	<th>Text</th>
-	<th>Constraints</th>
-	<th>Delete</th>
-<!-- TMPL_LOOP NAME="loop" -->
-<!-- TMPL_IF NAME="toggle" --><tr class="highlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
-	<td>
-		<!-- TMPL_IF NAME="subfield_ignored" -->
-			<i><!-- TMPL_VAR NAME="liblibrarian" --></i>
-		<!-- TMPL_ELSE -->
-			<!-- TMPL_VAR NAME="liblibrarian" -->
-		<!-- /TMPL_IF -->
-	</td>
-	<td>
-		<!-- TMPL_IF NAME="subfield_ignored" -->
-			<i>subfield ignored</i>
-		<!-- TMPL_ELSE -->
-			<strong>Tab:</strong><!-- TMPL_VAR NAME="tab" -->,
-			<!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="seealso" --> | <strong>See Also:</strong> <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="authorised_value" --> | <strong>Auth value:</strong><!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="authtypecode" --> | <strong>Authority:</strong><!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="value_builder" --> | <strong>Plugin:</strong><!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="link" --> | <strong>Link:</strong><!-- TMPL_VAR NAME="link" -->,<!-- /TMPL_IF -->
-		<!-- /TMPL_IF -->
-	</td>
-	<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
-</tr>
-<!-- /TMPL_LOOP -->
-</table>
-<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="edit_tagfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="edit_frameworkcode" -->" /><input type="submit" class="submit" value="Edit Subfields" /></form> <form class="inline" action="holdingstagstructure.pl" method="get"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="tagfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" class="submit" value="Return to Marc Structure" /></form>
-<!-- TMPL_IF NAME="previous" -->
-	<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0" >
-	</a><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="next" -->
-	<!-- TMPL_VAR NAME="next" -->
-		<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0" />
-	</a>
-<!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/holdingstagstructure.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/holdingstagstructure.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/holdingstagstructure.tmpl
--- htdocs/intranet-tmpl/default/en/admin/holdingstagstructure.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,208 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
-<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Tag '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->MARC tag Structure<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1>Holdings MARC tag structure admin for <!-- TMPL_IF NAME="frameworkcode" --><!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)<!-- TMPL_ELSE -->default MARC framework<!-- /TMPL_IF --></h1>
-<script language="javascript" type="text/javascript">
-	function _(s) { return s } // dummy function for gettext
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function isNotNull(f,noalert) {
-		if (f.value.length ==0) {
-   return false;
-		}
-		return true;
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function toUC(f) {
-		var x=f.value.toUpperCase();
-		f.value=x;
-		return true;
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function isNum(v,maybenull) {
-	var n = new Number(v.value);
-	if (isNaN(n)) {
-		return false;
-		}
-	if (maybenull==0 && v.value=='') {
-		return false;
-	}
-	return true;
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function isDate(f) {
-		var t = Date.parse(f.value);
-		if (isNaN(t)) {
-			return false;
-		}
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function Check(f) {
-		var ok=1;
-		var _alertString="";
-		var alertString2;
-		if (f.tagfield.value.length==0) {
-			_alertString += "\n- " + _("tag number missing");
-		}
-		if (_alertString.length==0) {
-			document.Aform.submit();
-		} else {
-			alertString2  = _("Form not submitted because of the following problem(s)");
-			alertString2 += "\n------------------------------------------------------------------------------------\n";
-			alertString2 += _alertString;
-			alert(alertString2);
-		}
-	}
-	</script>
-
-<!-- TMPL_IF NAME="add_form" -->
-<!-- ------------------------------------------------------------------------ -->
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-		<input type="hidden" name="op" value="add_validate" />
-		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-	<div class="data"><table>
-		<caption><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF --><!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></caption>
-	<tr><th><label>Tag<label></th><td><!-- TMPL_VAR NAME="searchfield" --></td></tr>
-	<tr><th><label for="liblibrarian">Tag Label in Intranet</label></th><td><input type="text" id="liblibrarian" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
-	<tr><th><label for="libopac">Tag Label in OPAC</label></th><td><input type="text" id="libopac" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100" /></td></tr>
-	<tr><th><label for="repeatable">Repeatable</label></th><td><!-- TMPL_VAR NAME="repeatable" --></td></tr>
-	<tr><th><label for="mandatory">Mandatory</label></th><td><!-- TMPL_VAR NAME="mandatory" --></td></tr>
-	<tr><th><label for="authorised_value">Authorized value</label></th><td><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</td></tr>
-	</table></div>
-		<p><input type="submit" value="Save Changes" class="submit" onclick="Check(this.form)" /></p>
-	<p><input type="submit" value="Cancel and Return to MARC Tag Structure" class="cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->'; return false;" /></p>
-	</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirm" -->
-<!-- ------------------------------------------------------------------------ -->
-<div class="data"><table>
-<caption>Confirm Deletion of Tag <em><!-- TMPL_VAR NAME="searchfield" --></em>?</caption>
-	<tr><th>Tag: </th><td><!-- TMPL_VAR NAME="searchfield" --></td></tr>
-	<tr><th>Description: </th><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
-	</table></div>
-	<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />	<input type="submit" class="cancel" value="Yes, Delete this Tag" /></form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" class="submit" value="No, Do Not Delete" /></form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirmed" -->
-<!-- ------------------------------------------------------------------------ -->
-	<div class="details"><h3>Tag Deleted</h3>
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-	<input type="submit" class="submit" value="Return to MARC Tag Structure" />
-	</form></div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="framework_create" -->
-<!-- ------------------------------------------------------------------------ -->
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="hidden" name="op" value="framework_create_confirm" />
-		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-		Create framework for <!-- TMPL_VAR NAME="frameworkcode" --> (<!-- TMPL_VAR NAME="frameworktext" -->) using
-		<select name="existingframeworkcode">
-			<option value="">Default</option>
-		<!-- TMPL_LOOP NAME="existingframeworkloop" -->
-			<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
-		<!-- /TMPL_LOOP -->
-		</select>
-		<input type="submit" value="OK" class="submit" />
-	</form>
-<!-- /TMPL_IF -->
-<!-- ------------------------------------------------------------------------ -->
-<!-- TMPL_IF NAME="else" -->
-	<form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><label for="frameworkcode">Select a framework: </label>
-		<select name="frameworkcode" id="frameworkcode">
-			<option value="">Default</option>
-		<!-- TMPL_LOOP NAME="frameworkloop" -->
-			<!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="value" -->"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="frameworktext" --></option>
-		<!-- /TMPL_LOOP -->
-		</select>
-		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" size="5" />
-		<input type="submit" value="Tag Search" class="submit" />
-		<p><!-- TMPL_IF Name="select_display"-->
-				<label for="onlyused">Display only used Tags/Subfields</label><input type="checkbox" name="select_display" id="onlyused" value="True" checked="checked" onchange="document.f.submit()" />
-			<!-- TMPL_ELSE -->
-				<label for="onlyused">Display only used Tags/Subfields</label><input type="checkbox" name="select_display"  id="onlyused" value="True" onchange="document.f.submit()" />
-			<!--/TMPL_IF --> 
-		</p>
-	</form>
-	<div class="help">NOTE : Framework consists of 2 parts biblio & holdings. This is for HOLDINGS definition.</div>
-
-	<div class="data">
-	<table>
-		<tr>
-			<th scope="col">Tag</th>
-			<th scope="col">Label</th>
-			<th scope="col">Repeatable</th>
-			<th scope="col">Mandatory</th>
-			<th scope="col">Authorized value</th>
-			<th scope="col">Subfields</th>
-			<th scope="col">&nbsp;</th>
-		</tr>
-	<!-- TMPL_IF NAME="select_display" -->
-		<!-- TMPL_LOOP NAME="loop" -->
-		<tr class="highlight">
-			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
-			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
-			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
-			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->">Edit Subfields</a></td>
-			<td><a class="edit" href="<!-- TMPL_VAR NAME="edit" -->">Edit Tag</a> <a class="delete" href="<!-- TMPL_VAR NAME="delete" -->">Delete Tag</a></td>
-		</tr>
-		<tr>
-			<td>
-				&nbsp;
-			</td>
-			<td colspan="6">
-				<ul>
-				<!-- TMPL_LOOP NAME="subfields" -->
-					<li>Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
-							<!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
-					</li>
-				<!-- /TMPL_LOOP -->
-				</ul>
-			</td>
-		</tr>
-		<!-- /TMPL_LOOP -->
-	<!-- TMPL_ELSE -->
-		<!-- TMPL_LOOP NAME="loop" -->
-		<!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
-			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
-			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
-			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->">View Subfields</a></td>
-			<td><a class="edit" href="<!-- TMPL_VAR NAME="edit" -->">Edit Tag</a> <a class="delete" href="<!-- TMPL_VAR NAME="delete" -->">Delete Tag</a></td>
-		</tr>
-		<!-- /TMPL_LOOP -->
-	<!--/TMPL_IF -->
-	</table>
-	<div class="tabitem">
-		<!-- TMPL_IF NAME="isprevpage" -->
-		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
-		<input type="hidden" value="<!-- TMPL_VAR NAME="prevpage" -->" name="offset" /><input type="hidden" value="<!-- TMPL_VAR NAME="searchfield" -->" name="searchfield" /><input type="hidden" value="<!-- TMPL_VAR NAME="frameworkcode" -->" name="frameworkcode" /><!--TMPL_IF Name="select_display"--><input type="hidden" value="select_display" name="True" /><!--/TMPL_IF --><input type="submit" value="&lt;&lt; Previous Page" class="submit" /></form>
-		<!-- /TMPL_IF -->	
-		
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="hidden" name="op" value="add_form" />
-	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-		<input type="submit" value="Add New MARC Tag" class="submit" /></form>
-		
-		<!-- TMPL_IF NAME="nextpage" -->
-		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextpage" -->" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><!--TMPL_IF Name="select_display"--><input type="hidden" name="select_display" value="True" /><!--/TMPL_IF --><input type="submit" class="submit" value="Next Page &gt;&gt;" /></form>
-		<!-- /TMPL_IF -->
-</div>
-</div>
-<!-- /TMPL_IF -->
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/institutions-careers.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/institutions-careers.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/institutions-careers.tmpl
--- htdocs/intranet-tmpl/default/en/admin/institutions-careers.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,126 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<script language="JavaScript" type="text/javascript">
-
-function confirm_delete_career(id_career) {
-	if (confirm('Are you sure you want to delete the selected career/curse?')) {
-	
-		document.location.href = "/cgi-bin/koha/admin/admin-careers.pl?op=del&id_career=" + id_career;
-	}
-	
-}
-
-function confirm_delete(id_institution) {
-	if (confirm('Are you sure you want to delete the selected educational institution?')) {
-
-		document.location.href = "/cgi-bin/koha/admin/institutions-careers.pl?op=del&id_institution=" + id_institution;
-	}
-
-}
-
-more = 0;
-less = 0;
-
-	function preloadImages() {
-		more = new Image();
-		more.src = "<!-- TMPL_VAR NAME="themelang" -->/images/more.gif";
-		less = new Image();
-		less.src = "<!-- TMPL_VAR NAME="themelang" -->/images/less.gif";
-	}
-
-	function show(element, img) {
-	    var block = document.getElementById(element);
-		if (block.style.display == 'none') {
-		    block.style.display = 'inline';
-		    img.src = less.src;
-		} else {
-			block.style.display = 'none';
-			img.src = more.src;
-		}
-	}
-	
-	preloadImages();
-
-</script>
-
-<div id="main">
-	<h1>Educational institutions (Courses)</h1>
-	
-	<!-- TMPL_IF NAME="add_form" -->
-	
-	    <form action="/cgi-bin/koha/admin/institutions-careers.pl">
-	        <input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->">
-	        <input type="hidden" name="id_institution" value="<!-- TMPL_VAR NAME="id_institution" -->">
-			Educational institution name:&nbsp;&nbsp;
-			<input size="50" type="text" name="institution_name" value="<!-- TMPL_VAR NAME="institution_name" -->"
-	        <br><br>
-	        <input type="submit" class="button" value="Save">
-	        <input type="button" class="button" value="Cancel" onclick="document.location.href='/cgi-bin/koha/admin/institutions-careers.pl'">
-	    </form>
-	
-	
-	<!-- TMPL_ELSE -->
-	
-	<table border="0" cellspacing="0" cellpadding="3">
-
-		<!-- TMPL_LOOP NAME="institutions" -->
-			<tr>
-			    <td class="hilighted" width="5%">
-					<a href="/cgi-bin/koha/admin/institutions-careers.pl?op=add_form&id_institution=<!-- TMPL_VAR NAME="id_institution" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" border="0"></a>
-				</td>
-				<td class="hilighted" width="5%">
-					<a href="javascript:confirm_delete(<!-- TMPL_VAR NAME="id_institution" -->)" ><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" border="0"></a>
-				</td>
-				<td align="center" class="hilighted"><b><!-- TMPL_VAR NAME="institution_name" --></b></td>
-				<td class="hilighted" align="center" width="15%">
-				    <a class="button" id="small" href="/cgi-bin/koha/admin/admin-careers.pl?op=add_form&id_institution=<!-- TMPL_VAR NAME="id_institution" -->">Add course</a>
-				</td>
-			</tr>
-			
-			<tr>
-			    <td colspan="3" style="font-size:13px">
-			        <img style="cursor:hand" class="relative" onclick="show('<!-- TMPL_VAR NAME="id_institution" -->', this)" src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif"> Courses
-			    </td>
-			    <td colspan="1">
-			    </td>
-			</tr>
-			
-			<tr>
-			    <td colspan="4">
-			        <table  id="<!-- TMPL_VAR NAME="id_institution" -->" style="border-spacing:5px;border-collapse:separate;border:0;display:none">
-						<tr>
-							<td colspan="3">
-								<hr>
-							</td>
-						</tr>
-			        <!-- TMPL_LOOP NAME="careers" -->
-			            <tr>
-			                <td>
-			                    <!-- TMPL_VAR NAME="career_name" -->
-			                </td>
-			                <td width="5%">
-                                <a class="button" id="small" href="/cgi-bin/koha/admin/admin-careers.pl?op=add_form&id_career=<!-- TMPL_VAR NAME="id_career" -->&id_institution=<!-- TMPL_VAR NAME="id_institution" -->">Edit</a>
-			                </td>
-			                <td width="5%">
-                                <input class="button" id="small" type="button" onclick="confirm_delete_career(<!-- TMPL_VAR NAME="id_career" -->)" value="Delete">
-			                </td>
-						</tr>
-						<tr>
-			                <td colspan="3">
-								<hr>
-							</td>
-			            </tr>
-			        <!-- /TMPL_LOOP -->
-			        </table>
-			    </td>
-			</tr>
-		<!-- /TMPL_LOOP -->
-	</table>
-	<br>
-    <a class="button" href="/cgi-bin/koha/admin/institutions-careers.pl?op=add_form">Add educational institution</a>
-
-	<!-- /TMPL_IF -->
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/issuingrules.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/issuingrules.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/issuingrules.tmpl
--- htdocs/intranet-tmpl/default/en/admin/issuingrules.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,62 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: Issuing Rules<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-	<h1>Defining <!-- TMPL_IF NAME="branch" -->issuing rules for <!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->default issuing rules<!-- /TMPL_IF --></h1>
-	<div class="help">
-		<h3>HINT for issues</h3>
-		<p>Each box needs to be filled in with issuelength,maxissues</p>
-		<p>eq <span class="ex">21,5</span> enables 5 issues for 21 days</p>
-		</div>
-	<div class="help">
-		<h3>HINT for fines</h3>
-		<p>Each box needs to be filled in with fine,time to start charging,charging cycle</p>
-		<p>eg <span class="ex">1,7,7</span> = 1 [USD,EUR,etc] fine after 7 days, every 7 days</p>
-		<p>Fines are calculated by the fines2.pl script, located in misc directory.  Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night</p>
-	</div>
-	<div class="help">
-		<h3>Default values</h3>
-		<p> If a cell is not filled, the 1st of the following value is searched :</p>
-		<ul>
-			<li>same branch and same borrower category, itemtype *</li>
-			<li>same branch and same itemtype, borrower category *</li>
-			<li>same itemtype and borrower category, branch *</li>
-			<li>everywhere</li>
-			<li>If nothing is set, default is 21,5 (hardcoded)</li>
-		</ul>
-	</div>
-		<form method="post" name="branch" action="/cgi-bin/koha/admin/issuingrules.pl">
-		<label for="branch">Select a branch :</label>
-			<select id="branch" name="branch" onchange="javascript:document.branch.submit();">
-				<option value="">Default</option>
-			<!-- TMPL_LOOP NAME="branchloop" -->
-				<option value="<!-- TMPL_VAR NAME="value" -->"<!-- TMPL_IF NAME="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchname" --></option><!-- /TMPL_LOOP --></select>
-			<input type="submit" value="Select" class="submit" />
-		</form>
-		<form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
-			<input type="hidden" name="op" value="save" />
-			<div class="data">
-			<table>
-			<caption>Defining issuing rules for <!-- TMPL_VAR NAME="branch" --></caption>
-			<tr>
-				<th>&nbsp;</th><!-- TMPL_LOOP NAME="title" --><th scope="col"><!-- TMPL_VAR NAME="in_title" --><br/>Issue / fine</th><!-- /TMPL_LOOP -->
-			</tr>
-			<!-- TMPL_LOOP NAME="row" -->
-				<tr>
-					<th><!-- TMPL_VAR NAME="categorycode" --></th>
-					<!-- TMPL_LOOP NAME="cell" -->
-						<td<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
-							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10" /> /
-							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10" />
-						</td>
-					<!-- /TMPL_LOOP -->
-				</tr>
-			<!-- /TMPL_LOOP -->
-			</table>
-			</div>
-			<input type="submit" value="Save Changes" class="submit" />
-		</form>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/itemtypes.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/itemtypes.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/itemtypes.tmpl
--- htdocs/intranet-tmpl/default/en/admin/itemtypes.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,172 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
-<!-- TMPL_IF name="add_form" --><!-- TMPL_IF name="itemtype" -->Modify item type '<!-- TMPL_VAR name="itemtype" -->'<!-- TMPL_ELSE -->Add item type<!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" --><!-- TMPL_IF name="total" -->Cannot Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'<!-- TMPL_ELSE -->Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'?<!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->Item Types Administration<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<!-- TMPL_IF name="add_form" -->
-
-	<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
-		<input type="hidden" name="op" value="add_validate" />
-		<input type="hidden" name="checked" value="0" />
-		<div class="data">
-		<table>
-		<caption><!-- TMPL_IF name="itemtype" -->
-		Modify item type
-	<!-- TMPL_ELSE -->
-		Add item type
-	<!-- /TMPL_IF --></caption>
-			<!-- TMPL_IF name="itemtype" -->
-				<tr><th><label for="">Item type</label></th><td><input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" -->" /><!-- TMPL_VAR name="itemtype" --></td></tr>
-			<!-- TMPL_ELSE -->
-				<tr><th><label for="">Item type</label></th><td><input type="text" name="itemtype" size="6" maxlength="4" onblur="toUC(this)" /></td></tr>
-			<!-- /TMPL_IF -->
-			<tr>
-				<th><label for="description">Description</label></th>
-				<td><input type="text" id="description" name="description" size="48" maxlength="80" value="<!-- TMPL_VAR name="description" escape="HTML" -->" />&nbsp;</td>
-			</tr>
-			<tr>
-				<th><label for="notforloan">Not for loan</label></th>
-				<td><input type="checkbox" id="notforloan" name="notforloan"<!-- TMPL_IF name="notforloan" --> checked="checked"<!-- /TMPL_IF --> value="1"> (if checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item)</td>
-			</tr>
-			<tr>
-			<tr>
-				<th><label for="renewalsallowed">Renewals</label></th>
-				<td><input type="text" id="renewalsallowed" name="renewalsallowed" size="3" maxlength="3" value="<!-- TMPL_IF name="renewalsallowed" --><!-- TMPL_VAR NAME="renewalsallowed" --><!-- /TMPL_IF -->" value="1" /><!-- Display for NPL //<input type="hidden" name="rentalcharge" value="0" /> //Display for NPL --></td>
-			</tr>
-<!-- Hide from NPL--> 			<tr>
-				<th><label for="rentalcharge">Rental charge</label></th>
-				<td><input type="text" id="rentalcharge" name="rentalcharge" size="10" value="<!-- TMPL_VAR name="rentalcharge" -->" /></td>
-			</tr><!--  /Hide from NPL -->
-		</table><input type="button" value="Save Changes" onclick="Check(this.form)" class="submit" /> <input type="button" class="cancel" value="Cancel" onclick="history.back();" />
-	</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="delete_confirm" -->
-<!-- TMPL_IF name="total" --><div class="error">This record is used <!-- TMPL_VAR name="total" --> times. Deletion is not possible.</div><!-- /TMPL_IF -->
-<div class="table details">	<table>
-	<caption><!-- TMPL_IF name="total" -->Cannot Delete Item Type<!-- TMPL_ELSE -->Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'?<!-- /TMPL_IF --></caption>
-		<tr>
-			<th>Item type</th>
-			<td><!-- TMPL_VAR name="itemtype" --></td>
-		</tr>
-
-	<tr><th>Description</th><td><!-- TMPL_VAR name="description" --></td></tr>
-	<tr><th>Loan length</th><td><!-- TMPL_VAR name="loanlength" --></td></tr>
-	<tr><th>Renewals</th><td><!-- TMPL_IF name="renewalsallowed" -->Allowed<!-- TMPL_ELSE -->Not allowed<!-- /TMPL_IF --></td></tr>
-<!-- Hide from NPL  --><tr><th>Rental charge</th><td><!-- TMPL_VAR name="rentalcharge" --></td></tr><!-- Hide from NPL --></table></div>
-		<div class="tabitem"><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-		<input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" -->" /><!-- TMPL_IF name="total" -->
-		</form><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="OK" class="submit" /></form>
-	<!-- TMPL_ELSE -->
-		<input type="submit" value="Delete this Item Type" class="cancel" /></form> <form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="Do Not Delete" class="submit" /></form>
-	<!-- /TMPL_IF --></div>
-
-	
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="else" -->
-<table>
-<caption>Item Types Administration</caption>
-	<tr>
-		<th>Code</th>
-		<th>Description</th>
-		<th>Not for Loan</th>
-		<th>Renewable</th>
-		<th>Charge</th>
-		<th>Edit</th>
-		<th>Delete</th>
-	</tr>
-	<!-- TMPL_LOOP name="loop" -->
-		<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
-			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;itemtype=<!-- TMPL_VAR name="itemtype" escape="HTML" -->"><!-- TMPL_VAR name="itemtype" --></a></td>
-			<td><!-- TMPL_VAR name="description" --></td>
-			<td><!-- TMPL_IF NAME="notforloan" -->Yes<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
-			<td><!-- TMPL_IF NAME="renewalsallowed" -->
-						<!-- TMPL_VAR name="renewalsallowed" --> time(s)
-					<!-- TMPL_ELSE -->
-						No
-					<!-- /TMPL_IF -->
-			</td>
-		<td><!-- TMPL_UNLESS name="notforloan" --><!-- TMPL_VAR NAME="rentalcharge" --><!-- /TMPL_UNLESS --></td>
-			<td><form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" escape="HTML" -->" /><input type="submit" value="Edit" class="submit" /></form></td>
-			<td><form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" escape="HTML" -->" /><input type="submit" class="delete" value="Delete" /></form></td>
-		</tr>
-	<!-- /TMPL_LOOP -->
-</table>
-
-<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-<p><input type="hidden" name="op" value="add_form" />
-
-<!-- TMPL_IF name="previous" --><input type="button" class="submit" onclick="location.href='<!-- TMPL_VAR name="previous" -->'; return false;" value="&lt;&lt; Previous Page" /><!-- /TMPL_IF -->
-
-<input type="submit" value="Add Item Type" class="submit" />
-
-<!-- TMPL_IF name="next" --><input type="button" class="submit" onclick="location.href='<!-- TMPL_VAR name="next" -->'; return false;" value="Next Page &gt;&gt;" /><!-- /TMPL_IF -->
-</p></form>
-<!-- /TMPL_IF -->
-
-</div>
-<script language="javascript" type="text/javascript">
-function _(s) { return s } // dummy function for gettext
-
-function isNotNull(f,noalert) {
-	if (f.value.length ==0) {
-		return false;
-	}
-	return true;
-}
-
-function toUC(f) {
-	var x=f.value.toUpperCase();
-	f.value=x;
-	return true;
-}
-
-function isNum(v,maybenull) {
-var n = new Number(v.value);
-if (isNaN(n)) {
-	return false;
-	}
-if (maybenull==0 && v.value=='') {
-	return false;
-}
-return true;
-}
-
-function isDate(f) {
-	var t = Date.parse(f.value);
-	if (isNaN(t)) {
-		return false;
-	}
-}
-
-function Check(f) {
-	var ok=1;
-	var _alertString="";
-	var alertString2;
-	if (f.itemtype.value.length==0) {
-		_alertString += "\n- " + _("Itemtype missing");
-	}
-	if (!(isNotNull(window.document.Aform.description,1))) {
-		_alertString += "\n- " + _("Description missing");
-	}
-	if ((!isNum(f.rentalcharge,0)) && f.rentalcharge.value.length > 0) {
-		_alertString += "\n- " + _("Rental charge is not a number");
-	}
-	if (_alertString.length==0) {
-		document.Aform.submit();
-	} else {
-		alertString2  = _("Form not submitted because of the following problem(s)");
-		alertString2 += "\n------------------------------------------------------------------------------------\n";
-		alertString2 += _alertString;
-		alert(alertString2);
-	}
-}
-</script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/koha-electronic.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/koha-electronic.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/koha-electronic.tmpl
--- htdocs/intranet-tmpl/default/en/admin/koha-electronic.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,113 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
-<div id="main">
-	<h1> OPAC Online Databases</h1>
-	<!-- TMPL_IF name="add_form" -->
-
-		<form name="add_form" method="post" action="/cgi-bin/koha/admin/koha-electronic.pl" >
-			<input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->">
-			<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->">
-			<table style="border:0" cellspacing="0" cellpadding="2">
-			    <tr>
-			        <td>Language
-			       
-						<select name="lang">
-			    			<option value="tr" <!-- TMPL_IF name="tr" -->selected<!-- /TMPL_IF --> > Türkçe</option>
-			    			<option value="en" <!-- TMPL_IF name="en" -->selected<!-- /TMPL_IF -->>English</option>
-						</select>
-					</td><td></td>
-					<td>Section
-						<select name="section">
-						<option value="affiliated" <!-- TMPL_IF name="affiliated" -->selected<!-- /TMPL_IF --> >Affiliated</option>
-			    			<option value="trial" <!-- TMPL_IF name="trial" -->selected<!-- /TMPL_IF --> >Trial</option>
-			    			<option value="economy" <!-- TMPL_IF name="economy" -->selected<!-- /TMPL_IF --> >Economy & Politics</option>
-			    			<option value="social" <!-- TMPL_IF name="social" -->selected<!-- /TMPL_IF -->>Social Sciences</option>
-						<option value="computer" <!-- TMPL_IF name="computer" -->selected<!-- /TMPL_IF --> >Computer Sciences</option>
-			    			<option value="health" <!-- TMPL_IF name="health" -->selected<!-- /TMPL_IF -->>Health & Medicine</option>
-						<option value="general" <!-- TMPL_IF name="general" -->selected<!-- /TMPL_IF --> > Interdiciplinary</option>
-			    			<option value="maths" <!-- TMPL_IF name="maths" -->selected<!-- /TMPL_IF -->>Maths,Physics,Chemistry</option>
-						<option value="other" <!-- TMPL_IF name="other" -->selected<!-- /TMPL_IF --> > Other Subjects</option>
-			    			</select>
-					</td>
-			    </tr>
-				<tr>
-					<td>Title:
-					<input size="30" type="text" name="title" value="<!-- TMPL_VAR NAME="title" -->"></td>
-					<td>URL:
-					<input size="30" type="text" name="href" value="<!-- TMPL_VAR NAME="href" -->"></td>
-					<td>Resim:
-					<input size="20" type="text" name="image" value="<!-- TMPL_VAR NAME="image" -->"></td>
-				</tr>
-				<tr>
-					<td>Text</td>
-					<td><textarea name="edata" cols="35" rows="4"><!-- TMPL_VAR NAME="edata" --></textarea></td>
-				</tr>
-				<tr>
-					<td  colspan="2">
-						<input class="button" type="submit" value="Save">
-						<input class="button" type="button" value="Cancel" onclick="window.location.href='/cgi-bin/koha/admin/koha-electronic.pl'">
-					</td>
-				</tr>
-			</table>
-		</form>
-
-
-	<!-- TMPL_ELSE -->
-
-		<!-- TMPL_IF NAME="opac_electronic_count" -->
-
-            <form name="add_form" method="post" action="/cgi-bin/koha/admin/koha-electronic.pl" >
-			Language:
-			<select name="lang">
-			    <option value="">All</option>
-			    <option value="tr" <!-- TMPL_IF name="tr" -->selected<!-- /TMPL_IF --> >Türkçe</option>
-			    <option value="en" <!-- TMPL_IF name="en" -->selected<!-- /TMPL_IF -->>English</option>
-			</select>
-			<input type="submit" class="button" value="Filter">
-			</form>
-
-			<form name="del_form" method="post" action="/cgi-bin/koha/admin/koha-electronic.pl" onsubmit="return confirm("Are you sure you want to delete the selected database?')">
-				<table border="0" cellspacing="0" cellpadding="3">
-					<tr bgcolor="#99cc33">
-						<th></td>
-						<th style="padding-left:3px;padding-right:3px">Language</th>
-						<th>image</th>
-						<th>URL</th>
-						<th  width="20%">Title</th>
-						<th>Text</th>
-						<th></th>
-					</tr>
-
-					<!-- TMPL_LOOP NAME="opac_electronic" -->
-						<tr>
-							<td width="5%"><input type="checkbox" name="ids" value="<!-- TMPL_VAR NAME="idelectronic" -->"</td>
-							<td align="center"><!-- TMPL_VAR NAME="lang" --></td>
-							<td><!-- TMPL_VAR NAME="image" --></td>
-							<td><!-- TMPL_VAR NAME="href" --></td>
-							<td align="center"><!-- TMPL_VAR NAME="title" --></td>
-							<td><!-- TMPL_VAR NAME="edata" --></td>
-							<td width="5%">
-								<a href="/cgi-bin/koha/admin/koha-electronic.pl?op=add_form&id=<!-- TMPL_VAR NAME="idelectronic" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" border="0"></a>
-							</td>
-						</tr>
-					<!-- /TMPL_LOOP -->
-
-				</table>
-					<input type="hidden" name="op" value="del">
-					<input type="submit" class="button" value="Delete selected">
-			</form>
-		<!-- TMPL_ELSE -->
-			<h5>No databases loaded</h5>
-		<!-- /TMPL_IF -->
-
-		<form name="add_form" method="post" action="/cgi-bin/koha/admin/koha-electronic.pl">
-			<input type="hidden" name="op" value="add_form">
-			<input type="submit" class="button" value="Add OPAC databases">
-		</form>
-	
-	
-	<!-- /TMPL_IF -->
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/koha2marclinks.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/koha2marclinks.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/koha2marclinks.tmpl
--- htdocs/intranet-tmpl/default/en/admin/koha2marclinks.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,141 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
-<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->MARC links <!-- TMPL_VAR name="tagfield" --><!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main"><!-- TMPL_IF name="add_form" -->
-<!-- -->
-<h1><!-- TMPL_VAR name="action" --></h1>
-	<p>Choose and validate 1 of the following for <b><!-- TMPL_VAR name="tablename" -->.<!-- TMPL_VAR name="kohafield" --></b></p><table>
-<tr><td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">	<input type="hidden" name="op" value="add_validate" />
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-			<!-- TMPL_VAR name="marclist0" --><input type="submit" value="OK" class="submit" /></form>
-		</td>
-	</tr>
-	<tr>
-
-		<td>	<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-			<input type="hidden" name="op" value="add_validate" />
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" /><input type="submit" value="OK" class="submit" />
-			<!-- TMPL_VAR name="marclist1" -->	</form>
-		</td>
-	</tr>
-	<tr>
-
-		<td>
-				<form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="hidden" name="op" value="add_validate" />
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-			<!-- TMPL_VAR name="marclist2" --><input type="submit" value="OK" class="submit" /></form>
-		</td>
-	</tr>
-	<tr>
-	
-		<td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-			<input type="hidden" name="op" value="add_validate" />
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-			<!-- TMPL_VAR name="marclist3" --><input type="submit" value="OK" class="submit" />	</form>
-		</td>
-	</tr>
-	<tr>
-	
-		<td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-			<input type="hidden" name="op" value="add_validate" />
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-			<!-- TMPL_VAR name="marclist4" --><input type="submit" value="OK" class="submit" /></form>
-		</td>
-	</tr>
-	<tr>
-
-		<td>	<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-			<input type="hidden" name="op" value="add_validate" />
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-			<!-- TMPL_VAR name="marclist5" --><input type="submit" value="OK" class="submit" /></form>
-		</td>
-	</tr>
-	<tr>
-	
-		<td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-			<input type="hidden" name="op" value="add_validate" />
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-			<!-- TMPL_VAR name="marclist6" --><input type="submit" value="OK" class="submit" /></form>
-		</td>
-	</tr>
-	<tr>
-	
-		<td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-			<input type="hidden" name="op" value="add_validate" />
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-			<!-- TMPL_VAR name="marclist7" --><input type="submit" value="OK" class="submit" /></form>
-		</td>
-	</tr>
-	<tr>
-	
-		<td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-			<input type="hidden" name="op" value="add_validate" />
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-			<!-- TMPL_VAR name="marclist8" --><input type="submit" value="OK" class="submit" /></form>
-		</td>
-	</tr>
-	<tr>
-	
-		<td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-			<input type="hidden" name="op" value="add_validate" />
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-			<!-- TMPL_VAR name="marclist9" --><input type="submit" value="OK" class="submit" /></form>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
-				<input type="hidden" name="op" value="add_validate" />
-				<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
-				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-				<input type="hidden" name="choice" value="" />
-				<input type="submit" value="Click to &quot;Unmap&quot;" class="submit" />
-			</form>
-		</td>
-	</tr>
-	</table>
-<!-- /TMPL_IF -->
-
-<!-- -->
-<!-- TMPL_IF name="else" -->
-
-<h1>MARC links <!-- TMPL_VAR name="tagfield" --></h1>
-<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-<p><!-- TMPL_VAR name="tablename" --> <input type="submit" value="OK" class="submit" /></p>
-</form>
-<table>
-<tr>
-	<th>Koha Field</th>
-	<th>Tag</th>
-	<th>Subfield</th>
-	<th>Lib</th>
-	<th>&nbsp;</th>
-</tr>
-<!-- TMPL_LOOP name="loop" -->
-<tr>
-	<td><a href="<!-- TMPL_VAR name="edit" -->"><!-- TMPL_VAR name="kohafield" --></a></td>
-	<td><!-- TMPL_VAR name="tagfield" --></td>
-	<td><!-- TMPL_VAR name="tagsubfield" --></td>
-	<td><!-- TMPL_VAR name="liblibrarian" --></td>
-	<td><a class="edit" href="<!-- TMPL_VAR name="edit" -->">Edit</a></td>
-</tr>
-<!-- /TMPL_LOOP -->
-</table>
-<!-- /TMPL_IF --></div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/koha_attr.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/koha_attr.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/koha_attr.tmpl
--- htdocs/intranet-tmpl/default/en/admin/koha_attr.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,198 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
-<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of attribute '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
-<!-- TMPL_IF name="else" -->MARC tag Structure<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1>KOHA attr matching for biblios,holdings and authorities XML & MARC records</h1>
-<script language="javascript" type="text/javascript">
-	function _(s) { return s } // dummy function for gettext
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function isNotNull(f,noalert) {
-		if (f.value.length ==0) {
-   return false;
-		}
-		return true;
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function toUC(f) {
-		var x=f.value.toUpperCase();
-		f.value=x;
-		return true;
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function isNum(v,maybenull) {
-	var n = new Number(v.value);
-	if (isNaN(n)) {
-		return false;
-		}
-	if (maybenull==0 && v.value=='') {
-		return false;
-	}
-	return true;
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function isDate(f) {
-		var t = Date.parse(f.value);
-		if (isNaN(t)) {
-			return false;
-		}
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function Check(f) {
-		var ok=1;
-		var _alertString="";
-		var alertString2;
-		if (f.marctokoha.value.length==0) {
-			_alertString += "\n- " + _("field name missing");
-		}
-		if (_alertString.length==0) {
-			document.Aform.submit();
-		} else {
-			alertString2  = _("Form not submitted because of the following problem(s)");
-			alertString2 += "\n------------------------------------------------------------------------------------\n";
-			alertString2 += _alertString;
-			alert(alertString2);
-		}
-	}
-	</script>
-
-<!-- TMPL_IF NAME="add_form" -->
-<!-- ------------------------------------------------------------------------ -->
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-		<input type="hidden" name="op" value="add_validate" />
-		<input type="hidden" name="id" value='<!-- TMPL_VAR NAME="id" -->' />
-	<div class="data"><table>
-		<caption><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF --><!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></caption>
-	<tr><th><label>Kohafield<label></th><td><!-- TMPL_VAR NAME="searchfield" --></td></tr>
-	<tr><th><label for="label">Field description</label></th><td><input type="text" id="label" name="label" value="<!-- TMPL_VAR NAME="label" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
-	<tr><th><label for="attr">Zebra attribute </label></th><td><input type="text" id="attr" name="attr" value="<!-- TMPL_VAR NAME="attr" escape="HTML" -->" size="40" maxlength="80" /></td></tr>
-	<tr><th><label for="taglist">MARC tag for this field</label></th><td><!-- TMPL_VAR NAME="tagfield"  --></td></tr>
-	<tr><th><label for="tagsublist">MARC subfieldcode for this field</label></th><td><!-- TMPL_VAR NAME="tagsubfield"  --></td></tr>
-	<tr><th><label for="sorts">Sorts on this field</label></th><td><!-- TMPL_VAR NAME="sorts" --></td></tr>
-	<tr><th><label for="opacshow">Shows in librarian searches</label></th><td><!-- TMPL_VAR NAME="intrashow" --><label for="opacshow">Shows in opac search</label><!-- TMPL_VAR NAME="opacshow" --></td></tr>
-	<tr><th><label for="serverlist">Record type for this field</label></th><td><!-- TMPL_VAR NAME="recordtype"  --></td></tr>
-	
-	
-	</table></div>
-		<p><input type="submit" value="Save Changes" class="submit" onclick=Check(this.form) /></p>
-	<p><input type="submit" value="Cancel and Return to Koha attr Structure" class="cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" /></p>
-	</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirm" -->
-<!-- ------------------------------------------------------------------------ -->
-<div class="data"><table>
-<caption>Confirm Deletion of Field <em><!-- TMPL_VAR NAME="searchfield" --></em>?</caption>
-	<tr><th>Kohafield: </th><td><!-- TMPL_VAR NAME="searchfield" --></td></tr>
-	<tr><th>Description: </th><td><!-- TMPL_VAR NAME="label" --></td></tr>
-	</table></div>
-	<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"/><input type="hidden" name="id" value='<!-- TMPL_VAR NAME="id" -->' />	<input type="submit" class="cancel" value="Yes, Delete this Tag" /></form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" class="submit" value="No, Do Not Delete" /></form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirmed" -->
-<!-- ------------------------------------------------------------------------ -->
-	<div class="details"><h3>Field Deleted</h3>
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-	<input type="submit" class="submit" value="Return to Koha attributes Structure" />
-	</form></div>
-<!-- /TMPL_IF -->
-
-
-<!-- ------------------------------------------------------------------------ -->
-<!-- TMPL_IF NAME="else" -->
-	<form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		
-		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" size="60" />
-		<input type="submit" value="Kohafield Search" class="submit" />
-		<p><!-- TMPL_IF Name="select_display"-->
-				<label for="onlyused">Display only used Tags/Subfields</label><input type="checkbox" name="select_display" id="onlyused" value="True" checked="checked" onchange="document.f.submit()" />
-			<!-- TMPL_ELSE -->
-				<label for="onlyused">Display only used Tags/Subfields</label><input type="checkbox" name="select_display"  id="onlyused" value="True" onchange="document.f.submit()" />
-			<!--/TMPL_IF --> 
-		</p>
-	</form>
-	<div class="help">NOTE : if you change the link between a KOHA field and a Z39.50 attribute, ask your administrator to reindex ZEBRA with these attributes.</div>
-
-	<div class="data">
-	<table>
-		<tr>
-			<th scope="col">Koha field</th>
-			<th scope="col">Attribute</th>
-			<th scope="col">MARC tag/sub</th>
-			<th scope="col">Label</th>
-			<th scope="col">Sorts</th>
-			<th scope="col">Intra Show</th>
-			<th scope="col">Opac Show</th>
-			
-			<th scope="col">Related record</th>
-			
-			
-			<th scope="col">&nbsp;</th>
-		</tr>
-	<!-- TMPL_IF NAME="select_display" -->
-		<!-- TMPL_LOOP NAME="loop" -->
-		<input type="hidden" value="<!-- TMPL_VAR NAME="attr" -->" />
-		<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
-		<tr class="highlight">
-			<td><b><!-- TMPL_VAR NAME="kohafield" --></b></td>
-			<td><!-- TMPL_VAR NAME="attr" --></td>
-			<td><!-- TMPL_VAR NAME="tagfield" --><!-- TMPL_VAR NAME="tagsubfield" --></td>
-			<td><!-- TMPL_VAR NAME="label" --></td>
-			<td><!-- TMPL_IF NAME="sorts" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-			<td><!-- TMPL_IF NAME="intrashow" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-			<td><!-- TMPL_IF NAME="opacshow" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-			<td><!-- TMPL_VAR NAME="recordtype" --></td>
-			<td><a class="edit" href="<!-- TMPL_VAR NAME="edit" -->">Edit Tag</a> <a class="delete" href="<!-- TMPL_VAR NAME="delete" -->">Delete Tag</a></td>
-		</tr>
-		<tr>
-			<td>
-				&nbsp;
-			</td>
-			
-		</tr>
-		<!-- /TMPL_LOOP -->
-	<!-- TMPL_ELSE -->
-		<!-- TMPL_LOOP NAME="loop" -->
-	<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
-		<!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-			<td><b><!-- TMPL_VAR NAME="kohafield" --></b></td>
-			<td><!-- TMPL_VAR NAME="attr" --></td>
-			<td><!-- TMPL_VAR NAME="tagfield" --><!-- TMPL_VAR NAME="tagsubfield" --></td>
-			<td><!-- TMPL_VAR NAME="label" --></td>
-			<td><!-- TMPL_IF NAME="sorts" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-			<td><!-- TMPL_IF NAME="intrashow" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-			<td><!-- TMPL_IF NAME="opacshow" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-			<td><!-- TMPL_VAR NAME="recordtype" --></td>
-			<td><a class="edit" href="<!-- TMPL_VAR NAME="edit" -->">Edit Tag</a> <a class="delete" href="<!-- TMPL_VAR NAME="delete" -->">Delete Tag</a></td>
-		</tr>
-		<!-- /TMPL_LOOP -->
-	<!--/TMPL_IF -->
-	</table>
-	<div class="tabitem">
-		<!-- TMPL_IF NAME="isprevpage" -->
-		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
-		<input type="hidden" value="<!-- TMPL_VAR NAME="prevpage" -->" name="offset" /><input type="hidden" value="<!-- TMPL_VAR NAME="searchfield" -->" name="searchfield" /><!--TMPL_IF Name="select_display"--><input type="hidden" value="select_display" name="True" /><!--/TMPL_IF --><input type="submit" value="&lt;&lt; Previous Page" class="submit" /></form>
-		<!-- /TMPL_IF -->	
-		
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="hidden" name="op" value="add_form" />
-	
-	
-		<input type="submit" value="Add Koha atrribute" class="submit" /></form>
-		
-		<!-- TMPL_IF NAME="nextpage" -->
-		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextpage" -->" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-		<!--TMPL_IF Name="select_display"--><input type="hidden" name="select_display" value="True" /><!--/TMPL_IF --><input type="submit" class="submit" value="Next Page &gt;&gt;" /></form>
-		<!-- /TMPL_IF -->
-</div>
-</div>
-<!-- /TMPL_IF -->
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/onlinedatabases.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/onlinedatabases.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/onlinedatabases.tmpl
--- htdocs/intranet-tmpl/default/en/admin/onlinedatabases.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,280 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF NAME="else" -->z39.50 Servers<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME=searchfield -->Modify z39.50 Server <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->Add z39.50 Server<!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_validate" -->z39.50 Server Added<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirmed" -->z39.50 Server Deleted<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main"><!-- TMPL_IF NAME="add_form" -->
-        <script language="JavaScript" type="text/javascript">
-        //
-        function isNotNull(f,noalert) {
-                if (f.value.length ==0) {
-                    return false;
-                }
-                return true;
-        }
-        //
-        function toUC(f) {
-                var x=f.value.toUpperCase();
-                f.value=x;
-                return true;
-        }
-        //
-        function isNum(v,maybenull) {
-        var n = new Number(v.value);
-        if (isNaN(n)) {
-                return false;
-                }
-        if (maybenull==0 && v.value=='') {
-                return false;
-        }
-        return true;
-        }
-        //
-        function isDate(f) {
-                var t = Date.parse(f.value);
-                if (isNaN(t)) {
-                       return false;                       
-                }
-        }
-        //
-        function Check(f) {
-                var ok=1;
-                var _alertString="";
-                var alertString2;
-                if (f.searchfield.value.length==0) {
-                        _alertString += "- site name missing\n";
-                }
-                if (f.host.value.length==0) {
-                        _alertString += "- host missing\n";
-                }
-                if (f.port.value.length==0) {
-                        _alertString += "- port missing\n";
-                }
-                if (f.db.value.length==0) {
-                        _alertString += "- database missing\n";
-                }
-                if (isNaN(f.port.value)) {
-                        _alertString += "- port must be a number\n";
-                }
-              
-                if (_alertString.length==0) {
-                        document.Aform.submit();
-                } else {
-                        alertString2 = "Form not submitted because of the following problem(s)\n";
-                        alertString2 += "------------------------------------------------------------------------------------\n\n";
-                        alertString2 += _alertString;
-                        alert(alertString2);
-                }
-        }
-        </script>
-
-       
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-        <input type="hidden" name="op" value="add_validate" />
-<!-- TMPL_IF NAME=searchfield -->
-                <h1>Modify Online Database Server</h1>
-        <!-- TMPL_ELSE -->
-                <h1>Add Online Database Server</h1>
-        <!-- /TMPL_IF -->                
-        <div class="data"><table>
-        <!-- TMPL_IF NAME=searchfield -->
-                <tr>
-                        <th>Display Name</th>
-                        <td>
-                                <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
-                        </td>
-                </tr>
-        <!-- TMPL_ELSE -->
-                <tr>
-                        <th>Display name</th>
-                        <td>
-                                <input type="text" name="searchfield" size="65" maxlength="100"  />
-                        </td>
-                </tr>
-        <!-- /TMPL_IF -->
-
-		<tr>
-			<th>Z3950 server</th>
-			<td>
-				<input type="text" name="host" size="30" value="<!-- TMPL_VAR NAME="host" -->" />
-			</td>
-		</tr>
-		<tr>
-			<th>Port</th>
-			<td>
-				<input type="text" name="port" size="5" value="<!-- TMPL_VAR NAME="port" -->" onblur="isNum(this)" />
-			</td>
-		</tr>
-		<tr>
-			<th>Database</th>
-			<td>
-				<input type="text" name="db" value="<!-- TMPL_VAR NAME="db" -->" />
-			</td>
-		</tr>
-		<tr>
-			<th>Userid</th>
-			<td>
-				<input type="text" name="userid" value="<!-- TMPL_VAR NAME="userid" -->" />
-			</td>
-		</tr>
-		<tr>
-			<th>Password</th>
-			<td>
-				<input type="text" name="password" value="<!-- TMPL_VAR NAME="password" -->" />
-			</td>
-		</tr>
-		<tr>
-			<th>Search string</th>
-			<td colspan="3">
-						<textarea name="search_string" row="3" cols="80"><!-- TMPL_VAR NAME="search_string" --></textarea>
-			</td>
-		</tr>
-	
-		<tr>
-			<th>Keyword search attr</th>
-			<td>
-						<input type="text" name="any" value="<!-- TMPL_VAR NAME="any" -->" />
-			</td>
-			<th>Keyword query syntax</th>
-			<td>
-						<input type="text" name="any_query" value="<!-- TMPL_VAR NAME="any_query" -->" />
-			</td>
-		</tr>	
-			<tr>
-			<th>Title search attr</th>
-			<td>
-						<input type="text" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
-			</td>
-			<th>Title query</th>
-			<td>
-						<input type="text" name="title_query" value="<!-- TMPL_VAR NAME="title_query" -->" />
-			</td>
-		</tr>	
-	<tr>
-			<th>Author search attr</th>
-			<td>
-						<input type="text" name="author" value="<!-- TMPL_VAR NAME="author" -->" />
-			</td>
-			<th>Author query</th>
-			<td>
-						<input type="text" name="author_query" value="<!-- TMPL_VAR NAME="author_query" -->" />
-			</td>
-		</tr>	
-		<tr>
-			<th>Subject search attr</th>
-			<td>
-						<input type="text" name="subject" value="<!-- TMPL_VAR NAME="subject" -->" />
-			</td>
-			<th>Subject query</th>
-			<td>
-						<input type="text" name="subject_query" value="<!-- TMPL_VAR NAME="subject_query" -->" />
-			</td>
-		</tr>	
-			
-        </table></div><input type="button" value="<!-- TMPL_IF NAME=searchfield -->Update Online database Server<!-- TMPL_ELSE -->Add Z39.50 Server<!-- /TMPL_IF -->" onclick="Check(this.form)" class="submit" />  <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->';" />
-        </form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="add_validate" -->
-<h3>Z39.50 Server Added</h3>
-<div class="form"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="submit" value="OK" class="submit" />
-        </form></div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirm" -->
-	<!-- TMPL_VAR NAME="reqsel" -->
-<h3>Confirm Deletion of Server <em><!-- TMPL_VAR NAME="searchfield" --></em></h3>	
-        <table>
-                <tr>
-                        <td>Display name</td>
-                        <td>
-                                <!-- TMPL_VAR NAME="searchfield" -->
-                        </td>
-                </tr>
-                <tr>
-                        <td>host</td>
-                        <td><!-- TMPL_VAR NAME="host" --></td>
-                </tr>
-                <tr>
-                        <td>Port</td>
-                        <td><!-- TMPL_VAR NAME="port" --></td>
-                </tr>
-                <tr>
-                        <td>Database</td>
-                        <td><!-- TMPL_VAR NAME="db" --></td>
-                </tr>
-                <tr>
-                        <td>Userid</td>
-                        <td><!-- TMPL_VAR NAME="userid" --></td>
-                </tr>
-              
-              
-                <tr>
-                        <td>                <div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                        <input type="hidden" name="op" value="delete_confirmed" />
-                        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="submit" value="Delete this Server" class="cancel" /></form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="Do Not Delete" class="submit" /></form></div></td>
-                </tr>
-	</table>
-
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirmed" -->
-<h3>Z39.50 Server Deleted</h3>
-<div class="form"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="submit" value="OK" class="submit" />
-</form></div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="else" -->
-<h3>Online Database Servers Admininistration</h3>
-         <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-                <input type="submit" name="search" value="Search" class="submit" />
-        </form>
-<div id="results">        <!-- TMPL_IF NAME="searchfield" -->
-                You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
-        <!-- /TMPL_IF --></div>		
-<table>
-                <tr>
-                        <th>Site</th>
-                        <th>Hostname/Port</th>
-                        <th>Database</th>
-                        <th>Userid</th>
-                        
-                        <th colspan="2">&nbsp;</th>
-                </tr>
-                <!-- TMPL_LOOP NAME="loop" -->
-               <!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-                        <td><!-- TMPL_VAR NAME="server" --></td>
-                        <td><!-- TMPL_VAR NAME="host" -->:<!-- TMPL_VAR NAME="port" --></td>
-                        <td><!-- TMPL_VAR NAME="db" --></td>
-                        <td><!-- TMPL_VAR NAME="userid" --></td>
-                       
-                        <td><form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="server" -->" /><input type="submit" class="submit" value="Edit" /></form></td>
-                        <td><form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="server" -->" /><input type="submit" class="delete" value="Delete" /></form></td>                
-			</tr>
-                <!-- /TMPL_LOOP -->
-	</table>
-<div class="tabitem">
-<!-- TMPL_IF NAME="offsetgtzero" --><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
-	<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevpage" -->" />
-	<input type="submit" value="&lt;&lt; Prev" class="submit">
-</form><!-- /TMPL_IF -->
-<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="hidden" name="op" value="add_form" />
-		<input type="submit" value="Add Online Database Server" class="submit" />
-</form>
-<!-- TMPL_IF NAME="ltcount" --><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
-	<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextpage" -->" />
-	<input type="submit" value="Next &gt;&gt;" class="submit" />
-</form> <!-- /TMPL_iF -->
- </div>
-
-<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/printers.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/printers.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/printers.tmpl
--- htdocs/intranet-tmpl/default/en/admin/printers.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,191 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
-<!-- TMPL_IF NAME=add_form --><!-- TMPL_IF NAME="searchfield" -->Modify printer '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add printer<!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_validate" -->Printer Added<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Printer '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirmed" -->Printer Deleted<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="else" -->Printers<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main"><!-- TMPL_IF NAME=add_form -->
-        <script language="JavaScript" type="text/javascript">
-        //
-        function isNotNull(f,noalert) {
-                if (f.value.length ==0) {
-   return false;
-                }
-                return true;
-        }
-        //
-        function toUC(f) {
-                var x=f.value.toUpperCase();
-                f.value=x;
-                return true;
-        }
-        //
-        function isNum(v,maybenull) {
-        var n = new Number(v.value);
-        if (isNaN(n)) {
-                return false;
-                }
-        if (maybenull==0 && v.value=="") {
-                return false;
-        }
-        return true;
-        }
-        //
-        function isDate(f) {
-                var t = Date.parse(f.value);
-                if (isNaN(t)) {
-                        return false;
-                }
-        }
-        //
-        function Check(f) {
-                var ok=1;
-                var _alertString="";
-                var alertString2;
-                if (f.printername.value.length==0) {
-                        _alertString += "- printer name missing\n";
-                }
-                if (f.printqueue.value.length==0) {
-                        _alertString += "- Queue missing\n";
-                }
-                if (_alertString.length==0) {
-                        document.Aform.submit();
-                } else {
-                        alertString2 = "Form not submitted because of the following problem(s)\n";
-                        alertString2 += "------------------------------------------------------------------------------------\n\n";
-                        alertString2 += _alertString;
-                        alert(alertString2);
-                }
-        }
-        </script>
-
-
-        
-<!-- TMPL_IF NAME="searchfield" -->
-		<h1>Modify printer</h1>
-	<!-- TMPL_ELSE -->
-		<h1>Add printer</h1>
-	<!-- /TMPL_IF -->
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-        <input type="hidden" name="op" value="add_validate" />
-	<table>
-	<!-- TMPL_IF NAME="searchfield" -->
-		<tr>
-			<td>Printer Name</td>
-			<td>
-				<input type="hidden" name="printername" value="<!-- TMPL_VAR NAME=searchfield -->" /><!-- TMPL_VAR NAME="searchfield" -->
-			</td>
-		</tr>
-	<!-- TMPL_ELSE -->
-		<tr>
-			<td>Printer Name</td>
-			<td>
-				<input type="text" name="printername" size="50" maxlength="50" />
-			</td>
-		</tr>
-	<!-- /TMPL_IF -->
-
-        	<tr>
-			<td>Queue</td>
-			<td><input type="text" name="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->" /> </td>
-		</tr>
-        	<tr>
-			<td>Type</td>
-			<td><input type="text" name="printtype" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printtype" -->" /> </td>
-		</tr>
-        </table><p><input type="button" value="OK" onclick="Check(this.form);" class="submit" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->';" /></p>
-        </form>
-
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="add_validate" -->
-<h3>Printer Added</h3>
-<div id="form"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="submit" value="OK" class="submit" />
-</form></div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirm" -->
-<h3>Confirm Deletion of Printer <em><!-- TMPL_VAR NAME="searchfield" --></em></h3>
-<table>
-		<tr>
-			<td>Printer</td>
-			<td><!-- TMPL_VAR NAME="searchfield" --></td>
-		</tr>
-		<tr>
-			<td>Queue</td>
-			<td><!-- TMPL_VAR NAME="printqueue" --></td>
-		</tr>
-        	<tr>
-			<td>Type</td>
-			<td><!-- TMPL_VAR NAME="printtype" --></td>
-		</tr>
-        	<tr>
-			<td>
-
-			</td>
-			<td>
-
-			</td>
-		</tr>
-	</table>
-<div class="tabitem">    	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="hidden" name="op" value="delete_confirmed" />
-			<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-			<input type="submit" value="Delete this Printer" class="cancel" />
-			</form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-				<input type="submit" value="Do not Delete" class="submit" />
-			</form></div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirmed" -->
-<h3>Printer Deleted</h3>
-<div class="form"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="submit" value="Ok" class="submit" />
-</form></div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="else" -->
-<h2>Printer Admin</h2>
-	<!-- TMPL_IF NAME=searchfield -->
-		<div id="results">You searched for <span class="ex"><!-- TMPL_VAR NAME="searchfield" --></span></div>
-	<!-- /TMPL_IF -->
-<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-                <input type="submit" name="submit" value="Search" class="submit" />
-        </form>
-<table>
-		<tr>
-			<th>Name</th>
-			<th>Queue</th>
-			<th>Type</th>
-			<th>&nbsp;</th>
-		</tr>
-		<!-- TMPL_LOOP NAME=loop -->
-		<tr>
-			<td><!-- TMPL_VAR NAME="printername" --></td>
-			<td><!-- TMPL_VAR NAME="printqueue" --></td>
-			<td><!-- TMPL_VAR NAME="printtype" --></td>
-			<td><form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="printername" -->" /><input type="submit" value="Edit" class="submit" /></form> <form class="inline" action="" method="get"><input type="hidden" name=
-"op" value="delete_confirm" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="printername" -->" /><input type="submit" class="delete" value="Delete" /></form></td>
-		</tr>
-		<!-- /TMPL_LOOP -->
-	</table>
-<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-       <p> <input type="hidden" name="op" value="add_form" /><input type="submit" value="Add Printer" class="submit" /></p></form>
-	<!-- TMPL_IF NAME="offsetgtzero" -->
-		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
-	<!-- /TMPL_IF -->
-
-	<!-- TMPL_IF NAME="ltcount" -->
-		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>	
-	<!-- /TMPL_iF -->
-<!-- /TMPL_IF -->
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/stopwords.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/stopwords.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/stopwords.tmpl
--- htdocs/intranet-tmpl/default/en/admin/stopwords.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,160 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
-<!-- TMPL_IF NAME="else" -->Stop Words Administration<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify Stop Word<!-- TMPL_ELSE -->Add Stop Word<!-- /TMPL_IF --><!-- /TMPL_IF --> 
-<!-- TMPL_IF NAME="add_validate" -->Stop Word Added<!-- /TMPL_IF --> 
-<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Stop Word '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF --> 
-<!-- TMPL_IF NAME="delete_confirmed" -->Stop Word Deleted<!-- /TMPL_IF --> 
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<!-- TMPL_IF NAME="add_form" -->
-        <script>
-        //
-        function isNotNull(f,noalert) {
-                if (f.value.length ==0) {
-   return false;
-                }
-                return true;
-        }
-        //
-        function toUC(f) {
-                var x=f.value.toUpperCase();
-                f.value=x;
-                return true;
-        }
-        //
-        function isNum(v,maybenull) {
-        var n = new Number(v.value);
-        if (isNaN(n)) {
-                return false;
-                }
-        if (maybenull==0 && v.value=="") {
-                return false;
-        }
-        return true;
-        }
-        //
-        function isDate(f) {
-                var t = Date.parse(f.value);
-                if (isNaN(t)) {
-                        return false;
-                }
-        }
-        //
-        function Check(f) {
-                var ok=1;
-                var _alertString="";
-                var alertString2;
-                if (f.word.value.length==0) {
-                        _alertString += "- word missing\n";
-                }
-                if (_alertString.length==0) {
-                        document.Aform.submit();
-                } else {
-                        alertString2 = "Form not submitted because of the following problem(s)\n";
-                        alertString2 += "------------------------------------------------------------------------------------\n\n";
-                        alertString2 += _alertString;
-                        alert(alertString2);
-                }
-        }
-        </SCRIPT>
-
-
-
-        <form action="<!-- TMPL_VAR NAME=script_name -->" name="Aform" method="post">
-        <input type="hidden" name="op" value="add_validate" />
-<!-- TMPL_IF NAME="searchfield" -->
-                <h1>Modify Stop Word</h1>
-        <!-- TMPL_ELSE -->
-                <h1>Add Stop Word</h1>
-        <!-- /TMPL_IF -->         
-<table>
-        <!-- TMPL_IF NAME="searchfield" -->
-                <tr>
-                        <td>Stop Word</td>
-                        <td><input type="hidden" name="word" value="<!-- TMPL_VAR NAME=searchfield -->" /><!-- TMPL_VAR NAME="searchfield" -->
-                        </td>
-                </tr>
-        <!-- TMPL_ELSE -->
-                <tr>
-                        <td>Stop Word: </td>
-                        <td>
-                                <input type="text" name="word" size="50" maxlength="250" onblur="toUC(this);" />
-                        </td>
-                </tr>
-        <!-- /TMPL_IF -->
-        </table><p><input type="button" value="<!-- TMPL_IF NAME="searchfield" -->Update Stop Word<!-- TMPL_ELSE -->Add Stop Word <!-- /TMPL_IF -->" onclick="Check(this.form);" class="submit" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->';" /></p>
-        </form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="add_validate" -->
-<h3>Stop Word Added</h3>
-<div class="form"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="submit" value="OK" class="submit" />
-        </form></div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirm" -->
- <h3>Confirm Deletion of Stop Word <em><!-- TMPL_VAR NAME="searchfield" --></em></h3>                       <table>
-                <tr>
-                        <td>Stop Word: </td>
-                        <td><!-- TMPL_VAR NAME="searchfield" --></td>
-                </tr>
-	</table><div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                        <input type="hidden" name="op" value="delete_confirmed" />
-                        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="submit" value="Delete this Stop Word" class="cancel" />
-                                </form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                                        <input type="submit" value="Do Not Delete" class="submit" />
-                                </form></div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirmed" -->
-<h3>Stop Word Deleted</h3>
-<div class="form"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="submit" value="OK" class="submit" />
-</form></div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="else" -->
- <h3>Stop Words Administration</h3>
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-                <input type="submit" name="submit" value="Search" class="submit" />
-        </form>
-<div id="results">        <!-- TMPL_IF NAME="searchfield" -->
-                You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
-        <!-- /TMPL_IF --></div>
-<!-- TMPL_IF NAME="loop" -->
-<table>
-                <tr>
-                        <th>Word</th>
-                        <th>&nbsp;</th>
-                </tr>
-                <!-- TMPL_LOOP NAME="loop" -->
-                <tr>
-                        <td><!-- TMPL_VAR NAME="word" --></td>
-                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="word" -->">Delete</a></td>
-                </tr>
-                <!-- /TMPL_LOOP -->
-        </table>
-<!-- /TMPL_IF -->
-<div class="tabitem"><!-- TMPL_IF NAME="offsetgtzero" -->
-               <form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevpage" -->" /><input type="submit" class="submit" value="&lt;&lt; Prev" /></form>
-        <!-- /TMPL_IF --> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="hidden" name="op" value="add_form" /><input type="submit" value="Add Word" class="submit" />
-        </form> <!-- TMPL_IF NAME="ltcount" -->
-                <form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="next_page" -->" /><input type="submit" class="submit" value="Next &gt;&gt;" /></form>
-        <!-- /TMPL_iF --></div>
-        
-
-        
-
-        
-
-<!-- /TMPL_IF -->
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/systempreferences.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/systempreferences.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/systempreferences.tmpl
--- htdocs/intranet-tmpl/default/en/admin/systempreferences.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,261 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
-<!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="modify" -->Modify system preference '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add a system preference<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="add_validate" -->Data Added<!-- /TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Parameter '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" -->Parameter Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Preferences<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<script language="JavaScript" type="text/javascript">
-		function _(s) { return s } // dummy function for gettext
-		//
-		function isNotNull(f,noalert) {
-			if (f.value.length ==0) {
-	return false;
-			}
-			return true;
-		}
-		//
-		function toUC(f) {
-			var x=f.value.toUpperCase();
-			f.value=x;
-			return true;
-		}
-		//
-		function isNum(v,maybenull) {
-		var n = new Number(v.value);
-		if (isNaN(n)) {
-			return false;
-			}
-		if (maybenull==0 && v.value=='') {
-			return false;
-		}
-		return true;
-		}
-		//
-		function isDate(f) {
-			var t = Date.parse(f.value);
-			if (isNaN(t)) {
-				return false;
-			}
-		}
-		//
-		function Check(f) {
-			var ok=1;
-			var _alertString="";
-			var alertString2;
-			if (f.variable.value.length==0) {
-				_alertString += "\n- " + _("variable missing");
-			}
-			if (f.value.value.length==0) {
-				_alertString += "\n- " + _("value missing");
-			}
-			if (_alertString.length==0) {
-				document.Aform.submit();
-			} else {
-				alertString2  = _("Form not submitted because of the following problem(s)");
-				alertString2 += "\n------------------------------------------------------------------------------------\n";
-				alertString2 += _alertString;
-				alert(alertString2);
-			}
-		}
-		</script>
-
-<div id="main">	<!-- TMPL_IF NAME="add_form" -->
-	
-		<!-- TMPL_IF NAME="modify" -->
-			<h1>Modify a system preference</h1>
-		<!-- TMPL_ELSE -->
-			<h1>Add a system preference</h1>
-		<!-- /TMPL_IF -->
-		<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-		<div class="details">
-		
-		<table>
-			<tr><td><label for="explanation">Explanation: </label></td><td><input type="text" name="explanation" id="explanation" size="60" value="<!-- TMPL_VAR NAME="explanation" escape="HTML" -->" /><input type="hidden" name="op" value="add_validate" /></td></tr>
-			<tr><!-- TMPL_IF NAME="searchfield" --><td><label>Variable</label></td><td><!-- TMPL_VAR NAME="searchfield" --><input type="hidden" name="variable" value="<!-- TMPL_VAR NAME="searchfield" -->"></td>
-			<!-- TMPL_ELSE --><td><label for="variable">Variable</label></td><td><input type="text" name="variable" id="variable" size="60" /></td><!-- /TMPL_IF --></tr>
-			<tr><td><label for="value">Value</label></td><td><!-- TMPL_IF NAME="type-free" -->
-					<input type="text" id="value" name="value" value="<!-- TMPL_VAR NAME="value" escape="HTML" -->" size="<!-- TMPL_VAR NAME="fieldlength" -->" />
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF NAME="type-textarea" -->
-					<textarea name="value" id="value" rows="<!--TMPL_VAR NAME="rows" -->" cols="<!-- TMPL_VAR NAME="cols" -->"><!-- TMPL_VAR NAME="value" escape="HTML" --></textarea>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF NAME="type-choice" -->
-					<select name="value" id="value">
-						<!-- TMPL_LOOP NAME="options" -->
-<!-- TMPL_IF NAME="selected" -->
-							<option value="<!-- TMPL_VAR NAME="option" -->" selected="selected"><!-- TMPL_VAR NAME="option" --></option>
-<!-- TMPL_ELSE -->
-							<option value="<!-- TMPL_VAR NAME="option" -->"><!-- TMPL_VAR NAME="option" --></option>
-<!-- /TMPL_IF -->
-						<!-- /TMPL_LOOP -->
-					</select>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF NAME="type-yesno" -->
-					<!-- TMPL_IF NAME="value-yes" -->
-					<input type="radio" name="value" id="value" value="1" checked="checked"><!-- TMPL_ELSE --><input type="radio" name="value" id="value" value="1" /><!-- /TMPL_IF -->Yes
-				<!-- TMPL_IF NAME="value-no" -->	
-					<input type="radio" name="value" value="0" checked="checked" /><!-- TMPL_ELSE --><input type="radio" name="value" value="0" /><!-- /TMPL_IF -->No<!-- /TMPL_IF -->
-				</td></tr>
-		</table></div>
-		<p>
-		<!-- TMPL_IF NAME="modify" -->
-		<input type="submit" value="Save Changes" class="submit" />
-	<!-- TMPL_ELSE -->
-		<input type="submit" value="Add this Preference" class="submit" />
-	<!-- /TMPL_IF -->
-<input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR name="script_name" -->'; return false;" /></p>
-		
-<h3>Koha internal</h3>		
-		<div class="details"><span class="note">Note: you should have no reasons to modify the following default values</span>
-		<table>
-		<tr><td><label for="preftype">Variable type:</label></td><td><input type="text" name="preftype" id="preftype" value="<!--TMPL_VAR NAME="preftype" -->" size="40" maxlength="40"><span class="formfield-notes"> (<em>Choice</em>, <em>YesNo</em>, <em>Integer</em>, <em>Textarea</em>, <em>Float</em>, <em>Themes</em>, or <em>Languages</em>)</span></td></tr>
-		<tr><td><label for="prefoptions">Variable options:</label></td><td><input type="text" name="prefoptions" id="prefoptions" value="<!-- TMPL_VAR NAME="prefoptions" -->" size="60" maxlength="80" /> <span class="formfield-notes">(a choice list for <em>Choice</em> (separated by <strong>|</strong>) or <strong>cols|rows</strong> for <em>Texarea</em>)</span></td></tr>
-		</table></div>
-		</form>
-	<!-- /TMPL_IF -->
-	
-	<!-- TMPL_IF NAME="add_validate" -->
-	
-
-		<h3>Data recorded</h3>
-		<div class="details">
-		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="submit" class="submit" value="OK" />
-		</form></div>
-	<!-- /TMPL_IF -->
-	
-	<!-- TMPL_IF NAME="delete_confirm" -->
-	
-<div class="data">	<table>
-		<caption>Confirm Deletion of <em><!-- TMPL_VAR NAME="searchfield" -->?</em></caption>
-		<tr>
-			<th>Variable Name:</th>
-			<td><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
-		</tr>
-		<tr><th>Value: </th><td><!-- TMPL_VAR NAME="Tvalue" --></td></tr></table>
-		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-		<input type="submit" class="cancel" value="Yes, Delete"></form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" class="submit" value="No, Do not Delete" /></form>
-	</div>
-	
-	<!-- /TMPL_IF -->
-	
-	<!-- TMPL_IF NAME="delete_confirmed" -->
-	
-		<div class="details"><h3>Data deleted</h3></div>
-		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="submit" class="submit" value="Back to System Preferences" />
-		</form>
-	<!-- /TMPL_IF -->
-	
-	<!-- TMPL_IF NAME="else" -->
-	<h1>System preferences admin</h1>
-<div class="tabitem">
-		<ul>
-			<li>
-				<!--TMPL_IF Name="Admin"-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin" class="here">Admin
-					</a>
-				<!--TMPL_ELSE-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin
-					</a>
-				<!--/TMPL_IF-->
-			</li>
-			<li>
-				<!--TMPL_IF Name="Acquisitions"-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions" class="here">Acquisitions
-					</a>
-				<!--TMPL_ELSE-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions
-					</a>
-				<!--/TMPL_IF-->
-			</li>
-			<li>
-				<!--TMPL_IF Name="Authorities"-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities" class="here">Authorities
-					</a>
-				<!--TMPL_ELSE-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities
-					</a>
-				<!--/TMPL_IF-->
-			</li>
-			<li>
-				<!--TMPL_IF Name="Catalogue"-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue" class="here">Catalogue
-					</a>
-				<!--TMPL_ELSE-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue">Catalogue
-					</a>
-				<!--/TMPL_IF-->
-			</li>
-			<li>
-				<!--TMPL_IF Name="Circulation"-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation" class="here">Circulation
-					</a>
-				<!--TMPL_ELSE-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation
-					</a>
-				<!--/TMPL_IF-->
-			</li>
-	<!--TMPL_IF Name="Librarian"-->
-			<li><a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet" class="here">Intranet</a></li>
-	<!--TMPL_ELSE-->
-			<li><a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet">Intranet</a></li>
-	<!--/TMPL_IF-->
-			<li>
-				<!--TMPL_IF Name="Members"-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members" class="here">Members
-					</a>
-				<!--TMPL_ELSE-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members">Members
-					</a>
-				<!--/TMPL_IF-->
-			</li>
-			<li>
-				<!--TMPL_IF Name="OPAC"-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC" class="here">OPAC
-					</a>
-				<!--TMPL_ELSE-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC
-					</a>
-				<!--/TMPL_IF-->
-			</li>
-			<li>
-				<!--TMPL_IF Name="Others"-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=" class="here">Others
-					</a>
-				<!--TMPL_ELSE-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=">Others
-					</a>
-				<!--/TMPL_IF-->
-			</li>
-		</ul>
-</div>
-	<!-- TMPL_VAR NAME="searchfield" -->
-	<table>
-	<tr>
-		<th>Variable</th>
-		<th>Value</th>
-		<th colspan="3">Explanation</th>
-	</tr>
-	<!-- TMPL_LOOP NAME="loop" -->
-	<tr<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
-		<td><!-- TMPL_VAR NAME="variable" --></td>
-		<td><!-- TMPL_VAR NAME="value" --></td>
-		<td><!-- TMPL_VAR NAME="explanation" --></td>
-		<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
-		<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
-	</tr>
-	<!-- /TMPL_LOOP -->
-	</table>
-	</form>
-	
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="hidden" name="op" value="add_form" />
-		<input type="submit" class="submit" value="Add a System Preference" />
-	</form>
-	
-	<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/thesaurus.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/thesaurus.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/thesaurus.tmpl
--- htdocs/intranet-tmpl/default/en/admin/thesaurus.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,153 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: Thesaurus Management
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<!-- TMPL_IF name="detail_form" -->
-	<!-- -->
-	<h1>Thesaurus management</h1><table>
-	<tr><td>&nbsp;</td></tr>
-	<tr>
-		<td><b>Values related to <!-- TMPL_VAR name="stdlib" --> (<!-- TMPL_VAR name="category" -->)</b></td>
-	</tr>
-	</table>
-	<br/><br/>
-	<table>
-	<tr>
-		<th>Other forms</th>
-		<th>&nbsp;</th>
-		<th>&nbsp;</th>
-	</tr>
-	<!-- TMPL_LOOP name="loop" -->
-	<tr>
-		<td><!-- TMPL_VAR name="freelib" --></td>
-		<td><a href="<!-- TMPL_VAR name="edit" -->">Edit</a></td>
-		<td><a href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
-	</tr>
-	<!-- /TMPL_LOOP -->
-	<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-	<input type="hidden" name="op" value="add_form" />
-	</table>
-	<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-	<input type="hidden" name="op" value="add_form" />
-	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->" />
-	<input type="hidden" name="stdlib" value="<!-- TMPL_VAR name="stdlib" -->" />
-	<br><input type="submit" value="Add thesaurus entry" /><br>
-	</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="add_form" -->
-<!-- -->
-
-	<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
-	<h1><!-- TMPL_IF name="search_category" -->Add<!-- TMPL_ELSE -->Modify<!-- /TMPL_IF --></h1><!-- TMPL_IF name="search_category" -->
-		<input type="hidden" name="op" value="add_validate" />
-	<!-- TMPL_ELSE -->
-		<input type="hidden" name="op" value="mod_validate" />
-	<!-- /TMPL_IF --><table>
-	<tr>
-		<td>Category</td>
-		<td><!-- TMPL_VAR name="category" --></td>
-	</tr>
-	<tr>
-		<td>Authority lib</td>
-		<!-- TMPL_IF name="id" -->
-			<td><!-- TMPL_VAR name="father" --><!-- TMPL_VAR name="stdlib" --><input type="hidden" name="stdlib" value="<!-- TMPL_VAR name="stdlib" -->" /></td>
-		<!-- TMPL_ELSE -->
-			<td><!-- TMPL_VAR name="father" --><input type="text" name="stdlib" value="<!-- TMPL_VAR name="stdlib" escape="HTML" -->" maxlength="80" size="80" /></td>
-		<!-- /TMPL_IF -->
-	</tr>
-	<tr>
-		<td>Other lib</td>
-		<td><!-- TMPL_VAR name="father" --><input type="text" name="freelib" value="<!-- TMPL_VAR name="freelib" escape="HTML" -->" maxlength="80" size="80" /></td>
-	</tr>
-	</table>
-	<p><input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
-			<input type="hidden" name="father" value="<!-- TMPL_VAR name="father" escape="HTML" -->" />
-			<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" escape="HTML" -->" />
-			<input type="hidden" name="search_category" value="<!-- TMPL_VAR name="search_category" -->" />
-			<input type="hidden" name="searchstring" value="<!-- TMPL_VAR name="searchstring" escape="HTML" -->" />
-			<input type="hidden" name="offset" value="<!-- TMPL_VAR name="offset" -->" />
-			<input type="submit" class="submit" value="<!-- TMPL_IF name="search_category" -->Add<!-- TMPL_ELSE -->Modify<!-- /TMPL_IF --> Value" /></p></form>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF name="delete_confirm" -->
-<!-- -->
-		<table>
-		<tr>
-			<td><b>lib</b></td>
-			<td><b><!-- TMPL_VAR name="search_category" --></b></td>
-		</tr>
-		<tr><td>Value</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
-		<tr><td>
-			<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-				<input type="hidden" name="op" value="delete_confirmed" />
-				<input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
-				<input type="hidden" name="search_category" value="<!-- TMPL_VAR name="search_category" -->" />
-		</tr></td>
-		<tr><td colspan=2 align=center>CONFIRM DELETION of this entry <b>and all entries depending on this one</b></td></tr>
-		<tr><td><input type="submit" value="YES" /></form></td>
-				<td><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="NO" /></form></td></tr>
-	</table>
-<!-- /TMPL_IF -->
-
-<!-- -->
-<!-- TMPL_IF name="else" -->
-<h1>Thesaurus management</h1>
-	<p>Manages thesaurus and authorities files.</p>
-	<ul>
-		<li><b>Dig</b>: see data dependent on this one</li>
-		<li><b>Related</b>: see other forms of this authority entry</li>
-	</ul>
-<div class="tabitem">	<form action="/cgi-bin/koha/admin/thesaurus.pl" method="post">
-		<!-- TMPL_VAR name="tab_list" -->
-		<input type="text" name="searchstring" value="<!-- TMPL_VAR name="searchstring" -->" />
-		<input type="submit" value="OK" class="submit" /></form>
-	<form action="/cgi-bin/koha/admin/thesaurus.pl" method="get"><input type="hidden" value="add_form" name="op" /><input type="submit" class="submit" value="New Category" /></form></div>
-	
-	<!-- TMPL_LOOP name="hierarchy_loop" -->
-		<a href="thesaurus.pl?branch=<!-- TMPL_VAR name="branch" -->&search_category=<!-- TMPL_VAR name="category" -->"><!-- TMPL_VAR name="string" --></a><br />
-	<!-- /TMPL_LOOP -->
-	
-<!-- TMPL_IF NAME="loop" -->
-<table>
-	<tr>
-		<th>&nbsp;</th>
-		<th>Free form</th>
-		<th>Authority</th>
-		<th>Dig</th>
-		<th>Related</th>
-		<th>Edit</th>
-		<th>Delete</th>
-	</tr>	<!-- TMPL_LOOP name="loop" -->
-
-	<tr>
-		<td>&nbsp;</td>
-		<td><!-- TMPL_VAR name="freelib" --></td>
-		<td><!-- TMPL_VAR name="father" --> <!-- TMPL_VAR name="stdlib" --></td>
-		<td><!-- TMPL_VAR name="dig" -->Dig</a></td>
-		<td><!-- TMPL_VAR name="related" -->Related</a></td>
-		<td><a href="<!-- TMPL_VAR name="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0" /></a></td>
-		<td><a href="<!-- TMPL_VAR name="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0" /></a></td>
-	</tr>
-	<!-- /TMPL_LOOP -->
-	</table>
-<!-- /TMPL_IF -->
-<p>		<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-	<input type="hidden" name="op" value="add_form" />
-</p>
-<p><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-	<input type="hidden" name="op" value="add_form" />
-	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->" />
-	<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" />
-	<input type="hidden" name="father" value="<!-- TMPL_VAR name="father" -->" />
-	<input type="submit" class="submit"  value="Add Thesaurus entry" />
-	</form></p>
-<!-- TMPL_VAR name="previous" --> <!-- TMPL_VAR name="next" -->
-<!-- /TMPL_IF -->
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/viewlog.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/viewlog.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/viewlog.tmpl
--- htdocs/intranet-tmpl/default/en/admin/viewlog.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,227 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->System Administration<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<div id="main" >
-
-<!-- TMPL_IF NAME="do_it" -->
-<script language="JavaScript" type="text/javascript">
-function Dopop(link) {
-	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
-}
-</script>
-		<h1 class="parameters">Koha :  <!-- TMPL_VAR NAME="modulename"--> için yapılan işlemler cetveli. Toplam:<!-- TMPL_VAR NAME="counter"--></h1>
-		<!-- TMPL_IF NAME="loopfilter"-->
-			<p>Filtered on</p>
-			<!-- TMPL_LOOP NAME="loopfilter" -->
-					<p><!-- TMPL_IF NAME="err" --> <font color="red"> <b><!--/TMPL_IF --><label class="label100"> <!-- TMPL_VAR NAME="name"--> =</label><!-- TMPL_VAR NAME="value"--><!-- TMPL_IF NAME="err" --> </font> </b><!--/TMPL_IF --></p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_IF -->
-		<br>
-		<table border="1">
-			<!-- TMPL_IF NAME="cataloguing" -->
-				<tr >
-							<th class="parameters">Modified on
-							</th>
-							<th class="parameters">Title
-							</th>
-							<th class="parameters">Librarian
-							</th>
-							<th class="parameters">Action
-							</th>
-							<th class="parameters">Info
-							</th>
-				</tr>
-				<!-- TMPL_LOOP NAME="looprow" -->
-					<!-- TMPL_IF NAME="hilighted" --><tr class="higlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-						<td><!-- TMPL_VAR NAME="day" --><br/>(<!-- TMPL_VAR NAME="timestamp" -->)
-						</td>
-						<td><!-- TMPL_VAR NAME="title" -->, <!-- TMPL_VAR NAME="author" -->
-						</td>
-						<td><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->
-						</td>
-						<td><!-- TMPL_IF NAME="action" --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
-						</td>
-						<td><!-- TMPL_IF NAME="info" --><!-- TMPL_VAR NAME="info" --><!-- /TMPL_IF -->
-						</td>
-					</tr>
-				<!-- /TMPL_LOOP -->
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF NAME="circulation" -->
-				<tr >
-							<th class="parameters">Timestamp
-							</th>
-							<th class="parameters">Circulation
-							</th>
-							<th class="parameters">Title
-							</th>
-							<th class="parameters">User
-							</th>
-							<th class="parameters">Action
-							</th>
-							
-				</tr>
-				<!-- TMPL_LOOP NAME="looprow" -->
-					<!-- TMPL_IF NAME="hilighted" --><tr class="higlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-						<td><!-- TMPL_VAR NAME="timestamp" -->
-						</td>
-						
-						<td><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->
-						</td>
-						<td><!-- TMPL_VAR NAME="title" -->, <!-- TMPL_VAR NAME="object" -->
-						</td>
-						
-						<td><a  href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="info" -->"><!-- TMPL_VAR NAME="first" --> <!-- TMPL_VAR NAME="last" -->
-						</td>
-						<td><!-- TMPL_IF NAME="action" --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
-						</td>
-					</tr>
-				<!-- /TMPL_LOOP -->
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF NAME="members" -->
-				<tr >
-							<th class="parameters">Timestamp
-							</th>
-							<th class="parameters">Librarian
-							</th>
-							<th class="parameters">Action
-							</th>
-							<th class="parameters">Member
-							</th>
-							<th class="parameters">Info
-							</th>
-							
-				</tr>
-				<!-- TMPL_LOOP NAME="looprow" -->
-					<!-- TMPL_IF NAME="hilighted" --><tr class="higlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-						<td><!-- TMPL_VAR NAME="timestamp" -->
-						</td>
-						
-						<td><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->
-						</td>
-						<td><!-- TMPL_VAR NAME="action" -->
-						</td>
-						
-						<td><a  href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="object" -->"><!-- TMPL_VAR NAME="first" --> <!-- TMPL_VAR NAME="last" -->(<!-- TMPL_VAR NAME="card" -->)
-						</td>
-						<td><!-- TMPL_VAR NAME="info" -->
-						</td>
-					</tr>
-				<!-- /TMPL_LOOP -->
-				<!-- /TMPL_IF -->
-		</table>
-<!-- TMPL_ELSE -->
-	<h1 class = "parameters">Koha : Display Logs </h1>
-	<form method="post">
-	
-	<table>
-		<thead>
-			<tr>
-			<th class="parameters">On Module</th>
-			<th class="parameters">User/Action Filters</th>
-			<th class="parameters">Object Filter</th>
-			</tr>
-		</thead>
-		<tbody>
-			<tr>
-				<td>
-					<select name="module">
-						<option value ="circulation" checked>Ödünç verme</option>
-						<option value ="cataloguing" >Eser kaydı</option>
-						<option value ="members">Ãœyeler</option>
-						
-					</select>
-				</td>
-				<td>
-				<p>
-					Librarian : <input type="text" name="user" value="">
-				</p>
-				<p>	Action type : <select name="action">
-						<option value ="">Tümü</option>
-						
-						<option value ="issue">Ödünç</option>
-						<option value ="renew">Uzatma</option>
-						<option value ="return">Ä°ade</option>
-						<option value ="add">Ekleme</option>
-						<option value ="delete">Silme</option>
-						<option value ="modify">DeÄŸiÅŸme</option>
-					</select>
-				</p>
-				<p> From <input type="text" readonly="readonly" size="10" id="from" name="from" >
-							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
-								<script language="JavaScript" type="text/javascript">
-									function validate1(date) {
-										var day = date.getDate();
-										var month = date.getMonth() + 1;
-										var year = date.getFullYear();
-										var weekDay = date.getDay();
-										var dayMonth = month + '-' + day;
-										var dateString = year + '-' + month + '-' + day;
-										var dateTo = document.getElementById('to').value.split("-");
-										var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
-										if (date > limitDate) {
-											return true;
-										} else {
-											return false;
-										}
-									}
-					
-									Calendar.setup(
-										{
-											inputField : "from",
-											ifFormat : "%Y-%m-%d",
-											button : "openCalendarFrom",
-											disableFunc : validate1,
-											dateStatusFunc : validate1
-										}
-									);
-								</script>
-					To <input readonly="readonly" size="10" id="to" name="Filter" value="" type="to">
-						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
-							<script type="text/javascript">
-								function validate2(date) {
-									var day = date.getDate();
-									var month = date.getMonth() + 1;
-									var year = date.getFullYear();
-									var weekDay = date.getDay();
-									var dayMonth = month + '-' + day;
-									var dateString = year + '-' + month + '-' + day;
-									var dateFrom = document.getElementById('from').value.split("-");
-									var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
-									if (limitDate > date) {
-										return true;
-									} else {
-										return false;
-									}
-								}
-		
-								Calendar.setup(
-									{
-										inputField : "to",
-										ifFormat : "%Y-%m-%d",
-										button : "openCalendarTo",
-										disableFunc : validate2,
-										dateStatusFunc : validate2
-									}
-								);
-							</script>
-				</td>
-			</tr>
-	</table>
-	
-	<div id="bloc25">
-		<h3 class="parameters"> Output </h3>
-		<input type="radio" checked name="output" value="screen" > To screen into the browser
-		<br>
-		<input type="radio" name="output" value="file"> To file <input type="text" name="basename" value="Export"> into an application  
-		<!-- TMPL_VAR NAME="CGIextChoice" -->
-		<!-- TMPL_VAR NAME="CGIsepChoice" -->
-	</p>
-	</div>
-	<p>
-	<input TYPE="submit" value="OK" class="button parameters">
-	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">
-	<input type="hidden" name="do_it" value="1">
-	</form>
-<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/admin/z3950servers.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/admin/z3950servers.tmpl
diff -N htdocs/intranet-tmpl/default/en/admin/z3950servers.tmpl
--- htdocs/intranet-tmpl/default/en/admin/z3950servers.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,294 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF NAME="else" -->z39.50 Servers<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME=searchfield -->Modify z39.50 Server <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->Add z39.50 Server<!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_validate" -->z39.50 Server Added<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirmed" -->z39.50 Server Deleted<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main"><!-- TMPL_IF NAME="add_form" -->
-        <script language="JavaScript" type="text/javascript">
-        //
-        function isNotNull(f,noalert) {
-                if (f.value.length ==0) {
-                    return false;
-                }
-                return true;
-        }
-        //
-        function toUC(f) {
-                var x=f.value.toUpperCase();
-                f.value=x;
-                return true;
-        }
-        //
-        function isNum(v,maybenull) {
-        var n = new Number(v.value);
-        if (isNaN(n)) {
-                return false;
-                }
-        if (maybenull==0 && v.value=='') {
-                return false;
-        }
-        return true;
-        }
-        //
-        function isDate(f) {
-                var t = Date.parse(f.value);
-                if (isNaN(t)) {
-                       return false;                       
-                }
-        }
-        //
-        function Check(f) {
-                var ok=1;
-                var _alertString="";
-                var alertString2;
-                if (f.searchfield.value.length==0) {
-                        _alertString += "- site name missing\n";
-                }
-                if (f.host.value.length==0) {
-                        _alertString += "- host missing\n";
-                }
-                if (f.port.value.length==0) {
-                        _alertString += "- port missing\n";
-                }
-                if (f.db.value.length==0) {
-                        _alertString += "- database missing\n";
-                }
-                if (isNaN(f.port.value)) {
-                        _alertString += "- port must be a number\n";
-                }
-                if (isNaN(f.rank.value)) {
-                        _alertString += "- rank must be a number\n";
-                }
-                if (isNaN(f.checked.value) || f.checked.value<0 || f.checked.value>1) {
-                        _alertString += "- checked must be 0 or 1\n";
-                }
-                if (_alertString.length==0) {
-                        document.Aform.submit();
-                } else {
-                        alertString2 = "Form not submitted because of the following problem(s)\n";
-                        alertString2 += "------------------------------------------------------------------------------------\n\n";
-                        alertString2 += _alertString;
-                        alert(alertString2);
-                }
-        }
-        </script>
-
-       
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-        <input type="hidden" name="op" value="add_validate" />
-<!-- TMPL_IF NAME=searchfield -->
-                <h1>Modify Z39.50 Server</h1>
-        <!-- TMPL_ELSE -->
-                <h1>Add Z39.50 Server</h1>
-        <!-- /TMPL_IF -->                
-        <div class="data"><table>
-        <!-- TMPL_IF NAME=searchfield -->
-                <tr>
-                        <th>Display Name</th>
-                        <td>
-                                <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
-                        </td>
-                </tr>
-        <!-- TMPL_ELSE -->
-                <tr>
-                        <th>Display name</th>
-                        <td>
-                                <input type="text" name="searchfield" size="65" maxlength="100"  />
-                        </td>
-                </tr>
-        <!-- /TMPL_IF -->
-
-		<tr>
-			<th>Z3950 server</th>
-			<td>
-				<input type="text" name="host" size="30" value="<!-- TMPL_VAR NAME="host" -->" />
-			</td>
-		</tr>
-		<tr>
-			<th>Port</th>
-			<td>
-				<input type="text" name="port" size="5" value="<!-- TMPL_VAR NAME="port" -->" onblur="isNum(this)" />
-			</td>
-		</tr>
-		<tr>
-			<th>Database</th>
-			<td>
-				<input type="text" name="db" value="<!-- TMPL_VAR NAME="db" -->" />
-			</td>
-		</tr>
-		<tr>
-			<th>Userid</th>
-			<td>
-				<input type="text" name="userid" value="<!-- TMPL_VAR NAME="userid" -->" />
-			</td>
-		</tr>
-		<tr>
-			<th>Password</th>
-			<td>
-				<input type="text" name="password" value="<!-- TMPL_VAR NAME="password" -->" />
-			</td>
-		</tr>
-		<tr>
-			<th>Checked (searched by default)</th>
-			<td>
-				<!-- TMPL_VAR NAME="checked" -->  
-			</td>
-		</tr>
-	<tr>
-			<th>Show in OPAC</th>
-			<td>
-				<!-- TMPL_VAR NAME="opacshow" -->
-			</td>
-			</tr>
-		<tr>
-			<th>Search this as online database</th>
-			<td>
-				<!-- TMPL_VAR NAME="onlinecatalog" -->
-			</td>
-		</tr>	
-			<tr>
-			<th>Rank (display order)</th>
-			<td>
-				<input type="text" name="rank" size="4" value="<!-- TMPL_VAR NAME="rank" -->" onblur="isNum(this)" />
-			</td>
-		</tr>
-				<tr>
-			<th>Syntax (z3950 can send<br>
-			 records in various format. Choose one)</th>
-			<td>
-				<select name="syntax">
-					<option value="USMARC">USMARC</option>
-					<option value="UNIMARC">UNIMARC</option>
-				</select>
-			</td>
-		</tr>
-        </table></div><input type="button" value="<!-- TMPL_IF NAME=searchfield -->Update Z39.50 Server<!-- TMPL_ELSE -->Add Z39.50 Server<!-- /TMPL_IF -->" onclick="Check(this.form)" class="submit" />  <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->';" />
-        </form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="add_validate" -->
-<h3>Z39.50 Server Added</h3>
-<div class="form"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="submit" value="OK" class="submit" />
-        </form></div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirm" -->
-	<!-- TMPL_VAR NAME="reqsel" -->
-<h3>Confirm Deletion of Server <em><!-- TMPL_VAR NAME="searchfield" --></em></h3>	
-        <table>
-                <tr>
-                        <td>Display name</td>
-                        <td>
-                                <!-- TMPL_VAR NAME="searchfield" -->
-                        </td>
-                </tr>
-                <tr>
-                        <td>Z3950 host</td>
-                        <td><!-- TMPL_VAR NAME="host" --></td>
-                </tr>
-                <tr>
-                        <td>Port</td>
-                        <td><!-- TMPL_VAR NAME="port" --></td>
-                </tr>
-                <tr>
-                        <td>Database</td>
-                        <td><!-- TMPL_VAR NAME="db" --></td>
-                </tr>
-                <tr>
-                        <td>Userid</td>
-                        <td><!-- TMPL_VAR NAME="userid" --></td>
-                </tr>
-                <tr>
-                        <td>Password</td>
-                        <td><!-- TMPL_VAR NAME="password" --></td>
-                </tr>
-                <tr>
-			<th>This is an online database</th>
-			<td>
-				<!-- TMPL_VAR NAME="onlinecatalog" -->
-			</td>
-		</tr>
-                <tr>
-                        <td>Rank</td>
-                        <td><!-- TMPL_VAR NAME="rank" --></td>
-                </tr>
-                <tr>
-                        <td>                <div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                        <input type="hidden" name="op" value="delete_confirmed" />
-                        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="submit" value="Delete this Server" class="cancel" /></form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="Do Not Delete" class="submit" /></form></div></td>
-                </tr>
-	</table>
-
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirmed" -->
-<h3>Z39.50 Server Deleted</h3>
-<div class="form"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="submit" value="OK" class="submit" />
-</form></div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="else" -->
-<h3>Z39.50 Servers Admininistration</h3>
-         <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-                <input type="submit" name="search" value="Search" class="submit" />
-        </form>
-<div id="results">        <!-- TMPL_IF NAME="searchfield" -->
-                You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
-        <!-- /TMPL_IF --></div>		
-<table>
-                <tr>
-                        <th>Site</th>
-                        <th>Hostname/Port</th>
-                        <th>Database</th>
-                        <th>Userid</th>
-                        <th>Password</th>
-                        <th>Checked</th>
-                        <th>Rank</th> 
-	<th>Show in Opac</th> 
-	<th>Online database</th>            
-						<th>Syntax</th>
-                        <th colspan="2">&nbsp;</th>
-                </tr>
-                <!-- TMPL_LOOP NAME="loop" -->
-               <!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-                        <td><!-- TMPL_VAR NAME="name" --></td>
-                        <td><!-- TMPL_VAR NAME="host" -->:<!-- TMPL_VAR NAME="port" --></td>
-                        <td><!-- TMPL_VAR NAME="db" --></td>
-                        <td><!-- TMPL_VAR NAME="userid" --></td>
-                        <td><!-- TMPL_VAR NAME="password" --></td>
-                        <td><!-- TMPL_IF NAME="checked" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-                        <td><!-- TMPL_VAR NAME="rank" --></td>
-				<td><!-- TMPL_IF NAME="opacshow" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-		<td><!-- TMPL_IF NAME="onlinecatalog" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-
-						<td><!-- TMPL_VAR NAME="syntax" --></td>
-                        <td><form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="name" -->" /><input type="submit" class="submit" value="Edit" /></form></td>
-                        <td><form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="name" -->" /><input type="submit" class="delete" value="Delete" /></form></td>                
-			</tr>
-                <!-- /TMPL_LOOP -->
-	</table>
-<div class="tabitem">
-<!-- TMPL_IF NAME="offsetgtzero" --><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
-	<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevpage" -->" />
-	<input type="submit" value="&lt;&lt; Prev" class="submit">
-</form><!-- /TMPL_IF -->
-<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="hidden" name="op" value="add_form" />
-		<input type="submit" value="Add z39.50 Server" class="submit" />
-</form>
-<!-- TMPL_IF NAME="ltcount" --><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
-	<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextpage" -->" />
-	<input type="submit" value="Next &gt;&gt;" class="submit" />
-</form> <!-- /TMPL_iF -->
- </div>
-
-<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/authorities/auth_finder.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/authorities/auth_finder.tmpl
diff -N htdocs/intranet-tmpl/default/en/authorities/auth_finder.tmpl
--- htdocs/intranet-tmpl/default/en/authorities/auth_finder.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,54 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
-
-
-<div id="main">
-
-<h1>Authority search</h1>
-
-<form name="f" method="post">
-	<input type="hidden" name="nonav" value="<!-- TMPL_VAR NAME="nonav" -->">
-	<input type="hidden" name="op" value="do_search">
-	<input type="hidden" name="type" value="author">
-	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
-	<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
-	<div id="bloc25">
-		<h2 class="authority">Search on</h2>
-		<p>
-			<label class="label100">Authority type</label>
-			<!-- TMPL_VAR NAME="authtypecode" -->
-			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
-		</p>
-		<p>
-			<label class="label100">Main heading(a)</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
-			<input type="hidden" name="marclist" value="mainentry">
-			<input type="hidden" name="and_or" value="and">
-			<input type="hidden" name="excluding" value="">
-			<select name="operator">
-				<option value="all">All words</option>
-				<option value="phrase">Phrase</option>
-			</select>
-			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
-		</p>
-		<p>
-			<label class="label100">Sub heading</label><input type="text" name="value">
-			<input type="hidden" name="marclist" value="">
-			<input type="hidden" name="and_or" value="and">
-			<input type="hidden" name="excluding" value="">
-			<select name="operator">
-				<option value="all">All words</option>
-				<option value="phrase">Phrase</option>
-			</select>
-			
-		</p>
-		<p>
-			<input type="submit" value="Start search" class="button authority">
-		</p>
-	</div>
-</form>
-</div>
-
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-

Index: htdocs/intranet-tmpl/default/en/authorities/auth_linker.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/authorities/auth_linker.tmpl
diff -N htdocs/intranet-tmpl/default/en/authorities/auth_linker.tmpl
--- htdocs/intranet-tmpl/default/en/authorities/auth_linker.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,58 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-
-<div id="main">
-
-<h1>Authority search</h1>
-
-<form name="f" method="post">
-	<input type="hidden" name="nonav" value="<!-- TMPL_VAR NAME="nonav" -->">
-	<input type="hidden" name="op" value="do_search">
-	<input type="hidden" name="type" value="author">
-	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
-	<div id="bloc25">
-		<h2 class="authority">Search on</h2>
-		<p>
-			
-<label for="authtypecode">Authority type</label></th><td><select id="authtypecode" name="authtypecode">
-			<!-- TMPL_LOOP NAME="authtypesloop" -->
-				<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
-					<!-- TMPL_VAR NAME="authtypetext" -->
-				</option>
-			<!-- /TMPL_LOOP -->
-			</select>
-			
-		</p>
-		<p>
-			<label class="label100">Main heading(a)</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
-			<input type="hidden" name="marclist" value="mainentry">
-			<input type="hidden" name="and_or" value="and">
-			<input type="hidden" name="excluding" value="">
-			<select name="operator">
-				<option value="all">All words</option>
-				<option value="phrase">Phrase</option>
-			</select>
-			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
-		</p>
-		<p>
-			<label class="label100">Sub heading</label><input type="text" name="value">
-			<input type="hidden" name="marclist" value="">
-			<input type="hidden" name="and_or" value="and">
-			<input type="hidden" name="excluding" value="">
-			<select name="operator">
-				<option value="all">All words</option>
-				<option value="phrase">Phrase</option>
-			</select>
-			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
-		</p>
-		<p>
-			<input type="submit" value="Start search" class="button authority">
-		</p>
-	</div>
-</form>
-</div>
-
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-

Index: htdocs/intranet-tmpl/default/en/authorities/authorities-home.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/authorities/authorities-home.tmpl
diff -N htdocs/intranet-tmpl/default/en/authorities/authorities-home.tmpl
--- htdocs/intranet-tmpl/default/en/authorities/authorities-home.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,44 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-
-<form name="f" method="post">
-	<input type="hidden" name="op" value="do_search" />
-	<input type="hidden" name="type" value="intranet" />
-	<input type="hidden" name="stype" value="author" />
-	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
-<div class="data"><table>
-<caption>Authority search</caption>
-<tr><th><label for="authtypecode">Authority type</label></th><td><select id="authtypecode" name="authtypecode"  >
-			<!-- TMPL_LOOP NAME="authtypesloop" -->
-				<option value="<!-- TMPL_VAR NAME="value" -->" >
-					<!-- TMPL_VAR NAME="authtypetext" -->
-				</option>
-			<!-- /TMPL_LOOP -->
-			</select></td></tr>
-<tr><th><label id="mainentry">Main entry</label></th><td><select name="operator" id="mainentry">
-				<option value="all">All words</option>
-				<option value="phrase">Phrase</option>
-			</select> <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
-			<input type="hidden" name="marclist" value="mainentry" />
-			
-			</td></tr>			
-<tr><th><label for="anywhere">Anywhere</label></th><td><select name="operator" id="anywhere">
-				<option value="all">All words</option>
-				<option value="phrase">Phrase</option>
-			</select> <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
-			<input type="hidden" name="marclist" value="">
-			
-			</td></tr></table></div>
-		<p>
-			<input type="submit" value="Start search" class="submit">
-		</p>
-</form>
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-

Index: htdocs/intranet-tmpl/default/en/authorities/authorities.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/authorities/authorities.tmpl
diff -N htdocs/intranet-tmpl/default/en/authorities/authorities.tmpl
--- htdocs/intranet-tmpl/default/en/authorities/authorities.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,340 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Authorities
-<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
-<!--TMPL_UNLESS NAME="nonav"--><!-- TMPL_INCLUDE NAME="masthead.inc" --><!--/TMPL_UNLESS-->
-<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
-<!--TMPL_UNLESS NAME="nonav"--><!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" --><!--/TMPL_UNLESS-->
-
-
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
-<div id="main">
-<!-- TMPL_IF name="error" -->
-			<div class="error">
-				<!--TMPL_IF NAME="xmlerror"-->
-				<ul>
-					<li>Non UTF-8 characters present or malformed XML</li>
-					<li>Please correct and save.</li>
-				</ul>
-				<!--/TMPL_IF-->
-			</div>
-<!-- /TMPL_IF -->
-<form method="post" name="f" id="f" action="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->&nonav=<!-- TMPL_VAR NAME="nonav" -->&linkid="+document.form.f.linkid.value >
-	
-<div class="tabitem">
-	<h1>Authority number <!-- TMPL_VAR NAME="authid" --></h1>
-	<p><input type="hidden" name="nonav" value="<!-- TMPL_VAR NAME="nonav" -->"><input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
-		<input type="hidden" name="op" value="add">
-		<input type="hidden" name="addfield_field">
-		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
-		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
-	<input type="hidden" name="linkid" id="linkid" value="0000">
-		<!-- TMPL_IF name="authid" -->
-			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="button authority">
-		<!-- TMPL_ELSE -->
-			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority">
-		<!-- /TMPL_IF -->
-	</p>
-</div>
-<br>
-	<div class="tabs">
-        <!-- TMPL_LOOP name="BIG_LOOP" -->
-            <a href="#" onclick="active(<!-- TMPL_VAR name="number"-->); return false;" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
-        <!--  /TMPL_LOOP -->
-	</div>
-
-
-<! -- RESET PAGINATION -->
-<!-- TMPL_LOOP name="BIG_LOOP" -->
-<!-- hide every tab except the 1st -->
-<!-- TMPL_IF name="number" -->
-    <div name="<!-- TMPL_VAR name="number" -->XX" id="<!-- TMPL_VAR name="number" -->XX" class="tab" style="visibility:hidden">
-<!-- TMPL_ELSE -->
-    <div name="<!-- TMPL_VAR name="number" -->XX" id="<!-- TMPL_VAR name="number" -->XX" class="tab" style="visibility:visible">
-<!-- /TMPL_IF -->
-<!-- TMPL_UNLESS name="number" -->
-    <!-- show duplicate warning on tab 0 only -->
-<!-- TMPL_IF name="duplicateauthid" -->
-			<div class="error">
-				<p>Is this a duplicate of <a href="detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&nonav=<!-- TMPL_VAR name="nonav" -->" onclick="openWindow('detail.pl?nonav=<!-- TMPL_VAR name="nonav" -->&authid=<!-- TMPL_VAR name="duplicateauthid" -->&popup=1', ''; return false;)"><!-- TMPL_VAR name="duplicateauthvalue" --></a>?</p>
-				
-				<ul>
-					
-					<li>If not, click to <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" /> <a href="#" onclick="confirmnotdup(); return false;">Confirm it's not a duplicate</a></li>
-				</ul>
-			</div>
-		<!-- /TMPL_IF -->
-  <!-- /TMPL_UNLESS -->
-    <!-- TMPL_LOOP NAME="innerloop" -->
-		<div style=";" id="tag<!-- TMPL_VAR name="tag"-->">
-        <!-- TMPL_IF name="tag" -->
-        <p class="MARCtag">
-            <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-            <!-- TMPL_UNLESS name="hide_marc" -->
-                <a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a>
-                <input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffff00;'" type="text" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> -
-            <!-- TMPL_ELSE -->
-                <input tabindex="1" type="hidden" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
-            <!-- /TMPL_UNLESS -->
-            <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-            <!-- TMPL_VAR NAME="tag_lib" -->
-            <!-- /TMPL_UNLESS -->
-            <!-- TMPL_IF name="repeatable" --><a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a><!-- /TMPL_IF -->
-        </p>
-        <!-- /TMPL_IF -->
-        <!-- TMPL_LOOP NAME="subfield_loop" -->
-            <!-- TMPL_IF NAME="visibility" -->
-                <a tabindex="1" style="color: grey; font-size: 80%; cursor: se-resize;" id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')">
-                    <!-- TMPL_VAR NAME="subfield" -->
-                </a>
-            <!-- /TMPL_IF -->
-            <div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->">
-                <p>
-                <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-                    <label <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> class="labelsubfield">
-                <!-- /TMPL_UNLESS -->
-                <!-- TMPL_UNLESS name="hide_marc" -->
-                    <img style="cursor: crosshair; color: grey; font-size: 80%;" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/>
-                        <input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
-                <!-- TMPL_ELSE -->
-                    <input type="hidden" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->" value="<!-- TMPL_VAR NAME="subfield" -->"/>
-                <!-- /TMPL_UNLESS -->
-                <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-                    <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
-                    <!-- TMPL_VAR NAME="marc_lib" -->
-                    <!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
-                    </label>
-                <!-- /TMPL_UNLESS -->
-                <!-- TMPL_VAR NAME="marc_value" -->
-                <!-- TMPL_IF NAME="repeatable" -->
-                    <a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a>
-                <!-- /TMPL_IF -->
-                <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->"/>
-                <input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1"/>
-                <input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"/>
-                <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
-                </p>
-            </div>
-        <!-- /TMPL_LOOP -->
-        </div>
-    <!-- /TMPL_LOOP -->
-    </div>
-<!-- /TMPL_LOOP -->
-		<div name="hidden" id="hidden" class="tab">
-		<!-- TMPL_LOOP NAME="hidden_loop" -->
-				<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
-				<input type="hidden" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->" value="<!-- TMPL_VAR NAME="subfield" -->">
-				<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->">
-				<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
-		<!-- /TMPL_LOOP -->
-		</div>
-		<!-- TMPL_IF name="oldauthnumtagfield" -->
-			<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldauthnumtagfield" -->">
-			<input type="hidden" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->" value="<!-- TMPL_VAR NAME="oldauthnumtagsubfield" -->">
-			<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="authid" -->">
-			<input type="hidden" name="mandatory" value="0">
-			<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
-			<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldauthtypetagfield" -->">
-			<input type="hidden" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->" value="<!-- TMPL_VAR NAME="oldauthtypetagsubfield" -->">
-			<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="authtypecode" -->">
-			<input type="hidden" name="mandatory" value="0">
-			<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
-
-		<!-- /TMPL_IF -->
-	</form>
-<script language="JavaScript" type="text/javascript">
-function _(s) { return s } // dummy function for gettext
-function confirmnotdup(){
-	document.getElementById("confirm_not_duplicate").value = 1;
-	var checkform =	document.getElementById("f");
-	Check(checkform);
-}
-function active(numlayer)
-{
-	for (i=0; i <= 9 ; i++ ) {
-		ong = i+"XX";
-		link = "link"+i;
-		if (numlayer==i) {
-			with(document){
-			if (document.getElementById(ong)){
-				document.getElementById(ong).style.visibility="visible";
-			}
-			if(document.getElementById(link)){
-				document.getElementById(link).style.color="#000066";
-				document.getElementById(link).style.backgroundColor="#FFFFCC";
-			}
-			}
-		} else {
-			with(document){
-			if (document.getElementById(ong)){
-				document.getElementById(ong).style.visibility="hidden";
-			}
-			if (document.getElementById(link)) {
-				document.getElementById(link).style.color="#669999";
-				document.getElementById(link).style.backgroundColor="#D8DEB8";
-			}
-			}
-		}
-	}
-}
-active(0);
-function Check(f) {
-	document.body.style.cursor ="wait";
-	// Scan for nonempty fields
-	var field_is_nonempty_p = new Array();
-	for (i=0 ; i<f.field_value.length ; i++) {
-	    field_is_nonempty_p[f.tag[i].value] = 0;
-	}
-	for (i=0 ; i<f.field_value.length ; i++) {
-	    if (f.field_value[i].value.length != 0) {
-		field_is_nonempty_p[f.tag[i].value] += 1;
-	    }
-	}
-
-	// Scan for missing mandatory subfields
-	var total_missing_mandatory_subfields = 0;
-	var missing_mandatory_subfields = new Array();
-	for (i=0 ; i<f.field_value.length-2 ; i++) {
-		if (f.field_value[i].value.length==0 && f.mandatory[i].value==1) {
-		    // We should not flag an error unless the tag is also
-		    // mandatory, or if something else in the tag is entered
-
-		    if (f.tag_mandatory[i].value == 1 || field_is_nonempty_p[f.tag[i].value]) {
-				f.field_value[i].style.backgroundColor="#FF0000";
-				total_missing_mandatory_subfields++;
-			if (f.field_value[i].parentNode.tagName == "B")
-			{
-				missing_mandatory_subfields.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.parentNode.id.substr(0,1) + ")");
-			}
-			else
-			{
-				missing_mandatory_subfields.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.id.substr(0,1) + ")");
-			}
-
-			}
-		} else {
-			f.field_value[i].style.backgroundColor="#FFFFFF";
-		}
-	}
-
-	// Scan for missing mandatory tags
-	var total_missing_mandatory_tags = 0;
-	var seen_mandatory_tag_p = new Array();
-	var missing_mandatory_tags = new Array();
-	for (i=0 ; i<f.field_value.length ; i++) {
-	    var j = f.tag[i].value;
-	    if (!field_is_nonempty_p[j] && f.tag_mandatory[i].value == 1) {
-		if (seen_mandatory_tag_p[j] != 1) {
-		    seen_mandatory_tag_p[j] = 1;
-		    total_missing_mandatory_tags++;
- 		    if (f.field_value[i].parentNode.tagName == "B")
-		    {
-				missing_mandatory_tags.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.parentNode.id.substr(0,1) + ")");
-		    }
-		    else
-		    {
-				missing_mandatory_tags.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.id.substr(0,1) + ")");
-			}
-		}
-		f.field_value[i].style.backgroundColor="#FFFF00";
-	    }
-	}
-
-	var total_errors = total_missing_mandatory_tags + total_missing_mandatory_subfields;
-	var alertString2;
-	if (total_errors!=0) {
-		alertString2  = _("Form not submitted because of the following problem(s)");
-		alertString2 += "\n------------------------------------------------------------------------------------\n";
-		alertString2 += "\n- "+ total_missing_mandatory_tags +_(" mandatory tags empty");
-		for (i=0; i<missing_mandatory_tags.length; i++)
-		{
-			alertString2 += "\n--->"+ missing_mandatory_tags[i];
-		}
-  		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" mandatory fields empty (see bold subfields)");
-		for (i=0; i<missing_mandatory_subfields.length; i++)
-		{
-			alertString2 += "\n--->"+ missing_mandatory_subfields[i];
-		}
-		alert(alertString2);
-	} else {
-		document.forms['f'].submit();
-	}
-}
-function Dopop(link,id) {
- var subf=document.getElementsByName('subfield'+id);
-var fields=document.getElementsByName('field_value'+id);
-var defaultvalue="";
-	for (var s=0; s<fields.length; s++){
-		if (subf.item(s).value == 'a'){
-		defaultvalue=fields.item(s).value;
-		}
-	}
-
-	newin=window.open(link+"&result="+defaultvalue,"",'width=550,height=550,toolbar=false,scrollbars=yes');
-
-}
-
-
-function AddField(field) {
-	document.forms['f'].op.value = "addfield";
-	document.forms['f'].addfield_field.value=field;
-	document.f.submit();
-}
-
-function cloneSubfield(index) {
- var original = document.getElementById(index);
- var clone = original.cloneNode(true);
- clone.setAttribute("id", index + index); 
-// orginput : the value of the original field (in [0] if hide_marc=1, otherwise in [1]
-// image : the up button. don't exist is hide_marc=1
- <!-- TMPL_IF name="hide_marc" -->
-	var orginput = original.getElementsByTagName('input')[0];
- <!-- TMPL_ELSE -->
- 	var orginput = original.getElementsByTagName('input')[1];
-	image = clone.getElementsByTagName('img')[0];
-	image.setAttribute("onclick","upSubfield('" + index + index + "')");
- <!-- /TMPL_IF -->
- trigger = original.getElementsByTagName('a')[0];
- if (trigger) {
- 	trigger.parentNode.removeChild(trigger);
- }
- clonetrigger = clone.getElementsByTagName('a')[0];
- clonetrigger.setAttribute("onclick","cloneSubfield('" + index + index + "')");
- clone.setAttribute("tabindex","1");
- orginput.value = '';
- original.parentNode.insertBefore( clone, original); 
-}
-
-function upSubfield(index) {
-	try{
-		var line = document.getElementById(index); // get the line where the user has clicked.
-	} catch(e) {
-		return;
-	}
-	var tag = line.parentNode; // get the dad of this line. (should be "<div tag=XXX>")
-	
-	// getting all subfields for this tag
-	var subfields = tag.getElementsByTagName('div');
-	var subfieldsLength = subfields.length;
-	if(subfieldsLength<=1) return; // nothing to do if there is just one subfield.
-	// among all subfields 
-	for(var i=0;i<subfieldsLength;i++){ 
-		if(subfields[i].getAttribute('id') == index){ //looking for the subfield which is clicked :
-			if(i==0){ // if the clicked subfield is on the top
-				tag.appendChild(subfields[0]);
-				return;
-			}else{
-				var lineAbove = subfields[i-1];
-				tag.insertBefore(line,lineAbove);
-				return;
-			}
-		}
-	}
-}
-
-function unHideSubfield(index,labelindex) {
-	subfield = document.getElementById(index);
-	subfield.style.display = 'block';
-	label = document.getElementById(labelindex);
-	label.style.display='none';	
-}
-</script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/authorities/blinddetail-biblio-search.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/authorities/blinddetail-biblio-search.tmpl
diff -N htdocs/intranet-tmpl/default/en/authorities/blinddetail-biblio-search.tmpl
--- htdocs/intranet-tmpl/default/en/authorities/blinddetail-biblio-search.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<html>
-<body>
-
-<script language="JavaScript" type="text/javascript">
-
-function goforward()
-{
-var start = <!-- TMPL_VAR NAME="index">;
-var subfields=opener.opener.document.getElementsByName('subfield'+start);
-var fields=opener.opener.document.getElementsByName('field_value'+start);
-// go forward, until reaching the end of the field.
-for  (var i=0; i<fields.length; i++) {
-	if ( subfields.item(i).value == '<!-- TMPL_VAR NAME="linkidsubfield">') {
-		fields.item(i).value = "<!-- TMPL_VAR NAME="authid">";
-	}
-	<!-- TMPL_LOOP NAME="0XX" -->
-		<!-- TMPL_LOOP NAME="subfield" -->
-			if (subfields.item(i).value == '<!-- TMPL_VAR NAME="marc_subfield" -->') 
-			{
-				fields.item(i).value = "<!-- TMPL_VAR NAME="marc_value" -->";
-			}
-		<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-}
-
-	opener.close();
-	self.close();
-	return false;
-
-
-}
-</script>
-<script language="javascript" type="text/javascript">
-window.onload=goforward();
-</script>
-
-
-</body>
-</html>

Index: htdocs/intranet-tmpl/default/en/authorities/blinddetail-linker.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/authorities/blinddetail-linker.tmpl
diff -N htdocs/intranet-tmpl/default/en/authorities/blinddetail-linker.tmpl
--- htdocs/intranet-tmpl/default/en/authorities/blinddetail-linker.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<html>
-<body>
-<script language="JavaScript" type="text/javascript">
-
-function go()
-{
-var index_start = <!-- TMPL_VAR NAME="index" -->;
-var whichfield = opener.opener.document.f.tag[index_start].value;
-i=index_start
-//try to fill authid as linkid to be used for linking authorities
-//opener.opener.document.f.linkid.value="<!-- TMPL_VAR NAME="authid"-->";
-
-// go forward, until reaching the end of the field.
-				opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="authid" -->";
-
-	opener.close();
-	self.close();
-	return false;
-
-
-}
-</script>
-<script language="javascript" type="text/javascript">
-window.onload = go();
-</script>
-</body>
-</html>

Index: htdocs/intranet-tmpl/default/en/authorities/detail.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/authorities/detail.tmpl
diff -N htdocs/intranet-tmpl/default/en/authorities/detail.tmpl
--- htdocs/intranet-tmpl/default/en/authorities/detail.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,50 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities 
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_UNLESS NAME="nonav"--><!-- TMPL_INCLUDE NAME="masthead.inc" --><!--/TMPL_UNLESS-->
-<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
-<!--TMPL_UNLESS NAME="nonav"--><!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" --><!--/TMPL_UNLESS-->
-
-
-<div id="main">
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
-<div class="tabbed"><input type="hidden" name="nonav" value="<!-- TMPL_VAR NAME="nonav" -->">
-	<h1>Authority number : <!-- TMPL_VAR NAME="authid" --> in <!-- TMPL_VAR NAME="authtypetext" --></h1>
-	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->&nonav=<!-- TMPL_VAR NAME="nonav" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" -->"><img border="0" src="<!-- TMPL_VAR NAME="themelang" -->/../images/fileopen.gif" alt="Edit"></a>
-	<!--TMPL_UNLESS NAME="nonav"--><a href="javascript:confirm_deletion()">
-		<img border="0" src="<!-- TMPL_VAR NAME="themelang" -->/../images/erase.gif" alt="Delete"></a>
-	<a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->')"><img border="0" src="<!-- TMPL_VAR NAME="themelang" -->/../images/print.gif" alt="Print"></a>
-	<!--/TMPL_UNLESS--><!--TMPL_IF NAME="count"-->&nbsp;<a href="/cgi-bin/koha/catalogue/catalogue-search.pl?value=<!-- TMPL_VAR NAME="authid" -->&kohafield=authid&amp;op=do_search&amp;zoom=1" class="button authority">Used in <!-- TMPL_VAR NAME="count" --> biblio(s)</a><!--/TMPL_IF-->
-</div>
-
-<div name="0XX" id="0XX" class="tab" style="visibility:visible">
-	<!-- TMPL_LOOP NAME="0XX" -->
-			<p class="MARCtag">
-				<!-- TMPL_VAR NAME="tag" -->
-			</p>
-		<!-- TMPL_LOOP NAME="subfield" -->
-			<p>
-				<label class="labelsubfield">
-				<a href="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->&marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&and_or=and&excluding=&operator=all&stype=author&value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
-					<img border="0" src="<!-- TMPL_VAR NAME="themelang" -->/../images/lupe.gif" height="15" alt="Search">
-				</a>
-				<!-- TMPL_VAR NAME="marc_subfield" -->
-				<!-- TMPL_VAR NAME="marc_lib" --></label>
-				<!-- TMPL_VAR NAME="marc_value" -->
-			</p>
-		<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-</div>
-	
-<script language="JavaScript" type="text/javascript">
-
-function confirm_deletion() {
-	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
-	if (is_confirmed) {
-		window.location="authorities.pl?op=delete&authid=<!-- TMPL_VAR NAME="authid" -->&nonav=<!-- TMPL_VAR NAME="nonav" -->";
-	}
-}
-function Dopop(link) {
-	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
-}
-</script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/authorities/linkresultlist-auth.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/authorities/linkresultlist-auth.tmpl
diff -N htdocs/intranet-tmpl/default/en/authorities/linkresultlist-auth.tmpl
--- htdocs/intranet-tmpl/default/en/authorities/linkresultlist-auth.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,94 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<div id="main">
-	<h1 class="authority">Authority search results</h1>
-		<div id="resultnumber">
-			<p>
-				<!-- TMPL_IF name="displayprev" -->
-					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author&index=<!-- TMPL_VAR NAME="index" -->">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif"  border="0">
-					</a>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP NAME="numbers" -->
-					<!-- TMPL_IF name="highlight" -->
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
-					<!-- TMPL_ELSE -->
-						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author&index=<!-- TMPL_VAR NAME="index" -->">
-							<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
-					<!-- /TMPL_IF -->
-				<!-- /TMPL_LOOP -->
-				<!-- TMPL_IF name="displaynext" -->
-					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author&index=<!-- TMPL_VAR NAME="index" -->">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0"></a>
-				<!-- /TMPL_IF -->
-			</p>
-			<p>
-				<!-- TMPL_IF name="total" -->
-					&nbsp;<b>Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --></b><br><br>
-				<!-- TMPL_ELSE -->
-					&nbsp;No results found.<br>
-				<!-- /TMPL_IF -->
-			</p>
-		</div>
-		<div id="resultlist">
-			<table>
-				<tr>
-					<th class="authority">Summary</th>
-					<th class="authority">Used</th>
-					<th class="authority">Get It!</th>
-					
-				</tr>
-				<tr>
-					<td>Clear any entry</td>
-					<td>&nbsp;</td>
-					<td>
-						<a href="javascript:jumpfull('blinddetail-linker.pl?authid=0&amp;index=<!-- TMPL_VAR NAME="index" -->&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->')" class="button authority">
-							Clear
-						</a>
-					</td>
-				<!-- TMPL_LOOP NAME="result" -->
-					<tr>
-						<td><!-- TMPL_VAR NAME="summary" --></td>
-						<td><!-- TMPL_VAR NAME="used" --> times</td>
-						<td>
-							<a href="javascript:jumpfull('blinddetail-linker.pl?authid=<!-- TMPL_VAR NAME="authid" -->&amp;index=<!-- TMPL_VAR NAME="index" -->')"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/arrow.gif" width="16" height="16" hspace="0" vspace="0" border="0"></a>
-						</td>
-							</tr>
-				<!-- /TMPL_LOOP -->
-			</table>
-	
-		</div>
-		<div id="resultnumber">
-			<p>
-				<!-- TMPL_IF name="displayprev" -->
-					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0">
-					</a>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP NAME="numbers" -->
-					<!-- TMPL_IF name="highlight" -->
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
-					<!-- TMPL_ELSE -->
-						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
-							<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
-					<!-- /TMPL_IF -->
-				<!-- /TMPL_LOOP -->
-				<!-- TMPL_IF name="displaynext" -->
-					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0"></a>
-				<!-- /TMPL_IF -->
-			</p>
-		</div>	
-		<a href="auth_linker.pl?index=<!-- TMPL_VAR NAME="index" -->">Search again</a>
-	</div>
-</div>
-
-<script language="JavaScript" type="text/javascript">
-
-function jumpfull(page)
-{	
-	window.open(page,'','');
-}
-</script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl
diff -N htdocs/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl
--- htdocs/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,95 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
-
-<div id="main">
-	<h1 class="authority">Authority search results</h1>
-		<div id="resultnumber">
-			<p>
-				<!-- TMPL_IF name="displayprev" -->
-					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author&index=<!-- TMPL_VAR NAME="index" -->">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/../images/numbers/prev.gif"  border="0">
-					</a>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP NAME="numbers" -->
-					<!-- TMPL_IF name="highlight" -->
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/../images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
-					<!-- TMPL_ELSE -->
-						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author&index=<!-- TMPL_VAR NAME="index" -->">
-							<img src="<!-- TMPL_VAR NAME="themelang" -->/../images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
-					<!-- /TMPL_IF -->
-				<!-- /TMPL_LOOP -->
-				<!-- TMPL_IF name="displaynext" -->
-					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author&index=<!-- TMPL_VAR NAME="index" -->">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/../images/numbers/next.gif" border="0"></a>
-				<!-- /TMPL_IF -->
-			</p>
-			<p>
-				<!-- TMPL_IF name="total" -->
-					&nbsp;<b>Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --></b><br><br>
-				<!-- TMPL_ELSE -->
-					&nbsp;No results found.<br>
-				<!-- /TMPL_IF -->
-			</p>
-		</div>
-		<div id="resultlist">
-			<table>
-				<tr>
-					<th class="authority">Summary</th>
-					<th class="authority">Used</th>
-					<th class="authority">Get It!</th>
-					<th class="authority">Edit It!</th>
-				</tr>
-				<tr>
-					<td>Clear any entry</td>
-					<td>&nbsp;</td>
-					<td>
-						<a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=0&amp;index=<!-- TMPL_VAR NAME="index" -->')" class="button authority">
-							Clear
-						</a>
-					</td>
-				<!-- TMPL_LOOP NAME="result" -->
-					<tr>
-						<td><!-- TMPL_VAR NAME="summary" --></td>
-						<td><!-- TMPL_VAR NAME="used" --> times</td>
-						<td>
-							<a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=<!-- TMPL_VAR NAME="authid" -->&amp;index=<!-- TMPL_VAR NAME="index" -->')"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/../images/arrow.gif" width="16" height="16" hspace="0" vspace="0" border="0"></a>
-						</td>
-						<td> <a href="/cgi-bin/koha/authorities/authorities.pl?nonav=<!-- TMPL_VAR NAME="nonav" -->&authid=<!-- TMPL_VAR NAME="authid" -->&index=<!-- TMPL_VAR NAME="index" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">Edit<a/></td>
-					</tr>
-				<!-- /TMPL_LOOP -->
-			</table>
-	
-		</div>
-		<div id="resultnumber">
-			<p>
-				<!-- TMPL_IF name="displayprev" -->
-					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/../images/numbers/prev.gif" border="0">
-					</a>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP NAME="numbers" -->
-					<!-- TMPL_IF name="highlight" -->
-						<img src="/intranet-tmpl/default/../images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
-					<!-- TMPL_ELSE -->
-						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
-							<img src="<!-- TMPL_VAR NAME="themelang" -->/../images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
-					<!-- /TMPL_IF -->
-				<!-- /TMPL_LOOP -->
-				<!-- TMPL_IF name="displaynext" -->
-					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/numbers/next.gif" border="0"></a>
-				<!-- /TMPL_IF -->
-			</p>
-		</div><a href="auth_finder.pl?index=<!-- TMPL_VAR NAME="index" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">Search again</a>	
-	</div>
-</div>
-
-<script language="JavaScript" type="text/javascript">
-
-function jumpfull(page)
-{	
-	window.open(page,'','');
-}
-</script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/authorities/searchresultlist.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/authorities/searchresultlist.tmpl
diff -N htdocs/intranet-tmpl/default/en/authorities/searchresultlist.tmpl
--- htdocs/intranet-tmpl/default/en/authorities/searchresultlist.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,110 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="authorities-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-	<h1 class="authority">Authority search results</h1>
-	<div id="resultnumber">
-		<p>
-			<!-- TMPL_IF name="displayprev" -->
-				<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;stype=author&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/../images/numbers/prev.gif" border="0">
-				</a>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="numbers" -->
-				<!-- TMPL_IF name="highlight" -->
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/../images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
-				<!-- TMPL_ELSE -->
-					<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;stype=author&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/../images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0">
-					</a>
-				<!-- /TMPL_IF -->
-			<!-- /TMPL_LOOP -->
-			<!-- TMPL_IF name="displaynext" -->
-				<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;stype=author&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/../images/numbers/next.gif" border="0">
-				</a>
-				<!-- /TMPL_IF -->
-		</p>
-		<p>
-			<!-- TMPL_IF name="total" -->
-			&nbsp;<b>Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --></b><br><br>
-			<!-- TMPL_ELSE -->
-			&nbsp;No results found.<br>
-			<!-- /TMPL_IF -->
-		</p>
-	</div>
-	<div id="resultlist">
-		<table>
-			<tr>
-				<th class="authority">Summary</th>
-				<th class="authority">Used in</th>
-				<th class="authority">Authid/Delete</th>
-				
-			</tr>
-			<!-- TMPL_LOOP NAME="result" -->
-				<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
-				
-					<td><!-- TMPL_VAR NAME="summary" --></td>
-					<td><a href="/cgi-bin/koha/catalogue/catalogue-search.pl?kohafield=authid&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;op=do_search&amp;zoom=1" class="button authority"><!-- TMPL_VAR NAME="used" --> biblio(s)</a></td>
-					
-					<td><!-- TMPL_VAR NAME="authid" -->&nbsp;
-						<!-- TMPL_UNLESS name="used" -->
-						<a href="javascript:do_delete('authorities-home.pl?op=delete&authid=<!-- TMPL_VAR NAME="authid" -->')">Delete</a>
-						<!-- /TMPL_UNLESS -->
-					</td>
-					
-				</tr>
-			<!-- /TMPL_LOOP -->
-		</table>
-	</div>
-	<div id="resultnumber">
-		<p>
-			<!-- TMPL_IF name="displayprev" -->
-				<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;stype=author&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/../images/numbers/prev.gif" border="0">
-				</a>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="numbers" -->
-				<!-- TMPL_IF name="highlight" -->
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/../images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
-				<!-- TMPL_ELSE -->
-					<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;stype=author&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/../images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0">
-					</a>
-				<!-- /TMPL_IF -->
-			<!-- /TMPL_LOOP -->
-			<!-- TMPL_IF name="displaynext" -->
-				<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;stype=author&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/../images/numbers/next.gif" border="0">
-				</a>
-				<!-- /TMPL_IF -->
-		</p>
-	</div>	
-<form name"m" id="m">
-
-From:<input type="text" size="10" name="mergefrom" id="mergefrom" value=""/>&nbsp;&nbsp;To:<input type="text" size="10" id="mergeto" name="mergeto" value=""/>
-<input type="button" class="submit" value="Merge" onclick="do_merge(); return false;" /></form>
-					
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
-
-<script language="JavaScript" type="text/javascript" >
-function do_delete(page)
-{
-window.location = page;
-}
-function do_merge(page)
-{
-
-X = document.forms['m'].elements['mergefrom'].value;
-	Y = document.forms['m'].elements['mergeto'].value;
-var is_confirmed = confirm('Merging from ID:'+X+'  to ID: '+Y+' .Confirm?');
-	if (is_confirmed) {
-window.location="authorities-home.pl?op=merge&mergefrom="+X+"&mergeto="+Y;
-}
-}
-</script>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/barcodes/barcodes.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/barcodes/barcodes.tmpl
diff -N htdocs/intranet-tmpl/default/en/barcodes/barcodes.tmpl
--- htdocs/intranet-tmpl/default/en/barcodes/barcodes.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,106 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Advanced Search<!-- TMPL_INCLUDE NAME="doc-head-barcodes-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-
-
-
-<div class="data">
-	<h1>Barcodes Generator</h1>
-	<ul>
-		<li>Yeni barkod üretmek için 6 rakamlı barkod numarası yazın. Aradaki 4 rakamı program yazacaktır. </li>
-		<li>Eski barkotları yazdırmak için ya tek tek numara girerek yada seri yazdırabilirsiniz.</li>
-		<li>Oluşan PDF dosyasını görmek ve yazdırmak için Acrobat Reader gerekir.</li>
-		<li>Etiket boylarını iyi ayarladığınızdan emin olun.
-		</li>
-	</ul>
-
-	<form id="formulario" method="POST" action="/cgi-bin/koha/barcodes/barcodes.pl" name="form1" onsubmit="return checkFields(this);" >
-		
-		<table class="myTable" border="1"'
-		<input type="hidden" id="labelsconfigs" name="labelsconfigs" value="<!--TMP_VAR NAME='labelsconfig'-->">
-		<caption>Generate barcodes </caption>
-			<!-- TMPL_IF NAME="ERROR" -->
-			<tr>
-				<td colspan="2">
-					<p class="error">Bu numaralı barkot yoktur.</p>
-				</td>
-			</tr>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="tmpFileName" -->
-			<tr>
-				<td colspan="2">
-					<p class="error">Barkotlar <!-- TMPL_VAR NAME="tmpFileName" -->  dosyasına kaydedildi.</p>
-					<a href="/uploaded-files/tmp-pdf/<!-- TMPL_VAR NAME="tmpFileName" -->" target="_blank">Görmek için buraya tıklayın</a>
-				</td>
-			</tr>
-			<!-- /TMPL_IF -->
-  			<tr>
-				<td><label for="rangeType">Basılacak Tür:</label> <!-- TMPL_VAR NAME="RANGE_TYPE" --></td>
-				<td> 
-					<div id="continuous" class="panel" style="display:inline">
-						<table class="ranges">
-							<tr>
-					   			<td>From:</td> 
-								<td><input id="from" type="text" name="from" size="20"></td>
-							</tr>
-							<tr>
-					   			<td>To:</td>
-								<td><input id="to" type="text" name="to" size="20"></td>
-							</tr>
-						</table>
-					</div> 
- 				    <div id="individuals" class="panel" style="display:none">
-						<table class="ranges">
-							<tr>
-								<td width="5%">
-									BarCodes <BR>
-									<input id="inventaryCode" type="text" name="inventaryCode" size="20">
-								<td>
-								<td>	
-									<a href="#" onclick="addItem(); return false;">&gt;&gt;</a><br>
-									<a href="#" onclick="removeItem(); return false;">&lt;&lt;</a>
-								</td>
-								<td width="95%">		   
-									<select id="inventaryList" size="5" style="width:150px">
-									</select>
-									<input type="hidden" id="individualCodes" name="individualCodes">																						
-								</td>
-							</tr>
-						</table>	
-					</div>						
-				</td> 
-			</tr>
-			<tr> <td>Etiket:<select type="text" size=1 id="labelsconfig" name="labelsconfig" onchange="javascript:document.form1.submit()">
-					<option value="itemsLabelConfig" <!--TMPL_IF NAME="itemsLabelConfig"-->selected<!--/TMPL_IF-->>Etiket 1</option>
-					<option value="itemsLabelConfig2" <!--TMPL_IF NAME="itemsLabelConfig2"-->selected<!--/TMPL_IF-->>Etiket 2</option>
-					<option value="itemsLabelConfig3" <!--TMPL_IF NAME="itemsLabelConfig3"-->selected<!--/TMPL_IF-->>Etiket 3</option>
-					</select>
-					
-				</td> 
-				<td><label for="pageType">Sayfa Boyu</label> <input type="text" name="pageType" id="pageType" readonly value="<!-- TMPL_VAR NAME="PAGES" -->" size="10"> <a href="/cgi-bin/koha/barcodes/printerConfig.pl?labelsconfig=<!-- TMPL_VAR NAME="labelsconfigs" -->">[Sayfa düzeni yap]</a></td>
-			</tr>
-			<tr> 
-				<td colspan="2"><label for="text_under_label">Barkot alt yazı: </label>	<input type="text" name="text_under_label" id="text_under_label" size="40" value="<!-- TMPL_VAR name="text_under_label" -->"/> Etiketin altına yazdırmak istediğiniz yazı</td>
-			</tr></table>
-
-						    	<table style="width:50%">
-						<tr>
-							<th colspan="<!-- TMPL_VAR NAME="COL_SPAN" -->">Sayfada baÅŸlama yeri</th>
-						</tr>
-						<!-- TMPL_LOOP NAME="LABEL_TABLE" -->
-							<tr>
-								<!-- TMPL_LOOP NAME="columns" -->
-									<td style="white-space: nowrap;">
-										<input type="radio" id="label" value="<!-- TMPL_VAR NAME="tagname" -->" name="label" <!-- TMPL_VAR NAME="check" -->>  Label  <!-- TMPL_VAR NAME="labelname" --></td>
-								<!-- /TMPL_LOOP -->
-							</tr>
-						<!-- /TMPL_LOOP -->  			    
-					</table>
-					
-<p><input type="submit" value="Generate Barcodes" name="op" class="submit"></p>
-	</form>
-</div>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/barcodes/cbarcodes.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/barcodes/cbarcodes.tmpl
diff -N htdocs/intranet-tmpl/default/en/barcodes/cbarcodes.tmpl
--- htdocs/intranet-tmpl/default/en/barcodes/cbarcodes.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,100 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Advanced Search<!-- TMPL_INCLUDE NAME="doc-head-barcodes-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-
-<div id="main">
-
-
-
-<div class="data">
-	<h1>Membership Card Generator</h1>
-	<ul>
-		<li>Yeni kart üretmek için 7 rakamlı barkod numarası yazın. </li>
-		<li>Resmin yuklendiginden emin olun.</li>
-		<li>Oluşan PDF dosyasını görmek ve yazdırmak için Acrobat Reader gerekir.</li>
-		<li>Üniversite dışı üye kartı basımı ayrıca kart ücreti kaydediyor. Tekrar tekrar üretmeyin!</li>
-	</ul>
-
-	<form id="formulario" method="POST" action="" name="form1" onsubmit="return checkFields(this);" >
-		
-		<table class="myTable" border="1">
-		<caption>Generate barcodes </caption>
-			<!-- TMPL_IF NAME="ERROR" -->
-			<tr>
-				<td colspan="2">
-					<p class="error">Bu numaralı barkot yoktur.</p>
-				</td>
-			</tr>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="tmpFileName" -->
-			<tr>
-				<td colspan="2">
-					<p class="error">Kart numaraları <!-- TMPL_VAR NAME="tmpFileName" -->  dosyasına kaydedildi.</p>
-					<a href="/uploaded-files/tmp-pdf/<!-- TMPL_VAR NAME="tmpFileName" -->" target="_blank">Görmek için buraya tıklayın</a>
-				</td>
-			</tr>
-			<!-- /TMPL_IF -->
-  			<tr>
-				<td><label for="rangeType">Basılacak Tür:</label> <!-- TMPL_VAR NAME="RANGE_TYPE" --></td>
-				<td> 
-					<div id="continuous" class="panel" style="display:inline">
-						<table class="ranges">
-							<tr>
-					   			<td>From:</td> 
-								<td><input id="from" type="text" name="from" size="20"></td>
-							</tr>
-							<tr>
-					   			<td>To:</td>
-								<td><input id="to" type="text" name="to" size="20"></td>
-							</tr>
-						</table>
-					</div> 
- 				    <div id="individuals" class="panel" style="display:none">
-						<table class="ranges">
-							<tr>
-								<td width="5%">
-									BarCodes <BR>
-									<input id="inventaryCode" type="text" name="inventaryCode" size="20">
-								<td>
-								<td>	
-									<a href="#" onclick="addItem(); return false;">&gt;&gt;</a><br>
-									<a href="#" onclick="removeItem(); return false;">&lt;&lt;</a>
-								</td>
-								<td width="95%">		   
-									<select id="inventaryList" size="5" style="width:150px">
-									</select>
-									<input type="hidden" id="individualCodes" name="individualCodes">																						
-								</td>
-							</tr>
-						</table>	
-					</div>						
-				</td> <!-- Fin Rangos -->
-			</tr>
-			<tr> 
-				
-				<td><label for="pageType">Sayfa Boyu</label> <input type="text" name="pageType" id="pageType" readonly value="<!-- TMPL_VAR NAME="PAGES" -->" size="10"> <a href="/cgi-bin/koha/barcodes/cardConfig.pl">[Sayfa düzeni yap]</a></td>
-			</tr>
-			<tr> 
-				<td colspan="2"><label for="text_under_label">Barkot alt yazı: </label>	<input type="text" name="text_under_label" id="text_under_label" size="40" value="<!-- TMPL_VAR name="text_under_label" -->">Barkod altına yazdırmak istediğiniz yazı</td>
-			</tr></table>
-
-						    	<table style="width:50%">
-						<tr>
-							<th colspan="<!-- TMPL_VAR NAME="COL_SPAN" -->">Sayfada baÅŸlama yeri</th>
-						</tr>
-						<!-- TMPL_LOOP NAME="LABEL_TABLE" -->
-							<tr>
-								<!-- TMPL_LOOP NAME="columns" -->
-									<td style="white-space: nowrap;">
-										<input type="radio" id="label" value="<!-- TMPL_VAR NAME="tagname" -->" name="label" <!-- TMPL_VAR NAME="check" -->>  Label  <!-- TMPL_VAR NAME="labelname" --></td>
-								<!-- /TMPL_LOOP -->
-							</tr>
-						<!-- /TMPL_LOOP -->  			    
-					</table>
-					
-<p><input type="submit" value="Generate Cards" name="op" class="submit"></p>
-	</form>
-</div>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/barcodes/mbarcodes.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/barcodes/mbarcodes.tmpl
diff -N htdocs/intranet-tmpl/default/en/barcodes/mbarcodes.tmpl
--- htdocs/intranet-tmpl/default/en/barcodes/mbarcodes.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,100 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Advanced Search<!-- TMPL_INCLUDE NAME="doc-head-barcodes-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-
-<div id="main">
-
-
-
-<div class="data">
-	<h1>Members Barcodes Generator</h1>
-	<ul>
-		<li>Yeni barkod üretmek için 7 rakamlı barkod numarası yazın. </li>
-		<li>Eski barkotları yazdırmak için ya tek tek numara girerek yada seri yazdırabilirsiniz.</li>
-		<li>Oluşan PDF dosyasını görmek ve yazdırmak için Acrobat Reader gerekir.</li>
-		</li>
-	</ul>
-
-	<form id="formulario" method="POST" action="" name="form1" onsubmit="return checkFields(this);" >
-		
-		<table class="myTable" border="1">
-		<caption>Generate barcodes </caption>
-			<!-- TMPL_IF NAME="ERROR" -->
-			<tr>
-				<td colspan="2">
-					<p class="error">Bu numaralı barkot yoktur.</p>
-				</td>
-			</tr>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="tmpFileName" -->
-			<tr>
-				<td colspan="2">
-					<p class="error">Kart numaraları <!-- TMPL_VAR NAME="tmpFileName" -->  dosyasına kaydedildi.</p>
-					<a href="/uploaded-files/tmp-pdf/<!-- TMPL_VAR NAME="tmpFileName" -->" target="_blank">Görmek için buraya tıklayın</a>
-				</td>
-			</tr>
-			<!-- /TMPL_IF -->
-  			<tr>
-				<td><label for="rangeType">Basılacak Tür:</label> <!-- TMPL_VAR NAME="RANGE_TYPE" --></td>
-				<td> 
-					<div id="continuous" class="panel" style="display:inline">
-						<table class="ranges">
-							<tr>
-					   			<td>From:</td> 
-								<td><input id="from" type="text" name="from" size="20"></td>
-							</tr>
-							<tr>
-					   			<td>To:</td>
-								<td><input id="to" type="text" name="to" size="20"></td>
-							</tr>
-						</table>
-					</div> 
- 				    <div id="individuals" class="panel" style="display:none">
-						<table class="ranges">
-							<tr>
-								<td width="5%">
-									BarCodes <BR>
-									<input id="inventaryCode" type="text" name="inventaryCode" size="20">
-								<td>
-								<td>	
-									<a href="#" onclick="addItem(); return false;">&gt;&gt;</a><br>
-									<a href="#" onclick="removeItem(); return false;">&lt;&lt;</a>
-								</td>
-								<td width="95%">		   
-									<select id="inventaryList" size="5" style="width:150px">
-									</select>
-									<input type="hidden" id="individualCodes" name="individualCodes">																						
-								</td>
-							</tr>
-						</table>	
-					</div>						
-				</td> <!-- Fin Rangos -->
-			</tr>
-			<tr> 
-				
-				<td><label for="pageType">Sayfa Boyu</label> <input type="text" name="pageType" id="pageType" readonly value="<!-- TMPL_VAR NAME="PAGES" -->" size="10"> <a href="/cgi-bin/koha/barcodes/mprinterConfig.pl">[Sayfa düzeni yap]</a></td>
-			</tr>
-			<tr> 
-				<td colspan="2"><label for="text_under_label">Barkot alt yazı: </label>	<input type="text" name="text_under_label" id="text_under_label" size="40" value="<!-- TMPL_VAR name="text_under_label -->"> Etiketin altına yazdırmak istediğiniz yazı</td>
-			</tr></table>
-
-						    	<table style="width:50%">
-						<tr>
-							<th colspan="<!-- TMPL_VAR NAME="COL_SPAN" -->">Sayfada baÅŸlama yeri</th>
-						</tr>
-						<!-- TMPL_LOOP NAME="LABEL_TABLE" -->
-							<tr>
-								<!-- TMPL_LOOP NAME="columns" -->
-									<td style="white-space: nowrap;">
-										<input type="radio" id="label" value="<!-- TMPL_VAR NAME="tagname" -->" name="label" <!-- TMPL_VAR NAME="check" -->>  Label  <!-- TMPL_VAR NAME="labelname" --></td>
-								<!-- /TMPL_LOOP -->
-							</tr>
-						<!-- /TMPL_LOOP -->  			    
-					</table>
-					
-<p><input type="submit" value="Generate Barcodes" name="op" class="submit"></p>
-	</form>
-</div>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/barcodes/printerConfig.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/barcodes/printerConfig.tmpl
diff -N htdocs/intranet-tmpl/default/en/barcodes/printerConfig.tmpl
--- htdocs/intranet-tmpl/default/en/barcodes/printerConfig.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,62 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Barcode Generator Printer Configuration<!-- TMPL_INCLUDE NAME="doc-head-barcodes-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-
-	<h1>Printer Configuration</h1>
-	<h3>Set the printer configuration corresponding to your environment</h3>
-	<ul>
-		<li>Set width and height of the label that you are going to work with.</li>
-		<li>Set your system's default DPI.</li>
-		<li>Set the page size.</li>
-		<li>Select how many columns and rows are in your page size.</li>
-		<li>Set the left margin bottom margin the page that you are going to use. This parameters will help to center the barcodes into the labels.</li>
-	</ul>
-
-	<form id="formulario" method="POST" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" name="form1">
-		<input type="hidden" name="saveSettings" value="1" >
-		<input type="hidden" name="labelsconfig" value="<!-- TMPL_VAR NAME="labelsconfig" -->">
-
-		<div class="table"><table border="1" class="myTable">
-			<tr>
-				<th>Label width (in mm)</th>
-				<th>Label height (in mm)</th>
-				<th>System DPI</th>
-				<th>Page Size</th>
-				<th>Columns</th>
-				<th>Rows</th>
-				<th>Margin Bottom (mm)</th>
-				<th>Margin Left (Expressed in mm)</th>
-			<tr>
-  			<tr>
-				<td> <input id="labelWidth" type="text" name="labelWidth" size="5" value="<!-- TMPL_VAR NAME="LABEL_WIDTH" -->"></td>
-				<td><input id="labelHeigth" type="text" name="labelHeigth" size="5" value="<!-- TMPL_VAR NAME="LABEL_HEIGTH" -->"></td>
-				<td><input id="systemDpi" type="text" name="systemDpi" size="5" value="<!-- TMPL_VAR NAME="SYSTEM_DPI" -->"></td>
-				<td><select name="pageType" id="pageType" size="1">
-						<!-- TMPL_IF name="A4" -->
-							<option value="A4" selected>A4</option>
-				        <!-- TMPL_ELSE -->
-							<option value="A4">A4</option>
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF name="Letter" -->
-							<option value="Letter" selected>Letter</option>
-				        <!-- TMPL_ELSE -->
-							<option value="Letter">Letter</option>
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF name="Legal" -->
-							<option value="Legal" selected>Legal</option>
-				        <!-- TMPL_ELSE -->
-							<option value="Legal">Legal</option>
-						<!-- /TMPL_IF -->
-		            </select></td>
-  			    <td><input id="columns" type="text" name="columns" size="5" value="<!-- TMPL_VAR NAME="COLUMNS" -->"></td>
-  			    <td><input id="rows" type="text" name="rows" size="5" value="<!-- TMPL_VAR NAME="ROWS" -->"></td>
-  			    <td><input id="marginBottom" type="text" name="marginBottom" size="5" value="<!-- TMPL_VAR NAME="MARGIN_TOP" -->"></td>
-  			    <td><input id="marginLeft" type="text" name="marginLeft" size="5" value="<!-- TMPL_VAR NAME="MARGIN_LEFT" -->"></td>
-  			</tr></table></div>
-<p>		<input type="submit" value="Save Settings" class="submit"></p>
-	</form>
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/barcodes/shelves.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/barcodes/shelves.tmpl
diff -N htdocs/intranet-tmpl/default/en/barcodes/shelves.tmpl
--- htdocs/intranet-tmpl/default/en/barcodes/shelves.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,175 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Virtual Shelves<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="search-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<!-- TMPL_IF Name="viewshelf" -->
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<table>
-			<caption><!-- TMPL_VAR NAME="shelfname" --></caption>
-				<tr>
-					<th>&nbsp;</th>
-					<th>Title</th>
-					<th>Author</th>
-					<th>Barcode</th>
-				</tr>
-				<!-- TMPL_LOOP Name="itemsloop" -->
-					<tr>
-						<td><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->" /></td>
-						<td><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
-						<td><!-- TMPL_VAR NAME="author" --></td> 
-						<td><!-- TMPL_VAR NAME="barcode" --></td>
-					</tr>
-				<!-- /TMPL_LOOP -->
-			</table>
-			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
-			<input type="hidden" name="modifyshelfcontents" value="1" />
-			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
-			<!-- TMPL_IF name="manageshelf" -->
-				<input type="submit" value="Remove Selected Items" class="submit" />
-			<!-- /TMPL_IF --></form><br>
-
-	<!-- TMPL_IF name="manageshelf" -->
-		<form>
-		<table>
-		<caption>Add a book by barcode</caption>
-		<tr><td><label for="barcode">Barcode:</label></td><td><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
-			<input type="hidden" name="modifyshelfcontents" value="1" />
-			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
-			<input type="text" size="14" maxlength="14" id="barcode" name="addbarcode" />
-			<input type="hidden" name="modifyshelfcontents" value="1" />
-			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="submit" value="Save" class="submit" /></td></tr></table>
-		</form>
-	<!-- /TMPL_IF -->
-		<form action="/cgi-bin/koha/bookshelves/shelves.pl" method="get"><input type="submit" class="submit" value="Return to Virtual Shelves" /></form>
-				</div>
-<!-- TMPL_ELSE -->
-	<!-- TMPL_IF Name="shelves" -->
-		<h1>Bookshelves</h1>
-		<!-- TMPL_IF Name="status1" -->
-			<p class="problem"><!-- TMPL_VAR NAME="string1" --><p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_LOOP Name="paramsloop" -->
-			<!-- TMPL_IF Name="status" -->
-				<p class="problem"><!-- TMPL_VAR NAME="string" --><p>
-			<!-- /TMPL_IF -->
-		<!-- /TMPL_LOOP -->
-		<div id="bloc25">
-					<h2>Select Shelves to Delete</h2>
-					<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
-					<input type="hidden" name="shelves" value="1" />
-						<!-- TMPL_LOOP Name="shelvesloop" -->
-						<!-- TMPL_IF name="canmanage" -->
-						<p>
-							<label></label>
-								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->" />
-							
-								<a href="shelves.pl?viewshelf=<!-- TMPL_VAR name="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a> (<!-- TMPL_VAR NAME="shelfbookcount" --> item(s))
-						</p>
-						<!-- /TMPL_IF -->
-						<!-- /TMPL_LOOP -->
-					<p>
-						<input type="submit" value="Delete Shelves" class="submit" />
-					</p>
-					</form>
-		</div>
-		<div id="bloc25">
-			<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
-				<input type="hidden" name="shelves" value="1" />
-				<h2>Add Shelf</h2>
-				<p><label>Name</label><input type="text" name="addshelf" size="25" /></p>
-				<p><label>Owner</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></p>
-				<p><label>Category</label>
-					<select name="category">
-						<option value="1">Private</option>
-						<option value="2">Public</option>
-						<option value="3">Free</option>
-					</select>
-				</p>
-				<p> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
-					<li> A public can be seen by everybody, but managed only by you.</li>
-					<li> A free can be managed by any user.</li>
-				</p>
-				<p>
-					<input type="submit" value="Add New Shelf" class="submit" />
-					<a href="shelves.pl">back to shelf list</a>
-				</p>
-
-			</form>
-		</div>
-	<!-- TMPL_ELSE -->
-			<table>
-			<caption>Virtual Shelves</caption>
-				<tr>
-					<th>Shelf Name</th>
-					<th>Category</th>
-					<th>Content size</th>
-					<th>&nbsp;</th>
-				</tr>
-				<!-- TMPL_LOOP Name="shelvesloop" -->
-				<tr>
-					<td>
-						<a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
-							<!-- TMPL_VAR NAME="shelfname" -->
-						</a>
-					</td>
-					<td>
-						<!-- TMPL_IF NAME="category1" -->
-							Private
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF NAME="category2" -->
-							Public
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF NAME="category3" -->
-							Free
-						<!-- /TMPL_IF -->
-					</td>
-					<td>
-						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
-					</td>
-					<!-- TMPL_IF name="mine" -->
-						<td>
-							<a href="shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Edit</a>
-							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->						</td>
-					<!-- /TMPL_IF -->
-				</tr>
-				<!-- /TMPL_LOOP -->
-			</table>
-			<form action="shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" class="submit" value="Add or Remove Book Shelves" />
-	<!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="edit" -->
-		<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
-			<input type="hidden" name="op" value="modifsave" />
-			<table>
-			<caption>Editing Shelf <em><!-- TMPL_VAR name="shelfname"--></em></caption>
-			<tr><td><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->" /><label for="shelfname">Name:</label></td><td><input id="shelfname" type="text" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></td></tr>
-			<tr><td><label for="owner">Owner:</label></td><td><input type="hidden" id="owner" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
-			<tr><td><label for="category">Category:</label></td><td><select id="category" name="category">
-					<!-- TMPL_IF name="category1" -->
-						<option value="1" selected>Private</option>
-					<!-- TMPL_ELSE -->
-						<option value="1">Private</option>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF name="category2" -->
-						<option value="2" selected>Public</option>
-					<!-- TMPL_ELSE -->
-						<option value="2">Public</option>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF name="category3" -->
-						<option value="3" selected>Free</option>
-					<!-- TMPL_ELSE -->
-						<option value="3">Free</option>
-					<!-- /TMPL_IF -->
-				</select></td></tr>
-			</table>
-			<ul><li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
-				<li> A public can be seen by everybody, but managed only by you.</li>
-				<li> A free can be managed by any user.</li></ul>
-			<p><input type="submit" value="Save Changes" class="submit" /></p>
-		</form>
-<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/bookshelves/addbookbiblionumber.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/bookshelves/addbookbiblionumber.tmpl
diff -N htdocs/intranet-tmpl/default/en/bookshelves/addbookbiblionumber.tmpl
--- htdocs/intranet-tmpl/default/en/bookshelves/addbookbiblionumber.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Add to Virtual Shelf<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<form>
-	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
-	<table>
-		<caption>Select a Bookshelf</caption>
-		<tr><td><label>Title</label></td><td><!-- TMPL_VAR NAME="title" --></td></tr>
-		<tr><td><label>Author</label></td><td><!-- TMPL_VAR NAME="author" --></td></tr>
-		<tr><td><label>Add to virtual shelf</label></td><td><!-- TMPL_VAR NAME="CGIbookshelves" --></td></tr>
-		<tr><th colspan="2">...or add to a new bookshelf:</th></tr>
-		<tr><td><label for="newbookshelf">Shelf Name:</label> </td><td><input type="text" name="newbookshelf" id="newbookshelf" maxlength="40" size="20" /></td></tr>
-		<tr><td><label for="category">Category:</label> </td><td><select name="category" id="category">
-			<option value="1">Private</option>
-			<option value="2">Public</option>
-			<option value="3">Free</option>
-		</select></td></tr>
-	</table>
-	<input type="submit" value="Add to virtual shelf" class="submit" />
-</form>
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl
diff -N htdocs/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl
--- htdocs/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-<!-- TMPL_INCLUDE Name="popup-top.inc" -->
-<div id="main">
-<h2 class="catalogue">Select bookshelf</h2>
-<form>
-	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
-	<p><label>Title :</label><!-- TMPL_VAR NAME="title" --></p>
-	<p><label>Author :</label><!-- TMPL_VAR NAME="author" --></p>
-	<p><label>Select Bookshelf: </label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
-	<input type="submit" value="Add to shelf" class="button catalogue">
-</form>
-<!-- TMPL_INCLUDE Name="popup-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/bookshelves/mail_request_REJECTED.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/bookshelves/mail_request_REJECTED.tmpl
diff -N htdocs/intranet-tmpl/default/en/bookshelves/mail_request_REJECTED.tmpl
--- htdocs/intranet-tmpl/default/en/bookshelves/mail_request_REJECTED.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-
-§SUBJECT§
-Request rejected
-§END_SUBJECT§
-
-§HEADER§
-Dear user:
-
-§END_HEADER§
-
-§MESSAGE§
-
-The request you have done:
-
-<!-- TMPL_VAR name="request_name" -->
-To be catalogued and added to your virtual shelf "<!-- TMPL_VAR name="shelfname" -->"
-Has been rejected.
-
-§END_MESSAGE§

Index: htdocs/intranet-tmpl/default/en/bookshelves/quicksearch.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/bookshelves/quicksearch.tmpl
diff -N htdocs/intranet-tmpl/default/en/bookshelves/quicksearch.tmpl
--- htdocs/intranet-tmpl/default/en/bookshelves/quicksearch.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,235 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-
-<title>KOHA: INTRANET: Virtual Shelves</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href='<!-- TMPL_VAR name="themelang" -->/includes/intranet.css'>
-
-<SCRIPT LANGUAGE="JavaScript">
-
-	/* Devuelve true si el explorador es Internet Explorer */
-	var IE = document.all?true:false;
-
-	// Captura el evento onkeypress para cualquier navegador
-	if (document.layers) { // Netscape
-		document.captureEvents(Event.KEYPRESS);
-	    document.onkeydown = captureShortKey;
-
-	} else if (document.all) { // Internet Explorer
-	    document.onkeydown = captureShortKey;
-
-	} else if (document.getElementById) { // Netcsape 6
-	    document.onkeydown = captureShortKey;
-
-	}
-
-	function captureShortKey(e) {
-		if (IE) {
-			if (event.ctrlKey) {
-				switch(event.keyCode) {
-					case 56: {
-							   window.close()
-							   break;
-							  }
-				}
-			}
-		} else {
-			if (e.ctrlKey) {
-				switch(e.keyCode) {
-					case 56: {
-							   window.close()
-							   break;
-							  }
-				}
-			}
-		}
-	}
-
-
-function selectItem(biblionumber) {
- 	window.opener.document.getElementById('biblionumber').value = biblionumber;
-	window.close();
-}
-
-function checkclear(frm, ipt) {
-	var cl = document.getElementById('class');
-	var tcl = document.getElementById(ipt);
-	tcl.value = cl.options[cl.selectedIndex].value;
- 	return true;
-}
-
-</SCRIPT>
-<style>
-h1.circulation {
-	background-color: #be6170;
-	color:#FFFFFF;
-	background-image:none;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-
-input.circulation {
-	background-color: #be6170;
-	color:#FFFFFF;
-	background-image:none;
-	text-decoration: normal;
-	font-weight: normal;
-	}
-
-a.circulation {
-	background-color: #be6170;
-	color:#FFFFFF;
-	background-image:none;
-	text-decoration: normal;
-	font-weight: normal;
-	}
-</style>
-
-
-</head>
-<body>
- <div id="main" style="margin:10px;width:95%;padding:5px;">
-	<h1 class="circulation">Quick search</h1>
-
-	<!-- TMPL_IF NAME="dosearch" -->
-
-		<div align="center" style="margin-bottom:10px;padding:3px;border:1px solid black">
-			<table style="border:0">
-				<tr>
-					<td>
-						<a href="/cgi-bin/koha/bookshelves/quicksearch.pl" class="button circulation">Search again</a>
-					</td>
-					<td>
-					    <!-- TMPL_IF NAME="displayprev" -->
-							<a class="button circulation" href="/cgi-bin/koha/bookshelves/quicksearch.pl?op=do_search&startfrom=<!-- TMPL_VAR NAME="prevstartfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->">&lt;&lt;</a>
-    					<!-- /TMPL_IF -->
-                        <!-- TMPL_IF NAME="displaynext" -->
-							<a class="button circulation" href="/cgi-bin/koha/bookshelves/quicksearch.pl?op=do_search&startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->">&gt;&gt;</a>
-    					<!-- /TMPL_IF -->
-					</td>
-					<td align="right">
-						<input type="button" class="button circulation" onclick="window.close()" value="Close (Ctrl + 8)">
-					</td>
-				</tr>
-			</table>
-		</div>
-		<!-- TMPL_IF NAME="result_count" -->
-			<table style="border-spacing:2px;border-collapse:separate">
-				<tr>
-					<th colspan="2">
-						Bibliographic information
-					</th>
-					<th>
-						
-					</th>
-				</tr>
-				<!-- TMPL_LOOP name="results" -->
-					<tr>
-					    <td width="2%" align="center"><!-- TMPL_VAR name="number" --></td>
-						<td  <!-- TMPL_IF name="color" -->class="hilighted"<!-- /TMPL_IF --> >
-							<u>ISBN:</u> <!-- TMPL_VAR name="isbn" --><br>	
-							<u>Title:</u> <!-- TMPL_VAR name="title" --><br>
-							<u>Author:</u> <!-- TMPL_VAR name="author" --><br>
-							<u>Publisher:</u> <!-- TMPL_VAR name="publishercode" --><br>
-						</td>
-						<td style="background-color:#F8F8F8;text-align:center;border:1px solid black">
-                            <a href="javascript: selectItem('<!-- TMPL_VAR name="biblionumber" -->')" ><!-- TMPL_VAR name="biblionumber" --></a> |
-						</td>
-					</tr>
-				<!-- /TMPL_LOOP -->
-			</table>
-			
-			<div align="center" style="margin-top:10px;padding:3px;border:1px solid black">
-			<table style="border:0">
-				<tr>
-					<td>
-						<a href="/cgi-bin/koha/bookshelves/quicksearch.pl" class="button circulation">Seach again</a>
-					</td>
-					<td>
-					    <!-- TMPL_IF NAME="displayprev" -->
-							<a class="button circulation" href="/cgi-bin/koha/bookshelves/quicksearch.pl?op=do_search&startfrom=<!-- TMPL_VAR NAME="prevstartfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->">&lt;&lt;</a>
-    					<!-- /TMPL_IF -->
-                        <!-- TMPL_IF NAME="displaynext" -->
-							<a class="button circulation" href="/cgi-bin/koha/bookshelves/quicksearch.pl?op=do_search&startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->">&gt;&gt;</a>
-    					<!-- /TMPL_IF -->
-					</td>
-					<td align="right">
-						<input type="button" class="button circulation" onclick="window.close()" value="Close (Ctrl + 8)">
-					</td>
-				</tr>
-			</table>
-		</div>
-		<!-- TMPL_ELSE -->
-			
-				<h6 align="center">No results</h6>
-			
-		<!-- /TMPL_IF -->
-	<!-- TMPL_ELSE -->
-	
-	    <div style="float:right; width:40%; padding-right:10px;text-align: left">
-		    <h6>
-		        Complete one of the search criterias.
-			</h6>
-		        <div style="margin-bottom:5px">Item types:</div>
-		    	<select size="1"  id="class" name="class" style="width:170px">
-					<option value="">All</option>
-					<!-- TMPL_LOOP name="itemtype" -->
-				        <option value="<!-- TMPL_VAR name="itemtype" -->"><!-- TMPL_VAR name="description" --></option>
-					<!-- /TMPL_LOOP -->
-				</select>
-		</div>
-
-		<form method="post" action="/cgi-bin/koha/bookshelves/quicksearch.pl" name="title_form" onSubmit="return checkclear(this, 'class1')">
-			<input type="hidden" name="op" value="do_search">
-			<input type="hidden" name="search_type" value="loose">
-			<input type="hidden" name="field_name1" value="title">
-			<input type="hidden" name="ttype1" value="exact">
-			<input type="hidden" id="class1" name="class" value="">
-			<div style="width:80px;float:left">Title:</div> <input type="text" name="field_value1"> <input type="submit" class="button circulation" id="small" value=">>">
-		</form>
-		
-		<form method="post" action="/cgi-bin/koha/bookshelves/quicksearch.pl" name="author_form" onSubmit="return checkclear(this, 'class2')">
-			<input type="hidden" name="op" value="do_search">
-			<input type="hidden" name="search_type" value="loose">
-			<input type="hidden" name="field_name1" value="author">
-			<input type="hidden" name="ttype1" value="exact">
-			<input type="hidden" id="class2" name="class" value="">
-			<div style="width:80px;float:left">Autor:</div> <input type="text" name="field_value1"> <input type="submit" class="button circulation" id="small" value=">>">
-		</form>
-			
-		<form method="post" action="/cgi-bin/koha/bookshelves/quicksearch.pl" name="isbn_form" onSubmit="return checkclear(this, 'class3')">
-			<input type="hidden" name="op" value="do_search">
-			<input type="hidden" name="search_type" value="precise">
-			<input type="hidden" id="class13" name="class" value="">
-			<div style="width:80px;float:left">ISBN:</div> <input type="text" name="isbn"> <input type="submit" class="button circulation"  id="small" value=">>">
-		</form>
-			
-		<form method="post" action="/cgi-bin/koha/bookshelves/quicksearch.pl" name="keyword_form" onSubmit="return checkclear(this, 'class4')">
-			<input type="hidden" name="op" value="do_search">
-			<input type="hidden" name="search_type" value="keyword">
-			<input type="hidden" name="ttype1" value="exact">
-			<input type="hidden" id="class4" name="class" value="">
-			<div style="width:80px;float:left">Word:</div> <input type="text" name="keyword"> <input type="submit" class="button circulation" id="small" value=">>">
-		</form>
-
-		<form method="post" action="/cgi-bin/koha/bookshelves/quicksearch.pl" name="itemnumber_form" onSubmit="return checkclear(this, 'class5')">
-			<input type="hidden" name="op" value="do_search">
-			<input type="hidden" name="search_type" value="precise">
-			<input type="hidden" id="class5" name="class" value="">
-			<div style="width:80px;float:left">Barcode:</div> <input type="text" name="itemnumber"> <input type="submit" class="button circulation" id="small" value=">>">
-		</form>
-		
-		
-	
-		<div align="right">
-			<hr>
-			<input type="button" class="button circulation" onclick="window.close()" value="Close (Ctrl + 8)">
-		</div>
-	<!-- /TMPL_IF -->
-	
-
- </div>	
-</body>
-</html>

Index: htdocs/intranet-tmpl/default/en/bookshelves/shelf-requests.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/bookshelves/shelf-requests.tmpl
diff -N htdocs/intranet-tmpl/default/en/bookshelves/shelf-requests.tmpl
--- htdocs/intranet-tmpl/default/en/bookshelves/shelf-requests.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,154 +0,0 @@
-<!-- TMPL_INCLUDE Name="cat-top.inc" -->
-
-<SCRIPT LANGUAGE="JavaScript">
-
-more = 0;
-less = 0;
-
-function preloadImages() {
-	more = new Image();
-	more.src = "<!-- TMPL_VAR NAME="themelang" -->/images/more.gif";
-	less = new Image();
-	less.src = "<!-- TMPL_VAR NAME="themelang" -->/images/less.gif";
-}
-
-function show(element, img) {
-    var block = document.getElementById(element);
-	if (block.style.display == 'none') {
-	    block.style.display = 'inline';
-	    img.src = less.src;
-	} else {
-		block.style.display = 'none';
-		img.src = more.src;
-	}
-}
-
-preloadImages();
-
-</SCRIPT>
-
-<div id="mainbloc">
-<h1>User Virtual Shelf requests</h1>
-
-<!-- TMPL_IF name="unknown_barcode" -->
-	<h6 id="warning">Unknown barcode.</h6>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="explore" -->
-
-	<form method="POST">
-		Request state
-		<select name="status">
-			<option value="pending"		<!-- TMPL_IF name="PENDING" -->selected<!-- /TMPL_IF --> >Pending</option>
-			<option value="catalogued"  <!-- TMPL_IF name="CATALOGUED" -->selected<!-- /TMPL_IF -->>Catalogued</option>
-			<option value="rejected"	<!-- TMPL_IF name="REJECTED" -->selected<!-- /TMPL_IF -->>Rejected</option>
-		</select>
-		Request type
-		<select name="request_type">
-			<option value=""  >All</option>
-			<option value="file" <!-- TMPL_IF name="file" -->selected<!-- /TMPL_IF --> >File</option>
-			<option value="link" <!-- TMPL_IF name="link" -->selected<!-- /TMPL_IF --> >Link</option>			
-		</select>
-		<input type="submit" value="Ver" class="button">
-	</form>
-
-    <!-- TMPL_IF name="requests" -->
-
-	<table style="background-color:white;border-collapse:separate;border-spacing:1px;">
-	    <tr>
-			<th>
-				Type
-			</th>
-	        <th>
-	            Request
-	        </th>
-	        <th>
-	            User
-	        </th>
-	        <th>
-	            Date
-	        </th>
-	        <th>
-				State
-	        </th>
-			<th colspan="2">
-			</th>
-	    </tr>
-	    <!-- TMPL_LOOP name="requests" -->
-	    <tr <!-- TMPL_IF name="color" -->bgcolor="#ffffcc"<!-- /TMPL_IF -->>
-	        <td align="center" >
-				<!-- TMPL_IF name="link" -->
-					Link
-				<!-- TMPL_ELSE -->
-					File
-				<!-- /TMPL_IF -->
-			</td>
-			<td align="center">
-				<!-- TMPL_IF name="link" -->
-					<a target="_blank" href="<!-- TMPL_VAR name="request_name" -->" > <!-- TMPL_VAR name="request_name" --> </a>
-				<!-- TMPL_ELSE -->
-					<a target="_blank" href="/uploaded-files/shelf-files/<!-- TMPL_VAR name="idRequest" -->-<!-- TMPL_VAR name="request_name" -->" > <!-- TMPL_VAR name="request_name" --> </a>
-				<!-- /TMPL_IF -->
-	        </td>
-	        <td >
-	            <!-- TMPL_VAR name="surname" -->, <!-- TMPL_VAR name="firstname" --> (<!-- TMPL_VAR name="cardnumber" -->)
-	        </td>
-	        <td align="center" >
-	            <!-- TMPL_VAR name="request_date" -->
-	        </td>
-	        <td align="center">
-				<!-- TMPL_IF name="PENDING" -->	
-					Pending
-				<!-- /TMPL_IF -->		
-				<!-- TMPL_IF name="CATALOGUED" -->	
-					Catalogued
-				<!-- /TMPL_IF -->		
-				<!-- TMPL_IF name="REJECTED" -->	
-					Rejected
-				<!-- /TMPL_IF -->		
-	        </td>
-			<td>
-			    <!-- TMPL_UNLESS name="REJECTED" -->
-					<form>
-						<input type="hidden" name="op" value="link_request">
-						<input type="hidden" name="status" value="CATALOGUED">
-						<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
-						<input type="hidden" name="idRequest" value="<!-- TMPL_VAR name="idRequest" -->">
-						Field 001 (MARC)<br>
-						<input type="text" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->">
-						<input type="submit" value=">>" class="button">
-					</form>
-                <!-- /TMPL_UNLESS -->
-			</td>
-			<td valign="bottom">
-			    <!-- TMPL_IF name="PENDING" -->
-			       
-					<form>
-						<input type="hidden" name="op" value="reject_request">
-						<input type="hidden" name="status" value="REJECTED">
-						<input type="hidden" name="idRequest" value="<!-- TMPL_VAR name="idRequest" -->">
-						<input type="submit" value="Reject" class="button">
-					</form>
-				
-		        <!-- /TMPL_IF -->
-	        </td>
-	 	</tr>
-	 	<tr <!-- TMPL_IF name="color" -->bgcolor="#ffffcc"<!-- /TMPL_IF -->>
-	 	    <td colspan="7">
-                <img style="cursor:hand" class="relative" onclick="show('<!-- TMPL_VAR NAME="idRequest" -->', this)" src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif"> Comments
-				
-				<span id="<!-- TMPL_VAR name="idRequest" -->" style="display:none;background-color:white;margin:5px;padding:5px;border: 2px solid black">
-					<!-- TMPL_VAR name="comments" -->
-				</span>
-	        </td>
-	 	</tr>
-	    <!-- /TMPL_LOOP -->
-	</table>
-	<!-- TMPL_ELSE -->
-		<h6>No request found.</h6>
-	
-	<!-- /TMPL_IF -->
-    	<hr>
-<!-- /TMPL_IF -->
-	
-<!-- TMPL_INCLUDE Name="cat-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/bookshelves/shelves.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/bookshelves/shelves.tmpl
diff -N htdocs/intranet-tmpl/default/en/bookshelves/shelves.tmpl
--- htdocs/intranet-tmpl/default/en/bookshelves/shelves.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,457 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Virtual Shelves<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="search-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<SCRIPT LANGUAGE="JavaScript">
-
-more = new Image();
-more.src = "<!-- TMPL_VAR NAME="themelang" -->/images/more.gif";
-less = new Image();
-less.src = "<!-- TMPL_VAR NAME="themelang" -->/images/less.gif";
-function show(element, img) {
-    var block = document.getElementById(element);
-	if (block.style.display == 'none') {
-	    block.style.display = 'inline';
-	    img.src = less.src;
-	} else {
-		block.style.display = 'none';
-		img.src = more.src;
-	}
-}
-
-
-var lastDIVshowed = <!-- TMPL_IF name="id_institution" --><!-- TMPL_VAR name="id_institution" --><!-- TMPL_ELSE -->''<!-- /TMPL_IF -->;
-
-function show_careers(sb) {
-	if (lastDIVshowed != '') {
-		document.getElementById(lastDIVshowed).style.display = 'none';
-	}
-	var item = sb.options[sb.selectedIndex].value;
-	if (item == '') {
-		lastDIVshowed = item;
-	} else {
-		var nextDIV = document.getElementById(item);
-		lastDIVshowed = item;
-		nextDIV.style.display = 'inline';
-	}
-
-}
-
-function checkAll(chk) {
-
-	var form = chk.form;
-
-	var checked = chk.checked;
-	var chks = form.shelfnumber;
-	for (i = 0; i < chks.length ; i++) {
-		if (chks[i].value == chk.value) {
-			chks[i].checked = checked;
-		}
-	}
-}
-
-function checkActualCareers() {
-	var selbox = document.add_form.actual_careers;
-	var radios = document.add_form.careers;
-    for (j = 0; j < radios.length; j++ ) {
-		for (i = 0; i < selbox.options.length; i++) {
-			if (selbox.options[i].value == radios[j].value) {
-				radios[j].checked = true;
-			}
-		}
-	}
-}
-
-function checkCareer(rb) {
-
-	var selbox = document.add_form.actual_careers;
-    var item = -1;
-
-	for (i = 0; i < selbox.options.length; i++) {
-        if (selbox.options[i].value == rb.value) {
-   			item = i;
-		}
-    }
-
-	if (rb.checked) {
-		option = new Option;
-		option.value = rb.value;
-		option.text = rb.id + ' - ' + rb.alt;
-		selbox.options[selbox.options.length] = option;
-	} else if (item != -1) {
-		selbox.options[item] = null;
-	}
-
-}
-
-//this functions trim the leading spaces of a string.
-function trim(s) {
-  while (s.substring(0,1) == ' ') {
-    s = s.substring(1,s.length);
-  }
-  while (s.substring(s.length-1,s.length) == ' ') {
-    s = s.substring(0,s.length-1);
-  }
-  return s;
-}
-
-function validityAdd_Form() {
-	if ( trim(document.add_form.shelfname.value) == '') {
-		alert('Complete el nombre de la estantería virtual');
-		return false;
-	}
-	if ( document.add_form.actual_careers.options.length == 0 ) {
-        alert('The virtual shelf must be asocied at least with one career');
-		return false;
-	}
-	return true;
-}
-
-function openQuickSearch() {
-	    var qs_window = window.open('/cgi-bin/koha/bookshelves/quicksearch.pl','_blanck','height=325,width=550,status=yes,toolbar=no,menubar=no,location=no,resizable=yes,scrollbars=yes,top=100,left=100');
-        qs_window.focus();
-
-	}
-	
-function check_del_shelf_form() {
-	send = false;
-	if ((document.delform) && (chks = document.delform.shelfnumber)) {
-		if (chks.length > 0) {
-     		for (i = 0; i < chks.length ; i++) {
-				if (chks[i].checked) {
-			    	send = true;
- 					break;
-				}
-			}
-		} else if (chks.checked) {
-	    	send = true;
-		}
-	}
-	if (!send) {
-		alert("No shelves seleted to delete.");
-		return false;
-	} else {
-		document.delform.submit();
-	}
-}
-
-function check_del_biblios_form() {
-	send = false;
-	if ((document.delform) && (chks = document.delform.biblionumber)) {
-		if (chks.length > 0) {
-     		for (i = 0; i < chks.length ; i++) {
-				if (chks[i].checked) {
-			    	send = true;
- 					break;
-				}
-			}
-		} else if (chks.checked) {
-	    	send = true;
-		}
-	}
-	if (!send) {
-		alert("No items selected to delete.");
-		return false;
-	} else {
-		document.delform.submit();
-	}
-}
-
-</SCRIPT>
-
-<div id="main">
-<h1>Virtual shelves</h1>
-
-<!-- TMPL_IF Name="add_form" -->
-
-	<!-- TMPL_LOOP name="messages" -->
-		<!-- TMPL_IF Name="duplicated_name" -->
-			<h6 id="warning">There is a virtual shelf with this name</h6>
-		<!-- /TMPL_IF -->
-	<!-- /TMPL_LOOP -->
-
-	<form method="post" action="/cgi-bin/koha/bookshelves/shelves.pl" name="add_form" onSubmit="return validityAdd_Form()">
-		<input type="hidden" name="op" value="<!-- TMPL_VAR Name="op" -->">
-		<input type="hidden" name="id_institution" value="<!-- TMPL_VAR name="id_institution" -->">
-        <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
-		<table style="border:0;">
-			<tr>
-				<td>
-					Shelf name: <br>
-					<input type="text" name="shelfname" value="<!-- TMPL_VAR Name="shelfname" -->">
-				</td>
-				<td>
-					Category: <br>
-					<select name="category">
-						<option value="1" <!-- TMPL_IF Name="private" -->selected<!-- /TMPL_IF --> >Private</option>
-						<option value="2" <!-- TMPL_IF Name="public" -->selected<!-- /TMPL_IF -->>Public</option>
-					</select>
-				</td>
-			</tr>
-
-			<tr>
-				<td width="50%">
-					Educational institutions:<br>
-					<select onchange="show_careers(this)" style="width:325px">
-						<option value=""></option>
-						<!-- TMPL_LOOP name="institutions" -->
-							<option value="<!-- TMPL_VAR name="id_institution" -->" <!-- TMPL_IF Name="selected" -->selected<!-- /TMPL_IF --> ><!-- TMPL_VAR name="institution_name" --></option>
-						<!-- /TMPL_LOOP  -->
-					</select>
-					<br>
-					<select name="actual_careers" readonly size="10" style="width:325px;margin-top:10px">
-					    <!-- TMPL_LOOP name="actual_careers" -->
-							<option value="<!-- TMPL_VAR name="id_career" -->"><!-- TMPL_VAR name="institution_name" --> - <!-- TMPL_VAR name="career_name" --></option>
-						<!-- /TMPL_LOOP  -->
-					</select>
-				</td>
-				<td>
-					<!-- TMPL_LOOP name="institutions_c" -->
-						<div id="<!-- TMPL_VAR Name="id_institution" -->"  style=" <!-- TMPL_IF Name="selected" -->display:inline;<!-- TMPL_ELSE -->display:none;<!-- /TMPL_IF -->">
-							<!-- TMPL_LOOP name="careers" -->
-							    <div style="margin-top:2px; width:100%;background-color:#FFFFCC;border: 1px solid black;padding:2px;">
-								<input onclick="checkCareer(this)" type="checkbox" name="careers" id="<!-- TMPL_VAR Name="institution_name" -->" value="<!-- TMPL_VAR Name="id_career" -->" alt="<!-- TMPL_VAR Name="career_name" -->"><!-- TMPL_VAR Name="career_name" -->
-								</div>
-							<!-- /TMPL_LOOP  -->
-						</div>
-					<!-- /TMPL_LOOP  -->
-				</td>
-			</tr>
-			<tr>
-				<td colspan="2">
-					<input type="submit" class="button" value="Save">
-					<input type="button" class="button" value="Cancel" onclick="document.location.href = '/cgi-bin/koha/bookshelves/shelves.pl?id_institution=<!-- TMPL_VAR Name="id_institution" -->'">
-				</td>
-			</tr>
-
-		</table>
-	</form>
-
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF Name="viewshelfcontent" -->
-
-	<table style="background-color:white">
-	    <tr>
-	        <th>
-	            Shelf
-	        </th>
-	        <th>
-	            Career
-	        </th>
-	    </tr>
-		<tr>
-		    <td>
-		        <!-- TMPL_VAR name="shelfname" --> <br>
-		    </td>
-		    <td>
-		        |
-		        <!-- TMPL_LOOP Name="actual_careers" -->
-                    <!-- TMPL_VAR name="institution_name" --> - <!-- TMPL_VAR name="career_name" --> |
-				<!-- /TMPL_LOOP -->
-		    </td>
-		</tr>
-	</table>
-	<br>
-<!-- TMPL_IF NAME="unknown_biblio" -->
-	    <h6 id="warning">Unknown biblionumber (001 MARC)</h6>
-	<!-- /TMPL_IF -->
-
-    <!-- TMPL_IF name="content" -->
-	<form method="post" action="/cgi-bin/koha/bookshelves/shelves.pl" name="delform">
-	    <input type="hidden" name="op" value="del_items">
-	    <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
-	    <input type="hidden" name="id_institution" value="<!-- TMPL_VAR name="id_institution" -->">
-	<table style="background-color:white">
-	    <tr>
-	        <th colspan="9">Virtual shelf content</th>
-	    </tr>
-	    <tr>
-	        <th></th>
-	        <th></th>
-	        <th align="left">Title</th>
-			<th align="left">Authors</th>
-			<th>Publisher</th>
-	
-			<th>Year</th>
-			<th>Availability</th>
-			<th>&nbsp;</th>
-	    </tr>
-	<!-- TMPL_LOOP name="content" -->
-	    <tr <!-- TMPL_IF name="even" -->bgcolor="#ffffcc"<!-- /TMPL_IF -->>
-	        <td align="center" valign="middle">
-				<img src="<!--TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif " width="16" height="16">
-			</td>
-	        <td width="3%">
-	            <input type="checkbox" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->">
-	        </td>
-	        <td>
-	            <!-- TMPL_IF NAME="color_id" -->
-								<span style='color:<!-- TMPL_VAR NAME="color_id" -->'>
-							<!-- TMPL_ELSE -->
-								<span class="style3">
-							<!-- /TMPL_IF -->
-							<!-- TMPL_IF NAME="itemtype" -->
-								<!-- TMPL_VAR NAME="itdescription" --><br>
-							<!-- /TMPL_IF -->
-	            <a class="transparent" href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR name="title" -->
-				<br>
-					<span style="font-size:90%">
-                    <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_VAR NAME="subtitle" --><br> <!-- /TMPL_IF -->
-					<!-- TMPL_IF NAME="isbn" -->ISBN: <!-- TMPL_VAR NAME="isbn" --> <!-- /TMPL_IF -->
-					</span>
-			</td>
-	        <td>
-	            <!-- TMPL_VAR name="author" -->
-				<br>
-                <!-- TMPL_VAR name="additionalauthors" -->
-	        </td>
-	        <td align="center">
-				<!-- TMPL_VAR name="publishercode" -->
-			</td>
-	        
-			<td align="center">
-				<!-- TMPL_IF NAME="copyrightdate" -->
-					<!-- TMPL_VAR NAME="copyrightdate" -->
-				<!-- TMPL_ELSE -->
-					 <!-- TMPL_VAR name="publicationyear" -->
-				<!-- /TMPL_IF -->
-			</td>
-			<td align="center">
-                    <!-- TMPL_IF NAME="on-loan-p" --> <!-- TMPL_VAR NAME="on-loan-p" --> - On Loan <br> <!-- /TMPL_IF -->
-					    <!-- TMPL_IF NAME="lost-p" --> <!-- TMPL_VAR NAME="lost-p" --> - Lost <br> <!-- /TMPL_IF -->
-					    <!-- TMPL_IF NAME="not-available-p" --> <!-- TMPL_VAR NAME="not-available-p" --> - Not for Loan <br> <!-- /TMPL_IF -->
-							<!-- TMPL_IF name="location-only" -->
-							<!-- TMPL_VAR name="location-only" -->
-						<!-- TMPL_ELSE -->
-							-
-						<!-- /TMPL_IF -->
-				</td>
-				<td align="center">
-					<!-- TMPL_IF NAME="noitems" -->
-								-
-							<!-- TMPL_ELSE -->
-								<!-- TMPL_IF NAME="norequests" -->
-        							 Not for loan
-								<!-- TMPL_ELSE -->
-									<a class="style1"
-									   href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-          								Reserve
-									</a>
-								<!-- /TMPL_IF -->
-							<!-- /TMPL_IF -->
-				</td>
-	    </tr>
-	<!-- /TMPL_LOOP -->
-	</table>
-	</form>
-	<!-- TMPL_ELSE -->
-		<h6> No documents added to this virtual shelf.</h6>
-    <!-- /TMPL_IF -->
-	
-	<table style="border-collapse:separate;border-spacing:2px;">
-		<tr>
-		    <td width="50%" align="center">
-                <input type="button" class="button" onclick="document.location.href = '/cgi-bin/koha/bookshelves/shelves.pl?id_institution=<!-- TMPL_VAR Name="id_institution" -->'" value="Back to virtual shelves">
-				<br>
-				<input type="button" class="button" onclick="javascript: check_del_biblios_form()" value="Delete selected">
-			</td>
-		    <td width="50%" align="left">
-		        <form method="POST" action="/cgi-bin/koha/bookshelves/shelves.pl">
-		        	<h6>Add document</h6>
-					Biblionumber (001 MARC):
-                	<input type="hidden" name="op" value="add_biblio">
-					<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
-    				<input type="input" name="biblionumber" size="15" id="biblionumber">
-					<input type="button" class="button circulation" id="small" value="..." style="margin-top:0px" onClick="openQuickSearch()">
-
-						<input type="submit" class="button" value="Add">
-
-				</form>
-			</td>
- 	</table>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF Name="viewshelfs" -->
-
-	<!-- TMPL_IF Name="biblionumber" -->
-        <a class="button" href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionumber" -->" >Volver al detalle del documento</a>
-    <!-- /TMPL_IF -->
-
-    <form method="post" action="/cgi-bin/koha/bookshelves/shelves.pl" name="delform">
-		<input type="hidden" name="op" value="del">
-    <!-- TMPL_LOOP Name="institutions" -->
-        <h6 style="margin-bottom:5px;">
-		<img style="cursor:hand;border:0" class="relative" onclick="show('inst_<!-- TMPL_VAR name="id_institution" -->', this)" src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif">
-		<!-- TMPL_VAR Name="institution_name" --> (<!-- TMPL_VAR Name="total_shelves" -->)</h6>
-
-		<!-- TMPL_IF Name="selected" -->
-			<span style="display:inline;padding-left:25px;margin-top:5px" id="inst_<!-- TMPL_VAR Name="id_institution" -->">
-		<!-- TMPL_ELSE-->
-		    <span style="display:none;padding-left:25px;margin-top:5px" id="inst_<!-- TMPL_VAR Name="id_institution" -->">
-		<!-- /TMPL_IF -->
-
-		<!-- TMPL_LOOP Name="careers_shelves" -->
-		    <!-- TMPL_IF Name="shelfcount" -->
-			<h5 style="margin-top:5px;margin-left:25px">
-				<img style="cursor:hand;border:0" class="relative" onclick="show('item<!-- TMPL_VAR name="id_career" -->', this)" src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif">
-				<!-- TMPL_VAR Name="career_name" -->  (<!-- TMPL_VAR Name="shelfcount" -->)</h5>
-				<div style="display:none;" id="item<!-- TMPL_VAR Name="id_career" -->">
-				<table style="background-color:white;margin-left:50px;width:90%" >
-
-					<tr>
-						<th></th>
-						<th>Shelf name</th>
-						<th>Documents</th>
-						<th>Owner</th>
-						<th>Category</th>
-						<th></th>
-					</tr>
-					<!-- TMPL_LOOP Name="shelvesloop" -->
-					<tr>
-						<td <!-- TMPL_IF name="color" -->class="hilighted"<!-- /TMPL_IF -->>
-						   
-								<input type="checkbox" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->" <!-- TMPL_IF Name="count" --><!-- /TMPL_IF  --> onclick="checkAll(this)">
-		                    
-						</td>
-						<td <!-- TMPL_IF name="color" -->class="hilighted"<!-- /TMPL_IF -->>
-							<a class="transparent" href="/cgi-bin/koha/bookshelves/shelves.pl?op=viewcontent&shelfnumber=<!-- TMPL_VAR Name="shelfnumber" -->&id_institution=<!-- TMPL_VAR Name="id_institution" -->">
-								<!-- TMPL_VAR Name="shelfname" -->
-							</a>
-						</td>
-						<td align="center" <!-- TMPL_IF name="color" -->class="hilighted"<!-- /TMPL_IF -->><!-- TMPL_VAR Name="count" --></td>
-						<td align="center" <!-- TMPL_IF name="color" -->class="hilighted"<!-- /TMPL_IF -->> <!-- TMPL_VAR Name="surname" -->, <!-- TMPL_VAR Name="firstname" --> </td>
-						<td align="center" <!-- TMPL_IF name="color" -->class="hilighted"<!-- /TMPL_IF -->> <!-- TMPL_IF name="private" -->Private<!-- /TMPL_IF --> <!-- TMPL_IF name="public" -->Public<!-- /TMPL_IF --> </td>
-						<td align="center" <!-- TMPL_IF name="color" -->class="hilighted"<!-- /TMPL_IF -->>
-						    
-							<A class="transparent" href="/cgi-bin/koha/bookshelves/shelves.pl?op=add_form&shelfnumber=<!-- TMPL_VAR Name="shelfnumber" -->&id_institution=<!-- TMPL_VAR Name="id_institution" -->"><img class="relative" style="border:0;width:25px" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" border="0"></a>
-							
-						</td>
-					</tr>
-					<!-- /TMPL_LOOP -->
-				</table>
-				</div>
-			<!-- TMPL_ELSE -->
-			    <!-- <h5 style="margin-top:5px;margin-left:25px"> <!- TMPL_VAR Name="career_name" ->  (<!- TMPL_VAR Name="shelfcount" ->)</h5>-->
-			<!-- /TMPL_IF -->
-		<!-- /TMPL_LOOP -->
-		</span>
- 	<!-- /TMPL_LOOP -->
-	</form>
-	<br>
-
-
-		<input class="button" onclick="javascript: document.location.href ='/cgi-bin/koha/bookshelves/shelves.pl?op=add_form&id_institution=<!-- TMPL_VAR Name="id_institution" -->'" value="Add shelf" type="button">
-		<input class="button" onclick="javascript: check_del_shelf_form()" value="Delete selected" type="button">
-
-<!-- /TMPL_IF -->
-
-</div>
-<SCRIPT LANGUAGE="JavaScript">
-    checkActualCareers();
-</SCRIPT>
-
-
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/catalogue/ISBDdetail.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/catalogue/ISBDdetail.tmpl
diff -N htdocs/intranet-tmpl/default/en/catalogue/ISBDdetail.tmpl
--- htdocs/intranet-tmpl/default/en/catalogue/ISBDdetail.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: ISBD View<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="search-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-
-<div class="tabitem"><form action="MARCdetail.pl" method="get">
-<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
-<input type="submit" class="submit" value="View MARC" /></form> <form action="/cgi-bin/koha/catalogue/moredetail.pl" method="get"><input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" /><input type="hidden" name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->" /><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Item Details" /></form> <form action="detailprint.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Print" onclick="Dopop('detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="biblionumber" /> <input type="submit" value="Place Reserve" class="submit" /></form> <form action="/cgi-bin/koha/cataloguing/addbiblio.pl"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Edit this Record" class="submit" /></form><!-- /TMPL_IF -->
-</div>
-
-	<div class="isbd">
-		<p><!-- TMPL_VAR NAME="ISBD" --></p>
-	</div>
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl
diff -N htdocs/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl
--- htdocs/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,212 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: MARC Record View<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_UNLESS NAME="popup"-->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<!--/TMPL_UNLESS-->
-<div id="main">
-<h2>MARC Record for number <em><!-- TMPL_VAR name="biblionumber" --><!-- TMPL_VAR NAME="biblio_title" --><!-- TMPL_IF NAME="biblio_subtitle" -->: <!-- TMPL_VAR NAME="biblio_subtitle" --><!-- /TMPL_IF --></em></h2>
-<div class="tabitem"><form action="detail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="Brief Display" /></form><!-- TMPL_IF NAME="norequests" -->&nbsp;<!-- TMPL_ELSE --> <form action="/cgi-bin/koha/reserve/request.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <input type="submit" class="submit" value="Place Reserve" /></form>
-		<!-- /TMPL_IF --><form action="detailprint.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple Print View" /></form> <!-- TMPL_IF name="subscriptionid" --><form action="/cgi-bin/koha/bull/subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Subscription" class="submit" /></form>
-<form action="/cgi-bin/koha/bull/serial-issues.pl" method="get"><input type="hidden" name="subscriptionid" value="!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Serial Issues" class="submit" /></form><!-- /TMPL_IF -->  <form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit MARC" /></form> <form action="/cgi-bin/koha/cataloguing/additem.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber"-->" /><input type="submit" class="submit" value="Edit Items" /></form> <form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="cancel" value="Delete Record" onclick="confirm_deletion(); return false;" /></form></div>
-
-<!-- TMPL_IF NAME="0XX" -->
-<table class="marc">
-	<!-- TMPL_LOOP NAME="0XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
-	<!-- TMPL_LOOP NAME="subfield" -->
-	<tr>
-         <td>&nbsp;</td>
-	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS --></td>
-		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
-		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-<!--		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>   -->
-	</tr>
-	<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-     </table>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="1XX" -->
-    <table class="marc">
-	<!-- TMPL_LOOP NAME="1XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
-	<!-- TMPL_LOOP NAME="subfield" -->
-	<tr>
-         <td>&nbsp;</td>
-	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS --></td>
-		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
-		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-	<!--	<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td> -->
-       </tr>
-	<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-     </table>
-	 <!-- /TMPL_IF -->
-	 
-<!-- TMPL_IF NAME="2XX" -->
-    <table class="marc">
-	<!-- TMPL_LOOP NAME="2XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
-	<!-- TMPL_LOOP NAME="subfield" -->
-	<tr>
-         <td>&nbsp;</td>
-	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
-		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
-		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-<!--		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td> -->
-       </tr>
-	<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-     </table>
-	 <!-- /TMPL_IF -->
-	 
-<!-- TMPL_IF NAME="3XX" -->
-    <table class="marc">
-	<!-- TMPL_LOOP NAME="3XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
-	<!-- TMPL_LOOP NAME="subfield" -->
-	<tr>
-         <td>&nbsp;</td>
-	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
-		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
-		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-<!--		<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td> -->
-       </tr>
-	<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-     </table>
-	 <!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="4XX" -->
-    <table class="marc">
-	<!-- TMPL_LOOP NAME="4XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
-	<!-- TMPL_LOOP NAME="subfield" -->
-	<tr>
-         <td>&nbsp;</td>
-	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
-		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
-		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-	<!--	<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td> -->
-       </tr>
-	<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-     </table>
-	 <!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="5XX" -->
-    <table class="marc">
-	<!-- TMPL_LOOP NAME="5XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
-	<!-- TMPL_LOOP NAME="subfield" -->
-	<tr>
-         <td>&nbsp;</td>
-	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
-		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
-		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-	<!--	<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td> -->
-       </tr>
-	<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-     </table>
-	 <!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="6XX" -->
-    <table class="marc">
-	<!-- TMPL_LOOP NAME="6XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
-	<!-- TMPL_LOOP NAME="subfield" -->
-	<tr>
-         <td>&nbsp;</td>
-	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
-		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
-		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-	<!--	<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td> -->
-       </tr>
-	<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-     </table>
-	 <!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="7XX" -->
-    <table class="marc">
-	<!-- TMPL_LOOP NAME="7XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
-	<!-- TMPL_LOOP NAME="subfield" -->
-	<tr>
-         <td>&nbsp;</td>
-	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
-		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
-		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-	<!--	<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>	-->
-       </tr>
-	<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-     </table>
-	 <!-- /TMPL_IF -->
-
-	 
-<!-- TMPL_IF NAME="8XX" -->
-    <table class="marc">
-	<!-- TMPL_LOOP NAME="8XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
-	<!-- TMPL_LOOP NAME="subfield" -->
-	<tr>
-         <td>&nbsp;</td>
-	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
-		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
-		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-	<!--	<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td> -->
-       </tr>
-	<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-     </table>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="9XX" -->
-    <table class="marc">
-	<!-- TMPL_LOOP NAME="9XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
-	<!-- TMPL_LOOP NAME="subfield" -->
-	<tr>
-         <td>&nbsp;</td>
-	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
-		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
-		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-	<!--	<td><a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->&amp;operator=&#x003D;&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">?</a></td>	-->
-       </tr>
-	<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-     </table>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF NAME="item_loop" -->    <table>
-		<tr>
-			<!-- TMPL_LOOP NAME="item_header_loop" --><th><!-- TMPL_VAR NAME="header_value" --></th><!-- /TMPL_LOOP -->
-		</tr>
-		<!-- TMPL_LOOP NAME="item_loop" -->
-			<tr>
-					<!-- TMPL_VAR NAME="item_value" -->
-			</tr>
-		<!-- /TMPL_LOOP -->
-     </table><!-- /TMPL_IF -->
-
-	 </div>
-	<script language="JavaScript" type="text/javascript">
-function confirm_deletion() {
-	var is_confirmed = confirm('Are you sure you want to delete this record and all the attached items?');
-	if (is_confirmed) {
-		window.location="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
-	}
-}
-function Changefwk(FwkList) {
-  var fwk = FwkList.options[FwkList.selectedIndex].value;
-  window.location = "MARCdetail.pl?biblionumber=<!--TMPL_VAR Name="biblionumber"-->&frameworkcode="+fwk;
-}
-function Addbiblio(op) {
-  var fwk = document.forms['duplicate'].Frameworks.options[document.forms['duplicate'].Frameworks.selectedIndex].value;
-  window.location = "/cgi-bin/koha/cataloguing/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode="+fwk+"&op="+op; 
-}
-</script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/catalogue/bookcount.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/catalogue/bookcount.tmpl
diff -N htdocs/intranet-tmpl/default/en/catalogue/bookcount.tmpl
--- htdocs/intranet-tmpl/default/en/catalogue/bookcount.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Circulation Statistics for <!-- TMPL_VAR Name="title" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1>
-<!-- TMPL_VAR Name="title" --> <!-- TMPL_IF NAME="author" -->(<!-- TMPL_VAR Name="author" -->)<!-- /TMPL_IF --></a></h1>
-<h2>Barcode <!-- TMPL_VAR Name="barcode" --></h2>
-<div class="tabitem"><form action="/cgi-bin/koha/catalogue/detail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->"><input type="hidden" name="type" value="intra"><input type="submit" class="submit" value="Brief Display"></form> <form action="/cgi-bin/koha/catalogue/moredetail.pl" method="get"><input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->"><input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->"><input type="submit" class="submit" value="Item Details"></form><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form action="/cgi-bin/koha/circ/request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="biblionumber"> <input type="submit" value="Place Reserve" class="submit"></form><!-- /TMPL_IF --></div>
-<div class="data">
-<table>
-		<tr><th>Home Branch: </th><td> <!-- TMPL_VAR Name="homebranch" --> </td></tr>
-		<tr><th>Current Branch: </th><td> <!-- TMPL_VAR Name="holdingbranch" --></td></tr>
-		<tr><th>Date arrived at current branch: </th><td> <!-- TMPL_VAR Name="lastdate" --> </td></tr>
-		<tr><th>Number of issues since since the above date :</th><td> <!-- TMPL_VAR Name="count" --> </td></tr>
-</table>
-</div>
-<div class="table">
-		<table>
-			<tr>
-				<th> Branch</th>
-				<th> No. of Issues</th>
-				<th> Last seen at branch</th>
-			</tr>
-			<!-- TMPL_LOOP Name="branchloop" -->
-				<tr>
-					<td class="data"><!-- TMPL_VAR Name="branchname" --> </td>
-					<td class="data"><!-- TMPL_VAR Name="issues" --> </td>
-					<td class="data"><!-- TMPL_VAR Name="seen" --> </td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-		</table></div>
-		</td>
-	</tr>
-</table></div>
-
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/catalogue/catalogue_search.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/catalogue/catalogue_search.tmpl
diff -N htdocs/intranet-tmpl/default/en/catalogue/catalogue_search.tmpl
--- htdocs/intranet-tmpl/default/en/catalogue/catalogue_search.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,253 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Simple Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<div id="main">
-	<h1>Catalogue Search</h1>
-
-<table align ="center" >
-	
-	    <td align ="center">
-	       <input id="searchType1" type="button" value="Zoom Search" onclick="changeSearch1()" <!-- TMPL_IF name="zoom_search" -->style="background-color:orange"<!-- TMPL_ELSE -->style="background-color:yellow"<!-- /TMPL_IF -->>
-		</td>	
-		<td align ="center">
-	       <input id="searchType2" type="button" value="SQL search" onclick="changeSearch2()" <!-- TMPL_IF name="sql_search" -->style="background-color:orange"<!-- TMPL_ELSE -->style="background-color:yellow"<!-- /TMPL_IF --> background-color="orange">
-		</td>
-		<td align ="center">
-	       <input id="searchType3" type="button" value="Brave search" onclick="changeSearch3()" <!-- TMPL_IF name="brave_search" -->style="background-color:orange"<!-- TMPL_ELSE -->style="background-color:yellow"<!-- /TMPL_IF --> background-color="orange">
-		</td>
-	</tr>
-</table>
-
-<form  name="zoom_form" id="zoom_form" action="/cgi-bin/koha/catalogue/catalogue-search.pl" method='post' <!-- TMPL_IF name="zoom_search" -->style="display:inline;"<!-- TMPL_ELSE -->style="display:none;"<!-- /TMPL_IF -->>
-    <input type="hidden" name="op" value="do_search">
-    <input type="hidden" name="search_type" value="zoom">
-    <input type="hidden" name="startfrom" value="0">
-	<input type="hidden" name="zoom" value="1">
-<table style="border:0" align="center"><tbody id="queryarea">
-
-<tr><td ><fieldset><b>Display per page:</b><input type text name="number_of_results" value="10" size="3"/></fieldset></td><td colspan="2"><fieldset><b>Format to display </b>MARC<input type="radio" name="MARC" value="1" checked=1>Brief<input type="radio" name="MARC" value="0"></fieldset></td></tr>
-
-<tr>	<td align="right">Search on:</td><td><select size="1"  name="kohafield" style="width:170px">
-				<!-- TMPL_LOOP name="kohafields" -->
-	                <option value="<!-- TMPL_VAR name="kohafield" -->" <!-- TMPL_IF name="sel" -->selected<!-- /TMPL_IF -->  ><!-- TMPL_VAR name="label" --></option>
-				<!-- /TMPL_LOOP --></select></td><td><input type="text"  size="25" name="value" value="<!-- TMPL_VAR name="value" -->" ></td>
-							<td>With</td><td><Select type="text"  name="relation">
-							<option value=" " <!-- TMPL_IF name="blank" -->selected<!-- /TMPL_IF --> >&nbsp;
-							</option>
-				            			<option value="@attr 5=1 @attr 4=6 " <!-- TMPL_IF name="@attr 5=1 @attr 4=6 " -->selected<!-- /TMPL_IF --> >* wildcard anywhere
-							</option>
-							<option value="@attr 5=100 " <!-- TMPL_IF name="@attr 5=100 " -->selected<!-- /TMPL_IF --> >No truncation
-							</option>
-							<option value="@attr 5=102 " <!-- TMPL_IF name="@attr 5=102 " -->selected<!-- /TMPL_IF --> >Mistakes allowed
-							</option>
-							<option value="@attr 5=1 @attr 6=3 " <!-- TMPL_IF name="@attr 5=1 @attr 6=3 " -->selected<!-- /TMPL_IF --> >Starts with
-							</option>
-							<option value="@attr 2=1  " <!-- TMPL_IF name="@attr 2=1 " -->selected<!-- /TMPL_IF --> >Less than
-							</option>
-							<option value="@attr 2=2  " <!-- TMPL_IF name="@attr 2=2 " -->selected<!-- /TMPL_IF --> >Less than & equal
-							</option>
-							<option value="@attr 2=5  " <!-- TMPL_IF name="@attr 2=5 " -->selected<!-- /TMPL_IF --> >Greater than
-							</option>
-							<option value="@attr 2=4  " <!-- TMPL_IF name="@attr 2=4 " -->selected<!-- /TMPL_IF --> >Greater than & equal
-							</option>
-						</select></td></tr>
-		<tr id="andor"><td>		
-					<Select type="text"   name="and_or">
-				            			<option value="@and" <!-- TMPL_IF name="and" -->selected<!-- /TMPL_IF --> >AND
-							</option>
-							<option value="@or" <!-- TMPL_IF name="or" -->selected<!-- /TMPL_IF --> >OR
-							</option>
-							<option value="@not" <!-- TMPL_IF name="not" -->selected<!-- /TMPL_IF --> >NOT
-							</option>
-						</select></td>
-				<td><select size="1"  name="kohafield" id="kohafield" style="width:170px">
-				
-				<!-- TMPL_LOOP name="kohafields" -->
-	               		 <option value="<!-- TMPL_VAR name="kohafield" -->" <!-- TMPL_IF name="sel" -->selected<!-- /TMPL_IF -->  ><!-- TMPL_VAR name="label" --></option>
-				<!-- /TMPL_LOOP --></select></td><td><input type="text"  size="25" name="value" value="<!-- TMPL_VAR name="value" -->" ></td>
-							<td>With</td><td><Select type="text"  name="relation">
-							<option value=" " <!-- TMPL_IF name="blank" -->selected<!-- /TMPL_IF --> >&nbsp;
-							</option>
-				            			<option value="@attr 5=1 @attr 4=6 " <!-- TMPL_IF name="@attr 5=1 @attr 4=6 " -->selected<!-- /TMPL_IF --> >* wildcard anywhere
-							</option>
-							<option value="@attr 5=100 " <!-- TMPL_IF name="@attr 5=100 " -->selected<!-- /TMPL_IF --> >No truncation
-							</option>
-							<option value="@attr 5=102 " <!-- TMPL_IF name="@attr 5=102 " -->selected<!-- /TMPL_IF --> >Mistakes allowed
-							</option>
-							<option value="@attr 3=1 " <!-- TMPL_IF name="@attr 3=1 " -->selected<!-- /TMPL_IF --> >Starts with
-							</option>
-							<option value="@attr 2=1  " <!-- TMPL_IF name="@attr 2=1 " -->selected<!-- /TMPL_IF --> >Less than
-							</option>
-							<option value="@attr 2=2  " <!-- TMPL_IF name="@attr 2=2 " -->selected<!-- /TMPL_IF --> >Less than & equal
-							</option>
-							<option value="@attr 2=5  " <!-- TMPL_IF name="@attr 2=5 " -->selected<!-- /TMPL_IF --> >Greater than
-							</option>
-							<option value="@attr 2=4  " <!-- TMPL_IF name="@attr 2=4 " -->selected<!-- /TMPL_IF --> >Greater than & equal
-							</option>
-						</select></td></tr></tbody>
-	<tr>
-<td ><fieldset>Limit with itemtype: <br>
-			<input type="hidden" name="kohafield" value="itemtype"/>
-			<input type="hidden" name="and_or" value="@and"/><input type="hidden" name="relation" value="@attr 2=3">
-			<select name="value"  style="width:170px">			
-			<option value="">All item types</option>
-		<!-- TMPL_LOOP NAME="itemtypeloop" -->
-			<option value="<!-- TMPL_VAR NAME="itemtype" -->"><!-- TMPL_VAR NAME="description" --></option>
-		<!-- /TMPL_LOOP -->
-			</select></fieldset>
-</td>
-<td colspan="4">
-	<fieldset>Location:<input type="hidden" name="kohafield" value="holdingbranch"/>
-		<input type="hidden" name="and_or" value="@and"/><input type="hidden" name="relation" value="@attr 2=3">
-		<select name="value" id="branchloop" size="1">
-		<option value="">All Branches</option>
-		<!-- TMPL_LOOP NAME="branchloop" -->
-		<option value=<!-- TMPL_VAR NAME="branchcode" --> ><!-- TMPL_VAR NAME="branchname"--></option>
-		<!-- /TMPL_LOOP -->
-		</select><br>
-		<input type="hidden" name="kohafield" value="onloan"/>
-		<input type="hidden" name="and_or" value="@and"/><input type="hidden" name="relation" value="@attr 2=1">
-		<label for="available-items">Only items currently available</label><input type="checkbox" id="available-items" name="value" value="1"/>
-	</fieldset>
-</td>
-
-</tr>
-<tr>
-			<td colspan="2"><fieldset >Sort on:<select size="1"  name="order" style="width:170px">
-			<option value="">System Ranked</option>	
-			<!-- TMPL_LOOP name="sorts" -->
-	              	  <option value="<!-- TMPL_VAR name="kohafield" -->" <!-- TMPL_IF name="sel" -->selected<!-- /TMPL_IF -->  ><!-- TMPL_VAR name="label" --></option>
-				<!-- /TMPL_LOOP --></select>
-			<select size="1"  name="asc" style="width:100px">
-				<option value=" <i">Ascending</option>
-				<option value=" >i">Descending</option>
-				</fieldset></td>
-		<td colspan="2"><fieldset >Catalogue:<select size="1"  name="serverid" style="width:170px">
-			<option value="-1" selected>Library Catalogue</option>
-			<option value="0">All Catalogues</option>	
-			<!-- TMPL_LOOP name="servers" -->
-	              	  <option value="<!-- TMPL_VAR name="serverid" -->" <!-- TMPL_IF name="sel" -->selected<!-- /TMPL_IF -->  ><!-- TMPL_VAR name="server" --></option>
-				<!-- /TMPL_LOOP --></select>
-			
-				</fieldset></td>
-
-</tr>
-<tr><td colspan=2><input class = "button" type="submit" value="Start search"></td><td><a href="#" onClick="cloneQuery();" title="add another search field">[+]</a></td></tr>
-</table>
-</form>
-<form onSubmit="return checkSQLSearch()" name="precise_form" id="sql_form" action="/cgi-bin/koha/catalogue/catalogue-search.pl" method='post' <!-- TMPL_IF name="sql_search" -->style="display:inline;"<!-- TMPL_ELSE -->style="display:none;"<!-- /TMPL_IF -->>
-
-    <input type="hidden" name = "op" value="do_search">
-    <input type="hidden" name = "search_type" value="sql">
-<input type="hidden" name="zoom" value="0">
-	<table style="border:0" align="center">
-<tr>
-<td><b>Format to display</b></td><td>MARC<input type="radio" name="MARC" value="1" checked=1>Brief<input type="radio" name="MARC" value="0"></td>
-	    <tr>
-			<td>Barcode</td>
-			<td colspan="1"><input type="text"  size="15"   name="barcode" value="<!-- TMPL_VAR name="barcode" -->" onchange="if(this.value != '') {this.form.itemnumber.value = ''; this.form.biblionumber.value = ''}"></td>
-		    <td>Item number</td>
-			<td colspan="1"><input type="text"  size="15"   name="itemnumber" value="<!-- TMPL_VAR name="itemnumber" -->" onchange="if(this.value != '') {this.form.biblionumber.value = ''; this.form.barcode.value = ''} "></td>
-		
-			 <td>Biblio Number</td>
-			<td colspan="1"><input type="text"  size="15"   name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" onchange="if(this.value != '') {this.form.barcode.value = ''; this.form.itemnumber.value = ''} "></td>
-		</tr>
-
-	    <tr>
-			<td colspan = "4" align = "center">
-			    <br>
-				<input class = "button" type="submit" value="Start search">
-	      		</td>
-		</tr>
-
-	</table>
-</form>
-<form onSubmit="return BraveSearch()" name="brave_form" id="brave_form" action="/cgi-bin/koha/catalogue/catalogue-search.pl" method='post' <!-- TMPL_IF name="brave_search" -->style="display:inline;"<!-- TMPL_ELSE -->style="display:none;"<!-- /TMPL_IF -->>
-
-    <input type="hidden" name = "op" value="do_search">
-  <input type="hidden" name="search_type" value="brave">
-<input type="hidden" name="zoom" value="1">
-	<table style="border:0" align="center">
-<tr>
-<td><fieldset><b>Format to display </b>MARC<input type="radio" name="MARC" value="1" checked=1>Brief<input type="radio" name="MARC" value="0"></fieldset></td><td><fieldset><b>Display per page:</b><input type text name="number_of_results" value="10" size="1"/></fieldset></td></tr>
-	    <tr>
-			<td>Query  <textarea name = "value"  id="bravetext" cols="40" rows="5" ></textarea></td>
-			 <td> of type: <select  name = "searchtype" >
-			<option value="pqf">PQF</option>
-			<option value="ccl">CCL</option>
-			<option value="cql">CQL</option>
-			</select>
-			</td>
-		</tr>
-
-	    <tr>
-			<td colspan = "4" align = "center">
-			    <br>
-				<input class = "button" type="submit" value="Start search">
-	      		</td>
-		</tr>
-
-	</table>
-</form>
-</table>	
-</div>
-<script language="JavaScript" type="text/javascript">
-function hideSearchsTypes() {
-            document.getElementById('zoom_form').style.display = 'none';
-            document.getElementById('sql_form').style.display = 'none';
-	 document.getElementById('brave_form').style.display = 'none';
-          
-		}
-
-		function resetButtonsColors() {
-			document.getElementById('searchType1').style.backgroundColor = 'yellow';
-			document.getElementById('searchType2').style.backgroundColor = 'yellow';
-			document.getElementById('searchType3').style.backgroundColor = 'yellow';
-			
-		}
-
-		function changeSearch1() {
-		    resetButtonsColors();
-		    document.getElementById('searchType1').style.backgroundColor = 'orange';
-		    hideSearchsTypes();
-		    document.getElementById('zoom_form').style.display = 'inline';
-		}
-
-        function changeSearch2() {
-            resetButtonsColors();
-		    document.getElementById('searchType2').style.backgroundColor = 'orange';
-		    hideSearchsTypes();
-		    document.getElementById('sql_form').style.display = 'inline';
-		}
-	 function changeSearch3() {
-            resetButtonsColors();
-		    document.getElementById('searchType3').style.backgroundColor = 'orange';
-		    hideSearchsTypes();
-		    document.getElementById('brave_form').style.display = 'inline';
-		}
-function checkSQLSearch() {
-		if ( (document.sql_form.barcode.value == '') &&
-			(document.sql_form.itemnumber.value == '') && (document.sql_form.biblionumber.value == '') ) {
-			alert("Enter a barcode or itemnumber or biblionumber to start searching.");
-			return false;
-		} else {
-		    return true;
-		}
-	}
-
-function BraveSearch() {
-		if ( document.brave_form.text.value == '')   {
-			alert("Enter some code to start searching.");
-			return false;
-		} else {
-		    return true;
-		}
-	}
-function cloneQuery() {
-var cloneoriginal = document.getElementById('andor');
- var clone = cloneoriginal.cloneNode(true);
-queryarea.appendChild(clone);
-
-}
-</script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/catalogue/catalogue_searchresults.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/catalogue/catalogue_searchresults.tmpl
diff -N htdocs/intranet-tmpl/default/en/catalogue/catalogue_searchresults.tmpl
--- htdocs/intranet-tmpl/default/en/catalogue/catalogue_searchresults.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,267 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Simple Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_IF NAME="facets_loop" -->
-<!-- TMPL_INCLUDE NAME="intranet-facets.inc" -->
-<!--TMPL_ELSE-->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<!--/TMPL_IF-->
-<script language="JavaScript" type="text/javascript">
-
-var no_biblios_selected = "Select one or more documents to add to your virtual shelves.";
-var no_shelves_selected = "Select one or more virtual shelves to add the selected documents.";
-
-/*Add the selected biblionumber to the seleted virtual shelves*/
-function addBibliosToShelves(){
-	shelf_frm = document.shelf_form;
-	//check for at least one shelf seleted
-	shelf_sel = false;
-	for (var i=0; i < shelf_frm.shelfnumber.length; i++) {
-		if (shelf_frm.shelfnumber[i].checked) {
-			shelf_sel = true;
-			break;
-		}
-	}
-	if (shelf_sel) {
-	    shelf_frm.biblios.value = '';
-		for (var i=0; i < document.myform.bibid.length; i++) {
-			if (document.myform.bibid[i].checked) {
-				shelf_frm.biblios.value = shelf_frm.biblios.value + document.myform.bibid[i].value + ",";
-			}
-		}
-		if (shelf_frm.biblios.value == '') {
-            alert(no_biblios_selected);
-		} else {
-			shelf_frm.submit();
-		}
-	} else {
-        alert(no_shelves_selected);
-	}
-}
-
-function show_shelfPanel() {
-
-	if (document.getElementById('shelf_panel').style.display == 'block') {
-	    //document.getElementById('shelf_panel').style.visibility = 'hidden';
-	    document.getElementById('shelf_panel').style.display = 'none';
-	} else {
-	    document.getElementById('shelf_panel').style.display = 'block';
-        //document.getElementById('shelf_panel').style.visibility = 'visible';
-	}
-}
-
-</script>
-
-
-<div id="main" align="center">
-    <h1>Catalogue search</h1>
-<!-- TMPL_IF name="error" --><div class="error">The server is too busy TRY AGAIN!</div>
-<!-- TMPL_ELSE -->
-	<!-- TMPL_LOOP NAME="searchdesc" -->
-    	You searched:
-    	<div style="color:green;">|&nbsp;
-	 <!-- TMPL_VAR name="query" -->&nbsp;|&nbsp;
-		</div>
-	<!-- /TMPL_LOOP -->
-
-<!-- TMPL_IF name="onlineloop" -->
-<div class="pages">
-<table width="80%"  border="0" align="center">
-<th colspan="3">Documents Found</th>
-	 <tr bgcolor="#DCD9CF">
-		<td bgcolor="#DCD9CF" >Database</td>
-		<td bgcolor="#DCD9CF" >Results</td>
-		<td bgcolor="#DCD9CF">View</td>
-		
-	</tr>
-	<tr bgcolor="#99cccc" >
-			<td>NEU Library Catalogue</td>
-			<td><!-- TMPL_VAR NAME="numrecords" --></td>
-	<td><a  href="catalogue-search.pl?op=do_search&amp;zoom=1<!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&serverid=-1">View results</a></td>
-	</tr>
-	<!-- TMPL_LOOP name="onlineloop" -->
-		<tr <!--TMPL_IF NAME="even"-->bgcolor="DEE5E7"<!--TMPL_ELSE-->bgcolor="#F2F0E9"<!--/TMPL_IF-->>
-			<td><!-- TMPL_VAR NAME="server" --></td>
-			<td><!-- TMPL_VAR NAME="numresults" --></td>
-			<td><a href='<!-- TMPL_VAR NAME="search_string" -->' target="_blank">Click to view</a></td>
-			
-			
-		</tr>
-	<!-- /TMPL_LOOP -->
-</table></div><br>
-<!--TMPL_ELSE-->
-	<!-- TMPL_VAR NAME="numrecords" --> results
-
-<div id="pages" >
-    <!-- Row of numbers corresponding to search result pages -->
-    
-    <!-- TMPL_LOOP NAME="numbers" -->
-		<!-- TMPL_IF NAME="highlight" -->
-		    <span class="current">
-		    <!-- TMPL_VAR NAME="number" -->
-	        </span>
-		<!-- TMPL_ELSE -->
-		    <span class="pages">
-	        <a class="pages"  href="catalogue-search.pl?op=do_search&amp;zoom=1&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="forminputs" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="HTML" --><!-- /TMPL_LOOP -->&amp;pg=<!-- TMPL_VAR NAME="pg" -->&amp;reorder=<!-- TMPL_VAR NAME="reorder" -->"><!-- TMPL_VAR NAME="number" --></a>
-	        </span>
-		<!-- /TMPL_IF -->
-    <!-- /TMPL_LOOP -->
-    
-</div>
-
-<!-- TMPL_IF name="shelvescount" -->
-<table style="border:0">
-	<tr>
-	    <td width="75%"></td>
-		<td>
-			<input type="button" value="Add to my virtual shelves" class="button"
-				    style="border:0px;background-color:#F2F0E9;text-align:left;display:block;"
-					onclick="show_shelfPanel();">
-
-			<div class="shelf_panel" id="shelf_panel" style="display:none;">
-	    		<form name="shelf_form" action="/cgi-bin/koha/bookshelves/add-biblios-to-shelves.pl" method="post">
-        		<input type="checkbox" name="shelfnumber" value="-1" style="display:none;">
-				<input type="hidden" name="biblios" value="">
-				<input type="hidden" name="return_url" value="catalogue-search.pl?op=do_search&amp;zoom=1&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->">
-				<span class="style3">Select one or more documents and the virtual shelves you want to add them.</span>
-				<table style="border:0">
-				<!-- TMPL_LOOP name="shelves" -->
-		    	<tr>
-		        	<td>
-						<input type="checkbox" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
-					</td>
-		        	<td>
-						<a class="style12" href="/cgi-bin/koha/bookshelves/shelves.pl?op=viewcontent&shelfnumber=<!-- TMPL_VAR name="shelfnumber" -->"><!-- TMPL_VAR name="shelfname" --></a>
-					</td>
-					<td>
-						<!-- TMPL_VAR name="bibliocount" --> documents
-					</td>
-				</tr>
-				<!-- /TMPL_LOOP -->
-				</table>
-				<div align="right" class="style5">
-					<input type="button" onclick="addBibliosToShelves()" value="Add" style="border:0px;background-color:#4898B0;height:20px;" class="button">
-				</div>
-				</form>
-			</div>
-  		</td>
-  	</tr>
-</table>
-<!-- /TMPL_IF -->
-
-<!-- Search Results Table -->
-<!-- TMPL_IF NAME="numrecords" -->
-<form name="myform" action="" style="margin:0px">
-	<br>
-	<table border="0" cellspacing="0" cellpadding="2" width="80%" align="center">
-	<tr bgcolor="#99cccc" background="<!-- TMPL_VAR NAME="themelang" -->/../images/background-opac.gif">
-        <th colspan="2"></th>
-		<th align="left"> <a  href="catalogue-search.pl?op=do_search&amp;zoom=1&amp;reorder=title,2<!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->">â–¼</a>Title <a  href="catalogue-search.pl?op=do_search&zoom=1<!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&amp;reorder=title,1">â–²</a>
-	   </th>
-		<th align="left"> <a  href="catalogue-search.pl?op=do_search&amp;zoom=1<!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&amp;reorder=author,2 ">â–¼</a>Author<a  href="catalogue-search.pl?op=do_search&zoom=1<!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&amp;reorder=author,1">â–²</a>
-
-		<th>Publisher</th>
-		
-		<th>&copy;</th>
-		<th align="left"> <a  href="catalogue-search.pl?op=do_search&zoom=1<!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&amp;reorder=local-number,2 ">â–¼</a>LC <a  href="catalogue-search.pl?op=do_search&zoom=1<!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&amp;reorder=local-number,1">â–²</a>
-	<th>Availability</th>
-		<th>&nbsp;</th>
-	</tr>
-
-
-	<!-- Actual Search Results -->
-	    <input type="checkbox" name="bibid" value="0" style="display:none">
-		<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
-			<tr <!-- TMPL_IF name="even" -->bgcolor="#ffffcc"<!-- /TMPL_IF -->>
-				<td>
-					<div align="center">
-							<img src='<!-- TMPL_VAR NAME="themelang" -->/../images/<!-- TMPL_VAR NAME="itemtype" -->.gif'
-							     width="16" height="16">
-						</div>
-				</td>
-				<td width="10" align="center" valign="middle">
-					<input type="checkbox" name="bibid" value='<!-- TMPL_VAR NAME="biblionumber" -->'>
-				</td>
-				<td >
-					
-					<a class="transparent" href="/cgi-bin/koha/<!--TMPL_VAR NAME="script"-->?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" -->
-					</a>
-					<br>
-					<span style="font-size:90%">
-                    <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_VAR NAME="subtitle" --><br> <!-- /TMPL_IF -->
-					<!-- TMPL_IF NAME="isbn" -->ISBN: <!-- TMPL_VAR NAME="isbn" --> <!-- /TMPL_IF -->
-					</span>
-				</td>
-				<td> <!-- TMPL_IF NAME="author" --> <a class="transparent" href="catalogue-search.pl?op=do_search&zoom=1&kohafield=author&value=<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a><br><!-- /TMPL_IF -->
-				    <span style="font-size:90%">
-					<!-- TMPL_LOOP NAME="additionalauthors" -->
-					    <a class="transparent" href="catalogue-search.pl?op=do_search&zoom=1&kohafield=author&value=<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="value" --></a><br>
-                   				 <!-- /TMPL_LOOP -->
-                    </span>
-				</td>
-                <td ><!-- TMPL_VAR NAME="publishercode" --></a></td>
-				
-				<td align="center" > <!-- TMPL_IF NAME="copyrightdate" --> <!-- TMPL_VAR NAME="copyrightdate" --> <!-- TMPL_ELSE --> - <!-- /TMPL_IF --> </td>
-				<td><!-- TMPL_VAR NAME="classification" --></td>
-				<td align="center">
-                    <!-- TMPL_IF NAME="on-loan-p" --> <!-- TMPL_VAR NAME="on-loan-p" --> - On Loan <br> <!-- /TMPL_IF -->
-					    <!-- TMPL_IF NAME="lost-p" --> <!-- TMPL_VAR NAME="lost-p" --> - Lost <br> <!-- /TMPL_IF -->
-					  <!-- TMPL_IF NAME="withdrawn-p" --> <!-- TMPL_VAR NAME="withdrawn-p" --> -Withdrawn <br> <!-- /TMPL_IF -->
-					  
-					    <!-- TMPL_IF NAME="not-available-p" --> <!-- TMPL_VAR NAME="not-available-p" --> - Not available <br> <!-- /TMPL_IF -->
-							<!-- TMPL_IF name="location-only" -->
-							<!-- TMPL_VAR name="location-only" -->
-						<!-- TMPL_ELSE -->
-							-
-						<!-- /TMPL_IF -->
-				</td>
-				<td align="center">
-					<!-- TMPL_IF NAME="noitems" -->
-								-
-							<!-- TMPL_ELSE -->
-								<!-- TMPL_IF NAME="norequests" -->
-        							 Not reservable
-								<!-- TMPL_ELSE -->
-									<a class="style1"
-									   href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-          								Reserve
-									</a>
-								<!-- /TMPL_IF -->
-							<!-- /TMPL_IF -->
-				</td>
-			</tr>
-		<!-- /TMPL_LOOP -->
-
-
-		
-		</table>
-</form>
-<br>
-<div class="pages">
-    <!-- Row of numbers corresponding to search result pages -->
-
-    <!-- TMPL_LOOP NAME="numbers" -->
-		<!-- TMPL_IF NAME="highlight" -->
-		    <span class="current">
-		    <!-- TMPL_VAR NAME="number" -->
-	        </span>
-		<!-- TMPL_ELSE -->
-		    <span class="pages">
-	        <a class="pages" href="catalogue-search.pl?op=do_search&zoom=1&startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="forminputs" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&amp;pg=<!-- TMPL_VAR NAME="pg" -->&amp;reorder=<!-- TMPL_VAR NAME="reorder" -->"><!-- TMPL_VAR NAME=number --></a>
-	        </span>
-		<!-- /TMPL_IF -->
-    <!-- /TMPL_LOOP -->
-    
-</div>
-<br>
-<div align="center">Results <b><!-- TMPL_VAR NAME="beginning" --></b> - <b><!-- TMPL_VAR NAME="endat" --></b> of <b><!-- TMPL_VAR NAME="numrecords" --></b> records.</div>
-<!-- TMPL_ELSE -->
-	<div align="center">0 records <br></div>
-<!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
-
-<div align="center"><a class="transparent" href="catalogue-search.pl">New search</a></div>
-
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/catalogue/detail.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/catalogue/detail.tmpl
diff -N htdocs/intranet-tmpl/default/en/catalogue/detail.tmpl
--- htdocs/intranet-tmpl/default/en/catalogue/detail.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,95 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Details for <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-<h3 class="title"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF NAME="author" -->(<!-- TMPL_VAR NAME="author" -->)<!-- /TMPL_IF --></h3>
-
-	<div class="tabitem">
-<form action="MARCdetail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View MARC" /></form>
-<form action="moredetail.pl" method="get"><input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" /><input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->" /><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="View Item Details" /></form> 	
-<form action="/cgi-bin/koha/bookshelves/addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Add to Shelf" onclick="openWindow('/cgi-bin/koha/bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->', 'popped'); return false;" /></form> 
-<form action="detailprint.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Print" onclick="openWindow('detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','printview'); return false;" /></form>
-<!-- TMPL_UNLESS NAME="norequests" --> <form action="/cgi-bin/koha/reserve/request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="biblionumber" /> <input type="submit" value="Reserves" class="submit" /></form><!-- /TMPL_UNLESS -->
-	 </div>
-<!-- TMPL_IF NAME="isbn" --><div >
-<img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01.MZZZZZZZ.jpg" alt="Book Cover Image" />
-</div><!-- /TMPL_IF -->
-<div class="details">
-			
-<ul>
-			<!-- TMPL_IF NAME="subtitle" --><li><b>Subtitle:</b> <!-- TMPL_VAR NAME="subtitle" --></li><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="author" --><li><b>Author:</b> <a href="catalogue-search.pl?kohafield=author&op=do_search&value=<!--TMPL_VAR NAME="author" ESCAPE=URL>&and_or=@and&order=author,1&zoom=1"><!-- TMPL_VAR NAME="author" --></a></li><!--/TMPL_IF-->
-			<!-- TMPL_IF NAME="additionalauthor" --><li><b>Additional Author:</b> <!-- TMPL_VAR NAME="additionalauthor" --></li><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="isbn" --><li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="isbn" --></li><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="classification" --><li><strong>Classification:</strong> <!-- TMPL_VAR NAME="classification" --></li><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="seriestitle" --><li><b>Series Title:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF --></li><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="subject" --><li><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --></li><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="copyrightdate" --><li><b>Copyright:</b> <!-- TMPL_VAR NAME="copyrightdate" --></li><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="notes" --><li><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --></li><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="unititle" --><li><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --></li><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="serial" --><li><b>Serial:</b> <!-- TMPL_VAR NAME="serial" --></li><!-- /TMPL_IF --> 
-			<!-- TMPL_IF name="url" --><li><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!--TMPL_VAR NAME="url" --></a></li><!-- /TMPL_IF -->
-			
-<!-- /TMPL_LOOP -->
-			<li><b>Subjects:</b><!-- TMPL_LOOP NAME="MARCSUBJCTS" --><!-- TMPL_VAR NAME="MARCSUBJCT" -->, <!-- /TMPL_LOOP -->
-			<li><b>URLs:</b><!-- TMPL_LOOP NAME="MARCURLS" --><a href="<!-- TMPL_VAR name="MARCURL" -->"><!-- TMPL_VAR NAME="MARCURL" --></a> <!-- /TMPL_LOOP -->
-			<li><b>Abstract:</b><!-- TMPL_LOOP NAME="MARCNOTES" --><!-- TMPL_VAR NAME="MARCNOTE" -->, <!-- /TMPL_LOOP -->
-
-			<li><b>Biblio Record</b> <!-- TMPL_VAR NAME="biblionumber" --></li>
-			<li><b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" --></li>
-			</ul>
-
-<br clear="both" /></div><div class="tabitem">
-		<form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit Record" /></form>
-		<form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="op" value="duplicate" /><input type="submit" class="submit" value="Duplicate Record" /></form>
-		<form action="/cgi-bin/koha/cataloguing/additem.pl" method="get" ><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber"-->" /><input type="submit" class="submit" value="Edit Items" /></form>
-		</div>
-
-
-<div class="table"><table>
-	<tr>
-		<th>Item Type</th>
-		<th>LC Classifiction</th>
-		<th>Location</th>
-		<th>Date Due</th>
-		<th>Last Seen</th>
-		<th>Barcode</th>
-		<!-- <th>Volume</th> -->
-	</tr>
-	
-<!-- TMPL_IF NAME="ITEM_RESULTS" -->
-<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
-		<tr>
-			<td><!-- TMPL_VAR NAME="ctype" --></td>
-			<td><!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="classification" --><!-- /TMPL_IF --></td>
-			<td><!--TMPL_IF  NAME="itemlost"--> LOST !!!<!--TMPL_ELSE--><!-- TMPL_VAR NAME="branchname" -->-<!-- TMPL_VAR NAME="shelf" --><!--/TMPL_IF--></td>
-			<td><!-- TMPL_VAR NAME="datedue" --></td>
-			<td><!-- TMPL_VAR NAME="datelastseen" --></td>
-			<td><a href="moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;barcode=<!-- TMPL_VAR NAME="barcode" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
-			 <td><!-- TMPL_IF NAME="volumedesc" --><!-- TMPL_VAR NAME="volumeddesc" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td> 
-		
-		</tr>
-	<!-- /TMPL_LOOP --><!-- TMPL_ELSE --><tr><td colspan="6">This record has no items.</td></tr><!-- /TMPL_IF -->
-	
-</table></div>
-
-
-
-<!-- TMPL_IF NAME="SITE_RESULTS" -->
-<table>
-<caption>Links to Associated Web Sites</caption>
-<!-- TMPL_LOOP NAME="SITE_RESULTS" -->
-<tr>
-<td><b>Title:</b> <!-- TMPL_VAR name="title" --><br>
-<b>Description:</b> <!-- TMPL_VAR name="description" --><br>
-<b>URL:</b><a href="http://<!-- TMPL_VAR name="url" -->">http://<!--TMPL_VAR name="url"></a><br>
-</td>
-</tr>
-<!-- /TMPL_LOOP -->
-</table>
-<!-- /TMPL_IF -->
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/catalogue/detailprint.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/catalogue/detailprint.tmpl
diff -N htdocs/intranet-tmpl/default/en/catalogue/detailprint.tmpl
--- htdocs/intranet-tmpl/default/en/catalogue/detailprint.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Print View for <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_LOOP --><!-- TMPL_INCLUDE NAME="doc-head-close-print.inc" -->
-
-<!-- main site -->
-<div id="main">
-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-	<table class="list">
-	<caption><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></caption>
-	<tr><th>Biblio Record Number: </th><td> <!-- TMPL_VAR NAME="biblionumber" -->	</td></tr>
-<!-- TMPL_IF NAME="author" --><tr><th>Author: </th><td><!-- TMPL_VAR NAME="author" --></td></tr><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="additional" --><tr><th>Additional Author: </th><td><!-- TMPL_VAR NAME="additional" --></td></tr><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
-<!-- TMPL_IF name="publishercode" --><tr><th>Publisher: </th><td><!-- TMPL_VAR NAME="publishercode" --></td></tr><!-- /TMPL_IF -->
-<tr><th>Publication Details: </th><td>			<!-- TMPL_IF name="publicationyear" --><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
-			<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --></td></tr>
-			<!-- TMPL_IF name="collection" --><tr><th>Collection:</th><td> <!-- TMPL_VAR NAME="seriestitle" --></td></tr><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="subject" --><tr><th>Subject: </th><td><!-- TMPL_VAR NAME="subject" --></td></tr><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="copyrightdate" --><tr><th>Copyright Date: </th><td> <!-- TMPL_VAR NAME="copyrightdate" --></td></tr><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="notes" --><tr><th>Notes: </th><td><!-- TMPL_VAR NAME="notes" --></td></tr><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="unititle" --><tr><th>Unititle: </th><td><!-- TMPL_VAR NAME="unititle" --></td></tr><!-- /TMPL_IF --> 
-			<!-- TMPL_IF name="dewey" --><tr><th>Dewey: </th><td><!-- TMPL_VAR name="dewey" --></td></tr><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="classification" --><tr><th>Classification: </th><td> <!-- TMPL_VAR name="classification" --></td></tr><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="lccn" --><tr><th>LCCN: </th><td><!-- TMPL_VAR name="lccn" --></td></tr><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="url" --><tr><th>URL: </th><td><a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a></td></tr><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="ISBN" --><tr><th>ISBN: </th><td><!-- TMPL_VAR NAME="ISBN" --></td></tr><!-- /TMPL_IF -->
-	</table>
-<!-- /TMPL_LOOP -->
-
-<table>
-	<tr><th>Item Type</th><th>Call Number</th><th>Location</th><th>Date Due</th><th>Last Seen</th><th>Barcode</th></tr>
-	<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
-		<tr>
-			<td><!-- TMPL_VAR NAME="itemtype" --></td>
-			<td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
-			<td><!-- TMPL_VAR NAME="branchname" --><!-- TMPL_IF NAME="bulk" -->, <!-- TMPL_VAR NAME="bulk" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
-			<td><!-- TMPL_VAR NAME="date_due" --></td>
-			<td><!-- TMPL_VAR NAME="datelastseen" --></td>
-			<td><!-- TMPL_VAR NAME="barcode" --></td>
-		</tr>
-	<!-- /TMPL_LOOP -->
-</table>
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/catalogue/livesearch.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/catalogue/livesearch.tmpl
diff -N htdocs/intranet-tmpl/default/en/catalogue/livesearch.tmpl
--- htdocs/intranet-tmpl/default/en/catalogue/livesearch.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-<ul class="LSRes"><!-- TMPL_LOOP name="results" --><li class="LSRow" onmouseover="liveSearchHover(this)" onclick="liveSearchClicked(this)"><a href="<!--TMPL_VAR name="script"-->"></a><!-- TMPL_VAR name="description" --><!-- TMPL_IF name="cuted" --> ...<!-- /TMPL_IF --></a><span class="LSResRight"><!-- TMPL_VAR name="translation" --></span></li><!-- /TMPL_LOOP --></ul>

Index: htdocs/intranet-tmpl/default/en/catalogue/moredetail.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/catalogue/moredetail.tmpl
diff -N htdocs/intranet-tmpl/default/en/catalogue/moredetail.tmpl
--- htdocs/intranet-tmpl/default/en/catalogue/moredetail.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,87 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Item Details for <!-- TMPL_LOOP NAME="BIBITEM_DATA" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<div id="main">
-
-<!-- TMPL_LOOP NAME="BIBITEM_DATA" -->
-<!-- TMPL_IF NAME="error" --><div id="error" class="error"><!-- TMPL_VAR NAME="error" -->
-<form class="inline" method="get" action="moredetail.pl">
-<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR name="itemnumber" -->" />
-<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-<input type="hidden" name="lost" value="<!-- TMPL_VAR name="lost" -->" />
-<input type="hidden" name="withdrawn" value="<!-- TMPL_VAR name="withdrawn" -->" />
-<input type="hidden" name="override" value="yes" />
-<input type="hidden" name="op" value="update" />
-<input type="submit" value="Confirm Change" class="submit" accesskey="y" /></form><form class="inline" method="get" action="moredetail.pl"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="cancel" value="Don't Change" accesskey="n" /></form>
-</div><!--/TMPL_IF-->
-
-<!-- BIBLIO ITEM  -->
-<h1><!-- TMPL_VAR NAME="title" -->
-<!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></h1>
-<div class="tabitem"><form action="/cgi-bin/koha/reserve/request.pl" method="post"><input type="hidden" value="<!-- TMPL_VAR NAME="biblionumber" -->" name="biblionumber" /><input type="submit" class="submit" value="Reserves" /></form> <form action="detail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="Return to Brief Display" /></form><form action="MARCdetail.pl" method="get">
-<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
-<input type="submit" class="submit" value="View MARC" /></form></div>
-<div class="data-main"><table>
-	<caption>Bibliographic Details</caption>
-	<!-- TMPL_IF NAME="biblionumber" --><tr><th>Biblionumber:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="itemtype" --><tr><th>Item Type:</th><td><!-- TMPL_VAR NAME="itemtype" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="url" --><tr><th>URL:</th><td><!-- <!-- TMPL_VAR NAME="url" --> --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="loanlength" --><tr><th>Loan Length:</th><td><!-- TMPL_VAR NAME="loanlength" --> days</td></tr><!-- /TMPL_IF -->
-	<!-- <tr><th>Rental Charge:</th><td><!-- TMPL_VAR NAME="rentalcharge" --></td></tr> -->
-	<!-- TMPL_IF NAME="dewey" --><tr><th>Classification:</th><td><!-- TMPL_VAR NAME="classification" --><!-- TMPL_VAR NAME="subclass" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="isbn" --><tr><th>ISBN:</th><td> <!-- TMPL_VAR NAME="isbn" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="publishercode" --><tr><th>Publisher:</th><td><!-- TMPL_VAR NAME="publishercode" --></td> </tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="place" --><tr><th>Place:</th><td><!-- TMPL_VAR NAME="place" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="publicationyear" --><tr><th>Date:</th><td><!-- TMPL_VAR NAME="publicationyear" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="volumedesc" --><tr><th>Volume:</th><td><!-- TMPL_VAR NAME="volumeddesc" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="pages" --><tr><th>Pages:</th><td><!-- TMPL_VAR NAME="pages" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="illus" --><tr><th>Illus:</th><td><!-- TMPL_VAR NAME="illus" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="size" --><tr><th>Size:</th><td><!-- TMPL_VAR NAME="size" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="bnotes" --><tr><th>Notes:</th><td><!-- TMPL_VAR NAME="bnotes" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="count" --><tr><th>No. of Items:</th><td><!-- TMPL_VAR NAME="count" --></td></tr><!-- /TMPL_IF -->
-</table></div>
-
-
-<!-- /TMPL_LOOP -->
-
-<!-- TMPL_LOOP NAME="ITEM_DATA" -->
-<div class="data">
-<table>
-<caption><a name="<!-- TMPL_VAR NAME="barcode" -->" id="<!-- TMPL_VAR NAME="barcode" -->">Barcode: <!-- TMPL_VAR NAME="barcode" --></a></caption>
-<!-- TMPL_IF NAME="homebranch" --><tr><th>Home Branch:</th><td> <!-- TMPL_VAR NAME="homebranch" --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="holdingbranch" --><tr><th>Current Branch:</th><td> <!-- TMPL_VAR NAME="holdingbranch" --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="datelastseen" --><tr><th>Last seen:</th><td> <!-- TMPL_VAR NAME="datelastseen" --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="issue" --><tr><th>Item Status:</th><td> Due <!-- TMPL_VAR NAME="date_due" --> (Issued to <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a>)</td></tr><!-- TMPL_ELSE --><tr><th>Item Status</th><td>Available</td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="datelastborrowed" --><tr><th>Last borrowed:</th><td> <!-- TMPL_VAR NAME="datelastborrowed" --></td></tr><!-- /TMPL_IF -->
-<!-- on issue bit -->
-<!-- TMPL_IF NAME="card0" --><tr><th>Last Borrower 1:</th><td> <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="card0" -->"><!-- TMPL_VAR NAME="card0" --></a></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="card1" --><tr><th>Last Borrower 2:</th><td> <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="card1" -->"><!-- TMPL_VAR NAME="card1" --></a></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="replacementprice" --><tr><th>Replacement Price:</th><td> $<!-- TMPL_VAR NAME="replacementprice" --></td></tr><!-- /TMPL_IF -->
-<tr><th>Lost Status:</th><td><!-- TMPL_IF NAME="itemlost" -->Lost<!-- TMPL_ELSE -->Not Lost<!-- /TMPL_IF -->
-<form class="inline" action="moredetail.pl" method="post"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
-<input type="hidden" name="op" value="update">
-<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
-<!-- TMPL_IF NAME="itemlost" --><input type="hidden" value="0" name="lost" /><!-- TMPL_ELSE --><input type="hidden" value="1" name="lost" /><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="wthdrawn" --><input type="hidden" name="withdrawn" value="1" /><!-- TMPL_ELSE --><input type="hidden" name="withdrawn" value="0" /><!-- /TMPL_IF -->
-<input type="submit" name="submit" class="submit" value="<!-- TMPL_IF NAME="itemlost" -->Make Found<!-- TMPL_ELSE -->Make Lost<!-- /TMPL_IF -->" /></form></td></tr>
-<tr><th>Withdrawn: </th><td><!-- TMPL_IF NAME="wthdrawn" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --> 
-<form class="inline" action="moredetail.pl" method="post"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
-<input type="hidden" name="op" value="update">
-<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
-<!-- TMPL_IF NAME="itemlost" --><input type="hidden" value="1" name="lost" /><!-- TMPL_ELSE --><input type="hidden" value="0" name="lost" /><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="wthdrawn" --><input type="hidden" name="withdrawn" value="0" /><!-- TMPL_ELSE --><input type="hidden" name="withdrawn" value="1" /><!-- /TMPL_IF -->
-
-<input type="submit" name="submit" class="submit" value="<!-- TMPL_IF NAME="wthdrawn" -->Restore<!-- TMPL_ELSE -->Make Withdrawn<!-- /TMPL_IF -->" /></form></td></tr>
-<!-- TMPL_IF NAME="paidfor" --><tr><th>Paid for:</th><td> <!-- TMPL_VAR NAME="paidfor" --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="itemnotes" --><tr><th>Notes:</th><td> <!-- TMPL_VAR NAME="itemnotes" --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="renewals" --><tr><th>Renewals:</th><td> <!-- TMPL_VAR NAME="renewals" --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="dateaccessioned" --><tr><th>Accession Date:</th><td><!-- TMPL_VAR NAME="dateaccessioned" --> (<a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&amp;catview=yes">View Receipt Summary</a>)</td></tr><!-- /TMPL_IF -->
-
-<tr><th>Total Issues:</th><td><!-- TMPL_VAR NAME="issues" --> (<a href="bookcount.pl?&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">View Circulation History</a>)</td></tr>
-</table></div>
-
-<!-- /TMPL_LOOP -->
-
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/catalogue/news_searchresults.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/catalogue/news_searchresults.tmpl
diff -N htdocs/intranet-tmpl/default/en/catalogue/news_searchresults.tmpl
--- htdocs/intranet-tmpl/default/en/catalogue/news_searchresults.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,113 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Simple Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_IF NAME="facets_loop" -->
-<!-- TMPL_INCLUDE NAME="intranet-facets.inc" -->
-<!--TMPL_ELSE-->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<!--/TMPL_IF-->
-
-
-
-<div id="main" align="center">
-    <h1>Catalogue search</h1>
-<!-- TMPL_IF name="error" --><div class="error">The server is too busy TRY AGAIN!</div>
-<!-- TMPL_ELSE -->
-	<!-- TMPL_LOOP NAME="searchdesc" -->
-    	You searched:
-    	<div style="color:green;">|&nbsp;
-	
-									<!-- TMPL_IF name="any" -->Any field = <!-- TMPL_VAR name="any" -->&nbsp;|&nbsp;<!-- /TMPL_IF -->
-									<!-- TMPL_IF name="title" -->Title = <!-- TMPL_VAR name="title" -->&nbsp;|&nbsp;<!-- /TMPL_IF -->
-									<!-- TMPL_IF name="publishercode" -->Publisher = <!-- TMPL_VAR name="publishercode" -->&nbsp;|&nbsp;<!-- /TMPL_IF -->
-									
-		</div>
-	<!-- /TMPL_LOOP -->
-
-
-	<!-- TMPL_VAR NAME="numrecords" --> results
-
-<div id="pages" >
-    <!-- Row of numbers corresponding to search result pages -->
-    
-    <!-- TMPL_LOOP NAME="numbers" -->
-		<!-- TMPL_IF NAME="highlight" -->
-		    <span class="current">
-		    <!-- TMPL_VAR NAME="number" -->
-	        </span>
-		<!-- TMPL_ELSE -->
-		    <span class="pages">
-	        <a class="pages"  href="cyprus-search.pl?op=do_search&amp;zoom=1&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="forminputs" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="HTML" --><!-- /TMPL_LOOP -->&amp;pg=<!-- TMPL_VAR NAME="pg" -->&amp;reorder=<!-- TMPL_VAR NAME="reorder" -->"><!-- TMPL_VAR NAME="number" --></a>
-	        </span>
-		<!-- /TMPL_IF -->
-    <!-- /TMPL_LOOP -->
-    
-</div>
-
-
-
-<!-- Search Results Table -->
-<!-- TMPL_IF NAME="numrecords" -->
-<form name="myform" action="" style="margin:0px">
-	<br>
-	<table border="0" cellspacing="0" cellpadding="2" width="80%" align="center">
-	<tr bgcolor="#99cccc" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif">
-        	<th align="left"> Title (click to read ) </th>
-		<th>Publisher</th>		
-		<th><a  href="cyprus-search.pl?op=do_search&amp;zoom=1&amp;reorder=date i&gt<!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->">â–¼</a>Date <a  href="cyprus-search.pl?op=do_search&amp;reorder=date i&lt&zoom=1<!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->">â–²</a></th>
-	
-	</tr>
-
-
-	<!-- Actual Search Results -->
-	    <input type="checkbox" name="bibid" value="0" style="display:none">
-		<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
-			<tr <!-- TMPL_IF name="even" -->bgcolor="#ffffcc"<!-- /TMPL_IF -->>
-				
-				<td >
-					
-					<a class="transparent" href="/cgi-bin/koha/<!--TMPL_VAR NAME="script"-->?id=<!-- TMPL_VAR NAME="id" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" -->
-					</a>
-					
-				</td>
-				
-                <td ><!-- TMPL_VAR NAME="source" --></a></td>
-				
-				<td align="center" >  <!-- TMPL_VAR NAME="date" --> </td>
-			
-			</tr>
-		<!-- /TMPL_LOOP -->
-
-
-		
-		</table>
-</form>
-<br>
-<div class="pages">
-    <!-- Row of numbers corresponding to search result pages -->
-
-    <!-- TMPL_LOOP NAME="numbers" -->
-		<!-- TMPL_IF NAME="highlight" -->
-		    <span class="current">
-		    <!-- TMPL_VAR NAME="number" -->
-	        </span>
-		<!-- TMPL_ELSE -->
-		    <span class="pages">
-	        <a class="pages" href="cyprus-search.pl?op=do_search&zoom=1&startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="forminputs" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&amp;pg=<!-- TMPL_VAR NAME="pg" -->&amp;reorder=<!-- TMPL_VAR NAME="reorder" -->"><!-- TMPL_VAR NAME=number --></a>
-	        </span>
-		<!-- /TMPL_IF -->
-    <!-- /TMPL_LOOP -->
-    
-</div>
-<br>
-<div align="center">Results <b><!-- TMPL_VAR NAME="beginning" --></b> - <b><!-- TMPL_VAR NAME="endat" --></b> of <b><!-- TMPL_VAR NAME="numrecords" --></b> records.</div>
-<!-- TMPL_ELSE -->
-	<div align="center">0 records <br></div>
-<!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
-
-
-<div align="center"><a class="transparent" href="catalogue-search.pl">New search</a></div>
-
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/catalogue/newsdetail.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/catalogue/newsdetail.tmpl
diff -N htdocs/intranet-tmpl/default/en/catalogue/newsdetail.tmpl
--- htdocs/intranet-tmpl/default/en/catalogue/newsdetail.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Details for <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-
-<h3 class="title"><!-- TMPL_VAR NAME="title" --> </h3>
-
-
-<div class="details">
-			
-<ul>
-			<!-- TMPL_IF NAME="date" --><li><b>Date:</b> <!-- TMPL_VAR NAME="date" --></li><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="source" --><li><b>Paper:</b> <a href="cyprus-search.pl?kohafield=publisher&op=do_search&value=<!--TMPL_VAR NAME="source" ESCAPE=URL>&and_or=@and&zoom=1"><!-- TMPL_VAR NAME="source" --></a></li><!--/TMPL_IF-->
-			<!-- TMPL_IF NAME="news" --><li><b>News:</b></li> <!-- TMPL_VAR NAME="news" --><!-- /TMPL_IF -->
-			
-
-			
-			</ul>
-
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/catalogue/search.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/catalogue/search.tmpl
diff -N htdocs/intranet-tmpl/default/en/catalogue/search.tmpl
--- htdocs/intranet-tmpl/default/en/catalogue/search.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,254 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Simple Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<div id="main">
-	<h1>Catalogue Search</h1>
-
-<table align ="center" >
-	
-	    <td align ="center">
-	       <input id="searchType1" type="button" value="Zoom Search" onclick="changeSearch1()" <!-- TMPL_IF name="zoom_search" -->style="background-color:orange"<!-- TMPL_ELSE -->style="background-color:yellow"<!-- /TMPL_IF -->>
-		</td>	
-		<td align ="center">
-	       <input id="searchType2" type="button" value="SQL search" onclick="changeSearch2()" <!-- TMPL_IF name="sql_search" -->style="background-color:orange"<!-- TMPL_ELSE -->style="background-color:yellow"<!-- /TMPL_IF --> background-color="orange">
-		</td>
-		<td align ="center">
-	       <input id="searchType3" type="button" value="Brave search" onclick="changeSearch3()" <!-- TMPL_IF name="brave_search" -->style="background-color:orange"<!-- TMPL_ELSE -->style="background-color:yellow"<!-- /TMPL_IF --> background-color="orange">
-		</td>
-	</tr>
-</table>
-
-<form  name="zoom_form" id="zoom_form" action="/cgi-bin/koha/catalogue/search.pl" method='post' <!-- TMPL_IF name="zoom_search" -->style="display:inline;"<!-- TMPL_ELSE -->style="display:none;"<!-- /TMPL_IF -->>
-    <input type="hidden" name="op" value="do_search">
-    <input type="hidden" name="search_type" value="zoom">
-    <input type="hidden" name="startfrom" value="0">
-	<input type="hidden" name="zoom" value="1">
-<table style="border:0" align="center"><tbody id="queryarea">
-
-<tr><td ><fieldset><b>Display per page:</b><input type text name="number_of_results" value="10" size="3"/></fieldset></td><td colspan="2"><fieldset><b>Format to display </b>MARC<input type="radio" name="MARC" value="1" checked=1>Brief<input type="radio" name="MARC" value="0"></fieldset></td></tr>
-
-<tr>	<td align="right">Search on:</td><td><select size="1"  name="kohafield" style="width:170px">
-				<!-- TMPL_LOOP name="kohafields" -->
-	                <option value="<!-- TMPL_VAR name="kohafield" -->" <!-- TMPL_IF name="sel" -->selected<!-- /TMPL_IF -->  ><!-- TMPL_VAR name="label" --></option>
-				<!-- /TMPL_LOOP --></select></td><td><input type="text"  size="25" name="value" value="<!-- TMPL_VAR name="value" -->" ></td>
-							<td>With</td><td><Select type="text"  name="relation">
-							<option value=" " <!-- TMPL_IF name="blank" -->selected<!-- /TMPL_IF --> >&nbsp;
-							</option>
-				            			<option value="@attr 5=1 " <!-- TMPL_IF name="@attr 5=1 " -->selected<!-- /TMPL_IF --> >* wildcard anywhere
-							</option>
-							<option value="@attr 5=100 " <!-- TMPL_IF name="@attr 5=100 " -->selected<!-- /TMPL_IF --> >No truncation
-							</option>
-							<option value="@attr 5=102 " <!-- TMPL_IF name="@attr 5=102 " -->selected<!-- /TMPL_IF --> >Mistakes allowed
-							</option>
-							<option value="@attr 5=1 @attr 6=3 " <!-- TMPL_IF name="@attr 5=1 @attr 6=3 " -->selected<!-- /TMPL_IF --> >Starts with
-							</option>
-							<option value="@attr 2=1  " <!-- TMPL_IF name="@attr 2=1 " -->selected<!-- /TMPL_IF --> >Less than
-							</option>
-							<option value="@attr 2=2  " <!-- TMPL_IF name="@attr 2=2 " -->selected<!-- /TMPL_IF --> >Less than & equal
-							</option>
-							<option value="@attr 2=5  " <!-- TMPL_IF name="@attr 2=5 " -->selected<!-- /TMPL_IF --> >Greater than
-							</option>
-							<option value="@attr 2=4  " <!-- TMPL_IF name="@attr 2=4 " -->selected<!-- /TMPL_IF --> >Greater than & equal
-							</option>
-						</select></td></tr>
-		<tr id="andor"><td>		
-					<Select type="text"   name="and_or">
-				            			<option value="@and" <!-- TMPL_IF name="and" -->selected<!-- /TMPL_IF --> >AND
-							</option>
-							<option value="@or" <!-- TMPL_IF name="or" -->selected<!-- /TMPL_IF --> >OR
-							</option>
-							<option value="@not" <!-- TMPL_IF name="not" -->selected<!-- /TMPL_IF --> >NOT
-							</option>
-						</select></td>
-				<td><select size="1"  name="kohafield" id="kohafield" style="width:170px">
-				
-				<!-- TMPL_LOOP name="kohafields" -->
-	               		 <option value="<!-- TMPL_VAR name="kohafield" -->" <!-- TMPL_IF name="sel" -->selected<!-- /TMPL_IF -->  ><!-- TMPL_VAR name="label" --></option>
-				<!-- /TMPL_LOOP --></select></td><td><input type="text"  size="25" name="value" value="<!-- TMPL_VAR name="value" -->" ></td>
-							<td>With</td><td><Select type="text"  name="relation">
-							<option value=" " <!-- TMPL_IF name="blank" -->selected<!-- /TMPL_IF --> >&nbsp;
-							</option>
-				            			<option value="@attr 5=1 " <!-- TMPL_IF name="@attr 5=1 " -->selected<!-- /TMPL_IF --> >* wildcard anywhere
-							</option>
-							<option value="@attr 5=100 " <!-- TMPL_IF name="@attr 5=100 " -->selected<!-- /TMPL_IF --> >No truncation
-							</option>
-							<option value="@attr 5=102 " <!-- TMPL_IF name="@attr 5=102 " -->selected<!-- /TMPL_IF --> >Mistakes allowed
-							</option>
-							<option value="@attr 3=1 " <!-- TMPL_IF name="@attr 3=1 " -->selected<!-- /TMPL_IF --> >Starts with
-							</option>
-							<option value="@attr 2=1  " <!-- TMPL_IF name="@attr 2=1 " -->selected<!-- /TMPL_IF --> >Less than
-							</option>
-							<option value="@attr 2=2  " <!-- TMPL_IF name="@attr 2=2 " -->selected<!-- /TMPL_IF --> >Less than & equal
-							</option>
-							<option value="@attr 2=5  " <!-- TMPL_IF name="@attr 2=5 " -->selected<!-- /TMPL_IF --> >Greater than
-							</option>
-							<option value="@attr 2=4  " <!-- TMPL_IF name="@attr 2=4 " -->selected<!-- /TMPL_IF --> >Greater than & equal
-							</option>
-						</select></td></tr></tbody>
-	<tr>
-<td ><fieldset>Limit with itemtype: <br>
-			<input type="hidden" name="kohafield" value="itemtype"/>
-			<input type="hidden" name="and_or" value="@and"/><input type="hidden" name="relation" value="@attr 2=3">
-			<select name="value"  style="width:170px">			
-			<option value="">All item types</option>
-		<!-- TMPL_LOOP NAME="itemtypeloop" -->
-			<option value="<!-- TMPL_VAR NAME="itemtype" -->"><!-- TMPL_VAR NAME="description" --></option>
-		<!-- /TMPL_LOOP -->
-			</select></fieldset>
-</td>
-<td colspan="4">
-	<fieldset>Location:<input type="hidden" name="kohafield" value="holdingbranch"/>
-		<input type="hidden" name="and_or" value="@and"/><input type="hidden" name="relation" value="@attr 2=3">
-		<select name="value" id="branchloop" size="1">
-		<option value="">All Branches</option>
-		<!-- TMPL_LOOP NAME="branchloop" -->
-		<option value=<!-- TMPL_VAR NAME="branchcode" --> ><!-- TMPL_VAR NAME="branchname"--></option>
-		<!-- /TMPL_LOOP -->
-		</select><br>
-		<input type="hidden" name="kohafield" value="date_due"/>
-		<input type="hidden" name="and_or" value="@and"/><input type="hidden" name="relation" value="@attr 2=6">
-		<label for="available-items">Only items currently available</label><input type="checkbox" id="available-items" name="value" value="0000-00-00"/>
-	</fieldset>
-</td>
-
-</tr>
-<tr>
-			<td colspan="2"><fieldset >Sort on:<select size="1"  name="order" style="width:170px">
-			<option value="">System Ranked</option>	
-			<!-- TMPL_LOOP name="sorts" -->
-	              	  <option value="<!-- TMPL_VAR name="kohafield" -->" <!-- TMPL_IF name="sel" -->selected<!-- /TMPL_IF -->  ><!-- TMPL_VAR name="label" --></option>
-				<!-- /TMPL_LOOP --></select>
-			<select size="1"  name="asc" style="width:100px">
-				<option value=" <i">Ascending</option>
-				<option value=" >i">Descending</option>
-				</fieldset></td>
-		<td colspan="2"><fieldset >Catalogue:<select size="1"  name="serverid" style="width:170px">
-			<option value="-1" selected>Library Catalogue</option>
-			<option value="0">All Catalogues</option>	
-			<!-- TMPL_LOOP name="servers" -->
-	              	  <option value="<!-- TMPL_VAR name="serverid" -->" <!-- TMPL_IF name="sel" -->selected<!-- /TMPL_IF -->  ><!-- TMPL_VAR name="server" --></option>
-				<!-- /TMPL_LOOP --></select>
-			
-				</fieldset></td>
-
-</tr>
-<tr><td colspan="2">Fill a filename to export results:<input type="text" name="basename"/>full path ie (c:\export)</td></tr>
-<tr><td colspan=2><input class = "button" type="submit" value="Start search"></td><td><a href="#" onClick="cloneQuery();" title="add another search field">[+]</a></td></tr>
-
-</form>
-<form onSubmit="return checkSQLSearch()" name="precise_form" id="sql_form" action="/cgi-bin/koha/catalogue/search.pl" method='post' <!-- TMPL_IF name="sql_search" -->style="display:inline;"<!-- TMPL_ELSE -->style="display:none;"<!-- /TMPL_IF -->>
-
-    <input type="hidden" name = "op" value="do_search">
-    <input type="hidden" name = "search_type" value="sql">
-<input type="hidden" name="zoom" value="0">
-	<table style="border:0" align="center">
-<tr>
-<td><b>Format to display</b></td><td>MARC<input type="radio" name="MARC" value="1" checked=1>Brief<input type="radio" name="MARC" value="0"></td>
-	    <tr>
-			<td>Barcode</td>
-			<td colspan="1"><input type="text"  size="15"   name="barcode" value="<!-- TMPL_VAR name="barcode" -->" onchange="if(this.value != '') {this.form.itemnumber.value = ''; this.form.biblionumber.value = ''}"></td>
-		    <td>Item number</td>
-			<td colspan="1"><input type="text"  size="15"   name="itemnumber" value="<!-- TMPL_VAR name="itemnumber" -->" onchange="if(this.value != '') {this.form.biblionumber.value = ''; this.form.barcode.value = ''} "></td>
-		
-			 <td>Biblio Number</td>
-			<td colspan="1"><input type="text"  size="15"   name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" onchange="if(this.value != '') {this.form.barcode.value = ''; this.form.itemnumber.value = ''} "></td>
-		</tr>
-
-	    <tr>
-			<td colspan = "4" align = "center">
-			    <br>
-				<input class = "button" type="submit" value="Start search">
-	      		</td>
-		</tr>
-
-	</table>
-</form>
-<form onSubmit="return BraveSearch()" name="brave_form" id="brave_form" action="/cgi-bin/koha/catalogue/search.pl" method='post' <!-- TMPL_IF name="brave_search" -->style="display:inline;"<!-- TMPL_ELSE -->style="display:none;"<!-- /TMPL_IF -->>
-
-    <input type="hidden" name = "op" value="do_search">
-  <input type="hidden" name="search_type" value="brave">
-<input type="hidden" name="zoom" value="1">
-	<table style="border:0" align="center">
-<tr>
-<td><fieldset><b>Format to display </b>MARC<input type="radio" name="MARC" value="1" checked=1>Brief<input type="radio" name="MARC" value="0"></fieldset></td><td><fieldset><b>Display per page:</b><input type text name="number_of_results" value="10" size="1"/></fieldset></td></tr>
-	    <tr>
-			<td>Query  <textarea name = "value"  id="bravetext" cols="40" rows="5" ></textarea></td>
-			 <td> of type: <select  name = "searchtype" >
-			<option value="pqf">PQF</option>
-			<option value="ccl">CCL</option>
-			<option value="cql">CQL</option>
-			</select>
-			</td>
-		</tr>
-
-	    <tr>
-			<td colspan = "4" align = "center">
-			    <br>
-				<input class = "button" type="submit" value="Start search">
-	      		</td>
-		</tr>
-
-	</table>
-</form>
-</table>	
-</div>
-<script language="JavaScript" type="text/javascript">
-function hideSearchsTypes() {
-            document.getElementById('zoom_form').style.display = 'none';
-            document.getElementById('sql_form').style.display = 'none';
-	 document.getElementById('brave_form').style.display = 'none';
-          
-		}
-
-		function resetButtonsColors() {
-			document.getElementById('searchType1').style.backgroundColor = 'yellow';
-			document.getElementById('searchType2').style.backgroundColor = 'yellow';
-			document.getElementById('searchType3').style.backgroundColor = 'yellow';
-			
-		}
-
-		function changeSearch1() {
-		    resetButtonsColors();
-		    document.getElementById('searchType1').style.backgroundColor = 'orange';
-		    hideSearchsTypes();
-		    document.getElementById('zoom_form').style.display = 'inline';
-		}
-
-        function changeSearch2() {
-            resetButtonsColors();
-		    document.getElementById('searchType2').style.backgroundColor = 'orange';
-		    hideSearchsTypes();
-		    document.getElementById('sql_form').style.display = 'inline';
-		}
-	 function changeSearch3() {
-            resetButtonsColors();
-		    document.getElementById('searchType3').style.backgroundColor = 'orange';
-		    hideSearchsTypes();
-		    document.getElementById('brave_form').style.display = 'inline';
-		}
-function checkSQLSearch() {
-		if ( (document.sql_form.barcode.value == '') &&
-			(document.sql_form.itemnumber.value == '') && (document.sql_form.biblionumber.value == '') ) {
-			alert("Enter a barcode or itemnumber or biblionumber to start searching.");
-			return false;
-		} else {
-		    return true;
-		}
-	}
-
-function BraveSearch() {
-		if ( document.brave_form.text.value == '')   {
-			alert("Enter some code to start searching.");
-			return false;
-		} else {
-		    return true;
-		}
-	}
-function cloneQuery() {
-var cloneoriginal = document.getElementById('andor');
- var clone = cloneoriginal.cloneNode(true);
-queryarea.appendChild(clone);
-
-}
-</script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/catalogue/searchresults.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/catalogue/searchresults.tmpl
diff -N htdocs/intranet-tmpl/default/en/catalogue/searchresults.tmpl
--- htdocs/intranet-tmpl/default/en/catalogue/searchresults.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,109 +0,0 @@
-<html>
-<body>
-
-
-<div id="main" align="center">
-    <h1>Catalogue search</h1>
-<!-- TMPL_IF name="error" --><div class="error">The server is too busy TRY AGAIN!</div>
-<!-- TMPL_ELSE -->
-	<!-- TMPL_LOOP NAME="searchdesc" -->
-    	You searched:
-    	<div >|&nbsp;
-	 <!-- TMPL_VAR name="query" -->&nbsp;|&nbsp;
-		</div>
-	<!-- /TMPL_LOOP -->
-
-
-	<!-- TMPL_VAR NAME="numrecords" --> results
-
-<div id="pages" >
-    <!-- Row of numbers corresponding to search result pages -->
-    
-    <!-- TMPL_LOOP NAME="numbers" -->
-		<!-- TMPL_IF NAME="highlight" -->
-		    <span class="current">
-		    <!-- TMPL_VAR NAME="number" -->
-	        </span>
-		<!-- TMPL_ELSE -->
-		    <span class="pages">
-	        <a class="pages"  href="search.pl?op=do_search&amp;zoom=1&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="forminputs" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="HTML" --><!-- /TMPL_LOOP -->&amp;pg=<!-- TMPL_VAR NAME="pg" -->&amp;reorder=<!-- TMPL_VAR NAME="reorder" -->"><!-- TMPL_VAR NAME="number" --></a>
-	        </span>
-		<!-- /TMPL_IF -->
-    <!-- /TMPL_LOOP -->
-    
-</div>
-
-
-
-<!-- Search Results Table -->
-<!-- TMPL_IF NAME="numrecords" -->
-<form name="myform" action="" style="margin:0px">
-	<br>
-	<table border="0" cellspacing="0" cellpadding="2" width="80%" align="center">
-	<tr >
-       	<th align="left"> Title
-	   </th>
-		<th align="left"> Author
-		<th>Issue</th>
-	</tr>
-
-
-	<!-- Actual Search Results -->
-	  	<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
-			<tr >
-				
-				<td >
-					
-					<a class="transparent" ><!-- TMPL_VAR NAME="title" -->
-					</a>
-					<br>
-					<span style="font-size:90%">
-                    <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_VAR NAME="subtitle" --><br> <!-- /TMPL_IF -->
-					<!-- TMPL_IF NAME="isbn" -->ISBN: <!-- TMPL_VAR NAME="isbn" --> <!-- /TMPL_IF -->
-					</span>
-				</td>
-				<td> <!-- TMPL_IF NAME="author" --> <a class="transparent"><!-- TMPL_VAR NAME="author" --></a><br><!-- /TMPL_IF -->
-				    <span style="font-size:90%">
-					<!-- TMPL_LOOP NAME="additionalauthors" -->
-					    <a class="transparent" ><!-- TMPL_VAR NAME="value" --></a><br>
-                   				 <!-- /TMPL_LOOP -->
-                  			  </span>
-				</td>
-                			<td><!-- TMPL_VAR NAME="totalissue" --></td>
-			</tr>
-		<!-- /TMPL_LOOP -->
-
-
-		
-		</table>
-</form>
-<br>
-<div class="pages">
-    <!-- Row of numbers corresponding to search result pages -->
-
-    <!-- TMPL_LOOP NAME="numbers" -->
-		<!-- TMPL_IF NAME="highlight" -->
-		    <span class="current">
-		    <!-- TMPL_VAR NAME="number" -->
-	        </span>
-		<!-- TMPL_ELSE -->
-		    <span class="pages">
-	        <a class="pages" href="search.pl?op=do_search&zoom=1&startfrom=<!-- TMPL_VAR NAME="startfrom" --><!-- TMPL_LOOP NAME="forminputs" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->&amp;pg=<!-- TMPL_VAR NAME="pg" -->&amp;reorder=<!-- TMPL_VAR NAME="reorder" -->"><!-- TMPL_VAR NAME=number --></a>
-	        </span>
-		<!-- /TMPL_IF -->
-    <!-- /TMPL_LOOP -->
-    
-</div>
-<br>
-<div align="center">Results <b><!-- TMPL_VAR NAME="beginning" --></b> - <b><!-- TMPL_VAR NAME="endat" --></b> of <b><!-- TMPL_VAR NAME="numrecords" --></b> records.</div>
-<!-- TMPL_ELSE -->
-	<div align="center">0 records <br></div>
-<!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
-
-
-<div align="center"><a class="transparent" href="search.pl">New search</a></div>
-
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/catalogue/translation.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/catalogue/translation.tmpl
diff -N htdocs/intranet-tmpl/default/en/catalogue/translation.tmpl
--- htdocs/intranet-tmpl/default/en/catalogue/translation.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-	<title><!--TMPL_VAR name="LibraryName"--></title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<script type="text/javascript" language="javascript" src="<!--TMPL_VAR name="themelang"-->/includes/livesearch.js"></script>
-	<link href='<!-- TMPL_VAR name="themelang" -->/includes/livesearch.css' rel="stylesheet" type="text/css">
-	<link href='<!-- TMPL_VAR name="themelang" -->/includes/intranet.css' rel="stylesheet" type="text/css">
-</head>
-<body onload="liveSearchInit()">
-
- <form method="get" action="" id="keyword" onSubmit="return liveSearchSubmit()">
-	<input type="text" autocomplete="off" size="27" name="keyword" id="keyword"  onkeypress="javascript:liveSearchStart()" style="width:250px;overflow:auto" />	
-<div id="LSResult" style="display: none;"><ul id="LSShadow"><li> </li></ul></div>
-</form>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/catalogue/translation_en.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/catalogue/translation_en.tmpl
diff -N htdocs/intranet-tmpl/default/en/catalogue/translation_en.tmpl
--- htdocs/intranet-tmpl/default/en/catalogue/translation_en.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-	<title>Dictionary</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<script type="text/javascript" language="javascript" src="<!--TMPL_VAR name="themelang"-->/includes/livesearch-en.js"></script>
-	<link href='<!-- TMPL_VAR name="themelang" -->/includes/livesearch.css' rel="stylesheet" type="text/css">
-	<link href='<!-- TMPL_VAR name="themelang" -->/includes/intranet.css' rel="stylesheet" type="text/css">
-</head>
-<body onload="liveSearchInit()">
-
- <form method="get" action="" id="keyword" onSubmit="return liveSearchSubmit()">
-	<input type="text" autocomplete="off" size="27" name="keyword" id="keyword"  onkeypress="javascript:liveSearchStart()" style="width:250px;overflow:auto" />	
-<div id="LSResult" style="display: none;"><ul id="LSShadow"><li> </li></ul></div>
-</form>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/catalogue/union-searchresult.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/catalogue/union-searchresult.tmpl
diff -N htdocs/intranet-tmpl/default/en/catalogue/union-searchresult.tmpl
--- htdocs/intranet-tmpl/default/en/catalogue/union-searchresult.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,76 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Simple Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<div id="main">
-<table width="760" border="0" align="center" cellpadding="4" cellspacing="2">
-  
-        <tr>
-          <td colspan="2" bgcolor="#F9F8F4"><table width="100%"  border="0" align="center" cellpadding="4" cellspacing="2">
-            <tr>
-              <td bgcolor="#06B4D2" class="style5">Union search</td>
-            </tr>  
-<!--TMPL_IF name="opsearch"-->
-<tr>
-              <td>
-				<table width="50%" border="0" align="left" cellpadding="0" cellspacing="0">
-                  <tr>
-<form method="post" action="/cgi-bin/koha/catalogue/union-search.pl" name="f">
-<input type="hidden" name="op" value="do_search"/>
-
-
-<tr>
-		<td bgcolor="#DCD9CF" class="style1">Library</td>
-		 <td width="10" bgcolor="#DCD9CF">Select</td>
-</tr>
-<!-- TMPL_LOOP name="serverloop" -->
-		<tr <!--TMPL_IF NAME="even"-->bgcolor="DEE5E7"<!--TMPL_ELSE-->bgcolor="#F2F0E9"<!--/TMPL_IF-->>
-			<td><!-- TMPL_VAR NAME="server" --></td>
-			
-			<td> <input type="checkbox" name="id" value=<!-- TMPL_VAR NAME="id" --> <!-- TMPL_IF name="checked" -->checked="1"<!-- /TMPL_IF --> ></td>
-	</tr>
-	<!-- /TMPL_LOOP -->
-	
-	<tr><td class="style1">Search <input name="field_value"       type="text" 	   class="style1"  /> 
-	on <select name="field" class="style2">
-	<option value="any">Any field</option>
-	<option value="author">Author</option>
-	<option value="title">Title</option>
-	<option value="subject">Subject</option>
-	</select></td>
-	</tr>
-	<tr><td class="style1"><input type="submit"  class="submit" value="Search" onclick="cursor :'wait'"; />
-	</td></tr>
-	</form>
-	</tr></table></td></tr>
-<!-- TMPL_ELSE -->
-		<tr>
-              <td><table width="100%"  border="0" align="left">
-<caption>Documents Found</caption>
-	 <tr bgcolor="#DCD9CF">
-		<td bgcolor="#DCD9CF" class="style1">Database</td>
-		<td bgcolor="#DCD9CF" class="style1">Results</td>
-		<td bgcolor="#DCD9CF" class="style1">View</td>
-		
-	</tr>
-	<!-- TMPL_IF name="breeding_loop" -->
-	<!-- TMPL_LOOP name="breeding_loop" -->
-		<tr <!--TMPL_IF NAME="even"-->bgcolor="DEE5E7"<!--TMPL_ELSE-->bgcolor="#F2F0E9"<!--/TMPL_IF-->>
-			<td><!-- TMPL_VAR NAME="server" --></td>
-			<td><!-- TMPL_VAR NAME="numresults" --></td>
-			<td><a href='<!-- TMPL_VAR NAME="search_string" -->' target="_blank">Click to view</a></td>
-			
-			
-		</tr>
-	<!-- /TMPL_LOOP -->
-	<!-- TMPL_ELSE -->
-		<tr><td colspan="6">Nothing found</td></tr>
-	<!-- /TMPL_IF -->
-</table></td></tr>
-<!-- /TMPL_IF -->
-</table>
-</div>
-
-
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-

Index: htdocs/intranet-tmpl/default/en/cataloguing/addbiblio.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/cataloguing/addbiblio.tmpl
diff -N htdocs/intranet-tmpl/default/en/cataloguing/addbiblio.tmpl
--- htdocs/intranet-tmpl/default/en/cataloguing/addbiblio.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,446 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: <!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="biblionumber" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
-<!--TMPL_UNLESS NAME="fromserials" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="acqui-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
-<div id="main">
-<!--/TMPL_UNLESS-->
-
-
-<!-- TMPL_IF name="error" -->
-			<div class="error">
-				<!--TMPL_IF NAME="onloan"-->
-				<ul>
-					<li>Item currenly onloan you can not DELETE!</li>
-					<li><a href="/cgi-bin/koha/mainpage.pl">Return to home page</a></li>
-				</ul>
-				<!--/TMPL_IF-->
-				<!--TMPL_IF NAME="xmlerror"-->
-				<ul>
-					<li>Non UTF-8 characters present or malformed XML</li>
-					<li>Please correct and save.</li>
-				</ul>
-				<!--/TMPL_IF-->
-			</div>
-<!-- /TMPL_IF -->
-<!--TMPL_UNLESS NAME="onloan"-->
-	<form method="post" name="f" id="f" action="/cgi-bin/koha/cataloguing/addbiblio.pl" >
-<h1><!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="oldbiblionumber" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --> With Framework : <!--TMPL_VAR Name="framework" --></h1>
-
-<div class="tabitem">
-		<input type="hidden" name="fromserials" value="<!-- TMPL_VAR NAME="fromserials" -->" />
-		<input type="hidden" name="op" value="addbiblio" />
-		<input type="hidden" name="addfield_field" /><input type="hidden" name="duplicateok" value="<!-- TMPL_VAR NAME="duplicateok" -->" />
-		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-		<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->" />
-		<!-- TMPL_IF name="biblionumber" -->
-			<input type="button" value="Save Bibliographic Record and go to Items"  onclick="Check(this.form);" accesskey="w" class="submit" />
-		<!-- TMPL_ELSE -->
-			<!--TMPL_UNLESS NAME="fromserials" -->
-			<input type="button" value="Add Bibliographic Record and go to Items" onclick="Check(this.form);" accesskey="w" class="submit" />
-			<!-- TMPL_ELSE -->
-			<input type="button" value="Add Bibliographic Record" onclick="Check(this.form);" accesskey="w" class="submit" />
-			<!--/TMPL_UNLESS-->
-		<!-- /TMPL_IF -->
-	<input type="button" value="z39.50 Search" class="submit" onclick="PopupZ3950(); return false;" / >
-	<input type="button" value="DVD Import" class="submit" onclick="PopupDVD(); return false;" / >
-</div>
-
-<br>
-	<div class="tabs">
-        <!-- TMPL_LOOP name="BIG_LOOP" -->
-            <a href="#" onclick="active(<!-- TMPL_VAR name="number"-->); return false;" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
-        <!--  /TMPL_LOOP -->
-	</div>
-
-<! -- RESET PAGINATION -->
-<!-- TMPL_LOOP name="BIG_LOOP" -->
-<!-- hide every tab except the 1st -->
-<!-- TMPL_IF name="number" -->
-    <div name="<!-- TMPL_VAR name="number" -->XX" id="<!-- TMPL_VAR name="number" -->XX" class="tab" style="visibility:hidden">
-<!-- TMPL_ELSE -->
-    <div name="<!-- TMPL_VAR name="number" -->XX" id="<!-- TMPL_VAR name="number" -->XX" class="tab" style="visibility:visible">
-<!-- /TMPL_IF -->
-<!-- TMPL_UNLESS name="number" -->
-    <!-- show duplicate warning on tab 0 only -->
-        <!-- TMPL_IF name="duplicatebiblionumber" -->
-                    <div class="error">
-                        <p>Is this a duplicate of <a href="../catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->" onclick="openWindow('../catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->&popup=1', 'Duplicatebiblio'); return false;"><!-- TMPL_VAR name="duplicatetitle" --></a>?</p>
-                        <p>You must either :</p>
-                        <ul>
-                            <li>If it <em>is</em> a duplicate, <a href="additem.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->">Edit Items</a> of the existing record.</li>
-                            <li>If not, click to <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" /> <a href="#" onclick="confirmnotdup(); return false;">Confirm it's not a duplicate</a></li>
-                        </ul>
-                    </div>
-        <!-- /TMPL_IF -->
-    <!-- /TMPL_UNLESS -->
-    <!-- TMPL_LOOP NAME="innerloop" -->
-		<div style=";" id="tag<!-- TMPL_VAR name="tag"-->">
-        <!-- TMPL_IF name="tag" -->
-        <p class="MARCtag">
-            <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-            <!-- TMPL_UNLESS name="hide_marc" -->
-                <a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a>
-                <input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffff00;'" type="text" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"  class="flat"> -
-            <!-- TMPL_ELSE -->
-                <input tabindex="1" type="hidden" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
-            <!-- /TMPL_UNLESS -->
-            <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-            <!-- TMPL_VAR NAME="tag_lib" -->
-            <!-- /TMPL_UNLESS -->
-            <!-- TMPL_IF name="repeatable" --><a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a><!-- /TMPL_IF -->
-        </p>
-        <!-- /TMPL_IF -->
-        <!-- TMPL_LOOP NAME="subfield_loop" -->
-            <!-- TMPL_IF NAME="visibility" -->
-                <a tabindex="1" style="color: grey; font-size: 80%; cursor: se-resize;" id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')">
-                    <!-- TMPL_VAR NAME="subfield" -->
-                </a>
-            <!-- /TMPL_IF -->
-            <div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->">
-                <p>
-                <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-                    <label <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> class="labelsubfield">
-                <!-- /TMPL_UNLESS -->
-                <!-- TMPL_UNLESS name="hide_marc" -->
-                    <img style="cursor: crosshair; color: grey; font-size: 80%;" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/>
-                        <input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->"  value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
-                <!-- TMPL_ELSE -->
-                    <input type="hidden" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->" value="<!-- TMPL_VAR NAME="subfield" -->"/>
-                <!-- /TMPL_UNLESS -->
-                <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-                    <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
-                    <!-- TMPL_VAR NAME="marc_lib" -->
-                    <!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
-                    </label>
-                <!-- /TMPL_UNLESS -->
-                <!-- TMPL_VAR NAME="marc_value" -->
-                <!-- TMPL_IF NAME="repeatable" -->
-                    <a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a>
-                <!-- /TMPL_IF -->
-	 <input type="hidden" name="tagindex" value="<!-- TMPL_VAR NAME="id" -->"/>
-                <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->"/>
-                <input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1"/>
-                <input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"/>
-                <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
-                </p>
-            </div>
-        <!-- /TMPL_LOOP -->
-        </div>
-    <!-- /TMPL_LOOP -->
-    </div>
-<!-- /TMPL_LOOP -->
-		<div name="hidden" id="hidden" class="tab">
-		<!-- TMPL_LOOP NAME="hidden_loop" -->
-				<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
-				<input type="hidden" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->" value="<!-- TMPL_VAR NAME="subfield" -->">
-				<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->">
-				<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
-		<!-- /TMPL_LOOP -->
-		</div>
-		<!-- TMPL_IF name="oldbiblionumtagfield" -->
-			<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldbiblionumtagfield" -->">
-			<input type="hidden" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->" value="<!-- TMPL_VAR NAME="oldbiblionumtagsubfield" -->">
-			<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->">
-			<input type="hidden" name="mandatory" value="0">
-			<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldbiblioitemnumtagfield" -->">
-			<input type="hidden" id="subfield<!--TMPL_VAR NAME="id"-->" name="subfield" value="<!-- TMPL_VAR NAME="oldbiblioitemnumtagsubfield" -->">
-				<input type="hidden" name="mandatory" value="0">
-				<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
-		<!-- /TMPL_IF -->
-	</form>
-
-
-
-<script language="JavaScript" type="text/javascript">
-function loading(){
-	document.getElementById("loading").style.display = "none";
-}
-function _(s) { return s } // dummy function for gettext
-	<!--TMPL_IF name="exit"-->
-var	finished=CloseMe(<!--TMPL_VAR NAME="biblionumber"-->,'<!--TMPL_VAR NAME="title"-->');
-	<!--/TMPL_IF-->
-function confirmnotdup(){
-	document.getElementById("confirm_not_duplicate").value = 1;
-	var checkform =	document.getElementById("f");
-	Check(checkform);
-}
-function active(numlayer)
-{
-	for (i=0; i <= 9 ; i++ ) {
-		ong = i+"XX";
-		link = "link"+i;
-		if (numlayer==i) {
-			with(document){
-			if (document.getElementById(ong)){
-				document.getElementById(ong).style.visibility="visible";
-			}
-			if(document.getElementById(link)){
-				document.getElementById(link).style.color="#000066";
-				document.getElementById(link).style.backgroundColor="#FFFFCC";
-			}
-			}
-		} else {
-			with(document){
-			if (document.getElementById(ong)){
-				document.getElementById(ong).style.visibility="hidden";
-			}
-			if (document.getElementById(link)) {
-				document.getElementById(link).style.color="#669999";
-				document.getElementById(link).style.backgroundColor="#D8DEB8";
-			}
-			}
-		}
-	}
-}
-active(0);
-function Check(f) {
-	document.body.style.cursor ="wait";
-	// Scan for nonempty fields
-	var field_is_nonempty_p = new Array();
-	for (i=0 ; i<f.field_value.length ; i++) {
-	    field_is_nonempty_p[f.tag[i].value] = 0;
-	}
-	for (i=0 ; i<f.field_value.length ; i++) {
-	    if (f.field_value[i].value.length != 0) {
-		field_is_nonempty_p[f.tag[i].value] += 1;
-	    }
-	}
-
-	// Scan for missing mandatory subfields
-	var total_missing_mandatory_subfields = 0;
-	var missing_mandatory_subfields = new Array();
-	for (i=0 ; i<f.field_value.length-2 ; i++) {
-		if (f.field_value[i].value.length==0 && f.mandatory[i].value==1) {
-		    // We should not flag an error unless the tag is also
-		    // mandatory, or if something else in the tag is entered
-
-		    if (f.tag_mandatory[i].value == 1 || field_is_nonempty_p[f.tag[i].value]) {
-				f.field_value[i].style.backgroundColor="#FF0000";
-				total_missing_mandatory_subfields++;
-			if (f.field_value[i].parentNode.tagName == "B")
-			{
-				missing_mandatory_subfields.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.parentNode.id.substr(0,1) + ")");
-			}
-			else
-			{
-				missing_mandatory_subfields.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.id.substr(0,1) + ")");
-			}
-
-			}
-		} else {
-			f.field_value[i].style.backgroundColor="#FFFFFF";
-		}
-	}
-
-	// Scan for missing mandatory tags
-	var total_missing_mandatory_tags = 0;
-	var seen_mandatory_tag_p = new Array();
-	var missing_mandatory_tags = new Array();
-	for (i=0 ; i<f.field_value.length ; i++) {
-	    var j = f.tag[i].value;
-	    if (!field_is_nonempty_p[j] && f.tag_mandatory[i].value == 1) {
-		if (seen_mandatory_tag_p[j] != 1) {
-		    seen_mandatory_tag_p[j] = 1;
-		    total_missing_mandatory_tags++;
- 		    if (f.field_value[i].parentNode.tagName == "B")
-		    {
-				missing_mandatory_tags.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.parentNode.id.substr(0,1) + ")");
-		    }
-		    else
-		    {
-				missing_mandatory_tags.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.id.substr(0,1) + ")");
-			}
-		}
-		f.field_value[i].style.backgroundColor="#FFFF00";
-	    }
-	}
-
-	var total_errors = total_missing_mandatory_tags + total_missing_mandatory_subfields;
-	var alertString2;
-	if (total_errors!=0) {
-		alertString2  = _("Form not submitted because of the following problem(s)");
-		alertString2 += "\n------------------------------------------------------------------------------------\n";
-		alertString2 += "\n- "+ total_missing_mandatory_tags +_(" mandatory tags empty");
-		for (i=0; i<missing_mandatory_tags.length; i++)
-		{
-			alertString2 += "\n--->"+ missing_mandatory_tags[i];
-		}
-  		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" mandatory fields empty (see bold subfields)");
-		for (i=0; i<missing_mandatory_subfields.length; i++)
-		{
-			alertString2 += "\n--->"+ missing_mandatory_subfields[i];
-		}
-		alert(alertString2);
-	} else {
-		document.forms['f'].submit();
-
-	}
-}
-function Dopop(link,id) {
- var subf=document.getElementsByName('subfield'+id);
-var fields=document.getElementsByName('field_value'+id);
-var defaultvalue="";
-	for (var s=0; s<fields.length; s++){
-		if (subf.item(s).value == 'a'){
-		defaultvalue=fields.item(s).value;
-		}
-	}
-
-	newin=window.open(link+"&result="+defaultvalue,"",'width=550,height=550,toolbar=false,scrollbars=yes');
-
-}
-
-function PopupZ3950() {
-    var strQuery="";
-	var error = 0;
-	for (i=0 ; i<document.forms['f'].field_value.length ; i++) {
-		if (document.forms['f'].tag[i].value == "<!--TMPL_VAR NAME="isbntag"-->"){
-		     if (document.forms['f'].subfieldYYY[i].value =="<!--TMPL_VAR NAME="isbnsub"-->"){
-			if(document.forms['f'].field_value[i].value.length>0) {
-		    	strQuery += "&isbn="+document.forms['f'].field_value[i].value;			
-			} else {
-			error++;
-			}
-		    }
-		}
-		if (document.forms['f'].tag[i].value == "<!--TMPL_VAR NAME="titletag"-->"){
-		    if (document.forms['f'].subfieldYYY[i].value == "<!--TMPL_VAR NAME="titlesub"-->"){
-			if(document.forms['f'].field_value[i].value.length>0) {
-		 	   strQuery += "&title="+document.forms['f'].field_value[i].value;
-			} else {
-			error++;
-			}
-		    }
-		}
-		if (document.forms['f'].tag[i].value == "<!--TMPL_VAR NAME="authortag"-->"){
-		   if (document.forms['f'].subfieldYYY[i].value == "<!--TMPL_VAR NAME="authorsub"-->"){
-			if(document.forms['f'].field_value[i].value.length>0) {
-		  	  strQuery += "&author="+document.forms['f'].field_value[i].value;
-			} else { 
-			error++;
-			}
-		    }
-		}
-		if (document.forms['f'].tag[i].value == "<!--TMPL_VAR NAME="issntag"-->"){
-		     if (document.forms['f'].subfieldYYY[i].value == "<!--TMPL_VAR NAME="issnsub"-->"){
-		             if(document.forms['f'].field_value[i].value.length>0) {
-		   	 strQuery += "&issn="+document.forms['f'].field_value[i].value;
-			} else {
-			error++;
-			}
-		      }
-		}
-	}
-	if(error < 4){
-	newin=window.open("../z3950/search.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"+strQuery,"z3950search",'width=640,height=400,location=yes,toolbar=no,scrollbars=yes');
-	} else {
-		alert("To perform a z39.50 search, you must enter at least one of the following: \n\n ISBN\n ISSN\n Title\n Author\n");
-	}
-}
-function PopupDVD() {
-    var strQuery="";
-	var error = 0;
-	for (i=0 ; i<document.forms['f'].field_value.length ; i++) {
-		
-		if (document.forms['f'].tag[i].value == "<!--TMPL_VAR NAME="urltag"-->"){
-		    if (document.forms['f'].subfieldYYY[i].value == "<!--TMPL_VAR NAME="urlsub"-->"){
-			if(document.forms['f'].field_value[i].value.length>0) {
-		 	   strQuery = document.forms['f'].field_value[i].value;
-			} else {
-			error++;
-			}
-		    }
-		}
-		
-		
-	}
-	if(error < 1){
-	newin=window.open("/cgi-bin/koha/cataloguing/get-imdb.php?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&website="+strQuery,"DVDsearch",'width=640,height=400,location=yes,toolbar=no,scrollbars=yes');
-	} else {
-		alert("To get DVD details, you must enter  856$u field\n as http://akas.imdb.com/title/tt0105435");
-	}
-}
-
-function Changefwk(FwkList) {
-  var fwk = FwkList.options[FwkList.selectedIndex].value;
-  window.location = "addbiblio.pl?oldbiblionumber=<!--TMPL_VAR Name="oldbiblionumber"-->&frameworkcode="+fwk;
-}
-
-
-
-function AddField(field) {
-	document.forms['f'].op.value = "addfield";
-	document.forms['f'].addfield_field.value=field;
-	document.f.submit();
-}
-
-function cloneSubfield(index) {
- var original = document.getElementById(index);
- var clone = original.cloneNode(true);
- clone.setAttribute("id", index + index); 
-// orginput : the value of the original field (in [0] if hide_marc=1, otherwise in [1]
-// image : the up button. don't exist is hide_marc=1
- <!-- TMPL_IF name="hide_marc" -->
-	var orginput = original.getElementsByTagName('input')[0];
- <!-- TMPL_ELSE -->
- 	var orginput = original.getElementsByTagName('input')[1];
-	image = clone.getElementsByTagName('img')[0];
-	image.setAttribute("onclick","upSubfield('" + index + index + "')");
- <!-- /TMPL_IF -->
- trigger = original.getElementsByTagName('a')[0];
- if (trigger) {
-// 	trigger.parentNode.removeChild(trigger);
- }
- clonetrigger = clone.getElementsByTagName('a')[0];
- clonetrigger.setAttribute("onclick","cloneSubfield('" + index + index + "')");
- clone.setAttribute("tabindex","1");
- orginput.value = '';
- original.parentNode.insertBefore( clone, original); 
-}
-
-
-function unHideSubfield(index,labelindex) {
-	subfield = document.getElementById(index);
-	subfield.style.display = 'block';
-	label = document.getElementById(labelindex);
-	label.style.display='none';	
-}
-function CloseMe(biblionumber,title) {
-	var myfield = opener.document.getElementById('biblionumber');
-	 myfield.value = biblionumber;
-	var myfield = opener.document.getElementById('title');
-	 myfield.value = title;
-	self.close();
-return false;
-	}
-function upSubfield(index) {
-	try{
-		var line = document.getElementById(index); // get the line where the user has clicked.
-	} catch(e) {
-		return;
-	}
-	var tag = line.parentNode; // get the dad of this line. (should be "<div tag=XXX>")
-	
-	// getting all subfields for this tag
-	var subfields = tag.getElementsByTagName('div');
-	var subfieldsLength = subfields.length;
-	if(subfieldsLength<=1) return; // nothing to do if there is just one subfield.
-	// among all subfields 
-	for(var i=0;i<subfieldsLength;i++){ 
-		if(subfields[i].getAttribute('id') == index){ //looking for the subfield which is clicked :
-			if(i==0){ // if the clicked subfield is on the top
-				tag.appendChild(subfields[0]);
-				return;
-			}else{
-				var lineAbove = subfields[i-1];
-				tag.insertBefore(line,lineAbove);
-				return;
-			}
-		}
-	}
-}
-</script>
-<!--/TMPL_UNLESS-->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/cataloguing/addbooks.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/cataloguing/addbooks.tmpl
diff -N htdocs/intranet-tmpl/default/en/cataloguing/addbooks.tmpl
--- htdocs/intranet-tmpl/default/en/cataloguing/addbooks.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging Home<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-	<h1>Catalog Maintenance</h1>
-	<!-- TMPL_IF name="noitemsfound" -->
-		<font color="red" size="4">No items found</font>
-	<!-- /TMPL_IF -->
-	
-	<div class="data">
-		<form action="isbnsearch.pl">
-		<table>
-		<caption>Search Existing Records</caption>
-		<tr><th><label for="title">Title</label></th>
-		<td>		<input type="text" name="title" id="title"size="35" /></td></tr>
-		<tr><th><label for="isbn">ISBN</label></th>
-		<td><input type="text" name="isbn" id="isbn"size="35" /></td></tr>		
-		</table></div>
-				<p><input type="submit" value="Search" class="submit" /></p>
-				<div class="help"><ul class="notes"><li>If the ISBN is found into the database, that record will be retrieved and can be modified.</li>
-	<li>If the ISBN is found in the reservoir, it will be retrieved and a full record added.</li>
-	<li>Otherwise, a record can be added from scratch.</li></ul></div>
-		</form>
-
-		<!-- TMPL_IF name="noitemsfound" -->
-				<form action="addbiblio.pl" method="post">
-		<div class="data"><table>
-		<caption>Create a Blank Bibliographic Record</caption>
-		<tr><th><label for="frameworkcode">Choose a Framework:</label></th><td><select name="frameworkcode" id="frameworkcode">
-						<option value="">Default</option>
-						<!-- TMPL_LOOP NAME="frameworkcodeloop" -->
-							<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
-						<!-- /TMPL_LOOP -->
-					</select> <input type="submit" value="Add Record Without Search" class="submit" /></td></tr>
-		</table></div></form>
-			
-		<!-- /TMPL_IF -->
-
-
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/cataloguing/additem.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/cataloguing/additem.tmpl
diff -N htdocs/intranet-tmpl/default/en/cataloguing/additem.tmpl
--- htdocs/intranet-tmpl/default/en/cataloguing/additem.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,147 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: Items for Bibliographic Record <!-- TMPL_VAR name="biblionumber" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_UNLESS NAME="fromserials"-->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
-<div id="main">
-
-<!--/TMPL_UNLESS-->
-<h1>Items for Record <!-- TMPL_VAR name="biblionumber" -->:</h1><h2><!-- TMPL_VAR name="title" -->, <!-- TMPL_VAR name="author" --></h2>
-	
-<!--TMPL_UNLESS NAME="fromserials"-->	
-<div class="tabitem">
-<form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"><input type="submit" class="submit" value="Edit Bibliographic Record"></form> <form action="addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="op" value="duplicate" /><input type="submit" class="submit" value="Duplicate this Record" /></form></div> <div class="tabitem"><form action="/cgi-bin/koha/catalogue/detail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View in Catalog"></form> <form action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View MARC in Catalog"></form>  <form action="/cgi-bin/koha/catalogue/ISBDdetail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View ISBD in Catalog"></form></div>
-<!--/TMPL_UNLESS-->
-<!-- TMPL_IF name="book_on_loan" -->
- 	         <div class="error">ERROR: This book is on LOAN DO NOT DELETE!</div>
- 	 <!-- /TMPL_IF -->
-<!-- TMPL_IF name="non_utf8" -->
- 	         <div class="error">ERROR: This record contains non UTF-8 chatacters correct and resave!!</div>
- 	 <!-- /TMPL_IF -->
- <!-- TMPL_IF name="barcode_not_unique" -->
- 	         <div class="error">ERROR: Barcode already exists!</div>
- 	 <!-- /TMPL_IF -->
-<!--TMPL_UNLESS NAME="fromserials"-->
-	<!-- TMPL_IF name="item_loop" -->
-			<div name="10XX" id="10XX">
-			<table class="editing">
-			<caption>Existing Items</caption>
-				<tr>
-					<!-- TMPL_LOOP NAME="item_header_loop" -->
-						<th><!-- TMPL_VAR NAME="header_value" --></th>
-					<!-- /TMPL_LOOP -->
-					<th colspan="2">&nbsp;</th>
-				</tr>
-					<!-- TMPL_LOOP NAME="item_loop" -->
-					<tr>
-						<!-- TMPL_VAR NAME="item_value" -->
-						<td><a href="additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">Edit</a></td>
-						<td><a href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="biblionumber" -->,<!-- TMPL_VAR NAME="itemnumber" -->)">Delete</a></td>
-					</tr>
-					<!-- /TMPL_LOOP -->
-			</table>
-			</div>
-
-	<!-- /TMPL_IF -->
-<!--/TMPL_UNLESS-->
-	<form method="post" action="additem.pl" name="f">
-	<input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->">
-	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">	
-	<input type="hidden" name="fromserials" value="<!--TMPL_VAR NAME="fromserials"-->">
-	<input type="hidden" name="serialid" value="<!--TMPL_VAR NAME="serialid"-->">
-	<input type="hidden" name="itemnumber" value="<!--TMPL_VAR NAME="itemnumber"-->">
-	<div class="data">
-	<table>
-		<caption><!-- TMPL_IF name="opisadd" -->Add New Item<!-- TMPL_ELSE -->Update Item<!-- /TMPL_IF --></caption>
-	<!-- TMPL_LOOP NAME="item" -->
-			<tr style="<!-- TMPL_VAR NAME='hidden' -->;">
-					<th><label><!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR NAME="subfield" --> - <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label></th>
-					<td><!-- TMPL_VAR NAME="marc_value" -->
-					<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
-					<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
-					<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"></td>
-			</tr>		
-<!-- /TMPL_LOOP -->
-		</table>
-	<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
-	 <!-- TMPL_IF name="barcode_not_unique" -->
- 	         <div class="error">ERROR: Barcode already exists!</div>
- 	 <!-- /TMPL_IF -->
-	
-	<!-- TMPL_IF name="opisadd" -->
-	<input type="button" value="Add item" onClick="Check(this.form)" accesskey="w" class="submit">
-	<!-- TMPL_ELSE -->
-	<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="itemtagfield" -->">
-	<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="itemtagsubfield" -->">
-	<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="itemnumber" -->">
-	<input type="button" value="Save Changes" onClick="Check(this.form)" accesskey="w" class="submit">
-	<!-- /TMPL_IF -->
-	</form>
-</div>
-</div>
-<script language="JavaScript" type="text/javascript">
-
-	
-	<!--TMPL_IF name="exit"-->
-var	finished=CloseMe(<!--TMPL_VAR NAME="serialid"-->,<!--TMPL_VAR NAME="itemnumber"-->,"<!--TMPL_VAR NAME="holdingbranch"-->");
-	<!--/TMPL_IF-->
-
-function _(s) { return s } // dummy function for gettext
-function active(numlayer)
-{
-	for (i=10; i < 11 ; i++ ) {
-		ong = i+"XX";
-			link = "link"+i;
-		if (numlayer==i) {
-			document.getElementById(ong).style.visibility="visible";
-			document.getElementById(link).style.backgroundColor="#11AA11";
-			document.getElementById(link).style.backgroundImage="url(<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif)";
-		} else {
-			document.getElementById(ong).style.visibility="hidden";
-			document.getElementById(link).style.backgroundColor="#FFFFFF";
-			document.getElementById(link).style.backgroundImage="";
-		}
-	}
-}
-function Check(f) {
-	var total_errors=0;
-//	alert(f.field_value.length);
-	for (i=0 ; i<f.field_value.length ; i++) {
-//	alert (f.field_value[i].value);
-		if (f.field_value[i].value.length==0 && f.mandatory[i].value==1) {
-			document.getElementById("error"+i).style.backgroundColor="#FF0000";
-			total_errors++;
-		} else {
-//			document.getElementById("error"+i).style.backgroundColor="#FFFFFF";
-		}
-	}
-	var alertString2;
-	if (total_errors==0) {
-		document.f.submit();
-	} else {
-		alertString2  = _("Form not submitted because of the following problem(s)");
-		alertString2 += "\n------------------------------------------------------------------------------------\n";
-		alertString2 += "\n- "+ total_errors+_(" mandatory fields empty (see bold subfields)");
-		alert(alertString2);
-	}
-}
-function Dopop(link,i) {
-	defaultvalue=document.forms[0].field_value[i].value;
-	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes');
-}
-function confirm_deletion(biblionumber,itemnumber) {
-	var is_confirmed = confirm(_('Do you confirm item deletion?'));
-	if (is_confirmed) {
-	window.location = "additem.pl?op=delitem&biblionumber="+biblionumber+"&itemnumber="+itemnumber;
-	}
-}
-function CloseMe(serialid,itemnumber,holdingbranch) {
-	var myfield = opener.document.getElementById('serial'+serialid);
-	 myfield.value = itemnumber;
-	var myfield = opener.document.getElementById('holdingbranch'+serialid);
-	 myfield.value = holdingbranch;
-	self.close();
-return false;
-	}
-</script>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/cataloguing/isbnsearch.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/cataloguing/isbnsearch.tmpl
diff -N htdocs/intranet-tmpl/default/en/cataloguing/isbnsearch.tmpl
--- htdocs/intranet-tmpl/default/en/cataloguing/isbnsearch.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,105 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: Search Results for <!-- TMPL_IF name="isbn" -->ISBN <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF --><!-- TMPL_IF name="title" -->title <!-- TMPL_VAR name="title" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-	<h1 class="acquisition">Search Results</h1>
-	<div id="bloc25">
-		<h2 class="acquisition">Results for <b><!-- TMPL_IF name="isbn" -->ISBN <!-- TMPL_VAR NAME="isbn" --><!-- /TMPL_IF --><!-- TMPL_IF name="title" -->title <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></b></h2>
-		<!-- TMPL_IF name="total" -->
-			<p><!-- TMPL_VAR NAME="grandtotal" --> total results</p>
-			<p>Results <i><!-- TMPL_VAR NAME="showoffset" --></i> to <i><!-- TMPL_VAR NAME="total" --></i> displayed</p>
-		<!-- /TMPL_IF -->
-	</div>
-	<div id="bloc100">
-		<h2 class="acquisition">Exists in Koha</h2>
-		<table>
-			<tr>
-				<th class="acquisition">Title</th>
-				<th class="acquisition">Author</th>
-				<th class="acquisition">copyright</th>
-				<th class="acquisition">LC</th>
-				<th class="acquisition">&nbsp;</th>
-<th class="acquisition">&nbsp;</th>
-<th class="acquisition">&nbsp;</th>
-			</tr>
-			<!-- TMPL_IF name="results_loop" -->
-			<!-- TMPL_LOOP NAME="results_loop" -->
-				<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
-					<td><!-- TMPL_VAR NAME="title" --></a>
-					<td><!-- TMPL_VAR NAME="author" --></td>
-					<td><!-- TMPL_VAR NAME="copyrightdate" --></td>
-					<td><!-- TMPL_VAR NAME="classification" -->&nbsp;<!-- TMPL_VAR NAME="subclass" --></td>
-					
-					<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button acquisition">Edit Book</a></td>
-					<td><a href="additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit Items</a></td>
-						
-						
-						<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;op=duplicate">Duplicate</a></td></tr>
-				</tr>
-			<!-- /TMPL_LOOP -->
-			<!-- TMPL_ELSE -->
-			<tr><td colspan="4">Nothing found</td></tr>
-			<!-- /TMPL_IF -->
-		</table>
-		<p class="center">
-			<!-- Row of numbers corresponding to search result pages -->
-			<!-- TMPL_IF name="displayprev" -->
-				<a href="isbnsearch.pl?offset=<!-- TMPL_VAR NAME="prevstartfrom" -->&amp;<!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->">
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0">
-				</a>
-			<!-- TMPL_ELSE -->
-				<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="numbers" -->
-				<!-- TMPL_IF name="highlight" -->
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
-				<!-- TMPL_ELSE -->
-					<a href="isbnsearch.pl?offset=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0">
-					</a>
-				<!-- /TMPL_IF -->
-			<!-- /TMPL_LOOP -->
-			<!-- TMPL_IF name="displaynext" -->
-				<a href="isbnsearch.pl?offset=<!-- TMPL_VAR NAME="nextstartfrom" -->&amp;<!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->">
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0">
-				</a>
-			<!-- TMPL_ELSE -->
-				<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
-			<!-- /TMPL_IF -->
-		</p>
-		<h2 class="acquisition">Books in breeding farm</h2>
-		<!-- TMPL_IF name="breeding_loop" -->
-			<table>
-				<tr>
-					<th>Title</th>
-					<th>Author</th>
-					<th>ISBN</th>
-					<th>LC</th>
-					<th>coming from</th>
-					<th>&nbsp;</th>
-					
-					<!-- TMPL_LOOP NAME="breeding_loop" -->
-						<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
-							<td><!-- TMPL_VAR NAME="title" --></a>
-							<td><!-- TMPL_VAR NAME="author" --></td>
-							<td><!-- TMPL_VAR NAME="isbn" --></td>
-							<td><!-- TMPL_VAR NAME="classification" -->&nbsp;<!-- TMPL_VAR NAME="subclass" --></td>
-							<td><!-- TMPL_VAR NAME="file" --></td>
-							<td><a href="addbiblio.pl?breedingid=<!-- TMPL_VAR NAME="id" -->">Add biblio</a></td>
-							
-						</tr>
-					<!-- /TMPL_LOOP -->
-			</table>
-		<!-- TMPL_ELSE -->
-			<p class="center">Nothing found</p>
-		<!-- /TMPL_IF -->
-		<p class="center">
-		
-			<a href="addbiblio.pl" class="button acquisition">Add new record</a>
-		
-		</p>
-	</div>
-	
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/circ/branchreserves.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/circ/branchreserves.tmpl
diff -N htdocs/intranet-tmpl/default/en/circ/branchreserves.tmpl
--- htdocs/intranet-tmpl/default/en/circ/branchreserves.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,82 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
-
-<h1>Circulation: Branch Reserves</h1>
-
-<div id="mainbloc">
-	<h1 class="circulation">Reserves of your library the : <!-- TMPL_VAR NAME="show_date" --></h1>
-	<!-- TMPL_IF NAME="messagetransfert" -->
-		<div>
-				<h2>Reserve find for the document(<!-- TMPL_VAR NAME="nextreservtitle" -->)must transfered</h2>
-			<p>This documen is reserved by : <b> <!-- TMPL_VAR NAME="nextreservsurname" --> <!-- TMPL_VAR NAME="nextreservfirstname" --></b> at the library : <b> <!-- TMPL_VAR NAME="branchname" --> </b>, Please put this document in transfer .
-			</p>
-			<form name="cancelReservewithtransfert" action="branchreserves.pl" method="post">
-				<input type="submit" class="button circulation">
-			</form>
-		</div>
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="waiting" -->
-		<div id="bloc25">
-				<h2 class="circulation">This document is in Waiting status</h2>
-			<p>This document (<!-- TMPL_VAR NAME="nextreservtitle" -->) is reserved by <b> : <!-- TMPL_VAR NAME="nextreservsurname" --> <!-- TMPL_VAR NAME="nextreservfirstname" --></b>,
-			Please keep this document for the next reserve .
-			</p>
-			<form name="cancelReservewithwaiting" action="branchreserves.pl" method="post">
-				<input type="submit">
-			</form>
-		</div>
-	<!-- /TMPL_IF -->
-	<!-- TMPL_UNLESS NAME="message" -->
-	<div id="resultlist">
-		<table>
-		<tr>
-			<th class="circulation" colspan="5">Reserves of your library</th>
-		</tr>
-		<tr>
-			<th class="circulation">Available since</th>
-			<th class="circulation">Title</th>
-			<th class="circulation">Borrower</th>
-			<th class="circulation">Localisation</th>
-			<th class="circulation">Action</th>
-		</tr>
-			<!-- TMPL_LOOP NAME="reserveloop" -->
-				<tr <!-- TMPL_IF NAME="messcompa" --> class="problem" <!-- /TMPL_IF -->>
-					<td><p><!-- TMPL_VAR NAME="waitingdate" --></p> <!-- TMPL_IF NAME="messcompa" --> Reserve Over <!-- /TMPL_IF --></td>
-					<td>
-						<p>
-							<a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
-							&nbsp; (<b><!-- TMPL_VAR NAME="itemtype" --></b>)
-							<br />Barcode : <!-- TMPL_VAR NAME="barcode" -->
-						</p>
-					</td>
-					<td>
-						<p><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> &nbsp; <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
-					<!-- TMPL_IF NAME="borrowermail" --><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR NAME="title" -->">
-		<!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
-						</p>
-					</td>
-					<td><p><!-- TMPL_VAR NAME="homebranch" --> <!-- TMPL_VAR NAME="itemcallnumber" --></p></td>
-					<td>
-						<form name="cancelReserve -->" action="branchreserves.pl" method="post">
-							<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernum" -->">
-							<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
-							<input type="hidden" name="fbr" value="<!-- TMPL_VAR NAME="holdingbranch" -->">
-							<input type="hidden" name="tbr" value="<!-- TMPL_VAR NAME="homebranch" -->">
-							<input type="submit" 
-								<!-- TMPL_IF NAME="dotransfer" -->
-							value="Cancel reserve and return this document" 
-							<!-- TMPL_ELSE -->
-							value="Cancel reserve" 
-						<!-- /TMPL_IF -->
-						>
-						</form>
-					</td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-		</table>
-	</div>
-	<!-- /TMPL_UNLESS -->
-</div>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/circ/branchtransfers.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/circ/branchtransfers.tmpl
diff -N htdocs/intranet-tmpl/default/en/circ/branchtransfers.tmpl
--- htdocs/intranet-tmpl/default/en/circ/branchtransfers.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,141 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation: Transfers<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="circ-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1>Circulation: Transfers</h1>
-
-<!-- TMPL_IF Name="found" -->
-	<h3 class="alert">Reserve Found</h3>
-		
-	<div class="form">
-		<table>
-		<caption><!-- TMPL_IF Name="reserved" -->Reserve found for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
-		<!-- TMPL_IF Name="waiting" -->
-    Item is marked waiting at <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF --></caption>
-		<tr><th>
-			<!-- TMPL_IF Name="reserved" -->Set reserve to waiting and transfer book to <b><!-- TMPL_VAR Name="branchname" --> </b>: <!-- /TMPL_IF -->
-			<!-- TMPL_IF Name="waiting" -->Cancel reservation and then attempt transfer: <!-- /TMPL_IF -->
-		</th>
-		<td>
-			<form method="post" name="mainform" id="mainform" action="branchtransfers.pl">
-				<!-- TMPL_LOOP Name="trsfitemloop" -->
-					<input type="hidden" name="bc-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
-					<input type="hidden" name="fb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="frombrcd" -->" />
-					<input type="hidden" name="tb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="tobrcd" -->" />
-				<!-- /TMPL_LOOP -->
-				<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
-				<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="bornum" -->" />
-				<!-- TMPL_IF Name="waiting" --><input type="hidden" name="barcode" value="<!-- TMPL_VAR Name="barcode" -->" />
-					<input type="hidden" name="request" value="KillWaiting" />
-					<input type="submit" value="Cancel" class="cancel" />
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF Name="reserved" --><input type="hidden" name="request" value="SetWaiting" />
-					<input type="submit" value="Waiting" class="submit" /><!-- /TMPL_IF -->
-			</form>
-		</td></tr>
-		<!-- TMPL_IF Name="reserved" --><tr><th>Cancel reservation and then attempt transfer:</th>
-			<td>
-			<form method="post" name="mainform" id="mainform" action="branchtransfers.pl">
-
-			<!-- TMPL_LOOP Name="trsfitemloop" -->
-				<input type="hidden" name="bc-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
-				<input type="hidden" name="fb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="frombrcd" -->" />
-				<input type="hidden" name="tb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="tobrcd" -->" />
-			<!-- /TMPL_LOOP -->
-
-			<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
-			<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="bornum" -->" />
-			<input type="hidden" name="tobranchcd" value="<!-- TMPL_VAR Name="tobranchcd" -->" />
-			<input type="hidden" name="barcode" value=<!-- TMPL_VAR Name="barcode" --> />
-			<input type="hidden" name="loggedinuser" value=<!-- TMPL_VAR Name="loggedinusername" --> />
-			<input type="hidden" name="request" value="KillReserved" />
-			<input type="submit" class="cancel" value="Cancel" />
-			</form>
-		<!-- /TMPL_IF -->
-		</td></tr>
-		<tr><th>Ignore and return to transfers: </th>
-			<td>
-			<form method="post" name="mainform" id="mainform" action="branchtransfers.pl" />
-			<input type="hidden" name="tobranchcd" value=<!-- TMPL_VAR Name="tobranchcd" --> />
-			<input type="hidden" name="barcode" />
-			<!-- TMPL_LOOP Name="trsfitemloop" -->
-				<input type="hidden" name="bc-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
-				<input type="hidden" name="fb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="frombrcd" -->" />
-				<input type="hidden" name="tb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="tobrcd" -->" />
-			<!-- /TMPL_LOOP -->
-			<input type="submit" value="Ignore" class="submit" />
-			</form>
-			</td>
-		</tr></table></div>
-
-<!-- TMPL_ELSE -->
-	<div class="table"><table>
-	<caption>Messages</caption>
-	<tr><td>
-	<!-- TMPL_IF Name="reqmessage" -->
-		<!-- TMPL_IF Name="cancelled" -->
-			Reserve Cancelled<br>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF Name="setwaiting" -->
-			Item should now be waiting at branch: <!-- TMPL_VAR Name="reqbrchname" --><br>
-		<!-- /TMPL_IF -->
-	<!-- /TMPL_IF -->
-	<!-- TMPL_LOOP Name="errmsgloop" -->
-		<font color='red' size='+2'>
-		<!-- TMPL_IF Name="errbadcode" -->
-			No Item with barcode: <!-- TMPL_VAR Name="msg" -->
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF Name="errispermanent" -->
-			Please return item to home branch: <!-- TMPL_VAR Name="msg" -->
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF Name="errdesteqholding" -->
-			Item is already at destination branch.
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF Name="errwasreturned" -->
-			Item was on loan to <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>
-<!-- TMPL_VAR Name="name" --> and has been returned.
-		<!-- /TMPL_IF -->
-		</font>
-		<br />
-	<!-- /TMPL_LOOP -->
-	</td></tr></table></div>
-	<form method="post" name="mainform" id="mainform" action="/cgi-bin/koha/circ/branchtransfers.pl">
-	<h3>Transfer</h3><div class="form">
-	<input type="hidden" name="loggedinuser" value=<!-- TMPL_VAR Name="loggedinusername" --> />
-	<table><tr><th>Destination Branch:</th><td><select name="tobranchcd">
-			<!-- TMPL_LOOP Name="branchoptionloop" -->
-				<option value="<!-- TMPL_VAR Name="code" -->" <!-- TMPL_VAR Name="selected" -->><!-- TMPL_VAR Name="name" --></option>
-			<!-- /TMPL_LOOP -->
-		</select></td></tr>
-<tr><th>Enter Book Barcode</th><td><input name="barcode" size="15" /></td></tr>
-</table>
-	<input type="hidden" name="tobranchcd" value="<!-- TMPL_VAR Name="tobrancd" -->" />
-	<!-- TMPL_LOOP Name="trsfitemloop" -->
-		<input type="hidden" name="bc-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
-		<input type="hidden" name="fb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="frombrcd" -->" />
-		<input type="hidden" name="tb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="tobrcd" -->" />
-	<!-- /TMPL_LOOP -->
-	<input type="submit" class="submit" value="Transfer" />
-
-	<div class="form"><table>
-		<caption>Transfered Items</caption>
-		<tr><th >Bar Code</th><th>Title</th><th>From</th><th>To</th></tr>
-		<!-- TMPL_LOOP Name="trsfitemloop" -->
-			<tr><td align="left" width="20">
-			<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR Name="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR Name="barcode" --></a></td>
-			<td align="center"  width="200"><!-- TMPL_VAR Name="title" --></td>
-			
-		
-			<td align="left"  width="100"><!-- TMPL_VAR Name="frbrname" --></td>
-			<td align="left"  width="100"><!-- TMPL_VAR Name="tobrname" --></td>
-			</tr>
-		<!-- /TMPL_LOOP -->
-		</table></div>
-	</div>
-	</form>
-		
-<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/circ/circulation.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/circ/circulation.tmpl
diff -N htdocs/intranet-tmpl/default/en/circ/circulation.tmpl
--- htdocs/intranet-tmpl/default/en/circ/circulation.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,300 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation<!-- TMPL_IF Name="borrowernumber" -->: Issuing to <!-- TMPL_VAR name="surname" -->, <!-- TMPL_VAR name="firstname" -->  (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<div id="main"><h1>Circulation: Issues  <!-- TMPL_VAR NAME="today" --></h1></div>
-
- <div id="main">
-	
-<!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
-	
-	
-	<!-- RESULT OF ISSUING REQUEST -->
-	
-		<!-- TMPL_IF NAME="IMPOSSIBLE" -->
-		<div class="error">
-		<h3>Error Issuing:</h3>
-			<ul>
-			<!-- TMPL_IF NAME="hr_LIMIT" -->
-				24 hour limit:
-				<p><!-- TMPL_VAR name="hr_LIMIT" --> </p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="TOO_MANY" -->
-				
-				<li>Too many isseus of <!-- TMPL_VAR NAME="TOO_MANY" --> </li>				
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="INVALID_DATE" -->
-				<li>Invalid date</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="TOO_EARLY" -->
-				
-				<li>Too early to renew. <!-- TMPL_VAR NAME="barcode" --> </li>				
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="RESERVE_FOUND" -->
-				
-				<li>Barcode: <!-- TMPL_VAR NAME="barcode" --> is reserved cannot issue</li>				
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
-				
-				<li>Barcode Unkown</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
-				
-				<li>NOT FOR LOAN</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="WTHDRAWN" -->
-				<li>Item is cancelled</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="GNA" -->
-				<li>Patron's address is in doubt</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="CARD_LOST" -->
-				<li>Patron's card is lost</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="DEBARRED" -->
-				<li>Patron is debarred</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="NO_MORE_RENEWALS" -->
-				<li>No more renewals possible</li>
-			<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="EXPIRED" -->
-				<li>Borrower card expired</li>
-			<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="IN_RESERVE" -->
-				<li>This is a Reserve Section book. Use Reserve issue</li>
-			<!-- /TMPL_IF -->
-			</ul>
-		</div>
-		<!-- TMPL_ELSE -->
-		
-		<!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->
-		
-		<div class="error">
-		<h3>Please Confirm Issue:</h3>
-			<!-- TMPL_IF NAME="hr_LIMIT" -->
-				24 hour limit:
-				<p><!-- TMPL_VAR name="hr_LIMIT" --> </p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="DEBT" -->
-				<p>The patron has a debt of <!-- TMPL_VAR name="DEBT" --> YTL</p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="RENEW_ISSUE" -->
-				<p>You are trying RE-ISSUE.  USE RENEW</p>
-			<!-- /TMPL_IF -->	
-			<!-- TMPL_IF NAME="SUCCESFUL_RENEW" -->
-				<p>Succesfully renewd items</p>
-			<!-- /TMPL_IF -->	
-			<!-- TMPL_IF NAME="RESERVE_WAITING" -->
-				<p>Item is consigned for <!-- TMPL_VAR NAME="RESERVE_WAITING" --></p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="RESERVED" -->
-				<p>Item is on reserve for <!-- TMPL_VAR NAME="RESERVED" --></p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
-				<p>Item issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return and issue?</p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="TOO_MANY" -->
-				<p>Too many issues (already issued / max : <!-- TMPL_VAR name="TOO_MANY" -->)</p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
-			<div class="action"><form class="inline" method="post" action="/cgi-bin/koha/circ/circulation.pl">
-				<!-- TMPL_IF NAME="RESERVED" -->
-					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
-				<!-- /TMPL_IF -->
-				
-			
-				
-				<!-- TMPL_IF NAME="RESERVE_WAITING" -->
-					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
-				<!-- /TMPL_IF -->
-				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" tabindex="0"/>
-				
-		
-				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
-				<input type="hidden" name="issueconfirmed" value="1" />
-				<input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->" />
-				<input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->" />
-				<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->" />
-			 	<!-- TMPL_UNLESS name="RENEW_ISSUE" --><input type="submit" value="Confirm Issue" class="submit" accesskey="y" /></form><form class="inline" method="post" action="/cgi-bin/koha/circ/circulation.pl"><input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="submit" class="cancel" value="Don't Issue" accesskey="n" /><!--/TMPL_UNLESS--></form></div>
-			</div>
-			<!-- /TMPL_UNLESS -->
-		<!-- /TMPL_IF -->
-		<!-- /TMPL_IF -->
-		
-		<!-- TMPL_IF NAME="issued" -->
-			<div class="error"><p>Item issued</p></div>
-		<!-- /TMPL_IF -->
-	
-	<div class="details">
-	<!-- TMPL_IF NAME="message" -->
-	<div class="details">
-	No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> <a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add">Add a new patron</a>
-	</div>
-	<!-- /TMPL_IF -->
-	
-	<!-- TMPL_IF NAME="CGIselectborrower" -->
-	<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform">
-		<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
-		<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
-	<label for="borrnumber">Select a borrower: </label>
-		<style type="text/css">
-		option:hover {
-			background-color : #f0f0f0;
-			color : #000099;
-		}
-	</style>
-	<p><!-- TMPL_VAR name="CGIselectborrower" --></p>
-	<p><input type="submit" class="submit" value="Select" /></p>
-	<p>Patron not found? <a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add">Add a new patron</a></p>
-	</form>
-	<!-- TMPL_ELSE -->
-		<!-- TMPL_IF NAME="borrowernumber" -->
-	<div id="notes">                                							
-	<ul>
-	<li><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="city" --></li>
-	<!-- TMPL_IF NAME="phone" --><li><!-- TMPL_VAR NAME="phone" --></li><!--/TMPL_IF-->
-	<!-- TMPL_IF NAME="emailaddress" --><li><a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a></li><!-- /TMPL_IF -->
-	<li>Category: <!-- TMPL_VAR name="categorycode" --></li>
-	<li>(<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">details</a> / <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;modify=edit&amp;destination=circ">edit</a>)</li>
-	</ul>
-	</div><table width= "70%"><tr><td>
-
-	<h3><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h3>
-	<h4> &nbsp; &nbsp; <!-- TMPL_VAR NAME="issuecount" --> out<!-- TMPL_IF NAME="overduecount" -->, <span class="error"><!-- TMPL_VAR name="overduecount" --> overdue</span><!-- /TMPL_IF --></h4><br clear="right" />
-	<!-- TMPL_IF NAME="resissuecount" -->, <h4> &nbsp;<span class="error"> Reserve section <!-- TMPL_VAR NAME="resissuecount" --> out, <!-- TMPL_VAR name="resfine" --> YTL fine</span></h4><br clear="right" /><!-- /TMPL_IF -->
-	
-	</td><td><img src="<!-- TMPL_VAR NAME="borrowerphoto" -->" alt="Photo" hspace="0" vspace="0" border="0" width="100px" heigth="100px" style="clear:both;float:right;position:relative;">
-	</td></tr></table>
-									
-						
-
-
-<!-- TMPL_IF NAME="flagged" -->
-</div><div class="details">
-<ul>
-<!-- TMPL_IF NAME="gna" -->
-<li><span class="error">Address:</span> Patron's address in doubt</li>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="lost" -->
-<li><span class="error">Lost:</span> Patron's card is lost</li>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="dbarred" -->
-<li><span class="error">Debarred:</span> Patron is debarred <form class="inline compact" action="/cgi-bin/koha/members/setdebar.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" value="circ" name="destination" /><input type="hidden" name="status" value="0" /><input type="submit" class="submit" value="Lift Debarment" /></form></li>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF name="odues" -->	<li><!-- TMPL_IF name="nonreturns" -->
-					<span class="error">Overdues:</span> Patron has <span class="error">ITEMS OVERDUE</span> See highlighted items <a href="#previous">below</a>
-				<!-- /TMPL_IF --></li><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="noissues" -->
-<!-- TMPL_IF NAME="charges" --><li><span class="error">Fines:</span> Patron has <a href="/cgi-bin/koha/members/boraccount.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">outstanding fines</a>. Make <a href="/cgi-bin/koha/members/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a></li><!-- /TMPL_IF -->
-<!-- TMPL_ELSE -->
-	<!-- TMPL_IF name="charges" --><li>Fines: Patron has <a href="/cgi-bin/koha/members/boraccount.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">outstanding fines</a>. Make <a href="/cgi-bin/koha/members/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a></li><!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
-</ul>
-
-<dl>
-		
-<!-- TMPL_IF name="waiting" -->
-		<dt>Reserves waiting:</dt>
-			<dd><ul><!-- TMPL_LOOP name="itemswaiting" -->
-				<li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR name="title" --></a> (<!-- TMPL_VAR name="barcode" --> -- <!-- TMPL_VAR name="branchname" -->)</li>
-			<!-- /TMPL_LOOP -->
-			</ul></dd>
-		<!-- /TMPL_IF -->
-
-		<!-- TMPL_IF name="notes" -->
-					<dt>Notes:</dt> <dd class="error"><!-- TMPL_VAR name="notesmsg" --></dd>
-				<!-- /TMPL_IF -->
-</dl>
-<!-- /TMPL_IF -->
-	<!-- TMPL_ELSE -->
-	<!-- No card entered yet -->
-	<form method="post" action="/cgi-bin/koha/circ/circulation.pl" name="mainform" id="mainform">
-<label for="findborrower">Enter borrower card number or partial last name: </label>
-				<input name="findborrower" type="text" size="40" />
-					<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
-					<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
-				<input type="submit" class="submit" value="Submit" />
-				</form>
-		<!-- /TMPL_IF -->
-	<!-- /TMPL_IF -->
-	</div>
-
-<!-- BARCODE ENTRY -->
-
-<!-- TMPL_IF NAME="borrowernumber" -->
-	<div class="details">
-	<form method="post" action="/cgi-bin/koha/circ/circulation.pl" name="mainform">
-<label for="barcode">Enter Item Barcode: </label><input name="barcode" size="14" maxlength="14"class="unfocus" onfocus="this.className='focus'" onblur="this.className='unfocus'" /> <input type="submit" value="Issue" class="submit" /><!-- Display for NPL <input type="hidden" name="day" value="0" /><input type="hidden" name="month" value="0" /><input type="hidden" name="year" value="0" /> /Display for NPL -->
-	<p><input type="hidden" name="day" value="0" /><input type="hidden" name="month" value="0" /><input type="hidden" name="year" value="0" />
-	<!--/TMPL_IF-->		
-		<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
-		<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
-		<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
-		<input type="hidden" name="print" value="maybe" />
-		<!-- TMPL_IF NAME="CHARGES" -->
-			<input type="hidden" name="charges" value="yes" />
-			<input type="hidden" name="oldamount" value="<!-- TMPL_VAR NAME="amountold" -->" />
-		<!-- /TMPL_IF -->
-		</p>
-	</form>
-	</div>
-
-
-
-
-
-
-<!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
-<!-- TMPL_IF NAME="borrowernumber" -->
-<div class="table"><form class="inline" action="/cgi-bin/koha/circ/renewscript.pl" method="post"><input type="hidden" value="circ" name="destination" /><input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
-	<table>
-		<caption>Issues <span class="print"><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page">(Print Page)</a> <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip">(Print Slip)</a></span></caption>
-		<tr><th>Format</th>
-			<th>Due Date</th>
-			<th>Title</th>
-			<th>Author</th>
-			<th>Call No</th>
-			<th>Barcode</th>
-			<th>Renew?</th>
-		</tr>
-	<!-- TMPL_IF NAME="todayissues" -->
-		<!-- TMPL_LOOP NAME="todayissues" -->
-		<!-- TMPL_IF NAME="tcolor" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
-			
-			<td><!-- TMPL_VAR NAME="ctype" --></td>
-			<td><!-- TMPL_VAR NAME="dd" --></td>
-			<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --></a><br/><i><!-- TMPL_VAR name="itemnotes" --></i></td>
-			<td><!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="additionalauthor" --><!-- /TMPL_IF --></td>
-			<td><!-- TMPL_VAR NAME="classification" --></td>
-			<td><!-- TMPL_VAR NAME="barcode" --></td>
-		</tr>
-		<!-- /TMPL_LOOP -->
-	
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="previssues" -->
-		<tr><th colspan="7"><a name="previous" id="previous">Previous Issues</a></th></tr>
-		<!-- TMPL_LOOP NAME="previssues" -->
-			<!-- TMPL_IF NAME="tcolor" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
-			
-			<td><!-- TMPL_VAR NAME="ctype" --></td>
-			<td><!-- TMPL_IF NAME="od" --><span class="error"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="dd" --><!-- TMPL_IF NAME="od" --></span><!-- /TMPL_IF --></td>
-			<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --></a><br/><i><!-- TMPL_VAR name="itemnotes" --></i></td>
-			<td><!-- TMPL_VAR NAME="author" --></td>
-			<td><!-- TMPL_VAR NAME="classification" --></td>
-			<td><!-- TMPL_VAR NAME="barcode" --></td>
-			<td><input type="checkbox" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF NAME="od" --> checked="checked"<!-- /TMPL_IF --> /></td></tr>
-		<!-- /TMPL_LOOP -->
-	</table>
-	
-	<p><input type="submit" class="submit" value="Renew Checked Items" /></p>
-<!-- /TMPL_IF -->
-</form>
-
-	
-</div>
-
-<!-- /TMPL_IF -->
-</div>
-
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
-

Index: htdocs/intranet-tmpl/default/en/circ/currenttransfers.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/circ/currenttransfers.tmpl
diff -N htdocs/intranet-tmpl/default/en/circ/currenttransfers.tmpl
--- htdocs/intranet-tmpl/default/en/circ/currenttransfers.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,59 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
-
-<div id="mainbloc">
-	<h1 class="circulation">Transfers in wait for your library the : <!-- TMPL_VAR NAME="show_date" --></h1>
-	<div id="resultlist">
-	<!-- TMPL_LOOP NAME="branchesloop" -->
-		<!-- TMPL_IF NAME="branchcode" -->
-		<table>
-		<tr>
-			<th class="circulation" colspan="5">current transfers from the library : <!-- TMPL_VAR NAME="branchname" --> </th>
-		</tr>
-		<tr>
-			<th class="circulation">Date of transfer</th>
-			<th class="circulation">Title</th>
-			<th class="circulation">Borrower</th>
-			<th class="circulation">Localisation</th>
-			<th class="circulation">Action</th>
-		</tr>
-		<!-- TMPL_LOOP NAME="reserv" -->
-			<tr <!-- TMPL_IF NAME="messcompa" --> class="problem" <!-- /TMPL_IF -->>
-				<td><p><!-- TMPL_VAR NAME="datetransfer" --></p> <!-- TMPL_IF NAME="messcompa" --> check this transfer<!-- /TMPL_IF --></td>
-				<td>
-					<p>
-						<a href="/cgi-bin/koha/catalogue/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
-						&nbsp; (<b><!-- TMPL_VAR NAME="itemtype" --> </b>)
-						<br />Barcode : <!-- TMPL_VAR NAME="barcode" -->
-					</p>
-				</td>
-				<td>
-				<!-- TMPL_IF NAME="borrowername" -->
-					<p><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> &nbsp; <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
-				<!-- TMPL_IF NAME="borrowermail" --><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR NAME="title" -->">
-	<!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
-					</p>
-				<!-- TMPL_ELSE -->
-					<P>
-					Transfer without reserv linked
-					</P>
-				<!-- /TMPL_IF -->
-				</td>
-				<td><p><!-- TMPL_VAR NAME="homebranch" --> <!-- TMPL_VAR NAME="itemcallnumber" --></p></td>
-				<td>
-				<form name="dotransfer" action="currenttransfers.pl" method="post">
-						<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
-				<input type="submit" value="Cancel this transfer">
-				</form>
-				</td>	
-			</tr>
-		<!-- /TMPL_LOOP -->	
-		</table>
-		<br><br>
-		<!-- /TMPL_IF -->
-	<!-- /TMPL_LOOP -->
-	</div>
-</div>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/circ/rescirculation.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/circ/rescirculation.tmpl
diff -N htdocs/intranet-tmpl/default/en/circ/rescirculation.tmpl
--- htdocs/intranet-tmpl/default/en/circ/rescirculation.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,338 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation<!-- TMPL_IF Name="borrowernumber" -->: Issuing to <!-- TMPL_VAR name="surname" -->, <!-- TMPL_VAR name="firstname" -->  (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<div id="main"><h1>Reserve Section: Issues  <!-- TMPL_VAR NAME="today" --></h1></div>
-
- <div id="main">
-	
-<!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
-	
-	
-	<!-- RESULT OF ISSUING REQUEST -->
-	
-		<!-- TMPL_IF NAME="IMPOSSIBLE" -->
-		<div class="error">
-		<h3>Error Issuing Item:</h3>
-			<ul>
-			<!-- TMPL_IF NAME="INVALID_DATE" -->
-				<li>The due date is invalid</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="TOO_EARLY" -->
-				<li>You are not allowed to renew this item yet. Too Early</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
-				<li>The barcode was not found</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="NOT_INRESERVE" -->
-				<li>The item is not in Reserve Section</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
-				<li>Item not for loan</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="WTHDRAWN" -->
-				<li>Item is cancelled</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="GNA" -->
-				<li>Patron's address is in doubt</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="CARD_LOST" -->
-				<li>Patron's card is lost</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="DEBARRED" -->
-				<li>Patron is debarred</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="NO_MORE_RENEWALS" -->
-				<li>No more renewals possible</li>
-			<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="EXPIRED" -->
-				<li>Borrower card expired</li>
-			<!-- /TMPL_IF -->
-
-			</ul>
-		</div>
-		<!-- TMPL_ELSE -->
-		<!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->
-		<div class="error">
-		<h3>Please Confirm Issue:</h3>
-			<!-- TMPL_IF NAME="DEBT" -->
-				<p>The patron has a debt of <!-- TMPL_VAR name="DEBT" --> YTL</p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="RENEW_ISSUE" -->
-				<p>Item is currently issued to this patron.  Renew?</p>
-			<!-- /TMPL_IF -->	
-			<!-- TMPL_IF NAME="RESERVE_WAITING" -->
-				<p>Item is consigned for <!-- TMPL_VAR NAME="RESERVE_WAITING" --></p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="RESERVED" -->
-				<p>Item is on reserve for <!-- TMPL_VAR NAME="RESERVED" --></p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
-				<p>Item issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return and issue?</p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="TOO_MANY" -->
-				<p>Too many issues (already issued / max : <!-- TMPL_VAR name="TOO_MANY" -->)</p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
-			<div class="action"><form class="inline" method="post" action="/cgi-bin/koha/circ/rescirculation.pl">
-				<!-- TMPL_IF NAME="RESERVED" -->
-					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF NAME="RENEW_ISSUE" -->
-				<input type="hidden" name="renew" value="1" />
-			
-				<!-- TMPL_LOOP NAME="todayissues" -->
-				<input type="hidden" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y"/>
-				<!--/TMPL_LOOP-->
-				<!-- TMPL_LOOP NAME="previssues" -->
-				<input type="hidden" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y"/>
-				<!--/TMPL_LOOP-->
-			
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF NAME="RESERVE_WAITING" -->
-					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
-				<!-- /TMPL_IF -->
-				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
-				
-				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
-				<input type="hidden" name="issueconfirmed" value="1" />
-				<input type="hidden" name="day" value="" />
-				<input type="hidden" name="month" value="" />
-				<input type="hidden" name="year" value="" />
-				<input type="submit" value="Confirm Issue (Y)" class="submit" accesskey="y" /></form><form class="inline" method="post" action="/cgi-bin/koha/circ/rescirculation.pl"><input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="submit" class="cancel" value="Don't Issue (N)" accesskey="n" /></form></div>
-			</div>
-			<!-- /TMPL_UNLESS -->
-		<!-- /TMPL_IF -->
-		<!-- /TMPL_IF -->
-		
-		<!-- TMPL_IF NAME="issued" -->
-			<div class="error"><p>Item issued</p></div>
-		<!-- /TMPL_IF -->
-	
-	<div class="details">
-	<!-- TMPL_IF NAME="message" -->
-	<div class="details">
-	No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> <a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add">Add a new patron</a>
-	</div>
-	<!-- /TMPL_IF -->
-	
-	<!-- TMPL_IF NAME="CGIselectborrower" -->
-	<form method="post" action="/cgi-bin/koha/circ/rescirculation.pl" id="mainform" name="mainform">
-		<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
-		<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
-	<label for="borrnumber">Select a borrower: </label>
-		<style type="text/css">
-		option:hover {
-			background-color : #f0f0f0;
-			color : #000099;
-		}
-	</style>
-	<p><!-- TMPL_VAR name="CGIselectborrower" --></p>
-	<p><input type="submit" class="submit" value="Select" /></p>
-	<p>Patron not found? <a href="/cgi-bin/koha/members/memberentry.pl?type=Add">Add a new patron</a></p>
-	</form>
-	<!-- TMPL_ELSE -->
-		<!-- TMPL_IF NAME="borrowernumber" -->
-	<div id="notes">                                							
-	<ul>
-	<li><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="city" --></li>
-	<!-- TMPL_IF NAME="phone" --><li><!-- TMPL_VAR NAME="phone" --></li><!--/TMPL_IF-->
-	<!-- TMPL_IF NAME="emailaddress" --><li><a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a></li><!-- /TMPL_IF -->
-	<li>Category: <!-- TMPL_VAR name="categorycode" --></li>
-	<li>(<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">details</a> / <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;modify=edit&amp;destination=circ">edit</a>)</li>
-	</ul>
-	</div><table width= "70%"><tr><td>
-
-	<h3><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h3>
-	<h4> &nbsp; &nbsp; <!-- TMPL_VAR NAME="issuecount" --> out<!-- TMPL_IF NAME="overduecount" -->, <span class="error"><!-- TMPL_VAR name="overduecount" --> overdue</span><!-- /TMPL_IF --></h4><br clear="right" />
-	</td><td><img src="<!-- TMPL_VAR NAME="borrowerphoto" -->" alt="Photo" hspace="0" vspace="0" border="0" width="100px" heigth="100px" style="clear:both;float:right;position:relative;">
-	</td></tr></table>
-									
-						
-
-
-<!-- TMPL_IF NAME="flagged" -->
-</div><div class="details">
-<ul>
-<!-- TMPL_IF NAME="gna" -->
-<li><span class="error">Address:</span> Patron's address in doubt</li>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="lost" -->
-<li><span class="error">Lost:</span> Patron's card is lost</li>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="dbarred" -->
-<li><span class="error">Debarred:</span> Patron is debarred <form class="inline compact" action="/cgi-bin/koha/members/setdebar.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" value="circ" name="destination" /><input type="hidden" name="status" value="0" /><input type="submit" class="submit" value="Lift Debarment" /></form></li>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF name="odues" -->	<li><!-- TMPL_IF name="nonreturns" -->
-					<span class="error">Overdues:</span> Patron has <span class="error">ITEMS OVERDUE</span> See highlighted items <a href="#previous">below</a>
-				<!-- /TMPL_IF --></li><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="noissues" -->
-<!-- TMPL_IF NAME="resfine" --><li><span class="error">Fines:</span> Patron has outstanding reserve section fines of <!-- TMPL_VAR NAME="resfine" --> YTL. Return book and make payment</li><!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="charges" --><li><span class="error">Fines:</span> Patron has <a href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">outstanding fines</a>. Make <a href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a></li><!-- /TMPL_IF -->
-<!-- TMPL_ELSE -->
-	<!-- TMPL_IF name="charges" --><li>Fines: Patron has <a href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">outstanding fines</a>. Make <a href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a></li><!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
-</ul>
-
-<dl>
-		
-<!-- TMPL_IF name="waiting" -->
-		<dt>Reserves waiting:</dt>
-			<dd><ul><!-- TMPL_LOOP name="itemswaiting" -->
-				<li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR name="title" --></a> (<!-- TMPL_VAR name="barcode" --> -- <!-- TMPL_VAR name="branchname" -->)</li>
-			<!-- /TMPL_LOOP -->
-			</ul></dd>
-		<!-- /TMPL_IF -->
-
-		<!-- TMPL_IF name="notes" -->
-					<dt>Notes:</dt> <dd class="error"><!-- TMPL_VAR name="notesmsg" --></dd>
-				<!-- /TMPL_IF -->
-</dl>
-<!-- /TMPL_IF -->
-	<!-- TMPL_ELSE -->
-	<!-- No card entered yet -->
-	<form method="post" action="/cgi-bin/koha/circ/rescirculation.pl" name="mainform" id="mainform">
-<label for="findborrower">Enter borrower card number or partial last name: </label>
-				<input name="findborrower" type="text" size="40" />
-					<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
-					<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
-				<input type="submit" class="submit" value="Submit" />
-				</form>
-		<!-- /TMPL_IF -->
-	<!-- /TMPL_IF -->
-	</div>
-
-<!-- BARCODE ENTRY -->
-
-<!-- TMPL_IF NAME="borrowernumber" -->
-	<div class="details">
-	<form method="post" action="/cgi-bin/koha/circ/rescirculation.pl" name="mainform">
-<label for="barcode">Enter Item Barcode: </label><input name="barcode" size="14" maxlength="14"class="unfocus" onfocus="this.className='focus'" onblur="this.className='unfocus'" /> <input type="submit" value="Issue" class="submit" /><!-- Display for NPL <input type="hidden" name="day" value="0" /><input type="hidden" name="month" value="0" /><input type="hidden" name="year" value="0" /> /Display for NPL -->
-	<!-- <p>
-			<label for="day">Specify Due Date: </label><select name="day" id="day">
-				<option value="0">Day</option>
-				<option value="1"<!-- TMPL_IF NAME="day1" --> selected="selected"<!-- /TMPL_IF -->>1</option>
-				<option value="2"<!-- TMPL_IF NAME="day2" --> selected="selected"<!-- /TMPL_IF -->>2</option>
-				<option value="3"<!-- TMPL_IF NAME="day3" --> selected="selected"<!-- /TMPL_IF -->>3</option>
-				<option value="4"<!-- TMPL_IF NAME="day4" --> selected="selected"<!-- /TMPL_IF -->>4</option>
-				<option value="5"<!-- TMPL_IF NAME="day5" --> selected="selected"<!-- /TMPL_IF -->>5</option>
-				<option value="6"<!-- TMPL_IF NAME="day6" --> selected="selected"<!-- /TMPL_IF -->>6</option>
-				<option value="7"<!-- TMPL_IF NAME="day7" --> selected="selected"<!-- /TMPL_IF -->>7</option>
-				<option value="8"<!-- TMPL_IF NAME="day8" --> selected="selected"<!-- /TMPL_IF -->>8</option>
-				<option value="9"<!-- TMPL_IF NAME="day9" --> selected="selected"<!-- /TMPL_IF -->>9</option>
-				<option value="10"<!-- TMPL_IF NAME="day10" --> selected="selected"<!-- /TMPL_IF -->>10</option>
-				<option value="11"<!-- TMPL_IF NAME="day11" --> selected="selected"<!-- /TMPL_IF -->>11</option>
-				<option value="12"<!-- TMPL_IF NAME="day12" --> selected="selected"<!-- /TMPL_IF -->>12</option>
-				<option value="13"<!-- TMPL_IF NAME="day13" --> selected="selected"<!-- /TMPL_IF -->>13</option>
-				<option value="14"<!-- TMPL_IF NAME="day14" --> selected="selected"<!-- /TMPL_IF -->>14</option>
-				<option value="15"<!-- TMPL_IF NAME="day15" --> selected="selected"<!-- /TMPL_IF -->>15</option>
-				<option value="16"<!-- TMPL_IF NAME="day16" --> selected="selected"<!-- /TMPL_IF -->>16</option>
-				<option value="17"<!-- TMPL_IF NAME="day17" --> selected="selected"<!-- /TMPL_IF -->>17</option>
-				<option value="18"<!-- TMPL_IF NAME="day18" --> selected="selected"<!-- /TMPL_IF -->>18</option>
-				<option value="19"<!-- TMPL_IF NAME="day19" --> selected="selected"<!-- /TMPL_IF -->>19</option>
-				<option value="20"<!-- TMPL_IF NAME="day20" --> selected="selected"<!-- /TMPL_IF -->>20</option>
-				<option value="21"<!-- TMPL_IF NAME="day21" --> selected="selected"<!-- /TMPL_IF -->>21</option>
-				<option value="22"<!-- TMPL_IF NAME="day22" --> selected="selected"<!-- /TMPL_IF -->>22</option>
-				<option value="23"<!-- TMPL_IF NAME="day23" --> selected="selected"<!-- /TMPL_IF -->>23</option>
-				<option value="24"<!-- TMPL_IF NAME="day24" --> selected="selected"<!-- /TMPL_IF -->>24</option>
-				<option value="25"<!-- TMPL_IF NAME="day25" --> selected="selected"<!-- /TMPL_IF -->>25</option>
-				<option value="26"<!-- TMPL_IF NAME="day26" --> selected="selected"<!-- /TMPL_IF -->>26</option>
-				<option value="27"<!-- TMPL_IF NAME="day27" --> selected="selected"<!-- /TMPL_IF -->>27</option>
-				<option value="28"<!-- TMPL_IF NAME="day28" --> selected="selected"<!-- /TMPL_IF -->>28</option>
-				<option value="29"<!-- TMPL_IF NAME="day29" --> selected="selected"<!-- /TMPL_IF -->>29</option>
-				<option value="30"<!-- TMPL_IF NAME="day30" --> selected="selected"<!-- /TMPL_IF -->>30</option>
-				<option value="31"<!-- TMPL_IF NAME="day31" --> selected="selected"<!-- /TMPL_IF -->>31</option>
-			</select>
-			<select name="month">
-				<option value="0">Month</option>
-				<option value="1"<!-- TMPL_IF NAME="month1" --> selected="selected"<!-- /TMPL_IF -->>Jan</option>
-				<option value="2"<!-- TMPL_IF NAME="month2" --> selected="selected"<!-- /TMPL_IF -->>Feb</option>
-				<option value="3"<!-- TMPL_IF NAME="month3" --> selected="selected"<!-- /TMPL_IF -->>Mar</option>
-				<option value="4"<!-- TMPL_IF NAME="month4" --> selected="selected"<!-- /TMPL_IF -->>Apr</option>
-				<option value="5"<!-- TMPL_IF NAME="month5" --> selected="selected"<!-- /TMPL_IF -->>May</option>
-				<option value="6"<!-- TMPL_IF NAME="month6" --> selected="selected"<!-- /TMPL_IF -->>Jun</option>
-				<option value="7"<!-- TMPL_IF NAME="month7" --> selected="selected"<!-- /TMPL_IF -->>Jul</option>
-				<option value="8"<!-- TMPL_IF NAME="month8" --> selected="selected"<!-- /TMPL_IF -->>Aug</option>
-				<option value="9"<!-- TMPL_IF NAME="month9" --> selected="selected"<!-- /TMPL_IF -->>Sep</option>
-				<option value="10"<!-- TMPL_IF NAME="month10" --> selected="selected"<!-- /TMPL_IF -->>Oct</option>
-				<option value="11"<!-- TMPL_IF NAME="month11" --> selected="selected"<!-- /TMPL_IF -->>Nov</option>
-				<option value="12"<!-- TMPL_IF NAME="month12" --> selected="selected"<!-- /TMPL_IF -->>Dec</option>
-			</select>
-			<select name="year">
-				<option value="0">Year</option>
-				<option value="2004"<!-- TMPL_IF NAME="year2004" --> selected="selected"<!-- /TMPL_IF -->>2004</option>
-				<option value="2005"<!-- TMPL_IF NAME="year2005" --> selected="selected"<!-- /TMPL_IF -->>2005</option>
-				<option value="2006"<!-- TMPL_IF NAME="year2006" --> selected="selected"<!-- /TMPL_IF -->>2006</option>
-				<option value="2007"<!-- TMPL_IF NAME="year2007" --> selected="selected"<!-- /TMPL_IF -->>2007</option>
-				<option value="2008"<!-- TMPL_IF NAME="year2008" --> selected="selected"<!-- /TMPL_IF -->>2008</option>
-			</select>
-<label for="stickyduedate">Remember for Session:</label><input type="checkbox" id="stickyduedate" name="stickyduedate" <!-- TMPL_VAR NAME="selected" --> />    -->
-		<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
-		<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
-		<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
-		<input type="hidden" name="print" value="maybe" />
-		<!-- TMPL_IF NAME="CHARGES" -->
-			<input type="hidden" name="charges" value="yes" />
-			<input type="hidden" name="oldamount" value="<!-- TMPL_VAR NAME="amountold" -->" />
-		<!-- /TMPL_IF -->
-		</p>
-	</form>
-	</div>
-
-
-<!-- /TMPL_IF -->
-
-
-
-<!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
-<!-- TMPL_IF NAME="borrowernumber" -->
-<div class="table"><form class="inline"  method="post"><input type="hidden" value="circ" name="destination" />
-	<table>
-		<caption>Issues from reserve section</caption>
-		<tr>
-			<th>Due Date</th>
-			<th>Title</th>
-			<th>Author</th>
-			<th>Call No</th>
-			<th>Barcode</th>
-			
-		</tr>
-	<!-- TMPL_IF NAME="todayissues" -->
-		<!-- TMPL_LOOP NAME="todayissues" -->
-		<tr>
-			<td><!-- TMPL_VAR NAME="dd" --></td>
-			<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --></a><br/><i><!-- TMPL_VAR name="itemnotes" --></i></td>
-			<td><!-- TMPL_VAR NAME="author" --></td>
-			<td><!-- TMPL_VAR NAME="classification" --></td>
-			<td><!-- TMPL_VAR NAME="barcode" --></td>
-			
-		</tr>
-		<!-- /TMPL_LOOP -->
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="previssues" -->
-		<tr><th colspan="6"><a name="previous" id="previous">Previous Issues</a></th></tr>
-		<!-- TMPL_LOOP NAME="previssues" -->
-			<tr>
-			<td><!-- TMPL_IF NAME="od" --><span class="error"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="dd" --><!-- TMPL_IF NAME="od" --></span><!-- /TMPL_IF --></td>
-			<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --></a><br/><i><!-- TMPL_VAR name="itemnotes" --></i></td>
-			<td><!-- TMPL_VAR NAME="author" --></td>
-			<td><!-- TMPL_VAR NAME="classification" --></td>
-			<td><!-- TMPL_VAR NAME="barcode" --></td>
-			
-		<!-- /TMPL_LOOP -->
-	</table>
-	
-	
-</form>
-
-<!-- TMPL_IF name="previssues" --><form class="inline" action="" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><!-- TMPL_LOOP NAME="previssues" --><input type="hidden" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y" /><!-- /TMPL_LOOP --></form><!-- /TMPL_IF -->
-	
-</div>
-<!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
-</div>
-
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
-

Index: htdocs/intranet-tmpl/default/en/circ/resreturns.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/circ/resreturns.tmpl
diff -N htdocs/intranet-tmpl/default/en/circ/resreturns.tmpl
--- htdocs/intranet-tmpl/default/en/circ/resreturns.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,160 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation: Returns<!-- TMPL_IF Name="returned" -->: <!-- TMPL_VAR Name="itemtitle" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<!-- TMPL_IF Name="found" -->
-		<h3 class="alert">Reserve Found<!-- TMPL_IF Name="waiting" --> (item is already <em>consigned</em>) <!-- /TMPL_IF --></h3>
-		<!-- TMPL_IF Name="waiting" -->
-		<div class="items">
-		<table>
-		<caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
-		<tr><th>Patron: </th><td>
-			<ul>
-						<li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
-			<li><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> </li>
-			<li><!-- TMPL_VAR Name="borstraddress" --><br />
-			<!-- TMPL_VAR Name="borcity" -->  <!-- TMPL_VAR NAME="borzip" --></li>
-			<li><!-- TMPL_VAR Name="borphone" --></li>
-			<!-- Display for NPL // <!-- TMPL_IF NAME="boremail" --><li><a href="/intranet-intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->" onclick="window.open('/intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->','notify','width=650,height=450,location=no,menubar=no,toolbar=no,scrollbars=yes'); return false;"><!-- TMPL_VAR Name="boremail" --></a></li><!-- /TMPL_IF --> // Display for NPL -->
-			</ul></td></tr>
-	<tr><th>Transfer to:</th><td><!-- TMPL_VAR Name="branchname" --></td></tr>
-		</table></div><form method="post" action="resreturns.pl" name="mainform" id="mainform">
-			<input type="submit" value="Confirm" class="submit" /><!-- TMPL_LOOP Name="inputloop" -->
-				<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
-				<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
-				<input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" />
-			<!-- /TMPL_LOOP -->
-			<input type="hidden" name="barcode" value="0" />
-			</form>
-		
-			
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF Name="diffbranch" -->
-			<h3>Item Consigned:</h3><br>
-    	<div class="item">
-		<table>
-		<caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
-		<tr><th>Patron:</th><td><!-- TMPL_VAR Name="name" --></td></tr>
-		</table></div><form method="post" action="resreturns.pl" name="mainform" id="mainform"><input type="submit" value="OK" />
-			<!-- TMPL_LOOP Name="inputloop" -->
-				<!-- TMPL_UNLESS Name="first" -->
-					<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
-					<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
-					<input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" />
-				<!-- /TMPL_UNLESS -->
-			<!-- /TMPL_LOOP -->
-			<input type="hidden" name="barcode" value="0" />
-			
-			</form>
-		
-
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF Name="reserved" -->
-			<div class="items">
-			<table>
-			<caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
-			<tr><th>Patron: </th><td>
-			<ul>
-						<li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
-			<li><!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" --></li>
-			<li><!-- TMPL_VAR Name="borstraddress" --><br />
-			<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
-			<li><!-- TMPL_VAR Name="borphone" --></li>
-			<!-- Display for NPL // <!-- TMPL_IF NAME="boremail" --><li><a href="/intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->" onclick="window.open('/intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->','notify','width=650,height=450,location=no,menubar=no,toolbar=no,scrollbars=yes'); return false;"><!-- TMPL_VAR Name="boremail" --></a></li><!-- /TMPL_IF --> // Display for NPL -->
-			</ul></td></tr>
-			<tr><th>Transfer to: </th><td><!-- TMPL_VAR Name="branchname" --></td></tr></table>
-			</div> <form method="post" action="resreturns.pl" name="mainform" id="mainform">
-			<input type="submit" class="submit" value="Confirm" />
-			<!-- TMPL_LOOP Name="inputloop" -->
-				<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
-				<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
-				<input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" />
-			<!-- /TMPL_LOOP -->
-			<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
-			<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="bornum" -->" />
-			<input type="hidden" name="resbarcode" value="<!-- TMPL_VAR Name="barcode" -->" /></form>
-		<!-- /TMPL_IF -->
-	
-<!-- TMPL_ELSE -->
-<h3 class="alert">Reserve section: Returns</h1>
-	<div class="details">
-	<form method="post" action="/cgi-bin/koha/circ/resreturns.pl"  name="mainform" id="mainform">
-			<label for="barcode">Enter Item Barcode</label>
-			<input name="barcode" id="barcode" size="14" maxlength="14" class="unfocus" onfocus="this.className='focus'" onblur="this.className='unfocus'" />
-			<input type="submit" class="submit" value="Submit" />
-			<!-- TMPL_LOOP Name="inputloop" -->
-				<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
-				<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
-				<input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" />
-			<!-- /TMPL_LOOP -->
-		</form><!-- TMPL_IF NAME="errmsgloop" --><!-- TMPL_LOOP Name="errmsgloop" -->
-				<div class="error">
-				<!-- TMPL_IF Name="badbarcode" -->
-					No Item with barcode: <!-- TMPL_VAR Name="msg" -->
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF Name="ispermanent" -->
-					Please return to  <!-- TMPL_VAR Name="msg" -->
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF Name="notissued" -->
-					Not On Issue.
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF Name="waslost" -->
-					Item was lost, now found.
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF Name="withdrawn" -->
-					Item Cancelled
-				<!-- /TMPL_IF -->
-				</div>
-			<!-- /TMPL_LOOP --><!-- /TMPL_IF -->
-</div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF Name="returned" -->
-<div class="table"><table>
-		<tr><th>Item Information</th><th>Patron Information</th></tr>
-		<tr><td><!-- TMPL_VAR Name="itemtitle" -->
-		</td><td><div class="flags">
-<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="ribornum" -->"><!-- TMPL_VAR Name="riborcnum" --></a>
-		<!-- TMPL_VAR Name="riborsurname" -->, <!-- TMPL_VAR Name="ribortitle" --> <!-- TMPL_VAR Name="riborfirstname" -->
-
-<!-- removed: removed-from-returns.tmpl -->
-<!-- TMPL_IF Name="flagset" -->
- (<!-- TMPL_LOOP Name="flagloop" -->
-<span class="error"><!-- TMPL_VAR Name="flag" -->, </span>
-<!-- /TMPL_LOOP -->)<!-- /TMPL_IF --></div>
-</td></tr></table>
-</div>
-<!-- /TMPL_IF -->
-
-
-
-<!-- TMPL_IF Name="riloop" -->
-<div class="table">
-		<table>
-		<caption>Returned Items</caption>
-		<tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>Patron</th></tr>
-		<!-- TMPL_LOOP Name="riloop" -->
-			<tr><td><!-- TMPL_IF Name="duedate" --><!-- TMPL_IF Name="early" --><span class="error"><!-- /TMPL_IF --><!-- TMPL_VAR Name="duedate" --><!-- TMPL_IF Name="early" --></span><!-- /TMPL_IF --><!-- TMPL_ELSE -->Not on Issue.<!-- /TMPL_IF --></td>
-			<td>
-			<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR Name="itembiblionumber" -->&type=intra"><!-- TMPL_VAR Name="barcode" --></a></td>
-			<td><!-- TMPL_VAR Name="itemtitle" --></td>
-			<td><!-- TMPL_VAR Name="itemauthor" --></td>
-			<td><!-- TMPL_VAR Name="itemtype" --></td>
-			<td>
-			<!-- TMPL_IF Name="duedate" -->
-				<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->">
-					<!-- TMPL_VAR Name="borcnum" -->
-				</a> <!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" -->
-			<!-- TMPL_ELSE -->
-								<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a> <!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" -->
-			<!-- /TMPL_IF -->
-			</td></tr>
-		<!-- /TMPL_LOOP -->
-		</table>
-		</div>
-<!-- /TMPL_IF -->
-
-</div>
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/circ/returns.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/circ/returns.tmpl
diff -N htdocs/intranet-tmpl/default/en/circ/returns.tmpl
--- htdocs/intranet-tmpl/default/en/circ/returns.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,163 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation: Returns<!-- TMPL_IF Name="returned" -->: <!-- TMPL_VAR Name="itemtitle" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<!-- TMPL_IF Name="found" -->
-		<h3 class="alert">Reserve Found<!-- TMPL_IF Name="waiting" --> (item is already <em>consigned</em>) <!-- /TMPL_IF --></h3>
-		<!-- TMPL_IF Name="waiting" -->
-		<div class="items">
-		<table>
-		<caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
-		<tr><th>Patron: </th><td>
-			<ul>
-						<li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
-			<li><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> </li>
-			<li><!-- TMPL_VAR Name="borstraddress" --><br />
-			<!-- TMPL_VAR Name="borcity" -->  <!-- TMPL_VAR NAME="borzip" --></li>
-			<li><!-- TMPL_VAR Name="borphone" --></li>
-			
-			</ul></td></tr>
-	<tr><th>Transfer to:</th><td><!-- TMPL_VAR Name="branchname" --></td></tr>
-		</table></div><form method="post" action="returns.pl" name="mainform" id="mainform">
-			<input type="submit" value="Confirm" class="submit" /><!-- TMPL_LOOP Name="inputloop" -->
-				<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
-				<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
-				<input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" />
-			<!-- /TMPL_LOOP -->
-			<input type="hidden" name="barcode" value="0" />
-			</form>
-		
-			
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF Name="diffbranch" -->
-			<h3>Item Consigned:</h3><br>
-    	<div class="item">
-		<table>
-		<caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
-		<tr><th>Patron:</th><td><!-- TMPL_VAR Name="name" --></td></tr>
-		</table></div><form method="post" action="returns.pl" name="mainform" id="mainform"><input type="submit" value="OK" />
-			<!-- TMPL_LOOP Name="inputloop" -->
-				<!-- TMPL_UNLESS Name="first" -->
-					<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
-					<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
-					<input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" />
-				<!-- /TMPL_UNLESS -->
-			<!-- /TMPL_LOOP -->
-			<input type="hidden" name="barcode" value="0" />
-			
-			</form>
-		
-
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF Name="reserved" -->
-			<div class="items">
-			<table>
-			<caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
-			<tr><th>Patron: </th><td>
-			<ul>
-						<li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
-			<li><!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" --></li>
-			<li><!-- TMPL_VAR Name="borstraddress" --><br />
-			<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
-			<li><!-- TMPL_VAR Name="borphone" --></li>
-			<!-- Display for NPL // <!-- TMPL_IF NAME="boremail" --><li><a href="/intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->" onclick="window.open('/intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->','notify','width=650,height=450,location=no,menubar=no,toolbar=no,scrollbars=yes'); return false;"><!-- TMPL_VAR Name="boremail" --></a></li><!-- /TMPL_IF --> // Display for NPL -->
-			</ul></td></tr>
-			<tr><th>Transfer to: </th><td><!-- TMPL_VAR Name="branchname" --></td></tr></table>
-			</div> <form method="post" action="returns.pl" name="mainform" id="mainform">
-			<input type="submit" class="submit" value="Confirm" />
-			<!-- TMPL_LOOP Name="inputloop" -->
-				<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
-				<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
-				<input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" />
-			<!-- /TMPL_LOOP -->
-			<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
-			<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="bornum" -->" />
-			<input type="hidden" name="resbarcode" value="<!-- TMPL_VAR Name="barcode" -->" /></form>
-		<!-- /TMPL_IF -->
-	
-<!-- TMPL_ELSE -->
-<h1>Circulation: Returns</h1>
-	<div class="details">
-	<form method="post" action="/cgi-bin/koha/circ/returns.pl"  name="mainform" id="mainform">
-			<label for="barcode">Enter Item Barcode</label>
-			<input name="barcode" id="barcode" size="14" maxlength="14" class="unfocus" onfocus="this.className='focus'" onblur="this.className='unfocus'" />
-			<input type="submit" class="submit" value="Submit" />
-			<!-- TMPL_LOOP Name="inputloop" -->
-				<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
-				<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
-				<input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" />
-			<!-- /TMPL_LOOP -->
-		</form><!-- TMPL_IF NAME="errmsgloop" --><!-- TMPL_LOOP Name="errmsgloop" -->
-				<div class="error">
-				<!-- TMPL_IF Name="badbarcode" -->
-					No Item with barcode: <!-- TMPL_VAR Name="msg" -->
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF Name="ispermanent" -->
-					Please return to  <!-- TMPL_VAR Name="msg" -->
-				<!-- /TMPL_IF -->
-				
-				<!-- TMPL_IF Name="reserveissued" -->
-					Issued from RESERVE Section-  Use RESERVE return.
-				<!-- TMPL_ELSE -->
-				<!-- TMPL_IF Name="notissued" -->
-					Not On Issue.
-				<!-- /TMPL_IF --><!-- /TMPL_IF -->
-				<!-- TMPL_IF Name="waslost" -->
-					Item was lost, now found.
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF Name="withdrawn" -->
-					Item Cancelled
-				<!-- /TMPL_IF -->
-				</div>
-			<!-- /TMPL_LOOP --><!-- /TMPL_IF -->
-</div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF Name="returned" -->
-<div class="table"><table>
-		<tr><th>Item Information</th><th>Patron Information</th></tr>
-		<tr><td><!-- TMPL_VAR Name="itemtitle" -->
-		</td><td><div class="flags">
-<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="ribornum" -->"><!-- TMPL_VAR Name="riborcnum" --></a>
-		<!-- TMPL_VAR Name="riborsurname" -->, <!-- TMPL_VAR Name="ribortitle" --> <!-- TMPL_VAR Name="riborfirstname" -->
-
-<!-- removed: removed-from-returns.tmpl -->
-<!-- TMPL_IF Name="flagset" -->
- (<!-- TMPL_LOOP Name="flagloop" -->
-<span class="error"><!-- TMPL_VAR Name="flag" -->, </span>
-<!-- /TMPL_LOOP -->)<!-- /TMPL_IF --></div>
-</td></tr></table>
-</div>
-<!-- /TMPL_IF -->
-
-
-
-<!-- TMPL_IF Name="riloop" -->
-<div class="table">
-		<table>
-		<caption>Returned Items</caption>
-		<tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>Patron</th></tr>
-		<!-- TMPL_LOOP Name="riloop" -->
-			<tr><td><!-- TMPL_IF Name="duedate" --><!-- TMPL_IF Name="early" --><span class="error"><!-- /TMPL_IF --><!-- TMPL_VAR Name="duedate" --><!-- TMPL_IF Name="early" --></span><!-- /TMPL_IF --><!-- TMPL_ELSE -->Not on Issue.<!-- /TMPL_IF --></td>
-			<td>
-			<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR Name="itembiblionumber" -->&type=intra"><!-- TMPL_VAR Name="barcode" --></a></td>
-			<td><!-- TMPL_VAR Name="itemtitle" --></td>
-			<td><!-- TMPL_VAR Name="itemauthor" --></td>
-			<td><!-- TMPL_VAR Name="ctype" --></td>
-			<td>
-			<!-- TMPL_IF Name="duedate" -->
-				<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->">
-					<!-- TMPL_VAR Name="borcnum" -->
-				</a> <!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" -->
-			<!-- TMPL_ELSE -->
-								<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a> <!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" -->
-			<!-- /TMPL_IF -->
-			</td></tr>
-		<!-- /TMPL_LOOP -->
-		</table>
-	</div>
-<!-- /TMPL_IF -->
-
-</div>
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl
diff -N htdocs/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl
--- htdocs/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation: Select Your Home Branch<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="circ-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1>Circulation: Select Your Home Branch</h1>
-
-<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
-<!-- TMPL_VAR NAME="branch" -->
-<div class="details">
-<label for="branch">Choose your Branch:</label>
-<!--branchselection-->
-	<select name="branch" id="branch">
-	<!-- TMPL_LOOP Name="branchloop" -->
-		<option value="<!-- TMPL_VAR Name="value" -->"<!-- TMPL_IF Name="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR Name="name" --></option>
-	<!-- /TMPL_LOOP -->
-	</select>
-</div>
-<div class="details">
-<!-- <label for="printer">Choose a Network Printer:</label> -->
-<!--printerselection-->
-<!-- 	<select name="printer" id="printer">
-	<!-- TMPL_LOOP Name="printerloop" -->
-		<option value="<!-- TMPL_VAR Name="value" -->"<!-- TMPL_IF Name="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR Name="name" -->
-	<!-- /TMPL_LOOP -->
-	</select>
- --><input type="hidden" name="setcookies" value="1" />
-<p><input type="submit" class="submit" value="Submit" name="changesettings" /></p></div>
-</form>
-
-
-</div>
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->
-

Index: htdocs/intranet-tmpl/default/en/circ/waitingreservestransfers.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/circ/waitingreservestransfers.tmpl
diff -N htdocs/intranet-tmpl/default/en/circ/waitingreservestransfers.tmpl
--- htdocs/intranet-tmpl/default/en/circ/waitingreservestransfers.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,62 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation
-<!-- TMPL_IF Name="borrowernumber" -->
-: Issuing to <!-- TMPL_VAR name="surname" -->, <!-- TMPL_VAR name="firstname" -->
-(<!-- TMPL_VAR NAME="cardnumber" -->)
-<!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
-
-
-<h1>Circulation: Transfers To do</h1>
-
-<div id="mainbloc">
-	<h1>Transfers to do <!-- TMPL_VAR NAME="show_date" --></h1>
-	<div id="resultlist">
-	<!-- TMPL_LOOP NAME="branchesloop" -->
-		<!-- TMPL_IF NAME="branchcode" -->
-		<table>
-		<tr>
-			<th class="circulation" colspan="5">Reserves in wait to the library : <!-- TMPL_VAR NAME="branchname" --> </th>
-		</tr>
-		<tr>
-			<th class="circulation">Date of reserve</th>
-			<th class="circulation">Title</th>
-			<th class="circulation">Borrower</th>
-			<th class="circulation">Localisation</th>
-			<th class="circulation">Action</th>
-		</tr>
-		<!-- TMPL_LOOP NAME="reserv" -->
-			<tr <!-- TMPL_IF NAME="messcompa" --> class="problem" <!-- /TMPL_IF -->>
-				<td><p><!-- TMPL_VAR NAME="reservedate" --></p> <!-- TMPL_IF NAME="messcompa" --> Reserve over <!-- /TMPL_IF --></td>
-				<td>
-					<p>
-						<a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
-						&nbsp; (<b><!-- TMPL_VAR NAME="itemtype" --> </b>)
-						<br />Barcode : <!-- TMPL_VAR NAME="barcode" -->
-					</p>
-				</td>
-				<td>
-					<p><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> &nbsp; <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
-				<!-- TMPL_IF NAME="borrowermail" --><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR NAME="title" -->">
-	<!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
-					</p>
-				</td>
-				<td><p><!-- TMPL_VAR NAME="holdingbranch" --> <!-- TMPL_VAR NAME="itemcallnumber" --></p></td>
-				<td>
-				<form name="dotransfer" action="waitingreservestransfers.pl" method="post">
-						<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
-						<input type="hidden" name="fbr" value="<!-- TMPL_VAR NAME="holdingbranch" -->">
-						<input type="hidden" name="tbr" value="<!-- TMPL_VAR NAME="branchcode" -->">
-				<input type="submit" value="Transfer this document">
-				</form>
-				</td>	
-			</tr>
-		<!-- /TMPL_LOOP -->	
-		</table>
-		<br><br>
-		<!-- /TMPL_IF -->
-	<!-- /TMPL_LOOP -->
-	</div>
-</div>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/errors/400.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/errors/400.tmpl
diff -N htdocs/intranet-tmpl/default/en/errors/400.tmpl
--- htdocs/intranet-tmpl/default/en/errors/400.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 400: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1>An Error has Occurred!</h1>
-<h2>Error 400: Page Not Found</h2>
-
-<ul>
-<li>This error means that the link was broken and that the page doesn't exist</li>	
-<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
-<li>Use navigation menu to go to another part of Koha.</li>
-</ul>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-

Index: htdocs/intranet-tmpl/default/en/errors/401.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/errors/401.tmpl
diff -N htdocs/intranet-tmpl/default/en/errors/401.tmpl
--- htdocs/intranet-tmpl/default/en/errors/401.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 401: Authorization Required<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1>An Error has Occurred!</h1>
-<h2>Error 401: Authorization Required</h2>
-
-<ul>
-<li>This error means that you aren't authorized to view this page</li>	
-<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
-<li>Use navigation menu to go to another part of Koha.</li>
-</ul>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-

Index: htdocs/intranet-tmpl/default/en/errors/402.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/errors/402.tmpl
diff -N htdocs/intranet-tmpl/default/en/errors/402.tmpl
--- htdocs/intranet-tmpl/default/en/errors/402.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 402: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1>An Error has Occurred!</h1>
-<h2>Error 402: Page Not Found</h2>
-
-<ul>
-<li>This error means that the link was broken and that the page doesn't exist</li>	
-<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
-<li>Use navigation menu to go to another part of Koha.</li>
-</ul>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-

Index: htdocs/intranet-tmpl/default/en/errors/403.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/errors/403.tmpl
diff -N htdocs/intranet-tmpl/default/en/errors/403.tmpl
--- htdocs/intranet-tmpl/default/en/errors/403.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 403: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1>An Error has Occurred!</h1>
-<h2>Error 403: Page Not Found</h2>
-
-<ul>
-<li>This error means that the link was broken and that the page doesn't exist</li>	
-<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
-<li>Use navigation menu to go to another part of Koha.</li>
-</ul>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-

Index: htdocs/intranet-tmpl/default/en/errors/404.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/errors/404.tmpl
diff -N htdocs/intranet-tmpl/default/en/errors/404.tmpl
--- htdocs/intranet-tmpl/default/en/errors/404.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 404: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1>An Error has Occurred!</h1>
-<h2>Error 404: Page Not Found</h2>
-
-<ul>
-<li>This error means that the link was broken and that the page doesn't exist</li>	
-<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
-<li>Use navigation menu to go to another part of Koha.</li>
-</ul>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-

Index: htdocs/intranet-tmpl/default/en/errors/405.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/errors/405.tmpl
diff -N htdocs/intranet-tmpl/default/en/errors/405.tmpl
--- htdocs/intranet-tmpl/default/en/errors/405.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 404: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1>An Error has Occurred!</h1>
-<h2>Error 405: Page Not Found</h2>
-
-<ul>
-<li>This error means that the link was broken and that the page doesn't exist</li>	
-<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
-<li>Use navigation menu to go to another part of Koha.</li>
-</ul>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-

Index: htdocs/intranet-tmpl/default/en/errors/500.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/errors/500.tmpl
diff -N htdocs/intranet-tmpl/default/en/errors/500.tmpl
--- htdocs/intranet-tmpl/default/en/errors/500.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 500: Internal Server Error<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1>An Error has Occurred!</h1>
-<h2>Error 500: Internal Server Error</h2>
-
-<ul>
-<li>In Koha this typically means that the Koha team is working on new features.</li>	
-<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
-<li>Use navigation menu to go to another part of Koha.</li>
-</ul>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-

Index: htdocs/intranet-tmpl/default/en/export/marc-time.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/export/marc-time.tmpl
diff -N htdocs/intranet-tmpl/default/en/export/marc-time.tmpl
--- htdocs/intranet-tmpl/default/en/export/marc-time.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Cataloging: MARC Export<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
-
-<div id="main"><h1>MARC Export</h1>
-<div class="details"><h4>Export in MARC format the following biblios:</h4>
-<form method="post">
-<p>From date (yyyy-mm-dd): <input type="text" name="start_bib" />
-to date (yyyy-mm-dd): <input type="text" name="end_bib" /></p>
-<p>(leave blank to export every biblio, giving only 'from date' exports starting 'from date')</p>
-<input type="hidden" name="op" value="export" />
-<input type="submit" value="Export" class="submit" />
-</form></div>
-<p>Note : Exporting all by this tool may take some time</p>
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/export/marc.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/export/marc.tmpl
diff -N htdocs/intranet-tmpl/default/en/export/marc.tmpl
--- htdocs/intranet-tmpl/default/en/export/marc.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Cataloging: MARC Export<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
-
-<div id="main"><h1>MARC Export</h1>
-<div class="details"><h4>Export in MARC format the following biblios:</h4>
-<form method="post">
-<p>From biblio number: <input type="text" name="start_bib" />
-to biblio number: <input type="text" name="end_bib" /></p>
-<p>(leave blank to export every biblio)</p>
-<input type="hidden" name="op" value="export" />
-<input type="submit" value="Export" class="submit" />
-</form></div>
-<p>Note : Exporting all by this tool may take some time</p>
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/export/marc_item.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/export/marc_item.tmpl
diff -N htdocs/intranet-tmpl/default/en/export/marc_item.tmpl
--- htdocs/intranet-tmpl/default/en/export/marc_item.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Cataloging: MARC Export<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
-
-<div id="main"><h1>MARC Export</h1>
-<div class="details"><h4>Export in MARC format the following items:</h4>
-<form method="post">
-<p>From biblio number: <input type="text" name="start_bib" />
-to biblio number: <input type="text" name="end_bib" /></p>
-<p>(leave blank to export every biblio)</p>
-<input type="hidden" name="op" value="export" />
-<input type="submit" value="Export" class="submit" />
-</form></div>
-<p>Note : Exporting all by this tool may take some time</p>
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/export/zebra-rebuild.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/export/zebra-rebuild.tmpl
diff -N htdocs/intranet-tmpl/default/en/export/zebra-rebuild.tmpl
--- htdocs/intranet-tmpl/default/en/export/zebra-rebuild.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Cataloging: MARC Export<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
-
-
-<div id="main"><h1>MARC Export For Zebra DB rebuilding</h1>
-<!--TMPL_IF NAME="exported"-->
-<div class="error"><p>Updating of Zebra DB started and may continue for some time in background</p></div>
-<!--/TMPL_IF-->
-<div class="details"><h4>Export in MARC format the following biblios:</h4>
-<form method="post">
-<p>From biblio number: <input type="text" name="start_bib" />
-to biblio number: <input type="text" name="end_bib" /></p>
-<p>(leave blank to export every biblio)</p>
-<input type="hidden" name="op" value="export" />
-<input type="submit" value="Export" class="submit" />
-</form></div>
-<p>Note : Exporting all by this tool may take some time</p>
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/acqui/acqui-home.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/acqui/acqui-home.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/acqui/acqui-home.tmpl
--- htdocs/intranet-tmpl/default/en/help/acqui/acqui-home.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Acquisitions Home Page<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<div id="main-compact">
-	<h1>Acquisitions Home Page</h1>
-<p>You're on the Acquisitions home page. Everything starts with a bookseller. If you want to create an order, or receive books, you must enter the supplier name or code. If you want to create a new supplier you can enter the name here as well.  You'll be able to create it on the next screen</p>
-	<p>You'll also find on this screen:</p>
-	<ul>
-		<li>The <strong>Exchange Rate</strong> for all currencies. You can change them if needed. Remember that Koha doesn't get them automatically</li>
-		<li>In the <strong>Suggestions</strong> box, you can see how many suggestions you have to check (accept or refuse). Of course, if you haven't activated suggestions (in <a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a>), you won't have anything in this box.</li>
-		<li>The last box, <strong>Budget and Funds</strong> shows you the budget summary. To appear on this page an entry must be active on today's date. If an expected Book Fund doesn't appear, check <a href="/cgi-bin/koha/admin/aqbookfund.pl">Book Funds</a> in Parameters and check that your budget hasn't expired.</li>
-	</ul>
-	<h2>Definitions</h2>
-	<ul>
-		<li>A <b>basket</b> is a group of orders that are sent all at once to a given supplier. Baskets are used when acquiring books.</li>
-		<li>A <b>parcel</b> is a group of acquired books that are in the same parcel. Parcel is used when receiving books.</li>
-	</ul>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/acqui/basket.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/acqui/basket.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/acqui/basket.tmpl
--- htdocs/intranet-tmpl/default/en/help/acqui/basket.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Acquisitions Basket/Order Creation<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<div id="main-compact">
-	<h1>Acquisitions Basket/Order Creation</h1>
-	<p>This page lets you create or modify a basket. A basket contains as many order lines as you want.</p>
-	<p>The first box contain the basket header: the librarian that started it, the date... It can be closed. A closed basket can't be modified anymore</p>
-	<p>The second box contain the order lines</p>
-	<p>The third box let you choose how to add a new order line. Each order line can come from:</p>
-	<ul>
-		<li>An accepted suggestion</li>
-		<li>An existing biblio (to order a new item)</li>
-		<li>A completly new biblio (from scratch)</li>
-	</ul>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/acqui/newbiblio.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/acqui/newbiblio.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/acqui/newbiblio.tmpl
--- htdocs/intranet-tmpl/default/en/help/acqui/newbiblio.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Add Bibliographic Record<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-
-<h1>Add Bibliographic Record</h1>
-
-<p>Sorting Field 1 and Sorting Field 2 may now be related to a list of Authorized Values. All you have to do is define an Asort1 or Asort2 category of authorised values and enter the desired values into these categories. You will then be able to use them through Add/Modify Bibliographic Record page</p>
-
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/acqui/order.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/acqui/order.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/acqui/order.tmpl
--- htdocs/intranet-tmpl/default/en/help/acqui/order.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Acquisitions Supplier List Page<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<div id="main-compact">
-	<h1>Acquisitions Supplier List Page</h1>
-	<p>This page shows the list of suppliers. For each supplier, you'll see:
-	<ul>
-		<li>The name of the supplier. You can see all details by clicking on its name<li>
-		<li>A button to create a new order</li>
-		<li>A button to see all existing receive parcels and create a new one.</li>
-		<li>The list of all basket orders to this supplier. You can view or add lines on each basket, depending on its status (closed or not). Baskets closed more than 6 months are not shown.</li>
-	</ul>
-	<p>At the end of the page, you have a button to create a new supplier.</p>
-	
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/acqui/recieve.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/acqui/recieve.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/acqui/recieve.tmpl
--- htdocs/intranet-tmpl/default/en/help/acqui/recieve.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Acquisitions : Parcel Detail<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>Acquisitions : Parcel Detail</h1>
-<p>This page show the contents of a parcel.</p>
-<p>The first box contain the list of already received items.</p>
-<p>The second box contain the list of orders from this supplier still incompletely received. You can add an item in the parcel by selecting in this list, or search it through ISBN/title.</p>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/acqui/recieveorder.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/acqui/recieveorder.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/acqui/recieveorder.tmpl
--- htdocs/intranet-tmpl/default/en/help/acqui/recieveorder.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Acquisitions : Recieve Parce<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<div id="main-compact">
-<h1>Acquisitions : Recieve Parcel</h1>
-<p>This screen shows the parcels of the supplier. You can filter on parcel code and recieved date</p>
-<p> The list can be ordered by date or parcel code and contains:</p>
-<p><ul>
-	<li>The parcel summary (date and code).</li>
-	<li>The number of items already entered in the parcel (physical items).</li>
-	<li>The number of different biblios (order lines) in the parcel.</li>
-	<li>The number of expected items. This number is calculated from ordered biblios.</li>
-	</ul>
-</p>
-<p>Example: a parcel contains 3 copies of the same book. It is related to an order of 5 items. The list will show:</p>
-<ul>
-	<li>Number of items in the parcel: 3</li>
-	<li>Number of biblios: 1</li>
-	<li>Number of expected items: 5</li>
-</ul>
-<p>At the end of the page, you have a tool to create a new parcel.</p>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/admin/aqbookfund.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/aqbookfund.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/aqbookfund.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/aqbookfund.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Book Fund Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-
-<h1>Book Fund Administration</h1>
-
-<p>The first time you access this page, you will be asked to add your first book fund -- thereafter you will also have the option of editing and deleting book funds.</p>
-
-<p>Book Funds may be ignored if you are setting your System Preferences to "simple" acquisitions: the funds are only useful when using "normal" acquisitions.</p>
-
-<p>"Book Funds" are accounts that you establish to keep track of your expenditures for library materials. They may be used for any kind of material, not just books, and should match the lines in your materials budget. For instance, if your library establishes a budget line for books, another for audiovisual materials, a third line for magazines, and a fourth budget line for electronic databases, then you would have four Book Funds.</p>
-
-<p>Each Book Fund has a unique fund code, limited to no more than five characters, that identifies it. You should decide on your fund codes (e.g. something like BOOKS, AV, MAGS, DATA for the four book funds described above) and enter the code in the "Book fund" box, then a full name in the "Name" box.</p>
-
-<p>Once you have set up a fund, you will see a link to a page for setting up the fund budget. Here you will enter the beginning and ending dates of your budget year and the amount of money in that particular budget line. Do not use any kind of currency notation (like "$") or commas when entering the number. (Commas will be converted to decimal points.) NOTE: Your dates will not saved correctly unless you have set your date format in the System Preferences section of the Parameters page -- DO THIS BEFORE setting budgets.)</p>
-
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/admin/auth_subfields_structure.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/auth_subfields_structure.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/auth_subfields_structure.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/auth_subfields_structure.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Authorities MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>MARC tag structure administration</h1>
-<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
-<p>You can define as the marc tag structure for each biblio framework you have defined</p>
-
-<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>
-
-<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
-<p>For each subfield you can set :</p>
-<ul>
-<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
-<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
-<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
-<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
-<li>Text for librarian : what appears before the subfield in the librarian interface</li>
-<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
-<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. </li>
-<li>hidden : allows you to select possible visibility conditions. Each section OPAC INTRANET or Editor can be set separately:</li>
-<li><b>Is a linking field : Select this if you want to use this field for linking other authorities to this authority. The kohafield should be set to auth_header.linkid in this subfield(preferred) or any other subfield in this field :</b>
-<li>URL : if checked, the subfield is an URL, and can be clicked</li>
-<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
-<li>thesaurus : shows the authority type</li>
-<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
-<li>
-<li><b>Example MARC21 Subject Headings Authority</b>
-<ul>Use field 035$a for your auth_header.authid and 035$8 for auth_header.authtypecode. Make sure your zebra authorities index these fields</ul>
-<ul>Use field 150 for your subject headings</ul>
-<ul>Use field 750$9 (add subfield if not present) for auth_header.linkid . Select <b>Is a linking field</b>. You may use any subfield for linking as $9 is not hardcoded
-<ul>When you add or modify an authority clicking on ... that will appear next to 750$9 will let you search any authority and link it to this record. You may repeat tag 750 and add as many linkages as you like</u>
-</li>
-</ul>
-
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/admin/authorised_values.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/authorised_values.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/authorised_values.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/authorised_values.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Authorised values management<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>Authorised values management</h1>
-<p>Koha allows you to restrict the values that catalogers can place in some MARC subfields to certain pre-defined "authorised" values. These authorised values are defined here.</p>
-
-<p>For example, if your Koha installation is used by several libraries, and you use MARC21, you might want to restrict the 850a MARC subfield to the instition codes for just those libraries. In that case, you could define a new authorised values category (perhaps called "INST") and enter the institution codes as the authorised values for that category. Once the 850a subfield is linked to the INST authorised values category in your MARC tag structure, catalogers must choose a value from the list you define here, and may not type in any other value.</p>
-<ul>
-<li>HINT : if a subfield is non mandatory, Koha automatically adds an empty value to the authorised value list, that is selected by default. If the subfield is mandatory, no empty value is added (and you should NOT add it in the list, as it's an illegal value !)</li>
-<li>HINT2 : in the MARC editor, the list is ordered by Text, NOT by value. So you can define a default value by putting a space before the value you want to see first. For example, if your list is related to language, you can set "ENG" as authorised value and " English" as text. The space will order "ENG" as first default value, and the space won't be shown (because HTML automatically discard useless spaces). Super hint : you can put a value 1st with N spaces, then another one 2nd with N-1 space,..., a value in Nth position with 1 space. Don't abuse of this feature, it's easier to find a value in an alphabetical order. It should be used only to have a default value</li>
-</ul>
-<p>Koha automatically sets up authorised value categories for your item types and branch codes, and you can link these authorised values to MARC subfields when you set up your MARC tag structure.</p>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/admin/authtypes.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/authtypes.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/authtypes.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/authtypes.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Authority types<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-	<h1>Authority types</h1>
-	<p>You can define as many Authority types as you want.</p>
-	<ul>
-		<li>with the MARC structure button, you can define the MARC structure of a given authority type</li>
-		<li>The tag reported must contain a MARC tag number. Every subfield in the selected tag will be copied to the "destination tag" in the biblio. for example, in UNIMARC, the tag 200 ot personal authority will be reported to 600, 700, 701, depending on what is cliqued in the biblio MARC editor.</li>
-		<li>The summary contains an "ISBD" like description to explain how the entry must be shown in the result list. The syntax is : 
-		<ul>
-			<li>[xxxFFFSyyy] where xxx are up to 3 digits BEFORE the field, FFF the field number, S the subfield code, yyy up to 3 digits AFTER the field.</li>
-			<li>things outside [] are kept as is (including HTML)</li>
-			<li>repeatable fields are manages.</li>
-		<ul>
-	</ul>
-	<p>IMPORTANT</p>
-	<p>
-		In the biblio framework, the reported tag <b>MUST</b> contain a $9 subfield, activated in the tab where the tag is, and hidden (hidden maybe omitted, but the field has no reason to appear anywhere). The $9 subfield in the biblio will contain the Authority number (the internal Koha number)
-	</p>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/admin/biblio_framework.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/biblio_framework.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/biblio_framework.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/biblio_framework.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Biblio framework<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-	<h1>Biblio framework</h1>
-	<p>biblio frameworks are used to catalogue your biblios.</p>
-	<p>Unlike Koha 2.0, in this version you can have more than 1 framework to catalogate differently various materials. You can, for example, define 1 framework for monographies, 1 framework for serials, 1 framework for URL...</p>
-	<p>Once a framework type is created, you can clic on "MARC structure" to define the exact MARC structure. The first time, Koha will ask you to select an existing framework to copy into the new one. Thus, you don't have to define all the MARC structure</p>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/admin/biblios_framework.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/biblios_framework.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/biblios_framework.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/biblios_framework.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Biblio framework<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-	<h1>Biblio framework</h1>
-	<p>biblio frameworks are used to catalogue your biblios.</p>
-	<p>Unlike Koha 2.0, in this version you can have more than 1 framework to catalogate differently various materials. You can, for example, define 1 framework for monographies, 1 framework for serials, 1 framework for URL...</p>
-	<p>Once a framework type is created, you can clic on "MARC structure" to define the exact MARC structure. The first time, Koha will ask you to select an existing framework to copy into the new one. Thus, you don't have to define all the MARC structure</p>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/admin/branches.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/branches.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/branches.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/branches.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Branches<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<div id="main-compact">
-<h1>Help: Library Branches</h1>
-
-<p>Fill in information about your library service outlets on this page.</p>
-
-<p>Begin by defining your branch categories. If, for example, you have one main library and several branch libraries, you might set up an "M" (Main) category and a "B" (Branch) category, with descriptions "Main Library" and "Branch Library."</p>
-
-<p>Now add the names and addresses, phone numbers, etc of your libraries in the "Branches" section. (All of your libraries should be described here, not just the branch libraries.) Give each library a unique and easily-remembered code (maximum of four characters). This code will be used in Koha's database to identify each library. When libraries are listed in Koha, they will be listed in alphabetical order by code. (Note that until you set your branch the first time you use a computer to circulate items in Koha, the branch will default to the first library in the alphabetical code list -- be careful to set the branch the first time you use Koha or whenever you add a new computer!)</p>
-
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/admin/categorie.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/categorie.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/categorie.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/categorie.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Borrower Categories<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>Borrower Categories</h1>
-
-<p>Here is where you define the types of users of your library and how they will be handled.</p>
-
-<h2>Category Code and Description</h2>
-<p>Start by assigning a Category Code and a Description to each borrower type. The code is limited on no more than two characters and may be anything you choose. Four codes, however, have special meaning for Koha :</p>
-<ul>
-	<li>"I" can be used for institutional members, like other libraries that borrow from you, in which case Koha expects slightly different information about the institution;</li>
-	<li>"A" (Adult) and "W" can be linked as "guarantors" to other borrowers who are their dependents.</li>
-	<li>"C" (Children) is a borrower category that has a "guarantor"</li>
-</ul>
-
-<h2>Enrollment Period</h2>
-<p>Enrollment period is a number indicating how many years a user's enrollment is valid. If you consider enrollments to expire after four years for example (as in a school, perhaps), then set this number to 4. If enrollments never expire, set this to an impossibly high number (99).</p>
-
-<h2>Upper Age Limit and Age Required</h2>
-<p>Upper Age Limit and Age Required set the age parameters for this type of user. If you issue children's cards to users between the ages of 2 and 18, for example, then Age Required would be "2" and Upper Age Limit would be "18." If there is no upper age limit, set this value to 99 (the highest allowed).</p>
-
-<h2>Enrollment Fee and Reserve Fee</h2>
-<p>Enrollment Fee and Reserve Fee (if any) should be entered either as whole numbers or with six decimal places, with no currency notation (e.g. "1.250000" instead of "$1.25").</p>
-
-<h2>Overdue Notice Required</h2>
-<p>Overdue Notice Required lets you bypass generating overdue notices for this user type.</p>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/admin/checkmarc.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/checkmarc.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/checkmarc.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/checkmarc.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC Check<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>MARC Check</h1>
-<p>Once you have completed the process of setting up your MARC tag structure (MarcTagstruct) and checked your MARC to Koha mapping (Koha2MarcLinks), click on this link to activate a small program that checks for major errors in your MARC setup.</p>
-
-<p>This MARC check does not guarantee that you will like the first results of your efforts to set up your MARC displays, etc. -- it simply checks for major errors. You will probably revise your MARC setup several times before you are completely pleased with it. Be sure to run checkmarc after every revision.</p>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/admin/currency.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/currency.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/currency.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/currency.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Currencies administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>Currencies administration</h1>
-<p>Define the currencies you deal with here.</p>
-
-<p>You should at least define your local currency here, giving it a name (like US DOLLAR or EURO) and setting the "rate" at 1. If you do business with vendors who charge in a different currency, enter a name for that currency (e.g. PESO) and set the approximate exchange rate compared to your currency. (Note: names are limited to 10 characters or less.) The exchange rate is used to calculate the remain balances in your materials budgets when you purchase materials using "normal" acquisitions.</p>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/admin/holdings_subfields_structure.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/holdings_subfields_structure.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/holdings_subfields_structure.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/holdings_subfields_structure.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>MARC tag structure administration</h1>
-<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
-<p>You can define as the marc tag structure for each biblio framework you have defined</p>
-
-<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>
-
-<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
-<p>For each subfield you can set :</p>
-<ul>
-<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
-<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
-<li>Search also : This section is not implemented anymore-- will  be depreceated --- Zebra indexing sets these fields</li>
-<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
-<li>Text for librarian : what appears before the subfield in the librarian interface</li>
-<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
-<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
-<li>hidden : You can choose whether this field will show in opac, intranet or editor separately. For editor an extra choice is to display the field collapsed.</li>
-
-<li>URL : if checked, the subfield is an URL, and can be clicked</li>
-<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
-<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
-<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
-<li>link : If you enter a field/subfield here (200b), a little glass appears after the subfield. If the user clic on the glass, a search is done on the DB for the field/subfield with the same value. Can be used for 2 main topic : 
-	<ul>
-		<li>on a field like author (200f in UNIMARC), put 200f here, you will be able to see all biblios with the same author</li>
-		<li>on a field that is a link (4xx) to reach another biblio. For example, put 011a in 464$x, will find the serial that was previously with this issn. With the 4xx pligin, you get a powerful tool to manage biblios connected to biblios</li>
-	</ul>
-</li>
-</ul>
-
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/admin/holdingstagstructure.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/holdingstagstructure.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/holdingstagstructure.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/holdingstagstructure.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>MARC tag structure administration</h1>
-<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
-<p>You can define as the marc tag structure for each biblio framework you have defined</p>
-
-<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>
-
-<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
-<p>For each subfield you can set :</p>
-<ul>
-<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
-<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
-<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
-<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
-<li>Text for librarian : what appears before the subfield in the librarian interface</li>
-<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
-<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
-<li>hidden : means that the field is managed, but NOT shown in opac. It's usually for internal fields</li>
-<li>URL : if checked, the subfield is an URL, and can be clicked</li>
-<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
-<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
-<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
-<li>link : useless for instance</li>
-</ul>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/admin/issuingrules.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/issuingrules.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/issuingrules.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/issuingrules.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Issuing rules<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>Issuing rules</h1>
-<p>Issuing rules deals with 2 topics :</p>
-<ul>
-	<li>Issuing length and quantity : they say how many items and how long a borrower category can issue for an itemtype </li>
-	<li>Overdue charges : they are based on the item type and borrower type. These charges are defined on this page.</li>
-</ul>
-<p>Itemtypes and borrower categories must be defined before issuing rules are defined. Your defined items types and borrower categories are then displayed in a grid on this page.</p>
-
-<h2>Issuing length and quantity</h2>
-<p>Each box in the grid contains 2 numbers, separated by commas, defining how many days a given borrower type can issue how many material. For example : 21,5 means the borrower can issue up to 5 books for up to 21 days</p>
-<p>The <b>*</b> have a specific meaning. They mean "any". If you set 21,5 for itemtype=*, borrower category=student, branch=main, then a student can't issue more than 5 items of ANY item type. This "any" box is cumulative with other boxes. It means that 21,5 as itemtype=book, 14,2 as itemtype=CD and 30,6 as itemtype=* (with category=student) means a student can issue up to 5 books, up to 2 CD but a maximum of 6 items (books or CD). In this case the "30 days" in itemtype=* is discarded and the issuing length is calculated on the exact itemtype</p>
-
-<h2>Overdue charges</h2>
-<p>Each box in the grid contains three numbers separated by commas, defining the fine, how many days overdue the item must be before the fine is assessed and a first notice prepared (the "grace period"), and how many days after that the fine is assessed again and a second notice sent. For example, if you charge adults 1 dollar (or euro, or whatever currency) for overdue videos after three days and add another dollar charge after another five days, put "1,3,5" in the box in the grid that aligns with "Adult" and "Video." If you charge adults 25 cents for overdue fiction books after a grace period of seven days and repeat the charge seven days later, then the entry in the corresponding box in the grid would be ".25,7,7". After the first and second notice are given, Koha prepares a "final notice" after the number of days set by the final number in the grid and sets the charge to the maximum, which is 5.</p>
-
-<p>(Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your system administrator to put this script in crontab, after midnight, to have fines calculated every night.)</p>
-
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/admin/items_subfields_structure.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/items_subfields_structure.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/items_subfields_structure.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/items_subfields_structure.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,57 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>MARC tag structure administration</h1>
-<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
-<p>You can define as the marc tag structure for each biblio framework you have defined</p>
-
-<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>
-
-<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
-<p>For each subfield you can set :</p>
-<ul>
-<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
-<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
-<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
-<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
-<li>Text for librarian : what appears before the subfield in the librarian interface</li>
-<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
-<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
-<li>hidden : allows you to select from 19 possible visibility conditions, 17 of which are implemented. They are the following:</li>
-<code><br />
-( ! means 'not visible' or in the case of Collapsed 'not
-Collapsed')
-<br /><br />
-  -9 => Future use<br/>
-  -8 =>  Flag<br/>
-  -7 =>  OPAC !Intranet !Editor  Collapsed<br/>
-  -6 =>  OPAC  Intranet !Editor !Collapsed<br/>
-  -5 =>  OPAC  Intranet !Editor  Collapsed<br/>
-  -4 =>  OPAC !Intranet !Editor !Collapsed<br/>
-  -3 =>  OPAC !Intranet  Editor  Collapsed<br/>
-  -2 =>  OPAC !Intranet  Editor !Collapsed<br/>
-  -1 =>  OPAC  Intranet  Editor  Collapsed<br/>
-   0 =>  OPAC  Intranet  Editor !Collapsed<br/>
-   1 => !OPAC  Intranet  Editor  Collapsed<br/>
-   2 => !OPAC !Intranet  Editor !Collapsed<br/>
-   3 => !OPAC !Intranet  Editor  Collapsed<br/>
-   4 => !OPAC  Intranet  Editor !Collapsed<br/>
-   5 => !OPAC !Intranet !Editor  Collapsed<br/>
-   6 => !OPAC  Intranet !Editor !Collapsed<br/>
-   7 => !OPAC  Intranet !Editor  Collapsed<br/>
-   8 => !OPAC !Intranet !Editor !Collapsed<br/>
-   9 => Future use<br/>
-</code>
-
-<li>URL : if checked, the subfield is an URL, and can be clicked</li>
-<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
-<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
-<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
-<li>link : If you enter a field/subfield here (200b), a little glass appears after the subfield. If the user clic on the glass, a search is done on the DB for the field/subfield with the same value. Can be used for 2 main topic : 
-	<ul>
-		<li>on a field like author (200f in UNIMARC), put 200f here, you will be able to see all biblios with the same author</li>
-		<li>on a field that is a link (4xx) to reach another biblio. For example, put 011a in 464$x, will find the serial that was previously with this issn. With the 4xx pligin, you get a powerful tool to manage biblios connected to biblios</li>
-	</ul>
-</li>
-</ul>
-
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/admin/itemstagstructure.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/itemstagstructure.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/itemstagstructure.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/itemstagstructure.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>MARC tag structure administration</h1>
-<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
-<p>You can define as the marc tag structure for each biblio framework you have defined</p>
-
-<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>
-
-<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
-<p>For each subfield you can set :</p>
-<ul>
-<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
-<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
-<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
-<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
-<li>Text for librarian : what appears before the subfield in the librarian interface</li>
-<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
-<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
-<li>hidden : means that the field is managed, but NOT shown in opac. It's usually for internal fields</li>
-<li>URL : if checked, the subfield is an URL, and can be clicked</li>
-<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
-<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
-<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
-<li>link : useless for instance</li>
-</ul>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/admin/itemtypes.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/itemtypes.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/itemtypes.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/itemtypes.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Item types management<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>Item types management</h1>
-<p>You can define as many itemtypes as you want.</p>
-
-<p>The item types are the "categories" into which your library items fall. For instance, you probably want to have videocassettes in a different category from non-fiction books, and mysteries in a different category from children's picture books. If you already are using a commercial ILS, you almost certainly already have all of your materials divided up into such categories. Now you need to tell Koha what your categories are.</p>
-
-<p>The itemtype code is limited to four characters. This code is rarely displayed by Koha; instead the description of the type will be what users see.</p>
-
-<p>"Rental charge" is any amount you might charge to users for borrowing items of a certain type (like videos).</p>
-
-<p>"Renewals allowed" says how many times an items of this type may be renewed.</p>
-
-<p>Item types are useful for many things, and <b>very</b> important in controlling how Koha works :</p>
-<ul>
-    <li>Borrowers can search on itemtypes</li>
-    <li>Issuing rules are set for item types (and for borrower types / branches)</li>
-</ul>
-<p>Setting up item types is one of the first things you should do after installing the Koha software.</p>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/admin/koha2marclinks.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/koha2marclinks.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/koha2marclinks.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/koha2marclinks.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Koha 2 MARC links<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>Koha 2 MARC links</h1>
-<p>This page provides a simplified way to map your MARC tags and subfields to the non-MARC Koha database tables <b>for default biblio framework</b>. This can also be done while setting the MARC tag structure, but it is easier to see the relationship between the MARC database and the Koha database here.</p>
-
-<p>The pull-down menu lists all the Koha tables that can receive values from the MARC records. The columns from each table are listed below the pull-down menu.</p>
-
-<p>Do not expect to have every Koha table.column mapped to a MARC subfield. Some (such as biblionumber, biblioitemnumber, and itemnumber) are values generated by Koha and will probably be automatically mapped. Others are flags which are set in the course of normal circulation activities and will contain information that is not part of your MARC record.</p>
-
-<p>This is a one-to-one mapping. In other words, a MARC tag/subfield can be mapped to one, and only one, Koha table.column.</p>
-
-<p>MARC data that is not mapped to a Koha table does not disappear -- it is simply not available for display on circulation screens and on some search results screens.</p>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,57 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>MARC tag structure administration</h1>
-<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
-<p>You can define as the marc tag structure for each biblio framework you have defined</p>
-
-<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>
-
-<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
-<p>For each subfield you can set :</p>
-<ul>
-<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
-<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
-<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
-<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
-<li>Text for librarian : what appears before the subfield in the librarian interface</li>
-<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
-<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
-<li>hidden : allows you to select from 19 possible visibility conditions, 17 of which are implemented. They are the following:</li>
-<code><br />
-( ! means 'not visible' or in the case of Collapsed 'not
-Collapsed')
-<br /><br />
-  -9 => Future use<br/>
-  -8 =>  Flag<br/>
-  -7 =>  OPAC !Intranet !Editor  Collapsed<br/>
-  -6 =>  OPAC  Intranet !Editor !Collapsed<br/>
-  -5 =>  OPAC  Intranet !Editor  Collapsed<br/>
-  -4 =>  OPAC !Intranet !Editor !Collapsed<br/>
-  -3 =>  OPAC !Intranet  Editor  Collapsed<br/>
-  -2 =>  OPAC !Intranet  Editor !Collapsed<br/>
-  -1 =>  OPAC  Intranet  Editor  Collapsed<br/>
-   0 =>  OPAC  Intranet  Editor !Collapsed<br/>
-   1 => !OPAC  Intranet  Editor  Collapsed<br/>
-   2 => !OPAC !Intranet  Editor !Collapsed<br/>
-   3 => !OPAC !Intranet  Editor  Collapsed<br/>
-   4 => !OPAC  Intranet  Editor !Collapsed<br/>
-   5 => !OPAC !Intranet !Editor  Collapsed<br/>
-   6 => !OPAC  Intranet !Editor !Collapsed<br/>
-   7 => !OPAC  Intranet !Editor  Collapsed<br/>
-   8 => !OPAC !Intranet !Editor !Collapsed<br/>
-   9 => Future use<br/>
-</code>
-
-<li>URL : if checked, the subfield is an URL, and can be clicked</li>
-<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
-<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
-<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
-<li>link : If you enter a field/subfield here (200b), a little glass appears after the subfield. If the user clic on the glass, a search is done on the DB for the field/subfield with the same value. Can be used for 2 main topic : 
-	<ul>
-		<li>on a field like author (200f in UNIMARC), put 200f here, you will be able to see all biblios with the same author</li>
-		<li>on a field that is a link (4xx) to reach another biblio. For example, put 011a in 464$x, will find the serial that was previously with this issn. With the 4xx pligin, you get a powerful tool to manage biblios connected to biblios</li>
-	</ul>
-</li>
-</ul>
-
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>MARC tag structure administration</h1>
-<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
-<p>You can define as the marc tag structure for each biblio framework you have defined</p>
-
-<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>
-
-<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
-<p>For each subfield you can set :</p>
-<ul>
-<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
-<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
-<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
-<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
-<li>Text for librarian : what appears before the subfield in the librarian interface</li>
-<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
-<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
-<li>hidden : means that the field is managed, but NOT shown in opac. It's usually for internal fields</li>
-<li>URL : if checked, the subfield is an URL, and can be clicked</li>
-<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
-<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
-<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
-<li>link : useless for instance</li>
-</ul>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/admin/printers.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/printers.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/printers.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/printers.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Printer Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>Printer Administration</h1>
-<p>If you are going to be using a printer (or several printers) that are attached to your Koha server for producing statistical and operations reports, then you need to give each printer a name and tell Koha how to access it. You do this by telling Koha which print queue to use.</p>
-
-<p>(In linux, each printer configuration in your printcap file defines a print queue. The default print queue is "lp," but if you use more than one printer you will have other queues, probably with names like "text" or "postscript." Tell Koha which printer queue(s) you want to use for printing reports directly from the server.)</p>
-
-<p>Note that you can always print Koha screens directly to a printer attached to your workstation just by using your web browser's Print function.</p>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/admin/stopwords.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/stopwords.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/stopwords.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/stopwords.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Stop word administration page<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>Stop word administration page</h1>
-<p>Here you should list all of the words you wish Koha to ignore when performing catalog searches or building the keyword index.</p>
-
-<p>Normally, you will not want Koha to save keyword references to articles like "The" and "A" and other very common words. Saving keyword references to these words does not help to limit a search and will make the keyword index very large and "cluttered" with words that are not really useful. The "stopwords" list defines these unnecessary words for your installation.</p>
-
-<p>(Hint: If you are proficient at MySQL, it is often faster and easier to find an existing stopwords list, edit it, put it in the correct format, and use the MySQL "Load Data Infile" command to import the list into the stopwords table. Many academic libraries publish their stopwords list on the Internet, or you can ask other Koha libraries if they would share their stopword list.)</p>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/admin/systempreferences.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/systempreferences.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/systempreferences.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/systempreferences.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,71 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- System preferences administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>System preferences administration</h1>
-<p>This page allows you to set the system preferences that control much of the basic behavior of Koha. These parameters should be set before any other parameters.</p>
-<ul>
-<li><b>acquisitions --</b> The choices are either "normal" or "simple." "Normal" sets the system to track orders and update budgeting and vendor information as you add materials to your collection. "Simple" tells Koha that you are going to add materials to the collection without tracking orders.</li>
-
-<li><b>authoritysep --</b> The separator used in authority/thesaurus. Usually " -- ". Deprecated and useless in Koha 2.2</li>
-
-<li><b>autoBarcode --</b> The barcode number to be assigned to items is automatically assigned (sequentially) by Koha if this is set to "yes" ("1" = "yes").</li>
-
-<li><b>autoMemberNum --</b> The membership number (patron card number) to be assigned to new library users is automatically assigned by Koha if this is set to "yes" ("1" = "yes").</li>
-
-<li><b>checkdigit --</b> Validity checks on membership number (patron card number): none or "Katipo" style checks. In most cases, you will choose "none" because you will be using pre-printed barcodes.</li>
-
-<li><b>dateformat --</b> Choose "metric," "us," or "iso" date format (us = mm/dd/yyyy, metric = dd/mm/yyy, ISO = yyyy/mm/dd). This controls how dates are displayed, not how they are stored in the database.</li>
-
-<li><b>gist --</b> "gist" is "GST" (Good and Sales Tax) rate. If your local tax laws require you to pay taxes on purchases from your suppliers, enter the tax rate here. Set to "0" if you are not required to pay tax.</li>
-
-<li><b>insecure --</b> The best choice is "no." If you choose "yes," users do not have to login and all information is open to anyone. Be careful if you set this to "yes!"</li>
-
-<li>
-	<p><b>ISBD --</b> Koha can display records in International Standard Bibliographic Description format. the syntax of this field is quite complex : </p>
-	<p>it's divided into blocks, that can contain a text before, X fields, each having -or not- a string before, a string after, and a text after :</p>
-	<p><b>#995|&lt;br&gt;Items :|{\n995b}{ - 995j}{/995k}|</b></p>
-	<p>means the "block" 995 has &lt;br&gt;Items : BEFORE, then fields 995b, 995j and 995k, repeated for each item (995 is an UNIMARC standard), then nothing after the block.</p>
-	<p> The # means "beginning of a block", the | is the separator of each part, the {} being used for each subfield. A subfield can have up to 3 digits BEFORE and up to 3 digits AFTER each subfield</p>
-	<p>The UNIMARC (partial) definition for ISBD is </p><i>
-	<p>#700|<label>Titre/auteur</label>|{700a}{701a}{702a}| ;
-		#200||{200a}{ [200b] }{. 200c}{ : 200e}{. 200h}{. 200i}{ / 200f}{ ; 200g}|<br/>
-		#230||{ ; 230a}|<br/>
-		#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|<br/>
-		#210|&lt;br/&gt;&lt;label&gt;Editeur&lt;/label&gt;|{ ; 210a}{ (210b) }{ : 210c}{, 210d}|<br/>
-		#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)<br/>
-		#215|&lt;br/&gt;&lt;label&gt;&nbsp;&lt;/label&gt;|{ ; 215a}{ : 215c}{ ; 215d}{ + 215e}|<br/>
-		#225|&lt;br/&gt;&lt;label&gt;Description&lt;/label&gt;|{ (225a}{ = 225d}{ : 225e}{. 225h}{. 225i}{ / 225f}{, I225x}{ ; 225v}|)<br/>
-		#606|&lt;br/&gt;&lt;label&gt;Sujets&lt;/label&gt;|{ 606a - }|&lt;br/&gt;&lt;br/&gt;<br/>
-		#995|&lt;br&gt;Exemplaires :|{\n995b}{ - 995j}{/995k}|<br/>
-	</i></p>
-</li>
-
-<li><b>KohaAdminEmailAddress --</b> The email address that will receive requests from borrowers for modification of their records.</li>
-
-<li><b>ldapserver and ldapinfos --</b> Koha 2.0 can use Perl LDAP (Lightweight Directory Access Protocol, see http://search.cpan.org/~gbarr/perl-ldap-0.3202/lib/Net/LDAP.pod) to manage user access and privileges. To avoid a useless Perl package for libraries without ldap, all what is related to LDAP has been moved to KohaInstall/modules/C4/Auth_with_ldap.pm. Ask your system administrator to set up LDAP with Auth_with_ldap.pm (perldoc Auth_with_ldap.pm for help). Those 2 parameters are useless in 2.2 and have should not appear on a new install.</li>
-
-<li><b>LibraryName --</b> The library name or message that will be shown on the main OPAC page. You may use HTML tags to format the name. Example: Welcome to <i>Koha<br/>Free Software ILS</i></li>
-
-<li><b>marc --</b> Turn on MARC support. Set to "no" if you do not intend to use MARC records.</li>
-
-<li><b>marcflavour --</b> Your MARC flavor (MARC21 or UNIMARC). This choice tells Koha how to interpret your MARC records.</li>
-
-<li><b>maxoutstanding --</b> The maximum amount of outstanding charges a borrower may have before he/she is barred from making reserve requests. The number represents units of your local currency (e.g. "5" means $5.00, if the dollar is your local currency.)</li>
-
-<li><b>maxreserves --</b> The maximum number of reserves a member can make.</li>
-
-<li><b>noissuescharge --</b> The maximum amount of outstanding charges a borrower may have before he/she is barred from checking out items. The number represents units of your local currency (e.g. "5" means $5.00, if the dollar is your local currency.)</li>
-
-<li><b>opaclanguages --</b> Set your language preference. (Despite the name, this choice controls the language used for all Koha screens, not just the OPAC). The top language in your list will be tried first.</li>
-
-<li><b>opacthemes --</b> Set the preferred order for themes. The top theme will be tried first.</li>
-
-<li><b>printcirculationslips --</b> if set to 1, circulation "slips" are printed on your receipt printer. If set to 0, no slips are printed.</li>
-
-<li><b>suggestion --</b> If set to 1, the Suggestions feature is activated in the OPAC. This feature allows OPAC users to suggest book purchases. When a suggestion is made in the OPAC, it is assigned the status "ASKED." A librarian then manages the suggestion and can set the status to "REJECTED" or "ORDERED." When a book is ordered and has arrived in the library, the status becomes "AVAILABLE." Suggestions that are not yet "AVAILABLE" are visible to all users of the OPAC.</li>
-
-<li><b>template --</b> Preference order for screen templates. Koha comes with several different options for templates that control the look and feel of your Koha screens, and you can also write your own templates.</li>
-
-<li><b>timeout --</b> Inactivity timeout period (in seconds). If a workstation is idle for longer than this period, the user will have to login again.</li>
-
-<li><b>virtualshelves --</b> Set virtual shelves management on or off ("1" or "0"). Users can set up and manage their own "virtual bookshelves" of favorite library items if this feature is turned on.</li></ul>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/admin/z3950servers.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/admin/z3950servers.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/admin/z3950servers.tmpl
--- htdocs/intranet-tmpl/default/en/help/admin/z3950servers.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Z39.50 servers administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>Z39.50 servers administration</h1>
-<p>Defines the Z39.50 servers you want Koha to search.</p>
-
-<p>Koha comes with one Z39.50 server site defined (the U.S. Library of Congress) for finding catalog records to import directly into your catalog. In this area, you can define other servers for searching.</p>
-
-<p>To add servers, you will need to know the domain name or IP address of the server, the port number to use, and the name of the database to access. This information is available for many servers worldwide by acessing the Index Data website at http://www.indexdata.dk/targettest/. All of the servers listed there accept anonymous connections. (Be sure to choose servers which deliver records in the proper MARC format for your Koha installation.)</p>
-
-<p>If you have a login name and password for other Z39.50 servers, Koha will save your user ID and password in addition to the other information it needs to make a connection. (For anonymous servers, leave the userid and password fields blank.) The other fields on the form control whether or not the server is automatically searched when you request a Z39.50 search (put a "1" in the "Checked" field) and the order in which it is checked.</p>
-
-<p>It is a good idea to be selective in choosing servers. Defining more than five or six checked servers may slow down your Z39.50 search results, even if they are queried all together.</p>
-
-<p>IMPORTANT NOTE : the z3950search will NOT work until your system administrator has not activated the z3950 client daemon on your server. The daemon is in KohaDirectory/script/z3950daemon. It should be added to rc.d to be launched during server boot.</p>
-
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/authorities/authorities.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/authorities/authorities.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/authorities/authorities.tmpl
--- htdocs/intranet-tmpl/default/en/help/authorities/authorities.tmpl	10 Mar 2007 01:54:27 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-authority help
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/bull-home.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/bull-home.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/bull-home.tmpl
--- htdocs/intranet-tmpl/default/en/help/bull-home.tmpl	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-	<h1>Serials subscription help</h1>
-	<p>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</p>
-		<p>If you want to create a new subscription, click the "Add subscription" button.</p>
-		<p>Once you have found the subscription you need, you can: </p>
-			<ul>
-				<li>View subscription details</li>
-				<li>Recieve any item and/or manage what appears in subscription summary (in OPAC and librarian interface)</li>
-	</ul>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/nohelp.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/nohelp.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/nohelp.tmpl
--- htdocs/intranet-tmpl/default/en/help/nohelp.tmpl	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: No help for this topic!<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-	<div id="main-compact">
-	<h1>Online Help</h1>
-	<p>Sorry, there is no help available for this topic</p>
-	</div>
-<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/circ/circulation.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/circ/circulation.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/circ/circulation.tmpl
--- htdocs/intranet-tmpl/default/en/help/circ/circulation.tmpl	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Circulation -- Issues<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-
-<h1>Circulation -- Issues</h1>
-
-<p>Before you begin, it is very important that you take note of the branch and printer settings and change them if necessary. This should only have to be done the first time you do circulations from a workstation, after which a browser cookie will remember the correct settings. If you do circulations under the wrong branch settings (for example, your branch setting is "Suburb," but you are actually working at the "Downtown" branch), then Koha will reset the location of all items scanned to the incorrect branch (Suburb) and the statistical reports will credit all circulations to the wrong branch.</p>
-
-<p>Now start by scanning the patron's barcode or type in their name to find their account. Once Koha has found the patron, you will see a new form for scanning or typing the item's identifying number (usually a barcode).</p>
-
-<p>If you wish to have this item and all subsequent items in this transaction to have a date due other than the default date due defined for the item type, use the "Sticky Due Date" to set the date due before scanning the first item.</p>
-
-<p>If the item can be issued without problems, it will be done immediatly and shown (with other patron issues) at bottom.</p>
-
-<p>If the issuing is problematic, then another box will appear and ask for confirmation if possible. If the issuing is really impossible (for example, the barcode does not exist), then you can't confirm the issue. If it is possible but has something that needs confirmation (like item being issued to another patron, or patron having issued too many items), then you must confirm the issuing. If the confirmation means another operation (if item is issued to another patron, then issuing also means make the return), then it's also done</p>
-
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/circ/returns.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/circ/returns.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/circ/returns.tmpl
--- htdocs/intranet-tmpl/default/en/help/circ/returns.tmpl	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Circulation -- Returns<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-
-<h1>Circulation -- Returns</h1>
-
-<p>Before you begin, it is very important that you take note of the branch and printer settings and change them if necessary. This should only have to be done the first time you do circulations (or returns) from a workstation, after which a browser cookie will remember the correct settings. If you do returns under the wrong branch settings (for example, your branch setting is "Suburb," but you are actually working at the "Downtown" branch), then Koha will reset the location of all items scanned to the incorrect branch (Suburb).</p>
-
-<p>Now simply scan or type the returned item's identifying number (usually a barcode) in the box provided.</p>
-
-<p>The return is done and if there is something specific for the item or the patron (like patron having debts), a red box will warn you</p>
-<p>If the item has been requested by someone else, you also are asked to validate the request. If you confirm it, item is changed to a "waiting" status and you should warn the patron that the item is available</p>
-<p>If the item is requested by someone in another branch, then you must validate the transfer too</p>
-
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/export/marc.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/export/marc.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/export/marc.tmpl
--- htdocs/intranet-tmpl/default/en/help/export/marc.tmpl	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: MARC Export<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-
-<h1>MARC Export</h1>
-
-<p>This is a tool to export your bibliographic records in standard MARC communications format (ISO 2709). It exports only the basic bibliographic information with no holdings information other than any holdings information originally loaded into Koha using the bulkmarcimport tool.</p>
-
-<p>You are asked to provide a starting bibliographic record number and an ending number for the export. If you want to export all of your records, leave the start and end numbers blank.</p>
-
-<p>Records are downloaded to the workstation that requests the export and are saved in a file called "marc.pl."</p>
-
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/import/breeding.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/import/breeding.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/import/breeding.tmpl
--- htdocs/intranet-tmpl/default/en/help/import/breeding.tmpl	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: MARC Import<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-
-<h1>MARC Import</h1>
-<p>This is one of the screens you will see frequently if you are starting from scratch.</p>
-
-<p>It is useful to import a bunch of ISO 2709 biblios that can be used later for a quick cataloguing</p>
-
-<p>First, you need to browse your computer to find the MARC record that you grabbed for your item. Click on</p>
-
-<p>Choose File to browse.</p>
-
-<p>If you aren't sure if you've already imported a record, keep the radio button set to</p>
-
-<p>Ignore this one, keep the existing one.</p>
-
-<p>You can "name" the import to help you when you need to choose between more than 1 imported biblio (or just want to keep trace on where the biblios comes from)</p>
-
-<p>You can also change char encoding between MARC21 and UNIMARC</p>
-
-<p>You don't need to actually name every import, so you don't need to fill in this box if you don't want to. It is useful for telling imports apart if you've more than one of the same record.</p>
-
-<p><b>IMPORTANT : This tool is NOT intended to import ISO 2709 in your ACTIVE database. If you need to migrate data from another ILS, then you must consider $kohaInstall/scripts/misc/bulkmarcimport.pl</b></p>
-
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/members/memberentry.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/members/memberentry.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/members/memberentry.tmpl
--- htdocs/intranet-tmpl/default/en/help/members/memberentry.tmpl	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Add Patron<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>Add patron help</h1>
-
-
-<h2>Add Patron, person</h2>
-<p>This is the form for adding a new single patron to the database. There is also a form for organisations, such as other libraries and non profit organisations you might lend to. You should use the Add Organisation tab at the top of the Patron page for that.</p>
-
-<p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
-<p>If you accidentally have two patrons with the same card number, the second duplicate will show up as just commas after you confirm the record.</p>
-<p>When you are done with the record, click the 'Add this Patron' button at the bottom.</p>
-
-<h2>Add Patron, Institutional</h2>
-<p>This is the form for adding a group of patrons. Suppose you had a YMCA group, or lend books to other libraries. This would be the form to use for that purpose.</p>
-<p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
-<p>If you accidentally have two patrons with the same card number, the second duplicate will show up as just commas after you confirm the record.</p>
-<p>When you are done with the record, click the Save button at the bottom.</p>
-
-<p>Sorting Field 1 and Sorting Field 2 may now be related to a list of Authorized Values. All you have to do is define a Bsort1 or Bsort2 category of authorised values and enter the desired values into these categories. You will then be able to use them through Add/Modify Patron Page</p>
-
-<p>You can always come back and edit what you enter in the Add Patron screen by searching for the borrower by using their last name or card number, selecting a user by clicking on the entry in the search list, and then clicking the Modify button on the patron information screen.</p>
-</div>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/members/members-home.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/members/members-home.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/members/members-home.tmpl
--- htdocs/intranet-tmpl/default/en/help/members/members-home.tmpl	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Members<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>Members help</h1>
-<p>This is the Members portion of Koha.</p>
-<p>The Members portion stores the information you add about your patrons.</p>
-<p>To add a patron, type their name into the search box on the left, and
-click the OK button.</p>
-<p>If there is already a borrower matching the name you searched, it will show
-after you click OK. This can be particularly useful when people have lost
-their cards or when children forget their cards. That way, you can avoid having
-multiple numbers for the same patron.</p>
-<p>Alternatively, you can browse a section of borrowers by selecting the first
-letter of the Patron's last name from the list on the right.</p>
-</div>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/members/moremember.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/members/moremember.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/members/moremember.tmpl
--- htdocs/intranet-tmpl/default/en/help/members/moremember.tmpl	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Member Information<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h1>Member Information Screen</h1>
-<p>This screen shows the information associated with a given patron.</p>
-<p>On the top left is their address and card number.</p>
-<p>A patron's annual membership fee payment status also shows on this screen.</p>
-<p>Any fines a patron has will show up in the top middle of this screen.</p>
-<p>Any materials a patron has requested will show up on the top right of this screen.</p>
-<p>You can get information on what a patron has read in the past by clicking on the Reading Record button.</p>
-<p>Any items a patron currently has out will show up under "Items currently on issue".</p>
-<p>If you would like to edit a patron's information, click the modify button on the lower left.</p>
-<p>If you would like to PERMANENTLY delete a user, click the delete button on the lower left. A confirmation box will
-appear, so don't worry about accidentally deleting a record. Just be absolutely sure before you delete!</p>
-<p>The change password button allows a user to either set a new password or change their current password. This is useful to patrons that wish to place reserves online from home. You cannot see a password again once you change it, but you can reset a password.</p>
-<p>Modify user flags allows an administrator to set which clerks, librarians, patrons, technical support people or trustees have access to certain parts of the database. Right now, one can either have permission to access everything on the Intranet side, or just have access to the OPAC.</p>
-</div>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/reports/borrowers_stats.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/reports/borrowers_stats.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/reports/borrowers_stats.tmpl
--- htdocs/intranet-tmpl/default/en/help/reports/borrowers_stats.tmpl	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Members Statistics<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<div id="main-compact">
-
-<h1>Members Statistics help</h1>
-<p>This page is to be used as a wizard to compose two entries table stats on borrowers.</p>
-<p>You must bear in mind what the table will look like :</p>
-<p>	<table>
-	<tr> <th> row/colunm </th> <th> column criteria1 </th> <th> column criteria2 </th> <th> total rows</th> </tr>
-	<tr> <td> row criteria1</td> <td> count11 </td> <td> count12 </td> <td>total row1 </td> </tr>
-	<tr> <td> row criteria2</td> <td> count21 </td> <td> count22 </td> <td>total row2 </td> </tr>
-	<tfoot><tr> <td> Total cols</td> <td> total col1</td> <td> total col2</td> <td> Global total</td> </tr></tfoot>
-	</table></p>
-<p>	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 :
-</p><p>	<table>
-	<tr> <th> catcode/branchcode </th> <th> BranchA</th> <th> BranchB</th> <th> total </th> </tr>
-	<tr> <td> A</td> <td> 12 </td> <td> 22 </td> <td>34</td> </tr>
-	<tr> <td> C</td> <td> 11</td> <td> 12 </td> <td>23</td> </tr>
-	<tr> <td> I</td> <td> 21</td> <td> 22</td> <td>43</td> </tr>
-	<tfoot><tr> <td> Total </td> <td> 44</td> <td> 56</td> <td> 100</td> </tr></tfoot>
-	</table>
-</p><p>	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.
-</p>
-<p>
- <h2> Criteria on row/column</h2>
- <ul> <li>You can choose sort1 sort2 if filled.</li>
- <li>You can choose Branch, zipcode or categorycode.</li>
- <li>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.</li>
- </ul>
- 
-</p>
-<p>
- <h2> Filters </h2>
- <ul> <li>You can filter on sort1 sort2 if filled.</li>
- <li>You can filter on zipcode, branch or categorycode.</li>
- <li>Branches and categorycodes are chosen in a select list.</li>
- <li>Zipcode can use special characters like * for many characters. say 31* to get french people that live in Haute-Garonne</li>
- </ul>
-</p>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/reports/catalogue_stats.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/reports/catalogue_stats.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/reports/catalogue_stats.tmpl
--- htdocs/intranet-tmpl/default/en/help/reports/catalogue_stats.tmpl	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Catalogue Statistics<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-
-<h1>Catalogue Statistics</h1>
-<p>This page is to be used as a wizard to compose two entries table stats on catalogue.</p>
-<p>You must bear in mind what the table will look like :</p>
-<p>	<table>
-	<tr> <th> row/colunm </th> <th> column criteria1 </th> <th> column criteria2 </th> <th> total rows</th> </tr>
-	<tr> <td> row criteria1</td> <td> count11 </td> <td> count12 </td> <td>total row1 </td> </tr>
-	<tr> <td> row criteria2</td> <td> count21 </td> <td> count22 </td> <td>total row2 </td> </tr>
-	<tfoot><tr> <td> Total cols</td> <td> total col1</td> <td> total col2</td> <td> Global total</td> </tr></tfoot>
-	</table></p>
-<p>	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 :
-</p><p>	<table>
-	<tr> <th> catcode/branchcode </th> <th> BranchA</th> <th> BranchB</th> <th> total </th> </tr>
-	<tr> <td> BOOKS</td> <td> 12 </td> <td> 22 </td> <td>34</td> </tr>
-	<tr> <td> ISSUES</td> <td> 11</td> <td> 12 </td> <td>23</td> </tr>
-	<tfoot><tr> <td> Total </td> <td> 33</td> <td> 34</td> <td> 57</td> </tr></tfoot>
-	</table>
-</p><p>	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.
-</p>
-<p>
- <h2> Criteria on row/column</h2>
- <ul> <li>Dewey Classification. You can group results on the n first digits</li>
- <li>Callnumber. You can group results on the n first characters</li>
- <li>Document Type</li>
- <li>Publication Year</li>
- <li>Home Branch</li>
- <li>Location</li>
- </ul>
- 
-</p>
-<p>
- <h2> Filters </h2>
- <ul> <li>Callnumber and Dewey Classification can be filtered from a string to another. You can use jokers.</li>
- <li>You can select one document type.</li>
- <li>Publication Year</li>
- <li>You can select one branch as Home Branch</li>
- <li>Location</li>
- </ul>
-</p>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/reports/inventory.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/reports/inventory.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/reports/inventory.tmpl
--- htdocs/intranet-tmpl/default/en/help/reports/inventory.tmpl	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Catalogue Statistics<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-
-<h1>Inventory help</h1>
-<p>With this utility you can take invetory of your collection</p>
-<p>There are two ways to do this :</p>
-<ul>
-<li>list books that haven't been 'seen' and then search for them on the shelves</li>
-<li>Scan all books which will tell Koha they have been 'seen'</li>
-</ul>
-<p>Koha supports both methods:</p>
-<h2>List unseen books and search for them on the shelves</h2>
-<p> In the 1st bloc, you can select :
-<ul>
-<li>a itemcallnumber range: to limit the list to a small physical shelf</li>
-<li>a date last seen: to see only books which have been unseen for a long time</li>
-</ul>
-<p>If you validate your search, you'll get a list of items. Go to the shelves, search them, and, if you see them, click on them</p>
-<h2>Scan all books and tell Koha you've seen them</h2>
-<p>This feature is new in Koha 2.2.6 : you can now scan ALL the books in your shelves (with a barcode reader and a laptop) and store them in a text file (from notepad or any text-only editor <b>This does NOT include MS-word or OpenOffice.org</b>)</p>
-<p>Once you have a long barcode list, reach the second bloc on inventory.pl, and upload the file : all items you have scanned will automatically be modified to have datelastseen set to whatever you wan</p>
-<p>Once you're done with your library, you can look at missing books by querying the 1st bloc for books unseen since the beginning of your inventory</p>
-
-<p>Note that inventory is calculated on a "date last seen" flag. This flag is automatically set every time a book circulate</p>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/reports/issues_stats.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/reports/issues_stats.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/reports/issues_stats.tmpl
--- htdocs/intranet-tmpl/default/en/help/reports/issues_stats.tmpl	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,48 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Circulation Statistics<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-
-<h1>Circulation Statistics</h1>
-<p>This page is to be used as a wizard to compose two entries table stats on issues.</p>
-<p>You must bear in mind what the table will look like :</p>
-<p>	<table>
-	<tr> <th> row/colunm </th> <th> column criteria1 </th> <th> column criteria2 </th> <th> total rows</th> </tr>
-	<tr> <td> row criteria1</td> <td> count11 </td> <td> count12 </td> <td>total row1 </td> </tr>
-	<tr> <td> row criteria2</td> <td> count21 </td> <td> count22 </td> <td>total row2 </td> </tr>
-<tfoot>	<tr> <td> Total cols</td> <td> total col1</td> <td> total col2</td> <td> Global total</td> </tr></tfoot>
-	</table></p>
-<p>	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 :
-</p><p>	<table>
-	<tr> <th> catcode/branchcode </th> <th> BranchA</th> <th> BranchB</th> <th> total </th> </tr>
-	<tr> <td> A</td> <td> 12 </td> <td> 22 </td> <td>34</td> </tr>
-	<tr> <td> C</td> <td> 11</td> <td> 12 </td> <td>23</td> </tr>
-	<tr> <td> I</td> <td> 21</td> <td> 22</td> <td>43</td> </tr>
-	<tfoot><tr> <td> Total </td> <td> 44</td> <td> 56</td> <td> 100</td> </tr></tfoot>
-	</table>
-</p><p>	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.
-</p>
-<p>
- <h2> Criteria on row/column</h2>
- <li>You can choose Branch, itemtype or borrower category.</li>
- <li>Period you can select whether you want it to be issue or return period. </li>
- <li>You can group results by day, by Month, by year. </li>
- </ul>
- 
-</p>
-<p>
- <h2> Filters </h2>
- <ul> <li>You can filter period in a From/to calendar.</li>
- <li>You can choose to see only One day on the period, or one month.</li>
- <li>You can filter on itemtypes, branch or borrowers category.</li>
- <li>Branches itemtypes and borrowers category are chosen in a select list.</li>
- </ul>
-</p>
-<p>
- <h2> Cell Value</h2>
-<p> You can choose to count 
- <ul> <li>distinct borrowers</li>
- <li>distinct items</li>
- <li>distinct issues (that is one borrower, one item)</li>
- <li>circulation rate (rate items issued out of total number of items)</li>
- </ul>
-</p>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/help/search.marc/search.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/search.marc/search.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/search.marc/search.tmpl
--- htdocs/intranet-tmpl/default/en/help/search.marc/search.tmpl	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-	<h1>Search</h1>
-	<p>The search id divided in 2 differents parts :</p>
-	<h2>Usual fields</h2>
-	<p>The usual fields are in the top part of the screen. They contains :</p>
-		<ul>
-			<li>Keyword : search on anything</li>
-			<li>Title</li>
-			<li>Author</li>
-			<li>Barcode : the library barcode of the book</li>
-			<li>Illustrator</li>
-			<li>Dewey</li>
-			<li>Item type : select here an item type. If none is selected, the search is done on every item type</li>
-			<li>Branch : select here a specific branch. If none selected, the search is done on every branch</li>
-		</ul>
-	<p>Search method</p>
-		<ul>
-			<li>If you enter values in more than 1 field, the search is "and-ed" (biblios that contains <b>title</b> AND <b>author</b>)</li>
-			<li>A biblio is selected if it's field <b>contains</b> the term you entered</li>
-			<li>If you enter a * (or a %) at the end of a term, Koha search for words starting with your term (entering <b>lower*</b> means : find biblio that have a <b>title containing a word starting by lower</b></li>
-		</ul>
-	<h2 class="catalogue">Complete MARC search</h2>
-	<p>In the lower part of the search screen, the <b>More fields</b> box let you enter whatever you want : and, or, exclusions (not), search on any MARC field/subfield</p>
-	
-	<p><b>IMPORTANT NOTE : </b>for performance reasons, the * is valid only if you enter a word more than 3 letters long. for words of 3 letters or less, the * is <b>ignored</b></p>
-	<br/>
-
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/serials/bull-home.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/serials/bull-home.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/serials/bull-home.tmpl
--- htdocs/intranet-tmpl/default/en/help/serials/bull-home.tmpl	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-	<h1>Serials subscription help</h1>
-	<p>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</p>
-	<p>If you want to create a new subscription, click on "Add subscription"</p>
-
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/serials/statecollection.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/serials/statecollection.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/serials/statecollection.tmpl
--- htdocs/intranet-tmpl/default/en/help/serials/statecollection.tmpl	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials -- Issues and Summary<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-	<h1>Serials issues and summary</h1>
-	<p>This screen is divided in 2 parts</p>
-	<h2>The right part</h2>
-	<p>The right part deals with issues. When you create a new subscription, the 1st issue is automatically calculated. When you want/need, you can define issues that have a new status:</p>
-	<ul>
-		<li>Arrived : when an book arrives, you can set it's status to "arrived". Then, the issue disappear from this list, and the number of the issue is added to the "arrived list" (on the left box)</li>
-		<li>Late : means that the book is late and should be arrived. A books changed to "late" status stays on the issue list, and the next waited number is generated</li>
-		<li>Missing : means the book will never arrive. The issue disappear from the list, and the number of the issue is added to the "missing list" (on the left box)</li>
-	</ul>
-	<h2>The left part</h2>
-	<p>the left part contains 6 differents informations, that are automatically calculated for some of them, but that you can change<p>
-	<ul>
-		<li>Subscription beginning date : the date of the beginning of the 1st subscription. Should not be modified and is not modified automatically by subscriptions renewals</li>
-		<li>Subscription enddate : must be entered manually when the subscription is definetly closed</li>
-		<li>Arrived numbers : the list of issues you have in your library. Automatically filled when a new number is marked "arrived". You can manually change this field if you want, for example, to change a long list (1,2,3,4,...,51) to a shorter one (1-51)</li>
-		<li>Missing numbers : the list of issues you don't have in your library, and that will never arrive (or have been lost). Automatically filled when a new number is marked "missing". You can manually change this field if you want, for example, to change a long list (1,2,3,4,...,51) to a shorter one (1-51)</li>
-		<li>opac note : the field that appears in the OPAC (with some other subscription information like beginning date and end date. This field must be filled manually. Nothing is put here automatically</li>
-		<li>opac note : the field that appears in the librarian interface (with some other subscription information like beginning date and end date. This field must be filled manually. Nothing is put here automatically.</li>
-	</ul>
-	<h2>Subscription renewals</h2>
-	<p>Koha calculates automatically the end of the subscription (based on the start date and the number of issues recieved). when a subscription has ended, you can't change the status of the last "waited number" (as it's not waited in fact). To be able to "recieve" this number, you must renew your subscription.</p>
-	<p>Renewing a subscription means that you define some informations for the renewal. When those informations have been filled, a suggestion is automatically created in Koha. This suggestion can be managed by the librarian that orders books, as any other order (= budget and bookseller are defined here).</p>
-	<p><i>Note that the subscription renewal done by the "serials librarian" is supposed to be immediate. We have decided to keep Koha as simple as possible. In fact, the subscription renewal won't be immediate, but we didn't wanted to add too much complexity.</i></p>
-	</p>
-
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/serials/subscription-add.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/serials/subscription-add.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/serials/subscription-add.tmpl
--- htdocs/intranet-tmpl/default/en/help/serials/subscription-add.tmpl	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials -- Adding Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-	<h1>Serials subscription add and modify help</h1>
-	<ul>
-		<h2>Subscription information bloc</h2>
-		<p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
-		<h2>Planning information bloc</h2>
-		<p>it contains various information to calculate arrival dates.</p>
-		<h2>Subscription length</h2>
-		<p>one field in this bloc should be filled : the subscription length can be calculated in weeks, months or number of issues to recieve</p>
-		<h2>Numbering calculation</h2>
-		<p>The numbering of issues recieved can be a complex formulas. The "numbering formula" can be filled with any text and/or numbers. 3 special tokens <b>{X} {Y}</b> and <b>{Z}</b> can be user to define the calculation formula. XYZ values are calculated with the following method:</p>
-			<ul>
-				<li>Add : the number here is added to XYZ</li>
-				<li>once every : the number before can be added on every issue or less often</li>
-				<li>When more than : if the calculated number is more than the value here</li>
-				<li>Set back to : if the previous condition is valid, the calculated number is set to this one instead</li>
-				<li>Last value / begins with : the last value calculated or the 1st value (when adding a subscription</li>
-			</ul>
-		<h2>Sample</h2>
-		Consider the formula <b>N°{X}/{Y}</b>. The following XYZ settings :
-		<ul>
-			<li> <b>X</b> add <b>1</b> once every <b>4</b> times. When more than <b>9999999</b> set back to <b>empty</b>. Begins with <b>2004</b></li>
-			<li> <b>Y</b> add <b>1</b> once every <b>1</b> times. When more than <b>4</b> set back to <b>4</b>. Begins with <b>1</b></li>
-		</ul>
-		will result in the following issues numbers :
-		<p>N°2004/1, N°2004/2, N°2004/3, N°2004/4, N°2005/1, N°2005/2, N°2005/3, N°2005/4, N°2006/1</p>
-		<p>
-			<b>Note:</b> when you add a subscription, Koha consider you already have done the order, or that you will do it soon. So, NO information is sent to the acquisition module. This is not the case when the subscription expires. In this case, a subscription renewal creates a "suggestion" that is sent to the acquisition module.
-		</p>
-
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/help/serials/subscription-detail.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/help/serials/subscription-detail.tmpl
diff -N htdocs/intranet-tmpl/default/en/help/serials/subscription-detail.tmpl
--- htdocs/intranet-tmpl/default/en/help/serials/subscription-detail.tmpl	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscription Detail<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-	<h1>Serials subscription detail help</h1>
-	In this screen, you can see subscription detail, and modify it if you need.
-	<ul>
-		<h2>Subscription information bloc</h2>
-		<p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
-		<h2>Planning information bloc</h2>
-		<p>it contains various information to calculate arrival dates.</p>
-		<h2>Subscription length</h2>
-		<p>one field in this bloc should be filled : the subscription length can be calculated in weeks, months or number of issues to recieve</p>
-		<h2>Numbering calculation</h2>
-		<p>The numbering of items recieved can contain complex formulas. The "numbering formula" can be filled with any text and/or numbers. 3 special tokens <b>{X} {Y}</b> and <b>{Z}</b> can be user to define the calculation formula. XYZ values are calculated with the following method:</p>
-			<ul>
-				<li>Add : the number here is added to XYZ</li>
-				<li>once every : the number before can be added on every issue or less often</li>
-				<li>When more than : if the calculated number is more than the value here</li>
-				<li>Set back to : if the previous condition is valid, the calculated number is set to this one instead</li>
-				<li>Last value / begins with : the last value calculated or the 1st value (when adding a subscription</li>
-			</ul>
-		<h2>Sample</h2>
-			Consider the formula <b>N°{X}/{Y}</b>. The following XYZ settings :
-			<li> <b>X</b> add <b>1</b> once every <b>4</b> times. When more than <b>9999999</b> set back to <b>empty</b>. Begins with <b>2004</b></li>
-			<li> <b>Y</b> add <b>1</b> once every <b>1</b> times. When more than <b>4</b> set back to <b>4</b>. Begins with <b>1</b></li>
-			will result in the following issues numbers :
-			<b>N°2004/1,N°2004/2,N°2004/3,N°2004/4,N°2005/1,N°2005/2,N°2005/3,N°2005/4,N°2006/1
-		<p>
-		</p>
-
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/import/breeding.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/import/breeding.tmpl
diff -N htdocs/intranet-tmpl/default/en/import/breeding.tmpl
--- htdocs/intranet-tmpl/default/en/import/breeding.tmpl	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,58 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC Import<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="acqui-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1>MARC acquisition system</h1>
-<h4>Import into the reservoir</h4>
-
-<!-- TMPL_IF name="uploadmarc" -->
-<p>Import results :</p>
-<ul>
-	<li><!-- TMPL_VAR name="imported" --> imported records</li>
-	<li><!-- TMPL_VAR name="alreadyindb" --> not imported because already in catalog</li>
-	<li><!-- TMPL_VAR name="alreadyinfarm" --> not imported because already in the reservoir</li>
-	<li><!-- TMPL_VAR name="notmarcrecord" --> not imported because they seem not to be in MARC format (or ISBN/ISSN missing) !</li>
-	<li><!-- TMPL_VAR name="total" -->  records parsed</li>
-	<li><a href="/cgi-bin/koha/admin-home.pl">Back</a></li>
-</ul>
-<!-- TMPL_ELSE -->
-<ul>
-	<li>Select a file to import into the reservoir. It will be parsed, and for each ISBN found, a new baby will be created in the reservoir.</li>
-	<li>If an ISBN already exists in the reservoir, you can choose whether to ignore the new one or overwrite the old one.</li>
-	<li>You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested MARC data comes from!</li>
-	<li>Of course, if the ISBN already exists in the active DB, the biblio will be ignored.</li>
-</ul>
-<form method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->" enctype="multipart/form-data">
-<div class="data"><table>
-	<tr>
-		<th><label for="uploadmarc">Select the file to import: </label></th>
-		<td>
-			<input type="file" id="uploadmarc" name="uploadmarc" /><br />
-		</td>
-	</tr>
-	<tr>
-		<th><label for="filename">Name of this import: </label></th>
-		<td>
-			<input type="text" id="filename" name="filename" />
-		</td>
-	</tr>
-	<tr>
-		<th><label for="syntax">Character encoding: </label></th>
-		<td>
-			<select name="syntax" id="syntax"><option value="MARC21">MARC21</option><option value="UNIMARC">UNIMARC</option></select>
-		</td>
-	</tr>
-	<tr>
-		<th rowspan="2">If ISBNi is already in the reservoir: </th>
-		<td><input type="radio" name="overwrite_biblio" value="0" checked="checked" />Ignore this one, keep the existing one</td></tr>
-<tr><td>
-			<input type="radio" name="overwrite_biblio" value="1" />Overwrite the existing one with this</td>
-	</tr>
-</table></div><input type="submit" value="Import" class="submit" />
-</form>
-<!-- /TMPL_IF -->
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/includes/acqui-full-topmenu.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/acqui-full-topmenu.inc
diff -N htdocs/intranet-tmpl/default/en/includes/acqui-full-topmenu.inc
--- htdocs/intranet-tmpl/default/en/includes/acqui-full-topmenu.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-<div id="topmenu"><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions Home</a> | <a href="/cgi-bin/koha/acqui/lateorders.pl">Late Orders</a> | <a href="/cgi-bin/koha/acqui/histsearch.pl">History Search</a></div>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/acqui-topmenu.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/acqui-topmenu.inc
diff -N htdocs/intranet-tmpl/default/en/includes/acqui-topmenu.inc
--- htdocs/intranet-tmpl/default/en/includes/acqui-topmenu.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-<div id="topmenu"><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging Home</a> | <a href="/cgi-bin/koha/tools/import.pl">MARC Import</a> | <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></div>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/acquisitions-bottom.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/acquisitions-bottom.inc
diff -N htdocs/intranet-tmpl/default/en/includes/acquisitions-bottom.inc
--- htdocs/intranet-tmpl/default/en/includes/acquisitions-bottom.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-</body>
-</html>

Index: htdocs/intranet-tmpl/default/en/includes/admin-topmenu.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/admin-topmenu.inc
diff -N htdocs/intranet-tmpl/default/en/includes/admin-topmenu.inc
--- htdocs/intranet-tmpl/default/en/includes/admin-topmenu.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-<div id="topmenu"><a href="/cgi-bin/koha/admin/admin-home.pl">System Administration Home</a> | <a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></div>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/alt_menu-serials.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/alt_menu-serials.inc
diff -N htdocs/intranet-tmpl/default/en/includes/alt_menu-serials.inc
--- htdocs/intranet-tmpl/default/en/includes/alt_menu-serials.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-    <p>
-         <a href="/cgi-bin/koha/serials/serials-home.pl">Search/Add Subscription</a>
-         <a href="/cgi-bin/koha/serials/serials-home.pl?routing=1">Create/Edit Routing List</a>
-         <a href="/cgi-bin/koha/serials/lateissues.pl">Outstanding Issues</a>
-	 <a href="/cgi-bin/koha/serials/claims.pl">Claims</a>
-    </p>

Index: htdocs/intranet-tmpl/default/en/includes/authorities-topmenu.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/authorities-topmenu.inc
diff -N htdocs/intranet-tmpl/default/en/includes/authorities-topmenu.inc
--- htdocs/intranet-tmpl/default/en/includes/authorities-topmenu.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-<script language="JavaScript" type="text/javascript">
-function Help() {
-	newin=window.open("/cgi-bin/koha/help.pl","",'width=600,height=600,toolbar=false,scrollbars=yes');
-}
-
-function addauthority() {
-	X = document.forms[0].authtype.value;
-	window.location="/cgi-bin/koha/authorities/authorities.pl?nonav=<!-- TMPL_VAR NAME="nonav" -->&index=<!-- TMPL_VAR NAME="index" -->&authtypecode="+X;
-}
-function searchauthority() {
-	X = document.forms[0].authtype2.value;
-	Y = document.forms[0].value.value;
-	window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=all";
-}
-</script>
-
-<div id="topmenu">
-	<form><input type="hidden" name="nonav" value="<!-- TMPL_VAR NAME="nonav" -->">
-	 <select name="authtype" id="authtype"><!-- TMPL_LOOP name="authtypesloop" --><option value="<!-- TMPL_VAR name="value" -->"<!-- TMPL_IF name="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR name="authtypetext" --></option><!-- /TMPL_LOOP --></select>
-	<input type="button" class="submit" value="Add Authority" onclick="addauthority(); return false;" /></form></div>

Index: htdocs/intranet-tmpl/default/en/includes/blank.css
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/blank.css
diff -N htdocs/intranet-tmpl/default/en/includes/blank.css
--- htdocs/intranet-tmpl/default/en/includes/blank.css	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,62 +0,0 @@
-a:link {
-	color : #000066;
-	text-decoration: none;
-}
-
-a:visited {
-	color : #000066;
-	text-decoration: none;
-}
-
-a:hover {
-	color : #993300;
-	text-decoration: none;
-}
-
-body {
-	background-color : #FFF;
-	font-size : 14px;
-	margin : 0px 0px 0px 0px;
-	padding : 0px;
-}
-
-caption {
-	color : #000000;
-	font-weight : bold;
-	margin-top : 5px;
-	text-align : left;
-}
-
-div.table {
-	font-weight: normal;
-}
-
-h3 {
-	color : #000000;
-	font-size : 14px;
-	font-weight : bold;
-	margin-bottom : 3px;
-	margin-top : 3px;
-}
-
-table {
-	border-collapse : collapse;
-	border : 0px solid #cccccc;
-
-}
-
-td, th {
-	border : 0px solid #cccccc;
-	padding : 2px;
-	}
-	
-th {
-	text-align : left;
-	}
-	
-
-#main {
-	background-color : #FFF;
-	border-left : 0px solid #CCCC99;
-	position : relative;
-}
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/borrcirculation-bottom.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/borrcirculation-bottom.inc
diff -N htdocs/intranet-tmpl/default/en/includes/borrcirculation-bottom.inc
--- htdocs/intranet-tmpl/default/en/includes/borrcirculation-bottom.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-<br clear="all">
-<p> &nbsp; </p>
-
-<div class="center">
-<a href="/cgi-bin/koha/mainpage.pl">Home</a> ||
-<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a> ||
-<a href="/cgi-bin/koha/members/members-home.pl">Users</a> ||
-<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
-<a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> ||
-<a href="/cgi-bin/koha/reports-home.pl">Reports</a> ||
-<a href="/cgi-bin/koha/admin-home.pl">Parameters</a> ||
-<a href="/cgi-bin/koha/about.pl">About</a> || 
-<a href="javascript: Help('circulation-hlp')">Help</a>
-</div>
-<script language="JavaScript" type="text/javascript">
-	document.getElementById('barcode').focus();
-</script>
-</body>
-</html>

Index: htdocs/intranet-tmpl/default/en/includes/borrcirculation-top.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/borrcirculation-top.inc
diff -N htdocs/intranet-tmpl/default/en/includes/borrcirculation-top.inc
--- htdocs/intranet-tmpl/default/en/includes/borrcirculation-top.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,384 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-<title>KOHA: INTRANET: Circulation</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="CACHE-CONTROL" content="NO-CACHE">
-
-<link rel="stylesheet" type="text/css" href='<!-- TMPL_VAR name="themelang" -->/includes/common-style.css'>
-<link rel="stylesheet" type="text/css" href='<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css'/>
-
-<!-- *********** This links are to manage the calendar. *********** -->
-<script type="text/javascript" src='<!-- TMPL_VAR NAME="themelang" -->/includes/calendar/calendar.js'></script>
-<script type="text/javascript" src='<!-- TMPL_VAR NAME="themelang" -->/includes/calendar/calendar-es.js'></script>
-<script type="text/javascript" src='<!-- TMPL_VAR NAME="themelang" -->/includes/calendar/calendar-setup.js'></script>
-<!-- ************************************************************** -->
-
-<script language="JavaScript" type="text/javascript">
-	/* Devuelve true si el explorador es Internet Explorer */
-	var IE = document.all?true:false;
-
-	/* Pop up windows handlers and control variables */
-	var issueWindow;
-	var issuecount = <!-- TMPL_VAR NAME="ISSUECOUNT" -->;
-	var currentCount = <!-- TMPL_VAR NAME="CURRENTCOUNT" -->;
-	var todayIssuesWindow;
-	var currentIssuesWindow;
-
-	/* gives the main window a name */
-	window.name = "main";
-
-	/* Declare an array to store the last issues */
-	var issuedBarcodes = new Array();
-
-	// Captura el evento onkeypress para cualquier navegador
-	if (document.layers) { // Netscape
-		document.captureEvents(Event.KEYDOWN);
-	    document.onkeydown = captureShortKey;
-		document.captureEvents(Event.MOUSEMOVE);
-	    document.onmousemove = captureMousePosition;
-	} else if (document.all) { // Internet Explorer
-	    document.onkeydown = captureShortKey;
-	    document.onmousemove = captureMousePosition;
-	} else if (document.getElementById) { // Netcsape 6
-	    document.onkeydown = captureShortKey;
-	    document.onmousemove = captureMousePosition;
-	}
-
-	function captureShortKey(e) {
-		if (IE) {
-			if (event.ctrlKey) { 
-				switch(event.keyCode) {
-				    case 50: {
-							   openQuickSearch()
-							   break;
-							  }
-					case 52: { 
-							   if (document.getElementById('internalloan').checked) {	
-								   document.getElementById('internalloan').checked = false; 
-                               } else {
-								   document.getElementById('internalloan').checked = true;
-							   }
-							   break;
-							  }
-					case 53: { 
-							   window.location.href = "/cgi-bin/koha/circ/returns.pl"; 
-							   break;
-							  }
-					case 54: {
-								showCurrentIssuesWindow();
-								currentIssuesWindow.focus();
-								break;
-							  }
-					case 55: { 
-								sendBarcodesToPrint();
-								break;
-							  }	
-					case 56: {
-								showTodayIssuesWindow();
-								todayIssuesWindow.focus(); 
-								break;
-							  }
-					case 57: {
-							   window.location.href = "/cgi-bin/koha/circ/circulation.pl"; 
-							   break;
-							  }
-				}
-			}			
-		} else {
-			if (e.ctrlKey) { 
-				switch(e.keyCode) {
-				    case 50: {
-							   openQuickSearch()
-							   break;
-							  }
-					case 52: { 
-							   if (document.getElementById('internalloan').checked) {	
-								   document.getElementById('internalloan').checked = false; 
-                               } else {
-								   document.getElementById('internalloan').checked = true;
-							   }
-							   break;
-							  }
-					case 53: { 
-							    window.location.href = "/cgi-bin/koha/circ/returns.pl"; 
-							    break;
-							  }
-					case 54: {
-								showCurrentIssuesWindow();
-								currentIssuesWindow.focus();
-								break;
-							  }
-					case 55: { 
-								sendBarcodesToPrint();
-								break;
-							  }	
-					case 56: {
-								showTodayIssuesWindow();
-								todayIssuesWindow.focus(); 
-								break;
-							  }
-					case 57: {
-							   window.location.href = "/cgi-bin/koha/circ/circulation.pl"; 
-							   break;
-							  }
-				}			
-			}
-		}
-	}
-
-	function closeAll() {
-		issueWindow.close();		
-		todayIssuesWindow.close();
-		currentIssuesWindow.close();
-	}
-
-	/* Add a barcode to the barcodes array */
-	function addBarcode(aBarcode) {
-		issuedBarcodes[issuedBarcodes.length] = aBarcode;
-	}
-
-	/* Returns true if the barcode is stored into the barcodes array */
-	function isLastIssue(aBarcode) {
-		var ok = false;
-		var i = 0;
-		while ((!(ok)) && (i < issuedBarcodes.length)) {
-			if (issuedBarcodes[i] == aBarcode) {
-				ok = true;
-			}
-			i++;
-		}
-		return ok;
-	}
-
-	/* Empty the barcodes array */
-	function emptyBarcodes() {
-		issuedBarcodes = new Array();
-	}
-
-	/* Returns an array with the last issues. */
-	function lastIssues() {
-		return issuedBarcodes;
-	}
-
-	/* Send the barcodes array to print */
-	function sendBarcodesToPrint() {
-		if (issuedBarcodes.length == 0) {
-			alert("There are no issues without printed circulation proof.");
-		} else {
-			var barcodes = issuedBarcodes.join("::");
-			emptyBarcodes();
-			window.open('/cgi-bin/koha/circ/print-todayissues.pl?hiddenBarcodes=' + barcodes + ';borrowernumber=<!-- TMPL_VAR NAME="BORROWERNUMBER" -->', 'PrintIssues');
-		}
-	}
-
-	function showIssueItemWindow(aForm) {
-		if (!window.focus) {
-			return true;
-		} else {
-			issueWindow = window.open('', 'issueWindow', 'width=600,height=400,toolbar=false,scrollbars=yes,resizable=no');
-			aForm.target = 'issueWindow';
-			return true;	
-		}
-	}
-
-	function issueReserve(barcode, borrowernumber, reserveID) {
-
-		var issueForm = document.getElementById('issueItemForm');
-		issueForm.barcode.value = barcode;
-		issueForm.reserveid.value = reserveID;
-		issueForm.action = '/cgi-bin/koha/circ/borrowercirculation.pl';
-//		issueWindow = window.open('', 'issueWindow', 'width=600,height=400,toolbar=false,scrollbars=yes,resizable=no');
-//		issueForm.target = 'issueWindow';
-		issueForm.submit();
-	}
-
-	function refreshReserveTable(reserveID) {
-		var reservePanel = document.getElementById('reserve_row');
-		var reserveTable = document.getElementById('reserve_table');
-		var reserveRow = document.getElementById(reserveID);
-		reserveTable.tBodies[0].removeChild(reserveRow);
-		if (reserveTable.tBodies[0].rows.length == 1) {
-			var mainTable = document.getElementById('mainTable');
-			mainTable.tBodies[0].removeChild(reservePanel);
-		}
-	}
-
-	function showTodayIssuesWindow() {
-		todayIssuesWindow = window.open('/cgi-bin/koha/circ/todayissues.pl?borrowernumber=<!-- TMPL_VAR NAME="BORROWERNUMBER" -->', 'Prestamos',"height=480,width=640,scrollbars,resizable=no,left=" + ((mouseXMax/2) - 320) + ",top=" + ((mouseYMax/2) - 240));
-        todayIssuesWindow.focus();
-	}
-
-	function showCurrentIssuesWindow() {
-		currentIssuesWindow = window.open('/cgi-bin/koha/circ/currentissues.pl?borrowernumber=<!-- TMPL_VAR NAME="BORROWERNUMBER" -->', 'PrestamosTotales',"height=480,width=640,scrollbars,resizable=no,left=" + ((mouseXMax/2) - 320) + ",top=" + ((mouseYMax/2) - 240));
-        currentIssuesWindow.focus();
-	}
-
-	function refreshIssueCount() {
-		var issueCountObj = document.getElementById('issueCount');
-		var currentIssuesObj = document.getElementById('currentIssues');
-		issuecount = issuecount + 1;
-		currentCount = currentCount + 1;
-		var newIssueCountText = document.createTextNode(issuecount + "");		
-		issueCountObj.removeChild(issueCountObj.firstChild);
-		issueCountObj.appendChild(newIssueCountText);
-		var newCurrentIssueCountText = document.createTextNode(currentCount + "");		
-		currentIssuesObj.removeChild(currentIssuesObj.firstChild);
-		currentIssuesObj.appendChild(newCurrentIssueCountText);	
-	}
-
-	function cleanBarcodeField() {
-		document.getElementById('barcode').value = "";
-	}
-
-	function Help(tmpl) {
-		var hlpwin = window.open("/cgi-bin/koha/help/intranet-help.pl?help_template=" + tmpl,"Ayuda",'width=600,height=450,resizable=yes,toolbar=false,scrollbars=1');
-        hlpwin.focus();
-	}
-
-	function showHideItems(imageObj, panelID) {
-		var panel = document.getElementById(panelID);
-		if (panel.style.display == 'none') {
-			imageObj.src = '<!-- TMPL_VAR NAME="themelang" -->/images/' + 'less.gif'; 
-			panel.style.display = 'inline';
-		} else {
-			imageObj.src = '<!-- TMPL_VAR NAME="themelang" -->/images/' + 'more.gif';
-			panel.style.display = 'none';
-		}
-	}
-
-	function select_borrower() {
-		var list = document.getElementById('borrowerList');
-		if (list.selectedIndex == -1) {
-			alert("Select a user from the list.");
-			return false;
-		} else {
-			return true;
-		}
-	}
-
-	function openWindow(targeturl, windowname) {
-		newwin = window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
-	}
-
-	function setFocus() {
-		document.getElementById('barcode').focus();
-	}
-
-	function showNote(formID) {
-		var panel = document.getElementById(formID);
-		panel.style.display = 'inline';
-		panel.style.top = mouseY;
-	    panel.style.left = mouseX - 250;
-	}
-
-	function hideNote(formID) {
-		var panel = document.getElementById(formID);
-		panel.style.display = "none";
-	}
-
-	var mouseXMax = 0;
-	var mouseYMax = 0;
-	var mouseX = 0;
-	var mouseY = 0;
-	function captureMousePosition(e) {
-	    if (document.layers) {
-		    mouseX = e.pageX;
-			mouseY = e.pageY;
-	        mouseXMax = window.innerWidth + window.pageXOffset;
-		    mouseYMax = window.innerHeight + window.pageYOffset;
-	    } else if (document.all) {
-		    mouseX = window.event.x + document.body.scrollLeft;
-	        mouseY = window.event.y + document.body.scrollTop;
-	        mouseXMax = document.body.clientWidth + document.body.scrollLeft;
-	        mouseYMax = document.body.clientHeight + document.body.scrollTop;
-	    } else if (document.getElementById) {
-	        mouseX = e.pageX;
-		    mouseY = e.pageY;
-	        mouseXMax = window.innerWidth + window.pageXOffset;
-	        mouseYMax = window.innerHeight + window.pageYOffset;
-	    }
-//		window.status = "mouseX=" + mouseX + ", mouseY=" + mouseY + ", mouseXMax=" + mouseXMax + ", mouseYMax=" + mouseYMax;
-	}
-
-
-	/* Creates all the structures to deal with all diferents kinds of holidays */
-	var week_days = new Array();
-	var holidays = new Array();
-	var exception_holidays = new Array();
-	var day_month_holidays = new Array();
-
-	<!-- TMPL_LOOP NAME="WEEK_DAYS_LOOP" -->
-		week_days['<!-- TMPL_VAR NAME="KEY" -->'] = {title:'<!-- TMPL_VAR NAME="TITLE" -->', 
-													 description:'<!-- TMPL_VAR NAME="DESCRIPTION" -->'};
-	<!-- /TMPL_LOOP -->
-	<!-- TMPL_LOOP NAME="HOLIDAYS_LOOP" -->
-		holidays['<!-- TMPL_VAR NAME="KEY" -->'] = {title:'<!-- TMPL_VAR NAME="TITLE" -->', 
-													description:'<!-- TMPL_VAR NAME="DESCRIPTION" -->'};
-	<!-- /TMPL_LOOP -->
-	<!-- TMPL_LOOP NAME="EXCEPTION_HOLIDAYS_LOOP" -->
-		exception_holidays['<!-- TMPL_VAR NAME="KEY" -->'] = {title:'<!-- TMPL_VAR NAME="TITLE" -->', 
-															  description:'<!-- TMPL_VAR NAME="DESCRIPTION" -->'};
-	<!-- /TMPL_LOOP -->
-	<!-- TMPL_LOOP NAME="DAY_MONTH_HOLIDAYS_LOOP" -->
-		day_month_holidays['<!-- TMPL_VAR NAME="KEY" -->'] = {title:'<!-- TMPL_VAR NAME="TITLE" -->',
-															  description:'<!-- TMPL_VAR NAME="DESCRIPTION" -->'};
-	<!-- /TMPL_LOOP -->
-
-	var dateToday = new Date();
-	var dayToday = dateToday.getDate();
-	var monthToday = dateToday.getMonth() + 1;
-	var yearToday = dateToday.getFullYear();
-
-
-	function openQuickSearch() {
-	    var qs_window = window.open('/cgi-bin/koha/circ/quicksearch.pl','_blanck','height=325,width=550,status=yes,toolbar=no,menubar=no,location=no,resizable=yes,scrollbars=yes,top=100,left=100');
-        qs_window.focus();
-	
-	}
-</script>
-
-<style type="text/css">
-.circulation {
-	background-color: #be6170;
-	color:#FFFFFF;
-	background-image:none;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-a.circulation:hover {
-	background-color: #be6170;
-	color: #FFFFFF;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-.circulation-reserves {
-	background-color: #BE619E;
-	color:#FFFFFF;
-	background-image:none;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-</style>
-</head>
-
-<body onload="javascript: setFocus()" onunload="javascript: closeAll()"
-      onkeydown="javascript: captureShortKey()">
-
-<!-- MENUS -->
-<div id="menubar">
-	<span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
-	<a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a> <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> <a class="members" href="/cgi-bin/koha/members/members-home.pl">Users</a> <!-- <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Autoridades</a> --> <a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a> <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameters</a> <a class="about" href="/cgi-bin/koha/about.pl">About</a>
-</div>
-<div id="submenu">
-	<span class="koha">Options &gt;&gt;&nbsp;&nbsp;</span>
-	<a href="/cgi-bin/koha/circ/circulation.pl" class="submenu">Issues</a> <a href="/cgi-bin/koha/circ/returns.pl" class="submenu2">Returns</a> <a href="/cgi-bin/koha/circ/branchtransfers.pl" class="submenu">Library Transfers</a>
-    <a class="submenu" href="javascript: Help('circulation-hlp')">Help</a>
-</div>
-
-<!-- TMPL_IF NAME="loggedinusername" -->
-    <p align="left">Administrator: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log out</a>]</p>
-<!-- TMPL_ELSE -->
-    <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log in</a> to Koha</p>
-<!-- /TMPL_IF -->

Index: htdocs/intranet-tmpl/default/en/includes/circ-topmenu.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/circ-topmenu.inc
diff -N htdocs/intranet-tmpl/default/en/includes/circ-topmenu.inc
--- htdocs/intranet-tmpl/default/en/includes/circ-topmenu.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-<div id="topmenu"><a class="button" href="circulation.pl?borrnumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;branch=<!-- TMPL_VAR name="branch" -->&amp;printer=<!-- TMPL_VAR name="printer" -->&amp;print=yes">
-				Circulation Home</a> | <a class="button" href="returns.pl">
-				Returns</a> | <a class="button" href="branchtransfers.pl">
-				Transfers</a> | <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
-
-</form></div>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/colors.css
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/colors.css
diff -N htdocs/intranet-tmpl/default/en/includes/colors.css
--- htdocs/intranet-tmpl/default/en/includes/colors.css	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,437 +0,0 @@
-a:hover {
-	color : #009933;
-}
-
-a.delete {
-	background-color : #CC3300;
-	color : #CCCCCC;
-}
-
-a.delete:hover {
-	background-color : #999999;
-	color : #CCCCCC;
-}
-
-a.edit {
-	background-color : Gray;
-	color : #330099;
-}
-
-a.edit:hover {
-	background-color : #CCCCCC;
-	color : #444444;
-}
-
-a:link, a:visited {
-	color : #330099;
-}
-
-a.current:link {
-	background-color : transparent;
-	color : #330099;
-}
-
-a.nav:link, a.nav:visited {
-	background-color : #FAFAFA;
-	color : #3366CC;
-}
-
-a.pages:link, a.pages:visited {
-	background-color : #E6E6E6;
-	color : #330099;
-}
-
-a.current:visited, a.current:link, a.current:visited {
-	background-color : transparent;
-	color : #330099;
-}
-
-a.current:hover, a.nav:hover, a.pages:hover {
-	background-color : #CCFF00;
-}
-
-a.nav:active, a.current:active {
-	background-color : #99CC00;
-	color : #FFFF99;
-}
-
-a:active.pages {
-	background-color : #99CC00;
-	color : #FFFF99;
-}
-
-body {
-	background-color : #FFFFFF;
-	color : #000000;
-}
-
-div#help .loggedin a {
-	background-color : transparent;
-	color : #6666CC;
-	text-decoration : underline;
-}
-
-div#help .loggedin, #topmenu {
-	color : #666699;
-}
-
-div#help .loggedinusername {
-	color : #7EABD6;
-}
-
-div#help a {
-	background-color : transparent;
-	color : #6666CC;
-}
-
-div.compact th {
-	border-bottom : 1px solid #666666;
-	border-left : 1px solid #D9D9D9;
-	border-right : 1px solid #666666;
-	border-top : 0px;
-}
-
-div.data table col, div.data-main table col {
-	background-color : #CCCCCC;
-}
-
-div.data table td, div.data-main table td {
-	background-color : #E6E6E6;
-	border-bottom : 1px solid #B2B2B2;
-	border-right : 1px solid #B2B2B2;
-}
-
-div.data table th, div.data-main table th {
-	background-color : #D9D9D9;
-	border-bottom : 1px solid #B2B2B2;
-	border-left : 1px solid #666666;
-	border-right : 1px solid #B2B2B2;
-}
-
-div.data table, div.data-main table, div.tabitem li a.here, #submenu {
-	background-color : #CBCBCB;
-}
-
-div.data-main table td, div.data {
-	background-color : #F0F0F0;
-}
-
-table tr.highlight td {
-	background-color : #FAFAFA;
-}
-
-div.data-main table th, td.onissue, table.editing tr:hover td {
-	background-color : #E4E4E4;
-}
-
-div.details {
-	border-bottom : 1px solid #666666;
-}
-
-div.details dt {
-	border-bottom : 1px solid #CBCBCB;
-}
-
-div.details td, div.form td, div.compact td {
-	border-bottom : 1px solid #D9D9D9;
-	border-left : 1px solid #D9D9D9;
-}
-
-div.error .cancel {
-	background-color : #CC3300;
-}
-
-div.error h3 {
-	color : #990000;
-}
-
-div.error, div.notice {
-	background-color : #FFFF99;
-	border : 1px dashed #CC3300;
-}
-
-div.help {
-	background-color : #D9D9D9;
-	border : 0;
-}
-
-div.help h3 {
-	background-color : #E6E6E6;
-	border-bottom : #B2B2B2;
-}
-
-div.items td {
-	border-bottom : 1px solid #D9D9D9;
-	border-left : 1px solid #D9D9D9;
-	border-right : 1px solid #D9D9D9;
-	border-top : 1px solid #D9D9D9;
-}
-
-div.items th {
-	background-color : #E6E6E6;
-	border-bottom : 1px solid #D9D9D9;
-	border-left : 1px solid #D9D9D9;
-	border-right : 0px;
-	border-top : 1px solid #D9D9D9;
-	color : #444444;
-}
-
-div.members th {
-	background-color : #E6E6E6;
-	border-bottom : 1px solid #D9D9D9;
-	border-right : 1px solid #D9D9D9;
-}
-
-div.menu th {
-	background-color : #E6E6E6;
-	border-bottom : 1px solid #D9D9D9;
-	border-left : 1px solid #D9D9D9;
-}
-
-div.tabitem ul li {
-	border-right : 1px solid #4C4C4C;
-}
-
-form.compact input {
-	color : #FFFFFF;
-}
-
-h3.alert {
-	background-color : #FFFF99;
-	color : #CC3300;
-}
-
-h3.title, h4.subtitle, h5.author {
-	background-color : #E6E6E6;
-}
-
-input.focus {
-	background-color : #FFFFFF;
-	border-bottom : 2px dashed #33cc00;
-}
-
-input.unfocus {
-	background-color : #FFFFFF;
-}
-
-label.required:after, sup, div.members label.focus {
-	color : #666666;
-}
-
-table {
-	background-color : #E6E6E6;
-	border-bottom : 0px solid #000000;
-	border-left : 0px solid #000000;
-}
-
-table.marc td.label {
-	color : #000000;
-}
-
-table.marc th, #submenu dl, tfoot, div.tabitem li a, tr.highlight td.onissue {
-	background-color : #D9D9D9;
-}
-
-td {
-	border-bottom : 1px solid #CCCCCC;
-	border-right : 1px solid #CCCCCC;
-}
-
-td fieldset {
-	border : 1px solid #CCCCCC;
-}
-
-td input.delete {
-	background-color : #cc3300;
-	border : 1px outset #B2B2B2;
-	color : #E6E6E6;
-}
-
-td input.submit {
-	border : 1px outset #B2B2B2;
-	color : #E6E6E6;
-}
-
-td input.submit:active, td input.delete:active {
-	border : 1px inset #B2B2B2;
-}
-
-td.debit {
-	color : #4C4C4C;
-}
-
-td.input, div.form td, div.details td {
-	border-bottom : 1px solid #D9D9D9;
-	border-left : 0px;
-	border-right : 0px;
-	color : #000000;
-}
-
-td.label, .form dt {
-	border-bottom : 1px solid #D9D9D9;
-	border-left : 1px solid #D9D9D9;
-	color : #444444;
-}
-
-td.label, div.form th, div.details th {
-	background-color : #E6E6E6;
-	border-bottom : 1px solid #D9D9D9;
-	border-left : 1px solid #D9D9D9;
-	border-right : 0px;
-	border-top : 0px;
-	color : #444444;
-}
-
-td:last-child {
-	border-bottom : 1px solid #D9D9D9;
-	border-right : 0px solid #D9D9D9;
-}
-
-tfoot td, tfoot td:last-child {
-	border-bottom : 1px solid #4C4C4C;
-	border-right : 1px solid #4C4C4C;
-}
-
-th {
-	background-color : #CCCCCC;
-	border-bottom : 1px solid #000000;
-	border-right : 1px solid #000000;
-}
-
-th:last-child {
-	border-right : 0;
-}
-
-tr.highlight, td.highlight, table.marc td.data {
-	background-color : #FFFFFF;
-}
-
-.cancel {
-	background-color : #CC3300;
-	color : #FFFFCC;
-}
-
-.current {
-	background-color : #FFFFFF;
-	color : Gray;
-}
-
-.error, .overdue {
-	color : #CC3300;
-}
-
-.form dd {
-	border-bottom : 1px solid #D9D9D9;
-	color : #000000;
-}
-
-.submit {
-	background-color : #6699CC;
-	color : White;
-}
-
-#auth table td, #auth table th {
-	background-color : #D9D9D9;
-	border-bottom : 0px solid #666666;
-	border-left : 0px solid #FFFFFF;
-	border-right : 0px solid #666666;
-	border-top : 0px solid #FFFFFF;
-}
-
-#auth table td {
-	background-color: #E4E4E4;
-}
-
-#main, #main-compact {
-	background-color : #FFFFFF;
-	border-left : 1px solid #E6E6E6;
-}
-
-#menu dd {
-	border-bottom : 1px dashed #CBCBCB;
-	border-left : 1px dashed #CBCBCB;
-	border-right : 0px solid #000000;
-	border-top : 0px solid #000000;
-}
-
-#menu dt {
-	background-color : #FFFFFF;
-	border-bottom : 1px solid #CBCBCB;
-	border-left : 0px solid #CBCBCB;
-	border-right : 0px solid #000000;
-	border-top : 0px solid #000000;
-	color : #333333;
-}
-
-#menu, div#controls form, div.form, div.details, div.items, div.tabitem li a:hover, table.marc {
-	background-color : #F0F0F0;
-}
-
-#nav {
-	background-color : #B2B2B2;
-}
-
-#nav ul li {
-	background-color : #CBCBCB;
-	border-bottom : 1px solid #E6E6E6;
-	border-left : 0px solid #E6E6E6;
-	border-right : 0px solid #4C4C4C;
-	border-top : 0px solid #E6E6E6;
-}
-
-#nav ul li a:hover {
-	color : #009933;
-}
-
-#nav ul li+li {
-	border-bottom : 1px solid #E6E6E6;
-	border-left : 0px solid #E6E6E6;
-	border-right : 0px solid #4C4C4C;
-}
-
-#nav ul ul li {
-	background-color : #E4E4E4;
-	border-bottom : 1px solid #B2B2B2;
-	border-left : 0px solid #E6E6E6;
-	border-right : 0px solid #4C4C4C;
-	border-top : 0px solid #E6E6E6;
-}
-
-#nav ul ul li+li {
-	border-bottom : 1px solid #B2B2B2;
-	border-left : 0px solid #E6E6E6;
-	border-right : 0px solid #4C4C4C;
-}
-
-#nav #circ {
-	background-color : #C8EEF7;
-}
-
-#nav #patrons {
-	background-color : #D1ECE5;
-}
-
-#nav #catalog {
-	background-color : #E6FBF3;
-}
-
-#nav #cataloging {
-	background-color : #E4F3FB;
-}
-
-#nav #admin {
-	background-color : #C8EEF7;
-}
-
-#notes img {
-	border: 1px solid #CCCCCC;
-}
-
-
-#results, .results, caption, h1, h2, h3, h4, h5, h6 {
-	color : #000066;
-}
-
-#topmenu .submit, #nav .submit {
-	background-color : #7EABD6;
-}

Index: htdocs/intranet-tmpl/default/en/includes/common.js.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/common.js.inc
diff -N htdocs/intranet-tmpl/default/en/includes/common.js.inc
--- htdocs/intranet-tmpl/default/en/includes/common.js.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,52 +0,0 @@
-<script language="javascript" type="text/javascript">
-function Help() {
-	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
-}
-
-function openWindow(targeturl, windowname) {
-	newwin =
-	window.open(targeturl,windowname,'height=480,width=640,scrollbars,resizable');
-}
- 
- 	var newwin;
-	
-	// Open the popup window if it doesn't already exist and give it focus.
-	function PopWin(targeturl, windowname) {
-	
-		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400,scrollbars=yes,resizable=yes");
-	  newwin.focus();
-	}
-	
-  // Set the value of the form field to the passed value and optionally shift
-	// focus and close the popup.
-	function FillForm(val,formname,formfield) {
-	
-		document.forms[formname].elements[formfield].value = val;
-
-		// Uncomment below to shift focus after clicking link in popup.
-		document.forms[formname].elements[formfield].focus();
-		
-		// Uncomment below to close popup after clicking link.
-		newwin.close();
-	}
-
-// http://www.oreillynet.com/pub/a/javascript/2003/10/21/amazonhacks.html
-function verify_images() {
-    for (var i = 0; i < document.images.length; i++) {
-        img = document.images[i];
-        if ((img.src.indexOf('images') >= 0)) {
-			w = img.width;
-            h = img.height;
-     if ((w == 0) && (h == 0) || ((img.complete != null) && (!img.complete))) {
-               img.src = '<!-- TMPL_VAR NAME='themelang' -->/images/patron-blank.png';
-			}
-        }
-    }
-}
-
-function mainfocus() {
-		if(document.forms['mainform']){
-			document.forms['mainform'].elements[0].focus();
-		}
-	}
-</script>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/dictionary-bottom.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/dictionary-bottom.inc
diff -N htdocs/intranet-tmpl/default/en/includes/dictionary-bottom.inc
--- htdocs/intranet-tmpl/default/en/includes/dictionary-bottom.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-</BODY>
-</HTML>

Index: htdocs/intranet-tmpl/default/en/includes/dictionary-top.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/dictionary-top.inc
diff -N htdocs/intranet-tmpl/default/en/includes/dictionary-top.inc
--- htdocs/intranet-tmpl/default/en/includes/dictionary-top.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-	<HEAD>
-	    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-	    <link rel="stylesheet" type="text/css" href='<!-- TMPL_VAR name="themelang"-->/includes/common-style.css'/>
-		<TITLE>Dictionary</TITLE>
-		<script type="text/javascript" language="javascript">
-		    function selectEntry(target) {
-		        
-		        if (document.dicc_form.dicc_entry.selectedIndex != -1) {
- 					target.value = document.dicc_form.dicc_entry.value;
-					window.close();
-		        } else {
-					alert("Select an option.")
-				}
-		    }
-        </script>
-	</HEAD>
-	<BODY>
-	

Index: htdocs/intranet-tmpl/default/en/includes/doc-head-barcodes-close.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/doc-head-barcodes-close.inc
diff -N htdocs/intranet-tmpl/default/en/includes/doc-head-barcodes-close.inc
--- htdocs/intranet-tmpl/default/en/includes/doc-head-barcodes-close.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,205 +0,0 @@
-</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
-<style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
-</style>
-<style>
-.parameters {
-	background-color: #86c268;
-	color: #FFFFFF;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-a.parameters:hover {
-	background-color: #86c268;
-	color: #FFFFFF;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-.ranges {
-	border:0;
-}
-
-.myTable TD{
-  border-width: 0px;
-  border-color: navy;
-  border-style: solid;
-}
-
-.panel { 
-	position:relative;
-}
-
-.countryPanel {
-	z-index:1;
-	width:300px;
-	display:none;
-	border:1px solid #000000;
-	padding:0px;
-}
-</style>
-
-
-<script type="text/javascript">
-	// Captura el evento onmousemove para cualquier navegador
-	if (document.layers) { // Netscape
-		document.captureEvents(Event.MOUSEMOVE);
-	    document.onmousemove = captureMousePosition;
-	} else if (document.all) { // Internet Explorer
-	    document.onmousemove = captureMousePosition;
-	} else if (document.getElementById) { // Netcsape 6
-	    document.onmousemove = captureMousePosition;
-	}
-
-	var mouseXMax = 0;
-	var mouseYMax = 0;
-	var mouseX = 0;
-	var mouseY = 0;
-
-	function captureMousePosition(e) {
-	    if (document.layers) {
-		    mouseX = e.pageX;
-			mouseY = e.pageY;
-	        mouseXMax = window.innerWidth + window.pageXOffset;
-		    mouseYMax = window.innerHeight + window.pageYOffset;
-	    } else if (document.all) {
-		    mouseX = window.event.x + document.body.scrollLeft;
-	        mouseY = window.event.y + document.body.scrollTop;
-	        mouseXMax = document.body.clientWidth + document.body.scrollLeft;
-	        mouseYMax = document.body.clientHeight + document.body.scrollTop;
-	    } else if (document.getElementById) {
-	        mouseX = e.pageX;
-		    mouseY = e.pageY;
-	        mouseXMax = window.innerWidth + window.pageXOffset;
-	        mouseYMax = window.innerHeight + window.pageYOffset;
-	    }
-	}
-
-/* Devuelve true si el explorador es Internet Explorer */
-var IE = document.all?true:false;
-
-function Help() {
-	newin=window.open("/cgi-bin/koha/help.pl","",'width=600,height=600,toolbar=false,scrollbars=yes');
-}
-
-function correctRange (from, to) {
-	if (from <= to) {
-		return true;
-	} else {
-		return false;
-	}
-}
-
-function emptyField (field) {
-	if ((field == null) || (field == "")) {
-		return true;
-	} else {
-		return false;
-	}
-}
-
-function checkFields (aForm) {
-  var option = document.getElementById('rangeType').value;
-  if ((option == 'continuous2') || (option == 'continuous')) {
-	if (emptyField(aForm.from.value) || emptyField(aForm.to.value)) {
-		alert("Please, complete all fields");
-	    return false;
-	} else {
-		if (correctRange(aForm.from.value, aForm.to.value)) {
-			return true;			
-		} else {
-			alert("The selected range is not correct");
-			return false;
-		}
-	}
-  } else {
-	var codeCount = document.getElementById('inventaryList').options.length;
-	if (codeCount == 0) {
-		alert("Please, complete all fields"); 
-	    return false;
-	} else {
-		var inventaryList = document.getElementById('inventaryList');
-		var allCodes = '';
-	  	for (i = 0; i <= inventaryList.options.length - 1; i++) {
-			allCodes = allCodes + "'" + inventaryList.options[i].text + "',";
-	  	}
-  		allCodes = '(' + allCodes.substr(0, allCodes.length - 1) + ')';
-	  	document.getElementById('individualCodes').value = allCodes;
-	    return true;
-	}
-  }
-}
-
-function changeRange(selectBox) {
-	var option = selectBox.value;
-	var panel = document.getElementById(option);
-	
-	if  ((option == 'continuous2') || (option == 'continuous')) {
-		document.getElementById('continuous').style.display = 'inline';
-		document.getElementById('inventaryList').options.length = 0;
-		document.getElementById('individuals').style.display = 'none';
-		document.getElementById('individualCodes').value = "";
-		
-	} else {
-		document.getElementById('individuals').style.display = 'inline';
-		document.getElementById('from').value = "";
-		document.getElementById('to').value = "";
-		document.getElementById('continuous').style.display = 'none';
-		
-	}
-}
-
-function itemExists(code, list) {
-  var ok = false;
-  var listLength = list.length - 1;
-  var count = 0;
-  while (!(ok) && (count <= listLength)) {
-	if (code == list[count].value) {
-	  ok = true;
-	}
-	count = count + 1;
-  }
-  return ok;	
-}
-
-function addItem() {
-  var codeObject = document.getElementById('inventaryCode');
-  var inventaryCode = document.getElementById('inventaryCode').value;
-  var inventaryList = document.getElementById('inventaryList');
-  if (inventaryCode == "") {
-    alert('You can´t add an empty code.');
-  } else {
-    if (itemExists(inventaryCode, inventaryList.options)) {
-	  codeObject.value = "";
-  	  alert("The code is already included."); 
-    } else {  	
-	  var optionObject = new Option(inventaryCode, inventaryCode);
-  	   if (!IE) {
-	     inventaryList.add(optionObject, inventaryList.options[inventaryList.options.length]); 
-      } else {
-	    inventaryList.add(optionObject, inventaryList.options.length);
-	  }
-      codeObject.value = "";
-    }
-  }	
-}
-
-function removeItem() {
-  var inventaryList = document.getElementById('inventaryList');
-  if (inventaryList.selectedIndex == -1) {
-  	alert('You have to select a code first.');
-  } else {
-  	inventaryList.options[inventaryList.selectedIndex] = null;
-  }
-}
-
-	function addCountryCode() {
-		var panel = document.getElementById('addCountryCode');
-		panel.style.display = 'inline';
-		panel.style.top = mouseY;
-		panel.style.left = mouseX;
-	}
-</script>
-</head>
-<body onload="javascript: changeRange(document.getElementById('rangeType'))">
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/doc-head-circ-close.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/doc-head-circ-close.inc
diff -N htdocs/intranet-tmpl/default/en/includes/doc-head-circ-close.inc
--- htdocs/intranet-tmpl/default/en/includes/doc-head-circ-close.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
-<style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
-</style>
-<script language="JavaScript" type="text/javascript">
-<!-- Hide from old browsers
-function Help() {
-	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
-}
-function openWindow(targeturl, windowname) {
-	newwin =
-	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
-}
- 
- 	var newwin;
-	
-	// Open the popup window if it doesn't already exist and give it focus.
-	function PopWin(targeturl, windowname) {
-	
-		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400,scrollbars=yes,resizable=yes");
-	  newwin.focus();
-	}
-	
-  // Set the value of the form field to the passed value and optionally shift
-	// focus and close the popup.
-	function FillForm(val,formname,formfield) {
-	
-		document.forms[formname].elements[formfield].value = val;
-
-		// Uncomment below to shift focus after clicking link in popup.
-		document.forms[formname].elements[formfield].focus();
-		
-		// Uncomment below to close popup after clicking link.
-		newwin.close();
-	}
- 
-// end hiding -->
-</script>
-</head>
-
-<body>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/doc-head-circ-open.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/doc-head-circ-open.inc
diff -N htdocs/intranet-tmpl/default/en/includes/doc-head-circ-open.inc
--- htdocs/intranet-tmpl/default/en/includes/doc-head-circ-open.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/doc-head-close-addbiblio.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/doc-head-close-addbiblio.inc
diff -N htdocs/intranet-tmpl/default/en/includes/doc-head-close-addbiblio.inc
--- htdocs/intranet-tmpl/default/en/includes/doc-head-close-addbiblio.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-</title>
-<!-- TMPL_IF NAME="TemplateEncoding" -->
-<meta http-equiv="Content-Type" content="text/html; charset=<!-- TMPL_VAR NAME='TemplateEncoding' -->" />
-<!-- TMPL_ELSE -->
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /TMPL_IF -->
-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
-<style type="text/css">
-        <!-- TMPL_IF NAME="intranetstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetstylesheet" -->);<!-- TMPL_ELSE -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="intranetcolorstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);<!-- /TMPL_IF -->
-        @import url(<!-- TMPL_VAR NAME='themelang' -->/includes/marc-editor.css);
-</style>
-<!-- TMPL_INCLUDE NAME="common.js.inc" -->
-</head>
-
-<body >

Index: htdocs/intranet-tmpl/default/en/includes/doc-head-close-calendar.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/doc-head-close-calendar.inc
diff -N htdocs/intranet-tmpl/default/en/includes/doc-head-close-calendar.inc
--- htdocs/intranet-tmpl/default/en/includes/doc-head-close-calendar.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,52 +0,0 @@
-</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
-<style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
-</style>
-<!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME='themelang' -->/includes/calendar/calendar-system.css">
-<!-- End of additions -->
-<script language="JavaScript" type="text/javascript">
-<!-- Hide from old browsers
-function Help() {
-	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
-}
-
-function openWindow(targeturl, windowname) {
-	newwin =
-	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
-}
- 
- 	var newwin;
-	
-	// Open the popup window if it doesn't already exist and give it focus.
-	function PopWin(targeturl, windowname) {
-	
-		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400,scrollbars=yes,resizable=yes");
-	  newwin.focus();
-	}
-	
-  // Set the value of the form field to the passed value and optionally shift
-	// focus and close the popup.
-	function FillForm(val,formname,formfield) {
-	
-		document.forms[formname].elements[formfield].value = val;
-
-		// Uncomment below to shift focus after clicking link in popup.
-		document.forms[formname].elements[formfield].focus();
-		
-		// Uncomment below to close popup after clicking link.
-		newwin.close();
-	}
- 
-// end hiding -->
-</script>
-<!-- Additions to enable Calendar system -->
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar.js"></script>
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-en.js"></script>
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-setup.js"></script>
-<!-- End of additions -->
-</head>
-
-<body>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/doc-head-close-cat-zoom.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/doc-head-close-cat-zoom.inc
diff -N htdocs/intranet-tmpl/default/en/includes/doc-head-close-cat-zoom.inc
--- htdocs/intranet-tmpl/default/en/includes/doc-head-close-cat-zoom.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,76 +0,0 @@
-</title>
-<!-- TMPL_IF NAME="TemplateEncoding" -->
-<meta http-equiv="Content-Type" content="text/html; charset=<!-- TMPL_VAR NAME='TemplateEncoding' -->" />
-<!-- TMPL_ELSE -->
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /TMPL_IF -->
-<meta http-equiv="Content-Language" content="en-us" />
-<link rel="shortcut icon" href="<TMPL_VAR NAME="themelang">/includes/favicon.ico" type="image/x-icon" />
-    <!-- TMPL_IF name="opacstylesheet" -->
-<style type="text/css">
-    @import url(<!-- TMPL_VAR NAME="opacstylesheet" -->);
-</style>
-    <!-- TMPL_ELSE -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/<!-- TMPL_VAR NAME="opaccolorstylesheet" -->" />
-<style type="text/css">
-    @import url(<!-- TMPL_VAR NAME="themelang" -->/includes/<!-- TMPL_VAR NAME="opaclayoutstylesheet" -->);
-</style>
-    <!-- /TMPL_IF -->
-<script language="JavaScript" type="text/javascript">
-function Help() {
-	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
-}
-
-function openWindow(targeturl, windowname) {
-	newwin =
-	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable");
-}
- 
- 	var newwin;
-	
-	// Open the popup window if it doesn't already exist and give it focus.
-	function PopWin(targeturl, windowname) {
-	
-		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400,scrollbars=yes,resizable=yes");
-	  newwin.focus();
-	}
-	
-  // Set the value of the form field to the passed value and optionally shift
-	// focus and close the popup.
-	function FillForm(val,formname,formfield) {
-	
-		document.forms[formname].elements[formfield].value = val;
-
-		// Uncomment below to shift focus after clicking link in popup.
-		document.forms[formname].elements[formfield].focus();
-		
-		// Uncomment below to close popup after clicking link.
-		newwin.close();
-	}
- 
-
-
-	function openDictionary(dict, search, target) {
-	    if ((dict == 'all') || (dict == 'publicationyear')) {
-	        alert("The selected field is not correct to search on dictionary.");
-		} else {
-	    	var dict_window = window.open('/cgi-bin/koha/dictionary.pl?dictionary=' + dict + '&search=' + search + '&target=' + target,'_blanck','height=325,width=550,status=no,toolbar=no,menubar=no,location=no,resizable=no,top=100,left=100');
-        	dict_window.focus();
-		}
-	}
-
-	</script>
-	<script type="text/javascript" language="javascript" src="<TMPL_VAR NAME="themelang">/includes/catsearch.js"></script>
-<script type="text/javascript" language="javascript" src="<TMPL_VAR NAME="themelang">/includes/basket.js"></script>
-<script type="text/javascript" language="javascript">
-	var MSG_BASKET_EMPTY = "You book bag is currently empty";
-	var MSG_RECORD_IN_BASKET = "This item is already in your book bag";
-	var MSG_RECORD_ADDED = "This item has been added to your book bag";
-	var MSG_NRECORDS_ADDED = " item(s) added to your book bag";
-	var MSG_NRECORDS_IN_BASKET = "already in the bag";
-	var MSG_NO_RECORD_SELECTED = "No item was selected";
-	var MSG_NO_RECORD_ADDED = "No item was added to your book bag";
-</script>
-</head>
-
-<body>

Index: htdocs/intranet-tmpl/default/en/includes/doc-head-close-cat.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/doc-head-close-cat.inc
diff -N htdocs/intranet-tmpl/default/en/includes/doc-head-close-cat.inc
--- htdocs/intranet-tmpl/default/en/includes/doc-head-close-cat.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,196 +0,0 @@
-</title>
-<!-- TMPL_IF NAME="TemplateEncoding" -->
-<meta http-equiv="Content-Type" content="text/html; charset=<!-- TMPL_VAR NAME='TemplateEncoding' -->" />
-<!-- TMPL_ELSE -->
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /TMPL_IF -->
-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
-<style type="text/css">
-    <!-- TMPL_IF NAME="intranetstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetstylesheet" -->);<!-- TMPL_ELSE -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);<!-- /TMPL_IF -->
-	    <!-- TMPL_IF NAME="intranetcolorstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);<!-- /TMPL_IF -->
-</style>
-<script language="JavaScript" type="text/javascript">
-<!-- Hide from old browsers
-function Help() {
-	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
-}
-
-function openWindow(targeturl, windowname) {
-	newwin =
-	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable");
-}
- 
- 	var newwin;
-	
-	// Open the popup window if it doesn't already exist and give it focus.
-	function PopWin(targeturl, windowname) {
-	
-		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400,scrollbars=yes,resizable=yes");
-	  newwin.focus();
-	}
-	
-  // Set the value of the form field to the passed value and optionally shift
-	// focus and close the popup.
-	function FillForm(val,formname,formfield) {
-	
-		document.forms[formname].elements[formfield].value = val;
-
-		// Uncomment below to shift focus after clicking link in popup.
-		document.forms[formname].elements[formfield].focus();
-		
-		// Uncomment below to close popup after clicking link.
-		newwin.close();
-	}
- 
-function hideSearchsTypes() {
-            document.getElementById('precise_form').style.display = 'none';
-            document.getElementById('loose_form').style.display = 'none';
-            document.getElementById('keyword_form').style.display = 'none';
-	
-		}
-
-		function resetButtonsColors() {
-			document.getElementById('searchType1').style.backgroundColor = 'orange';
-			document.getElementById('searchType2').style.backgroundColor = 'orange';
-			document.getElementById('searchType3').style.backgroundColor = 'orange';
-			
-		}
-
-		function changeSearch1() {
-		    resetButtonsColors();
-		    document.getElementById('searchType1').style.backgroundColor = 'yellow';
-		    hideSearchsTypes();
-		  //  document.getElementById('keyword_form').reset();
-		    document.getElementById('keyword_form').style.display = 'inline';
-		}
-
-        function changeSearch2() {
-            resetButtonsColors();
-		    document.getElementById('searchType2').style.backgroundColor = 'yellow';
-		    hideSearchsTypes();
-		    //document.getElementById('precise_form').reset;
-		    document.getElementById('precise_form').style.display = 'inline';
-		}
-
-		function changeSearch3() {
-		    resetButtonsColors();
-		    document.getElementById('searchType3').style.backgroundColor = 'yellow';
-		    hideSearchsTypes();
-		   // document.getElementById('loose_form').reset();
-		    document.getElementById('loose_form').style.display = 'inline';
-		}
-		
-		
-		function checkKeywordSearch() {
-		if (document.keyword_form.keyword.value == '') {
-			alert("Enter a word to start searching.");
-			return false;
-		} else {
-		    return true;
-		}
-	}
-
-	function checkLooseSearch() {
-		if ( document.loose_form.field_value1.value == '' ) {
-			alert("Enter at least the first search to start searching.");
-			document.loose_form.field_value1.focus();
-			return false;
-		    } else {
-		        return true;
-		    }
-	}
-
-	function checkPreciseSearch() {
-		if ( (document.precise_form.barcode.value == '') &&
-			(document.precise_form.itemnumber.value == '') && (document.precise_form.biblionumber.value == '') ) {
-			alert("Enter a barcode or itemnumber or Biblionumber to start searching.");
-			return false;
-		} else {
-		    return true;
-		}
-	}
-
-	function openDictionary(dict, search, target) {
-	    if ((dict == 'all') || (dict == 'publicationyear')) {
-	        alert("The selected field is not correct to search on dictionary.");
-		} else {
-	    	var dict_window = window.open('/cgi-bin/koha/dictionary.pl?dictionary=' + dict + '&search=' + search + '&target=' + target,'_blanck','height=325,width=550,status=no,toolbar=no,menubar=no,location=no,resizable=no,top=100,left=100');
-        	dict_window.focus();
-		}
-	}
-
-
-		
-	</script>
-
-<style type="text/css">
-.catalogue {
-	background-color: #ad11ad;
-	color:#FFFFFF;
-	background-image:none;
-	text-decoration: normal;
-}
-.catalogueReservesLabel {
-	background-color:#5e11ac;
-	color:#FFFFFF;
-	background-image:none;
-	text-decoration: normal;	
-}
-.emptyCell {
-	background-color: transparent;
-	color:#FFFFFF;
-	background-image: none;
-	border: 0px solid;
-}
-
-a.catalogue:hover {
-	background-color: #ad11ad;
-	color: #FFFFFF;
-	text-decoration: none;
-	}
-
-.searchtype {
-    height: 20px;
-    font-size: 9px;
-	text-align: center;
-	padding: 3px, 8px, 3px, 8px;
-	border:0px solid black;
-	text-decoration: none;
-	color: black;
-	border-radius: 6px;
-	-moz-border-radius: 6px;
-	background-color: orange;
-	margin : 3px;
-	vertical-align: middle;
-	}
-
-.searchtypeselected {
-    height: 20px;
-    font-size: 9px;
-	text-align: center;
-	padding: 3px, 8px, 3px, 8px;
-	border:0px solid black;
-	text-decoration: none;
-	color: black;
-	border-radius: 6px;
-	-moz-border-radius: 6px;
-	background-color: yellow;
-	margin : 3px;
-	vertical-align: middle;
-}
-.catalogue_button {
-	border-width: 1px;
-	border-color: black;
-	text-decoration: none;
-	border-radius: 6px;
-	cursor:pointer;
-	vertical-align:middle;
-	-moz-border-radius: 6px;
-	background-color: #ad11ad;
-	color:#FFFFFF;
-}
-</style>
-
-</head>
-
-<body>

Index: htdocs/intranet-tmpl/default/en/includes/doc-head-close-dic.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/doc-head-close-dic.inc
diff -N htdocs/intranet-tmpl/default/en/includes/doc-head-close-dic.inc
--- htdocs/intranet-tmpl/default/en/includes/doc-head-close-dic.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,53 +0,0 @@
-</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
-<style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
-</style>
-<script language="JavaScript" type="text/javascript">
- function selectEntry(target) {
-		        
-		        if (document.dicc_form.dicc_entry.selectedIndex != -1) {
- 					target.value = document.dicc_form.dicc_entry.value;
-					window.close();
-		        } else {
-					alert("Select an option.")
-				}
-		    }
-<!-- Hide from old browsers
-function Help() {
-	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
-}
-
-function openWindow(targeturl, windowname) {
-	newwin =
-	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
-}
- 
- 	var newwin;
-	
-	// Open the popup window if it doesn't already exist and give it focus.
-	function PopWin(targeturl, windowname) {
-	
-		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400,scrollbars=yes,resizable=yes");
-	  newwin.focus();
-	}
-	
-  // Set the value of the form field to the passed value and optionally shift
-	// focus and close the popup.
-	function FillForm(val,formname,formfield) {
-	
-		document.forms[formname].elements[formfield].value = val;
-
-		// Uncomment below to shift focus after clicking link in popup.
-		document.forms[formname].elements[formfield].focus();
-		
-		// Uncomment below to close popup after clicking link.
-		newwin.close();
-	}
- 
-// end hiding -->
-</script>
-</head>
-
-<body>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/doc-head-close-print.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/doc-head-close-print.inc
diff -N htdocs/intranet-tmpl/default/en/includes/doc-head-close-print.inc
--- htdocs/intranet-tmpl/default/en/includes/doc-head-close-print.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
-<style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/print.css);
-</style>
-</head>
-
-<body>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/doc-head-close-receipt.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/doc-head-close-receipt.inc
diff -N htdocs/intranet-tmpl/default/en/includes/doc-head-close-receipt.inc
--- htdocs/intranet-tmpl/default/en/includes/doc-head-close-receipt.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
-<style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/blank.css);
-</style>
-</head>
-
-<body>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/doc-head-close-z3950.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/doc-head-close-z3950.inc
diff -N htdocs/intranet-tmpl/default/en/includes/doc-head-close-z3950.inc
--- htdocs/intranet-tmpl/default/en/includes/doc-head-close-z3950.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- TMPL_IF name="refresh" --><meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR NAME="refresh" -->" /><!-- /TMPL_IF -->
-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
-<style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME="themelang" -->/includes/intranet.css);
-	#main {
-		background-color : #CCCC99;
-		border-left : 1px solid #CCCC99;
-		margin-left : 2%;
-		margin-right : 2%;
-		margin-top : 2%;
-		padding : 10px;
-		position : relative;
-	}
-</style>
-<script language="JavaScript" type="text/javascript">
-	function Import(GetThisOne) {
-		opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
-		self.close();
-		return false;
-	}
-</script>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/doc-head-close.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/doc-head-close.inc
diff -N htdocs/intranet-tmpl/default/en/includes/doc-head-close.inc
--- htdocs/intranet-tmpl/default/en/includes/doc-head-close.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,47 +0,0 @@
-</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
-<style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
-</style>
-<script language="JavaScript" type="text/javascript">
-
-function Help() {
-	newin=window.open("/cgi-bin/koha/help.pl","Koha_Help",'width=600,height=600,toolbar=false,scrollbars=yes');
-}
-
-function openWindow(targeturl, windowname) {
-	newwin =
-	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable");
-}
- 
- 	var newwin;
-	
-	// Open the popup window if it doesn't already exist and give it focus.
-	function PopWin(targeturl, windowname) {
-	
-		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400,scrollbars=yes,resizable=yes");
-	  newwin.focus();
-	}
-	
-  // Set the value of the form field to the passed value and optionally shift
-	// focus and close the popup.
-	function FillForm(val,formname,formfield) {
-	
-		document.forms[formname].elements[formfield].value = val;
-
-		// Uncomment below to shift focus after clicking link in popup.
-		document.forms[formname].elements[formfield].focus();
-		
-		// Uncomment below to close popup after clicking link.
-		newwin.close();
-	}
- 
-
-
-
-
-</script>
-</head>
-
-<body>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/doc-head-open.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/doc-head-open.inc
diff -N htdocs/intranet-tmpl/default/en/includes/doc-head-open.inc
--- htdocs/intranet-tmpl/default/en/includes/doc-head-open.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/favicon.ico
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/favicon.ico
diff -N htdocs/intranet-tmpl/default/en/includes/favicon.ico
Binary files /tmp/cvs6NKFKk and /dev/null differ

Index: htdocs/intranet-tmpl/default/en/includes/help-bottom.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/help-bottom.inc
diff -N htdocs/intranet-tmpl/default/en/includes/help-bottom.inc
--- htdocs/intranet-tmpl/default/en/includes/help-bottom.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-<div class="action"><form action="help.pl" method="get"><input type="button" class="submit" onclick="window.close(); return false;" value="Close Help Window" /></form></div></div>
-</body>
-</html>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/help-top.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/help-top.inc
diff -N htdocs/intranet-tmpl/default/en/includes/help-top.inc
--- htdocs/intranet-tmpl/default/en/includes/help-top.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-<title>KOHA: online help</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
-<body>
-<div id="mainbloc">

Index: htdocs/intranet-tmpl/default/en/includes/holidays-bottom.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/holidays-bottom.inc
diff -N htdocs/intranet-tmpl/default/en/includes/holidays-bottom.inc
--- htdocs/intranet-tmpl/default/en/includes/holidays-bottom.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-
-
-</body>
-</html>

Index: htdocs/intranet-tmpl/default/en/includes/holidays-top.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/holidays-top.inc
diff -N htdocs/intranet-tmpl/default/en/includes/holidays-top.inc
--- htdocs/intranet-tmpl/default/en/includes/holidays-top.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,184 +0,0 @@
-
-
-</title>
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
-
-<!-- Estos scripts permiten manejar calendario de fechas. -->
-<script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/calendar/calendar.js"></script>
-<script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/calendar/calendar-en.js"></script>
-<script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/calendar/calendar-setup.js"></script>
-<!-- **************************************************** -->
-
-<script language="JavaScript" type="text/javascript">
-	// Captura el evento onmousemove para cualquier navegador
-	if (document.layers) { // Netscape
-		document.captureEvents(Event.MOUSEMOVE);
-	    document.onmousemove = captureMousePosition;
-	} else if (document.all) { // Internet Explorer
-	    document.onmousemove = captureMousePosition;
-	} else if (document.getElementById) { // Netcsape 6
-	    document.onmousemove = captureMousePosition;
-	}
-
-	var mouseXMax = 0;
-	var mouseYMax = 0;
-	var mouseX = 0;
-	var mouseY = 0;
-
-	function captureMousePosition(e) {
-	    if (document.layers) {
-		    mouseX = e.pageX;
-			mouseY = e.pageY;
-	        mouseXMax = window.innerWidth + window.pageXOffset;
-		    mouseYMax = window.innerHeight + window.pageYOffset;
-	    } else if (document.all) {
-		    mouseX = window.event.x + document.body.scrollLeft;
-	        mouseY = window.event.y + document.body.scrollTop;
-	        mouseXMax = document.body.clientWidth + document.body.scrollLeft;
-	        mouseYMax = document.body.clientHeight + document.body.scrollTop;
-	    } else if (document.getElementById) {
-	        mouseX = e.pageX;
-		    mouseY = e.pageY;
-	        mouseXMax = window.innerWidth + window.pageXOffset;
-	        mouseYMax = window.innerHeight + window.pageYOffset;
-	    }
-	}
-
-	function holidayOperation(formObject, opType) {
-		var op = document.getElementsByName('operation');
-		op[0].value = opType;
-		formObject.submit();
-	}
-
-	// This function shows the "Show Holiday" panel //
-	function showHoliday (exceptionPosibility, dayName, day, month, year, weekDay, title, description) {
-		var panel = document.getElementById('showHoliday');
-		panel.style.display = 'inline';
-		document.getElementById('newHoliday').style.display = 'none';
-		panel.style.top = mouseYMax/2;
-		panel.style.left = (mouseXMax/2) - 250;
-		document.getElementById('showDayname').value = dayName;
-		document.getElementById('showBranchName').value = document.getElementById('branch').value;
-		document.getElementById('showDay').value = day;
-		document.getElementById('showMonth').value = month;
-		document.getElementById('showYear').value = year;
-		document.getElementsByName('showWeekday')[0].value = weekDay;
-		document.getElementById('showTitle').value = title;
-		document.getElementById('showDescription').value = description;
-	
-		if (exceptionPosibility == 1) {
-			document.getElementById('exceptionPosibility').style.display = 'inline';
-		} else {
-			document.getElementById('exceptionPosibility').style.display = 'none';
-		}
-	}
-
-	// This function shows the "Add Holiday" panel //
-	function newHoliday (dayName, day, month, year, weekDay) {
-		var panel = document.getElementById('newHoliday');
-		panel.style.display = 'inline';
-		document.getElementById('showHoliday').style.display = 'none';
-		panel.style.top = mouseYMax/2;
-		panel.style.left = (mouseXMax/2)  - 250;
-		document.getElementById('newDayname').value = dayName;
-		document.getElementById('newBranchName').value = document.getElementById('branch').value;
-		document.getElementById('newDay').value = day;
-		document.getElementById('newMonth').value = month;
-		document.getElementById('newYear').value = year;
-		document.getElementsByName('newWeekday')[0].value = weekDay;
-	}
-
-	function hidePanel(aPanelName) {
-		document.getElementById(aPanelName).style.display = 'none';
-	}
-
-	function changeBranch () {
-		var branch = document.getElementById('branch').options[document.getElementById('branch').selectedIndex].value;
-		location.href='/cgi-bin/koha/tools/holidays.pl?branch=' + branch;
-	}
-
-	function additionalInformation (anExplanation) {
-		var panel = document.getElementById('information');
-		var paragraph = document.getElementById('explanation');
-		panel.style.display = 'inline'
-		panel.style.top = mouseY;
-		panel.style.left = mouseX;
-		var info = document.createTextNode(anExplanation);
-		if (paragraph.hasChildNodes()) {
-			paragraph.removeChild(paragraph.lastChild);
-		}
-		paragraph.appendChild(info);
-	}
-
-	function Help() {
-		newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
-	}
-</script>
-
-<style type="text/css">
-.parameters {
-	background-color: #86c268;
-	color: #FFFFFF;
-	text-decoration: normal;
-	font-weight: bold;
-	background-image:none;
-	}
-a.parameters:hover {
-	background-color: #86c268;
-	color: #FFFFFF;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-
-.normalday { 
-	background-color: #EDEDED;
-	color: Black; 
-	border:1px solid #000000;
-}
-
-.exception {
-	background-color: #A2B38F;
-	color: Black; 		
-	border:1px solid #000000;
-}
-
-.holiday { 
-	background-color: #8A70D1;
-	color: Black; 
-	border:1px solid #000000;
-}
-
-.repeatableday { 
-	background-color: #8FB1E9;
-	color: Black; 
-	border:1px solid #000000;
-}
-
-.information {
-	z-index:1;
-	background-color: #DCD2F1;
-	width:300px;
-	display:none;
-	border:1px solid #000000;
-	color: #000000;
-	font-size: 8pt;
-	font-weight: bold;
-    background-color: #FFD700;
-	cursor: pointer;
-	padding:2px;
-}
-
-.panel {
-	z-index:1;
-	width:500px;
-	display:none;
-	border:1px solid #000000;
-	padding:0px;
-}
-
-</style>
-</head>
-
-<body>
-
-

Index: htdocs/intranet-tmpl/default/en/includes/intranet-bottom.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/intranet-bottom.inc
diff -N htdocs/intranet-tmpl/default/en/includes/intranet-bottom.inc
--- htdocs/intranet-tmpl/default/en/includes/intranet-bottom.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-</body>
-</html>

Index: htdocs/intranet-tmpl/default/en/includes/intranet-facets.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/intranet-facets.inc
diff -N htdocs/intranet-tmpl/default/en/includes/intranet-facets.inc
--- htdocs/intranet-tmpl/default/en/includes/intranet-facets.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-<div id="nav">
-<li><a href="/cgi-bin/koha/mainpage.pl">NEULIS Home</a></li>
-<h6>Refine Your Search</h6>
-
-<!-- TMPL_LOOP NAME="facets_loop" -->
-<ul><!-- TMPL_VAR NAME="type_label" -->
-	<!-- TMPL_LOOP NAME="facets" -->
-		<li><a href="/cgi-bin/koha/catalogue/catalogue-search.pl?op=do_search&and_or=@and&<!-- TMPL_VAR NAME="type_link_value" -->&value=<!-- TMPL_VAR NAME="facet_link_value" ESCAPE="URL"-->&zoom=1<!-- TMPL_VAR NAME="facetsdesc" -->"  title="<!-- TMPL_VAR NAME="facet_title_value" -->"><!-- TMPL_VAR NAME="facet_label_value" --> (<!-- TMPL_VAR NAME="facet_count" -->)</a></li>
-	<!-- /TMPL_LOOP -->
-<!-- TMPL_IF NAME="expandable" -->
-	<li class="showmore"><a href="/cgi-bin/koha/catalogue/catalogue-search.pl?q=<!-- TMPL_VAR NAME="forminputs" -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">Show More</a></li>
-</li><!-- /TMPL_IF -->
-</ul>
-<!-- /TMPL_LOOP -->
-
-
-
-</div>

Index: htdocs/intranet-tmpl/default/en/includes/intranet-nav-brief.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/intranet-nav-brief.inc
diff -N htdocs/intranet-tmpl/default/en/includes/intranet-nav-brief.inc
--- htdocs/intranet-tmpl/default/en/includes/intranet-nav-brief.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-<div id="nav">
-    <ul>
-    <li><a href="/cgi-bin/koha/mainpage.pl">Home Page</a></li></ul>
-    <li><a href="/cgi-bin/koha/circ/circulation.pl">Issues</a></li>
-<ul>
-    <li><a accesskey="r" href="/cgi-bin/koha/circ/returns.pl">Returns</a>
-   <li> <a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></ul>
-  <ul><li><label>Reserve Section</label>
-<a href="/cgi-bin/koha/circ/rescirculation.pl">Issue</a></li>
-<li><label>Reserve Section </label><a href="/cgi-bin/koha/circ/resreturns.pl">Return</a></li></ul>
-<li><a href="/cgi-bin/koha/members/members-home.pl">Users</a></li>
-	<li><a href="/cgi-bin/koha/catalogue/catalogue-search.pl">Catalogue search</a></li>
-<li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></li><ul>
-
-<li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
-
-
-<!-- TMPL_IF NAME="loggedinusername" --><li>
-    Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> </li><ul><li><a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a></li></ul><!-- /TMPL_IF -->
-</li>
-</div>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/intranet-nav.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/intranet-nav.inc
diff -N htdocs/intranet-tmpl/default/en/includes/intranet-nav.inc
--- htdocs/intranet-tmpl/default/en/includes/intranet-nav.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,52 +0,0 @@
-<div id="nav">
- <ul>
-    
-    <li><a href="/cgi-bin/koha/mainpage.pl">NEULIS home</a></li>
-    <li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
-
-      <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
-        <label for="navfindborrower">Iss<span class="accesskey">u</span>e to:</label>
-        <input id="navfindborrower" name="findborrower" type="text" size="10" accesskey="u" />
-        <input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" />
-        <input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" />
-        <input type="submit" class="submit" value="Submit" />
-      </form>
-    </li></ul></li>
-<ul>
-    <li><a accesskey="r" href="/cgi-bin/koha/circ/returns.pl"><span class="accesskey">R</span>eturns</a>
-   <li> <a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></li></ul>
-  <ul><li><label>Reserve Section</label>
-<a href="/cgi-bin/koha/circ/rescirculation.pl">Issue</a></li>
-<li><label>Reserve Section </label><a href="/cgi-bin/koha/circ/resreturns.pl">Return</a></li></ul>
-<li><a href="/cgi-bin/koha/members/members-home.pl">Users</a>
-<ul><li><form action="/cgi-bin/koha/members/member.pl" method="post">
-	<label for="navmember">Search:</label><input id="navmember" type="text" size="10" name="member" />
-	<input type="submit" value="Search" class="submit" />
-
-	</form></li></ul></li>
-
-	<li><a href="/cgi-bin/koha/catalogue/catalogue-search.pl">Catalogue Search</a></li>
-<ul>
-<li><form name="f" method="post" action="/cgi-bin/koha/catalogue/catalogue-search.pl"><input type="hidden" name="op" value="do_search" /><input type="hidden" name="search_type" value="precise" /><input type="hidden" name="zoom" value="0" /><input type="hidden" name="serverid" value="-1" /><input type="hidden" name="number_to_display" value="10" /><label><span class="accesskey">Barcode:</span></label><input type="text" id="barcode" name="barcode" size="10"  /><input type="submit" value="Search" class="submit"></form></li>
-<li><form name="f" method="post" action="/cgi-bin/koha/catalogue/catalogue-search.pl"><input type="hidden" name="op" value="do_search" /><input type="hidden" name="kohafield" value="" /><input type="hidden" name="zoom" value="1" /><input type="hidden" name="MARC" value="0" /><input type="hidden" name="serverid" value="-1" /><input type="hidden" name="number_to_display" value="10" /><label><span class="accesskey">Keyword Search:</span></label><input type="text"  name="value" size="10"  /><input type="submit" value="Search" class="submit"></form></li>
-</ul>
-
-
-
-<li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></li>
-<ul><li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>
-<li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
-<li><a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual Shelves</a></li></ul>
-<li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>
-<li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
-<li><a href="/cgi-bin/koha/admin/admin-home.pl">System Admin</a></li>
-<li><a href="/cgi-bin/koha/sms/sms.pl">Send SMS</a></li>
-<ul><li><a href="/cgi-bin/koha/barcodes/cbarcodes.pl">Membership cards</a></li>
-<li><a href="/cgi-bin/koha/admin/institutions-careers.pl">Faculty&courses</a></li>
-<li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li></ul></li>
-
-<!-- TMPL_IF NAME="loggedinusername" --><li>
-    Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> </li><ul><li><a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a></li></ul><!-- /TMPL_IF -->
-
-</li>
-</div>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/intranet-topmenu.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/intranet-topmenu.inc
diff -N htdocs/intranet-tmpl/default/en/includes/intranet-topmenu.inc
--- htdocs/intranet-tmpl/default/en/includes/intranet-topmenu.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-<div id="topmenu"><form action="/cgi-bin/koha/member.pl" method="post">
-<label for="member">Patron Search</label>
-  <input type="text" id="member" name="member" value="" />&nbsp;<input type="submit"  class="submit" name="Go" value="Search" /></form><form action="/cgi-bin/koha/simpleredirect.pl" method="post">
-<input type="submit" class="submit" value="Add New Patron" />
-<input type="hidden" name="chooseform" value="adult" />
-</form></div>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/intranet.css
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/intranet.css
diff -N htdocs/intranet-tmpl/default/en/includes/intranet.css
--- htdocs/intranet-tmpl/default/en/includes/intranet.css	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,1321 +0,0 @@
-a:link {
-	color : #0066CC;
-}
-
-a:visited {
-	color : #0066CC;
-}
-
-a:hover {
-	color : #993300;
-}
-
-a.delete {
-	background-color : #CC3333;
-	color : #FFFF99;
-	display : block;
-	margin : 2px;
-	padding : 1px;
-	font-weight : bold;
-	text-align : center;
-	text-decoration : none;
-}
-
-a.delete:hover {
-	background-color : #FF3333;
-	color : #FFFF99;
-}
-
-a.edit {
-	background-color : #EFF1D8;
-	color : #3366CC;
-	display : block;
-	margin : 2px;
-	padding : 1px;
-	font-weight : bold;
-	text-align : center;
-	text-decoration : none;
-}
-
-a.edit:hover {
-	background-color : #CCFF99;
-	color : #000088;
-}
-
-a:link.current {
-	background-color : transparent;
-	color : #3366CC;
-	font-size : 12px;
-	font-weight : bold;
-	padding : 1px 5px 1px 5px;
-	text-decoration : none;
-}
-
-a:link.current {
-	background-color : transparent;
-	color : #3366CC;
-}
-
-a:link.nav {
-	background-color : #D8DEB8;
-	color : #3366CC;
-}
-
-a:link.pages {
-	background-color : #FFFFCC;
-	color : #3366CC;
-	font-size : 12px;
-	font-weight : bold;
-	padding : 1px 5px 1px 5px;
-	text-decoration : none;
-}
-
-a:visited.current {
-	background-color : transparent;
-	color : #3366CC;
-	font-size : 12px;
-	font-weight : bold;
-	padding : 1px 5px 1px 5px;
-	text-decoration : none;
-}
-
-a:visited.current {
-	background-color : transparent;
-	color : #3366CC;
-}
-
-a:visited.nav {
-	background-color : #D8DEB8;
-	color : #3366CC;
-}
-
-a:visited.pages {
-	background-color : #FFFFCC;
-	color : #3366CC;
-	font-size : 12px;
-	font-weight : bold;
-	padding : 1px 5px 1px 5px;
-	text-decoration : none;
-}
-
-a:hover.current {
-	background-color : #CCFF00;
-	color : #CC3333;
-	font-size : 12px;
-	font-weight : bold;
-	padding : 1px 5px 1px 5px;
-	text-decoration : none;
-}
-
-a:hover.current {
-	background-color : #CCFF00;
-	color : #CC3333;
-}
-
-a:hover.nav {
-	background-color : #CCFF00;
-	color : #CC3333;
-}
-
-a:hover.pages {
-	background-color : #CCFF00;
-	color : #CC3333;
-	font-size : 12px;
-	font-weight : bold;
-	padding : 1px 5px 1px 5px;
-	text-decoration : none;
-}
-
-a:active.current {
-	background-color : #99CC00;
-	color : #FFFF99;
-	font-size : 12px;
-	font-weight : bold;
-	padding : 1px 5px 1px 5px;
-	text-decoration : none;
-}
-
-a:active.current {
-	background-color : #99CC00;
-	color : #FFFF99;
-}
-
-a:active.nav {
-	background-color : #99CC00;
-	color : #FFFF99;
-}
-
-a:active.pages {
-	background-color : #99CC00;
-	color : #FFFF99;
-	font-size : 12px;
-	font-weight : bold;
-	padding : 1px 5px 1px 5px;
-	text-decoration : none;
-}
-
-body {
-	background-color : #0983A1;
-	color : #333333;
-	font-family : arial, geneva, sans-serif;
-	font-size : 16px;
-	margin : 3px 0px 0px 5px;
-}
-
-caption {
-	color : #000066;
-	font-size : 20px;
-	font-weight : bold;
-	margin-top : 5px;
-	text-align : left;
-}
-
-div.form {
-	background-color : #FFFFCC;
-	border : 0px;
-	margin : 0px auto;
-	padding : 5px;
-}
-
-div.details {
-background-color : #FFFFCC;
-	border : 0px;
-	margin : 1px auto;
-	padding : 5px;
-	margin-bottom: 5px;
-
-}
-
-div.details dl {
-	margin : 0px;
-	padding : 0px;
-}
-
-div.details dt {
-	font-weight: bold;
-	font-size: 12px;
-	border-bottom : 1px solid #D8DEB8;
-	padding : 2px;
-}
-
-div.details dd {
-	font-size: 12px;
-}
-
-div.details ul {
-	margin-top: 0px;
-	margin-bottom: 0px;
-	padding-top : 0px;
-	padding-bottom : 3px;
-	font-size : 12px;
-}
-
-div#help {
-	position : absolute;
-	top : 3px;
-	right : 3px;
-	font-weight : bold;
-}
-
-div#help a {
-	background-color : #3FB2B3;
-	padding : 1px 2px;
-	text-decoration : none;
-}
-
-div#help .loggedin {
-	color : #cccc99;
-	font-size : 80%;
-}
-
-div#help .loggedinusername {
-	color : #D8DEB8;
-}
-
-div#help .loggedin a {
-	background-color : transparent;
-	text-decoration : underline;
-	color : #CCFF66;
-}
-
-div.items {
-	background-color : #FFFFCC;
-	border : 0px;
-	margin : 0px auto;
-	padding : 5px;
-	width : 100%;
-}
-
-div.items td {
-	border-bottom : 1px solid #E7E7CA;
-	border-left : 1px solid #E7E7CA;
-	border-right : 1px solid #E7E7CA;
-	border-top : 1px solid #E7E7CA;
-	font-size : .75em;
-	padding: 2px;
-}
-
-div.items th {
-	background-color : #FFC;
-	border-bottom : 1px solid #E7E7CA;
-	border-left : 1px solid #E7E7CA;
-	border-right : 0px;
-	border-top : 1px solid #E7E7CA;
-	color : #000088;
-	font-size: .75em;
-	font-weight : bold;
-	padding : 2px;
-	text-align : left;
-	vertical-align : top;
-}
-
-div.details td, div.form td {
-	border-bottom : 1px solid #E7E7CA;
-	border-left : 1px solid #E7E7CA;
-	border-right : 0px;
-	border-top : 0px;
-}
-
-div.details td:first-child, div.form td:first-child {
-	font-weight : bold;
-	text-align : right;
-	width : 25%;
-}
-
-div.details td+td, div.form td+td {
-	font-weight : normal;
-	text-align : left;
-	width : 75%;
-}
-
-div.compact td {
-	border-bottom : 1px solid #E7E7CA;
-	border-left : 1px solid #E7E7CA;
-	border-right : 0px;
-	border-top : 0px;
-	font-weight : normal;
-	font-size : 13px;
-	padding : 1px 1px 1px 10px;
-}
-
-div.compact th {
-	border-bottom : 1px solid #999933;
-	border-left : 1px solid #E7E7CA;
-	border-right : 1px solid #999933;
-	border-top : 0px;
-	padding : 1px 10px 1px 1px;
-	font-weight : normal;
-	font-size : 13px;
-	text-align : right;
-	width : 20%;
-	vertical-align: top;
-}
-
-div.error {
-	background-color : #FFFF99;
-	border : 1px dashed #990000;
-	font-size : 16px;
-	line-height : 18px;
-	margin : 10px auto;
-	padding : 5px;
-	width : 65%;
-}
-
-div.error .submit {
-	background-color : #669999;
-	font-size: 14px;
-	margin-left : 5%;
-	padding : 2px 15px 2px 15px;
-}
-
-div.error .cancel {
-	background-color : #993300;
-	font-size: 14px;
-	margin-left : 5%;
-	padding : 2px 15px 2px 15px;
-}
-
-div.error h3 {
-	color : #990033;
-}
-
-div.error p {
-	margin : 0px;
-	padding : 0px 0px 0px 20px;
-}
-
-div.notice {
-	background-color : #FFFF99;
-	border : 1px dashed #990000;
-	font-size : 16px;
-	line-height : 18px;
-	margin : 10px auto;
-	padding : 5px;	
-}
-
-div.flags li {
-	list-style : circle;
-}
-
-div.flags ul {
-	margin : 0px;
-	padding : 0px;
-}
-
-
-
-	div.help {
-		border : 0;
-		background-color : #E7E7CA;
-		font-size : 90%;
-		margin-bottom : 5px;
-	}
-	
-	div.help h3 {
-		font-size : 100%;
-		background-color : #FFFFCC;
-		border-bottom : #CCCC99;
-		margin : 0;
-		padding : 5px;
-	}
-	
-	div.help p {
-		margin : 0;
-		padding : 2px 5px;
-	}
-	
-	div.help .ex {
-		font-weight : bold;
-	}
-
-div.menu {
-	width : 100%;
-}
-
-div.menu th {
-	background-color : #FFFFCC;
-	border-bottom : 1px solid #E7E7CA;
-	border-left : 1px solid #E7E7CA;
-	border-right : 0px;
-	border-top : 0px;
-	font-size : 101%;
-	font-weight : bold;
-	text-align : right;
-	}
-
-div.menu td+td {
-	font-size : 90%;
-	font-weight : normal;
-	text-align : left;
-}
-
-div.tabitem {
-	display : inline;
-}
-
-div.tabitem form {
-	display : inline;
-	white-space : nowrap;
-}
-
-div.tabitem ul li {
-	margin-left: 0;
-	margin-bottom: 0;
-	padding: 2px 10px 5px;
-	
-	list-style: none;
-	display: inline;
-	}
-	
-		
-div.tabitem ul li.here {
-	border-bottom: 1px solid #ffc;
-	list-style: none;
-	display: inline;
-	}
-
-fieldset {
-	border : 0;
-	padding : 0;
-	white-space : nowrap;
-}
-
-fieldset.list {
-	white-space : normal;
-}
-
-form {
-	margin : 0px;
-	padding : 0px;
-}
-
-form.compact input {
-	color : #ffffff;
-	font-size : 80%;
-	font-weight : normal;
-	padding : 0 6px;
-}
-
-h1
-	{
-	color : #000066;
-	font-size : 20px;
-	font-weight : bold;
-	margin-bottom : 3px;
-	margin-top : 3px;
-}
-
-h2 {
-	color : #000066;
-	font-size : 18px;
-	font-weight : bold;
-	margin-bottom : 3px;
-	margin-top : 3px;
-}
-
-h3 {
-	color : #000066;
-	font-size : 16px;
-	font-weight : bold;
-	margin-bottom : 3px;
-	margin-top : 3px;
-}
-
-h3.alert {
-	background-color: #FFCC33;
-	color: #CC0000;
-	padding: 3px;
-}
-
-h3.title {
-	background-color: #EEF0DB;
-	font-size : 18px;
-	display : block;
-	padding : 5px;
-	margin: 0px auto;
-}
-
-h4 {
-	color : #000066;
-	font-size : 14px;
-	font-weight : bold;
-	margin-bottom : 3px;
-	margin-top : 3px;
-}
-
-h5 {
-	color : #000066;
-	font-size : 13px;
-	font-weight : bold;
-	margin-bottom : 1px;
-	margin-top : 1px;
-}
-
-h6 {
-	color : #000066;
-	font-size : 12px;
-	font-weight : bold;
-	margin-bottom : 1px;
-	margin-top : 1px;
-}
-
-label {
-	font-weight : bold;
-	padding : 0px 5px 0px 5px;
-}
-
-sup {
-	font-size : .7em;
-	color : #cc0000;
-	font-weight : bold;
-	font-family : "courier new", courier, monospace;
-}
-
-table {
-	background-color : #FFFFCC;
-	border-bottom : 0px solid #000000;
-	border-collapse : collapse;
-	border-left : 0px solid #000000;
-	margin : 3px 0px 5px 0px;
-	padding : 0px;
-	width : 99%;
-}
-
-td {
-	border-bottom : 1px solid #E7E7CA;
-	border-right : 1px solid #E7E7CA;
-	font-size : 12px;
-	padding : 5px 5px 5px 5px;
-}
-
-td:last-child {
-	border-bottom : 1px solid #E7E7CA;
-	border-right : 0px solid #E7E7CA;
-	font-size : 12px;
-	padding : 5px 5px 5px 5px;
-}
-
-td+ul {
-	margin-top : 0px;
-	margin-bottom : 0px;
-}
-
-th {
-	background-color : #D8DEB8;
-	border-bottom : 1px solid #000000;
-	border-right : 1px solid #000000;
-	font-size : 14px;
-	font-weight : bold;
-	padding : 5px 5px 5px 5px;
-}
-
-th:last-child {
-	background-color : #D8DEB8;
-	border-bottom : 1px solid #000000;
-	border-right : 0px solid #000000;
-	font-size : 14px;
-	font-weight : bold;
-	padding : 5px 5px 5px 5px;
-}
-
-td.input, div.form td, div.details td {
-	border-bottom : 1px solid #E7E7CA;
-	border-left : 0px;
-	border-right : 0px;
-	color : #000000;
-	line-height : 1.5em;
-	padding : 4px;
-	text-align : right;
-}
-
-td.label, div.form th, div.details th {
-	background-color : #FFC;
-	border-bottom : 1px solid #E7E7CA;
-	border-left : 1px solid #E7E7CA;
-	border-right : 0px;
-	border-top : 0px;
-	color : #000088;
-	font-weight : bold;
-	line-height : 1.5em;
-	padding : 4px;
-	text-align : left;
-	vertical-align : top;
-}
-
-td.label {
-	border-bottom : 1px solid #E7E7CA;
-	border-left : 1px solid #E7E7CA;
-	color : #000088;
-	font-weight : bold;
-	line-height : 1.5em;
-	padding : 4px;
-}
-
-tr.highlight, td.highlight {
-	background-color : #FFFFFF;
-}
-
-td.onissue {
-	background-color : #EFF1D8;
-}
-
-tr.highlight td.onissue {
-	background-color : #E7E7CA;
-}
-
-table.marc {
-	background-color : #FFFFCC;
-	border-collapse : collapse;
-	margin : 3px 0px 5px 0px;
-	padding : 0px;
-	width : 95%;
-}
-
-table.marc th {
-	background-color: #E7E7CA;
-	border : 0px;
-	text-align : left;
-	font-weight : normal;
-}
-
-table.marc td.label {
-	color : #000000;
-	font-weight : bold;
-	width : 25%;
-}
-
-table.marc td.data {
-	background-color : #FFFFFF;
-}
-
-/*.barcode {
-	display : block;
-	text-align : right;
-	font-style: italic;
-	font-size : .95em;
-	color: #666633;
-}*/
-
-.cancel {
-	background-color : #993300;
-	color : #FFFFCC;
-	font-size : 12px;
-	font-weight : bold;
-	padding : 2px;
-}
-
-td.credit, td.debit, td.sum {
-	font-family : "Courier New", Courier, monospace;
-	text-align : right;
-}
-
-td.debit {
-	color : #990000;
-}
-
-.current {
-	background-color : #FFFFFF;
-	color : #3366CC;
-	font-size : 12px;
-	font-weight : bold;
-	padding : 1px 5px 1px 5px;
-	text-decoration : none;
-}
-
-.error {
-	color : #CC0033;
-	font-weight : bold;
-}
-
-.ex {
-	font-family : "Courier New", Courier, monospace;
-}
-
-.form dd {
-	border-bottom : 1px solid #E7E7CA;
-	color : #000000;
-	display : block;
-	line-height : 1.5em;
-	padding : 4px;
-	text-align : right;
-}
-
-.form dl {
-	margin : 0px 0px 0px 0px;
-	padding : 3px;
-	width : 80%;
-}
-
-.form dt {
-	border-bottom : 1px solid #E7E7CA;
-	border-left : 1px solid #E7E7CA;
-	color : #000088;
-	float : left;
-	font-weight : bold;
-	line-height : 1.5em;
-	padding : 4px;
-}
-
-.form-help {
-	font-size : 95%;
-	padding-left : 15px;
-}
-
-.inline {
-	display : inline;
-}
-
-.menu input {
-	font-size : 80%;
-}
-
-input.focus {
-	background-color: #FFF;
-	border-bottom: 2px dashed #993300;
-}
-
-input.unfocus {
-	background-color : #FFF;
-}
-
-.nav {
-	font-size : 12px;
-	font-weight : bold;
-	padding : 1px 5px 1px 5px;
-	text-decoration : none;
-}
-
-.print {
-	font-size: 10px;
-}
-
-.submit {
-	background-color : #669999;
-	color : #EEF0DB;
-	font-size : 12px;
-	font-weight : bold;
-	padding : 2px;
-}
-
-td form {
-	margin : 0;
-}
-
-td input.submit {
-	border : 1px outset #CCCC99;
-	color : #FFFFCC;
-	margin : 0 5px 0 0;
-	padding : 0 5px 0 5px;
-}
-
-td input.submit:active {
-	border : 1px inset #cccc99;
-}
-
-td input.delete {
-	border : 1px outset #CCCC99;
-	color : #FFFFCC;
-	background-color : #993300;
-	font-size : 12px;
-	font-weight : bold;
-	padding : 0 5px 0 5px;
-	margin : 0 5px 0 0;
-}
-
-td input.delete:active {
-	border : 1px inset #cccc99;
-}
-
-.thumbnail {
-	float : left;
-	margin : 0 5px 10px 0;
-	border : 0px solid #E7E7CA;
-}
-
-.yes {
-	float: left;
-	padding : 0px 15px 0px 15px;
-	width : 33%;
-	margin : 0px 2px 0px 2px;
-	text-align: center;
-}
-
-.no {
-	float: right;
-	padding : 0px 15px 0px 15px;
-	width : 33%;
-	margin : 0px 2px 0px 2px;
-	text-align: center;
-}
-
-#auth {
-	background-color : transparent;
-	margin : 0 30% 0 30%;
-	padding : 5px;
-}
-
-#auth table {
-	border-collapse : separate;
-}
-
-#auth table td {
-	background-color : #E7E7CA;
-	border-bottom : 1px solid #999933;
-	border-left : 1px solid #FFFFFF;
-	border-right : 1px solid #999933;
-	border-top : 1px solid #FFFFFF;
-	text-align : left;
-}
-
-#auth table th{
-	background-color : #E7E7CA;
-	border-bottom : 1px solid #999933;
-	border-left : 1px solid #FFFFFF;
-	border-right : 1px solid #999933;
-	border-top : 1px solid #FFFFFF;
-	width : 50%;
-	text-align : right;			
-}
-
-#auth p {
-	width : 25%;
-	margin : 0 auto;
-	text-align : center;
-	padding : 0;
-}
-
-#main {
-	background-color : #C2CED3;
-	border-left : 1px solid #000000;
-	margin-left : 18%;
-	margin-right : 2%;
-	margin-top : 2%;
-	padding : 10px;
-}
-
-#main-compact {
-	background-color : #C2CED3;
-	border-left : 1px solid #CCCC99;
-	margin-left : 2%;
-	margin-right : 2%;
-	margin-top : 6%;
-	padding : 10px;	
-}
-
-#menu {
-	background-color : #FFFFCC;
-}
-
-#menu dd {
-	border-bottom : 1px dashed #D8DEB8;
-	border-left : 1px dashed #D8DEB8;
-	border-right : 0px solid #000000;
-	border-top : 0px solid #000000;
-	padding : 3px 45px 3px 10px;
-}
-
-#menu dd a {
-	font-size : 1.05em;
-	font-weight : bold;
-	text-decoration : none;
-}
-
-#menu dd li {
-	display : inline;
-	white-space : nowrap;
-}
-
-#menu dd li:before {
-	content : "\00BB \0020";
-}
-
-#menu dd ul {
-	display : inline;
-	list-style : disc;
-}
-
-#menu dl {
-	margin : 0px;
-	padding : 0px; /*width : 80%;*/
-}
-
-#menu dt {
-	background-color : #FFFFFF;
-	border-bottom : 1px solid #D8DEB8;
-	border-left : 0px solid #D8DEB8;
-	border-right : 0px solid #000000;
-	border-top : 0px solid #000000;
-	color : #000066;
-	font-size : 1.2em;
-	font-weight : bold;
-	padding : 2px 2px 2px 5px;
-}
-
-#menu dt a {
-	text-decoration : none;
-}
-
-#nav {
-	background-color : #C2CED3;
-	position : absolute;
-	left : 1px;
-	margin : 2% 0% 0% 1%;
-	padding : 0px;
-	width : 16%;
-}
-
-#nav .submit {
-	font-size : 9px;
-}
-
-#nav a {
-	font-family : Tahoma, arial, geneva, sans-serif;
-	font-weight : bold;
-	text-decoration : none;
-}
-
-#nav h4 {
-	font-size : 12px;
-	font-weight : bold;
-	margin : 0px;
-	padding : 0px;
-	text-align : left;
-}
-
-#nav input {
-	font-size : .8em;
-}
-
-#nav label {
-	font-size : 10px;
-}
-
-#nav ul {
-	margin : 0px;
-	padding : 0px;
-}
-
-
-#nav ul li {
-	background-color : #C4C6C7;
-	border-bottom : 1px solid #FFFFCC;
-	border-left : 0px solid #FFFFCC;
-	border-right : 0px solid #006699;
-	border-top : 0px solid #FFFFCC;
-	font-size : .8em;
-	list-style : none;
-	padding : 3px;
-	text-align : right;
-	width : 100%;
-}
-
-#nav ul li+li {
-	border-bottom : 1px solid #FFFFCC;
-	border-left : 0px solid #FFFFCC;
-	border-right : 0px solid #006699;
-}
-
-#nav ul ul {
-	margin : 0px 0px 0px 5px;
-}
-
-#nav ul ul li {
-	background-color : #EFF1D8;
-	border-bottom : 1px solid #CCCC99;
-	border-left : 0px solid #FFFFCC;
-	border-right : 0px solid #006699;
-	border-top : 0px solid #FFFFCC;
-	font-size : .9em;
-	list-style : none;
-	margin : 0px 0px 0px 0px;
-	padding : 0px 0px 0px 0px;
-	text-align : right;
-	width : 100%;
-}
-
-#nav ul ul li+li {
-	border-bottom : 1px solid #CCCC99;
-	border-left : 0px solid #FFFFCC;
-	border-right : 0px solid #006699;
-	padding : 0px 0px 0px 0px;
-}
-ul#facets {
-	margin: 3px;
-}
-
-#nav h6 {
-	text-align: center;
-}
-
-#nav ul#facets {
-	margin : 0;
-	padding : 0;
-}
-
-#nav ul#facets li {
-	font-weight: bold;
-	text-align: left;
-}
-
-#nav ul#facets li#branch_facet, #nav ul#facets li#subject_facet, #nav ul#facets li#series_facet, #nav ul#facets li#author_facet {
-}
-
-#nav ul#facets ul li {
-	border: 0;
-	font-size: .95em;
-	font-weight: normal;
-	padding: 2px;
-	text-align: left;
-}
-
-#nav ul#facets ul li a {
-	font-weight: normal;
-	text-decoration: underline;
-}
-
-#nav ul#facets ul li.showmore {
-	text-align: center;
-}
-
-#nav ul#facets ul li.showmore a {
-	font-weight: bold;
-	text-decoration: none;
-}
-#notes {
-	float : right;
-	margin : 0px;
-	font-size : 12px;
-}
-
-#notes ul {
-	margin : 0px;
-	padding : 0px;
-}
-
-#results, .results {
-	color : #000066;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size : .8em;
-	margin : 0px;
-	padding : 3px 0px 15px 0px;
-}
-
-#submenu {
-	background-color: #D8DEB8;
-}
-
-#submenu dl {
-	background-color : #E7E7CA;
-	float: left;
-	font-size : 90%;
-	margin: 10px 10px;
-	padding: 2px 2px 2px 7px;
-	width : 27%;
-}
-
-#submenu dt {
-	font-size: 100%;
-	font-weight : bold;
-}
-
-#submenu dd {
-	margin-left: 2%;
-}
-
-#submenu dd ul {
-	margin-left : 0;
-	padding-left : 7%;
-}
-
-#topmenu {
-	color : #CCCC99;
-	margin-bottom : 5px;
-	margin-left : 20px;
-	margin-right : 10px;
-}
-
-#topmenu .submit {
-	background-color : #999933;
-	color : #FFFFCC;
-	font-size : .7em;
-	padding : 2px;
-}
-
-#topmenu a:link {
-	color : #CCFF66;
-	font-weight : bold;
-	padding : 2px;
-}
-
-#topmenu a:visited {
-	color : #CCFF66;
-	font-weight : bold;
-	padding : 2px;
-}
-
-#topmenu a:hover {
-	color : #FFFFCC;
-	font-weight : bold;
-	padding : 2px;
-}
-
-#topmenu a:active {
-	color : #FFFFCC;
-	font-weight : bold;
-	padding : 2px;
-}
-
-#topmenu form {
-	display : inline;
-}
-
-#topmenu label {
-	font-weight : bold;
-}
-
-.searchresults td {
-	padding : 2px 2px 2px 5px;
-}
-
-.searchresults p {
-	font-size : 1.2em;
-	font-weight : bold;
-	margin : .2em;
-}
-
-.searchresults p+p {
-	font-size : 1em;
-	font-weight : normal;
-	text-indent : 1em;
-}
-
-.searchresults strong a {
-	font-weight : bold;
-	font-size : 14px;
-}
-
-div.members th {
-	background-color : #FFFFCC;
-	border-bottom : 1px solid #E7E7CA;
-	border-right : 1px solid #E7E7CA;
-	font-size : 12px;
-	padding : 3px 5px;
-	width : 25%;
-	font-weight : bold;
-	text-align : left;
-	vertical-align : top;
-}
-
-div.members th label {
-	display : block;
-	margin : 0;
-	padding : 0;
-}
-
-div.members label.focus {
-	color : #cc0000;
-}
-
-div.members th p, div.compact th p {
-	font-weight : normal;
-	padding : 0;
-	margin : 0;
-	text-indent : 1em;
-}
-
-td fieldset {
-	border : 1px solid #CCCCCC;
-	margin : 0 0 3px 0;
-	padding : 0 0 3px 0;
-}
-
-fieldset label {
-	float : left;
-	margin-left : 3px;
-	width : 25%;
-}
-
-td legend {
-	margin : 0;
-	padding : 4px;
-}
-
-table.editing tr:hover td {
-	background-color: #EFF1D8;
-}
-
-tfoot {
-	background-color : #E7E7CA;
-	font-weight : bold;
-}
-
-tfoot td, tfoot td:last-child {
-	border-right : 1px solid #999900;
-	border-bottom : 1px solid #999900;
-}
-
-div.data table, div.data-main table {
-	background-color: #D8DeB8;
-	border-collapse: collapse;
-	margin : auto;
-	margin : 0 0 5px 0;
-}
-
-div.data table caption {
-	font-size : 1em;
-}
-
-div.data-main table caption {
-	font-size : 1.1em;
-}
-
-div.data table td, div.data-main table td {
-	border-right : 1px solid #CCCC99;
-	border-bottom : 1px solid #CCCC99;
-	background-color: #FFFFCC;
-	font-size: 12px;
-	padding : 2px;
-	padding-left : .7em;
-	margin : 0 0 0 0;
-}
-
-div.data-main table td {
-	background-color : #FFFFE1;
-}
-
-div.data table th, div.data-main table th  {
-	border-left : 1px solid #999933;
-	border-right : 1px solid #CCCC99;
-	border-bottom : 1px solid #CCCC99;
-	font-size : 12px;
-	font-weight: bold;
-	text-align : right;
-	padding : 2px;
-	padding-right : 1em;
-	background-color: #E7E7CA;
-	width : 17%;
-}
-
-div.data-main table th {
-	background-color : #EFF1D8;
-}
-
-div.data table tr.highlight td {
-	background-color: #FFFFE1;
-}
-
-div.data table th[scope=col], div.data-main table th[scope=col] {
-	text-align: center;
-	border-left : 0;
-}
-
-div.data table col, div.data-main table col {
-	background-color : #CCCCCC;
-}
-
-.accesskey {
-	text-decoration : underline;
-}
-/* MAIN MENU STYLES */
-#mainmenu {
-    display:block;
-    float:left;
-    margin-right:20px;
-    border-right:1px solid black;
-}
-
-#mainmenu a {
-    display:block;
-    margin:5px;
-    text-decoration:none;
-    color:black;
-}
-#mainmenu a:hover {
-    display:block;
-    margin:5px;
-    background-color:#6699cc;
-    color:white;
-}
-
-/* submenus styles */
-#submenu {
-    margin-left:10%;
-}
-#submenu a {
-    margin:5px;
-    text-decoration:none;
-    color:black;
-}
-#submenu a:hover {
-    margin:5px;
-    background-color:#6699cc;
-    color:white;
-}
-
-/* the USER information block */
-#librarian_information {
-/*     position:absolute; */
-    float:right;
-    font-size:10pt;
-}
-

Index: htdocs/intranet-tmpl/default/en/includes/livesearch.css
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/livesearch.css
diff -N htdocs/intranet-tmpl/default/en/includes/livesearch.css
--- htdocs/intranet-tmpl/default/en/includes/livesearch.css	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,81 +0,0 @@
-/* LiveSearch */
-
-#keyword {
-	margin: 0 25px 5px 0;
-	padding:0px;
-	width: 200px;
-	display: block;
-	border:1px solid #99b58d;
-}
-
-
-#LSResult {
-	position: absolute;
-	background-color: #aaa;
-	width: 450px;
-	margin: 1px 0px 2px 0px;
-      	padding: 0px;
-	font-size:80%
-}
-
-#LSResult li {
-	padding-bottom: 2px;
-    	padding-top: 2px;
-	line-height:normal;
-	margin-bottom: 0px;
-}
-
-
-ul#LSShadow {
-      	position: relative;
-	right: 1px;
-	margin: 0px;
-	padding: 0px;
-	background-color: #666; /*shadow color*/
-	color: inherit;
-}
-#LSResult ul {
-	list-style-position:outside;
-	margin-bottom: -5px;
-	margin-top: 0px;
-	padding-top: 0px;
-	margin: 0px;
-	padding: 0px;
-}
-
-#LSResult ul li {
-	text-indent: -20px;
-	padding: 0px 15px 0 20px;
-	margin-top:0;
-	list-style-type:none;
-}
-
-.LSRes {
-	position: relative;	
-	bottom: 1px;
-	right: 1px;
-	background-color: white;
-	border:  1px solid #AAA;
-	
-    }
-#LSHighlight {
-	color: #564b47;
-	background-color: #ccc;
-}
-.LSRes li a {
-	text-decoration: none;
-	color:black;
-	cursor:default;
-
-}
-.LSResRight {
-	position:absolute;
-	right:2px;
-	display:inline;
-	padding:1;margin:1;
-	width:100%;
-	color:navy;
-	text-align:right;
-
-}
-

Index: htdocs/intranet-tmpl/default/en/includes/livesearch.js
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/livesearch.js
diff -N htdocs/intranet-tmpl/default/en/includes/livesearch.js
--- htdocs/intranet-tmpl/default/en/includes/livesearch.js	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,205 +0,0 @@
-
-	/*
-// +----------------------------------------------------------------------+
-// | Copyright (c) 2005 LibLime                                           |
-// +----------------------------------------------------------------------+
-// | Licensed under the Apache License, Version 2.0 (the "License");      |
-// | you may not use this file except in compliance with the License.     |
-// | You may obtain a copy of the License at                              |
-// | http://www.apache.org/licenses/LICENSE-2.0                           |
-// | Unless required by applicable law or agreed to in writing, software  |
-// | distributed under the License is distributed on an "AS IS" BASIS,    |
-// | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or      |
-// | implied. See the License for the specific language governing         |
-// | permissions and limitations under the License.                       |
-// +----------------------------------------------------------------------+
-// | Author: Joshua Ferraro <jmf at liblime dot com>                      |
-// | Thanks to Bitflux GmbH <devel at bitflux dot ch>                     |
-// +----------------------------------------------------------------------+
-
-*/
-
-var liveSearchReq = false;
-var t = null;
-var liveSearchLast = "";
-	
-var isIE = false;
-// on !IE we only have to initialize it once
-if (window.XMLHttpRequest) {
-	liveSearchReq = new XMLHttpRequest();
-}
-
-function liveSearchInit() {
-	
-	if (navigator.userAgent.indexOf("Safari") > 0) {
-		document.getElementById('keyword').addEventListener("keydown",liveSearchKeyPress,false);
-//		document.getElementById('keyword').addEventListener("blur",liveSearchHide,false);
-	} else if (navigator.product == "Gecko") {
-		
-		document.getElementById('keyword').addEventListener("keypress",liveSearchKeyPress,false);
-		document.getElementById('keyword').addEventListener("blur",liveSearchHideDelayed,false);
-		
-	} else {
-		document.getElementById('keyword').attachEvent('onkeydown',liveSearchKeyPress);
-//		document.getElementById('keyword').attachEvent("onblur",liveSearchHide,false);
-		isIE = true;
-	}
-	
-	document.getElementById('keyword').setAttribute("autocomplete","off");
-
-}
-
-function liveSearchHideDelayed() {
-	window.setTimeout("liveSearchHide()",400);
-}
-	
-function liveSearchHide() {
-	document.getElementById("LSResult").style.display = "none";
-	var highlight = document.getElementById("LSHighlight");
-	if (highlight) {
-		highlight.removeAttribute("id");
-	}
-
-	//make visible the select box in IE
-	if (isIE) {
-		if (document.getElementById("id1")) {	
-			document.getElementById("id1").style.visibility = 'visible';
-			document.getElementById("id2").style.visibility = 'visible';
-		}
-	}
-}
-
-function liveSearchKeyPress(event) {
-
-	if (event.keyCode == 40 )
-	//KEY DOWN
-	{
-		highlight = document.getElementById("LSHighlight");
-		if (!highlight) {
-			highlight = document.getElementById("LSShadow").firstChild.firstChild;
-		} else {
-			highlight.removeAttribute("id");
-			highlight = highlight.nextSibling;
-		}
-		if (highlight) {
-			highlight.setAttribute("id","LSHighlight");
-		} 
-		if (!isIE) { event.preventDefault(); }
-	} 
-	//KEY UP
-	else if (event.keyCode == 38 ) {
-		highlight = document.getElementById("LSHighlight");
-		if (!highlight) {
-			highlight = document.getElementById("LSResult").firstChild.firstChild.lastChild;
-		} 
-		else {
-			highlight.removeAttribute("id");
-			highlight = highlight.previousSibling;
-		}
-		if (highlight) {
-				highlight.setAttribute("id","LSHighlight");
-		}
-		if (!isIE) { event.preventDefault(); }
-	} 
-	//ESC
-	else if (event.keyCode == 27) {
-		highlight = document.getElementById("LSHighlight");
-		if (highlight) {
-			highlight.removeAttribute("id");
-		}
-		document.getElementById("LSResult").style.display = "none";
-		
-		//make visible the select box in IE
-		if (isIE) {
-			if (document.getElementById("id1")) {	
-				document.getElementById("id1").style.visibility = 'visible';
-				document.getElementById("id2").style.visibility = 'visible';
-			}
-		}
-	} 
-}
-function liveSearchStart() {
-	if (t) {
-		window.clearTimeout(t);
-	}
-	t = window.setTimeout("liveSearchDoSearch()",100);
-}
-
-function liveSearchDoSearch() {
-
-	if (typeof liveSearchRoot == "undefined") {
-		liveSearchRoot = "";
-	}
-	if (typeof liveSearchRootSubDir == "undefined") {
-		liveSearchRootSubDir = "";
-	}
-	if (typeof liveSearchParams == "undefined") {
-		liveSearchParams = "";
-	}
-	if (liveSearchLast != document.forms.keyword.keyword.value) {
-	if (liveSearchReq && liveSearchReq.readyState < 4) {
-		liveSearchReq.abort();
-	}
-	if ( document.forms.keyword.keyword.value == "") {
-		liveSearchHide();
-		return false;
-	}
-	if (window.XMLHttpRequest) {
-	// branch for IE/Windows ActiveX version
-	} else if (window.ActiveXObject) {
-		liveSearchReq = new ActiveXObject("Microsoft.XMLHTTP");
-	}
-	liveSearchReq.onreadystatechange= liveSearchProcessReqChange;
-	liveSearchReq.open("GET", liveSearchRoot + "/cgi-bin/koha/livesearch.pl?value=" + document.forms.keyword.keyword.value + liveSearchParams);
-	liveSearchLast = document.forms.keyword.keyword.value;
-	liveSearchReq.send(null);
-	}
-}
-
-function liveSearchProcessReqChange() {
-	
-	if (liveSearchReq.readyState == 4) {
-		var  res = document.getElementById("LSResult");
-		res.style.display = "block";
-		var  sh = document.getElementById("LSShadow");
-		sh.innerHTML = liveSearchReq.responseText;
-
-		//hide the select box in IE
-		if (isIE) {
-			if (document.getElementById("id1")) {	
-				document.getElementById("id1").style.visibility = 'hidden';
-				document.getElementById("id2").style.visibility = 'hidden';
-			}
-		}
-		 
-	}
-}
-
-function liveSearchSubmit() {
-	var highlight = document.getElementById("LSHighlight");
-	if (highlight && highlight.firstChild) {
-		window.location = liveSearchRoot + liveSearchRootSubDir + highlight.firstChild.getAttribute("href");
-		return false;
-	} 
-	else {
-		return (document.keyword.keyword.value != '');
-	}
-}
-
-// for mouseovers
-function liveSearchHover(el) {
-		highlight = document.getElementById("LSHighlight");
-		if (highlight) {
-			highlight.removeAttribute("id");
-		}
-		el.setAttribute("id","LSHighlight");
-}
-
-function liveSearchClicked(el) {
-		highlight = document.getElementById("LSHighlight");
-		if (highlight) {
-			highlight.removeAttribute("id");
-		}
-		el.setAttribute("id","LSHighlight");
-		return liveSearchSubmit();
-}
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/main-top-addbiblio.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/main-top-addbiblio.inc
diff -N htdocs/intranet-tmpl/default/en/includes/main-top-addbiblio.inc
--- htdocs/intranet-tmpl/default/en/includes/main-top-addbiblio.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Koha Intranet</title>
-<!-- TMPL_IF NAME="TemplateEncoding" -->
-<meta http-equiv="Content-Type" content="text/html; charset=<!-- TMPL_VAR NAME='TemplateEncoding' -->" />
-<!-- TMPL_ELSE -->
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<!-- /TMPL_IF -->
-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
-<style type="text/css"> 
-	<!-- TMPL_IF NAME="intranetstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetstylesheet" -->);<!-- TMPL_ELSE -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="intranetcolorstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);<!-- /TMPL_IF -->
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/tabs.css);
-</style>
-<script language="JavaScript" type="text/javascript">
-<!-- Hide from old browsers
-function openWindow(targeturl, windowname) {
-// newwin =
-// window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
-	location.href = targeturl;
-}
- 
- 	var newwin;
-	
-	// Open the popup window if it doesn't already exist and give it focus.
-	function PopWin(targeturl, windowname) {
-	
-		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400");
-	  newwin.focus();
-	}
-	
-  // Set the value of the form field to the passed value and optionally shift
-	// focus and close the popup.
-	function FillForm(val,formname,formfield) {
-	
-		document.forms[formname].elements[formfield].value = val;
-
-		// Uncomment below to shift focus after clicking link in popup.
-		document.forms[formname].elements[formfield].focus();
-		
-		// Uncomment below to close popup after clicking link.
-		newwin.close();
-	}
- 
-// end hiding -->
-</script>
-</head>
-
-<body onload="showPanel(1);">

Index: htdocs/intranet-tmpl/default/en/includes/main-top-blank.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/main-top-blank.inc
diff -N htdocs/intranet-tmpl/default/en/includes/main-top-blank.inc
--- htdocs/intranet-tmpl/default/en/includes/main-top-blank.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Koha Intranet</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
-<style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/blank.css);
-</style>
-</head>
-
-<body>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/main-top-circ.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/main-top-circ.inc
diff -N htdocs/intranet-tmpl/default/en/includes/main-top-circ.inc
--- htdocs/intranet-tmpl/default/en/includes/main-top-circ.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Koha Intranet</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
-<style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
-</style>
-<script language="JavaScript" type="text/javascript">
-<!-- Hide from old browsers
-function openWindow(targeturl, windowname) {
-// newwin =
-// window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
-	location.href = targeturl;
-}
- 
- 	var newwin;
-	
-	// Open the popup window if it doesn't already exist and give it focus.
-	function PopWin(targeturl, windowname) {
-	
-		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400,scrollbars=yes,resizable=yes");
-	  newwin.focus();
-	}
-	
-  // Set the value of the form field to the passed value and optionally shift
-	// focus and close the popup.
-	function FillForm(val,formname,formfield) {
-	
-		document.forms[formname].elements[formfield].value = val;
-
-		// Uncomment below to shift focus after clicking link in popup.
-		document.forms[formname].elements[formfield].focus();
-		
-		// Uncomment below to close popup after clicking link.
-		newwin.close();
-	}
- 
-// end hiding -->
-</script>
-</head>
-
-<body onload="document.forms['mainform'].elements[0].focus();">
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/main-top-print.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/main-top-print.inc
diff -N htdocs/intranet-tmpl/default/en/includes/main-top-print.inc
--- htdocs/intranet-tmpl/default/en/includes/main-top-print.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Koha Intranet</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
-<style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/print.css);
-</style>
-</head>
-
-<body>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/main-top.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/main-top.inc
diff -N htdocs/intranet-tmpl/default/en/includes/main-top.inc
--- htdocs/intranet-tmpl/default/en/includes/main-top.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>NEULIS</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
-<style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
-</style>
-<script language="JavaScript" type="text/javascript">
-
-
-function openWindow(targeturl, windowname) {
-// newwin =
-// window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
-	location.href = targeturl;
-}
- 
- 	var newwin;
-	
-	// Open the popup window if it doesn't already exist and give it focus.
-	function PopWin(targeturl, windowname) {
-	
-		if (!newwin || newwin.closed) newwin = window.open(targeturl,windowname, "height=300,width=400,scrollbars=yes,resizable=yes");
-	  newwin.focus();
-	}
-	
-  // Set the value of the form field to the passed value and optionally shift
-	// focus and close the popup.
-	function FillForm(val,formname,formfield) {
-	
-		document.forms[formname].elements[formfield].value = val;
-
-		// Uncomment below to shift focus after clicking link in popup.
-		document.forms[formname].elements[formfield].focus();
-		
-		// Uncomment below to close popup after clicking link.
-		newwin.close();
-	}
- 
-
-</script>
-</head>
-
-<body>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/main.js
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/main.js
diff -N htdocs/intranet-tmpl/default/en/includes/main.js
--- htdocs/intranet-tmpl/default/en/includes/main.js	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-// one window.onload to rule them all
-
-window.onload=kohajs;
-
-// check to see if functions exist before loading them
-function kohajs() {
-  if ( typeof window.verify_images == "function" ) verify_images();
-//  if ( typeof window.liveSearchInit == "function" ) liveSearchInit();
-  if ( typeof window.runLSPrep == "function" ) runLSPrep();
-}

Index: htdocs/intranet-tmpl/default/en/includes/marc-editor.css
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/marc-editor.css
diff -N htdocs/intranet-tmpl/default/en/includes/marc-editor.css
--- htdocs/intranet-tmpl/default/en/includes/marc-editor.css	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,90 +0,0 @@
-div.tabbed {
-	border : 1px solid red;
-	/*position: absolute;*/
-	margin-left:5%;
-	width:90%;
-/*	display:block;*/
-}
-
-div.tabs {
-/*	border : 1px solid aqua;*/
-	float : left;
-	margin : 5px 0 0 0;
-/*	position:absolute;
-	margin-left: .5em;
-	margin-top:110px;*/
-}
-
-div.tabs a {
-	display:block;
-	background-color: #D8DEB8;
-	color: #000066;
-	font-weight : bold;
-	text-decoration : none;
-	border-bottom : 1px solid #999933;
-	border-left : 1px solid #999933;
-	border-right : 1px solid #FFFFCC;
-	border-top : 1px solid #FFFFCC;
-	margin : 0 0 2px 0;
-	padding: 10px 5px 10px 5px;
-}
-
-div.tabs a:hover {
-	background-color : #CCFF99;
-	border-left : 1px solid #000066;
-	border-bottom : 1px solid #000066;
-}
-
-div.tab {
-	background-color : #FFFFCC;
-	border : 1px solid #D8DEB8;
-	border-top : 1px solid #FFFFCC;
-	display: block;
-	visibility:hidden;
-	position : absolute;
-	margin : 5px 0 0 10px;
-	padding : 3px;
-	width : 70%;
-	/*margin-top:110px;*/
-}
-
-/* style for tag definition (e.g. 700 - Statement of responsibility) */
-.MARCtag { 
-	clear : left;
-	color : #000000;
-	background-color : #FFFFCC;
-	border-top : 5px solid #FFFFCC;
-	border-bottom : thin solid #CCCC99;
-	font-weight : bold;
-	font-size : .7em;
-	margin-top : 5px;
-}
-
-div.tab p {
-	margin : 3px;
-}	
-
-/* style for each subfield (e.g.: Publication year), just before the biblio subfield */
-.labelsubfield { 
-	background-color : #FFFFE1;
-/*	border : 1px solid red;*/
-	clear : left;
-	float : left;
-	font-size : .7em;
-	font-weight : normal;
-	width : 12em;
-	margin-left : 20px;
-	display : inline;
-}
-
-#loading {
-	position: absolute;
-	top: 3em;
-	left: 3em;
-	padding: 1em;
-	mozopacity: 50%;
-	background-color: #FFFFFF;
-	border: 10px solid #CCCC99;
-	font-size: 1.5em;
-	z-index: 999;
-	}
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/masthead.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/masthead.inc
diff -N htdocs/intranet-tmpl/default/en/includes/masthead.inc
--- htdocs/intranet-tmpl/default/en/includes/masthead.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-<div id="help">KOHA Intranet&nbsp;<span class="loggedin"><!-- TMPL_IF NAME="loggedinusername" -->Logged in as: <span class="loggedinusername"><!-- TMPL_VAR NAME="loggedinusername" --></span> | <a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a> | <!-- TMPL_ELSE -->You are not logged in | <!-- /TMPL_IF --></span><a href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">[ ? ]</a></div>

Index: htdocs/intranet-tmpl/default/en/includes/masthead_adv.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/masthead_adv.inc
diff -N htdocs/intranet-tmpl/default/en/includes/masthead_adv.inc
--- htdocs/intranet-tmpl/default/en/includes/masthead_adv.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-<div id="masthead">
-<h1><!-- TMPL_IF NAME="opacsmallimage" --><img alt="<!-- TMPL_VAR NAME="LibraryName" -->" src="<!-- TMPL_VAR NAME="opacsmallimage" -->" /><!-- /TMPL_IF -->Library Catalog Search</h1>
-<div class="menu"><a href="/cgi-bin/koha/opac-main.pl">Search Home</a> <!-- TMPL_IF NAME="opacbookbag" -->| <a href="" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections">Book Bag<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a><!-- /TMPL_IF --></div><br class="clear">
-
-<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><div id="members">
-	<ul>
-		<li>Logged in as <span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></li>
-		<!--TMPL_IF NAME="virtualshelves" --><li><a href="/cgi-bin/koha/opac-shelves.pl">My Virtual Shelves</a></li><!-- /TMPL_IF -->
-		<li><a href="/cgi-bin/koha/opac-user.pl">My Account</a></li>
-		<li><a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></li>
-	</ul>	
-</div>
-<!-- TMPL_ELSE -->
-	<div id="members">
-		<a class="card" href="/cgi-bin/koha/opac-user.pl">Log in to access<br /> cardholder features</a>
-	</div>
-<!-- /TMPL_IF -->
-<br class="clear" /><!-- /TMPL_IF -->
-</div>

Index: htdocs/intranet-tmpl/default/en/includes/members-topmenu.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/members-topmenu.inc
diff -N htdocs/intranet-tmpl/default/en/includes/members-topmenu.inc
--- htdocs/intranet-tmpl/default/en/includes/members-topmenu.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-<div id="topmenu"><a href="/cgi-bin/koha/members/members-home.pl">Patrons Home</a> | <form action="/cgi-bin/koha/members/member.pl" method="post">
-<label for="member">Patron Search</label>
-  <input type="text" id="member" name="member" value="" />&nbsp;<input type="submit"  class="submit" name="Go" value="Search" /></form><form action="/cgi-bin/koha/members/memberentry.pl" method="post">
-<input type="submit" class="submit" value="Add New Patron" />
-<input type="hidden" name="actionType" value="Add" />
-</form></div>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/menu-acqui.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/menu-acqui.inc
diff -N htdocs/intranet-tmpl/default/en/includes/menu-acqui.inc
--- htdocs/intranet-tmpl/default/en/includes/menu-acqui.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-<div id="nav">
-<ul><li><a href="/cgi-bin/koha/mainpage.pl">Home page</a></li></ul>
-    <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquitions home page</a></li>
-   <li> <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=0">Add supplier</a></li>
-   <li> <a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
-    <li><a href="/cgi-bin/koha/acqui/histsearch.pl">History search</a></li>
-    <li><a href="/cgi-bin/koha/suggestion/acceptorreject.pl">Manage suggestions</a></li>
-    <li><a href="/cgi-bin/koha/admin/aqbookfund.pl">Parameters</a></li>
-</div>

Index: htdocs/intranet-tmpl/default/en/includes/menu-admin.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/menu-admin.inc
diff -N htdocs/intranet-tmpl/default/en/includes/menu-admin.inc
--- htdocs/intranet-tmpl/default/en/includes/menu-admin.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-<div id="submenu">
-	<a href="/cgi-bin/koha/admin/systempreferences.pl">System pref</a>
-	<a href="/cgi-bin/koha/admin/branches.pl">Branches</a>
-	<a href="/cgi-bin/koha/admin/aqbookfund.pl">Funds</a>
-	<a href="/cgi-bin/koha/admin/currency.pl">Currencies</a>
-	<a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a>
-	<a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a>
-	<a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a>
-	<a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a>
-	<a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus</a>
-	<a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio Framework</a>
-	<a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links Koha-MARC DB</a>
-	<a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a>
-	<a href="/cgi-bin/koha/admin/printers.pl">Printers</a>
-	<a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a>
-	<a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a>
-	<a href="/cgi-bin/koha/import/breeding.pl">Reservoir</a>
-</div>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/menu-authorities.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/menu-authorities.inc
diff -N htdocs/intranet-tmpl/default/en/includes/menu-authorities.inc
--- htdocs/intranet-tmpl/default/en/includes/menu-authorities.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-<script language="JavaScript" type="text/javascript">
-function Help() {
-	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
-}
-
-function addauthority() {
-	X = document.forms[0].authtype.value;
-	window.location="/cgi-bin/koha/authorities/authorities.pl?authtypecode="+X;
-}
-function searchauthority() {
-	X = document.forms[0].authtype2.value;
-	Y = document.forms[0].value.value;
-	window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=contains";
-}
-</script>

Index: htdocs/intranet-tmpl/default/en/includes/menu-catalogue.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/menu-catalogue.inc
diff -N htdocs/intranet-tmpl/default/en/includes/menu-catalogue.inc
--- htdocs/intranet-tmpl/default/en/includes/menu-catalogue.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-<div id="submenu">
-	<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">Search</a>
-	<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet">Add biblio</a>
-	<a class="submenu serial" href="/cgi-bin/koha/serials/serials-home.pl">Subscriptions</a>
-	<a href="/cgi-bin/koha/serials/lateissues.pl">Late issues</a>
-	<a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual shelves</a>
-</div>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/menu-circ.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/menu-circ.inc
diff -N htdocs/intranet-tmpl/default/en/includes/menu-circ.inc
--- htdocs/intranet-tmpl/default/en/includes/menu-circ.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-<div id="submenu">
-    <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
-    <a href="/cgi-bin/koha/circ/circulation.pl">Issues</a>
-    <a href="/cgi-bin/koha/circ/returns.pl">Returns</a>
-    <a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a>
-    <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set branch</a>
-    <a href="/cgi-bin/koha/circ/branchreserves.pl">Waiting reserves</a>
-    <a href="/cgi-bin/koha/circ/waitingreservestransfers.pl">Transfers to do</a>
-    <a href="/cgi-bin/koha/circ/currenttransfers.pl">Transfers to recieve</a>
-</div>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/menu-main.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/menu-main.inc
diff -N htdocs/intranet-tmpl/default/en/includes/menu-main.inc
--- htdocs/intranet-tmpl/default/en/includes/menu-main.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-
-<div id="subnav">
- <ul>
-    <li>
-         <form name="formcirc" method="post" action="/cgi-bin/koha/circ/circulation.pl">
-        <label for="navfindborrower">Iss<span class="accesskey">u</span>e to:</label>
-        <input id="navfindborrower" name="findborrower" type="text" size="10" accesskey="u" />
-        <input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->
-        " />
-        <input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->
-        " />
-        <input type="submit" class="submit" value="Submit" />
-      </form>
-    </li></ul></li>
-<ul>
-    <li><a accesskey="r" href="/cgi-bin/koha/circ/returns.pl"><span class="accesskey">R</span>eturns</a>
-   <li> <a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></li></ul>
-  <ul><li><label>Reserve Section</label>
-<a href="/cgi-bin/koha/circ/rescirculation.pl">Issue</a></li>
-<li><label>Reserve Section </label><a href="/cgi-bin/koha/circ/resreturns.pl">Return</a></li></ul>
-<li><a href="/cgi-bin/koha/members/members-home.pl">Users</a>
-<ul><li><form name="fmember" action="/cgi-bin/koha/members/member.pl" method="post">
-	<label for="navmember">Search:</label><input id="navmember" type="text" size="10" name="member" />
-	<input type="submit" value="Search" class="submit" />
-
-	</form></li></ul></li>
-
-	<li><a href="/cgi-bin/koha/catalogue/catalogue-search.pl">Catalogue Search</a></li>
-<ul>
-<li><form name="form1" method="post" action="/cgi-bin/koha/catalogue/catalogue-search.pl"><input type="hidden" name="op" value="do_search" /><input type="hidden" name="search_type" value="precise" /><input type="hidden" name="zoom" value="0" /><input type="hidden" name="number_to_display" value="10" /><label><span class="accesskey">Barcode:</span></label><input type="text" id="barcode" name="barcode" size="10"  /><input type="submit" value="Search" class="submit"></form></li>
-<li><form name="form2" method="post" action="/cgi-bin/koha/catalogue/catalogue-search.pl"><input type="hidden" name="op" value="do_search" /><input type="hidden" name="kohafield" value="" /><input type="hidden" name="zoom" value="1" /><input type="hidden" name="MARC" value="0" /><input type="hidden" name="number_to_display" value="10" /><label><span class="accesskey">Keyword Search:</span></label><input type="text"  name="value" size="10"  /><input type="submit" value="Search" class="submit"></form></li>
-</ul>
-</div>
-<div id="main">
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/menu-members.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/menu-members.inc
diff -N htdocs/intranet-tmpl/default/en/includes/menu-members.inc
--- htdocs/intranet-tmpl/default/en/includes/menu-members.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-<div id="submenu">
- 	<a href="/cgi-bin/koha/members/members-home.pl">Search</a>
- 	<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A"/>Add adult</a>
- 	<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C"/>Add child</a>
- 	<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=P"/>Add prof</a>
- 	<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=I"/>Add org</a>
-</div>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/menu-serials.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/menu-serials.inc
diff -N htdocs/intranet-tmpl/default/en/includes/menu-serials.inc
--- htdocs/intranet-tmpl/default/en/includes/menu-serials.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-<div id="submenu">
-        <a href="/cgi-bin/koha/serials/serials-home.pl">home</a>
-        <a href="/cgi-bin/koha/serials/serial-issues.pl">Serials issues</a>
-        <a href="/cgi-bin/koha/serials/acqui-search.pl">Supplier search</a>
-        <a href="/cgi-bin/koha/serials/subscription-bib-search.pl">Subscription search</a>
-        <a href="/cgi-bin/koha/serials/subscription-bib-search.pl">Search subscription</a>
-        <a href="/cgi-bin/koha/serials/lateissues.pl">Late issue</a>
-        <a href="/cgi-bin/koha/serials/subscription-add.pl">Add a subscription</a>
-        <a href="/cgi-bin/koha/serials/viewalerts.pl">View alerts</a>
-</div>

Index: htdocs/intranet-tmpl/default/en/includes/menu-tools.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/menu-tools.inc
diff -N htdocs/intranet-tmpl/default/en/includes/menu-tools.inc
--- htdocs/intranet-tmpl/default/en/includes/menu-tools.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-<div id="submenu">
-    <a href="/cgi-bin/koha/tools/cities.pl">Cities</a>
-    <a href="/cgi-bin/koha/tools/holidays.pl">Holidays</a>
-    <a href="/cgi-bin/koha/tools/marc.pl">Export</a>
-    <a href="/cgi-bin/koha/import/breeding.pl">Reservoir</a>
-    <a href="/cgi-bin/koha/tools/barcodes.pl">Barcodes</a>
-</div>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/menus.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/menus.inc
diff -N htdocs/intranet-tmpl/default/en/includes/menus.inc
--- htdocs/intranet-tmpl/default/en/includes/menus.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-<script language="JavaScript" type="text/javascript">
-function _(s) { return s } // dummy function for gettext
-function Help() {
-	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
-}
-</script>
-<div id="mainmenu">
-	<a href="/cgi-bin/koha/mainpage.pl">Koha</a>
-	<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
-	<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a>
-	<a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
-	<a href="/cgi-bin/koha/members/members-home.pl">Members</a>
-	<a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
-	<a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a>
-	<a href="/cgi-bin/koha/admin/admin-home.pl">Parameters</a>
-	<a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
-	<a href="/cgi-bin/koha/about.pl">About</a>
-	<a href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>
-</div>
-
-<div id="librarian_information">
-<p><!-- TMPL_VAR name="loggedinusername" -->, from <!-- TMPL_VAR name="branchname" --></p>
-</div>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/popup-bottom.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/popup-bottom.inc
diff -N htdocs/intranet-tmpl/default/en/includes/popup-bottom.inc
--- htdocs/intranet-tmpl/default/en/includes/popup-bottom.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-</body>
-</html>

Index: htdocs/intranet-tmpl/default/en/includes/popup-top.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/popup-top.inc
diff -N htdocs/intranet-tmpl/default/en/includes/popup-top.inc
--- htdocs/intranet-tmpl/default/en/includes/popup-top.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-<title>popup</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/intranet.css">
-
-</head>
-
-<body>
-<!-- NO MENUS for popup-top -->

Index: htdocs/intranet-tmpl/default/en/includes/print.css
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/print.css
diff -N htdocs/intranet-tmpl/default/en/includes/print.css
--- htdocs/intranet-tmpl/default/en/includes/print.css	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,214 +0,0 @@
-a:link {
-	color : #000066;
-	text-decoration: none;
-}
-
-a:visited {
-	color : #000066;
-	text-decoration: none;
-}
-
-a:hover {
-	color : #993300;
-	text-decoration: none;
-}
-
-body {
-	background-color : #FFF;
-	color : #333333;
-	font-family : arial, geneva, sans-serif;
-	font-size : 14px;
-	margin : 0px 0px 0px 0px;
-}
-
-caption {
-	color : #000066;
-	font-size : 18px;
-	font-weight : bold;
-	margin-top : 5px;
-	text-align : left;
-}
-
-div.table {
-	width : 100%;
-}
-
-form {
-	margin : 0px;
-	padding : 0px;
-}
-
-h1
-	{
-	color : #000066;
-	font-size : 22px;
-	font-weight : bold;
-	margin-bottom : 3px;
-	margin-top : 3px;
-}
-
-h2 {
-	color : #000066;
-	font-size : 20px;
-	font-weight : bold;
-	margin-bottom : 3px;
-	margin-top : 3px;
-}
-
-h3 {
-	color : #000066;
-	font-size : 18px;
-	font-weight : bold;
-	margin-bottom : 3px;
-	margin-top : 3px;
-}
-
-h4 {
-	color : #000066;
-	font-size : 16px;
-	font-weight : bold;
-	margin-bottom : 3px;
-	margin-top : 3px;
-}
-
-h5 {
-	color : #000066;
-	font-size : 15px;
-	font-weight : bold;
-	margin-bottom : 1px;
-	margin-top : 1px;
-}
-
-h6 {
-	color : #000066;
-	font-size : 14px;
-	font-weight : bold;
-	margin-bottom : 1px;
-	margin-top : 1px;
-}
-
-table, table.list {
-	background-color : #FFFFFF;
-	border-bottom : 0px solid #CCCCCC;
-	border-collapse : collapse;
-	border-left : 0px solid #CCCCCC;
-	margin : 3px 0px 5px 0px;
-	padding : 0px;
-	width : 99%;
-}
-
-td {
-	background-color : #FFF;
-	border-bottom : 1px solid #CCCCCC;
-	border-right : 1px solid #CCCCCC;
-	font-size : 12px;
-	padding : 5px 5px 5px 5px;
-}
-
-td:last-child {
-	background-color : #FFF;
-	border-bottom : 1px solid #CCCCCC;
-	border-right : 0px solid #CCCCCC;
-	font-size : 12px;
-	padding : 5px 5px 5px 5px;
-}
-
-table.list th {
-	background-color : #FFFFFF;
-	text-align: left;
-	font-size: 12px;
-	font-weight: bold;
-	padding: 5px;
-	width : 25%;
-}
-
-th {
-	background-color : #E9E9E9;
-	border-bottom : 1px solid #CCCCCC;
-	border-right : 1px solid #CCCCCC;
-	font-size : 14px;
-	font-weight : bold;
-	padding : 5px 5px 5px 5px;
-}
-
-th:last-child {
-	background-color : #E9E9E9;
-	border-bottom : 1px solid #CCCCCC;
-	border-right : 0px solid #CCCCCC;
-	font-size : 14px;
-	font-weight : bold;
-	padding : 5px 5px 5px 5px;
-}
-
-td.input, div.form td, div.details td {
-	border-bottom : 1px solid #CCCCCC;
-	border-left : 0px;
-	border-right : 0px;
-	color : #000000;
-	line-height : 1.5em;
-	padding : 4px;
-	text-align : left;
-}
-
-td.label, div.form th, div.details th {
-	background-color : #FFF;
-	border-bottom : 1px solid #CCCCCC;
-	border-left : 1px solid #CCCCCC;
-	border-right : 0px;
-	border-top : 0px;
-	color : #000088;
-	font-weight : bold;
-	line-height : 1.5em;
-	padding : 4px;
-	text-align : right;
-	vertical-align : top;
-}
-
-tr.highlight {
-	background-color: #CCCCCC;
-}
-
-.cancel {
-	background-color : #993300;
-	color : #FFFFCC;
-	font-size : 12px;
-	font-weight : bold;
-	padding : 2px;
-}
-
-.error {
-	font-weight: bold;
-}
-
-.ex {
-	font-family : "Courier New", Courier, monospace;
-}
-.inline {
-	display : inline;
-}
-
-.print {
-	display : none;
-}
-
-.submit {
-	background-color : #669999;
-	color : #FFFFCC;
-	font-size : 12px;
-	font-weight : bold;
-	padding : 2px;
-}
-
-#main {
-	background-color : #FFF;
-	border-left : 0px solid #CCCC99;
-	margin-left : 2%;
-	margin-right : 2%;
-	margin-top : 1%;
-	padding : 5px;
-	position : relative;
-}
-
-tr.overdue {
-	font-weight : bold;
-}
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/rollovers.js
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/rollovers.js
diff -N htdocs/intranet-tmpl/default/en/includes/rollovers.js
--- htdocs/intranet-tmpl/default/en/includes/rollovers.js	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,61 +0,0 @@
-	 	if (document.images) {
-		home0 = new Image();
-		home0.src = "/intranet-tmpl/npl/en/images/home0.gif";
-		library0 = new Image();
-		library0.src = "/intranet-tmpl/npl/en/images/library0.gif";
-		kids0 = new Image();
-		kids0.src = "/intranet-tmpl/npl/en/images/kids0.gif";
-		teens0 = new Image();
-		teens0.src = "/intranet-tmpl/npl/en/images/teens0.gif";
-		readers0 = new Image();
-		readers0.src = "/intranet-tmpl/npl/en/images/readers0.gif";
-		search0 = new Image();
-		search0.src = "/intranet-tmpl/npl/en/images/search0.gif";
-		branch0 = new Image();
-		branch0.src = "/intranet-tmpl/npl/en/images/branch0.gif";
-		programs0 = new Image();
-		programs0.src = "/intranet-tmpl/npl/en/images/programs0.gif";
-		mobile0 = new Image();
-		mobile0.src = "/intranet-tmpl/npl/en/images/mobile0.gif";
-		OPLIN0 = new Image();
-		OPLIN0.src = "/intranet-tmpl/npl/en/images/OPLIN0.gif";
-		contact0 = new Image();
-		contact0.src = "/intranet-tmpl/npl/en/images/contact0.gif";
-		
-		home1 = new Image();
-		home1.src = "/intranet-tmpl/npl/en/images/home1.gif";
-		library1 = new Image();
-		library1.src = "/intranet-tmpl/npl/en/images/library1.gif";
-		kids1 = new Image();
-		kids1.src = "/intranet-tmpl/npl/en/images/kids1.gif";
-		teens1 = new Image();
-		teens1.src = "/intranet-tmpl/npl/en/images/teens1.gif";
-		readers1 = new Image();
-		readers1.src = "/intranet-tmpl/npl/en/images/readers1.gif";
-		search1 = new Image();
-		search1.src = "/intranet-tmpl/npl/en/images/search1.gif";;
-		branch1 = new Image();
-		branch1.src = "/intranet-tmpl/npl/en/images/branch1.gif";
-		programs1 = new Image();
-		programs1.src = "/intranet-tmpl/npl/en/images/programs1.gif";
-		mobile1 = new Image();
-		mobile1.src = "/intranet-tmpl/npl/en/images/mobile1.gif";
-		OPLIN1 = new Image();
-		OPLIN1.src = "/intranet-tmpl/npl/en/images/OPLIN1.gif";
-		contact1 = new Image();
-		contact1.src = "/intranet-tmpl/npl/en/images/contact1.gif";
-}
-
-// Function to 'activate' images.
-function imgOn(imgName) {
-	if (document.images) {
-		document[imgName].src = eval(imgName + "0.src");
-	}
-}
-
-// Function to 'deactivate' images.
-function imgOff(imgName) {
-	if (document.images) {
-		document[imgName].src = eval(imgName + "1.src");
-		}
-	}
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/search-topmenu.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/search-topmenu.inc
diff -N htdocs/intranet-tmpl/default/en/includes/search-topmenu.inc
--- htdocs/intranet-tmpl/default/en/includes/search-topmenu.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-<div id="topmenu"><a href="/cgi-bin/koha/search.marc/search.pl?type=intranet">Advanced Search</a> | <form name="f" method="post" action="/cgi-bin/koha/search.marc/search.pl"><input type="hidden" name="op" value="do_search" /><input type="hidden" name="type" value="intranet" /><input type="hidden" name="nbstatements" value="3" /><label for="keyword">Quick Search:</label><input type="hidden" name="marclist" value="" /><input type="hidden" name="and_or" value="and" /><input type="hidden" name="excluding" value="" /><input type="hidden" name="operator" value="contains" /><input type="text" id="keyword" name="value" size="10" /> <input type="submit" value="Start search" class="submit"></form> | <a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual Shelves</a></div>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/serials-menu.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/serials-menu.inc
diff -N htdocs/intranet-tmpl/default/en/includes/serials-menu.inc
--- htdocs/intranet-tmpl/default/en/includes/serials-menu.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-<div id="nav">
-    <ul>
-    <li><a href="/cgi-bin/koha/mainpage.pl">Home Page</a></li></ul>
-    <li><a href="/cgi-bin/koha/circ/circulation.pl">Issues</a></li>
-
-<li><a href="/cgi-bin/koha/members/members-home.pl">Users</a></li>
-	<li><a href="/cgi-bin/koha/catalogue/catalogue-home.pl">Catalogue search</a></li>
-<li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></li><ul>
-<li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials Home</a></li>
-<li><a href="/cgi-bin/koha/serials/subscription-add.pl">Add Subscription</a></li>
-<li><a href="/cgi-bin/koha/serials/lateissues.pl">Late Issues</a></li>
-<li><a href="/cgi-bin/koha/serials/claims.pl">Claims</a></li>
-<li><a href="#" onclick="javascript:window.open('/cgi-bin/koha/manual.pl','MARC','width=700 height=600,location=yes,toolbar=yes,scrollbars=yes');">MARC Manual</a></li></ul>
-
-
-<li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
-
-
-<!-- TMPL_IF NAME="loggedinusername" --><li>
-    Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> </li><ul><li><a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a></li></ul><!-- /TMPL_IF -->
-</li>
-</div>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/serials-topmenu.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/serials-topmenu.inc
diff -N htdocs/intranet-tmpl/default/en/includes/serials-topmenu.inc
--- htdocs/intranet-tmpl/default/en/includes/serials-topmenu.inc	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-<div id="topmenu">
-<a href="/cgi-bin/koha/serials/serials-home.pl">Serials Home</a> | 
-<a href="/cgi-bin/koha/serials/subscription-add.pl">Add Subscription</a> | 
-<a href="/cgi-bin/koha/serials/lateissues.pl">Late Issues</a> |
- <a href="/cgi-bin/koha/serials/serials-home.pl?routing=1">Create/Edit Routing List</a> |
- <a href="/cgi-bin/koha/serials/claims.pl">Claims</a>
-</div>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/tabs.css
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/tabs.css
diff -N htdocs/intranet-tmpl/default/en/includes/tabs.css
--- htdocs/intranet-tmpl/default/en/includes/tabs.css	10 Mar 2007 01:54:28 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,82 +0,0 @@
-
-
-.contentholder {
-	position: relative;
-	padding-top: 10px;
-	padding-right: 10px;	
-	padding-bottom: 10px;	
-	padding-left: 10px;	
-}
-
-.tabholder {
-	margin-top : 5px;
-	padding: 0;
-	position: relative;
-	z-index: 2;
-}
-.tab {
-	border: 2px;
-	border-color: #999999;
-	border-bottom-style: none;
-	line-height: 150%;
-	text-align: center;
-	padding: 4px 10px 4px 10px;
-	margin: 0;
-	cursor: pointer;
-	cursor: hand;
-	font-family: Arial, Helvetica,  sans-serif; 
-	font-size: 12px;
-	font-weight: bold;
-	background-color: #D8DEB8;
-	color: #000066;				 
-}
-
-.panelholder {
-	position: relative;
-	top: 3px;
-	z-index: 1;
-	width: 100%;
-	visibility: visible;
-	display: block;
-}
-
-.panelholder table {
-	font-family : Verdana, Geneva, Arial, sans-serif;
-}
-
-.panelholder table th {
-	background-color : #EFF1D8;
-	border-bottom : 1px solid #CCCC99;
-	border-right : 1px solid #CCCC99;
-	font-size : 80%;
-	font-weight : bold;
-	text-align : right;
-	width : 30%;
-}
-
-.panelholder table tr.mandatory td, .panelholder table tr.mandatory th {
-	background-color : #FFFFE1;
-	border-bottom : 1px dashed #990000;
-	border-left : 1px dashed #990000;
-	border-top : 1px dashed #990000;
-}
-
-.panelholder table tr.mandatory td:first-child {
-	border-left : 3px dotted #990000;
-}
-
-.panelholder table tr.mandatory td {
-	background-color : #EEF0DB;
-}
-
-.panel {
-	position: relative;
-	color: #000000;
-	background-color: #FFFFCC;
-	border: 2px;
-	border-color: #999999;
-	top: 0;
-	left: 0;
-	padding: 0 0 0 10px;
-	display: none;
-}
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/calendar/cal.gif
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/calendar/cal.gif
diff -N htdocs/intranet-tmpl/default/en/includes/calendar/cal.gif
Binary files /tmp/cvsTKRnX8 and /dev/null differ

Index: htdocs/intranet-tmpl/default/en/includes/calendar/calendar-en.js
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/calendar/calendar-en.js
diff -N htdocs/intranet-tmpl/default/en/includes/calendar/calendar-en.js
--- htdocs/intranet-tmpl/default/en/includes/calendar/calendar-en.js	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,127 +0,0 @@
-// ** I18N
-
-// Calendar EN language
-// Author: Mihai Bazon, <mishoo at infoiasi.ro>
-// Encoding: any
-// Distributed under the same terms as the calendar itself.
-
-// For translators: please use UTF-8 if possible.  We strongly believe that
-// Unicode is the answer to a real internationalized world.  Also please
-// include your contact information in the header, as can be seen above.
-
-// full day names
-Calendar._DN = new Array
-("Sunday",
- "Monday",
- "Tuesday",
- "Wednesday",
- "Thursday",
- "Friday",
- "Saturday",
- "Sunday");
-
-// Please note that the following array of short day names (and the same goes
-// for short month names, _SMN) isn't absolutely necessary.  We give it here
-// for exemplification on how one can customize the short day names, but if
-// they are simply the first N letters of the full name you can simply say:
-//
-//   Calendar._SDN_len = N; // short day name length
-//   Calendar._SMN_len = N; // short month name length
-//
-// If N = 3 then this is not needed either since we assume a value of 3 if not
-// present, to be compatible with translation files that were written before
-// this feature.
-
-// short day names
-Calendar._SDN = new Array
-("Sun",
- "Mon",
- "Tue",
- "Wed",
- "Thu",
- "Fri",
- "Sat",
- "Sun");
-
-// First day of the week. "0" means display Sunday first, "1" means display
-// Monday first, etc.
-Calendar._FD = 0;
-
-// full month names
-Calendar._MN = new Array
-("January",
- "February",
- "March",
- "April",
- "May",
- "June",
- "July",
- "August",
- "September",
- "October",
- "November",
- "December");
-
-// short month names
-Calendar._SMN = new Array
-("Jan",
- "Feb",
- "Mar",
- "Apr",
- "May",
- "Jun",
- "Jul",
- "Aug",
- "Sep",
- "Oct",
- "Nov",
- "Dec");
-
-// tooltips
-Calendar._TT = {};
-Calendar._TT["INFO"] = "About the calendar";
-
-Calendar._TT["ABOUT"] =
-"DHTML Date/Time Selector\n" +
-"(c) dynarch.com 2002-2003\n" + // don't translate this this ;-)
-"For latest version visit: http://dynarch.com/mishoo/calendar.epl\n" +
-"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
-"\n\n" +
-"Date selection:\n" +
-"- Use the \xab, \xbb buttons to select year\n" +
-"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
-"- Hold mouse button on any of the above buttons for faster selection.";
-Calendar._TT["ABOUT_TIME"] = "\n\n" +
-"Time selection:\n" +
-"- Click on any of the time parts to increase it\n" +
-"- or Shift-click to decrease it\n" +
-"- or click and drag for faster selection.";
-
-Calendar._TT["PREV_YEAR"] = "Prev. year (hold for menu)";
-Calendar._TT["PREV_MONTH"] = "Prev. month (hold for menu)";
-Calendar._TT["GO_TODAY"] = "Go Today";
-Calendar._TT["NEXT_MONTH"] = "Next month (hold for menu)";
-Calendar._TT["NEXT_YEAR"] = "Next year (hold for menu)";
-Calendar._TT["SEL_DATE"] = "Select date";
-Calendar._TT["DRAG_TO_MOVE"] = "Drag to move";
-Calendar._TT["PART_TODAY"] = " (today)";
-
-// the following is to inform that "%s" is to be the first day of week
-// %s will be replaced with the day name.
-Calendar._TT["DAY_FIRST"] = "Display %s first";
-
-// This may be locale-dependent.  It specifies the week-end days, as an array
-// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
-// means Monday, etc.
-Calendar._TT["WEEKEND"] = "0,6";
-
-Calendar._TT["CLOSE"] = "Close";
-Calendar._TT["TODAY"] = "Today";
-Calendar._TT["TIME_PART"] = "(Shift-)Click or drag to change value";
-
-// date formats
-Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
-Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
-
-Calendar._TT["WK"] = "wk";
-Calendar._TT["TIME"] = "Time:";

Index: htdocs/intranet-tmpl/default/en/includes/calendar/calendar-setup.js
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/calendar/calendar-setup.js
diff -N htdocs/intranet-tmpl/default/en/includes/calendar/calendar-setup.js
--- htdocs/intranet-tmpl/default/en/includes/calendar/calendar-setup.js	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,181 +0,0 @@
-/*  Copyright Mihai Bazon, 2002, 2003  |  http://dynarch.com/mishoo/
- * ---------------------------------------------------------------------------
- *
- * The DHTML Calendar
- *
- * Details and latest version at:
- * http://dynarch.com/mishoo/calendar.epl
- *
- * This script is distributed under the GNU Lesser General Public License.
- * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
- *
- * This file defines helper functions for setting up the calendar.  They are
- * intended to help non-programmers get a working calendar on their site
- * quickly.  This script should not be seen as part of the calendar.  It just
- * shows you what one can do with the calendar, while in the same time
- * providing a quick and simple method for setting it up.  If you need
- * exhaustive customization of the calendar creation process feel free to
- * modify this code to suit your needs (this is recommended and much better
- * than modifying calendar.js itself).
- */
-
-// $Id: calendar-setup.js,v 1.1.2.1 2007/03/10 01:54:29 tgarip1957 Exp $
-
-/**
- *  This function "patches" an input field (or other element) to use a calendar
- *  widget for date selection.
- *
- *  The "params" is a single object that can have the following properties:
- *
- *    prop. name   | description
- *  -------------------------------------------------------------------------------------------------
- *   inputField    | the ID of an input field to store the date
- *   displayArea   | the ID of a DIV or other element to show the date
- *   button        | ID of a button or other element that will trigger the calendar
- *   eventName     | event that will trigger the calendar, without the "on" prefix (default: "click")
- *   ifFormat      | date format that will be stored in the input field
- *   daFormat      | the date format that will be used to display the date in displayArea
- *   singleClick   | (true/false) wether the calendar is in single click mode or not (default: true)
- *   firstDay      | numeric: 0 to 6.  "0" means display Sunday first, "1" means display Monday first, etc.
- *   align         | alignment (default: "Br"); if you don't know what's this see the calendar documentation
- *   range         | array with 2 elements.  Default: [1900, 2999] -- the range of years available
- *   weekNumbers   | (true/false) if it's true (default) the calendar will display week numbers
- *   flat          | null or element ID; if not null the calendar will be a flat calendar having the parent with the given ID
- *   flatCallback  | function that receives a JS Date object and returns an URL to point the browser to (for flat calendar)
- *   disableFunc   | function that receives a JS Date object and should return true if that date has to be disabled in the calendar
- *   onSelect      | function that gets called when a date is selected.  You don't _have_ to supply this (the default is generally okay)
- *   onClose       | function that gets called when the calendar is closed.  [default]
- *   onUpdate      | function that gets called after the date is updated in the input field.  Receives a reference to the calendar.
- *   date          | the date that the calendar will be initially displayed to
- *   showsTime     | default: false; if true the calendar will include a time selector
- *   timeFormat    | the time format; can be "12" or "24", default is "12"
- *   electric      | if true (default) then given fields/date areas are updated for each move; otherwise they're updated only on close
- *   step          | configures the step of the years in drop-down boxes; default: 2
- *   position      | configures the calendar absolute position; default: null
- *   cache         | if "true" (but default: "false") it will reuse the same calendar object, where possible
- *   showOthers    | if "true" (but default: "false") it will show days from other months too
- *
- *  None of them is required, they all have default values.  However, if you
- *  pass none of "inputField", "displayArea" or "button" you'll get a warning
- *  saying "nothing to setup".
- */
-Calendar.setup = function (params) {
-	function param_default(pname, def) { if (typeof params[pname] == "undefined") { params[pname] = def; } };
-
-	param_default("inputField",     null);
-	param_default("displayArea",    null);
-	param_default("button",         null);
-	param_default("eventName",      "click");
-	param_default("ifFormat",       "%Y/%m/%d");
-	param_default("daFormat",       "%Y/%m/%d");
-	param_default("singleClick",    true);
-	param_default("disableFunc",    'dateStatusHandler');
-	param_default("dateStatusFunc", params["disableFunc"]);	// takes precedence if both are defined
-	param_default("firstDay",       0); // defaults to "Sunday" first
-	param_default("align",          "Br");
-	param_default("range",          [1900, 2999]);
-	param_default("weekNumbers",    true);
-	param_default("flat",           null);
-	param_default("flatCallback",   null);
-	param_default("onSelect",       null);
-	param_default("onClose",        null);
-	param_default("onUpdate",       null);
-	param_default("date",           null);
-	param_default("showsTime",      false);
-	param_default("timeFormat",     "24");
-	param_default("electric",       true);
-	param_default("step",           2);
-	param_default("position",       null);
-	param_default("cache",          false);
-	param_default("showOthers",     false);
-
-	var tmp = ["inputField", "displayArea", "button"];
-	for (var i in tmp) {
-		if (typeof params[tmp[i]] == "string") {
-			params[tmp[i]] = document.getElementById(params[tmp[i]]);
-		}
-	}
-	if (!(params.flat || params.inputField || params.displayArea || params.button)) {
-		alert("Calendar.setup:\n  Nothing to setup (no fields found).  Please check your code");
-		return false;
-	}
-
-	function onSelect(cal) {
-		var p = cal.params;
-		var update = (cal.dateClicked || p.electric);
-		if (update && p.flat) {
-			if (typeof p.flatCallback == "function")
-				p.flatCallback(cal);
-			else
-				alert("No flatCallback given -- doing nothing.");
-			return false;
-		}
-		if (update && p.inputField) {
-			p.inputField.value = cal.date.print(p.ifFormat);
-			if (typeof p.inputField.onchange == "function")
-				p.inputField.onchange();
-		}
-		if (update && p.displayArea)
-			p.displayArea.innerHTML = cal.date.print(p.daFormat);
-		if (update && p.singleClick && cal.dateClicked)
-			cal.callCloseHandler();
-		if (update && typeof p.onUpdate == "function")
-			p.onUpdate(cal);
-	};
-
-	if (params.flat != null) {
-		if (typeof params.flat == "string")
-			params.flat = document.getElementById(params.flat);
-		if (!params.flat) {
-			alert("Calendar.setup:\n  Flat specified but can't find parent.");
-			return false;
-		}
-		var cal = new Calendar(params.firstDay, params.date, params.onSelect || onSelect);
-		cal.showsTime = params.showsTime;
-		cal.time24 = (params.timeFormat == "24");
-		cal.params = params;
-		cal.weekNumbers = params.weekNumbers;
-		cal.setRange(params.range[0], params.range[1]);
-		cal.setDateStatusHandler(params.dateStatusFunc);
-		cal.create(params.flat);
-		cal.show();
-		return false;
-	}
-
-	var triggerEl = params.button || params.displayArea || params.inputField;
-	triggerEl["on" + params.eventName] = function() {
-		var dateEl = params.inputField || params.displayArea;
-		var dateFmt = params.inputField ? params.ifFormat : params.daFormat;
-		var mustCreate = false;
-		var cal = window.calendar;
-		if (!(cal && params.cache)) {
-			window.calendar = cal = new Calendar(params.firstDay,
-							     params.date,
-							     params.onSelect || onSelect,
-							     params.onClose || function(cal) { cal.hide(); });
-			cal.showsTime = params.showsTime;
-			cal.time24 = (params.timeFormat == "24");
-			cal.weekNumbers = params.weekNumbers;
-			mustCreate = true;
-		} else {
-			if (params.date)
-				cal.setDate(params.date);
-			cal.hide();
-		}
-		cal.showsOtherMonths = params.showOthers;
-		cal.yearStep = params.step;
-		cal.setRange(params.range[0], params.range[1]);
-		cal.params = params;
-		cal.setDateStatusHandler(params.dateStatusFunc);
-		cal.setDateFormat(dateFmt);
-		if (mustCreate)
-			cal.create();
-		cal.parseDate(dateEl.value || dateEl.innerHTML);
-		cal.refresh();
-		if (!params.position)
-			cal.showAtElement(params.button || params.displayArea || params.inputField, params.align);
-		else
-			cal.showAt(params.position[0], params.position[1]);
-		return false;
-	};
-};

Index: htdocs/intranet-tmpl/default/en/includes/calendar/calendar-system.css
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/calendar/calendar-system.css
diff -N htdocs/intranet-tmpl/default/en/includes/calendar/calendar-system.css
--- htdocs/intranet-tmpl/default/en/includes/calendar/calendar-system.css	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,254 +0,0 @@
-/* The main calendar widget.  DIV containing a table. */
-
-.calendar {
-  position: relative;
-  display: none;
-  border: 1px solid;
-  border-color: #fff #000 #000 #fff;
-  font-size: 11px;
-  cursor: default;
-  background: Window;
-  color: WindowText;
-  font-family: tahoma,verdana,sans-serif;
-  width:250px;
-}
-
-.calendar table {
-  border: 1px solid;
-  border-color: #fff #000 #000 #fff;
-  font-size: 11px;
-  cursor: default;
-  background: Window;
-  color: WindowText;
-  font-family: tahoma,verdana,sans-serif;
-  border-collapse:separate;
-}
-
-/* Header part -- contains navigation buttons and day names. */
-
-.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
-  text-align: center;
-  padding: 1px;
-  border: 1px solid;
-  display: table-cell;
-  -moz-border-radius: 0px;
-  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
-  background: ButtonFace;
-}
-
-.calendar .nav {
-  background: ButtonFace url('menuarrow.gif') no-repeat 100% 100%;
-}
-
-.calendar thead .title { /* This holds the current "month, year" */
-  font-weight: bold;
-  padding: 1px;
-  border: 1px solid #000;
-  background: ActiveCaption;
-  color: CaptionText;
-  text-align: center;
-}
-
-.calendar thead .headrow { /* Row <TR> containing navigation buttons */
-}
-
-.calendar thead .daynames { /* Row <TR> containing the day names */
-}
-
-.calendar thead .name { /* Cells <TD> containing the day names */
-  border-bottom: 1px solid ButtonShadow;
-  padding: 2px;
-  text-align: center;
-  background: ButtonFace;
-  color: ButtonText;
-}
-
-.calendar thead .weekend { /* How a weekend day name shows in header */
-//  color: #f00;
-}
-
-.calendar thead .hilite { /* How do the buttons in header appear when hover */
-  border: 2px solid;
-  padding: 0px;
-  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
-}
-
-.calendar thead .active { /* Active (pressed) buttons in header */
-  border-width: 1px;
-  padding: 2px 0px 0px 2px;
-  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-}
-
-/* The body part -- contains all the days in month. */
-
-.calendar tbody .day { /* Cells <TD> containing month days dates */
-  width: 2em;
-  text-align: right;
-  padding: 2px 4px 2px 2px;
-}
-.calendar tbody .day.othermonth {
-  font-size: 80%;
-  color: #aaa;
-}
-.calendar tbody .day.othermonth.oweekend {
-  color: #faa;
-}
-
-.calendar table .wn {
-  padding: 2px 3px 2px 2px;
-  border-right: 1px solid ButtonShadow;
-  background: ButtonFace;
-  color: ButtonText;
-}
-
-.calendar tbody .rowhilite td {
-//  background: Highlight;
-//  color: HighlightText;
-}
-
-.calendar tbody td.hilite { /* Hovered cells <TD> */
-  padding: 1px 3px 1px 1px;
-  border-top: 1px solid #fff;
-  border-right: 1px solid #000;
-  border-bottom: 1px solid #000;
-  border-left: 1px solid #fff;
-}
-
-.calendar tbody td.active { /* Active (pressed) cells <TD> */
-//  padding: 2px 2px 0px 2px;
-//  border: 1px solid;
-//  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-}
-
-.calendar tbody td.selected { /* Cell showing selected date */
-  font-weight: bold;
-  border: 1px solid;
-  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-  padding: 2px 2px 0px 2px;
-  background: ButtonFace;
-  color: ButtonText;
-}
-
-.calendar tbody td.weekend { /* Cells showing weekend days */
-//  color: #f00;
-}
-
-.calendar tbody td.today { /* Cell showing today date */
-  font-weight: bold;
-  color: #00f;
-}
-
-.calendar tbody td.disabled { color: GrayText; }
-
-.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
-  visibility: hidden;
-}
-
-.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
-  display: none;
-}
-
-/* The footer part -- status bar and "Close" button */
-
-.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
-}
-
-.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
-  background: ButtonFace;
-  padding: 1px;
-  border: 1px solid;
-  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-  color: ButtonText;
-  text-align: center;
-}
-
-.calendar tfoot .hilite { /* Hover style for buttons in footer */
-  border-top: 1px solid #fff;
-  border-right: 1px solid #000;
-  border-bottom: 1px solid #000;
-  border-left: 1px solid #fff;
-  padding: 1px;
-  background: #e4e0d8;
-}
-
-.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
-  padding: 2px 0px 0px 2px;
-  border-top: 1px solid #000;
-  border-right: 1px solid #fff;
-  border-bottom: 1px solid #fff;
-  border-left: 1px solid #000;
-}
-
-/* Combo boxes (menus that display months/years for direct selection) */
-
-.calendar .combo {
-  position: absolute;
-  display: none;
-  width: 4em;
-  top: 0px;
-  left: 0px;
-  cursor: default;
-  border: 1px solid;
-  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
-  background: Menu;
-  color: MenuText;
-  font-size: 90%;
-  padding: 1px;
-}
-
-.calendar .combo .label,
-.calendar .combo .label-IEfix {
-  text-align: center;
-  padding: 1px;
-}
-
-.calendar .combo .label-IEfix {
-  width: 4em;
-}
-
-.calendar .combo .active {
-  padding: 0px;
-  border: 1px solid #000;
-}
-
-.calendar .combo .hilite {
-  background: Highlight;
-  color: HighlightText;
-}
-
-.calendar td.time {
-  border-top: 1px solid ButtonShadow;
-  padding: 1px 0px;
-  text-align: center;
-  background-color: ButtonFace;
-}
-
-.calendar td.time .hour,
-.calendar td.time .minute,
-.calendar td.time .ampm {
-  padding: 0px 3px 0px 4px;
-  border: 1px solid #889;
-  font-weight: bold;
-  background-color: Menu;
-}
-
-.calendar td.time .ampm {
-  text-align: center;
-}
-
-.calendar td.time .colon {
-  padding: 0px 2px 0px 3px;
-  font-weight: bold;
-}
-
-.calendar td.time span.hilite {
-  border-color: #000;
-  background-color: Highlight;
-  color: HighlightText;
-}
-
-.calendar td.time span.active {
-  border-color: #f00;
-  background-color: #000;
-  color: #0f0;
-}
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/calendar/calendar.js
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/calendar/calendar.js
diff -N htdocs/intranet-tmpl/default/en/includes/calendar/calendar.js
--- htdocs/intranet-tmpl/default/en/includes/calendar/calendar.js	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,1715 +0,0 @@
-/*  Copyright Mihai Bazon, 2002, 2003  |  http://dynarch.com/mishoo/
- * ------------------------------------------------------------------
- *
- * The DHTML Calendar, version 0.9.6 "Keep cool but don't freeze"
- *
- * Details and latest version at:
- * http://dynarch.com/mishoo/calendar.epl
- *
- * This script is distributed under the GNU Lesser General Public License.
- * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
- */
-
-// $Id: calendar.js,v 1.1.2.1 2007/03/10 01:54:29 tgarip1957 Exp $
-
-/** The Calendar object constructor. */
-Calendar = function (firstDayOfWeek, dateStr, onSelected, onClose) {
-	// member variables
-	this.activeDiv = null;
-	this.currentDateEl = null;
-	this.getDateStatus = null;
-	this.timeout = null;
-	this.onSelected = onSelected || null;
-	this.onClose = onClose || null;
-	this.dragging = false;
-	this.hidden = false;
-	this.minYear = 1970;
-	this.maxYear = 2050;
-	this.dateFormat = Calendar._TT["DEF_DATE_FORMAT"];
-	this.ttDateFormat = Calendar._TT["TT_DATE_FORMAT"];
-	this.isPopup = true;
-	this.weekNumbers = true;
-	this.firstDayOfWeek = firstDayOfWeek; // 0 for Sunday, 1 for Monday, etc.
-	this.showsOtherMonths = false;
-	this.dateStr = dateStr;
-	this.ar_days = null;
-	this.showsTime = false;
-	this.time24 = true;
-	this.yearStep = 2;
-	// HTML elements
-	this.table = null;
-	this.element = null;
-	this.tbody = null;
-	this.firstdayname = null;
-	// Combo boxes
-	this.monthsCombo = null;
-	this.yearsCombo = null;
-	this.hilitedMonth = null;
-	this.activeMonth = null;
-	this.hilitedYear = null;
-	this.activeYear = null;
-	// Information
-	this.dateClicked = false;
-
-	// one-time initializations
-	if (typeof Calendar._SDN == "undefined") {
-		// table of short day names
-		if (typeof Calendar._SDN_len == "undefined")
-			Calendar._SDN_len = 3;
-		var ar = new Array();
-		for (var i = 8; i > 0;) {
-			ar[--i] = Calendar._DN[i].substr(0, Calendar._SDN_len);
-		}
-		Calendar._SDN = ar;
-		// table of short month names
-		if (typeof Calendar._SMN_len == "undefined")
-			Calendar._SMN_len = 3;
-		ar = new Array();
-		for (var i = 12; i > 0;) {
-			ar[--i] = Calendar._MN[i].substr(0, Calendar._SMN_len);
-		}
-		Calendar._SMN = ar;
-	}
-};
-
-// ** constants
-
-/// "static", needed for event handlers.
-Calendar._C = null;
-
-/// detect a special case of "web browser"
-Calendar.is_ie = ( /msie/i.test(navigator.userAgent) &&
-		   !/opera/i.test(navigator.userAgent) );
-
-Calendar.is_ie5 = ( Calendar.is_ie && /msie 5\.0/i.test(navigator.userAgent) );
-
-/// detect Opera browser
-Calendar.is_opera = /opera/i.test(navigator.userAgent);
-
-/// detect KHTML-based browsers
-Calendar.is_khtml = /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
-
-// BEGIN: UTILITY FUNCTIONS; beware that these might be moved into a separate
-//        library, at some point.
-
-Calendar.getAbsolutePos = function(el) {
-	var SL = 0, ST = 0;
-	var is_div = /^div$/i.test(el.tagName);
-	if (is_div && el.scrollLeft)
-		SL = el.scrollLeft;
-	if (is_div && el.scrollTop)
-		ST = el.scrollTop;
-	var r = { x: el.offsetLeft - SL, y: el.offsetTop - ST };
-	if (el.offsetParent) {
-		var tmp = this.getAbsolutePos(el.offsetParent);
-		r.x += tmp.x;
-		r.y += tmp.y;
-	}
-	return r;
-};
-
-Calendar.isRelated = function (el, evt) {
-	var related = evt.relatedTarget;
-	if (!related) {
-		var type = evt.type;
-		if (type == "mouseover") {
-			related = evt.fromElement;
-		} else if (type == "mouseout") {
-			related = evt.toElement;
-		}
-	}
-	while (related) {
-		if (related == el) {
-			return true;
-		}
-		related = related.parentNode;
-	}
-	return false;
-};
-
-Calendar.removeClass = function(el, className) {
-	if (!(el && el.className)) {
-		return;
-	}
-	var cls = el.className.split(" ");
-	var ar = new Array();
-	for (var i = cls.length; i > 0;) {
-		if (cls[--i] != className) {
-			ar[ar.length] = cls[i];
-		}
-	}
-	el.className = ar.join(" ");
-};
-
-Calendar.addClass = function(el, className) {
-	Calendar.removeClass(el, className);
-	el.className += " " + className;
-};
-
-Calendar.getElement = function(ev) {
-	if (Calendar.is_ie) {
-		return window.event.srcElement;
-	} else {
-		return ev.currentTarget;
-	}
-};
-
-Calendar.getTargetElement = function(ev) {
-	if (Calendar.is_ie) {
-		return window.event.srcElement;
-	} else {
-		return ev.target;
-	}
-};
-
-Calendar.stopEvent = function(ev) {
-	ev || (ev = window.event);
-	if (Calendar.is_ie) {
-		ev.cancelBubble = true;
-		ev.returnValue = false;
-	} else {
-		ev.preventDefault();
-		ev.stopPropagation();
-	}
-	return false;
-};
-
-Calendar.addEvent = function(el, evname, func) {
-	if (el.attachEvent) { // IE
-		el.attachEvent("on" + evname, func);
-	} else if (el.addEventListener) { // Gecko / W3C
-		el.addEventListener(evname, func, true);
-	} else {
-		el["on" + evname] = func;
-	}
-};
-
-Calendar.removeEvent = function(el, evname, func) {
-	if (el.detachEvent) { // IE
-		el.detachEvent("on" + evname, func);
-	} else if (el.removeEventListener) { // Gecko / W3C
-		el.removeEventListener(evname, func, true);
-	} else {
-		el["on" + evname] = null;
-	}
-};
-
-Calendar.createElement = function(type, parent) {
-	var el = null;
-	if (document.createElementNS) {
-		// use the XHTML namespace; IE won't normally get here unless
-		// _they_ "fix" the DOM2 implementation.
-		el = document.createElementNS("http://www.w3.org/1999/xhtml", type);
-	} else {
-		el = document.createElement(type);
-	}
-	if (typeof parent != "undefined") {
-		parent.appendChild(el);
-	}
-	return el;
-};
-
-// END: UTILITY FUNCTIONS
-
-// BEGIN: CALENDAR STATIC FUNCTIONS
-
-/** Internal -- adds a set of events to make some element behave like a button. */
-Calendar._add_evs = function(el) {
-	with (Calendar) {
-		addEvent(el, "mouseover", dayMouseOver);
-		addEvent(el, "mousedown", dayMouseDown);
-		addEvent(el, "mouseout", dayMouseOut);
-		if (is_ie) {
-			addEvent(el, "dblclick", dayMouseDblClick);
-			el.setAttribute("unselectable", true);
-		}
-	}
-};
-
-Calendar.findMonth = function(el) {
-	if (typeof el.month != "undefined") {
-		return el;
-	} else if (typeof el.parentNode.month != "undefined") {
-		return el.parentNode;
-	}
-	return null;
-};
-
-Calendar.findYear = function(el) {
-	if (typeof el.year != "undefined") {
-		return el;
-	} else if (typeof el.parentNode.year != "undefined") {
-		return el.parentNode;
-	}
-	return null;
-};
-
-Calendar.showMonthsCombo = function () {
-	var cal = Calendar._C;
-	if (!cal) {
-		return false;
-	}
-	var cal = cal;
-	var cd = cal.activeDiv;
-	var mc = cal.monthsCombo;
-	if (cal.hilitedMonth) {
-		Calendar.removeClass(cal.hilitedMonth, "hilite");
-	}
-	if (cal.activeMonth) {
-		Calendar.removeClass(cal.activeMonth, "active");
-	}
-	var mon = cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];
-	Calendar.addClass(mon, "active");
-	cal.activeMonth = mon;
-	var s = mc.style;
-	s.display = "block";
-	if (cd.navtype < 0)
-		s.left = cd.offsetLeft + "px";
-	else {
-		var mcw = mc.offsetWidth;
-		if (typeof mcw == "undefined")
-			// Konqueror brain-dead techniques
-			mcw = 50;
-		s.left = (cd.offsetLeft + cd.offsetWidth - mcw) + "px";
-	}
-	s.top = (cd.offsetTop + cd.offsetHeight) + "px";
-};
-
-Calendar.showYearsCombo = function (fwd) {
-	var cal = Calendar._C;
-	if (!cal) {
-		return false;
-	}
-	var cal = cal;
-	var cd = cal.activeDiv;
-	var yc = cal.yearsCombo;
-	if (cal.hilitedYear) {
-		Calendar.removeClass(cal.hilitedYear, "hilite");
-	}
-	if (cal.activeYear) {
-		Calendar.removeClass(cal.activeYear, "active");
-	}
-	cal.activeYear = null;
-	var Y = cal.date.getFullYear() + (fwd ? 1 : -1);
-	var yr = yc.firstChild;
-	var show = false;
-	for (var i = 12; i > 0; --i) {
-		if (Y >= cal.minYear && Y <= cal.maxYear) {
-			yr.firstChild.data = Y;
-			yr.year = Y;
-			yr.style.display = "block";
-			show = true;
-		} else {
-			yr.style.display = "none";
-		}
-		yr = yr.nextSibling;
-		Y += fwd ? cal.yearStep : -cal.yearStep;
-	}
-	if (show) {
-		var s = yc.style;
-		s.display = "block";
-		if (cd.navtype < 0)
-			s.left = cd.offsetLeft + "px";
-		else {
-			var ycw = yc.offsetWidth;
-			if (typeof ycw == "undefined")
-				// Konqueror brain-dead techniques
-				ycw = 50;
-			s.left = (cd.offsetLeft + cd.offsetWidth - ycw) + "px";
-		}
-		s.top = (cd.offsetTop + cd.offsetHeight) + "px";
-	}
-};
-
-// event handlers
-
-Calendar.tableMouseUp = function(ev) {
-	var cal = Calendar._C;
-	if (!cal) {
-		return false;
-	}
-	if (cal.timeout) {
-		clearTimeout(cal.timeout);
-	}
-	var el = cal.activeDiv;
-	if (!el) {
-		return false;
-	}
-	var target = Calendar.getTargetElement(ev);
-	ev || (ev = window.event);
-	Calendar.removeClass(el, "active");
-	if (target == el || target.parentNode == el) {
-		Calendar.cellClick(el, ev);
-	}
-	var mon = Calendar.findMonth(target);
-	var date = null;
-	if (mon) {
-		date = new Date(cal.date);
-		if (mon.month != date.getMonth()) {
-			date.setMonth(mon.month);
-			cal.setDate(date);
-			cal.dateClicked = false;
-			cal.callHandler();
-		}
-	} else {
-		var year = Calendar.findYear(target);
-		if (year) {
-			date = new Date(cal.date);
-			if (year.year != date.getFullYear()) {
-				date.setFullYear(year.year);
-				cal.setDate(date);
-				cal.dateClicked = false;
-				cal.callHandler();
-			}
-		}
-	}
-	with (Calendar) {
-		removeEvent(document, "mouseup", tableMouseUp);
-		removeEvent(document, "mouseover", tableMouseOver);
-		removeEvent(document, "mousemove", tableMouseOver);
-		cal._hideCombos();
-		_C = null;
-		return stopEvent(ev);
-	}
-};
-
-Calendar.tableMouseOver = function (ev) {
-	var cal = Calendar._C;
-	if (!cal) {
-		return;
-	}
-	var el = cal.activeDiv;
-	var target = Calendar.getTargetElement(ev);
-	if (target == el || target.parentNode == el) {
-		Calendar.addClass(el, "hilite active");
-		Calendar.addClass(el.parentNode, "rowhilite");
-	} else {
-		if (typeof el.navtype == "undefined" || (el.navtype != 50 && (el.navtype == 0 || Math.abs(el.navtype) > 2)))
-			Calendar.removeClass(el, "active");
-		Calendar.removeClass(el, "hilite");
-		Calendar.removeClass(el.parentNode, "rowhilite");
-	}
-	ev || (ev = window.event);
-	if (el.navtype == 50 && target != el) {
-		var pos = Calendar.getAbsolutePos(el);
-		var w = el.offsetWidth;
-		var x = ev.clientX;
-		var dx;
-		var decrease = true;
-		if (x > pos.x + w) {
-			dx = x - pos.x - w;
-			decrease = false;
-		} else
-			dx = pos.x - x;
-
-		if (dx < 0) dx = 0;
-		var range = el._range;
-		var current = el._current;
-		var count = Math.floor(dx / 10) % range.length;
-		for (var i = range.length; --i >= 0;)
-			if (range[i] == current)
-				break;
-		while (count-- > 0)
-			if (decrease) {
-				if (--i < 0)
-					i = range.length - 1;
-			} else if ( ++i >= range.length )
-				i = 0;
-		var newval = range[i];
-		el.firstChild.data = newval;
-
-		cal.onUpdateTime();
-	}
-	var mon = Calendar.findMonth(target);
-	if (mon) {
-		if (mon.month != cal.date.getMonth()) {
-			if (cal.hilitedMonth) {
-				Calendar.removeClass(cal.hilitedMonth, "hilite");
-			}
-			Calendar.addClass(mon, "hilite");
-			cal.hilitedMonth = mon;
-		} else if (cal.hilitedMonth) {
-			Calendar.removeClass(cal.hilitedMonth, "hilite");
-		}
-	} else {
-		if (cal.hilitedMonth) {
-			Calendar.removeClass(cal.hilitedMonth, "hilite");
-		}
-		var year = Calendar.findYear(target);
-		if (year) {
-			if (year.year != cal.date.getFullYear()) {
-				if (cal.hilitedYear) {
-					Calendar.removeClass(cal.hilitedYear, "hilite");
-				}
-				Calendar.addClass(year, "hilite");
-				cal.hilitedYear = year;
-			} else if (cal.hilitedYear) {
-				Calendar.removeClass(cal.hilitedYear, "hilite");
-			}
-		} else if (cal.hilitedYear) {
-			Calendar.removeClass(cal.hilitedYear, "hilite");
-		}
-	}
-	return Calendar.stopEvent(ev);
-};
-
-Calendar.tableMouseDown = function (ev) {
-	if (Calendar.getTargetElement(ev) == Calendar.getElement(ev)) {
-		return Calendar.stopEvent(ev);
-	}
-};
-
-Calendar.calDragIt = function (ev) {
-	var cal = Calendar._C;
-	if (!(cal && cal.dragging)) {
-		return false;
-	}
-	var posX;
-	var posY;
-	if (Calendar.is_ie) {
-		posY = window.event.clientY + document.body.scrollTop;
-		posX = window.event.clientX + document.body.scrollLeft;
-	} else {
-		posX = ev.pageX;
-		posY = ev.pageY;
-	}
-	cal.hideShowCovered();
-	var st = cal.element.style;
-	st.left = (posX - cal.xOffs) + "px";
-	st.top = (posY - cal.yOffs) + "px";
-	return Calendar.stopEvent(ev);
-};
-
-Calendar.calDragEnd = function (ev) {
-	var cal = Calendar._C;
-	if (!cal) {
-		return false;
-	}
-	cal.dragging = false;
-	with (Calendar) {
-		removeEvent(document, "mousemove", calDragIt);
-		removeEvent(document, "mouseup", calDragEnd);
-		tableMouseUp(ev);
-	}
-	cal.hideShowCovered();
-};
-
-Calendar.dayMouseDown = function(ev) {
-	var el = Calendar.getElement(ev);
-	if (el.disabled) {
-		return false;
-	}
-	var cal = el.calendar;
-	cal.activeDiv = el;
-	Calendar._C = cal;
-	if (el.navtype != 300) with (Calendar) {
-		if (el.navtype == 50) {
-			el._current = el.firstChild.data;
-			addEvent(document, "mousemove", tableMouseOver);
-		} else
-			addEvent(document, Calendar.is_ie5 ? "mousemove" : "mouseover", tableMouseOver);
-		addClass(el, "hilite active");
-		addEvent(document, "mouseup", tableMouseUp);
-	} else if (cal.isPopup) {
-		cal._dragStart(ev);
-	}
-	if (el.navtype == -1 || el.navtype == 1) {
-		if (cal.timeout) clearTimeout(cal.timeout);
-		cal.timeout = setTimeout("Calendar.showMonthsCombo()", 250);
-	} else if (el.navtype == -2 || el.navtype == 2) {
-		if (cal.timeout) clearTimeout(cal.timeout);
-		cal.timeout = setTimeout((el.navtype > 0) ? "Calendar.showYearsCombo(true)" : "Calendar.showYearsCombo(false)", 250);
-	} else {
-		cal.timeout = null;
-	}
-	return Calendar.stopEvent(ev);
-};
-
-Calendar.dayMouseDblClick = function(ev) {
-	Calendar.cellClick(Calendar.getElement(ev), ev || window.event);
-	if (Calendar.is_ie) {
-		document.selection.empty();
-	}
-};
-
-Calendar.dayMouseOver = function(ev) {
-	var el = Calendar.getElement(ev);
-	if (Calendar.isRelated(el, ev) || Calendar._C || el.disabled) {
-		return false;
-	}
-	if (el.ttip) {
-		if (el.ttip.substr(0, 1) == "_") {
-			el.ttip = el.caldate.print(el.calendar.ttDateFormat) + el.ttip.substr(1);
-		}
-		el.calendar.tooltips.firstChild.data = el.ttip;
-	}
-	if (el.navtype != 300) {
-		Calendar.addClass(el, "hilite");
-		if (el.caldate) {
-			Calendar.addClass(el.parentNode, "rowhilite");
-		}
-	}
-	return Calendar.stopEvent(ev);
-};
-
-Calendar.dayMouseOut = function(ev) {
-	with (Calendar) {
-		var el = getElement(ev);
-		if (isRelated(el, ev) || _C || el.disabled) {
-			return false;
-		}
-		removeClass(el, "hilite");
-		if (el.caldate) {
-			removeClass(el.parentNode, "rowhilite");
-		}
-		el.calendar.tooltips.firstChild.data = _TT["SEL_DATE"];
-		return stopEvent(ev);
-	}
-};
-
-/**
- *  A generic "click" handler :) handles all types of buttons defined in this
- *  calendar.
- */
-Calendar.cellClick = function(el, ev) {
-	var cal = el.calendar;
-	var closing = false;
-	var newdate = false;
-	var date = null;
-	if (typeof el.navtype == "undefined") {
-		Calendar.removeClass(cal.currentDateEl, "selected");
-		Calendar.addClass(el, "selected");
-		closing = (cal.currentDateEl == el);
-		if (!closing) {
-			cal.currentDateEl = el;
-		}
-		cal.date = new Date(el.caldate);
-		date = cal.date;
-		newdate = true;
-		// a date was clicked
-		if (!(cal.dateClicked = !el.otherMonth))
-			cal._init(cal.firstDayOfWeek, date);
-	} else {
-		if (el.navtype == 200) {
-			Calendar.removeClass(el, "hilite");
-			cal.callCloseHandler();
-			return;
-		}
-		date = (el.navtype == 0) ? new Date() : new Date(cal.date);
-		// unless "today" was clicked, we assume no date was clicked so
-		// the selected handler will know not to close the calenar when
-		// in single-click mode.
-		// cal.dateClicked = (el.navtype == 0);
-		cal.dateClicked = false;
-		var year = date.getFullYear();
-		var mon = date.getMonth();
-		function setMonth(m) {
-			var day = date.getDate();
-			var max = date.getMonthDays(m);
-			if (day > max) {
-				date.setDate(max);
-			}
-			date.setMonth(m);
-		};
-		switch (el.navtype) {
-		    case 400:
-			Calendar.removeClass(el, "hilite");
-			var text = Calendar._TT["ABOUT"];
-			if (typeof text != "undefined") {
-				text += cal.showsTime ? Calendar._TT["ABOUT_TIME"] : "";
-			} else {
-				// FIXME: this should be removed as soon as lang files get updated!
-				text = "Help and about box text is not translated into this language.\n" +
-					"If you know this language and you feel generous please update\n" +
-					"the corresponding file in \"lang\" subdir to match calendar-en.js\n" +
-					"and send it back to <mishoo at infoiasi.ro> to get it into the distribution  ;-)\n\n" +
-					"Thank you!\n" +
-					"http://dynarch.com/mishoo/calendar.epl\n";
-			}
-			alert(text);
-			return;
-		    case -2:
-			if (year > cal.minYear) {
-				date.setFullYear(year - 1);
-			}
-			break;
-		    case -1:
-			if (mon > 0) {
-				setMonth(mon - 1);
-			} else if (year-- > cal.minYear) {
-				date.setFullYear(year);
-				setMonth(11);
-			}
-			break;
-		    case 1:
-			if (mon < 11) {
-				setMonth(mon + 1);
-			} else if (year < cal.maxYear) {
-				date.setFullYear(year + 1);
-				setMonth(0);
-			}
-			break;
-		    case 2:
-			if (year < cal.maxYear) {
-				date.setFullYear(year + 1);
-			}
-			break;
-		    case 100:
-			cal.setFirstDayOfWeek(el.fdow);
-			return;
-		    case 50:
-			var range = el._range;
-			var current = el.firstChild.data;
-			for (var i = range.length; --i >= 0;)
-				if (range[i] == current)
-					break;
-			if (ev && ev.shiftKey) {
-				if (--i < 0)
-					i = range.length - 1;
-			} else if ( ++i >= range.length )
-				i = 0;
-			var newval = range[i];
-			el.firstChild.data = newval;
-			cal.onUpdateTime();
-			return;
-		    case 0:
-			// TODAY will bring us here
-			if ((typeof cal.getDateStatus == "function") && cal.getDateStatus(date, date.getFullYear(), date.getMonth(), date.getDate())) {
-				// remember, "date" was previously set to new
-				// Date() if TODAY was clicked; thus, it
-				// contains today date.
-				return false;
-			}
-			break;
-		}
-		if (!date.equalsTo(cal.date)) {
-			cal.setDate(date);
-			newdate = true;
-		}
-	}
-	if (newdate) {
-		cal.callHandler();
-	}
-	if (closing) {
-		Calendar.removeClass(el, "hilite");
-		cal.callCloseHandler();
-	}
-};
-
-// END: CALENDAR STATIC FUNCTIONS
-
-// BEGIN: CALENDAR OBJECT FUNCTIONS
-
-/**
- *  This function creates the calendar inside the given parent.  If _par is
- *  null than it creates a popup calendar inside the BODY element.  If _par is
- *  an element, be it BODY, then it creates a non-popup calendar (still
- *  hidden).  Some properties need to be set before calling this function.
- */
-Calendar.prototype.create = function (_par) {
-	var parent = null;
-	if (! _par) {
-		// default parent is the document body, in which case we create
-		// a popup calendar.
-		parent = document.getElementsByTagName("body")[0];
-		this.isPopup = true;
-	} else {
-		parent = _par;
-		this.isPopup = false;
-	}
-	this.date = this.dateStr ? new Date(this.dateStr) : new Date();
-
-	var table = Calendar.createElement("table");
-	this.table = table;
-	table.cellSpacing = 0;
-	table.cellPadding = 0;
-	table.calendar = this;
-	Calendar.addEvent(table, "mousedown", Calendar.tableMouseDown);
-
-	var div = Calendar.createElement("div");
-	this.element = div;
-	div.className = "calendar";
-	if (this.isPopup) {
-		div.style.position = "absolute";
-		div.style.display = "none";
-	}
-	div.appendChild(table);
-
-	var thead = Calendar.createElement("thead", table);
-	var cell = null;
-	var row = null;
-
-	var cal = this;
-	var hh = function (text, cs, navtype) {
-		cell = Calendar.createElement("td", row);
-		cell.colSpan = cs;
-		cell.className = "button";
-		if (navtype != 0 && Math.abs(navtype) <= 2)
-			cell.className += " nav";
-		Calendar._add_evs(cell);
-		cell.calendar = cal;
-		cell.navtype = navtype;
-		if (text.substr(0, 1) != "&") {
-			cell.appendChild(document.createTextNode(text));
-		}
-		else {
-			// FIXME: dirty hack for entities
-			cell.innerHTML = text;
-		}
-		return cell;
-	};
-
-	row = Calendar.createElement("tr", thead);
-	var title_length = 6;
-	(this.isPopup) && --title_length;
-	(this.weekNumbers) && ++title_length;
-
-	hh("?", 1, 400).ttip = Calendar._TT["INFO"];
-	this.title = hh("", title_length, 300);
-	this.title.className = "title";
-	if (this.isPopup) {
-		this.title.ttip = Calendar._TT["DRAG_TO_MOVE"];
-		this.title.style.cursor = "move";
-		hh("&#x00d7;", 1, 200).ttip = Calendar._TT["CLOSE"];
-	}
-
-	row = Calendar.createElement("tr", thead);
-	row.className = "headrow";
-
-	this._nav_py = hh("&#x00ab;", 1, -2);
-	this._nav_py.ttip = Calendar._TT["PREV_YEAR"];
-
-	this._nav_pm = hh("&#x2039;", 1, -1);
-	this._nav_pm.ttip = Calendar._TT["PREV_MONTH"];
-
-	this._nav_now = hh(Calendar._TT["TODAY"], this.weekNumbers ? 4 : 3, 0);
-	this._nav_now.ttip = Calendar._TT["GO_TODAY"];
-
-	this._nav_nm = hh("&#x203a;", 1, 1);
-	this._nav_nm.ttip = Calendar._TT["NEXT_MONTH"];
-
-	this._nav_ny = hh("&#x00bb;", 1, 2);
-	this._nav_ny.ttip = Calendar._TT["NEXT_YEAR"];
-
-	// day names
-	row = Calendar.createElement("tr", thead);
-	row.className = "daynames";
-	if (this.weekNumbers) {
-		cell = Calendar.createElement("td", row);
-		cell.className = "name wn";
-		cell.appendChild(document.createTextNode(Calendar._TT["WK"]));
-	}
-	for (var i = 7; i > 0; --i) {
-		cell = Calendar.createElement("td", row);
-		cell.appendChild(document.createTextNode(""));
-		if (!i) {
-			cell.navtype = 100;
-			cell.calendar = this;
-			Calendar._add_evs(cell);
-		}
-	}
-	this.firstdayname = (this.weekNumbers) ? row.firstChild.nextSibling : row.firstChild;
-	this._displayWeekdays();
-
-	var tbody = Calendar.createElement("tbody", table);
-	this.tbody = tbody;
-
-	for (i = 6; i > 0; --i) {
-		row = Calendar.createElement("tr", tbody);
-		if (this.weekNumbers) {
-			cell = Calendar.createElement("td", row);
-			cell.appendChild(document.createTextNode(""));
-		}
-		for (var j = 7; j > 0; --j) {
-			cell = Calendar.createElement("td", row);
-			cell.appendChild(document.createTextNode(""));
-			cell.calendar = this;
-			Calendar._add_evs(cell);
-		}
-	}
-
-	if (this.showsTime) {
-		row = Calendar.createElement("tr", tbody);
-		row.className = "time";
-
-		cell = Calendar.createElement("td", row);
-		cell.className = "time";
-		cell.colSpan = 2;
-		cell.innerHTML = Calendar._TT["TIME"] || "&nbsp;";
-
-		cell = Calendar.createElement("td", row);
-		cell.className = "time";
-		cell.colSpan = this.weekNumbers ? 4 : 3;
-
-		(function(){
-			function makeTimePart(className, init, range_start, range_end) {
-				var part = Calendar.createElement("span", cell);
-				part.className = className;
-				part.appendChild(document.createTextNode(init));
-				part.calendar = cal;
-				part.ttip = Calendar._TT["TIME_PART"];
-				part.navtype = 50;
-				part._range = [];
-				if (typeof range_start != "number")
-					part._range = range_start;
-				else {
-					for (var i = range_start; i <= range_end; ++i) {
-						var txt;
-						if (i < 10 && range_end >= 10) txt = '0' + i;
-						else txt = '' + i;
-						part._range[part._range.length] = txt;
-					}
-				}
-				Calendar._add_evs(part);
-				return part;
-			};
-			var hrs = cal.date.getHours();
-			var mins = cal.date.getMinutes();
-			var t12 = !cal.time24;
-			var pm = (hrs > 12);
-			if (t12 && pm) hrs -= 12;
-			var H = makeTimePart("hour", hrs, t12 ? 1 : 0, t12 ? 12 : 23);
-			var span = Calendar.createElement("span", cell);
-			span.appendChild(document.createTextNode(":"));
-			span.className = "colon";
-			var M = makeTimePart("minute", mins, 0, 59);
-			var AP = null;
-			cell = Calendar.createElement("td", row);
-			cell.className = "time";
-			cell.colSpan = 2;
-			if (t12)
-				AP = makeTimePart("ampm", pm ? "pm" : "am", ["am", "pm"]);
-			else
-				cell.innerHTML = "&nbsp;";
-
-			cal.onSetTime = function() {
-				var hrs = this.date.getHours();
-				var mins = this.date.getMinutes();
-				var pm = (hrs > 12);
-				if (pm && t12) hrs -= 12;
-				H.firstChild.data = (hrs < 10) ? ("0" + hrs) : hrs;
-				M.firstChild.data = (mins < 10) ? ("0" + mins) : mins;
-				if (t12)
-					AP.firstChild.data = pm ? "pm" : "am";
-			};
-
-			cal.onUpdateTime = function() {
-				var date = this.date;
-				var h = parseInt(H.firstChild.data, 10);
-				if (t12) {
-					if (/pm/i.test(AP.firstChild.data) && h < 12)
-						h += 12;
-					else if (/am/i.test(AP.firstChild.data) && h == 12)
-						h = 0;
-				}
-				var d = date.getDate();
-				var m = date.getMonth();
-				var y = date.getFullYear();
-				date.setHours(h);
-				date.setMinutes(parseInt(M.firstChild.data, 10));
-				date.setFullYear(y);
-				date.setMonth(m);
-				date.setDate(d);
-				this.dateClicked = false;
-				this.callHandler();
-			};
-		})();
-	} else {
-		this.onSetTime = this.onUpdateTime = function() {};
-	}
-
-	var tfoot = Calendar.createElement("tfoot", table);
-
-	row = Calendar.createElement("tr", tfoot);
-	row.className = "footrow";
-
-	cell = hh(Calendar._TT["SEL_DATE"], this.weekNumbers ? 8 : 7, 300);
-	cell.className = "ttip";
-	if (this.isPopup) {
-		cell.ttip = Calendar._TT["DRAG_TO_MOVE"];
-		cell.style.cursor = "move";
-	}
-	this.tooltips = cell;
-
-	div = Calendar.createElement("div", this.element);
-	this.monthsCombo = div;
-	div.className = "combo";
-	for (i = 0; i < Calendar._MN.length; ++i) {
-		var mn = Calendar.createElement("div");
-		mn.className = Calendar.is_ie ? "label-IEfix" : "label";
-		mn.month = i;
-		mn.appendChild(document.createTextNode(Calendar._SMN[i]));
-		div.appendChild(mn);
-	}
-
-	div = Calendar.createElement("div", this.element);
-	this.yearsCombo = div;
-	div.className = "combo";
-	for (i = 12; i > 0; --i) {
-		var yr = Calendar.createElement("div");
-		yr.className = Calendar.is_ie ? "label-IEfix" : "label";
-		yr.appendChild(document.createTextNode(""));
-		div.appendChild(yr);
-	}
-
-	this._init(this.firstDayOfWeek, this.date);
-	parent.appendChild(this.element);
-};
-
-/** keyboard navigation, only for popup calendars */
-Calendar._keyEvent = function(ev) {
-	if (!window.calendar) {
-		return false;
-	}
-	(Calendar.is_ie) && (ev = window.event);
-	var cal = window.calendar;
-	var act = (Calendar.is_ie || ev.type == "keypress");
-	if (ev.ctrlKey) {
-		switch (ev.keyCode) {
-		    case 37: // KEY left
-			act && Calendar.cellClick(cal._nav_pm);
-			break;
-		    case 38: // KEY up
-			act && Calendar.cellClick(cal._nav_py);
-			break;
-		    case 39: // KEY right
-			act && Calendar.cellClick(cal._nav_nm);
-			break;
-		    case 40: // KEY down
-			act && Calendar.cellClick(cal._nav_ny);
-			break;
-		    default:
-			return false;
-		}
-	} else switch (ev.keyCode) {
-	    case 32: // KEY space (now)
-		Calendar.cellClick(cal._nav_now);
-		break;
-	    case 27: // KEY esc
-		act && cal.callCloseHandler();
-		break;
-	    case 37: // KEY left
-	    case 38: // KEY up
-	    case 39: // KEY right
-	    case 40: // KEY down
-		if (act) {
-			var date = cal.date.getDate() - 1;
-			var el = cal.currentDateEl;
-			var ne = null;
-			var prev = (ev.keyCode == 37) || (ev.keyCode == 38);
-			switch (ev.keyCode) {
-			    case 37: // KEY left
-				(--date >= 0) && (ne = cal.ar_days[date]);
-				break;
-			    case 38: // KEY up
-				date -= 7;
-				(date >= 0) && (ne = cal.ar_days[date]);
-				break;
-			    case 39: // KEY right
-				(++date < cal.ar_days.length) && (ne = cal.ar_days[date]);
-				break;
-			    case 40: // KEY down
-				date += 7;
-				(date < cal.ar_days.length) && (ne = cal.ar_days[date]);
-				break;
-			}
-			if (!ne) {
-				if (prev) {
-					Calendar.cellClick(cal._nav_pm);
-				} else {
-					Calendar.cellClick(cal._nav_nm);
-				}
-				date = (prev) ? cal.date.getMonthDays() : 1;
-				el = cal.currentDateEl;
-				ne = cal.ar_days[date - 1];
-			}
-			Calendar.removeClass(el, "selected");
-			Calendar.addClass(ne, "selected");
-			cal.date = new Date(ne.caldate);
-			cal.callHandler();
-			cal.currentDateEl = ne;
-		}
-		break;
-	    case 13: // KEY enter
-		if (act) {
-			cal.callHandler();
-			cal.hide();
-		}
-		break;
-	    default:
-		return false;
-	}
-	return Calendar.stopEvent(ev);
-};
-
-/**
- *  (RE)Initializes the calendar to the given date and firstDayOfWeek
- */
-Calendar.prototype._init = function (firstDayOfWeek, date) {
-	var today = new Date();
-	this.table.style.visibility = "hidden";
-	var year = date.getFullYear();
-	if (year < this.minYear) {
-		year = this.minYear;
-		date.setFullYear(year);
-	} else if (year > this.maxYear) {
-		year = this.maxYear;
-		date.setFullYear(year);
-	}
-	this.firstDayOfWeek = firstDayOfWeek;
-	this.date = new Date(date);
-	var month = date.getMonth();
-	var mday = date.getDate();
-	var no_days = date.getMonthDays();
-
-	// calendar voodoo for computing the first day that would actually be
-	// displayed in the calendar, even if it's from the previous month.
-	// WARNING: this is magic. ;-)
-	date.setDate(1);
-	var day1 = (date.getDay() - this.firstDayOfWeek) % 7;
-	if (day1 < 0)
-		day1 += 7;
-	date.setDate(-day1);
-	date.setDate(date.getDate() + 1);
-
-	var row = this.tbody.firstChild;
-	var MN = Calendar._SMN[month];
-	var ar_days = new Array();
-	var weekend = Calendar._TT["WEEKEND"];
-	for (var i = 0; i < 6; ++i, row = row.nextSibling) {
-		var cell = row.firstChild;
-		if (this.weekNumbers) {
-			cell.className = "day wn";
-			cell.firstChild.data = date.getWeekNumber();
-			cell = cell.nextSibling;
-		}
-		row.className = "daysrow";
-		var hasdays = false;
-		for (var j = 0; j < 7; ++j, cell = cell.nextSibling, date.setDate(date.getDate() + 1)) {
-			var iday = date.getDate();
-			var wday = date.getDay();
-			cell.className = "day";
-			var current_month = (date.getMonth() == month);
-			if (!current_month) {
-				if (this.showsOtherMonths) {
-					cell.className += " othermonth";
-					cell.otherMonth = true;
-				} else {
-					cell.className = "emptycell";
-					cell.innerHTML = "&nbsp;";
-					cell.disabled = true;
-					continue;
-				}
-			} else {
-				cell.otherMonth = false;
-				hasdays = true;
-			}
-			cell.disabled = false;
-			cell.firstChild.data = iday;
-			if (typeof this.getDateStatus == "function") {
-				var status = this.getDateStatus(date, year, month, iday);
-				if (status === true) {
-					cell.className += " disabled";
-					cell.disabled = true;
-				} else {
-					if (/disabled/i.test(status))
-						cell.disabled = true;
-					cell.className += " " + status;
-				}
-			}
-			if (!cell.disabled) {
-				ar_days[ar_days.length] = cell;
-				cell.caldate = new Date(date);
-				cell.ttip = "_";
-				if (current_month && iday == mday) {
-					cell.className += " selected";
-					this.currentDateEl = cell;
-				}
-				if (date.getFullYear() == today.getFullYear() &&
-				    date.getMonth() == today.getMonth() &&
-				    iday == today.getDate()) {
-					cell.className += " today";
-					cell.ttip += Calendar._TT["PART_TODAY"];
-				}
-				if (weekend.indexOf(wday.toString()) != -1) {
-					cell.className += cell.otherMonth ? " oweekend" : " weekend";
-				}
-			}
-		}
-		if (!(hasdays || this.showsOtherMonths))
-			row.className = "emptyrow";
-	}
-	this.ar_days = ar_days;
-	this.title.firstChild.data = Calendar._MN[month] + ", " + year;
-	this.onSetTime();
-	this.table.style.visibility = "visible";
-	// PROFILE
-	// this.tooltips.firstChild.data = "Generated in " + ((new Date()) - today) + " ms";
-};
-
-/**
- *  Calls _init function above for going to a certain date (but only if the
- *  date is different than the currently selected one).
- */
-Calendar.prototype.setDate = function (date) {
-	if (!date.equalsTo(this.date)) {
-		this._init(this.firstDayOfWeek, date);
-	}
-};
-
-/**
- *  Refreshes the calendar.  Useful if the "disabledHandler" function is
- *  dynamic, meaning that the list of disabled date can change at runtime.
- *  Just * call this function if you think that the list of disabled dates
- *  should * change.
- */
-Calendar.prototype.refresh = function () {
-	this._init(this.firstDayOfWeek, this.date);
-};
-
-/** Modifies the "firstDayOfWeek" parameter (pass 0 for Synday, 1 for Monday, etc.). */
-Calendar.prototype.setFirstDayOfWeek = function (firstDayOfWeek) {
-	this._init(firstDayOfWeek, this.date);
-	this._displayWeekdays();
-};
-
-/**
- *  Allows customization of what dates are enabled.  The "unaryFunction"
- *  parameter must be a function object that receives the date (as a JS Date
- *  object) and returns a boolean value.  If the returned value is true then
- *  the passed date will be marked as disabled.
- */
-Calendar.prototype.setDateStatusHandler = Calendar.prototype.setDisabledHandler = function (unaryFunction) {
-	this.getDateStatus = unaryFunction;
-};
-
-/** Customization of allowed year range for the calendar. */
-Calendar.prototype.setRange = function (a, z) {
-	this.minYear = a;
-	this.maxYear = z;
-};
-
-/** Calls the first user handler (selectedHandler). */
-Calendar.prototype.callHandler = function () {
-	if (this.onSelected) {
-		this.onSelected(this, this.date.print(this.dateFormat));
-	}
-};
-
-/** Calls the second user handler (closeHandler). */
-Calendar.prototype.callCloseHandler = function () {
-	if (this.onClose) {
-		this.onClose(this);
-	}
-	this.hideShowCovered();
-};
-
-/** Removes the calendar object from the DOM tree and destroys it. */
-Calendar.prototype.destroy = function () {
-	var el = this.element.parentNode;
-	el.removeChild(this.element);
-	Calendar._C = null;
-	window.calendar = null;
-};
-
-/**
- *  Moves the calendar element to a different section in the DOM tree (changes
- *  its parent).
- */
-Calendar.prototype.reparent = function (new_parent) {
-	var el = this.element;
-	el.parentNode.removeChild(el);
-	new_parent.appendChild(el);
-};
-
-// This gets called when the user presses a mouse button anywhere in the
-// document, if the calendar is shown.  If the click was outside the open
-// calendar this function closes it.
-Calendar._checkCalendar = function(ev) {
-	if (!window.calendar) {
-		return false;
-	}
-	var el = Calendar.is_ie ? Calendar.getElement(ev) : Calendar.getTargetElement(ev);
-	for (; el != null && el != calendar.element; el = el.parentNode);
-	if (el == null) {
-		// calls closeHandler which should hide the calendar.
-		window.calendar.callCloseHandler();
-		return Calendar.stopEvent(ev);
-	}
-};
-
-/** Shows the calendar. */
-Calendar.prototype.show = function () {
-	var rows = this.table.getElementsByTagName("tr");
-	for (var i = rows.length; i > 0;) {
-		var row = rows[--i];
-		Calendar.removeClass(row, "rowhilite");
-		var cells = row.getElementsByTagName("td");
-		for (var j = cells.length; j > 0;) {
-			var cell = cells[--j];
-			Calendar.removeClass(cell, "hilite");
-			Calendar.removeClass(cell, "active");
-		}
-	}
-	this.element.style.display = "block";
-	this.hidden = false;
-	if (this.isPopup) {
-		window.calendar = this;
-		Calendar.addEvent(document, "keydown", Calendar._keyEvent);
-		Calendar.addEvent(document, "keypress", Calendar._keyEvent);
-		Calendar.addEvent(document, "mousedown", Calendar._checkCalendar);
-	}
-	this.hideShowCovered();
-};
-
-/**
- *  Hides the calendar.  Also removes any "hilite" from the class of any TD
- *  element.
- */
-Calendar.prototype.hide = function () {
-	if (this.isPopup) {
-		Calendar.removeEvent(document, "keydown", Calendar._keyEvent);
-		Calendar.removeEvent(document, "keypress", Calendar._keyEvent);
-		Calendar.removeEvent(document, "mousedown", Calendar._checkCalendar);
-	}
-	this.element.style.display = "none";
-	this.hidden = true;
-	this.hideShowCovered();
-};
-
-/**
- *  Shows the calendar at a given absolute position (beware that, depending on
- *  the calendar element style -- position property -- this might be relative
- *  to the parent's containing rectangle).
- */
-Calendar.prototype.showAt = function (x, y) {
-	var s = this.element.style;
-	s.left = x + "px";
-	s.top = y + "px";
-	this.show();
-};
-
-/** Shows the calendar near a given element. */
-Calendar.prototype.showAtElement = function (el, opts) {
-	var self = this;
-	var p = Calendar.getAbsolutePos(el);
-	if (!opts || typeof opts != "string") {
-		this.showAt(p.x, p.y + el.offsetHeight);
-		return true;
-	}
-	function fixPosition(box) {
-		if (box.x < 0)
-			box.x = 0;
-		if (box.y < 0)
-			box.y = 0;
-		var cp = document.createElement("div");
-		var s = cp.style;
-		s.position = "absolute";
-		s.right = s.bottom = s.width = s.height = "0px";
-		document.body.appendChild(cp);
-		var br = Calendar.getAbsolutePos(cp);
-		document.body.removeChild(cp);
-		if (Calendar.is_ie) {
-			br.y += document.body.scrollTop;
-			br.x += document.body.scrollLeft;
-		} else {
-			br.y += window.scrollY;
-			br.x += window.scrollX;
-		}
-		var tmp = box.x + box.width - br.x;
-		if (tmp > 0) box.x -= tmp;
-		tmp = box.y + box.height - br.y;
-		if (tmp > 0) box.y -= tmp;
-	};
-	this.element.style.display = "block";
-	Calendar.continuation_for_the_fucking_khtml_browser = function() {
-		var w = self.element.offsetWidth;
-		var h = self.element.offsetHeight;
-		self.element.style.display = "none";
-		var valign = opts.substr(0, 1);
-		var halign = "l";
-		if (opts.length > 1) {
-			halign = opts.substr(1, 1);
-		}
-		// vertical alignment
-		switch (valign) {
-		    case "T": p.y -= h; break;
-		    case "B": p.y += el.offsetHeight; break;
-		    case "C": p.y += (el.offsetHeight - h) / 2; break;
-		    case "t": p.y += el.offsetHeight - h; break;
-		    case "b": break; // already there
-		}
-		// horizontal alignment
-		switch (halign) {
-		    case "L": p.x -= w; break;
-		    case "R": p.x += el.offsetWidth; break;
-		    case "C": p.x += (el.offsetWidth - w) / 2; break;
-		    case "r": p.x += el.offsetWidth - w; break;
-		    case "l": break; // already there
-		}
-		p.width = w;
-		p.height = h + 40;
-		self.monthsCombo.style.display = "none";
-		fixPosition(p);
-		self.showAt(p.x, p.y);
-	};
-	if (Calendar.is_khtml)
-		setTimeout("Calendar.continuation_for_the_fucking_khtml_browser()", 10);
-	else
-		Calendar.continuation_for_the_fucking_khtml_browser();
-};
-
-/** Customizes the date format. */
-Calendar.prototype.setDateFormat = function (str) {
-	this.dateFormat = str;
-};
-
-/** Customizes the tooltip date format. */
-Calendar.prototype.setTtDateFormat = function (str) {
-	this.ttDateFormat = str;
-};
-
-/**
- *  Tries to identify the date represented in a string.  If successful it also
- *  calls this.setDate which moves the calendar to the given date.
- */
-Calendar.prototype.parseDate = function (str, fmt) {
-	var y = 0;
-	var m = -1;
-	var d = 0;
-	var a = str.split(/\W+/);
-	if (!fmt) {
-		fmt = this.dateFormat;
-	}
-	var b = fmt.match(/%./g);
-	var i = 0, j = 0;
-	var hr = 0;
-	var min = 0;
-	for (i = 0; i < a.length; ++i) {
-		if (!a[i])
-			continue;
-		switch (b[i]) {
-		    case "%d":
-		    case "%e":
-			d = parseInt(a[i], 10);
-			break;
-
-		    case "%m":
-			m = parseInt(a[i], 10) - 1;
-			break;
-
-		    case "%Y":
-		    case "%y":
-			y = parseInt(a[i], 10);
-			(y < 100) && (y += (y > 29) ? 1900 : 2000);
-			break;
-
-		    case "%b":
-		    case "%B":
-			for (j = 0; j < 12; ++j) {
-				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; }
-			}
-			break;
-
-		    case "%H":
-		    case "%I":
-		    case "%k":
-		    case "%l":
-			hr = parseInt(a[i], 10);
-			break;
-
-		    case "%P":
-		    case "%p":
-			if (/pm/i.test(a[i]) && hr < 12)
-				hr += 12;
-			break;
-
-		    case "%M":
-			min = parseInt(a[i], 10);
-			break;
-		}
-	}
-	if (y != 0 && m != -1 && d != 0) {
-		this.setDate(new Date(y, m, d, hr, min, 0));
-		return;
-	}
-	y = 0; m = -1; d = 0;
-	for (i = 0; i < a.length; ++i) {
-		if (a[i].search(/[a-zA-Z]+/) != -1) {
-			var t = -1;
-			for (j = 0; j < 12; ++j) {
-				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; }
-			}
-			if (t != -1) {
-				if (m != -1) {
-					d = m+1;
-				}
-				m = t;
-			}
-		} else if (parseInt(a[i], 10) <= 12 && m == -1) {
-			m = a[i]-1;
-		} else if (parseInt(a[i], 10) > 31 && y == 0) {
-			y = parseInt(a[i], 10);
-			(y < 100) && (y += (y > 29) ? 1900 : 2000);
-		} else if (d == 0) {
-			d = a[i];
-		}
-	}
-	if (y == 0) {
-		var today = new Date();
-		y = today.getFullYear();
-	}
-	if (m != -1 && d != 0) {
-		this.setDate(new Date(y, m, d, hr, min, 0));
-	}
-};
-
-Calendar.prototype.hideShowCovered = function () {
-	var self = this;
-	Calendar.continuation_for_the_fucking_khtml_browser = function() {
-		function getVisib(obj){
-			var value = obj.style.visibility;
-			if (!value) {
-				if (document.defaultView && typeof (document.defaultView.getComputedStyle) == "function") { // Gecko, W3C
-					if (!Calendar.is_khtml)
-						value = document.defaultView.
-							getComputedStyle(obj, "").getPropertyValue("visibility");
-					else
-						value = '';
-				} else if (obj.currentStyle) { // IE
-					value = obj.currentStyle.visibility;
-				} else
-					value = '';
-			}
-			return value;
-		};
-
-		var tags = new Array("applet", "iframe", "select");
-		var el = self.element;
-
-		var p = Calendar.getAbsolutePos(el);
-		var EX1 = p.x;
-		var EX2 = el.offsetWidth + EX1;
-		var EY1 = p.y;
-		var EY2 = el.offsetHeight + EY1;
-
-		for (var k = tags.length; k > 0; ) {
-			var ar = document.getElementsByTagName(tags[--k]);
-			var cc = null;
-
-			for (var i = ar.length; i > 0;) {
-				cc = ar[--i];
-
-				p = Calendar.getAbsolutePos(cc);
-				var CX1 = p.x;
-				var CX2 = cc.offsetWidth + CX1;
-				var CY1 = p.y;
-				var CY2 = cc.offsetHeight + CY1;
-
-				if (self.hidden || (CX1 > EX2) || (CX2 < EX1) || (CY1 > EY2) || (CY2 < EY1)) {
-					if (!cc.__msh_save_visibility) {
-						cc.__msh_save_visibility = getVisib(cc);
-					}
-					cc.style.visibility = cc.__msh_save_visibility;
-				} else {
-					if (!cc.__msh_save_visibility) {
-						cc.__msh_save_visibility = getVisib(cc);
-					}
-					cc.style.visibility = "hidden";
-				}
-			}
-		}
-	};
-	if (Calendar.is_khtml)
-		setTimeout("Calendar.continuation_for_the_fucking_khtml_browser()", 10);
-	else
-		Calendar.continuation_for_the_fucking_khtml_browser();
-};
-
-/** Internal function; it displays the bar with the names of the weekday. */
-Calendar.prototype._displayWeekdays = function () {
-	var fdow = this.firstDayOfWeek;
-	var cell = this.firstdayname;
-	var weekend = Calendar._TT["WEEKEND"];
-	for (var i = 0; i < 7; ++i) {
-		cell.className = "day name";
-		var realday = (i + fdow) % 7;
-		if (i) {
-			cell.ttip = Calendar._TT["DAY_FIRST"].replace("%s", Calendar._DN[realday]);
-			cell.navtype = 100;
-			cell.calendar = this;
-			cell.fdow = realday;
-			Calendar._add_evs(cell);
-		}
-		if (weekend.indexOf(realday.toString()) != -1) {
-			Calendar.addClass(cell, "weekend");
-		}
-		cell.firstChild.data = Calendar._SDN[(i + fdow) % 7];
-		cell = cell.nextSibling;
-	}
-};
-
-/** Internal function.  Hides all combo boxes that might be displayed. */
-Calendar.prototype._hideCombos = function () {
-	this.monthsCombo.style.display = "none";
-	this.yearsCombo.style.display = "none";
-};
-
-/** Internal function.  Starts dragging the element. */
-Calendar.prototype._dragStart = function (ev) {
-	if (this.dragging) {
-		return;
-	}
-	this.dragging = true;
-	var posX;
-	var posY;
-	if (Calendar.is_ie) {
-		posY = window.event.clientY + document.body.scrollTop;
-		posX = window.event.clientX + document.body.scrollLeft;
-	} else {
-		posY = ev.clientY + window.scrollY;
-		posX = ev.clientX + window.scrollX;
-	}
-	var st = this.element.style;
-	this.xOffs = posX - parseInt(st.left);
-	this.yOffs = posY - parseInt(st.top);
-	with (Calendar) {
-		addEvent(document, "mousemove", calDragIt);
-		addEvent(document, "mouseup", calDragEnd);
-	}
-};
-
-// BEGIN: DATE OBJECT PATCHES
-
-/** Adds the number of days array to the Date object. */
-Date._MD = new Array(31,28,31,30,31,30,31,31,30,31,30,31);
-
-/** Constants used for time computations */
-Date.SECOND = 1000 /* milliseconds */;
-Date.MINUTE = 60 * Date.SECOND;
-Date.HOUR   = 60 * Date.MINUTE;
-Date.DAY    = 24 * Date.HOUR;
-Date.WEEK   =  7 * Date.DAY;
-
-/** Returns the number of days in the current month */
-Date.prototype.getMonthDays = function(month) {
-	var year = this.getFullYear();
-	if (typeof month == "undefined") {
-		month = this.getMonth();
-	}
-	if (((0 == (year%4)) && ( (0 != (year%100)) || (0 == (year%400)))) && month == 1) {
-		return 29;
-	} else {
-		return Date._MD[month];
-	}
-};
-
-/** Returns the number of day in the year. */
-Date.prototype.getDayOfYear = function() {
-	var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
-	var then = new Date(this.getFullYear(), 0, 0, 0, 0, 0);
-	var time = now - then;
-	return Math.floor(time / Date.DAY);
-};
-
-/** Returns the number of the week in year, as defined in ISO 8601. */
-Date.prototype.getWeekNumber = function() {
-	var d = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
-	var DoW = d.getDay();
-	d.setDate(d.getDate() - (DoW + 6) % 7 + 3); // Nearest Thu
-	var ms = d.valueOf(); // GMT
-	d.setMonth(0);
-	d.setDate(4); // Thu in Week 1
-	return Math.round((ms - d.valueOf()) / (7 * 864e5)) + 1;
-};
-
-/** Checks dates equality (ignores time) */
-Date.prototype.equalsTo = function(date) {
-	return ((this.getFullYear() == date.getFullYear()) &&
-		(this.getMonth() == date.getMonth()) &&
-		(this.getDate() == date.getDate()) &&
-		(this.getHours() == date.getHours()) &&
-		(this.getMinutes() == date.getMinutes()));
-};
-
-/** Prints the date in a string according to the given format. */
-Date.prototype.print = function (str) {
-	var m = this.getMonth();
-	var d = this.getDate();
-	var y = this.getFullYear();
-	var wn = this.getWeekNumber();
-	var w = this.getDay();
-	var s = {};
-	var hr = this.getHours();
-	var pm = (hr >= 12);
-	var ir = (pm) ? (hr - 12) : hr;
-	var dy = this.getDayOfYear();
-	if (ir == 0)
-		ir = 12;
-	var min = this.getMinutes();
-	var sec = this.getSeconds();
-	s["%a"] = Calendar._SDN[w]; // abbreviated weekday name [FIXME: I18N]
-	s["%A"] = Calendar._DN[w]; // full weekday name
-	s["%b"] = Calendar._SMN[m]; // abbreviated month name [FIXME: I18N]
-	s["%B"] = Calendar._MN[m]; // full month name
-	// FIXME: %c : preferred date and time representation for the current locale
-	s["%C"] = 1 + Math.floor(y / 100); // the century number
-	s["%d"] = (d < 10) ? ("0" + d) : d; // the day of the month (range 01 to 31)
-	s["%e"] = d; // the day of the month (range 1 to 31)
-	// FIXME: %D : american date style: %m/%d/%y
-	// FIXME: %E, %F, %G, %g, %h (man strftime)
-	s["%H"] = (hr < 10) ? ("0" + hr) : hr; // hour, range 00 to 23 (24h format)
-	s["%I"] = (ir < 10) ? ("0" + ir) : ir; // hour, range 01 to 12 (12h format)
-	s["%j"] = (dy < 100) ? ((dy < 10) ? ("00" + dy) : ("0" + dy)) : dy; // day of the year (range 001 to 366)
-	s["%k"] = hr;		// hour, range 0 to 23 (24h format)
-	s["%l"] = ir;		// hour, range 1 to 12 (12h format)
-	s["%m"] = (m < 9) ? ("0" + (1+m)) : (1+m); // month, range 01 to 12
-	s["%M"] = (min < 10) ? ("0" + min) : min; // minute, range 00 to 59
-	s["%n"] = "\n";		// a newline character
-	s["%p"] = pm ? "PM" : "AM";
-	s["%P"] = pm ? "pm" : "am";
-	// FIXME: %r : the time in am/pm notation %I:%M:%S %p
-	// FIXME: %R : the time in 24-hour notation %H:%M
-	s["%s"] = Math.floor(this.getTime() / 1000);
-	s["%S"] = (sec < 10) ? ("0" + sec) : sec; // seconds, range 00 to 59
-	s["%t"] = "\t";		// a tab character
-	// FIXME: %T : the time in 24-hour notation (%H:%M:%S)
-	s["%U"] = s["%W"] = s["%V"] = (wn < 10) ? ("0" + wn) : wn;
-	s["%u"] = w + 1;	// the day of the week (range 1 to 7, 1 = MON)
-	s["%w"] = w;		// the day of the week (range 0 to 6, 0 = SUN)
-	// FIXME: %x : preferred date representation for the current locale without the time
-	// FIXME: %X : preferred time representation for the current locale without the date
-	s["%y"] = ('' + y).substr(2, 2); // year without the century (range 00 to 99)
-	s["%Y"] = y;		// year with the century
-	s["%%"] = "%";		// a literal '%' character
-
-	var re = /%./g;
-	if (!Calendar.is_ie5)
-		return str.replace(re, function (par) { return s[par] || par; });
-
-	var a = str.match(re);
-	for (var i = 0; i < a.length; i++) {
-		var tmp = s[a[i]];
-		if (tmp) {
-			re = new RegExp(a[i], 'g');
-			str = str.replace(re, tmp);
-		}
-	}
-
-	return str;
-};
-
-Date.prototype.__msh_oldSetFullYear = Date.prototype.setFullYear;
-Date.prototype.setFullYear = function(y) {
-	var d = new Date(this);
-	d.__msh_oldSetFullYear(y);
-	if (d.getMonth() != this.getMonth())
-		this.setDate(28);
-	this.__msh_oldSetFullYear(y);
-};
-
-// END: DATE OBJECT PATCHES
-
-
-// global object that remembers the calendar
-window.calendar = null;

Index: htdocs/intranet-tmpl/default/en/includes/calendar/menuarrow.gif
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/calendar/menuarrow.gif
diff -N htdocs/intranet-tmpl/default/en/includes/calendar/menuarrow.gif
Binary files /tmp/cvsIEBeNg and /dev/null differ

Index: htdocs/intranet-tmpl/default/en/includes/countryCodes/countryCodes.dat
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/countryCodes/countryCodes.dat
diff -N htdocs/intranet-tmpl/default/en/includes/countryCodes/countryCodes.dat
--- htdocs/intranet-tmpl/default/en/includes/countryCodes/countryCodes.dat	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-00 = USA I
-93 = Australia
-94 = New Zealand
-779 = Argentina
-773 = Uruguay
-30 = France I
-84 = Spain
-45 = Japan
-777 = Bolivia
-80 = Italy I
-73 = Sweden
-40 = Germany
-31 = France II
-254 = Ucrania
-090=Turkey

Index: htdocs/intranet-tmpl/default/en/includes/countryCodes/labelCodes.dat
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/countryCodes/labelCodes.dat
diff -N htdocs/intranet-tmpl/default/en/includes/countryCodes/labelCodes.dat
--- htdocs/intranet-tmpl/default/en/includes/countryCodes/labelCodes.dat	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-itemslabelConfig = Etiket 1
-itemslabelConfig2= Etiket 2
-itemslabelConfig3= Etiket 3
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/includes/javascript/members.js
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/javascript/members.js
diff -N htdocs/intranet-tmpl/default/en/includes/javascript/members.js
--- htdocs/intranet-tmpl/default/en/includes/javascript/members.js	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,178 +0,0 @@
-<script language="JavaScript" type="text/javascript">
-function CheckDate(d) {
-	if (d!="")
-{
-      // Cette fonction vérifie le format JJ/MM/AAAA saisi et la validité de la date.
-      // Le séparateur est défini dans la variable separateur
-      var amin=1900; // année mini
-      var amax=2100; // année maxi
-      var separateur="/"; // separateur entre jour/mois/annee
-      var j=(d.substring(0,2));
-      var m=(d.substring(3,5));
-      var a=(d.substring(6));
-      var ok=1;
-	var msg; 
-      if ( ((isNaN(j))||(j<1)||(j>31)) && (ok==1) ) {
-        msg = _("day not correct."); 
-	alert(msg); ok=0;
-      }
-      if ( ((isNaN(m))||(m<1)||(m>12)) && (ok==1) ) {
-        msg = _("month not correct.");
-	 alert(msg); ok=0;
-      }
-      if ( ((isNaN(a))||(a<amin)||(a>amax)) && (ok==1) ) {
-         msg = _("years not correct."); 
-	alert(msg); ok=0;
-      }
-      if ( ((d.substring(2,3)!=separateur)||(d.substring(5,6)!=separateur)) && (ok==1) ) {
-         alert("Separator must be "+separateur); ok=0;
-      }
-      return ok;
-   }
-}   
-   
-
-
-
-//function test if member is unique and if it's right the member is registred
-function unique() {
-var msg1;
-var msg2;
-if (  document.form.check_member.value==1){
-	if (document.form.categorycode.value != "I"){
-		
-		msg1 += _("Warning  !!!! Duplicate borrower!!!!");
-		alert(msg1);
-	check_form_borrowers(0);
-	document.form.submit();
-	
-	}else{
-		msg2 += _("Warning !!!! Duplicate organisation!!!!");
-		alert(msg2);
-	check_form_borrowers(0);
-	}
-}
-else
-{
-	document.form.submit();
-}
-
-}
-//end function
-//function test if date enrooled < date expiry
-function check_manip_date(status) {
-if (status=='verify'){
-// this part of function('verify') is used to check if dateenrolled<date expiry
-var myDate1=document.form.dateenrolled.value.split ('/');
-var myDate2=document.form.dateexpiry.value.split ('/');
-	if ((myDate1[2]>myDate2[2])||(myDate1[2]==myDate2[2] && myDate1[1]>myDate2[1])||(myDate1[2]==myDate2[2] && myDate1[1]>=myDate2[1] && myDate1[0]>=myDate2[0]))
-	
-		{ 
-		var msg = _("Warning !!! check date expiry  > date enrolment");
-		alert(msg);
-		document.form.dateexpiry.value="";
-		document.form.dateexpiry.setfocus;
-		}
-	}
-}
-//end function
-
-
-// function to test all fields in forms and nav in different forms(1 ,2 or 3)
- function check_form_borrowers(nav){
-var statut=0;
-if (nav < document.form.step.value) {
-	document.form.step.value=nav;
-	if ((document.form.step.value==0) && document.form.check_member.value == 1 )
-	{
- 	
-		if (document.form_double.answernodouble)	{
-			if( (!(document.form_double.answernodouble.checked))){
-				document.form.nodouble.value=0;
-			}
-			else {
-			document.form.nodouble.value=1;
-			}
- 		}
- 	} 
-	document.form.submit();
-	
-
-} else {
-	if (document.form.BorrowerMandatoryfield.value==''||document.form.FormFieldList.value=='' )
-	{}
-	else
-	{
-	var champ_verif = document.form.BorrowerMandatoryfield.value.split ('|');
- 	var champ_form= document.form.FormFieldList.value.split('|');
-		var message ="The following fields are mandatory :\n";
-		var message_champ="";
-	for (var j=0; j<champ_form.length; j++){ 
-		if (document.getElementsByName(""+champ_form[j]+"")[0]){
-			for (var i=0; i<champ_verif.length; i++) {
-					if (document.getElementsByName(""+champ_verif[i]+"")[0]) {
-						var val_champ=eval("document.form."+champ_verif[i]+".value");
-						var ref_champ=eval("document.form."+champ_verif[i]);
-						var val_form=eval("document.form."+champ_form[j]+".value");
-						if (champ_verif[i] == champ_form[j]){
-							//check if it's a select
-							if (ref_champ.type=='select-one'){
-								if (ref_champ.options[0].selected ){
-									// action if field is empty
-									message_champ+=champ_verif[i]+"\n";
-									//test to konw if u must show a message with error
-									statut=1;
-								}
-							}else {
-								if ( val_champ == '' ) {
-									// action if the field is not empty
-									message_champ+=champ_verif[i]+"\n";
-									statut=1;
-								}	
-							}
-						}
-					}
-			}
-		}
-	}
-	}
-//borrowers form 2 test if u chcked no to the quetsion of double 
- 	if (document.form.step.value==2 && statut!=1 && document.form.check_member.value > 0 )
-	{
-		
-  		
-			if (!(document.form_double.answernodouble.checked)){
-					
-				message ="";
-					message_champ+=_("Please confirm suspicious duplicate borrower !!! ");
-					statut=1;
-					document.form.nodouble.value=0;
-			}
-			else {
-			document.form.nodouble.value=1;
-			}
- 	}
-		
-			if (statut==1){
-			//alert if at least 1 error
-				alert(message+"\n"+message_champ);
-			}
-			else 
-			{
-			document.form.step=nav;
-			document.form.submit();
-			}
-		}
-
-}
-function Dopop(link) {
-// // 	var searchstring=document.form.value[i].value;
-	newin=window.open(link,'popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=no,top');
-}
-
-function Dopopguarantor(link) {
-
-	newin=window.open(link,'popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=no,top');
-}
-
-</script>

Index: htdocs/intranet-tmpl/default/en/includes/labelConfig/cardConfig.conf
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/labelConfig/cardConfig.conf
diff -N htdocs/intranet-tmpl/default/en/includes/labelConfig/cardConfig.conf
--- htdocs/intranet-tmpl/default/en/includes/labelConfig/cardConfig.conf	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-marginBottom = 12
-pageType = A4
-columns = 2
-systemDpi = 72
-labelHeigth = 54
-rows = 4
-marginLeft = 6
-labelWidth = 84

Index: htdocs/intranet-tmpl/default/en/includes/labelConfig/cardsConfig.conf
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/labelConfig/cardsConfig.conf
diff -N htdocs/intranet-tmpl/default/en/includes/labelConfig/cardsConfig.conf
--- htdocs/intranet-tmpl/default/en/includes/labelConfig/cardsConfig.conf	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-marginBottom = 10
-pageType = A4
-columns = 2
-systemDpi = 72
-labelHeigth = 54
-rows = 5
-marginLeft = 17
-labelWidth = 88

Index: htdocs/intranet-tmpl/default/en/includes/labelConfig/itemsLabelConfig.conf
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/labelConfig/itemsLabelConfig.conf
diff -N htdocs/intranet-tmpl/default/en/includes/labelConfig/itemsLabelConfig.conf
--- htdocs/intranet-tmpl/default/en/includes/labelConfig/itemsLabelConfig.conf	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-marginBottom = 12
-pageType = A4
-columns = 3
-systemDpi = 72
-labelHeigth = 34
-rows = 8
-marginLeft = 6
-labelWidth = 64

Index: htdocs/intranet-tmpl/default/en/includes/labelConfig/itemsLabelConfig3.conf
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/labelConfig/itemsLabelConfig3.conf
diff -N htdocs/intranet-tmpl/default/en/includes/labelConfig/itemsLabelConfig3.conf
--- htdocs/intranet-tmpl/default/en/includes/labelConfig/itemsLabelConfig3.conf	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-marginBottom = 8
-pageType = A4
-columns = 4
-systemDpi = 72
-labelHeigth = 22
-rows = 13
-marginLeft = 3.5
-labelWidth = 50

Index: htdocs/intranet-tmpl/default/en/includes/labelConfig/itemslabelConfig2.conf
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/labelConfig/itemslabelConfig2.conf
diff -N htdocs/intranet-tmpl/default/en/includes/labelConfig/itemslabelConfig2.conf
--- htdocs/intranet-tmpl/default/en/includes/labelConfig/itemslabelConfig2.conf	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-marginBottom = 5
-pageType = A4
-columns = 4
-systemDpi = 72
-labelHeigth = 22
-rows = 13
-marginLeft = 3,5
-labelWidth = 50

Index: htdocs/intranet-tmpl/default/en/includes/labelConfig/labelConfig.conf
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/labelConfig/labelConfig.conf
diff -N htdocs/intranet-tmpl/default/en/includes/labelConfig/labelConfig.conf
--- htdocs/intranet-tmpl/default/en/includes/labelConfig/labelConfig.conf	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-marginBottom = 25
-pageType = A4
-columns = 5
-systemDpi = 96
-labelHeigth = 21
-rows = 13
-marginLeft = 2
-labelWidth = 41

Index: htdocs/intranet-tmpl/default/en/includes/labelConfig/membersConfig.conf
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/includes/labelConfig/membersConfig.conf
diff -N htdocs/intranet-tmpl/default/en/includes/labelConfig/membersConfig.conf
--- htdocs/intranet-tmpl/default/en/includes/labelConfig/membersConfig.conf	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-marginBottom = 0
-pageType = A4
-columns = 4
-systemDpi = 72
-labelHeigth = 29.7
-rows = 10
-marginLeft = 0
-labelWidth = 52.5

Index: htdocs/intranet-tmpl/default/en/maint/catmaintain.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/maint/catmaintain.tmpl
diff -N htdocs/intranet-tmpl/default/en/maint/catmaintain.tmpl
--- htdocs/intranet-tmpl/default/en/maint/catmaintain.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,110 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog Maintenance<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="acqui-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<!-- TMPL_IF NAME=allsub-p -->
-<table>
-<caption>Results</caption>
-<!-- TMPL_LOOP NAME="loop" -->
-<tr><td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html --></a></td></tr>
-<!-- /TMPL_LOOP -->
-</table>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF NAME=modsub-p -->
-<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
-<div class="error">This will change the subject headings on <strong>all</strong> the records this subject is applied to.</div>
-<table>
-<caption>Subject Heading Global Update</caption>
-<tr><td><label for="sub">Subject:</label></td><td><input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" id="sub" size="40" /><input type="hidden" name="type" value="upsub" />
-<input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->" /></td></tr>
-</table>
-<input type="submit" value="Modify" class="submit" />
-</form>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF NAME=upsub-p -->
-Successfully modified <!-- TMPL_VAR NAME="oldsub" escape=html -->
-is now <!-- TMPL_VAR NAME="sub" escape=html -->
-<!-- <![ IGNORE [
-<p><a href="/cgi-bin/koha/maint/catmaintain.pl" onclick="window0.focus()">Back to catalogue maintenance</a><br>
-<a href=nowhere onclick="self.close()">Close this window</a>
-]]> -->
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF NAME=undel-p -->
-<table>
-<thead>
-<tr><th>Title</th><th>Author</th><th>Undelete</th></tr>
-<!-- TMPL_LOOP NAME="loop" -->
-<tr>
-<td><!-- TMPL_VAR NAME="title" escape=html --></td>
-<td><!-- TMPL_VAR NAME="author" escape=html --></td>
-<td><a href="/cgi-bin/koha/maint/catmaintain.pl?<!-- TMPL_VAR NAME="undelete" escape=url -->">Undelete</a></td>
-</tr>
-<!-- /TMPL_LOOP -->
-</table>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF NAME=finun-p -->
-<h3>Succesfully undeleted</h3>
-<p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF NAME=fixitemtype-p -->
-<form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
-<table>
-<tr><td><label for="itemtype">Itemtype:</label></td><td><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>" />
-<input type="hidden" name="type" value="updatetype" />
-<input type="text" name="itemtype" id="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>" /></td></tr>
-</table>
-<input type="submit" value="Change" class="submit" />
-</form>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF NAME=updatetype-p -->
-<h3>Updated successfully</h3>
-<p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF NAME=mainmenu-p -->
-<div class="menu">
-<h1>Catalog Maintenance</h1>
-<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
-<table>
-<caption>Subject Maintenance</caption>
-<tr><td><label for="sub">Show all subjects beginning with: </label></td><td><input type="text" name="sub" id="sub"><input type="hidden" name="type" value="allsub" /></td></tr>
-</table>
-<input type="submit" value="Show" class="submit" />
-</form>
-
-<form action="/cgi-bin/koha/search.pl" method="post">
-<table>
-<caption>Group Maintenance</caption>
-<tr><td><label for="title">Show all Titles beginning with:</label></td><td><input type="hidden" name="type" value="catmain"><input type="text" name="title" id="title" /></td></tr>
-<tr><td><label for="item">Item Number:</label></td><td><input type="text" size="25" id="item" name="item" /></td></tr>
-</table>
-<input type="submit" value="Show" class="submit" />
-</form>
-
-<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
-<table>
-<caption>Undelete Biblio</caption>
-<tr><td><label for="title">Show all Titles beginning with</label></td><td><input type="text" name="title" id="title" /><input type="hidden" name="type" value="undel" /></td></tr>
-</table>
-<input type="submit" value="Show" class="submit" />
-</form>
-</div>
-<!-- /TMPL_IF -->
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/members/boraccount.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/boraccount.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/boraccount.tmpl
--- htdocs/intranet-tmpl/default/en/members/boraccount.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Account for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<!-- The table with the account items -->
-<div id="main">
-<div class="table"><table>
-<caption>Account for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></caption>
-  <tr>
-  	<th>Date</th>
-	<th>Click to credit</th>
-    <th>Description of Charges</th>
-    <th>Amount</th>
-    <th>Still Owed</th>
-  </tr>
-
-  <!-- TMPL_LOOP NAME="accounts" -->
-
-   <!-- TMPL_IF NAME="toggle" --> <tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
-      <td><!-- TMPL_VAR NAME="date" --></td>
-   <td>  <!-- TMPL_IF NAME="amountoutstandingcredit" --><!-- TMPL_VAR NAME="itemnum" --><!-- TMPL_ELSE --><a href="mancredit.pl?itemnum=<!-- TMPL_VAR NAME="itemnum" -->&accountid=<!-- TMPL_VAR NAME="accountid" -->&bornum=<!-- TMPL_VAR NAME="bornum" -->&accounttype=<!-- TMPL_VAR NAME="accounttype" -->&amount=<!-- TMPL_VAR NAME="amountoutstanding" -->&user=<!-- TMPL_VAR NAME="firstname" -->%20<!-- TMPL_VAR NAME="surname" -->"><!--TMPL_IF NAME="itemnum"--><!-- TMPL_VAR NAME="itemnum" --><!--TMPL_ELSE-->Click<!--/TMPL_IF--></a><!-- /TMPL_IF --></td>
-      <td><!-- TMPL_VAR NAME="description" --><!-- TMPL_IF NAME="printtitle" --> <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></td>
-      <!-- TMPL_IF NAME="amountcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="amount" --> YTL</td>
-      <!-- TMPL_IF NAME="amountoutstandingcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="amountoutstanding" --> YTL</td>
-    </tr>
-
-  <!-- /TMPL_LOOP -->
-<tfoot>
-  <tr>
-    <td colspan="4">Total Due</td>
-    <!-- TMPL_IF NAME="totalcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="total" --> YTL</td>
-  </tr>
-  </tfoot>
-</table></div>
-<!-- The manual invoice and credit buttons -->
-<div class="tabitem">
-<form action="maninvoice.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /><input type="submit" class="submit" value="Create Manual Invoice" /></form><form action="moremember.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" value="Return to User Record" class="submit" /></form>
-</div>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/members/borrowers_details.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/borrowers_details.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/borrowers_details.tmpl
--- htdocs/intranet-tmpl/default/en/members/borrowers_details.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,59 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Borrower Details<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="mainbloc">
-	<h1>BORROWER DETAILS</h1>
-	
-	<form name="form" method="post" action="/cgi-bin/members/borrowers_details.pl">
-	<div >
-	<!-- TMPL_IF NAME="Institution"-->	
-		
-		<p>
-		
-			<label>borrower categorie</label>		
-			<input  type="text" name="description" size="20"  value="<!-- TMPL_VAR NAME="description" -->" >
-		</p>
-		<p>
-			
-			<label>organisation name</label>
-			<input  style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
-		</p>
-		
-	<!-- TMPL_ELSE -->	
-
-		<p>
-			<label>borrower categorie</label>
-			<input  type="text" name="description" size="20"  value="<!-- TMPL_VAR NAME="description" -->" >
-			</p>
-		<p>
-			<label>title</label>
-			<input  type="text" name="title" size="20"  value="<!-- TMPL_VAR NAME="title" -->" >
-			
-		</p>
-		<p>
-			<label>surname</label>
-			<input  style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
-		</p>
-			
-		<p>	
-			
-			<label>firstname</label>
-			<input  style="text-transform:capitalize;" type="text" name="firstname" size="20"  value="<!-- TMPL_VAR NAME="firstname" -->">
-		</p>
-		<p>
-			<label>Date of birth </label>
-			<input  type="text" name="dateofbirth" size="20"  value="<!-- TMPL_VAR NAME="dateofbirth" -->">
-		</p>		
-		
-		
-			
-		
-	<!-- /TMPL_IF -->
-	<p>
-		<div align="center">
-		<a href="#" onclick="window.close()">Close Window</a>
-		</div>
-	</p>
-	
-	</form>
-
-
-

Index: htdocs/intranet-tmpl/default/en/members/deletemem.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/deletemem.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/deletemem.tmpl
--- htdocs/intranet-tmpl/default/en/members/deletemem.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Cannot Delete User<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-	<div class="error">
-	<h3>Cannot Delete Patron</h3>
-		<!-- TMPL_IF name="ItemsOnIssues" -->
-			<p>Patron has <!-- TMPL_VAR name="ItemsOnIssues" --> item(s) checked out.</p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="charges -->
-			<p>Patron has <!-- TMPL_VAR name="charges" --> in fines.</p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="guarantees" -->
-			<p>Patron's record has child accounts attached.</p>
-		<!-- /TMPL_IF -->
-		<form action="moremember.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR NAME="bornum" -->" name="bornum" /><input type="submit" class="submit" value="&lt;&lt; Return to Patron Record" /></form>
-	</div>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/members/guarantor_search.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/guarantor_search.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/guarantor_search.tmpl
--- htdocs/intranet-tmpl/default/en/members/guarantor_search.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Guarantor search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<h1>Search guarantor</h1>
-	Search on
-	<form action="/cgi-bin/koha/members/guarantor_search.pl" method="post">
-		<input type="text" name="member" value="<!-- TMPL_VAR NAME="member" -->"> Ordered by
-		<select name="orderby">
-			<option value="surname,firstname">Surname</option>
-			<option value="cardnumber">cardnumber</option>
-		</select>
-		<input type="submit" class="button" value="OK">
-	</form>
-</div>
-
-<!--TMPL_IF NAME="results" -->
-	<p>filter on <!-- TMPL_VAR NAME="member" -->, <!-- TMPL_VAR Name ="numresults" --> members found</p>
-	<table>
-		<tr>
-			<th>cardnumber</th>
-			<th>surname</th>
-			<th>firstname</th>
-			<th>Date of birth</th>
-			<th>address</th>
-		</tr>
-		<!-- TMPL_LOOP NAME="resultsloop" -->
-			<!-- TMPL_IF NAME="background" -->
-				<tr bgcolor="#ffffcc">
-			<!-- TMPL_ELSE -->
-				<tr bgcolor="white">
-			<!-- /TMPL_IF -->
-				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
-				<td><p><a href="javascript:window.opener.document.form.guarantorid.value=<!-- TMPL_VAR NAME="borrowernumber" -->;self.close();"><!-- TMPL_VAR NAME="surname" --></a></p>
-				<td><b><!-- TMPL_VAR NAME="firstname" --></b></td> 
-				<td><!-- TMPL_VAR NAME="dateofbirth" --></td>
-				<td><p><!-- TMPL_VAR NAME="address" --> <!-- TMPL_VAR NAME="city" --></p></td>
-			</tr>
-		<!-- /TMPL_LOOP -->
-	</table>
-</div>
-</div>
-<!--/TMPL_IF-->
-
-
-

Index: htdocs/intranet-tmpl/default/en/members/imemberentry.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/imemberentry.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/imemberentry.tmpl
--- htdocs/intranet-tmpl/default/en/members/imemberentry.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,66 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Users: <!-- TMPL_IF NAME="surname" -->Edit Record for  <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- TMPL_ELSE -->Add New Institution<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<form action="newimember.pl" method="post">
-<!-- TMPL_IF name="surname" -->
-	<h1>Edit Institution</h1>
-<!-- TMPL_ELSE -->
-	<h1>Add New Institution</h1>
-<!-- /TMPL_IF -->
-
-
-  <input type="hidden" name="joining" value="<!-- TMPL_VAR name="joining" -->" />
-  
-  <input type="hidden" name="type" value="borrowers" />
-  <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->" />
-  <input type="hidden" name="updtype" value="I" />
-
-  <div class="table"><table>
-    <tr><td><label for="institution_name">Institution Name: </label></td><td><input type="text" id="institution_name" name="institution_name" size="50" value="<!-- TMPL_VAR name="surname" -->" /></td></tr>
-	<tr><td><label for="address">Postal Address: </label></td><td><input type="text" id="address" name="address" size="40" value="<!-- TMPL_VAR name="streetaddress" -->" /></td></tr>
-	<tr><td><label for="city">City, State:</label></td><td><input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR name="city" -->" /></td></tr>
-	<tr><td><label for="zipcode">Zipcode: </label></td><td><input type="text" id="zipcode" name="zipcode" size="20" value="<!-- TMPL_VAR name="zipcode" -->" /></td></tr>
-	<tr><td><label for="borrowernotes">Notes:</label> </td><td><textarea id="borrowernotes" name="borrowernotes" cols="30" rows="3"><!-- TMPL_VAR name="borrowernotes" --></textarea></td></tr>
-	</table></div>
-	
-	<div class="table"><table>
-	<caption>Contact Details</caption>
-    <tr><td><label for="contactname">Contact Name:</label> </td><td><input type="text" id="contactname" name="contactname" size="40" value="<!-- TMPL_VAR name="contactname" -->" /></td></tr>
-	<tr><td><label for="phoneday">Phone:</label> </td><td><input type="text" id="phoneday" name="phoneday" size="20" value="<!-- TMPL_VAR name="phoneday" -->" /></td></tr>
-	<tr><td><label for="faxnumber">Fax:</label> </td><td><input type="text" id="faxnumber" name="faxnumber" size="20" value="<!-- TMPL_VAR name="faxnumber" -->" /></td></tr>
-	<tr><td><label for="emailaddress">Email:</label> </td><td><input type="text" id="emailaddress" name="emailaddress" size="40" value="<!-- TMPL_VAR name="emailaddress" -->" /></td></tr>
-	<tr><td><label for="altnotes">Notes:</label> </td><td><textarea id="altnotes" name="altnotes" cols="30" rows="3"><!-- TMPL_VAR name="altnotes" --></textarea></td></tr>
-</table></div>
-
-	<div class="table"><table>
-	<caption>Institution Details</caption>
-	<tr><td><label>Member Number:</label> </td><td><!-- TMPL_VAR NAME="member" --></td></tr>
-	<tr><td><label for="branchcode">Branch:</label> </td><td><!-- TMPL_VAR name="CGIbranch" --></td></tr>
-	<tr><td><label for="cardnumber_institution">Card Number: </label></td><td><input type="text" id="cardnumber_institution" name="cardnumber_institution" size="7" maxlength="7" value="<!-- TMPL_VAR NAME="cardnumber_institution" -->" /></td></tr>
-	</table></div>
-<div class="table"><table>
-				<caption>Library Use</caption>
-			</tr>
-			<tr>
-				<!-- TMPL_IF NAME="addAction" -->
-					<th>Joining date (leave blank for today)</th>
-					<td><input type="text" name="joining" id="joining" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->"></td>
-				<!-- TMPL_ELSE -->
-					<td>Joining date</td>
-					<td><!-- TMPL_VAR name="joining" --></td>
-				<!-- /TMPL_IF -->
-				<th><label for="expiry">Expiry date (leave blank for auto calc)</label></th>
-				<td><input type="text" name="expiry" id ="expiry" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->"></td>
-			</tr>
-
-</table></div>
-	<p><input type="submit" class="submit" value="Add this Member" /></p>
-</form>
-
-
-<!-- TMPL_VAR NAME="endmenumember" -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/members/jmemberentry.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/jmemberentry.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/jmemberentry.tmpl
--- htdocs/intranet-tmpl/default/en/members/jmemberentry.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,60 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Users: Add Child for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-
-<div id="main"><form action="newjmember.pl" method="post">
-	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->" />
-	<input type="hidden" name="updtype" value="I" />
-	<input type="hidden" name="area" value="<!-- TMPL_VAR NAME="area" -->" />
-	<input type="hidden" name="city" value="<!-- TMPL_VAR NAME="city" -->" />
-	<input type="hidden" name="physstreet" value="<!-- TMPL_VAR NAME="physstreet" -->" />
-	<input type="hidden" name="streetaddress" value="<!-- TMPL_VAR NAME="streetaddress" -->" />
-	<input type="hidden" name="streetcity" value="<!-- TMPL_VAR NAME="streetcity" -->" />
-	<input type="hidden" name="phone" value="<!-- TMPL_VAR NAME="phone" -->" />
-	<input type="hidden" name="phoneday" value="<!-- TMPL_VAR NAME="phoneday" -->" />
-	<input type="hidden" name="faxnumber" value="<!-- TMPL_VAR NAME="faxnumber" -->" />
-	<input type="hidden" name="emailaddress" value="<!-- TMPL_VAR NAME="emailaddress" -->" />
-	<input type="hidden" name="contactname" value="<!-- TMPL_VAR NAME="contactname" -->" />
-	<input type="hidden" name="altphone" value"<!-- TMPL_VAR NAME="altphone" -->" />
-
-	<h1>Add New Juvenile Patron</h1>
-<div class="table"><table>
-  <caption>Parent or Guardian</caption>
-	<tr><td><label for="firstname_guardian">First Name</label></td><td><input type="text" name="firstname_guardian" id="firstname_guardian" size="20" value="<!-- TMPL_VAR NAME="firstname" -->" /></td></tr>
-		<tr><td><label for="surname_guardian">Last Name</label></td><td><input type="text" name="surname_guardian" id="surname_guardian" size="20" value="<!-- TMPL_VAR NAME="surname" -->" /></td></tr>
-		<tr><td><label for="guardian_number">Library Card Number</label></td><td><input type="text" name="guardian_number" id="guardian_number" size="20" value="<!-- TMPL_VAR NAME="cardnumber" -->" /></td></tr>
-</table></div>
-
-	<div class="table"><!-- TMPL_LOOP NAME="cmemloop" -->
-	<table>
-		<caption>Child <!-- TMPL_VAR NAME="count" --></caption>
-	<tr>
-		<td><label for="cmember">Member Number</label></td><td><!-- TMPL_VAR NAME="cmember" --></td>
-	</tr>
-	<tr>
-	<td><label for="cardnumber_child_<!-- TMPL_VAR NAME="i" -->">Card Number</label></td><td><input type="text" id="cardnumber_child_<!-- TMPL_VAR NAME="i" -->" name="cardnumber_child_<!-- TMPL_VAR NAME="i" -->" size="20" value="<!-- TMPL_VAR NAME="jcardnumber" -->" /><input type="hidden" name="bornumber_child_<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="cmember" -->" /></td>
-	</tr>
-	<tr>
-		<td><label for="firstname_child_<!-- TMPL_VAR NAME="i" -->">First Name(s)</label></td><td><input type="text" id="firstname_child_<!-- TMPL_VAR NAME="i" -->" name="firstname_child_<!-- TMPL_VAR NAME="i" -->" size="20"  /></td></tr>
-		<tr><td><label for="surname_child_<!-- TMPL_VAR NAME="i" -->">Last Name</label></td><td><input type="text" id="surname_child_<!-- TMPL_VAR NAME="i" -->" name="surname_child_<!-- TMPL_VAR NAME="i" -->" size="20"  /></td></tr>
-		<tr><td><label for="dateofbirth_child_<!-- TMPL_VAR NAME="i" -->">Date of Birth (<!-- TMPL_VAR NAME="dateformat" -->)</label></td><td><input type="text" name="dateofbirth_child_<!-- TMPL_VAR NAME="i" -->" id="dateofbirth_child_<!-- TMPL_VAR NAME="i" -->" size="10"  /></td></tr>
-		<tr><td><label for="sex_child_<!-- TMPL_VAR NAME="i" -->">Sex</label></td><td>
-			<input type="radio" id="sex_child_<!-- TMPL_VAR NAME="i" -->" name="sex_child_<!-- TMPL_VAR NAME="i" -->" value="F" />F
-			<input type="radio" name="sex_child_<!-- TMPL_VAR NAME="i" -->" value="M" />M
-		</td></tr>
-<!-- 		<tr><td>School</td><td><input type="text" name="school_child_<!-- TMPL_VAR NAME="i" -->" size="20" ></td>
-	</tr> -->
-	<tr>
-		<td><label for="altnotes_child_<!-- TMPL_VAR NAME="i" -->">Notes</label></td><td><textarea name="altnotes_child_<!-- TMPL_VAR NAME="i" -->" id="altnotes_child_<!-- TMPL_VAR NAME="i" -->" cols="40" rows="3"></textarea></td>
-	</tr>
-	</table>
-	<!-- /TMPL_LOOP --></div>
-
-<p>			<input type="submit" value="Add New Member" class="submit" /></p>
-
-</form></div>
-
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/members/mancredit.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/mancredit.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/mancredit.tmpl
--- htdocs/intranet-tmpl/default/en/members/mancredit.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Users: Create Manual Credit<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main"><h3>Manual Credit</h3>
-<!-- TMPL_IF NAME="error" -->
-		<div class="error">
-		<h3>Error Crediting User: Either no such invoice exists or no amount given</h3>
-		
-</div><!--/TMPL_IF-->
-<form class="inline" action="mancredit.pl" method="post" name="manualcredit">
-<input type="hidden" name="bornum" value="<!-- TMPL_VAR Name="bornum" -->" />
-<input type="hidden" name="loggedinuser" value="<!-- TMPL_VAR NAME="loggedinusername" -->">
-<input type="hidden" name="accounttype" value=  "<!-- TMPL_VAR NAME="accounttype" -->"/>
-<input type="hidden" name="itemnum" value=  "<!-- TMPL_VAR NAME="itemnum" -->"/>
-<input type="hidden" name="accountid" value=  "<!-- TMPL_VAR NAME="accountid" -->"/>
-<input type="hidden" name="user" value=  "<!-- TMPL_VAR NAME="user" -->"/>
-<input type="hidden" name="add" value=  "add"/>
-<div class="data">
-<table>
-	<tr><th>Fine Details</th><td><div class="error">User:<!-- TMPL_VAR Name="user" -->&nbsp;&nbsp;&nbsp;Amount:<!-- TMPL_VAR NAME="amount" --> </div></td></tr>
-	<tr><th>Description</th><td><input type="text" name="desc" size="50" /></td></tr>
-	<tr><th>Amount</th><td><input type="text" name="amount" /></td></tr>
-</table>
-</div>
-<input type="button"  onclick="AddCredit(this.form)" value="Add Credit" />
-</form> <form class="inline" action="boraccount.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR Name="bornum" -->" name="bornum" /><input type="submit" class="cancel" value="Cancel" /></form>
-
-<script type="text/javascript">
-function AddCredit(f){
-if (f.amount.value==""){
-alert("No amount given");
-return false;
-}
-document.manualcredit.submit();
-
-
-
-}
-</script>
-<div>
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/members/maninvoice.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/maninvoice.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/maninvoice.tmpl
--- htdocs/intranet-tmpl/default/en/members/maninvoice.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Users: Create Manual Invoice<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-
-<div id="main">
-<form class="inline" action="maninvoice.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR Name="bornum" -->" />
-	<div class="data"><table>
-	<caption>Manual Invoice</caption>
-	<tr><th>User</th><td><!-- TMPL_VAR Name="user" --></td></tr>
-	<tr><th>Type</th><td><select name="type">
-<option value="L">Lost Item</option>
-<option value="F">Fine</option>
-<option value="A">Account Management Fee</option>
-<option value="N">New Card</option>
-<option value="M">Sundry</option>
-<option value="REF">Cash Refund</option>
-</select></td></tr>
-	<tr><th>Description</th><td><input type="text" name="desc" size="50" /></td></tr>
-	<tr><th>Amount</th><td>YTL<input type="text" name="amount" /></td></tr>
-	</table></div>
-<input type="submit" name="add" value="Add Charge" class="submit" />
-</form> <form class="inline" action="boraccount.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR Name="bornum" -->" /><input type="submit" class="cancel" value="Cancel" /></form>
-
-
-</div>
-
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/members/member-flags.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/member-flags.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/member-flags.tmpl
--- htdocs/intranet-tmpl/default/en/members/member-flags.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<form method="post" action="/cgi-bin/koha/members/member-flags.pl">
-	<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->" />
-	<input type="hidden" name="newflags" value="1" />
-<div class="table">	<table>
-	<caption>Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></caption>
-	<tr><th>Flag</th><th>Name</th><th>Description</th></tr>
-	<!-- TMPL_LOOP NAME="loop" -->
-		<tr>
-			<td>
-				<input type="checkbox" name="flag-<!-- TMPL_VAR NAME="bit" -->" <!-- TMPL_VAR NAME="checked" --> />
-			</td>
-			<td>
-				<!-- TMPL_VAR NAME="flag" -->
-			</td>
-			<td>
-				<!-- TMPL_VAR NAME="flagdesc" -->
-			</td>
-		</tr>
-	<!-- /TMPL_LOOP -->
-	</table></div>
-<p><input type="submit" value="Set Flags" class="submit" /> <input class="cancel" type="button" value="Cancel" onclick="location.href='/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="member" -->'; return false;" /></p>
-
-</form>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/members/member-password.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/member-password.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/member-password.tmpl
--- htdocs/intranet-tmpl/default/en/members/member-password.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Users: <!-- TMPL_IF NAME="newpassword" -->Password Updated <!-- TMPL_ELSE -->Update Password for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<!-- TMPL_IF NAME="newpassword" -->
-<h3>Password Updated</h3>
-<div class="details">
-<p><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="member" -->">Return to Member Details</a></p>
-</div>
-<!-- TMPL_ELSE --><form method="post" action="/cgi-bin/koha/members/member-password.pl">
-<h3>Change Username and/or Password for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h3>
-	
-	<!-- TMPL_IF NAME="warn" --><div class="error">
-		You have entered a User ID that already exists.  Please choose another one.</div>
-	<!-- /TMPL_IF -->
-<div class="details">
-<table><tr><th>New UserID:</th><td><input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->" />
-	
-<input name="newuserid" size="20" value="<!-- TMPL_VAR NAME=userid -->" /></td></tr>
-<tr><th>New Password:</th><td><input name="newpassword" type="text" size="20" value="<!-- TMPL_VAR NAME="defaultnewpassword" -->" /></td></tr></table>
-	</div><p><input type="submit" value="Confirm Password" class="submit" /> <input class="cancel" type="button" value="Cancel" onclick="location.href='/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="member" -->'; return false;" /></p>
-</form><!-- /TMPL_IF -->
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/members/member-picupload.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/member-picupload.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/member-picupload.tmpl
--- htdocs/intranet-tmpl/default/en/members/member-picupload.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patrons: Details for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
- 
- <div id="main">
- 	<div id="bloc25">
- 	<h2 class="members">Upload Picture</h2>
- 	Member name:: <!-- TMPL_VAR NAME="name" --> cardnumber:<!-- TMPL_VAR NAME="cardnum" --><br>
- 	<FORM ACTION="/cgi-bin/koha/members/member-picupload.pl" METHOD="post"
-ENCTYPE="multipart/form-data"> 
-     Photo to Upload: <INPUT TYPE="file" NAME="photo"> 
-     <INPUT TYPE="hidden" NAME="cardnum" VALUE="<!-- TMPL_VAR NAME="cardnum" -->">
-    <INPUT TYPE="hidden" NAME="bornum" VALUE="<!-- TMPL_VAR NAME="bornum" -->">
-  <br><br> 
-  <INPUT TYPE="submit" NAME="Submit" VALUE="Submit Form"> 
-  </FORM>
- 	</div>
- </div>
- <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->	
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl
--- htdocs/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Users Quick Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<div id="main-compact">
-
-<div class="table"><table>
-  <tr>
-  	<th>&nbsp;</th>
-    <th>Card</th>
-    <th>Name (Cat.)</th>
-    <th>Address</th>
-  </tr>
-  <!-- TMPL_IF NAME="resultsloop" -->
-  <!-- TMPL_LOOP NAME="resultsloop" -->
-    <!-- TMPL_IF NAME="background" -->
-    <tr class="highlight">
-    <!-- TMPL_ELSE -->
-    <tr>
-    <!-- /TMPL_IF -->
-	 <td><form action="member-search-results.pl" method="get"><input type="button" class="submit" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
-      <td><!-- TMPL_VAR NAME="cardnumber" --></td>
-      <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
-      <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
-    </tr>
-  <!-- /TMPL_LOOP -->
-  <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
-</table></div>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/members/member-quicksearch.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/member-quicksearch.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/member-quicksearch.tmpl
--- htdocs/intranet-tmpl/default/en/members/member-quicksearch.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS-- Users Quick Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<div id="main-compact">
-	<form action="/cgi-bin/koha/members/member.pl" method="post" id="mainform" class="mainform">
-	<label for="member">Patron Search:</label><input id="member" type="text" size="25" name="member" /><input type="hidden" name="quicksearch" value="1" />
-	<input type="submit" value="Search" class="submit" />
-	</form>
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/members/member.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/member.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/member.tmpl
--- htdocs/intranet-tmpl/default/en/members/member.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patrons: Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<div class="table"><table>
-	<caption>Patron Search Results</caption>
-  <tr>
-    <th>Card</th>
-    <th>Name</th>
-    <th>Cat</th>
-    <th>Address</th>
-    <th>OD/Issues</th>
-<!--     <th>Charges</th> -->
-    <th>Notes</th>
-	<th>&nbsp;</th>
-  </tr>
-  <!-- TMPL_IF NAME="resultsloop" -->
-  <!-- TMPL_LOOP NAME="resultsloop" -->
-    <!-- TMPL_IF NAME="background" -->
-    <tr class="highlight">
-    <!-- TMPL_ELSE -->
-    <tr>
-    <!-- /TMPL_IF -->
-      <td><!-- TMPL_VAR NAME="cardnumber" --> (<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->" title="Issue to this Patron">Issue</a>)</td>
-      <td><a class="searchresults" href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> </td>
-      <td><!-- TMPL_VAR NAME="categorycode" --></td>
-      <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
-      <td><!-- TMPL_VAR NAME="odissue" --></td>
-<!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
-      <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
-	  <td><a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
-    </tr>
-  <!-- /TMPL_LOOP -->
-  <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
-</table></div>
-<div class="tabitem"><form action="/cgi-bin/koha/members/memberentry.pl" method="post"><input type="hidden" name="categorycode" value="" /><input type="hidden" name="actionType" value="Add" />
-	<input type="submit" class="submit" value="Add New Patron" /></form>
-	<form action="/cgi-bin/koha/members/memberentry.pl" method="post"><input type="hidden" name="categorycode" value="I" /><input type="hidden" name="actionType" value="Add" /><input type="submit" class="submit" value="Add New Institution" /></form>
-	</div>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/members/memberentry.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/memberentry.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/memberentry.tmpl
--- htdocs/intranet-tmpl/default/en/members/memberentry.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,160 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patrons: <!-- TMPL_IF NAME="modify" -->Edit Record for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- TMPL_ELSE -->Add New <!-- TMPL_IF NAME="institution" -->Institutional <!-- /TMPL_IF -->Patron<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-	<!-- TMPL_IF NAME="addAction" -->
-	<h1>
-		Add New <!-- TMPL_IF NAME="institution" -->Institutional <!-- /TMPL_IF -->Patron
-	</h1>
-	<!-- TMPL_ELSE -->
-	<h1>
-		Update <!-- TMPL_IF NAME="institution" -->Institutional <!-- /TMPL_IF -->Patron Details
-</h1><h2><!-- TMPL_IF NAME="surname" --><!-- TMPL_VAR NAME="surname" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="firstname" -->, <!-- TMPL_VAR name="firstname" --><!-- /TMPL_IF --></h2>
-	<!-- /TMPL_IF -->
-
-	<!-- TMPL_IF Name="NOK" -->
-		
-		<div class="error">
-		<h3>Missing Information</h3>
-			<p>The following fields have a forbidden value. Correct them and press OK again :</p><ul>
-			<!-- TMPL_IF NAME="ERROR_surname" -->
-				<li><a href="#lastname">Last Name</a></li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="ERROR_firstname" -->
-				<li><a href="#firstname">First Name</a></li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="ERROR_gender" -->
-				<li><a href="sex">Sex</a></li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="ERROR_address" -->
-				<li><a href="#address">Mailing Address</a></li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="ERROR_city" -->
-				<li><a href="#city">Mailing Address City/State</a><br>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="ERROR_cardnumber" -->
-				<li><a href="#cardnumber">Card Number</a></li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="ERROR_invalid_cardnumber" -->
-				<li><a href="#cardnumber">Invalid Card Number</a></li>
-			<!-- /TMPL_IF -->
-			</ul>
-		</div>
-	<!-- /TMPL_IF -->
-	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
-		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
-		<input type="hidden" name="type" value="borrowers">
-<input type="hidden" name="joining" value="<!-- TMPL_VAR NAME="joining" -->">
-		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-	<input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
-		<!-- TMPL_IF NAME="addAction" -->
-			<input type="hidden" name="op" value="add">
-		<!-- TMPL_ELSE -->
-			<input type="hidden" name="op" value="modify">
-		<!-- /TMPL_IF -->
-<div class="table members"><table>
-
-	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="title">Salutation:</label></th><td colspan="4"><!-- TMPL_VAR NAME="Mr" -->
-				<select name="title" id="title">
-					<option <!-- TMPL_VAR NAME="title_selected_ " --> value="">No Title</option>
-					<option value="Miss" <!-- TMPL_VAR NAME="title_Miss" -->>Miss</option>
-					<option value="Mrs" <!-- TMPL_VAR NAME="title_Mrs" -->>Mrs</option>
-					<option value="Ms" <!-- TMPL_VAR NAME="title_Ms" -->>Ms</option>
-					<option <!-- TMPL_VAR NAME="title_Mr" --> value="Mr" >Mr</option>
-					<option value="Dr" <!-- TMPL_VAR NAME="title_Dr" -->>Dr</option>
-					<option value="Sir" <!-- TMPL_VAR NAME="title_Sir" -->>Sir</option>
-				</select>
-				</td></tr><!-- /TMPL_UNLESS -->
-	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="initials">Initials:</label></th><td colspan="4"><input type="text" id="initials" name="initials" size="5" value="<!-- TMPL_VAR NAME="initials" -->"></td></tr><!-- /TMPL_UNLESS -->
-
-	<tr><th><label for="surname"<!-- TMPL_IF NAME="ERROR_surname" --> class="focus"<!-- /TMPL_IF -->><a name="lastname" id="lastname"><!-- TMPL_IF NAME="institution" -->Institution name:<!-- TMPL_ELSE -->Last Name: <!-- /TMPL_IF --></a></label></th><td><input type="text" id="surname" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->"<!-- TMPL_IF NAME="ERROR_surname" --> class="focus"<!-- /TMPL_IF -->></td>
-
-<!-- TMPL_UNLESS name="institution" --><th><label for="sex"<!-- TMPL_IF NAME="ERROR_gender" --> class="focus"<!-- /TMPL_IF -->><a name="sex" id="sex">Sex:</a> </label></th><td><input type="radio" id="sex" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked="checked"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_gender" --> class="focus"<!-- /TMPL_IF -->>F	<input type="radio" name="sex" value="M"<!-- TMPL_UNLESS name="female" --> checked="checked"<!-- /TMPL_UNLESS --><!-- TMPL_IF NAME="ERROR_gender" --> class="focus"<!-- /TMPL_IF -->> M</td><!-- /TMPL_UNLESS -->
-</tr>
-
-	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="firstname"<!-- TMPL_IF NAME="ERROR_firstname" --> class="focus"<!-- /TMPL_IF -->><a name="firstname" id="firstname">First Name:</a></label> </th><td><input type="text" id="firstname" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->"<!-- TMPL_IF NAME="ERROR_firstname" --> class="focus"<!-- /TMPL_IF -->></td>
-
-<!-- TMPL_UNLESS name="institution" --><th><label for="dateofbirth">Date of Birth: </label></th><td><input type="text" id="dateofbirth" name="dateofbirth" size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->"> (<!-- TMPL_VAR NAME="dateformat" -->)</td><!-- /TMPL_UNLESS -->
-</tr><!-- /TMPL_UNLESS -->
-					
-	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="othernames">Prefered Name:</label></th><td colspan="4"><input type="text" id="othernames" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->"></td></tr><!-- /TMPL_UNLESS -->
-
-	<tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing Address</legend><label for="streetaddress"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->><a name="address" id="address">Address:</a> </label><input type="text" id="streetaddress" name="streetaddress" size="25" value="<!-- TMPL_VAR NAME="address" -->"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->>
-<br><label for="city"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->><a name="#city" id="#city">City:</a></label> <input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->>
-<br><label for="zipcode">Postal Code:</label> <input type="text" id="zipcode" name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->"></fieldset>
-
-<fieldset><legend>Street Address (if different)</legend>
-<label for="physstreet">Address:</label><input type="text" id="physstreet" name="physstreet" size="25" value="<!-- TMPL_VAR NAME="physstreet" -->">
-<br><label for="streetcity">City: </label><input type="text" id="streetcity" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->">
-<br><label for="homezipcode">Postal Code:</label><input type="text" id="homezipcode" name="homezipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->">
-</fieldset>
-</td></tr><tr><th><label for="preferedcont">Prefered method to contact:</label> </th><td ><input type="radio" id="preferredcont" name="preferredcont"  value="sms" <!-- TMPL_IF NAME="sms" -->checked<!--/TMPL_IF-->>SMS<input type="radio" id="preferredcont" name="preferredcont"  value="email" <!-- TMPL_IF NAME="email" -->checked<!--/TMPL_IF-->>E-mail<input type="radio" id="preferredcont" name="preferredcont"  value="letter" <!-- TMPL_IF NAME="letter" -->checked<!--/TMPL_IF-->>Letter</td><td>If Letter is chosen fill Mailing address properly</tr>
-	
-	<tr><th><label for="phoneday">GSM Mobile:</label> </th><td colspan="4"><input type="text" id="phoneday" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->">If SMS is chosen please fill one number as 05338717273</td></tr>
-	<tr><th><label for="phone"> Other Phone :</label> </th><td colspan="4"><input type="text" id="phone" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->"></td></tr>
-	<tr><th><label for="faxnumber">Fax: </label></th><td colspan="4"><input type="text" id="faxnumber" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->"></td></tr>
-	<tr><th><label for="emailaddress">Email :</label> </th><td colspan="4"><input type="text" id="emailaddress" name="emailaddress" size="40" value="<!-- TMPL_VAR NAME="emailaddress" -->">If Email is chosen write a valid e-mail</td></tr>
-			</tr>
-	<tr><th><label for="textmessaging">Patron message:</label><p> (appears in OPAC)</p></th><td colspan="4"><textarea id="textmessaging" name="textmessaging" cols="30" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td></tr>
-	<tr><th><label for="borrowernotes">Circulation note:</label> <p>(appears in Circulation)</p> </th><td colspan="4"><textarea id="borrowernotes" name="borrowernotes" cols="30" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td></tr>
-			</table></div>
-
-
-<!-- TMPL_UNLESS name="institution" -->
-		<div class="table members"><table>
-		<caption>Alternate Contact</caption>
-		<tr><th><label for="contactname">Name: </label></th><td><input type="text" id="contactname"  name="contactname" size="40" value="<!-- TMPL_VAR NAME="contactname" -->"></td></tr>
-		<tr><th><label for="altphone">Phone:</label> </th><td><input type="text" id="altphone" name="altphone" size="20" value="<!-- TMPL_VAR NAME="altphone" -->"></td></tr>
-		<tr><th><label for="altrelationship">Relationship:</label> </th><td><select id="altrelationship" name="altrelationship" size="1">
-					<!-- TMPL_LOOP NAME="relshiploop" -->
-						<option <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="relationship" --></option>
-					<!-- /TMPL_LOOP -->
-					</select></td></tr><!-- /TMPL_UNLESS -->
-
-		<tr><th><label for="altnotes">Notes: </label></th><td><textarea id="altnotes" name="altnotes" cols="30" rows="3"><!-- TMPL_VAR NAME="altnotes" --></textarea></td></tr>
-		
-	<tr></table></div><div class="table members"><table>
-				<caption>Library Use</caption>
-			</tr>
-			<tr>
-				<!-- TMPL_IF NAME="addAction" -->
-					<th>Joining date (leave blank for today)</th>
-					<td><input type="text" name="joining" id="joining" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->"> (<!-- TMPL_VAR NAME="dateformat" -->)</td>
-				<!-- TMPL_ELSE -->
-					<td>Joining date</td>
-					<td><!-- TMPL_VAR name="joining" --></td>
-				<!-- /TMPL_IF -->
-				<th><label for="expiry">Expiry date (leave blank for auto calc)</label></th>
-				<td><input type="text" name="expiry" id ="expiry" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->"> (<!-- TMPL_VAR NAME="dateformat" -->)</td>
-			</tr>
-
-</table></div>
-<div class="table members"><table>
-	<caption>Flags</caption>
-	<!-- TMPL_LOOP NAME="flagloop" -->
-	<tr><th><label for="<!-- TMPL_VAR NAME="name" -->"><!-- TMPL_VAR NAME="html" --></label></th><td><input type="radio" id="<!-- TMPL_VAR NAME="name" -->" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Yes <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>No</td></tr>
-				<!-- /TMPL_LOOP -->
-</table></div>
-
-<div class="table members"><table>
-<caption>Patron Details</caption>
-	<!-- TMPL_UNLESS NAME="addAction" --><tr><th><label>Member Number:</label></th><td><span class="ex"><!-- TMPL_VAR NAME="member" --></span></td></tr><!-- /TMPL_UNLESS -->
-	<tr><th><label for="categorycode">Category:</label> </th><td><!-- TMPL_VAR NAME="catcodepopup" --></td></tr>
-	<tr><th><label for="branchcode">Branch:</label></th><td><!-- TMPL_VAR NAME="CGIbranch" --></td></tr>	
-	<tr><th><label for="cardnumber"<!-- TMPL_IF NAME="ERROR_cardnumber" --> class="focus"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_invalid_cardnumber" --> class="focus"<!-- /TMPL_IF -->><a name="cardnumber" id="cardnumber">Card Number</a></label></th><td><input id="cardnumber" type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"<!-- TMPL_IF NAME="ERROR_cardnumber" --> class="focus"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_invalid_cardnumber" --> class="focus"<!-- /TMPL_IF -->></td></tr>
-</table>
-<table><caption>Additional Fields</caption>
-	<tr><th><label for="sort1">Sorting field 1</label></th><td><input type="text" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->"></td><td rowspan="2"><p>These fields are available for your own usage. They can be useful for statistical purposes</p></td></tr>
-	<tr><th><label for="sort2">Sorting field 2</label></th><td><input type="text" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->"></td></tr>
-</table>
-</div>
-
-<p>	<input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->">
-	<input name="submit" type="submit" class="submit" value="<!-- TMPL_IF NAME="modify" -->Update<!-- TMPL_ELSE -->Add<!-- /TMPL_IF --> This Patron" /></p>
-	</form>
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/members/memberentryA.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/memberentryA.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/memberentryA.tmpl
--- htdocs/intranet-tmpl/default/en/members/memberentryA.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,606 +0,0 @@
-<!-- templates to add/modify an <A>dult -->
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Member, Adult management
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
-<!-- TMPL_INCLUDE NAME="javascript/members.js" -->
-
-	<!-- TMPL_IF NAME="opadd" -->
-	<h1>
-		Add adult member (step <!-- TMPL_VAR NAME="step" -->)
-	</h1>
-	<!-- TMPL_ELSE -->
-	<h1 >
-		Modify adult member
-	</h1>
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="check_member" -->
-		<!-- TMPL_IF NAME="step_2" -->
-		<p>
-		<form name="form_double">
-			<div id="problem">
-				Duplicate suspected 
-				<a href="javascript:Dopop('borrowers_details.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->');" >Detail</a>
-				Duplicate ?
-				<a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->&category_type=<!--TMPL_VAR NAME="check_categorytype"-->">Yes</a> 
-				&nbsp;&nbsp;&nbsp; No, it is not
-				<!-- TMPL_IF NAME="checked"-->
-					<input type="checkbox" checked name="answernodouble" >
-				<!-- TMPL_ELSE -->
-					<input type="checkbox" name="answernodouble" >
-				<!-- /TMPL_IF -->
-			</div>
-		</form>
-		</p>
-		<!--/TMPL_IF-->
-	<!--/TMPL_IF-->
-		
-		<!-- TMPL_IF Name="nok" -->
-		<!--<h1>ERREUR</h1>-->
-		<div id="problem">
-			<p>The following fields are wrong. Please fix it/them</p>
-			<!-- TMPL_IF NAME="ERROR_login_exist" -->
-				<p>login/password already exist</p>
-			<!-- /TMPL_IF -->
-                        <!-- TMPL_IF NAME="ERROR_age_limitations" -->
-                                Member is too young or too old for this category
-                        <!-- /TMPL_IF -->
-		</div>
-	<!-- /TMPL_IF -->
-
-	<!-- TMPL_IF NAME="step_1"-->
-<form name="form"  action="/cgi-bin/koha/members/memberentry.pl" method="post"> 
-<!-- 		field always hidden in different form (1,2,3) -->
-	<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
-	<input type="hidden" name="FormFieldList" value="surname|select_city|othernames|initials|title|cardnumber|firstname|dateofbirth|sort1|sort2">
-	<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-	<input type="hidden" name="type" value="borrowers">
-	<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-	<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-	<input type="hidden" name="guarantorid"   value="<!-- TMPL_VAR NAME="guarantorid" -->">
-	<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
-	<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
-	<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-	<input type="hidden" name="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
-	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-	<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
-	
-<!-- 	from form 2 -->
-	<input type="hidden" name="streetnumber"  value="<!-- TMPL_VAR NAME="streetnumber" -->">
-	<input type="hidden" name="address"  value="<!-- TMPL_VAR NAME="address" -->">
-	<input type="hidden" name="streettype"  value="<!-- TMPL_VAR NAME="streettype" -->">
-	<input type="hidden" name="address2"  value="<!-- TMPL_VAR NAME="address2" -->">	
-	<input type="hidden" name="zipcode"  value="<!-- TMPL_VAR NAME="zipcode" -->">
-	<input type="hidden" name="city"  value="<!-- TMPL_VAR NAME="city" -->">	
-	<input type="hidden" name="branchcode"  value="<!-- TMPL_VAR NAME="branchcode" -->">
-	<input type="hidden" name="B_address"  value="<!-- TMPL_VAR NAME="B_address" -->">
-	<input type="hidden" name="B_zipcode"  value="<!-- TMPL_VAR NAME="B_zipcode" -->">
-	<input type="hidden" name="B_city"  value="<!-- TMPL_VAR NAME="B_city" -->">	
-	<input type="hidden" name="phone"   value="<!-- TMPL_VAR NAME="phone" -->" >
-	<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-	<input type="hidden" name="mobile"  value="<!-- TMPL_VAR NAME="mobile" -->" >	
-	<input type="hidden" name="fax"  value="<!-- TMPL_VAR NAME="fax" -->"> 
-	<input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" >
-	<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-	
-<!-- 	from form 3	 -->
-	<input type="hidden" name="dateenrolled" size="20" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-	<input type="hidden" name="dateexpiry" size="20" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
-	<textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
-	<textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-	<input type="hidden" name="userid" size="20"  value="<!-- TMPL_VAR NAME="userid" -->">
-	<input type="hidden" name="password" size="20"  value="<!-- TMPL_VAR NAME="password" -->">	
-	<input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
-	<input type="hidden" name="lost"  value="<!-- TMPL_VAR NAME="lost" -->" />
-	<input type="hidden" name="gonenoaddress"  value="<!-- TMPL_VAR NAME="gonenoaddress" -->" />
-
-	
-	
-	<!-- / CHECKBOX from form 3 Warning -->
-	<!-- TMPL_IF NAME="opadd" -->
-		<input type="hidden" name="op" value="add">
-	<!-- TMPL_ELSE -->
-		<input type="hidden" name="op" value="modify">
-	<!-- /TMPL_IF -->
-	<fieldset id="memberentry_identity">
-		<legend>Borrower identity</legend>
-		<p>
-		<!-- TMPL_IF NAME="female" -->
-		<input type="radio" name="sex" value="F" checked>Female
-		<input type="radio" name="sex" value="M">Male
-		<!-- TMPL_ELSE -->
-		<input type="radio" name="sex" value="F">Female
-		<input type="radio" name="sex" value="M" checked>Male
-		<!-- /TMPL_IF -->
-		</p>
-		<!-- TMPL_IF NAME="mandatorycardnumber" -->
-			<label style="font-weight:bold">
-		<!--TMPL_ELSE -->
-			<label>
-		<!-- /TMPL_IF--> 
-		Card number</label>
-		<input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
-		<p>
-		<!-- TMPL_IF NAME="mandatorytitle" -->
-			<label style="font-weight:bold">
-		<!-- TMPL_ELSE -->
-			<label>
-		<!-- /TMPL_IF-->
-		Title</label>
-		<select  name="title" >
-			<option <!-- TMPL_VAR NAME="title_selected_ " --> value="" >Select a value</option>
-			<option value="Mlle" <!-- TMPL_VAR NAME="title_Mlle" -->>Mlle</option>
-			<option value="Mme" <!-- TMPL_VAR NAME="title_Mme" -->>Mme</option>
-			<option value="Mr" <!-- TMPL_VAR NAME="title_Mr" --> >M.</option>
-		</select>
-		</p>
-		<p>
-		<!-- TMPL_IF NAME="mandatorysurname" -->
-		<label style="font-weight:bold">
-		<!-- TMPL_ELSE -->
-		<label>
-		<!-- /TMPL_IF-->
-		Surname</label>
-		<input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
-		</p>
-		<p>
-		<!-- TMPL_IF NAME="mandatoryfirstname" -->
-		<label style="font-weight:bold">
-		<!-- TMPL_ELSE -->
-		<label>
-		<!-- /TMPL_IF-->
-		Firstname</label>
-		<input style="text-transform:capitalize;" type="text" name="firstname" size="20"  value="<!-- TMPL_VAR NAME="firstname" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorydateofbirth" -->
-			<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->	
-			<label>
-			<!-- /TMPL_IF-->
-			Date of Birth</label>
-			<input type="text" name="dateofbirth" size="20" onBlur="CheckDate(document.form.dateofbirth.value);" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryinitials" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Initials</label>
-			<input type="text" name="initials" size="20"  value="<!-- TMPL_VAR NAME="initials" -->">	
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryothernames" -->
-			<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-			<label>
-			<!-- /TMPL_IF-->
-			Other name</label>
-			<input style="text-transform:uppercase;" type="text" name="othernames" size="20"  value="<!-- TMPL_VAR NAME="othernames" -->" >
-		</p>
-	</fieldset>
-	<fieldset id="memberentry_identity">
-		<legend>Borrower type</legend>
-		<p>
-		<label>Select a category</label>
-		<!-- TMPL_VAR NAME="catcodepopup" -->
-		</p>
-		<!-- TMPL_IF NAME="city_cgipopup" -->	
-		<p>
-			<!-- TMPL_IF NAME="mandatoryselect_city" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Select a city</label>
-			<!-- TMPL_VAR NAME="citypopup" -->
-		</p>
-		<!-- /TMPL_IF-->
-		<p>
-			<!-- TMPL_IF NAME="mandatorysort1" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Sort 1</label>
-			<!--TMPL_IF NAME="CGIsort1" -->	
-				<!-- TMPL_VAR NAME="CGIsort1" -->
-			<!--TMPL_ELSE-->
-				<input  type="text" name="sort1" size="20"  value="<!-- TMPL_VAR NAME="sort1" -->" >
-			<!-- /TMPL_IF -->		
-		</p>
-		<p>
-		<!-- TMPL_IF NAME="mandatorysort2" -->
-		<label style="font-weight:bold">
-		<!-- TMPL_ELSE -->
-		<label>
-		<!-- /TMPL_IF-->
-		Sort 2</label>
-		<!--TMPL_IF NAME="CGIsort2" -->	
-			<!-- TMPL_VAR NAME="CGIsort2" -->
-		<!--TMPL_ELSE-->
-			<input  type="text" name="sort2" size="20"  value="<!-- TMPL_VAR NAME="sort2" -->" >
-		<!-- /TMPL_IF -->	
-		</p>
-	</fieldset>
-	<div>
-		<input type="button" name="next_step" value="Next Step" onclick="check_form_borrowers(1);">
-	</div>
-</form>
-<!-- ************************ STEP_1 *********************** -->
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="step_2"-->
-<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
-	<!-- 		field always hidden in different form (1,2,3) -->
-	<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
-	<input type="hidden" name="FormFieldList" value="cardnumber|streetnumber|streettype|address|address2|zipcode|city|B_address|B_zipcode|B_city|phone|phonepro|mobile|email|emailpro|fax">
-	<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-	<input type="hidden" name="type" value="borrowers">
-	<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-	<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-	<input type="hidden" name="guarantorid"   value="<!-- TMPL_VAR NAME="guarantorid" -->">
-	<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
-	<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
-	<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-	<input type="hidden" name="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
-	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-	<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
-
-<!-- 	from form 1	 -->
-	<input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" -->">
-	<input style="text-transform:capitalize;" type="hidden" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->">
-	<input style="text-transform:uppercase;" type="hidden" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" >
-	<input type="hidden" name="cardnumber"  value="<!-- TMPL_VAR NAME="cardnumber" -->">
-	<input type="hidden" name="dateofbirth"  value="<!-- TMPL_VAR NAME="dateofbirth" -->">
-	<input type="hidden" name="initials" size="20"  value="<!-- TMPL_VAR NAME="initials" -->">
-	<input type="hidden" name="othernames" size="20"  value="<!-- TMPL_VAR NAME="othernames" -->" >
-	<input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->" >
-	<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" >	
-	<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->">
-	<input type="hidden" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" >
-	<input type="hidden" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" >
-	<!-- 	from form 3	 -->
-	<input type="hidden" name="dateenrolled" size="20" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-	<input type="hidden" name="dateexpiry" size="20" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
-	<textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
-	<textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-	<input type="hidden" name="userid" size="20"  value="<!-- TMPL_VAR NAME="userid" -->">
-	<input type="hidden" name="password" size="20"  value="<!-- TMPL_VAR NAME="password" -->">	
-	<input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
-	<input type="hidden" name="lost"  value="<!-- TMPL_VAR NAME="lost" -->" />
-	<input type="hidden" name="gonenoaddress"  value="<!-- TMPL_VAR NAME="gonenoaddress" -->" />	
-	<!-- TMPL_IF NAME="opadd" -->
-		<input type="hidden" name="op" value="add">
-	<!-- TMPL_ELSE -->
-		<input type="hidden" name="op" value="modify">
-	<!-- /TMPL_IF -->
-	<fieldset id="memberentry_address">
-		<legend>Address</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatorybranchcode" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Branch</label>
-			<!-- TMPL_VAR NAME="CGIbranch" -->
-		</p>
-		<fieldset>
-		<legend>Main Address</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatorystreetnumber" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			street number</label>
-			<input type="text" name="streetnumber" size="5" value="<!-- TMPL_VAR NAME="streetnumber" -->">
-		</p>
-		<!-- TMPL_IF NAME="road_cgipopup" -->
-			<p>
-			<!-- TMPL_IF NAME="mandatorystreettype" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Street type</label>
-			<!-- TMPL_VAR NAME="roadpopup" -->
-			</p>
-		<!--/TMPL_IF-->	
-		<p>
-			<!-- TMPL_IF NAME="mandatoryaddress" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Address</label>
-			<input type="text" name="address" size="35" value="<!-- TMPL_VAR NAME="address" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryaddress2" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Address 2</label>
-			<input type="text" name="address2" size="35" value="<!-- TMPL_VAR NAME="address2" -->">
-		</p>
-		<p>	
-			<!-- TMPL_IF NAME="mandatoryzipcode" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Zipcode</label>
-			<input type="text" maxlength="5" name="zipcode" size="5" value="<!-- TMPL_VAR NAME="zipcode" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorycity" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			City</label>
-			<input style="text-transform:uppercase;" type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->">
-		</p>
-		</fieldset>
-		<fieldset>
-		<legend>Alt Address</legend>
-			<p>
-				<!-- TMPL_IF NAME="mandatoryB_address" -->
-					<label style="font-weight:bold">
-				<!--TMPL_ELSE-->
-					<label>
-				<!-- /TMPL_IF-->
-				Address</label>
-				<input type="text" name="B_address" size="40" value="<!-- TMPL_VAR NAME="B_address" -->">
-			</p>
-			<p>
-				<!-- TMPL_IF NAME="mandatoryB_zipcode" -->
-					<label style="font-weight:bold">
-				<!--TMPL_ELSE-->
-					<label>
-				<!-- /TMPL_IF-->
-				Zipcode</label>
-				<input type="text" name="B_zipcode" maxlength="5" size="5" value="<!-- TMPL_VAR NAME="B_zipcode" -->">
-			</p>
-			<p>
-				<!-- TMPL_IF NAME="mandatoryB_city" -->
-					<label style="font-weight:bold" >
-				<!--TMPL_ELSE-->
-					<label>
-				<!-- /TMPL_IF-->
-				City</label>
-				<input type="text" style="text-transform:uppercase;" name="B_city" size="20" value="<!-- TMPL_VAR NAME="B_city" -->">
-			</p>
-		</fieldset>
-	</fieldset>
-	<fieldset id="memberentry_contact">
-		<legend>contact</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryphone" --> 
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Phone (home)</label>
-			<input type="text"  name="phone" value="<!-- TMPL_VAR NAME="phone" -->" >
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryphonepro" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Phone (prof)</label>
-			<input type="text" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorymobile" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Phone (cell)</label>
-			<input type="text" name="mobile" value="<!-- TMPL_VAR NAME="mobile" -->" >
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryemail" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			E-mail (home)</label>
-			<input type="text" name="email" value="<!-- TMPL_VAR NAME="email" -->" >	
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryemailpro" -->	
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			E-mail (prof)</label>
-			<input type="text" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryfax" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Fax</label>
-			<input type="text" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" >
-		</p>
-	</fieldset>
-	<!-- TMPL_IF NAME="memberofinstution" -->
-	<fieldset id="memberentry_organisation">
-		<legend>Organisations</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryphone" --> 
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Organisation(s)</label>
-			<!-- TMPL_VAR NAME="CGIorganisations" -->
-		</p>
-	</fieldset>
-	<!-- /TMPL_IF -->
-
-	<div>
-		<input type="button" class="borrowers_button" name="step1" value="Previous step" onclick="check_form_borrowers(0);">	
-		<INPUT type="button" class="borrowers_button" name="step3" onclick="check_form_borrowers(2)" value="Next step">
-	</div>
-</p>
-</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="step_3"-->
-<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
-	<!-- 		field always hidden in different form (1,2,3) -->
-	<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
-	<input type="hidden" name="FormFieldList" value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password">
-	<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-	<input type="hidden" name="type" value="borrowers">
-	<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-	<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-	<input type="hidden" name="guarantorid"   value="<!-- TMPL_VAR NAME="guarantorid" -->">
-	<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
-	<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
-	<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-	<input type="hidden" name="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
-	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-	<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
-
-<!-- 	from form 1	 -->
-	<input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" -->">
-	<input style="text-transform:capitalize;" type="hidden" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->">
-	<input style="text-transform:uppercase;" type="hidden" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" >
-	<input type="hidden" name="cardnumber"  value="<!-- TMPL_VAR NAME="cardnumber" -->">
-	<input type="hidden" name="dateofbirth"  value="<!-- TMPL_VAR NAME="dateofbirth" -->">
-	<input type="hidden" name="initials" size="20"  value="<!-- TMPL_VAR NAME="initials" -->">
-	<input type="hidden" name="othernames" size="20"  value="<!-- TMPL_VAR NAME="othernames" -->" >
-	<input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->" >
-	<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" >	
-	<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->">
-	<input type="hidden" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" >
-	<input type="hidden" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" >
-
-<!-- 	from form 2 -->
-	<input type="hidden" name="streetnumber"  value="<!-- TMPL_VAR NAME="streetnumber" -->">
-	<input type="hidden" name="address"  value="<!-- TMPL_VAR NAME="address" -->">
-	<input type="hidden" name="streettype"  value="<!-- TMPL_VAR NAME="streettype" -->">
-	<input type="hidden" name="address2"  value="<!-- TMPL_VAR NAME="address2" -->">	
-	<input type="hidden" name="zipcode"  value="<!-- TMPL_VAR NAME="zipcode" -->">
-	<input type="hidden" name="city"  value="<!-- TMPL_VAR NAME="city" -->">	
-	<input type="hidden" name="branchcode"  value="<!-- TMPL_VAR NAME="branchcode" -->">
-	<input type="hidden" name="B_address"  value="<!-- TMPL_VAR NAME="B_address" -->">
-	<input type="hidden" name="B_zipcode"  value="<!-- TMPL_VAR NAME="B_zipcode" -->">
-	<input type="hidden" name="B_city"  value="<!-- TMPL_VAR NAME="B_city" -->">	
-	<input type="hidden" name="phone"   value="<!-- TMPL_VAR NAME="phone" -->" >
-	<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-	<input type="hidden" name="mobile"  value="<!-- TMPL_VAR NAME="mobile" -->" >	
-	<input type="hidden" name="fax"  value="<!-- TMPL_VAR NAME="fax" -->"> 
-	<input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" >
-	<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-	<input type="hidden" name="organisations" value="<!-- TMPL_VAR NAME="organisations" -->" >	
-	<!-- TMPL_IF NAME="opadd" -->
-		<input type="hidden" name="op" value="add">
-	<!-- TMPL_ELSE -->
-		<input type="hidden" name="op" value="modify">
-	<!-- /TMPL_IF -->
-	<fieldset id="memberentry_subscription">
-	<legend>Library set-up</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatorydateenrolled" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Arrival date</label>
-			<input type="text" name="dateenrolled"  maxlength="10"	  size="10" onblur="CheckDate(document.form.dateenrolled.value);" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorydateexpiry" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Expiry date</label>
-			<input type="text" name="dateexpiry" maxlength="10"  size="10"
-							onblur="CheckDate(document.form.dateexpiry.value);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryopacnote" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->	
-			OPAC note</label>
-			<textarea  name="opacnote" cols="70" rows="2"   ><!-- TMPL_VAR NAME="opacnote" --></textarea>
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryborrowernotes" -->	
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Library note</label>
-			<textarea name="borrowernotes" cols="70" rows="2"   ><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-		</p>
-	</fieldset>
-	<fieldset id="memberentry_userid">
-		<legend>OPAC login</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryuserid" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			OPAC Login</label>
-			<input type="text" name="userid" size="20"  value="<!-- TMPL_VAR NAME="userid" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorypassword" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Password</label>
-			<!--TMPL_IF NAME="opadd"-->
-				<input type="text" name="password" size="20"  value="<!-- TMPL_VAR NAME="password" -->">
-			<!--TMPL_ELSE-->
-				<!--TMPL_IF NAME="password"-->
-					<input type="text" name="password" size="20"  value="****">
-				<!--TMPL_ELSE-->
-					<input type="text" name="password" size="20"  value="">
-				<!--/TMPL_IF-->
-			<!--/TMPL_IF-->
-		</p>
-		<!--this zones are not necessary in modif mode -->
-		<!-- TMPL_UNLESS NAME="opadd" -->
-			<h1>Warning</h1>
-			<!-- TMPL_LOOP NAME="flagloop" -->
-			<p>
-				<label class="borrowers_labels_title"><!-- TMPL_VAR NAME="html" --></label>
-				<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Yes
-				<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>No
-			</p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_UNLESS -->	
-		<p>
-		</fieldset>
-		<div>
-			<input type="button" class="borrowers_button" name="step2" value="Previous step" onclick="check_form_borrowers(1);">	
-			<!-- TMPL_IF NAME="opadd" -->
-				<input type="button" name="step4" onclick="unique();" value="Add member">
-			<!-- TMPL_ELSE -->
-				<input type="button" name="step4" onclick="check_form_borrowers();" value="Modify member">
-			<!--/TMPL_IF -->
-		</div>
-		</form>
-	<!-- /TMPL_IF -->
-
-<!--	 TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/members/memberentryC.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/memberentryC.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/memberentryC.tmpl
--- htdocs/intranet-tmpl/default/en/members/memberentryC.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,650 +0,0 @@
-<!-- templates to add/modify a <C>hild -->
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Member, Child management
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
-<!-- TMPL_INCLUDE NAME="javascript/members.js" -->
-
-	<!-- TMPL_IF NAME="add" -->
-	<h1>
-		Add children member (step <!-- TMPL_VAR NAME="step" -->)
-	</h1>
-	<!-- TMPL_ELSE -->
-	<h1 >
-		Modify children member
-	</h1>
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="check_member" -->
-		<!-- TMPL_IF NAME="step_2" -->
-	<p>
-	<form name="form_double">
-		<div id="problem">
-			Duplicate suspected 
-			<a href="javascript:Dopop('borrowers_details.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->');" class="borrowers_button">Details</a>
-			Duplicate ?	
-			<a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->&category_type=<!--TMPL_VAR NAME="check_categorytype"-->" class="borrowers_button">Yes</a> 
-			&nbsp;&nbsp;&nbsp; No, it is not
-			<INPUT type="checkbox" <!-- TMPL_IF NAME="checked"--> checked <!--/TMPL_IF--> name="answernodouble" >
-		</div>
-	</form>	
-	
-		</p>	
-		<!--/TMPL_IF-->
-	<!--/TMPL_IF-->
-	<!-- TMPL_IF Name="NOK" -->
-		<h1>ERROR</h1>
-		<div id="problem">
-			<p>The following fields are wrong. Please fix it/them</p>
-			<!-- TMPL_IF NAME="ERROR_login_exist" -->
-				<p>login/password already exist</p>
-			<!-- /TMPL_IF -->
- 			<!-- TMPL_IF NAME="ERROR_age_limitations" -->
-                                Member is too young or too old for this category
-                        <!-- /TMPL_IF -->
-		</div>
-	<!-- /TMPL_IF -->
-
-<!--############################################################FORMULAIRE 1 #######################################-->
-<!-- TMPL_IF NAME="step_1"-->
-		<form name="form"  action="/cgi-bin/koha/members/memberentry.pl" method="post"> 
-		<!-- 		field always hidden in different form (1,2,3) -->		
-			<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
-			<input type="hidden" name="FormFieldList" value="cardnumber|title|surname|firstname|dateofbirth|initials|othernames|select_city|sort1|sort2">
-			<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-			<input type="hidden" name="type" value="borrowers">
-			<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-			<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-			<input type="hidden" name="guarantorid"   value="<!-- TMPL_VAR NAME="guarantorid" -->">
-			<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
-			<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
-			<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-			<input type="hidden" name="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
-			<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-			<input type="hidden" name="nodouble" "  value="<!-- TMPL_VAR NAME="nodouble" -->"/>
-	
-			<!-- 		input from form 2 -->
-			<input type="hidden" name="contacttitle" size="20" value="<!-- TMPL_VAR NAME="contacttitle" -->">
-			<input type="hidden" name="contactname" value="<!-- TMPL_VAR NAME="contactname" -->">
-			<input type="hidden" name="contactfirstname" value="<!-- TMPL_VAR NAME="contactfirstname" -->">		
-			<input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->">
-			<input type="hidden" name="streetnumber" value="<!-- TMPL_VAR NAME="streetnumber" -->">
-			<input type="hidden" name="streettype" value="<!-- TMPL_VAR NAME="streettype" -->">
-			<input type="hidden" name="address"  value="<!-- TMPL_VAR NAME="address" -->">
-			<input type="hidden" name="address2"  value="<!-- TMPL_VAR NAME="address2" -->">
-			<input type="hidden" name="zipcode" value="<!-- TMPL_VAR NAME="zipcode" -->">
-			<input type="hidden" name="city" value="<!-- TMPL_VAR NAME="city" -->">
-			<input type="hidden" name="relationship" value="<!-- TMPL_VAR NAME="relationship" -->"> 
-			<input type="hidden" name="phone" value="<!-- TMPL_VAR NAME="phone" -->" >
-			<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-			<input type="hidden" name="mobile" size="10" value="<!-- TMPL_VAR NAME="mobile" -->" >	
-			<input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" >
-			<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-			<input type="hidden" name="B_email" value="<!-- TMPL_VAR NAME="B_email" -->" >	
-			<input type="hidden" name="B_phone" value="<!-- TMPL_VAR NAME="B_phone" -->" >
-			<input type="hidden" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" >	
-
-			<!-- 		input from form3		 -->
-			<input type="hidden" name="dateenrolled" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-			<input type="hidden" name="dateexpiry"  value="<!-- TMPL_VAR NAME="dateexpiry" -->">
-			<textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
-			<textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-			<input type="hidden" name="userid"  value="<!-- TMPL_VAR NAME="userid" -->">
-			<input type="hidden" name="password"  value="<!-- TMPL_VAR NAME="password" -->">	
-			<input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
-			<input type="hidden" name="lost"  value="<!-- TMPL_VAR NAME="lost" -->" />
-			<input type="hidden" name="gonenoaddress"  value="<!-- TMPL_VAR NAME="gonenoaddress" -->" />	
-
-	<!-- TMPL_IF NAME="opadd" -->
-		<input type="hidden" name="op" value="add">
-	<!-- TMPL_ELSE -->
-		<input type="hidden" name="op" value="modify">
-	<!-- /TMPL_IF -->
-		<!-- TMPL_VAR NAME="member" -->
-			<p>
-				<!-- TMPL_IF NAME="mandatorycardnumber" -->
-				<label style="font-weight:bold">
-				<!--TMPL_ELSE-->
-				<label>
-				<!-- /TMPL_IF-->
-				Card number</label>
-				 <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
-			</p>	
-	<fieldset id="memberentry_identity">
-		<legend>Borrower identity</legend>
-		<p>
-		<!-- TMPL_IF NAME="female" -->
-		<input type="radio" name="sex" value="F" checked>Female
-		<input type="radio" name="sex" value="M">Male
-		<!-- TMPL_ELSE -->
-		<input type="radio" name="sex" value="F">Female
-		<input type="radio" name="sex" value="M" checked>Male
-		<!-- /TMPL_IF -->
-		</p>
-		<p>
-		<!-- TMPL_IF NAME="mandatorytitle" -->
-			<label style="font-weight:bold">
-		<!-- TMPL_ELSE -->
-			<label>
-		<!-- /TMPL_IF-->
-		Title</label>
-		<select  name="title" >
-			<option <!-- TMPL_VAR NAME="title_selected_ " --> value="" >Select a value</option>
-			<option value="Mlle" <!-- TMPL_VAR NAME="title_Mlle" -->>Mlle</option>
-			<option value="Mme" <!-- TMPL_VAR NAME="title_Mme" -->>Mme</option>
-			<option value="Mr" <!-- TMPL_VAR NAME="title_Mr" --> >M.</option>
-		</select>
-		</p>
-		<p>
-		<!-- TMPL_IF NAME="mandatorysurname" -->
-		<label  style="font-weight:bold">
-		<!-- TMPL_ELSE -->
-		<label>
-		<!-- /TMPL_IF-->
-		Surname</label>
-		<input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
-		</p>
-		<p>
-		<!-- TMPL_IF NAME="mandatoryfirstname" -->
-		<label  style="font-weight:bold">
-		<!-- TMPL_ELSE -->
-		<label>
-		<!-- /TMPL_IF-->
-		Firstname</label>
-		<input style="text-transform:capitalize;" type="text" name="firstname" size="20"  value="<!-- TMPL_VAR NAME="firstname" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorydateofbirth" -->
-			<label  style="font-weight:bold">
-			<!-- TMPL_ELSE -->	
-			<label>
-			<!-- /TMPL_IF-->
-			Date of Birth</label>
-			<input type="text" name="dateofbirth" size="20" onBlur="CheckDate(document.form.dateofbirth.value);" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryinitials" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Initials</label>
-			<input type="text" name="initials" size="20"  value="<!-- TMPL_VAR NAME="initials" -->">	
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryothernames" -->
-			<label  style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-			<label>
-			<!-- /TMPL_IF-->
-			Other name</label>
-			<input style="text-transform:uppercase;" type="text" name="othernames" size="20"  value="<!-- TMPL_VAR NAME="othernames" -->" >
-		</p>
-	
-	<!-- TMPL_UNLESS NAME="add"-->	
-	<p><a href="javascript:Dopopguarantor('guarantor_search.pl');">Modify guarantor</a></p>
-	<!-- /TMPL_UNLESS -->
-	<!-- TMPL_IF NAME="add" -->
-	<!-- TMPL_UNLESS NAME="guarantorid"-->	
-	<p><a href="javascript:Dopopguarantor('guarantor_search.pl');">Find guarantor</a></p>
-	<!-- /TMPL_UNLESS -->
-	<!-- /TMPL_IF -->
-	</fieldset>
-	<fieldset id="memberentry_identity">
-		<legend>Borrower type</legend>
-		<p>
-		<label>Select a category</label>
-		<!-- TMPL_VAR NAME="catcodepopup" -->
-		</p>
-		<!-- TMPL_IF NAME="city_cgipopup" -->	
-		<p>
-			<!-- TMPL_IF NAME="mandatoryselect_city" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Select a city</label>
-			<!-- TMPL_VAR NAME="citypopup" -->
-		</p>
-		<!-- /TMPL_IF-->
-		<p>
-			<!-- TMPL_IF NAME="mandatorysort1" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Sort 1</label>
-			<!--TMPL_IF NAME="CGIsort1" -->	
-				<!-- TMPL_VAR NAME="CGIsort1" -->
-			<!--TMPL_ELSE-->
-				<input  type="text" name="sort1" size="20"  value="<!-- TMPL_VAR NAME="sort1" -->" >
-			<!-- /TMPL_IF -->		
-		</p>
-		<p>
-		<!-- TMPL_IF NAME="mandatorysort2" -->
-		<label style="font-weight:bold">
-		<!-- TMPL_ELSE -->
-		<label>
-		<!-- /TMPL_IF-->
-		Sort 2</label>
-		<!--TMPL_IF NAME="CGIsort2" -->	
-			<!-- TMPL_VAR NAME="CGIsort2" -->
-		<!--TMPL_ELSE-->
-			<input  type="text" name="sort2" size="20"  value="<!-- TMPL_VAR NAME="sort2" -->" >
-		<!-- /TMPL_IF -->	
-		</p>
-	</fieldset>
-	<div>
-		<input type="button" name="next_step" value="Next Step" onclick="check_form_borrowers(1);">
-	</div>
-</form>
-<!-- ************************ STEP_1 *********************** -->
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="step_2"-->
-	<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
-<!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
-		<input type="hidden" name="FormFieldList" value="cardnumber|streetnumber|streettype|address|address2|zipcode|contacttitle|city|contactname|contactfirstname|phone|phonepro|mobile|email|emailpro|B_email|B_phone|relationship|fax">
-		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-		<input type="hidden" name="type" value="borrowers">
-		<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-		<input type="hidden" name="guarantorid"   value="<!-- TMPL_VAR NAME="guarantorid" -->">
-		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
-		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
-		<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-		<input type="hidden" name="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
-		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-		<input type="hidden" name="nodouble" "  value="<!-- TMPL_VAR NAME="nodouble" -->"/>
-
-<!-- 		input from form 1 		-->
-		<input type="hidden" name="title" size="10" value="<!-- TMPL_VAR NAME="title" -->">
-		<input style="text-transform:capitalize;" type="hidden" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->">
-		<input style="text-transform:uppercase;" type="hidden" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" >
-		<input type="hidden" name="dateofbirth" size="20"  value="<!-- TMPL_VAR NAME="dateofbirth" -->">
-		<input type="hidden" name="initials" size="20"  value="<!-- TMPL_VAR NAME="initials" -->">
-		<input type="hidden" name="othernames" size="20"  value="<!-- TMPL_VAR NAME="othernames" -->" >
-		<input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->" >
-		<input type="hidden" name="categorycode" size="10" value="<!-- TMPL_VAR NAME="categorycode" -->">
-		<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->">	
-		<input type="hidden" name="sort1"  value="<!-- TMPL_VAR NAME="sort1" -->">
-		<input type="hidden" name="sort2"  value="<!-- TMPL_VAR NAME="sort2" -->">
-
-<!-- 		input from form3		 -->
-		<input type="hidden" name="dateenrolled" size="20" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-		<input type="hidden" name="dateexpiry" size="20" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
-		<textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
-		<textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-		<input type="hidden" name="userid" size="20"  value="<!-- TMPL_VAR NAME="userid" -->">
-		<input type="hidden" name="password" size="20"  value="<!-- TMPL_VAR NAME="password" -->">	
-		<input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
-		<input type="hidden" name="lost"  value="<!-- TMPL_VAR NAME="lost" -->" />
-		<input type="hidden" name="gonenoaddress"  value="<!-- TMPL_VAR NAME="gonenoaddress" -->" />
-
-		<!-- TMPL_IF NAME="opadd" -->
-			<input type="hidden" name="op" value="add">
-		<!-- TMPL_ELSE -->
-			<input type="hidden" name="op" value="modify">
-		<!-- /TMPL_IF -->
-		
-		<!-- TMPL_VAR NAME="member" -->
-		<p>
-			<!-- TMPL_IF NAME="mandatorycardnumber" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Card number</label>
-			<input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
-		</p>
-		<fieldset>
-		<legend>Guarantor</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatorycontacttitle" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Title</label>
-			<select  name="contacttitle" >
-					<option <!-- TMPL_VAR NAME="contacttitle_selected " --> value="" >Select title</option>
-					<option value="Mlle" <!-- TMPL_VAR NAME="contacttitle_Mlle" -->>Mlle</option>
-					<option value="Mme" <!-- TMPL_VAR NAME="contacttitle_Mme" -->>Mme</option>
-					<option value="Mr" <!-- TMPL_VAR NAME="contacttitle_Mr" --> >M.</option>
-			</select>
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorycontactname" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Surname</label>	
-			<input type="text" style="text-transform:uppercase;" name="contactname" size="20" value="<!-- TMPL_VAR NAME="contactname" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorycontactfirstname" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Firstname</label>	
-			<input type="text" style="text-transform:capitalize;" name="contactfirstname" size="20" value="<!-- TMPL_VAR NAME="contactfirstname" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorybranchcode" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Branch</label>	
-			<!-- TMPL_VAR NAME="CGIbranch" -->
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorystreetnumber" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->	
-			Street number</label> 
-			<input type="text" name="streetnumber" size="5" value="<!-- TMPL_VAR NAME="streetnumber" -->">
-		</p>
-			<!-- TMPL_IF NAME="road_cgipopup" -->
-				<p>
-				<!-- TMPL_IF NAME="mandatorystreettype" -->
-					<label style="font-weight:bold">
-				<!--TMPL_ELSE-->
-					<label>
-				<!-- /TMPL_IF-->
-				Road type</label>
-				<!-- TMPL_VAR NAME="roadpopup" -->
-				</p>
-			<!--/TMPL_IF-->
-		<p>
-			<!-- TMPL_IF NAME="mandatoryaddress" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Address</label> 
-			<input type="text" name="address" size="35" value="<!-- TMPL_VAR NAME="address" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryaddress2" -->	
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Address 2</label>
-			<input type="text" name="address2" size="35" value="<!-- TMPL_VAR NAME="address2" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryzipcode" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->	
-			Zipcode</label>
-			<input type="text" maxlength="5" name="zipcode" size="10" value="<!-- TMPL_VAR NAME="zipcode" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorycity" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			City</label>
-			<input style="text-transform:uppercase;" type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryrelationship" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Relation</label>
-			<select name="relationship" size="1">
-						<!-- TMPL_LOOP NAME="relshiploop" -->
-							<option <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="relationship" --></option>
-						<!-- /TMPL_LOOP -->
-			</select>
-		</p>
-	</fieldset>
-	<fieldset>
-		<legend>Guarantor contact</legend>
-		<h2>Guarantor</h2>
-	<p>
-		<!-- TMPL_IF NAME="mandatoryphone" -->
-			<label style="font-weight:bold">
-		<!--TMPL_ELSE-->
-			<label>
-		<!-- /TMPL_IF-->
-		Phone (home)</label>
-		<input type="text" name="phone" value="<!-- TMPL_VAR NAME="phone" -->" >
-	</p>
-	<p>
-		<!-- TMPL_IF NAME="mandatoryphonepro" -->
-			<label style="font-weight:bold">
-		<!--TMPL_ELSE-->
-			<label>
-		<!-- /TMPL_IF-->
-		Phone (prof)</label>
-		<input type="text" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-	</p>
-	<p>
-		<!-- TMPL_IF NAME="mandatorymobile" -->
-			<label style="font-weight:bold">
-		<!--TMPL_ELSE-->
-			<label>
-		<!-- /TMPL_IF-->
-		Phone (cell)</label>
-		<input type="text" name="mobile" value="<!-- TMPL_VAR NAME="mobile" -->" >
-	</p>
-	<p>
-		<!-- TMPL_IF NAME="mandatoryemail" -->
-			<label style="font-weight:bold">
-		<!--TMPL_ELSE-->
-			<label>
-		<!-- /TMPL_IF-->
-		E-mail (home)</label>
-		<input type="text" name="email" value="<!-- TMPL_VAR NAME="email" -->" >	
-	</p>
-	<p>
-		<!-- TMPL_IF NAME="mandatoryemailpro" -->
-			<label style="font-weight:bold">
-		<!--TMPL_ELSE-->
-			<label>
-		<!-- /TMPL_IF-->
-		E-mail (prof)</label>
-		<input type="text" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >		
-	</p>
-	<p>
-		<!-- TMPL_IF NAME="mandatoryfax" -->
-			<label style="font-weight:bold">
-		<!--TMPL_ELSE-->
-			<label>
-		<!-- /TMPL_IF-->
-		fax</label>
-		<input type="text" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" >	
-	</p>
-	<h2>Member</h2>
-	<p>	
-		<!-- TMPL_IF NAME="mandatoryB_email" -->
-			<label style="font-weight:bold">
-		<!--TMPL_ELSE-->
-			<label>
-		<!-- /TMPL_IF-->
-		E-mail (home)</label>
-		<input type="text" name="B_email" value="<!-- TMPL_VAR NAME="B_email" -->" >	
-		<!-- TMPL_IF NAME="mandatoryB_phone" -->
-			<label style="font-weight:bold">
-		<!--TMPL_ELSE-->
-			<label>
-		<!-- /TMPL_IF-->
-		Phone (cell)</label>	
-		<input type="text" name="B_phone" value="<!-- TMPL_VAR NAME="B_phone" -->" >			
-	</p>
-	</fieldset>
-	<div>
-		<input type="button" name="step1" value="Previous step" onclick="check_form_borrowers(0);">
-		<input type="button" name="step3" onclick="check_form_borrowers(3)" value="Next step">
-	</div>
-</form>
-
-<!--/TMPL_IF-->
-<!-- TMPL_IF NAME="step_3"-->
-	<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
-<!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
-		<input type="hidden" name="FormFieldList" value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password">
-		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-		<input type="hidden" name="type" value="borrowers">
-		<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-		<input type="hidden" name="guarantorid"   value="<!-- TMPL_VAR NAME="guarantorid" -->">
-		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
-		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
-		<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-		<input type="hidden" name="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
-		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-		<input type="hidden" name="nodouble" "  value="<!-- TMPL_VAR NAME="nodouble" -->"/>
-
-<!-- 		input from form 1 		-->
-		<input type="hidden" name="title" size="10" value="<!-- TMPL_VAR NAME="title" -->">
-		<input style="text-transform:capitalize;" type="hidden" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->">
-		<input style="text-transform:uppercase;" type="hidden" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" >
-		<input type="hidden" name="dateofbirth" size="20"  value="<!-- TMPL_VAR NAME="dateofbirth" -->">
-		<input type="hidden" name="initials" size="20"  value="<!-- TMPL_VAR NAME="initials" -->">
-		<input type="hidden" name="othernames" size="20"  value="<!-- TMPL_VAR NAME="othernames" -->" >
-		<input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->" >
-		<input type="hidden" name="categorycode" size="10" value="<!-- TMPL_VAR NAME="categorycode" -->">
-		<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->">	
-		<input type="hidden" name="sort1"  value="<!-- TMPL_VAR NAME="sort1" -->">
-		<input type="hidden" name="sort2"  value="<!-- TMPL_VAR NAME="sort2" -->">
-<!-- 		input from form 2 -->
-		<input type="hidden" name="contacttitle" size="20" value="<!-- TMPL_VAR NAME="contacttitle" -->">
-		<input type="hidden" name="contactname" size="35" value="<!-- TMPL_VAR NAME="contactname" -->">
-		<input type="hidden" name="contactfirstname" size="5" value="<!-- TMPL_VAR NAME="contactfirstname" -->">		
-		<input type="hidden" name="branchcode" size="20" value="<!-- TMPL_VAR NAME="branchcode" -->">
-		<input type="hidden" name="streetnumber"  value="<!-- TMPL_VAR NAME="streetnumber" -->">
-		<input type="hidden" name="streettype"  value="<!-- TMPL_VAR NAME="streettype" -->">
-		<input type="hidden" name="address"  value="<!-- TMPL_VAR NAME="address" -->">
-		<input type="hidden" name="address2"  value="<!-- TMPL_VAR NAME="address2" -->">
-		<input type="hidden" name="zipcode" size="20" value="<!-- TMPL_VAR NAME="zipcode" -->">
-		<input type="hidden" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->">
-		<input type="hidden" name="relationship" size="20" value="<!-- TMPL_VAR NAME="relationship" -->"> 
-		<input type="hidden" name="phone" size="10"  value="<!-- TMPL_VAR NAME="phone" -->" >
-		<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-		<input type="hidden" name="mobile" size="10" value="<!-- TMPL_VAR NAME="mobile" -->" >	
-		<input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" >
-		<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-		<input type="hidden" name="B_email" value="<!-- TMPL_VAR NAME="B_email" -->" >	
-		<input type="hidden" name="B_phone" value="<!-- TMPL_VAR NAME="B_phone" -->" >
-		<input type="hidden" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" >	
-		
-		<!-- TMPL_IF NAME="opadd" -->
-			<input type="hidden" name="op" value="add">
-		<!-- TMPL_ELSE -->
-			<input type="hidden" name="op" value="modify">
-		<!-- /TMPL_IF -->
-		<p>
-			<!-- TMPL_IF NAME="mandatorycardnumber" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			 Card number</label>
-			<input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
-		</p>
-	<fieldset id="memberentry_subscription">
-	<legend>Library set-up</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatorydateenrolled" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Arrival date</label>
-			<input type="text" name="dateenrolled"  maxlength="10"	  size="10" onblur="CheckDate(document.form.dateenrolled.value);" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorydateexpiry" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Expiry date</label>
-			<input type="text" name="dateexpiry" maxlength="10"  size="10"
-							onblur="CheckDate(document.form.dateexpiry.value);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryopacnote" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->	
-			OPAC note</label>
-			<textarea  name="opacnote" cols="70" rows="2"   ><!-- TMPL_VAR NAME="opacnote" --></textarea>
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryborrowernotes" -->	
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Library note</label>
-			<textarea name="borrowernotes" cols="70" rows="2"   ><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-		</p>
-	</fieldset>
-	<fieldset id="memberentry_userid">
-		<legend>OPAC login</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryuserid" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			OPAC Login</label>
-			<input type="text" name="userid" size="20"  value="<!-- TMPL_VAR NAME="userid" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorypassword" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Password</label>
-			<!--TMPL_IF NAME="opadd"-->
-				<input type="text" name="password" size="20"  value="<!-- TMPL_VAR NAME="password" -->">
-			<!--TMPL_ELSE-->
-				<!--TMPL_IF NAME="password"-->
-					<input type="text" name="password" size="20"  value="****">
-				<!--TMPL_ELSE-->
-					<input type="text" name="password" size="20"  value="">
-				<!--/TMPL_IF-->
-			<!--/TMPL_IF-->
-		</p>
-		<!--this zones are not necessary in modif mode -->
-		<!-- TMPL_UNLESS NAME="opadd" -->
-			<h1>Warning</h1>
-			<!-- TMPL_LOOP NAME="flagloop" -->
-			<p>
-				<label class="borrowers_labels_title"><!-- TMPL_VAR NAME="html" --></label>
-				<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Yes
-				<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>No
-			</p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_UNLESS -->	
-		<p>
-		</fieldset>
-		<div>
-			<input type="button" class="borrowers_button" name="step2" value="Previous step" onclick="check_form_borrowers(1);">	
-			<!-- TMPL_IF NAME="opadd" -->
-				<input type="button" name="step4" onclick="unique();" value="Add member">
-			<!-- TMPL_ELSE -->
-				<input type="button" name="step4" onclick="check_form_borrowers();" value="Modify member">
-			<!--/TMPL_IF -->
-		</div>
-	</form>
-<!-- /TMPL_IF -->
-<!--	 TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/members/memberentryI.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/memberentryI.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/memberentryI.tmpl
--- htdocs/intranet-tmpl/default/en/members/memberentryI.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,459 +0,0 @@
-<!-- templates to add/modify a <I>nstitution -->
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Member, Organisation management
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
-<!-- TMPL_INCLUDE NAME="javascript/members.js" -->
-
-	<!-- TMPL_IF NAME="opadd" -->
-	<h1>
-		Add organisation member (step <!-- TMPL_VAR NAME="step" -->)
-	</h1>
-	<!-- TMPL_ELSE -->
-	<h1 >
-		Modify organisation member
-	</h1>
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="check_member" -->
-		<!-- TMPL_IF NAME="step_2" -->
-			<p>
-			<form name="form_double">
-				<div id="problem">
-					Duplicate suspected 
-					<a href="javascript:Dopop('borrowers_details.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->');" class="borrowers_button">Details</a>
-					Duplicate ?	
-					<a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->&category_type=<!--TMPL_VAR NAME="check_categorytype"-->" class="borrowers_button">Yes</a> 
-					&nbsp;&nbsp;&nbsp; No, it is not
-					<INPUT type="checkbox" <!-- TMPL_IF NAME="checked"--> checked <!--/TMPL_IF--> name="answernodouble" >
-				</div>
-			</form>
-			</p>
-		<!--/TMPL_IF-->
-	<!--/TMPL_IF-->
-
-	<!-- TMPL_IF Name="NOK" -->
-		<h1>ERROR</h1>
-		<div id="problem">
-			<p>The following fields are wrong. Please fix it/them</p>
-			<!-- TMPL_IF NAME="ERROR_login_exist" -->
-				<p>login/password already exist</p>
-			<!-- /TMPL_IF -->
-		</div>
-	<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="step_1"-->
-<form name="form"  action="/cgi-bin/koha/members/memberentry.pl" method="post"> 
-	<!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
-		<input type="hidden" name="FormFieldList" value="cardnumber|surname|contactname|contactfirstname|select_city">
-		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-		<input type="hidden" name="type" value="borrowers">
-		<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-		<input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
-		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
-		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
-		<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-		<input type="hidden" name="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
-		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-		<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
-
-<!-- 		from form 2 -->
-		<input type="hidden" name="streetnumber"  value="<!-- TMPL_VAR NAME="streetnumber" -->">
-		<input type="hidden" name="streettype"  value="<!-- TMPL_VAR NAME="streettype" -->">
-		<input type="hidden" name="address"  value="<!-- TMPL_VAR NAME="address" -->">
-		<input type="hidden" name="address2"  value="<!-- TMPL_VAR NAME="address2" -->">	
-		<input type="hidden" name="zipcode"  value="<!-- TMPL_VAR NAME="zipcode" -->">	
-		<input type="hidden" name="city"  value="<!-- TMPL_VAR NAME="city" -->">
-		<input type="hidden" name="branchcode"  value="<!-- TMPL_VAR NAME="branchcode" -->">
-		<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-		<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-		<textarea style="display:none;" name="contactnotes" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnotes" --></textarea>
-		<input type="hidden" name="fax"   value="<!-- TMPL_VAR NAME="fax" -->"	
-
-<!-- 		from form 3	 -->
-		<input type="hidden" name="dateenrolled" size="20" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-		<input type="hidden" name="dateexpiry" size="20" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
-		<textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
-		<textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-		<input type="hidden" name="userid" size="20"  value="<!-- TMPL_VAR NAME="userid" -->">
-		<input type="hidden" name="password" size="20"  value="<!-- TMPL_VAR NAME="password" -->">	
-		<input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
-		<input type="hidden" name="lost"  value="<!-- TMPL_VAR NAME="lost" -->" />
-		<input type="hidden" name="gonenoaddress"  value="<!-- TMPL_VAR NAME="gonenoaddress" -->" />
-	<!-- TMPL_IF NAME="opadd" -->
-		<input type="hidden" name="op" value="add">
-	<!-- TMPL_ELSE -->
-		<input type="hidden" name="op" value="modify">
-	<!-- /TMPL_IF -->
-	<p>
-		<!-- TMPL_IF NAME="mandatorycardnumber" -->
-		<label style="font-weight:bold">
-		<!--TMPL_ELSE-->
-		<label>
-		<!-- /TMPL_IF-->
-		Card number</label>
-			<input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
-	</p>	
-	<fieldset id="memberentry_identity">
-		<legend>organisation identity</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatorysurname" -->
-			<label style="font-weight:bold">
-			<!-- TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Organisation name</label>
-			<input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >	
-		</p>
-		<p>
-			<label>Select a category</label>
-			<!-- TMPL_VAR NAME="catcodepopup" -->
-			<!-- TMPL_IF NAME="city_cgipopup" -->	
-					<!-- TMPL_IF NAME="mandatoryselect_city" -->
-					<<label style="font-weight:bold">
-					<!-- TMPL_ELSE -->
-					<label>
-					<!-- /TMPL_IF-->
-					Select a city</label>
-				<!-- TMPL_VAR NAME="citypopup" -->
-			<!-- /TMPL_IF-->
-	</fieldset>
-	<fieldset>
-		<legend>Personal identity</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatorycontactname" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Surname</label>
-			<input style="text-transform:uppercase;" type="text" name="contactname" size="20"  value="<!-- TMPL_VAR NAME="contactname" -->" >
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorycontactfirstname" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Firstname</label>
-			<input style="text-transform:capitalize;" type="text" name="contactfirstname" size="20"  value="<!-- TMPL_VAR NAME="contactfirstname" -->">
-		</p>
-	</fieldset>
-		<div>
-			<input type="button" name="step2" value="Next step" onclick="check_form_borrowers('2');">
-		</div>
-		</p>
-
-		</form>
-	<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF NAME="step_2"-->
-<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
-		<!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
-		<input type="hidden" name="FormFieldList" value="cardnumber|streetnumber|streettype|address|address2|zipcode|city|phonepro|emailpro|fax|contactnotes">
-		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-		<input type="hidden" name="type" value="borrowers">
-		<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-		<input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
-		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
-		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
-		<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-		<input type="hidden" name="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
-		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-		<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
-
-
-<!-- 		from form 1 -->
-		<input  type="hidden" name="surname" value="<!-- TMPL_VAR NAME="surname" -->" >
-		<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->">
-		<input type="hidden" name="contactname" value="<!-- TMPL_VAR name="contactname" -->">
-		<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->">
-		<input type="hidden" name="contactfirstname" value="<!-- TMPL_VAR name="contactfirstname" -->">
-
-<!-- 		from form 3	 -->
-		<input type="hidden" name="dateenrolled" size="20" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-		<input type="hidden" name="dateexpiry" size="20" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
-		<textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
-		<textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-		<input type="hidden" name="userid" size="20"  value="<!-- TMPL_VAR NAME="userid" -->">
-		<input type="hidden" name="password" size="20"  value="<!-- TMPL_VAR NAME="password" -->">	
-		<input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
-		<input type="hidden" name="lost"  value="<!-- TMPL_VAR NAME="lost" -->" />
-		<input type="hidden" name="gonenoaddress"  value="<!-- TMPL_VAR NAME="gonenoaddress" -->" />
-		<!-- TMPL_IF NAME="opadd" -->
-			<input type="hidden" name="op" value="add">
-		<!-- TMPL_ELSE -->
-			<input type="hidden" name="op" value="modify">
-		<!-- /TMPL_IF -->
-	
-	
-	<p>
-		<!-- TMPL_IF NAME="mandatorycardnumber" -->
-		<label style="font-weight:bold">
-		<!-- TMPL_ELSE -->
-		<label>
-		<!-- /TMPL_IF-->
-		Card number</label>
-		<input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
-	</p>
-	<fieldset is="memberentry_address">
-		<legend>Organisation address</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatorystreetnumber" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Street number</label>
-			<input type="text" name="streetnumber" size="5" value="<!-- TMPL_VAR NAME="streetnumber" -->">
-		</p>
-		<!-- TMPL_IF NAME="road_cgipopup" -->
-			<p>
-			<!-- TMPL_IF NAME="mandatorystreettype" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Street type</label>
-			<!-- TMPL_VAR NAME="roadpopup" -->
-			<p>
-		<!--/TMPL_IF-->
-		<p>
-			<!-- TMPL_IF NAME="mandatoryaddress" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->	
-			Address</label>
-			<input type="text" name="address" size="34" value="<!-- TMPL_VAR NAME="address" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryaddress2s" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Address 2</label>
-			<input type="text" name="address2" size="33" value="<!-- TMPL_VAR NAME="address2" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryzipcode" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Zipcode</label>
-			<input type="text" name="zipcode" size="10"  maxlength="10" value="<!-- TMPL_VAR NAME="zipcode" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorycity" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			City</label>
-			<input style="text-transform:uppercase;" type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->">
-		</p>
-			<!-- TMPL_IF NAME="mandatorybranchcode" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Branch</label>
-			<!-- TMPL_VAR NAME="CGIbranch" -->
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryphonepro" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Phone (prof)</label>
-			<input type="text" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-		<p>
-		</p>
-			<!-- TMPL_IF NAME="mandatoryemailpro" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->	
-			E-mail (prof)</label>
-			<input type="text" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryefax" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Fax</label>		
-			<input type="text" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" >	
-		</p>
-	</fieldset>
-	<fieldset>
-		<legend>Member list</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatorycontactnotes" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Persons that can issue books</label>
-			<textarea  name="contactnotes" cols="70" rows="2"   ><!-- TMPL_VAR NAME="contactnotes" --></textarea>	
-		</p>
-	<fieldset>
-	<div id="action">
-		<input type="button" name="step1" value="Previous step" onclick="check_form_borrowers(0);">
-		<input type="button" name="step3" onclick="check_form_borrowers('3')" value="Next step">
-	</div>
-</form>
-<!-- ############################END FORM PROFESSIONAL############################################"-->
-<!--/TMPL_IF-->
-
-<!-- TMPL_IF NAME="step_3"-->
-	<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
-		<!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
-		<input type="hidden" name="FormFieldList" value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password">
-		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-		<input type="hidden" name="type" value="borrowers">
-		<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-		<input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
-		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
-		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
-		<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-		<input type="hidden" name="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
-		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-		<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->"/>
-
-		<!-- 		from form 1 -->
-		<input  type="hidden" name="surname" value="<!-- TMPL_VAR NAME="surname" -->" >
-		<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->">
-		<input type="hidden" name="contactname" value="<!-- TMPL_VAR name="contactname" -->">
-		<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->">
-		<input type="hidden" name="contactfirstname" value="<!-- TMPL_VAR name="contactfirstname" -->">
-
-		<!-- 		from form 2 -->
-		<input type="hidden" name="streetnumber"  value="<!-- TMPL_VAR NAME="streetnumber" -->">
-		<input type="hidden" name="streettype"  value="<!-- TMPL_VAR NAME="streettype" -->">
-		<input type="hidden" name="address"  value="<!-- TMPL_VAR NAME="address" -->">
-		<input type="hidden" name="address2"  value="<!-- TMPL_VAR NAME="address2" -->">	
-		<input type="hidden" name="zipcode"  value="<!-- TMPL_VAR NAME="zipcode" -->">	
-		<input type="hidden" name="city"  value="<!-- TMPL_VAR NAME="city" -->">
-		<input type="hidden" name="branchcode"  value="<!-- TMPL_VAR NAME="branchcode" -->">
-		<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-		<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-		<textarea style="display:none;" name="contactnotes" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnotes" --></textarea>
-		<input type="hidden" name="fax" value="<!-- TMPL_VAR NAME="fax" -->">
-		
-		<!-- TMPL_IF NAME="opadd" -->
-			<input type="hidden" name="op" value="add">
-		<!-- TMPL_ELSE -->
-			<input type="hidden" name="op" value="modify">
-		<!-- /TMPL_IF -->
-	
-	<p>
-		<!-- TMPL_IF NAME="mandatorycardnumber" -->
-		<label style="font-weight:bold">
-		<!-- TMPL_ELSE -->
-		<label>
-		<!-- /TMPL_IF-->
-		Cardnumber</label>
-		<input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
-	</p>
-	<fieldset id="memberentry_subscription">
-	<legend>Library set-up</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatorydateenrolled" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Arrival date</label>
-			<input type="text" name="dateenrolled"  maxlength="10"	  size="10" onblur="CheckDate(document.form.dateenrolled.value);" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorydateexpiry" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Expiry date</label>
-			<input type="text" name="dateexpiry" maxlength="10"  size="10"
-							onblur="CheckDate(document.form.dateexpiry.value);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryopacnote" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->	
-			OPAC note</label>
-			<textarea  name="opacnote" cols="70" rows="2"   ><!-- TMPL_VAR NAME="opacnote" --></textarea>
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryborrowernotes" -->	
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Library note</label>
-			<textarea name="borrowernotes" cols="70" rows="2"   ><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-		</p>
-	</fieldset>
-	<fieldset id="memberentry_userid">
-		<legend>OPAC login</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatorylogin" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			OPAC Login</label>
-			<input type="text" name="userid" size="20"  value="<!-- TMPL_VAR NAME="userid" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorypassword" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Password</label>
-			<!--TMPL_IF NAME="opadd"-->
-				<input type="text" name="password" size="20"  value="<!-- TMPL_VAR NAME="password" -->">
-			<!--TMPL_ELSE-->
-				<!--TMPL_IF NAME="password"-->
-					<input type="text" name="password" size="20"  value="****">
-				<!--TMPL_ELSE-->
-					<input type="text" name="password" size="20"  value="">
-				<!--/TMPL_IF-->
-			<!--/TMPL_IF-->
-		</p>
-		<!--this zones are not necessary in modif mode -->
-		<!-- TMPL_UNLESS NAME="opadd" -->
-			<h1>Warning</h1>
-			<!-- TMPL_LOOP NAME="flagloop" -->
-			<p>
-				<label class="borrowers_labels_title"><!-- TMPL_VAR NAME="html" --></label>
-				<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Yes
-				<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>No
-			</p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_UNLESS -->	
-		<p>
-		</fieldset>
-		<div>
-			<input type="button" class="borrowers_button" name="step2" value="Previous step" onclick="check_form_borrowers(1);">	
-			<!-- TMPL_IF NAME="opadd" -->
-				<input type="button" name="step4" onclick="unique();" value="Add member">
-			<!-- TMPL_ELSE -->
-				<input type="button" name="step4" onclick="check_form_borrowers();" value="Modify member">
-			<!--/TMPL_IF -->
-		</div>
-	</form>
-<!-- /TMPL_IF -->
-<!--	 TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/members/memberentryP.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/memberentryP.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/memberentryP.tmpl
--- htdocs/intranet-tmpl/default/en/members/memberentryP.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,656 +0,0 @@
-<!-- templates to add/modify a <P>rofessional -->
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Member, Professional management
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
-<!-- TMPL_INCLUDE NAME="javascript/members.js" -->
-
-	<!-- TMPL_IF NAME="opadd" -->
-	<h1>
-		Add professional member (step <!-- TMPL_VAR NAME="step" -->)
-	</h1>
-	<!-- TMPL_ELSE -->
-	<h1 >
-		Modify professional member
-	</h1>
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="check_member" -->
-		<!-- TMPL_IF NAME="step_2" -->
-	<p>
-	<form name="form_double">
-		<div id="problem">
-			Duplicate suspected 
-			<a href="javascript:Dopop('borrowers_details.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->');" class="borrowers_button">Details</a>
-			Duplicate ?	
-			<a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->&category_type=<!--TMPL_VAR NAME="check_categorytype"-->" class="borrowers_button">Yes</a> 
-			&nbsp;&nbsp;&nbsp; No, it is not
-			<INPUT type="checkbox" <!-- TMPL_IF NAME="checked"--> checked <!--/TMPL_IF--> name="answernodouble" >
-		</div>
-	</form>	
-	
-		</p>	
-		<!--/TMPL_IF-->
-	<!--/TMPL_IF-->
-	<!-- TMPL_IF Name="NOK" -->
-		<h1>ERROR</h1>
-		<div id="problem">
-			<p>The following fields are wrong. Please fix it/them</p>
-			<!-- TMPL_IF NAME="ERROR_login_exist" -->
-				<p>login/password already exist</p>
-			<!-- /TMPL_IF -->
-		 <!-- TMPL_IF NAME="ERROR_age_limitations" -->
-                                Member is too young or too old for this category
-                        <!-- /TMPL_IF -->
-		</div>
-	<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="step_1"--><!--BEGIN OF TEST IF NOT collectivity BUT IN 1 STEP-->
-<form name="form"  action="/cgi-bin/koha/members/memberentry.pl" method="post"> 
-		<!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
-		<input type="hidden" name="FormFieldList" value="surname|select_city|othernames|initials|title|cardnumber|firstname|dateofbirth|sort1|sort2">
-		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-		<input type="hidden" name="type" value="borrowers">
-		<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-		<input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
-		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
-		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
-		<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" >
-		<input type="hidden" name="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
-		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-		<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->"/>
-
-<!-- 		from form 2 -->
-		<input type="hidden" name="streetnumber"  value="<!-- TMPL_VAR NAME="streetnumber" -->">
-		<input type="hidden" name="address"  value="<!-- TMPL_VAR NAME="address" -->">
-		<input type="hidden" name="address2"  value="<!-- TMPL_VAR NAME="address2" -->">
-		<input type="hidden" name="streettype"  value="<!-- TMPL_VAR NAME="streettype" -->">	
-		<input type="hidden" name="zipcode"  value="<!-- TMPL_VAR NAME="zipcode" -->">
-		<input type="hidden" name="city"  value="<!-- TMPL_VAR NAME="city" -->"> 
-		<input type="hidden" name="branchcode"  value="<!-- TMPL_VAR NAME="branchcode" -->">
-		<input type="hidden" name="phone"   value="<!-- TMPL_VAR NAME="phone" -->" >
-		<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-		<input type="hidden" name="mobile"  value="<!-- TMPL_VAR NAME="mobile" -->" >	
-		<input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" >
-		<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-		<input type="hidden" name="contactname"  value="<!-- TMPL_VAR NAME="contactname" -->">
-		<input type="hidden" name="relationship"  value="<!-- TMPL_VAR NAME="relationship" -->">
-		<input type="hidden" name="B_address" value="<!-- TMPL_VAR NAME="B_address" -->">
-		<input type="hidden" name="B_zipcode"  value="<!-- TMPL_VAR NAME="B_zipcode" -->">
-		<input type="hidden" name="B_city"  value="<!-- TMPL_VAR NAME="B_city" -->">
-		<input type="hidden" name="B_phone"  value="<!-- TMPL_VAR NAME="B_phone" -->"> 
-		<input type="hidden" name="fax"  value="<!-- TMPL_VAR NAME="fax" -->"> 	
-		<textarea style="display:none;" name="contactnotes" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnotes" --></textarea>
-
-<!-- 		from form 3 -->
-		<input type="hidden" name="dateenrolled"  value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-		<input type="hidden" name="dateexpiry"  value="<!-- TMPL_VAR NAME="dateexpiry" -->">
-		<textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
-		<textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-		<input type="hidden" name="userid"   value="<!-- TMPL_VAR NAME="userid" -->">
-		<input type="hidden" name="password"   value="<!-- TMPL_VAR NAME="password" -->">	
-		<input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
-		<input type="hidden" name="lost"  value="<!-- TMPL_VAR NAME="lost" -->" />
-		<input type="hidden" name="gonenoaddress"  value="<!-- TMPL_VAR NAME="gonenoaddress" -->" />
-	<!-- TMPL_IF NAME="opadd" -->
-		<input type="hidden" name="op" value="add">
-	<!-- TMPL_ELSE -->
-		<input type="hidden" name="op" value="modify">
-	<!-- /TMPL_IF -->
-	<!-- TMPL_VAR NAME="member" -->
-	<p>
-		<!-- TMPL_IF NAME="mandatorycardnumber" -->
-		<label style="font-weight:bold">
-		<!--TMPL_ELSE-->
-		<label>
-		<!-- /TMPL_IF-->
-		Card number</label>
-			<input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
-	</p>	
-	<fieldset id="memberentry_identity">
-		<legend>Borrower identity</legend>
-		<p>
-		<!-- TMPL_IF NAME="female" -->
-		<input type="radio" name="sex" value="F" checked>Female
-		<input type="radio" name="sex" value="M">Male
-		<!-- TMPL_ELSE -->
-		<input type="radio" name="sex" value="F">Female
-		<input type="radio" name="sex" value="M" checked>Male
-		<!-- /TMPL_IF -->
-		</p>
-		<p>
-		<!-- TMPL_IF NAME="mandatorytitle" -->
-			<label style="font-weight:bold">
-		<!-- TMPL_ELSE -->
-			<label>
-		<!-- /TMPL_IF-->
-		Title</label>
-		<select  name="title" >
-			<option <!-- TMPL_VAR NAME="title_selected_ " --> value="" >Select a value</option>
-			<option value="Mlle" <!-- TMPL_VAR NAME="title_Mlle" -->>Mlle</option>
-			<option value="Mme" <!-- TMPL_VAR NAME="title_Mme" -->>Mme</option>
-			<option value="Mr" <!-- TMPL_VAR NAME="title_Mr" --> >M.</option>
-		</select>
-		</p>
-		<p>
-		<!-- TMPL_IF NAME="mandatorysurname" -->
-		<label style="font-weight:bold">
-		<!-- TMPL_ELSE -->
-		<label>
-		<!-- /TMPL_IF-->
-		Surname</label>
-		<input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
-		</p>
-		<p>
-		<!-- TMPL_IF NAME="mandatoryfirstname" -->
-		<label style="font-weight:bold">
-		<!-- TMPL_ELSE -->
-		<label>
-		<!-- /TMPL_IF-->
-		Firstname</label>
-		<input style="text-transform:capitalize;" type="text" name="firstname" size="20"  value="<!-- TMPL_VAR NAME="firstname" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorydateofbirth" -->
-			<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->	
-			<label>
-			<!-- /TMPL_IF-->
-			Date of Birth</label>
-			<input type="text" name="dateofbirth" size="20" onBlur="CheckDate(document.form.dateofbirth.value);" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryinitials" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Initials</label>
-			<input type="text" name="initials" size="20"  value="<!-- TMPL_VAR NAME="initials" -->">	
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryothernames" -->
-			<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-			<label>
-			<!-- /TMPL_IF-->
-			Other name</label>
-			<input style="text-transform:uppercase;" type="text" name="othernames" size="20"  value="<!-- TMPL_VAR NAME="othernames" -->" >
-		</p>
-	</fieldset>
-	<fieldset id="memberentry_identity">
-		<legend>Borrower type</legend>
-		<p>
-		<label>Select a category</label>
-		<!-- TMPL_VAR NAME="catcodepopup" -->
-		</p>
-		<!-- TMPL_IF NAME="city_cgipopup" -->	
-		<p>
-			<!-- TMPL_IF NAME="mandatoryselect_city" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Select a city</label>
-			<!-- TMPL_VAR NAME="citypopup" -->
-		</p>
-		<!-- /TMPL_IF-->
-		<p>
-			<!-- TMPL_IF NAME="mandatorysort1" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Sort 1</label>
-			<!--TMPL_IF NAME="CGIsort1" -->	
-				<!-- TMPL_VAR NAME="CGIsort1" -->
-			<!--TMPL_ELSE-->
-				<input type="text" name="sort1" size="20"  value="<!-- TMPL_VAR NAME="sort1" -->" >
-			<!-- /TMPL_IF -->		
-		</p>
-		<p>
-		<!-- TMPL_IF NAME="mandatorysort2" -->
-		<label style="font-weight:bold">
-		<!-- TMPL_ELSE -->
-		<label>
-		<!-- /TMPL_IF-->
-		Sort 2</label>
-		<!--TMPL_IF NAME="CGIsort2" -->	
-			<!-- TMPL_VAR NAME="CGIsort2" -->
-		<!--TMPL_ELSE-->
-			<input type="text" name="sort2" size="20"  value="<!-- TMPL_VAR NAME="sort2" -->" >
-		<!-- /TMPL_IF -->	
-		</p>
-	</fieldset>
-	<div>
-		<input type="button" name="next_step" value="Next Step" onclick="check_form_borrowers(1);">
-	</div>
-</form>
-<!-- /TMPL_IF --><!--STEP_1	-->
-
-
-<!-- TMPL_IF NAME="step_2"-->
-<!-- ############################BEGIN FORM PROFESSIONAL############################################"-->
-	
-<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
-		<!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
-		<input type="hidden" name="FormFieldList" value="cardnumber|streetnumber|streettype|address|address2|zipcode|city|contactname|phone|phonepro|mobile|email|emailpro|B_zipcode|B_phone|B_address|B_city|relationship|fax|contactnotes">
-		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-		<input type="hidden" name="type" value="borrowers">
-		<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-		<input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
-		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
-		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
-		<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-		<input type="hidden" name="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
-		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-		<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
-	
-
-<!-- 		from form 1 -->
-		<input type="hidden" name="title"  value="<!-- TMPL_VAR NAME="title" -->">
-		<input type="hidden" name="surname"  value="<!-- TMPL_VAR NAME="surname" -->" >
-		<input type="hidden" name="firstname"  value="<!-- TMPL_VAR NAME="firstname" -->">
-		<input type="hidden" name="dateofbirth"  value="<!-- TMPL_VAR NAME="dateofbirth" -->">
-		<input type="hidden" name="initials"  value="<!-- TMPL_VAR NAME="initials" -->">
-		<input type="hidden" name="othernames"  value="<!-- TMPL_VAR NAME="othernames" -->" >
-		<input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->" >
-		<input type="hidden" name="categorycode"  value="<!-- TMPL_VAR NAME="categorycode" -->">
-		<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->">
-		<input type="hidden" name="sort1"   value="<!-- TMPL_VAR NAME="sort1" -->">
-		<input type="hidden" name="sort2"   value="<!-- TMPL_VAR NAME="sort2" -->">
-		
-<!-- 		from form 3 -->
-		<input type="hidden" name="dateenrolled"  value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-		<input type="hidden" name="dateexpiry"  value="<!-- TMPL_VAR NAME="dateexpiry" -->">
-		<textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
-		<textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-		<input type="hidden" name="userid"   value="<!-- TMPL_VAR NAME="userid" -->">
-		<input type="hidden" name="password"   value="<!-- TMPL_VAR NAME="password" -->">	
-		<input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
-		<input type="hidden" name="lost"  value="<!-- TMPL_VAR NAME="lost" -->" />
-		<input type="hidden" name="gonenoaddress"  value="<!-- TMPL_VAR NAME="gonenoaddress" -->" />
-		
-		<!-- TMPL_IF NAME="opadd" -->
-			<input type="hidden" name="op" value="add">
-		<!-- TMPL_ELSE -->
-			<input type="hidden" name="op" value="modify">
-		<!-- /TMPL_IF -->
-
-		<input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
-
-	<p>
-		<!-- TMPL_IF NAME="mandatorycardnumber" -->
-		<label style="font-weight:bold">
-		<!-- TMPL_ELSE -->
-		<label>
-		<!-- /TMPL_IF-->
-		Card number</label>
-		<input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
-	</p>
-	<fieldset is="memberentry_address">
-		<legend>Professional address</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatorystreetnumber" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->	
-			Street number</label>
-			<input type="text" name="streetnumber" size="5" value="<!-- TMPL_VAR NAME="streetnumber" -->">
-		</p>
-			<!-- TMPL_IF NAME="road_cgipopup" -->
-				<p>
-				<!-- TMPL_IF NAME="mandatorystreettype" -->
-					<label style="font-weight:bold">
-				<!--TMPL_ELSE-->
-					<label>
-				<!-- /TMPL_IF-->
-				Road type</label>
-				<!-- TMPL_VAR NAME="roadpopup" -->
-				</p>
-			<!--/TMPL_IF-->	
-		<p>
-			<!-- TMPL_IF NAME="mandatoryaddress" -->
-			<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->	
-			Address</label>
-			<input type="text" name="address" size="34" value="<!-- TMPL_VAR NAME="address" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryaddress2s" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Address 2</label>
-			<input type="text" name="address2" size="33" value="<!-- TMPL_VAR NAME="address2" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryzipcode" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-				Zipcode</label>
-			<input type="text" name="zipcode" size="10"  maxlength="10" value="<!-- TMPL_VAR NAME="zipcode" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorycity" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-				City</label>
-			<input style="text-transform:uppercase;" type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorybranchcode" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-				Branch</label>
-		<!-- TMPL_VAR NAME="CGIbranch" -->
-		</p>
-	</fieldset>
-	<fieldset>
-		<legend>Professional contact</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryphone" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Phone (home)</label>
-			<input type="text" name="phone" value="<!-- TMPL_VAR NAME="phone" -->" >
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryphonepro" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Phone (prof)</label>
-			<input type="text" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorymobile" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Phone (cell)</label>				
-			<input type="text" name="mobile" value="<!-- TMPL_VAR NAME="mobile" -->" >
-		</p>
-		<p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryemail" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			E-mail (home)</label>
-			<input type="text" name="email" value="<!-- TMPL_VAR NAME="email" -->" >	
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryemailpro" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			E-mail (prof)</label>
-			<input type="text" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryefax" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Fax</label>	
-			<input type="text" name="fax" value="<!-- TMPL_VAR NAME="fax" -->">
-		</p>
-	</fieldset>
-	<fieldset>
-		<legend>Structure</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatorycontactname" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Name</label>
-			<input style="text-transform:uppercase;" type="text" name="contactname" size="20" value="<!-- TMPL_VAR NAME="contactname" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryrelationship" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Relation</label>
-			<select name="relationship" size="1">
-						<!-- TMPL_LOOP NAME="relshiploop" -->
-							<option <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="relationship" --></option>
-						<!-- /TMPL_LOOP -->
-			</select>
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryB_address" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Adress </label>
-			<input type="text" name="B_address" size="40" value="<!-- TMPL_VAR NAME="B_address" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryB_zipcode" -->
-			<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-			<label>
-			<!-- /TMPL_IF-->	
-			Zipcode</label>
-			<input type="text" maxlength="5" name="B_zipcode" size="5" value="<!-- TMPL_VAR NAME="B_zipcode" -->">
-		</p>
-			<!-- TMPL_IF NAME="mandatoryB_city" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			City</label>
-			<input style="text-transform:uppercase;" type="text" name="B_city" size="20" value="<!-- TMPL_VAR NAME="B_city" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryB_phone" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Phone (home)</label>
-			<input type="text" name="B_phone" size="20" value="<!-- TMPL_VAR NAME="B_phone" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorycontactnotes" -->
-				<label style="font-weight:bold">
-			<!-- TMPL_ELSE -->
-				<label>
-			<!-- /TMPL_IF-->
-			Notes</label>
-			<textarea  name="contactnotes" cols="70" rows="2"   ><!-- TMPL_VAR NAME="contactnotes" --></textarea>
-		</p>
-	</fieldset>
-		<div>
-		<input type="button" class="borrowers_button" name="etapeprec1" value="Etape precedente" onclick="check_form_borrowers(0);">
-		<input type="button" class="borrowers_button" name="etapesuiv3" onclick="check_form_borrowers('3')" value="Etape suivante"></div>
-	</p>
-</form>
-<!-- ############################END FORM PROFESSIONAL############################################"-->
-<!--/TMPL_IF-->
-
-<!-- TMPL_IF NAME="step_3"-->
-	<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
-		<!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
-		<input type="hidden" name="FormFieldList" value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password">
-		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-		<input type="hidden" name="type" value="borrowers">
-		<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-		<input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
-		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
-		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
-		<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-		<input type="hidden" name="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
-		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-		<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
-		
-	<!-- 		from form 1 -->
-		<input type="hidden" name="title"  value="<!-- TMPL_VAR NAME="title" -->">
-		<input type="hidden" name="surname"  value="<!-- TMPL_VAR NAME="surname" -->" >
-		<input type="hidden" name="firstname"  value="<!-- TMPL_VAR NAME="firstname" -->">
-		<input type="hidden" name="dateofbirth"  value="<!-- TMPL_VAR NAME="dateofbirth" -->">
-		<input type="hidden" name="initials"  value="<!-- TMPL_VAR NAME="initials" -->">
-		<input type="hidden" name="othernames"  value="<!-- TMPL_VAR NAME="othernames" -->" >
-		<input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->" >
-		<input type="hidden" name="categorycode"  value="<!-- TMPL_VAR NAME="categorycode" -->">
-		<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->">
-		<input type="hidden" name="sort1"   value="<!-- TMPL_VAR NAME="sort1" -->">
-		<input type="hidden" name="sort2"   value="<!-- TMPL_VAR NAME="sort2" -->">
-
-
-	<!-- 		from form 2 -->
-		<input type="hidden" name="streetnumber"  value="<!-- TMPL_VAR NAME="streetnumber" -->">
-		<input type="hidden" name="address"  value="<!-- TMPL_VAR NAME="address" -->">
-		<input type="hidden" name="address2"  value="<!-- TMPL_VAR NAME="address2" -->">
-		<input type="hidden" name="streettype"  value="<!-- TMPL_VAR NAME="streettype" -->">	
-		<input type="hidden" name="zipcode"  value="<!-- TMPL_VAR NAME="zipcode" -->">
-		<input type="hidden" name="city"  value="<!-- TMPL_VAR NAME="city" -->"> 
-		<input type="hidden" name="branchcode"  value="<!-- TMPL_VAR NAME="branchcode" -->">
-		<input type="hidden" name="phone"   value="<!-- TMPL_VAR NAME="phone" -->" >
-		<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-		<input type="hidden" name="mobile"  value="<!-- TMPL_VAR NAME="mobile" -->" >	
-		<input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" >
-		<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-		<input type="hidden" name="contactname"  value="<!-- TMPL_VAR NAME="contactname" -->">
-		<input type="hidden" name="relationship"  value="<!-- TMPL_VAR NAME="relationship" -->">
-		<input type="hidden" name="B_address" value="<!-- TMPL_VAR NAME="B_address" -->">
-		<input type="hidden" name="B_zipcode"  value="<!-- TMPL_VAR NAME="B_zipcode" -->">
-		<input type="hidden" name="B_city"  value="<!-- TMPL_VAR NAME="B_city" -->">
-		<input type="hidden" name="B_phone"  value="<!-- TMPL_VAR NAME="B_phone" -->"> 
-		<input type="hidden" name="fax"  value="<!-- TMPL_VAR NAME="fax" -->"> 	
-		<textarea style="display:none;" name="contactnotes" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnotes" --></textarea>
-	
-		<!-- TMPL_IF NAME="opadd" -->
-			<input type="hidden" name="op" value="add">
-		<!-- TMPL_ELSE -->
-			<input type="hidden" name="op" value="modify">
-		<!-- /TMPL_IF -->
-		<p>
-			<!-- TMPL_IF NAME="mandatorycardnumber" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			 Card number</label>
-			<input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
-		</p>
-	<fieldset id="memberentry_subscription">
-	<legend>Library set-up</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatorydateenrolled" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Arrival date</label>
-			<input type="text" name="dateenrolled"  maxlength="10"	  size="10" onblur="CheckDate(document.form.dateenrolled.value);" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorydateexpiry" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Expiry date</label>
-			<input type="text" name="dateexpiry" maxlength="10"  size="10"
-							onblur="CheckDate(document.form.dateexpiry.value);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryopacnote" -->
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->	
-			OPAC note</label>
-			<textarea  name="opacnote" cols="70" rows="2"   ><!-- TMPL_VAR NAME="opacnote" --></textarea>
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryborrowernotes" -->	
-				<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-				<label>
-			<!-- /TMPL_IF-->
-			Library note</label>
-			<textarea name="borrowernotes" cols="70" rows="2"   ><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-		</p>
-	</fieldset>
-	<fieldset id="memberentry_userid">
-		<legend>OPAC login</legend>
-		<p>
-			<!-- TMPL_IF NAME="mandatoryuserid" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			OPAC Login</label>
-			<input type="text" name="userid" size="20"  value="<!-- TMPL_VAR NAME="userid" -->">
-		</p>
-		<p>
-			<!-- TMPL_IF NAME="mandatorypassword" -->
-			<label style="font-weight:bold">
-			<!--TMPL_ELSE-->
-			<label>
-			<!-- /TMPL_IF-->
-			Password</label>
-			<!--TMPL_IF NAME="opadd"-->
-				<input type="text" name="password" size="20"  value="<!-- TMPL_VAR NAME="password" -->">
-			<!--TMPL_ELSE-->
-				<!--TMPL_IF NAME="password"-->
-					<input type="text" name="password" size="20"  value="****">
-				<!--TMPL_ELSE-->
-					<input type="text" name="password" size="20"  value="">
-				<!--/TMPL_IF-->
-			<!--/TMPL_IF-->
-		</p>
-		<!--this zones are not necessary in modif mode -->
-		<!-- TMPL_UNLESS NAME="opadd" -->
-			<h1>Warning</h1>
-			<!-- TMPL_LOOP NAME="flagloop" -->
-			<p>
-				<label class="borrowers_labels_title"><!-- TMPL_VAR NAME="html" --></label>
-				<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Yes
-				<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>No
-			</p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_UNLESS -->	
-		<p>
-		</fieldset>
-		<div>
-			<input type="button" class="borrowers_button" name="step2" value="Previous step" onclick="check_form_borrowers(1);">	
-			<!-- TMPL_IF NAME="opadd" -->
-				<input type="button" name="step4" onclick="unique();" value="Add member">
-			<!-- TMPL_ELSE -->
-				<input type="button" name="step4" onclick="check_form_borrowers();" value="Modify member">
-			<!--/TMPL_IF -->
-		</div>
-	</form>
-<!-- /TMPL_IF -->
-<!--	 TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-

Index: htdocs/intranet-tmpl/default/en/members/members-home.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/members-home.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/members-home.tmpl
--- htdocs/intranet-tmpl/default/en/members/members-home.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,53 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Users<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1>Users</h1>
-<div id="menu">
-<dl><dt>User Search</dt>
-			<dd>Start with a search to add, update, or delete a record, check accounts, &amp; renew items.
-	<form action="/cgi-bin/koha/members/member.pl" method="post">
-	<label for="member">Enter Name or Barcode</label><input id="member" type="text" size="25" name="member" />  <select name="orderby" id="orderby">
-			<option value="surname,firstname">Order by Last Name</option>
-			<option value="cardnumber">Order by Card Number</option>
-		</select><br />
-	<input type="submit" value="Search" class="submit" />
-	</form></dd>
-<dt>Browse Users</dt>
-<dd>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=a">A</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=b">B</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=c">C</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=d">D</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=e">E</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=f">F</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=g">G</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=h">H</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=i">I</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=j">J</a>
-
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=k">K</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=l">L</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=m">M</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=n">N</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=o">O</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=p">P</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=q">Q</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=r">R</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=s">S</a>
-
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=t">T</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=u">U</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=v">V</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=w">W</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=x">X</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=y">Y</a>
-<a class="nav" href="/cgi-bin/koha/members/member.pl?member=z">Z</a>
-</dd>
-</dl>
-</div>
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/members/moremember-print.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/moremember-print.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/moremember-print.tmpl
--- htdocs/intranet-tmpl/default/en/members/moremember-print.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,76 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Summary for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->  (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- TMPL_INCLUDE NAME="doc-head-close-print.inc" -->
-
-
-<div id="main">
-<h3><!-- TMPL_VAR NAME="LibraryName" --></h3><br><br>
-<h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->">Account: <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->      &nbsp;&nbsp; &nbsp;&nbsp;Student/Members card:<!-- TMPL_VAR NAME="cardnumber" --></a></h3>
-
-<ul><li><!-- TMPL_VAR NAME="streetaddress" --></li><li><!-- TMPL_VAR NAME="city" -->, <!-- TMPL_VAR NAME="zipcode" --></li>
-<li><!-- TMPL_IF NAME="phone" --><!-- TMPL_VAR NAME="phone" --><!-- TMPL_ELSE -->(no phone number on file)<!-- /TMPL_IF --></li>
-<li><!-- TMPL_IF NAME="emailaddress" --><!-- TMPL_VAR NAME="emailaddress" --><!-- TMPL_ELSE -->(no email on file)<!-- /TMPL_IF --></li>
-</ul>
-
-<table>
-	<caption>Fines &amp; Charges</caption>
-		
-		<tr>
-			<!-- TMPL_IF name="totaldue" --><th>Total Due:</th><td><!-- TMPL_VAR NAME="totaldue" --> YTL</td></tr><!-- TMPL_ELSE --><td>No Outstanding Charges (Hiçbir borcu yoktur)</td><!-- /TMPL_IF --></table>
-<table>
-	<caption>Items Checked Out</caption>
-<!-- TMPL_IF name="issueloop" -->
-	<tr>
-		<th>Title</th>
-		<th>Author</th>
-		<th>Format</th>
-		<th>Date Due</th>
-		<th>Status</th>
-	</tr>
-
-	<!-- TMPL_loop name="issueloop" -->
-	<tr<!-- TMPL_IF name="red" --> class="overdue"</TMPL_IF>>
-		<td>
-		<!-- TMPL_VAR NAME="title" -->
-		<a href="/cgi-bin/koha/catalogue/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">
-		</a>
-		</td>
-		<td><!-- TMPL_VAR NAME="author" --></td>
-		<td><!-- TMPL_VAR NAME="itemtype" --></td>
-		<td><!-- TMPL_VAR NAME="date_due" --></td>
-		<td><!-- TMPL_IF NAME="red" -->Overdue!<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
-	</tr>
-	<!-- /TMPL_LOOP -->
-<!-- TMPL_ELSE -->
-<tr>
-		<td>No items onloan (Hiçbir ödünç yayını yoktur)</td></tr><!-- /TMPL_IF -->
-	</table>
-<!-- TMPL_IF name="reserveloop" -->	
-<table>
-
-	<caption>Items on Reserve</caption>
-
-	<tr>
-		<th>Title</th>
-		<th>Author</th>
-		<th>Format</th>
-		<th>Requested</th>
-	</tr>
-
-<!-- TMPL_loop name="reserveloop" -->
-	<tr>
-		<td><a href="/cgi-bin/koha/reserve/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a></td>
-		<td><!-- TMPL_VAR NAME="author" --></td>
-		<td><!-- TMPL_VAR NAME="description" --></td>
-		<td><!-- TMPL_VAR NAME="reservedate2" --></td>
-	</tr>
-	<!-- /tmpl_loop -->
-
-</table>
-<!-- /TMPL_IF -->
-<br>
-Date:<!-- TMPL_VAR NAME="today" --><br><br><br>
-
-Signed:..................................................
-</div>
-
-
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/members/moremember-receipt.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/moremember-receipt.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/moremember-receipt.tmpl
--- htdocs/intranet-tmpl/default/en/members/moremember-receipt.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,44 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Print Receipt for <!-- TMPL_VAR NAME="cardnumber" --><!-- TMPL_INCLUDE NAME="doc-head-close-receipt.inc" -->
-
-<!-- main site -->
-<div id="main">
-<h3>NEU Grand Library</h3>
-<!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><br><!-- /TMPL_IF -->
-Issued To <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber">"><!-- TMPL_VAR NAME="cardnumber" --></a><br>
-<!-- TMPL_VAR NAME="todaysdate" --><br>
-<table>
-	<caption>Issues</caption>
-	<tr>
-		<th>Date Due</th>
-		<th>Title</th>
-	</tr>
-
-	<!-- TMPL_loop name="issueloop" -->
-	<!-- TMPL_IF name="red" --><!-- TMPL_ELSE -->
-		<tr>
-		<td><!-- TMPL_VAR NAME="date_due" --></td>
-		<td><a href="/cgi-bin/koha/catalogue/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
-		</tr>
-	<!-- /TMPL_IF -->
-	<!-- /TMPL_LOOP -->
-	</table>
-	
-	<table>
-	<caption>Overdues</caption>
-	<tr>
-	<th>Date Due</th>
-	<th>Title</th>
-	</tr>
-	<!-- TMPL_LOOP NAME="issueloop" -->
-	<!-- TMPL_IF NAME="red" --><tr>
-	<td><!-- TMPL_VAR NAME="date_due" --></td>
-	<td><a href="cgi-bin/koha/catalogue/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
-	</tr>
-	<!-- /TMPL_IF -->
-	<!-- /TMPL_LOOP -->
-	</table>
-
-</div>
-<!-- endmenu -->
-
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/members/moremember.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/moremember.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/moremember.tmpl
--- htdocs/intranet-tmpl/default/en/members/moremember.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,236 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patrons: Details for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<!-- main site -->
-<div id="main">
-<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->) <span class="print"><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page">(İlişik kesme mektubu)</a> <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip">(Print Slip)</a><a href="/cgi-bin/koha/reports/contact_history.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;do_contacts=1">(Gönderilen mesajlar)</a></span></h1>
-<!-- TMPL_IF NAME="borrowerphoto" -->
- 		<img src="<!-- TMPL_VAR NAME="borrowerphoto" -->">
-  	<!-- /TMPL_IF --><br>
-  	<a href="/cgi-bin/koha/members/member-picupload.pl?cardnum=<!-- TMPL_VAR NAME="cardnumber"-->&bornum=<!-- TMPL_VAR NAME=bornum -->&name=<!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="othernames" --> <!--
-TMPL_VAR NAME="surname" -->" class="button">Upload Picture</a><br>
-
-<div class="tabitem">
-			 <form method="post" action="/cgi-bin/koha/circ/circulation.pl"><input name="findborrower" type="hidden" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" /><input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" /> <input type="submit" class="submit" value="Issue" /></form>
-
-<!-- Hide from NPL --><!-- TMPL_IF name="IS_ADULT" --> <form action="/cgi-bin/koha/members/jmemberentry.pl" method="post"> <input type="submit" name="submit" value="Add Child" class="submit" alt="Add Child" /><input type="hidden" name="type" value="add" /><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /></form><!-- /TMPL_IF --><!-- /Hide from NPL -->
-
-<!-- TMPL_IF name="I" --> <form action="/cgi-bin/koha/members/imemberentry.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" name="modify" class="submit" value="Edit" /></form>
-<!-- TMPL_ELSE --> <form action="/cgi-bin/koha/members/memberentry.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" class="submit" name="modify" value="Edit" /></form>
-<!-- /TMPL_IF -->
-
-<form action="/cgi-bin/koha/members/member-password.pl" method="post"><input type="hidden" name="member" value="<!-- TMPL_VAR NAME=bornum -->" /> <input type="submit" class="submit" value="Change Password" /></form>
-
- <form action="/cgi-bin/koha/members/member-flags.pl" method="post"><input type="hidden" name="member" value="<!-- TMPL_VAR NAME=bornum -->" /> <input type="submit" class="submit" value="Modify Privileges" /></form>
-
-
-<form action="/cgi-bin/koha/members/deletemem.pl?member=<!-- TMPL_VAR NAME="bornum" -->" onclick="confirm_deletion(); return false;"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->"><input type="submit" class="cancel" value="Delete"></form>
-
-</div>
-<!-- TMPL_IF NAME="flagged" -->	<div class="details">
-	<ul>
-		<!-- TMPL_IF NAME="debarred" --><li>Patron is <span class="error">debarred</span>. <form class="inline compact" action="/cgi-bin/koha/members/setdebar.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="hidden" name="status" value="0" /><input type="submit" class="submit" value="Lift Debarment" /></form></li><!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="gonenoaddress" --><li>Patron's <span class="error">address is not known or garduated</span>.</li><!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="lost" --><li>Patron's card has been reported <span class="error">lost</span>.</li><!-- /TMPL_IF -->
-	</ul>
-<!-- TMPL_IF name="borrowernotes" --><dl><dt>Notes:</dt> <dd class="error"><!-- TMPL_VAR name="borrowernotes" --></dd></dl><!-- /TMPL_IF --></div>
-<!-- /TMPL_IF -->
-
-<div class="compact">
-<table>
-<tr><th>Name:</th><td><!-- TMPL_IF name="IS_ADULT" --><!-- TMPL_IF NAME="title" -->[<!-- TMPL_VAR NAME="title" -->]. <!-- /TMPL_IF --><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_IF NAME="othernames" -->"<!-- TMPL_VAR NAME="othernames" -->" <!-- /TMPL_IF --><!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="initials" -->(<!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF --><!-- /TMPL_IF --></td></tr>
-		<tr><th>Mailing Address:</th><td><!-- TMPL_IF NAME="streetaddress" --><!-- TMPL_VAR NAME="streetaddress" --><br /><!-- /TMPL_IF -->
-<!-- TMPL_VAR NAME="city" -->, <!-- TMPL_VAR NAME="zipcode" --></td></tr>
-		<!-- TMPL_IF NAME="physstreet" --><tr><th>Street Address:</th><td><!-- TMPL_VAR NAME="physstreet" --><br /><!-- TMPL_VAR NAME="streetcity" -->, <!-- TMPL_VAR NAME="homezipcode" --></td></tr><!-- /TMPL_IF -->
-		<!-- TMPL_UNLESS name="I" -->
-		<tr><th>Home Phone: </th><td><!-- TMPL_IF NAME="phone" --><!-- TMPL_VAR NAME="phone" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr><!-- /TMPL_UNLESS -->
-		<!-- TMPL_IF NAME="phoneday" --><tr><th>Mobile Phone: </th><td><!-- TMPL_VAR NAME="phoneday" --></td></tr><!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="faxnumber" --><tr><th>Fax: </th><td><!-- TMPL_VAR NAME="faxnumber" --></td></tr><!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="emailaddress" --><tr><th>E-mail:</th><td><a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_UNLESS name="I" -->
-			<tr><th>Date of Birth:</th><td><!-- TMPL_IF NAME="dateofbirth" --><!-- TMPL_VAR NAME="dateofbirth" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
-			<tr><th>Sex:</th><td><!-- TMPL_IF NAME="sex" --><!-- TMPL_VAR NAME="sex" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr><!-- /TMPL_UNLESS -->
-</table></div>
-<div class="compact">
-	<table>
-		<tr><th>Member Number:</th><td><!-- TMPL_VAR NAME="borrowernumber" --></td></tr>
-		<tr><th>Category:</th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
-		<tr><th>Registration Date:</th><td><!-- TMPL_IF NAME="dateenrolled" --><!-- TMPL_VAR NAME="dateenrolled" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
-		<tr><th>Expiration Date</th><td><!-- TMPL_IF NAME="expiry" --><!-- TMPL_VAR NAME="expiry" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
-		<tr><th>Registration Branch:</th><td><!-- TMPL_VAR NAME="branchcode" --></td></tr>
-		<!-- TMPL_IF name="printethnicityline" -->
-			<tr><th>Ethnicity:</th><td><!-- TMPL_VAR NAME="ethnicity" -->, <!-- TMPL_VAR NAME="ethnotes" --></td></tr>
-	<!-- /TMPL_IF --><tr><th>To contact with : </th><td><!-- TMPL_VAR NAME="preferredcont" --></td></tr>
-			<!-- TMPL_IF NAME="sort1" -->
-			<tr><th>Sort field 1 : </th><td><!-- TMPL_VAR NAME="sort1" --></td></tr>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="sort2" -->
-			<tr><th>Sort field 2 :</th> <td><!-- TMPL_VAR NAME="sort2" --></td></tr>
-		<!-- /TMPL_IF -->
-</table>
-</div>
-
-
-<div class="compact">
-<table>
-<!-- TMPL_IF NAME="userid" -->
-	<tr><th>OPAC login: </th><td><!-- TMPL_VAR name="userid" --></td></tr>
-	<tr><th>OPAC Password: </th><td><!-- TMPL_IF name="password" -->On Record<!-- TMPL_ELSE -->Not Set <form class="inline compact" action="/cgi-bin/koha/members/member-password.pl" method="post"><input type="hidden" name="member" value="<!-- TMPL_VAR NAME=bornum -->" /> <input type="submit" class="submit" value="Set Password" /></form><!-- /TMPL_IF --></td></tr> 
-<!-- TMPL_ELSE -->
-	<tr><th>OPAC Login Not Defined!</th><td><form class="inline compact" action="/cgi-bin/koha/members/member-password.pl" method="post"><input type="hidden" name="member" value="<!-- TMPL_VAR NAME=bornum -->" /> <input type="submit" class="submit" value="Set Login and Password" /></form></td></tr>
-<!-- /TMPL_IF -->
-</table>
-</div>
-
-
-<div class="compact">
-<table>
-		<!-- TMPL_IF NAME="borrowernotes" -->
-		<tr><th>Circulation Note: <p>(appears in Circulation)</p></th> 
-		<td><p class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></p></td></tr>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="textmessaging" --><tr><th>Patron Message:<p>(appears in OPAC)</p></th><td><!-- TMPL_VAR NAME="textmessaging" --></td></tr><!-- /TMPL_IF -->
-</table></div>
-<div class="compact">
-<table>
-			<tr><th><!-- TMPL_UNLESS name="I" -->Alternate<!-- /TMPL_UNLESS --> Contact:</th> 
-			<td>
-				<!-- TMPL_UNLESS name="I" --><ul><li>Name: <!-- /TMPL_UNLESS --><!-- TMPL_VAR NAME="contactname" --><!-- TMPL_UNLESS name="I" --></li><!-- /TMPL_UNLESS -->
-				<!-- TMPL_UNLESS name="I" --><li>Phone: <!-- TMPL_VAR NAME="altphone" --></li>
-				<li>Relationship: <!-- TMPL_VAR NAME="altrelationship" --></li>
-		<!-- /TMPL_UNLESS -->
-		<!-- TMPL_IF NAME="altnotes" --><li>Notes: <!-- TMPL_VAR NAME="altnotes" --></li><!-- /TMPL_IF -->
-				<!-- TMPL_UNLESS name="I" --></ul><!-- /TMPL_UNLESS --></td></tr>
-
-		<!-- TMPL_UNLESS name="I" -->
-		
-			<!-- TMPL_IF name="isguarantee" -->
-
-				<!-- TMPL_IF NAME="guaranteeloop" --><tr><th>Guarantees:</th><td><ul><!-- tmpl_loop name="guaranteeloop" --><li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME=name --> - <!-- TMPL_VAR NAME="cardnumber" --></a></li><!-- /tmpl_loop --></ul></td></tr><!-- /TMPL_IF -->
-
-			<!-- TMPL_ELSE -->
-
-<!-- TMPL_IF name="guarantorborrowernumber" --><tr><th>Guarantor:</th>
-					<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->"><!-- TMPL_VAR NAME="guarantorcardnumber" --></a></td></tr><!-- /TMPL_IF -->
-
-			<!-- /TMPL_IF -->
-			
-		<!-- /TMPL_UNLESS -->
-</table>
-</div><div class="data">
-<table>
-	<caption>Fines &amp; Charges</caption>
-		
-		<tr>
-			<!-- TMPL_IF name="totaldue" --><th>Total Due:</th><td><!-- TMPL_VAR NAME="totaldue" --> YTL</td></tr><!-- TMPL_ELSE --><td>No Outstanding Charges</td><!-- /TMPL_IF --></table>
-<p><form class="inline" action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /><input type="submit" value="View Account" class="submit" /></form>
-
-
-	<form class="inline" action="/cgi-bin/koha/members/pay.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /><input type="submit" value="Pay Fines" class="submit" /></form>
-
-
-</p></div>
-
-<form class="inline" action="/cgi-bin/koha/circ/renewscript.pl" method="post">
-	<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" />
-	
-<div class="table"><table>
-	<caption>Items On Loan</caption>
-	<tr>
-		<th>Title</th>
-		<th>Due</th>
-		<th>Itemtype</th>
-<!-- 		<th>Charge</th> -->
-		<th>Price</th>
-		<th>Renew</th>
-		<th>Return</th>
-	</tr>
-
-	<!-- tmpl_loop name="issueloop" -->
-	<tr>
-		<td><!-- TMPL_IF name="red" --><font color="red"><!-- /TMPL_IF -->
-		<!-- TMPL_VAR NAME="title" --><!-- TMPL_IF name="red" --></font><!-- /TMPL_IF -->
-		<a href="/cgi-bin/koha/catalogue/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-			<!-- TMPL_VAR NAME="barcode" -->
-		</a>
-		</td>
-		<td><!-- TMPL_VAR NAME="date_due" --></td>
-		<td><!-- TMPL_VAR NAME="itemtype" --></td>
-		<!-- <td><!-- TMPL_VAR NAME="charge" --></td> -->
-		<td><!-- TMPL_VAR NAME="replacementprice" --></td>
-		<td>
-		<!-- TMPL_IF name="norenew" -->
-			<a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Reserved</a>
-		<!-- TMPL_ELSE -->
-			<input type="checkbox" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF name="red" -->checked="checked"<!-- /TMPL_IF --> />
-		<!-- /TMPL_IF -->
-		</td>
-		<td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR NAME="barcode" -->">Return</a></td>
-	</tr>
-	<!-- /tmpl_loop -->
-	<tfoot><tr><td colspan="3">Total Replacement Cost:</td><td><!-- TMPL_VAR NAME="totalprice" --></td><td colspan="2">&nbsp;</td></tr></tfoot>
-	</table></div><p><input type="submit" class="submit" value="Renew Checked Items" /></p>
-</form>
-
-<form class="inline" action="/cgi-bin/koha/circ/renewscript.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /><!-- TMPL_LOOP NAME="issueloop" --><!-- TMPL_UNLESS NAME="norenew" --><input type="hidden" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y" /><!-- /TMPL_UNLESS --><!-- /TMPL_LOOP --><input type="submit" class="submit" value="Renew All" /></form>
-
-
-
-
-	<form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
-	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->" />
-	<div class="table"><table>
-	<caption>Reserves</caption>
-	<tr>
-		<th>Title</th>
-		<th>Requested</th>
-		<th>Remove</th>
-	</tr>
-
-
-
-	<!-- TMPL_LOOP name="reserveloop" -->
-	<tr>
-		<td><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-			<a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
-			<!-- TMPL_IF name="volumeddesc" -->
-				<!-- TMPL_VAR NAME="volumeddesc" -->
-				<!-- TMPL_VAR NAME="itemtype" -->
-			<!-- /TMPL_IF -->
-		</td>
-		<td><!-- TMPL_VAR NAME="reservedate" --></td>
-		<td>
-			<select name="rank-request">
-			<option value="n">No</option>
-			<option value="del">Yes</option>
-			</select>
-		</td>
-		<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->" />
-	</tr>
-	<!-- /TMPL_LOOP -->
-
-</table>		<!-- TMPL_IF name="reserveloop" -->
-			<p><input type="submit" class="cancel" name="submit" value="Cancel Marked Requests" /></p>
-		<!-- /TMPL_IF --></div></form>
-
-
-<!-- Hide from NPL --><div class="table">
-<h1>Reading Record</h1>
-<form class="inline" action="/cgi-bin/koha/members/readingrec.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" class="submit" value="View Patron's Reading Record" /></form>
-</div><!-- /Hide from NPL -->
-
-</div>
-
-<script language="JavaScript" type="text/javascript">
-function confirm_deletion() {
-	var is_confirmed = confirm('Are you sure you want to delete this patron?');
-	if (is_confirmed) {
-		window.location="/cgi-bin/koha/members/deletemem.pl?member=<!-- TMPL_VAR NAME="bornum" -->";
-	}
-}
-</script>
-
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/members/newimember.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/newimember.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/newimember.tmpl
--- htdocs/intranet-tmpl/default/en/members/newimember.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Confirm New Borrower<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main"><!-- TMPL_IF NAME="missingloop" -->
-	<!-- TMPL_VAR Name="string" -->
-<!-- TMPL_ELSE -->
-	<!-- TMPL_IF NAME="invalid" -->
-		Invalid cardnumber.<p>
-	<!-- TMPL_ELSE -->
-<div class="details">
-	<h3>Valid values</h3>
-	<p>Click below to confirm this new borrower.</p>
-		<form action="/cgi-bin/koha/members/insertidata.pl" method="post">
-			<!-- TMPL_LOOP NAME="inputsloop" -->
-				<input type="hidden" name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->" />
-			<!-- /TMPL_LOOP -->
-			<input type="submit" name="submit" class="submit" value="Add Institutional Member" />
-		</form></div>
-	<!-- /TMPL_IF -->
-<!-- /TMPL_IF --></div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/members/newjmember.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/newjmember.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/newjmember.tmpl
--- htdocs/intranet-tmpl/default/en/members/newjmember.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,58 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS-- Confirm Details<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-		<div id="main">	
-<!-- TMPL_IF Name="NOK" -->
-	<div class="details"><h3>Error Completing Form</h3>
-	<p><!-- TMPL_VAR Name="string" --></p></div>
-<!-- TMPL_ELSE -->
-	
-	<!-- TMPL_LOOP Name="identsloop" -->
-		<!-- TMPL_IF Name="cardchild" -->
-<div class="form">
-				<table>
-				<caption>Confirm Details for <!-- TMPL_VAR Name="name" --></caption>
-				<tr>
-					<th>Name</th><td><!-- TMPL_VAR Name="name" --></td>
-				</tr>
-				<tr>
-					<th>Membership Number</th>
-					<td><!-- TMPL_VAR Name="bornum" --></td>
-				</tr>
-				<tr>
-					<th>Barcode Number</th>
-					<td><!-- TMPL_VAR NAME="cardnumber" --></td>
-				</tr>
-				<tr>
-					<th>Date Of Birth</th>
-					<td><!-- TMPL_VAR Name="dob" --></td>
-				</tr>
-				<tr>
-					<th>Sex</th>
-					<td><!-- TMPL_VAR Name="sex" --></td>
-				</tr>
-<!-- 				<tr>
-					<th>School</td>
-					<td><!-- TMPL_VAR Name="school" --></td>
-				</tr> -->
-<!-- TMPL_IF NAME="notes" -->
-				<tr>
-					<th>General Notes</th>
-					<td><!-- TMPL_VAR Name="notes" --></td>
-				</tr>
-
-<!-- /TMPL_IF -->
-		</table></div>
-		<!-- /TMPL_IF -->
-  <!-- /TMPL_LOOP -->
-<form action="/cgi-bin/koha/insertjdata.pl" method="post">
-		<p><!-- TMPL_LOOP NAME="inputsloop" -->
-			<input type="hidden" name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->" />
-		<!-- /TMPL_LOOP -->
-		<input type="submit" name="submit" value="Save Changes to Patron Record" class="submit" /></p>
-	</form>
-<!-- /TMPL_IF -->
-			</div>
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/members/newmember.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/newmember.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/newmember.tmpl
--- htdocs/intranet-tmpl/default/en/members/newmember.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Confirm Record<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<!-- TMPL_IF Name="OK" -->
-
-<h2>Confirm Record</h2>
-	<div class="compact">
-			<table>
-			<tr><th>Name:</th><td><!-- TMPL_IF NAME="name" --><!-- TMPL_VAR NAME="name" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
-			<tr><th>Address:</th><td><!-- TMPL_IF NAME="postal" --><!-- TMPL_VAR NAME="postal" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
-			<tr><th>Home Phone: </th><td><!-- TMPL_IF NAME="phone" --><!-- TMPL_VAR NAME="phone" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
-			<!-- TMPL_IF NAME="phoneday" --><tr><th>Work Phone: </th><td><!-- TMPL_VAR NAME="phoneday" --></td></tr><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="faxnumber" --><tr><th>Fax:</th><td><!-- TMPL_VAR NAME="faxnumber" --></td></tr><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="emailaddress" --><tr><th>E-mail:</th><td><!-- TMPL_VAR NAME="emailaddress" --></td></tr><!-- /TMPL_IF -->
-			<tr><th>Date Of Birth:</th><td><!-- TMPL_IF NAME="dob" --><!-- TMPL_VAR NAME="dob" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
-			<tr><th>Sex:</th><td><!-- TMPL_IF NAME="sex" --><!-- TMPL_VAR NAME="sex" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
-			</table>
-			</div>
-<div class="compact">			<table>
-			<tr><th>Member Number:</th><td><!-- TMPL_IF NAME="bornum" --><!-- TMPL_VAR NAME="bornum" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
-			<tr><th>Card Number:</th><td><!-- TMPL_IF NAME="cardnum" --><!-- TMPL_VAR NAME="cardnum" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
-			<tr><th>Category:</th><td><!-- TMPL_IF NAME="memcat" --><!-- TMPL_VAR NAME="memcat" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
-			<tr><th>Registration Date:</th><td><!-- TMPL_IF NAME="joindate" --><!-- TMPL_VAR NAME="joindate" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
-			<tr><th>Expiration Date:</th><td><!-- TMPL_IF NAME="expdate" --><!-- TMPL_VAR NAME="expdate" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
-			<tr><th>Registration Branch:</th><td><!-- TMPL_IF NAME="branchcode" --><!-- TMPL_VAR NAME="branchcode" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
-			</table>
-</div>
-<div class="compact">			<table>
-			<tr><th>General Notes:</th><td><!-- TMPL_IF NAME="bornotes" --><!-- TMPL_VAR NAME="bornotes" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
-			</table></div>
-<div class="compact">			<table>
-			<tr><th>Alternate contact:</th><td><!-- TMPL_IF NAME="contactname" --><!-- TMPL_VAR NAME="contactname" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
-			<tr><th>Contact's Phone:</th><td><!-- TMPL_IF NAME="altphone" --><!-- TMPL_VAR NAME="altphone" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
-			<tr><th>Relationship to Patron:</th><td><!-- TMPL_IF NAME="altrelationship" --><!-- TMPL_VAR NAME="altrelationship" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
-			<!-- TMPL_IF NAME="altnotes" --><tr><th>Notes:</th><td><!-- TMPL_VAR NAME="altnotes" --></td></tr><!-- /TMPL_IF -->
-			</table></div>
-<form action="/cgi-bin/koha/insertdata.pl" method="post">
-<p>			<!-- TMPL_LOOP NAME="inputsloop" -->
-				<input type="hidden" name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->" />
-			<!-- /TMPL_LOOP -->
-			<input type="submit" name="submit" class="submit" value="Save Changes to Patron Record" /></p>
-		</form>
-</div>		
-<!-- TMPL_ELSE -->
-	<h3>Error</h3>
-	<div class="details">
-	<p>The following  fields have a forbidden value. Please push the back button and try again : </p>
-	<!-- TMPL_IF name="cardnumber" -->
-		Cardnumber<br/>
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF name="invalid_cardnumber" -->
-		Invalid_cardnumber<br/>
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF name="gender" -->
-		Gender<br/>
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF name="firstname" -->
-		Given Names<br/>
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF name="surname" -->
-		Surname<br/>
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF name="address" -->
-		Postal Street Address<br/>
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF name="city" -->
-		Postal city<br/>
-	<!-- /TMPL_IF --><form><input type="button" class="submit" value="&lt;&lt;Back" onclick="history.back();" /></form>
-<!-- /TMPL_IF --></div>
-</div>
-
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/members/pay.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/pay.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/pay.tmpl
--- htdocs/intranet-tmpl/default/en/members/pay.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,57 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Pay Fines for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-	<form class="inline" id="payment" action="/cgi-bin/koha/members/pay.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->" />
-<div class="table"><table>
-<input type="hidden" name="loggedinuser" value="<!-- TMPL_VAR NAME="loggedinusername" -->">
-<caption>Pay Fines for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></caption>
-<tr>
-	<th>Fines &amp; Charges</th>
-	<th>Description</th>
-	<th>Account Type</th>
-	<th>Amount</th>
-	<th>Amount Outstanding</th>
-	<th>Amount to pay</th></tr>
-	
-<!-- TMPL_LOOP name="loop_pay" -->
-<tr>
-	<td><fieldset><label for="payfine<!-- TMPL_VAR name="i" -->">Unpaid</label><input id="payfine<!-- TMPL_VAR name="i" -->" type="radio" name="payfine<!-- TMPL_VAR name="i" -->" value="no" checked="checked" /><br>
-	<label for="payfine<!-- TMPL_VAR name="i" -->">Pay</label><input type="radio" id="payfine<!-- TMPL_VAR name="i" -->" name="payfine<!-- TMPL_VAR name="i" -->" value="yes" /><br>
-	<!--TMPL_IF NAme="CAN_user_management"--> <label for="payfine<!-- TMPL_VAR name="i" -->">Writeoff</label><input type="radio" id="payfine<!-- TMPL_VAR name="i" -->" name="payfine<!-- TMPL_VAR name="i" -->" value="wo" /><!--/TMPL_IF--> </fieldset>
-	<input type="hidden" name="itemnumber<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="itemnumber" -->" />
-	<input type="hidden" name="accounttype<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accounttype" -->" />
-	<input type="hidden" name="amount<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amount" -->" />
-	<input type="hidden" name="out<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amountoutstanding" -->" />
-	<input type="hidden" name="bornum<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="bornum" -->" />
-	<input type="hidden" name="accountno<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accountno" -->" />
-	<input type="hidden" name="desc<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="description" --><!-- TMPL_VAR name="title" -->" />
-	<input type="hidden" id="counter" value="">
-	</td>
-	<td><!-- TMPL_VAR name="description" --><!-- TMPL_VAR name="title" --></td>
-	<td><!-- TMPL_VAR name="accounttype" --></td>
-	<td><!-- TMPL_VAR name="amount" --></td>
-	<td><!-- TMPL_VAR name="amountoutstanding" --></td>
-	<td><input type="text" name="amounttopay<!-- TMPL_VAR name="i" -->" size="5" value="<!-- TMPL_VAR name="amountoutstanding" -->" />
-	</td>
-</tr>
-<!-- /TMPL_LOOP -->
-<tr>
-	<td colspan="4">Total Due</td>
-	<td><!-- TMPL_VAR name="total" --></td>
-	</tr>
-</table></div>
-<input type="submit" name="submit"  value="Make Payment" class="submit" /></form> <form class="inline" action="/cgi-bin/koha/members/moremember.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="bornum" -->" name="bornum" /> <input type="submit" class="submit" value="Return to Member Record" /></form>
-</div>
-<script language="JavaScript" type="text/javascript">
-function changetotal() {
-mytotal=0;
-for (i=0 ; i<document.forms['payment'].counter.length ; i++) {
- mytotal +=document.getElementById("amounttopay"+i).value;
-}
-document.forms['payment'].totalamountopay.value=mytotal;
-}
-</script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/members/payprint.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/payprint.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/payprint.tmpl
--- htdocs/intranet-tmpl/default/en/members/payprint.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Payment for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->  (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- TMPL_INCLUDE NAME="doc-head-close-print.inc" -->
-
-
-<div id="main" >
-<input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->" />
-<h3><!-- TMPL_VAR NAME="LibraryName" --></h3>
-<h3>Account: <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->     <br>Members card:<!-- TMPL_VAR NAME="cardnumber" --></h3>
-
-<ul><li><!-- TMPL_VAR NAME="streetaddress" --></li><li><!-- TMPL_VAR NAME="city" -->, <!-- TMPL_VAR NAME="zipcode" --></li>
-</ul>
-
-
-	<h3>Payment Receipt</h3><br>
-<div id="notes">		
-	
-			Fee Type:<!-- TMPL_VAR NAME="accounttype" --><br>
-Description: <!-- TMPL_VAR NAME="desc" --> <br>
-<b>Total: <!-- TMPL_VAR NAME="amount" -->YTL</b></div>
-
-<br><br>
-Date:<!-- TMPL_VAR NAME="date" --><br><br>
-
-Librarian:<!-- TMPL_VAR NAME="loggeduser" -->
-<br>
-
-</div>
-<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->">Return</a>
-
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/members/readingrec.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/readingrec.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/readingrec.tmpl
--- htdocs/intranet-tmpl/default/en/members/readingrec.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,45 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Reading Record for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main"><div class="table">
-<table>
-<caption>Reading Record for <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a></caption>
-<!-- TMPL_IF NAME="showfulllink" -->
-<tr><td colspan="4">Showing All Items | <a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;limit=full">Show Last 50 Items Only</a></td></tr><!-- TMPL_ELSE -->
-<tr><td colspan="4">Showing Last 50 Items | <a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;limit=full">Show All Items</a></td></tr>
-<!-- /TMPL_IF --><tr>
-	<th>
-		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;order=title&amp;amp;limit=<!-- TMPL_VAR name="limit" -->">Title</a>
-	</th>
-	<th>
-		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;order=author&amp;limit=<!-- TMPL_VAR name="limit" -->">Author</a>
-	</th>
-	<th>Call No.</th>
-	<th>
-		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;order=returndate DESC&amp;limit=<!-- TMPL_VAR name="limit" -->">Return Date</a>
-	</th>
-</tr>
-<!-- TMPL_LOOP name="loop_reading" -->
-<tr<!-- TMPL_IF NAME="toggle" --><!-- TMPL_ELSE --> class="highlight"<!-- /TMPL_IF -->>
-	<td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> class="onissue"<!-- /TMPL_IF -->>
- 		<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR name="title" --></a>&nbsp;
-	</td>
-	<td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> class="onissue"<!-- /TMPL_IF -->>
- 		<!-- TMPL_VAR name="author" -->&nbsp;
-	</td>
-	<td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> class="onissue"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="classification" --></td>
-	<td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> class="onissue"<!-- /TMPL_IF -->><!-- TMPL_IF NAME="returndate" --><!-- TMPL_VAR name="returndate" --><!-- TMPL_ELSE -->Checked Out<!-- /TMPL_IF -->
-	</td>
-<!-- /TMPL_LOOP -->
-</table>
-
-<p><form action="/cgi-bin/koha/members/moremember.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->"><input type="submit" class="submit" value="Return to Member Record" /></form></p>
-
-</div></div>
-
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
-

Index: htdocs/intranet-tmpl/default/en/members/receipts/print-receipts-conf-bottom.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/receipts/print-receipts-conf-bottom.inc
diff -N htdocs/intranet-tmpl/default/en/members/receipts/print-receipts-conf-bottom.inc
--- htdocs/intranet-tmpl/default/en/members/receipts/print-receipts-conf-bottom.inc	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-<br clear="all">
-<p> &nbsp; </p>
-
-<div class="center">
-<a href="/cgi-bin/koha/mainpage.pl">Home</a> ||
-<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a> ||
-<a href="/cgi-bin/koha/members/members-home.pl">Members</a> ||
-<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
-<a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a> ||
-<a href="/cgi-bin/koha/reports-home.pl">Reports</a> ||
-<a href="/cgi-bin/koha/admin-home.pl">Parameters</a> ||
-<a href="/cgi-bin/koha/about.pl">About</a> || 
-Help
-</div>
-
-</body>
-</html>

Index: htdocs/intranet-tmpl/default/en/members/receipts/print-receipts-conf-top.inc
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/receipts/print-receipts-conf-top.inc
diff -N htdocs/intranet-tmpl/default/en/members/receipts/print-receipts-conf-top.inc
--- htdocs/intranet-tmpl/default/en/members/receipts/print-receipts-conf-top.inc	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,175 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-<title>KOHA: INTRANET: Parameters</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
-<style>
-.parameters {
-	background-color: #86c268;
-	color: #FFFFFF;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-a.parameters:hover {
-	background-color: #86c268;
-	color: #FFFFFF;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-.ranges {
-	border:0;
-}
-
-.myTable TD{
-  border-width: 0px;
-  border-color: navy;
-  border-style: solid;
-}
-
-.panel { 
-	position:relative;
-}
-
-.countryPanel {
-	z-index:1;
-	width:300px;
-	display:none;
-	border:1px solid #000000;
-	padding:0px;
-}
-</style>
-
-
-<script type="text/javascript">
-	// Captura el evento onmousemove para cualquier navegador
-	if (document.layers) { // Netscape
-		document.captureEvents(Event.MOUSEMOVE);
-	    document.onmousemove = captureMousePosition;
-	} else if (document.all) { // Internet Explorer
-	    document.onmousemove = captureMousePosition;
-	} else if (document.getElementById) { // Netcsape 6
-	    document.onmousemove = captureMousePosition;
-	}
-
-	var mouseXMax = 0;
-	var mouseYMax = 0;
-	var mouseX = 0;
-	var mouseY = 0;
-
-	function captureMousePosition(e) {
-	    if (document.layers) {
-		    mouseX = e.pageX;
-			mouseY = e.pageY;
-	        mouseXMax = window.innerWidth + window.pageXOffset;
-		    mouseYMax = window.innerHeight + window.pageYOffset;
-	    } else if (document.all) {
-		    mouseX = window.event.x + document.body.scrollLeft;
-	        mouseY = window.event.y + document.body.scrollTop;
-	        mouseXMax = document.body.clientWidth + document.body.scrollLeft;
-	        mouseYMax = document.body.clientHeight + document.body.scrollTop;
-	    } else if (document.getElementById) {
-	        mouseX = e.pageX;
-		    mouseY = e.pageY;
-	        mouseXMax = window.innerWidth + window.pageXOffset;
-	        mouseYMax = window.innerHeight + window.pageYOffset;
-	    }
-	}
-	
-function getFileExt(fname) {
-	var fileExtExp = /\.([\w]*)$/;
-	var fext;
-	if ( (fext = fileExtExp.exec(fname)) && fext[1] ) {
-		return (fext[1].toLowerCase());
-	} else {
-		return ('');
-}}
-
-function checkFileExt(fname){
-	var fileKind = 'image';
-	var allowedFilesExt = ['jpg'];
-	if (fname == '') {
-			alert("You must select a file to upload.");
-			return false;
-			}
-	var fext = getFileExt(fname);
-	var i = 0;
-	while ( (allowedFilesExt[i] != fext) && (i < allowedFilesExt.length) ) {i++;}
-	if (i == allowedFilesExt.length)	{
-			alert("The selected file isn't an " + fileKind + " file (" + allowedFilesExt.join(", ") + ").");
-			return false;
-	}
-	return true;
-}
-
-//this functions trim the leading spaces of a string.
-function trim(s) {
-  while (s.substring(0,1) == ' ') {
-    s = s.substring(1,s.length);
-  }
-  while (s.substring(s.length-1,s.length) == ' ') {
-    s = s.substring(0,s.length-1);
-  }
-  return s;
-}
-
-function addField2(selectBox1, textArea) {
-	if (selectBox1.options.selectedIndex != -1) {
-		var value = selectBox1.options[selectBox1.options.selectedIndex].value;
-		if (value.substring(0,1) == '<') {
-		    alert("You cannot add this value, it's only a reference."); }
-		else {
-		    if (textArea.value.substring(textArea.value.length - 1,textArea.value.length) == ' ') {
-				textArea.value = textArea.value + '<' + value + '>';}
-			else {textArea.value = textArea.value + ' <' + value + '>';}
-	}}
-}
-
-function checkReceiptOptions() {
-  if (trim(document.linesForm.legend.value) == '') {
-	alert("The card legend isn't valid.");
-	return false;
-  }
-  if ((trim(document.linesForm.line1.value) == '') && (trim(document.linesForm.line2.value) == '') && (trim(document.linesForm.line3.value) == '')) {
-	alert("You have to write at least one line.");
-	return false;
-  }
-  if ( (document.linesForm.customPage.checked) && ( (isNaN(document.linesForm.pageWidth.value)) || (trim(document.linesForm.pageWidth.value) == '') || (isNaN(document.linesForm.pageHeight.value)) || (trim(document.linesForm.pageHeight.value) == '') ) ) {
-	alert("The page size is incorrect.");
-	return false;
-  }
-  return true;
-}
-
-
-</script>
-</head>
-<body onload="javascript: changeRange(document.getElementById('rangeType'))">
-<!-- MENUS -->
-<div id="menubar">
-	<span class="koha">KOHA</span>
-	<a class="home" href="/cgi-bin/koha/mainpage.pl">Home</a>
-	<a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a>
-	<a class="members" href="/cgi-bin/koha/members/members-home.pl">Members</a>
-	<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
-	<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
-	<a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
-	<a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a>
-	<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameters</a>
-	<a class="about" href="/cgi-bin/koha/about.pl">About</a>
-	<a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>
-</div>
-<div id="submenu">
-	<span class="koha">options &gt;&gt;&nbsp;&nbsp;</span>
-	<a href="/cgi-bin/koha/admin/aqbookfund.pl" class="submenu">Funds</a>
-	<a href="/cgi-bin/koha/admin/authorised_values.pl" class="submenu2">Auth value</a>
-	<a href="/cgi-bin/koha/admin/thesaurus.pl" class="submenu">Thesaurus</a>
-	<a href="/cgi-bin/koha/admin/currency.pl" class="submenu2">Currencies</a>
-	<a href="/cgi-bin/koha/admin/printers.pl" class="submenu">Printers</a>
-</div>
-<!-- TMPL_IF NAME="loggedinusername" -->
-    <p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
-<!-- TMPL_ELSE -->
-    <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
-<!-- /TMPL_IF -->

Index: htdocs/intranet-tmpl/default/en/members/receipts/print-receipts-conf.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/receipts/print-receipts-conf.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/receipts/print-receipts-conf.tmpl
--- htdocs/intranet-tmpl/default/en/members/receipts/print-receipts-conf.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,126 +0,0 @@
-<!-- TMPL_INCLUDE NAME="print-receipts-conf-top.inc" -->
-<div id="main">
-	<h1>Receipt print options</h1>
-	
-	<ul>
-	 <li>Select a branch and set the receipt print options.</li>
-	</ul>
-	<br>
-
- 	<form name ="branchesForm" action="/cgi-bin/koha/members/receipts/print-receipts-conf.pl" method="post">
-		<Table style = "border-width:0px;">
-			<tr>
-		 		<td width = "80">Branches</td>
-				<td><!-- TMPL_VAR NAME="branches" --></td>
-			</tr>
-		</table>
-	</form>
-
-	<form method="POST" action= "/cgi-bin/koha/members/receipts/print-receipts-conf.pl" name="linesForm" onSubmit ="return checkReceiptOptions();">
-		<INPUT TYPE= "hidden" name="setLines" value="<!-- TMPL_VAR NAME="BRANCH_CODE" -->">
-		<TABLE class = "myTable">
-            <tr><th colspan = '3'>Lines & others options</th></tr>
-			<tr>
-                <td colspan = '3'>
-					<input type="radio" name="outputtype" value = "PLAIN" <!-- TMPL_IF name="asPLAIN" --> checked <!-- /TMPL_IF --> >  Print as text plain
-					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-					<input type="radio" name="outputtype" value = "PDF" <!-- TMPL_IF name="asPDF" --> checked <!-- /TMPL_IF --> >  Print as PDF file
-					<hr>
-				</td>
-			<tr>
-
-			<tr>
-				<td colspan = '3'><b style="margin-right:5px;">Line 1 - Legend:</b><input type="text" style = "width:100%" name="legend" value = "<!-- TMPL_VAR NAME="LEGEND" -->"></td>
-			</tr>
-			<tr>
-			    <td colspan = '3'><hr></td>
-			<tr>
-		  	<tr>
-			  <td colspan = '3'><b>Lines 2 - 4</b></td>
-			</tr>
-		  	<tr>
-			  <td  rowspan = "<!-- TMPL_VAR NAME="ROW_SPAN" -->">
-			  	<div  style = "margin-bottom: 5px;">Fields of borrowers table, accountlines table and special values.</div>
-			  	<!-- TMPL_VAR NAME="FIELD_LIST" -->
-			  </td>
-			</tr>
-      		<!-- TMPL_LOOP NAME="FIELD_LIST_LOOP" -->
-			<tr>
-				<td width = "110" align = "center">
-					<div>
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/rightarrow.png" onclick="<!-- TMPL_VAR NAME="IMG_ADD_CLICK" -->"
-									     border="0">
-					</div>
-				</td>
-				<td align = "left">
-					<div><!-- TMPL_VAR NAME="LINE_NUM" --></div>
-					<!-- TMPL_VAR NAME="LINE_VALUE" -->
-				</td>
-			</tr>
-			<!-- /TMPL_LOOP -->
-			<tr>
-                <td colspan = '3'>
-					<hr>
-				</td>
-			</tr>
-           
-            <tr>
-                <td colspan = '2'>
-                	<b>Page size:</b>
-                	<br>
-                    <div>
-                    Predefined sizes
-     				<select name="pageType" style="width:200px" size="1">
-						<!-- TMPL_IF name="A4" -->
-							<option value="A4" selected>A4</option>
-				        <!-- TMPL_ELSE -->
-							<option value="A4">A4</option>
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF name="Letter" -->
-							<option value="Letter" selected>Letter</option>
-				        <!-- TMPL_ELSE -->
-							<option value="Letter">Letter</option>
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF name="Legal" -->
-							<option value="Legal" selected>Legal</option>
-				        <!-- TMPL_ELSE -->
-							<option value="Legal">Legal</option>
-						<!-- /TMPL_IF -->
-		            </select>
-		            </div>
-		            <br>
-     				<div><!-- TMPL_VAR NAME="CUSTOM_PAGE_CHECK" -->&nbsp;&nbsp;&nbsp;
-     				Width:&nbsp;<!-- TMPL_VAR NAME="CUSTOM_PAGE_WIDTH" --> &nbsp;mm&nbsp;&nbsp;Height:&nbsp;<!-- TMPL_VAR NAME="CUSTOM_PAGE_HEIGHT" -->&nbsp;mm</div>
-
-				</td>
-				<td valign = "top">
-				    <b>Currency:</b>
-				    <br>
-				    <div>
-				    <!-- TMPL_VAR NAME="CURRENCIES" -->
-				    </div>
-				</td>
-            </tr>
-			<tr>
-  				<td  colspan= '3'>
-  				    <hr>
-					<input type="submit" value="Save" class="button" style = "width:100px">
-				</td>
-  			</tr>
-		</table>		
-	</form>
-	
-	<form name ="logoForm" action="/cgi-bin/koha/members/receipts/print-receipts-conf.pl" method="post" enctype="multipart/form-data" onSubmit="return checkFileExt(document.logoForm.logo.value);">
-		<input type="hidden" name="uploadLogo" value="<!-- TMPL_VAR NAME="BRANCH_CODE" -->">
-		<table style = "width:100%">
-			<tr><th colspan = '3'>Logo</th></tr>
-			<tr>
-				<td align = "center" width = "50" style= "padding:5px;"><img width = "100%" src="<!-- TMPL_VAR NAME="LOGO" -->" border="1"></td>
-			    <td align = "left">(Only for PDF printing) <input type= "file" name="logo" style = "width:100%"></td>
-				<td width = "110"><input type = "submit" style = "width:100px" value="Upload logo" class="button"></td>
-			</tr>
-		</table>
-	</form>
-
-</div>
-<!-- TMPL_INCLUDE NAME="print-receipts-conf-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/members/receipts/receipt-plain.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/receipts/receipt-plain.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/receipts/receipt-plain.tmpl
--- htdocs/intranet-tmpl/default/en/members/receipts/receipt-plain.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-	<head>
-		<title>Receipt</title>
-
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		
-		<style>
-		    h6 {margin-top: 2px;margin-bottom:2px; font-weight: normal}
-		</style>
-		
-	</head>
-	<body style="padding:10px;font-family:arial,helvetica" onload="window.print()">
-        <h5>-----------------------------</h5>
-        <h6><!-- TMPL_VAR name="LibraryName" --></h6>
-		<h6><!-- TMPL_VAR name="today" --></h6>
-		<h6><!-- TMPL_VAR name="legend" --></h6>
-		<br>
-	    <h6><!-- TMPL_VAR name="line1" --></h6>
-        <h6><!-- TMPL_VAR name="line2" --></h6>
-        <h6><!-- TMPL_VAR name="line3" --></h6>
-        <br>
-	    <h6>Signed: _______________</h6>
-		<h5>------------------------------</h5>
-	</body>
-</html>

Index: htdocs/intranet-tmpl/default/en/members/receipts/receipt-rich.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/members/receipts/receipt-rich.tmpl
diff -N htdocs/intranet-tmpl/default/en/members/receipts/receipt-rich.tmpl
--- htdocs/intranet-tmpl/default/en/members/receipts/receipt-rich.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-	<head>
-		<title>Receipt</title>
-
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		
-		<style>
-		    h5, h4 {margin-top: 2px;margin-bottom:2px;}
-		    h6 {margin-top: 2px;margin-bottom:2px; font-weight: normal}
-		</style>
-		
-	</head>
-	<body style="padding:10px;font-family:arial,helvetica" onload="window.print()">
-        <hr>
-        <table>
-            <tr>
-                <td valing="middle">
-                    <img style="float:left;margin-right:10px;width:50px;height:50px" src="<!-- TMPL_VAR name="image_logo" -->"
-				    <h4><!-- TMPL_VAR name="LibraryName" --></h4>
-				</td>
-            </tr>
-			<tr>
-			    <td><h5> <!-- TMPL_VAR name="legend" --> - <!-- TMPL_VAR name="today" --></h5></td>
-			</tr>
-			<tr>
-			    <td style="padding-left:15px">
-			        <h6><!-- TMPL_VAR name="line1" --></h6>
-		            <h6><!-- TMPL_VAR name="line2" --></h6>
-		            <h6><!-- TMPL_VAR name="line3" --></h6>
-                </td>
-            </tr>
-	        <tr>
-	            <td align="right">
-					<br>
-	                <h6>_________________</h6>
-	            </td>
-	        </tr>
-        
-        </table>
-        <hr>
-        
-	</body>
-</html>

Index: htdocs/intranet-tmpl/default/en/reports/accounts.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/accounts.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/accounts.tmpl
--- htdocs/intranet-tmpl/default/en/reports/accounts.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,120 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1 class="reports">Library Accounts</h1>
-
-
-	
-	<form action="accounts.pl"  method="post">
-	
-	<table style="border:0">
-	   
-	        <td>
-	            From:
-	        </td>
-			<td>
-			   	
-                <input type="text" readonly size="10" id="from" name="from" value="<!-- TMPL_VAR NAME="from" -->">
-				<img src="<!-- TMPL_VAR NAME="themelang" -->/includes/calendar/cal.gif" hspace="0" vspace="0" border="0" id="openCalendarFrom" style="cursor:pointer" valign="top">
-                <script type="text/javascript">
-                    function validate1(date) {
-						var day = date.getDate();
-						var month = date.getMonth() + 1;
-						var year = date.getFullYear();
-						var weekDay = date.getDay();
-						var dayMonth = month + '-' + day;
-						var dateString = year + '-' + month + '-' + day;
-						var dateTo = document.getElementById('to').value.split("-");
-						var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
-						if (date > limitDate) {
-							return true;
-						} else {
-							return false;
-						}
-					}
-
-					Calendar.setup(
-						{
-							inputField : "from",
-							ifFormat : "%Y-%m-%d",
-							button : "openCalendarFrom",
-							disableFunc : validate1,
-							dateStatusFunc : validate1
-						}
-					);
-				</script>
-
-			</td>
-			<td>
-	            To:
-	        </td>
-			<td>
-                <input type="text" readonly size="10" id="to" name="to" value="<!-- TMPL_VAR NAME="to" -->">
-				<img src="<!-- TMPL_VAR NAME="themelang" -->/includes/calendar/cal.gif"  hspace="0" vspace="0" border="0" id="openCalendarTo" style="cursor:pointer" valign="top">
-                <script type="text/javascript">
-                   function validate2(date) {
-						var day = date.getDate();
-						var month = date.getMonth() + 1;
-						var year = date.getFullYear();
-						var weekDay = date.getDay();
-						var dayMonth = month + '-' + day;
-						var dateString = year + '-' + month + '-' + day;
-						var dateFrom = document.getElementById('from').value.split("-");
-						var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
-						if (limitDate > date) {
-						    return true;
-						} else {
-							return false;
-						}
-					}
-
-					Calendar.setup(
-						{
-							inputField : "to",
-							ifFormat : "%Y-%m-%d",
-							button : "openCalendarTo",
-							disableFunc : validate2,
-							dateStatusFunc : validate2
-						}
-					);
-				</script>
-
-			</td>
-			
-
-		</tr>
-	</table>
-		<br>
-	<table>
-			<tr>
-				<th colspan="3" class="reports">Output</th>
-			</tr>
-			<tr>
-				<td><input type="radio" checked name="output" value="screen" > Browser screen</td>
-				<td>
-					<input type="radio" name="output" value="file"> File
-				</td>
-				<td>
-					<br>
-					<input type="text" name="basename" value="report">
-					<!-- TMPL_VAR NAME="CGIextChoice" -->
-					<!-- TMPL_VAR NAME="CGIsepChoice" -->
-					<br>
-					<h6 id="small">(Bu fonksiyonu henuz yazmadim!)Give the filename which you want to export the report.</h6>
-				 </td>
-			</tr>
-			<tr>
-				<td colspan="3" align="right">
-					<input TYPE="submit" value="Query" class="button reports">
-					<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">
-					<input type="hidden" name="do_it" value="1">
-				</td>
-			</tr>
-		</table>
-		
-	</form>
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/reports/acquisitions_stats.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/acquisitions_stats.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/acquisitions_stats.tmpl
--- htdocs/intranet-tmpl/default/en/reports/acquisitions_stats.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,269 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main" >
-
-<!-- TMPL_IF NAME="do_it" -->
-	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1>Koha : Acquisitions statistics </h1>
-		<!-- TMPL_IF NAME="loopfilter"-->
-			<p>Filtered on</p>
-			<!-- TMPL_LOOP NAME="loopfilter" -->
-					<p><!-- TMPL_IF NAME="err" --> <span class="error"> <b><!--/TMPL_IF --><!-- TMPL_VAR NAME="crit"--> =<!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" --> </span> </b><!--/TMPL_IF --></p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_IF -->
-		<br />
-		<table>
-			<tr >
-				<th><!-- TMPL_VAR name="line" --> / <!-- TMPL_VAR name="column" --></th>
-				<!-- TMPL_LOOP NAME="loopcol" -->
-					<th><!-- TMPL_VAR NAME="coltitle" --></th>
-				<!-- /TMPL_LOOP -->
-				<th>TOTAL</th>
-			</tr>
-				<!-- TMPL_LOOP NAME="looprow" -->
-					<tr>
-						<!-- TMPL_IF NAME="highlight" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-						<!-- TMPL_VAR NAME="rowtitle" --></td>
-						<!-- TMPL_LOOP NAME="loopcell" -->
-							<!-- TMPL_IF NAME="highlight" --><td class="numberhighlight"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
-								<!-- TMPL_IF Name="value" --><!-- TMPL_VAR NAME="value" -->
-								<!-- TMPL_ELSE--> &nbsp;
-								<!-- /TMPL_IF -->
-							</td>
-						<!-- /TMPL_LOOP -->
-						<!-- TMPL_IF NAME="highlight" --><td class="numberhighlight"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
-							<!-- TMPL_VAR NAME="totalrow" -->
-						</td>
-					</tr>
-				<!-- /TMPL_LOOP  -->
-				<tr >
-					<th>TOTAL</th>
-					<!-- TMPL_LOOP NAME="loopfooter" -->
-						<th>
-							<!-- TMPL_VAR NAME="totalcol" -->
-						</th>
-					<!-- /TMPL_LOOP -->
-					<th><!-- TMPL_VAR NAME="total" --></th>
-				</tr>
-		</table>
-	<!-- /TMPL_LOOP -->
-<!-- TMPL_ELSE -->
-	<h1>Acquisitions Statistics</h1>
-	<form method="post">
-	<div class="data"><table>
-		<tbody>
-			<tr>
-				<th>Display Order Date As:</th>
-				<td><label for="Line">Row:</label> <input type="radio" name="Line" id="Line" value="aqbasket.closedate" /> <label for="Column">Column:</label> <input type="radio" name="Column" value="aqbasket.closedate" /></td>
-			</tr>
-			<tr>
-			<th>Limit by Date: </th>
-			<td><label for="from1">From: </label><input type="text"  size="10" id="from1" name="Filter" />
-							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
-								<script language="JavaScript" type="text/javascript">
-									function validate1(date) {
-										var day = date.getDate();
-										var month = date.getMonth() + 1;
-										var year = date.getFullYear();
-										var weekDay = date.getDay();
-										var dayMonth = month + '-' + day;
-										var dateString = year + '-' + month + '-' + day;
-										var dateTo = document.getElementById('to').value.split("-");
-										var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
-										if (date > limitDate) {
-											return true;
-										} else {
-											return false;
-										}
-									}
-					
-									Calendar.setup(
-										{
-											inputField : "from",
-											ifFormat : "%Y-%m-%d",
-											button : "openCalendarFrom",
-											disableFunc : validate1,
-											dateStatusFunc : validate1
-										}
-									);
-								</script>
-					<label for="to1">To:</label> <input  size="10" id="to1" name="Filter" value="" type="text" />
-						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" >
-							<script type="text/javascript">
-								function validate2(date) {
-									var day = date.getDate();
-									var month = date.getMonth() + 1;
-									var year = date.getFullYear();
-									var weekDay = date.getDay();
-									var dayMonth = month + '-' + day;
-									var dateString = year + '-' + month + '-' + day;
-									var dateFrom = document.getElementById('from').value.split("-");
-									var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
-									if (limitDate > date) {
-										return true;
-									} else {
-										return false;
-									}
-								}
-		
-								Calendar.setup(
-									{
-										inputField : "to",
-										ifFormat : "%Y-%m-%d",
-										button : "openCalendarTo",
-										disableFunc : validate2,
-										dateStatusFunc : validate2
-									}
-								);
-							</script>
-				</td>
-			</tr>
-			<tr> 
-				<th>Group by: </th>
-				<td><select name="PlacedOnDisplay">
-					<option value="">None</option>
-					<option value ="1">Day of week</option>
-					<option value ="2">Month</option>
-					<option value ="3">Year</option>
-					</select>
-				</td>
-			</tr></table></div>
-			
-			<div class="data">
-			<table>
-			<tr>
-				<th>Display Received Date As:</th>
-				<td><label for="Line2">Row: </label><input type="radio" name="Line" id="Line2" value="aqorderdelivery.deliverydate" /> <label for="Column2">Column: </label><input type="radio" name="Column" id="Column2" value="aqorderdelivery.deliverydate" /></td>
-			</tr>
-			<tr>
-			<th>Limit by Date: </th>
-				<td><label for="fromRO">From:</label> <input type="text"  size="10" id="fromRO" name="Filter" />
-							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" id="openCalendarFromRO" style="cursor: pointer;" />
-								<script language="JavaScript" type="text/javascript">
-									function validate1(date) {
-										var day = date.getDate();
-										var month = date.getMonth() + 1;
-										var year = date.getFullYear();
-										var weekDay = date.getDay();
-										var dayMonth = month + '-' + day;
-										var dateString = year + '-' + month + '-' + day;
-										var dateTo = document.getElementById('toRO').value.split("-");
-										var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
-										if (date > limitDate) {
-											return true;
-										} else {
-											return false;
-										}
-									}
-					
-									Calendar.setup(
-										{
-											inputField : "fromRO",
-											ifFormat : "%Y-%m-%d",
-											button : "openCalendarFromRO",
-											disableFunc : validate1,
-											dateStatusFunc : validate1
-										}
-									);
-								</script>
-					<label for="toRO">To: </label><input type="text"  size="10" id="toRO" name="Filter" value="" />
-						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarToRO" style="cursor: pointer;" border="0" />
-							<script language="JavaScript" type="text/javascript">
-								function validate2(date) {
-									var day = date.getDate();
-									var month = date.getMonth() + 1;
-									var year = date.getFullYear();
-									var weekDay = date.getDay();
-									var dayMonth = month + '-' + day;
-									var dateString = year + '-' + month + '-' + day;
-									var dateFrom = document.getElementById('fromRO').value.split("-");
-									var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
-									if (limitDate > date) {
-										return true;
-									} else {
-										return false;
-									}
-								}
-		
-								Calendar.setup(
-									{
-										inputField : "toRO",
-										ifFormat : "%Y-%m-%d",
-										button : "openCalendarToRO",
-										disableFunc : validate2,
-										dateStatusFunc : validate2
-									}
-								);
-							</script>
-				</td>
-			</tr>
-			<tr> 
-				<th>Group by: </th>
-				<td><select name="ReceivedOnDisplay">
-					<option value="">None</option>
-					<option value ="1">Day of week</option>
-					<option value ="2">Month</option>
-					<option value ="3">Year</option>
-					</select>
-				</td>
-			</tr></table>
-			
-			<table>
-			<tr>
-				<th>Display Book Seller As:</th>
-				<td><label for="Line3">Row</label><input type="radio" name="Line" id="Line3" value="aqbooksellers.name" /> <label for="Column3">Column</label><input type="radio" name="Column" id="Column3" value="aqbooksellers.name" /></td>
-			</tr>
-			<tr><th><label for="Filter">Limit by Book Seller:</label></th>
-				<td><!-- TMPL_VAR NAME="CGIBookSeller" --></td>
-			</tr>
-			<tr>
-				<th>Display Budget As:</th>
-				<td><label for="Line4">Row</label><input type="radio" name="Line" id="Line4" value="aqorderbreakdown.bookfundid" /> <label for="Column4">Column</label><input type="radio" name="Column" id="Column4" value="aqorderbreakdown.bookfundid" /></td></tr>
-			<tr>
-				<th><label for="Filter">Limit by Budget:</label> </th>
-				<td><!-- TMPL_VAR NAME="CGIBudget" --></td>
-			</tr>
-			<!-- TMPL_IF Name="hassort1" -->
-				<tr> 
-					<th>Sort 1:</th>
-					<td><input type="radio" name="Line" value="aqorders.sort1" /></td>
-					<td><input type="radio" name="Column" value="aqorders.sort1" /></td>
-					<td><!-- TMPL_VAR NAME="CGISort1" --> </td>
-				</tr>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF Name="hassort2" -->
-				<!-- TMPL_IF Name="HglghtSort2"--><tr> <!-- TMPL_ELSE --><tr><!--/TMPL_IF --> 
-					<th>Sort 2:</th>
-					<td><input type="radio" name="Line" value="aqorders.sort2" /></td>
-					<td><input type="radio" name="Column" value="aqorders.sort2" /></td>
-					<td><!-- TMPL_VAR NAME="CGISort2" --> </td>
-				</tr>
-			<!-- /TMPL_IF -->
-		</tbody>
-	</table>
-	<table>
-		<tr>
-			<th>Cell Value: </th><td><label for="Cellvalue1">Count items</label><input type="radio" name="Cellvalue" id="Cellvalue1" value="1" checked="checked" /> 
-			<label for="Cellvalue2"> Amount</label><input type="radio" name="Cellvalue" id="Cellvalue2" value="2" /></td></tr>
-	</table>
-	<table>
-	<caption>Output Options</caption>
-	<tr><td colspan="2"><label for="screen">To the Screen</label> <input type="radio" checked name="output" value="screen" id="screen" /></td></tr>
-	<tr><td colspan="2"><label for="file">To file a file</label><input type="radio" name="output" value="file" id="file"></td></tr>
-<tr><td>&nbsp;</td><td>...named:   <input type="text" name="basename" value="Export"></td></td></tr>
-<tr><td>&nbsp;</td><td>File Format: <!-- TMPL_VAR NAME="CGIextChoice" --></td></tr>
-<tr><td>&nbsp;</td><td>Delimiter: <!-- TMPL_VAR NAME="CGIsepChoice" --></td></tr>
-</table>
-		</div>
-	<p>
-	<input TYPE="submit" value="Generate Report" class="submit" />
-	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-	<input type="hidden" name="do_it" value="1" />
-	</form>
-
-<!-- /TMPL_IF -->
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/reports/bor_issues_top.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/bor_issues_top.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/bor_issues_top.tmpl
--- htdocs/intranet-tmpl/default/en/reports/bor_issues_top.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,244 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<div id="main" >
-
-<!-- TMPL_IF NAME="do_it" -->
-<script language="JavaScript" type="text/javascript">
-function Dopop(link) {
-	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
-}
-</script>
-	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1>Koha : Top <!-- TMPL_VAR NAME="limit"--> List borrowers for Issues </h1>
-		<!-- TMPL_IF NAME="loopfilter"-->
-			<p>Filtered on</p>
-			<!-- TMPL_LOOP NAME="loopfilter" -->
-					<p><!-- TMPL_IF NAME="err" --> <span class="error"> <b><!--/TMPL_IF --><strong><!-- TMPL_VAR NAME="crit"--> =</strong><!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" --> </span> </b><!--/TMPL_IF --></p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_IF NAME="loopfilter"-->
-		<br>
-		<table>
-			<tr>
-				<th>Rank/Borrowers</th>
-				<!-- TMPL_LOOP NAME="loopcol" -->
-					<th colspan="2"><!-- TMPL_VAR NAME="coltitle" --></th>
-				<!-- /TMPL_LOOP -->
-			</tr>
-			<tr >
-				<th>&nbsp;</th>
-				<!-- TMPL_LOOP NAME="loopcol" -->
-					<th>Borrower</th>
-					<th>Issues count</th>
-				<!-- /TMPL_LOOP -->
-			</tr>
-				<!-- TMPL_LOOP NAME="looprow" -->
-					<!-- TMPL_IF NAME="hilighted" --><tr class="highlight"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-						<td>
-						<!-- TMPL_VAR NAME="rowtitle" --></td>
-						<!-- TMPL_LOOP NAME="loopcell" -->
-						<td>
-								<!-- TMPL_IF NAME="reference" --><a href="javascript:Dopop('cgi-bin/koha//members/moremember.pl?bornum=<!-- TMPL_VAR NAME="reference" -->')" ><!-- /TMPL_IF -->
-								<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
-								<!-- TMPL_IF NAME="reference" --></a><!-- /TMPL_IF -->
-							</td>
-							<td>
-								<!-- TMPL_IF NAME="count" --><!-- TMPL_VAR NAME="count" --><!-- /TMPL_IF -->
-							</td>
-						<!-- /TMPL_LOOP -->
-					</tr>
-				<!-- /TMPL_LOOP NAME="looprow" -->
-		</table>
-	<!-- /TMPL_LOOP -->
-<!-- TMPL_ELSE -->
-	<h1>Koha : Top List borrowers for Issues  </h1>
-	<form method="post">
-	
-	<div class="data"><table>
-		<thead>
-			<tr>
-			<th><label for="">Limit Number of Results:</label> </th><td><select name="Limit">
-						<option value ="5" checked="checked"> 5</option>
-						<option value ="10">10</option>
-						<option value ="15">15</option>
-						<option value ="20">20</option>
-	<!--					<option value ="25">25</option>
-						<option value ="40">40</option>
-						<option value ="50">50</option>
-						<option value ="100">100</option>-->
-					</select></td></tr>
-		<tr><th><label for="">Limit By:</label> </th><td>
-					<select name="Criteria">
-						<option value ="" checked="checked">None</option>
-						<option value ="issuingbranch">Branch</option>
-						<option value ="categorycode">Categorycode</option>
-						<option value ="itemtype">Itemtype</option>
-						<option value ="Day">Day</option>
-						<option value ="Week">Week</option>
-						<option value ="Month">Month</option>
-						<option value ="Year">Year</option>
-					</select>
-				</td>
-			</tr>
-			
-			<tr><th><label for="">Limit by Issue Date:</label> </th>
-				<td>From: <input type="text" readonly="readonly" size="10" id="from" name="Filter" >
-							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
-								<script language="JavaScript" type="text/javascript">
-									function validate1(date) {
-										var day = date.getDate();
-										var month = date.getMonth() + 1;
-										var year = date.getFullYear();
-										var weekDay = date.getDay();
-										var dayMonth = month + '-' + day;
-										var dateString = year + '-' + month + '-' + day;
-										var dateTo = document.getElementById('to').value.split("-");
-										var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
-										if (date > limitDate) {
-											return true;
-										} else {
-											return false;
-										}
-									}
-					
-									Calendar.setup(
-										{
-											inputField : "from",
-											ifFormat : "%Y-%m-%d",
-											button : "openCalendarFrom",
-											disableFunc : validate1,
-											dateStatusFunc : validate1
-										}
-									);
-								</script>
-					To: <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text">
-						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
-							<script type="text/javascript">
-								function validate2(date) {
-									var day = date.getDate();
-									var month = date.getMonth() + 1;
-									var year = date.getFullYear();
-									var weekDay = date.getDay();
-									var dayMonth = month + '-' + day;
-									var dateString = year + '-' + month + '-' + day;
-									var dateFrom = document.getElementById('from').value.split("-");
-									var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
-									if (limitDate > date) {
-										return true;
-									} else {
-										return false;
-									}
-								}
-		
-								Calendar.setup(
-									{
-										inputField : "to",
-										ifFormat : "%Y-%m-%d",
-										button : "openCalendarTo",
-										disableFunc : validate2,
-										dateStatusFunc : validate2
-									}
-								);
-							</script>
-				</td>
-			</tr>
-			<tr><th><label for="">Limit by Return Date: </label></th>
-				<td> From <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" >
-							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFromRO" style="cursor: pointer;" valign="top">
-								<script language="JavaScript" type="text/javascript">
-									function validate1(date) {
-										var day = date.getDate();
-										var month = date.getMonth() + 1;
-										var year = date.getFullYear();
-										var weekDay = date.getDay();
-										var dayMonth = month + '-' + day;
-										var dateString = year + '-' + month + '-' + day;
-										var dateTo = document.getElementById('toRO').value.split("-");
-										var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
-										if (date > limitDate) {
-											return true;
-										} else {
-											return false;
-										}
-									}
-					
-									Calendar.setup(
-										{
-											inputField : "fromRO",
-											ifFormat : "%Y-%m-%d",
-											button : "openCalendarFromRO",
-											disableFunc : validate1,
-											dateStatusFunc : validate1
-										}
-									);
-								</script>
-					To <input type="text" readonly="readonly" size="10" id="toRO" name="Filter" value="" >
-						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarToRO" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
-							<script type="text/javascript">
-								function validate2(date) {
-									var day = date.getDate();
-									var month = date.getMonth() + 1;
-									var year = date.getFullYear();
-									var weekDay = date.getDay();
-									var dayMonth = month + '-' + day;
-									var dateString = year + '-' + month + '-' + day;
-									var dateFrom = document.getElementById('fromRO').value.split("-");
-									var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
-									if (limitDate > date) {
-										return true;
-									} else {
-										return false;
-									}
-								}
-		
-								Calendar.setup(
-									{
-										inputField : "toRO",
-										ifFormat : "%Y-%m-%d",
-										button : "openCalendarToRO",
-										disableFunc : validate2,
-										dateStatusFunc : validate2
-									}
-								);
-							</script>
-				</td>
-			</tr>
-			<tr><th><label for="">Limit by Branch:</label> </th>
-				<td><input type="text" name="Filter" value="" /></td>
-			</tr>
-			<tr><th><label for="">Limit by Document Type:</label> </th>
-				<td><input type="text" name="Filter" value="" /></td>
-			</tr>
-			<tr><th><label for="">Limit by Borrower Category:</label> </th>
-				<td><input type="text" name="Filter" value="" /></td>
-			</tr>
-			<tr><th><label for="">Limit by Day:</label> </th>
-				<td><input type="text" name="Filter" value="" /></td>
-			</tr>
-			<tr><th><label for="">Limit by Month:</label> </th>
-				<td><input type="text" name="Filter" value="" /></td>
-			</tr>
-			<tr><th><label for=""><label for="">Limit by Year:</label></label> </th>
-				<td><input type="text" name="Filter" value="" /></td>
-			</tr>
-		</tbody>
-	</table>
-	
-<table>
-	<caption>Output Options</caption>
-	<tr><td colspan="2"><label for="screen">To the Screen</label> <input type="radio" checked name="output" value="screen" id="screen" /></td></tr>
-	<tr><td colspan="2"><label for="file">To file a file</label><input type="radio" name="output" value="file" id="file" /></td></tr>
-<tr><td>&nbsp;</td><td><label for="basename">...named:</label>   <input type="text" id="basename" name="basename" value="Export" /></td></td></tr>
-<tr><td>&nbsp;</td><td><label for="MIME">File Format:</label> <!-- TMPL_VAR NAME="CGIextChoice" --></td></tr>
-<tr><td>&nbsp;</td><td><label for="sep">Delimiter:</label> <!-- TMPL_VAR NAME="CGIsepChoice" --></td></tr>
-</table>
-		
-	<p>
-	<input type="submit" value="Generate Report" class="submit" />
-	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-	<input type="hidden" name="do_it" value="1" />
-	</form></p>
-	</div>
-<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/reports/borrowers-stats.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/borrowers-stats.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/borrowers-stats.tmpl
--- htdocs/intranet-tmpl/default/en/reports/borrowers-stats.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,136 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-
-<!-- TMPL_IF NAME="do_it" -->
-	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1>Koha : Borrowers statistics </h1>
-		<!-- TMPL_IF NAME="loopfilter"-->
-			<p>Filtered on</p>
-			<!-- TMPL_LOOP NAME="loopfilter" -->
-					<p><label> <!-- TMPL_VAR NAME="crit"--> = </label><!-- TMPL_VAR NAME="filter"--></p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_IF NAME="loopfilter"-->
-		<table>
-			<tr>
-				<th><!-- TMPL_VAR name="line" --> / <!-- TMPL_VAR name="column" --></th>
-				<!-- TMPL_LOOP NAME="loopcol" -->
-					<th><!-- TMPL_VAR NAME="coltitle" --></th>
-				<!-- /TMPL_LOOP -->
-				<th>TOTAL</th>
-			</tr>
-				<!-- TMPL_LOOP NAME="looprow" -->
-					<tr>
-						<!-- TMPL_IF NAME="highlighted" --><td class="highlighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-						<!-- TMPL_VAR NAME="rowtitle" --></td>
-						<!-- TMPL_LOOP NAME="loopcell" -->
-							<!-- TMPL_IF NAME="highlighted" --><td class="numberhighlighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
-								<!-- TMPL_VAR NAME="value" -->
-							</td>
-						<!-- /TMPL_LOOP -->
-						<!-- TMPL_IF NAME="highlighted" --><td class="numberhighlighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
-							<!-- TMPL_VAR NAME="totalrow" -->
-						</td>
-					</tr>
-				<!-- /TMPL_LOOP NAME="looprow" -->
-				<tr>
-					<th>TOTAL</th>
-					<!-- TMPL_LOOP NAME="loopfooter" -->
-						<th>
-							<!-- TMPL_VAR NAME="totalcol" -->
-						</th>
-					<!-- /TMPL_LOOP -->
-					<th><!-- TMPL_VAR NAME="total" --></th>
-				</tr>
-		</table>
-	<!-- /TMPL_LOOP -->
-<!-- TMPL_ELSE -->
-	<h1>Borrowers statistics</h1>
-	<form method="post" action="borrowers_stats.pl">
-	<table>
-		<thead>
-			<tr>
-			<th>Title</th>
-			<th>Row</th>
-			<th>Column</th>
-			<th>Filter</th>
-			</tr>
-		</thead>
-		<tbody>
-			<tr class="highlighted">
-			<td>Borrower category</td>
-			<td><input type="radio" name="Line" value="categorycode" /></td>
-			<td><input type="radio" name="Column" value="categorycode" /></td>
-			<td ><!-- TMPL_VAR NAME="CGICatCode" --></td>
-			</tr>
-			<tr>
-			<td>Borrower status</td>
-			<td></td>
-			<td></td>
-			<td ><select name="status"><option value=""> </option><option value="debarred">debarred</option><option value="gonenoadress">gone no adress</option><option value="lost">lost</option></td>
-			</tr>
-			<tr class="highlighted">
-			<td>
-			Zip Code
-			</td>
-			<td><input type="radio" name="Line" value="zipcode" /></td>
-			<td><input type="radio" name="Column" value="zipcode" /></td>
-			<td><input type="text"  name="Filter" /></td>
-			</tr>
-			<tr class="highlighted">
-			<td>&nbsp;</td>
-			<td colspan="2"><select name="digits">
-			<option value=""> </option>
-			<option value ="1">1</option>
-			<option value ="2">2</option>
-			<option value ="3">3</option>
-			<option value ="4">4</option>
-			<option value ="5">5</option>
-			<option value ="6">6</option>
-			<option value ="7">7</option>
-			<option value ="8">8</option>
-			<option value ="9">9</option>
-			<option value ="10">10</option>
-			</select>
-			digits 
-			</td>
-			<td>&nbsp;</td>
-			</tr>
-			<!-- TMPL_IF name="hassort1" -->
-			<tr>
-			<td>Sort1</td>
-			<td><input type="radio" name="Line" value="sort1" /></td>
-			<td><input type="radio" name="Column" value="sort1" /></td>
-			<td ><!-- TMPL_VAR NAME="CGISort1" --></td>
-			</tr>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="hassort2" -->			
-			<tr class="highlighted" >
-			<td>Sort2</td>
-			<td><input type="radio" name="Line" value="sort2" /></td>
-			<td><input type="radio" name="Column" value="sort2" /></td>
-			<td><!-- TMPL_VAR NAME="CGISort2" --></td>
-			</tr>
-			<!-- /TMPL_IF -->
-		</tbody>
-	</table>
-	
-	<div class="details">
-		<h3> Output </h3>
-		<input type="radio" checked="checked" name="output" value="screen" /> To screen into the browser
-		<br />
-		<input type="radio" name="output" value="file" /> To file <input type="text" name="basename" value="Export"   /> into an application  
-		<!-- TMPL_VAR NAME="CGIextChoice" -->
-		<!-- TMPL_VAR NAME="CGIsepChoice" -->
-	</p>
-	</div>
-	<p>
-	<input type="submit" value="OK" class="submit" />
-	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-	<input type="hidden" name="do_it" value="1" />
-	</form>
-<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/reports/borrowers_out.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/borrowers_out.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/borrowers_out.tmpl
--- htdocs/intranet-tmpl/default/en/reports/borrowers_out.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,115 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-
-<!-- TMPL_IF NAME="do_it" -->
-	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1>Patrons with No Issues </h1>
-		<!-- TMPL_IF NAME="loopfilter"-->
-			<p>Filtered on</p>
-			<!-- TMPL_LOOP NAME="loopfilter" -->
-					<p><!-- TMPL_IF NAME="err" --> <span class="error"> <b><!--/TMPL_IF --><strong><!-- TMPL_VAR NAME="crit"--> =</strong><!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" --> </font> </b><!--/TMPL_IF --></p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_IF NAME="loopfilter"-->
-		
-		<table>
-			<tr>
-				<th>Num/Borrowers</th>
-				<!-- TMPL_LOOP NAME="loopcol" -->
-					<th><!-- TMPL_VAR NAME="coltitle" --></th>
-				<!-- /TMPL_LOOP -->
-			</tr>
-				<!-- TMPL_LOOP NAME="looprow" -->
-					<tr>
-						<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-						<!-- TMPL_VAR NAME="rowtitle" --></td>
-						<!-- TMPL_LOOP NAME="loopcell" -->
-							<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td ><!-- /TMPL_IF -->
-								<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
-							</td>
-						<!-- /TMPL_LOOP -->
-					</tr>
-				<!-- /TMPL_LOOP NAME="looprow" -->
-		</table>
-	<!-- /TMPL_LOOP -->
-<!-- TMPL_ELSE -->
-	<h1>Koha : Borrowers with no Issues  </h1>
-	<form method="post">
-	
-	<table>
-		<thead>
-			<tr>
-			<th>Limit to </th>
-			<th>By </th>
-			<th colspan="2">Filters</th>
-			</tr>
-		</thead>
-		<tbody>
-			<tr>
-				<td>
-					<select name="Limit">
-						<option value ="" checked>None</option>
-						<option value ="5"> 5</option>
-						<option value ="10">10</option>
-						<option value ="15">15</option>
-						<option value ="20">20</option>
-						<option value ="25">25</option>
-						<option value ="40">40</option>
-						<option value ="50">50</option>
-						<option value ="100">100</option>
-					</select>
-				</td>
-				<td>
-					<select name="Criteria">
-						<option value ="" checked>None</option>
-						<option value ="categorycode">Categorycode</option>
-						<option value ="itemtype">Itemtype</option>
-					</select>
-				</td>
-				<td colspan="2">&nbsp;</td>
-			</tr>
-			<tr>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td><label for="borrowercategory">Borrower Category</label></td>
-				<td><input type="text" name="Filter" id="borrowercategory" value="" /></td>
-			</tr>
-						<tr class="hilighted">
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td><label for="issuessince">Without issues since:</label> </td>
-				<td><input size="10" id="to" id="issuessince" name="Filter" value="" type="text" />
-						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" />
-							<script type="text/javascript">
-								Calendar.setup(
-									{
-										inputField : "to",
-										ifFormat : "%Y-%m-%d",
-										button : "openCalendarTo",
-									}
-								);
-							</script></td>
-			</tr>
-		</tbody>
-	</table>
-	
-<table>
-	<caption>Output Options</caption>
-	<tr><td colspan="2"><label for="screen">To the Screen</label> <input type="radio" checked name="output" value="screen" id="screen" /></td></tr>
-	<tr><td colspan="2"><label for="file">To file a file</label><input type="radio" name="output" value="file" id="file" /></td></tr>
-<tr><td>&nbsp;</td><td><label for="basename">...named:</label>   <input type="text" id="basename" name="basename" value="Export" /></td></td></tr>
-<tr><td>&nbsp;</td><td><label for="MIME">File Format:</label> <!-- TMPL_VAR NAME="CGIextChoice" --></td></tr>
-<tr><td>&nbsp;</td><td><label for="sep">Delimiter:</label> <!-- TMPL_VAR NAME="CGIsepChoice" --></td></tr>
-</table>
-		
-	<p>
-	<input type="submit" value="Generate Report" class="submit" />
-	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-	<input type="hidden" name="do_it" value="1" />
-	</form></p>
-	</div>
-<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/reports/borrowers_stats.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/borrowers_stats.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/borrowers_stats.tmpl
--- htdocs/intranet-tmpl/default/en/reports/borrowers_stats.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,108 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main" >
-
-<!-- TMPL_IF NAME="do_it" -->
-	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1>Koha : Borrowers statistics </h1>
-		<!-- TMPL_IF NAME="loopfilter"-->
-			<p>Filtered on</p>
-			<!-- TMPL_LOOP NAME="loopfilter" -->
-					<p><label> <!-- TMPL_VAR NAME="crit"--> =</label><!-- TMPL_VAR NAME="filter"--></p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_IF-->
-		<table>
-			<tr >
-				<th><!-- TMPL_VAR name="line" --> / <!-- TMPL_VAR name="column" --></th>
-				<!-- TMPL_LOOP NAME="loopcol" -->
-					<th><!-- TMPL_VAR NAME="coltitle" --></th>
-				<!-- /TMPL_LOOP -->
-				<th>TOTAL</th>
-			</tr>
-				<!-- TMPL_LOOP NAME="looprow" -->
-					<tr>
-						<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-						<!-- TMPL_VAR NAME="rowtitle" --></td>
-						<!-- TMPL_LOOP NAME="loopcell" -->
-							<!-- TMPL_IF NAME="hilighted" --><td class="numberhilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-								<!--TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" -->
-								<!--TMPL_ELSE-->
-									&nbsp;
-								<!--/TMPL_IF-->
-								</td>
-						<!-- /TMPL_LOOP -->
-						<!-- TMPL_IF NAME="hilighted" --><td class="numberhilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-							<!-- TMPL_VAR NAME="totalrow" -->
-						</td>
-					</tr>
-				<!-- /TMPL_LOOP -->
-				<tr >
-					<th>TOTAL</th>
-					<!-- TMPL_LOOP NAME="loopfooter" -->
-						<th>
-							<!-- TMPL_VAR NAME="totalcol" -->
-						</th>
-					<!-- /TMPL_LOOP -->
-					<th><!-- TMPL_VAR NAME="total" --></th>
-				</tr>
-		</table>
-	<!-- /TMPL_LOOP -->
-<!-- TMPL_ELSE -->
-	<h1 class = "reports">Borrowers statistics</h1>
-	<form method="post">
-<div class="data">
-	<table>
-		<tbody>
-			<tr>
-			<th>Display Patron Category As: </th><td><label for="">Line</label><input type="radio" name="Line" value="categorycode" checked="1" />  <label for="">Column</label><input type="radio" name="Column" value="categorycode" /></td></tr>
-			<tr><th><label for="Filter">Limit by Patron Category: </label></th><td><!-- TMPL_VAR NAME="CGICatCode" --></td></tr>
-			<tr><th><label for="">Limit by Patron Status: </label></th><td><select name="status"><option value=""> </option><option value="debarred">debarred</option><option value="gonenoadress">gone no adress</option><option value="lost">lost</option></td></tr>
-			<tr><th>Display Zip Code As: </th><td><label for="">Row</label><input type="radio" name="Line" value="zipcode" />  <label for="">Column</label><input type="radio" name="Column" value="zipcode" checked="1"/></td></tr>
-			<tr><th><label for="zipcode">Limit by Zip Code: </label></th><td><input type="text" size="10" id="zipcode" name="Filter" /> Limit to <select name="digits">
-			<option value=""> </option>
-			<option value ="1">1</option>
-			<option value ="2">2</option>
-			<option value ="3">3</option>
-			<option value ="4">4</option>
-			<option value ="5">5</option>
-			<option value ="6">6</option>
-			<option value ="7">7</option>
-			<option value ="8">8</option>
-			<option value ="9">9</option>
-			<option value ="10">10</option>
-			</select> digits</td></tr>
-			
-			<!-- TMPL_IF name="hassort1" -->
-				<tr>
-				<th>Display Sorting Field 1 As: </th><td><label for="">Row</label> <input type="radio" name="Line" value="sort1" /> <label for="">Column</label><input type="radio" name="Column" value="sort1" /></td></tr>
-				<tr>
-				<th>Limit by Sorting Field 1: </th><td><!-- TMPL_VAR NAME="CGISort1" --></td></tr>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="hassort2" -->
-				<tr>
-				<th>Display Sorting Field 2 As: </th><td><label for="">Row</label> <input type="radio" name="Line" value="sort2" /> <label for="">Column</label><input type="radio" name="Column" value="sort2" /></td></tr>
-				<tr>
-				<th>Limit by Sorting Field 1: </th><td><!-- TMPL_VAR NAME="CGISort1" --></td></tr>
-			<!-- /TMPL_IF -->
-		</tbody>
-	</table>
-<table>
-	<caption>Output Options</caption>
-	<tr><td colspan="2"><label for="screen">To the Screen</label> <input type="radio" checked name="output" value="screen" id="screen" /></td></tr>
-	<tr><td colspan="2"><label for="file">To file a file</label><input type="radio" name="output" value="file" id="file"></td></tr>
-<tr><td>&nbsp;</td><td>...named:   <input type="text" name="basename" value="Export"></td></td></tr>
-<tr><td>&nbsp;</td><td>File Format: <!-- TMPL_VAR NAME="CGIextChoice" --></td></tr>
-<tr><td>&nbsp;</td><td>Delimiter: <!-- TMPL_VAR NAME="CGIsepChoice" --></td></tr>
-</table>
-	</div>
-	<p>
-	<input TYPE="submit" value="Generate Report" class="submit" />
-	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-	<input type="hidden" name="do_it" value="1" />
-	</form>
-<!-- /TMPL_IF -->
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/reports/cat_issues_top.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/cat_issues_top.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/cat_issues_top.tmpl
--- htdocs/intranet-tmpl/default/en/reports/cat_issues_top.tmpl	10 Mar 2007 01:54:29 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,245 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-
-<!-- TMPL_IF NAME="do_it" -->
-<script language="JavaScript" type="text/javascript">
-function Dopop(link) {
-	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
-}
-</script>
-	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1>Koha : Top <!-- TMPL_VAR NAME="limit"--> List On Catalogue Issues </h1>
-		<!-- TMPL_IF NAME="loopfilter"-->
-			<p>Filtered on</p>
-			<!-- TMPL_LOOP NAME="loopfilter" -->
-					<p><!-- TMPL_IF NAME="err" --> <span class="error"> <b><!--/TMPL_IF --><strong><!-- TMPL_VAR NAME="crit"--> =</strong><!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" --> </span> </b><!--/TMPL_IF --></p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_IF -->
-		
-		<table>
-			<tr>
-				<th>Rank/Biblioitemnumbers</th>
-				<!-- TMPL_LOOP NAME="loopcol" -->
-					<th colspan="2"><!-- TMPL_VAR NAME="coltitle" --></th>
-				<!-- /TMPL_LOOP -->
-			</tr>
-			<tr>
-				<th>&nbsp;</th>
-				<!-- TMPL_LOOP NAME="loopcol" -->
-					<th>Item</th>
-					<th>Issues count</th>
-				<!-- /TMPL_LOOP -->
-			</tr>
-				<!-- TMPL_LOOP NAME="looprow" -->
-					<!-- TMPL_IF NAME="hilighted" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-						<td>
-						<!-- TMPL_VAR NAME="rowtitle" --></td>
-						<!-- TMPL_LOOP NAME="loopcell" -->
-							<td>
-								<!-- TMPL_IF NAME="reference" --><a href="javascript:Dopop('../MARCdetail.pl?bib=<!-- TMPL_VAR NAME="reference" -->')" ><!-- /TMPL_IF -->
-								<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- TMPL_ELSE -->Item<!-- /TMPL_IF -->
-								<!-- TMPL_IF NAME="reference" --></a><!-- /TMPL_IF -->
-							</td>
-							<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td ><!-- /TMPL_IF -->
-								<!-- TMPL_IF NAME="count" --><!-- TMPL_VAR NAME="count" --><!-- /TMPL_IF -->
-							</td>
-						<!-- /TMPL_LOOP -->
-					</tr>
-				<!-- /TMPL_LOOP -->
-		</table>
-	<!-- /TMPL_LOOP -->
-<!-- TMPL_ELSE -->
-	<h1>Top List On Catalogue Issues  </h1>
-	<form method="post">
-	<div class="data">
-	<table>
-		<thead>
-			<tr>
-			<th><label for="Limit">Limit Number of Results: </label></th><td><select name="Limit" id="Limit">
-						<option value ="5" checked> 5</option>
-						<option value ="10">10</option>
-						<option value ="15">15</option>
-						<option value ="20">20</option>
-						<option value ="25">25</option>
-						<option value ="40">40</option>
-						<option value ="50">50</option>
-						<option value ="100">100</option>
-					</select></td>
-			</tr>
-			<tr><th><label for="Criteria">Limit By:</label> </th><td><select name="Criteria" id="Criteria">
-						<option value ="" checked>None</option>
-						<option value ="issuingbranch">Branch</option>
-						<option value ="categorycode">Categorycode</option>
-						<option value ="itemtype">Itemtype</option>
-						<option value ="Day">Day</option>
-						<option value ="Week">Week</option>
-						<option value ="Month">Month</option>
-						<option value ="Year">Year</option>
-					</select></td></tr>
-		</thead>
-		<tbody>
-			<tr><th>Issue date</th>
-				<td> From <input type="text" readonly="readonly" size="10" id="from" name="Filter" >
-							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
-								<script language="JavaScript" type="text/javascript">
-									function validate1(date) {
-										var day = date.getDate();
-										var month = date.getMonth() + 1;
-										var year = date.getFullYear();
-										var weekDay = date.getDay();
-										var dayMonth = month + '-' + day;
-										var dateString = year + '-' + month + '-' + day;
-										var dateTo = document.getElementById('to').value.split("-");
-										var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
-										if (date > limitDate) {
-											return true;
-										} else {
-											return false;
-										}
-									}
-					
-									Calendar.setup(
-										{
-											inputField : "from",
-											ifFormat : "%Y-%m-%d",
-											button : "openCalendarFrom",
-											disableFunc : validate1,
-											dateStatusFunc : validate1
-										}
-									);
-								</script>
-					To <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text">
-						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
-							<script type="text/javascript">
-								function validate2(date) {
-									var day = date.getDate();
-									var month = date.getMonth() + 1;
-									var year = date.getFullYear();
-									var weekDay = date.getDay();
-									var dayMonth = month + '-' + day;
-									var dateString = year + '-' + month + '-' + day;
-									var dateFrom = document.getElementById('from').value.split("-");
-									var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
-									if (limitDate > date) {
-										return true;
-									} else {
-										return false;
-									}
-								}
-		
-								Calendar.setup(
-									{
-										inputField : "to",
-										ifFormat : "%Y-%m-%d",
-										button : "openCalendarTo",
-										disableFunc : validate2,
-										dateStatusFunc : validate2
-									}
-								);
-							</script>
-				</td>
-			</tr>
-			<tr>
-				<th>Returns</th>
-				<td> From <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" >
-							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFromRO" style="cursor: pointer;" valign="top">
-								<script language="JavaScript" type="text/javascript">
-									function validate1(date) {
-										var day = date.getDate();
-										var month = date.getMonth() + 1;
-										var year = date.getFullYear();
-										var weekDay = date.getDay();
-										var dayMonth = month + '-' + day;
-										var dateString = year + '-' + month + '-' + day;
-										var dateTo = document.getElementById('toRO').value.split("-");
-										var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
-										if (date > limitDate) {
-											return true;
-										} else {
-											return false;
-										}
-									}
-					
-									Calendar.setup(
-										{
-											inputField : "fromRO",
-											ifFormat : "%Y-%m-%d",
-											button : "openCalendarFromRO",
-											disableFunc : validate1,
-											dateStatusFunc : validate1
-										}
-									);
-								</script>
-					To <input type="text" readonly="readonly" size="10" id="toRO" name="Filter" value="" >
-						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarToRO" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
-							<script type="text/javascript">
-								function validate2(date) {
-									var day = date.getDate();
-									var month = date.getMonth() + 1;
-									var year = date.getFullYear();
-									var weekDay = date.getDay();
-									var dayMonth = month + '-' + day;
-									var dateString = year + '-' + month + '-' + day;
-									var dateFrom = document.getElementById('fromRO').value.split("-");
-									var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
-									if (limitDate > date) {
-										return true;
-									} else {
-										return false;
-									}
-								}
-		
-								Calendar.setup(
-									{
-										inputField : "toRO",
-										ifFormat : "%Y-%m-%d",
-										button : "openCalendarToRO",
-										disableFunc : validate2,
-										dateStatusFunc : validate2
-									}
-								);
-							</script>
-				</td>
-			</tr>
-			<tr><th><label for="branch">Branch</label></th>
-				<td><input type="text" name="Filter" id="branch" value=""></td>
-			</tr>
-			<tr><th><label for="doctype">Document Type</label></th>
-				<td><input type="text" name="Filter" id="doctype" value=""></td>
-			</tr>
-			<tr><th><label for="borcat">Borrower Category</label></th>
-				<td><input type="text" name="Filter" id="borcat" value=""></td>
-			</tr>
-			<tr><th><label for="day">Day</label></th>
-				<td><input type="text" name="Filter" id="day" value=""></td>
-			</tr>
-			<tr><th><label for="month">Month</label></th>
-				<td><input type="text" name="Filter" id="month" value=""></td>
-			</tr>
-			<tr><th><label for="year">Year</label></th>
-				<td><input type="text" name="Filter" id="year" value=""></td>
-			</tr>
-		</tbody>
-	</table>
-	
-<table>
-	<caption>Output Options</caption>
-	<tr><td colspan="2"><label for="screen">To the Screen</label> <input type="radio" checked name="output" value="screen" id="screen" /></td></tr>
-	<tr><td colspan="2"><label for="file">To file a file</label><input type="radio" name="output" value="file" id="file" /></td></tr>
-<tr><td>&nbsp;</td><td><label for="basename">...named:</label>   <input type="text" id="basename" name="basename" value="Export" /></td></td></tr>
-<tr><td>&nbsp;</td><td><label for="MIME">File Format:</label> <!-- TMPL_VAR NAME="CGIextChoice" --></td></tr>
-<tr><td>&nbsp;</td><td><label for="sep">Delimiter:</label> <!-- TMPL_VAR NAME="CGIsepChoice" --></td></tr>
-</table>
-		
-	<p>
-	<input type="submit" value="Generate Report" class="submit" />
-	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-	<input type="hidden" name="do_it" value="1" />
-	</form></p>
-	</div>
-<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/reports/catalogue_out.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/catalogue_out.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/catalogue_out.tmpl
--- htdocs/intranet-tmpl/default/en/reports/catalogue_out.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,105 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-
-<!-- TMPL_IF NAME="do_it" -->
-	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1>Items with No Issues </h1>
-		<!-- TMPL_IF NAME="loopfilter"-->
-			<p>Filtered on</p>
-			<!-- TMPL_LOOP NAME="loopfilter" -->
-					<p><!-- TMPL_IF NAME="err" --> <span class="error"> <b><!--/TMPL_IF --><strong><!-- TMPL_VAR NAME="crit"--> =</strong><!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" --> </span> </b><!--/TMPL_IF --></p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_IF NAME="loopfilter"-->
-		
-		<table>
-			<tr>
-				<th>Num/Items</th>
-				<!-- TMPL_LOOP NAME="loopcol" -->
-					<th><!-- TMPL_VAR NAME="coltitle" --></th>
-				<!-- /TMPL_LOOP -->
-			</tr>
-				<!-- TMPL_LOOP NAME="looprow" -->
-					<tr>
-						<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-						<!-- TMPL_VAR NAME="rowtitle" --></td>
-						<!-- TMPL_LOOP NAME="loopcell" -->
-							<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td ><!-- /TMPL_IF -->
-								<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
-							</td>
-						<!-- /TMPL_LOOP -->
-					</tr>
-				<!-- /TMPL_LOOP NAME="looprow" -->
-		</table>
-	<!-- /TMPL_LOOP -->
-<!-- TMPL_ELSE -->
-	<h1>Koha : Items with no Issues </h1>
-	<form method="post">
-	
-	<table>
-		<thead>
-			<tr>
-			<th>Limit to </th>
-			<th>By </th>
-			<th colspan="2">Filters</th>
-			</tr>
-		</thead>
-		<tbody>
-			<tr>
-				<td>
-					<select name="Limit">
-						<option value ="" checked>None</option>
-						<option value ="5"> 5</option>
-						<option value ="10">10</option>
-						<option value ="15">15</option>
-						<option value ="20">20</option>
-						<option value ="25">25</option>
-						<option value ="40">40</option>
-						<option value ="50">50</option>
-						<option value ="100">100</option>
-					</select>
-				</td>
-				<td>
-					<select name="Criteria">
-						<option value ="" checked>None</option>
-						<option value ="homebranch">Branch</option>
-						<option value ="itemtype">Itemtype</option>
-					</select>
-				</td>
-				<td colspan="2">&nbsp;</td>
-			</tr>
-			<tr>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td>Branch</td>
-				<td><input type="text" name="Filter" value=""></td>
-			</tr>
-			<tr>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td>Document Type</td>
-				<td><input type="text" name="Filter" value=""></td>
-			</tr>
-		</tbody>
-	</table>
-<div class="data">
-<table>
-	<caption>Output Options</caption>
-	<tr><td colspan="2"><label for="screen">To the Screen</label> <input type="radio" checked name="output" value="screen" id="screen" /></td></tr>
-	<tr><td colspan="2"><label for="file">To file a file</label><input type="radio" name="output" value="file" id="file" /></td></tr>
-<tr><td>&nbsp;</td><td><label for="basename">...named:</label>   <input type="text" id="basename" name="basename" value="Export" /></td></td></tr>
-<tr><td>&nbsp;</td><td><label for="MIME">File Format:</label> <!-- TMPL_VAR NAME="CGIextChoice" --></td></tr>
-<tr><td>&nbsp;</td><td><label for="sep">Delimiter:</label> <!-- TMPL_VAR NAME="CGIsepChoice" --></td></tr>
-</table>
-		
-	<p>
-	<input type="submit" value="Generate Report" class="submit" />
-	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-	<input type="hidden" name="do_it" value="1" />
-	</form></p>
-	</div>
-<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/reports/catalogue_stats.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/catalogue_stats.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/catalogue_stats.tmpl
--- htdocs/intranet-tmpl/default/en/reports/catalogue_stats.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,194 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main" >
-
-<!-- TMPL_IF NAME="do_it" -->
-	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1 class="reports">Katalog istatistikleri</h1>
-		
-		<!-- TMPL_IF NAME="loopfilter"-->
-			<p>Filtered on</p>
-			<!-- TMPL_LOOP NAME="loopfilter" -->
-					<p><!-- TMPL_IF NAME="err" --> <font color="red"> <b><!--/TMPL_IF --><label class="label100"> <!-- TMPL_VAR NAME="crit"--> =</label><!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" --> </font> </b><!--/TMPL_IF --></p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_IF -->
-		<br>
-		<table border="1">
-			<tr >
-				<th class="reports"><!-- TMPL_VAR name="line" --> / <!-- TMPL_VAR name="column" --></th>
-				<!-- TMPL_LOOP NAME="loopcol" -->
-					<th class="reports"><!-- TMPL_VAR NAME="coltitle" --></th>
-				<!-- /TMPL_LOOP -->
-				<th class="reports">TOTAL</th>
-			</tr>
-				<!-- TMPL_LOOP NAME="looprow" -->
-					<tr>
-						<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-						<!-- TMPL_VAR NAME="rowtitle" --></td>
-						<!-- TMPL_LOOP NAME="loopcell" -->
-							<!-- TMPL_IF NAME="hilighted" --><td class="numberhilighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
-								<!--TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" -->
-								<!--TMPL_ELSE-->&nbsp;
-								<!--/TMPL_IF-->
-							</td>
-						<!-- /TMPL_LOOP -->
-						<!-- TMPL_IF NAME="hilighted" --><td class="numberhilighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
-							<!-- TMPL_VAR NAME="totalrow" -->
-						</td>
-					</tr>
-				<!-- /TMPL_LOOP  -->
-				<tr >
-					<th class="reports">TOTAL</th>
-					<!-- TMPL_LOOP NAME="loopfooter" -->
-						<th class="reports">
-							<!-- TMPL_VAR NAME="totalcol" -->
-						</th>
-					<!-- /TMPL_LOOP -->
-					<th class="reports"><!-- TMPL_VAR NAME="total" --></th>
-				</tr>
-		</table>
-	<!-- /TMPL_LOOP -->
-<!-- TMPL_ELSE -->
-	<h1 class = "reports">Katalog istatistikleri  </h1>
-		
-	<form method="post">
-	<table>
-		<thead>
-			<tr>
-			<th class="reports"><div class="label100">Title</div></th>
-			<th class="reports">Row</th>
-			<th class="reports">Column</th>
-			<th class="reports">Filter</th>
-			</tr>
-		</thead>
-		<tbody>
-			<!-- TMPL_IF Name="hasdewey" -->
-				<tr class="hilighted">
-					<td>Dewey Classification</td>
-					<td align="center"><input type="radio" name="Line" value="dewey"></td>
-					<td align="center"><input type="radio" name="Column" value="dewey"></td>
-					<td > From <input type="text" name="Filter" > To <input type="text" name="Filter" ></td>
-				</tr>
-				<tr class="hilighted">
-					<td>&nbsp;</td>
-					<td align="center" colspan="2">Limit to<select name="deweydigits">
-						<option value=""> </option>
-						<option value ="1">1</option>
-						<option value ="2">2</option>
-						<option value ="3">3</option>
-						<option value ="4">4</option>
-						<option value ="5">5</option>
-						</select>
-						digits 
-					</td>
-					<td>&nbsp;</td>
-				</tr>
-				<!-- TMPL_ELSE -->
-				<tr><input type="hidden" name="Filter" > <input type="hidden" name="Filter" ></tr>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF Name="haslccn" -->
-				<!--TMPL_IF Name="hlghtlccn"--><tr class="hilighted"> <!--TMPL_ELSE --><tr><!--/TMPL_IF-->
-					<td>LC Classification</td>
-					<td align="center"><input type="radio" name="Line" value="classification"></td>
-					<td align="center"><input type="radio" name="Column" value="classification"></td>
-					<td > From <!-- TMPL_VAR NAME="CGIFromLoCClass" --> To <!-- TMPL_VAR NAME="CGIToLoCClass" --> </td>
-				</tr>
-				<!--TMPL_IF Name="hlghtlccn"--><tr class="hilighted"> <!--TMPL_ELSE --><tr><!--/TMPL_IF-->
-					<td>&nbsp;</td>
-					<td align="center" colspan="2">Limit to<select name="lccndigits">
-						<option value=""> </option>
-						<option value ="1">1</option>
-						<option value ="2">2</option>
-						<option value ="3">3</option>
-						<option value ="4">4</option>
-						<option value ="5">5</option>
-						</select>
-						characters
-					</td>
-					<td>&nbsp;</td>
-				</tr>
-				<!-- TMPL_ELSE -->
-				<tr><input type="hidden" name="Filter" > <input type="hidden" name="Filter" ></tr>
-			<!-- /TMPL_IF  -->
-			<!-- TMPL_IF Name="hascote" -->
-				<!--TMPL_IF Name="hlghtcote"--><tr class="hilighted"> <!--TMPL_ELSE --><tr><!--/TMPL_IF-->
-					<td>Callnumber</td>
-					<td align="center"><input type="radio" name="Line" value="itemcallnumber"></td>
-					<td align="center"><input type="radio" name="Column" value="itemcallnumber"></td>
-					<td>From <input type="text" name="Filter" > To <input type="text" name="Filter" ></td>
-				</tr>
-				<!--TMPL_IF Name="hlghtcote"--><tr class="hilighted"> <!--TMPL_ELSE --><tr><!--/TMPL_IF-->
-					<td>&nbsp;</td>
-					<td align="center" colspan="2">Limit to<select name="cotedigits">
-						<option value=""> </option>
-						<option value ="1">1</option>
-						<option value ="2">2</option>
-						<option value ="3">3</option>
-						<option value ="4">4</option>
-						<option value ="5">5</option>
-						</select>
-						characters 
-					</td>
-					<td>&nbsp;</td>
-				</tr>
-				<!-- TMPL_ELSE -->
-				<tr><input type="hidden" name="Filter" > <input type="hidden" name="Filter" ></tr>
-			<!-- /TMPL_IF -->
-			<!--TMPL_IF Name="hglghtDT"--><tr class="hilighted"> <!--TMPL_ELSE --><tr><!--/TMPL_IF-->
-				<td>Document Type</td>
-				<td align="center"><input type="radio" name="Line" value="itemtype"></td>
-				<td align="center"><input type="radio" name="Column" value="itemtype"></td>
-				<td ><!-- TMPL_VAR NAME="CGIItemType" --></td>
-			</tr>
-			<!--TMPL_IF Name="hglghtPub"--><tr class="hilighted"> <!--TMPL_ELSE --><tr><!--/TMPL_IF-->
-				<td>Publisher</td>
-				<td align="center"><input type="radio" name="Line" value="publishercode"></td>
-				<td align="center"><input type="radio" name="Column" value="publishercode"></td>
-				<td><input type="text" name="Filter" ></td>
-			</tr>
-			<!--TMPL_IF Name="hglghtPY"--><tr class="hilighted"> <!--TMPL_ELSE --><tr><!--/TMPL_IF-->
-				<td>Publication Year</td>
-				<td align="center"><input type="radio" name="Line" value="publicationyear"></td>
-				<td align="center"><input type="radio" name="Column" value="publicationyear"></td>
-				<td>From <input type="text" name="Filter" > To <input type="text" name="Filter" ></td>
-			</tr>
-			<!--TMPL_IF Name="hglghtHB"--><tr class="hilighted"> <!--TMPL_ELSE --><tr><!--/TMPL_IF-->
-				<td>Home Branch</td>
-				<td align="center"><input type="radio" name="Line" value="homebranch"></td>
-				<td align="center"><input type="radio" name="Column" value="homebranch"></td>
-				<td><!-- TMPL_VAR NAME="CGIBranch" --></td>
-			</tr>
-			<!--TMPL_IF Name="hglghtLOC"--><tr class="hilighted"> <!--TMPL_ELSE --><tr><!--/TMPL_IF-->
-				<td>Holding Branch</td>
-				<td align="center"><input type="radio" name="Line" value="holdingbranch"></td>
-				<td align="center"><input type="radio" name="Column" value="holdingbranch"></td>
-				<td><!-- TMPL_VAR NAME="CGILocation" --> </td>
-			</tr>
-			<!--TMPL_IF Name="hglghtSTACK"--><tr class="hilighted"> <!--TMPL_ELSE --><tr><!--/TMPL_IF-->
-				<td>Shelving</td>
-				<td align="center"><input type="radio" name="Line" value="shelf"></td>
-				<td align="center"><input type="radio" name="Column" value="shelf"></td>
-				<td><!-- TMPL_VAR NAME="CGISTACK" --> </td>
-			</tr>
-		</tbody>
-	</table>
-	
-	<div id="bloc25">
-		<h3 class="reports"> Output </h3>
-		<input type="radio" checked name="output" value="screen" > To screen into the browser
-		<br>
-		<input type="radio" name="output" value="file"> To file <input type="text" name="basename" value="Export"> into an application  
-		<!-- TMPL_VAR NAME="CGIextChoice" -->
-		<!-- TMPL_VAR NAME="CGIsepChoice" -->
-	</p>
-	</div>
-	<p>
-	<input TYPE="submit" value="OK" class="button reports">
-	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">
-	<input type="hidden" name="do_it" value="1">
-	</form>
-<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/reports/contact_history.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/contact_history.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/contact_history.tmpl
--- htdocs/intranet-tmpl/default/en/reports/contact_history.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,67 +0,0 @@
-
-<!-- TMPL_UNLESS NAME="do_contacts" -->
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports: Contacts<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<div id="main">
-<form action="contact_history.pl" method="post">
-<h1>Contact History report</h1>
-Date from:<input type="text" name="sdate"/> Date to:<input type="text" name="edate"/>
-<input type="hidden" name="do_contacts" value="1"/>
-<input type="submit" value="Find"/><p>
-<b>Leave date blank for all or enter dates in  <!-- TMPL_VAR NAME="dateformatted" --> format</b>
-</form>
-<!-- TMPL_ELSE -->
-<!-- TMPL_INCLUDE NAME="main-top-print.inc" -->
-<div id="main">
-
-<h2>Contact History </h2>
-<div id="pages" >
-   
-    
-    <!-- TMPL_LOOP NAME="numbers" -->
-		<!-- TMPL_IF NAME="highlight" -->
-		    <span class="current">
-		    <!-- TMPL_VAR NAME="number" -->
-	        </span>
-		<!-- TMPL_ELSE -->
-		    <span class="pages">
-	        <a class="pages"  href="overdue.pl?op=do_search&amp;totalcount=<!-- TMPL_VAR NAME="totalcount" -->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;pg=<!-- TMPL_VAR NAME="pg" -->"><!-- TMPL_VAR NAME="number" --></a>
-	        </span>
-		<!-- /TMPL_IF -->
-    <!-- /TMPL_LOOP -->
-    
-</div>
-<div class="table"><table>
-
-
-  <tr>
-    <th>Date</th>
-    <th>User</th>
-    <th>Method</th>
-    <th>Message</th>
-    <th>Result</th>
-  </tr>
-  <!-- TMPL_LOOP NAME="contacts" -->
-    <tr>
-      <td><!-- TMPL_VAR NAME="date" --></td>
-    
-      <td><a  href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="name" --> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
-   
-      <td><!-- TMPL_VAR NAME="method" --></a></td>
-      <td><!-- TMPL_VAR NAME="message" --></td>
-      <td><!-- TMPL_VAR NAME="result" --></td>
-    </tr>
-  <!-- /TMPL_LOOP -->
-</table></div>
-
-</div>
-<span class="pages"><!--TMPL_IF NAME="borrowernumber"-->
-		<a   href="/cgi-bin/koha/members/moremember.pl?bornum=<!--TMPL_VAR NAME="borrowernumber"-->">Back to member</a>
-		<!--TMPL_ELSE-->
-	        <a   href="reports-home.pl">Back to reports</a>
-		<!--/TMPL_IF-->
-	        </span>
-
-<!-- /TMPL_UNLESS  -->
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/reports/inventory.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/inventory.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/inventory.tmpl
--- htdocs/intranet-tmpl/default/en/reports/inventory.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,80 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports: Inventory<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-	<h1>Inventory Report</h1>
-	<form method="post">
-	<div class="data">
-	<table>
-	<caption>Select items you want to check</caption>
-	<tr><th><label for="minlocation">Item Location (items.itemcallnumber) starting with:</label></th><td><input type="text" name="minlocation" id="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->" /> if you write A it gives all the callnumbers starting with A
-	<tr><th><label for="datelastseen">Not seen since:</label></th><td><input type="text" name="datelastseen" id="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->" size="10" maxlength="10" /></td></tr>
-	<tr><th><label for="pagesize">Items per Page: </label></th><td><input type="text" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" maxlength="5" size="5" /></td></tr>
-	<tr><th><label for="offset">Beginning at Page: </label></th><td><input type="text" name="offset" id="offset" value="<!-- TMPL_VAR NAME="offset" -->" size="5" maxlength="5" /></td></tr>
-	</table>
-		<p>
-			<input type="submit" value="Generate Report" class="submit">
-		</p>
-	</form>
-	<!-- TMPL_IF NAME="loop" -->
-	<form method="post">
-	<input type="hidden" name="markseen" value="1" />
-	<input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->" />
-	<input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->" />
-	<input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" />
-	<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="offset" -->" />
-	
-	<table>
-		<tr>
-			<th>Seen</th>
-			<th>Barcode</th>
-			<th>Call number</th>
-			<th>Title</th>
-			<th>Author</th>
-		</tr>
-	<!-- TMPL_LOOP NAME="loop" -->
-		<tr>
-			<td align="left">
-				<input type="checkbox" name="SEEN-<!-- TMPL_VAR NAME="itemnumber" -->" value="1" />
-			</td>
-			<td>
-				<a href="/cgi-bin/koha/catalogue/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->#<!-- TMPL_VAR NAME="barcode" -->"><!-- TMPL_VAR NAME="barcode" --></a>
-			</td>
-			<td>
-				<!-- TMPL_VAR NAME="itemcallnumber" -->
-			</td>
-			<td>
-				<!-- TMPL_VAR NAME="title" -->
-			</td>
-			<td>
-				<!-- TMPL_VAR NAME="author" -->
-			</td>
-		</tr>
-	<!-- /TMPL_LOOP -->
-	</table>
-	<input type="submit" value="Mark seen" class="submit">
-	</form>
-	
-	<!-- TMPL_IF NAME="offset" -->
-	<form method="post">
-		<input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->" />
-		<input type="hidden" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->" /> 
-		<input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->" />
-		<input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" />
-		<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevoffset" -->" />
-		<input type="submit" value="&lt;&lt;&lt;" class="submit" />
-	</form>
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="nextoffset" -->
-	<form method="post">
-		<input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->" /> 
-		<input type="hidden" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->" />
-		<input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->" />
-		<input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" />
-		<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextoffset" -->" />
-		<input type="submit" value="&gt;&gt;&gt;" class="submit" />
-	</form>
-	<!-- /TMPL_IF --><!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/reports/issues_avg_stats.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/issues_avg_stats.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/issues_avg_stats.tmpl
--- htdocs/intranet-tmpl/default/en/reports/issues_avg_stats.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,280 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-
-<!-- TMPL_IF NAME="do_it" -->
-	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1>Koha : Issues Average Period statistics </h1>
-		<!-- TMPL_IF NAME="loopfilter"-->
-			<p>Filtered on</p>
-			<!-- TMPL_LOOP NAME="loopfilter" -->
-					<p><!-- TMPL_IF NAME="err" --> <span class="error"> <b><!--/TMPL_IF --><strong><!-- TMPL_VAR NAME="crit"--> =</strong><!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" --> </span> </b><!--/TMPL_IF --></p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_IF NAME="loopfilter"-->
-		
-		<table>
-			<tr>
-				<th><!-- TMPL_VAR name="line" --> / <!-- TMPL_VAR name="column" --></th>
-				<!-- TMPL_LOOP NAME="loopcol" -->
-					<th><!-- TMPL_VAR NAME="coltitle" --></th>
-				<!-- /TMPL_LOOP -->
-				<th>TOTAL</th>
-			</tr>
-				<!-- TMPL_LOOP NAME="looprow" -->
-					<tr>
-						<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-						<!-- TMPL_VAR NAME="rowtitle" --></td>
-						<!-- TMPL_LOOP NAME="loopcell" -->
-							<!-- TMPL_IF NAME="hilighted" --><td class="numberhilighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
-								<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
-							</td>
-						<!-- /TMPL_LOOP -->
-						<!-- TMPL_IF NAME="hilighted" --><td class="numberhilighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
-							<!-- TMPL_VAR NAME="totalrow" -->
-						</td>
-					</tr>
-				<!-- /TMPL_LOOP NAME="looprow" -->
-				<tr>
-					<th>TOTAL</th>
-					<!-- TMPL_LOOP NAME="loopfooter" -->
-						<th>
-							<!-- TMPL_VAR NAME="totalcol" -->
-						</th>
-					<!-- /TMPL_LOOP -->
-					<th><!-- TMPL_VAR NAME="total" --></th>
-				</tr>
-		</table>
-	<!-- /TMPL_LOOP -->
-<!-- TMPL_ELSE -->
-	<h1>Koha : Issues Average Period statistics </h1>
-	<form method="post">
-	<div class="data">
-	<table>
-		<thead>
-			<tr>
-			<th scope="col">Title</th>
-			<th scope="col">Row</th>
-			<th scope="col">Column</th>
-			<th scope="col">Filter</th>
-			</tr>
-		</thead>
-		<tbody>
-			<tr class="hilighted">
-				<td>Issue date</td>
-				<td><input type="radio" name="Line" value="timestamp"></td>
-				<td><input type="radio" name="Column" value="timestamp"></td>
-				<td > From <input type="text" readonly="readonly" size="10" id="from" name="Filter" >
-							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
-								<script language="JavaScript" type="text/javascript">
-									function validate1(date) {
-										var day = date.getDate();
-										var month = date.getMonth() + 1;
-										var year = date.getFullYear();
-										var weekDay = date.getDay();
-										var dayMonth = month + '-' + day;
-										var dateString = year + '-' + month + '-' + day;
-										var dateTo = document.getElementById('to').value.split("-");
-										var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
-										if (date > limitDate) {
-											return true;
-										} else {
-											return false;
-										}
-									}
-					
-									Calendar.setup(
-										{
-											inputField : "from",
-											ifFormat : "%Y-%m-%d",
-											button : "openCalendarFrom",
-											disableFunc : validate1,
-											dateStatusFunc : validate1
-										}
-									);
-								</script>
-					To <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text">
-						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
-							<script type="text/javascript">
-								function validate2(date) {
-									var day = date.getDate();
-									var month = date.getMonth() + 1;
-									var year = date.getFullYear();
-									var weekDay = date.getDay();
-									var dayMonth = month + '-' + day;
-									var dateString = year + '-' + month + '-' + day;
-									var dateFrom = document.getElementById('from').value.split("-");
-									var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
-									if (limitDate > date) {
-										return true;
-									} else {
-										return false;
-									}
-								}
-		
-								Calendar.setup(
-									{
-										inputField : "to",
-										ifFormat : "%Y-%m-%d",
-										button : "openCalendarTo",
-										disableFunc : validate2,
-										dateStatusFunc : validate2
-									}
-								);
-							</script>
-				</td>
-			</tr>
-			<tr class="hilighted"> 
-				<td>&nbsp;</td>
-				<td colspan="2">by <select name="IssueDisplay">
-					<option value=""> </option>
-					<option value ="1">Day</option>
-					<option value ="2">Month</option>
-					<option value ="3">Year</option>
-					</select>
-					
-				</td>
-				<td><!--Preparing Month and Day Selection--><input type="hidden" name="Filter" value=""><input type="hidden" name="Filter" value=""></td>
-			</tr>
-			<tr>
-				<td>Returns</td>
-				<td><input type="radio" name="Line" value="returndate"></td>
-				<td><input type="radio" name="Column" value="returndate"></td>
-				<td > From <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" >
-							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFromRO" style="cursor: pointer;" valign="top">
-								<script language="JavaScript" type="text/javascript">
-									function validate1(date) {
-										var day = date.getDate();
-										var month = date.getMonth() + 1;
-										var year = date.getFullYear();
-										var weekDay = date.getDay();
-										var dayMonth = month + '-' + day;
-										var dateString = year + '-' + month + '-' + day;
-										var dateTo = document.getElementById('toRO').value.split("-");
-										var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
-										if (date > limitDate) {
-											return true;
-										} else {
-											return false;
-										}
-									}
-					
-									Calendar.setup(
-										{
-											inputField : "fromRO",
-											ifFormat : "%Y-%m-%d",
-											button : "openCalendarFromRO",
-											disableFunc : validate1,
-											dateStatusFunc : validate1
-										}
-									);
-								</script>
-					To <input type="text" readonly="readonly" size="10" id="toRO" name="Filter" value="" >
-						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarToRO" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
-							<script type="text/javascript">
-								function validate2(date) {
-									var day = date.getDate();
-									var month = date.getMonth() + 1;
-									var year = date.getFullYear();
-									var weekDay = date.getDay();
-									var dayMonth = month + '-' + day;
-									var dateString = year + '-' + month + '-' + day;
-									var dateFrom = document.getElementById('fromRO').value.split("-");
-									var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
-									if (limitDate > date) {
-										return true;
-									} else {
-										return false;
-									}
-								}
-		
-								Calendar.setup(
-									{
-										inputField : "toRO",
-										ifFormat : "%Y-%m-%d",
-										button : "openCalendarToRO",
-										disableFunc : validate2,
-										dateStatusFunc : validate2
-									}
-								);
-							</script>
-				</td>
-			</tr>
-			<tr> 
-				<td>&nbsp;</td>
-				<td colspan="2">by <select name="ReturnDisplay">
-					<option value=""> </option>
-					<option value ="1">Day</option>
-					<option value ="2">Month</option>
-					<option value ="3">Year</option>
-					</select>
-					
-				</td>
-				<td><input type="hidden" name="Filter" value=""><input type="hidden" name="Filter" value=""></td>
-			</tr>
-			<tr class="hilighted">
-				<td>Borrower Category</td>
-				<td><input type="radio" name="Line" value="borrowers.categorycode"></td>
-				<td><input type="radio" name="Column" value="borrowers.categorycode"></td>
-				<td><!-- TMPL_VAR NAME="CGIBorCat" --></td>
-			</tr>
-			<tr>
-				<td>Document Type</td>
-				<td><input type="radio" name="Line" value="itemtype"></td>
-				<td><input type="radio" name="Column" value="itemtype"></td>
-				<td ><!-- TMPL_VAR NAME="CGIItemType" --></td>
-			</tr>
-			<tr class="hilighted">
-				<td>Branch</td>
-				<td><input type="radio" name="Line" value="branchcode"></td>
-				<td><input type="radio" name="Column" value="branchcode"></td>
-				<td><!-- TMPL_VAR NAME="CGIBranch" --></td>
-			</tr>
-<!-- Modified according to statistics table
-			<tr>
-				<td>Issuing Branch</td>
-				<td><input type="radio" name="Line" value="issuingbranch"></td>
-				<td><input type="radio" name="Column" value="issuingbranch"></td>
-				<td ><! TMPL_VAR NAME="CGIBranch" ></td>
-			</tr> -->
-			<input type="hidden" name="Filter" value="">
-<!--End Modified -->
-			<!-- TMPL_IF Name="hassort1" -->
-				<tr class="hilighted"> 
-					<td>Sort1</td>
-					<td><input type="radio" name="Line" value="borrowers.sort1"></td>
-					<td><input type="radio" name="Column" value="borrowers.sort1"></td>
-					<td><!-- TMPL_VAR NAME="CGISort1" --> </td>
-				</tr>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF Name="hassort2" -->
-				<!-- TMPL_IF Name="HglghtSort2"--><tr class="hilighted"> <!-- TMPL_ELSE --><tr><!--/TMPL_IF --> 
-					<td>Sort2</td>
-					<td><input type="radio" name="Line" value="borrowers.sort2"></td>
-					<td><input type="radio" name="Column" value="borrowers.sort2"></td>
-					<td><!-- TMPL_VAR NAME="CGISort2" --> </td>
-				</tr>
-			<!-- /TMPL_IF -->
-			<tr></tr>
-		</tbody>
-	</table>
-	
-<table>
-	<caption>Output Options</caption>
-	<tr><td colspan="2"><label for="screen">To the Screen</label> <input type="radio" checked name="output" value="screen" id="screen" /></td></tr>
-	<tr><td colspan="2"><label for="file">To file a file</label><input type="radio" name="output" value="file" id="file" /></td></tr>
-<tr><td>&nbsp;</td><td><label for="basename">...named:</label>   <input type="text" id="basename" name="basename" value="Export" /></td></td></tr>
-<tr><td>&nbsp;</td><td><label for="MIME">File Format:</label> <!-- TMPL_VAR NAME="CGIextChoice" --></td></tr>
-<tr><td>&nbsp;</td><td><label for="sep">Delimiter:</label> <!-- TMPL_VAR NAME="CGIsepChoice" --></td></tr>
-</table>
-		
-	<p>
-	<input type="submit" value="Generate Report" class="submit" />
-	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-	<input type="hidden" name="do_it" value="1" />
-	</form></p>
-	</div>
-<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/reports/issues_by_borrower_category.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/issues_by_borrower_category.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/issues_by_borrower_category.tmpl
--- htdocs/intranet-tmpl/default/en/reports/issues_by_borrower_category.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,52 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<div id="main">
-<!-- TMPL_IF name="do_it" -->
-<!-- TMPL_LOOP name="mainloop" -->
-	<h1>Koha : Issues by borrower category <!--TMPL_IF name="borrower_category" --> for category = <!-- TMPL_VAR name="borrower_category" --><!-- /TMPL_IF --></h1>
-	<table>
-		<tr>
-			<th>&nbsp;</th>
-			<!-- TMPL_LOOP name="categorycodeloop" -->
-				<th><!-- TMPL_VAR name="categorycode" --></th>
-			<!-- /TMPL_LOOP -->
-			<th>TOTAL</th>
-		</tr>
-			<!-- TMPL_LOOP name="loopborrowertype" -->
-				<tr>
-					<td>
-					<!-- TMPL_VAR name="itemtype" --></td>
-					<!-- TMPL_LOOP name="loopitemtype" -->
-						<td>
-							<!-- TMPL_VAR name="issues" -->
-						</td>
-					<!-- /TMPL_LOOP -->
-					<td>
-						<!-- TMPL_VAR name="totalitemtype" -->
-					</td>
-				</tr>
-			<!-- /TMPL_LOOP  -->
-			<tr>
-				<th>TOTAL</th>
-				<!-- TMPL_LOOP name="loopborrowertotal" -->
-					<th>
-						<!-- TMPL_VAR name="issues" -->
-					</th>
-				<!-- /TMPL_LOOP -->
-				<th>&nbsp;</th>
-			</tr>
-	</table>
-<!-- /TMPL_LOOP -->
-<!-- TMPL_ELSE -->
-	<h1>Issues by patron category</h1>
-	<form method="post">
-		<p>Select a patron category (leave blank to select all) <input type="text" name="value" /></p>
-		<p>Select a branch : <!-- TMPL_VAR name="CGIbranch" --></p>
-		<input type="submit" value="Submit" class="submit" />
-		<input type="hidden" name="report_name" value="<!--TMPL_VAR name="report_name" -->" />
-		<input type="hidden" name="do_it" value="1" />
-	</form>
-<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/reports/issues_stats.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/issues_stats.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/issues_stats.tmpl
--- htdocs/intranet-tmpl/default/en/reports/issues_stats.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,254 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports: Issues Statistics<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main" >
-
-<!-- TMPL_IF NAME="do_it" -->
-	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1>Issues Statistics Report</h1>
-		<!-- TMPL_IF NAME="loopfilter"-->
-			<p>Showing Issues where 
-			<!-- TMPL_LOOP NAME="loopfilter" -->
-					<!-- TMPL_IF NAME="err" --> <font color="red"> <b><!--/TMPL_IF --> <strong><!-- TMPL_VAR NAME="crit"--></strong> = <span class="ex"><!-- TMPL_VAR NAME="filter"--></span>, <!-- TMPL_IF NAME="err" --> </font> </b><!--/TMPL_IF -->
-			<!-- /TMPL_LOOP --></p>
-		<!-- /TMPL_IF -->
-	
-		<table> 
-			<tr>
-				<th scope="col"><!-- TMPL_VAR name="line" --> / <!-- TMPL_VAR name="column" --></th>
-				<!-- TMPL_LOOP NAME="loopcol" -->
-					<th scope="col"><!-- TMPL_VAR NAME="coltitle" --></th>
-				<!-- /TMPL_LOOP -->
-				<th scope="col">Total</th>
-			</tr>
-				<!-- TMPL_LOOP NAME="looprow" -->
-					<!-- TMPL_IF NAME="hilighted" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-						<td>
-						<!-- TMPL_VAR NAME="rowtitle" --></td>
-						<!-- TMPL_LOOP NAME="loopcell" -->
-							<td class="sum">
-								<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" -->
-								<!-- TMPL_ELSE --> &nbsp;
-								<!-- /TMPL_IF -->
-							</td>
-						<!-- /TMPL_LOOP -->
-						<td class="sum">
-							<!-- TMPL_VAR NAME="totalrow" -->
-						</td>
-					</tr>
-				<!-- /TMPL_LOOP -->
-				<tr>
-					<td>TOTAL</td>
-					<!-- TMPL_LOOP NAME="loopfooter" -->
-						<td class="sum">
-							<!-- TMPL_VAR NAME="totalcol" -->
-						</td>
-					<!-- /TMPL_LOOP -->
-					<td class="sum"><!-- TMPL_VAR NAME="total" --></td>
-				</tr>
-		</table>
-	<!-- /TMPL_LOOP -->
-	
-<!-- TMPL_ELSE -->
-	<h1>Build Issues Statistics Report</h1>
-	<div class="help">Choose at least one piece of information to display as a row in the report, and one to display as a column.</div>
-	<form method="post">
-	<div class="data">
-	<table>
-		<caption>Date Range</caption>
-		<thead>
-			<tr>
-			<th scope="col">Display as Row</th>
-			<th scope="col">Display as Column</th>
-			<th scope="col">From...</th>
-			<th scope="col">...To</th>
-			</tr>
-		</thead>
-		<tbody>
-			<tr>
-				<td><input type="radio" name="Line" value="datetime" /></td>
-				<td><input type="radio" name="Column" value="datetime" /></td>
-				<td><input type="text" size="10" id="from" name="Filter" />
-							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" valign="top" />
-								<script language="JavaScript" type="text/javascript">
-									function validate1(date) {
-										var day = date.getDate();
-										var month = date.getMonth() + 1;
-										var year = date.getFullYear();
-										var weekDay = date.getDay();
-										var dayMonth = month + '-' + day;
-										var dateString = year + '-' + month + '-' + day;
-										var dateTo = document.getElementById('to').value.split("-");
-										var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
-										if (date > limitDate) {
-											return true;
-										} else {
-											return false;
-										}
-									}
-					
-									Calendar.setup(
-										{
-											inputField : "from",
-											ifFormat : "%Y-%m-%d",
-											button : "openCalendarFrom",
-											disableFunc : validate1,
-											dateStatusFunc : validate1
-										}
-									);
-								</script></td><td>
-					<input size="10" id="to" name="Filter" value="" type="text" />
-						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" />
-							<script type="text/javascript">
-								function validate2(date) {
-									var day = date.getDate();
-									var month = date.getMonth() + 1;
-									var year = date.getFullYear();
-									var weekDay = date.getDay();
-									var dayMonth = month + '-' + day;
-									var dateString = year + '-' + month + '-' + day;
-									var dateFrom = document.getElementById('from').value.split("-");
-									var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
-									if (limitDate > date) {
-										return true;
-									} else {
-										return false;
-									}
-								}
-		
-								Calendar.setup(
-									{
-										inputField : "to",
-										ifFormat : "%Y-%m-%d",
-										button : "openCalendarTo",
-										disableFunc : validate2,
-										dateStatusFunc : validate2
-									}
-								);
-							</script>
-				</td>
-			</tr>
-			</table>
-			<table>
-			<caption>Transaction Type</caption>
-			<thead><tr><th scope="col">Type</th><th scope="col">Group By</th><th scope="col">Limit by Day of Week</th><th scope="col">Limit by Month</th></tr></thead>
-			<tr> 
-				<td><select id="PeriodTypeSel" name="PeriodTypeSel">
-					<option value ="issue">Issue</option>
-					<option value ="return">Return</option>
-					</select></td>
-				<td><select id="DisplayBy" name="DisplayBy">
-					<option value="">None</option>
-					<option value ="1">Day of week</option>
-					<option value ="2">Month</option>
-					<option value ="3">Year</option>
-					</select>
-					
-				</td>
-				<td><select id="PeriodDaySel" name="PeriodDaySel">
-					<option value =""></option>
-					<option value ="Monday">Monday</option>
-					<option value ="Tuesday">Tuesday</option>
-					<option value ="Wednesday">Wednesday</option>
-					<option value ="Thursday">Thursday</option>
-					<option value ="Friday">Friday</option>
-					<option value ="Saturday">Saturday</option>
-					<option value ="Sunday">Sunday</option>
-					</select></td>
-					
-					<td><select id="PeriodMonthSel" name="PeriodMonthSel">
-					<option value =""></option>
-					<option value ="January">January</option>
-					<option value ="February">February</option>
-					<option value ="March">March</option>
-					<option value ="April">April</option>
-					<option value ="May">May</option>
-					<option value ="June">June</option>
-					<option value ="July">July</option>
-					<option value ="August">August</option>
-					<option value ="September">September</option>
-					<option value ="October">October</option>
-					<option value ="November">November</option>
-					<option value ="December">December</option>
-					</select>
-				</td>
-			</tr>
-			</table>
-			<table>
-			<caption>Patron Category</caption>
-			<thead><tr>
-			<th scope="col">Display as Row</th><th scope="col">Display as Column</th><th scope="col">Limit by Category</th></tr></thead>
-				<td><input type="radio" name="Line" value="borrowers.categorycode" /></td>
-				<td><input type="radio" name="Column" value="borrowers.categorycode" /></td>
-				<td><!-- TMPL_VAR NAME="CGIBorCat" --></td>
-			</tr>
-			</table>
-			<table>
-			<caption>Item Type</caption>
-			<thead><tr><th scope="col">Display as Row</th><th scope="col">Display as Column</th><th scope="col">Limit by Item Type</th></tr></thead>
-			<tr>
-				<td><input type="radio" name="Line" value="itemtype" /></td>
-				<td><input type="radio" name="Column" value="itemtype" /></td>
-				<td><!-- TMPL_VAR NAME="CGIItemType" --></td>
-			</tr>
-			</table>
-			
-			<table>
-			<caption>Branch</caption>
-			<thead><tr><th scope="col">Display as Row</th><th scope="col">Display as Column</th><th scope="col">Limit by Branch</th></tr></thead>
-			<tr>
-				<td><input type="radio" name="Line" value="branch" /></td>
-				<td><input type="radio" name="Column" value="branch" /></td>
-				<td><!-- TMPL_VAR NAME="CGIBranch" --></td>
-			</tr>
-			</table>
-			
-			<!-- TMPL_IF Name="hassort1" -->
-			<table>
-				<caption>Sorting Field 1</caption>
-				<thead><tr><th scope="col">Display as Row</th><th scope="col">Display as Column</th><th scope="col">Limit by Sorting Field 1</th></tr></thead>
-				<tr> 
-					<td><input type="radio" name="Line" value="borrowers.sort1" /></td>
-					<td><input type="radio" name="Column" value="borrowers.sort1" /></td>
-					<td><!-- TMPL_VAR NAME="CGISort1" --> </td>
-				</tr>
-				</table>
-			<!-- /TMPL_IF -->
-			
-			<!-- TMPL_IF Name="hassort2" -->
-			<table>
-				<caption>Sorting Field 2</caption>
-				<thead><tr><th scope="col">Display as Row</th><th scope="col">Display as Column</th><th scope="col">Limit by Sorting Field 2</th></tr></thead>
-				<tr> 
-					<td><input type="radio" name="Line" value="borrowers.sort2" /></td>
-					<td><input type="radio" name="Column" value="borrowers.sort2" /></td>
-					<td><!-- TMPL_VAR NAME="CGISort2" --> </td>
-				</tr>
-				</table>
-			<!-- /TMPL_IF -->
-	
-		<table>
-		<caption> Cell value</caption>
-		<tr><th><label for="count">Count issues</label></th><td><input type="radio" id="count" name="Cellvalue" value="1" checked="checked" /></td></tr>
-		<tr><th><label for="rate">Circulation rate</label></th><td><input type="radio" id="rate" name="Cellvalue" value="3" /></td></tr>
-		</table>
-
-<table>
-	<caption>Output Options</caption>
-	<tr><td colspan="2"><label for="screen">To the Screen</label> <input type="radio" checked name="output" value="screen" id="screen" /></td></tr>
-	<tr><td colspan="2"><label for="file">To file a file</label><input type="radio" name="output" value="file" id="file" /></td></tr>
-<tr><td>&nbsp;</td><td><label for="basename">...named:</label>   <input type="text" id="basename" name="basename" value="Export" /></td></td></tr>
-<tr><td>&nbsp;</td><td><label for="MIME">File Format:</label> <!-- TMPL_VAR NAME="CGIextChoice" --></td></tr>
-<tr><td>&nbsp;</td><td><label for="sep">Delimiter:</label> <!-- TMPL_VAR NAME="CGIsepChoice" --></td></tr>
-</table>
-		
-	<p>
-	<input type="submit" value="Generate Report" class="submit" />
-	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-	<input type="hidden" name="do_it" value="1" />
-	</form></p>
-<!-- /TMPL_IF -->
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/reports/itemtypes.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/itemtypes.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/itemtypes.tmpl
--- htdocs/intranet-tmpl/default/en/reports/itemtypes.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<div id="main">
-<!-- TMPL_IF name="do_it" -->
-<!-- TMPL_LOOP name="mainloop" -->
-	<table>
-	<caption>Item Counts <!--TMPL_IF name="branch" --> for <!-- TMPL_VAR name="branch" --><!-- /TMPL_IF --></caption>
-		<tr>
-			<th>Item Type</th>
-			<th>Count</th>
-		</tr>
-			<!-- TMPL_LOOP name="loopitemtype" -->
-				<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
-					<td><!-- TMPL_VAR name="itemtype" --></td>
-					<td class="credit"><!-- TMPL_VAR name="count" --></td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-			<tfoot><tr>
-				<td>TOTAL</td>
-				<td class="credit"><!-- TMPL_VAR name="total" --></td>
-				</tr></tfoot>
-	</table>
-<!-- /TMPL_LOOP -->
-<!-- TMPL_ELSE -->
-	<h1>Item Type Report</h1>
-	<div class="form">
-	<h3>View a count of items with each item type</h3>
-	<form method="post">
-		Select a branch (leave blank to show all branches) <!-- TMPL_VAR name="CGIbranch" -->
-		<input type="submit" value="Submit" class="submit" />
-		<input type="hidden" name="report_name" value="<!--TMPL_VAR name="report_name" -->" />
-		<input type="hidden" name="do_it" value="1" />
-	</form>
-<!-- /TMPL_IF -->
-</div>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/reports/onloan.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/onloan.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/onloan.tmpl
--- htdocs/intranet-tmpl/default/en/reports/onloan.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,50 +0,0 @@
-<!-- TMPL_INCLUDE NAME="main-top-print.inc" -->
-<div id="main"><!-- the site -->
-
-<h2>Items OnLoan as of <!-- TMPL_VAR NAME="dateformatted" --></h2>
-<div id="pages" >
-    <!-- Row of numbers corresponding to search result pages -->
-    
-    <!-- TMPL_LOOP NAME="numbers" -->
-		<!-- TMPL_IF NAME="highlight" -->
-		    <span class="current">
-		    <!-- TMPL_VAR NAME="number" -->
-	        </span>
-		<!-- TMPL_ELSE -->
-		    <span class="pages">
-	        <a class="pages"  href="onloan.pl?op=do_search&amp;totalcount=<!-- TMPL_VAR NAME="totalcount" -->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;pg=<!-- TMPL_VAR NAME="pg" -->"><!-- TMPL_VAR NAME="number" --></a>
-	        </span>
-		<!-- /TMPL_IF -->
-    <!-- /TMPL_LOOP -->
-    
-</div>
-<div class="table"><table>
-<tr>Total on loan: <!-- TMPL_VAR NAME="totalcount" --> </tr>
-  <tr>
-    <th>Due Date</th>
-    <th>User</th>
-    <th>Barcode</th>
-    <th>Title</th>
-    <th>Author</th>
-  </tr>
-
-  <!-- TMPL_LOOP NAME="overdueloop" -->
-    <tr>
-      <td> <!-- TMPL_IF NAME="overduedate" --><h5><!-- TMPL_VAR NAME="overduedate" --> Overdue</h5><!-- TMPL_ELSE -->
-<!-- TMPL_VAR NAME="duedate" --> <!-- /TMPL_IF --></td>
-      <td><a  href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR NAME="name" --></td>
-      <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->#<!-- TMPL_VAR NAME="barcode" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
-      <td><!-- TMPL_VAR NAME="title" --></td>
-      <td><!-- TMPL_VAR NAME="author" --></td>
-    </tr>
-  <!-- /TMPL_LOOP -->
-
-</table></div>
-
-</div>
-    <span class="pages">
-	        <a   href="reports-home.pl">Back to reports</a>
-	        </span>
-
-<!-- endmenu -->
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/reports/overdue.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/overdue.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/overdue.tmpl
--- htdocs/intranet-tmpl/default/en/reports/overdue.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,53 +0,0 @@
-<!-- TMPL_INCLUDE NAME="main-top-print.inc" -->
-<div id="main">
-
-<h2>Items Overdue as of <!-- TMPL_VAR NAME="dateformatted" --></h2>
-<div id="pages" >
-   
-    
-    <!-- TMPL_LOOP NAME="numbers" -->
-		<!-- TMPL_IF NAME="highlight" -->
-		    <span class="current">
-		    <!-- TMPL_VAR NAME="number" -->
-	        </span>
-		<!-- TMPL_ELSE -->
-		    <span class="pages">
-	        <a class="pages"  href="overdue.pl?op=do_search&amp;totalcount=<!-- TMPL_VAR NAME="totalcount" -->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;pg=<!-- TMPL_VAR NAME="pg" -->"><!-- TMPL_VAR NAME="number" --></a>
-	        </span>
-		<!-- /TMPL_IF -->
-    <!-- /TMPL_LOOP -->
-    
-</div>
-<div class="table"><table>
-<tr>Total overdue: <!-- TMPL_VAR NAME="totalcount" --> </tr>
-
-  <tr>
-    <th>Due Date</th>
-    <th>User</th>
-    <th>Barcode</th>
-    <th>Title</th>
-    <th>Author</th>
-  </tr>
-
-  <!-- TMPL_LOOP NAME="overdueloop" -->
-    <tr>
-      <td><!-- TMPL_VAR NAME="duedate" --></td>
-    <!-- TMPL_IF NAME="email" -->
-      <td><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Overdue: <!-- TMPL_VAR NAME="title" -->"><!-- TMPL_VAR NAME="name" --></a></td>
-    <!-- TMPL_ELSE -->
-      <td><a  href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR NAME="name" -->(<!-- TMPL_VAR NAME="categorycode" -->)</td>
-    <!-- /TMPL_IF -->
-      <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
-      <td><!-- TMPL_VAR NAME="title" --></td>
-      <td><!-- TMPL_VAR NAME="author" --></td>
-    </tr>
-  <!-- /TMPL_LOOP -->
-</table></div>
-
-</div>
-<span class="pages">
-	        <a   href="reports-home.pl">Back to reports</a>
-	        </span>
-
-
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/reports/reports-home.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/reports-home.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/reports-home.tmpl
--- htdocs/intranet-tmpl/default/en/reports/reports-home.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,50 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-
-<div id="main">
-<h1>Reports</h1>
-<div class="details">
-<h2>Statistics Wizards</h2>
-	<ul>
-		<li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></li>
-		<li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">Borrowers</a></li>
-		<li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalogue-- Simdilik kullanmayin</a></li>
-		<li><a href="/cgi-bin/koha/reports/issues_stats.pl">Issues</a></li>
-	</ul>
-</div>
-
-	<h2>Catalogue Statistics</h2>
-<div class="details">
-	<ul>
-		<li><a href="/cgi-bin/koha/reports/inventory.pl">Inventory/Stocktaking</a></li>
-		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></li>
-		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=transfers">Transfer report</a></li>	
-</ul>
-</div>
-	<h2>Circulation Statistics</h2>
-<div class="details">
-	<ul>
-		
-		<li><a href="/cgi-bin/koha/reports/overdue.pl">Overdue items</a></li>
-		<li><a href="/cgi-bin/koha/reports/onloan.pl">Items on loan</a></li>
-		<li><a href="/cgi-bin/koha/reports/resonloan.pl">Items on loan at Reserve section</a></li>
-		<li><a href="/cgi-bin/koha/reports/reservereport.pl">Reserved Books with User details</a></li>
-		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=issues_by_borrower_category">Issues by borrower category</a></li>
-	</ul>
-</div>
-<h2>Other Utilities</h2>
-<div class="details">
-	<ul>	<li><a href="/cgi-bin/koha/reports/accounts.pl">Accounts</a> </li>
-		<li><a href="/cgi-bin/koha/reports/sms_history.pl">SMS History</a></li>
-		<li><a href="/cgi-bin/koha/reports/contact_history.pl">Borrowers attemted contacts</a></li>
-		<li><a href="/cgi-bin/koha/reports/shelf.pl">Change Shelf of an item</a> </li>
-		<li><a href="/cgi-bin/koha/reports/shelforder.pl">Shelf Control Management</a></li>
-		<li><a href="/cgi-bin/koha/reports/stock.pl">Stock Control</a></li>
-</div>
-	
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-

Index: htdocs/intranet-tmpl/default/en/reports/reports.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/reports.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/reports.tmpl
--- htdocs/intranet-tmpl/default/en/reports/reports.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main"><h3> <!-- TMPL_VAR Name="type" --> reports </h3>
-
-<!-- TMPL_LOOP Name="dataloop" -->
-	<!-- TMPL_VAR Name="value" -->
-<!-- /TMPL_LOOP --></div>
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/reports/reservereport.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/reservereport.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/reservereport.tmpl
--- htdocs/intranet-tmpl/default/en/reports/reservereport.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,53 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1>Current  Unfilled Reserves</h1>
-<table>
-<tr>
-        <th>
-                Name
-        </th>
-        <th>
-                Date of Reserve
-        </th>
-        <th>
-                Title
-        </th>
-        <th>
-                Classification
-        </th>
-        <th>
-                Status
-        </th>
-</tr>
-<!-- TMPL_LOOP Name="dataloop" -->
-       <!-- TMPL_IF NAME="toggle" --> <tr><!-- TMPL_ELSE --><tr class="hilighted"><!-- /TMPL_IF -->
-                <td>
-                        <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a>&nbsp;
-                </td>
-                <td>
-                        <!-- TMPL_VAR NAME="reservedate" -->&nbsp;
-                </td>
-                <td>
-                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --></a>&nbsp;
-                </td>
-                <td>
-                        <!-- TMPL_VAR NAME="classification" -->&nbsp;
-                </td>
-                <td>
-                        <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="status" --></a>&nbsp;
-                </td>
-
-        </tr>
-<!-- /TMPL_LOOP -->
-<tr>
-                <td>
-                        <b>Total: <!-- TMPL_VAR NAME="count" --></b>
-                </td>
-                <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
-        </tr>
-</table>
-</div>
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/reports/reserves_by_biblios.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/reserves_by_biblios.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/reserves_by_biblios.tmpl
--- htdocs/intranet-tmpl/default/en/reports/reserves_by_biblios.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,161 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1 class="reports">Reserves by item</h1>
-
-<!-- TMPL_VAR NAME="test" -->
-<!-- TMPL_IF NAME="do_it" -->
-    <!-- TMPL_IF NAME="results" -->
-		<table style="border-collapse: separate; border-spacing: 2px;">
-		        <tr>
-		            <th></th>
-		            <th>Document</th>
-	                <th>Total reserves</th>
-		        </tr>
-
-
-				<!-- TMPL_LOOP NAME="results" -->
-					<tr>
-					    <td align="center" style="background-color:silver"><!-- TMPL_VAR NAME="index" --></td>
-					    <td style="padding-left:5px" <!--TMPL_IF NAME="color" -->bgcolor="#CBE4E4" <!-- /TMPL_IF -->>
-							<!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" -->
-						</td>
-					    <td  align="center" width="15%" <!--TMPL_IF NAME="color" -->bgcolor="#CBE4E4" <!-- /TMPL_IF -->>
-							<!-- TMPL_VAR NAME="count" -->
-						</td>
-						
-					</tr>
-				<!-- /TMPL_LOOP -->
-		</table>
-		
-
-    <!-- TMPL_ELSE -->
-        <h6>No results</h6>
-	<!-- /TMPL_IF -->
-
-<!-- TMPL_ELSE -->
-	
-	<form method="post">
-
-	<table style="border:0">
-	    <tr>
-	        
-	        <td>
-	            Library:
-	        </td>
-	        <td colspan="3">
-	    				<!-- TMPL_VAR name="branches" -->
-				
-	        </td>
-	    </tr>
-	    
-	    <tr>
-	        <td>
-	            From:
-	        </td>
-			<td>
-			   	
-                <input type="text" readonly size="10" id="from" name="from" value="<!-- TMPL_VAR NAME="from" -->">
-				<img src="<!-- TMPL_VAR NAME="themelang" -->/includes/calendar/cal.gif" hspace="0" vspace="0" border="0" id="openCalendarFrom" style="cursor:pointer" valign="top">
-                <script type="text/javascript">
-                    function validate1(date) {
-						var day = date.getDate();
-						var month = date.getMonth() + 1;
-						var year = date.getFullYear();
-						var weekDay = date.getDay();
-						var dayMonth = month + '-' + day;
-						var dateString = year + '-' + month + '-' + day;
-						var dateTo = document.getElementById('to').value.split("-");
-						var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
-						if (date > limitDate) {
-							return true;
-						} else {
-							return false;
-						}
-					}
-
-					Calendar.setup(
-						{
-							inputField : "from",
-							ifFormat : "%Y-%m-%d",
-							button : "openCalendarFrom",
-							disableFunc : validate1,
-							dateStatusFunc : validate1
-						}
-					);
-				</script>
-
-			</td>
-			<td>
-	            To:
-	        </td>
-			<td>
-                <input type="text" readonly size="10" id="to" name="to" value="<!-- TMPL_VAR NAME="to" -->">
-				<img src="<!-- TMPL_VAR NAME="themelang" -->/includes/calendar/cal.gif"  hspace="0" vspace="0" border="0" id="openCalendarTo" style="cursor:pointer" valign="top">
-                <script type="text/javascript">
-                   function validate2(date) {
-						var day = date.getDate();
-						var month = date.getMonth() + 1;
-						var year = date.getFullYear();
-						var weekDay = date.getDay();
-						var dayMonth = month + '-' + day;
-						var dateString = year + '-' + month + '-' + day;
-						var dateFrom = document.getElementById('from').value.split("-");
-						var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
-						if (limitDate > date) {
-						    return true;
-						} else {
-							return false;
-						}
-					}
-
-					Calendar.setup(
-						{
-							inputField : "to",
-							ifFormat : "%Y-%m-%d",
-							button : "openCalendarTo",
-							disableFunc : validate2,
-							dateStatusFunc : validate2
-						}
-					);
-				</script>
-
-			</td>
-			
-
-		</tr>
-	</table>
-		<br>
-	<table>
-			<tr>
-				<th colspan="3" class="reports">Output</th>
-			</tr>
-			<tr>
-				<td><input type="radio" checked name="output" value="screen" > Browser screen</td>
-				<td>
-					<input type="radio" name="output" value="file"> File
-				</td>
-				<td>
-					<br>
-					<input type="text" name="basename" value="report">
-					<!-- TMPL_VAR NAME="CGIextChoice" -->
-					<!-- TMPL_VAR NAME="CGIsepChoice" -->
-					<br>
-					<h6 id="small">Especify the filename which you want to export the report.</h6>
-				 </td>
-			</tr>
-			<tr>
-				<td colspan="3" align="right">
-					<input TYPE="submit" value="Query" class="button reports">
-					<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">
-					<input type="hidden" name="do_it" value="1">
-				</td>
-			</tr>
-		</table>
-		
-	</form>
-<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/reports/shelf.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/shelf.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/shelf.tmpl
--- htdocs/intranet-tmpl/default/en/reports/shelf.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Stock control<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
-
-
-<body onload="document.forms['mainform'].elements[0].focus();">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<div id="main">
-	<!--TMPL_IF NAME="error"--><div class="error">BARCODE does not EXIST!</div><!--/TMPL_IF-->
-	<table><form method="post" id="mainform" name="mainform" action="/cgi-bin/koha/reports/shelf.pl" enctype="multipart/form-data">
-	<caption>Shelf change</caption>
-		<tr>
-			<th>Barcode</th>
-			
-		
-			<td><input type="text" name="barcode" size="10" tabindex="0" ></td>
-			<th><label for="uploadmarc">Select the file to check: </label></th>
-	
-		<td>
-			<input type="file" id="uploadbarcode" name="uploadbarcode" /><br />
-		</td>
-		<tr>
-						<th>Shelving</th>
-					 <td colspan="3" align="left">
-					        <select size="1"  name="shelf" >					  
-							<!-- TMPL_LOOP name="shelves" -->
-				                <option value="<!-- TMPL_VAR name="shelf" -->" <!--TMPL_IF NAME="selected"-->selected<!--/TMPL_IF--> ><!-- TMPL_VAR name="shelfname" --></option>
-							<!-- /TMPL_LOOP -->
-							</select>
-						</td>
-					</tr>
-<tr>
-		<td><input type="submit" value="Change Shelf" class="button"></td></tr><input type="hidden" id="op" name="op"  value="dostock"/></form>
-		</table>
-		
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/reports/shelforder.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/shelforder.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/shelforder.tmpl
--- htdocs/intranet-tmpl/default/en/reports/shelforder.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,63 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: Shelf check<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-<div id="main">
-<h1>Raf kontrol sistemi -Shelving & inventory control</h1>
-<h4></h4>
-
-<ul>
-	<li>Select the barcodes file to check. Select the shelving section for these barcodes.</li>
-	<li>Fill the call number that this shelf is expected to start and end with. Give as many characters as you can. e.g. 'PL' or 'PL54' </li>
-	<li>Barkot dosyasını seçiniz. Bu barkotların hangi raflarda olduğunu seçiniz.</li>
-	<li>Call Number kısmına bu rafın başlaması ve bitmesi gereken sırt etiketini belirtiniz. ör. 'PL' veya 'PL54' gibi</li>
-	<br>
-	<li>Full Report will display all barcodes read while Brief Report only display barcodes which are not in correct place</li>
-	</ul>
-<form method="post" action="shelforder.pl" enctype="multipart/form-data">
-<div class="data"><table>
-	<tr>
-		<th><label for="uploadmarc">Select the file to check: </label></th>
-	
-		<td><input type="hidden" id="upload" name="upload"  value="1"/>
-			<input type="file" id="uploadmarc" name="uploadmarc" /><br />
-		</td>
-<th><label>Report Type: </label></th>
-<td>
-  <input name="brief" type="radio" class="style2" value="0" >
-        Full Report <input name="brief" type="radio" class="style2" value="1" checked>Brief Report</td>
-      
-	</tr>
-		
-	<tr>
-		<th><label for="shelf">Shelving: </label></th>
-		<td>
-			<select type="text" name="shelf"
-									        class="style2">
-										
-										<option value="Gen"  selected>General Collection</option>
-										<option value="Res"  >Reserve section</option>
-										<option value="Cyp"  >Cyprus section</option>
-										<option value="Spc"  >Special collection</option>
-										<option value="New"  >New Arrivals</option>
-									</select>
-		</td>
-	</tr>
-<tr>
-		<th><label for="callnumber">Expected callnumber start: </label></th>
-		<td>
-			<input type="text" id="callnumber" name="callnumber" />
-		</td>
-<th><label for="endnumber">callnumbers end: </label></th>
-<td>
-			<input type="text" id="endnumber" name="endnumber" />
-		</td>
-	</tr>
-		</table></div><input type="submit" value="Start Check" class="submit" />
-</form>
-
-
-</div>
-
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/reports/shelforderresult.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/shelforderresult.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/shelforderresult.tmpl
--- htdocs/intranet-tmpl/default/en/reports/shelforderresult.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-<!-- TMPL_INCLUDE NAME="main-top-print.inc" -->
-<div id ="main">
-
-<h2>Shelf Contents result for <!-- TMPL_VAR NAME="total" --> books from <!-- TMPL_VAR NAME="starting" --> to  <!-- TMPL_VAR NAME="ending" -->on <!-- TMPL_VAR NAME="dateformatted" --></h2>
-<a href="/cgi-bin/koha/reports/shelforder.pl">Return</a> 
-
-<div class="table"><table>
-  <tr>
-    
-    <th>Barcode</th>
-    <th>Call number</th>
-    <th>Status</th>
-  </tr>
-
-  <!-- TMPL_LOOP NAME="overdueloop" -->
-<tr>
-      <td ><!-- TMPL_VAR NAME="barcode" --></td>
-      <td><!-- TMPL_VAR NAME="callnumber" --></td>
-      <td><!-- TMPL_VAR NAME="status" --></td>
-    </tr>
-  <!-- /TMPL_LOOP -->
-</table></div>
-
-</div>
-<a href="/cgi-bin/koha/reports/shelforder.pl">Return</a>
-
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/reports/sms_history.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/sms_history.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/sms_history.tmpl
--- htdocs/intranet-tmpl/default/en/reports/sms_history.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,68 +0,0 @@
-
-<!-- TMPL_UNLESS NAME="do_contacts" -->
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports: Contacts<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<div id="main">
-<form action="sms_history.pl" method="post">
-<h1>SMS History report</h1>
-Userno:<input type="text" name="cardnumber"/>
-Date from:<input type="text" name="sdate"/> Date to:<input type="text" name="edate"/>
-<input type="hidden" name="do_contacts" value="1"/>
-<input type="submit" value="Find"/><p>
-<b>Leave date blank for all or enter dates in  <!-- TMPL_VAR NAME="dateformatted" --> format</b>
-</form>
-<!-- TMPL_ELSE -->
-<!-- TMPL_INCLUDE NAME="main-top-print.inc" -->
-<div id="main">
-
-<h2>SMS History </h2>
-<div id="pages" >
-   
-    
-    <!-- TMPL_LOOP NAME="numbers" -->
-		<!-- TMPL_IF NAME="highlight" -->
-		    <span class="current">
-		    <!-- TMPL_VAR NAME="number" -->
-	        </span>
-		<!-- TMPL_ELSE -->
-		    <span class="pages">
-	        <a class="pages"  href="overdue.pl?op=do_search&amp;totalcount=<!-- TMPL_VAR NAME="totalcount" -->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;pg=<!-- TMPL_VAR NAME="pg" -->"><!-- TMPL_VAR NAME="number" --></a>
-	        </span>
-		<!-- /TMPL_IF -->
-    <!-- /TMPL_LOOP -->
-    
-</div>
-<div class="table"><table>
-
-
-  <tr>
-    <th>Date</th>
-    <th>User</th>
-   <th>Phone</th>
-    <th>Message</th>
-    <th>Reply</th>
-   
-  </tr>
-  <!-- TMPL_LOOP NAME="contacts" -->
-    <tr>
-      <td><!-- TMPL_VAR NAME="date" --></td>
-    
-      <td><a  href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="name" --> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
-    <td><!-- TMPL_VAR NAME="user_phone" --></td>
-      <td><!-- TMPL_VAR NAME="message" --></td>
-      <td><!-- TMPL_VAR NAME="reply" --></td>
-    </tr>
-  <!-- /TMPL_LOOP -->
-</table></div>
-
-</div>
-<span class="pages"><!--TMPL_IF NAME="borrowernumber"-->
-		<a   href="/cgi-bin/koha/members/moremember.pl?bornum=<!--TMPL_VAR NAME="borrowernumber"-->">Back to member</a>
-		<!--TMPL_ELSE-->
-	        <a   href="reports-home.pl">Back to reports</a>
-		<!--/TMPL_IF-->
-	        </span>
-
-<!-- /TMPL_UNLESS  -->
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/reports/stats.screen.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/stats.screen.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/stats.screen.tmpl
--- htdocs/intranet-tmpl/default/en/reports/stats.screen.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,102 +0,0 @@
-<!-- TMPL_INCLUDE NAME="main-top-print.inc" -->
-
-<h1>Payments received</h1>
-
-        <table border="0" cellspacing="0" cellpadding="0" class="collapse">
-                <tr>
-                        <th class="cell-header">Date/time</th>
-                        <th class="cell-header">Surname</th>
-                        <th class="cell-header">Firstname</th>
-                        <th class="cell-header">Description</th>
-                        <th class="cell-header">Charge Type</th>
-                        <th class="cell-header">Invoice Amount</th>
-                        <th class="cell-header">Payment Type</th>
-                        <th class="cell-header">Payment Amount</th>
-                </tr>
-                <tr>
-                <!-- TMPL_LOOP NAME=loop1 -->
-                <tr>
-                        <td class="cell"><!-- TMPL_VAR NAME="datetime" --></td>
-                        <td class="cell"><!-- TMPL_VAR NAME="surname" --></td>
-                        <td class="cell"><!-- TMPL_VAR NAME="firstname" --></td>
-                        <td class="cell"><!-- TMPL_VAR NAME="description" --></td>
-                        <td class="cell"><!-- TMPL_VAR NAME="accounttype" --></td>
-                        <td class="cell" align="right"><!-- TMPL_VAR NAME="amount" --></td>
-                        <td class="cell"><!-- TMPL_VAR NAME="type" --></td>
-                        <td class="cell" align="right"><!-- TMPL_VAR NAME="value" --></td>
-                </tr>
-                <!-- /TMPL_LOOP -->
-        </table>
-
-<p>
-        <b>Total amount received: <!-- TMPL_VAR NAME="totalpaid" --> YTL</b>
-        
-</p>
-
-
-<h1>Credits given</h1>
-
-        <table border="0" cellspacing="0" cellpadding="0" class="collapse">
-                <tr>
-                        <th class="cell-header">Date</th>
-                        <th class="cell-header">Surname</th>
-                        <th class="cell-header">Firstname</th>
-                        <th class="cell-header">Description</th>
-                        <th class="cell-header">Charge Type</th>
-                        <th class="cell-header">Credit Amount</th>
-                </tr>
-                <tr>
-                <!-- TMPL_LOOP NAME=loop2 -->
-                <tr>
-                            <td class="cell"><!-- TMPL_VAR NAME="creditdate" --></td>
-                        <td class="cell"><!-- TMPL_VAR NAME="creditsurname" --></td>
-                        <td class="cell"><!-- TMPL_VAR NAME="creditfirstname" --></td>
-                        <td class="cell"><!-- TMPL_VAR NAME="creditdescription" --></td>
-                        <td class="cell"><!-- TMPL_VAR NAME="creditaccounttype" --></td>
-                        <td class="cell" align="right"><!-- TMPL_VAR NAME="creditamount" --></td>
-                </tr>
-                <!-- /TMPL_LOOP -->
-        </table>
-<p>
-        <b>Total amount credits+ written off: <!-- TMPL_VAR NAME="totalcredits" --> YTL</b>
-<br>  <b>Total amount of credits: <!-- TMPL_VAR NAME="totalcreditsamount" --> YTL</b><br>
-	<b>Total amount written off : <!-- TMPL_VAR NAME="totalwrittenamount" --> YTL</b><br>
-        <b>Total number written off: <!-- TMPL_VAR NAME="totalwritten" --></b>
-</p>
-
-<h1>Amounts outstanding</h1>
-
-        <table border="0" cellspacing="0" cellpadding="0" class="collapse">
-                <tr>
-                        <th class="cell-header">Date</th>
-                        <th class="cell-header">Surname</th>
-                        <th class="cell-header">Firstname</th>
-                        <th class="cell-header">Description</th>
-                        <th class="cell-header">Charge Type</th>
-                        <th class="cell-header">Invoice Amount</th>
-		<th class="cell-header">Amount remaining</th>
-                </tr>
-                <tr>
-                <!-- TMPL_LOOP NAME=loop3 -->
-                <tr>
-                            <td class="cell"><!-- TMPL_VAR NAME="invoicesdate" --></td>
-                        <td class="cell"><!-- TMPL_VAR NAME="invoicessurname" --></td>
-                        <td class="cell"><!-- TMPL_VAR NAME="invoicesfirstname" --></td>
-                        <td class="cell"><!-- TMPL_VAR NAME="invoicesdescription" --></td>
-                        <td class="cell"><!-- TMPL_VAR NAME="invoicesaccounttype" --></td>
-                        <td class="cell" align="right"><!-- TMPL_VAR NAME="invoicesamount" --></td>
-		<td class="cell" align="right"><!-- TMPL_VAR NAME="invoicesamountremaining" --></td>
-                </tr>
-                <!-- /TMPL_LOOP -->
-        </table>
-<p>
-        <b>Total amount of invoices: <!-- TMPL_VAR NAME="totalinvoices" --> YTL</b>
-<br>  <b>Total amount remaining: <!-- TMPL_VAR NAME="totalinvoicesamount" --> YTL</b><br>
-	
-</p>
-
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-</body>
-</html>
-

Index: htdocs/intranet-tmpl/default/en/reports/stats.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/stats.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/stats.tmpl
--- htdocs/intranet-tmpl/default/en/reports/stats.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Statistics<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
-	<div id="main">
-	<!-- TMPL_IF NAME="loop1" -->
-	<table>
-	<caption>Statistics</caption>
-		<tr>
-			<th>Name</th>
-			<th>Type</th>
-			<th>Date/time</th>
-			<th>Amount</th>
-			<th>Branch</th>
-		<tr>
-		<!-- TMPL_LOOP name="loop1" -->
-		<tr>
-			<td><!-- TMPL_VAR NAME="name" --></td>
-			<td><!-- TMPL_VAR NAME="type" --></td>
-			<td><!-- TMPL_VAR NAME="time" --></td>
-			<td><!-- TMPL_VAR NAME="amount" --></td>
-			<td><!-- TMPL_VAR NAME="branch" --></td>
-		</tr>
-		<!-- /TMPL_LOOP -->
-		</table>
-		<p>Total paid: <!-- TMPL_VAR NAME="total" --><br>Total written off: <!-- TMPL_VAR NAME="totalw" --></p>
-	<!-- TMPL_ELSE -->
-	<h3>No statistics to report</h3>
-	<!-- /TMPL_IF -->
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/reports/stock.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/stock.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/stock.tmpl
--- htdocs/intranet-tmpl/default/en/reports/stock.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Stock control<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
-
-
-<body onload="document.forms['mainform'].elements[0].focus();">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<div id="main">
-	
-	<table><form method="post" id="mainform" name="mainform" action="/cgi-bin/koha/reports/stock.pl" enctype="multipart/form-data">
-	<caption>Stock control</caption>
-		<tr>
-			<th>Barcode</th>
-			
-		
-			<td><input type="text" name="barcode" size="10" tabindex="0" ></td>
-			<th><label for="uploadmarc">Select the file to check: </label></th>
-	
-		<td><input type="hidden" id="op" name="op"  value="dostock"/>
-			<input type="file" id="uploadbarcode" name="uploadbarcode" /><br />
-		</td>
-		
-		<td><input type="submit" value="Mark seen" class="button"></td></tr></form>
-		</table>
-		
-</div>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/reports/transfers.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reports/transfers.tmpl
diff -N htdocs/intranet-tmpl/default/en/reports/transfers.tmpl
--- htdocs/intranet-tmpl/default/en/reports/transfers.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,44 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<div id="main">
-<!-- TMPL_IF name="do_it" -->
-<!-- TMPL_LOOP name="mainloop" -->
-	<table>
-	<caption>Item Counts <!--TMPL_IF name="branch" --> for <!-- TMPL_VAR name="branch" --><!-- /TMPL_IF --></caption>
-		<tr>
-			<th>Barcode</th>
-			<th>Current Branch</th>
-			<th>Origional Branch</th>
-			<th>Date of Transfer</th>
-			<th>Transferred By</th>
-		</tr>
-			<!-- TMPL_LOOP name="loopitemtype" -->
-				<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
-					<td><a href="/cgi-bin/koha/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->#<!-- TMPL_VAR NAME="barcode" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
-					<td><!-- TMPL_VAR name="currentb" --></td>
-					<td><!-- TMPL_VAR name="origb" --></td>
-					<td><!-- TMPL_VAR name="date" --></td>
-					<td><!-- TMPL_VAR name="by" --></td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-			<tfoot><tr>
-				<td>TOTAL</td>
-				<td class="credit"><!-- TMPL_VAR name="total" --></td>
-				</tr></tfoot>
-	</table>
-<!-- /TMPL_LOOP -->
-<!-- TMPL_ELSE -->
-	<h1>TRANSFERS Report</h1>
-	<div class="form">
-	<h3>Bir şubeden(fakülteden) aktarılan kitaplar</h3>
-	<form method="post">
-		Şube seçiniz. Tümü için boş bırakınız. <!-- TMPL_VAR name="CGIbranch" -->
-		<input type="submit" value="Submit" class="submit" />
-		<input type="hidden" name="report_name" value="<!--TMPL_VAR name="report_name" -->" />
-		<input type="hidden" name="do_it" value="1" />
-	</form>
-<!-- /TMPL_IF -->
-</div>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/reserve/request.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/reserve/request.tmpl
diff -N htdocs/intranet-tmpl/default/en/reserve/request.tmpl
--- htdocs/intranet-tmpl/default/en/reserve/request.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,151 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Catalogue: Add Reserve for <!-- TMPL_VAR Name="title" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<div id="main">
-<form action="placerequest.pl" method="post" id="mainform">
-
-<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
-<input type="hidden" name="type" value="str8" />
-<input type="hidden" name="title" value="<!-- TMPL_VAR Name="title" -->" />
-<input type="hidden" name="loggedinuser" value="<!-- TMPL_VAR Name="loggedinusername" -->" />
-<h3>Add Reserve for
-<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR Name="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a>
-<!-- TMPL_VAR Name="author" --></h3>
-<div class="form">
-	<table>
-		<tr><th>Rank</th><td>
-<select name="rank-request">
-			<!-- TMPL_LOOP Name="optionloop" -->
-				<option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected="selected"<!-- /TMPL_IF -->>
-					<!-- TMPL_VAR Name="num" -->
-				</option>
-			<!-- /TMPL_LOOP -->
-			</select>
-			</td></tr>
-
-		<tr><th><label for="notes">Notes</label></th><td><input type="text" size="20" name="notes" id="notes"></tr>
-		<tr><th><label for="date">Date</label></th><td><!-- TMPL_VAR name="date" --></td></tr>
-		<tr><th><label for="pickup">Pickup</label></th><td><!-- TMPL_VAR name="CGIbranch" --></td></tr>
-		<tr><th><label for="member">Card Number</label> <a href="/cgi-bin/koha/members/members-home.pl?quicksearch=1" onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick Search)</a></th><td><input type="text" size="10" name="member" id="member" /></td></tr>
-	</table>
-</div>
-
-	<div class="table"><table>
-<tr>
-	<th>Reservables</th>
-	<th>Item Type</th>
-	<th>Call Number</th>
-	<th>Volume</th>
-	<th>Pubdate</th>
-	
-</tr>
-
-<!-- TMPL_LOOP Name="bibitemloop" -->
-	<tr>
-		<td><!-- TMPL_LOOP Name="barcodeloop" -->
-			<!-- TMPL_IF Name="itemlost" -->
-				Cannot be selected
-			<!-- TMPL_ELSE -->
-				<li><!-- TMPL_IF Name="date_due" --><input type="checkbox" name="reqbib" value=<!-- TMPL_VAR Name="itemnumber" -->><!-- TMPL_VAR Name="barcode" -->
-				<input type="hidden" name="itemnumber" value=<!-- TMPL_VAR Name="itemnumber" -->><!--TMPL_ELSE-->On shelf:<!-- TMPL_VAR Name="barcode" --><input type="hidden" name="reqbib" value=""><!--/TMPL_IF--></li>
-			<!-- /TMPL_IF --><!-- /TMPL_LOOP -->
-		</td>
-			
-		</td>
-		<td>
-			<!-- TMPL_VAR Name="description" -->
-		</td>
-		<td>
-			<!-- TMPL_IF NAME="class" --><!-- TMPL_VAR Name="class" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
-		</td>
-		<td>
-			<!-- TMPL_IF NAME="volumedesc" --><!-- TMPL_VAR Name="volumeddesc" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
-		</td>
-		<td>
-			<!-- TMPL_IF NAME="publicationyear" --><!-- TMPL_VAR Name="publicationyear" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
-		</td>
-		
-	</tr>
-<!-- /TMPL_LOOP -->
-</table></div>
-
-<input type="submit" name="submit"  value="Place New Request"  class="submit"  >
-</form>
-<!-- TMPL_IF NAME="reserveloop" -->
-<form name="T<!-- TMPL_VAR Name="time" -->" action="modrequest.pl" method="post">
-<input type="hidden" name="loggedinuser" value="<!-- TMPL_VAR Name="loggedinusername" -->" >
-
-<h3>Modify Existing Requests</h3>
-<div class="table"><table>
-	<tr>
-		<th>Rank</th>
-		<th>Patron</th>
-		<th>Notes</th>
-		<th>Date</th>
-		<th>Pickup Location</th>
-		<th>Request</th>
-	</tr>
-
-	<!-- TMPL_LOOP Name="reserveloop" -->
-		<tr>
-			<td>
-			<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" >
-			<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" >
-			<select name="rank-request">
-				<!-- TMPL_IF Name="wait" -->
-					<option value="W" selected="selected">Consigned</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP Name="optionloop" -->
-					<option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected="selected"<!-- /TMPL_IF -->>
-						<!-- TMPL_VAR Name="num" -->
-					</option>
-				<!-- /TMPL_LOOP -->
-				<option value="del">Del</option>
-			</select></td>
-			<td>
-			<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="borrowernumber" -->"><!-- TMPL_VAR Name="firstname" --> <!-- TMPL_VAR Name="surname" --></a>
-			</td>
-			<td><!-- TMPL_IF NAME="notes" --><!-- TMPL_VAR Name="notes" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
-			<td><!-- TMPL_VAR Name="date" --></td>
-			<td><!-- TMPL_IF Name="wait" -->
-				<input type="hidden" name="pickup" value="<!-- TMPL_VAR Name="wbrcode" -->" >
-				<!-- TMPL_IF NAME="atdestination" -->
-				<strong>Waiting</strong> at <!-- TMPL_VAR Name="wbrcode" -->
-				<!-- TMPL_ELSE -->
-				In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="wbrcode" -->
-				<!-- /TMPL_IF -->
-				
-				<!-- TMPL_ELSE -->
-					<select name="pickup">
-						<!-- TMPL_LOOP Name="branchloop" -->
-							<option value="<!-- TMPL_VAR Name="branch" -->"<!-- TMPL_IF Name="selected" --> selected="selected"<!-- /TMPL_IF -->>
-								<!-- TMPL_VAR Name="branchname" -->
-							</option>
-						<!-- /TMPL_LOOP -->
-					</select>
-				<!-- /TMPL_IF -->
-			</td>
-			<td>
-				<!-- TMPL_IF Name="wait" -->
-					<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR Name="biblionumber"-->&type=intra" >
-						<!-- TMPL_VAR Name="barcode" -->
-					</a>
-				<!-- TMPL_ELSE -->
-					<!-- TMPL_IF Name="constrainttypea" -->
-						<!-- TMPL_VAR Name="barcode" -->
-					<!-- TMPL_ELSE -->
-						<!-- TMPL_IF Name="constrainttypeo" -->
-							Item : <!-- TMPL_VAR Name="volumeddesc" --> <!-- TMPL_VAR Name="barcode" -->
-						<!-- /TMPL_IF -->
-					<!-- /TMPL_IF -->
-				<!-- /TMPL_IF -->
-
-			</td>
-		</tr>
-	<!-- /TMPL_LOOP -->
-</table>
-<p>Delete a request by selecting "del" from the rank list.</p>
-<p><input type="submit" name="submit"  value="Update List" class="submit" /></p>
-</div></form><!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/serials/acqui-search-result.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/serials/acqui-search-result.tmpl
diff -N htdocs/intranet-tmpl/default/en/serials/acqui-search-result.tmpl
--- htdocs/intranet-tmpl/default/en/serials/acqui-search-result.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit -- Select supplier<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<h1>Supplier Search Results</h1>
-<h2>You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h2>
-<table>
-	<tr>
-		<th>Book seller</th>
-		<th>Select</th>
-	</tr>
-	<!-- TMPL_LOOP name="loop_suppliers" -->
-		<tr>
-			<td><!-- TMPL_VAR name="name" --></td>
-			<td><a href="#" onclick="javascript:GetIt(<!-- TMPL_VAR name="aqbooksellerid" -->,'<!-- TMPL_VAR name="name" -->')">Get It !</td>
-		</tr>
-	<!-- /TMPL_LOOP -->
-</table>
-
-<script language="Javascript">
-
-function GetIt(aqbooksellerid,name)
-{
-  opener.document.f.aqbooksellerid.value = aqbooksellerid;
-  opener.document.f.aqbooksellername.value = name;
-  self.close();
-}
-</script>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/serials/acqui-search.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/serials/acqui-search.tmpl
diff -N htdocs/intranet-tmpl/default/en/serials/acqui-search.tmpl
--- htdocs/intranet-tmpl/default/en/serials/acqui-search.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit -- Search supplier<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-
-
-<script language="Javascript">
-
-function GetIt(aqbooksellerid,name)
-{
-  opener.document.f.aqbooksellerid.value = aqbooksellerid;
-  opener.document.f.aqbooksellername.value = name;
-  self.close();
-}
-</script>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
-
-<h1>Search supplier for serial subscription</h1>
-	<form action="/cgi-bin/koha/serials/acqui-search-result.pl" method=post>
-		Supplier name : <input type="text"  size="25"   name="supplier">
-        <input type="submit" class="button serial" value="OK">
-	</form>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/serials/claims.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/serials/claims.tmpl
diff -N htdocs/intranet-tmpl/default/en/serials/claims.tmpl
--- htdocs/intranet-tmpl/default/en/serials/claims.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,166 +0,0 @@
-<!-- TMPL_UNLESS NAME="preview" -->
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!--
-TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
-
-<div id="main">
-<!-- TMPL_ELSE -->
-<!-- TMPL_INCLUDE NAME="popup-top.inc" -->
-<div class="popup-block">
-<!-- /TMPL_UNLESS -->
-
-<!-- TMPL_UNLESS NAME="preview" -->
-	<h1>Claims</h1>
-
-	<p>
-	<form action="claims.pl" method="post">
-	<input type="hidden" name="claimletter" value="<!-- TMPL_VAR NAME="claimletter"-->">
-	<!-- TMPL_VAR name="CGIsupplier" -->
-	<input type="submit" value="Filter by Supplier" class="button">
-	</form>
-	</p>
-<!--
-	<p>
-	<form action="claims.pl" method="post">
-	<input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid"-->">
-	<!-- TMPL_VAR name="CGIletter" -->
-	<input type="submit" value="Choose Claim Form" class="button">
-	</form>
-	</p> -->
-
-<form method="post" action="lateissues-excel.pl">
-<input type="hidden" name="op" value="claims" />
-
-		<!-- TMPL_IF NAME="missingissues" -->
-		<h3>Missing Issues</h3>
-		<table cellpadding="0" cellspacing="0" border="0" class="collapse">
-			<tr>
-				<th class="cell-header">&nbsp;</th>
-				<th class="cell-header">Supplier</th>
-				<th class="cell-header">Title</th>
-				<th class="cell-header">Issue number</th>
-				<th class="cell-header">Missing since</th>
-				<th class="cell-header">Began Claim</th>
-				<th class="cell-header">&nbsp;</th>
-			</tr>
-			<!-- TMPL_LOOP name="missingissues" -->
-				<tr>
-					<td class="cell">
-					<input type="checkbox" name="serialid" value="<!-- TMPL_VAR NAME="serialid"-->">
-					</td>
-					<td class="cell">
-					<!-- TMPL_VAR name="name" -->
-					</td>
-					<td class="cell">
-					<!-- TMPL_VAR name="Title" -->
-					</td>
-					<td class="cell">
-					<!-- TMPL_VAR name="serialseq" -->
-					</td>
-					<td class="cell">
-					<!-- TMPL_VAR name="planneddate" -->
-					</td>
-					<td class="cell">
-					<!-- TMPL_VAR name="claimdate" -->
-					</td>
-					<td class="cell">
-					<a href="lateissues-excel.pl?supplierid=<!--TMPL_VAR NAME="supplierid"-->&amp;serialid=<!-- TMPL_VAR name="serialid" -->&amp;op=claims" class="button">Export Item Data</a>
-					<!--
-					<a href="claims.pl?serialid=<!-- TMPL_VAR name="serialid" -->&amp;supplierid=<!-- TMPL_VAR name="supplierid" -->&amp;op=preview" onclick="popup(<!-- TMPL_VAR name="supplierid" -->,<!-- TMPL_VAR name="serialid" -->); return false">Claim Letter</a> -->
-					</td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-		</table>
-		<!-- TMPL_ELSE -->
-		<p>There are no missing issues to claim</p>
-		<!-- /TMPL_IF -->
-
-	<!-- TMPL_IF Name="singlesupplier"-->
-<input type="hidden" name="supplierid" value="<!--TMPL_VAR NAME="supplierid"-->" />
-
-		<!--
-		<a href="claims.pl?supplierid=<!-- TMPL_VAR
-name="supplierid" -->&amp;op=preview" onclick="popup(<!-- TMPL_VAR
-name="supplierid" -->,''); return false" class="button">Supplier Group Claim Letter</a></p> -->
-	<!-- /TMPL_IF -->
-<p><br/>
-		<input type="submit" name="submit" class="button" value="Export Selected Data" />
-
-</form>
-<!-- TMPL_ELSE -->
-	<!-- TMPL_IF Name="supplierloop"-->
-		<!-- TMPL_LOOP Name="supplierloop"-->
-		<!-- TMPL_IF NAME="name" -->
-		<p><b><!-- TMPL_VAR NAME="name" --></b><br />
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="postal" -->
-		<!-- TMPL_VAR NAME="postal" --><br />
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="contphone" -->
-		Ph: <!-- TMPL_VAR NAME="contphone" --><br />
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="contfax" -->
-		Fax: <!-- TMPL_VAR NAME="contfax" --><br />
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="contemail" -->
-		Email: <!-- TMPL_VAR NAME="contemail" --><br />
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="accountnumber" -->
-		A/C: <!-- TMPL_VAR NAME="accountnumber"></p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="contact" -->
-		<p>Dear <!-- TMPL_VAR NAME="contact" --></p>
-		<!-- TMPL_ELSE -->
-		<p>To whom it may concern</p>
-		<!-- /TMPL_IF -->
-		<p>The following items have not been received from you and are now considered missing:</p>
-		<!-- /TMPL_LOOP -->
-	<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="missingissues" -->
-		<h3>Missing Issues</h3>
-		<table cellpadding="0" cellspacing="4" border="0" width="550" class="collapse">
-			<tr>
-				<td class="cell"><b>Supplier<b></td>
-				<td class="cell"><b>Title</b></td>
-				<td class="cell"><b>Issue number</b></td>
-				<td class="cell"><b>Missing since</b></td>
-			</tr>
-			<!-- TMPL_LOOP name="missingissues" -->
-				<tr>
-					<td class="cell">
-					<!-- TMPL_VAR name="name" -->
-					</td>
-					<td class="cell">
-					<!-- TMPL_VAR name="Title" -->
-					</td>
-					<td class="cell">
-					<!-- TMPL_VAR name="serialseq" -->
-					</td>
-					<td class="cell">
-					<!-- TMPL_VAR name="planneddate" -->
-					</td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-		</table>
-		<!-- /TMPL_IF -->
-<br />
-<p class="noprint"><a href="javascript:window.print()" class="button">Print</a> &nbsp; <a href="javascript:window.close()" class="button">Close</a></p>
-<!-- /TMPL_UNLESS -->
-
-</div>
-<script type="text/javascript">
-<!--
-
-function popup(supplierid,serialid){
-	window.open('claims.pl?supplierid='+ supplierid +'&amp;serialid='+ serialid +'&amp;op=preview' ,'popup', 'width=600,height=400,toolbar=no,scrollbars=yes');
-}
-//-->
-</script>
-<!-- TMPL_UNLESS NAME="preview" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-<!-- TMPL_ELSE -->
-<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
-<!-- /TMPL_UNLESS -->
-
-

Index: htdocs/intranet-tmpl/default/en/serials/distributedto.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/serials/distributedto.tmpl
diff -N htdocs/intranet-tmpl/default/en/serials/distributedto.tmpl
--- htdocs/intranet-tmpl/default/en/serials/distributedto.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,88 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit -- Select supplier<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
-
-<div id="main">
-	<h1>Select borrowers or enter manually the names</h1>
-	<p>
-		<form action="/cgi-bin/koha/serials/distributedto.pl" method="post" name="Aform">
-			<table>
-			<tr>
-			<td>
-				<input type="text" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->">
-				<input type="submit" class="button" value="Filter">
-			</td>
-			<td rowspan="2">
-				<h2>Distributed to</h2>
-				<p>
-					<textarea name="distributedto" rows="15" cols="30"><!-- TMPL_VAR name="distributedto" --></textarea>
-				</p>
-				<p>
-					<!-- TMPL_IF name="save" -->
-						saved</p><p>
-					<!-- /TMPL_IF -->
-					<input type="hidden" name="SaveList" value="0">
-					<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
-					<input type="button" name="save" value="Save" class="button" onClick="FSaveList()">
-					<input type="button" name="clode" value="Close" class="button" onClick="javascript:window.close()">
-			</td>
-			</tr>
-			<tr>
-			<td>
-				<!-- TMPL_VAR NAME="borrowername" -->
-				<select name="borlist" size="15">
-					<!-- TMPL_LOOP name="borlist" -->
-						<option value="<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->">
-							<!-- TMPL_VAR name="surname" --> <!-- TMPL_VAR name="firstname" -->
-						</option>
-					<!-- /TMPL_LOOP -->
-				</select>
-				<input type="button" name="insert" value="&gt;&gt;" class="button" onclick="insertValueQuery()" title="Insert" />
-			</td>
-			</tr>
-			</table>
-		</form>
-	</p>
-	<script language="javascript" type="text/javascript">
-		// GPL code coming from PhpMyAdmin
-		function insertValueQuery() {
-			var myQuery = document.Aform.distributedto;
-			var myListBox = document.Aform.borlist;
-		
-			if(myListBox.options.length > 0) {
-				var chaineAj = "";
-				var NbSelect = 0;
-				for(var i=0; i<myListBox.options.length; i++) {
-					if (myListBox.options[i].selected){
-						NbSelect++;
-						if (NbSelect > 1)
-							chaineAj += ", ";
-						chaineAj += myListBox.options[i].value;
-					}
-				}
-		
-				//IE support
-				if (document.selection) {
-					myQuery.focus();
-					sel = document.selection.createRange();
-					sel.text = chaineAj;
-					document.Aform.insert.focus();
-				}
-				//MOZILLA/NETSCAPE support
-				else if (document.Aform.distributedto.selectionStart || document.Aform.distributedto.selectionStart == "0") {
-					var startPos = document.Aform.distributedto.selectionStart;
-					var endPos = document.Aform.distributedto.selectionEnd;
-					var chaineSql = document.Aform.distributedto.value;
-					myQuery.value = chaineSql.substring(0, startPos) +''+ chaineAj+"\n" + chaineSql.substring(endPos, chaineSql.length);
-				} else {
-					myQuery.value += chaineAj;
-				}
-			}
-		}
-		function FSaveList() {
-			document.Aform.SaveList.value=1;
-			document.Aform.submit();
-		}
-	</script>
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/serials/lateissues.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/serials/lateissues.tmpl
diff -N htdocs/intranet-tmpl/default/en/serials/lateissues.tmpl
--- htdocs/intranet-tmpl/default/en/serials/lateissues.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,86 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
-
-<div id="main">
-<h1>Late issues</h1>
-<p>
-	<form action="lateissues.pl" method="post">
-		<!-- TMPL_VAR name="CGIsupplier" -->
-			<!-- TMPL_IF name="phone" -->Phone: <!-- TMPL_VAR name="phone" --><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="booksellerfax" -->Fax: <!-- TMPL_VAR name="booksellerfax" --><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="bookselleremail" --></p><p><a href="mailto:<!-- TMPL_VAR name="bookselleremail" -->"><!-- TMPL_VAR name="bookselleremail" --></a><!-- /TMPL_IF -->
-		<input type="submit" value="filter">
-	</form>
-</p>
-        <!-- TMPL_IF NAME="lateissues" -->
-	
-<table>
-	<tr>
-		<th>Title</th>
-		<th>Issue number</th>
-		<th>Late since</th>
-		<th colspan=2>&nbsp;</th>
-	</tr>
-	<!-- TMPL_LOOP name="lateissues" -->
-		<tr>
-			<!-- TMPL_IF name="odd" -->
-				<td class="hilighted"><!-- TMPL_IF name="title" --><!-- TMPL_VAR name="title" --><!-- TMPL_ELSE -->|<!-- /TMPL_IF --></td>
-				<td class="hilighted"><!-- TMPL_VAR name="serialseq" --></td>
-				<td class="hilighted"><!-- TMPL_VAR name="planneddate" --></td>
-				<td class="hilighted">
-					<a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Detail</a>
-					<a href="serials-recieve.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Recieve</a>
-				</td>
-			<!-- TMPL_ELSE -->
-				<td><!-- TMPL_VAR name="title" --></td>
-				<td><!-- TMPL_VAR name="serialseq" --></td>
-				<td><!-- TMPL_VAR name="planneddate" --></td>
-				<td>
-					<a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Detail</a>
-					<a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Receive</a>
-				</td>
-			<!-- /TMPL_IF -->
-		</tr>
-	<!-- /TMPL_LOOP -->
-</table>
-        <!-- TMPL_ELSE -->
-               <p>There are currently no outstanding issues.</p>
-	<!-- /TMPL_IF -->
-	
-        <!-- TMPL_IF NAME="missingissues" -->
-	        <h1 class="bull">Missing Issues</h1>
-		<table cellpadding="0" cellspacing="0" border="0" class="collapse">
-		<tr>
-		<th class="cell-header">Supplier</th>
-		<th class="cell-header">Title</th>
-		<th class="cell-header">Issue number</th>
-		<th class="cell-header">Missing since</th>
-		<th class="cell-header">&nbsp;</th>
-		</tr>
-		<!-- TMPL_LOOP name="missingissues" -->
-		<tr>
-		<td class="cell">
-		<!-- TMPL_VAR name="name" -->
-		</td>
-		<td class="cell">
-		<!-- TMPL_VAR name="Title" -->
-		</td>
-		<td class="cell">
-		<!--TMPL_VAR name="serialseq" -->
-		</td>
-		<td class="cell">
-		<!-- TMPL_VAR name="planneddate" -->
-		</td>
-		<td class="cell">
-		<a href="statecollection.pl?op=found&amp;planneddate=<!-- TMPL_VAR name="planneddate" -->&amp;missingissue=<!-- TMPL_VAR name="serialseq" -->&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Receive</a>
-                </td>
-		</tr>
-		<!--/TMPL_LOOP -->
-		</table>
-	<!-- /TMPL_IF -->
-		
-</div>		       
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-

Index: htdocs/intranet-tmpl/default/en/serials/member-search.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/serials/member-search.tmpl
diff -N htdocs/intranet-tmpl/default/en/serials/member-search.tmpl
--- htdocs/intranet-tmpl/default/en/serials/member-search.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,45 +0,0 @@
-<!-- TMPL_INCLUDE NAME="popup-top.inc" -->
-<script type="text/javascript">
-<!--
-
-function add_member(subscriptionid,bornum){
-     var myurl = "routing.pl?subscriptionid="+subscriptionid+"&bornum="+bornum+"&op=add";
-     window.opener.location.href = myurl;
-}
-
-//-->
-</script>
-
-<div class="popup-block">
-<h1>Member Search</h1>
-
-<p>
-<form name="search" action="/cgi-bin/koha/serials/member-search.pl" method="post">
-<input type="text" name="member" size="30" />
-<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->">
-<input type="submit" class="button" value="Search" />
-</form>
-</p>
-<!-- TMPL_IF NAME="memberloop" -->
-<table cellspacing="0" cellpadding="0" border="0" width="480" class="collapse">
-<tr><td class="cell-header">Name</td>
-    <td class="cell-header">Location</td>
-    <td class="cell-header">Add</td></tr>
-<!-- TMPL_LOOP NAME="memberloop" -->
-<tr><td class="cell"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></td>
-    <td class="cell"><!-- TMPL_VAR NAME="streetaddress" --></td>
-    <td class="cell"><a onclick="add_member(<!-- TMPL_VAR
-NAME="subscriptionid" -->,<!-- TMPL_VAR NAME="borrowernumber" -->); return false" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;op=add">Add</a></td></tr>
-<!-- /TMPL_LOOP -->
-        </table></td></tr>
-</table>
-<!-- TMPL_ELSE -->
-    <!-- TMPL_IF NAME="member" -->
-        <p>No results found</p>
-    <!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
-<br />
-<p><a href="javascript:self.close()" class="button">Close</a></p>
-</div>
-
-<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/serials/printlist.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/serials/printlist.tmpl
diff -N htdocs/intranet-tmpl/default/en/serials/printlist.tmpl
--- htdocs/intranet-tmpl/default/en/serials/printlist.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-<html>
-
-<!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
-
-<body onLoad="window.print();">
-<h1>Distribution list</h1>
-<h2>Title : <!-- TMPL_VAR name="title" -->, <!-- TMPL_VAR name="serialseq" --></h2>
-<div style="border : 1px solid black;">
-	<!-- TMPL_VAR name="distributedto" -->
-</div>
-
-<div style=border-top: 1px solid black;">
-	<p><!-- TMPL_VAR name="branchname" --></p>
-	<p><!-- TMPL_VAR name="branchaddress1" --></p>
-	<p><!-- TMPL_VAR name="branchaddress2" --></p>
-	<p><!-- TMPL_VAR name="branchaddress3" --></p>
-	<p>phone : <!-- TMPL_VAR name="branchphone" --> <i><!-- TMPL_VAR name="branchemail" --></i></p>
-</div>
-
-</body>
-</html>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/serials/receipt-search-result.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/serials/receipt-search-result.tmpl
diff -N htdocs/intranet-tmpl/default/en/serials/receipt-search-result.tmpl
--- htdocs/intranet-tmpl/default/en/serials/receipt-search-result.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,80 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
-
-<div id="main">
-	<h1 class="authority">Serial search results</h1>
-	<div id="resultnumber">
-		<p>
-			<!-- TMPL_IF NAME=displayprev -->
-				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search>
-					<img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0>
-				</a>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME=numbers -->
-				<!-- TMPL_IF NAME=highlight -->
-					<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
-				<!-- TMPL_ELSE -->
-					<a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
-				<!-- /TMPL_IF -->
-			<!-- /TMPL_LOOP -->
-			<!-- TMPL_IF NAME=displaynext -->
-				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
-				<!-- /TMPL_IF -->
-		</p>
-
-	</div>
-	<div id="resultlist">
-		<table>
-			<tr>
-				<th class="authority">Serial</th>
-				<th class="authority">View</th>
-				<th class="authority">State of collection</th>
-				<th class="authority">Delete</th>
-			</tr>
-			<!-- TMPL_LOOP name="result" -->
-				<tr>
-					<td><!-- TMPL_VAR name="serial" --></td>
-
-					<td>
-		<div align="center">				<a href="subscription-detail.pl?suscr=<!-- TMPL_VAR name="subscriptionid" -->">
-							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0" alt="Authority number <!-- TMPL_VAR name="authid" -->" title="Serial number<!-- TMPL_VAR name="subscriptionid" -->">
-						</a> </div>
-					</td>
-	<td><div align="center"><a href="serials-recieve.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&serial=<!-- TMPL_VAR name="serial" -->">
-
-							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/Fleche.jpg"  width="32" hspace="0" vspace="0" border="0" alt="Subscribtion serial<!-- TMPL_VAR name="subscriptionid" -->" title="Serial number<!-- TMPL_VAR name="subscriptionid" -->">
-
-
-</a></td></div>
-				</tr>
-			<!-- /TMPL_LOOP -->
-		</table>
-	</div>
-	<div id="resultnumber">
-		<p>
-			<!-- TMPL_IF NAME=displayprev -->
-			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME=numbers -->
-				<!-- TMPL_IF NAME=highlight -->
-				<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
-				<!-- TMPL_ELSE -->
-				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
-				<!-- /TMPL_IF -->
-			<!-- /TMPL_LOOP -->
-			<!-- TMPL_IF NAME=displaynext -->
-			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
-				<!-- /TMPL_IF -->
-		</p>
-	</div>	
-</div>
-<!-- TMPL_INCLUDE NAME="serials-bottom.inc" -->
-
-
-<script language="JavaScript" type="text/javascript" >
-function do_delete(page)
-{
-window.location = page;
-}
-</script>

Index: htdocs/intranet-tmpl/default/en/serials/result.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/serials/result.tmpl
diff -N htdocs/intranet-tmpl/default/en/serials/result.tmpl
--- htdocs/intranet-tmpl/default/en/serials/result.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,86 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-
-
-	<h1 class="catalogue">Search results</h1>
-	<div id="resultnumber">
-		<p>
-			<!-- TMPL_IF NAME=displayprev -->
-				<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search>
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border=0>
-				</a>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME=numbers -->
-				<!-- TMPL_IF NAME=highlight -->
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
-				<!-- TMPL_ELSE -->
-					<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
-				<!-- /TMPL_IF -->
-			<!-- /TMPL_LOOP -->
-			<!-- TMPL_IF NAME=displaynext -->
-				<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border=0></a>
-				<!-- /TMPL_IF -->
-		</p>
-		<p>
-			<!-- TMPL_IF name=total -->
-			&nbsp<b>Results <!-- TMPL_VAR name="from" --> to <!-- TMPL_VAR name="to" --> of <!-- TMPL_VAR name="total" --></b><br><br>
-			<!-- TMPL_ELSE -->
-			&nbsp No results found.<br>
-			<!-- /TMPL_IF -->
-		</p>
-	</div>
-	<div id="resultlist">
-		<table>
-			<tr>
-			<th class="catalogue">Summary</th>
-			<th class="catalogue">&nbsp;</th>
-			</tr>
-			<!-- TMPL_LOOP name="result" -->
-			<tr>
-				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
-					<p>
-						<p><b><!-- TMPL_VAR NAME="title" --></b></p>
-						<p><!-- TMPL_VAR NAME="author" -->
-						<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="notes" --> : <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
-					</p>
-				</td>
-				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
-						<a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" escape="URL" -->') ">Get it!</a>
-				</td>
-			</tr>
-			<!-- /TMPL_LOOP -->
-		</table>
-	</div>
-	<div id="resultnumber">
-		<p>
-			<!-- TMPL_IF NAME=displayprev -->
-			<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border=0></a>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME=numbers -->
-				<!-- TMPL_IF NAME=highlight -->
-				<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
-				<!-- TMPL_ELSE -->
-				<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
-				<!-- /TMPL_IF -->
-			<!-- /TMPL_LOOP -->
-			<!-- TMPL_IF NAME=displaynext -->
-			<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border=0></a>
-				<!-- /TMPL_IF -->
-		</p>
-	</div>	
-
-
-
-<script language="Javascript">
-
-function GetIt(bibno,title)
-{
-  opener.document.f.biblionumber.value = bibno;
-  opener.document.f.title.value = title;
-  self.close();
-}
-</script>
\ No newline at end of file

Index: htdocs/intranet-tmpl/default/en/serials/routing-preview-slip.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/serials/routing-preview-slip.tmpl
diff -N htdocs/intranet-tmpl/default/en/serials/routing-preview-slip.tmpl
--- htdocs/intranet-tmpl/default/en/serials/routing-preview-slip.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-<!-- TMPL_INCLUDE NAME="popup-top.inc" -->
-
-<div id="slip-block">
-<table cellspacing="0" cellpadding="0" border="0" class="collapse routingslip">
-<tr><td class="cell" colspan="3"><h3>Opus International Consultants - Information Centre</h3></td></tr>
-<tr><td class="cell" colspan="3"><b>Title:</b> <!-- TMPL_VAR NAME="title" --><br />
-<!-- TMPL_VAR NAME="issue" --></td></tr>
-<tr><td class="cell"><b>Name/Location</b></td>
-    <td class="cell"><b>Date Due</b></td></tr>
-<!-- TMPL_LOOP NAME="memberloop" -->
-        <tr><td class="name"><b><!-- TMPL_VAR NAME="name" --></b> <!-- TMPL_VAR NAME="location" --></td>
-            <td class="date">&nbsp;</td></tr>
-<!-- /TMPL_LOOP -->
-</table>
-<p><b>Notes:</b> Please return this journal
-promptly as others are waiting.
-<br /><!-- TMPL_VAR NAME="routingnotes" --></p>
-   <div id="slip-block-links">
-   <a class="button" href="javascript:window.print();self.close()">Print</a> &nbsp; <a class="button" href="javascript:self.close()">Close</a>
-   </div>
-</div>
-
-<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->

Index: htdocs/intranet-tmpl/default/en/serials/routing-preview.tmpl
===================================================================
RCS file: htdocs/intranet-tmpl/default/en/serials/routing-preview.tmpl
diff -N htdocs/intranet-tmpl/default/en/serials/routing-preview.tmpl
--- htdocs/intranet-tmpl/default/en/serials/routing-preview.tmpl	10 Mar 2007 01:54:30 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,44 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
-
-<div id="main">
-<h1 class="bull">Preview Routing List</h1>
-
-<form method="post" action="routing-preview.pl">
-<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" />
-<p><b>Serial Title:</b> <!-- TMPL_VAR NAME="title" --></p>
-<p><b>Issue:</b> <!-- TMPL_VAR NAME="issue" --></p>
-
-<table border="0" cellspacing="0" cellpadding="0">
-<tr valign="top"><td style="padding-top: 5px;"><b>List Member:</b>&nbsp;</td>
-    <td><table cellspacing="0" cellpadding="0" border="0" class="collapse">
-        <tr><td class="cell-header">Name</td>
-            <td class="cell-header">Location</td></tr>
-<!-- TMPL_LOOP NAME="memberloop" -->
-        <tr><td class="cell"><!-- TMPL_VAR NAME="name" --></td>
-            <td class="cell"><!-- TMPL_VAR NAME="location" --></td></tr>
-<!-- /TMPL_LOOP -->
-        </table></td></tr>
-<tr valign="top"><td colspan="2">&nbsp;</td></tr>
-<tr valign="top"><td><b>Notes:</b></td>
-    <td><!-- TMPL_VAR NAME="routingnotes" --></td></tr>
-</table>
-<p>
-<input type="submit" name="ok" class="button" value="OK, Preview Routing Slip" onclick="print_slip(<!-- TMPL_VAR NAME="subscriptionid" -->,'<!-- TMPL_VAR NAME="issue" -->'); return false" />
-<input type="submit" name="edit" class="button" value="Edit" />
-<input type="submit" name="delete" class="button" value="Delete" /></p>
-</form>
-</div>
-
-<script type="text/javascript">
-<!--
-
-function print_slip(subscriptionid,issue){
-    var myurl = 'routing-preview.pl?ok=1&subscriptionid='+subscriptionid+'&issue='+issue;
-window.open(myurl,'PrintSlip','width=400,height=500,toolbar=no,scrollbars=yes');
-    window.location.href='serials-home.pl';
-}
-//-->
-</script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->