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

Ajout de la possibilit de dterminer si on veut voir ou non la date en entier des actions dans la fiche tiers

Browse Source
This commit is contained in:
Regis Houssin 2007-12-05 12:36:30 +00:00
parent 073830eb6b
commit 03f9455bf7
6 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
htdocs/admin/societe.php
View File

@ -2,6 +2,7 @@
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 É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>
*
* 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
@ -77,6 +78,19 @@ 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
if ($_POST["action"] == 'updateMask')
{
@ -237,7 +251,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été
$var=!$var;
print "<form method=\"post\" action=\"societe.php\">";
print "<input type=\"hidden\" name=\"action\" value=\"usesearchtoselectcompany\">";
@ -260,6 +274,20 @@ 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();

8
htdocs/comm/fiche.php
View File

@ -741,7 +741,7 @@ if ($socid > 0)
$obj = $db->fetch_object($result);
print "<tr $bc[$var]>";
if ($oldyear == strftime("%Y",$obj->dp) )
if ($oldyear == strftime("%Y",$obj->dp) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS)
{
print '<td width="30" align="center">|</td>';
}
@ -751,7 +751,7 @@ if ($socid > 0)
$oldyear = strftime("%Y",$obj->dp);
}
if ($oldmonth == strftime("%Y%b",$obj->dp) )
if ($oldmonth == strftime("%Y%b",$obj->dp) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS)
{
print '<td width="30" align="center">|</td>';
}
@ -873,7 +873,7 @@ if ($socid > 0)
print "<tr $bc[$var]>";
// Champ date
if ($oldyear == strftime("%Y",$obj->da) )
if ($oldyear == strftime("%Y",$obj->da) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS)
{
print '<td width="30" align="center">|</td>';
}
@ -883,7 +883,7 @@ if ($socid > 0)
$oldyear = strftime("%Y",$obj->da);
}
if ($oldmonth == strftime("%Y%b",$obj->da) )
if ($oldmonth == strftime("%Y%b",$obj->da) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS)
{
print '<td width="30" align="center">|</td>';
}

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

@ -339,7 +339,7 @@ if ($socid > 0)
$obj = $db->fetch_object($result);
print "<tr $bc[$var]>";
if ($oldyear == strftime("%Y",$obj->dp) )
if ($oldyear == strftime("%Y",$obj->dp) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS)
{
print '<td width="30" align="center">|</td>';
}
@ -349,7 +349,7 @@ if ($socid > 0)
$oldyear = strftime("%Y",$obj->dp);
}
if ($oldmonth == strftime("%Y%b",$obj->dp) )
if ($oldmonth == strftime("%Y%b",$obj->dp) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS)
{
print '<td width="30" align="center">|</td>';
}
@ -438,14 +438,14 @@ if ($socid > 0)
$obj = $db->fetch_object($result);
print "<tr $bc[$var]>";
if ($oldyear == strftime("%Y",$obj->da) ) {
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);
}
if ($oldmonth == strftime("%Y%b",$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";

8
htdocs/fourn/fiche.php
View File

@ -390,7 +390,7 @@ if ( $societe->fetch($socid) )
$obj = $db->fetch_object($result);
print "<tr $bc[$var]>";
if ($oldyear == strftime("%Y",$obj->dp) )
if ($oldyear == strftime("%Y",$obj->dp) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS)
{
print '<td width="30" align="center">|</td>';
}
@ -400,7 +400,7 @@ if ( $societe->fetch($socid) )
$oldyear = strftime("%Y",$obj->dp);
}
if ($oldmonth == strftime("%Y%b",$obj->dp) )
if ($oldmonth == strftime("%Y%b",$obj->dp) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS)
{
print '<td width="30" align="center">|</td>';
}
@ -493,7 +493,7 @@ if ( $societe->fetch($socid) )
$obj = $db->fetch_object($result);
print "<tr $bc[$var]>";
if ($oldyear == strftime("%Y",$obj->da) )
if ($oldyear == strftime("%Y",$obj->da) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS)
{
print '<td width="30" align="center">|</td>';
} else {
@ -501,7 +501,7 @@ if ( $societe->fetch($socid) )
$oldyear = strftime("%Y",$obj->da);
}
if ($oldmonth == strftime("%Y%b",$obj->da) )
if ($oldmonth == strftime("%Y%b",$obj->da) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS)
{
print '<td width="30" align="center">|</td>';
} else {

3
htdocs/langs/en_US/admin.lang
View File

@ -21,7 +21,8 @@ DictionnarySetup=Dictionnary setup
DisableJavascript=Disable JavaScript functions
DisableAjax=Disable Ajax functions
ConfirmAjax=Use Ajax confirmation popups
UseSearchToSelectProduct=Use a search form to choose a company (intead of using a list box)
UseSearchToSelectCompany=Use a search form to choose a company (intead of using a list box)
ViewFullDateActions=Show full dates actions in the third sheet
NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
JavascriptDisabled=JavaScript disabled
UsePopupCalendar=Use popup for dates input

1
htdocs/langs/fr_FR/admin.lang
View File

@ -22,6 +22,7 @@ DisableJavascript=D
DisableAjax=Désactiver les fonctions Ajax
ConfirmAjax=Utiliser les popups de confirmation Ajax
UseSearchToSelectCompany=Utiliser un formulaire de recherche pour choix d'un tiers (plutôt que liste déroulante)
ViewFullDateActions=Visualiser les dates des actions en entier dans la fiche tiers
NotAvailableWhenAjaxDisabled=Non disponible quand Ajax désactivé
JavascriptDisabled=Javascript désactivé
UsePopupCalendar=Utiliser les popups pour la saisie des dates