Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Date must be GTM in agenda export

Browse Source
This commit is contained in:
Laurent Destailleur
2008-07-28 21:20:23 +00:00
parent 447dad021d
commit 5f4ded10da
6 changed files with 1340 additions and 1339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/actioncomm.class.php
View File

@@ -151,12 +151,12 @@ class ActionComm
$sql.= "fk_facture,propalrowid,fk_commande)"; $sql.= "fk_facture,propalrowid,fk_commande)";
$sql.= " VALUES ("; $sql.= " VALUES (";
$sql.= "'".$this->db->idate($now)."',"; $sql.= "'".$this->db->idate($now)."',";
$sql.= ($this->datep?"'".$this->db->idate($this->datep)."'":"null").","; $sql.= ($this->datep!=''?"'".$this->db->idate($this->datep)."'":"null").",";
$sql.= ($this->datef?"'".$this->db->idate($this->datef)."'":"null").","; $sql.= ($this->datef!=''?"'".$this->db->idate($this->datef)."'":"null").",";
$sql.= ($this->date?"'".$this->db->idate($this->date)."'":"null").","; $sql.= ($this->date!=''?"'".$this->db->idate($this->date)."'":"null").",";
$sql.= ($this->dateend?"'".$this->db->idate($this->dateend)."'":"null").","; $sql.= ($this->dateend!=''?"'".$this->db->idate($this->dateend)."'":"null").",";
$sql.= ($this->durationp >= 0?"'".$this->durationp."'":"null").","; $sql.= ($this->durationp >= 0 && $this->durationp != ''?"'".$this->durationp."'":"null").",";
$sql.= ($this->durationa >= 0?"'".$this->durationa."'":"null").","; $sql.= ($this->durationa >= 0 && $this->durationa != ''?"'".$this->durationa."'":"null").",";
$sql.= "'".$this->type_id."', '".$this->societe->id."' ,'".addslashes($this->note)."',"; $sql.= "'".$this->type_id."', '".$this->societe->id."' ,'".addslashes($this->note)."',";
$sql.= ($this->contact->id > 0?"'".$this->contact->id."'":"null").","; $sql.= ($this->contact->id > 0?"'".$this->contact->id."'":"null").",";
$sql.= ($user->id > 0 ? "'".$user->id."'":"null").","; $sql.= ($user->id > 0 ? "'".$user->id."'":"null").",";
@@ -334,13 +334,14 @@ class ActionComm
return -1; return -1;
} }
$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm "; //print 'eeea'.$this->datep.'-'.(strval($this->datep) != '').'-'.$this->db->idate($this->datep);
$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
$sql.= " SET percent='".$this->percentage."'"; $sql.= " SET percent='".$this->percentage."'";
$sql.= ", label = ".($this->label ? "'".addslashes($this->label)."'":"null"); $sql.= ", label = ".($this->label ? "'".addslashes($this->label)."'":"null");
$sql.= ", datep = ".($this->datep ? "'".$this->db->idate($this->datep)."'" : 'null'); $sql.= ", datep = ".(strval($this->datep)!='' ? "'".$this->db->idate($this->datep)."'" : 'null');
$sql.= ", datep2 = ".($this->datef ? "'".$this->db->idate($this->datef)."'" : 'null'); $sql.= ", datep2 = ".(strval($this->datef)!='' ? "'".$this->db->idate($this->datef)."'" : 'null');
$sql.= ", datea = ".($this->date ? "'".$this->db->idate($this->date)."'" : 'null'); $sql.= ", datea = ".(strval($this->date)!='' ? "'".$this->db->idate($this->date)."'" : 'null');
$sql.= ", datea2 = ".($this->dateend ? "'".$this->db->idate($this->dateend)."'" : 'null'); $sql.= ", datea2 = ".(strval($this->dateend)!='' ? "'".$this->db->idate($this->dateend)."'" : 'null');
$sql.= ", note = ".($this->note ? "'".addslashes($this->note)."'":"null"); $sql.= ", note = ".($this->note ? "'".addslashes($this->note)."'":"null");
$sql.= ", fk_soc =". ($this->societe->id > 0 ? "'".$this->societe->id."'":"null"); $sql.= ", fk_soc =". ($this->societe->id > 0 ? "'".$this->societe->id."'":"null");
$sql.= ", fk_contact =". ($this->contact->id > 0 ? "'".$this->contact->id."'":"null"); $sql.= ", fk_contact =". ($this->contact->id > 0 ? "'".$this->contact->id."'":"null");

26
htdocs/comm/action/fiche.php
View File

@@ -171,13 +171,13 @@ if ($_POST["action"] == 'add_action')
$actioncomm->duree=(($_POST["dureehour"] * 60) + $_POST["dureemin"]) * 60; $actioncomm->duree=(($_POST["dureehour"] * 60) + $_POST["dureemin"]) * 60;
$usertodo=new User($db,$_POST["affectedto"]); $usertodo=new User($db,$_POST["affectedto"]);
if ($_POST["affectedto"]) if ($_POST["affectedto"] > 0)
{ {
$usertodo->fetch(); $usertodo->fetch();
} }
$actioncomm->usertodo = $usertodo; $actioncomm->usertodo = $usertodo;
$userdone=new User($db,$_POST["doneby"]); $userdone=new User($db,$_POST["doneby"]);
if ($_POST["doneby"]) if ($_POST["doneby"] > 0)
{ {
$userdone->fetch(); $userdone->fetch();
} }
@@ -243,13 +243,14 @@ if ($_POST["action"] == 'add_action')
// Si erreur // Si erreur
$db->rollback(); $db->rollback();
$_GET["id"]=$idaction; $_GET["id"]=$idaction;
$error='<div class="error">'.$actioncomm->error.'</div>'; $error=$actioncomm->error;
} }
} }
else else
{ {
$db->rollback(); $db->rollback();
$error='<div class="error">'.$actioncomm->error.'</div>'; $_GET["id"]=$idaction;
$error=$actioncomm->error;
} }
} }
@@ -299,6 +300,7 @@ if ($_POST["action"] == 'update')
$_POST["apmonth"], $_POST["apmonth"],
$_POST["apday"], $_POST["apday"],
$_POST["apyear"]); $_POST["apyear"]);
$datep2=dolibarr_mktime($_POST["p2hour"], $datep2=dolibarr_mktime($_POST["p2hour"],
$_POST["p2min"], $_POST["p2min"],
0, 0,
@@ -317,19 +319,15 @@ if ($_POST["action"] == 'update')
$_POST["a2month"], $_POST["a2month"],
$_POST["a2day"], $_POST["a2day"],
$_POST["a2year"]); $_POST["a2year"]);
// Si param incorrects, mktime renvoi false en PHP 5.1, -1 avant
if (! ($datep > 0)) $datep='';
if (! ($datep2 > 0)) $datep2='';
if (! ($datea > 0)) $datea='';
if (! ($datea2 > 0)) $datea2='';
//print $_POST["apmonth"].",".$_POST["apday"].",".$_POST["apyear"].",".$_POST["aphour"].",".$_POST["apmin"]."<br>\n"; //print $_POST["apmonth"].",".$_POST["apday"].",".$_POST["apyear"].",".$_POST["aphour"].",".$_POST["apmin"]."<br>\n";
//print $actioncomm->datep; //print $actioncomm->datep;
$actioncomm->label = $_POST["label"]; //print 'dddd'.$datep;
$actioncomm->datep = $datep; $actioncomm->label = $_POST["label"];
$actioncomm->datef = $datep2; $actioncomm->datep = $datep;
$actioncomm->date = $datea; $actioncomm->datef = $datep2;
$actioncomm->dateend = $datea2; $actioncomm->date = $datea;
$actioncomm->dateend = $datea2;
$actioncomm->percentage = $_POST["percentage"]; $actioncomm->percentage = $_POST["percentage"];
$actioncomm->priority = $_POST["priority"]; $actioncomm->priority = $_POST["priority"];
$actioncomm->societe->id = $_POST["socid"]; $actioncomm->societe->id = $_POST["socid"];

4
htdocs/html.form.class.php
View File

@@ -2642,7 +2642,7 @@ class Form
$shour = $reg[4]; $shour = $reg[4];
$smin = $reg[5]; $smin = $reg[5];
} }
elseif ($set_time > 0) elseif (strval($set_time) != '')
{ {
// Date est un timestamps // Date est un timestamps
$syear = date("Y", $set_time); $syear = date("Y", $set_time);
@@ -2669,7 +2669,7 @@ class Form
if ($conf->use_javascript_ajax && $conf->use_popup_calendar) if ($conf->use_javascript_ajax && $conf->use_popup_calendar)
{ {
//print "e".$set_time." t ".$conf->format_date_short; //print "e".$set_time." t ".$conf->format_date_short;
if ($set_time > 0) if (strval($set_time) != '')
{ {
$formated_date=dolibarr_print_date($set_time,$conf->format_date_short); $formated_date=dolibarr_print_date($set_time,$conf->format_date_short);
} }

2576
htdocs/includes/adodbtime/adodb-time.inc.php
View File

File diff suppressed because it is too large Load Diff

38
htdocs/lib/functions.lib.php
View File

@@ -402,20 +402,20 @@ function dolibarr_time_plus_duree($time,$duration_value,$duration_unit)
/** /**
\brief Formattage de la date en fonction de la langue $conf->langage * \brief Formattage de la date en fonction de la langue $conf->langage
\param time Date 'timestamp' ou format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS' * \param time Date 'timestamp' ou format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS'
\param format Format d'affichage de la date * \param format Format d'affichage de la date
"%d %b %Y", * "%d %b %Y",
"%d/%m/%Y %H:%M", * "%d/%m/%Y %H:%M",
"%d/%m/%Y %H:%M:%S", * "%d/%m/%Y %H:%M:%S",
"day", "daytext", "dayhour", "dayhourldap", "dayhourtext" * "day", "daytext", "dayhour", "dayhourldap", "dayhourtext"
\return string Date format<EFBFBD>e ou '' si time null * \return string Date formatee ou '' si time null
*/ */
function dolibarr_print_date($time,$format='') function dolibarr_print_date($time,$format='',$to_gmt=false)
{ {
global $conf; global $conf;
// Si format non d<EFBFBD>fini, on prend $conf->format_date_text_short sinon %Y-%m-%d %H:%M:%S // Si format non defini, on prend $conf->format_date_text_short sinon %Y-%m-%d %H:%M:%S
if (! $format) $format=(isset($conf->format_date_text_short) ? $conf->format_date_text_short : '%Y-%m-%d %H:%M:%S'); if (! $format) $format=(isset($conf->format_date_text_short) ? $conf->format_date_text_short : '%Y-%m-%d %H:%M:%S');
if ($format == 'day') $format=$conf->format_date_short; if ($format == 'day') $format=$conf->format_date_short;
@@ -440,24 +440,24 @@ function dolibarr_print_date($time,$format='')
$smin = $reg[5]; $smin = $reg[5];
$ssec = $reg[6]; $ssec = $reg[6];
return adodb_strftime($format,dolibarr_mktime($shour,$smin,$ssec,$smonth,$sday,$syear)); return adodb_strftime($format,dolibarr_mktime($shour,$smin,$ssec,$smonth,$sday,$syear),$to_gmt);
} }
else else
{ {
// Date est un timestamps // Date est un timestamps
return adodb_strftime($format,$time); return adodb_strftime($format,$time,$to_gmt);
} }
} }
/** /**
\brief Retourne une date fabriqu<EFBFBD>e depuis une chaine * \brief Retourne une date fabrique depuis une chaine
\param string Date format<EFBFBD>e en chaine * \param string Date formate en chaine
YYYYMMDD * YYYYMMDD
YYYYMMDDHHMMSS * YYYYMMDDHHMMSS
DD/MM/YY ou DD/MM/YYYY * DD/MM/YY ou DD/MM/YYYY
DD/MM/YY HH:MM:SS ou DD/MM/YYYY HH:MM:SS * DD/MM/YY HH:MM:SS ou DD/MM/YYYY HH:MM:SS
\return date Date * \return date Date
*/ */
function dolibarr_stringtotime($string) function dolibarr_stringtotime($string)
{ {

12
htdocs/lib/xcal.lib.php
View File

@@ -67,7 +67,7 @@ function build_calfile($format='vcal',$title,$desc,$events_array,$outputfile,$fi
if ($eventqualified) if ($eventqualified)
{ {
// See http://fr.wikipedia.org/wiki/ICalendar for format // See http://fr.wikipedia.org/wiki/ICalendar for format
//$uid = dolibarr_print_date($now,'dayhourxcard').'-'.$event['uid']."-export@".$_SERVER["SERVER_NAME"]; //$uid = dolibarr_print_date($now,'dayhourxcard',true).'-'.$event['uid']."-export@".$_SERVER["SERVER_NAME"];
$uid = $event['uid']; $uid = $event['uid'];
$type = $event['type']; $type = $event['type'];
$startdate = $event['startdate']; $startdate = $event['startdate'];
@@ -136,11 +136,13 @@ function build_calfile($format='vcal',$title,$desc,$events_array,$outputfile,$fi
if (! empty($location)) fwrite($calfileh,"LOCATION:".$location."\n"); if (! empty($location)) fwrite($calfileh,"LOCATION:".$location."\n");
//fwrite($calfileh,"TRANSP:".$transparency."\n"); //fwrite($calfileh,"TRANSP:".$transparency."\n");
//fwrite($calfileh,"CLASS:PUBLIC\n"); // PUBLIC, PRIVATE, CONFIDENTIAL //fwrite($calfileh,"CLASS:PUBLIC\n"); // PUBLIC, PRIVATE, CONFIDENTIAL
fwrite($calfileh,"DTSTAMP:".dolibarr_print_date($now,'dayhourxcard')."\n");
$startdatef = dolibarr_print_date($startdate,'dayhourxcard'); // Date must be GMT dates
fwrite($calfileh,"DTSTAMP:".dolibarr_print_date($now,'dayhourxcard',true)."\n");
$startdatef = dolibarr_print_date($startdate,'dayhourxcard',true);
fwrite($calfileh,"DTSTART:".$startdatef."\n"); fwrite($calfileh,"DTSTART:".$startdatef."\n");
if (empty($enddate)) $enddate=$startdate+$duration; if (empty($enddate)) $enddate=$startdate+$duration;
$enddatef = dolibarr_print_date($enddate,'dayhourxcard'); $enddatef = dolibarr_print_date($enddate,'dayhourxcard',true);
fwrite($calfileh,"DTEND:".$enddatef."\n"); fwrite($calfileh,"DTEND:".$enddatef."\n");
fwrite($calfileh,"END:VEVENT\n"); fwrite($calfileh,"END:VEVENT\n");
} }
@@ -171,7 +173,7 @@ function build_calfile($format='vcal',$title,$desc,$events_array,$outputfile,$fi
fwrite($calfileh,"LOCATION:".$location."\n"); fwrite($calfileh,"LOCATION:".$location."\n");
fwrite($calfileh,"TRANSP:OPAQUE\n"); fwrite($calfileh,"TRANSP:OPAQUE\n");
fwrite($calfileh,"CLASS:CONFIDENTIAL\n"); fwrite($calfileh,"CLASS:CONFIDENTIAL\n");
fwrite($calfileh,"DTSTAMP:".dolibarr_print_date($startdatef,'dayhourxcard')."\n"); fwrite($calfileh,"DTSTAMP:".dolibarr_print_date($startdatef,'dayhourxcard',true)."\n");
fwrite($calfileh,"END:VJOURNAL\n"); fwrite($calfileh,"END:VJOURNAL\n");
} }