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

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

Browse Source 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/product/stock/class/entrepot.class.php
	htdocs/product/stock/list.php
This commit is contained in:
Laurent Destailleur
2020-04-10 01:22:22 +02:00
parent 401b8b2dcc f7d1ce1e09
commit 83af4ebea4
10 changed files with 242 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/modLabel.class.php
View File

@@ -51,7 +51,7 @@ class modLabel extends DolibarrModules
// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
$this->version = 'development';
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
$this->picto='label';
$this->picto='generic';
// Data directories to create when module is enabled
$this->dirs = array("/label/temp");