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

Tache #7526

Browse Source
This commit is contained in:
Laurent Destailleur 2008-01-27 00:43:26 +00:00
parent 70b1fabf13
commit 979b0aaa36
2 changed files with 11 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
htdocs/admin/societe.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Éric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2004 <EFBFBD>ric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr>
*
@ -78,20 +78,7 @@ if ($_POST["action"] == 'usesearchtoselectcompany')
}
}
if ($_POST["action"] == 'viewfulldateactions')
{
if (dolibarr_set_const($db, "COMPANY_VIEW_FULL_DATE_ACTIONS", $_POST["activate_viewfulldateactions"]))
{
Header("Location: ".$_SERVER["PHP_SELF"]);
exit;
}
else
{
dolibarr_print_error($db);
}
}
// défini les constantes du modèle tigre
// define constants for tigre model
if ($_POST["action"] == 'updateMask')
{
dolibarr_set_const($db, "CODE_TIGRE_MASK_CUSTOMER",$_POST["maskcustomer"]);
@ -252,7 +239,7 @@ print " <td>".$langs->trans("Parameters")."</td>\n";
print " <td align=\"right\" width=\"60\">".$langs->trans("Value")."</td>\n";
print " <td width=\"80\">&nbsp;</td></tr>\n";
// Utilisation formulaire Ajax sur choix société
// Utilisation formulaire Ajax sur choix soci<EFBFBD>t<EFBFBD>
$var=!$var;
print "<form method=\"post\" action=\"societe.php\">";
print "<input type=\"hidden\" name=\"action\" value=\"usesearchtoselectcompany\">";
@ -275,20 +262,6 @@ else
print '</tr>';
print '</form>';
// Faire apparaitre les dates en entier dans la liste des actions
$var=!$var;
print "<form method=\"post\" action=\"societe.php\">";
print "<input type=\"hidden\" name=\"action\" value=\"viewfulldateactions\">";
print "<tr ".$bc[$var].">";
print '<td width="80%">'.$langs->trans("ViewFullDateActions").'</td>';
print '<td width="60" align="right">';
print $html->selectyesno("activate_viewfulldateactions",$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS,1);
print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</td>";
print '</tr>';
print '</form>';
print '</table>';
$db->close();

38
htdocs/comm/prospect/fiche.php
View File

@ -365,25 +365,11 @@ if ($socid > 0)
$obj = $db->fetch_object($result);
print "<tr $bc[$var]>";
if ($oldyear == strftime("%Y",$obj->dp) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS)
{
print '<td width="30" align="center">|</td>';
}
else
{
print '<td width="30" align="center">'.strftime("%Y",$obj->dp)."</td>\n";
$oldyear = strftime("%Y",$obj->dp);
}
print '<td width="30" align="center">'.strftime("%Y",$obj->dp)."</td>\n";
$oldyear = strftime("%Y",$obj->dp);
if ($oldmonth == strftime("%Y%b",$obj->dp) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS)
{
print '<td width="30" align="center">|</td>';
}
else
{
print '<td width="30" align="center">' .strftime("%b",$obj->dp)."</td>\n";
$oldmonth = strftime("%Y%b",$obj->dp);
}
print '<td width="30" align="center">' .strftime("%b",$obj->dp)."</td>\n";
$oldmonth = strftime("%Y%b",$obj->dp);
print '<td width="20">'.strftime("%d",$obj->dp)."</td>\n";
print '<td width="30">'.strftime("%H:%M",$obj->dp)."</td>\n";
@ -472,19 +458,11 @@ if ($socid > 0)
$obj = $db->fetch_object($result);
print "<tr $bc[$var]>";
if ($oldyear == strftime("%Y",$obj->da) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS) {
print '<td width="30" align="center">|</td>';
} else {
print '<td width="30" align="center">'.strftime("%Y",$obj->da)."</td>\n";
$oldyear = strftime("%Y",$obj->da);
}
print '<td width="30" align="center">'.strftime("%Y",$obj->da)."</td>\n";
$oldyear = strftime("%Y",$obj->da);
if ($oldmonth == strftime("%Y%b",$obj->da) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS) {
print '<td width="30" align="center">|</td>';
} else {
print '<td width="30" align="center">'.strftime("%b",$obj->da)."</td>\n";
$oldmonth = strftime("%Y%b",$obj->da);
}
print '<td width="30" align="center">'.strftime("%b",$obj->da)."</td>\n";
$oldmonth = strftime("%Y%b",$obj->da);
print '<td width="20">'.strftime("%d",$obj->da)."</td>\n";
print '<td width="30">'.strftime("%H:%M",$obj->da)."</td>\n";