diff --git a/htdocs/admin/societe.php b/htdocs/admin/societe.php index 9dc0fdd51a9..32d3064a849 100644 --- a/htdocs/admin/societe.php +++ b/htdocs/admin/societe.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Éric Seigne + * Copyright (C) 2004 �ric Seigne * Copyright (C) 2005-2007 Laurent Destailleur * Copyright (C) 2005-2007 Regis Houssin * @@ -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 " ".$langs->trans("Parameters")."\n"; print " ".$langs->trans("Value")."\n"; print "  \n"; -// Utilisation formulaire Ajax sur choix société +// Utilisation formulaire Ajax sur choix soci�t� $var=!$var; print "
"; print ""; @@ -275,20 +262,6 @@ else print ''; print '
'; -// Faire apparaitre les dates en entier dans la liste des actions -$var=!$var; -print "
"; -print ""; -print ""; -print ''.$langs->trans("ViewFullDateActions").''; -print ''; -print $html->selectyesno("activate_viewfulldateactions",$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS,1); -print ''; -print ''; -print ""; -print ''; -print '
'; - print ''; $db->close(); diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php index 333c6c33d98..c1e089bb841 100644 --- a/htdocs/comm/prospect/fiche.php +++ b/htdocs/comm/prospect/fiche.php @@ -365,25 +365,11 @@ if ($socid > 0) $obj = $db->fetch_object($result); print ""; - if ($oldyear == strftime("%Y",$obj->dp) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS) - { - print '|'; - } - else - { - print ''.strftime("%Y",$obj->dp)."\n"; - $oldyear = strftime("%Y",$obj->dp); - } + print ''.strftime("%Y",$obj->dp)."\n"; + $oldyear = strftime("%Y",$obj->dp); - if ($oldmonth == strftime("%Y%b",$obj->dp) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS) - { - print '|'; - } - else - { - print '' .strftime("%b",$obj->dp)."\n"; - $oldmonth = strftime("%Y%b",$obj->dp); - } + print '' .strftime("%b",$obj->dp)."\n"; + $oldmonth = strftime("%Y%b",$obj->dp); print ''.strftime("%d",$obj->dp)."\n"; print ''.strftime("%H:%M",$obj->dp)."\n"; @@ -472,19 +458,11 @@ if ($socid > 0) $obj = $db->fetch_object($result); print ""; - if ($oldyear == strftime("%Y",$obj->da) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS) { - print '|'; - } else { - print ''.strftime("%Y",$obj->da)."\n"; - $oldyear = strftime("%Y",$obj->da); - } + print ''.strftime("%Y",$obj->da)."\n"; + $oldyear = strftime("%Y",$obj->da); - if ($oldmonth == strftime("%Y%b",$obj->da) && !$conf->global->COMPANY_VIEW_FULL_DATE_ACTIONS) { - print '|'; - } else { - print ''.strftime("%b",$obj->da)."\n"; - $oldmonth = strftime("%Y%b",$obj->da); - } + print ''.strftime("%b",$obj->da)."\n"; + $oldmonth = strftime("%Y%b",$obj->da); print ''.strftime("%d",$obj->da)."\n"; print ''.strftime("%H:%M",$obj->da)."\n";