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

Fix sql phpunit regression

Browse Source
This commit is contained in:
Laurent Destailleur 2015-10-23 15:24:47 +02:00
parent f3a5331095
commit 016dbd39ee
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
View File

@ -86,5 +86,3 @@ CREATE TABLE IF NOT EXISTS llx_establishment (
status tinyint DEFAULT 1 status tinyint DEFAULT 1
) ENGINE=InnoDB; ) ENGINE=InnoDB;
ALTER TABLE llx_user ADD COLUMN employee tinyint DEFAULT 0 AFTER ref_int;

2
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, -- 1 if user is an employee employee tinyint DEFAULT 1, -- 1 if user is an employee
datec datetime, datec datetime,
tms timestamp, tms timestamp,

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

@ -126,13 +126,17 @@ class User extends CommonObject
{ {
$this->db = $db; $this->db = $db;
// Preference utilisateur // User preference
$this->liste_limit = 0; $this->liste_limit = 0;
$this->clicktodial_loaded = 0; $this->clicktodial_loaded = 0;
// For cache usage
$this->all_permissions_are_loaded = 0; $this->all_permissions_are_loaded = 0;
$this->admin=0;
// Force some default values
$this->admin = 0;
$this->employee = 1;
$this->conf = new stdClass(); $this->conf = new stdClass();
$this->rights = new stdClass(); $this->rights = new stdClass();
$this->rights->user = new stdClass(); $this->rights->user = new stdClass();