From e8235adc4907533d0b00f047cd7adcd86759363e Mon Sep 17 00:00:00 2001 From: sparkyx Date: Sat, 7 Oct 2006 10:18:06 +0000 Subject: [PATCH] Merge with Dev-Dany --- doc/FAQ-fr.sgml | 3 +- doc/developper/Doxyfile | 1 + doc/developper/account_repository.html | 2 +- doc/developper/dossier1.dia | 502 ++++++--- doc/developper/dossier1.html | 183 +++- doc/manuel-fr.sgml | 5 + html/admin_repo.php | 21 +- html/commercial.php | 1 + html/fiche.php | 203 +++- html/fiche_csv.php | 2 +- html/fiche_new.php | 59 +- html/fiche_search.php | 2 +- html/index.php | 2 +- html/jrn_op_detail.php | 95 -- html/jrn_search.php | 13 +- html/js/calc.js | 9 +- html/js/cancel_op.js | 34 + html/js/jrn_concerned.js | 81 ++ html/js/modify_op.js | 36 + html/js/search_card.js | 110 ++ html/js/search_poste.js | 63 ++ html/js/update_pcmn.js | 36 + html/logout.php | 4 +- html/modify_op.php | 4 +- html/test.php | 7 +- include/ac_common.php | 13 +- include/class_contact.php | 5 +- include/class_fiche.php | 218 +--- include/class_fiche_def.php | 493 +++++++-- include/class_fiche_def_ref.php | 143 +++ include/class_widget.php | 33 +- include/constant.php | 233 +---- include/fiche_inc.php | 1327 +----------------------- include/import_inc.php | 64 +- include/impress_fiche.php | 8 +- include/jrn.php | 30 +- include/stock_inc.php | 2 +- include/user_common.php | 122 ++- include/user_form_ach.php | 81 +- include/user_form_fin.php | 2 + include/user_form_ven.php | 5 +- include/user_menu.php | 11 +- include/user_update.php | 2 +- sql/upgrade.sql | 2 + 44 files changed, 1980 insertions(+), 2292 deletions(-) delete mode 100644 html/jrn_op_detail.php create mode 100644 html/js/cancel_op.js create mode 100644 html/js/jrn_concerned.js create mode 100644 html/js/modify_op.js create mode 100644 html/js/search_card.js create mode 100644 html/js/search_poste.js create mode 100644 html/js/update_pcmn.js create mode 100644 include/class_fiche_def_ref.php diff --git a/doc/FAQ-fr.sgml b/doc/FAQ-fr.sgml index c999b8ca2..062bcefbf 100644 --- a/doc/FAQ-fr.sgml +++ b/doc/FAQ-fr.sgml @@ -143,7 +143,8 @@ Si cela ne marche pas ce n'est pas bon Comment faire de la doc

Sous Mandriva (anciennement mandrake), ajouter les linuxdocs-tools avec la commande -urpmi linuxdoc-tools, pour les autres, je ne sais pas :( +urpmi linuxdoc-tools, pour Ubuntu apt-get install linuxdoc-tools, tetex, tetex-extra +les autres, je ne sais pas :(

Une fois, les linuxdoc tools installés il peut être nécessaire diff --git a/doc/developper/Doxyfile b/doc/developper/Doxyfile index 63caa5ea9..1871a7a24 100644 --- a/doc/developper/Doxyfile +++ b/doc/developper/Doxyfile @@ -121,6 +121,7 @@ FILE_PATTERNS = *.c \ *.PHP3 \ *.M \ *.MM \ + *.js \ *.inc.php RECURSIVE = YES EXCLUDE = diff --git a/doc/developper/account_repository.html b/doc/developper/account_repository.html index f92243626..baf135f99 100644 --- a/doc/developper/account_repository.html +++ b/doc/developper/account_repository.html @@ -111,7 +111,7 @@ -



Dumped on 2006-09-05

+



Dumped on 2006-09-26

Index of database - account_repository