Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch 'develop' into actionrefused

Browse Source
This commit is contained in:
Laurent Destailleur
2018-12-14 15:48:24 +01:00
committed by GitHub
parent ce6b7adaa0 bcf2e751b5
commit 2011afe6fb
1577 changed files with 82293 additions and 45499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/ecm/class/ecmfiles.class.php
View File

@@ -180,8 +180,15 @@ class EcmFiles extends CommonObject
if (empty($this->date_m)) $this->date_m = dol_now();
// If ref not defined
$ref = dol_hash($this->filepath.'/'.$this->filename, 3);
if (! empty($this->ref)) $ref=$this->ref;
$ref = '';
if (! empty($this->ref))
{
$ref=$this->ref;
}
else {
include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
$ref = dol_hash($this->filepath.'/'.$this->filename, 3);
}
$maxposition=0;
if (empty($this->position)) // Get max used

1
htdocs/ecm/index_auto.php
View File

@@ -331,6 +331,7 @@ if (! empty($conf->global->ECM_AUTO_TREE_ENABLED))
if (! empty($conf->projet->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsByProjects")); }
if (! empty($conf->ficheinter->enabled)) { $langs->load("interventions"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsByInterventions")); }
if (! empty($conf->expensereport->enabled)) { $langs->load("trips"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsByExpenseReports")); }
if (! empty($conf->holiday->enabled)) { $langs->load("holiday"); $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsByHolidays")); }
$rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'user', 'test'=>1, 'label'=>$langs->trans("Users"), 'desc'=>$langs->trans("ECMDocsByUsers"));
}