diff --git a/htdocs/compta/deplacement/deplacement.class.php b/htdocs/compta/deplacement/deplacement.class.php index 0e132979360..392d56b7ae4 100644 --- a/htdocs/compta/deplacement/deplacement.class.php +++ b/htdocs/compta/deplacement/deplacement.class.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 @@ -85,7 +86,7 @@ class Deplacement */ Function fetch ($id) { - $sql = "SELECT rowid, fk_user, km, fk_soc,".$this->db->pdate("dated")." as dated"; + $sql = "SELECT fk_user, km, fk_soc,".$this->db->pdate("dated")." as dated"; $sql .= " FROM ".MAIN_DB_PREFIX."deplacement WHERE rowid = $id"; $result = $this->db->query($sql) ; @@ -94,13 +95,18 @@ class Deplacement { $result = $this->db->fetch_array(); - $this->id = $result["rowid"]; + $this->id = $id; + $this->date = $result["dated"]; $this->userid = $result["fk_user"]; $this->socid = $result["fk_soc"]; $this->km = $result["km"]; return 1; } + else { + print $this->db->error(); + print "
".$sql; + } } /* * diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index 2fbd1c1a077..9dfa6fbebd2 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.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 @@ -23,31 +24,31 @@ require("./pre.inc.php"); $mesg = ''; -if ($HTTP_POST_VARS["action"] == 'confirm_delete' && $HTTP_POST_VARS["confirm"] == "yes") +if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes") { $deplacement = new Deplacement($db); - $deplacement->delete($id); + $deplacement->delete($_GET["id"]); Header("Location: index.php"); } -if ($HTTP_POST_VARS["action"] == 'add' && $HTTP_POST_VARS["cancel"] <> 'Annuler') +if ($_POST["action"] == 'add' && $_POST["cancel"] <> 'Annuler') { $deplacement = new Deplacement($db); $deplacement->date = mktime(12, 1 , 1, - $HTTP_POST_VARS["remonth"], - $HTTP_POST_VARS["reday"], - $HTTP_POST_VARS["reyear"]); + $_POST["remonth"], + $_POST["reday"], + $_POST["reyear"]); - $deplacement->km = $HTTP_POST_VARS["km"]; - $deplacement->socid = $HTTP_POST_VARS["socid"]; - $deplacement->userid = $user->id; //$HTTP_POST_VARS["km"]; + $deplacement->km = $_POST["km"]; + $deplacement->socid = $_POST["soc_id"]; + $deplacement->userid = $user->id; //$_POST["km"]; $id = $deplacement->create($user); - if ($id > 0) + if ($_POST["id"]) { - Header ( "Location: fiche.php?id=$id"); + Header ( "Location: fiche.php?id=".$_POST["id"]); } else { @@ -55,23 +56,23 @@ if ($HTTP_POST_VARS["action"] == 'add' && $HTTP_POST_VARS["cancel"] <> 'Annuler' } } -if ($HTTP_POST_VARS["action"] == 'update' && $HTTP_POST_VARS["cancel"] <> 'Annuler') +if ($_POST["action"] == 'update' && $_POST["cancel"] <> 'Annuler') { $deplacement = new Deplacement($db); - $result = $deplacement->fetch($id); + $result = $deplacement->fetch($_POST["id"]); $deplacement->date = mktime(12, 1 , 1, - $HTTP_POST_VARS["remonth"], - $HTTP_POST_VARS["reday"], - $HTTP_POST_VARS["reyear"]); + $_POST["remonth"], + $_POST["reday"], + $_POST["reyear"]); - $deplacement->km = $HTTP_POST_VARS["km"]; + $deplacement->km = $_POST["km"]; $result = $deplacement->update($user); if ($result > 0) { - Header ( "Location: fiche.php?id=$id"); + Header ( "Location: fiche.php?id=".$_POST["id"]); } else { @@ -87,21 +88,27 @@ llxHeader(); * */ $html = new Form($db); -if ($action == 'create') +if ($_GET["action"] == 'create') { print "
\n"; print ''; - print ''; + print '
Nouveau déplacement

'; - print ''; + print '
'; print ''; + + print ""; + print ''; + print ""; print ''; - print ''; + print ''; print ''; print '
Personne'.$user->fullname.'
Société visitée'; + print $html->select_societes(); + print '
Date du déplacement'; print $html->select_date(); print '
Kilomètres
Kilomètres
  '; print '
'; @@ -109,57 +116,54 @@ if ($action == 'create') } else { - if ($id) + if ($_GET["id"]) { $deplacement = new Deplacement($db); - $result = $deplacement->fetch($id); + $result = $deplacement->fetch($_GET["id"]); if ( $result ) { /* - * Confirmation de la suppression de l'adhérent + * Confirmation de la suppression du déplacement * */ - if ($action == 'delete') + if ($_GET["action"] == 'delete') { - print ''; - print ''; - print ''; - - print ''; - print '\n"; - print ''; - print '
Supprimer ce déplacement
Etes-vous sur de vouloir supprimer ce déplacement ?'; - $htmls = new Form($db); - - $htmls->selectyesno("confirm","no"); - - print "
'; - print "
\n"; + print_fiche_titre("Suppression déplacement ",$message); + print '
'; + + $html = new Form($db); + $html->form_confirm("fiche.php?id=".$_GET["id"],"Supprimer ce déplacement","Etes-vous sûr de vouloir supprimer ce déplacement ?","confirm_delete"); } - if ($action == 'edit') + if ($_GET["action"] == 'edit') { - print_fiche_titre('Fiche déplacement : '.$product->ref, $mesg); + print_fiche_titre('Fiche déplacement', $mesg); - print "
\n"; + print "\n"; print ''; + print ''; - print ''; + print '
'; $soc = new Societe($db); $soc->fetch($deplacement->socid); + print ''; - print ''; + + print ""; + print ''; + print ''; - print ''; + print ''; print ''; @@ -168,18 +172,17 @@ else } else { - print_fiche_titre('Fiche déplacement : '.$product->ref, $mesg); + print_fiche_titre('Fiche déplacement', $mesg); - print '
Personne'.$user->fullname.'
Société visitée'.$soc->nom_url.'
Société visitée'; + print $html->select_societes($soc->id); + print '
Date du déplacement'; print $html->select_date($deplacement->date); - print strftime("%A %d %B %Y",$deplacement->date); print '
Kilomètres '.$deplacement->km.'
Kilomètres
  '; print '
'; - $soc = new Societe($db); $soc->fetch($deplacement->socid); + + print '
'; print ''; print ''; print ''; - print ''; print "
Personne'.$user->fullname.'
Société visitée'.$soc->nom_url.'
Date du déplacement'; - print strftime("%A %d %B %Y",$deplacement->date); + print dolibarr_print_date($deplacement->date); print '
Kilomètres'.$deplacement->km.'
"; } @@ -187,32 +190,27 @@ else } else { - print "Error"; + print "Error:".$db->error(); } } } -/* ************************************************************************** */ -/* */ -/* Barre d'action */ -/* */ -/* ************************************************************************** */ -print '
'; -print ''; -if ($action == 'create') +/* + * Barre d'actions + * + */ +print '
'; + +print '
'; + +if ($_GET["action"] != 'create') { - print '
'; + print 'Editer'; + print 'Supprimer'; } -else -{ - print ''; -} -print ''; -print ''; -print ''; -print '
--[Editer]--[Supprimer]

'; +print ''; $db->close(); diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index 17647c0d37c..eacb3edb74a 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.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 @@ -36,6 +37,9 @@ llxHeader(); * Liste * */ +$sortorder=$_GET["sortorder"]; +$sortfield=$_GET["sortfield"]; +$page=$_GET["page"]; if ($sortorder == "") { @@ -70,30 +74,30 @@ if ( $db->query($sql) ) print_barre_liste("Liste des déplacements", $page, $PHP_SELF,"&socidp=$socidp",$sortfield,$sortorder,'',$num); $i = 0; - print ''; - print ""; + print '
'; + print ""; print_liste_field_titre_new ("Date",$PHP_SELF,"d.dated","","&socidp=$socidp",'',$sortfield); print_liste_field_titre_new ("Société",$PHP_SELF,"s.nom","","&socidp=$socidp",'',$sortfield); - print ''; + print ''; + print "\n"; - print "\n"; $var=True; while ($i < $num) { $objp = $db->fetch_object( $i); $var=!$var; - print ""; - print ''; + print ""; + print ''; print '\n"; - print ''; + print ''; - print "\n"; + print "\n"; $i++; } - print "
UtilisateurUtilisateur
'.strftime("%d %B %Y",$objp->dd).'
'.dolibarr_print_date($objp->dd).''.$objp->nom."'.$objp->firstname.' '.$objp->name.''.$objp->firstname.' '.$objp->name.'
"; + print ""; $db->free(); } else diff --git a/htdocs/compta/deplacement/pre.inc.php b/htdocs/compta/deplacement/pre.inc.php index effe11bacbe..6db10d49f05 100644 --- a/htdocs/compta/deplacement/pre.inc.php +++ b/htdocs/compta/deplacement/pre.inc.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 @@ -39,6 +40,7 @@ function llxHeader($head = "") { $menu = new Menu(); $menu->add("index.php","Déplacements"); + $menu->add_submenu("fiche.php?action=create","Nouveau déplacement"); left_menu($menu->liste); }