diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index d0967fd4417..1091f05b2ab 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -21,14 +21,24 @@ * */ -/** \file htdocs/compta/deplacement/fiche.php +/** + \file htdocs/compta/deplacement/fiche.php \brief Page fiche d'un déplacement */ require("./pre.inc.php"); +$langs->load("trips"); + +$id=isset($_GET["id"])?$_GET["id"]:$_POST["id"]; + + $mesg = ''; + +/* + * Actions + */ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes") { $deplacement = new Deplacement($db); @@ -80,39 +90,40 @@ if ($_POST["action"] == 'update' && $_POST["cancel"] <> $langs->trans("Cancel")) } else { - print "Error"; + print $mesg=$langs->trans("ErrorUnknown"); } } + llxHeader(); -/* - * - * - */ $html = new Form($db); + +/* + * Action create + */ if ($_GET["action"] == 'create') { print "
\n"; print ''; - print '
Nouveau déplacement

'; + print '
'.$langs->trans("NewTrip").'

'; - print ''; - print ''; + print '
Personne'.$user->fullname.'
'; + print ''; print ""; - print ''; print ""; - print ''; - print ''; + print ''; print ''; print '
'.$langs->trans("Person").''.$user->fullname.'
Société visitée'; + print ''.$langs->trans("CompanyVisited").''; print $html->select_societes(); print '
Date du déplacement'; + print ''.$langs->trans("Date").''; print $html->select_date(); print '
Kilomètres
'.$langs->trans("Kilometers").'
  '; print '
'; @@ -120,83 +131,92 @@ if ($_GET["action"] == 'create') } else { - if ($_GET["id"]) + if ($id) { $deplacement = new Deplacement($db); - $result = $deplacement->fetch($_GET["id"]); - - if ( $result ) + $result = $deplacement->fetch($id); + if ($result) { - /* - * Confirmation de la suppression du déplacement - * - */ - - if ($_GET["action"] == 'delete') - { - - 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"); - - print '
'; - } - + if ($mesg) print "$mesg
"; if ($_GET["action"] == 'edit') { - print_fiche_titre('Fiche déplacement', $mesg); - + $h=0; + + $head[$h][0] = DOL_URL_ROOT."/compta/deplacement/fiche.php?id=$deplacement->id"; + $head[$h][1] = $langs->trans("TripCard"); + + dolibarr_fiche_head($head, $hselected, $langs->trans("Ref").' '.$deplacement->id); + print "\n"; print ''; - print ''; + print ''; print ''; $soc = new Societe($db); $soc->fetch($deplacement->socid); - print ''; + print ''; print ""; - print ''; - print ''; - print ''; + print ''; - print ''; + print ''; print '
Personne'.$user->fullname.'
'.$langs->trans("Personn").''.$user->fullname.'
Société visitée'; + print ''.$langs->trans("CompanyVisited").''; print $html->select_societes($soc->id); print '
Date du déplacement'; + print '
'.$langs->trans("Date").''; print $html->select_date($deplacement->date); print '
Kilomètres
'.$langs->trans("Kilometers").'
  '; - print '
  '; + print '
'; - print '
'; + print '
'; + + print ''; } else { - print_fiche_titre('Fiche déplacement', $mesg); + $h=0; + + $head[$h][0] = DOL_URL_ROOT."/compta/deplacement/fiche.php?id=$deplacement->id"; + $head[$h][1] = $langs->trans("TripCard"); + + dolibarr_fiche_head($head, $hselected, $langs->trans("Ref").' '.$deplacement->id); + /* + * Confirmation de la suppression du déplacement + */ + if ($_GET["action"] == 'delete') + { + + $html = new Form($db); + $html->form_confirm("fiche.php?id=".$id,$langs->trans("DeleteTrip"),$langs->trans("ConfirmDeleteTrip"),"confirm_delete"); + + print '
'; + } + $soc = new Societe($db); $soc->fetch($deplacement->socid); - print ''; - print ''; - print ''; - print ''; + print "
Personne'.$user->fullname.'
Société visitée'.$soc->nom_url.'
Date du déplacement'; + print ''; + print ''; + print ''; + print ''; - print ''; - print "
'.$langs->trans("Personn").''.$user->fullname.'
'.$langs->trans("CompanyVisited").''.$soc->nom_url.'
'.$langs->trans("Date").''; print dolibarr_print_date($deplacement->date); print '
Kilomètres'.$deplacement->km.'
"; + print '
'.$langs->trans("Kilometers").''.$deplacement->km.'

"; + + print ''; } } else { - print "Error:".$db->error(); + dolibarr_print_error($db); } } } @@ -206,19 +226,18 @@ else * Barre d'actions * */ -print '
'; print '
'; -if ($_GET["action"] != 'create') +if ($_GET["action"] != 'create' && $_GET["action"] != 'edit') { - print ''.$langs->trans('Edit').''; - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Edit').''; + print ''.$langs->trans('Delete').''; } print '
'; $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index f01d5354194..14aa13bd087 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -51,7 +51,7 @@ $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 = "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"; @@ -72,6 +72,7 @@ if ($resql) $i = 0; print ''; print ""; + print_liste_field_titre($langs->trans("Ref"),"index.php","d.rowid","","&socidp=$socidp",'',$sortfield); 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); @@ -85,11 +86,10 @@ if ($resql) $soc->fetch($objp->idp); $var=!$var; print ""; - print ''; - print ''; - - print ''; - + print ''; + print ''; + print ''; + print ''; print "\n"; $i++; diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang index b872d5a097d..1a5eca20bd0 100644 --- a/htdocs/langs/en_US/trips.lang +++ b/htdocs/langs/en_US/trips.lang @@ -1,5 +1,11 @@ # Dolibarr language file - en_US - trips Trip=Trip Trips=Trips +TripCard=Trip card AddTrip=Add trip -ListOfTrips=List of trips \ No newline at end of file +ListOfTrips=List of trips +NewTrip=New trip +CompanyVisited=Company/fundation visited +Kilometers=Kilometers +DeleteTrip=Delete trip +ConfirmDeleteTrip=Are you sure you want to delete this trip ? diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang index 67db6c241bf..92ca7ad8a23 100644 --- a/htdocs/langs/fr_FR/trips.lang +++ b/htdocs/langs/fr_FR/trips.lang @@ -1,5 +1,11 @@ # Dolibarr language file - fr_FR - trips Trip=Déplacement Trips=Déplacements +TripCard=Fiche déplacement AddTrip=Ajouter déplacement -ListOfTrips=Liste des déplacements \ No newline at end of file +ListOfTrips=Liste des déplacements +NewTrip=Nouveau déplacement +CompanyVisited=Société/Institution visitée +Kilometers=Kilomètres +DeleteTrip=Supprimer déplacement +ConfirmDeleteTrip=Êtes vous sur de vouloir supprimer ce déplacement ? \ No newline at end of file
'.dolibarr_print_date($objp->dd).'' . $soc->nom_url . ''.$objp->firstname.' '.$objp->name.''.img_object($langs->trans("ShowTrip"),"trip").' '.$objp->rowid.''.dolibarr_print_date($objp->dd).'' . img_object($langs->trans("ShowCompany"),"company").' '.$soc->nom_url . ''.img_object($langs->trans("ShowUser"),"user").' '.$objp->firstname.' '.$objp->name.'