diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index c7b4ca8e556..93035ad912a 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -177,7 +177,7 @@ class Deplacement extends CommonObject $sql .= " SET km = ".$this->km; // This is a distance or amount $sql .= " , dated = '".$this->db->idate($this->date)."'"; $sql .= " , type = '".$this->type."'"; - $sql .= " , fk_statut = '".$this->fk_statut."'"; + $sql .= " , fk_statut = '".$this->statut."'"; $sql .= " , fk_user = ".$this->fk_user; $sql .= " , fk_user_modif = ".$user->id; $sql .= " , fk_soc = ".($this->socid > 0?$this->socid:'null'); @@ -226,7 +226,7 @@ class Deplacement extends CommonObject $this->socid = $obj->fk_soc; $this->km = $obj->km; $this->type = $obj->type; - $this->fk_statut = $obj->fk_statut; + $this->statut = $obj->fk_statut; $this->note_private = $obj->note; $this->note_public = $obj->note_public; $this->fk_project = $obj->fk_projet; @@ -249,7 +249,7 @@ class Deplacement extends CommonObject function delete($id) { $this->db->begin(); - + $sql = "DELETE FROM ".MAIN_DB_PREFIX."deplacement WHERE rowid = ".$id; dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG); @@ -300,23 +300,24 @@ class Deplacement extends CommonObject } if ($mode == 2) { - //if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0').' '.$langs->trans($this->statuts_short[$statut]); - if ($statut==0 || $statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]); + if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0').' '.$langs->trans($this->statuts_short[$statut]); + if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]); } if ($mode == 3) { - //if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0'); - if ($statut==0 || $statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4'); + if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0'); + if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4'); } if ($mode == 4) { //if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]); - if ($statut==0 || $statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]); + if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]); + if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]); } if ($mode == 5) { - //if ($statut==0) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut0'); - if ($statut==0 || $statut==1) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4'); + if ($statut==0) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut0'); + if ($statut==1) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4'); } } diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index eac993909f1..0c12272b21c 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -1,21 +1,21 @@ - * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2005-2011 Regis Houssin - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ + * Copyright (C) 2004-2012 Laurent Destailleur +* Copyright (C) 2005-2011 Regis Houssin +* +* 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 +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +*/ /** * \file htdocs/compta/deplacement/fiche.php @@ -28,8 +28,8 @@ require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php" require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); if ($conf->projet->enabled) { - require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); - require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); + require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php"); + require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php"); } $langs->load("trips"); @@ -50,176 +50,167 @@ $object = new Deplacement($db); /* * Actions - */ -if ($action == 'block' && $user->rights->deplacement->valider) +*/ +if ($action == 'validate' && $user->rights->deplacement->creer) { $object->fetch($id); - if ($object->fk_statut == '2') // Already blocked... - { - $mesg='
'.$langs->trans("Error").'
'; - $action=''; - $error++; - } - else - { - $result = $object->fetch($id); - - $object->fk_statut = '2'; - - $result = $object->update($user); - - if ($result > 0) - { - Header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); - exit; - } - else - { - $mesg=$object->error; - } - } + if ($object->statut == 0) + { + $result = $object->setStatut(1); + if ($result > 0) + { + Header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); + exit; + } + else + { + $mesg=$object->error; + } + } } +/* if ($action == 'unblock' && $user->rights->deplacement->unvalidate) { $object->fetch($id); if ($object->fk_statut == '1') // Not blocked... - { - $mesg='
'.$langs->trans("Error").'
'; - $action=''; - $error++; - } - else - { - $result = $object->fetch($id); - - $object->fk_statut = '1'; - - $result = $object->update($user); - - if ($result > 0) - { - Header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); - exit; - } - else - { - $mesg=$object->error; - } - } -} + { + $mesg='
'.$langs->trans("Error").'
'; + $action=''; + $error++; + } + else + { + $result = $object->fetch($id); + + $object->fk_statut = '1'; + + $result = $object->update($user); + + if ($result > 0) + { + Header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); + exit; + } + else + { + $mesg=$object->error; + } + } +}*/ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer) { - $result=$object->delete($id); - if ($result >= 0) - { - Header("Location: index.php"); - exit; - } - else - { - $mesg=$object->error; - } + $result=$object->delete($id); + if ($result >= 0) + { + Header("Location: index.php"); + exit; + } + else + { + $mesg=$object->error; + } } if ($action == 'add' && $user->rights->deplacement->creer) { - if (! $_POST["cancel"]) - { - $error=0; + if (! $_POST["cancel"]) + { + $error=0; - $object->date = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); - $object->km = $_POST["km"]; - $object->type = $_POST["type"]; - $object->socid = $_POST["socid"]; - $object->fk_user = $_POST["fk_user"]; - $object->note_private = $_POST["note_private"]; - $object->note_public = $_POST["note_public"]; + $object->date = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); + $object->km = $_POST["km"]; + $object->type = $_POST["type"]; + $object->socid = $_POST["socid"]; + $object->fk_user = $_POST["fk_user"]; + $object->note_private = $_POST["note_private"]; + $object->note_public = $_POST["note_public"]; + $object->statut = 0; if (! $object->date) { $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")); $error++; } - if ($object->type == '-1') // Otherwise it is TF_LUNCH,... - { - $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'
'; - $error++; - } - if (! ($object->fk_user > 0)) - { - $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Person")).'
'; - $error++; - } + if ($object->type == '-1') // Otherwise it is TF_LUNCH,... + { + $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'
'; + $error++; + } + if (! ($object->fk_user > 0)) + { + $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Person")).'
'; + $error++; + } - if (! $error) - { - $id = $object->create($user); + if (! $error) + { + $id = $object->create($user); - if ($id > 0) - { - Header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); - exit; - } - else - { - $mesg=$object->error; - $action='create'; - } - } - else - { - $action='create'; - } - } - else - { - Header("Location: index.php"); - exit; - } + if ($id > 0) + { + Header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); + exit; + } + else + { + $mesg=$object->error; + $action='create'; + } + } + else + { + $action='create'; + } + } + else + { + Header("Location: index.php"); + exit; + } } // Update record if ($action == 'update' && $user->rights->deplacement->creer) { - if (empty($_POST["cancel"])) - { - $result = $object->fetch($id); + if (empty($_POST["cancel"])) + { + $result = $object->fetch($id); - $object->date = dol_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); - $object->km = $_POST["km"]; - $object->type = $_POST["type"]; - $object->fk_user = $_POST["fk_user"]; - $object->socid = $_POST["socid"]; - $object->note_private = $_POST["note_private"]; - $object->note_public = $_POST["note_public"]; + $object->date = dol_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); + $object->km = $_POST["km"]; + $object->type = $_POST["type"]; + $object->fk_user = $_POST["fk_user"]; + $object->socid = $_POST["socid"]; + $object->note_private = $_POST["note_private"]; + $object->note_public = $_POST["note_public"]; - $result = $object->update($user); + $result = $object->update($user); - if ($result > 0) - { - Header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); - exit; - } - else - { - $mesg=$object->error; - } - } - else - { - Header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); - exit; - } + if ($result > 0) + { + Header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); + exit; + } + else + { + $mesg=$object->error; + } + } + else + { + Header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); + exit; + } } // Set into a project if ($action == 'classin') { - $object->fetch($id); - $result=$object->setProject($_POST['projectid']); - if ($result < 0) dol_print_error($db, $object->error); + $object->fetch($id); + $result=$object->setProject($_POST['projectid']); + if ($result < 0) dol_print_error($db, $object->error); } // Set fields @@ -252,7 +243,7 @@ if ($action == 'setnote') /* * View - */ +*/ llxHeader(); @@ -260,322 +251,313 @@ $form = new Form($db); /* * Action create - */ +*/ if ($action == 'create') { - print_fiche_titre($langs->trans("NewTrip")); + print_fiche_titre($langs->trans("NewTrip")); - dol_htmloutput_errors($mesg); + dol_htmloutput_errors($mesg); - $datec = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); + $datec = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); - print '
' . "\n"; - print ''; - print ''; + print '' . "\n"; + print ''; + print ''; - print ''; + print '
'; - print ""; - print ''; + print ""; + print ''; - print ""; - print ''; + print ""; + print ''; - print ""; - print ''; + print ""; + print ''; - // Km + // Km print ''; // Company - print ""; - print ''; + print ""; + print ''; - // Public note - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; - // Private note - if (! $user->societe_id) - { - print ''; - print ''; - print ''; + print ''; + print ''; - } + print ''; + } print '
'.$langs->trans("Type").''; - print $form->select_type_fees(GETPOST("type"),'type',1); - print '
'.$langs->trans("Type").''; + print $form->select_type_fees(GETPOST("type"),'type',1); + print '
'.$langs->trans("Person").''; - print $form->select_users(GETPOST("fk_user"),'fk_user',1); - print '
'.$langs->trans("Person").''; + print $form->select_users(GETPOST("fk_user"),'fk_user',1); + print '
'.$langs->trans("Date").''; - print $form->select_date($datec?$datec:-1,'','','','','add',1,1); - print '
'.$langs->trans("Date").''; + print $form->select_date($datec?$datec:-1,'','','','','add',1,1); + print '
'.$langs->trans("FeesKilometersOrAmout").'
'.$langs->trans("CompanyVisited").''; - print $form->select_societes(GETPOST("socid"),'socid','',1); - print '
'.$langs->trans("CompanyVisited").''; + print $form->select_societes(GETPOST("socid"),'socid','',1); + print '
'.$langs->trans('NotePublic').''; - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); - $doleditor=new DolEditor('note_public',GETPOST('note_public'),600,200,'dolibarr_notes','In',false,true,true,ROWS_8,100); + // Public note + print '
'.$langs->trans('NotePublic').''; + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + $doleditor=new DolEditor('note_public',GETPOST('note_public'),600,200,'dolibarr_notes','In',false,true,true,ROWS_8,100); print $doleditor->Create(1); - print '
'.$langs->trans('NotePrivate').''; - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); - $doleditor=new DolEditor('note_private',GETPOST('note_private'),600,200,'dolibarr_notes','In',false,true,true,ROWS_8,100); + // Private note + if (! $user->societe_id) + { + print '
'.$langs->trans('NotePrivate').''; + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + $doleditor=new DolEditor('note_private',GETPOST('note_private'),600,200,'dolibarr_notes','In',false,true,true,ROWS_8,100); print $doleditor->Create(1); - print '
'; print '
    '; - print ''; + print ''; } else if ($id) { - $result = $object->fetch($id); - if ($result > 0) - { - dol_htmloutput_mesg($mesg); + $result = $object->fetch($id); + if ($result > 0) + { + dol_htmloutput_mesg($mesg); - $head = trip_prepare_head($object); + $head = trip_prepare_head($object); - dol_fiche_head($head, 'card', $langs->trans("TripCard"), 0, 'trip'); + dol_fiche_head($head, 'card', $langs->trans("TripCard"), 0, 'trip'); - if ($action == 'edit' && $user->rights->deplacement->creer) - { - $soc = new Societe($db); - if ($object->socid) - { - $soc->fetch($object->socid); - } + if ($action == 'edit' && $user->rights->deplacement->creer) + { + $soc = new Societe($db); + if ($object->socid) + { + $soc->fetch($object->socid); + } - print '
' . "\n"; - print ''; - print ''; - print ''; + print '' . "\n"; + print ''; + print ''; + print ''; - print ''; + print '
'; - // Ref - print ""; - print ''; + // Ref + print ""; + print ''; - // Type - print ""; - print ''; + // Type + print ""; + print ''; - // Who - print ""; - print ''; + // Who + print ""; + print ''; - // Date - print ''; + // Date + print ''; - // Km - print ''; + // Km + print ''; - // Where - print ""; - print ''; + // Where + print ""; + print ''; - // Public note - print ''; - print '"; + // Public note + print ''; + print '"; - // Private note - if (! $user->societe_id) - { - print ''; - print '"; - } + // Private note + if (! $user->societe_id) + { + print ''; + print '"; + } - print '
'.$langs->trans("Ref").''; - print $object->ref; - print '
'.$langs->trans("Ref").''; + print $object->ref; + print '
'.$langs->trans("Type").''; - print $form->select_type_fees($_POST["type"]?$_POST["type"]:$object->type,'type',0); - print '
'.$langs->trans("Type").''; + print $form->select_type_fees($_POST["type"]?$_POST["type"]:$object->type,'type',0); + print '
'.$langs->trans("Person").''; - print $form->select_users($_POST["fk_user"]?$_POST["fk_user"]:$object->fk_user,'fk_user',0); - print '
'.$langs->trans("Person").''; + print $form->select_users($_POST["fk_user"]?$_POST["fk_user"]:$object->fk_user,'fk_user',0); + print '
'.$langs->trans("Date").''; - print $form->select_date($object->date,'','','','','update'); - print '
'.$langs->trans("Date").''; + print $form->select_date($object->date,'','','','','update'); + print '
'.$langs->trans("FeesKilometersOrAmout").''; - print ''; - print '
'.$langs->trans("FeesKilometersOrAmout").''; + print ''; + print '
'.$langs->trans("CompanyVisited").''; - print $form->select_societes($soc->id,'socid','',1); - print '
'.$langs->trans("CompanyVisited").''; + print $form->select_societes($soc->id,'socid','',1); + print '
'.$langs->trans("NotePublic").''; - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); - $doleditor=new DolEditor('note_public',$object->note_public,600,200,'dolibarr_notes','In',false,true,true,ROWS_8,'100'); - print $doleditor->Create(1); - print "
'.$langs->trans("NotePublic").''; + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + $doleditor=new DolEditor('note_public',$object->note_public,600,200,'dolibarr_notes','In',false,true,true,ROWS_8,'100'); + print $doleditor->Create(1); + print "
'.$langs->trans("NotePrivate").''; - require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); - $doleditor=new DolEditor('note_private',$object->note_private,600,200,'dolibarr_notes','In',false,true,true,ROWS_8,'100'); - print $doleditor->Create(1); - print "
'.$langs->trans("NotePrivate").''; + require_once(DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php"); + $doleditor=new DolEditor('note_private',$object->note_private,600,200,'dolibarr_notes','In',false,true,true,ROWS_8,'100'); + print $doleditor->Create(1); + print "
'; + print ''; - print '
  '; - print ''; - print '
'; + print '
  '; + print ''; + print '
'; - print '
'; + print ''; - print ''; - } - else - { - /* - * Confirmation de la suppression du deplacement - */ - if ($action == 'delete') - { - $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("DeleteTrip"),$langs->trans("ConfirmDeleteTrip"),"confirm_delete"); - if ($ret == 'html') print '
'; - } + print ''; + } + else + { + /* + * Confirmation de la suppression du deplacement + */ + if ($action == 'delete') + { + $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("DeleteTrip"),$langs->trans("ConfirmDeleteTrip"),"confirm_delete"); + if ($ret == 'html') print '
'; + } - $soc = new Societe($db); - if ($object->socid) $soc->fetch($object->socid); + $soc = new Societe($db); + if ($object->socid) $soc->fetch($object->socid); - print ''; + print '
'; - // Ref - print ''; + // Ref + print ''; - // Type - print ''; + print ''; - // Who - print ''; + // Who + print ''; - // Date - print ''; + // Date + print ''; - // Km/Price - print '"; + // Km/Price + print '"; - // Where - print ''; - print ''; + // Where + print ''; + print ''; - // Project - if ($conf->projet->enabled) - { - $langs->load('projects'); - print ''; - print ''; + print ''; - print ''; - } + print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'id','',1,'rowid','ref',''); - print '
'.$langs->trans("Ref").''; + print $form->showrefnav($object,'id','',1,'rowid','ref',''); + print '
'; + // Type + print '
'; print $form->editfieldkey("Type",'type',$langs->trans($object->type),$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees'); - print ''; + print ''; print $form->editfieldval("Type",'type',$langs->trans($object->type),$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees'); - print '
'.$langs->trans("Person").''; - $userfee=new User($db); - $userfee->fetch($object->fk_user); - print $userfee->getNomUrl(1); - print '
'.$langs->trans("Person").''; + $userfee=new User($db); + $userfee->fetch($object->fk_user); + print $userfee->getNomUrl(1); + print '
'; - print $form->editfieldkey("Date",'dated',$object->date,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'datepicker'); - print ''; - print $form->editfieldval("Date",'dated',$object->date,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'datepicker'); - print '
'; + print $form->editfieldkey("Date",'dated',$object->date,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'datepicker'); + print ''; + print $form->editfieldval("Date",'dated',$object->date,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'datepicker'); + print '
'; - print $form->editfieldkey("FeesKilometersOrAmout",'km',$object->km,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6'); - print ''; - print $form->editfieldval("FeesKilometersOrAmout",'km',$object->km,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6'); - print "
'; + print $form->editfieldkey("FeesKilometersOrAmout",'km',$object->km,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6'); + print ''; + print $form->editfieldval("FeesKilometersOrAmout",'km',$object->km,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6'); + print "
'.$langs->trans("CompanyVisited").''; - if ($soc->id) print $soc->getNomUrl(1); - print '
'.$langs->trans("CompanyVisited").''; + if ($soc->id) print $soc->getNomUrl(1); + print '
'; + // Project + if ($conf->projet->enabled) + { + $langs->load('projects'); + print '
'; - print ''; - if ($action != 'classify' && $user->rights->deplacement->creer) - { - print ''; - } - print '
'; - print $langs->trans('Project'); - print 'id.'">'; - print img_edit($langs->trans('SetProject'),1); - print '
'; - print '		'; - if ($action == 'classify') - { - $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'projectid'); - } - else - { - $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'none'); - } - print '
'; + if ($action != 'classify' && $user->rights->deplacement->creer) + { + print ''; + } + print '
'; + print $langs->trans('Project'); + print 'id.'">'; + print img_edit($langs->trans('SetProject'),1); + print '
'; + print ''; + if ($action == 'classify') + { + $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'projectid'); + } + else + { + $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'none'); + } + print ''; + print ''; + } - // Statut - print ''.$langs->trans("Status").''.$object->getLibStatut(4).''; + // Statut + print ''.$langs->trans("Status").''.$object->getLibStatut(4).''; - // Public note - print ''; - print $form->editfieldkey("NotePublic",'note_public',$object->note_public,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'ckeditor:dolibarr_notes:600:180'); - print ''; - print $form->editfieldval("NotePublic",'note_public',$object->note_public,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'ckeditor:dolibarr_notes:600:180'); - print ""; + // Public note + print ''; + print $form->editfieldkey("NotePublic",'note_public',$object->note_public,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'ckeditor:dolibarr_notes:600:180'); + print ''; + print $form->editfieldval("NotePublic",'note_public',$object->note_public,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'ckeditor:dolibarr_notes:600:180'); + print ""; - // Private note - if (! $user->societe_id) - { - print ''; - print $form->editfieldkey("NotePrivate",'note',$object->note_private,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'ckeditor:dolibarr_notes:600:180'); - print ''; - print $form->editfieldval("NotePrivate",'note',$object->note_private,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'ckeditor:dolibarr_notes:600:180'); - print ""; - } + // Private note + if (! $user->societe_id) + { + print ''; + print $form->editfieldkey("NotePrivate",'note',$object->note_private,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'ckeditor:dolibarr_notes:600:180'); + print ''; + print $form->editfieldval("NotePrivate",'note',$object->note_private,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'ckeditor:dolibarr_notes:600:180'); + print ""; + } - print ""; + print ""; - print ''; + print ''; - /* - * Barre d'actions - */ + /* + * Barre d'actions + */ - print '
'; + print '
'; - if ($object->fk_statut == '2') // if blocked... - { - if ($user->rights->deplacement->unvalidate) - { - print ''.$langs->trans('Unblock').''; - } - else - { - print ''.$langs->trans('Unblock').''; - } - } - if ($object->fk_statut == '1') // If not blocked... - { - if ($user->rights->deplacement->valider) - { - print ''.$langs->trans('Block').''; - } - else - { - print ''.$langs->trans('Block').''; - } - if ($user->rights->deplacement->creer) - { - print ''.$langs->trans('Modify').''; - } - else - { - print ''.$langs->trans('Modify').''; - } - if ($user->rights->deplacement->supprimer) - { - print ''.$langs->trans('Delete').''; - } - else - { - print ''.$langs->trans('Delete').''; - } - } - print '
'; - } - } - else - { - dol_print_error($db); - } + if ($object->statut == 0) // if blocked... + { + if ($user->rights->deplacement->creer) + { + print ''.$langs->trans('Validate').''; + } + else + { + print ''.$langs->trans('Validate').''; + } + } + + if ($user->rights->deplacement->creer) + { + print ''.$langs->trans('Modify').''; + } + else + { + print ''.$langs->trans('Modify').''; + } + if ($user->rights->deplacement->supprimer) + { + print ''.$langs->trans('Delete').''; + } + else + { + print ''.$langs->trans('Delete').''; + } + + print '
'; + } + } + else + { + dol_print_error($db); + } } $db->close(); diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php index 7393a90749b..215bd228a89 100644 --- a/htdocs/compta/deplacement/index.php +++ b/htdocs/compta/deplacement/index.php @@ -131,7 +131,7 @@ $max=10; $langs->load("boxes"); -$sql = "SELECT u.rowid as uid, u.name, u.firstname, d.rowid, d.dated as date, d.tms as dm, d.km"; +$sql = "SELECT u.rowid as uid, u.name, u.firstname, d.rowid, d.dated as date, d.tms as dm, d.km, d.fk_statut"; $sql.= " FROM ".MAIN_DB_PREFIX."deplacement as d, ".MAIN_DB_PREFIX."user as u"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE u.rowid = d.fk_user"; @@ -164,18 +164,18 @@ if ($result) $userstatic=new User($db); while ($i < $num && $i < $max) { - $objp = $db->fetch_object($result); - $deplacementstatic->ref=$objp->rowid; - $deplacementstatic->id=$objp->rowid; - $userstatic->id=$objp->uid; - $userstatic->nom=$objp->name; - $userstatic->prenom=$objp->firstname; + $obj = $db->fetch_object($result); + $deplacementstatic->ref=$obj->rowid; + $deplacementstatic->id=$obj->rowid; + $userstatic->id=$obj->uid; + $userstatic->nom=$obj->name; + $userstatic->prenom=$obj->firstname; print ''; print ''.$deplacementstatic->getNomUrl(1).''; print ''.$userstatic->getNomUrl(1).''; - print ''.$objp->km.''; - print ''.dol_print_date($db->jdate($objp->dm),'day').''; - print ''.$deplacementstatic->LibStatut($objp->fk_statut,3).''; + print ''.$obj->km.''; + print ''.dol_print_date($db->jdate($obj->dm),'day').''; + print ''.$deplacementstatic->LibStatut($obj->fk_statut,3).''; print ''; $var=!$var; $i++; @@ -191,7 +191,7 @@ if ($result) else dol_print_error($db); -$db->close(); - llxFooter(); + +$db->close(); ?> diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php index 5a74877adc3..bd3ffc66e36 100755 --- a/htdocs/compta/deplacement/list.php +++ b/htdocs/compta/deplacement/list.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2004 Eric Seigne * Copyright (C) 2005-2011 Regis Houssin * @@ -20,7 +20,7 @@ /** * \file htdocs/compta/deplacement/list.php - * \brief Page list of expenses + * \brief Page to list trips and expenses */ require("../../main.inc.php"); @@ -60,6 +60,7 @@ llxHeader(); $sql = "SELECT s.nom, s.rowid as socid,"; // Ou $sql.= " d.rowid, d.type, d.dated as dd, d.km,"; // Comment +$sql.= " d.fk_statut,"; $sql.= " u.name, u.firstname"; // Qui $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= ", ".MAIN_DB_PREFIX."deplacement as d"; @@ -123,21 +124,22 @@ if ($resql) $var=true; while ($i < min($num,$limit)) { - $objp = $db->fetch_object($resql); + $obj = $db->fetch_object($resql); $soc = new Societe($db); - if ($objp->socid) $soc->fetch($objp->socid); + if ($obj->socid) $soc->fetch($obj->socid); $var=!$var; print ''; - print ''.img_object($langs->trans("ShowTrip"),"trip").' '.$objp->rowid.''; - print ''.$langs->trans($objp->type).''; - print ''.dol_print_date($db->jdate($objp->dd),'day').''; - print ''.img_object($langs->trans("ShowUser"),"user").' '.$objp->firstname.' '.$objp->name.''; - if ($objp->socid) print ''.$soc->getNomUrl(1).''; + print ''.img_object($langs->trans("ShowTrip"),"trip").' '.$obj->rowid.''; + print ''.$langs->trans($obj->type).''; + print ''.dol_print_date($db->jdate($obj->dd),'day').''; + print ''.img_object($langs->trans("ShowUser"),"user").' '.$obj->firstname.' '.$obj->name.''; + if ($obj->socid) print ''.$soc->getNomUrl(1).''; else print ' '; - print ''.$objp->km.''; + print ''.$obj->km.''; + $tripandexpense_static->statut=$obj->fk_statut; print ''.$tripandexpense_static->getLibStatut(5).''; print "\n"; diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php index c4b0b4c913b..bb9108ea738 100755 --- a/htdocs/compta/deplacement/stats/index.php +++ b/htdocs/compta/deplacement/stats/index.php @@ -192,8 +192,6 @@ foreach ($data as $val) print ''; -$db->close(); - print ''; print ''; @@ -209,7 +207,7 @@ print ''; print ''; -llxFooter(); - $db->close(); + +llxFooter(); ?> diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php index fb48f5b0628..e741d0add17 100644 --- a/htdocs/core/modules/modDeplacement.class.php +++ b/htdocs/core/modules/modDeplacement.class.php @@ -95,19 +95,19 @@ class modDeplacement extends DolibarrModules $this->rights[3][2] = 'd'; $this->rights[3][3] = 0; $this->rights[3][4] = 'supprimer'; - +/* $this->rights[4][0] = 174; $this->rights[4][1] = 'Bloquer les deplacements'; $this->rights[4][2] = 'a'; $this->rights[4][3] = 0; $this->rights[4][4] = 'valider'; - + $this->rights[5][0] = 175; $this->rights[5][1] = 'Debloquer les deplacements'; $this->rights[5][2] = 'a'; $this->rights[5][3] = 0; $this->rights[5][4] = 'unvalidate'; - +*/ $this->rights[6][0] = 178; $this->rights[6][1] = 'Exporter les deplacements'; $this->rights[6][2] = 'd'; diff --git a/htdocs/install/mysql/migration/3.1.0-3.2.0.sql b/htdocs/install/mysql/migration/3.1.0-3.2.0.sql index 192c80e3c5d..1277d6a7f63 100755 --- a/htdocs/install/mysql/migration/3.1.0-3.2.0.sql +++ b/htdocs/install/mysql/migration/3.1.0-3.2.0.sql @@ -178,3 +178,4 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (23 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2323,232, '8','0','VAT 8%',1); update llx_cotisation set fk_bank = null where fk_bank not in (select rowid from llx_bank); +