From ebe496972338d41a0e364aa854d5a025affc7a96 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 11 Aug 2015 10:22:06 +0200 Subject: [PATCH 1/2] Fix: missing entity in cache files names --- htdocs/core/class/stats.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php index ff9f29f55ff..d885c320583 100644 --- a/htdocs/core/class/stats.class.php +++ b/htdocs/core/class/stats.class.php @@ -56,7 +56,7 @@ abstract class Stats include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php'; } - $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_user'.$user->id.'.cache'; + $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache'; $newmask='0644'; $nowgmt = dol_now(); @@ -147,7 +147,7 @@ abstract class Stats include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php'; } - $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_user'.$user->id.'.cache'; + $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache'; $newmask='0644'; $nowgmt = dol_now(); @@ -273,7 +273,7 @@ abstract class Stats include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php'; } - $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_user'.$user->id.'.cache'; + $newpathofdestfile=$conf->user->dir_temp.'/'.get_class($this).'_'.__FUNCTION__.'_'.(empty($this->cachefilesuffix)?'':$this->cachefilesuffix.'_').$langs->defaultlang.'_entity.'.$conf->entity.'_user'.$user->id.'.cache'; $newmask='0644'; $nowgmt = dol_now(); From e146af3118a34cd1d392dbd956d5f13b2f0b7f36 Mon Sep 17 00:00:00 2001 From: josemariagomezroncero Date: Tue, 11 Aug 2015 22:38:21 +0200 Subject: [PATCH 2/2] Update llx_c_type_resource.sql Error create table, missing incremet type element --- htdocs/install/mysql/tables/llx_c_type_resource.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/tables/llx_c_type_resource.sql b/htdocs/install/mysql/tables/llx_c_type_resource.sql index 8ba088c075e..a12abb95f83 100644 --- a/htdocs/install/mysql/tables/llx_c_type_resource.sql +++ b/htdocs/install/mysql/tables/llx_c_type_resource.sql @@ -27,7 +27,7 @@ create table llx_c_type_resource ( - rowid integer PRIMARY KEY, + rowid integer AUTO_INCREMENT PRIMARY KEY, code varchar(32) NOT NULL, label varchar(64) NOT NULL, active tinyint DEFAULT 1 NOT NULL