From 6917ba2a8fee7bb416e5b277f3776ff46e7d2bfe Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 20 Feb 2004 23:40:13 +0000 Subject: [PATCH] Uniformisation du look des pages de config des modules. --- htdocs/admin/adherent.php | 19 +++--- htdocs/admin/commande.php | 24 +++---- htdocs/admin/compta.php | 121 ++++++++++++++++++++++++++++++++++-- htdocs/admin/const.php | 41 +++++------- htdocs/admin/dict.php | 1 + htdocs/admin/expedition.php | 12 +++- htdocs/admin/facture.php | 4 ++ htdocs/admin/fichinter.php | 9 ++- htdocs/admin/modules.php | 15 ++++- htdocs/admin/propale.php | 48 +++++++------- 10 files changed, 214 insertions(+), 80 deletions(-) diff --git a/htdocs/admin/adherent.php b/htdocs/admin/adherent.php index 02f2870afbc..41c21081277 100644 --- a/htdocs/admin/adherent.php +++ b/htdocs/admin/adherent.php @@ -1,6 +1,7 @@ - * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -92,7 +93,7 @@ print_titre("Gestion des adh /* * Mailman */ -print ''; +print '
'; print "
MailmanSystème de mailing listes"; print ''; @@ -127,7 +128,7 @@ print "

\n"; /* * Gestion banquaire */ -print ''; +print '
'; print "
Gestion BanquaireGestion banquaire des adherents"; print ''; @@ -159,7 +160,7 @@ print "

\n"; * Spip */ $var=!$var; -print ''; +print '
'; print "\n"; $form = new Form($db); $typeconst=array('yesno','texte','chaine'); -if ($user->admin) -{ - if ($HTTP_POST_VARS["action"] == 'update' || $HTTP_POST_VARS["action"] == 'add') - { - - if (isset($HTTP_POST_VARS["consttype"]) && $HTTP_POST_VARS["consttype"] != ''){ - $sql = "REPLACE INTO llx_const SET name='".$_POST["constname"]."', value = '".$HTTP_POST_VARS["constvalue"]."',note='".$HTTP_POST_VARS["constnote"]."', type='".$typeconst[$HTTP_POST_VARS["consttype"]]."'"; - }else{ - $sql = "REPLACE INTO llx_const SET name='".$_POST["constname"]."', value = '".$HTTP_POST_VARS["constvalue"]."',note='".$HTTP_POST_VARS["constnote"]."'"; - } - - - $result = $db->query($sql); - if (!$result) - { - print $db->error(); - } - } - if ($action == 'delete') - { - $sql = "DELETE FROM llx_const WHERE rowid='$rowid'"; - - $result = $db->query($sql); - if (!$result) + +if ($HTTP_POST_VARS["action"] == 'update' || $HTTP_POST_VARS["action"] == 'add') +{ + if (! dolibarr_set_const($db, $HTTP_POST_VARS["constname"],$HTTP_POST_VARS["constvalue"],$typeconst[$HTTP_POST_VARS["consttype"]],0,isset($HTTP_POST_VARS["constnote"])?$HTTP_POST_VARS["constnote"]:'')); { - print $db->error(); + print $db->error(); } - } } + +if ($_GET["action"] == 'delete') +{ + if (! dolibarr_del_const($db, $HTTP_POST_VARS["constname"])); + { + print $db->error(); + } +} + + if ($all==1){ $sql = "SELECT rowid, name, value, type, note FROM llx_const ORDER BY name ASC"; }else{ diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 23184e7752b..87fc2de3b4b 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index 77237446c8f..a7ec8d272ce 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -125,9 +126,13 @@ $dir = DOL_DOCUMENT_ROOT."/includes/modules/expedition/"; * Méthode de livraison */ +print_titre("Configuration du module Expedition/Livraisons"); + +print "
"; + print_titre("Méthode de livraison"); -print '
SpipSystème de publication en ligne"; print ''; @@ -193,7 +194,7 @@ print "

\n"; * Glasnost */ $var=!$var; -print ''; +print '
'; print "
GlasnostSystème de vote en ligne"; print ''; @@ -226,7 +227,7 @@ $var=!$var; /* * Edition des varibales globales non rattache a un theme specifique */ -print ''; +print '
'; print "'; print '
Variables globalesVariables globales non rattachées a un thème"; print '
'; @@ -256,7 +257,7 @@ function form_constantes($tableau){ // Variables globales global $db,$bc; $form = new Form($db); - print ''; + print '
'; print ''; print ''; print ''; @@ -305,8 +306,8 @@ function form_constantes($tableau){ // print ''; // print '\n"; print ''; diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index ae1c05a8213..186caf19b4d 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -52,11 +53,13 @@ if ($action == 'setmod') $dir = "../includes/modules/commande/"; -print_titre("Configuration des commandes"); +print_titre("Configuration du module Commandes"); -print_titre("Module de numérotation"); +print "
"; -print '
DescriptionValeur'; - print '
'; - print 'Delete'; + print '  '; + print ''.img_delete().''; print "
'; +print_titre("Module de numérotation des commandes"); + +print '
'; print ''; print ''; print ''; @@ -80,22 +83,21 @@ if ($handle) print ''; if ($commande_addon_var == "$file") { + print ''; } else { - print " "; + print ''; + print ''; } - - print "'; + + print ''; } } closedir($handle); diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index d480eb6a813..dbf19bfec80 100644 --- a/htdocs/admin/compta.php +++ b/htdocs/admin/compta.php @@ -32,26 +32,137 @@ $compta_mode = defined("COMPTA_MODE")?COMPTA_MODE:"RECETTES-DEPENSES"; if ($action == 'setcomptamode') { $compta_mode = $HTTP_POST_VARS["compta_mode"]; - dolibarr_set_const($db, "COMPTA_MODE",$compta_mode); + if (! dolibarr_set_const($db, "COMPTA_MODE",$compta_mode)) { print $db->error(); } } -print_titre("Module de comptabilité"); +$form = new Form($db); +$typeconst=array('yesno','texte','chaine'); + + +if ($HTTP_POST_VARS["action"] == 'update' || $HTTP_POST_VARS["action"] == 'add') +{ + if (! dolibarr_set_const($db, $HTTP_POST_VARS["constname"],$HTTP_POST_VARS["constvalue"],$typeconst[$HTTP_POST_VARS["consttype"]],0,isset($HTTP_POST_VARS["constnote"])?$HTTP_POST_VARS["constnote"]:'')); + { + print $db->error(); + } +} + + +if ($_GET["action"] == 'delete') +{ + if (! dolibarr_del_const($db, $_GET["constname"])); + { + print $db->error(); + } +} + + + +print_titre("Configuration du module Comptabilité"); + +print "
"; print '
NomInfoActivé 
'.$modCommande->nom."\n"; print $modCommande->info(); - print ''; + print ''; print ''; + print '  activer\n"; - - print 'activer'; - - print '
'; print ''; print ''; -print ''; +print ''; print ''; print ''; -print "\n"; +print "\n"; print ""; print "\n"; print ""; print "\n"; print ""; -print "
Option de tenue de comptabilitéDescription
Option Recettes-DépensesDans ce mode, le CA est calculé sur la base des factures à l'état payé.\nLa validité des chiffres n'est donc assurée que si la tenue de la comptabilité passe rigoureusement par des entrées/sorties sur les comptes via des factures.\nDe plus, dans cette version, Dolibarr utilise la date de passage de la facture à l'état 'Validé' et non la date de passage à l'état 'Payé'.
Option Créances-DettesDans ce mode, le CA est calculé sur la base des factures validées. Qu'elles soient ou non payés, dès lors qu'elles sont dues, elles apparaissent dans le résultat.
"; + +print "
\n"; + +print "
\n"; + +$sql = "SELECT rowid, name, value, type, note FROM llx_const WHERE name like 'COMPTA_%' and name not in ('COMPTA_MODE')"; +$result = $db->query($sql); +if ($result) +{ + $num = $db->num_rows(); + $i = 0; + $var=True; + + if ($num) { + print ''; + print ''; + print ''; + print ''; + print "\n"; + } + + while ($i < $num) + { + $obj = $db->fetch_object( $i); + $var=!$var; + + print ''; + print ''; + print ''; + print ''; + + print "\n"; + + print '\n"; + + print ''; + + $i++; + } + + if ($num) { + print "
Autres option du module comptabilité  Description 
$obj->name'; + if ($obj->type == 'yesno') + { + $form->selectyesnonum('constvalue',$obj->value); + print ''; + $form->select_array('consttype',array('yesno','texte','chaine'),0); + } + elseif ($obj->type == 'texte') + { + print '\n"; + print ''; + $form->select_array('consttype',array('yesno','texte','chaine'),1); + } + else + { + print ''; + print ''; + $form->select_array('consttype',array('yesno','texte','chaine'),2); + } + print ''; + + print ''; + print ''; + print '   '; + print ''.img_delete().''; + print "
\n"; + } + +} + + + + + + + + + + + + + + + llxFooter("Dernière modification $Date$ révision $Revision$"); ?> diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index b28ca57160d..43433b325fd 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -43,37 +43,26 @@ print "
'; +print '
'; print ''; print ''; print ''; @@ -190,14 +195,15 @@ closedir($handle); print '
NomInfoActif
'; +print '
'; /* - * PDF + * */ print_titre("Modèles bordereau de livraison"); -print ''; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 6f95f202e29..a8cff6a521f 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -58,6 +58,10 @@ if ($action == 'settvaoption') $dir = "../includes/modules/facture/"; +print_titre("Configuration du module Factures"); + +print "
"; + print_titre("Module de numérotation des factures"); print '
NomInfoActif
'; diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index c3d1a96d226..8fa22e2a21a 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -49,12 +50,16 @@ if ($action == 'setpdf') $dir = "../includes/modules/fichinter/"; /* - * PDF + * */ +print_titre("Configuration du module Fiches d'interventions"); + +print "
"; + print_titre("Modèles de fiche d'intervention pdf"); -print '
'; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 55cea5f4993..dff8167e2b0 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -1,6 +1,7 @@ - * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -169,7 +170,17 @@ foreach ($orders as $key => $value) if ($objMod->config_page_url) { - print ''; + if (is_array($objMod->config_page_url)) { + print ''; + } else { + print ''; + } } else { diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php index 2f6fce8f504..05a3167a6fe 100644 --- a/htdocs/admin/propale.php +++ b/htdocs/admin/propale.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -105,15 +106,19 @@ if ($action == 'setmod') * */ -print_titre("Module de numérotation"); +print_titre("Configuration du module Propositions Commerciales"); -print '
NomInfoConfigurer'; + $i=0; + foreach ($objMod->config_page_url as $page) { + if ($i++) { print ''.ucfirst($page).' '; } + else { print 'Configurer '; } + } + print 'Configurer
'; -print ''; +print "
"; + +print_titre("Module de numérotation des propositions commerciales"); + +print '
'; +print ''; print ''; print ''; print ''; print ''; -print "\n"; +print "\n"; clearstatcache(); @@ -131,24 +136,23 @@ if ($handle) $modPropale = new $file; - print ''; if ($propale_addon_var == "$file") { + print ''; } else { - print " "; + print ''; + print ''; } - print "'; + print ''; } } closedir($handle); @@ -187,13 +191,13 @@ $dir = "../includes/modules/propale/"; print_titre("Modèles de propale pdf"); -print '
NomInfoActivé 
'.$file."\n"; + print '
'.$file."\n"; print $modPropale->info(); - print ''; + print ''; print ''; + print '  activer\n"; - - print 'activer'; - - print '
'; -print ''; -print ''; +print '
Nom
'; +print ''; +print ''; print ''; -print ''; -print ''; -print "\n"; +print ''; +print ''; +print "\n"; clearstatcache(); @@ -257,12 +261,12 @@ print '
NomInfoActifDéfaut
ActifDéfaut
'; */ print_titre("Formulaire de création"); print '
'; -print ''; -print ''; +print '
'; +print ''; print ''; print ''; -print "\n"; -print '\n"; +print '
NomValeur 
'; +print "
'; print 'Nombre de ligne produits'; print ''; print '
';