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

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

Browse Source 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
This commit is contained in:
Laurent Destailleur
2018-08-12 20:08:20 +02:00
parent ddbfaf0788 2d571acc03
commit 0a1c6e7194
17 changed files with 85 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,7 @@ class modService extends DolibarrModules
*/
function __construct($db)
{
global $conf;
global $conf, $mysoc;
$this->db = $db;
$this->numero = 53;