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

Fix: Date ral mal renseigne

Browse Source
This commit is contained in:
Laurent Destailleur 2006-09-16 00:14:11 +00:00
parent 9e08f34f31
commit 05289ec490
4 changed files with 77 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/actioncomm.class.php
View File

@ -41,11 +41,11 @@ class ActionComm
var $type_code; var $type_code;
var $type; var $type;
var $label; var $label;
var $datec; // Date creation enregistrement var $datec; // Date creation enregistrement (datec)
var $datep; // Date action planifie debut var $datem; // Date modif enregistrement (tms)
var $datep; // Date action planifie debut (datep)
var $datef; // Date action planifie fin var $datef; // Date action planifie fin
var $date; // Date action realise completement (datea) var $date; // Date action realise completement (datea)
var $datem; // Date modif (tms)
var $priority; var $priority;
var $user; var $user;
var $author; var $author;
@ -79,20 +79,20 @@ class ActionComm
{ {
global $langs,$conf; global $langs,$conf;
dolibarr_syslog("ActionComm::add"); dolibarr_syslog("ActionComm.class::add datep=".strftime("%x %X",$this->datep)." datea=".$this->datea);
if (! $this->percent) $this->percent = 0; if (! $this->percent) $this->percent = 0;
if (! $this->priority) $this->priority = 0; if (! $this->priority) $this->priority = 0;
$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm";
$sql.= "(datec,"; $sql.= "(datec,";
if ($this->date_p) $sql.= "datep,"; if ($this->datep) $sql.= "datep,";
if ($this->date_a) $sql.= "datea,"; if ($this->date) $sql.= "datea,";
$sql.= "fk_action,fk_soc,note,fk_contact,fk_user_author,fk_user_action,label,percent,priority,"; $sql.= "fk_action,fk_soc,note,fk_contact,fk_user_author,fk_user_action,label,percent,priority,";
$sql.= "fk_facture,propalrowid,fk_commande)"; $sql.= "fk_facture,propalrowid,fk_commande)";
$sql.= " VALUES (now(),"; $sql.= " VALUES (now(),";
if ($this->date_p) $sql.= "'".$this->db->idate($this->date_p)."',"; if ($this->datep) $sql.= "'".$this->db->idate($this->datep)."',";
if ($this->date_a) $sql.= "'".$this->db->idate($this->date_a)."',"; if ($this->date) $sql.= "'".$this->db->idate($this->date)."',";
$sql.= "'".$this->type_id."', '".$this->societe->id."' ,'".addslashes($this->note)."',"; $sql.= "'".$this->type_id."', '".$this->societe->id."' ,'".addslashes($this->note)."',";
$sql.= ($this->contact->id?$this->contact->id:"null").","; $sql.= ($this->contact->id?$this->contact->id:"null").",";
$sql.= "'$author->id', '".$this->user->id ."', '".addslashes($this->label)."','".$this->percent."','".$this->priority."',"; $sql.= "'$author->id', '".$this->user->id ."', '".addslashes($this->label)."','".$this->percent."','".$this->priority."',";
@ -217,8 +217,8 @@ class ActionComm
$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm "; $sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
$sql.= " SET percent='".$this->percent."'"; $sql.= " SET percent='".$this->percent."'";
if ($this->label) $sql.= ", label = '".addslashes($this->label)."'"; if ($this->label) $sql.= ", label = '".addslashes($this->label)."'";
$sql.= ", datep = ".($this->date_p ? "'".$this->db->idate($this->date_p)."'" : 'null'); $sql.= ", datep = ".($this->datep ? "'".$this->db->idate($this->datep)."'" : 'null');
$sql.= ", datea = ".($this->date_a ? "'".$this->db->idate($this->date_a)."'" : 'null'); $sql.= ", datea = ".($this->date ? "'".$this->db->idate($this->date)."'" : 'null');
if ($this->note) $sql.= ", note = '".addslashes($this->note)."'"; if ($this->note) $sql.= ", note = '".addslashes($this->note)."'";
if ($this->contact->id) $sql.= ", fk_contact =". $this->contact->id; if ($this->contact->id) $sql.= ", fk_contact =". $this->contact->id;
$sql.= " WHERE id=".$this->id; $sql.= " WHERE id=".$this->id;

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

@ -54,6 +54,24 @@ if (isset($_GET["error"])) $error=$_GET["error"];
*/ */
if ($_POST["action"] == 'add_action') if ($_POST["action"] == 'add_action')
{ {
// Nettoyage parametres
if ($_POST["aphour"] == -1) $_POST["aphour"]='0';
if ($_POST["apmin"] == -1) $_POST["apmin"]='0';
if ($_POST["adhour"] == -1) $_POST["adhour"]='0';
if ($_POST["admin"] == -1) $_POST["admin"]='0';
$datep=@mktime($_POST["aphour"],
$_POST["apmin"],
0,
$_POST["apmonth"],
$_POST["apday"],
$_POST["apyear"]);
$datea=@mktime($_POST["adhour"],
$_POST["admin"],
0,
$_POST["admonth"],
$_POST["adday"],
$_POST["adyear"]);
if ($_POST["contactid"]) if ($_POST["contactid"])
{ {
$contact = new Contact($db); $contact = new Contact($db);
@ -67,6 +85,13 @@ if ($_POST["action"] == 'add_action')
$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("Type")).'</div>'; $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("Type")).'</div>';
} }
if ($datea && $_POST["percentage"] == 0)
{
$error=1;
$_GET["action"] = 'create';
$mesg='<div class="error">'.$langs->trans("ErrorStatusCantBeZeroIfStarted").'</div>';
}
if (! $_POST["apyear"] && ! $_POST["adyear"]) if (! $_POST["apyear"] && ! $_POST["adyear"])
{ {
$error=1; $error=1;
@ -102,22 +127,14 @@ if ($_POST["action"] == 'add_action')
} }
} }
} }
$actioncomm->date_p = @mktime($_POST["aphour"], // print $_POST["aphour"]." ".$_POST["apmin"]." ".$_POST["apday"];
$_POST["apmin"], $actioncomm->datep = $datep;
0, $actioncomm->date = $datea;
$_POST["apmonth"], if ($_POST["percentage"] < 100 && ! $actioncomm->datep) $actioncomm->datep=$actioncomm->date;
$_POST["apday"],
$_POST["apyear"]);
$actioncomm->date_a = @mktime($_POST["adhour"],
$_POST["admin"],
0,
$_POST["admonth"],
$_POST["adday"],
$_POST["adyear"]);
if ($actioncomm->type_id == 5) if ($actioncomm->type_id == 5)
{ {
// RDV // RDV
if ($actioncomm->date_a) if ($actioncomm->date)
{ {
$actioncomm->percent = 100; $actioncomm->percent = 100;
} }
@ -204,22 +221,21 @@ if ($_POST["action"] == 'update')
{ {
if (! $_POST["cancel"]) if (! $_POST["cancel"])
{ {
if ($_POST["aphour"] == -1) $_POST["aphour"]='0'; if ($_POST["aphour"] == -1) $_POST["aphour"]='0';
if ($_POST["apmin"] == -1) $_POST["apmin"]='0'; if ($_POST["apmin"] == -1) $_POST["apmin"]='0';
if ($_POST["adhour"] == -1) $_POST["adhour"]='0'; if ($_POST["adhour"] == -1) $_POST["adhour"]='0';
if ($_POST["admin"] == -1) $_POST["admin"]='0'; if ($_POST["admin"] == -1) $_POST["admin"]='0';
$action = new Actioncomm($db); $action = new Actioncomm($db);
$action->fetch($_POST["id"]); $action->fetch($_POST["id"]);
$action->datep = @mktime($_POST["aphour"],
$action->date_p = @mktime($_POST["aphour"],
$_POST["apmin"], $_POST["apmin"],
0, 0,
$_POST["apmonth"], $_POST["apmonth"],
$_POST["apday"], $_POST["apday"],
$_POST["apyear"]); $_POST["apyear"]);
$action->date_a = @mktime($_POST["adhour"], $action->date = @mktime($_POST["adhour"],
$_POST["admin"], $_POST["admin"],
0, 0,
$_POST["admonth"], $_POST["admonth"],
@ -231,9 +247,9 @@ if ($_POST["action"] == 'update')
$action->percent = $_POST["percent"]; $action->percent = $_POST["percent"];
$action->contact->id = $_POST["contactid"]; $action->contact->id = $_POST["contactid"];
$action->note = $_POST["note"]; $action->note = $_POST["note"];
if ($action->type_code == 'AC_RDV' && $action->percent == 100 && ! $action->date_a) if ($action->type_code == 'AC_RDV' && $action->percent == 100 && ! $action->date)
{ {
$action->date_a = $action->date_p; $action->date = $action->datep;
} }
$result=$action->update(); $result=$action->update();
} }

2
htdocs/comm/action/index.php
View File

@ -186,7 +186,7 @@ if ($resql)
{ {
$cont = new Contact($db); $cont = new Contact($db);
$cont->fetch($obj->fk_contact); $cont->fetch($obj->fk_contact);
print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$cont->id.'">'.img_object($langs->trans("ShowContact"),"contact").' '.dolibarr_trunc($cont->fullname,24).'</a>'; print $cont->getNomUrl(1);
} }
else else
{ {

10
htdocs/comm/fiche.php
View File

@ -749,7 +749,10 @@ if ($socid > 0)
print '<td colspan="11"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$objsoc->id.'&amp;status=todo">'.$langs->trans("ActionsToDoShort").'</a></td><td align="right">&nbsp;</td>'; print '<td colspan="11"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$objsoc->id.'&amp;status=todo">'.$langs->trans("ActionsToDoShort").'</a></td><td align="right">&nbsp;</td>';
print '</tr>'; print '</tr>';
$sql = "SELECT a.id, a.label, ".$db->pdate("a.datep")." as dp, a.percent,"; $sql = "SELECT a.id, a.label,";
$sql.= " ".$db->pdate("a.datep")." as dp,";
$sql.= " ".$db->pdate("a.datea")." as da,";
$sql.= " a.percent,";
$sql.= " c.code as acode, c.libelle, u.code, a.propalrowid, a.fk_user_author, fk_contact, u.rowid "; $sql.= " c.code as acode, c.libelle, u.code, a.propalrowid, a.fk_user_author, fk_contact, u.rowid ";
$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u "; $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u ";
$sql.= " WHERE a.fk_soc = ".$objsoc->id; $sql.= " WHERE a.fk_soc = ".$objsoc->id;
@ -865,7 +868,10 @@ if ($socid > 0)
print '<td colspan="12"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$objsoc->id.'&amp;status=done">'.$langs->trans("ActionsDoneShort").'</a></td>'; print '<td colspan="12"><a href="'.DOL_URL_ROOT.'/comm/action/index.php?socid='.$objsoc->id.'&amp;status=done">'.$langs->trans("ActionsDoneShort").'</a></td>';
print '</tr>'; print '</tr>';
$sql = "SELECT a.id, a.label, ".$db->pdate("a.datea")." as da, a.percent,"; $sql = "SELECT a.id, a.label,";
$sql.= " ".$db->pdate("a.datep")." as dp,";
$sql.= " ".$db->pdate("a.datea")." as da,";
$sql.= " a.percent,";
$sql.= " a.propalrowid, a.fk_facture, a.fk_user_author, a.fk_contact,"; $sql.= " a.propalrowid, a.fk_facture, a.fk_user_author, a.fk_contact,";
$sql.= " c.code as acode, c.libelle,"; $sql.= " c.code as acode, c.libelle,";
$sql.= " u.code, u.rowid"; $sql.= " u.code, u.rowid";