lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uniformize way of working of trip and expenses (added "validate" step

Browse Source 
after "draft").
This commit is contained in:
Laurent Destailleur 2012-01-18 01:05:26 +01:00
parent 9af78f97a8
commit a8ca1c721c
7 changed files with 429 additions and 445 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/compta/deplacement/class/deplacement.class.php
View File

@ -177,7 +177,7 @@ class Deplacement extends CommonObject
$sql .= " SET km = ".$this->km; // This is a distance or amount $sql .= " SET km = ".$this->km; // This is a distance or amount
$sql .= " , dated = '".$this->db->idate($this->date)."'"; $sql .= " , dated = '".$this->db->idate($this->date)."'";
$sql .= " , type = '".$this->type."'"; $sql .= " , type = '".$this->type."'";
$sql .= " , fk_statut = '".$this->fk_statut."'"; $sql .= " , fk_statut = '".$this->statut."'";
$sql .= " , fk_user = ".$this->fk_user; $sql .= " , fk_user = ".$this->fk_user;
$sql .= " , fk_user_modif = ".$user->id; $sql .= " , fk_user_modif = ".$user->id;
$sql .= " , fk_soc = ".($this->socid > 0?$this->socid:'null'); $sql .= " , fk_soc = ".($this->socid > 0?$this->socid:'null');
@ -226,7 +226,7 @@ class Deplacement extends CommonObject
$this->socid = $obj->fk_soc; $this->socid = $obj->fk_soc;
$this->km = $obj->km; $this->km = $obj->km;
$this->type = $obj->type; $this->type = $obj->type;
$this->fk_statut = $obj->fk_statut; $this->statut = $obj->fk_statut;
$this->note_private = $obj->note; $this->note_private = $obj->note;
$this->note_public = $obj->note_public; $this->note_public = $obj->note_public;
$this->fk_project = $obj->fk_projet; $this->fk_project = $obj->fk_projet;
@ -300,23 +300,24 @@ class Deplacement extends CommonObject
} }
if ($mode == 2) 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) 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==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
} }
if ($mode == 3) if ($mode == 3)
{ {
//if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0'); 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==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
} }
if ($mode == 4) if ($mode == 4)
{ {
//if ($statut==0) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0').' '.$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==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 ($mode == 5)
{ {
//if ($statut==0) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut0'); 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==1) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
} }
} }

80
htdocs/compta/deplacement/fiche.php
View File

@ -1,21 +1,21 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** /**
* \file htdocs/compta/deplacement/fiche.php * \file htdocs/compta/deplacement/fiche.php
@ -50,24 +50,13 @@ $object = new Deplacement($db);
/* /*
* Actions * Actions
*/ */
if ($action == 'block' && $user->rights->deplacement->valider) if ($action == 'validate' && $user->rights->deplacement->creer)
{ {
$object->fetch($id); $object->fetch($id);
if ($object->fk_statut == '2') // Already blocked... if ($object->statut == 0)
{ {
$mesg='<div class="error">'.$langs->trans("Error").'</div>'; $result = $object->setStatut(1);
$action='';
$error++;
}
else
{
$result = $object->fetch($id);
$object->fk_statut = '2';
$result = $object->update($user);
if ($result > 0) if ($result > 0)
{ {
Header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); Header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
@ -80,6 +69,7 @@ if ($action == 'block' && $user->rights->deplacement->valider)
} }
} }
/*
if ($action == 'unblock' && $user->rights->deplacement->unvalidate) if ($action == 'unblock' && $user->rights->deplacement->unvalidate)
{ {
$object->fetch($id); $object->fetch($id);
@ -107,7 +97,7 @@ if ($action == 'unblock' && $user->rights->deplacement->unvalidate)
$mesg=$object->error; $mesg=$object->error;
} }
} }
} }*/
if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer) if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer)
{ {
@ -136,6 +126,7 @@ if ($action == 'add' && $user->rights->deplacement->creer)
$object->fk_user = $_POST["fk_user"]; $object->fk_user = $_POST["fk_user"];
$object->note_private = $_POST["note_private"]; $object->note_private = $_POST["note_private"];
$object->note_public = $_POST["note_public"]; $object->note_public = $_POST["note_public"];
$object->statut = 0;
if (! $object->date) if (! $object->date)
{ {
@ -252,7 +243,7 @@ if ($action == 'setnote')
/* /*
* View * View
*/ */
llxHeader(); llxHeader();
@ -260,7 +251,7 @@ $form = new Form($db);
/* /*
* Action create * Action create
*/ */
if ($action == 'create') if ($action == 'create')
{ {
print_fiche_titre($langs->trans("NewTrip")); print_fiche_titre($langs->trans("NewTrip"));
@ -531,27 +522,18 @@ else if ($id)
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if ($object->fk_statut == '2') // if blocked... if ($object->statut == 0) // if blocked...
{ {
if ($user->rights->deplacement->unvalidate) if ($user->rights->deplacement->creer)
{ {
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=unblock&id='.$id.'">'.$langs->trans('Unblock').'</a>'; print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=validate&id='.$id.'">'.$langs->trans('Validate').'</a>';
} }
else else
{ {
print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Unblock').'</a>'; print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Validate').'</a>';
} }
} }
if ($object->fk_statut == '1') // If not blocked...
{
if ($user->rights->deplacement->valider)
{
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=block&id='.$id.'">'.$langs->trans('Block').'</a>';
}
else
{
print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Block').'</a>';
}
if ($user->rights->deplacement->creer) if ($user->rights->deplacement->creer)
{ {
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>'; print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
@ -568,7 +550,7 @@ else if ($id)
{ {
print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Delete').'</a>'; print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Delete').'</a>';
} }
}
print '</div>'; print '</div>';
} }
} }

24
htdocs/compta/deplacement/index.php
View File

@ -131,7 +131,7 @@ $max=10;
$langs->load("boxes"); $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"; $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"; 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"; $sql.= " WHERE u.rowid = d.fk_user";
@ -164,18 +164,18 @@ if ($result)
$userstatic=new User($db); $userstatic=new User($db);
while ($i < $num && $i < $max) while ($i < $num && $i < $max)
{ {
$objp = $db->fetch_object($result); $obj = $db->fetch_object($result);
$deplacementstatic->ref=$objp->rowid; $deplacementstatic->ref=$obj->rowid;
$deplacementstatic->id=$objp->rowid; $deplacementstatic->id=$obj->rowid;
$userstatic->id=$objp->uid; $userstatic->id=$obj->uid;
$userstatic->nom=$objp->name; $userstatic->nom=$obj->name;
$userstatic->prenom=$objp->firstname; $userstatic->prenom=$obj->firstname;
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
print '<td>'.$deplacementstatic->getNomUrl(1).'</td>'; print '<td>'.$deplacementstatic->getNomUrl(1).'</td>';
print '<td>'.$userstatic->getNomUrl(1).'</td>'; print '<td>'.$userstatic->getNomUrl(1).'</td>';
print '<td align="right">'.$objp->km.'</td>'; print '<td align="right">'.$obj->km.'</td>';
print '<td align="right">'.dol_print_date($db->jdate($objp->dm),'day').'</td>'; print '<td align="right">'.dol_print_date($db->jdate($obj->dm),'day').'</td>';
print '<td>'.$deplacementstatic->LibStatut($objp->fk_statut,3).'</td>'; print '<td>'.$deplacementstatic->LibStatut($obj->fk_statut,3).'</td>';
print '</tr>'; print '</tr>';
$var=!$var; $var=!$var;
$i++; $i++;
@ -191,7 +191,7 @@ if ($result)
else dol_print_error($db); else dol_print_error($db);
$db->close();
llxFooter(); llxFooter();
$db->close();
?> ?>

22
htdocs/compta/deplacement/list.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* *
@ -20,7 +20,7 @@
/** /**
* \file htdocs/compta/deplacement/list.php * \file htdocs/compta/deplacement/list.php
* \brief Page list of expenses * \brief Page to list trips and expenses
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
@ -60,6 +60,7 @@ llxHeader();
$sql = "SELECT s.nom, s.rowid as socid,"; // Ou $sql = "SELECT s.nom, s.rowid as socid,"; // Ou
$sql.= " d.rowid, d.type, d.dated as dd, d.km,"; // Comment $sql.= " d.rowid, d.type, d.dated as dd, d.km,"; // Comment
$sql.= " d.fk_statut,";
$sql.= " u.name, u.firstname"; // Qui $sql.= " u.name, u.firstname"; // Qui
$sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
$sql.= ", ".MAIN_DB_PREFIX."deplacement as d"; $sql.= ", ".MAIN_DB_PREFIX."deplacement as d";
@ -123,21 +124,22 @@ if ($resql)
$var=true; $var=true;
while ($i < min($num,$limit)) while ($i < min($num,$limit))
{ {
$objp = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$soc = new Societe($db); $soc = new Societe($db);
if ($objp->socid) $soc->fetch($objp->socid); if ($obj->socid) $soc->fetch($obj->socid);
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
print '<td><a href="fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowTrip"),"trip").' '.$objp->rowid.'</a></td>'; print '<td><a href="fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowTrip"),"trip").' '.$obj->rowid.'</a></td>';
print '<td>'.$langs->trans($objp->type).'</td>'; print '<td>'.$langs->trans($obj->type).'</td>';
print '<td>'.dol_print_date($db->jdate($objp->dd),'day').'</td>'; print '<td>'.dol_print_date($db->jdate($obj->dd),'day').'</td>';
print '<td align="left"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowUser"),"user").' '.$objp->firstname.' '.$objp->name.'</a></td>'; print '<td align="left"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),"user").' '.$obj->firstname.' '.$obj->name.'</a></td>';
if ($objp->socid) print '<td>'.$soc->getNomUrl(1).'</td>'; if ($obj->socid) print '<td>'.$soc->getNomUrl(1).'</td>';
else print '<td>&nbsp;</td>'; else print '<td>&nbsp;</td>';
print '<td align="right">'.$objp->km.'</td>'; print '<td align="right">'.$obj->km.'</td>';
$tripandexpense_static->statut=$obj->fk_statut;
print '<td align="right">'.$tripandexpense_static->getLibStatut(5).'</td>'; print '<td align="right">'.$tripandexpense_static->getLibStatut(5).'</td>';
print "</tr>\n"; print "</tr>\n";

6
htdocs/compta/deplacement/stats/index.php
View File

@ -192,8 +192,6 @@ foreach ($data as $val)
print '</table>'; print '</table>';
$db->close();
print '</td>'; print '</td>';
print '<td align="center" valign="top">'; print '<td align="center" valign="top">';
@ -209,7 +207,7 @@ print '</td></tr></table>';
print '</td></tr></table>'; print '</td></tr></table>';
llxFooter();
$db->close(); $db->close();
llxFooter();
?> ?>

4
htdocs/core/modules/modDeplacement.class.php
View File

@ -95,7 +95,7 @@ class modDeplacement extends DolibarrModules
$this->rights[3][2] = 'd'; $this->rights[3][2] = 'd';
$this->rights[3][3] = 0; $this->rights[3][3] = 0;
$this->rights[3][4] = 'supprimer'; $this->rights[3][4] = 'supprimer';
/*
$this->rights[4][0] = 174; $this->rights[4][0] = 174;
$this->rights[4][1] = 'Bloquer les deplacements'; $this->rights[4][1] = 'Bloquer les deplacements';
$this->rights[4][2] = 'a'; $this->rights[4][2] = 'a';
@ -107,7 +107,7 @@ class modDeplacement extends DolibarrModules
$this->rights[5][2] = 'a'; $this->rights[5][2] = 'a';
$this->rights[5][3] = 0; $this->rights[5][3] = 0;
$this->rights[5][4] = 'unvalidate'; $this->rights[5][4] = 'unvalidate';
*/
$this->rights[6][0] = 178; $this->rights[6][0] = 178;
$this->rights[6][1] = 'Exporter les deplacements'; $this->rights[6][1] = 'Exporter les deplacements';
$this->rights[6][2] = 'd'; $this->rights[6][2] = 'd';

1
htdocs/install/mysql/migration/3.1.0-3.2.0.sql
View File

@ -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); 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); update llx_cotisation set fk_bank = null where fk_bank not in (select rowid from llx_bank);