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

Trad: Traduction de la fiche contrat et page index contrat

Browse Source 
New: Ajout de la rfrence facture dans le lien facture au lieu du simple texte "Facture".
New: Ajout du statut de la facture si contrat li  une facture.
Doc: Documentation doxygen
This commit is contained in:
Laurent Destailleur 2004-09-26 23:02:40 +00:00
parent a528336bff
commit cb7e19dfbe
3 changed files with 253 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
htdocs/contrat/contrat.class.php
View File

@ -21,16 +21,27 @@
* *
*/ */
/*!
\file htdocs/contrat/contrat.class.php
\ingroup contrat
\brief Fichier de la classe des contrats
\version $Revision$
*/
/*! \class Contrat
\brief Classe permettant la gestion des contrats
*/
class Contrat class Contrat
{ {
var $id; var $id;
var $db; var $db;
/* /**
* Initialisation * \brief Constructeur de la classe
* * \param DB handler accès base de données
*/ */
function Contrat($DB) function Contrat($DB)
{ {
$this->db = $DB ; $this->db = $DB ;
@ -82,9 +93,10 @@ class Contrat
$result = $this->db->query($sql) ; $result = $this->db->query($sql) ;
if (!$result) if (!$result)
{ {
print $this->db->error() . "<br>" . $sql; dolibarr_print_error($this->db);
} }
} }
/* /*
* *
* *
@ -97,6 +109,7 @@ class Contrat
$result = $this->db->query($sql) ; $result = $this->db->query($sql) ;
} }
/* /*
* *
* *
@ -109,6 +122,7 @@ class Contrat
$result = $this->db->query($sql) ; $result = $this->db->query($sql) ;
} }
/* /*
* *
* *
@ -146,11 +160,12 @@ class Contrat
} }
else else
{ {
print $this->db->error(); dolibarr_print_error($this->db);
} }
return $result; return $result;
} }
/* /*
* Crée autant de contrats que de lignes de facture, pour une facture donnée * Crée autant de contrats que de lignes de facture, pour une facture donnée
* *
@ -185,7 +200,7 @@ class Contrat
if (! $this->db->query($sql)) if (! $this->db->query($sql))
{ {
dolibarr_syslog("Contrat::create_from_facture - 10"); dolibarr_syslog("Contrat::create_from_facture - 10");
print "Erreur : ".$this->db->error()."<br>".$sql; dolibarr_print_error($this->db,"Contrat::create_from_facture - 10");
} }
} }
} }
@ -197,15 +212,12 @@ class Contrat
else else
{ {
dolibarr_syslog("Contrat::create_from_facture - 20"); dolibarr_syslog("Contrat::create_from_facture - 20");
print $this->db->error(); dolibarr_print_error($this->db,"Contrat::create_from_facture - 20");
} }
return $result; return $result;
} }
/*
*
*
*/
} }
?> ?>

386
htdocs/contrat/fiche.php
View File

@ -20,11 +20,22 @@
* $Source$ * $Source$
* *
*/ */
/*!
\file htdocs/contrat/fiche.php
\ingroup contrat
\brief Fiche d'un contrat
\version $Revision$
*/
require("./pre.inc.php"); require("./pre.inc.php");
require("./contrat.class.php"); require("./contrat.class.php");
require("../facture.class.php"); require("../facture.class.php");
$langs->load("products");
$langs->load("companies");
$langs->load("bills");
llxHeader(); llxHeader();
$id = $_GET["id"]; $id = $_GET["id"];
@ -33,47 +44,47 @@ $mesg = '';
/* /*
* Sécurité accés client * Sécurité accés client
*/ */
if ($user->societe_id > 0) if ($user->societe_id > 0)
{ {
$action = ''; $action = '';
$id = $user->societe_id; $id = $user->societe_id;
} }
if ($_POST["action"] == 'miseenservice') if ($_POST["action"] == 'miseenservice')
{ {
$contrat = new Contrat($db); $contrat = new Contrat($db);
$contrat->id = $id; $contrat->id = $id;
$contrat->fetch($id); $contrat->fetch($id);
$contrat->mise_en_service($user, $contrat->mise_en_service($user,
mktime($_POST["date_starthour"], mktime($_POST["date_starthour"],
$_POST["date_startmin"], $_POST["date_startmin"],
0, 0,
$_POST["date_startmonth"], $_POST["date_startmonth"],
$_POST["date_startday"], $_POST["date_startday"],
$_POST["date_startyear"]), $_POST["date_startyear"]),
0, 0,
mktime($_POST["date_endhour"], mktime($_POST["date_endhour"],
$_POST["date_endmin"], $_POST["date_endmin"],
0, 0,
$_POST["date_endmonth"], $_POST["date_endmonth"],
$_POST["date_endday"], $_POST["date_endday"],
$_POST["date_endyear"]) $_POST["date_endyear"])
); );
} }
if ($_GET["action"] == 'cloture') if ($_GET["action"] == 'cloture')
{ {
$contrat = new Contrat($db); $contrat = new Contrat($db);
$contrat->id = $id; $contrat->id = $id;
$contrat->cloture($user); $contrat->cloture($user);
} }
if ($_GET["action"] == 'annule') if ($_GET["action"] == 'annule')
{ {
$contrat = new Contrat($db); $contrat = new Contrat($db);
$contrat->id = $id; $contrat->id = $id;
$contrat->annule($user); $contrat->annule($user);
} }
@ -81,177 +92,182 @@ $html = new Form($db);
/* /*
* Fiche visu/édition * Fiche contract en mode visu/édition
* *
*/ */
if ($id) if ($id)
{ {
$contrat = new Contrat($db); $contrat = new Contrat($db);
$result = $contrat->fetch($id); $result = $contrat->fetch($id);
if ( $result )
{
$date_start='';
$date_end='';
print $mesg;
/*
* Affichage onglets
*/
$h = 0;
$hselected=$h;
$head[$h][0] = DOL_URL_ROOT.'/contrat/fiche.php?id='.$id;
$head[$h][1] = 'Fiche contrat : '.$contrat->id;
$h++;
dolibarr_fiche_head($head, $hselected);
print '<table class="border" width="100%" cellspacing="0" cellpadding="3">';
print "<tr>";
print '<td width="20%">Service</td><td colspan="3">'.($contrat->product->ref).' - '.($contrat->product->label_url).'</td>';
print '</tr><tr>';
if ($contrat->factureid)
{
print '<td>Société</td><td>'.$contrat->societe->nom_url.'</td>';
print '<td>Facture</td><td><a href="../compta/facture.php?facid='.$contrat->factureid.'">Facture</td>';
}
else
{
print '<td>Société</td><td colspan="3">'.$contrat->societe->nom_url.'</td></tr>';
}
// Affiche statut contrat
$now=mktime();
if ($contrat->enservice == 1)
{
if (! $contrat->date_fin_validite || $contrat->date_fin_validite >= $now) {
$class = "normal";
$statut="En service";
}
else {
$class = "error";
$statut="<b>En service, expiré</b>";
}
}
elseif($contrat->enservice == 2)
{
$class = "normal";
$statut= "Cloturé";
}
else
{
$class = "warning";
$statut= "<b>Ce contrat n'est pas en service</b>";
}
print "<tr><td>".$langs->trans("Status")."</td><td colspan=\"3\" class=\"$class\">$statut</td></tr>\n";
if ($_GET["request"] == 'miseenservice')
{
// Si contrat lié à une ligne de facture, on recherche date debut et fin de la ligne
if ($contrat->facturedetid) {
$facturedet = new FactureLigne($db);
$facturedet->fetch($contrat->facturedetid);
$date_start=$facturedet->date_start;
$date_end=$facturedet->date_end;
}
// Si date_start et date_end ne sont pas connues de la ligne de facture, on les
// definit à une valeur par défaut en fonction de la durée définie pour le service.
if (! $date_start) { $date_start=mktime(); }
if (! $date_end) {
if ($contrat->product->duration)
{
// Si duree du service connue
$duree_value = substr($contrat->product->duration,0,strlen($contrat->product->duration)-1);
$duree_unit = substr($contrat->product->duration,-1);
$month = date("m",$date_start);
$day = date("d",$date_start);
$year = date("Y",$date_start);
switch($duree_unit)
{
case "d":
$day = $day + $duree_value;
break;
case "w":
$day = $day + ($duree_value * 7);
break;
case "m":
$month = $month + $duree_value;
break;
case "y":
$year = $year + $duree_value;
break;
}
$date_end = mktime(date("H",$date_start), date("i",$date_start), 0, $month, $day, $year);
}
}
print '<form action="fiche.php?id='.$id.'" method="post">'; if ( $result )
print '<input type="hidden" name="action" value="miseenservice">'; {
$date_start='';
print '<tr><td>Durée standard pour ce service</td><td colspan="3">'; $date_end='';
print $contrat->product->duration;
print '<input type="hidden" name="duration" value="'.$contrat->product->duration.'">';
print '</td></tr>';
// Date de début de mise en service
print '<tr><td>Date de mise en service</td><td colspan="3">';
print $html->select_date($date_start,'date_start',1,1);
print "&nbsp;";
print '</td></tr>';
// Date de fin prévue de mise en service print $mesg;
print '<tr><td>Date de fin prévue</td><td colspan="3">';
print $html->select_date($date_end,'date_end',1,1);
print "&nbsp;";
print '</td></tr>';
print '<tr><td colspan="4" align="center">';
print '<input type="submit" value="'.$langs->trans("Save").'">';
print '</td></tr>';
print '</form>';
}
if ($contrat->enservice > 0)
{
print "<tr><td valign=\"top\">Mis en service</td><td>".dolibarr_print_date($contrat->mise_en_service,"%d %B %Y à %H:%M");
print "</td>";
$contrat->user_service->fetch();
print '<td>par</td><td>'.$contrat->user_service->fullname.'</td></tr>';
print '<tr><td valign="top">Fin de validité</td><td colspan="3">'.dolibarr_print_date($contrat->date_fin_validite,"%d %B %Y à %H:%M");
}
if ($contrat->enservice == 2)
{
print "<tr><td valign=\"top\">Cloturé</td><td>".dolibarr_print_date($contrat->date_cloture,"%d %B %Y à %H:%M")."</td>";
$contrat->user_cloture->fetch();
print '<td>par</td><td>'.$contrat->user_cloture->fullname.'</td></tr>';
}
/*
print "</table>"; * Affichage onglets
print '<br>'; */
print '</div>'; $h = 0;
$hselected=$h;
$head[$h][0] = DOL_URL_ROOT.'/contrat/fiche.php?id='.$id;
$head[$h][1] = $langs->trans("CardContract").' : '.$contrat->id;
$h++;
dolibarr_fiche_head($head, $hselected);
print '<table class="border" width="100%">';
print "<tr>";
print '<td width="20%">'.$langs->trans("Service").'</td><td colspan="3">'.($contrat->product->ref).' - '.($contrat->product->label_url).'</td>';
print '</tr>';
if ($contrat->factureid)
{
print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$contrat->societe->nom_url.'</td></tr>';
$facture=new Facture($db);
$facture->fetch($contrat->factureid);
print '<tr><td>'.$langs->trans("Bill").'</td><td><a href="../compta/facture.php?facid='.$contrat->factureid.'">'.$facture->ref.'</td>';
print '<td>'.$langs->trans("BillStatus").'</td><td>'.$facture->get_libStatut().'</td></tr>';
}
else
{
print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$contrat->societe->nom_url.'</td></tr>';
}
// Affiche statut contrat
$now=mktime();
if ($contrat->enservice == 1)
{
if (! $contrat->date_fin_validite || $contrat->date_fin_validite >= $now) {
$class = 'normal';
$statut=$langs->trans("ContractStatusRunning");
}
else {
$class = 'error';
$statut= $langs->trans("ContractStatusRunning").', '.img_warning().' '.$langs->trans("ContractStatusExpired");
}
}
elseif($contrat->enservice == 2)
{
$class = 'normal';
$statut= $langs->trans("ContractStatusClosed");
}
else
{
$class = 'warning';
$statut= '<b>'.$langs->trans("ContractNotRunning").'</b>';
}
print "<tr><td>".$langs->trans("ContractStatus")."</td><td colspan=\"3\" class=\"$class\">$statut</td></tr>\n";
if ($_GET["request"] == 'miseenservice')
{
// Si contrat lié à une ligne de facture, on recherche date debut et fin de la ligne
if ($contrat->facturedetid) {
$facturedet = new FactureLigne($db);
$facturedet->fetch($contrat->facturedetid);
$date_start=$facturedet->date_start;
$date_end=$facturedet->date_end;
}
// Si date_start et date_end ne sont pas connues de la ligne de facture, on les
// definit à une valeur par défaut en fonction de la durée définie pour le service.
if (! $date_start) { $date_start=mktime(); }
if (! $date_end) {
if ($contrat->product->duration)
{
// Si duree du service connue
$duree_value = substr($contrat->product->duration,0,strlen($contrat->product->duration)-1);
$duree_unit = substr($contrat->product->duration,-1);
$month = date("m",$date_start);
$day = date("d",$date_start);
$year = date("Y",$date_start);
switch($duree_unit)
{
case "d":
$day = $day + $duree_value;
break;
case "w":
$day = $day + ($duree_value * 7);
break;
case "m":
$month = $month + $duree_value;
break;
case "y":
$year = $year + $duree_value;
break;
}
$date_end = mktime(date("H",$date_start), date("i",$date_start), 0, $month, $day, $year);
}
}
print '<form action="fiche.php?id='.$id.'" method="post">';
print '<input type="hidden" name="action" value="miseenservice">';
print '<tr><td>Durée standard pour ce service</td><td colspan="3">';
print $contrat->product->duration;
print '<input type="hidden" name="duration" value="'.$contrat->product->duration.'">';
print '</td></tr>';
// Date de début de mise en service
print '<tr><td>Date de mise en service</td><td colspan="3">';
print $html->select_date($date_start,'date_start',1,1);
print "&nbsp;";
print '</td></tr>';
// Date de fin prévue de mise en service
print '<tr><td>Date de fin prévue</td><td colspan="3">';
print $html->select_date($date_end,'date_end',1,1);
print "&nbsp;";
print '</td></tr>';
print '<tr><td colspan="4" align="center">';
print '<input type="submit" value="'.$langs->trans("Save").'">';
print '</td></tr>';
print '</form>';
}
if ($contrat->enservice > 0)
{
print "<tr><td valign=\"top\">Mis en service</td><td>".dolibarr_print_date($contrat->mise_en_service,"%d %B %Y à %H:%M");
print "</td>";
$contrat->user_service->fetch();
print '<td>'.$langs->trans("By").'</td><td>'.$contrat->user_service->fullname.'</td></tr>';
print '<tr><td valign="top">Fin de validité</td><td colspan="3">'.dolibarr_print_date($contrat->date_fin_validite,"%d %B %Y à %H:%M");
}
if ($contrat->enservice == 2)
{
print '<tr><td valign="top">'.$langs->trans("Closed").'</td><td>'.dolibarr_print_date($contrat->date_cloture,"%d %B %Y à %H:%M").'</td>';
$contrat->user_cloture->fetch();
print '<td>'.$langs->trans("By").'</td><td>'.$contrat->user_cloture->fullname.'</td></tr>';
}
print "</table>";
print '<br>';
print '</div>';
} }
} }
else else
{ {
print "Error"; dolibarr_print_error(0,"Contract id not provided");
return;
} }
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* Barre d'action */ /* Barre d'action */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -267,8 +283,8 @@ if (! $contrat->enservice)
} }
elseif ($contrat->enservice == 1) elseif ($contrat->enservice == 1)
{ {
print '<a class="tabAction" href="fiche.php?action=annule&id='.$id.'">Mettre hors service</a>'; print '<a class="tabAction" href="fiche.php?action=annule&id='.$id.'">Mettre hors service</a>';
print '<a class="tabAction" href="fiche.php?action=cloture&id='.$id.'">Clôturer</a>'; print '<a class="tabAction" href="fiche.php?action=cloture&id='.$id.'">'.$langs->trans("Close").'</a>';
} }
print '</div>'; print '</div>';

37
htdocs/contrat/index.php
View File

@ -20,8 +20,19 @@
* $Source$ * $Source$
* *
*/ */
/*!
\file htdocs/contrat/contrat.class.php
\ingroup contrat
\brief Fichier de la classe des contrats
\version $Revision$
*/
require("./pre.inc.php"); require("./pre.inc.php");
$langs->load("products");
llxHeader(); llxHeader();
$sortorder=$_GET["sortorder"]; $sortorder=$_GET["sortorder"];
@ -75,20 +86,22 @@ if ( $db->query($sql) )
print_barre_liste("Liste des contrats", $page, "index.php", "&sref=$sref&snom=$snom", $sortfield, $sortorder,'',$num); print_barre_liste("Liste des contrats", $page, "index.php", "&sref=$sref&snom=$snom", $sortfield, $sortorder,'',$num);
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="3">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'; print '<td>';
print_liste_field_titre("Numéro","index.php", "c.rowid"); print_liste_field_titre($langs->trans("Ref"),"index.php", "c.rowid");
print "</td><td>"; print "</td><td>";
print_liste_field_titre($langs->trans("Label"),"index.php", "p.label"); print_liste_field_titre($langs->trans("Label"),"index.php", "p.label");
print "</td><td>"; print "</td><td>";
print_liste_field_titre("Société","index.php", "s.nom"); print_liste_field_titre($langs->trans("Company"),"index.php", "s.nom");
print '</td><td align="center">'; print '</td><td align="center">';
print_liste_field_titre($langs->trans("Status"),"index.php", "c.enservice"); print_liste_field_titre($langs->trans("Status"),"index.php", "c.enservice");
print '</td>'; print '</td>';
print '</td><td align="center">'; print '</td><td align="center">';
print_liste_field_titre("Date Fin","index.php", "c.fin_validite"); print_liste_field_titre("Date Fin","index.php", "c.fin_validite");
print '</td><td align="center">';
print_liste_field_titre($langs->trans("Action"),"index.php", "c.next");
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
@ -109,23 +122,23 @@ if ( $db->query($sql) )
if ($obj->enservice == 1) if ($obj->enservice == 1)
{ {
if (! $obj->fin_validite || $obj->fin_validite >= $now) { if (! $obj->fin_validite || $obj->fin_validite >= $now) {
$class = "normal"; $class = 'normal';
$statut="En service"; $statut= $langs->trans("ContractStatusRunning");
} }
else { else {
$class = "error"; $class = 'error';
$statut="<b>En service</b>, ".img_warning()." expiré"; $statut= $langs->trans("ContractStatusRunning").', '.img_warning().' '.$langs->trans("ContractStatusExpired");
} }
} }
elseif($obj->enservice == 2) elseif($obj->enservice == 2)
{ {
$class = "normal"; $class = "normal";
$statut= "Cloturé"; $statut= $langs->trans("Closed");
} }
else else
{ {
$class = "warning"; $class = "warning";
$statut= "A mettre en service"; $statut= $langs->trans("ContractStatusToRun");
} }
print "<td align=\"center\" class=\"$class\">"; print "<td align=\"center\" class=\"$class\">";
print "$statut"; print "$statut";
@ -139,6 +152,10 @@ if ( $db->query($sql) )
print "&nbsp;"; print "&nbsp;";
} }
print "</td>\n"; print "</td>\n";
print '<td>';
// \todo Créer action "Renouveler"
print '</td>';
print "</tr>\n"; print "</tr>\n";
$i++; $i++;
@ -150,7 +167,7 @@ if ( $db->query($sql) )
} }
else else
{ {
print $db->error() . "<br>" .$sql; dolibarr_print_error($db);
} }