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

Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/user/class/usergroup.class.php
This commit is contained in:
Laurent Destailleur
2021-01-14 14:13:08 +01:00
29 changed files with 210 additions and 124 deletions

View File

@@ -65,7 +65,7 @@ class modMyModule extends DolibarrModules
// Module description, used if translation string 'ModuleMyModuleDesc' not found (MyModule is name of module).
$this->description = "MyModuleDescription";
// Used only if file README.md and README-LL.md not found.
$this->descriptionlong = "MyModule description (Long)";
$this->descriptionlong = "MyModuleDescription";
// Author
$this->editor_name = 'Editor name';