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

Fix: A lot of fixes.

Browse Source
This commit is contained in:
Laurent Destailleur 2008-02-28 17:15:48 +00:00
parent 8a0a2dacdf
commit b22a77cde4
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/actioncomm.class.php
View File

@ -2,9 +2,6 @@
/* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* $Id$
* $Source$
*
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
@ -52,8 +49,9 @@ class ActionComm
var $usermod; // User that modified action var $usermod; // User that modified action
var $datep; // Date action planifie debut (datep) var $datep; // Date action planifie debut (datep)
var $datef; // Date action planifie fin var $datef; // Date action planifie fin (datep2)
var $date; // Date action realise completement (datea) var $date; // Date action realise debut (datea)
var $dateend; // Date action realise fin (datea2)
var $priority; var $priority;
var $usertodo; // User that must do action var $usertodo; // User that must do action
@ -125,7 +123,8 @@ class ActionComm
$sql.= "(datec,"; $sql.= "(datec,";
if ($this->datep) $sql.= "datep,"; if ($this->datep) $sql.= "datep,";
if ($this->date) $sql.= "datea,"; if ($this->date) $sql.= "datea,";
$sql.= "fk_action,fk_soc,note,fk_contact,"; $sql.= "fk_action,fk_soc,note,";
$sql.= "fk_contact,";
$sql.= "fk_user_author,"; $sql.= "fk_user_author,";
$sql.= "fk_user_action,"; $sql.= "fk_user_action,";
$sql.= "fk_user_done,"; $sql.= "fk_user_done,";
@ -135,10 +134,10 @@ class ActionComm
if ($this->datep) $sql.= "'".$this->db->idate($this->datep)."',"; if ($this->datep) $sql.= "'".$this->db->idate($this->datep)."',";
if ($this->date) $sql.= "'".$this->db->idate($this->date)."',"; 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 > 0?"'".$this->contact->id."'":"null").",";
$sql.= "'".$author->id."',"; $sql.= "'".$author->id."',";
$sql.= ($this->usertodo->id?"'".$this->usertodo->id."'":"null").","; $sql.= ($this->usertodo->id > 0?"'".$this->usertodo->id."'":"null").",";
$sql.= ($this->userdone->id?"'".$this->userdone->id."'":"null").","; $sql.= ($this->userdone->id > 0?"'".$this->userdone->id."'":"null").",";
$sql.= "'".addslashes($this->label)."','".$this->percentage."','".$this->priority."',"; $sql.= "'".addslashes($this->label)."','".$this->percentage."','".$this->priority."',";
$sql.= ($this->facid?$this->facid:"null").","; $sql.= ($this->facid?$this->facid:"null").",";
$sql.= ($this->propalrowid?$this->propalrowid:"null").","; $sql.= ($this->propalrowid?$this->propalrowid:"null").",";
@ -296,15 +295,15 @@ class ActionComm
$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm "; $sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
$sql.= " SET percent='".$this->percentage."'"; $sql.= " SET percent='".$this->percentage."'";
if ($this->label) $sql.= ", label = '".addslashes($this->label)."'"; $sql.= ", label = ".($this->label ? "'".addslashes($this->label)."'":"null");
$sql.= ", datep = ".($this->datep ? "'".$this->db->idate($this->datep)."'" : 'null'); $sql.= ", datep = ".($this->datep ? "'".$this->db->idate($this->datep)."'" : 'null');
$sql.= ", datea = ".($this->date ? "'".$this->db->idate($this->date)."'" : 'null'); $sql.= ", datea = ".($this->date ? "'".$this->db->idate($this->date)."'" : 'null');
if ($this->note) $sql.= ", note = '".addslashes($this->note)."'"; $sql.= ", note = ".($this->note ? "'".addslashes($this->note)."'":"null");
if ($this->contact->id) $sql.= ", fk_contact =". $this->contact->id; $sql.= ", fk_contact =". ($this->contact->id > 0 ? "'".$this->contact->id."'":"null");
$sql.= ", priority = '".$this->priority."'"; $sql.= ", priority = '".$this->priority."'";
$sql.= ", fk_user_mod = '".$user->id."'"; $sql.= ", fk_user_mod = '".$user->id."'";
$sql.= ", fk_user_action=".($this->usertodo->id > 0?"'".$this->usertodo->id."'":"null"); $sql.= ", fk_user_action=".($this->usertodo->id > 0 ? "'".$this->usertodo->id."'":"null");
$sql.= ", fk_user_done=".($this->userdone->id > 0?"'".$this->userdone->id."'":"null"); $sql.= ", fk_user_done=".($this->userdone->id > 0 ? "'".$this->userdone->id."'":"null");
$sql.= " WHERE id=".$this->id; $sql.= " WHERE id=".$this->id;
dolibarr_syslog("ActionComm::update sql=".$sql); dolibarr_syslog("ActionComm::update sql=".$sql);

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

@ -683,10 +683,10 @@ if ($_GET["id"])
print '</td></tr>'; print '</td></tr>';
// Etat // Status
print '<tr><td nowrap>'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="3"><input name="percentage" value="'.$act->percentage.'" size="4">%</td></tr>'; print '<tr><td nowrap>'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="3"><input name="percentage" value="'.$act->percentage.'" size="4">%</td></tr>';
// Objet li<6C> // Object linked
if ($act->objet_url) if ($act->objet_url)
{ {
print '<tr><td>'.$langs->trans("LinkedObject").'</td>'; print '<tr><td>'.$langs->trans("LinkedObject").'</td>';
@ -751,13 +751,12 @@ if ($_GET["id"])
// Affecte a // Affecte a
print '<tr><td nowrap>'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">'; print '<tr><td nowrap>'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
if ($act->usertodo->id) print $act->usertodo->getNomUrl(1); if ($act->usertodo->id > 0) print $act->usertodo->getNomUrl(1);
print '</td></tr>'; print '</td></tr>';
// Realise par // Realise par
print '<tr><td nowrap>'.$langs->trans("ActionDoneBy").'</td><td colspan="3">'; print '<tr><td nowrap>'.$langs->trans("ActionDoneBy").'</td><td colspan="3">';
print $act->userdone->id; if ($act->userdone->id > 0) print $act->userdone->getNomUrl(1);
if ($act->userdone->id) print $act->userdone->getNomUrl(1);
print '</td></tr>'; print '</td></tr>';
// Date planification // Date planification