Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 10:21:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
This commit is contained in:
Laurent Destailleur
2020-06-07 19:55:48 +02:00
parent f2e54b9ad5 d1dba53f61
commit 6f12488e30
15 changed files with 78 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/modulebuilder/template/core/modules/modMyModule.class.php
View File

@@ -269,7 +269,7 @@ class modMyModule extends DolibarrModules
$this->menu[$r++] = array(
'fk_menu'=>'', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
'type'=>'top', // This is a Top menu entry
'titre'=>'MyModule',
'titre'=>'ModuleMyModuleName',
'mainmenu'=>'mymodule',
'leftmenu'=>'',
'url'=>'/mymodule/mymoduleindex.php',