Look: Modif esthtiques mineures
This commit is contained in:
Laurent Destailleur
parent
a8b16f2603
commit
04f184d042
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
*
|
||||
* 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
|
||||
@ -20,7 +20,7 @@
|
||||
* $Source$
|
||||
*/
|
||||
|
||||
/*!
|
||||
/**
|
||||
\file htdocs/admin/compta.php
|
||||
\ingroup comptabilite
|
||||
\brief Page de configuration du module comptabilité
|
||||
@ -70,12 +70,12 @@ if ($_GET["action"] == 'delete')
|
||||
}
|
||||
|
||||
|
||||
|
||||
print_titre($langs->trans("ComptaSetup"));
|
||||
|
||||
|
||||
print "<br>";
|
||||
|
||||
print '<table class="noborder" cellpadding="3" cellspacing="0" width=\"100%\">';
|
||||
print '<table class="noborder" width=\"100%\">';
|
||||
|
||||
// Cas du paramètre COMPTA_MODE
|
||||
print '<form action="compta.php" method="post">';
|
||||
@ -84,9 +84,9 @@ print '<tr class="liste_titre">';
|
||||
print '<td>'.$langs->trans("OptionMode").'</td><td>'.$langs->trans("Description").'</td>';
|
||||
print '<td><input type="submit" value="'.$langs->trans("Modify").'"></td>';
|
||||
print "</tr>\n";
|
||||
print "<tr ".$bc[True]."><td width=\"200\"><input type=\"radio\" name=\"compta_mode\" value=\"RECETTES-DEPENSES\"".($compta_mode != "CREANCES-DETTES"?" checked":"")."> ".$langs->trans("OptionModeTrue")."</td>";
|
||||
print "<tr ".$bc[false]."><td width=\"200\"><input type=\"radio\" name=\"compta_mode\" value=\"RECETTES-DEPENSES\"".($compta_mode != "CREANCES-DETTES"?" checked":"")."> ".$langs->trans("OptionModeTrue")."</td>";
|
||||
print "<td colspan=\"2\">".nl2br($langs->trans("OptionModeTrueDesc"))."</td></tr>\n";
|
||||
print "<tr ".$bc[False]."><td width=\"200\"><input type=\"radio\" name=\"compta_mode\" value=\"CREANCES-DETTES\"".($compta_mode == "CREANCES-DETTES"?" checked":"")."> ".$langs->trans("OptionModeVirtual")."</td>";
|
||||
print "<tr ".$bc[true]."><td width=\"200\"><input type=\"radio\" name=\"compta_mode\" value=\"CREANCES-DETTES\"".($compta_mode == "CREANCES-DETTES"?" checked":"")."> ".$langs->trans("OptionModeVirtual")."</td>";
|
||||
print "<td colspan=\"2\">".$langs->trans("OptionModeVirtualDesc")."</td></tr>\n";
|
||||
print "</form>";
|
||||
|
||||
@ -95,16 +95,18 @@ print "</table>\n";
|
||||
print "<br>\n";
|
||||
|
||||
// Cas des autres paramètres COMPTA_*
|
||||
$sql = "SELECT rowid, name, value, type, note FROM llx_const WHERE name like 'COMPTA_%' and name not in ('COMPTA_MODE')";
|
||||
$sql ="SELECT rowid, name, value, type, note";
|
||||
$sql.=" FROM llx_const";
|
||||
$sql.=" WHERE name like 'COMPTA_%' and name not in ('COMPTA_MODE')";
|
||||
$result = $db->query($sql);
|
||||
if ($result)
|
||||
{
|
||||
$num = $db->num_rows();
|
||||
$num = $db->num_rows($result);
|
||||
$i = 0;
|
||||
$var=True;
|
||||
$var=true;
|
||||
|
||||
if ($num) {
|
||||
print '<table class="noborder" cellpadding="3" cellspacing="0" width=\"100%\">';
|
||||
print '<table class="noborder" width=\"100%\">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td>'.$langs->trans("OtherOptions").'</td><td> </td><td> </td><td>'.$langs->trans("Description").'</td>';
|
||||
print '<td> </td>';
|
||||
@ -163,20 +165,9 @@ if ($result)
|
||||
|
||||
}
|
||||
|
||||
|
||||
$db->close();
|
||||
|
||||
|
||||
llxFooter('$Date$ - $Revision$');
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
llxFooter("<em>Dernière modification $Date$ révision $Revision$</em>");
|
||||
?>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
*
|
||||
* 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
|
||||
@ -92,7 +92,7 @@ if ($_GET["action"] == 'delete')
|
||||
$dir = "../includes/modules/facture/";
|
||||
|
||||
|
||||
llxHeader('','Fiche commande','FactureConfiguration');
|
||||
llxHeader('',$langs->trans("BillsSetup"),'FactureConfiguration');
|
||||
|
||||
print_titre($langs->trans("BillsSetup"));
|
||||
|
||||
@ -101,7 +101,7 @@ print_titre($langs->trans("BillsSetup"));
|
||||
* Module numérotation
|
||||
*/
|
||||
print "<br>";
|
||||
print_titre("Module de numérotation des factures");
|
||||
print_titre($langs->trans("BillsNumberingModule"));
|
||||
|
||||
print '<table class="noborder" width=\"100%\">';
|
||||
print '<tr class="liste_titre">';
|
||||
@ -161,7 +161,7 @@ closedir($handle);
|
||||
print '</table>';
|
||||
|
||||
print "<br>";
|
||||
print_titre("Date des factures");
|
||||
print_titre($langs->trans("BillsDate"));
|
||||
|
||||
print '<table class="noborder" width=\"100%\">';
|
||||
print '<tr class="liste_titre">';
|
||||
@ -170,6 +170,7 @@ print '<td align="center" width="60">'.$langs->trans("Activated").'</td>';
|
||||
print '<td width="80"> </td>';
|
||||
print "</tr>\n";
|
||||
|
||||
$var=false;
|
||||
print '<tr '.$bc[$var].'><td>';
|
||||
echo "Forcer la définition de la date des factures lors de la validation";
|
||||
|
||||
@ -345,7 +346,7 @@ print "</table>";
|
||||
print '<br>';
|
||||
print_titre("Options fiscales de facturation de la TVA");
|
||||
|
||||
print '<table class="noborder" cellpadding="2" cellspacing="0" width=\"100%\">';
|
||||
print '<table class="noborder" width=\"100%\">';
|
||||
print '<form action="facture.php" method="post">';
|
||||
print '<input type="hidden" name="action" value="settvaoption">';
|
||||
print '<tr class="liste_titre">';
|
||||
@ -355,12 +356,14 @@ print "</tr>\n";
|
||||
$var=True;
|
||||
$var=!$var;
|
||||
print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optiontva\" value=\"reel\"".($facture_tva_option != "franchise"?" checked":"")."> Option réel</td>";
|
||||
print "<td colspan=\"2\">L'option 'réel' est la plus courante. Elle est à destination des entreprises et professions libérales.\nChaque produits/service vendu est soumis à la TVA (Dolibarr propose le taux standard par défaut à la création d'une facture). Cette dernière est récupérée l'année suivante suite à la déclaration TVA pour les produits/services achetés et est reversée à l'état pour les produits/services vendus.</td></tr>\n";
|
||||
print "<td colspan=\"2\">L'option 'réel' est la plus courante. Elle est à destination des entreprises et professions libérales.\nChaque produits/service vendu est soumis à la TVA (Dolibarr propose le taux standard par défaut à la création d'une facture). Cette dernière est récupérée l'année suivante suite à la déclaration TVA pour les produits/services achetés et est reversée à l'état pour les produits/services vendus.";
|
||||
print "</td></tr>\n";
|
||||
$var=!$var;
|
||||
print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optiontva\" value=\"facturation\"".($facture_tva_option == "facturation"?" checked":"")."> Option facturation</td>";
|
||||
print "<td colspan=\"2\">L'option 'facturation' est utilisée par les entreprises qui payent la TVA à facturation (vente de matériel).</td></tr>\n";
|
||||
$var=!$var;
|
||||
print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optiontva\" value=\"franchise\"".($facture_tva_option == "franchise"?" checked":"")."> Option franchise</td>";
|
||||
print "<td colspan=\"2\">L'option 'franchise' est utilisée par les particuliers ou professions libérales à titre occasionnel avec de petits chiffres d'affaires.\nChaque produits/service vendu est soumis à une TVA de 0 (Dolibarr propose le taux 0 par défaut à la création d'une facture cliente). Il n'y a pas de déclaration ou récupération de TVA, et les factures qui gèrent l'option affichent la mention obligatoire \"TVA non applicable - art-293B du CGI\".</td></tr>\n";
|
||||
print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optiontva\" value=\"facturation\"".($facture_tva_option == "facturation"?" checked":"")."> Option facturation</td>";
|
||||
print "<td colspan=\"2\">L'option 'facturation' est utilisée par les entreprises qui payent la TVA à facturation (vente de matériel).</td></tr>\n";
|
||||
print "</form>";
|
||||
print "</table>";
|
||||
|
||||
@ -369,5 +372,5 @@ print "<br>";
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter("<em>Dernière modification $Date$ révision $Revision$</em>");
|
||||
llxFooter('$Date$ - $Revision$');
|
||||
?>
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
<?php
|
||||
/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
|
||||
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
|
||||
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
|
||||
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
|
||||
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
|
||||
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
|
||||
*
|
||||
* 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
|
||||
@ -32,6 +32,7 @@
|
||||
require("./pre.inc.php");
|
||||
|
||||
$langs->load("admin");
|
||||
$langs->load("propal");
|
||||
|
||||
if (!$user->admin)
|
||||
accessforbidden();
|
||||
@ -48,7 +49,6 @@ llxHeader();
|
||||
|
||||
if ($_GET["action"] == 'set')
|
||||
{
|
||||
|
||||
$sql = "INSERT INTO ".MAIN_DB_PREFIX."propal_model_pdf (nom) VALUES ('".$_GET["value"]."')";
|
||||
|
||||
if ($db->query($sql))
|
||||
@ -72,22 +72,19 @@ $propale_addon_var_pdf = PROPALE_ADDON_PDF;
|
||||
|
||||
if ($_GET["action"] == 'setpdf')
|
||||
{
|
||||
if (dolibarr_set_const($db, "PROPALE_ADDON_PDF",$_GET["value"]))
|
||||
if (dolibarr_set_const($db, "PROPALE_ADDON_PDF",$_GET["value"]))
|
||||
{
|
||||
// la constante qui a été lue en avant du nouveau set
|
||||
// on passe donc par une variable pour avoir un affichage cohérent
|
||||
$propale_addon_var_pdf = $_GET["value"];
|
||||
// La constante qui a été lue en avant du nouveau set
|
||||
// on passe donc par une variable pour avoir un affichage cohérent
|
||||
$propale_addon_var_pdf = $_GET["value"];
|
||||
}
|
||||
/*
|
||||
* On la set active
|
||||
*/
|
||||
$sql_del = "delete from ".MAIN_DB_PREFIX."propal_model_pdf
|
||||
where nom = '".$_GET["value"]."';";
|
||||
$db->query($sql_del);
|
||||
|
||||
$sql = "INSERT INTO ".MAIN_DB_PREFIX."propal_model_pdf (nom) VALUES ('".$_GET["value"]."')";
|
||||
|
||||
if ($db->query($sql))
|
||||
// On active le modele
|
||||
$sql_del = "delete from ".MAIN_DB_PREFIX."propal_model_pdf where nom = '".$_GET["value"]."';";
|
||||
$db->query($sql_del);
|
||||
|
||||
$sql = "INSERT INTO ".MAIN_DB_PREFIX."propal_model_pdf (nom) VALUES ('".$_GET["value"]."')";
|
||||
if ($db->query($sql))
|
||||
{
|
||||
|
||||
}
|
||||
@ -105,15 +102,17 @@ if ($_GET["action"] == 'setmod')
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
*
|
||||
* Affiche page
|
||||
*/
|
||||
|
||||
print_titre($langs->trans("PropalSetup"));
|
||||
|
||||
print "<br>";
|
||||
|
||||
print_titre("Module de numérotation des propositions commerciales");
|
||||
print_titre($langs->trans("ProposalsNumberingModules"));
|
||||
|
||||
print "<table class=\"noborder\" width=\"100%\">\n";
|
||||
print "<tr class=\"liste_titre\">\n";
|
||||
@ -121,7 +120,6 @@ print " <td>".$langs->trans("Name")."</td>\n";
|
||||
print " <td>".$langs->trans("Description")."</td>\n";
|
||||
print " <td>".$langs->trans("Example")."</td>\n";
|
||||
print " <td align=\"center\">".$langs->trans("Activated")."</td>\n";
|
||||
print " <td> </td>\n";
|
||||
print "</tr>\n";
|
||||
|
||||
clearstatcache();
|
||||
@ -130,7 +128,7 @@ $dir = "../includes/modules/propale/";
|
||||
$handle = opendir($dir);
|
||||
if ($handle)
|
||||
{
|
||||
$var=false;
|
||||
$var=true;
|
||||
while (($file = readdir($handle))!==false)
|
||||
{
|
||||
if (substr($file, 0, 12) == 'mod_propale_' && substr($file, strlen($file)-3, 3) == 'php')
|
||||
@ -148,14 +146,13 @@ if ($handle)
|
||||
|
||||
if ($propale_addon_var == "$file")
|
||||
{
|
||||
print " <td align=\"center\">";
|
||||
print '<td align="center">';
|
||||
print img_tick();
|
||||
print "</td>\n <td> </td>\n";
|
||||
print '</td>';
|
||||
}
|
||||
else
|
||||
{
|
||||
print " <td> </td>\n";
|
||||
print " <td align=\"center\"><a href=\"propale.php?action=setmod&value=".$file."\">".$langs->trans("Activate")."</a></td>\n";
|
||||
print "<td align=\"center\"><a href=\"propale.php?action=setmod&value=".$file."\">".$langs->trans("Activate")."</a></td>\n";
|
||||
}
|
||||
|
||||
print "</tr>\n";
|
||||
@ -170,17 +167,19 @@ print "</table><br>\n";
|
||||
* PDF
|
||||
*/
|
||||
|
||||
print_titre("Modèles de propale pdf");
|
||||
print_titre($langs->trans("ProposalsPDFModules"));
|
||||
|
||||
$def = array();
|
||||
|
||||
$sql = "SELECT nom FROM ".MAIN_DB_PREFIX."propal_model_pdf";
|
||||
if ($db->query($sql))
|
||||
$resql=$db->query($sql);
|
||||
if ($resql)
|
||||
{
|
||||
$i = 0;
|
||||
while ($i < $db->num_rows())
|
||||
$num_rows=$db->num_rows($resql);
|
||||
while ($i < $num_rows)
|
||||
{
|
||||
$array = $db->fetch_array($i);
|
||||
$array = $db->fetch_array($resql);
|
||||
array_push($def, $array[0]);
|
||||
$i++;
|
||||
}
|
||||
@ -196,15 +195,15 @@ print "<table class=\"noborder\" width=\"100%\">\n";
|
||||
print "<tr class=\"liste_titre\">\n";
|
||||
print " <td width=\"140\">".$langs->trans("Name")."</td>\n";
|
||||
print " <td>".$langs->trans("Description")."</td>\n";
|
||||
print " <td colspan=\"2\">".$langs->trans("Activated")."</td>\n";
|
||||
print " <td colspan=\"2\">".$langs->trans("Default")."</td>\n";
|
||||
print ' <td align="center" colspan="2">'.$langs->trans("Activated")."</td>\n";
|
||||
print ' <td align="center">'.$langs->trans("Default")."</td>\n";
|
||||
print "</tr>\n";
|
||||
|
||||
clearstatcache();
|
||||
|
||||
$handle=opendir($dir);
|
||||
|
||||
$var=false;
|
||||
$var=true;
|
||||
while (($file = readdir($handle))!==false)
|
||||
{
|
||||
if (substr($file, strlen($file) -12) == '.modules.php' && substr($file,0,12) == 'pdf_propale_')
|
||||
@ -244,13 +243,8 @@ while (($file = readdir($handle))!==false)
|
||||
}
|
||||
else
|
||||
{
|
||||
print " ";
|
||||
}
|
||||
|
||||
print "</td>\n <td>";
|
||||
|
||||
print '<a href="propale.php?action=setpdf&value='.$name.'">'.$langs->trans("Activate").'</a>';
|
||||
|
||||
}
|
||||
print '</td></tr>';
|
||||
}
|
||||
}
|
||||
@ -269,7 +263,7 @@ print "<tr class=\"liste_titre\">\n";
|
||||
print " <td>".$langs->trans("Name")."</td>\n";
|
||||
print " <td>".$langs->trans("Value")."</td>\n";
|
||||
print "</tr>\n";
|
||||
print "<tr ".$bc[True].">\n <td width=\"140\">".$langs->trans("Directory")."</td>\n <td>".$conf->propal->dir_output."</td>\n</tr>\n";
|
||||
print "<tr ".$bc[false].">\n <td width=\"140\">".$langs->trans("Directory")."</td>\n <td>".$conf->propal->dir_output."</td>\n</tr>\n";
|
||||
print "</table>\n<br>";
|
||||
|
||||
|
||||
@ -278,17 +272,17 @@ print "</table>\n<br>";
|
||||
* Formulaire création
|
||||
*
|
||||
*/
|
||||
print_titre("Formulaire de création");
|
||||
print_titre($langs->trans("CreateForm"));
|
||||
|
||||
print "<form method=\"post\" action=\"propale.php\">";
|
||||
print "<input type=\"hidden\" name=\"action\" value=\"nbprod\">";
|
||||
print "<table class=\"noborder\" cellpadding=\"3\" cellspacing=\"0\" width=\"100%\">";
|
||||
print "<table class=\"noborder\" width=\"100%\">";
|
||||
print "<tr class=\"liste_titre\">";
|
||||
print " <td>".$langs->trans("Name")."</td>\n";
|
||||
print " <td align=\"left\">".$langs->trans("Value")."</td>\n";
|
||||
print " <td> </td>\n";
|
||||
print "</tr><tr class=\"pair\">";
|
||||
print "<td>Nombre de ligne produits</td>";
|
||||
print "</tr><tr ".$bc[false].">";
|
||||
print '<td>'.$langs->trans("NumberOfProductLines").'</td>';
|
||||
print "<td align=\"left\"><input size=\"3\" type=\"text\" name=\"value\" value=\"".PROPALE_NEW_FORM_NB_PRODUCT."\"></td>";
|
||||
print '<td><input type="submit" value="'.$langs->trans("Modify").'"></td>';
|
||||
print '</tr>';
|
||||
|
||||
@ -20,7 +20,8 @@
|
||||
* $Source$
|
||||
*/
|
||||
|
||||
/** \file htdocs/admin/system/index.php
|
||||
/**
|
||||
\file htdocs/admin/system/index.php
|
||||
\brief Page accueil infos système
|
||||
\version $Revision$
|
||||
*/
|
||||
@ -43,7 +44,7 @@ print "<br>\n";
|
||||
|
||||
print '<table class="noborder" width="100%">';
|
||||
print "<tr class=\"liste_titre\"><td colspan=\"2\">Dolibarr</td></tr>\n";
|
||||
print "<tr $bc[1]><td width=\"240\">".$langs->trans("Version")."</td><td>" . DOL_VERSION . "</td></tr>\n";
|
||||
print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>" . DOL_VERSION . "</td></tr>\n";
|
||||
print '</table>';
|
||||
|
||||
print "<br>\n";
|
||||
@ -56,24 +57,24 @@ phpinfo();
|
||||
$chaine = ob_get_contents();
|
||||
ob_end_clean();
|
||||
eregi('System </td><td class="v">([^\/]*)</td>',$chaine,$reg);
|
||||
print "<tr $bc[1]><td width=\"240\">".$langs->trans("Version")."</td><td>".$reg[1]."</td></tr>\n";
|
||||
print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>".$reg[1]."</td></tr>\n";
|
||||
print '</table>';
|
||||
|
||||
print "<br>\n";
|
||||
|
||||
print '<table class="noborder" width="100%">';
|
||||
print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("WebServer")."</td></tr>\n";
|
||||
print "<tr $bc[1]><td width=\"240\">".$langs->trans("Version")."</td><td>".$_SERVER["SERVER_SOFTWARE"]."</td></tr>\n";
|
||||
print "<tr $bc[0]><td>".$langs->trans("DocumentRootServer")."</td><td>" . DOL_DOCUMENT_ROOT . "</td></tr>\n";
|
||||
print "<tr $bc[1]><td>".$langs->trans("DataRootServer")."</td><td>" . DOL_DATA_ROOT . "</td></tr>\n";
|
||||
print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>".$_SERVER["SERVER_SOFTWARE"]."</td></tr>\n";
|
||||
print "<tr $bc[1]><td>".$langs->trans("DocumentRootServer")."</td><td>" . DOL_DOCUMENT_ROOT . "</td></tr>\n";
|
||||
print "<tr $bc[0]><td>".$langs->trans("DataRootServer")."</td><td>" . DOL_DATA_ROOT . "</td></tr>\n";
|
||||
print '</table>';
|
||||
|
||||
print "<br>\n";
|
||||
|
||||
print '<table class="noborder" width="100%">';
|
||||
print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("Php")."</td></tr>\n";
|
||||
print "<tr $bc[1]><td width=\"240\">".$langs->trans("Version")."</td><td>".phpversion()."</td></tr>\n";
|
||||
print "<tr $bc[0]><td>".$langs->trans("PhpWebLink")."</td><td>".php_sapi_name()."</td></tr>\n";
|
||||
print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>".phpversion()."</td></tr>\n";
|
||||
print "<tr $bc[1]><td>".$langs->trans("PhpWebLink")."</td><td>".php_sapi_name()."</td></tr>\n";
|
||||
print '</table>';
|
||||
|
||||
print "<br>\n";
|
||||
@ -101,5 +102,5 @@ print "<tr $bc[1]><td>".$langs->trans("DatabaseName")."</td><td>" . $conf->db->n
|
||||
|
||||
print '</table>';
|
||||
|
||||
llxFooter("<em>Dernière modification $Date$ révision $Revision$</em>");
|
||||
llxFooter('$Date$ - $Revision$');
|
||||
?>
|
||||
|
||||
@ -19,7 +19,8 @@
|
||||
* $Source$
|
||||
*/
|
||||
|
||||
/*! \file htdocs/admin/system/os.php
|
||||
/**
|
||||
\file htdocs/admin/system/os.php
|
||||
\brief Page des infos système de l'OS
|
||||
\version $Revision$
|
||||
*/
|
||||
@ -41,6 +42,10 @@ print "<br>\n";
|
||||
print '<table class="noborder" width="100%">';
|
||||
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
|
||||
print "\n";
|
||||
|
||||
// Récupère l'OS au sens PHP
|
||||
print "<tr $bc[0]><td width=\"140\"><b>".$langs->trans("PHP_OS")."</b></td><td>".PHP_OS."</td></tr>\n";
|
||||
|
||||
// Récupère la version de l'OS
|
||||
ob_start();
|
||||
phpinfo();
|
||||
@ -51,5 +56,5 @@ print "<tr $bc[1]><td width=\"140\"><b>".$langs->trans("Version")."</b></td><td>
|
||||
print '</table>';
|
||||
|
||||
|
||||
llxFooter();
|
||||
llxFooter('$Date$ - $Revision$');
|
||||
?>
|
||||
|
||||
@ -19,7 +19,8 @@
|
||||
* $Source$
|
||||
*/
|
||||
|
||||
/** \file htdocs/admin/system/web.php
|
||||
/**
|
||||
\file htdocs/admin/system/web.php
|
||||
\brief Page des infos système du serveur Web
|
||||
\version $Revision$
|
||||
*/
|
||||
@ -40,12 +41,13 @@ print "<br>\n";
|
||||
|
||||
print '<table class="noborder" width="100%">';
|
||||
print "<tr class=\"liste_titre\"><td>".$langs->trans("Parameter")."</td><td>".$langs->trans("Value")."</td></tr>\n";
|
||||
print "<tr $bc[1]><td width=\"200\">".$langs->trans("Version")."</td><td>".$_SERVER["SERVER_SOFTWARE"]."</td></tr>\n";
|
||||
print "<tr $bc[0]><td>".$langs->trans("VirtualServerName")."</td><td>" . $_SERVER["SERVER_NAME"] . "</td></tr>\n";
|
||||
print "<tr $bc[1]><td width=\"200\">".$langs->trans("IP")."</td><td>".$_SERVER["SERVER_ADDR"]."</td></tr>\n";
|
||||
print "<tr $bc[0]><td>".$langs->trans("Port")."</td><td>" . $_SERVER["SERVER_PORT"] . "</td></tr>\n";
|
||||
print "<tr $bc[1]><td width=\"200\">".$langs->trans("DocumentRootServer")."</td><td>".$_SERVER["DOCUMENT_ROOT"]."</td></tr>\n";
|
||||
print "<tr $bc[0]><td width=\"200\">".$langs->trans("Version")."</td><td>".$_SERVER["SERVER_SOFTWARE"]."</td></tr>\n";
|
||||
print "<tr $bc[1]><td>".$langs->trans("VirtualServerName")."</td><td>" . $_SERVER["SERVER_NAME"] . "</td></tr>\n";
|
||||
print "<tr $bc[0]><td width=\"200\">".$langs->trans("IP")."</td><td>".$_SERVER["SERVER_ADDR"]."</td></tr>\n";
|
||||
print "<tr $bc[1]><td>".$langs->trans("Port")."</td><td>" . $_SERVER["SERVER_PORT"] . "</td></tr>\n";
|
||||
print "<tr $bc[0]><td width=\"200\">".$langs->trans("DocumentRootServer")."</td><td>".$_SERVER["DOCUMENT_ROOT"]."</td></tr>\n";
|
||||
print '</table>';
|
||||
|
||||
llxFooter();
|
||||
|
||||
llxFooter('$Date$ - $Revision$');
|
||||
?>
|
||||
|
||||
@ -234,7 +234,7 @@ if ($_GET["action"] == 'create')
|
||||
print '<input type="hidden" name="actionid" value="5">';
|
||||
|
||||
// Societe, contact
|
||||
print '<tr><td width="10%">'.$langs->trans("ActionOnCompany").'</td><td width="40%">';
|
||||
print '<tr><td>'.$langs->trans("ActionOnCompany").'</td><td>';
|
||||
if ($_GET["socid"])
|
||||
{
|
||||
$societe = new Societe($db);
|
||||
@ -251,18 +251,18 @@ if ($_GET["action"] == 'create')
|
||||
// Si la societe est imposée, on propose ces contacts
|
||||
if ($_GET["socid"])
|
||||
{
|
||||
print '<tr><td width="10%">'.$langs->trans("ActionOnContact").'</td><td width="40%">';
|
||||
print '<tr><td>'.$langs->trans("ActionOnContact").'</td><td width="40%">';
|
||||
print $html->select_contacts($_GET["socid"],'','contactid',1,1);
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
print '<tr><td width="10%">'.$langs->trans("Date").'</td><td width="40%">';
|
||||
print '<tr><td>'.$langs->trans("Date").'</td><td>';
|
||||
$html->select_date('','ac');
|
||||
print '</td></tr>';
|
||||
print '<tr><td width="10%">'.$langs->trans("Hour").'</td><td width="40%">';
|
||||
print '<tr><td>'.$langs->trans("Hour").'</td><td>';
|
||||
print_heure_select("heure",8,20);
|
||||
print '</td></tr>';
|
||||
print '<tr><td width="10%">'.$langs->trans("Duration").'</td><td width="40%">';
|
||||
print '<tr><td>'.$langs->trans("Duration").'</td><td>';
|
||||
print_duree_select("duree");
|
||||
print '</td></tr>';
|
||||
|
||||
@ -311,7 +311,7 @@ if ($_GET["action"] == 'create')
|
||||
print '<table class="border" width="100%">';
|
||||
|
||||
// Type d'action actifs
|
||||
print '<tr><td width="10%">'.$langs->trans("Action").'</td><td>';
|
||||
print '<tr><td>'.$langs->trans("Action").'</td><td>';
|
||||
if ($_GET["actionid"])
|
||||
{
|
||||
print '<input type="hidden" name="actionid" value="'.$_GET["actionid"].'">'."\n";
|
||||
@ -323,10 +323,10 @@ if ($_GET["action"] == 'create')
|
||||
}
|
||||
print '</td></tr>';
|
||||
|
||||
print '<tr><td width="10%">'.$langs->trans("Label").'</td><td><input type="text" name="label" size="30"></td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Label").'</td><td><input type="text" name="label" size="30"></td></tr>';
|
||||
|
||||
// Societe, contact
|
||||
print '<tr><td width="10%">'.$langs->trans("ActionOnCompany").'</td><td width="40%">';
|
||||
print '<tr><td>'.$langs->trans("ActionOnCompany").'</td><td>';
|
||||
if ($_GET["socid"])
|
||||
{
|
||||
$societe = new Societe($db);
|
||||
@ -343,7 +343,7 @@ if ($_GET["action"] == 'create')
|
||||
// Si la societe est imposée, on propose ces contacts
|
||||
if ($_GET["socid"])
|
||||
{
|
||||
print '<tr><td width="10%">'.$langs->trans("ActionOnContact").'</td><td width="40%">';
|
||||
print '<tr><td>'.$langs->trans("ActionOnContact").'</td><td>';
|
||||
print $html->select_contacts($_GET["socid"],'','contactid',1,1);
|
||||
print '</td></tr>';
|
||||
}
|
||||
@ -358,32 +358,32 @@ if ($_GET["action"] == 'create')
|
||||
elseif ($_GET["afaire"] == 2)
|
||||
{
|
||||
print '<input type="hidden" name="percentage" value="100">';
|
||||
print '<tr><td width="10%">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td>'.$langs->trans("StatusActionDone").' / 100%</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td>'.$langs->trans("StatusActionDone").' / 100%</td></tr>';
|
||||
} else
|
||||
{
|
||||
print '<tr><td width="10%">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td><input type="text" name="percentage" value="0%"></td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td><input type="text" name="percentage" value="0%"></td></tr>';
|
||||
}
|
||||
|
||||
// Date
|
||||
print '<tr><td width="10%">'.$langs->trans("Date").'</td><td width="40%">';
|
||||
print '<tr><td>'.$langs->trans("Date").'</td><td>';
|
||||
if ($_GET["afaire"] == 1)
|
||||
{
|
||||
$html->select_date('','ac');
|
||||
print '<tr><td width="10%">'.$langs->trans("Hour").'</td><td width="40%">';
|
||||
print '<tr><td>'.$langs->trans("Hour").'</td><td>';
|
||||
print_heure_select("heure",8,20);
|
||||
print '</td></tr>';
|
||||
}
|
||||
else if ($_GET["afaire"] == 2)
|
||||
{
|
||||
$html->select_date('','ac',1,1);
|
||||
print '<tr><td width="10%">'.$langs->trans("Hour").'</td><td width="40%">';
|
||||
print '<tr><td>'.$langs->trans("Hour").'</td><td>';
|
||||
print_heure_select("heure",8,20);
|
||||
print '</td></tr>';
|
||||
}
|
||||
else
|
||||
{
|
||||
$html->select_date('','ac',1,1);
|
||||
print '<tr><td width="10%">'.$langs->trans("Hour").'</td><td width="40%">';
|
||||
print '<tr><td>'.$langs->trans("Hour").'</td><td>';
|
||||
print_heure_select("heure",8,20);
|
||||
print '</td></tr>';
|
||||
}
|
||||
@ -448,12 +448,12 @@ if ($_GET["id"])
|
||||
print '<input type="hidden" name="from" value="'.$_SERVER["HTTP_REFERER"].'">';
|
||||
|
||||
print '<table class="border" width="100%">';
|
||||
print '<tr><td width="20%">'.$langs->trans("Type").'</td><td colspan="3">'.$act->type.'</td></tr>';
|
||||
print '<tr><td width="20%">'.$langs->trans("Label").'</td><td colspan="3">'.$act->libelle.'</td></tr>';
|
||||
print '<tr><td width="20%">'.$langs->trans("Company").'</td>';
|
||||
print '<td width="30%"><a href="../fiche.php?socid='.$act->societe->id.'">'.$act->societe->nom.'</a></td>';
|
||||
print '<tr><td>'.$langs->trans("Type").'</td><td colspan="3">'.$act->type.'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$act->libelle.'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Company").'</td>';
|
||||
print '<td><a href="../fiche.php?socid='.$act->societe->id.'">'.$act->societe->nom.'</a></td>';
|
||||
|
||||
print '<td width="20%">'.$langs->trans("Contact").'</td><td width="30%">';
|
||||
print '<td>'.$langs->trans("Contact").'</td><td width="30%">';
|
||||
$html->select_array("contactid", $act->societe->contact_array(), $act->contact->id, 1);
|
||||
print '</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("DateCreation").'</td><td>'.strftime('%d %B %Y %H:%M',$act->date).'</td>';
|
||||
@ -461,7 +461,7 @@ if ($_GET["id"])
|
||||
print '<tr><td>'.$langs->trans("PercentDone").'</td><td colspan="3"><input name="percent" value="'.$act->percent.'">%</td></tr>';
|
||||
if ($act->objet_url)
|
||||
{
|
||||
print '<tr><td>Objet lié</td>';
|
||||
print '<tr><td>'.$langs->trans("LinkedObject").'</td>';
|
||||
print '<td colspan="3">'.$act->objet_url.'</td></tr>';
|
||||
}
|
||||
|
||||
@ -477,19 +477,19 @@ if ($_GET["id"])
|
||||
{
|
||||
// Affichage fiche action en mode visu
|
||||
print '<table class="border" width="100%"';
|
||||
print '<tr><td width="20%">'.$langs->trans("Type").'</td><td colspan="3">'.$act->type.'</td></tr>';
|
||||
print '<tr><td width="20%">'.$langs->trans("Label").'</td><td colspan="3">'.$act->libelle.'</td></tr>';
|
||||
print '<tr><td width="20%">'.$langs->trans("Company").'</td>';
|
||||
print '<td width="30%">'.$act->societe->nom_url.'</td>';
|
||||
print '<tr><td>'.$langs->trans("Type").'</td><td colspan="3">'.$act->type.'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$act->libelle.'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("Company").'</td>';
|
||||
print '<td>'.$act->societe->nom_url.'</td>';
|
||||
|
||||
print '<td width="10%">'.$langs->trans("Contact").'</td>';
|
||||
print '<td width="40%"><a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$act->contact->id.'">'.$act->contact->fullname.'</a></td></tr>';
|
||||
print '<td>'.$langs->trans("Contact").'</td>';
|
||||
print '<td><a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$act->contact->id.'">'.$act->contact->fullname.'</a></td></tr>';
|
||||
print '<tr><td>'.$langs->trans("DateCreation").'</td><td>'.strftime('%d %B %Y %H:%M',$act->date).'</td>';
|
||||
print '<td>'.$langs->trans("Author").'</td><td>'.$act->author->fullname.'</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("PercentDone").'</td><td colspan="3">'.$act->percent.' %</td></tr>';
|
||||
if ($act->objet_url)
|
||||
{
|
||||
print '<tr><td>Objet lié</td>';
|
||||
print '<tr><td>'.$langs->trans("LinkedObject").'</td>';
|
||||
print '<td colspan="3">'.$act->objet_url.'</td></tr>';
|
||||
}
|
||||
|
||||
@ -514,21 +514,20 @@ if ($_GET["id"])
|
||||
|
||||
if ($_GET["action"] == 'edit')
|
||||
{
|
||||
print '<a class="tabAction" href="fiche.php?id='.$act->id.'">'.$langs->trans("Cancel").'</a>';
|
||||
print '<a class="butAction" href="fiche.php?id='.$act->id.'">'.$langs->trans("Cancel").'</a>';
|
||||
}
|
||||
else
|
||||
{
|
||||
print '<a class="tabAction" href="fiche.php?action=edit&id='.$act->id.'">'.$langs->trans("Edit").'</a>';
|
||||
print '<a class="butAction" href="fiche.php?action=edit&id='.$act->id.'">'.$langs->trans("Edit").'</a>';
|
||||
}
|
||||
|
||||
print '<a class="butDelete" href="fiche.php?action=delete&id='.$act->id.'">'.$langs->trans("Delete").'</a>';
|
||||
print '<a class="butActionDelete" href="fiche.php?action=delete&id='.$act->id.'">'.$langs->trans("Delete").'</a>';
|
||||
print '</div>';
|
||||
}
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter("<em>Dernière modification $Date$ révision $Revision$</em>");
|
||||
|
||||
llxFooter('$Date$ - $Revision$');
|
||||
|
||||
|
||||
/**
|
||||
|
||||
Loading…
Reference in New Issue
Block a user