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

Synchro

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2004-07-27 16:30:19 +00:00
parent 030948ad03
commit d5419912e8
6 changed files with 144 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/admin/system/index.php
View File

@ -1,5 +1,5 @@
<?PHP <?PHP
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -37,7 +37,6 @@ require("./pre.inc.php");
if (!$user->admin) if (!$user->admin)
accessforbidden(); accessforbidden();
llxHeader(); llxHeader();
print_titre("Résumé des informations systèmes Dolibarr"); print_titre("Résumé des informations systèmes Dolibarr");
@ -46,7 +45,8 @@ print "<br>\n";
print '<table class="noborder" cellpadding="3" cellspacing="0" width="100%">'; print '<table class="noborder" cellpadding="3" cellspacing="0" width="100%">';
print "<tr class=\"liste_titre\"><td colspan=\"2\">Dolibar</td></tr>\n"; print "<tr class=\"liste_titre\"><td colspan=\"2\">Dolibar</td></tr>\n";
print "<tr $bc[1]><td width=\"140\">Version</td><td>" . DOL_VERSION . "</td></tr>\n"; print "<tr $bc[1]><td width=\"240\">Version</td><td>" . DOL_VERSION . "</td></tr>\n";
//print "<tr $bc[1]><td width=\"240\">Version de la base de données</td><td>" . DOL_VERSION_DB . "</td></tr>\n";
print '</table>'; print '</table>';
print "<br>\n"; print "<br>\n";
@ -59,14 +59,14 @@ phpinfo();
$chaine = ob_get_contents(); $chaine = ob_get_contents();
ob_end_clean(); ob_end_clean();
eregi('System </td><td class="v">([^\/]*)</td>',$chaine,$reg); eregi('System </td><td class="v">([^\/]*)</td>',$chaine,$reg);
print "<tr $bc[1]><td width=\"140\">Version</td><td>".$reg[1]."</td></tr>\n"; print "<tr $bc[1]><td width=\"240\">Version</td><td>".$reg[1]."</td></tr>\n";
print '</table>'; print '</table>';
print "<br>\n"; print "<br>\n";
print '<table class="noborder" cellpadding="3" cellspacing="0" width="100%">'; print '<table class="noborder" cellpadding="3" cellspacing="0" width="100%">';
print "<tr class=\"liste_titre\"><td colspan=\"2\">Serveur Web</td></tr>\n"; print "<tr class=\"liste_titre\"><td colspan=\"2\">Serveur Web</td></tr>\n";
print "<tr $bc[1]><td width=\"140\">Version</td><td>".$_SERVER["SERVER_SOFTWARE"]."</td></tr>\n"; print "<tr $bc[1]><td width=\"240\">Version</td><td>".$_SERVER["SERVER_SOFTWARE"]."</td></tr>\n";
print "<tr $bc[0]><td>document root</td><td>" . DOL_DOCUMENT_ROOT . "</td></tr>\n"; print "<tr $bc[0]><td>document root</td><td>" . DOL_DOCUMENT_ROOT . "</td></tr>\n";
print '</table>'; print '</table>';
@ -74,7 +74,7 @@ print "<br>\n";
print '<table class="noborder" cellpadding="3" cellspacing="0" width="100%">'; print '<table class="noborder" cellpadding="3" cellspacing="0" width="100%">';
print "<tr class=\"liste_titre\"><td colspan=\"2\">PHP</td></tr>\n"; print "<tr class=\"liste_titre\"><td colspan=\"2\">PHP</td></tr>\n";
print "<tr $bc[1]><td width=\"140\">Version</td><td>".phpversion()."</td></tr>\n"; print "<tr $bc[1]><td width=\"240\">Version</td><td>".phpversion()."</td></tr>\n";
print "<tr $bc[0]><td>Liaison Web-PHP</td><td>".php_sapi_name()."</td></tr>\n"; print "<tr $bc[0]><td>Liaison Web-PHP</td><td>".php_sapi_name()."</td></tr>\n";
print '</table>'; print '</table>';
@ -89,16 +89,13 @@ if ($result)
$row = $db->fetch_row(); $row = $db->fetch_row();
} }
print "<tr $bc[0]><td>Version</td><td>" . $row[1] . "</td></tr>\n"; print "<tr $bc[0]><td>Version</td><td>" . $row[1] . "</td></tr>\n";
print "<tr $bc[1]><td width=\"140\">Type</td><td>" . $conf->db->type . "</td></tr>\n"; print "<tr $bc[1]><td width=\"240\">Type</td><td>" . $conf->db->type . "</td></tr>\n";
print "<tr $bc[0]><td>Host</td><td>" . $conf->db->host . "</td></tr>\n"; print "<tr $bc[0]><td>Host</td><td>" . $conf->db->host . "</td></tr>\n";
print "<tr $bc[1]><td>User</td><td>" . $conf->db->user . "&nbsp;</td></tr>\n"; print "<tr $bc[1]><td>User</td><td>" . $conf->db->user . "&nbsp;</td></tr>\n";
print "<tr $bc[0]><td>Pass</td><td>" . $conf->db->pass . "&nbsp;</td></tr>\n"; print "<tr $bc[0]><td>Pass</td><td>" . $conf->db->pass . "&nbsp;</td></tr>\n";
print "<tr $bc[1]><td>Database name</td><td>" . $conf->db->name . "</td></tr>\n"; print "<tr $bc[1]><td>Database name</td><td>" . $conf->db->name . "</td></tr>\n";
print '</table>'; print '</table>';
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>"); llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
?> ?>

5
htdocs/commande/fiche.php
View File

@ -681,11 +681,6 @@ else
{ {
print '<a class="tabAction" href="fiche.php?id='.$id.'&amp;action=delete">Supprimer</a>'; print '<a class="tabAction" href="fiche.php?id='.$id.'&amp;action=delete">Supprimer</a>';
} }
elseif ($commande->statut == 1 && abs($resteapayer) > 0 && $user->rights->commande->envoyer)
{
print '<a class="tabAction" href="fiche.php?id='.$id.'&amp;action=presend">Envoyer</a>';
}
if ($commande->statut > 0 && $commande->statut < 3 && $user->rights->expedition->creer) if ($commande->statut > 0 && $commande->statut < 3 && $user->rights->expedition->creer)
{ {

3
htdocs/compta/facture.php
View File

@ -390,8 +390,7 @@ if ($_GET["action"] == 'pdf')
facture_pdf_create($db, $_GET["facid"]); facture_pdf_create($db, $_GET["facid"]);
} }
llxHeader('','Facture','Facture');
llxHeader();
$html = new Form($db); $html = new Form($db);

295
htdocs/contrat/fiche.php
View File

@ -27,7 +27,8 @@ require("../facture.class.php");
llxHeader(); llxHeader();
$id = $_GET["id"]; $id = $_GET["id"];
$socid = $_GET["socid"];
$mesg = ''; $mesg = '';
/* /*
@ -40,24 +41,26 @@ if ($user->societe_id > 0)
} }
if ($action == 'add')
{
$contrat = new Contrat($db);
$id = $product->create($user);
$action = '';
}
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"],$_POST["date_startmin"],0,$_POST["date_startmonth"],$_POST["date_startday"],$_POST["date_startyear"]), mktime($_POST["date_starthour"],
0, $_POST["date_startmin"],
mktime($_POST["date_endhour"],$_POST["date_endmin"],0,$_POST["date_endmonth"],$_POST["date_endday"],$_POST["date_endyear"]) 0,
); $_POST["date_startmonth"],
$_POST["date_startday"],
$_POST["date_startyear"]),
0,
mktime($_POST["date_endhour"],
$_POST["date_endmin"],
0,
$_POST["date_endmonth"],
$_POST["date_endday"],
$_POST["date_endyear"])
);
} }
if ($_GET["action"] == 'cloture') if ($_GET["action"] == 'cloture')
@ -75,127 +78,64 @@ if ($_GET["action"] == 'annule')
} }
if ($action == 'update' && $cancel <> 'Annuler')
{
$product = new Product($db);
$product->ref = $_POST["ref"];
$product->libelle = $_POST["libelle"];
$product->price = $_POST["price"];
$product->tva_tx = $_POST["tva_tx"];
$product->description = $_POST["desc"];
$product->envente = $_POST["statut"];
$product->duration_value = $_POST["duration_value"];
$product->duration_unit = $_POST["duration_unit"];
if ( $product->update($id, $user))
{
$action = '';
$mesg = 'Fiche mise à jour';
}
else
{
$action = 'edit';
$mesg = 'Fiche non mise à jour !' . "<br>" . $product->mesg_error;
}
}
$html = new Form($db); $html = new Form($db);
/*
* Fiche création
*
*/
if ($action == 'create')
{
print "<form action=\"$PHP_SELF?type=".$_POST["type"]."\" method=\"post\">\n";
print "<input type=\"hidden\" name=\"action\" value=\"add\">\n";
print '<input type="hidden" name="type" value="'.$_POST["type"].'">'."\n";
print '<div class="titre">Nouveau</div><br>'."\n";
print '<table class="border" width="100%" cellspacing="0" cellpadding="3">';
print "<tr>";
print '<td>Référence</td><td><input name="ref" size="20" value=""></td></tr>';
print '<td>Libellé</td><td><input name="libelle" size="40" value=""></td></tr>';
print '<tr><td>Prix de vente</td><TD><input name="price" size="10" value=""></td></tr>';
print '<tr><td>Taux TVA</td><TD>';
print $html->select_tva("tva_tx");
print ' %</td></tr>';
print "<tr><td valign=\"top\">Description</td><td>";
print '<textarea name="desc" rows="8" cols="50">';
print "</textarea></td></tr>";
if ($_POST["type"] == 1)
{
// Si contrat de type service
print '<tr><td>Durée</td><td><input name="duration_value" size="6" value="'.$product->duree.'">';
print '<input name="duration_unit" type="radio" value="d">jour&nbsp;';
print '<input name="duration_unit" type="radio" value="w">semaine&nbsp;';
print '<input name="duration_unit" type="radio" value="m">mois&nbsp;';
print '<input name="duration_unit" type="radio" value="y">année';
print '</td></tr>';
}
print '<tr><td>&nbsp;</td><td><input type="submit" value="Créer"></td></tr>';
print '</table>';
print '</form>';
}
else
{
/* /*
* Fiche visu/édition * Fiche visu/édition
* *
*/ */
if ($id) if ($id)
{ {
$contrat = new Contrat($db); $contrat = new Contrat($db);
$result = $contrat->fetch($id); $result = $contrat->fetch($id);
if ( $result ) if ( $result )
{ {
$date_start=''; $date_start='';
$date_end=''; $date_end='';
print $mesg; print $mesg;
/* /*
* Affichage onglets * Affichage onglets
*/ */
$h = 0; $h = 0;
$hselected=$h; $hselected=$h;
$head[$h][0] = DOL_URL_ROOT.'/soc.php?socid='.$socid; $head[$h][0] = DOL_URL_ROOT.'/soc.php?socid='.$socid;
$head[$h][1] = 'Fiche contrat : '.$contrat->id; $head[$h][1] = 'Fiche contrat : '.$contrat->id;
$h++; $h++;
dolibarr_fiche_head($head, $hselected); dolibarr_fiche_head($head, $hselected);
print '<table class="border" width="100%" cellspacing="0" cellpadding="3">'; print '<table class="border" width="100%" cellspacing="0" cellpadding="3">';
print "<tr>"; print "<tr>";
print '<td width="20%">Service</td><td colspan="3">'.($contrat->product->ref).' - '.($contrat->product->label_url).'</td>'; print '<td width="20%">Service</td><td colspan="3">'.($contrat->product->ref).' - '.($contrat->product->label_url).'</td>';
print '</tr><tr>'; print '</tr><tr>';
if ($contrat->factureid) if ($contrat->factureid)
{ {
print '<td>Société</td><td>'.$contrat->societe->nom_url.'</td>'; 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>'; print '<td>Facture</td><td><a href="../compta/facture.php?facid='.$contrat->factureid.'">Facture</td>';
} }
else else
{ {
print '<td>Société</td><td colspan="3">'.$contrat->societe->nom_url.'</td></tr>'; print '<td>Société</td><td colspan="3">'.$contrat->societe->nom_url.'</td></tr>';
} }
// Affiche statut contrat // Affiche statut contrat
$now=mktime(); $now=mktime();
if ($contrat->enservice == 1) if ($contrat->enservice == 1)
{ {
if (! $contrat->date_fin_validite || $contrat->date_fin_validite >= $now) { if (! $contrat->date_fin_validite || $contrat->date_fin_validite >= $now) {
$class = "normal"; $class = "normal";
$statut="En service"; $statut="En service";
} }
else { else {
$class = "error"; $class = "error";
$statut="<b>En service, expiré</b>"; $statut="<b>En service, expiré</b>";
} }
} }
elseif($contrat->enservice == 2) elseif($contrat->enservice == 2)
{ {
@ -207,26 +147,27 @@ else
$class = "warning"; $class = "warning";
$statut= "<b>Ce contrat n'est pas en service</b>"; $statut= "<b>Ce contrat n'est pas en service</b>";
} }
print "<tr><td>Statut</td><td colspan=\"3\" class=\"$class\">$statut</td></tr>\n"; print "<tr><td>Statut</td><td colspan=\"3\" class=\"$class\">$statut</td></tr>\n";
if ($request == 'miseenservice') if ($_GET["request"] == 'miseenservice')
{ {
// Si contrat lié à une ligne de facture, on recherche date debut et fin de la ligne // Si contrat lié à une ligne de facture, on recherche date debut et fin de la ligne
if ($contrat->facturedetid) { if ($contrat->facturedetid) {
$facturedet = new FactureLigne($db); $facturedet = new FactureLigne($db);
$facturedet->fetch($contrat->facturedetid); $facturedet->fetch($contrat->facturedetid);
$date_start=$facturedet->date_start; $date_start=$facturedet->date_start;
$date_end=$facturedet->date_end; $date_end=$facturedet->date_end;
} }
// Si date_start et date_end ne sont pas connues de la ligne de facture, on les // 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. // 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_start) { $date_start=mktime(); }
if (! $date_end) { if (! $date_end) {
if ($contrat->product->duration) { if ($contrat->product->duration)
// Si duree du service connue {
$duree_value = substr($contrat->product->duration,0,strlen($contrat->product->duration)-1); // Si duree du service connue
$duree_unit = substr($contrat->product->duration,-1); $duree_value = substr($contrat->product->duration,0,strlen($contrat->product->duration)-1);
$duree_unit = substr($contrat->product->duration,-1);
$month = date("m",$date_start); $month = date("m",$date_start);
$day = date("d",$date_start); $day = date("d",$date_start);
@ -235,78 +176,78 @@ else
switch($duree_unit) switch($duree_unit)
{ {
case "d": case "d":
$day = $day + $duree_value; $day = $day + $duree_value;
break; break;
case "w": case "w":
$day = $day + ($duree_value * 7); $day = $day + ($duree_value * 7);
break; break;
case "m": case "m":
$month = $month + $duree_value; $month = $month + $duree_value;
break; break;
case "y": case "y":
$year = $year + $duree_value; $year = $year + $duree_value;
break; break;
} }
$date_end = mktime(date("H",$date_start), date("i",$date_start), 0, $month, $day, $year); $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 '<form action="fiche.php?id='.$id.'" method="post">';
print '<input type="hidden" name="action" value="miseenservice">'; print '<input type="hidden" name="action" value="miseenservice">';
print '<tr><td>Durée standard pour ce service</td><td colspan="3">'; print '<tr><td>Durée standard pour ce service</td><td colspan="3">';
print $contrat->product->duration; print $contrat->product->duration;
print '<input type="hidden" name="duration" value="'.$contrat->product->duration.'">'; print '<input type="hidden" name="duration" value="'.$contrat->product->duration.'">';
print '</td></tr>'; print '</td></tr>';
// Date de début de mise en service // Date de début de mise en service
print '<tr><td>Date de mise en service</td><td colspan="3">'; print '<tr><td>Date de mise en service</td><td colspan="3">';
print $html->select_date($date_start,'date_start',1,1); print $html->select_date($date_start,'date_start',1,1);
print "&nbsp;"; print "&nbsp;";
print '</td></tr>'; print '</td></tr>';
// Date de fin prévue de mise en service // Date de fin prévue de mise en service
print '<tr><td>Date de fin prévue</td><td colspan="3">'; print '<tr><td>Date de fin prévue</td><td colspan="3">';
print $html->select_date($date_end,'date_end',1,1); print $html->select_date($date_end,'date_end',1,1);
print "&nbsp;"; print "&nbsp;";
print '</td></tr>'; print '</td></tr>';
print '<tr><td colspan="4" align="center">'; print '<tr><td colspan="4" align="center">';
print '<input type="submit" value="Enregistrer">'; print '<input type="submit" value="Enregistrer">';
print '</td></tr>'; print '</td></tr>';
print '</form>'; 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>";
print '<br>';
print '</div>';
} }
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>";
print '<br>';
print '</div>';
} }
else
{
print "Error";
}
} }
else
{
print "Error";
}
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */

2
htdocs/main.inc.php
View File

@ -208,7 +208,7 @@ $langs = new Translate(DOL_DOCUMENT_ROOT ."/langs", $conf->langage);
*/ */
if (defined("MAIN_NOT_INSTALLED")) if (defined("MAIN_NOT_INSTALLED"))
{ {
Header("Location: install.php"); Header("Location: install/index.php");
} }

2
htdocs/pre.inc.php
View File

@ -110,7 +110,7 @@ function llxHeader($head = "") {
if ($conf->commande->enabled) if ($conf->commande->enabled)
{ {
$menu->add(DOL_URL_ROOT."/commande/index.php", "Commandes"); $menu->add(DOL_URL_ROOT."/commande/index.php", "Commandes");
if ($conf->expedition->enabled) { if ($conf->expedition->enabled) {
$menu->add_submenu(DOL_URL_ROOT."/expedition/index.php", "Expéditions"); $menu->add_submenu(DOL_URL_ROOT."/expedition/index.php", "Expéditions");
} }
} }