diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index 6864deff731..adb9f3a5c58 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -18,7 +18,6 @@ * * $Id$ * $Source$ - * */ /** @@ -63,6 +62,7 @@ if ($_POST["action"] == 'add' && $_POST["cancel"] <> $langs->trans("Cancel")) if ($id) { Header ( "Location: fiche.php?id=".$id); + exit; } else { @@ -87,6 +87,7 @@ if ($_POST["action"] == 'update' && $_POST["cancel"] <> $langs->trans("Cancel")) if ($result > 0) { Header ( "Location: fiche.php?id=".$_POST["id"]); + exit; } else { @@ -170,10 +171,10 @@ else print ''; print ''.$langs->trans("Kilometers").''; - print '  '; + print '   '; print ''; print ''; - print '
'; + print ''; print ''; } @@ -208,7 +209,7 @@ else print dolibarr_print_date($deplacement->date); print ''; print ''.$langs->trans("Kilometers").''.$deplacement->km.''; - print "
"; + print ""; print ''; } diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index be9bee9f238..b99e63e7101 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -19,7 +19,6 @@ * * $Id$ * $Source$ - * */ /** @@ -52,9 +51,11 @@ $offset = $limit * $page ; $pageprev = $page - 1; $pagenext = $page + 1; -$sql = "SELECT s.nom, s.idp, d.km,".$db->pdate("d.dated")." as dd, u.name, u.firstname, d.rowid"; -$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."deplacement as d, ".MAIN_DB_PREFIX."user as u "; -$sql .= " WHERE d.fk_soc = s.idp AND d.fk_user = u.rowid"; +$sql = "SELECT s.nom, s.idp,"; // Ou +$sql.= " d.rowid, ".$db->pdate("d.dated")." as dd, d.km, "; // Comment +$sql.= " u.name, u.firstname"; // Qui +$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."deplacement as d, ".MAIN_DB_PREFIX."user as u "; +$sql.= " WHERE d.fk_soc = s.idp AND d.fk_user = u.rowid"; if ($user->societe_id > 0) { @@ -77,6 +78,7 @@ if ($resql) print_liste_field_titre($langs->trans("Date"),"index.php","d.dated","","&socidp=$socidp",'',$sortfield); print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","&socidp=$socidp",'',$sortfield); print_liste_field_titre($langs->trans("Person"),"index.php","u.name","","&socidp=$socidp",'',$sortfield); + print_liste_field_titre($langs->trans("Distance"),"index.php","d.km","","&socidp=$socidp",'align="right"',$sortfield); print "\n"; $var=true; @@ -91,6 +93,7 @@ if ($resql) print ''.dolibarr_print_date($objp->dd).''; print '' . img_object($langs->trans("ShowCompany"),"company").' '.$soc->nom_url . ''; print ''.img_object($langs->trans("ShowUser"),"user").' '.$objp->firstname.' '.$objp->name.''; + print ''.$objp->km.''; print "\n"; $i++; diff --git a/htdocs/includes/modules/modDeplacement.class.php b/htdocs/includes/modules/modDeplacement.class.php index 16abfb5c2bd..e8b1f7c59d0 100644 --- a/htdocs/includes/modules/modDeplacement.class.php +++ b/htdocs/includes/modules/modDeplacement.class.php @@ -17,7 +17,6 @@ * * $Id$ * $Source$ - * */ /**