diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index a1b8c2879ac..7fc2467de08 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -31,7 +31,6 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes") Header("Location: index.php"); } - if ($_POST["action"] == 'add' && $_POST["cancel"] <> $langs->trans("Cancel")) { $deplacement = new Deplacement($db); diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index dc272dc731d..b8518be9fe9 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -1,6 +1,7 @@ * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004 Eric Seigne * * 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 @@ -76,11 +77,13 @@ if ( $db->query($sql) ) $var=True; while ($i < $num) { - $objp = $db->fetch_object(); + $objp = $db->fetch_object($i); + $soc = new Societe($db); + $soc->fetch($objp->idp); $var=!$var; print ""; print ''.dolibarr_print_date($objp->dd).''; - print ''.$objp->nom."\n"; + print '' . $soc->nom_url . ''; print ''.$objp->firstname.' '.$objp->name.''; diff --git a/htdocs/pre.inc.php b/htdocs/pre.inc.php index da8d17790f8..3ba5f9f2171 100644 --- a/htdocs/pre.inc.php +++ b/htdocs/pre.inc.php @@ -45,7 +45,8 @@ function llxHeader($head = "") { { $menu->add_submenu(DOL_URL_ROOT."/soc.php?action=create", $langs->trans("MenuNewCompany")); } - $menu->add_submenu(DOL_URL_ROOT."/societe/groupe/index.php", $langs->trans("MenuSocGroup")); + if(is_dir("societe/groupe")) + $menu->add_submenu(DOL_URL_ROOT."/societe/groupe/index.php", $langs->trans("MenuSocGroup")); $menu->add_submenu(DOL_URL_ROOT."/contact/index.php",$langs->trans("Contacts")); }