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

Merge remote-tracking branch 'origin/3.7' into develop

Browse Source 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
This commit is contained in:
Laurent Destailleur
2015-02-18 22:04:26 +01:00
parent fe50a585fc cc1d506614
commit b6947dbe2c
17 changed files with 82 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/modules/DolibarrModules.class.php
View File

@@ -192,8 +192,10 @@ abstract class DolibarrModules
* Enables a module.
* Inserts all informations into database
*
* @param string[]|array $array_sql SQL requests to be executed when enabling module
* @param string $options String with options when disabling module ('newboxdefonly|noboxes')
* @param array $array_sql SQL requests to be executed when enabling module
* @param string $options String with options when disabling module:
* 'noboxes' = Do not insert boxes
* 'newboxdefonly' = For boxes, insert def of boxes only and not boxes activation
*
* @return int 1 if OK, 0 if KO
*/
@@ -279,7 +281,8 @@ abstract class DolibarrModules
* Disable function. Deletes the module constant and boxes from the database.
*
* @param string[] $array_sql SQL requests to be executed when module is disabled
* @param string $options Options when disabling module ('newboxdefonly|noboxes')
* @param string $options Options when disabling module:
* 'newboxdefonly|noboxes' = We don't remove boxes.
*
* @return int 1 if OK, 0 if KO
*/