[Koha-cvs] koha/koha-tmpl/intranet-tmpl/default/fr auth.tm... [rel_2_2]

paul poulain paul at koha-fr.org
Tue Oct 17 09:26:46 CEST 2006


CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	paul poulain <tipaul>	06/10/17 07:26:45

Modified files:
	koha-tmpl/intranet-tmpl/default/fr: auth.tmpl intranet-main.tmpl 
	                                    modbibitem.tmpl overdue.tmpl 
	                                    stats.tmpl 
	koha-tmpl/intranet-tmpl/default/fr/acqui: acqui-home.tmpl 
	                                          acquire.tmpl 
	                                          basket.tmpl 
	                                          lateorders.tmpl 
	                                          newbasket2.tmpl 
	                                          newbiblio.tmpl 
	                                          order.tmpl 
	                                          recieve.tmpl 
	                                          recieveorder.tmpl 
	                                          suggestion-select.tmpl 
	                                          supplier.tmpl 
	koha-tmpl/intranet-tmpl/default/fr/acqui.simple: addbiblio.tmpl 
	                                                 addbooks.tmpl 
	                                                 additem.tmpl 
	                                                 isbnsearch.tmpl 
	koha-tmpl/intranet-tmpl/default/fr/authorities: auth_finder.tmpl 
	                                                authorities-home.tmpl 
	                                                authorities.tmpl 
	                                                blinddetail-biblio-search.tmpl 
	                                                detail.tmpl 
	                                                searchresultlist-auth.tmpl 
	koha-tmpl/intranet-tmpl/default/fr/bull: full-serial-issues.tmpl 
	                                         lateissues.tmpl 
	                                         statecollection.tmpl 
	                                         subscription-add.tmpl 
	                                         subscription-detail.tmpl 
	koha-tmpl/intranet-tmpl/default/fr/catalogue: MARCdetail.tmpl 
	                                              detail.tmpl 
	koha-tmpl/intranet-tmpl/default/fr/circ: circulation.tmpl 
	                                         returns.tmpl 
	koha-tmpl/intranet-tmpl/default/fr/export: marc.tmpl 
	koha-tmpl/intranet-tmpl/default/fr/help/acqui: newbiblio.tmpl 
	koha-tmpl/intranet-tmpl/default/fr/help/admin: categorie.tmpl 
	                                               marc_subfields_structure.tmpl 
	                                               systempreferences.tmpl 
	koha-tmpl/intranet-tmpl/default/fr/help/bull: 
	                                              statecollection.tmpl 
	koha-tmpl/intranet-tmpl/default/fr/includes: about-top.inc 
	                                             acquisitions-top.inc 
	                                             auth-search-top.inc 
	                                             auth-top.inc 
	                                             bull-top.inc 
	                                             cat-top.inc 
	                                             circulation-top.inc 
	                                             common-print.css 
	                                             error-top.inc 
	                                             help-bottom.inc 
	                                             help-top.inc 
	                                             marc-editor.css 
	                                             marc-top.inc 
	                                             members-top.inc 
	                                             menus.inc 
	                                             neutral-top.inc 
	                                             opac-top.inc 
	                                             parameters-top.inc 
	                                             popup-top.inc 
	                                             quicksearch-top.inc 
	                                             reports-top.inc 
	                                             reportswcal-top.inc 
	koha-tmpl/intranet-tmpl/default/fr/members: jmemberentry.tmpl 
	                                            memberentry.tmpl 
	                                            moremember-receipt.tmpl 
	                                            moremember.tmpl 
	koha-tmpl/intranet-tmpl/default/fr/parameters: admin-home.tmpl 
	                                               aqbookfund.tmpl 
	                                               auth_subfields_structure.tmpl 
	                                               auth_tag_structure.tmpl 
	                                               issuingrules.tmpl 
	                                               marc_subfields_structure.tmpl 
	                                               marctagstructure.tmpl 
	                                               printers.tmpl 
	                                               systempreferences.tmpl 
	koha-tmpl/intranet-tmpl/default/fr/reports: bor_issues_top.tmpl 
	                                            borrowers_out.tmpl 
	                                            inventory.tmpl 
	                                            issues_by_borrower_category.tmpl 
	                                            itemtypes.tmpl 
	                                            reports-home.tmpl 
	koha-tmpl/intranet-tmpl/default/fr/search.marc: dictionary.tmpl 
	                                                result.tmpl 
	koha-tmpl/intranet-tmpl/default/fr/value_builder: 
	                                                  labs_theses.tmpl 
	koha-tmpl/intranet-tmpl/default/fr/z3950: searchresult.tmpl 
Added files:
	koha-tmpl/intranet-tmpl/default/fr/help/acqui: acqui-home.tmpl 
	                                               basket.tmpl 
	                                               order.tmpl 
	                                               recieve.tmpl 
	                                               recieveorder.tmpl 
	koha-tmpl/intranet-tmpl/default/fr/help/reports: inventory.tmpl 
	koha-tmpl/intranet-tmpl/default/fr/images: exception.jpg 
	koha-tmpl/intranet-tmpl/default/fr/images/numbers: 
	                                                   1-highlight.gif 
	                                                   1.gif 
	                                                   10-highlight.gif 
	                                                   10.gif 
	                                                   11-highlight.gif 
	                                                   11.gif 
	                                                   12-highlight.gif 
	                                                   12.gif 
	                                                   13-highlight.gif 
	                                                   13.gif 
	                                                   14-highlight.gif 
	                                                   14.gif 
	                                                   15-highlight.gif 
	                                                   15.gif 
	                                                   16-highlight.gif 
	                                                   16.gif 
	                                                   17-highlight.gif 
	                                                   17.gif 
	                                                   18-highlight.gif 
	                                                   18.gif 
	                                                   19-highlight.gif 
	                                                   19.gif 
	                                                   2-highlight.gif 
	                                                   2.gif 
	                                                   20-highlight.gif 
	                                                   20.gif 
	                                                   21-highlight.gif 
	                                                   21.gif 
	                                                   22-highlight.gif 
	                                                   22.gif 
	                                                   23-highlight.gif 
	                                                   23.gif 
	                                                   24-highlight.gif 
	                                                   24.gif 
	                                                   25-highlight.gif 
	                                                   25.gif 
	                                                   26-highlight.gif 
	                                                   26.gif 
	                                                   27-highlight.gif 
	                                                   27.gif 
	                                                   28-highlight.gif 
	                                                   28.gif 
	                                                   29-highlight.gif 
	                                                   29.gif 
	                                                   3-highlight.gif 
	                                                   3.gif 
	                                                   30-highlight.gif 
	                                                   30.gif 
	                                                   31-highlight.gif 
	                                                   31.gif 
	                                                   4-highlight.gif 
	                                                   4.gif 
	                                                   5-highlight.gif 
	                                                   5.gif 
	                                                   6-highlight.gif 
	                                                   6.gif 
	                                                   7-highlight.gif 
	                                                   7.gif 
	                                                   8-highlight.gif 
	                                                   8.gif 
	                                                   9-highlight.gif 
	                                                   9.gif 
	                                                   next.gif 
	                                                   placeholder.gif 
	                                                   prev.gif 
	koha-tmpl/intranet-tmpl/default/fr/import: picture-upload.tmpl 
	koha-tmpl/intranet-tmpl/default/fr/includes: hierarchy.css 
	koha-tmpl/intranet-tmpl/default/fr/includes/calendar: cal.gif 
	                                                      calendar-en.js 
	                                                      calendar-setup.js 
	                                                      calendar-system.css 
	                                                      calendar.js 
	koha-tmpl/intranet-tmpl/default/fr/includes/countryCodes: 
	                                                          countryCodes.dat 
	koha-tmpl/intranet-tmpl/default/fr/includes/labelConfig: 
	                                                         itemsLabelConfig.conf 
	koha-tmpl/intranet-tmpl/default/fr/reports: reservereport.tmpl 
	koha-tmpl/intranet-tmpl/default/fr/value_builder: macles.tmpl 

Log message:
	french templates for 2.2.6

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/auth.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.4.2.1&r2=1.4.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/intranet-main.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.9.2.2&r2=1.9.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/modbibitem.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.4&r2=1.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/overdue.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.4.2.2&r2=1.4.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/stats.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3&r2=1.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acqui-home.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.6.2.2&r2=1.6.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acquire.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.4.2.2&r2=1.4.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.8.2.1&r2=1.8.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/lateorders.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket2.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.7.2.1&r2=1.7.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.8.2.2&r2=1.8.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/order.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.5.2.1&r2=1.5.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/recieve.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.4.2.1&r2=1.4.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/recieveorder.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3.2.1&r2=1.3.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/suggestion-select.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/supplier.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.7.2.1&r2=1.7.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.13.2.2&r2=1.13.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbooks.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.6.2.2&r2=1.6.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/additem.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.9.2.2&r2=1.9.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/isbnsearch.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.5.2.2&r2=1.5.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/auth_finder.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/authorities-home.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/authorities.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/blinddetail-biblio-search.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/detail.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/searchresultlist-auth.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/bull/full-serial-issues.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/bull/lateissues.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/bull/statecollection.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-add.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-detail.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/MARCdetail.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.10.2.2&r2=1.10.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.9.2.3&r2=1.9.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.11.2.2&r2=1.11.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/circ/returns.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.7.2.1&r2=1.7.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/export/marc.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3.2.2&r2=1.3.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/help/acqui/newbiblio.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/help/acqui/acqui-home.tmpl?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/help/acqui/basket.tmpl?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/help/acqui/order.tmpl?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/help/acqui/recieve.tmpl?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/help/acqui/recieveorder.tmpl?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/help/admin/categorie.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/help/admin/marc_subfields_structure.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/help/admin/systempreferences.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/help/bull/statecollection.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/help/reports/inventory.tmpl?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/exception.jpg?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/1-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/1.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/10-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/10.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/11-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/11.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/12-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/12.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/13-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/13.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/14-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/14.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/15-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/15.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/16-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/16.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/17-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/17.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/18-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/18.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/19-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/19.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/2-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/2.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/20-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/20.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/21-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/21.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/22-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/22.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/23-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/23.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/24-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/24.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/25-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/25.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/26-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/26.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/27-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/27.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/28-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/28.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/29-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/29.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/3-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/3.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/30-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/30.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/31-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/31.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/4-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/4.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/5-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/5.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/6-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/6.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/7-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/7.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/8-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/8.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/9-highlight.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/9.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/next.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/placeholder.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/images/numbers/prev.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/import/picture-upload.tmpl?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/about-top.inc?cvsroot=koha&only_with_tag=rel_2_2&r1=1.6.2.1&r2=1.6.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-top.inc?cvsroot=koha&only_with_tag=rel_2_2&r1=1.11.2.1&r2=1.11.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/auth-search-top.inc?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/auth-top.inc?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/bull-top.inc?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/cat-top.inc?cvsroot=koha&only_with_tag=rel_2_2&r1=1.15.2.1&r2=1.15.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-top.inc?cvsroot=koha&only_with_tag=rel_2_2&r1=1.14.2.1&r2=1.14.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/common-print.css?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/error-top.inc?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/help-bottom.inc?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/help-top.inc?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/marc-editor.css?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/marc-top.inc?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/members-top.inc?cvsroot=koha&only_with_tag=rel_2_2&r1=1.13.2.1&r2=1.13.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/menus.inc?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/neutral-top.inc?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/opac-top.inc?cvsroot=koha&only_with_tag=rel_2_2&r1=1.5&r2=1.5.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-top.inc?cvsroot=koha&only_with_tag=rel_2_2&r1=1.13.2.2&r2=1.13.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/popup-top.inc?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/quicksearch-top.inc?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/reports-top.inc?cvsroot=koha&only_with_tag=rel_2_2&r1=1.12.2.1&r2=1.12.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/reportswcal-top.inc?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/hierarchy.css?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/calendar/cal.gif?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/calendar/calendar-en.js?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/calendar/calendar-setup.js?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/calendar/calendar-system.css?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/calendar/calendar.js?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/countryCodes/countryCodes.dat?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/labelConfig/itemsLabelConfig.conf?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/members/jmemberentry.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.10&r2=1.10.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/members/memberentry.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.13.2.3&r2=1.13.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/members/moremember-receipt.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/members/moremember.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.17.2.2&r2=1.17.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/admin-home.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.8.2.2&r2=1.8.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.7.2.2&r2=1.7.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/auth_subfields_structure.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/auth_tag_structure.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/issuingrules.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/marc_subfields_structure.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.6.2.2&r2=1.6.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/marctagstructure.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.10.2.2&r2=1.10.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/printers.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.4.2.2&r2=1.4.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/systempreferences.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.6.2.2&r2=1.6.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/reports/bor_issues_top.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/reports/borrowers_out.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/reports/inventory.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3&r2=1.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/reports/issues_by_borrower_category.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/reports/itemtypes.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/reports/reports-home.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.6.2.2&r2=1.6.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/reports/reservereport.tmpl?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc/dictionary.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc/result.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.6.2.1&r2=1.6.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/labs_theses.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/macles.tmpl?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/z3950/searchresult.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3.2.1&r2=1.3.2.2

Patches:
Index: auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/Attic/auth.tmpl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- auth.tmpl	5 Jan 2006 15:17:56 -0000	1.4.2.1
+++ auth.tmpl	17 Oct 2006 07:26:43 -0000	1.4.2.2
@@ -1,4 +1,4 @@
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="nopermission" -->
 <!-- This is what is displayed if user doesn't have permission -->

Index: intranet-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/Attic/intranet-main.tmpl,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -b -r1.9.2.2 -r1.9.2.3
--- intranet-main.tmpl	5 Jan 2006 15:17:56 -0000	1.9.2.2
+++ intranet-main.tmpl	17 Oct 2006 07:26:43 -0000	1.9.2.3
@@ -3,7 +3,7 @@
 <head>
 	<title>BIENVENUE DANS L'INTRANET KOHA </title>
 	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/intranet-main.css">
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<!-- 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=iso-8859-1"><!-- /TMPL_IF -->
 <!-- JAVASCRIPT SCRIPTS -->
 	<script language="JavaScript" type="text/javascript">
 		var IE = document.all?true:false;
@@ -88,7 +88,7 @@
 			<a class="catalogue" href="/cgi-bin/koha/bull-home.pl">Périodiques</a>
 				<p>Gestion des abonnements et des périodiques</p>
 			<a href="/cgi-bin/koha/bookshelves/shelves.pl" class="catalogue">Etagères Virtuelles</a>
-				<p>Les étagères virtuelles peuvent être utilisées par des bibliothécaires ou des usagers pour constituer des bibliothèques virtuelles au sein de la vraie. L'étagère virtuelle peut être utilisé par un enseignant pour aider ses élèves dans la recherche d'information sur un sujet particulier.On peut l'utiliser  dans une bibliothèque pour indiquer des listes de documents (les plus empruntés, les plus représentatifs...).</p>
+				<p>Les étagères virtuelles peuvent être utilisées par des bibliothécaires ou des lecteurs pour constituer des bibliothèques virtuelles au sein de la vraie. L'étagère virtuelle peut être utilisé par un enseignant pour aider ses élèves dans la recherche d'information sur un sujet particulier. On peut l'utiliser dans une bibliothèque pour indiquer des listes de documents (les plus empruntés, les plus représentatifs...).</p>
 			<!-- TMPL_IF NAME="NOTMARC" -->
 				<form action="/cgi-bin/koha/loadmodules.pl" method="post">
 					<input type="hidden" name="module" value="search">
@@ -125,7 +125,7 @@
 			Nom Fournisseur : <input type="text"  size="25"   name="supplier">
 			<input type="submit" class="button acquisition" value="OK">
 			</form>
-			<p>ou <a href="histsearch.pl" class="button acquisition">Recherche dans l'historique des commandes</a></p>
+			<p>ou <a href="acqui/histsearch.pl" class="button acquisition">Recherche dans l'historique des commandes</a></p>
 			
 		</div>
 		<div id="Hint4" class="hint">
@@ -158,7 +158,7 @@
 			</div>
 			<div id="bloc25">
 			<h2 class="reports">Les plus</h2>
-				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/bor_issues_top.pl">Plus gros usagers</a></p>
+				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/bor_issues_top.pl">Plus gros lecteurs</a></p>
 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/cat_issues_top.pl">Documents les plus empruntés</a></p>
 			</div>
 		</div>

Index: modbibitem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/Attic/modbibitem.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- modbibitem.tmpl	5 Jan 2005 14:33:21 -0000	1.4
+++ modbibitem.tmpl	17 Oct 2006 07:26:43 -0000	1.4.2.1
@@ -23,7 +23,7 @@
 			<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="2" ><b><input type="radio" name="existing" value="NO" checked >OU MODIFIER DES DETAILS</b></td>
 		</tr>
 
-		<tr valign="top" bgcolor="white"><td>Type de document</td><td><input type="text" name="Item" Type value="<!-- TMPL_VAR NAME="itemtype" -->" size="20"></td></tr>
+		<tr valign="top" bgcolor="white"><td>Type de document</td><td><input type="text" name="Item" value="<!-- TMPL_VAR NAME="itemtype" -->" size="20"></td></tr>
 
 		<tr valign="top" bgcolor="white">
 			<td>URL</td>
@@ -39,6 +39,7 @@
 
 
 		<tr valign="top" bgcolor="white"><td>ISBN</td><td><input type="text" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" size="20"></td></tr>
+		<tr valign="top" bgcolor="white"><td>ISSN</td><td><input type="text" name="ISSN" value="<!-- TMPL_VAR NAME="issn" -->" size="20"></td></tr>		
 
 		<tr valign="top" bgcolor="white"><td>Année de Publication</td><td><input type="text" name="Publication" Year value="<!-- TMPL_VAR NAME="publicationyear" -->" size="20"></td></tr>
 

Index: overdue.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/Attic/overdue.tmpl,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -b -r1.4.2.2 -r1.4.2.3
--- overdue.tmpl	9 Jan 2006 10:44:04 -0000	1.4.2.2
+++ overdue.tmpl	17 Oct 2006 07:26:43 -0000	1.4.2.3
@@ -36,21 +36,20 @@
 		<th class="reports">Date de retour </th>
 		<th class="reports">Lecteur </th>
 		<th class="reports">Téléphone</th>
-		<th class="reports">Titre</th>
-		<th class="reports">Auteur</th>
+		<th class="reports">Titre / Auteur</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>
+			<td><a href="members/moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->"><!-- TMPL_VAR NAME="name" --></a> <a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Overdue: <!-- TMPL_VAR NAME="title" -->"><i>(email)</i></a>
+			</td>
 			<!-- TMPL_ELSE -->
 			<td><!-- TMPL_VAR NAME="name" --></td>
 			<!-- /TMPL_IF -->
 			<td><!-- TMPL_VAR NAME="phone" --></td>
-			<td><!-- TMPL_VAR NAME="title" --></td>
-			<td><!-- TMPL_VAR NAME="author" --></td>
+			<td><p><b><!-- TMPL_VAR NAME="title" --></b>, <!-- TMPL_VAR NAME="author" --></p></td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 	</table>

Index: stats.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/Attic/stats.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- stats.tmpl	24 Nov 2004 16:22:26 -0000	1.3
+++ stats.tmpl	17 Oct 2006 07:26:43 -0000	1.3.2.1
@@ -1,16 +1,20 @@
 <!-- TMPL_INCLUDE NAME="reports-top.inc" -->
 
+<div id="mainbloc">
 	<table border="0" cellspacing="0" cellpadding="5" align="center">
 		<tr bgcolor="#99cc33">
-			<td background="/images/background-mem.gif"><b>Nom</b></td>
-			<td background="/images/background-mem.gif"><b>Type</b></td>
-			<td background="/images/background-mem.gif"><b>Date/heure</b></td>
-			<td background="/images/background-mem.gif"><b>Montant</b></td>
-			<td background="/images/background-mem.gif"><b>Site</b></td>
+			<th>Nom</th>
+			<th>Description</th>
+			<th>Type</th>
+			<th>Date/heure</th>
+			<th>Montant</th>
+			<th>Site</th>
+			
 		<tr>
 		<!-- TMPL_LOOP NAME=loop1 -->
 		<tr>
 			<td><!-- TMPL_VAR NAME="name" --></td>
+			<td><!-- TMPL_VAR NAME="description" --></td>
 			<td><!-- TMPL_VAR NAME="type" --></td>
 			<td><!-- TMPL_VAR NAME="time" --></td>
 			<td><!-- TMPL_VAR NAME="amount" --></td>
@@ -26,6 +30,5 @@
 	<b>Total annulé : <!-- TMPL_VAR NAME="totalw" --></b>
 </p>
 
+</div>
 <!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->
-</body>
-</html>

Index: acqui/acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/Attic/acqui-home.tmpl,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -b -r1.6.2.2 -r1.6.2.3
--- acqui/acqui-home.tmpl	5 Jan 2006 15:17:56 -0000	1.6.2.2
+++ acqui/acqui-home.tmpl	17 Oct 2006 07:26:43 -0000	1.6.2.3
@@ -48,6 +48,8 @@
 		<table class="noborder">
 			<tr>
 				<th class="acquisition">Budgets</th>
+				<th class="acquisition">De</th>
+				<th class="acquisition">à</th>
 				<th class="acquisition">Total</th>
 				<th class="acquisition">Dépensé</th>
 				<th class="acquisition">Engagé</th>
@@ -56,6 +58,8 @@
 			<!-- TMPL_LOOP NAME="loop_budget" -->
 				<tr>
 					<td><!-- TMPL_VAR NAME="bookfundname" --></td>
+					<td align="right"><!-- TMPL_VAR NAME="startdate" --></td>
+					<td align="right"><!-- TMPL_VAR NAME="enddate" --></td>
 					<td align="right"><!-- TMPL_VAR NAME="budgetamount" --></td>
 					<td align="right"><!-- TMPL_VAR NAME="spent" --></td>
 					<td align="right"><!-- TMPL_VAR NAME="comtd" --></td>
@@ -63,7 +67,7 @@
 				</tr>
 			<!-- /TMPL_LOOP -->
 			<tr>
-				<th class="acquisition" align="right">Total</th>
+				<th class="acquisition" align="right" colspan="3">Total</th>
 				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="total" --></th>
 				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="totspent" --></th>
 				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="totcomtd" --></th>

Index: acqui/acquire.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/Attic/acquire.tmpl,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -b -r1.4.2.2 -r1.4.2.3
--- acqui/acquire.tmpl	5 Jan 2006 15:17:56 -0000	1.4.2.2
+++ acqui/acquire.tmpl	17 Oct 2006 07:26:43 -0000	1.4.2.3
@@ -75,6 +75,7 @@
 				<label class="label100">Numéro Facture/BL</label>
 					<!-- TMPL_VAR NAME="invoice" -->
 					<input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->">
+                <input type="hidden" name="datereceived" value="<!-- TMPL_VAR NAME="datereceived" -->">
 			</p>
 			<p>
 				<label class="label100">Notes</label>
@@ -87,13 +88,7 @@
 				<input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->">
 				<input type="hidden" name="freight" value="<!-- TMPL_VAR NAME="freight" -->">
 				<input type="hidden" name="gst" value="<!-- TMPL_VAR NAME="gst" -->">
-				<!-- TMPL_IF name="catview" -->
 					<input type="submit" class="button acquisition" value="enregistrer"> (tous les prix sont pour 1 exemplaire)
-				<!-- TMPL_ELSE -->
-					<a class="button acquisition" href="/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;booksellerid=<!-- TMPL_VAR NAME="supplierid" -->">
-						Editer
-					</a>
-				<!-- /TMPL_IF -->
 			</p>
 		</div>
 		</form>

Index: acqui/basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/Attic/basket.tmpl,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -b -r1.8.2.1 -r1.8.2.2
--- acqui/basket.tmpl	5 Jan 2006 15:17:56 -0000	1.8.2.1
+++ acqui/basket.tmpl	17 Oct 2006 07:26:43 -0000	1.8.2.2
@@ -3,43 +3,52 @@
 <div id="mainbloc">
 	<h1 class="acquisition"><!-- TMPL_UNLESS name="basketno" -->Nouveau <!-- /TMPL_UNLESS -->Panier de commande <b><!-- TMPL_VAR NAME="basketno" --> </b> pour <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1><br />
 	<!-- TMPL_UNLESS name="closedate" -->
+	<!-- TMPL_IF name="basketno" -->
 		<div id="bloc25">
-			<h2 class="acquisition">Information Panier</h2>
+			<h2 class="acquisition doNotPrint">Information Panier</h2>
+			<p class="doNotPrint"><label class="label100">Géré par<label><!-- TMPL_VAR NAME="authorisedbyname" --></p>
 			<p><label class="label100">Numéro de Panier<label> <!-- TMPL_VAR NAME="basketno" --></p>
-			<p><label class="label100">Géré par<label><!-- TMPL_VAR NAME="authorisedbyname" --></p>
 			<p><label class="label100">ouvert le<label> <!-- TMPL_VAR NAME="creationdate" --></p>
-			<p><label class="label100">pour<label> <!-- TMPL_VAR NAME="booksellerid" --></p>
-			<p><label class="label100">Numéro facture/BL </label><!-- TMPL_VAR NAME="booksellerinvoicenumber" --></p>
 			<!-- TMPL_IF name="closedate" -->
 				fermé le <!-- TMPL_VAR name="closedate" -->
 			<!-- TMPL_ELSE -->
-				<a href="/cgi-bin/koha/acqui/order.pl?op=close&amp;basket=<!-- TMPL_VAR NAME="basketno" -->&supplier=<!-- TMPL_VAR name="booksellerid" -->" class="button acquisition">Fermer</a>
+			<p class="doNotPrint"><a href="/cgi-bin/koha/acqui/order.pl?op=close&amp;basket=<!-- TMPL_VAR NAME="basketno" -->&supplier=<!-- TMPL_VAR name="booksellerid" -->" class="button acquisition">Fermer le panier d'achat</a></p>
 			<!-- /TMPL_IF -->
 		</div>
+    <!-- /TMPL_IF -->
 	<!-- /TMPL_UNLESS -->
-	<div id="bloc25" style="align:right">
+		<div id="bloc25">
 		<p><!-- TMPL_VAR name="name" --></p>
-		<p><!-- TMPL_VAR name="address1" --></p>
+			<p><!-- TMPL_VAR name="postal" --></p>
 		<p><!-- TMPL_VAR name="address2" --></p>
 		<p><!-- TMPL_VAR name="address3" --></p>
 		<p><!-- TMPL_VAR name="address4" --></p>
 	</div>
+		<div id="bloc25" style="float:right">
+		   <p><!-- TMPL_VAR name="branchname" --></p>
+		   <p><!-- TMPL_VAR name="branchaddress1" --></p>
+		   <p><!-- TMPL_VAR name="branchaddress2" --></p>
+		   <p><!-- TMPL_VAR name="branchaddress3" --></p>
+	     </div>
+	
 	<div id="bloc100">
 	<h2 class="acquisition">Commande</h2>
 	<!-- TMPL_IF name="books_loop" -->
 		<table>
 			<tr valign="top" bgcolor="#ffdf61">
 				<th class="acquisition doNotPrint">Commande</th>
-				<th class="acquisition">Editeur<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition">[Trier]</a></th>
+				<th class="acquisition">Editeur<span class="doNotPrint"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition">Trier</a></span></th>
 				<th class="acquisition">Titre</th>
-				<th class="acquisition doNotPrint">prix rempl.</th>
+				<th class="acquisition doNotPrint" title="Prix de vente recommandé">RRP</th>
 				<th class="acquisition">estimé</th>
 				<th class="acquisition">QTé</th>
 				<th class="acquisition">Total</th>
 				<th class="acquisition doNotPrint">Budget <a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[Trier]</a></th>
 				<!-- TMPL_IF name="active" -->
+		              <!-- TMPL_UNLESS name="closedate" -->
 				<th class="acquisition doNotPrint">Retirer</th>
 				<th class="acquisition doNotPrint">Editer</th>
+                    <!-- /TMPL_UNLESS -->
 				<!-- /TMPL_IF -->
 			</tr>
 			<!-- TMPL_LOOP NAME="books_loop" -->
@@ -71,6 +80,7 @@
 					<td class="number"><p><!-- TMPL_VAR NAME="line_total" --></p></td>
 					<td class="doNotPrint"><p><!-- TMPL_VAR NAME="bookfundid" --></p></td>
 					<!-- TMPL_IF name="active" -->
+		              <!-- TMPL_UNLESS name="closedate" -->
 						<td class="doNotPrint">
 							<a href="addorder.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&quantity=0&biblio=<!-- TMPL_VAR NAME="biblionumber" -->">
 								<img src="/intranet-tmpl/default/images/edittrash.png" alt="Supprimer du panier" title="Supprimer du panier" width="32" hspace="0" vspace="0" border="0">
@@ -81,43 +91,47 @@
 								<img src="/intranet-tmpl/default/images/fileopen.png" alt="Editer" title="Supprimer du panier" width="32" hspace="0" vspace="0" border="0">
 							</a>
 						</td>
+                        <!-- /TMPL_UNLESS -->
 					<!-- /TMPL_IF -->
 				</tr>
 			<!-- /TMPL_LOOP -->
 			<input type="hidden" name="number" value=<!-- TMPL_VAR NAME="count" -->>
 			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
 			<tr>
-				<td colspan="2" class="acquisition">
+				<td class="acquisition doNotPrint">
+					&nbsp;
+				</td>
+				<td class="acquisition">
 					&nbsp;
 				</td>
 				<td class="acquisition number">
-					<p>Sous-Total</p>
-					<p>TVA</p>
+					<!-- TMPL_IF NAME="GST" --><p>Sous-Total</p>
+					<p>TVA</p><!-- /TMPL_IF -->
 					<p>TOTAL (<!-- TMPL_VAR NAME="currency" -->)</p>
 				</td>
 				<td class="acquisition number">
-					<p><!-- TMPL_VAR NAME="sub_total_est" --></p>
-					<p><!-- TMPL_VAR NAME="gist_est" --></p>
+					<!-- TMPL_IF NAME="GST" --><p><!-- TMPL_VAR NAME="sub_total_est" --></p>
+					<p><!-- TMPL_VAR NAME="gist_est" --></p><!-- /TMPL_IF -->
 					<p><!-- TMPL_VAR NAME="grand_total_est" --></p>
 				</td>
-				<td class="acquisition">
-					<p>&nbsp;</p>
-					<p>&nbsp;</p>
+				<td class="doNotPrint acquisition">
+					<!-- TMPL_IF NAME="GST" --><p>&nbsp;</p>
+					<p>&nbsp;</p><!-- /TMPL_IF -->
 					<p>&nbsp;</p>
 				</td>
 				<td class="acquisition number">
-					<p><!-- TMPL_VAR name="qty_total" --></p>
-					<p>&nbsp;</p>
+					<!-- TMPL_IF NAME="GST" --><p><!-- TMPL_VAR name="qty_total" --></p>
+					<p>&nbsp;</p><!-- /TMPL_IF -->
 					<p>&nbsp;</p>
 				</td>
 				<td class="acquisition number">
-					<p><!-- TMPL_VAR NAME="sub_total" --></p>
-					<p><!-- TMPL_VAR NAME="gist" --></p>
+					<!-- TMPL_IF NAME="GST" --><p><!-- TMPL_VAR NAME="sub_total" --></p>
+					<p><!-- TMPL_VAR NAME="gist" --></p><!-- /TMPL_IF -->
 					<p><!-- TMPL_VAR NAME="grand_total" --></p>
 				</td>
-				<td class="acquisition">
-					<p>&nbsp;</p>
-					<p>&nbsp;</p>
+				<td colspan="3" class="acquisition">
+					<!-- TMPL_IF NAME="GST" --><p>&nbsp;</p>
+					<p>&nbsp;</p><!-- /TMPL_IF -->
 					<p>&nbsp;</p>
 				</td>
 			</tr>
@@ -129,12 +143,12 @@
 	<!-- TMPL_IF name="active" -->
 		<!-- TMPL_UNLESS name="closedate" -->
 		<div id="bloc25">
-			<h2 class="acquisition">Ajouter une ligne de commande</h2>
+			<h2 class="acquisition doNotPrint">Ajouter une ligne de commande</h2>
 			<form action="/cgi-bin/koha/acqui/newbasket2.pl" method="post">
 				<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->">
 				<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
-				<p>A partir d'une notice existante </b><input type="text"  size="25"   name="search"><input type="submit" class="button acquisition" value="Recherche"></p>
-				<p>ou <a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition"> d'après une suggestion </a> <a href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">Nouvelle notice </a>
+				<p class="doNotPrint" >A partir d'une notice existante </b><input type="text"  size="25"   name="search"><input type="submit" class="button acquisition" value="Recherche"></p>
+				<p class="doNotPrint">ou <a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition"> d'après une suggestion </a> <a href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">Nouvelle notice </a>
 				</p>
 			</form>
 		</div>

Index: acqui/lateorders.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/Attic/lateorders.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- acqui/lateorders.tmpl	5 Jan 2006 15:24:47 -0000	1.1.2.1
+++ acqui/lateorders.tmpl	17 Oct 2006 07:26:43 -0000	1.1.2.2
@@ -53,7 +53,7 @@
 					<!-- TMPL_VAR name="latesince" -->
 				</td>
 				<td align="center" class="doNotPrint">
-					<!-- TMPL_VAR name="basketno" -->
+					<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR name="basketno" --></a>
 				</td>
 				<td >
 					<b><!-- TMPL_VAR name="title" --></b>

Index: acqui/newbasket2.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/Attic/newbasket2.tmpl,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -b -r1.7.2.1 -r1.7.2.2
--- acqui/newbasket2.tmpl	17 Feb 2005 13:06:27 -0000	1.7.2.1
+++ acqui/newbasket2.tmpl	17 Oct 2006 07:26:43 -0000	1.7.2.2
@@ -83,9 +83,14 @@
 		</tr>
 	</table>
 	
+	<!-- TMPL_IF name="previous" -->
+	<a href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR NAME="num" -->&amp;offset=<!-- TMPL_VAR NAME="previous" -->&amp;type=<!-- TMPL_VAR NAME="type" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;search=<!-- TMPL_VAR NAME="title" -->&amp;author=<!-- TMPL_VAR NAME="author" -->">
+	&lt; Préc.
+	</a>
+	<!-- /TMPL_IF -->
 	<!-- TMPL_IF name="offsetover" -->
 	<a href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR NAME="num" -->&amp;offset=<!-- TMPL_VAR NAME="offset" -->&amp;type=<!-- TMPL_VAR NAME="type" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;search=<!-- TMPL_VAR NAME="title" -->&amp;author=<!-- TMPL_VAR NAME="author" -->">
-	Suivant
+	Suivant &gt;
 	</a>
 	<!-- /TMPL_IF -->
 </div>

Index: acqui/newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/Attic/newbiblio.tmpl,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -b -r1.8.2.2 -r1.8.2.3
--- acqui/newbiblio.tmpl	5 Jan 2006 15:17:56 -0000	1.8.2.2
+++ acqui/newbiblio.tmpl	17 Oct 2006 07:26:43 -0000	1.8.2.3
@@ -85,17 +85,17 @@
 	<!-- TMPL_LOOP NAME="loop_currencies" -->
 		<input type="hidden" name="<!-- TMPL_VAR NAME="currency" -->" value="<!-- TMPL_VAR NAME="rate" -->">
 	<!-- /TMPL_LOOP -->
-	<a href="basket.pl?basket=<!-- TMPL_VAR NAME="basket" -->" class="button acquisition">Voir le panier</a> <h1 class="acquisition">
+	<a href="basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">Voir le panier</a> <h1 class="acquisition">
 		<!-- TMPL_IF name="ordnum" -->
 			Modifier les détails de la commande (ligne #<!-- TMPL_VAR NAME="ordnum" -->)
 		<!-- TMPL_ELSE -->
-			Nouvelle commande
+			Ajouter une ligne de commande
 		<!-- /TMPL_IF -->
 		 <!-- TMPL_IF name="suggestionid" -->spécifié à partir de la suggestion #<!-- TMPL_VAR NAME="suggestionid" --><!-- /TMPL_IF -->
 	</h1>
 	Panier d'Achat pour <!-- TMPL_VAR NAME="name" -->
 	<div id="bloc25">
-		<h2 class="acquisition">Détails du catalogue</h2>
+		<h2 class="acquisition">Détails notice</h2>
 		<p>
 			<label class="label100"><b>Titre *</b></label>
 			<!-- TMPL_IF name="biblio" -->
@@ -191,10 +191,10 @@
 			<label class="label100">Coût budgété</label>
 			<input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->"<!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF-->>
 		</p>
-		<p>
+<!-- TMPL_IF NAME="GST" -->		<p>
 			<label class="label100">TVA budgetée</label>
-			<input type="text" size="20" name="GST" value="" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF-->>
-		</p>
+			<input type="text" size="20" name="GST" value="<!-- TMPL_VAR NAME="GST" -->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF-->>
+		</p><!-- TMPL_ELSE --><input type="hidden" name="GST" value="0"><!-- /TMPL_IF -->
 		<p>
 			<label class="label100"><b>TOTAL BUDGETE</b></label>
 			<input type="text" size="20" name="total" value="" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF-->>
@@ -204,7 +204,7 @@
 			<input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF-->>
 		</p>
 		<p>
-			<label class="label100">Numéro Facture/BL *</label>
+			<label class="label100"><i>Code colis</i></label>
 			<input type="text" size="20" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->">
 		<p>
 			<label class="label100">Notes</label>

Index: acqui/order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/Attic/order.tmpl,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -b -r1.5.2.1 -r1.5.2.2
--- acqui/order.tmpl	5 Jan 2006 15:17:56 -0000	1.5.2.1
+++ acqui/order.tmpl	17 Oct 2006 07:26:43 -0000	1.5.2.2
@@ -6,8 +6,8 @@
 <tr>
 	<th class="acquisition">Commande</th>
 	<th class="acquisition">Réception</th>
-	<th class="acquisition">Société</th>
-	<th class="acquisition">&nbsp;</th>
+	<th class="acquisition">Fournisseur</th>
+	<th class="acquisition">Panier</th>
 </tr>
 
 <!-- TMPL_LOOP name="loop_suppliers" -->
@@ -22,9 +22,10 @@
 		<td>
 			<a href="recieveorder.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_get.png" title="Réceptionner" alt="Ajouter" border=0></a>
 		</td>
-		<td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><!-- TMPL_VAR name="name" --></a></td>
+		<td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name=supplierid -->&op=display"><!-- TMPL_VAR name="name" --></a></td>
 		<td>
 			<table>
+			     <!-- TMPL_IF name="loop_basket" -->
 					<tr>
 						<th class="acquisition">Panier</th>
 						<th class="acquisition">Exemplaires</th>
@@ -32,6 +33,9 @@
 						<th class="acquisition">Date</th>
 						<th class="acquisition">&nbsp;</th>
 					</tr>
+				<!-- TMPL_ELSE -->
+				    </p>Pas de panier en attente</p>
+                <!-- /TMPL_IF -->
 					<!-- TMPL_LOOP NAME="loop_basket" -->
 						<tr>
 							<td><!-- TMPL_VAR NAME="basketno" --></a></td>

Index: acqui/recieve.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/Attic/recieve.tmpl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- acqui/recieve.tmpl	5 Jan 2006 15:17:56 -0000	1.4.2.1
+++ acqui/recieve.tmpl	17 Oct 2006 07:26:43 -0000	1.4.2.2
@@ -2,20 +2,63 @@
 
 <div id="mainbloc">
 	<h1 class="acquisition">
-		<!-- TMPL_IF name="invoice" -->
-			Récapitulatif de réception pour <i><!-- TMPL_VAR NAME="name" --></i> Facture/BL <i><!-- TMPL_VAR NAME="invoice" --></i>
-		<!-- TMPL_ELSE -->
-			Commandes en attente pour <!-- TMPL_VAR NAME="name" -->
-		<!-- /TMPL_IF -->
+			Réception colis pour <i><!-- TMPL_VAR NAME="name" --></i>
 	</h1>
 	
 	<div id="bloc25">
-		Facture/BL : <!-- TMPL_VAR NAME="invoice" --><br>
-		Reçu Par : <!-- TMPL_VAR NAME="user" --><br>
-		<!-- TMPL_VAR NAME="date" -->
+		<p><label>Facture/BL</label><!-- TMPL_VAR NAME="invoice" --></p>
+        <p><label>Date</label> <!-- TMPL_VAR name="formatteddatereceived"--></p>
 	</div>
 	
 	<div id="bloc25">
+	<h2 class="acquisition"> Documents dans le colis</h2>
+	<p>
+	<!-- TMPL_VAR NAME="countreceived" --> documents reçus
+	</p>
+	<table>
+		<tr>
+			<th class="acquisition">Panier</th>
+			<th class="acquisition">Titre</th>
+			<th class="acquisition">Cout net</th>
+			<th class="acquisition">Qté Commandée</th>
+			<th class="acquisition">P&P</th>
+			<th class="acquisition">Effectif</th>
+			<th class="acquisition">QTé</th>
+			<th class="acquisition">Total</th>
+		</tr>
+		<!-- TMPL_LOOP NAME="loop_received" -->
+			<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
+				<td class="number"><!-- TMPL_VAR NAME="basketno" --></td>
+				<td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->&catview=yes&datereceived=<!-- TMPL_VAR name="datereceived" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+				<td class="number"><!-- TMPL_VAR NAME="ecost" --></td>
+				<td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
+				<td></td>
+				<td class="number"><!-- TMPL_VAR NAME="unitprice" --></td>
+				<td class="number"><!-- TMPL_VAR NAME="quantityrecieved" --></td>
+				<td class="number"><!-- TMPL_VAR NAME="total" --></td>
+			</tr>
+		<!-- /TMPL_LOOP -->
+		<tr>
+			<td colspan="5" rowspan=3  bgcolor="#ffdf61">
+			<b>AIDE</b>
+				<p>Le total en bas de la page devra être proche de quelques centimes du total de la facture.</p>
+			</td>
+			<td colspan="2"  class="acquisition number"><b>TVA</b></td>
+			<td class="acquisition number"><!-- TMPL_VAR NAME="gst" --></td>
+		</tr>
+		<tr>
+			<td colspan="2" class="acquisition number"><b>PORT</b></td>
+			<td class="acquisition number"><!-- TMPL_VAR NAME="freight" --></td>
+		</tr>
+		<tr>
+			<td colspan="2" class="acquisition number"><b>TOTAL</b></td>
+			<td class="acquisition number"><!-- TMPL_VAR NAME="grandtot" --></td>
+		</tr>
+	</table>
+	</div>
+	
+	<div id="bloc25">
+	<h2 class="acquisition"> Commandes en attente </h2>
 		<form action="/cgi-bin/koha/acqui/acquire.pl">
 			<input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->">
 			<input type="hidden" name="gst" value="<!-- TMPL_VAR NAME="gst" -->">
@@ -27,52 +70,24 @@
 	<p>
 	<form action="" method="get" name="orderform">
 	
-	<table>
+	<table class="small">
 		<tr>
-			<th class="acquisition">PANIER</th>
-			<th class="acquisition">ISBN</th>
-			<th class="acquisition">TITRE</th>
-			<th class="acquisition">AUTEUR</th>
-			<th class="acquisition">REEL</th>
-			<th class="acquisition">P&P</th>
-			<th class="acquisition">QTé</th>
-			<th class="acquisition">TOTAL</th>
+			<th class="acquisition">Panier</th>
+			<th class="acquisition">Titre</th>
+			<th class="acquisition">Commandé</th>
+			<th class="acquisition">Reçu</th>
+			<th class="acquisition"></th>
 		</tr>
-		<!-- TMPL_VAR NAME="count" -->
+		<!-- TMPL_VAR NAME="countpending" --> lignes
 		<!-- TMPL_LOOP NAME="loop_orders" -->
 			<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
-				<td><!-- TMPL_VAR NAME="basketno" --></td>
-				<td><!-- TMPL_VAR NAME="isbn" --></td>
-				<td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="title" --></a></td>
-				<td><!-- TMPL_VAR NAME="author" --></td>
-				<td><!-- TMPL_VAR NAME="unitprice" --></td>
-				<td></td>
-				<td><!-- TMPL_VAR NAME="quantityrecieved" --></td>
-				<td><!-- TMPL_VAR NAME="total" --></td>
+				<td class="number"><!-- TMPL_VAR NAME="basketno" --></td>
+				<td><!-- TMPL_VAR NAME="title" --></td>
+				<td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
+				<td class="number"><!-- TMPL_VAR NAME="quantityrecieved" --></td>
+                <td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;datereceived=<!-- TMPL_VAR name="datereceived"-->&catview=yes" class="button acquisition">Réception</td>
 			</tr>
 		<!-- /TMPL_LOOP -->
-		<tr bgcolor="white">
-			<th class="acquisition"></th>
-			<th class="acquisition"></th>
-			<th class="acquisition"></th>
-			<th class="acquisition">SOUS-TOTAUX</th>
-			<th class="acquisition"><!-- TMPL_VAR NAME="totalprice" --></th>
-			<th class="acquisition"><!-- TMPL_VAR NAME="totalfreight" --></th>
-			<th class="acquisition"><!-- TMPL_VAR NAME="totalquantity" --></th>
-			<th class="acquisition"><!-- TMPL_VAR NAME="tototal" --></th>
-		</tr>
-		<tr>
-			<td colspan="5" rowspan=2  bgcolor="#ffdf61">
-			<b>AIDE</b>
-				<p>Le total en bas de la page devra être proche de quelques centimes du total de la facture.</p>
-			</td>
-			<td colspan="2" align="right"><b>TVA</b></td>
-			<td><!-- TMPL_VAR NAME="gst" --></td>
-		</tr>
-		<tr bgcolor="white">
-			<td colspan="2" align="right" ><b>TOTAL</b></td>
-			<td><!-- TMPL_VAR NAME="grandtot" --></td>
-		</tr>
 	</table>
 	</div>
 </div>

Index: acqui/recieveorder.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/Attic/recieveorder.tmpl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -b -r1.3.2.1 -r1.3.2.2
--- acqui/recieveorder.tmpl	5 Jan 2006 15:17:56 -0000	1.3.2.1
+++ acqui/recieveorder.tmpl	17 Oct 2006 07:26:43 -0000	1.3.2.2
@@ -1,19 +1,117 @@
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 <div id="mainbloc">
-	<h1 class="acquisition">Réception de Commandes Pour le Fournisseur <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
+	<h1 class="acquisition">Réception de colis pour le fournisseur <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" --> colis trouvés</p><!--/TMPL_IF-->
+<div id="resultnumber">
+<!-- Row of numbers corresponding to search result pages -->
+<!-- TMPL_IF NAME="displayprev" -->
+	<a href="recieveorder.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="recieveorder.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="recieveorder.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 -->
+<!-- TMPL_IF NAME="count" -->
+<form method="post" action="recieveorder.pl">
+	<table class="small">
+		<tr>
+			<th class="acquisition">Ligne</th>
+			<th class="acquisition">Code</th>
+			<th class="acquisition">Reçu le</th>
+			<th class="acquisition">Nombre d'exemplaires</th>
+			<th class="acquisition">Total notices</th>
+			<th class="acquisition">Documetns attendus</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">
+				De <input type="text" size="9" name="datefrom" value="<!-- TMPL_VAR NAME="datefrom" -->"> 
+				<p>à : <input type="text" size="9" name="dateto" value="<!-- TMPL_VAR NAME="dateto" -->">
+			</th>
+			<th class="acquisition">
+				&nbsp;
+			</th>
+			<th class="acquisition">
+				Trié par :<select name="orderby" size="1">
+				<option value="aqorders.booksellerinvoicenumber"> Code</option>
+				<option value="datereceived"> Reçu le</option>
+				<option value="datereceived desc"> Date réception (inversée)</option>
+				<option value="aqorders.booksellerinvoicenumber desc"> Code inversé</option>
+				</select><br />
+				Résultats par 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="Sélectionner">
+			</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/receive.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>
+<!--/TMPL_IF-->
 	<div id="bloc25">
+	<h2 class="acquisition"> Réceptionner un nouveau colis </h2>
 		<form method="get" action="receive.pl">
 		<p>
 			<input type="hidden" name="supplierid" value=<!-- TMPL_VAR NAME="supplierid" -->>
-			<h2 class="acquisition">Information facture fournissseur</h2>
-		<p>
-			<label>Numéro de Facture/BL</label>
+			<label>Code colis</label>
 			<input type="text" size="20" name="invoice">
 		</p>
-		<p>
+<!-- TMPL_IF NAME="GST" -->		<p>
 			<label>TVA</label>
 			<input type="text" size="20" name="gst">
-		</p>
+		</p><!-- TMPL_ELSE --><input type="hidden" name="gst" value="0"><!-- /TMPL_IF -->
 		<p>
 			<label>Frais de port</label>
 			<input type="text" size="20" name="freight">

Index: acqui/suggestion-select.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/Attic/suggestion-select.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- acqui/suggestion-select.tmpl	5 Jan 2006 15:17:56 -0000	1.2.2.1
+++ acqui/suggestion-select.tmpl	17 Oct 2006 07:26:43 -0000	1.2.2.2
@@ -6,6 +6,7 @@
 			<th class="acquisition">Suggestion</th>
 			<th class="acquisition">Suggéré par</th>
 			<th class="acquisition">Accepté par</th>
+			<th class="acquisition">Dupliquer</th>
 			<th class="acquisition">&nbsp;</th>
 		</tr>
 		<tr>
@@ -20,6 +21,9 @@
 					&nbsp;
 				</th>
 				<th class="acquisition">
+					&nbsp;
+				</th>
+				<th class="acquisition">
 					<input type="submit" class="button acquisition" value="Sélectionner">
 				</th>
 			</form>
@@ -43,6 +47,11 @@
 				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
 					<!-- TMPL_VAR NAME="surnamemanagedby" --><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="firstnamemanagedby" -->
 				</td>
+				<td>
+					<!-- TMPL_IF name="duplicateBiblionumber" -->
+						<a href=# onClick="javascript:window.open('/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="duplicateBiblionumber" -->')" class="button acquisition">Doublon suspecté</a> <a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR name="supplierid" -->&basketno=<!-- TMPL_VAR name="basketno"-->&op=connectDuplicate&duplicateNumber=<!-- TMPL_VAR name="duplicateBiblionumber" -->&suggestionid=<!-- TMPL_VAR name="suggestionid" -->" class="button acquisition">Relier</a>
+					<!-- /TMPL_IF -->
+				</td>
 				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
 					<!-- TMPL_IF name="biblionumber" -->
 						<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->" class="button acquisition">Commande</a>

Index: acqui/supplier.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/Attic/supplier.tmpl,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -b -r1.7.2.1 -r1.7.2.2
--- acqui/supplier.tmpl	5 Jan 2006 15:17:56 -0000	1.7.2.1
+++ acqui/supplier.tmpl	17 Oct 2006 07:26:43 -0000	1.7.2.2
@@ -1,6 +1,7 @@
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
 <div id="mainbloc">
+<!--TMPL_IF Name="enter"-->
 	<form action=updatesupplier.pl method="post">
 	
 	<input type="hidden" name="id" value=<!-- TMPL_VAR NAME="id" -->>
@@ -63,7 +64,7 @@
 		</p>
 		<p>
 			<label>Notes</label>
-			<textarea name="notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea>
+			<textarea name="contact_notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea>
 		</p>
 	</div>
 	<div id="bloc25">
@@ -98,26 +99,136 @@
 				<!-- /TMPL_LOOP -->
 				</select>
 		</p>
-		<p>
+		<!-- TMPL_IF NAME="GST" --><p>
 			<label class="label100">TVA enregistrée</label>
 				<input type="radio" name="gst" value="1" <!-- TMPL_IF name="gstreg" -->checked<!-- /TMPL_IF -->>Oui <input type="radio" name="gst" value="0" <!-- TMPL_UNLESS name="gstreg" -->checked<!-- /TMPL_UNLESS -->>Non
-		</p>
-		<p>
+		</p><!-- TMPL_ELSE --><input type="hidden" name="gst" value="0"><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="GST" --><p>
 			<label class="label100">Liste des prix des documents incluant la TVA</label>
 				<input type="radio" name="list_gst" value="1" <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Oui <input type="radio" name="list_gst" value="0" <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>Non
-		</p>
-		<p>
+		</p><!-- TMPL_ELSE --><input type="hidden" name="list_gst" value="0"><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="GST" --><p>
 			<label class="label100">Le prix facturé comprend la TVA</label>
 				<input type="radio" name="invoice_gst" value="1" <!-- TMPL_IF name= "invoiceincgst" -->checked<!-- /TMPL_IF -->>Oui <input type="radio" name="invoice_gst" value="0" <!-- TMPL_UNLESS name="invoiceincgst" -->checked<!-- /TMPL_UNLESS -->>Non
-		</p>
+		</p><!-- TMPL_ELSE --><input type="hidden" name="invoice_gst" value="0"><!-- /TMPL_IF -->
 		<p>
 			<label class="label100">Remise</label>
 			<input type="text" size="3" name="discount" value="<!-- TMPL_VAR NAME="discount" -->"> %
 		</p>
+		<p>
+			<label class="label100">Notes</label>
+			<textarea cols="40" rows="4" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea>
+		</p>
 	<br/>
 	<br/><input type="image" name="submit" src="/<!-- TMPL_VAR NAME="theme" -->/images/filesave.png" border="0" title="enregistrer" alt="enregistrer" class="button acquisition">
 	</form>
 	</div>
 </div>
+<!--TMPL_ELSE-->
+	<h1 class="acquisition">Information pour : <!-- TMPL_VAR NAME="name" --></h1>
+	<a href="supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->" class="button acquisition">Modifier</a> <a href="order.pl?supplier=<!--TMPL_VAR Name="name"-->" class="button acquisition">Commandes</a> <a href="recieveorder.pl?supplierid=<!--TMPL_VAR Name="id"-->" class="button acquisition">Colis (réception)</a>
+	<div id="bloc25">
+		<h2 class="acquisition">DETAILS SOCIETE</h2>
+		<p>
+			<label>Nom de Société</label>
+			<!-- TMPL_VAR NAME="name" -->
+		</p>
+		<p>
+			<label class="label100">Adresse Postale</label>
+				<!-- TMPL_VAR NAME="postal" -->
+		</p>
+		<p>
+			<label class="label100">Adresse Physique</label>
+			<!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" -->
+		</p>
+		<p>
+			<label>Téléphone</label>
+			<!-- TMPL_VAR NAME="phone" -->
+		</p>
+		<p>
+			<label>Fax</label>
+			<!-- TMPL_VAR NAME="fax" -->
+		</p>
+		<p>
+			<label>Site Web</label>
+			<!-- TMPL_VAR NAME="url" -->
+		</p>
 
+		<h2 class="acquisition">COORDONNEES DU CONTACT</h2>
+		<p>
+			<label>Nom du contact</label>
+			<!-- TMPL_VAR NAME="contact" -->
+		</p>
+		<p>
+			<label>Position</label>
+			<!-- TMPL_VAR NAME="contpos" -->
+		</p>
+		<p>
+			<label>Téléphone</label>
+			<!-- TMPL_VAR NAME="contphone" -->
+		</p>
+		<p>
+			<label>Autre téléphone</label>
+			<!-- TMPL_VAR NAME="contaltphone" -->
+		</p>
+		<p>
+			<label>Fax</label>
+			<!-- TMPL_VAR NAME="contfax" -->
+		</p>
+		<p>
+			<label>Mail</label>
+			<!-- TMPL_VAR NAME="contemail" -->
+		</p>
+		<p>
+			<label>Notes</label>
+			<!-- TMPL_VAR NAME="contnotes" -->
+		</p>
+	</div>
+	<div id="bloc25">
+		<h2 class="acquisition">ETAT ACTUEL</h2>
+		<p>
+			<label>Le Fournisseur est</label>
+				<!-- TMPL_IF name="active" -->
+					Actif
+				<!-- TMPL_ELSE -->
+					Inactif
+				<!-- /TMPL_IF -->
+		</p>
+		<h2 class="acquisition">INFORMATION POUR LES COMMANDES</h2>
+		</p>
+		<p>
+			<label>Editeurs et adresses bibliographiques</label>
+			<!-- TMPL_VAR NAME="specialty" -->
+		</p>
+		<p>
+			<label class="label100">La Liste des Prix est</label><!--TMPL_VAR Name="listprice"-->
+		</p>
+		<p>
+			<label class="label100">Les Prix Facturés sont</label><!--TMPL_VAR Name="invoiceprice"-->
+		</p>
+		<p>
+			<label class="label100">TVA enregistrée</label>
+				<!-- TMPL_IF name="gstreg" -->Oui<!--TMPL_ELSE-->Non<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Liste des prix des documents incluant la TVA</label>
+				<!-- TMPL_IF name="listincgst" -->Oui<!--TMPL_ELSE-->Non<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Le prix facturé comprend la TVA</label>
+				<!-- TMPL_IF name= "invoiceincgst" -->Oui<!--TMPL_ELSE-->Non<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Remise</label>
+			<!-- TMPL_VAR NAME="discount" --> %
+		</p>
+		<p>
+			<label class="label100">Notes</label>
+			<!-- TMPL_VAR NAME="notes" -->
+		</p>
+	<br/>
+	<br/>
+	</div>
+</div>
+<!--/TMPL_IF-->
 <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: acqui.simple/addbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/Attic/addbiblio.tmpl,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -b -r1.13.2.2 -r1.13.2.3
--- acqui.simple/addbiblio.tmpl	5 Jan 2006 15:17:56 -0000	1.13.2.2
+++ acqui.simple/addbiblio.tmpl	17 Oct 2006 07:26:43 -0000	1.13.2.3
@@ -1,464 +1,103 @@
 <!-- TMPL_INCLUDE NAME="marc-top.inc" -->
+	<form method="post" name="f" id="f" action="addbiblio.pl">
+<h1 class="catalogue"><!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edition de la notice numéro <!-- TMPL_VAR name="oldbiblionumber" --><!-- TMPL_ELSE -->Ajouter enregistrement MARC<!-- /TMPL_IF --> grille <!--TMPL_VAR Name="framework" --></h1>
+
 <div class="tabbed">
-	<form method="post" name="f">
-	<h1 class="catalogue">Notice N°<!-- TMPL_VAR NAME="oldbiblionumber" --> grille <!--TMPL_VAR Name="framework" --></b></h1>
-	<p>
-		<input type="hidden" name="op" value="addbiblio">
-		<input type="hidden" name="addfield_field">
-		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
-		<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->">
+		<input type="hidden" name="op" value="addbiblio" />
+		<input type="hidden" name="addfield_field" />
+		<input type="hidden" name="repeat_field" />
+		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+		<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->" />
 		<!-- TMPL_IF name="bibid" -->
-			<input type="button" value="Enregistrer" onclick="Check(this.form)" accesskey="w" class="button catalogue">
+			<input type="button" value="Enregistrer notice biblio et aller aux exemplaires" onclick="Check(this.form);" accesskey="w" class="button catalogue">
 		<!-- TMPL_ELSE -->
-			<input type="button" value="Ajouter la notice" onclick="Check(this.form)" accesskey="w" class="button catalogue">
+			<input type="button" value="Ajouter notice biblio et créer exemplaires" onclick="Check(this.form);" accesskey="w" class="button catalogue">
 		<!-- /TMPL_IF -->
-		<a href="javascript:PopupZ3950()" class="button catalogue">Recherche Z39.50</a>
-	</p>
-</div>
+	<input type="button" value="Recherche Z39.50" class="button catalogue" onclick="PopupZ3950(); return false;" =/></div>
+
 
 	<div class="tabs">
-		<!-- TMPL_IF name="0XX" -->
-		<a href="javascript:active(0)" id="link0">0</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="1XX" -->
-		<a href="javascript:active(1)" id="link1">1</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="2XX" -->
-		<a href="javascript:active(2)" id="link2">2</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="3XX" -->
-		<a href="javascript:active(3)" id="link3">3</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="4XX" -->
-		<a href="javascript:active(4)" id="link4">4</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="5XX" -->
-		<a href="javascript:active(5)" id="link5">5</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="6XX" -->
-		<a href="javascript:active(6)" id="link6">6</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="7XX" -->
-		<a href="javascript:active(7)" id="link7">7</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="8XX" -->
-		<a href="javascript:active(8)" id="link8">8</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="9XX" -->
-			<a href="javascript:active(9)" id="link9">9</a>
-		<!-- /TMPL_IF -->
+        <!-- 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>
 	
-	<div name="0XX" id="0XX" class="tab" style="visibility:visible">
+<! -- 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="problem">
-				<p>Doublon suspecté avec <a href='javascript:openWindow("../MARCdetail.pl?bib=<!-- TMPL_VAR name="duplicatebiblionumber" -->&popup=1", "Duplicate biblio")' class="button catalogue"><!-- TMPL_VAR name="duplicatetitle" --></a></p>
+                    <div class="error">
+                        <p>Est-ce un doublon de <a href="../MARCdetail.pl?bib=<!-- TMPL_VAR name="duplicatebiblionumber" -->" onclick="openWindow('../MARCdetail.pl?bib=<!-- TMPL_VAR name="duplicatebiblionumber" -->&popup=1', 'Duplicate biblio'; return false;)"><!-- TMPL_VAR name="duplicatetitle" --></a>?</p>
 				<p>Vous devez soit :</p>
 				<ul>
-					<p><input type="checkbox" value=1 name="confirm_not_duplicate"> Confirmer que ce n'est pas un doublon (et cliquer sur Ajouter Notice à nouveau)</p>
-					<p><a href="additem.pl?biblionumber=<!-- TMPL_VAR name="duplicatebibid" -->" class="button catalogue">Editer les exemplaires</a> à partir de cette notice</p>
+                            <li>S'il s'agit d'un <em>doublon</em> <a href="additem.pl?biblionumber=<!-- TMPL_VAR name="duplicatebibid" -->">Editer exemplaires</a> de la notice existante</li>
+                            <li>Sinon, cliquer pour <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" /> <a href="#" onclick="confirmnotdup(); return false;">Confirmer que ce n'est pas un doublon</a></li>
 				</ul>
 			</div>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_LOOP NAME="0XX" -->
-			<!-- TMPL_IF name="tag" -->
-				<p class="MARCtag">
-				<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-				<!-- TMPL_UNLESS name="hide_marc" -->
-					<!-- TMPL_VAR NAME="tag" --> <input type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> - 
-				<!-- TMPL_ELSE -->
-					<input type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_VAR NAME="tag_lib" -->
-				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
-				<!-- /TMPL_IF -->
-				</p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="subfield_loop" -->
-				<p class="MARCsubfield">
-					<label class="labelsubfield">
-					<!-- TMPL_UNLESS name="hide_marc" -->
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
-							<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat">
-					<!-- TMPL_ELSE -->
-							<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
 					<!-- /TMPL_UNLESS -->
-					<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="marc_lib" -->
-					<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
-					</label>
-					<!-- TMPL_VAR NAME="marc_value" -->
-					<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="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
-					<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
-				</p>
-			<!-- /tmpl_loop -->
-		<!-- /tmpl_loop -->
-	</div>
-	
-	<div name="1XX" id="1XX" class="tab">
-		<!-- TMPL_LOOP NAME="1XX" -->
+    <!-- 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" -->
-					<!-- TMPL_VAR NAME="tag" --> <input type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> - 
+                <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 type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
+                <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_IF name="repeatable" -->
-					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
-				<!-- /TMPL_IF -->
-				</p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="subfield_loop" -->
-				<p>
-					<label class="labelsubfield">
-					<!-- TMPL_UNLESS name="hide_marc" -->
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
-							<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat">
-					<!-- TMPL_ELSE -->
-							<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
 					<!-- /TMPL_UNLESS -->
-					<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="marc_lib" -->
-					<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
-					</label>
-					<!-- TMPL_VAR NAME="marc_value" -->
-					<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="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
-					<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
-				</p>
-			<!-- /tmpl_loop -->
-		<!-- /tmpl_loop -->
-	</div>
-	
-	<div name="2XX" id="2XX" class="tab">
-		<!-- TMPL_LOOP NAME="2XX" -->
-			<!-- TMPL_IF name="tag" -->
-				<p class="MARCtag">
-				<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-				<!-- TMPL_UNLESS name="hide_marc" -->
-					<!-- TMPL_VAR NAME="tag" --> <input type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> - 
-				<!-- TMPL_ELSE -->
-					<input type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_VAR NAME="tag_lib" -->
-				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
-				<!-- /TMPL_IF -->
+            <!-- TMPL_IF name="repeatable" --><a href="#<!-- TMPL_VAR NAME="tag" -->" onclick="javascript:this.nextSibling.type='text';this.nextSibling.focus()">+</a><input type="hidden"  value="" size="2" onchange="javascript:alert(this.value);AddField('<!-- TMPL_VAR NAME="tag" -->',this.value)" ><!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_LOOP NAME="subfield_loop" -->
-				<p>
-					<label class="labelsubfield">
-					<!-- TMPL_UNLESS name="hide_marc" -->
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
-							<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat">
-					<!-- TMPL_ELSE -->
-							<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
-					<!-- /TMPL_UNLESS -->
-					<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="marc_lib" -->
-					<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
-					</label>
-					<!-- TMPL_VAR NAME="marc_value" -->
-					<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="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
-					<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
-				</p>
-			<!-- /tmpl_loop -->
-		<!-- /tmpl_loop -->
-	</div>
-	
-	<div name="3XX" id="3XX" class="tab">
-		<!-- TMPL_LOOP NAME="3XX" -->
-			<!-- TMPL_IF name="tag" -->
-				<p class="MARCtag">
-				<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-				<!-- TMPL_UNLESS name="hide_marc" -->
-					<!-- TMPL_VAR NAME="tag" --> <input type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> - 
-				<!-- TMPL_ELSE -->
-					<input type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_VAR NAME="tag_lib" -->
-				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
-				<!-- /TMPL_IF -->
-				</p>
+            <!-- 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 -->
-			<!-- TMPL_LOOP NAME="subfield_loop" -->
+            <div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->">
 				<p>
-					<label class="labelsubfield">
-					<!-- TMPL_UNLESS name="hide_marc" -->
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
-							<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat">
-					<!-- TMPL_ELSE -->
-							<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
+                <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
+                    <label <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> class="labelsubfield">
 					<!-- /TMPL_UNLESS -->
-					<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="marc_lib" -->
-					<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
-					</label>
-					<!-- TMPL_VAR NAME="marc_value" -->
-					<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="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
-					<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
-				</p>
-			<!-- /tmpl_loop -->
-		<!-- /tmpl_loop -->
-	</div>
-	
-	<div name="4XX" id="4XX" class="tab">
-		<!-- TMPL_LOOP NAME="4XX" -->
-			<!-- TMPL_IF name="tag" -->
-				<p class="MARCtag">
-				<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
 				<!-- TMPL_UNLESS name="hide_marc" -->
-					<!-- TMPL_VAR NAME="tag" --> <input type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> - 
+                    <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="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_VAR NAME="tag_lib" -->
-				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
-				<!-- /TMPL_IF -->
-				</p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="subfield_loop" -->
-				<p>
-					<label class="labelsubfield">
-					<!-- TMPL_UNLESS name="hide_marc" -->
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
-							<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat">
-					<!-- TMPL_ELSE -->
-							<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
+                    <input type="hidden" name="subfield" 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_VAR NAME="marc_value" -->
-					<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="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
-					<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
-				</p>
-			<!-- /tmpl_loop -->
-		<!-- /tmpl_loop -->
-	</div>
-	
-	<div name="5XX" id="5XX" class="tab">
-		<!-- TMPL_LOOP NAME="5XX" -->
-			<!-- TMPL_IF name="tag" -->
-				<p class="MARCtag">
-				<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-				<!-- TMPL_UNLESS name="hide_marc" -->
-					<!-- TMPL_VAR NAME="tag" --> <input type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> - 
-				<!-- TMPL_ELSE -->
-					<input type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_VAR NAME="tag_lib" -->
-				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
-				<!-- /TMPL_IF -->
-				</p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="subfield_loop" -->
-				<p>
-					<label class="labelsubfield">
-					<!-- TMPL_UNLESS name="hide_marc" -->
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
-							<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat">
-					<!-- TMPL_ELSE -->
-							<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
 					<!-- /TMPL_UNLESS -->
-					<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="marc_lib" -->
-					<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
-					</label>
 					<!-- TMPL_VAR NAME="marc_value" -->
-					<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="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
-					<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
-				</p>
-			<!-- /tmpl_loop -->
-		<!-- /tmpl_loop -->
-	</div>
-	
-	<div name="6XX" id="6XX" class="tab">
-		<!-- TMPL_LOOP NAME="6XX" -->
-			<!-- TMPL_IF name="tag" -->
-				<p class="MARCtag">
-				<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-				<!-- TMPL_UNLESS name="hide_marc" -->
-					<!-- TMPL_VAR NAME="tag" --> <input type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> - 
-				<!-- TMPL_ELSE -->
-					<input type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_VAR NAME="tag_lib" -->
-				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
+                <!-- 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="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->"/>
+                <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
 				</p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="subfield_loop" -->
-				<p>
-					<label class="labelsubfield">
-					<!-- TMPL_UNLESS name="hide_marc" -->
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
-							<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat">
-					<!-- TMPL_ELSE -->
-							<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
-					<!-- /TMPL_UNLESS -->
-					<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="marc_lib" -->
-					<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
-					</label>
-					<!-- TMPL_VAR NAME="marc_value" -->
-					<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="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
-					<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
-				</p>
-			<!-- /tmpl_loop -->
-		<!-- /tmpl_loop -->
 	</div>
-	
-	<div name="7XX" id="7XX" class="tab">
-		<!-- TMPL_LOOP NAME="7XX" -->
-			<!-- TMPL_IF name="tag" -->
-				<p class="MARCtag">
-				<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-				<!-- TMPL_UNLESS name="hide_marc" -->
-					<!-- TMPL_VAR NAME="tag" --> <input type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> - 
-				<!-- TMPL_ELSE -->
-					<input type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_VAR NAME="tag_lib" -->
-				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
-				<!-- /TMPL_IF -->
-				</p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="subfield_loop" -->
-				<p>
-					<label class="labelsubfield">
-					<!-- TMPL_UNLESS name="hide_marc" -->
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
-							<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat">
-					<!-- TMPL_ELSE -->
-							<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
-					<!-- /TMPL_UNLESS -->
-					<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="marc_lib" -->
-					<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
-					</label>
-					<!-- TMPL_VAR NAME="marc_value" -->
-					<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="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
-					<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
-				</p>
-			<!-- /tmpl_loop -->
-		<!-- /tmpl_loop -->
-	</div>
-	
-	<div name="8XX" id="8XX" class="tab">
-		<!-- TMPL_LOOP NAME="8XX" -->
-			<!-- TMPL_IF name="tag" -->
-				<p class="MARCtag">
-				<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-				<!-- TMPL_UNLESS name="hide_marc" -->
-					<!-- TMPL_VAR NAME="tag" --> <input type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> - 
-				<!-- TMPL_ELSE -->
-					<input type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_VAR NAME="tag_lib" -->
-				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
-				<!-- /TMPL_IF -->
-				</p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="subfield_loop" -->
-				<p>
-					<label class="labelsubfield">
-					<!-- TMPL_UNLESS name="hide_marc" -->
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
-							<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat">
-					<!-- TMPL_ELSE -->
-							<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
-					<!-- /TMPL_UNLESS -->
-					<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="marc_lib" -->
-					<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
-					</label>
-					<!-- TMPL_VAR NAME="marc_value" -->
-					<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="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
-					<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
-				</p>
-			<!-- /tmpl_loop -->
-		<!-- /tmpl_loop -->
+        <!-- /TMPL_LOOP -->
 	</div>
-	
-	<div name="9XX" id="9XX" class="tab">
-		<!-- TMPL_LOOP NAME="9XX" -->
-			<!-- TMPL_IF name="tag" -->
-				<p class="MARCtag">
-				<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-				<!-- TMPL_UNLESS name="hide_marc" -->
-					<!-- TMPL_VAR NAME="tag" --> <input type="text" name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> - 
-				<!-- TMPL_ELSE -->
-					<input type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
-				<!-- /TMPL_UNLESS -->
-				<!-- TMPL_VAR NAME="tag_lib" -->
-				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
-				<!-- /TMPL_IF -->
-				</p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="subfield_loop" -->
-				<p>
-					<label class="labelsubfield">
-					<!-- TMPL_UNLESS name="hide_marc" -->
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onClick="javascript:upSubfield('<!-- TMPL_VAR name="index" -->')">
-							<input type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat">
-					<!-- TMPL_ELSE -->
-							<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
-					<!-- /TMPL_UNLESS -->
-					<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="marc_lib" -->
-					<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
-					</label>
-					<!-- TMPL_VAR NAME="marc_value" -->
-					<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="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
-					<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
-				</p>
-			<!-- /tmpl_loop -->
-		<!-- /tmpl_loop -->
+    <!-- /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" -->">
@@ -483,26 +122,46 @@
 		<!-- /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
+function confirmnotdup(){
+	document.getElementById("confirm_not_duplicate").value = 1;
+	var checkform =	document.getElementById("f");
+	Check(checkform);
+}
 function active(numlayer)
 {
-	for (i=0; i < 10 ; i++ ) {
+	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";
-			document.getElementById(link).style.color="#FFFFFF";
+			}
+			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="#000000";
+			}
+			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++) {
@@ -523,21 +182,20 @@
 		    // 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]) {
-			document.getElementById("error"+i).style.backgroundColor="#FF0000";
+				f.field_value[i].style.backgroundColor="#FF0000";
 			total_missing_mandatory_subfields++;
-			if (document.getElementById("error"+i).parentNode.tagName == "B")
+			if (f.field_value[i].parentNode.tagName == "B")
 			{
-				missing_mandatory_subfields.push(document.getElementById("error"+i).innerHTML + " (tab " +  document.getElementById("error"+i).parentNode.parentNode.parentNode.parentNode.id.substr(0,1) + ")");
+				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(document.getElementById("error"+i).innerHTML + " (tab " +  document.getElementById("error"+i).parentNode.parentNode.parentNode.id.substr(0,1) + ")");
+				missing_mandatory_subfields.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.id.substr(0,1) + ")");
 			}
 
 			}
 		} else {
-// 			alert("I = "+i);
-			document.getElementById("error"+i).style.backgroundColor="#FFFFFF";
+			f.field_value[i].style.backgroundColor="#FFFFFF";
 		}
 	}
 
@@ -551,16 +209,16 @@
 		if (seen_mandatory_tag_p[j] != 1) {
 		    seen_mandatory_tag_p[j] = 1;
 		    total_missing_mandatory_tags++;
- 		    if (document.getElementById("error"+i).parentNode.tagName == "B")
+ 		    if (f.field_value[i].parentNode.tagName == "B")
 		    {
-				missing_mandatory_tags.push(document.getElementById("error"+i).innerHTML + " (tab " +  document.getElementById("error"+i).parentNode.parentNode.parentNode.parentNode.id.substr(0,1) + ")");
+				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(document.getElementById("error"+i).innerHTML + " (tab " +  document.getElementById("error"+i).parentNode.parentNode.parentNode.id.substr(0,1) + ")");
+				missing_mandatory_tags.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.id.substr(0,1) + ")");
 			}
 		}
-		document.getElementById("error"+i).style.backgroundColor="#ffff00";
+		f.field_value[i].style.backgroundColor="#FFFF00";
 	    }
 	}
 
@@ -586,55 +244,126 @@
 }
 function Dopop(link,i) {
 	defaultvalue=document.forms['f'].field_value[i].value;
-	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes');
+	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=700,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'].kohafield[i].value == "biblioitems.isbn" && document.forms['f'].field_value[i].value.length>0) {
+		if (document.forms['f'].kohafield[i].value == "biblioitems.isbn"){
+			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'].kohafield[i].value == "biblio.title" && document.forms['f'].field_value[i].value.length>0) {
+		if (document.forms['f'].kohafield[i].value == "biblio.title"){
+			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'].kohafield[i].value == "biblio.author" &&document.forms['f'].field_value[i].value.length>0) {
+		if (document.forms['f'].kohafield[i].value == "biblio.author"){
+			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'].kohafield[i].value == "biblioitems.issn" && document.forms['f'].field_value[i].value.length>0) {
+		if (document.forms['f'].kohafield[i].value == "biblioitems.issn"){
+			if(document.forms['f'].field_value[i].value.length>0) {
 		    strQuery += "&issn="+document.forms['f'].field_value[i].value;
+		} else {
+			error++;
+		}
 		}
 	}
-	newin=window.open("../z3950/search.pl?bibid=<!-- TMPL_VAR NAME="bibid" -->"+strQuery,"z3950search",'width=800,height=400,toolbar=false,scrollbars=yes');
+	if(error < 4){
+	newin=window.open("../z3950/search.pl?bibid=<!-- TMPL_VAR NAME="bibid" -->"+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 Changefwk(FwkList) {
   var fwk = FwkList.options[FwkList.selectedIndex].value;
   window.location = "addbiblio.pl?oldbiblionumber=<!--TMPL_VAR Name="oldbiblionumber"-->&frameworkcode="+fwk;
 }
 
-function AddField(field) {
+function openAuth(tagid,authtype,X) {
+// 	defaultid=document.getElementById(subfieldid);
+//     alert("X"+X);
+    Y=X.parentNode.getAttribute("id");
+//     alert("tagid"+Y);
+	newin=window.open("../authorities/auth_finder.pl?authtypecode="+  authtype+ "&tagid="+Y, "value builder",'width=700,height=550,toolbar=false,scrollbars=yes');
+}
+
+
+function AddField(field,cntrepeatfield) {
 	document.forms['f'].op.value = "addfield";
 	document.forms['f'].addfield_field.value=field;
+	document.forms['f'].repeat_field.value=cntrepeatfield;
 	document.f.submit();
 }
 
+function cloneSubfield(index) {
+    var original = document.getElementById(index); //original <div>
+    var clone = original.cloneNode(true);
+
+    // set the attribute for the new 'div' subfields
+    clone.setAttribute('id',index + index);//set another id.
+    var NumTabIndex;
+    NumTabIndex = parseInt(original.getAttribute('tabindex'));
+    if(isNaN(NumTabIndex)) NumTabIndex = 0;
+    clone.setAttribute('tabindex',NumTabIndex+1);
+    
+    var CloneButtonPlus;
+    try{
+        CloneButtonPlus = clone.getElementsByTagName('a')[0];
+        CloneButtonPlus.setAttribute('onclick',"cloneSubfield('" + index + index + "')");
+    }
+    catch(e){
+        // do nothig if ButtonPlus & CloneButtonPlus don't exist.
+    }
+
+    // insert this line on the page
+    original.parentNode.insertBefore(clone,original.nextSibling);
+}
+
 function upSubfield(index) {
-// 	alert("UP "+index);
-	temp = document.forms['f'].field_value[index-1].value;
-	document.forms['f'].field_value[index-1].value=document.forms['f'].field_value[index].value;
-	document.forms['f'].field_value[index].value= temp;
-	temp = document.forms['f'].subfield[index-1].value;
-	document.forms['f'].subfield[index-1].value=document.forms['f'].subfield[index].value;
-	document.forms['f'].subfield[index].value = temp;
-	temp = document.forms['f'].mandatory[index-1].value;
-	document.forms['f'].mandatory[index-1].value=document.forms['f'].mandatory[index].value;
-	document.forms['f'].mandatory[index].value = temp;
-	temp = document.forms['f'].kohafield[index-1].value;
-	document.forms['f'].kohafield[index-1].value=document.forms['f'].kohafield[index].value;
-	document.forms['f'].kohafield[index].value = temp;
-// 	temp = document.getElementById('error'+index).value = "XXX";
-// 	document.forms['f'].kohafield[index-1].value=document.forms['f'].kohafield[index].value;
-// 	document.forms['f'].kohafield[index].value = temp;
+	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>
 </body>

Index: acqui.simple/addbooks.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/Attic/addbooks.tmpl,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -b -r1.6.2.2 -r1.6.2.3
--- acqui.simple/addbooks.tmpl	5 Jan 2006 15:17:56 -0000	1.6.2.2
+++ acqui.simple/addbooks.tmpl	17 Oct 2006 07:26:43 -0000	1.6.2.3
@@ -18,7 +18,7 @@
 				<input type="hidden" name="and_or" value="and">
 				<input type="hidden" name="excluding" value="">
 				<input type="hidden" name="operator" value="contains">
-				<input type="text" name="value" id="title"size="35">
+				<input type="text" name="value" id="title" size="35">
 			</p>
 			<p>
 				<label class="label100" for="title">ISBN</label>
@@ -27,7 +27,7 @@
 				<input type="hidden" name="and_or" value="and">
 				<input type="hidden" name="excluding" value="">
 				<input type="hidden" name="operator" value="start">
-				<input type="text" name="value" id="title"size="35">
+				<input type="text" name="value" id="title" size="35">
 			</p>
 			<p><input type="submit" value="Lancer" class="button catalogue"></p>
 		</form>

Index: acqui.simple/additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/Attic/additem.tmpl,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -b -r1.9.2.2 -r1.9.2.3
--- acqui.simple/additem.tmpl	5 Jan 2006 15:17:56 -0000	1.9.2.2
+++ acqui.simple/additem.tmpl	17 Oct 2006 07:26:43 -0000	1.9.2.3
@@ -55,6 +55,9 @@
 	<!-- TMPL_IF name="barcode_not_unique" -->
 		<div id="problem"><b>ERREUR : Code à barres déjà utilisé!<b></div>
 	<!-- /TMPL_IF -->
+	<!-- TMPL_IF name="book_on_loan" -->
+		<div id="problem"><b>Erreur : document en prêt : impossible de le supprimer !<b></div>
+	<!-- /TMPL_IF -->
 	<!-- TMPL_IF name="opisadd" -->
 	<input type="button" value="Ajouter un exemplaire" onclick="Check(this.form)" accesskey="w" class="button catalogue">
 	<!-- TMPL_ELSE -->

Index: acqui.simple/isbnsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/Attic/isbnsearch.tmpl,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -b -r1.5.2.2 -r1.5.2.3
--- acqui.simple/isbnsearch.tmpl	5 Jan 2006 15:17:56 -0000	1.5.2.2
+++ acqui.simple/isbnsearch.tmpl	17 Oct 2006 07:26:43 -0000	1.5.2.3
@@ -143,13 +143,16 @@
 		<!-- TMPL_IF NAME="NOTMARC" -->
 			<a href="addbiblio-nomarc.pl?isbn=<!-- TMPL_VAR NAME="isbn" -->" class="button catalogue">Ajouter une nouvelle notice</a>
 		<!-- TMPL_ELSE -->
+		<p>
+		<form action="addbiblio.pl" method="post">
 			<select name="frameworkcode">
 				<option value="">Par défaut</option>
 				<!-- TMPL_LOOP NAME="frameworkcodeloop" -->
 					<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
 				<!-- /TMPL_LOOP -->
 			</select>
-			<a href="addbiblio.pl?isbn=<!-- TMPL_VAR NAME="isbn" -->" class="button catalogue">Ajouter une nouvelle notice</a>
+			<input type="submit" value="Créer une nouvelle notice" class="button catalogue">
+		</form>
 		<!-- /TMPL_IF -->
 		</p>
 	</div>

Index: authorities/auth_finder.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/Attic/auth_finder.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- authorities/auth_finder.tmpl	5 Jan 2006 15:17:56 -0000	1.1.2.1
+++ authorities/auth_finder.tmpl	17 Oct 2006 07:26:43 -0000	1.1.2.2
@@ -15,27 +15,41 @@
 			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
 		</p>
 		<p>
-			<label class="label100">Vedette</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="">
+			<label class="label100">Vedette ($a seulement)</label>
 			<select name="operator">
-				<option value="start">commence par</option>
 				<option value="contains">contient</option>
+				<option value="start">commence par</option>
 			</select>
-			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+			<input type="text" name="value" value="<!-- TMPL_VAR NAME="resultstring" -->">
+			<input type="hidden" name="marclist" value="$a">
+			<input type="hidden" name="and_or" value="and">
+			<input type="hidden" name="excluding" value="">
 		</p>
 		<p>
-			<label class="label100">Partout</label><input type="text" name="value">
-			<input type="hidden" name="marclist" value="">
+			<label class="label100">Vedette</label>
+			<select name="operator">
+				<option value="contains">contient</option>
+				<option value="start">commence par</option>
+			</select>
+			<input type="text" name="value">
+			<input type="hidden" name="marclist" value="mainentry">
 			<input type="hidden" name="and_or" value="and">
 			<input type="hidden" name="excluding" value="">
+		</p>
+		<p>
+			<label class="label100">Partout</label>
 			<select name="operator">
 				<option value="contains">contient</option>
 				<option value="start">commence par</option>
 			</select>
+			<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="">
 			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+			<input type="hidden" name="tagid" value="<!-- TMPL_VAR NAME="tagid" -->">
 		</p>
+        <p>(ajouter % à la fin des mots si vous voulez une troncature : <b>théor%</b> trouvera théorie et théorèmes)</p>
 		<p>
 			<input type="submit" value="Lancer la recherche" class="button authority">
 		</p>

Index: authorities/authorities-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/Attic/authorities-home.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- authorities/authorities-home.tmpl	5 Jan 2006 15:17:56 -0000	1.1.2.1
+++ authorities/authorities-home.tmpl	17 Oct 2006 07:26:43 -0000	1.1.2.2
@@ -18,27 +18,39 @@
 			</select>
 		</h2>
 		<p>
-			<label class="label100">Vedette</label>
+			<label class="label100">Vedette ($a seulement)</label>
+			<select name="operator">
+				<option value="contains">contient</option>
+				<option value="start">commence par</option>
+			</select>
 			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
-			<input type="hidden" name="marclist" value="mainentry">
+			<input type="hidden" name="marclist" value="$a">
 			<input type="hidden" name="and_or" value="and">
 			<input type="hidden" name="excluding" value="">
+		</p>
+		<p>
+			<label class="label100">Vedette</label>
 			<select name="operator">
 				<option value="contains">contient</option>
 				<option value="start">commence par</option>
 			</select>
-		</p>
-		<p>
-			<label class="label100">Partout</label>
 			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
-			<input type="hidden" name="marclist" value="">
+			<input type="hidden" name="marclist" value="mainentry">
 			<input type="hidden" name="and_or" value="and">
 			<input type="hidden" name="excluding" value="">
+		</p>
+		<p>
+			<label class="label100">Partout</label>
 			<select name="operator">
 				<option value="contains">contient</option>
 				<option value="start">commence par</option>
 			</select>
+			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+			<input type="hidden" name="marclist" value="">
+			<input type="hidden" name="and_or" value="and">
+			<input type="hidden" name="excluding" value="">
 		</p>
+        <p>(ajouter % à la fin des mots si vous voulez une troncature : <b>théor%</b> trouvera théorie et théorèmes)</p>
 		<p>
 			<input type="submit" value="Lancer la recherche" class="button authority">
 		</p>

Index: authorities/authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/Attic/authorities.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- authorities/authorities.tmpl	5 Jan 2006 15:17:56 -0000	1.2.2.2
+++ authorities/authorities.tmpl	17 Oct 2006 07:26:43 -0000	1.2.2.3
@@ -154,7 +154,7 @@
 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_("champs obligatoires non renseignés (voir les champs en caractère gras)");
 		alert(alertString2);
 	} else {
-		document.forms[0].submit();
+		document.forms['f'].submit();
 	}
 }
 function Dopop(link,i) {
@@ -182,8 +182,8 @@
 }
 
 function AddField(field) {
-	document.forms[0].op.value = "addfield";
-	document.forms[0].addfield_field.value=field;
+	document.forms['f'].op.value = "addfield";
+	document.forms['f'].addfield_field.value=field;
 	document.f.submit();
 }
 

Index: authorities/blinddetail-biblio-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/Attic/blinddetail-biblio-search.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- authorities/blinddetail-biblio-search.tmpl	5 Jan 2006 15:17:56 -0000	1.1.2.1
+++ authorities/blinddetail-biblio-search.tmpl	17 Oct 2006 07:26:43 -0000	1.1.2.2
@@ -1,5 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
+<!-- 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=iso-8859-1"><!-- /TMPL_IF -->
+
 <body>
 <script language="JavaScript" type="text/javascript">
 

Index: authorities/detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/Attic/detail.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- authorities/detail.tmpl	5 Jan 2006 15:17:56 -0000	1.1.2.1
+++ authorities/detail.tmpl	17 Oct 2006 07:26:43 -0000	1.1.2.2
@@ -1,5 +1,58 @@
 <!-- TMPL_INCLUDE NAME="auth-top.inc" -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
+<!-- TMPL_IF Name="displayhierarchy"-->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/hierarchy.css">
+<script language="JavaScript" type="text/javascript">
+function showParents(mynumber) {
+  var parents=document.getElementsByName(mynumber+'p')
+  for(i=0;i<parents.length;i++){
+    if (parents[i].style.display == "none") {
+      parents[i].style.display ="block";
+    } else {
+      parents[i].style.display ="none";
+    }
+  } 
+}
+function showChildren(mynumber) {
+  var children=document.getElementsByName(mynumber+'c')
+  for(i=0;i<children.length;i++){
+    if (children[i].style.display == "none") {
+      children[i].style.display = "block";
+    } else {
+      children[i].style.display = "none";
+    }
+  }
+}
+</script>
+
+<div class="hierarchies">
+<!--TMPL_LOOP Name="loophierarchies" -->
+  <div class="hierarchy">
+  <!--TMPL_LOOP Name="loopelement" -->
+    <div id="<!--TMPL_VAR Name="loopauthid" -->" class="<!--TMPL_VAR Name="class" -->">
+    <!--TMPL_IF Name="ifparents" -->
+      <!--TMPL_LOOP Name="loopparents" -->
+        <div name="<!--TMPL_VAR Name="loopauthid" -->p" class="parent"> <a href="detail.pl?authid=<!--TMPL_VAR Name="parentauthid" -->"><!--TMPL_VAR Name="parentvalue" --></a></div>
+      <!--/TMPL_LOOP-->
+    <!--/TMPL_IF -->
+    <!-- TMPL_IF name="current_value" -->
+        <!--TMPL_VAR Name="value" -->
+    <!-- TMPL_ELSE -->
+        <a href="detail.pl?authid=<!--TMPL_VAR Name="loopauthid" -->" title="Terme"><!--TMPL_VAR Name="value" --></a>
+    <!-- /TMPL_IF -->
+    <!--TMPL_IF Name="ifchildren" -->
+      <sub><a class="parents" title="Termes spécifiques" href="JavaScript:showChildren('<!--TMPL_VAR Name="loopauthid" -->');">+</a></sub><br/>
+      <!--TMPL_LOOP Name="loopchildren" -->
+        <div name="<!--TMPL_VAR Name="loopauthid" -->c" class="child"> <a href="detail.pl?authid=<!--TMPL_VAR Name="childauthid" -->"><!--TMPL_VAR Name="childvalue" --></a></div>
+      <!--/TMPL_LOOP-->
+    <!-- /TMPL_IF -->
+    </div>
+  <!--/TMPL_LOOP-->
+    
+  </div>
+<!--/TMPL_LOOP-->
+</div>
+<!-- /TMPL_IF -->
 <div class="tabbed">
 	<h1 class="authority">Autorité  #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
 	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
@@ -10,7 +63,7 @@
 			<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png">
 		</a>
 	<!-- /TMPL_UNLESS -->
-	<a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->')" class="button authority"> Imprimer </a> <a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button authority"><!-- TMPL_VAR name="count" --> Notices</a>
+	<a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button authority"><!-- TMPL_VAR name="count" --> notices</a>
 </div>
 
 <div name="0XX" id="0XX" class="tab" style="visibility:visible">

Index: authorities/searchresultlist-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/Attic/searchresultlist-auth.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- authorities/searchresultlist-auth.tmpl	5 Jan 2006 15:17:56 -0000	1.2.2.1
+++ authorities/searchresultlist-auth.tmpl	17 Oct 2006 07:26:43 -0000	1.2.2.2
@@ -23,6 +23,7 @@
 						<option value="contains">contient</option>
 					</select>
 					<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+					<input type="hidden" name="tagid" value="<!-- TMPL_VAR NAME="tagid" -->">
 				</p>
 				<p>
 					<label class="label100">Partout</label><input type="text" name="value">
@@ -34,6 +35,7 @@
 						<option value="start">commence par</option>
 					</select>
 					<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+					<input type="hidden" name="tagid" value="<!-- TMPL_VAR NAME="tagid" -->">
 				</p>
 				<p>
 				<input type="submit" value="Lancer la recherche" class="button authority">
@@ -45,7 +47,7 @@
 		<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" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
+					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
 						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
 					</a>
 				<!-- /TMPL_IF -->
@@ -53,12 +55,12 @@
 					<!-- 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" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
+						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
 							<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="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
+					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
 						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
 				<!-- /TMPL_IF -->
 			</p>
@@ -81,7 +83,7 @@
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
 					<td>
-						<a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=0&amp;index=<!-- TMPL_VAR NAME="index" -->')" class="button authority">
+						<a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=0&amp;index=<!-- TMPL_VAR NAME="index" -->&amp;tagid=<!-- TMPL_VAR NAME="tagid" -->')" class="button authority">
 							Effacer
 						</a>
 					</td>
@@ -90,7 +92,7 @@
 						<td><!-- TMPL_VAR NAME="summary" --></td>
 						<td><!-- TMPL_VAR NAME="used" --> fois</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="32" hspace="0" vspace="0" border="0"></a>
+							<a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=<!-- TMPL_VAR NAME="authid" -->&amp;index=<!-- TMPL_VAR NAME="index" -->&amp;tagid=<!-- TMPL_VAR NAME="tagid" -->')"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/arrow.gif" width="32" hspace="0" vspace="0" border="0"></a>
 						</td>
 					</tr>
 				<!-- /TMPL_LOOP -->
@@ -125,7 +127,7 @@
 
 function jumpfull(page)
 {	
-	window.open(page,'','fullscreen,scrollbars');
+	window.open(page,'','width=10,height=10');
 }
 </script>
 <!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->

Index: bull/full-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/Attic/full-serial-issues.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- bull/full-serial-issues.tmpl	5 Jan 2006 15:24:47 -0000	1.1.2.1
+++ bull/full-serial-issues.tmpl	17 Oct 2006 07:26:43 -0000	1.1.2.2
@@ -4,22 +4,26 @@
 <!-- TMPL_UNLESS name="popup" -->
 	<h1 class="bull">Information d'abonnement pour notice N°<!-- TMPL_VAR NAME="biblionumber" --> titre : <!-- TMPL_VAR name="bibliotitle" --></h1>
 	<p>
-	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button bull">Retour notice</a>
+	<a href="/cgi-bin/koha/bull-home.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button bull">Retour aux abonnements</a> <a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button bull">Retour à la notice</a>
 <!-- /TMPL_UNLESS -->
 	<!-- TMPL_LOOP NAME="years" -->
-		<!-- TMPL_IF NAME="year" -->
+		<!-- TMPL_IF NAME="Nodate" -->
+			<a  class="button bull" href="javascript:active(1900)">Pas de publication</a>
+		<!-- TMPL_ELSE-->
 			<a  class="button bull" href="javascript:active(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a>
 		<!-- /TMPL_IF -->
 	<!-- /TMPL_LOOP -->
 	<a class=" button bull" href="serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&selectview=small">Vue compacte</a>
 	</p>
 	<!-- TMPL_LOOP NAME="years" -->
-	<div name="<!-- TMPL_VAR NAME="year" -->" id="<!-- TMPL_VAR NAME="year" -->" style="position:absolute; visibility:hidden; margin-top:0px; border:4px;" <!--TMPL_IF Name="first" -->style="visibility:visible"<!--/TMPL_IF -->>
+	<div name="yeardata" id="<!-- TMPL_VAR NAME="year" -->" style="position:absolute; visibility:hidden; margin-top:0px; border:4px;" <!--TMPL_IF Name="first" -->style="visibility:visible"<!--/TMPL_IF -->>
 		<table>
 			<tr>
 				<th class="bull">Information
 				</th>
-				<th class="bull">Date
+				<th class="bull">Année de Publication
+				</th>
+				<th class="bull">Date réception
 				</th>
 				<th class="bull">Nombre
 				</th>
@@ -32,14 +36,17 @@
 					<!-- TMPL_VAR name="notes" -->
 				</td>
 				<td>
+					<!-- TMPL_VAR Name="publisheddate" -->
+				</td>
+				<td>
 					<!-- TMPL_VAR Name="planneddate" -->
 				</td>
 				<td>
 					<!-- TMPL_VAR Name="serialseq" -->
 				</td>
 				<td>
-					<!-- TMPL_IF Name="status1" -->Arrivé<!-- /TMPL_IF -->
-					<!-- TMPL_IF Name="status2" -->Attendu<!-- /TMPL_IF -->
+					<!-- TMPL_IF Name="status1" -->Attendu<!-- /TMPL_IF -->
+					<!-- TMPL_IF Name="status2" -->Arrivé<!-- /TMPL_IF -->
 					<!-- TMPL_IF Name="status3" -->En retard<!-- /TMPL_IF -->
 					<!-- TMPL_IF Name="status4" -->Manquant<!-- /TMPL_IF -->
 				</td>
@@ -52,13 +59,13 @@
 active(<!-- TMPL_VAR name="yearmin" -->);
 function active(numlayer)
 {
-	for (i=<!--TMPL_VAR Name="yearmin"-->; i<=<!--TMPL_VAR Name="yearmax"-->; i++ ) {
-		ong = i;
-		link = "link"+i;
-		if (numlayer==i) {
-			document.getElementById(ong).style.visibility="visible";
+	var yeardata=document.getElementsByName("yeardata");
+    for (i=0; i<=yeardata.length; i++ ) {
+		ong=yeardata[i].getAttribute('id');
+        if (numlayer==ong) {
+			yeardata[i].style.visibility="visible";
 		} else {
-			document.getElementById(ong).style.visibility="hidden";
+			yeardata[i].style.visibility="hidden";
 		}
 	}
 }

Index: bull/lateissues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/Attic/lateissues.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- bull/lateissues.tmpl	5 Jan 2006 15:24:47 -0000	1.1.2.1
+++ bull/lateissues.tmpl	17 Oct 2006 07:26:43 -0000	1.1.2.2
@@ -7,7 +7,7 @@
 			<!-- TMPL_VAR name="CGIsupplier" -->
 				<!-- TMPL_IF name="phone" -->Télé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" -->" class="button bull"><!-- TMPL_VAR name="bookselleremail" --></a><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="contemail" --></p><p><a href="mailto:<!-- TMPL_VAR name="contemail" -->" class="button bull"><!-- TMPL_VAR name="contemail" --></a><!-- /TMPL_IF -->
 			<input type="submit" value="filtre" class="button bull">
 		</form>
 	</p>

Index: bull/statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/Attic/statecollection.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- bull/statecollection.tmpl	5 Jan 2006 15:17:56 -0000	1.2.2.1
+++ bull/statecollection.tmpl	17 Oct 2006 07:26:43 -0000	1.2.2.2
@@ -6,7 +6,7 @@
 <a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull" title="detail of the subscription">Abonnement</a> <a href="/cgi-bin/koha/bull-home.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button bull" title="all subscriptions on <!-- TMPL_VAR name="bibliotitle" -->">Abonnements</a> <a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button bull" title="go to <!-- TMPL_VAR name="bibliotitle" -->">Notice</a>
 
 <div id="bloc25">
-<h2 class="bull">Numéros attendus ou en retard</h2>
+<h2 class="bull">numéros attendus ou en retard</h2>
 	<form method="post" name="f" action="statecollection.pl">
 		<input type="hidden" name="op" value="serialchangestatus">
 		<input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->">
@@ -18,7 +18,10 @@
 			Numéroté
 		</th>
 		<th class="bull">
-			Prevu pour
+			Publié le
+		</th>
+		<th class="bull">
+			Arrive le
 		</th>
 		<th class="bull">
 			Etat
@@ -30,10 +33,13 @@
 	<!-- TMPL_LOOP name="serialslist" -->
 		<tr>
 			<td>
-				<input type="text" name="serialseq" value="<!-- TMPL_VAR name="serialseq" -->" size=50 maxlength=100>
+				Bulletin <input type="text" name="serialseq" value="<!-- TMPL_VAR name="serialseq" -->" size="40" maxlength="100">
+			</td>
+			<td>
+				<input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size="10" maxlength="15">
 			</td>
 			<td>
-				<input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size=10 maxlength=15>
+				<input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size="10" maxlength="15">
 			</td>
 			<td>
 				<input type="hidden" name="serialid" value="<!-- TMPL_VAR name="serialid" -->">
@@ -72,6 +78,48 @@
 				<input type="text" name="notes" value="<!-- TMPL_VAR name="notes" -->" size=20 maxlength=255>
 			</td>
 		</tr>
+		<!--TMPL_IF Name="serialadditems" -->
+		<tr>
+            <td>
+				Code à barres <input type="text" name="barcode" value="" size=20 maxlength=20> Cote <input type="text" name="itemcallnumber" value="" size=10 maxlength=15>
+            </td>
+			</td>
+            &nbsp;
+			<td>
+			<td>
+				<select name="branch" size="1">
+						<option value="">Site</option>
+			<!-- 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>
+			</td>
+			<td>
+				<!--TMPL_IF Name="itemstatus"-->
+					<select name="itemstatus" size="1">
+						<option value="">Etat exemplaire</option>
+						<!-- TMPL_LOOP name="itemstatusloop" -->
+							<option value="<!-- TMPL_VAR name="itemval" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="itemlib" --></option>
+						<!-- /TMPL_LOOP -->
+					</select>
+				<!-- TMPL_ELSE -->
+				&nbsp;
+				<!--/TMPL_IF-->
+			</td>
+			<td>
+				<!--TMPL_IF Name="itemlocation"-->
+					<select name="location" size="1">
+						<option value="">Localisation</option>
+						<!-- TMPL_LOOP name="itemlocationloop" -->
+							<option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="itemlocationname" --></option>
+						<!-- /TMPL_LOOP -->
+					</select>
+				<!-- TMPL_ELSE -->
+				&nbsp;
+				<!--/TMPL_IF-->
+			</td>
+		</tr>
+		<!--/TMPL_IF-->
 	<!-- /TMPL_LOOP -->
 	<!-- TMPL_UNLESS name="hassubscriptionexpired" -->
 		<tr>
@@ -79,6 +127,9 @@
 				Bulletin hors série <input type="text" name="serialseq" size=30 maxlength=100>
 			</td>
 			<td>
+				<input type="text" name="publisheddate" size=10 maxlength=15>
+			</td>
+			<td>
 				<input type="text" name="planneddate" size=10 maxlength=15>
 			</td>
 			<td>
@@ -90,6 +141,48 @@
 				</select>
 			</td>
 		</tr>
+		<!--TMPL_IF Name="serialadditems" -->
+		<tr>
+            <td>
+				Code à barres <input type="text" name="barcode" value="" size=20 maxlength=20> Cote <input type="text" name="itemcallnumber" value="" size=10 maxlength=15>
+			</td>
+			<td>
+				&nbsp;
+            </td>
+			<td>
+				<select name="branch" size="1">
+						<option value="">Site</option>
+			<!-- 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>
+			</td>
+			<td>
+				<!-- TMPL_IF Name="itemstatus"-->
+					<select name="itemstatus" size="1">
+						<option value="">Etat exemplaire</option>
+						<!-- TMPL_LOOP name="itemstatusloop" -->
+							<option value="<!-- TMPL_VAR name="itemval" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="itemlib" --></option>
+						<!-- /TMPL_LOOP -->
+					</select>
+				<!-- TMPL_ELSE -->
+				&nbsp;
+				<!--/TMPL_IF -->
+			</td>
+			<td>
+				<!-- TMPL_IF Name="itemlocation"-->
+					<select name="location" size="1">
+						<option value="">Localisation</option>
+						<!-- TMPL_LOOP name="itemlocationloop" -->
+							<option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="itemlocationname" --></option>
+						<!-- /TMPL_LOOP -->
+					</select>
+				<!-- TMPL_ELSE -->
+				&nbsp;
+				<!--/TMPL_IF -->
+			</td>
+		</tr>
+		<!--/TMPL_IF-->
 	<!-- /TMPL_UNLESS -->
 	</table>
 	<input type="submit" value="Enregistrer les changements" accesskey="w" class="button bull">

Index: bull/subscription-add.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/Attic/subscription-add.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- bull/subscription-add.tmpl	5 Jan 2006 15:17:56 -0000	1.2.2.2
+++ bull/subscription-add.tmpl	17 Oct 2006 07:26:43 -0000	1.2.2.3
@@ -125,7 +125,7 @@
 </div>
 <div id="bloc25">
 	<h2 class="bull">Durée d'abonnement</h2>
-	<p>Saisir 1 des champs suivants :</p>
+	<p>Saisir 1 (et 1 seul) des champs suivants :</p>
 	<ul>
 		<p><label class="label100">Nombre de bulletins</label><input type="text" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></p>
 		<p><label class="label100">Nombre de semaines</label><input type="text" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></p>
@@ -162,19 +162,21 @@
 				<td><input type="text" name="every3" value="<!-- TMPL_VAR name="every3" -->"></td>
 			</tr>
 			<tr>
-				<td class="bull">Quand supérieur à</td>
-				<td><input type="text" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
-				<td><input type="text" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
-				<td><input type="text" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
-			</tr>
 			<!-- TMPL_IF name="mod" -->
-			<tr>
 				<td class="bull">Le compteur est actuellement</td>
+				<!-- TMPL_ELSE -->
+					<td class="bull">Début abonnement</td>
+				<!-- /TMPL_IF -->
 				<td><input type="text" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->"></td>
 				<td><input type="text" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->"></td>
 				<td><input type="text" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->"></td>
 			</tr>
-			<!-- /TMPL_IF -->
+			<tr>
+				<td class="bull">Quand supérieur à</td>
+				<td><input type="text" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
+				<td><input type="text" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
+				<td><input type="text" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
+			</tr>
 			<tr>
 				<td class="bull">Retourner à</td>
 				<td><input type="text" name="setto1" value="<!-- TMPL_VAR name="setto1" -->"></td>

Index: bull/subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/Attic/subscription-detail.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- bull/subscription-detail.tmpl	5 Jan 2006 15:17:56 -0000	1.2.2.2
+++ bull/subscription-detail.tmpl	17 Oct 2006 07:26:43 -0000	1.2.2.3
@@ -111,13 +111,16 @@
 				<td><!-- TMPL_VAR name="every3" --></td>
 			</tr>
 			<tr>
+				<td class="bull">Début abonnement</td>
+				<td><!-- TMPL_IF name="innerloop1" --><!-- TMPL_VAR name="innerloop1" --><!-- /TMPL_IF --></td>
+				<td><!-- TMPL_IF name="innerloop2" --><!-- TMPL_VAR name="innerloop2" --><!-- /TMPL_IF --></td>
+				<td><!-- TMPL_IF name="innerloop3" --><!-- TMPL_VAR name="innerloop3" --><!-- /TMPL_IF --></td>
+			</tr>
+			<tr>
 				<td class="bull">Quand supérieur à</td>
-				<td><!-- TMPL_VAR name="whenmorethan1" --> <!-- TMPL_IF name="innerloop1" --><br/>
-					<i>(est <!-- TMPL_VAR name="innerloop1" -->)</i><!-- /TMPL_IF --></td>
-				<td><!-- TMPL_VAR name="whenmorethan2" --> <!-- TMPL_IF name="innerloop2" --><br/>
-					<i>(est <!-- TMPL_VAR name="innerloop2" -->)</i><!-- /TMPL_IF --></td>
-				<td><!-- TMPL_VAR name="whenmorethan3" --> <!-- TMPL_IF name="innerloop3" --><br/>
-					<i>(est <!-- TMPL_VAR name="innerloop3" -->)</i><!-- /TMPL_IF --></td>
+				<td><!-- TMPL_VAR name="whenmorethan1" --></td>
+				<td><!-- TMPL_VAR name="whenmorethan2" --></td>
+				<td><!-- TMPL_VAR name="whenmorethan3" --></td>
 			</tr>
 			<tr>
 				<td class="bull">Retourner à</td>
@@ -136,7 +139,7 @@
 		</table>
 </div>
 <div id="bloc25">
-	<h2 class="bull">N° parus</h2>
+	<h2 class="bull">Bulletins</h2>
 	<table class="small">
 	<tr>
 		<th class="bull">Numéro</th>

Index: catalogue/MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/Attic/MARCdetail.tmpl,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -b -r1.10.2.2 -r1.10.2.3
--- catalogue/MARCdetail.tmpl	5 Jan 2006 15:17:56 -0000	1.10.2.2
+++ catalogue/MARCdetail.tmpl	17 Oct 2006 07:26:43 -0000	1.10.2.3
@@ -69,9 +69,9 @@
 					<label class="labelsubfield">&nbsp;
 					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
 					<!-- TMPL_VAR NAME="marc_lib" --></label>
-					<!-- TMPL_VAR NAME="marc_value" -->
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
 					<!-- TMPL_IF name="link" -->
-						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='Autorité numéro <!-- TMPL_VAR name="authid" -->'>
 						</a>
 					<!-- /TMPL_IF -->
@@ -97,9 +97,9 @@
 					<label class="labelsubfield">&nbsp;
 					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
 					<!-- TMPL_VAR NAME="marc_lib" --></label>
-					<!-- TMPL_VAR NAME="marc_value" -->
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
 					<!-- TMPL_IF name="link" -->
-						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='Autorité numéro <!-- TMPL_VAR name="authid" -->'>
 						</a>
 					<!-- /TMPL_IF -->
@@ -125,9 +125,9 @@
 					<label class="labelsubfield">&nbsp;
 					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
 					<!-- TMPL_VAR NAME="marc_lib" --></label>
-					<!-- TMPL_VAR NAME="marc_value" -->
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
 					<!-- TMPL_IF name="link" -->
-						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='Autorité numéro <!-- TMPL_VAR name="authid" -->'>
 						</a>
 					<!-- /TMPL_IF -->
@@ -153,9 +153,9 @@
 					<label class="labelsubfield">&nbsp;
 					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
 					<!-- TMPL_VAR NAME="marc_lib" --></label>
-					<!-- TMPL_VAR NAME="marc_value" -->
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
 					<!-- TMPL_IF name="link" -->
-						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='Autorité numéro <!-- TMPL_VAR name="authid" -->'>
 						</a>
 					<!-- /TMPL_IF -->
@@ -181,9 +181,9 @@
 					<label class="labelsubfield">&nbsp;
 					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
 					<!-- TMPL_VAR NAME="marc_lib" --></label>
-					<!-- TMPL_VAR NAME="marc_value" -->
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
 					<!-- TMPL_IF name="link" -->
-						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='Autorité numéro <!-- TMPL_VAR name="authid" -->'>
 						</a>
 					<!-- /TMPL_IF -->
@@ -209,9 +209,9 @@
 					<label class="labelsubfield">&nbsp;
 					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
 					<!-- TMPL_VAR NAME="marc_lib" --></label>
-					<!-- TMPL_VAR NAME="marc_value" -->
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
 					<!-- TMPL_IF name="link" -->
-						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='Autorité numéro <!-- TMPL_VAR name="authid" -->'>
 						</a>
 					<!-- /TMPL_IF -->
@@ -237,9 +237,9 @@
 					<label class="labelsubfield">&nbsp;
 					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
 					<!-- TMPL_VAR NAME="marc_lib" --></label>
-					<!-- TMPL_VAR NAME="marc_value" -->
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
 					<!-- TMPL_IF name="link" -->
-						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='Autorité numéro <!-- TMPL_VAR name="authid" -->'>
 						</a>
 					<!-- /TMPL_IF -->
@@ -265,9 +265,9 @@
 					<label class="labelsubfield">&nbsp;
 					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
 					<!-- TMPL_VAR NAME="marc_lib" --></label>
-					<!-- TMPL_VAR NAME="marc_value" -->
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
 					<!-- TMPL_IF name="link" -->
-						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='Autorité numéro <!-- TMPL_VAR name="authid" -->'>
 						</a>
 					<!-- /TMPL_IF -->
@@ -293,9 +293,9 @@
 					<label class="labelsubfield">&nbsp;
 					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
 					<!-- TMPL_VAR NAME="marc_lib" --></label>
-					<!-- TMPL_VAR NAME="marc_value" -->
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
 					<!-- TMPL_IF name="link" -->
-						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='Autorité numéro <!-- TMPL_VAR name="authid" -->'>
 						</a>
 					<!-- /TMPL_IF -->
@@ -321,9 +321,9 @@
 					<label class="labelsubfield">&nbsp;
 					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
 					<!-- TMPL_VAR NAME="marc_lib" --></label>
-					<!-- TMPL_VAR NAME="marc_value" -->
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
 					<!-- TMPL_IF name="link" -->
-						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='Autorité numéro <!-- TMPL_VAR name="authid" -->'>
 						</a>
 					<!-- /TMPL_IF -->

Index: catalogue/detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/Attic/detail.tmpl,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -u -b -r1.9.2.3 -r1.9.2.4
--- catalogue/detail.tmpl	5 Jan 2006 15:17:56 -0000	1.9.2.3
+++ catalogue/detail.tmpl	17 Oct 2006 07:26:43 -0000	1.9.2.4
@@ -50,7 +50,7 @@
 					<p><label class="label100"><b>Sujet:</b></label></p>
 					<p>
 						<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
-							<label class="label100">-</label><a href="/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->">
+							<label class="label100">-</label><a href="/cgi-bin/koha/search.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->">
 								<!-- TMPL_VAR NAME="marcsubjct" -->
 							</a><br>
 						<!-- /TMPL_LOOP -->
@@ -58,7 +58,7 @@
 				<!-- TMPL_ELSE -->
 					<!-- TMPL_IF name="subjects" --><p><label class="label100"><b>Sujet(s)</b> </label></p>
 						<!-- TMPL_LOOP name="subjects" -->
-							<p><a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator==&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a> </p> <!-- /TMPL_LOOP -->
+							<p><a href="/cgi-bin/koha/search.marc/search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->&type=intranet"><!-- TMPL_VAR NAME="subject" --></a> </p> <!-- /TMPL_LOOP -->
 					<!-- /TMPL_IF -->
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="copyrightdate" --><p><label class="label100"><b>Année</b> </label><!-- TMPL_VAR NAME="copyrightdate" --></p><!-- /TMPL_IF -->
@@ -114,13 +114,22 @@
 				<td><!-- TMPL_VAR NAME="description" --></td>
 				<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --></td>
 				<td>
-					<!-- TMPL_IF name="datedue" -->
+					<!-- TMPL_IF name="borrowernumber" -->
 						Prété à : <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a>
 					<!-- TMPL_ELSE -->
-						<!-- TMPL_VAR name="notforloan" -->
+						<!-- TMPL_IF name="notforloantext" -->
+							<!-- TMPL_VAR name="notforloantext" -->
+						<!-- TMPL_ELSE -->
+						    <!-- TMPL_IF name="itemlost"-->
+						        Exemplaire perdu
+						    <!-- TMPL_ELSE -->
+							<!-- TMPL_IF NAME="wthdrawn" -->Exemplaire annulé<!-- TMPL_ELSE -->Disponible<!-- /TMPL_IF -->
+						    <!-- /TMPL_IF -->
+						<!-- /TMPL_IF -->
 					<!-- /TMPL_IF -->
 				</td>
-				<td><!-- TMPL_VAR NAME="datedue" --></td>
+				<td><!-- TMPL_VAR NAME="datedue" -->
+				<!-- TMPL_IF name="reservestatus" -->Réservations <!-- TMPL_VAR name="reservestatus" --><!-- /TMPL_IF --></td>
 				<td><!-- TMPL_VAR NAME="datelastseen" --></td>
 				<td><a href="/cgi-bin/koha/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
 				<td><!-- TMPL_VAR NAME="volumeddesc" --></td>

Index: circ/circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/Attic/circulation.tmpl,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -b -r1.11.2.2 -r1.11.2.3
--- circ/circulation.tmpl	5 Jan 2006 15:17:56 -0000	1.11.2.2
+++ circ/circulation.tmpl	17 Oct 2006 07:26:43 -0000	1.11.2.3
@@ -30,6 +30,11 @@
 			<h2 class="circulation">Information lecteur</h2>
 			<!--TMPL_IF Name="warndeparture"--><p class="problem"><!--TMPL_ELSE--><p><!--/TMPL_IF--><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR name="cardnumber" -->) <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" --> " class="button circulation"> détail </a> <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;modify=edit&amp;destination=circ" class="button circulation">Modifier</a>
 			<!--TMPL_IF Name="warndeparture"--><br /> La carte lecteur va bientôt expirer<br /><!--/TMPL_IF-->
+			<!-- TMPL_IF NAME="patronimages" -->
+				<div class="bloc25">
+					<img src="/patronimages/<!-- TMPL_VAR NAME="cardnumber" -->.<!-- TMPL_VAR NAME="patronimages" -->" alt="PAS d'IMAGE" border="0">
+				</div>
+			<!-- /TMPL_IF -->
 			</p>
 			<p>
 				<!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME="city" -->
@@ -54,7 +59,7 @@
 				<h2 class="circulation">
 					entrer le n° de carte de lecteur ou une partie du nom
 				</h2>
-				<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+				<form method="post" name="f" action="/cgi-bin/koha/circ/circulation.pl">
 					<input name="findborrower">
 					<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
 					<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
@@ -70,21 +75,21 @@
 
 <!-- TMPL_IF NAME="borrowernumber" -->
 	<div id="bloc25">
-	<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+	<form method="post" name="f" action="/cgi-bin/koha/circ/circulation.pl">
 		<h2 class="circulation">Entrez le code à barres du livre</h2>
 		<p>Code à Barres de l'exemplaire :<input name="barcode" size="10"> <input type="submit" value="Prêter" class="button circulation"></p>
 		<p>
 			<select name="day">
 				<option value="0">Jour</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="01"<!-- TMPL_IF NAME="day1" --> selected="selected"<!-- /TMPL_IF -->>1</option>
+				<option value="02"<!-- TMPL_IF NAME="day2" --> selected="selected"<!-- /TMPL_IF -->>2</option>
+				<option value="03"<!-- TMPL_IF NAME="day3" --> selected="selected"<!-- /TMPL_IF -->>3</option>
+				<option value="04"<!-- TMPL_IF NAME="day4" --> selected="selected"<!-- /TMPL_IF -->>4</option>
+				<option value="05"<!-- TMPL_IF NAME="day5" --> selected="selected"<!-- /TMPL_IF -->>5</option>
+				<option value="06"<!-- TMPL_IF NAME="day6" --> selected="selected"<!-- /TMPL_IF -->>6</option>
+				<option value="07"<!-- TMPL_IF NAME="day7" --> selected="selected"<!-- /TMPL_IF -->>7</option>
+				<option value="08"<!-- TMPL_IF NAME="day8" --> selected="selected"<!-- /TMPL_IF -->>8</option>
+				<option value="09"<!-- 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>
@@ -110,15 +115,15 @@
 			</select>
 			<select name="month">
 				<option value="0">Mois</option>
-				<option value="1"<!-- TMPL_IF NAME="month1" --> selected="selected"<!-- /TMPL_IF -->>Janv</option>
-				<option value="2"<!-- TMPL_IF NAME="month2" --> selected="selected"<!-- /TMPL_IF -->>Fév.</option>
-				<option value="3"<!-- TMPL_IF NAME="month3" --> selected="selected"<!-- /TMPL_IF -->>Mars</option>
-				<option value="4"<!-- TMPL_IF NAME="month4" --> selected="selected"<!-- /TMPL_IF -->>Avr</option>
-				<option value="5"<!-- TMPL_IF NAME="month5" --> selected="selected"<!-- /TMPL_IF -->>Mai</option>
-				<option value="6"<!-- TMPL_IF NAME="month6" --> selected="selected"<!-- /TMPL_IF -->>Juin</option>
-				<option value="7"<!-- TMPL_IF NAME="month7" --> selected="selected"<!-- /TMPL_IF -->>Juil</option>
-				<option value="8"<!-- TMPL_IF NAME="month8" --> selected="selected"<!-- /TMPL_IF -->>Aou</option>
-				<option value="9"<!-- TMPL_IF NAME="month9" --> selected="selected"<!-- /TMPL_IF -->>Sept</option>
+				<option value="01"<!-- TMPL_IF NAME="month1" --> selected="selected"<!-- /TMPL_IF -->>Janv</option>
+				<option value="02"<!-- TMPL_IF NAME="month2" --> selected="selected"<!-- /TMPL_IF -->>Fév.</option>
+				<option value="03"<!-- TMPL_IF NAME="month3" --> selected="selected"<!-- /TMPL_IF -->>Mars</option>
+				<option value="04"<!-- TMPL_IF NAME="month4" --> selected="selected"<!-- /TMPL_IF -->>Avr</option>
+				<option value="05"<!-- TMPL_IF NAME="month5" --> selected="selected"<!-- /TMPL_IF -->>Mai</option>
+				<option value="06"<!-- TMPL_IF NAME="month6" --> selected="selected"<!-- /TMPL_IF -->>Juin</option>
+				<option value="07"<!-- TMPL_IF NAME="month7" --> selected="selected"<!-- /TMPL_IF -->>Juil</option>
+				<option value="08"<!-- TMPL_IF NAME="month8" --> selected="selected"<!-- /TMPL_IF -->>Aou</option>
+				<option value="09"<!-- TMPL_IF NAME="month9" --> selected="selected"<!-- /TMPL_IF -->>Sept</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>
@@ -154,6 +159,9 @@
 	<div id="bloc25">
 		<!-- TMPL_IF NAME="IMPOSSIBLE" -->
 		<h2 class="problem">Prêt impossible</h2>
+			<!-- TMPL_IF NAME="NOTSAMEBRANCH" -->
+				<p class="problem">Vous tentez de préter un document qui n'est pas à votre site.</p>
+			<!-- /TMPL_IF -->
 			<!-- TMPL_IF NAME="INVALID_DATE" -->
 				<p class="problem">La date de retour est invalide</p>
 			<!-- /TMPL_IF -->
@@ -234,16 +242,19 @@
 SUMMARY : TODAY & PREVIOUS ISSUES
 -->
 
-<!-- TMPL_IF NAME="todayissues" -->
 <div id="bloc25">
-	<h2 class="circulation">Prêts du jour</h2>
+	<h2 class="circulation">Prêts en cours</h2>
+	<form class="inline" action="/cgi-bin/koha/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>
 		<tr>
 			<th class="circulation">Date de retour</th>
 			<th class="circulation">Code à Barres</th>
 			<th class="circulation">Titre</th>
-			<th class="circulation">Auteur</th>
-			<th class="circulation">Cote</th>
+			<th class="circulation">Renouvellement?</th>
+			<th class="circulation">Retourner ?</th>
 		</tr>
 		<!-- TMPL_LOOP NAME="todayissues" -->
 		<!-- TMPL_IF NAME="togglecolor" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
@@ -252,28 +263,15 @@
 				<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra" onclick="openWindow(this, 'Item', 480, 640); return false;"><!-- TMPL_VAR NAME="barcode" --></a>
 			</td>
 			<td>
-				<!-- TMPL_VAR NAME="title" --><br/>
-				<i><!-- TMPL_VAR name="itemnotes" --></i>
+				<p><!-- TMPL_VAR NAME="title" --></p>
+				<p><!-- TMPL_VAR NAME="author" -->, <!-- TMPL_VAR NAME="itemcallnumber" --></p>
+				<p><i><!-- TMPL_VAR name="itemnotes" --></i></p>
 			</td>
-			<td><!-- TMPL_VAR NAME="author" --></td>
-			<td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
+			<td><input type="checkbox" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF NAME="od" --> checked="checked"<!-- /TMPL_IF --> /></td>
+			<td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR name="barcode" -->">Date du retour</a></td>
 		</tr>
 		<!-- /TMPL_LOOP -->
-	</table>
-</div>
-<!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME="previssues" -->
-<div id="bloc25">
-	<h2 class="circulation">Prêts précédents</h2>
-	<table>
-		<tr>
-			<th class="circulation">Date de retour</th>
-			<th class="circulation">Code à Barres</th>
-			<th class="circulation">Titre</th>
-			<th class="circulation">Auteur</th>
-			<th class="circulation">Cote</th>
-		</tr>
 		<!-- TMPL_LOOP NAME="previssues" -->
 		<!-- TMPL_IF NAME="togglecolor" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
 				<!-- TMPL_IF NAME="od" -->
@@ -283,9 +281,12 @@
 					<td class="problem">
 						<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra" onclick="openWindow(this, 'Item', 480, 640); return false;"><!-- TMPL_VAR NAME="barcode" --></a>
 					</td>
-					<td class="problem"><!-- TMPL_VAR NAME="title" --></td>
-					<td class="problem"><!-- TMPL_VAR NAME="author" --></td>
-					<td class="problem"><!-- TMPL_VAR NAME="itemcallnumber" --></td>
+					<td class="problem">
+					   <p><!-- TMPL_VAR NAME="title" --></p>
+					   <p><!-- TMPL_VAR NAME="author" -->, <!-- TMPL_VAR NAME="itemcallnumber" --></p>
+					</td>
+                    <td><input type="checkbox" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF NAME="od" --> checked="checked"<!-- /TMPL_IF --> /></td>
+                    <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR name="barcode" -->" class="button circulation">Date du retour</a></td>
 				<!-- TMPL_ELSE -->
 					<td>
 						<!-- TMPL_VAR NAME="dd" -->
@@ -294,17 +295,26 @@
 						<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra" onclick="openWindow(this, 'Item', 480, 640); return false;"><!-- TMPL_VAR NAME="barcode" --></a>
 					</td>
 					<td>
-						<!-- TMPL_VAR NAME="title" --><br/>
-						<i><!-- TMPL_VAR name="itemnotes" --></i>
+					   <p><!-- TMPL_VAR NAME="title" --></p>
+					   <p><!-- TMPL_VAR NAME="author" -->, <!-- TMPL_VAR NAME="itemcallnumber" --></p>
 					</td>
-					<td><!-- TMPL_VAR NAME="author" --></td>
-					<td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
+                    <td><input type="checkbox" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF NAME="od" --> checked="checked"<!-- /TMPL_IF --> /></td>
+                    <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR name="barcode" -->" class="button circulation">Date du retour</a></td>
 				<!-- /TMPL_IF -->
 			</tr>
 		<!-- /TMPL_LOOP -->
+	
+        <tr>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td><input type="submit" value="Renouvellement" class="button circulation"></td>
+        <td>
+        </tr>
 	</table>
+    </form>
 </div>
-<!-- /TMPL_IF -->
+
 </div>
 <!-- TMPL_INCLUDE NAME="circulation-bottom.inc" -->
 

Index: circ/returns.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/Attic/returns.tmpl,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -b -r1.7.2.1 -r1.7.2.2
--- circ/returns.tmpl	5 Jan 2006 15:17:56 -0000	1.7.2.1
+++ circ/returns.tmpl	17 Oct 2006 07:26:43 -0000	1.7.2.2
@@ -10,7 +10,7 @@
 		<div id="bloc25">
 			<!-- TMPL_IF Name="waiting" -->
 				<h2 class="circulation">Exemplaire marqué 'En attente' :</h2>
-			<p>Le document <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) est noté en attente à <b><!-- TMPL_VAR NAME="branchname" --></b> pour <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
+			<p>Le document <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) est noté en attente à <b><!-- TMPL_VAR NAME="tobranchname" --></b> pour <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
 					<form method="post" action="returns.pl">
 					<!-- TMPL_LOOP Name="inputloop" -->
 						<input type="hidden" name="ri-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
@@ -24,10 +24,10 @@
 			<!-- TMPL_IF Name="diffbranch" -->
 				<h2 class="circulation">Exemplaire marqué 'En attente' :</h2>
 				<p>
-					L'exemplaire: <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) doit être transféré à <b><!-- TMPL_VAR NAME="branchname" --></b> pour être retiré par <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
+					L'exemplaire: <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) doit être transféré à <b><!-- TMPL_VAR NAME="tobranchname" --></b> pour être retiré par <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
 				</p>
 				<center>
-				<form method="post" action="returns.pl">
+				<form name="f" method="post" action="returns.pl">
 				<!-- TMPL_LOOP Name="inputloop" -->
 					<!-- TMPL_UNLESS Name="first" -->
 						<input type="hidden" name="ri-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
@@ -42,7 +42,7 @@
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF Name="reserved" -->
 				<h2 class="circulation">Réservation trouvée</h2>
-				<p> Exemplaire : <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra', 'Item'); return false;"> <!-- TMPL_VAR NAME="itembarcode" --> </a> pour <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false"><!-- TMPL_VAR NAME="borcnum" --></a>) peut être retiré à <b> <!-- TMPL_VAR NAME="branchname" --></b>.
+				<p> Exemplaire : <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra', 'Item'); return false;"> <!-- TMPL_VAR NAME="itembarcode" --> </a> pour <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false"><!-- TMPL_VAR NAME="borcnum" --></a>) peut être retiré à <b> <!-- TMPL_VAR NAME="tobranchname" --></b>.
 				</p>
 				<p>
 				Mettre en attente et imprimer <a href="" class="circulation" onclick="alert(document.forms['f'].resslip.value); return false">bon de prêt</a> ? </p>
@@ -62,7 +62,7 @@
 	ITEM RESERVED:<!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->)
 	barcode: <!-- TMPL_VAR NAME="itembarcode" -->
 	itemtype: <!-- TMPL_VAR NAME="itemtype" -->
-	COLLECT AT: <!-- TMPL_VAR NAME="branchname" -->
+	COLLECT AT: <!-- TMPL_VAR NAME="tobranchname" -->
 	
 	BORROWER:
 	<!-- TMPL_VAR NAME="bortitle" --> <!-- TMPL_VAR NAME="borfirstname" --> <!-- TMPL_VAR NAME="borsurname" -->
@@ -82,7 +82,7 @@
 		</div>
 	<!-- TMPL_ELSE -->
 		<div id="bloc25">
-			<form method="post" action="/cgi-bin/koha/circ/returns.pl">
+			<form name="f" method="post" action="/cgi-bin/koha/circ/returns.pl">
 				<h2 class="circulation">Entrez le code à barres du livre</h2>
 				<label class="label20">Code à Barres de l'exemplaire :</label><input name="barcode" size="10">
 				</table>

Index: export/marc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/export/Attic/marc.tmpl,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -b -r1.3.2.2 -r1.3.2.3
--- export/marc.tmpl	5 Jan 2006 15:17:56 -0000	1.3.2.2
+++ export/marc.tmpl	17 Oct 2006 07:26:43 -0000	1.3.2.3
@@ -17,7 +17,7 @@
 </p>
 			<p>de la cote : <input type="text" name="start_callnumber"> à  la cote : <input type="text" name="end_callnumber"></p>
 			<p>Limiter aux <input type="text" name="limit"> premières notices</p>
-			<p>Remarque : les exemplaires NE SONT PAS exportés par cet outil</p>
+			<p>Remarque : les exemplaires sont exportés par cet outil</p>
 			<input type="hidden" name="op" value="export">
 			<input type="submit" value="Exportation" class="button">
 		</form>

Index: help/acqui/newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/acqui/Attic/newbiblio.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- help/acqui/newbiblio.tmpl	5 Jan 2006 15:24:47 -0000	1.1.2.1
+++ help/acqui/newbiblio.tmpl	17 Oct 2006 07:26:43 -0000	1.1.2.2
@@ -1,5 +1,10 @@
 <!-- TMPL_INCLUDE name="help-top.inc" -->
 <h1>Aide sur ajout notice</h1>
-
+<p>Sur cette page, vous pouvez ajouter des commandes dans le panier.</p>
+<h2>Le 1er bloc concerne les "livres" que vous voulez acquérir.</h2>
+<p>Si vous sélectionnez une suggestion ou souhaitez commander un nouvel exemplaire d'une notice existante, la zone sera pré-remplie. Sinon, elle sera vide : le titre et le type du document sont les seuls champs obligatoires.</p>
+<h2>Le 2eme bloc contient les quantités et éléments budgétaires pour cette ligne.</h2>
+<p>Saisissez la quantité que vous souhaitez acquérir, le prix fournisseur et la ligne budgétaire. Lorsque vous saisissez le prix fournisseur, les autres valeurs sont recalculées, en fonction des éléments de TVA, des remises...</p>
+<p>Vous pouvez également saisir un code colis si vous saisissez une commande qui est dans votre bibliothèque</p>
 <p>sort1 et sort2 peuvent être rattachées à une liste de valeur autorisée. Tout ce que vous avez à faire, c'est définir Asort1 ou Asort2 comme catégorie de valeurs autorisées, et entrer les valeurs souhaitée. Vous pourrez les utiliser lors de la saisie de la ligne de commande</p>
 

Index: help/admin/categorie.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/admin/Attic/categorie.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- help/admin/categorie.tmpl	5 Jan 2006 15:17:56 -0000	1.2.2.2
+++ help/admin/categorie.tmpl	17 Oct 2006 07:26:44 -0000	1.2.2.3
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE name="help-top.inc" -->
 <h1>Catégories de lecteur</h1>
 
-<p>C'est ici que vous déterminez les types d'usagers de votre bibliothèque et comment ils seront traités.</p>
+<p>C'est ici que vous déterminez les types de lecteurs de votre bibliothèque et comment ils seront traités.</p>
 
 <h2 class="help">Gestion des catégories</h2>
 <p>Commencez en attribuant un Code de Catégorie et une définition pour chaque type de lecteur.Le code est limité à deux caractères et peut être ce que vous voulez.Toutefois, quatre codes ont un sens particulier pour Koha :</p>
@@ -21,5 +21,5 @@
 <p>Les frais d'inscription et de réservation (s'il y en a)doivent être entrés soit comme des nombres entiers ou avec 6 décimales, sans indications de la devise (ex. "1,25000" au lieu de "1,25 Euros").</p>
 
 <h2 class="help">Note de retard demandée</h2>
-<p>Note de retard demandée vous permet de forcer les notes de retard affichées pour ce type d'usager.</p>
+<p>Note de retard demandée vous permet de forcer les notes de retard affichées pour ce type de lecteur.</p>
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: help/admin/marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/admin/Attic/marc_subfields_structure.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- help/admin/marc_subfields_structure.tmpl	5 Jan 2006 15:17:56 -0000	1.2.2.2
+++ help/admin/marc_subfields_structure.tmpl	17 Oct 2006 07:26:44 -0000	1.2.2.3
@@ -15,7 +15,30 @@
 <li>Texte pour les bibliothécaires :  c'est ce qui est affiché avant le sous- champ dans l'intranet</li>
 <li>Texte pour l'OPAC : c'est ce qui apparaît avant le champ à l'OPAC.S'il est vide, c'est le texte pour les bibliothécaires qui est utilisé  à la place</li>
 <li>Géré dans l'onglet : indique l'onglet où le sous-champ est visible. Ignore signifie que le sous-champ n'est pas géré. Tous les sous-champs d'un champ donné doivent se trouver dans le même onglet ou être ignorés : premièrement c'est plus logique, deuxièment, Koha ne saurait plus trop répéter des champs répétables autrement!!!</li>
-<li>caché : signifie que le champ est géré, mais PAS affiché à l'opac.C'est en général pour les champs internes</li>
+<li>caché : vous pouvez choisir parmi 19 combinaisons pour la visibilité, 17 étant actives. En voici la liste :</li>
+<code><br />
+(! signifie 'invisible' ou, dans le cas de 'minimisé' : 'non minimisé')
+<br /><br />
+  -9 => réservé<br/>
+  -8 => Flag<br/>
+  -7 => OPAC !Intranet !Editeur Minimisé<br/>
+  -6 => OPAC Intranet !Editeur !Minimisé<br/>
+  -5 => OPAC Intranet !Editeur Minimisé<br/>
+  -4 => OPAC !Intranet !Editeur !Minimisé<br/>
+  -3 => OPAC !Intranet Editeur Minimisé<br/>
+  -2 => OPAC !Intranet Editeur !Minimisé<br/>
+  -1 => OPAC intranet Editeur minimisé<br/>
+   0 => OPAC Intranet Editeur !Minimisé<br/>
+   1 => !OPAC Intranet Editeur Minimisé<br/>
+   2 => !OPAC !Intranet Editeur !Minimisé<br/>
+   3 => !OPAC !Intranet Editeur Minimisé<br/>
+   4 => !OPAC Intranet Editeur !Minimisé<br/>
+   5 => !OPAC !Intranet !Editeur Minimisé<br/>
+   6 => !OPAC Intranet !Editeur !Minimisé<br/>
+   7 => !OPAC Intranet !Editeur Minimisé<br/>
+   8 => !OPAC !Intranet !Editeur !Minimisé<br/>
+   9 => Réservé<br/>
+</code>
 <li>URL si coché, indique que le champ est une URL valide et peut-être cliquée</li>
 <li>Valeur autorisée : signifie que la valeur n'est pas libre, mais dans une liste de valeurs autorisées du genre sélectionné</li>
 <li>Liste d'autorité : signifie que la valeur n'est libre, mais doit être choisie dans la liste d'autorité de la catégorie choisie</li>

Index: help/admin/systempreferences.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/admin/Attic/systempreferences.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- help/admin/systempreferences.tmpl	5 Jan 2006 15:17:56 -0000	1.2.2.2
+++ help/admin/systempreferences.tmpl	17 Oct 2006 07:26:44 -0000	1.2.2.3
@@ -8,7 +8,7 @@
 
 <li><b>autoBarcode --</b> Le numéro de code à barres à affecter aux exemplaires est automatiquement défini (séquentiellement)par Koha si le choix est "oui " ("1"="oui").</li>
 
-<li><b>autoMemberNum --</b> Le numéro de lecteur (numéro de carte de lecteur) attribué au nouvel usager de la bibliothèque est automatiquement calculé par Koha si vous choisissez le "yes"("1"="yes")</li>
+<li><b>autoMemberNum --</b> Le numéro de lecteur (numéro de carte de lecteur) attribué au nouveau lecteur de la bibliothèque est automatiquement calculé par Koha si vous choisissez le "yes"("1"="yes")</li>
 
 <li><b>checkdigit --</b> Contrôles de validité sur le numéro de lecteur (Numéro de la carte d'emprunteur):rien ou contrôle de type"Katipo".Dans la plupart des cas vous choisirez "none"parce que vous utiliserez des codes à barres pré-imprimés</li>
 

Index: help/bull/statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/bull/Attic/statecollection.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- help/bull/statecollection.tmpl	5 Jan 2006 15:17:56 -0000	1.2.2.2
+++ help/bull/statecollection.tmpl	17 Oct 2006 07:26:44 -0000	1.2.2.3
@@ -1,15 +1,19 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 	<h1>Abonnement Périodiques et résumé</h1>
 	<p>Cet écran est divisé en 2 parties</p>
-	<h2>La partie droite</h2>
-	<p>La partie droite concerne les parutions.Quand vous créez un nouvel abonnement, le 1er numéro est calculé automatiquement.Lorsque vous voulez/ avez besoin,vous pouvez définir les numeros qui ont un nouveau statut :</p>
+	<h2>La 1ere partie, numéros attendus ou en retard</h2>
+	<p>La première partie contient les bulletins. Quand vous créez un nouvel abonnement, le 1er numéro est calculé automatiquement. Lorsque vous voulez/ avez besoin,vous pouvez définir les numéros qui ont un nouveau statut :</p>
 	<ul>
 		<li>Arrivé : lorqu'un bulletin arrive, vous pouvez le mettre en état"arrivé". Le bulletin disparait de la liste et le numéro est ajouté dans la liste des bulletins arrivés (à gauche)</li>
 		<li>En retard : signifie que le document est en retard et devrait être arrivé.Un numéro, qui noté à l'état en retard reste dans la liste des bulletins attendus et le  bulletin suivant attendu est généré</li>
-		<li>Manquant : signifie que la livraison n'aura jamais lieu.Le numéro disparaît de la liste et est ajouté à la liste "Liste des lacunes" (sur la partie gauche)</li>
+		<li>Manquant : signifie que le bulletin n'est pas dans la bibliothèque, mais a été publié (il a été perdu par exemple). Le numéro disparaît de la liste et est ajouté à la liste "Liste des lacunes" (sur la partie gauche)</li>
+		<li>Non publié : signifie que le bulletin n'arrivera jamais parce qu'il n'a pas été publié. Le bulletin disparaît de la liste et est ajouté dans l'élémant "lacunes" de l'état de collection.</li>
+		<li>Supprimer : ce bulletin sera supprimé de la base. C'est utile lorsque 2 bulletins sont fusionnés en un : modifiez la numérotation du 1er bulletin, et supprimez le 2nd.</li>
 	</ul>
-	<h2>La partie gauche</h2>
-	<p>Il y a 6 informations différentes dans la partie gauche, qui sont calculées automatiquement pour la plupart, mais vous pouvez les changer<p>
+	<p>Lorsque vous changez un bulletin de "attendu" à autre chose, le prochain bulletin est automatiquement créé. La liste contient seulement les bulletins attendus, en retard, et les 5 derniers.</p>
+	<p>"Publié le" et "Prévu le" : pour les nouveaux bulletins, ces valeurs sont automatiquement calculées. La première contient la date de publication. Elle n'est généralement jamais modifiée. La seconde est la date à laquelle vous attendez le bulletin, ou l'avez effectivement reçu. Les bulletins en retard dépendent de la date de réception prévue, alors que la date de publication est utilisée pour trier les bulletins dans l'état de collection détaillé : pour une publication mensuelle, vous pouvez recevoir le numéro de février en avril, mais avez quand même besoin de savoir que le numéro de février a été publié avant celui de mars.</p>
+	<h2>La 2eme partie</h2>
+	<p>Il y a 6 informations différentes dans la 2ème partie, qui sont calculées automatiquement pour la plupart, mais vous pouvez les changer<p>
 	<ul>
 		<li>Date de début d'abonnement : la date de début du premier abonnement.Ne devrait être modifiée et n'est pas modifié automatiquement lors du renouvellement des abonnements</li>
 		<li>Date de fin d'abonnement : doit être entré manuellement lorsque l'abonnement est définitivement clos</li>

Index: includes/about-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/about-top.inc,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -b -r1.6.2.1 -r1.6.2.2
--- includes/about-top.inc	5 Jan 2006 15:17:56 -0000	1.6.2.1
+++ includes/about-top.inc	17 Oct 2006 07:26:44 -0000	1.6.2.2
@@ -4,7 +4,7 @@
 <head>
 <title>KOHA : INTRANET : A propos</title>
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /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');

Index: includes/acquisitions-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/acquisitions-top.inc,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -b -r1.11.2.1 -r1.11.2.2
--- includes/acquisitions-top.inc	5 Jan 2006 15:17:56 -0000	1.11.2.1
+++ includes/acquisitions-top.inc	17 Oct 2006 07:26:44 -0000	1.11.2.2
@@ -15,7 +15,7 @@
 </script>
 <!-- /Additions for Calendar-system -->
 
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /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');
@@ -27,12 +27,12 @@
 	background-color: #ffdf61;
 	color:#000000;
 	background-image:none;
-	text-decoration: normal;
+	text-decoration: none;
 	}
 a.acquisition:hover {
 	background-color: #ffdf61;
 	color: #000000;
-	text-decoration: normal;
+	text-decoration: none;
 	}
 </style>
 </head>

Index: includes/auth-search-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/auth-search-top.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- includes/auth-search-top.inc	24 Nov 2004 16:16:54 -0000	1.1
+++ includes/auth-search-top.inc	17 Oct 2006 07:26:44 -0000	1.1.2.1
@@ -3,7 +3,7 @@
 <html>
 <head>
 <title>KOHA: INTRANET: Autorités</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /TMPL_IF -->
 
 <script language="JavaScript">
 <!-- Hide from old browsers
@@ -20,7 +20,7 @@
 }
 
 function addauthority() {
-	X = document.forms[0].authtype.value;
+	X = document.forms['f'].authtype.value;
 	window.location="/cgi-bin/koha/authorities/authorities.pl?authtypecode="+X;
 }
 </script>

Index: includes/auth-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/auth-top.inc,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- includes/auth-top.inc	5 Jan 2006 15:17:56 -0000	1.2.2.2
+++ includes/auth-top.inc	17 Oct 2006 07:26:44 -0000	1.2.2.3
@@ -3,7 +3,7 @@
 <html>
 <head>
 <title>KOHA: INTRANET: Autorités</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /TMPL_IF -->
 
 <script language="JavaScript">
 <!-- Hide from old browsers
@@ -20,12 +20,12 @@
 }
 
 function addauthority() {
-	X = document.forms[0].authtype.value;
+	X = document.forms['f'].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;
+	X = document.forms['f'].authtype2.value;
+	Y = document.forms['f'].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: includes/bull-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/bull-top.inc,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- includes/bull-top.inc	5 Jan 2006 15:17:56 -0000	1.2.2.2
+++ includes/bull-top.inc	17 Oct 2006 07:26:44 -0000	1.2.2.3
@@ -4,7 +4,7 @@
 <head>
 <title>KOHA: INTRANET: Gestion des périodiques</title>
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /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');

Index: includes/cat-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/cat-top.inc,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -b -r1.15.2.1 -r1.15.2.2
--- includes/cat-top.inc	5 Jan 2006 15:17:56 -0000	1.15.2.1
+++ includes/cat-top.inc	17 Oct 2006 07:26:44 -0000	1.15.2.2
@@ -2,7 +2,7 @@
 <html>
 <head>
 <title>KOHA: INTRANET: Catalogue</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /TMPL_IF -->
 
 <script language="JavaScript" type="text/javascript">
 <!-- Hide from old browsers

Index: includes/circulation-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/circulation-top.inc,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -b -r1.14.2.1 -r1.14.2.2
--- includes/circulation-top.inc	5 Jan 2006 15:17:56 -0000	1.14.2.1
+++ includes/circulation-top.inc	17 Oct 2006 07:26:44 -0000	1.14.2.2
@@ -3,7 +3,7 @@
 <html>
 <head>
 <title>KOHA: INTRANET:Prêt</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /TMPL_IF -->
 
 <script language="JavaScript">
 <!-- Hide from old browsers
@@ -12,7 +12,7 @@
 window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
 }
 function focusOnFirst (){
-document.forms[0].elements[0].focus();
+document.forms['f'].elements[0].focus();
 }
 // end hiding -->
 </script>
@@ -40,7 +40,7 @@
 </style>
 </head>
 
-<body onload="javascript:focusOnFirst()">
+<body onload="focusOnFirst()">
 
 <!-- TMPL_INCLUDE name="menus.inc" -->
 <!-- TMPL_IF NAME="loggedinusername" -->

Index: includes/common-print.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/common-print.css,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- includes/common-print.css	5 Jan 2006 15:17:56 -0000	1.1.2.2
+++ includes/common-print.css	17 Oct 2006 07:26:44 -0000	1.1.2.3
@@ -1,5 +1,6 @@
 div,
 .user,
+h1,h2,
 .doNotPrint
 {
     /* Hides all the elements irrelevant for printing */
@@ -28,11 +29,25 @@
 	border:1px solid #000000;
 }
 
+/* cells that are numbers => aligned right */
+td.number {
+	border-left:0px;
+	text-align:right;
+}
+
 
-div#mainbloc, 
-div#bloc100
+div#bloc100,
+div#mainbloc
 {
 	display: block;
 }
 
+div#bloc25,div#bloc100
+{
+	display:block;
+	float:left;
+	/*order:1px solid #000000;*/
+	margin:10px;
+	padding:10px;
+}	
 

Index: includes/error-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/error-top.inc,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- includes/error-top.inc	5 Jan 2006 15:17:56 -0000	1.2.2.1
+++ includes/error-top.inc	17 Oct 2006 07:26:44 -0000	1.2.2.2
@@ -3,7 +3,7 @@
 <html>
 <head>
 <title>KOHA: INTRANET: Catalogue</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /TMPL_IF -->
 
 <script language="JavaScript">
 <!-- Hide from old browsers

Index: includes/help-bottom.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/help-bottom.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- includes/help-bottom.inc	24 Nov 2004 16:16:54 -0000	1.1
+++ includes/help-bottom.inc	17 Oct 2006 07:26:44 -0000	1.1.2.1
@@ -1,4 +1,5 @@
-<a href="javascript:window.close()" class="button">Fermer l'aide en ligne</a>
+<br/>
+<p><a href="javascript:window.close()" class="button">Fermer l'aide en ligne</a></p>
 </div>
 </body>
 </html>
\ No newline at end of file

Index: includes/help-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/help-top.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- includes/help-top.inc	24 Nov 2004 16:16:54 -0000	1.1
+++ includes/help-top.inc	17 Oct 2006 07:26:44 -0000	1.1.2.1
@@ -3,7 +3,7 @@
 <html>
 <head>
 <title>KOHA: Aide en Ligne</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /TMPL_IF -->
 
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
 <body>

Index: includes/marc-editor.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/marc-editor.css,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- includes/marc-editor.css	5 Jan 2006 15:17:56 -0000	1.1.2.1
+++ includes/marc-editor.css	17 Oct 2006 07:26:44 -0000	1.1.2.2
@@ -58,3 +58,11 @@
 	display:inline;
 	color:#000000;
 }
+
+input.addbiblioInput {
+	background-color: #FFFFFF;
+}
+
+input.addbiblioInputFocus {
+	background-color: #DDDDDD;
+}
\ No newline at end of file

Index: includes/marc-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/marc-top.inc,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- includes/marc-top.inc	5 Jan 2006 15:17:56 -0000	1.2.2.1
+++ includes/marc-top.inc	17 Oct 2006 07:26:44 -0000	1.2.2.2
@@ -3,7 +3,7 @@
 <html>
 <head>
 <title>KOHA: INTRANET: Catalogue</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /TMPL_IF -->
 
 <script language="JavaScript" type="text/javascript">
 <!-- Hide from old browsers

Index: includes/members-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/members-top.inc,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -b -r1.13.2.1 -r1.13.2.2
--- includes/members-top.inc	5 Jan 2006 15:17:56 -0000	1.13.2.1
+++ includes/members-top.inc	17 Oct 2006 07:26:44 -0000	1.13.2.2
@@ -4,7 +4,7 @@
 <head>
 <title>KOHA: INTRANET: Lecteurs</title>
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /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');

Index: includes/menus.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/menus.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- includes/menus.inc	5 Jan 2006 15:24:47 -0000	1.1.2.1
+++ includes/menus.inc	17 Oct 2006 07:26:44 -0000	1.1.2.2
@@ -59,7 +59,7 @@
 <div id="Subm3"> 
 	<a href="/cgi-bin/koha/circ/circulation.pl" class="submenu circulation" onMouseOver="CancelTimeOut(TID)" onMouseOut="LaunchSetOff(3)">Sorties</a> <a href="/cgi-bin/koha/circ/returns.pl" class="submenu circulation" onMouseOver="CancelTimeOut(TID)" onMouseOut="LaunchSetOff(3)">Retours</a> <a href="/cgi-bin/koha/circ/branchtransfers.pl" class="submenu circulation" onMouseOver="CancelTimeOut(TID)" onMouseOut="LaunchSetOff(3)">Transferts</a>
 	<hr />
-	<a href="/cgi-bin/koha/circ/reserve.pl" class="submenu circulation" onMouseOver="CancelTimeOut(TID)" onMouseOut="LaunchSetOff(3)">Réservation en attente</a>
+	<a href="/cgi-bin/koha/circ/reserve.pl" class="submenu circulation" onMouseOver="CancelTimeOut(TID)" onMouseOut="LaunchSetOff(3)">Réservations en attente</a> <a href="/cgi-bin/koha/overdue.pl" class="submenu circulation" onMouseOver="CancelTimeOut(TID)" onMouseOut="LaunchSetOff(3)">Retards</a>
 </div>
 <!-- MEMBERS -->
 <div id="Subm4"> 
@@ -106,7 +106,7 @@
 
 <TMPL_IF name="CAN_user_tools">
 	<hr>
-		<a href="/cgi-bin/koha/export/marc.pl" title="Exporting in MARC format" class="submenu parameters" onMouseOver="CancelTimeOut(TID)" onMouseOut="TID=setTimeout('SetOff(7)',Mduration)">Export notices</a> <a href="/cgi-bin/koha/import/breeding.pl" title="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" class="submenu parameters" onMouseOver="CancelTimeOut(TID)" onMouseOut="TID=setTimeout('SetOff(7)',Mduration)">Import réservoir</a> <a href="/cgi-bin/koha/barcodes/barcodes.pl" title="the barcode generator deals with generating barcodes for items you acquire" class="submenu parameters" onMouseOver="CancelTimeOut(TID)" onMouseOut="TID=setTimeout('SetOff(7)',Mduration)">Generer code-barres</a>
+		<a href="/cgi-bin/koha/import/picture-upload.pl" title="Import members pictures" class="submenu parameters" onMouseOver="CancelTimeOut(TID)" onMouseOut="TID=setTimeout('SetOff(7)',Mduration)">Import photos lecteurs</a><a href="/cgi-bin/koha/export/marc.pl" title="Exporting in MARC format" class="submenu parameters" onMouseOver="CancelTimeOut(TID)" onMouseOut="TID=setTimeout('SetOff(7)',Mduration)">Export notices</a> <a href="/cgi-bin/koha/import/breeding.pl" title="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" class="submenu parameters" onMouseOver="CancelTimeOut(TID)" onMouseOut="TID=setTimeout('SetOff(7)',Mduration)">Import réservoir</a> <a href="/cgi-bin/koha/barcodes/barcodes.pl" title="the barcode generator deals with generating barcodes for items you acquire" class="submenu parameters" onMouseOver="CancelTimeOut(TID)" onMouseOut="TID=setTimeout('SetOff(7)',Mduration)">Générer code-barres</a>
 </TMPL_IF>
 
 </div>

Index: includes/neutral-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/neutral-top.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- includes/neutral-top.inc	24 Nov 2004 16:16:54 -0000	1.1
+++ includes/neutral-top.inc	17 Oct 2006 07:26:44 -0000	1.1.2.1
@@ -3,7 +3,7 @@
 <html>
 <head>
 <title>KOHA: INTRANET: Catalogue</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /TMPL_IF -->
 
 <script language="JavaScript">
 <!-- Hide from old browsers

Index: includes/opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/opac-top.inc,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -b -r1.5 -r1.5.2.1
--- includes/opac-top.inc	24 Nov 2004 16:16:54 -0000	1.5
+++ includes/opac-top.inc	17 Oct 2006 07:26:44 -0000	1.5.2.1
@@ -4,7 +4,7 @@
 <html>
 <head>
 <title>KOHA: OPAC Recherche Catalogue</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /TMPL_IF -->
 
 </head>
 <body text="black" bgcolor="white" link="#0000ff" vlink="#3366cc" Alink="#cc3300"

Index: includes/parameters-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/parameters-top.inc,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -b -r1.13.2.2 -r1.13.2.3
--- includes/parameters-top.inc	5 Jan 2006 15:17:56 -0000	1.13.2.2
+++ includes/parameters-top.inc	17 Oct 2006 07:26:44 -0000	1.13.2.3
@@ -7,7 +7,7 @@
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
 <!-- End of additions -->
 
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /TMPL_IF -->
 <!-- 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>

Index: includes/popup-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/popup-top.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- includes/popup-top.inc	24 Nov 2004 16:16:54 -0000	1.1
+++ includes/popup-top.inc	17 Oct 2006 07:26:44 -0000	1.1.2.1
@@ -3,7 +3,7 @@
 <html>
 <head>
 <title>fenêtre contextuelle</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /TMPL_IF -->
 
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
 

Index: includes/quicksearch-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/quicksearch-top.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- includes/quicksearch-top.inc	5 Jan 2006 15:24:47 -0000	1.1.2.1
+++ includes/quicksearch-top.inc	17 Oct 2006 07:26:44 -0000	1.1.2.2
@@ -3,7 +3,7 @@
 <html>
 <head>
 <title>fenêtre contextuelle</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /TMPL_IF -->
 
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
 <script language="javascript" type="text/javascript">

Index: includes/reports-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/reports-top.inc,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -b -r1.12.2.1 -r1.12.2.2
--- includes/reports-top.inc	5 Jan 2006 15:17:56 -0000	1.12.2.1
+++ includes/reports-top.inc	17 Oct 2006 07:26:44 -0000	1.12.2.2
@@ -4,7 +4,7 @@
 <head>
 <title>KOHA: INTRANET: Bilans</title>
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /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');

Index: includes/reportswcal-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/Attic/reportswcal-top.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- includes/reportswcal-top.inc	5 Jan 2006 15:24:47 -0000	1.1.2.1
+++ includes/reportswcal-top.inc	17 Oct 2006 07:26:44 -0000	1.1.2.2
@@ -8,7 +8,7 @@
 <!-- End of additions -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
 
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /TMPL_IF -->
 <!-- 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>

Index: members/jmemberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/Attic/jmemberentry.tmpl,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -b -r1.10 -r1.10.2.1
--- members/jmemberentry.tmpl	5 Jan 2005 14:35:21 -0000	1.10
+++ members/jmemberentry.tmpl	17 Oct 2006 07:26:44 -0000	1.10.2.1
@@ -2,9 +2,9 @@
 <div id="mainbloc">
 	<h1>Ajouter un nouveau jeune lecteur </h1><br>
 	<form action="/cgi-bin/koha/members/newjmember.pl" method="post">
-		<!--<input type="hidden" name="joining" value="">
-		<input type="hidden" name="expiry" value="">
-		<input type="hidden" name="type" value="borrowers">-->
+		<input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->">
+		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
+		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="zipcode" -->">
 		<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" -->">

Index: members/memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/Attic/memberentry.tmpl,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -u -b -r1.13.2.3 -r1.13.2.4
--- members/memberentry.tmpl	9 Jan 2006 10:44:04 -0000	1.13.2.3
+++ members/memberentry.tmpl	17 Oct 2006 07:26:44 -0000	1.13.2.4
@@ -294,7 +294,6 @@
 				<td></td>
 				<td>
 					<input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->">
-					<input type="reset" value="Effacer tous les champs" class="button">
 					<input type="submit" value="Enregistrer" class="button">
 				</td>
 			</tr>

Index: members/moremember-receipt.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/Attic/moremember-receipt.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- members/moremember-receipt.tmpl	5 Jan 2006 15:24:47 -0000	1.1.2.1
+++ members/moremember-receipt.tmpl	17 Oct 2006 07:26:44 -0000	1.1.2.2
@@ -7,7 +7,7 @@
 Prété à <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>N° parus</caption>
+	<caption>Prêts en cours</caption>
 	<tr>
 		<th>Date de retour</th>
 		<th>Titre</th>

Index: members/moremember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/Attic/moremember.tmpl,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -u -b -r1.17.2.2 -r1.17.2.3
--- members/moremember.tmpl	5 Jan 2006 15:17:57 -0000	1.17.2.2
+++ members/moremember.tmpl	17 Oct 2006 07:26:44 -0000	1.17.2.3
@@ -65,7 +65,7 @@
 		<p>
 		<!-- TMPL_UNLESS NAME="unvalidlibrarian"--> 
 			<!-- TMPL_IF NAME="I" -->
-				<a href="/cgi-bin/koha/members/imemberentry.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modifier</a>
+				<a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="bornum" -->&categorycode=I" class="button">Modifier</a>
 			<!-- TMPL_ELSE -->
 				<a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modifier</a>
 			<!-- /TMPL_IF -->
@@ -89,6 +89,7 @@
 		<!-- TMPL_IF NAME="gonenoaddress" --><li>L'adresse du lecteur est erronée</li><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="lost" --><li>La carte a été déclarée perdue</li><!-- /TMPL_IF -->
 		</ul>
+		<!-- TMPL_VAR NAME="borrowernotes" -->
 	</div><!-- /TMPL_IF -->
 
 	<div class="bloc25">
@@ -153,7 +154,11 @@
 	<div class="bloc25">
 		<a class="button" href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Liste des lectures</a>
 	</div>
-
+	<!-- TMPL_IF NAME="patronimages" -->
+		<div class="bloc25">
+			<img src="/patronimages/<!-- TMPL_VAR NAME="cardnumber" -->.<!-- TMPL_VAR NAME="patronimages" -->" alt="PAS d'IMAGE" border="0">
+		</div>
+	<!-- /TMPL_IF -->
 	<div class="bloc25">
 		<h2 class="members">Documents actuellement en prêt</h2>
 		<!-- TMPL_IF NAME="issueloop" -->

Index: parameters/admin-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/Attic/admin-home.tmpl,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -b -r1.8.2.2 -r1.8.2.3
--- parameters/admin-home.tmpl	5 Jan 2006 15:17:57 -0000	1.8.2.2
+++ parameters/admin-home.tmpl	17 Oct 2006 07:26:44 -0000	1.8.2.3
@@ -1,25 +1,25 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 <div id="mainbloc">
-<TMPL_IF name="CAN_user_management">
+<!-- TMPL_IF name="CAN_user_management" -->
 <h1>Paramètres</h1><br>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
 <div id="bloc100">
-<TMPL_IF name="CAN_user_management">
+<!-- TMPL_IF name="CAN_user_management" -->
 	<div id="bloctitle">Paramètres Système </div>
 
 	<table>
 	<tr>
 	<td colspan="2"><b> Remplissez ces tables dans l'ordre où elles apparaissent pour que Koha fonctionne</b></td>
 	</tr>
-	<TMPL_IF name="CAN_user_parameters">	
+	<!-- TMPL_IF name="CAN_user_parameters" -->	
 		<tr>
 			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/branches.pl">Sites de la Bibliothèque</a></td>
 			<td>Les différents sites que vous gérez avec ce serveur Koha</td>
 		</tr>
-	</TMPL_IF>
+	<!-- /TMPL_IF -->
 	
-	<TMPL_IF name="CAN_user_management">
+	<!-- TMPL_IF name="CAN_user_management" -->
 		<tr>
 			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/aqbookfund.pl">Lignes de crédit</a></td>
 			<td>Administration des lignes de crédit.Pensez à mettre vos lignes de crédit à jour avant de commencer à libeller les budgets.</td>
@@ -49,9 +49,9 @@
 			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/authorised_values.pl">Valeurs autorisées</a></td>
 			<td>Definir des catégories et les valeurs autorisées pour celles-ci.Les valeurs autorisées sont utilisées dans la grille MARC pour limiter et aider la saisie des notices  MARC biblio.</td>
 		</tr>
-	</TMPL_IF>
+	<!-- /TMPL_IF -->
 		
-	<TMPL_IF name="CAN_user_parameters">
+	<!-- TMPL_IF name="CAN_user_parameters" -->
 		<tr>
 			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/authtypes.pl">Structure des autorités</a></td>
 			<td>Définir des catégories et les structures  des autorités MARC</td>
@@ -71,27 +71,27 @@
 			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/checkmarc.pl">Contrôle MARC</a></td>
 			<td>Contrôle la structure MARC.A UTILISER avant de travailler avec des données réelles.ça pointe les erreurs qui peuvent CASSER la base de données Koha</td>
 		</tr>
-	</TMPL_IF>
+	<!-- /TMPL_IF -->
 	
 	<tr>
 	<th colspan="2">Paramètres divers</th>
 	</tr>
-	<TMPL_IF name="CAN_user_parameters">
+	<!-- TMPL_IF name="CAN_user_parameters" -->
 		<tr>
 			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/printers.pl">Imprimantes</a></td>
 			<td>Imprimantes (chemin UNIX)</td>
 		</tr>
-	</TMPL_IF>
+	<!-- /TMPL_IF -->
 	
-	<TMPL_IF name="CAN_user_management">
+	<!-- TMPL_IF name="CAN_user_management" -->
 		<tr>
 			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/stopwords.pl">Mots vides</a></td>
 			<td>Mots ignorés lors de la recherche
 				<!-- TMPL_UNLESS name="stopwords" --><p class="problem">ALERTE : vous devez définir des mot-vides</p><!-- /TMPL_UNLESS --></td>
 		</tr>
-	</TMPL_IF>
+	<!-- /TMPL_IF -->
 	
-	<TMPL_IF name="CAN_user_parameters">
+	<!-- TMPL_IF name="CAN_user_parameters" -->
 		<tr>
 			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/z3950servers.pl">Serveurs Z39.50</a></td>
 			<td>Serveurs à interroger pour données MARC</td>
@@ -101,12 +101,12 @@
 			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/systempreferences.pl">Préférences Système</a></td>
 			<td>Préférences Système.</td>
 		</tr>
-	</TMPL_IF>
+	<!-- /TMPL_IF -->
 	</table>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
 
-<TMPL_IF name="CAN_user_tools">
+<!-- TMPL_IF name="CAN_user_tools" -->
 	<h1>Outils</h1>
 	<table>
 		<tr>
@@ -133,7 +133,7 @@
 			</td>
 		</tr>
 	</table>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: parameters/aqbookfund.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/Attic/aqbookfund.tmpl,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -b -r1.7.2.2 -r1.7.2.3
--- parameters/aqbookfund.tmpl	5 Jan 2006 15:17:57 -0000	1.7.2.2
+++ parameters/aqbookfund.tmpl	17 Oct 2006 07:26:44 -0000	1.7.2.3
@@ -7,6 +7,7 @@
 	<!-- TMPL_IF NAME="search" -->
 		<br>Vous cherchiez <b><!-- TMPL_VAR NAME="searchfield" --></b><p><br>
 	<!-- /TMPL_IF -->
+		<p><br>Budgets <!-- TMPL_VAR NAME="min" --> à <!-- TMPL_VAR NAME="max" --> sur <!-- TMPL_VAR NAME="nbresults" --> <!--TMPL_IF Name="Next" --><a href="/cgi-bin/koha/admin/aqbookfund.pl?offset=<!-- TMPL_VAR NAME="max" -->">plus </a><!-- /TMPL_IF--></p><br><p>
 	<table border="0" cellspacing="0" cellpadding="2" width="80%">
 	<tr>
 		<th>Ligne de crédit</th>
@@ -151,7 +152,7 @@
 	</p>
 	<p>
 		<label>Site</label><!-- TMPL_VAR NAME="CGIbranch"-->&nbsp;
-		<br/> Sélectionner une branche si le budget lui est spécifique. Sinon, laisser blanc
+		<br/> Sélectionner un site si le budget lui est spécifique. Sinon, laisser blanc
 	</p>
 	<p>
 		<label>&nbsp;</label><input type="button" value="OK" onclick="Check(this.form)" class="button">

Index: parameters/auth_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/Attic/auth_subfields_structure.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- parameters/auth_subfields_structure.tmpl	5 Jan 2006 15:17:57 -0000	1.2.2.2
+++ parameters/auth_subfields_structure.tmpl	17 Oct 2006 07:26:44 -0000	1.2.2.3
@@ -17,28 +17,29 @@
 		<td>
 			<h2 class="parameters">Etiquette <!-- TMPL_VAR NAME="tagfield" -->, Sous-champ <!-- TMPL_VAR NAME="tagsubfield" --></h2>
 			<h3>Restrictions MARC</h3>
+			<ul>
 			<p>
-				<label>&nbsp;</label><!-- TMPL_VAR NAME="repeatable" --> répétable <!-- TMPL_VAR NAME="mandatory" --> obligatoire
+				<!-- TMPL_VAR NAME="repeatable" --> répétable
+            </p>
+            <p>
+				<!-- TMPL_VAR NAME="mandatory" --> obligatoire
 			</p>
 			<p>
-				<label>&nbsp;</label>
 				<label>Rechercher aussi</label><input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20> (exemple pour 200a : '200c','200d','200e')
 			</p>
+			</ul>
 			<h3>Editeur des restrictions</h3>
-			<p> <label>&nbsp;</label>
-				<label>Texte pour le bibliothécaire</label>
-				<input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80">
-			</p>
+			<ul>
+			<p>Description</p>
 			<p>
-				<label>&nbsp;</label>
-				<label>Texte pour l'OPAC</label> <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80">
+				<label>pour le bibliothécaire</label>
+				<input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80"> pour l'OPAC <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80">
 			</p>
-			<p><label>&nbsp;</label><label>Géré</label> <!-- TMPL_VAR NAME="tab" --></p>
-			<p><label>&nbsp;</label><!-- TMPL_VAR NAME="hidden" --> caché (champ géré, mais caché. - devrait être rempli par un module d'extension ou un type d'autorité-)</p>
-			<p><label>&nbsp;</label> <!-- TMPL_VAR NAME="isurl" --> URL (si coché, indique que le champ est une URL valide et peut-être cliquée</p>
+			<p><label>Géré</label> <!-- TMPL_VAR NAME="tab" --></p>
 			<p>
-				<label>&nbsp;</label><label>Valeur Autorisée :</label> <!-- TMPL_VAR NAME="authorised_value" --> ou type d'autorité : <!-- TMPL_VAR NAME="thesaurus_category" --> ou module d'extension : <!-- TMPL_VAR NAME="value_builder" -->
+				<label>Valeur Autorisée :</label> <!-- TMPL_VAR NAME="authorised_value" --> ou type d'autorité : <!-- TMPL_VAR NAME="thesaurus_category" --> ou module d'extension : <!-- TMPL_VAR NAME="value_builder" -->
 			</p>
+			</ul>
 		</td>
 		</tr>
 	<!-- /TMPL_LOOP -->

Index: parameters/auth_tag_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/Attic/auth_tag_structure.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- parameters/auth_tag_structure.tmpl	5 Jan 2006 15:17:57 -0000	1.2.2.2
+++ parameters/auth_tag_structure.tmpl	17 Oct 2006 07:26:44 -0000	1.2.2.3
@@ -146,7 +146,7 @@
 		<th>Editer</th>
 		<th>Supprimer</th>
 	<!-- TMPL_LOOP NAME="loop" -->
-	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
+	<!-- TMPL_IF NAME="toggle" --><tr valign="top" class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
 		<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
 		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
 		<td><!-- TMPL_IF NAME="repeatable" -->Oui<!-- TMPL_ELSE -->Non<!-- /TMPL_IF --></td>

Index: parameters/issuingrules.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/Attic/issuingrules.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- parameters/issuingrules.tmpl	5 Jan 2006 15:17:57 -0000	1.2.2.2
+++ parameters/issuingrules.tmpl	17 Oct 2006 07:26:44 -0000	1.2.2.3
@@ -24,14 +24,13 @@
 	</div>
 	<div id="bloc100">
 		<form method="post">
-		Selectionnez une annexe :
-			<select name="branch">
+		Selectionnez un site :
+			<select name="branch" onchange="javascript:submit()">
 				<option value="">Par défaut</option>
 			<!-- 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>
-			<input type="submit" value="Sélectionner" class="button parameters">
 		</form>
 		<form method="post">
 			<input type="hidden" name="op" value="save">

Index: parameters/marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/Attic/marc_subfields_structure.tmpl,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -b -r1.6.2.2 -r1.6.2.3
--- parameters/marc_subfields_structure.tmpl	5 Jan 2006 15:17:57 -0000	1.6.2.2
+++ parameters/marc_subfields_structure.tmpl	17 Oct 2006 07:26:44 -0000	1.6.2.3
@@ -17,28 +17,27 @@
 		<td>
 			<h2 class="parameters">Etiquette <!-- TMPL_VAR NAME="tagfield" -->, Sous-champ <!-- TMPL_VAR NAME="tagsubfield" --></h2>
 			<h3>Restrictions MARC</h3>
-			<ul>
 				<p>
-					<!-- TMPL_VAR NAME="repeatable" --> répétable <!-- TMPL_VAR NAME="mandatory" --> obligatoire
-				</p>
+			<ul>
+				<p><!-- TMPL_VAR NAME="repeatable" --> répétable </p>
+				<p><!-- TMPL_VAR NAME="mandatory" --> obligatoire</p>
 				<!-- TMPL_IF name="frameworkcode" -->
 					<p>Rechercher aussi <i>(a un sens seulement pour la grille par défaut)</i></p>
 				<!-- TMPL_ELSE -->
 					<p>
-						Rechercher aussi <input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20> (exemple pour 200a : '200c','200d','200e')
+						<label>Rechercher aussi</label> <input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20> (exemple pour 200a : '200c','200d','200e')
 					</p>
 				<!-- /TMPL_IF -->
-				<p>Lien Koha : <!-- TMPL_VAR NAME="kohafield" --></p>
+				<p><label>Lien Koha</label><!-- TMPL_VAR NAME="kohafield" --></p>
 			</ul>
-			<h3>Editeur des restrictions</h3>
-			<ul>
-				<p>Texte pour le bibliothécaire <input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80">
 				</p>
-				<p>Texte pour l'OPAC <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80">
+			<h3>Editeur des restrictions</h3>
+			<ul><p>Description
+				<p><label>pour le bibliothécaire</label> <input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80"> Texte pour l'OPAC <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80">
 				</p>
-				<p>Géré dans l'onglet <!-- TMPL_VAR NAME="tab" --> (ignorer signifie que le sous-champ n'est pas géré par Koha)</p>
-				<p><!-- TMPL_VAR NAME="hidden" --> caché (champ géré, mais caché. - devrait être rempli par un module d'extension ou un type d'autorité-)</p>
-				<p> <!-- TMPL_VAR NAME="isurl" --> URL (si coché, indique que le champ est une URL valide et peut-être cliquée</p>
+				<p><label>Onglet</label><!-- TMPL_VAR NAME="tab" --> (ignore signifie que le sous-champ n'est PAS géré par Koha)</p>
+				<p><label>caché</label><input type="text" id="hidden<!-- TMPL_VAR NAME="row" -->" name="hidden" value="<!-- TMPL_VAR name="hidden" -->" size="2" /> (voir aide en ligne)</label></p>
+				<p><!-- TMPL_VAR NAME="isurl" --> URL (si coché, indique que le champ est une URL valide et peut-être cliquée</p>
 				<p>
 					<label>Valeur Autorisée :</label> <!-- TMPL_VAR NAME="authorised_value" --> ou type d'autorité : <!-- TMPL_VAR NAME="authtypes" --> ou module d'extension : <!-- TMPL_VAR NAME="value_builder" -->
 				</p>

Index: parameters/marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/Attic/marctagstructure.tmpl,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -b -r1.10.2.2 -r1.10.2.3
--- parameters/marctagstructure.tmpl	5 Jan 2006 15:17:57 -0000	1.10.2.2
+++ parameters/marctagstructure.tmpl	17 Oct 2006 07:26:44 -0000	1.10.2.3
@@ -68,7 +68,7 @@
 		<p><label>Etiquette<label><!-- TMPL_IF Name="searchfield" -->
 		<!-- TMPL_VAR NAME="searchfield" -->
 		<!-- TMPL_ELSE -->
-		<input type="text" name="tagfield" value="" escape=HTML -->
+		<input type="text" name="tagfield" value="" escape="HTML" -->
 		<!-- /TMPL_IF -->
 		</p>
 		<p><label>Lib for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100"></p>

Index: parameters/printers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/Attic/printers.tmpl,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -b -r1.4.2.2 -r1.4.2.3
--- parameters/printers.tmpl	5 Jan 2006 15:17:57 -0000	1.4.2.2
+++ parameters/printers.tmpl	17 Oct 2006 07:26:44 -0000	1.4.2.3
@@ -130,7 +130,7 @@
 	
 	<!-- TMPL_IF NAME="else" -->
 			<form action="<!-- TMPL_VAR NAME="script_name">" method="post">
-					<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
+					<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
 					<input type="reset" name="reset" value="eff">
 			</form>
 	

Index: parameters/systempreferences.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/Attic/systempreferences.tmpl,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -b -r1.6.2.2 -r1.6.2.3
--- parameters/systempreferences.tmpl	5 Jan 2006 15:17:57 -0000	1.6.2.2
+++ parameters/systempreferences.tmpl	17 Oct 2006 07:26:44 -0000	1.6.2.3
@@ -165,6 +165,15 @@
 				<!--/TMPL_IF-->
 			</td>
 			<td>
+				<!--TMPL_IF Name="Librarian"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet" class="button">Intranet
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet">Intranet
+					</a>
+				<!--/TMPL_IF-->
+			</td>
+			<td>
 				<!--TMPL_IF Name="Catalogue"-->
 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue" class="button">Catalogue
 					</a>
@@ -211,19 +220,23 @@
 			</td>
 		</tr>
 	</table>
-	<table border="0" cellspacing="0" cellpadding="2">
-	<tr valign="top" bgcolor="#99cc33">
-		<th>Variable</th>
-		<th>Valeur</th>
-		<th colspan="3">Explication</th>
-	</tr>
+	<table>
 	<!-- TMPL_LOOP NAME="loop" -->
-	<!-- TMPL_IF NAME="toggle" --><tr valign="top" class="hilighted"><!-- TMPL_ELSE --><tr valign="top"><!-- /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" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"><br>Editer</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"><br>Supprimer</a></td>
+		<!-- TMPL_IF NAME="toggle" -->
+			<tr valign="top" class="hilighted">
+		<!-- TMPL_ELSE -->
+			<tr valign="top">
+		<!-- /TMPL_IF -->
+		<td>
+			<p><b><!-- TMPL_VAR NAME="variable" --></b> <!-- TMPL_VAR NAME="value" --></p>
+			<p align="right"><i>(<!-- TMPL_VAR NAME="explanation" -->)</i></p>
+		</td>
+		<td>
+			<p><a href="<!-- TMPL_VAR NAME="edit" -->" class="button parameters">Modifier</a></p>
+		</td>
+		<td>
+			<p><a href="<!-- TMPL_VAR NAME="delete" -->" class="button parameters">Supprimer</a></p>
+		</td>
 	</tr>
 	<!-- /TMPL_LOOP -->
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">

Index: reports/bor_issues_top.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/Attic/bor_issues_top.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- reports/bor_issues_top.tmpl	5 Jan 2006 15:24:47 -0000	1.1.2.1
+++ reports/bor_issues_top.tmpl	17 Oct 2006 07:26:44 -0000	1.1.2.2
@@ -8,7 +8,7 @@
 }
 </script>
 	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1 class="reports">Koha : les <!-- TMPL_VAR NAME="limit"--> plus gros usagers </h1>
+		<h1 class="reports">Koha : les <!-- TMPL_VAR NAME="limit"--> plus gros lecteurs </h1>
 		<!-- TMPL_IF NAME="loopfilter"-->
 			<p>Sélectionner sur</p>
 			<!-- TMPL_LOOP NAME="loopfilter" -->
@@ -49,7 +49,7 @@
 		</table>
 	<!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-	<h1 class = "reports">Koha : Les plus gros usagers  </h1>
+	<h1 class = "reports">Koha : Les plus gros lecteurs  </h1>
 	<form method="post">
 	
 	<table>

Index: reports/borrowers_out.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/Attic/borrowers_out.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- reports/borrowers_out.tmpl	5 Jan 2006 15:24:47 -0000	1.1.2.1
+++ reports/borrowers_out.tmpl	17 Oct 2006 07:26:44 -0000	1.1.2.2
@@ -3,7 +3,7 @@
 
 <!-- TMPL_IF NAME="do_it" -->
 	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1 class="reports">Koha : usagers n'ayant pas de prêt </h1>
+		<h1 class="reports">Koha : Lecteurs n'ayant pas de prêt </h1>
 		<!-- TMPL_IF NAME="loopfilter"-->
 			<p>Sélectionner sur</p>
 			<!-- TMPL_LOOP NAME="loopfilter" -->
@@ -32,7 +32,7 @@
 		</table>
 	<!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-	<h1 class = "reports">Koha : Usages n'ayant pas de prêt  </h1>
+	<h1 class = "reports">Koha : Lecteurs n'ayant pas de prêt  </h1>
 	<form method="post">
 	
 	<table>

Index: reports/inventory.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/Attic/inventory.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- reports/inventory.tmpl	5 Jan 2005 14:35:22 -0000	1.3
+++ reports/inventory.tmpl	17 Oct 2006 07:26:44 -0000	1.3.2.1
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="reports-top.inc" -->
 <div id="mainbloc">
 	<h1 class="reports">Inventaire/récolement</h1>
-	<form method="post">
+	<div id="bloc25"><form method="post">
 		<h2 class="reports">Sélectionnez les exemplaires que vous souhaitez vérifier</h2>
 		<p>
 			Cote de l'exemplaire ((items.itemcallnumber) entre <input type="text" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->"> et <input type="text" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->">
@@ -17,6 +17,24 @@
 		</p>
 	</form>
 	
+	</div>
+	<div id="bloc25">
+		<form  name="barcodefile" method="post">
+		<h2 class="reports">Utiliser un fichier de code-barre</h2>
+		<p>ficher de code-barres : <input type="file" name="uploadbarcodes" /></p>
+		<p>mettre date dernier mouvement à : <input type="text" name="setdate" /></p>
+		<p><input type="submit" value="OK" class="button reports"></p>
+		</form>
+		<!--TMPL_IF Name="Number" --><p><!--TMPL_VAR Name="Number"--> documents modifiés : date dernier mouvement positionné à <!--TMPL_VAR Name="date"--></p><!-- /TMPL_IF-->
+		<!--TMPL_IF Name="errorfile" --><p class="error"><!--TMPL_VAR Name="errorfile"--> ne peut pas être ouvert</p><!-- /TMPL_IF-->
+	</div>
+	<!--TMPL_LOOP Name="errorloop"--><p class="error"><!--TMPL_VAR Name="barcode"-->
+	<!--TMPL_IF Name="ERR_BARCODE"--> : code-barre non trouvé<!--/TMPL_IF-->
+	<!--TMPL_IF Name="ERR_WTHDRAWN"--> : Exemplaire retiré<!--/TMPL_IF-->
+	<!--TMPL_IF Name="ERR_ONLOAN_RET"--> : le document était en prêt : il a été retourné avant d'être mis à jour<!--/TMPL_IF-->
+	<!--TMPL_IF Name="ERR_ONLOAN_NOT_RET"--> : le document est en prêt. N'a pas pu être retourné.<!--/TMPL_IF-->
+	</p><!-- /TMPL_LOOP-->
+	<!-- TMPL_IF NAME="loop" -->
 	<form method="post">
 	<input type="hidden" name="markseen" value="1">
 	<input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->">
@@ -24,7 +42,6 @@
 	<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" -->">
-	<!-- TMPL_IF NAME="loop" -->
 	<table>
 		<tr>
 			<th class="reports">Vu</th>

Index: reports/issues_by_borrower_category.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/Attic/issues_by_borrower_category.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- reports/issues_by_borrower_category.tmpl	5 Jan 2006 15:17:57 -0000	1.2.2.2
+++ reports/issues_by_borrower_category.tmpl	17 Oct 2006 07:26:44 -0000	1.2.2.3
@@ -39,8 +39,7 @@
 <!-- TMPL_ELSE -->
 	<h1 class = "reports">Prêts par catégorie de lecteur</h1>
 	<form method="post">
-		<p> Sélectionner une catégorie de lecteur (ou rien si vous souhaitez visualiser l'état global) <input type="text" name="value"></p>
-		<p>Sélectionnez une annexe : <!-- TMPL_VAR NAME="CGIbranch" --></p>
+		<p>Sélectionnez un site : <!-- TMPL_VAR NAME="CGIbranch" --></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">

Index: reports/itemtypes.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/Attic/itemtypes.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- reports/itemtypes.tmpl	5 Jan 2006 15:17:57 -0000	1.2.2.1
+++ reports/itemtypes.tmpl	17 Oct 2006 07:26:44 -0000	1.2.2.2
@@ -22,7 +22,7 @@
 <!-- TMPL_ELSE -->
 	<h1>Voir le catalogue par type de document</h1>
 	<form method="post">
-		 Sélectionner une annexe (ou rien si vous souhaitez le rapport pour toutes les annexes) <!-- TMPL_VAR NAME="CGIbranch" -->
+		 Sélectionner un site (ou rien si vous souhaitez le rapport pour tous les sites) <!-- TMPL_VAR NAME="CGIbranch" -->
 		<input type="submit" value="OK" class="button">
 		<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">
 		<input type="hidden" name="do_it" value="1">

Index: reports/reports-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/Attic/reports-home.tmpl,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -b -r1.6.2.2 -r1.6.2.3
--- reports/reports-home.tmpl	5 Jan 2006 15:17:57 -0000	1.6.2.2
+++ reports/reports-home.tmpl	17 Oct 2006 07:26:44 -0000	1.6.2.3
@@ -16,12 +16,12 @@
 <div id="bloc25">
 	<h2 class="reports">Les plus</h2>
 	<ul>
-		<li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Plus gros usagers</a></li>
+		<li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Plus gros lecteurs</a></li>
 		<li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Documents les plus empruntés</a></li>
 	</ul>
 	<h2 class="reports">Les moins</h2>
 	<ul>
-		<li><a href="/cgi-bin/koha/reports/borrowers_out.pl">Usagers sans prêt</a></li>
+		<li><a href="/cgi-bin/koha/reports/borrowers_out.pl">Lecteurs sans prêt</a></li>
 		<li><a href="/cgi-bin/koha/reports/catalogue_out.pl">Documents non empruntés</a></li>
 	</ul>
 </div>

Index: search.marc/dictionary.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc/Attic/dictionary.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- search.marc/dictionary.tmpl	5 Jan 2006 15:24:47 -0000	1.1.2.1
+++ search.marc/dictionary.tmpl	17 Oct 2006 07:26:44 -0000	1.1.2.2
@@ -2,7 +2,7 @@
 <html>
 <head>
 <title>dictionnaire KOHA</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /TMPL_IF -->
 
 <script language="JavaScript" type="text/javascript">
 <!-- Hide from old browsers

Index: search.marc/result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc/Attic/result.tmpl,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -b -r1.6.2.1 -r1.6.2.2
--- search.marc/result.tmpl	5 Jan 2006 15:17:57 -0000	1.6.2.1
+++ search.marc/result.tmpl	17 Oct 2006 07:26:44 -0000	1.6.2.2
@@ -6,8 +6,8 @@
 <div id="mainbloc">
 	<h1 class="catalogue">Résultats de recherche</h1>
 	<div id="resultnumber">
-		<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="search.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;op=do_search">&lt;&lt; Préc.</a><!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="numbers" --><!-- TMPL_IF NAME="highlight" --> <span class="highlight"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE --> <a class="resultnumber" href="search.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;op=do_search"><!-- TMPL_VAR NAME="number" --></a><!-- /TMPL_IF --><!-- /TMPL_LOOP --> <!-- TMPL_IF NAME="displaynext" --><a class="resultnumber" href="search.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;op=do_search">Suivant &gt;&gt;</a><!-- /TMPL_IF --></p>
+		<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="search.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;<!--TMPL_IF NAME="orderby"-->orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;<!--/TMPL_IF--><!--TMPL_IF NAME="desc_asc"-->desc_or_asc=<!-- TMPL_VAR NAME="desc_asc" -->&amp;<!--/TMPL_IF-->type=intranet&amp;op=do_search">&lt;&lt; Préc.</a><!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="numbers" --><!-- TMPL_IF NAME="highlight" --> <span class="highlight"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE --> <a class="resultnumber" href="search.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;<!--TMPL_IF NAME="orderby"-->orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;<!--/TMPL_IF--><!--TMPL_IF NAME="desc_asc"-->desc_or_asc=<!-- TMPL_VAR NAME="desc_asc" -->&amp;<!--/TMPL_IF-->type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a><!-- /TMPL_IF --><!-- /TMPL_LOOP --> <!-- TMPL_IF NAME="displaynext" --><a class="resultnumber" href="search.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;<!--TMPL_IF NAME="orderby"-->orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;<!--/TMPL_IF--><!--TMPL_IF NAME="desc_asc"-->desc_or_asc=<!-- TMPL_VAR NAME="desc_asc" -->&amp;<!--/TMPL_IF-->type=intranet&amp;op=do_search">Suivant &gt;&gt;</a><!-- /TMPL_IF --></p>
 		<p class="resultcount"><!-- TMPL_IF NAME="total" -->Réponses <!-- TMPL_VAR NAME="from" --> à  <!-- TMPL_VAR NAME="to" --> sur <!-- TMPL_VAR NAME="total" --><!-- TMPL_ELSE -->Pas de réponse<!-- /TMPL_IF --></p></div>
 	<div id="resultlist">
 		<table>
@@ -56,6 +56,9 @@
 							<!-- TMPL_ELSE -->
 								<!-- TMPL_IF NAME="itemcallnumber" -->
 									(<!-- TMPL_VAR NAME="itemcallnumber" -->)
+                                <!-- TMPL_IF name="cnt" -->
+                                  x <!-- TMPL_VAR name="cnt" -->
+                                <!--/TMPL_IF-->
 								<!-- /TMPL_IF -->
 							<!-- /TMPL_IF -->
 							<!-- TMPL_IF name="notforloan" -->
@@ -77,8 +80,8 @@
 		</table>
 	</div>
 	<div id="resultnumber">
-		<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="search.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;op=do_search">&lt;&lt; Préc.</a><!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="numbers" --><!-- TMPL_IF NAME="highlight" --> <span class="highlight"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE --> <a class="resultnumber" href="search.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;op=do_search"><!-- TMPL_VAR NAME="number" --></a><!-- /TMPL_IF --><!-- /TMPL_LOOP --> <!-- TMPL_IF NAME="displaynext" --><a class="resultnumber" href="search.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;op=do_search">Suivant &gt;&gt;</a><!-- /TMPL_IF --></p>
+		<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="search.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;<!--TMPL_IF NAME="orderby"-->orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;<!--/TMPL_IF--><!--TMPL_IF NAME="desc_asc"-->desc_or_asc=<!-- TMPL_VAR NAME="desc_asc" -->&amp;<!--/TMPL_IF-->type=intranet&amp;op=do_search">&lt;&lt; Préc.</a><!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="numbers" --><!-- TMPL_IF NAME="highlight" --> <span class="highlight"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE --> <a class="resultnumber" href="search.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;<!--TMPL_IF NAME="orderby"-->orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;<!--/TMPL_IF--><!--TMPL_IF NAME="desc_asc"-->desc_or_asc=<!-- TMPL_VAR NAME="desc_asc" -->&amp;<!--/TMPL_IF-->type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a><!-- /TMPL_IF --><!-- /TMPL_LOOP --> <!-- TMPL_IF NAME="displaynext" --><a class="resultnumber" href="search.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;<!--TMPL_IF NAME="orderby"-->orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;<!--/TMPL_IF--><!--TMPL_IF NAME="desc_asc"-->desc_or_asc=<!-- TMPL_VAR NAME="desc_asc" -->&amp;<!--/TMPL_IF-->type=intranet&amp;op=do_search">Suivant &gt;&gt;</a><!-- /TMPL_IF --></p>
 	</div>	
 </div>
 <!-- TMPL_IF NAME="opac" -->

Index: value_builder/labs_theses.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/Attic/labs_theses.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- value_builder/labs_theses.tmpl	5 Jan 2006 15:24:47 -0000	1.1.2.1
+++ value_builder/labs_theses.tmpl	17 Oct 2006 07:26:45 -0000	1.1.2.2
@@ -2,7 +2,7 @@
 <html>
 <head>
 <title>Sélection des laboratoires de thèse</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<!-- 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=iso-8859-1"><!-- /TMPL_IF -->
 
 <script language="JavaScript" type="text/javascript">
 <!-- Hide from old browsers

Index: z3950/searchresult.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/z3950/Attic/searchresult.tmpl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -b -r1.3.2.1 -r1.3.2.2
--- z3950/searchresult.tmpl	5 Jan 2006 15:17:57 -0000	1.3.2.1
+++ z3950/searchresult.tmpl	17 Oct 2006 07:26:45 -0000	1.3.2.2
@@ -1,6 +1,6 @@
 <HTML>
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<!-- 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=iso-8859-1"><!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="refresh" -->
 		<meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR NAME="refresh" -->">
 	<!-- /TMPL_IF -->
@@ -34,7 +34,7 @@
 				<th class="catalogue">&nbsp;</th>
 			</tr>
 				<!-- TMPL_LOOP NAME="breeding_loop" -->
-					<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+					<!-- TMPL_IF NAME="toggle" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
 						<td><!-- TMPL_VAR NAME="title" --></td>
 						<td><!-- TMPL_VAR NAME="author" --></td>
 						<td><!-- TMPL_VAR NAME="isbn" --></td>

Index: help/acqui/acqui-home.tmpl
===================================================================
RCS file: help/acqui/acqui-home.tmpl
diff -N help/acqui/acqui-home.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ help/acqui/acqui-home.tmpl	17 Oct 2006 07:26:43 -0000	1.1.2.1
@@ -0,0 +1,15 @@
+<!-- TMPL_INCLUDE NAME="help-top.inc" -->
+	<h1>Acquisitions</h1>
+	<p>Vous êtes sur la page d'accueil du module acquisitions. Tout débute par le fournisseur. Si vous souhaitez créer une commande ou réceptionner un document, vous devez saisir le nom du fournisseur ou son code. Si vous voulez créer un nouveau fournisseur, saisissez son nom, vous pourrez le créer dans l'écran suivant</p>
+	<p>Vous trouverez également sur cette page :</p>
+	<ul>
+		<li>Le taux de change pour chaque devise. Vous pouvez les changer si nécessaire. N'oubliez pas que Koha ne le fera pas automatiquement</li>
+		<li>Dans le bloc des suggestions, vous pouvez voir combien de suggestions vous avez à traiter (accepter ou rejeter). Bien sûr, si vous n'avez pas activé les suggestions (dans paramètres >> préférences systèmes), vous n'avez rien dans cette zone.</li>
+		<li>Le dernier bloc, "budgets", affiche le résumé de la situation budgétaire. Seuls les budgets actifs à la date du jour sont affichés. Donc si une ligne budgétaire disparait, allez dans Paramètres >> budgets, et vérifiez si le budget n'a pas disparu à cause de la date !</li>
+	</ul>
+	<h2>Définitions</h2>
+	<ul>
+		<li>Un <b>panier</b> est un groupe de lignes de commandes qui sont envoyés en même temps à un fournisseur. Le panier est utilisé pour acheter des documents</li>
+		<li>Un <b>Colis</b> est un groupe de document acquis qui sont dans un même carton de livraison. Le colis est utilisé pour réceptionner les commandes.</li>
+	</ul>
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: help/acqui/basket.tmpl
===================================================================
RCS file: help/acqui/basket.tmpl
diff -N help/acqui/basket.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ help/acqui/basket.tmpl	17 Oct 2006 07:26:43 -0000	1.1.2.1
@@ -0,0 +1,12 @@
+<!-- TMPL_INCLUDE NAME="help-top.inc" -->
+	<h1>Panier d'acquisition/Création de commande</h1>
+	<p>Cette pas vous permet de créer ou modifier un panier. Un panier contient autant de lignes de commandes que vous le souhaitez.</p>
+	<p>Le 1er bloc contient les en-têtes de panier : le bibliothécaire qui l'a créé, la date... Le panier peut être fermé. Un panier fermé ne peut plus être modifié.</p>
+	<p>Le 2eme bloc contient les lignes de commande</p>
+	<p>Le 3eme bloc vous permet d'ajouter une ligne de commande. Chaque ligne peut provenir de : 
+	<ul>
+		<li>Suggestion acceptée</li>
+		<li>Une notice existante (pour acheter un nouvel exemplaire) </li>
+		<li>Une nouvelle notice bibliographique (à partir de rien)</li>
+	</ul>
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: help/acqui/order.tmpl
===================================================================
RCS file: help/acqui/order.tmpl
diff -N help/acqui/order.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ help/acqui/order.tmpl	17 Oct 2006 07:26:43 -0000	1.1.2.1
@@ -0,0 +1,11 @@
+<!-- TMPL_INCLUDE NAME="help-top.inc" -->
+	<h1>Liste des fournisseurs</h1>
+	<p>Cette page affiche la liste des fournisseurs. Pour chaque fournisseur, vous aurez :
+	<ul>
+		<li>Le nom du fournisseur. Vous pouvez simplement voir les détails en cliquant sur son nom<li>
+		<li>Le bouton pour créer une nouvelle commande</li>
+		<li>Le bouton pour voir tous les colis de réception et en créer un autre.</li>
+		<li>La liste de tous les paniers pour ce fournisseur. Vous pouvez visualiser ou ajouter des lignes sur chaque panier, s'il n'est pas fermé. Les paniers fermés depuis plus de 6 mois ne sont pas affichés.</li>
+	</ul>
+	<p>A la fin de la page, vous trouverez un bouton pour créer un nouveau fournisseur</p>
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: help/acqui/recieve.tmpl
===================================================================
RCS file: help/acqui/recieve.tmpl
diff -N help/acqui/recieve.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ help/acqui/recieve.tmpl	17 Oct 2006 07:26:43 -0000	1.1.2.1
@@ -0,0 +1,6 @@
+<!-- TMPL_INCLUDE name="help-top.inc" -->
+<h1>Acquisition : détail du colis</h1>
+<p>Cette page affiche le contenu d'un colis</p>
+<p>Le 1er bloc contient une liste des documents déjà réceptionnés.</p>
+<p>Le 2eme bloc contient la liste des commandes de ce fournisseur toujours en attente de réception. Vous pouvez remplir un colis à partir de cette liste, ou en recherchant dans l'isbn/titre.</p>
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: help/acqui/recieveorder.tmpl
===================================================================
RCS file: help/acqui/recieveorder.tmpl
diff -N help/acqui/recieveorder.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ help/acqui/recieveorder.tmpl	17 Oct 2006 07:26:44 -0000	1.1.2.1
@@ -0,0 +1,19 @@
+<!-- TMPL_INCLUDE name="help-top.inc" -->
+<h1>Acquisition : réception d'un colis</h1>
+<p>Cette page affiche les colis du fournisseur. Vous pouvez filter sur un code colis et sur une date de réception</p>
+<p> La liste peut être triée par date, par code colis, et contient :</p>
+<p><ul>
+	<li>Le résumé du colis (date et code)</li>
+	<li>Le nombre de documents déjà dans le colis (exemplaires physiques)</li>
+	<li>Le nombre de lignes de commandes différentes dans le colis</li>
+	<li>Le nombre de documents attendus. Ce nombre est calculé à partir des notices commandées</li>
+	</ul>
+</p>
+<p>Exemple : un colis contenant 3 exemplaires du même document. Si la ligne concerne une commande de 5 exemplaires, la liste affichera :</p>
+<ul>
+	<li>Nombre de documents dans le colis : 3</li>
+	<li>Nombre de notices : 1</li>
+	<li>Nombre de documetns : 5</li>
+</ul>
+<p>A la fin de la page, vous trouverez un bouton pour créer un nouveau colis</p>
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: help/reports/inventory.tmpl
===================================================================
RCS file: help/reports/inventory.tmpl
diff -N help/reports/inventory.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ help/reports/inventory.tmpl	17 Oct 2006 07:26:44 -0000	1.1.2.1
@@ -0,0 +1,23 @@
+<!-- TMPL_INCLUDE name="help-top.inc" -->
+<h1>aide inventaire/récollement</h1>
+<p>Avec cet utilitaire, vous pouvez faire l'inventaire/récolement de votre fonds</p>
+<p>Il y a 2 manières de faire ceci :</p>
+<ul>
+<li>Listez les documents qui n'ont pas été 'vus', et recherchez les sur les étagères</li>
+<li>Scanner tous les documents, ce qui permettra à Koha de les marquer comme "vus"</li>
+</ul>
+<p>Koha permet les 2 méthodes :</p>
+<h2>Afficher les documents non vus et les chercher dans les rayonnages</h2>
+<p> Dans le 1er bloc, vous pouvez sélectionner :
+<ul>
+<li>Une tranche de cote : pour limiter la liste à une étagère</li>
+<li>Une "date de dernier mouvement" : pour voir seulement les documents qui n'ont pas circulé depuis longtemps</li>
+</ul>
+<p>Si vous validez votre recherche, vous aurez une liste de documents. Allez sur les étagères, recherchez les et, si vous les trouvez, cliquez</p>
+<h2>Scanner tous les document et signaler à Koha que vous les avez vus</h2>
+<p>Cette fonctionnalité est nouvelle dans Koha 2.2.6 : vous pouvez scanner TOUS les documents dans vos étagères (avec un lecteur de code-barres et un ordinateur portable), et les sauvegarder dans un fichier texte (bloc-note ou tout autre éditeur de texte <b>Ceci exclut MS-word ou OpenOffice.org</b>)</p>
+<p>Lorsque vous avez une longue liste de code-barres, regardez dans le second bloc de la page, et téléchargez le fichier : tous les documents que vous avez scanné sont automatiquement modifiés pour avoir la "date de dernier mouvement" mise à jour à la valeur que vous souhaitez</p>
+<p>Lorsque vous avez inventorié toute votre bibliothèque, vous pouvez visualiser les documents manquants en recherchant les documents n'ayant pas été marqués depuis le début de votre inventaire.</p>
+
+<p>Notez que l'inventaire/récollement est calculé à partir de la "date de dernier mouvement". Cette date est positionnée automatiquement à chaque circulation du document.</p>
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: images/exception.jpg
===================================================================
RCS file: images/exception.jpg
diff -N images/exception.jpg
Binary files /dev/null and /tmp/cvsm5PKHy differ

Index: images/numbers/1-highlight.gif
===================================================================
RCS file: images/numbers/1-highlight.gif
diff -N images/numbers/1-highlight.gif
Binary files /dev/null and /tmp/cvsVq1rQB differ

Index: images/numbers/1.gif
===================================================================
RCS file: images/numbers/1.gif
diff -N images/numbers/1.gif
Binary files /dev/null and /tmp/cvsOPiN9z differ

Index: images/numbers/10-highlight.gif
===================================================================
RCS file: images/numbers/10-highlight.gif
diff -N images/numbers/10-highlight.gif
Binary files /dev/null and /tmp/cvs7xJSEA differ

Index: images/numbers/10.gif
===================================================================
RCS file: images/numbers/10.gif
diff -N images/numbers/10.gif
Binary files /dev/null and /tmp/cvsw5gOED differ

Index: images/numbers/11-highlight.gif
===================================================================
RCS file: images/numbers/11-highlight.gif
diff -N images/numbers/11-highlight.gif
Binary files /dev/null and /tmp/cvsPfK6rE differ

Index: images/numbers/11.gif
===================================================================
RCS file: images/numbers/11.gif
diff -N images/numbers/11.gif
Binary files /dev/null and /tmp/cvsCYoNKC differ

Index: images/numbers/12-highlight.gif
===================================================================
RCS file: images/numbers/12-highlight.gif
diff -N images/numbers/12-highlight.gif
Binary files /dev/null and /tmp/cvsvzGGlD differ

Index: images/numbers/12.gif
===================================================================
RCS file: images/numbers/12.gif
diff -N images/numbers/12.gif
Binary files /dev/null and /tmp/cvsCSlydG differ

Index: images/numbers/13-highlight.gif
===================================================================
RCS file: images/numbers/13-highlight.gif
diff -N images/numbers/13-highlight.gif
Binary files /dev/null and /tmp/cvsnXWpRG differ

Index: images/numbers/13.gif
===================================================================
RCS file: images/numbers/13.gif
diff -N images/numbers/13.gif
Binary files /dev/null and /tmp/cvsQun5iF differ

Index: images/numbers/14-highlight.gif
===================================================================
RCS file: images/numbers/14-highlight.gif
diff -N images/numbers/14-highlight.gif
Binary files /dev/null and /tmp/cvsb8MnUF differ

Index: images/numbers/14.gif
===================================================================
RCS file: images/numbers/14.gif
diff -N images/numbers/14.gif
Binary files /dev/null and /tmp/cvsO6CuTI differ

Index: images/numbers/15-highlight.gif
===================================================================
RCS file: images/numbers/15-highlight.gif
diff -N images/numbers/15-highlight.gif
Binary files /dev/null and /tmp/cvsBCraqJ differ

Index: images/numbers/15.gif
===================================================================
RCS file: images/numbers/15.gif
diff -N images/numbers/15.gif
Binary files /dev/null and /tmp/cvswClSIH differ

Index: images/numbers/16-highlight.gif
===================================================================
RCS file: images/numbers/16-highlight.gif
diff -N images/numbers/16-highlight.gif
Binary files /dev/null and /tmp/cvspiPcjI differ

Index: images/numbers/16.gif
===================================================================
RCS file: images/numbers/16.gif
diff -N images/numbers/16.gif
Binary files /dev/null and /tmp/cvscA8rhL differ

Index: images/numbers/17-highlight.gif
===================================================================
RCS file: images/numbers/17-highlight.gif
diff -N images/numbers/17-highlight.gif
Binary files /dev/null and /tmp/cvsB1DE4L differ

Index: images/numbers/17.gif
===================================================================
RCS file: images/numbers/17.gif
diff -N images/numbers/17.gif
Binary files /dev/null and /tmp/cvsQFSVmK differ

Index: images/numbers/18-highlight.gif
===================================================================
RCS file: images/numbers/18-highlight.gif
diff -N images/numbers/18-highlight.gif
Binary files /dev/null and /tmp/cvsRdYURK differ

Index: images/numbers/18.gif
===================================================================
RCS file: images/numbers/18.gif
diff -N images/numbers/18.gif
Binary files /dev/null and /tmp/cvswAzIRN differ

Index: images/numbers/19-highlight.gif
===================================================================
RCS file: images/numbers/19-highlight.gif
diff -N images/numbers/19-highlight.gif
Binary files /dev/null and /tmp/cvsledCjM differ

Index: images/numbers/19.gif
===================================================================
RCS file: images/numbers/19.gif
diff -N images/numbers/19.gif
Binary files /dev/null and /tmp/cvsSWP8VM differ

Index: images/numbers/2-highlight.gif
===================================================================
RCS file: images/numbers/2-highlight.gif
diff -N images/numbers/2-highlight.gif
Binary files /dev/null and /tmp/cvsd3bEVP differ

Index: images/numbers/2.gif
===================================================================
RCS file: images/numbers/2.gif
diff -N images/numbers/2.gif
Binary files /dev/null and /tmp/cvsu3m0pQ differ

Index: images/numbers/20-highlight.gif
===================================================================
RCS file: images/numbers/20-highlight.gif
diff -N images/numbers/20-highlight.gif
Binary files /dev/null and /tmp/cvszZzqKO differ

Index: images/numbers/20.gif
===================================================================
RCS file: images/numbers/20.gif
diff -N images/numbers/20.gif
Binary files /dev/null and /tmp/cvsazYuxP differ

Index: images/numbers/21-highlight.gif
===================================================================
RCS file: images/numbers/21-highlight.gif
diff -N images/numbers/21-highlight.gif
Binary files /dev/null and /tmp/cvsPuucuS differ

Index: images/numbers/21.gif
===================================================================
RCS file: images/numbers/21.gif
diff -N images/numbers/21.gif
Binary files /dev/null and /tmp/cvsO2FH7S differ

Index: images/numbers/22-highlight.gif
===================================================================
RCS file: images/numbers/22-highlight.gif
diff -N images/numbers/22-highlight.gif
Binary files /dev/null and /tmp/cvsFWXnjR differ

Index: images/numbers/22.gif
===================================================================
RCS file: images/numbers/22.gif
diff -N images/numbers/22.gif
Binary files /dev/null and /tmp/cvsgxyYTR differ

Index: images/numbers/23-highlight.gif
===================================================================
RCS file: images/numbers/23-highlight.gif
diff -N images/numbers/23-highlight.gif
Binary files /dev/null and /tmp/cvsLMVqTU differ

Index: images/numbers/23.gif
===================================================================
RCS file: images/numbers/23.gif
diff -N images/numbers/23.gif
Binary files /dev/null and /tmp/cvsq8QqGV differ

Index: images/numbers/24-highlight.gif
===================================================================
RCS file: images/numbers/24-highlight.gif
diff -N images/numbers/24-highlight.gif
Binary files /dev/null and /tmp/cvsDhN10T differ

Index: images/numbers/24.gif
===================================================================
RCS file: images/numbers/24.gif
diff -N images/numbers/24.gif
Binary files /dev/null and /tmp/cvs8f9ruU differ

Index: images/numbers/25-highlight.gif
===================================================================
RCS file: images/numbers/25-highlight.gif
diff -N images/numbers/25-highlight.gif
Binary files /dev/null and /tmp/cvslnsEvX differ

Index: images/numbers/25.gif
===================================================================
RCS file: images/numbers/25.gif
diff -N images/numbers/25.gif
Binary files /dev/null and /tmp/cvs690HiY differ

Index: images/numbers/26-highlight.gif
===================================================================
RCS file: images/numbers/26-highlight.gif
diff -N images/numbers/26-highlight.gif
Binary files /dev/null and /tmp/cvsNvhsBW differ

Index: images/numbers/26.gif
===================================================================
RCS file: images/numbers/26.gif
diff -N images/numbers/26.gif
Binary files /dev/null and /tmp/cvsMmQu6W differ

Index: images/numbers/27-highlight.gif
===================================================================
RCS file: images/numbers/27-highlight.gif
diff -N images/numbers/27-highlight.gif
Binary files /dev/null and /tmp/cvsllrg3Z differ

Index: images/numbers/27.gif
===================================================================
RCS file: images/numbers/27.gif
diff -N images/numbers/27.gif
Binary files /dev/null and /tmp/cvssboRH0 differ

Index: images/numbers/28-highlight.gif
===================================================================
RCS file: images/numbers/28-highlight.gif
diff -N images/numbers/28-highlight.gif
Binary files /dev/null and /tmp/cvstbks9Y differ

Index: images/numbers/28.gif
===================================================================
RCS file: images/numbers/28.gif
diff -N images/numbers/28.gif
Binary files /dev/null and /tmp/cvsgyCT91 differ

Index: images/numbers/29-highlight.gif
===================================================================
RCS file: images/numbers/29-highlight.gif
diff -N images/numbers/29-highlight.gif
Binary files /dev/null and /tmp/cvsDpJYE2 differ

Index: images/numbers/29.gif
===================================================================
RCS file: images/numbers/29.gif
diff -N images/numbers/29.gif
Binary files /dev/null and /tmp/cvso96DX0 differ

Index: images/numbers/3-highlight.gif
===================================================================
RCS file: images/numbers/3-highlight.gif
diff -N images/numbers/3-highlight.gif
Binary files /dev/null and /tmp/cvs98mZK1 differ

Index: images/numbers/3.gif
===================================================================
RCS file: images/numbers/3.gif
diff -N images/numbers/3.gif
Binary files /dev/null and /tmp/cvscXusH4 differ

Index: images/numbers/30-highlight.gif
===================================================================
RCS file: images/numbers/30-highlight.gif
diff -N images/numbers/30-highlight.gif
Binary files /dev/null and /tmp/cvsFHIKm5 differ

Index: images/numbers/30.gif
===================================================================
RCS file: images/numbers/30.gif
diff -N images/numbers/30.gif
Binary files /dev/null and /tmp/cvsuZyjC3 differ

Index: images/numbers/31-highlight.gif
===================================================================
RCS file: images/numbers/31-highlight.gif
diff -N images/numbers/31-highlight.gif
Binary files /dev/null and /tmp/cvsdXKi83 differ

Index: images/numbers/31.gif
===================================================================
RCS file: images/numbers/31.gif
diff -N images/numbers/31.gif
Binary files /dev/null and /tmp/cvsYN0846 differ

Index: images/numbers/4-highlight.gif
===================================================================
RCS file: images/numbers/4-highlight.gif
diff -N images/numbers/4-highlight.gif
Binary files /dev/null and /tmp/cvsjGptJ7 differ

Index: images/numbers/4.gif
===================================================================
RCS file: images/numbers/4.gif
diff -N images/numbers/4.gif
Binary files /dev/null and /tmp/cvsAOZjb6 differ

Index: images/numbers/5-highlight.gif
===================================================================
RCS file: images/numbers/5-highlight.gif
diff -N images/numbers/5-highlight.gif
Binary files /dev/null and /tmp/cvsBYKlP6 differ

Index: images/numbers/5.gif
===================================================================
RCS file: images/numbers/5.gif
diff -N images/numbers/5.gif
Binary files /dev/null and /tmp/cvs6TpyF9 differ

Index: images/numbers/6-highlight.gif
===================================================================
RCS file: images/numbers/6-highlight.gif
diff -N images/numbers/6-highlight.gif
Binary files /dev/null and /tmp/cvsjhJ7ka differ

Index: images/numbers/6.gif
===================================================================
RCS file: images/numbers/6.gif
diff -N images/numbers/6.gif
Binary files /dev/null and /tmp/cvsw0wXA8 differ

Index: images/numbers/7-highlight.gif
===================================================================
RCS file: images/numbers/7-highlight.gif
diff -N images/numbers/7-highlight.gif
Binary files /dev/null and /tmp/cvsJwZVq9 differ

Index: images/numbers/7.gif
===================================================================
RCS file: images/numbers/7.gif
diff -N images/numbers/7.gif
Binary files /dev/null and /tmp/cvsEGCOmc differ

Index: images/numbers/8-highlight.gif
===================================================================
RCS file: images/numbers/8-highlight.gif
diff -N images/numbers/8-highlight.gif
Binary files /dev/null and /tmp/cvsBKJWTc differ

Index: images/numbers/8.gif
===================================================================
RCS file: images/numbers/8.gif
diff -N images/numbers/8.gif
Binary files /dev/null and /tmp/cvsaYNLcb differ

Index: images/numbers/9-highlight.gif
===================================================================
RCS file: images/numbers/9-highlight.gif
diff -N images/numbers/9-highlight.gif
Binary files /dev/null and /tmp/cvstCvlle differ

Index: images/numbers/9.gif
===================================================================
RCS file: images/numbers/9.gif
diff -N images/numbers/9.gif
Binary files /dev/null and /tmp/cvsmbbqVe differ

Index: images/numbers/next.gif
===================================================================
RCS file: images/numbers/next.gif
diff -N images/numbers/next.gif
Binary files /dev/null and /tmp/cvsd8JNfd differ

Index: images/numbers/placeholder.gif
===================================================================
RCS file: images/numbers/placeholder.gif
diff -N images/numbers/placeholder.gif
Binary files /dev/null and /tmp/cvsKShBKd differ

Index: images/numbers/prev.gif
===================================================================
RCS file: images/numbers/prev.gif
diff -N images/numbers/prev.gif
Binary files /dev/null and /tmp/cvsf21DKg differ

Index: import/picture-upload.tmpl
===================================================================
RCS file: import/picture-upload.tmpl
diff -N import/picture-upload.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ import/picture-upload.tmpl	17 Oct 2006 07:26:44 -0000	1.1.2.1
@@ -0,0 +1,56 @@
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+
+<div id="mainbloc">
+<h1>Import des photos des lecteurs</h1>
+
+<!-- TMPL_IF name="total" -->
+	<ul class="data">
+		<li>Import terminé</li>
+	</ul>
+    <!-- TMPL_VAR NAME="total" --> récupérées <!-- TMPL_VAR NAME="handled" --> traitées
+    <!-- TMPL_LOOP name="counts" -->
+        <!-- TMPL_VAR name="count" --> images déplacées de <!-- TMPL_VAR name="source" --> à <!-- TMPL_VAR name="dest" -->
+        <!-- TMPL_LOOP name="filenames" -->
+            <!-- TMPL_VAR name="source" --> vers <!-- TMPL_VAR name="dest" -->
+        <!-- /TMPL_LOOP -->
+    <!-- /TMPL_LOOP -->
+<!-- TMPL_ELSE -->
+
+    <!-- TMPL_IF name="errors" -->
+        <!-- TMPL_LOOP name="errors" -->
+        <ul class="error">
+        <!-- TMPL_IF name="NOTZIP" -->
+            <li>Le fichier importé n'est pas un fichier compressé (.zip)</li>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="NOWRITETEMP" -->
+            <li>Impossible d'écrire dans le répertoire temporaire !</li>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="NOWRITEDEST" -->
+            <li>Impossible d'écrire dans le répertoire de photos lecteurs.</li>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="EMPTYUPLOAD" -->
+            <li>Le fichier semble vide.</li>
+        <!-- /TMPL_IF -->
+        <!-- /TMPL_LOOP -->
+    <!-- /TMPL_IF -->
+    <form method="post" action="/cgi-bin/koha/import/picture-upload.pl" enctype="multipart/form-data">
+    <h2 class="problem">Attention, cette fonctionnalité est expérimentale, et peut donc mal fonctionner pour vous.</h2>
+    <ul>
+        <li>Sélectionner un fichier à importer sur le serveur. Chaque fichier .jpg sera copié dans le répertoire approprié en tant que photo du lecteur.</li>
+        <li>Vous pouvez inclure plusieurs photos dans le fichier .zip et mettre plusieurs répertoires.</li>
+        <li>Il doit y avoir un fichier DATALINK.TXT ou IDLINK.TXT pour chaque photo. Il doit contenir le numéro de carte lecteur et le nom du fichier (.jpg) avec la photo. Un lecteur par ligne, séparé par des virgules ou des tabulations. Les ' sont ignorés.</li>
+    </ul>
+    <table>
+        <tr>
+            <th><label for="uploadfile">Sélectionnez le fichier à importer : </label></th>
+            <td>
+                <input type="file" id="uploadfile" name="uploadfile" /><br />
+            </td>
+        </tr>
+    </table>
+        <input type="submit" value="Importer" class="submit">
+    </form>
+    
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: includes/hierarchy.css
===================================================================
RCS file: includes/hierarchy.css
diff -N includes/hierarchy.css
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ includes/hierarchy.css	17 Oct 2006 07:26:44 -0000	1.1.2.1
@@ -0,0 +1,105 @@
+.hierarchies {
+	background-color:#fff;
+	color:#000000;
+	padding:5px;
+	margin-left:50px;
+	-moz-border-radius:6px;
+	display:block;
+	font-size:10px;
+}
+.hierarchy {
+	padding:5px;
+	width:90%;
+	-moz-border-radius:6px;
+	display:block;
+}
+.child {
+	display:none;
+    margin-left : 50px;
+    width:150%;
+}
+.child a:hover{
+  background-color:#BFCFFF;
+}
+.parent {
+	display:none;
+    margin-left : -50px;
+}
+.parent a:hover{
+  background-color:#BFCFFF;
+}
+.child0{
+  width : 20%;
+  text-align : left;
+}
+.child0 a:hover{
+  background-color:#BFCFFF;
+}
+.child1{
+  width : 20%;
+  text-align : left;
+  margin-left : 50px;
+}
+.child1 a:hover{
+  background-color:#BFCFFF;
+}
+.child2{
+  width : 20%;
+  text-align : left;
+  margin-left : 100px;
+}
+.child2 a:hover{
+  background-color:#BFCFFF;
+}
+.child3{
+  width : 20%;
+  text-align : left;
+  margin-left : 150px;
+}
+.child3 a:hover{
+  background-color:#BFCFFF;
+}
+.child4{
+  width : 20%;
+  text-align : left;
+  margin-left : 200px;
+}
+.child4 a:hover{
+  background-color:#BFCFFF;
+}
+.child5{
+  width : 20%;
+  text-align : left;
+  margin-left : 250px;
+}
+.child5 a:hover{
+  background-color:#BFCFFF;
+}
+.child6{
+  width : 20%;
+  text-align : left;
+  margin-left : 300px;
+}
+.child6 a:hover{
+  background-color:#BFCFFF;
+}
+.child7{
+  width : 20%;
+  text-align : left;
+  margin-left : 350px;
+}
+.child7 a:hover{
+  background-color:#BFCFFF;
+}
+.child8{
+  width : 10%;
+  text-align : left;
+  margin-left : 400px;
+}
+.child8 a:hover{
+  background-color:#BFCFFF;
+}
+.parents{
+  display:inline;
+  cursor:crosshair;
+}
\ No newline at end of file

Index: includes/calendar/cal.gif
===================================================================
RCS file: includes/calendar/cal.gif
diff -N includes/calendar/cal.gif
Binary files /dev/null and /tmp/cvskB4htg differ

Index: includes/calendar/calendar-en.js
===================================================================
RCS file: includes/calendar/calendar-en.js
diff -N includes/calendar/calendar-en.js
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ includes/calendar/calendar-en.js	17 Oct 2006 07:26:44 -0000	1.1.2.1
@@ -0,0 +1,127 @@
+// ** 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: includes/calendar/calendar-setup.js
===================================================================
RCS file: includes/calendar/calendar-setup.js
diff -N includes/calendar/calendar-setup.js
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ includes/calendar/calendar-setup.js	17 Oct 2006 07:26:44 -0000	1.1.2.1
@@ -0,0 +1,181 @@
+/*  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 2006/10/17 07:26:44 tipaul 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: includes/calendar/calendar-system.css
===================================================================
RCS file: includes/calendar/calendar-system.css
diff -N includes/calendar/calendar-system.css
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ includes/calendar/calendar-system.css	17 Oct 2006 07:26:44 -0000	1.1.2.1
@@ -0,0 +1,254 @@
+/* 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: includes/calendar/calendar.js
===================================================================
RCS file: includes/calendar/calendar.js
diff -N includes/calendar/calendar.js
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ includes/calendar/calendar.js	17 Oct 2006 07:26:44 -0000	1.1.2.1
@@ -0,0 +1,1715 @@
+/*  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 2006/10/17 07:26:44 tipaul 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: includes/countryCodes/countryCodes.dat
===================================================================
RCS file: includes/countryCodes/countryCodes.dat
diff -N includes/countryCodes/countryCodes.dat
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ includes/countryCodes/countryCodes.dat	17 Oct 2006 07:26:44 -0000	1.1.2.1
@@ -0,0 +1,14 @@
+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

Index: includes/labelConfig/itemsLabelConfig.conf
===================================================================
RCS file: includes/labelConfig/itemsLabelConfig.conf
diff -N includes/labelConfig/itemsLabelConfig.conf
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ includes/labelConfig/itemsLabelConfig.conf	17 Oct 2006 07:26:44 -0000	1.1.2.1
@@ -0,0 +1,8 @@
+marginBottom = 25
+pageType = A4
+columns = 5
+systemDpi = 96
+labelHeigth = 21
+rows = 13
+marginLeft = 2
+labelWidth = 41

Index: reports/reservereport.tmpl
===================================================================
RCS file: reports/reservereport.tmpl
diff -N reports/reservereport.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ reports/reservereport.tmpl	17 Oct 2006 07:26:44 -0000	1.1.2.1
@@ -0,0 +1,25 @@
+<!-- TMPL_INCLUDE NAME="reports-top.inc" -->
+<div id="mainbloc">
+<h1 class="reports">Koha : Réservations</h1>
+<table>
+	<tr><th>Nom</th><th>Date réservation</th><th>Titre</th><th>classification</th></tr>
+	<!-- TMPL_LOOP Name="dataloop" -->
+		<tr>
+			<td>
+				<!-- TMPL_VAR Name="name" -->
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="reservedate" -->
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="title" -->
+			</td>
+			<td>
+				<!-- TMPL_VAR Name="classification" -->
+			</td>
+		</tr>
+	<!-- /TMPL_LOOP -->
+</table>
+<p><!-- TMPL_VAR Name="count" --></p>
+</div>
+<!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->

Index: value_builder/macles.tmpl
===================================================================
RCS file: value_builder/macles.tmpl
diff -N value_builder/macles.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ value_builder/macles.tmpl	17 Oct 2006 07:26:45 -0000	1.1.2.1
@@ -0,0 +1,257 @@
+<html>
+<head>
+<title>Gestion_des_index_MACLES</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=iso-8859-1"><!-- /TMPL_IF -->
+<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/marc-editor.css">
+<style type="text/css">
+.catalogue {
+	background-color:#ad11ad;
+	color:#FFFFFF;
+	background-image:none;
+	text-decoration: normal;
+	}
+a.catalogue:hover {
+	background-color: #ad11ad;
+	color: #FFFFFF;
+	text-decoration: none;
+	}
+
+</style>
+</head>
+
+<body onload="javascript:Activate(0);load_macles(630);">
+<h1 class="catalogue">Gestion des index MACLES</h1>
+<form name="f_pop"> <!-- onSubmit="javascript:add_macles('630');"> -->
+
+<div class="tabbed">
+	<div class="tabs">
+        <!--TMPL_LOOP name="BIGLOOP" -->
+            <a href="#" onclick="javascript:Activate('<!-- 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="BIGLOOP" -->
+<!-- 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 -->
+          <h2 class="catalogue"> <!--TMPL_VAR Name="hdr_tab"--></h2>
+	  <a href="#" class="button catalogue" onclick="JavaScript:add_macles('630');">Envoyer</a>
+          <!-- <input type="submit" class="button catalogue" value="Envoyer" /> -->
+          <a class="button catalogue" href="" onclick="javascript:load_macles(630);">Réinitialiser</a> <a class="button catalogue" href="javascript:uncheck_tab(<!-- TMPL_VAR name="number" -->)">d&eacute;selectionner onglet</a>
+          <input type="reset" class="button catalogue" value="d&eacute;selectionner tout" />
+        <!--TMPL_IF Name="Table"-->
+          <table>
+            <tr>
+              <th class="catalogue">Espace\\Temps</th>
+              <!--TMPL_LOOP Name="col_hdr"-->
+                <th class="catalogue" scope="col" id="<!--TMPL_VAR Name="colvalue"-->">  <!--TMPL_VAR Name="collib" ESCAPE=HTML--> <br /><input type="checkbox" name="<!--TMPL_VAR Name="colvalue"-->" OnClick="check_col('<!--TMPL_VAR Name="colvalue"-->')" />
+                </th>
+              <!--/TMPL_LOOP-->
+            </tr>
+            <!--TMPL_LOOP Name="lines"-->
+            <tr>
+                <th class="catalogue" scope="row" id="<!--TMPL_VAR Name="rowvalue"-->">  <!--TMPL_VAR Name="rowlib" ESCAPE=HTML--> <br /><input type="checkbox" name="<!--TMPL_VAR Name="rowvalue"-->" OnClick="check_row('<!--TMPL_VAR Name="rowvalue"-->')" />
+                </th>
+                <!--TMPL_LOOP Name="cells"-->
+                <td headers="<!--TMPL_VAR Name="rowvalue"--> <!--TMPL_VAR Name="colvalue"-->">
+                  <span TITLE="<!--TMPL_LOOP Name="libs" --><!--TMPL_VAR Name="lib" ESCAPE=HTML--> - <!--/TMPL_LOOP-->">
+                  <!--TMPL_VAR Name="celvalue"--> <br /><input type="checkbox" name="<!--TMPL_VAR Name="celvalue"-->" value="<!--TMPL_VAR Name="celvalue"-->" />
+                  </span>
+                </td>
+                <!--/TMPL_LOOP-->
+            </tr>
+            <!--/TMPL_LOOP-->
+          </table>
+        <!--/TMPL_IF-->
+        <!--TMPL_IF Name="Lists" -->
+          <h2 class="catalogue">s&eacute;lection au moyen d'une liste de descripteurs</h2>
+          <!--TMPL_LOOP name="Lists"-->
+            <h3 class="catalogue"><!--TMPL_VAR name="lib"--></h3>
+            <!--TMPL_LOOP name=liblist -->
+              <a href="#<!--TMPL_VAR Name="listvalue"-->" onclick="javascript:check_multiple(<!--TMPL_VAR Name="listvalue"-->)"> <!--TMPL_VAR name="listlib" escape=html--></a><br />
+            <!--/TMPL_LOOP-->
+          <!--/TMPL_LOOP-->
+        <!--/TMPL_IF-->
+        <!--TMPL_UNLESS Name="Table"-->
+        <!-- Listes simples :Onglets 0 et 9-->
+          <!--TMPL_LOOP Name="lines"-->
+            <h3><!--TMPL_VAR Name="rowvalue" ESCAPE=HTML-->&nbsp;-&nbsp;<!--TMPL_VAR Name="rowlib" ESCAPE=HTML-->&nbsp;<input type="checkbox" name="<!--TMPL_VAR Name="rowvalue"-->" OnClick="javascript:check_row('<!--TMPL_VAR Name="rowvalue"-->')" /></h3>
+            <!--TMPL_LOOP Name="cells"-->
+              <p><!--TMPL_VAR Name="celvalue" ESCAPE=HTML-->&nbsp;-&nbsp;<!--TMPL_LOOP Name="libs" -->
+                    <!--TMPL_VAR Name="lib" ESCAPE=HTML--> &nbsp;
+                 <!--/TMPL_LOOP-->
+                 <input type="checkbox" name="<!--TMPL_VAR Name="celvalue"-->" value="<!--TMPL_VAR Name="celvalue"-->" />
+              </p>
+            <!--/TMPL_LOOP-->
+          <!--/TMPL_LOOP-->
+        <!--/TMPL_UNLESS-->
+    </div>
+<!-- /TMPL_LOOP -->
+</div>
+</form>
+<script language="JavaScript" type="text/javascript">
+function Activate(numlayer)
+{
+	for (var i=0; i <= 9 ; i++ ) {
+		var ong = i+"XX";
+		var 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";
+			}
+			}
+		}
+	}
+}
+
+function add_macles(myvalue)
+{
+  var myinputs=document.getElementsByTagName("input");
+  var mycountMACLESgen=0;
+  var tab = new Array();
+  for (var i=0;i<myinputs.length;i++){
+    if (myinputs[i].checked) {
+      tab[mycountMACLESgen]=myinputs[i].value;
+      mycountMACLESgen++;
+    }
+  }
+  if (mycountMACLESgen==1){opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value = tab[0];
+  } else {
+    var mytags=opener.document.getElementsByName("tag");
+    var mycountMACLESinit=0;
+    var indexmin=0
+    //Compter le nombre de MACLES présent
+    for (i=0;i<mytags.length;i++){
+      if (mytags[i].value==myvalue) {
+        if (indexmin==0){
+          indexmin=i
+        }
+        mycountMACLESinit++;
+      }
+    }
+    // Si Nombre de Macles <Nombre de cases cochées, ajouter le nombre de champ manquant
+    if (mycountMACLESinit < mycountMACLESgen){
+    //for (i=0;i< (mycountMACLESgen - mycountMACLESinit);i++){
+    //  PluginAddField(myvalue);
+    //}
+      alert("veuillez d'abord créer le nombre de champs nécessaires ");
+    } else {
+    // Pour chaque valeur cochée, ajouter la valeur dans un noeud MACLES.
+      k=indexmin;
+      for (i=0;i<tab.length;i++){
+          // Se positionner sur le prochain noeud MACLES
+          opener.document.f.field_value[k].value = tab[i];
+          k=k+2;
+      }
+    }
+  }
+  window.close();
+  return false;
+}
+
+function uncheck_tab(number)
+{
+  var myinputs=document.getElementsByTagName("input");
+  var myRegEx=new RegExp(number+"..");
+  for(i=0;i<myinputs.length;i++){
+    if ((myinputs[i].name.search(myRegEx)>=0) && myinputs[i].checked == true) {
+      myinputs[i].checked = false;
+    }
+  }
+}
+function check_col(col)
+{
+  var myref=document.getElementsByName(col);
+  var myinputs=document.getElementsByTagName("input");
+  var myRegEx=new RegExp(col);
+  for(i=0;i<myinputs.length;i++){
+    if (myinputs[i].name.search(myRegEx)>=0) {
+      if (myref[0].checked){
+        myinputs[i].checked = true;
+      } else {
+        myinputs[i].checked = false;
+      }
+    } 
+  }
+  return false;
+}
+
+function check_multiple()
+{
+  for(myi=0;myi<check_multiple.arguments.length;myi++){
+    var myinput=document.getElementsByName(""+check_multiple.arguments[myi]);
+    myinput[0].checked=true;
+  }
+  return false;
+}
+
+function check_row(row)
+{
+  var myref=document.getElementsByName(row);
+  var myinputs=document.getElementsByTagName("input");
+  var myRegEx=new RegExp(row);
+//   alert myRegEx;
+  for(i=0;i<myinputs.length;i++){
+    if (myinputs[i].name.search(myRegEx)>=0){
+      if (myref[0].checked){
+        myinputs[i].checked = true;
+      } else {
+        myinputs[i].checked = false;
+      }
+    } 
+  }
+  return false;
+}
+
+function load_macles(myvalue)
+{
+  document.forms.f_pop.reset;
+  var mystart=<!-- TMPL_VAR name="index" -->;
+  var descent=mystart;
+  var countchecked=0;
+  // Remonter à la source
+  while (opener.document.f.tag[descent].value==myvalue && descent>0){
+    var checkvalue=opener.document.f.field_value[descent].value;
+    var myinput=document.getElementsByName(checkvalue);
+    if (myinput.length>0){
+      myinput[0].checked=true;
+      countchecked++;
+    }
+    descent = descent - 2;
+  }
+  // Continuer jusquà la fin
+  var ascent=mystart+2;
+  while (opener.document.f.tag[ascent].value==myvalue && ascent>0){
+    var checkvalue=opener.document.f.field_value[ascent].value;
+    var myinput=document.getElementsByName(checkvalue);
+    if (myinput.length>0){
+      myinput[0].checked=true;
+      countchecked++;
+    }
+    ascent=ascent+2;
+  }
+  return false;
+}
+</script>
+</body>
+</html>





More information about the Koha-cvs mailing list