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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2014-02-06 20:57:58 +01:00
commit e1880a6394
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/comm/action/class/actioncomm.class.php
View File

@ -58,7 +58,7 @@ class ActionComm extends CommonObject
var $percentage; // Percentage var $percentage; // Percentage
var $location; // Location var $location; // Location
var $transparency; // Transparency (ical standard). Used to say if people assigned to event are busy or not by event. 0=available, 1=busy, 2=busy (refused events) var $transparency; // Transparency (ical standard). Used to say if people assigned to event are busy or not by event. 0=available, 1=busy, 2=busy (refused events)
var $priority; // Free text ('' By default) var $priority; // Small int (0 By default)
var $note; // Description var $note; // Description
var $usertodo; // Object user that must do action var $usertodo; // Object user that must do action
@ -116,7 +116,7 @@ class ActionComm extends CommonObject
$this->location=dol_trunc(trim($this->location),128); $this->location=dol_trunc(trim($this->location),128);
$this->note=dol_htmlcleanlastbr(trim($this->note)); $this->note=dol_htmlcleanlastbr(trim($this->note));
if (empty($this->percentage)) $this->percentage = 0; if (empty($this->percentage)) $this->percentage = 0;
if (empty($this->priority)) $this->priority = 0; if (empty($this->priority) || ! is_numeric($this->priority)) $this->priority = 0;
if (empty($this->fulldayevent)) $this->fulldayevent = 0; if (empty($this->fulldayevent)) $this->fulldayevent = 0;
if (empty($this->punctual)) $this->punctual = 0; if (empty($this->punctual)) $this->punctual = 0;
if (empty($this->transparency)) $this->transparency = 0; if (empty($this->transparency)) $this->transparency = 0;
@ -438,7 +438,7 @@ class ActionComm extends CommonObject
$this->label=trim($this->label); $this->label=trim($this->label);
$this->note=trim($this->note); $this->note=trim($this->note);
if (empty($this->percentage)) $this->percentage = 0; if (empty($this->percentage)) $this->percentage = 0;
if (empty($this->priority)) $this->priority = 0; if (empty($this->priority) || ! is_numeric($this->priority)) $this->priority = 0;
if (empty($this->transparency)) $this->transparency = 0; if (empty($this->transparency)) $this->transparency = 0;
if (empty($this->fulldayevent)) $this->fulldayevent = 0; if (empty($this->fulldayevent)) $this->fulldayevent = 0;
if ($this->percentage > 100) $this->percentage = 100; if ($this->percentage > 100) $this->percentage = 100;
@ -1064,7 +1064,7 @@ class ActionComm extends CommonObject
$this->percentage=0; $this->percentage=0;
$this->location='Location'; $this->location='Location';
$this->transparency=0; $this->transparency=0;
$this->priority='Priority X'; $this->priority=1;
$this->note = 'Note'; $this->note = 'Note';
} }