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

Fix: Pb in date management

Browse Source
This commit is contained in:
Laurent Destailleur 2008-07-29 04:49:36 +00:00
parent 9c548f99e9
commit 6e60069403
3 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dev/skeletons/build_class_from_table.php
View File

@ -225,7 +225,7 @@ foreach($property as $key => $prop)
$varprop.="\t\t\$sql.= \" "; $varprop.="\t\t\$sql.= \" ";
if ($prop['istime']) if ($prop['istime'])
{ {
$varprop.='".(! isset($this->'.$prop['field'].') || $this->'.$prop['field'].'==\'\'?\'NULL\':$this->db->idate('; $varprop.='".(! isset($this->'.$prop['field'].') || strval($this->'.$prop['field'].')==\'\'?\'NULL\':$this->db->idate(';
$varprop.="\$this->".$prop['field'].""; $varprop.="\$this->".$prop['field']."";
$varprop.='))."'; $varprop.='))."';
if ($i < sizeof($property)) $varprop.=","; if ($i < sizeof($property)) $varprop.=",";
@ -256,15 +256,24 @@ foreach($property as $key => $prop)
{ {
$varprop.="\t\t\$sql.= \" "; $varprop.="\t\t\$sql.= \" ";
$varprop.=$prop['field'].'='; $varprop.=$prop['field'].'=';
if ($prop['istime']) $varprop.='".$this->db->idate('; if ($prop['istime'])
else $varprop.="'\"."; {
if ($prop['istime']) $varprop.="\$this->".$prop['field']; // (strval($this->datep)!='' ? "'".$this->db->idate($this->datep)."'" : 'null')
else if ($prop['ischar']) $varprop.="addslashes(\$this->".$prop['field'].")"; $varprop.='".(strval($this->'.$prop['field'].')!=\'\' ? "\'".$this->db->idate(';
else $varprop.="\$this->".$prop['field']; $varprop.='$this->'.$prop['field'];
if ($prop['istime']) $varprop.=')."'; $varprop.=')."\'" : \'null\').';
else $varprop.=".\"'"; $varprop.='"';
if ($i < sizeof($property)) $varprop.=","; }
$varprop.="\";"; else
{
$varprop.="'\".";
if ($prop['ischar']) $varprop.="addslashes(\$this->".$prop['field'].")";
else $varprop.="\$this->".$prop['field'];
$varprop.=".\"'";
}
if ($i < sizeof($property)) $varprop.=',';
$varprop.='";';
$varprop.="\n"; $varprop.="\n";
} }
} }

8
htdocs/actioncomm.class.php
View File

@ -151,10 +151,10 @@ 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.= (strval($this->datep)!=''?"'".$this->db->idate($this->datep)."'":"null").",";
$sql.= ($this->datef!=''?"'".$this->db->idate($this->datef)."'":"null").","; $sql.= (strval($this->datef)!=''?"'".$this->db->idate($this->datef)."'":"null").",";
$sql.= ($this->date!=''?"'".$this->db->idate($this->date)."'":"null").","; $sql.= (strval($this->date)!=''?"'".$this->db->idate($this->date)."'":"null").",";
$sql.= ($this->dateend!=''?"'".$this->db->idate($this->dateend)."'":"null").","; $sql.= (strval($this->dateend)!=''?"'".$this->db->idate($this->dateend)."'":"null").",";
$sql.= ($this->durationp >= 0 && $this->durationp != ''?"'".$this->durationp."'":"null").","; $sql.= ($this->durationp >= 0 && $this->durationp != ''?"'".$this->durationp."'":"null").",";
$sql.= ($this->durationa >= 0 && $this->durationa != ''?"'".$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)."',";

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

@ -109,11 +109,6 @@ if ($_POST["action"] == 'add_action')
$_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='';
// Initialisation objet cactioncomm // Initialisation objet cactioncomm
if (! $_POST["actioncode"]) if (! $_POST["actioncode"])
@ -151,11 +146,11 @@ if ($_POST["action"] == 'add_action')
//$actioncomm->date = $datea; //$actioncomm->date = $datea;
$actioncomm->datef = $datep2; $actioncomm->datef = $datep2;
//$actioncomm->dateend = $datea2; //$actioncomm->dateend = $datea2;
if ($_POST["percentage"] < 100 && ! $actioncomm->datep) $actioncomm->datep=$actioncomm->date; //if ($_POST["percentage"] < 100 && strval($actioncomm->datep) != '') $actioncomm->datep=$actioncomm->date;
if ($actioncomm->type_code == 'AC_RDV') if ($actioncomm->type_code == 'AC_RDV')
{ {
// RDV // RDV
if ($actioncomm->date) if ($actioncomm->datef)
{ {
$actioncomm->percentage = 100; $actioncomm->percentage = 100;
} }