Browse Source

Merge branch '19.0-mmi' of gogs.iprospective.fr:iProspective/Dolibarr into 19.0-mmi

CalyClay 1 year ago
parent
commit
98d175bac1

+ 4 - 1
.gitmodules

@@ -174,4 +174,7 @@
         path = htdocs/custom/mmiredmine
         url = git@gogs.iprospective.fr:iProspective/dolibarr-module-mmiredmine.git
         branch = 19.0
-
+[submodule "htdocs/custom/mmisav"]
+        path = htdocs/custom/mmisav
+        url = git@gogs.iprospective.fr:iProspective/dolibarr-module-mmisav.git
+        branch = 19.0

+ 2 - 4
htdocs/core/class/CSMSFile.class.php

@@ -266,10 +266,8 @@ class CSMSFile
 
 	// Added by MMI Mathieu Moulin iProspective
 	function tel_international($value, $prefix='') {
-		if (empty($prefix)) {
-			global $conf;
-			$prefix = $conf->global->MAIN_MAIL_SMS_INTL_PREFIX_DEFAULT;
-		}
+		if (empty($prefix))
+			$prefix = getDolGlobalString('MAIN_MAIL_SMS_INTL_PREFIX_DEFAULT');
 		$value = str_replace([' ', '.', '-'], ['', '', ''], $value);
 		if (substr($value, 0, 2)=='00')
 			$value = '+'.substr($value, 2);

+ 1 - 1
htdocs/custom/mbietransactions

@@ -1 +1 @@
-Subproject commit db398734334ca6435ae436f1f6a1ceefcbb56a06
+Subproject commit 12037ef584df484d2b4f51617d9878f4dc5a95fa

+ 1 - 0
htdocs/custom/mmisav

@@ -0,0 +1 @@
+Subproject commit 6a9dd9a6548e4b4395326d080551d88044f82d33

+ 1 - 1
htdocs/custom_dolicloud

@@ -1 +1 @@
-Subproject commit 65f0c5ba45814ab7b17d220edecf2436dafa713a
+Subproject commit 1e87e85e937abed216ce543cf28e21e95e9f9e7d