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

Merge pull request #3793 from olsesacl/develop-employee

Browse Source 
Fix: Bug: if $this->employe no exist
This commit is contained in:
Laurent Destailleur 2015-10-23 15:14:30 +02:00
commit f3a5331095
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/install/mysql/tables/llx_user.sql
View File

@ -26,7 +26,7 @@ create table llx_user
ref_ext varchar(50), -- reference into an external system (not used by dolibarr) ref_ext varchar(50), -- reference into an external system (not used by dolibarr)
ref_int varchar(50), -- reference into an internal system (deprecated) ref_int varchar(50), -- reference into an internal system (deprecated)
employee tinyint DEFAULT 0, -- employee 0/1 employee tinyint DEFAULT 0, -- 1 if user is an employee
datec datetime, datec datetime,
tms timestamp, tms timestamp,
@ -76,7 +76,6 @@ create table llx_user
nb_holiday integer DEFAULT 0, nb_holiday integer DEFAULT 0,
thm double(24,8), thm double(24,8),
tjm double(24,8), tjm double(24,8),
employee tinyint DEFAULT 1, -- 1 if user is an employee
salary double(24,8), salary double(24,8),
salaryextra double(24,8), salaryextra double(24,8),
weeklyhours double(16,8) weeklyhours double(16,8)

2
htdocs/user/class/user.class.php
View File

@ -1156,7 +1156,7 @@ class User extends CommonObject
// Clean parameters // Clean parameters
$this->lastname = trim($this->lastname); $this->lastname = trim($this->lastname);
$this->firstname = trim($this->firstname); $this->firstname = trim($this->firstname);
$this->employee = trim($this->employee); $this->employee = $this->employee?$this->employee:0;
$this->login = trim($this->login); $this->login = trim($this->login);
$this->gender = trim($this->gender); $this->gender = trim($this->gender);
$this->pass = trim($this->pass); $this->pass = trim($this->pass);