Home Explore Help
Sign In
iProspective
/
dolibarr
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Fix php8.2 warnings

Laurent Destailleur 1 year ago
parent
53dab922fd
commit
7785ae93a1
95 changed files with 668 additions and 668 deletions
Split View Show Diff Stats
  1. 1 1
      htdocs/admin/modules.php
  2. 1 1
      htdocs/contrat/card.php
  3. 1 1
      htdocs/core/tpl/contacts.tpl.php
  4. 2 2
      htdocs/core/tpl/login.tpl.php
  5. 4 4
      htdocs/core/tpl/objectline_create.tpl.php
  6. 1 1
      htdocs/core/tpl/passwordforgotten.tpl.php
  7. 1 1
      htdocs/core/tpl/passwordreset.tpl.php
  8. 1 1
      htdocs/datapolicy/admin/setup.php
  9. 1 1
      htdocs/datapolicy/class/actions_datapolicy.class.php
  10. 1 1
      htdocs/datapolicy/lib/datapolicy.lib.php
  11. 5 5
      htdocs/dav/fileserver.php
  12. 1 1
      htdocs/debugbar/class/DataCollector/DolibarrCollector.php
  13. 6 6
      htdocs/delivery/card.php
  14. 7 7
      htdocs/delivery/class/delivery.class.php
  15. 1 1
      htdocs/delivery/tpl/linkedobjectblock.tpl.php
  16. 9 9
      htdocs/don/card.php
  17. 1 1
      htdocs/don/class/don.class.php
  18. 1 1
      htdocs/don/index.php
  19. 3 3
      htdocs/don/list.php
  20. 1 1
      htdocs/don/payment/payment.php
  21. 1 1
      htdocs/don/stats/index.php
  22. 1 1
      htdocs/ecm/class/ecmfiles.class.php
  23. 1 1
      htdocs/ecm/dir_card.php
  24. 2 2
      htdocs/ecm/index.php
  25. 5 5
      htdocs/ecm/index_auto.php
  26. 1 1
      htdocs/ecm/index_medias.php
  27. 26 26
      htdocs/emailcollector/class/emailcollector.class.php
  28. 2 2
      htdocs/emailcollector/class/emailcollectoraction.class.php
  29. 2 2
      htdocs/emailcollector/class/emailcollectorfilter.class.php
  30. 3 3
      htdocs/eventorganization/class/conferenceorbooth.class.php
  31. 6 6
      htdocs/eventorganization/class/conferenceorboothattendee.class.php
  32. 5 5
      htdocs/eventorganization/conferenceorbooth_card.php
  33. 5 5
      htdocs/eventorganization/conferenceorbooth_contact.php
  34. 5 5
      htdocs/eventorganization/conferenceorbooth_document.php
  35. 5 5
      htdocs/eventorganization/conferenceorbooth_list.php
  36. 5 5
      htdocs/eventorganization/conferenceorboothattendee_card.php
  37. 6 6
      htdocs/eventorganization/conferenceorboothattendee_list.php
  38. 3 3
      htdocs/eventorganization/core/actions_massactions_mail.inc.php
  39. 1 1
      htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
  40. 47 47
      htdocs/expedition/card.php
  41. 17 17
      htdocs/expedition/class/expedition.class.php
  42. 22 22
      htdocs/expedition/dispatch.php
  43. 3 3
      htdocs/expedition/list.php
  44. 8 8
      htdocs/expedition/shipment.php
  45. 1 1
      htdocs/expedition/stats/index.php
  46. 51 51
      htdocs/expensereport/card.php
  47. 6 6
      htdocs/expensereport/class/expensereport.class.php
  48. 3 3
      htdocs/expensereport/index.php
  49. 1 1
      htdocs/expensereport/list.php
  50. 3 3
      htdocs/expensereport/payment/list.php
  51. 1 1
      htdocs/expensereport/payment/payment.php
  52. 1 1
      htdocs/expensereport/stats/index.php
  53. 2 2
      htdocs/expensereport/tpl/expensereport_addfile.tpl.php
  54. 4 4
      htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
  55. 2 2
      htdocs/exports/class/export.class.php
  56. 2 2
      htdocs/exports/export.php
  57. 2 2
      htdocs/externalsite/admin/index.php
  58. 2 2
      htdocs/externalsite/frames.php
  59. 2 2
      htdocs/fichinter/card-rec.php
  60. 54 54
      htdocs/fichinter/card.php
  61. 3 3
      htdocs/fichinter/class/fichinter.class.php
  62. 2 2
      htdocs/fichinter/contact.php
  63. 1 1
      htdocs/fichinter/index.php
  64. 9 9
      htdocs/fichinter/list.php
  65. 2 2
      htdocs/fichinter/stats/index.php
  66. 2 2
      htdocs/fourn/ajax/getSupplierPrices.php
  67. 8 8
      htdocs/fourn/card.php
  68. 22 22
      htdocs/fourn/class/fournisseur.commande.class.php
  69. 10 10
      htdocs/fourn/class/fournisseur.facture.class.php
  70. 7 7
      htdocs/fourn/class/fournisseur.product.class.php
  71. 5 5
      htdocs/fourn/class/paiementfourn.class.php
  72. 60 60
      htdocs/fourn/commande/card.php
  73. 1 1
      htdocs/fourn/commande/contact.php
  74. 37 37
      htdocs/fourn/commande/dispatch.php
  75. 1 1
      htdocs/fourn/commande/document.php
  76. 2 2
      htdocs/fourn/commande/index.php
  77. 3 3
      htdocs/fourn/commande/info.php
  78. 4 4
      htdocs/fourn/commande/list.php
  79. 1 1
      htdocs/fourn/commande/note.php
  80. 1 1
      htdocs/fourn/contact.php
  81. 13 13
      htdocs/fourn/facture/card-rec.php
  82. 74 74
      htdocs/fourn/facture/card.php
  83. 2 2
      htdocs/fourn/facture/contact.php
  84. 2 2
      htdocs/fourn/facture/document.php
  85. 2 2
      htdocs/fourn/facture/index.php
  86. 2 2
      htdocs/fourn/facture/info.php
  87. 3 3
      htdocs/fourn/facture/list.php
  88. 2 2
      htdocs/fourn/facture/note.php
  89. 1 1
      htdocs/fourn/facture/paiement.php
  90. 2 2
      htdocs/fourn/index.php
  91. 8 8
      htdocs/fourn/paiement/card.php
  92. 5 5
      htdocs/fourn/paiement/list.php
  93. 1 1
      htdocs/fourn/recap-fourn.php
  94. 1 1
      htdocs/ftp/admin/ftpclient.php
  95. 1 1
      htdocs/ftp/index.php

+ 1 - 1
htdocs/admin/modules.php
View File 

@@ -1157,7 +1157,7 @@ if ($mode == 'marketplace') {
 
 					</tbody>
 
 				</table>
 
 			</div>
 
-<?php
 
+		<?php
 
 	}
 
 }

+ 1 - 1
htdocs/contrat/card.php
View File 

@@ -2352,5 +2352,5 @@ $(document).ready(function() {
 
 	}
 
 });
 
 </script>
 
-<?php
 
+	<?php
 
 }

+ 1 - 1
htdocs/core/tpl/contacts.tpl.php
View File 

@@ -179,7 +179,7 @@ if ($permission) {
 
 		</div>
 
 	</form>
 
 
-<?php
 
+		<?php
 
 	}
 
 
 	print "</div>";

+ 2 - 2
htdocs/core/tpl/login.tpl.php
View File 

@@ -117,7 +117,7 @@ if (getDolGlobalString('ADD_UNSPLASH_LOGIN_BACKGROUND')) {
 
 	// For example $conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND = 'https://source.unsplash.com/random'
 
 	?>
 
 	<body class="body bodylogin" style="background-image: url('<?php echo dol_escape_htmltag($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND); ?>'); background-repeat: no-repeat; background-position: center center; background-attachment: fixed; background-size: cover; background-color: #ffffff;">
 
-<?php
 
+	<?php
 
 } else {
 
 	?>
 
 	<body class="body bodylogin"<?php print !getDolGlobalString('MAIN_LOGIN_BACKGROUND') ? '' : ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: url(\''.DOL_URL_ROOT.'/viewimage.php?cache=1&noalt=1&modulepart=mycompany&file=logos/'.urlencode($conf->global->MAIN_LOGIN_BACKGROUND).'\')"'; ?>>
 
@@ -249,7 +249,7 @@ if (!empty($captcha)) {
 
 	</span>
 
 
 	</div></div>
 
-<?php
 
+	<?php
 
 }
 
 
 if (!empty($morelogincontent)) {

+ 4 - 4
htdocs/core/tpl/objectline_create.tpl.php
View File 

@@ -116,7 +116,7 @@ if ($nolinesbefore) {
 
 		if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier' || $object->element == 'invoice_supplier_rec') {	// We must have same test in printObjectLines
 
 			?>
 
 			<td class="linecolrefsupplier"><span id="title_fourn_ref"><?php echo $langs->trans('SupplierRef'); ?></span></td>
 
-<?php
 
+			<?php
 
 		}
 
 		?>
 
 		<td class="linecolvat right"><span id="title_vat"><?php echo $langs->trans('VAT'); ?></span></td>
 
@@ -846,13 +846,13 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 
 									?>
 
 									console.log("Countries are both IN and states are same, so we revert I into CS in default_vat_code="+default_vat_code);
 
 									new_default_vat_code = default_vat_code.replace(/^I\-/, 'C+S-');
 
-<?php
 
+									<?php
 
 								} elseif ($mysoc->country_code == 'IN' && !empty($object->thirdparty) && $object->thirdparty->country_code == 'IN' && $mysoc->state_code != $object->thirdparty->state_code) {
 
 									// We are in India and states differs, we revert the vat code "CS-x" into "I-x"
 
 									?>
 
 									console.log("Countries are both IN and states differs, so we revert CS into I in default_vat_code="+default_vat_code);
 
 									new_default_vat_code = default_vat_code.replace(/^C\+S\-/, 'I-');
 
-<?php
 
+									<?php
 
 								}
 
 								?>
 
 								if (new_default_vat_code != default_vat_code && jQuery('#tva_tx option:contains("'+new_default_vat_code+'")').val()) {
 
@@ -1200,7 +1200,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 
 
 		<?php if (GETPOST('prod_entry_mode') == 'predef') { // When we submit with a predef product and it fails we must start with predef ?>
 
 		setforpredef();
 
-<?php } ?>
 
+		<?php } ?>
 
 	});
 
 
 	/* Function to set fields visibility after selecting a free product */

+ 1 - 1
htdocs/core/tpl/passwordforgotten.tpl.php
View File 

@@ -179,7 +179,7 @@ if (!empty($captcha)) {
 
 	</span>
 
 
 	</div></div>
 
-<?php
 
+	<?php
 
 }
 
 
 if (!empty($morelogincontent)) {

+ 1 - 1
htdocs/core/tpl/passwordreset.tpl.php
View File 

@@ -220,7 +220,7 @@ if (!empty($captcha)) {
 
 	</span>
 
 
 	</div></div>
 
-<?php
 
+	<?php
 
 }
 
 
 if (!empty($morelogincontent)) {

+ 1 - 1
htdocs/datapolicy/admin/setup.php
View File 

@@ -42,7 +42,7 @@ $arrayofparameters['ThirdParty'] = array(
 
 	'DATAPOLICY_TIERS_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'company', 'class="pictofixedwidth"')),
 
 	'DATAPOLICY_TIERS_FOURNISSEUR'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'supplier', 'class="pictofixedwidth"')),
 
 );
 
-if (!empty($conf->global->DATAPOLICY_USE_SPECIFIC_DELAY_FOR_CONTACT)) {
 
+if (getDolGlobalString('DATAPOLICY_USE_SPECIFIC_DELAY_FOR_CONTACT')) {
 
 	$arrayofparameters['Contact'] = array(
 
 		'DATAPOLICY_CONTACT_CLIENT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'contact', 'class="pictofixedwidth"')),
 
 		'DATAPOLICY_CONTACT_PROSPECT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'contact', 'class="pictofixedwidth"')),

+ 1 - 1
htdocs/datapolicy/class/actions_datapolicy.class.php
View File 

@@ -171,7 +171,7 @@ class ActionsDatapolicy extends CommonHookActions
 
 		global $conf, $langs;
 
 		$langs->load('datapolicy@datapolicy');
 
 
-		if (!empty($conf->global->DATAPOLICY_ENABLE_EMAILS)) {
 
+		if (getDolGlobalString('DATAPOLICY_ENABLE_EMAILS')) {
 
 			$dialog = '<div id="dialogdatapolicy" style="display:none;" title="'.$langs->trans('DATAPOLICY_PORTABILITE_TITLE').'">';
 
 			$dialog .= '<div class="confirmmessage">'.img_help('', '').' '.$langs->trans('DATAPOLICY_PORTABILITE_CONFIRMATION').'</div>';
 
 			$dialog .= "</div>";

+ 1 - 1
htdocs/datapolicy/lib/datapolicy.lib.php
View File 

@@ -41,7 +41,7 @@ function datapolicyAdminPrepareHead()
 
 	$head[$h][2] = 'settings';
 
 	$h++;
 
 
-	if (!empty($conf->global->DATAPOLICY_ENABLE_EMAILS) || getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 
+	if (getDolGlobalString('DATAPOLICY_ENABLE_EMAILS') || getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 
 		$head[$h][0] = DOL_URL_ROOT."/datapolicy/admin/setupmail.php";
 
 		$head[$h][1] = $langs->trans("DATAPOLICYMail");
 
 		$head[$h][2] = 'emailing';

+ 5 - 5
htdocs/dav/fileserver.php
View File 

@@ -67,7 +67,7 @@ if (empty($conf->dav->enabled)) {
 
 }
 
 
 // Restrict API to some IPs
 
-if (!empty($conf->global->DAV_RESTRICT_ON_IP)) {
 
+if (getDolGlobalString('DAV_RESTRICT_ON_IP')) {
 
 	$allowedip = explode(' ', $conf->global->DAV_RESTRICT_ON_IP);
 
 	$ipremote = getUserRemoteIP();
 
 	if (!in_array($ipremote, $allowedip)) {
 
@@ -171,13 +171,13 @@ $nodes = array();
 
 
 // Enable directories and features according to DAV setup
 
 // Public dir
 
-if (!empty($conf->global->DAV_ALLOW_PUBLIC_DIR)) {
 
+if (getDolGlobalString('DAV_ALLOW_PUBLIC_DIR')) {
 
 	$nodes[] = new \Sabre\DAV\FS\Directory($publicDir);
 
 }
 
 // Private dir
 
 $nodes[] = new \Sabre\DAV\FS\Directory($privateDir);
 
 // ECM dir
 
-if (isModEnabled('ecm') && !empty($conf->global->DAV_ALLOW_ECM_DIR)) {
 
+if (isModEnabled('ecm') && getDolGlobalString('DAV_ALLOW_ECM_DIR')) {
 
 	$nodes[] = new \Sabre\DAV\FS\Directory($ecmDir);
 
 }
 
 
@@ -207,7 +207,7 @@ if (isset($baseUri)) {
 
 }
 
 
 // Add authentication function
 
-if ((empty($conf->global->DAV_ALLOW_PUBLIC_DIR)
 
+if ((!getDolGlobalString('DAV_ALLOW_PUBLIC_DIR')
 
 	|| !preg_match('/'.preg_quote(DOL_URL_ROOT.'/dav/fileserver.php/public', '/').'/', $_SERVER["PHP_SELF"]))
 
 	&& !preg_match('/^sabreAction=asset&assetName=[a-zA-Z0-9%\-\/]+\.(png|css|woff|ico|ttf)$/', $_SERVER["QUERY_STRING"])	// URL for Sabre browser resources
 
 	) {
 
@@ -220,7 +220,7 @@ $lockPlugin = new \Sabre\DAV\Locks\Plugin($lockBackend);
 
 $server->addPlugin($lockPlugin);
 
 
 // Support for the html browser
 
-if (empty($conf->global->DAV_DISABLE_BROWSER)) {
 
+if (!getDolGlobalString('DAV_DISABLE_BROWSER')) {
 
 	$browser = new \Sabre\DAV\Browser\Plugin();
 
 	$server->addPlugin($browser);
 
 }

+ 1 - 1
htdocs/debugbar/class/DataCollector/DolibarrCollector.php
View File 

@@ -113,7 +113,7 @@ class DolibarrCollector extends DataCollector implements Renderable, AssetProvid
 
 		$info .= $langs->trans('ID').': <strong>'.getDolGlobalString("MAIN_MAIL_SMTPS_IDT").'</strong><br>';
 
 		$info .= $langs->trans('Pwd').': <strong>'.preg_replace('/./', '*', getDolGlobalString("MAIN_MAIL_SMTPS_PW")).'</strong><br>';
 
 		$info .= $langs->trans('TLS/STARTTLS').': <strong>'.getDolGlobalString("MAIN_MAIL_EMAIL_TLS").'</strong> / <strong>'.getDolGlobalString("MAIN_MAIL_EMAIL_STARTTLS").'</strong><br>';
 
-		$info .= $langs->trans('MAIN_DISABLE_ALL_MAILS').': <strong>'.(empty($conf->global->MAIN_DISABLE_ALL_MAILS) ? $langs->trans('No') : $langs->trans('Yes')).'</strong><br>';
 
+		$info .= $langs->trans('MAIN_DISABLE_ALL_MAILS').': <strong>'.(!getDolGlobalString('MAIN_DISABLE_ALL_MAILS') ? $langs->trans('No') : $langs->trans('Yes')).'</strong><br>';
 
 		$info .= 'dolibarr_mailing_limit_sendbyweb = <strong>'.$dolibarr_mailing_limit_sendbyweb.'</strong><br>';
 
 		$info .= 'dolibarr_mailing_limit_sendbycli = <strong>'.$dolibarr_mailing_limit_sendbycli.'</strong><br>';
 
 		$info .= 'dolibarr_mailing_limit_sendbyday = <strong>'.$dolibarr_mailing_limit_sendbyday.'</strong><br>';

+ 6 - 6
htdocs/delivery/card.php
View File 

@@ -135,13 +135,13 @@ if ($action == 'add') {
 
 		$action = 'create';
 
 	}
 
 } elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
 
-	((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'delivery', 'creer'))
 
-	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'delivery_advance', 'validate')))
 
+	((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'delivery', 'creer'))
 
+	|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'delivery_advance', 'validate')))
 
 ) {
 
 	$result = $object->valid($user);
 
 
 	// Define output language
 
-	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+	if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 		$outputlangs = $langs;
 
 		$newlang = '';
 
 		if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -537,7 +537,7 @@ if ($action == 'create') {
 
 						$product->fetch($object->lines[$i]->fk_product);
 
 
 						// Define output language
 
-						if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 
+						if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 
 							$outputlangs = $langs;
 
 							$newlang = '';
 
 							if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -642,8 +642,8 @@ if ($action == 'create') {
 
 				print '<div class="tabsAction">';
 
 
 				if ($object->statut == 0 && $num_prod > 0) {
 
-					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'delivery', 'creer'))
 
-						|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'delivery_advance', 'validate'))) {
 
+					if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'delivery', 'creer'))
 
+						|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'delivery_advance', 'validate'))) {
 
 						print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=valid&amp;token='.newToken().'&amp;id='.$object->id, '');
 
 					}
 
 				}

+ 7 - 7
htdocs/delivery/class/delivery.class.php
View File 

@@ -409,9 +409,9 @@ class Delivery extends CommonObject
 
 
 		$error = 0;
 
 
-		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'delivery', 'creer'))
 
-			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'delivery_advance', 'validate'))) {
 
-			if (!empty($conf->global->DELIVERY_ADDON_NUMBER)) {
 
+		if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'delivery', 'creer'))
 
+			|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'delivery_advance', 'validate'))) {
 
+			if (getDolGlobalString('DELIVERY_ADDON_NUMBER')) {
 
 				// Setting the command numbering module name
 
 				$modName = $conf->global->DELIVERY_ADDON_NUMBER;
 
 
@@ -569,7 +569,7 @@ class Delivery extends CommonObject
 
 			$line->description       = $expedition->lines[$i]->description;
 
 			$line->qty               = $expedition->lines[$i]->qty_shipped;
 
 			$line->fk_product        = $expedition->lines[$i]->fk_product;
 
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($expedition->lines[$i]->array_options) && count($expedition->lines[$i]->array_options) > 0) { // For avoid conflicts if trigger used
 
+			if (!getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED') && is_array($expedition->lines[$i]->array_options) && count($expedition->lines[$i]->array_options) > 0) { // For avoid conflicts if trigger used
 
 				$line->array_options = $expedition->lines[$i]->array_options;
 
 			}
 
 			$this->lines[$i] = $line;
 
@@ -606,7 +606,7 @@ class Delivery extends CommonObject
 
 		global $conf;
 
 		$error = 0;
 
 
-		if ($id > 0 && !$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
 
+		if ($id > 0 && !$error && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED') && is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
 
 			$line = new DeliveryLine($this->db);
 
 			$line->array_options = $array_options;
 
 			$line->id = $id;
 
@@ -643,7 +643,7 @@ class Delivery extends CommonObject
 
 
 		$line->origin_id = $origin_id;
 
 		$line->qty = $qty;
 
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
 
+		if (!getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED') && is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
 
 			$line->array_options = $array_options;
 
 		}
 
 		$this->lines[$num] = $line;
 
@@ -1125,7 +1125,7 @@ class Delivery extends CommonObject
 
 
 			if ($this->model_pdf) {
 
 				$modele = $this->model_pdf;
 
-			} elseif (!empty($conf->global->DELIVERY_ADDON_PDF)) {
 
+			} elseif (getDolGlobalString('DELIVERY_ADDON_PDF')) {
 
 				$modele = $conf->global->DELIVERY_ADDON_PDF;
 
 			}
 
 		}

+ 1 - 1
htdocs/delivery/tpl/linkedobjectblock.tpl.php
View File 

@@ -48,7 +48,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 
 	}
 
 	echo '<tr class="'.$trclass.'" >';
 
 	echo '<td class="linkedcol-element tdoverflowmax100">'.$langs->trans("Delivery");
 
-	if (!empty($showImportButton) && !empty($conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)) {
 
+	if (!empty($showImportButton) && getDolGlobalString('MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES')) {
 
 		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
 
 	}
 
 	echo '</td>';

+ 9 - 9
htdocs/don/card.php
View File 

@@ -131,7 +131,7 @@ if (empty($reshook)) {
 
 		$result = $object->reopen($user);
 
 		if ($result >= 0) {
 
 			// Define output language
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 				if (method_exists($object, 'generateDocument')) {
 
 					$outputlangs = $langs;
 
 					$newlang = '';
 
@@ -225,7 +225,7 @@ if (empty($reshook)) {
 
 
 		$error = 0;
 
 
-		if (isModEnabled("societe") && !empty($conf->global->DONATION_USE_THIRDPARTIES) && !(GETPOST("socid", 'int') > 0)) {
 
+		if (isModEnabled("societe") && getDolGlobalString('DONATION_USE_THIRDPARTIES') && !(GETPOST("socid", 'int') > 0)) {
 
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")), null, 'errors');
 
 			$action = "create";
 
 			$error++;
 
@@ -417,7 +417,7 @@ if ($action == 'create') {
 
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans('Ref').'</td><td>'.$langs->trans('Draft').'</td></tr>';
 
 
 	// Company
 
-	if (isModEnabled("societe") && !empty($conf->global->DONATION_USE_THIRDPARTIES)) {
 
+	if (isModEnabled("societe") && getDolGlobalString('DONATION_USE_THIRDPARTIES')) {
 
 		// Thirdparty
 
 		if ($soc->id > 0) {
 
 			print '<td class="fieldrequired">'.$langs->trans('ThirdParty').'</td>';
 
@@ -443,7 +443,7 @@ if ($action == 'create') {
 
 			$filter = '((s.client:IN:1,2,3) AND (status:=:1))';
 
 			print $form->select_company($soc->id, 'socid', $filter, 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 
 			// Option to reload page to retrieve customer informations. Note, this clear other input
 
-			if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
 
+			if (getDolGlobalString('RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED')) {
 
 				print '<script type="text/javascript">
 
 				$(document).ready(function() {
 
 					$("#socid").change(function() {
 
@@ -476,7 +476,7 @@ if ($action == 'create') {
 
 	print $form->selectyesno("public", $public_donation, 1);
 
 	print "</td></tr>\n";
 
 
-	if (!isModEnabled('societe') || empty($conf->global->DONATION_USE_THIRDPARTIES)) {
 
+	if (!isModEnabled('societe') || !getDolGlobalString('DONATION_USE_THIRDPARTIES')) {
 
 		print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" value="'.dol_escape_htmltag(GETPOST("societe")).'" class="maxwidth200"></td></tr>';
 
 		print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" value="'.dol_escape_htmltag(GETPOST("lastname")).'" class="maxwidth200"></td></tr>';
 
 		print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" value="'.dol_escape_htmltag(GETPOST("firstname")).'" class="maxwidth200"></td></tr>';
 
@@ -515,7 +515,7 @@ if ($action == 'create') {
 
 	if (!isset($note_public)) {
 
 		$note_public = $object->getDefaultCreateValueFor('note_public');
 
 	}
 
-	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 
+	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 
 	print $doleditor->Create(1);
 
 	print '</td></tr>';
 
 
@@ -527,7 +527,7 @@ if ($action == 'create') {
 
 		if (!isset($note_private)) {
 
 			$note_private = $object->getDefaultCreateValueFor('note_private');
 
 		}
 
-		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 
+		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 
 		print $doleditor->Create(1);
 
 		print '</td></tr>';
 
 	}
 
@@ -613,7 +613,7 @@ if (!empty($id) && $action == 'edit') {
 
 	print "</td>";
 
 	print "</tr>\n";
 
 
-	if (isModEnabled("societe") && !empty($conf->global->DONATION_USE_THIRDPARTIES)) {
 
+	if (isModEnabled("societe") && getDolGlobalString('DONATION_USE_THIRDPARTIES')) {
 
 		$company = new Societe($db);
 
 
 		print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="2">';
 
@@ -780,7 +780,7 @@ if (!empty($id) && $action != 'edit') {
 
 	print yn($object->public);
 
 	print '</td></tr>';
 
 
-	if (isModEnabled("societe") && !empty($conf->global->DONATION_USE_THIRDPARTIES)) {
 
+	if (isModEnabled("societe") && getDolGlobalString('DONATION_USE_THIRDPARTIES')) {
 
 		$company = new Societe($db);
 
 
 		print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="2">';

+ 1 - 1
htdocs/don/class/don.class.php
View File 

@@ -1024,7 +1024,7 @@ class Don extends CommonObject
 
 
 			if ($this->model_pdf) {
 
 				$modele = $this->model_pdf;
 
-			} elseif (!empty($conf->global->DON_ADDON_MODEL)) {
 
+			} elseif (getDolGlobalString('DON_ADDON_MODEL')) {
 
 				$modele = $conf->global->DON_ADDON_MODEL;
 
 			}
 
 		}

+ 1 - 1
htdocs/don/index.php
View File 

@@ -90,7 +90,7 @@ print load_fiche_titre($langs->trans("DonationsArea"), '', 'object_donation');
 
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // TODO Add a search into global search combo so we can remove this
 
+if (getDolGlobalString('MAIN_SEARCH_FORM_ON_HOME_AREAS')) {     // TODO Add a search into global search combo so we can remove this
 
 	if (isModEnabled('don') && $user->hasRight('don', 'lire')) {
 
 		$listofsearchfields['search_donation'] = array('text'=>'Donation');
 
 	}

+ 3 - 3
htdocs/don/list.php
View File 

@@ -321,7 +321,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 
 print '<td class="liste_titre">';
 
 print '<input class="flat" size="10" type="text" name="search_ref" value="'.$search_ref.'">';
 
 print '</td>';
 
-if (!empty($conf->global->DONATION_USE_THIRDPARTIES)) {
 
+if (getDolGlobalString('DONATION_USE_THIRDPARTIES')) {
 
 	print '<td class="liste_titre">';
 
 	print '<input class="flat" size="10" type="text" name="search_thirdparty" value="'.$search_thirdparty.'">';
 
 	print '</td>';
 
@@ -372,7 +372,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 
 }
 
 print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "d.rowid", "", $param, "", $sortfield, $sortorder);
 
 $totalarray['nbfield']++;
 
-if (!empty($conf->global->DONATION_USE_THIRDPARTIES)) {
 
+if (getDolGlobalString('DONATION_USE_THIRDPARTIES')) {
 
 	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "d.fk_soc", "", $param, "", $sortfield, $sortorder);
 
 	$totalarray['nbfield']++;
 
 } else {
 
@@ -453,7 +453,7 @@ while ($i < $imaxinloop) {
 
 		$donationstatic->lastname = $obj->lastname;
 
 		$donationstatic->firstname = $obj->firstname;
 
 		print "<td>".$donationstatic->getNomUrl(1)."</td>";
 
-		if (!empty($conf->global->DONATION_USE_THIRDPARTIES)) {
 
+		if (getDolGlobalString('DONATION_USE_THIRDPARTIES')) {
 
 			if (!empty($obj->socid) && $company->id > 0) {
 
 				print "<td>".$company->getNomUrl(1)."</td>";
 
 			} else {

+ 1 - 1
htdocs/don/payment/payment.php
View File 

@@ -186,7 +186,7 @@ if ($action == 'create') {
 
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td colspan="2">';
 
 	$datepaid = dol_mktime(12, 0, 0, GETPOST("remonth"), GETPOST("reday"), GETPOST("reyear"));
 
-	$datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (GETPOST("remonth") ? $datepaid : -1) : 0;
 
+	$datepayment = !getDolGlobalString('MAIN_AUTOFILL_DATE') ? (GETPOST("remonth") ? $datepaid : -1) : 0;
 
 	print $form->selectDate($datepayment, '', 0, 0, 0, "add_payment", 1, 1, 0, '', '', $object->date, '', 1, $langs->trans("DonationDate"));
 
 	print "</td>";
 
 	print '</tr>';

+ 1 - 1
htdocs/don/stats/index.php
View File 

@@ -43,7 +43,7 @@ if ($user->socid > 0) {
 
 
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
 
 $year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
 
-$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 
 $endyear = $year;
 
 
 // Load translation files required by the page

+ 1 - 1
htdocs/ecm/class/ecmfiles.class.php
View File 

@@ -894,7 +894,7 @@ class EcmFiles extends CommonObject
 
 
 		$linkclose = '';
 
 		if (empty($notooltip)) {
 
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 
 				$label = $langs->trans("ShowProject");
 
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 
 			}

+ 1 - 1
htdocs/ecm/dir_card.php
View File 

@@ -114,7 +114,7 @@ if (!$permissiontoread) {
 
  */
 
 
 // Upload file
 
-if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC) && $permissiontoupload) {
 
+if (GETPOST("sendit") && getDolGlobalString('MAIN_UPLOAD_DOC') && $permissiontoupload) {
 
 	if (dol_mkdir($upload_dir) >= 0) {
 
 		$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir."/".dol_unescapefile($_FILES['userfile']['name']), 0, 0, $_FILES['userfile']['error']);
 
 		if (is_numeric($resupload) && $resupload > 0) {

+ 2 - 2
htdocs/ecm/index.php
View File 

@@ -101,7 +101,7 @@ $hookmanager->initHooks(array('ecmindexcard', 'globalcard'));
 
 //include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 
 // Upload file (code similar but different than actions_linkedfiles.inc.php)
 
-if (GETPOST("sendit", 'alphanohtml') && !empty($conf->global->MAIN_UPLOAD_DOC) && $permissiontocreate) {
 
+if (GETPOST("sendit", 'alphanohtml') && getDolGlobalString('MAIN_UPLOAD_DOC') && $permissiontocreate) {
 
 	// Define relativepath and upload_dir
 
 	$relativepath = '';
 
 	if ($ecmdir->id) {
 
@@ -323,7 +323,7 @@ $moreheadjs = '';
 
 
 //$morejs=array();
 
 $morejs = array('includes/jquery/plugins/blockUI/jquery.blockUI.js', 'core/js/blockUI.js'); // Used by ecm/tpl/enabledfiletreeajax.tpl.pgp
 
-if (empty($conf->global->MAIN_ECM_DISABLE_JS)) {
 
+if (!getDolGlobalString('MAIN_ECM_DISABLE_JS')) {
 
 	$morejs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
 
 }

+ 5 - 5
htdocs/ecm/index_auto.php
View File 

@@ -295,7 +295,7 @@ $moreheadjs = '';
 
 
 //$morejs=array();
 
 $morejs = array('includes/jquery/plugins/blockUI/jquery.blockUI.js', 'core/js/blockUI.js'); // Used by ecm/tpl/enabledfiletreeajax.tpl.pgp
 
-if (empty($conf->global->MAIN_ECM_DISABLE_JS)) {
 
+if (!getDolGlobalString('MAIN_ECM_DISABLE_JS')) {
 
 	$morejs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
 
 }
 
 
@@ -309,7 +309,7 @@ llxHeader($moreheadcss.$moreheadjs, $langs->trans("ECMArea"), '', '', '', '', $m
 
 // Add sections to manage
 
 $rowspan = 0;
 
 $sectionauto = array();
 
-if (empty($conf->global->ECM_AUTO_TREE_HIDEN)) {
 
+if (!getDolGlobalString('ECM_AUTO_TREE_HIDEN')) {
 
 	if (isModEnabled("product") || isModEnabled("service")) {
 
 		$langs->load("products");
 
 		$rowspan++; $sectionauto[] = array('position'=>10, 'level'=>1, 'module'=>'product', 'test'=>(isModEnabled("product") || isModEnabled("service")), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts"));
 
@@ -408,7 +408,7 @@ if ($action == 'deletefile' && empty($conf->use_javascript_ajax)) {
 
 print '<div class="inline-block toolbarbutton centpercent">';
 
 
 // Toolbar
 
-$url = ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) ? '#' : ($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module ? '&amp;module='.$module : '').($section ? '&amp;section='.$section : '')));
 
+$url = ((!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_ECM_DISABLE_JS')) ? '#' : ($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module ? '&amp;module='.$module : '').($section ? '&amp;section='.$section : '')));
 
 print '<a href="'.$url.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('Refresh')).'">';
 
 print img_picto('', 'refresh', 'id="refreshbutton"', false, 0, 0, '', 'size15x marginrightonly');
 
 print '</a>';
 
@@ -459,7 +459,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 
 			}
 
 
 			print '<li class="directory collapsed">';
 
-			if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
 
+			if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_ECM_DISABLE_JS')) {
 
 				print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.urlencode($val['module']).'">';
 
 				print $val['label'];
 
 				print '</a>';
 
@@ -514,7 +514,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php';
 
 <?php
 
 // End of page
 
 
-if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
 
+if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_ECM_DISABLE_JS')) {
 
 	include DOL_DOCUMENT_ROOT.'/ecm/tpl/enablefiletreeajax.tpl.php';
 
 }

+ 1 - 1
htdocs/ecm/index_medias.php
View File 

@@ -287,7 +287,7 @@ $moreheadjs = '';
 
 
 //$morejs=array();
 
 $morejs = array('includes/jquery/plugins/blockUI/jquery.blockUI.js', 'core/js/blockUI.js'); // Used by ecm/tpl/enabledfiletreeajax.tpl.pgp
 
-if (empty($conf->global->MAIN_ECM_DISABLE_JS)) {
 
+if (!getDolGlobalString('MAIN_ECM_DISABLE_JS')) {
 
 	$morejs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
 
 }

+ 26 - 26
htdocs/emailcollector/class/emailcollector.class.php
View File 

@@ -251,7 +251,7 @@ class EmailCollector extends CommonObject
 
 
 		$this->db = $db;
 
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 
 			$this->fields['rowid']['visible'] = 0;
 
 		}
 
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 
@@ -590,7 +590,7 @@ class EmailCollector extends CommonObject
 
 
 		$linkclose = '';
 
 		if (empty($notooltip)) {
 
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 
 				$label = $langs->trans("ShowEmailCollector");
 
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 
 			}
 
@@ -788,9 +788,9 @@ class EmailCollector extends CommonObject
 
 
 		// Connect to IMAP
 
 		$flags = '/service=imap'; // IMAP
 
-		if (!empty($conf->global->IMAP_FORCE_TLS)) {
 
+		if (getDolGlobalString('IMAP_FORCE_TLS')) {
 
 			$flags .= '/tls';
 
-		} elseif (empty($this->imap_encryption) || ($this->imap_encryption == 'ssl' && !empty($conf->global->IMAP_FORCE_NOSSL))) {
 
+		} elseif (empty($this->imap_encryption) || ($this->imap_encryption == 'ssl' && getDolGlobalString('IMAP_FORCE_NOSSL'))) {
 
 			$flags .= '';
 
 		} else {
 
 			$flags .= '/' . $this->imap_encryption;
 
@@ -799,7 +799,7 @@ class EmailCollector extends CommonObject
 
 		$flags .= '/novalidate-cert';
 
 		//$flags.='/readonly';
 
 		//$flags.='/debug';
 
-		if (!empty($this->norsh) || !empty($conf->global->IMAP_FORCE_NORSH)) {
 
+		if (!empty($this->norsh) || getDolGlobalString('IMAP_FORCE_NORSH')) {
 
 			$flags .= '/norsh';
 
 		}
 
 		//Used in shared mailbox from Office365
 
@@ -1086,7 +1086,7 @@ class EmailCollector extends CommonObject
 
 		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
 
 
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
-		if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
 
+		if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 
 			require_once DOL_DOCUMENT_ROOT.'/includes/webklex/php-imap/vendor/autoload.php';
 
 		}
 
 
@@ -1129,7 +1129,7 @@ class EmailCollector extends CommonObject
 
 		$this->fetchFilters();
 
 		$this->fetchActions();
 
 
-		if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
 
+		if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 
 			if ($this->acces_type == 1) {
 
 				// Mode OAUth2 with PHP-IMAP
 
 				$supportedoauth2array = array();
 
@@ -1263,7 +1263,7 @@ class EmailCollector extends CommonObject
 
 			//$search='ALL';
 
 		}
 
 
-		if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
 
+		if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 
 			// Use PHPIMAP external library
 
 			$criteria = array(array('UNDELETED')); // Seems not supported by some servers
 
 			foreach ($this->filters as $rule) {
 
@@ -1529,7 +1529,7 @@ class EmailCollector extends CommonObject
 
 		$nbactiondone = 0;
 
 		$charset = ($this->hostcharset ? $this->hostcharset : "UTF-8");
 
 
-		if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
 
+		if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 
 			try {
 
 				//$criteria = [['ALL']];
 
 				//$Query = $client->getFolders()[0]->messages()->where($criteria);
 
@@ -1606,7 +1606,7 @@ class EmailCollector extends CommonObject
 
 
 
 				// GET header and overview datas
 
-				if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
 
+				if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 
 					$header = $imapemail->getHeader()->raw;
 
 					$overview = $imapemail->getAttributes();
 
 				} else {
 
@@ -1734,7 +1734,7 @@ class EmailCollector extends CommonObject
 
 				$candidaturefoundby = '';
 
 
 
-				if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
 
+				if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 
 					dol_syslog("msgid=".$overview['message_id']." date=".dol_print_date($overview['date'], 'dayrfc', 'gmt')." from=".$overview['from']." to=".$overview['to']." subject=".$overview['subject']);
 
 
 					// Removed emojis
 
@@ -1853,7 +1853,7 @@ class EmailCollector extends CommonObject
 
 				$fromstring = '';
 
 				$replytostring = '';
 
 
-				if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
 
+				if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 
 					$fromstring = $overview['from'];
 
 					//$replytostring = empty($overview['reply-to']) ? '' : $overview['reply-to'];
 
 
@@ -2558,7 +2558,7 @@ class EmailCollector extends CommonObject
 
 								$description = dol_concatdesc($description, $messagetext);
 
 
 								$descriptionfull = $description;
 
-								if (empty($conf->global->MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER)) {
 
+								if (!getDolGlobalString('MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER')) {
 
 									$descriptionfull = dol_concatdesc($descriptionfull, "----- Header");
 
 									$descriptionfull = dol_concatdesc($descriptionfull, $header);
 
 								}
 
@@ -2622,7 +2622,7 @@ class EmailCollector extends CommonObject
 
 							}
 
 						} elseif ($operation['type'] == 'recordjoinpiece') {
 
 							$data = [];
 
-							if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
 
+							if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 
 								foreach ($attachments as $attachment) {
 
 									if ($attachment->getName() === 'undefined') {
 
 										continue;
 
@@ -2822,7 +2822,7 @@ class EmailCollector extends CommonObject
 
 								$description = dol_concatdesc($description, $messagetext);
 
 
 								$descriptionfull = $description;
 
-								if (empty($conf->global->MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER)) {
 
+								if (!getDolGlobalString('MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER')) {
 
 									$descriptionfull = dol_concatdesc($descriptionfull, "----- Header");
 
 									$descriptionfull = dol_concatdesc($descriptionfull, $header);
 
 								}
 
@@ -2850,7 +2850,7 @@ class EmailCollector extends CommonObject
 
 								if (empty($projecttocreate->ref)) {
 
 									// Get next Ref
 
 									$defaultref = '';
 
-									$modele = empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
 
+									$modele = !getDolGlobalString('PROJECT_ADDON') ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
 
 
 									// Search template files
 
 									$file = ''; $classname = ''; $filefound = 0; $reldir = '';
 
@@ -2907,7 +2907,7 @@ class EmailCollector extends CommonObject
 
 												if (!dol_is_dir($destdir)) {
 
 													dol_mkdir($destdir);
 
 												}
 
-												if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
 
+												if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 
 													foreach ($attachments as $attachment) {
 
 														// $attachment->save($destdir.'/');
 
 														$typeattachment = (string) $attachment->getDisposition();
 
@@ -2958,16 +2958,16 @@ class EmailCollector extends CommonObject
 
 								$description = dol_concatdesc($description, $messagetext);
 
 
 								$descriptionfull = $description;
 
-								if (empty($conf->global->MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER)) {
 
+								if (!getDolGlobalString('MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER')) {
 
 									$descriptionfull = dol_concatdesc($descriptionfull, "----- Header");
 
 									$descriptionfull = dol_concatdesc($descriptionfull, $header);
 
 								}
 
 
 								$tickettocreate->subject = $subject;
 
 								$tickettocreate->message = $description;
 
-								$tickettocreate->type_code = (!empty($conf->global->MAIN_EMAILCOLLECTOR_TICKET_TYPE_CODE) ? $conf->global->MAIN_EMAILCOLLECTOR_TICKET_TYPE_CODE : dol_getIdFromCode($this->db, 1, 'c_ticket_type', 'use_default', 'code', 1));
 
-								$tickettocreate->category_code = (!empty($conf->global->MAIN_EMAILCOLLECTOR_TICKET_CATEGORY_CODE) ? $conf->global->MAIN_EMAILCOLLECTOR_TICKET_CATEGORY_CODE : dol_getIdFromCode($this->db, 1, 'c_ticket_category', 'use_default', 'code', 1));
 
-								$tickettocreate->severity_code = (!empty($conf->global->MAIN_EMAILCOLLECTOR_TICKET_SEVERITY_CODE) ? $conf->global->MAIN_EMAILCOLLECTOR_TICKET_SEVERITY_CODE : dol_getIdFromCode($this->db, 1, 'c_ticket_severity', 'use_default', 'code', 1));
 
+								$tickettocreate->type_code = (getDolGlobalString('MAIN_EMAILCOLLECTOR_TICKET_TYPE_CODE') ? $conf->global->MAIN_EMAILCOLLECTOR_TICKET_TYPE_CODE : dol_getIdFromCode($this->db, 1, 'c_ticket_type', 'use_default', 'code', 1));
 
+								$tickettocreate->category_code = (getDolGlobalString('MAIN_EMAILCOLLECTOR_TICKET_CATEGORY_CODE') ? $conf->global->MAIN_EMAILCOLLECTOR_TICKET_CATEGORY_CODE : dol_getIdFromCode($this->db, 1, 'c_ticket_category', 'use_default', 'code', 1));
 
+								$tickettocreate->severity_code = (getDolGlobalString('MAIN_EMAILCOLLECTOR_TICKET_SEVERITY_CODE') ? $conf->global->MAIN_EMAILCOLLECTOR_TICKET_SEVERITY_CODE : dol_getIdFromCode($this->db, 1, 'c_ticket_severity', 'use_default', 'code', 1));
 
 								$tickettocreate->origin_email = $from;
 
 								$tickettocreate->fk_user_create = $user->id;
 
 								$tickettocreate->datec = dol_now();
 
@@ -2989,7 +2989,7 @@ class EmailCollector extends CommonObject
 
 								if (empty($tickettocreate->ref)) {
 
 									// Get next Ref
 
 									$defaultref = '';
 
-									$modele = empty($conf->global->TICKET_ADDON) ? 'mod_ticket_simple' : $conf->global->TICKET_ADDON;
 
+									$modele = !getDolGlobalString('TICKET_ADDON') ? 'mod_ticket_simple' : $conf->global->TICKET_ADDON;
 
 
 									// Search template files
 
 									$file = ''; $classname = ''; $filefound = 0; $reldir = '';
 
@@ -3041,7 +3041,7 @@ class EmailCollector extends CommonObject
 
 												if (!dol_is_dir($destdir)) {
 
 													dol_mkdir($destdir);
 
 												}
 
-												if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
 
+												if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 
 													foreach ($attachments as $attachment) {
 
 														// $attachment->save($destdir.'/');
 
 														$typeattachment = (string) $attachment->getDisposition();
 
@@ -3204,7 +3204,7 @@ class EmailCollector extends CommonObject
 
 				// Error for email or not ?
 
 				if (!$errorforactions) {
 
 					if (!empty($targetdir)) {
 
-						if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
 
+						if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 
 							// Move mail using PHP-IMAP
 
 							dol_syslog("EmailCollector::doCollectOneCollector move message ".($imapemail->getHeader()->get('subject'))." to ".$targetdir, LOG_DEBUG);
 
 							if (empty($mode)) {
 
@@ -3217,7 +3217,7 @@ class EmailCollector extends CommonObject
 
 							$arrayofemailtodelete[$imapemail] = $msgid;
 
 						}
 
 					} else {
 
-						if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
 
+						if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 
 							dol_syslog("EmailCollector::doCollectOneCollector message '".($imapemail->getHeader()->get('subject'))."' using this->host=".$this->host.", this->access_type=".$this->acces_type." was set to read", LOG_DEBUG);
 
 						} else {
 
 							dol_syslog("EmailCollector::doCollectOneCollector message ".((string) $imapemail)." to ".$connectstringtarget." was set to read", LOG_DEBUG);
 
@@ -3267,7 +3267,7 @@ class EmailCollector extends CommonObject
 
 		}
 
 
 		// Disconnect
 
-		if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
 
+		if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 
 			$client->disconnect();
 
 		} else {
 
 			foreach ($arrayofemailtodelete as $imapemail => $msgid) {

+ 2 - 2
htdocs/emailcollector/class/emailcollectoraction.class.php
View File 

@@ -122,7 +122,7 @@ class EmailCollectorAction extends CommonObject
 
 
 		$this->db = $db;
 
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 
 			$this->fields['rowid']['visible'] = 0;
 
 		}
 
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 
@@ -305,7 +305,7 @@ class EmailCollectorAction extends CommonObject
 
 
 		$linkclose = '';
 
 		if (empty($notooltip)) {
 
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 
 				$label = $langs->trans("ShowEmailcollectorAction");
 
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 
 			}

+ 2 - 2
htdocs/emailcollector/class/emailcollectorfilter.class.php
View File 

@@ -124,7 +124,7 @@ class EmailCollectorFilter extends CommonObject
 
 
 		$this->db = $db;
 
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 
 			$this->fields['rowid']['visible'] = 0;
 
 		}
 
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 
@@ -319,7 +319,7 @@ class EmailCollectorFilter extends CommonObject
 
 
 		$linkclose = '';
 
 		if (empty($notooltip)) {
 
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 
 				$label = $langs->trans("ShowEmailcollectorFilter");
 
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 
 			}

+ 3 - 3
htdocs/eventorganization/class/conferenceorbooth.class.php
View File 

@@ -159,7 +159,7 @@ class ConferenceOrBooth extends ActionComm
 
 
 		$this->db = $db;
 
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 
 			$this->fields['id']['visible'] = 0;
 
 		}
 
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 
@@ -559,7 +559,7 @@ class ConferenceOrBooth extends ActionComm
 
 
 		$linkclose = '';
 
 		if (empty($notooltip)) {
 
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 
 				$label = $langs->trans("ShowConferenceOrBooth");
 
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 
 			}
 
@@ -781,7 +781,7 @@ class ConferenceOrBooth extends ActionComm
 
 
 			if (!empty($this->model_pdf)) {
 
 				$modele = $this->model_pdf;
 
-			} elseif (!empty($conf->global->CONFERENCEORBOOTH_ADDON_PDF)) {
 
+			} elseif (getDolGlobalString('CONFERENCEORBOOTH_ADDON_PDF')) {
 
 				$modele = $conf->global->CONFERENCEORBOOTH_ADDON_PDF;
 
 			}
 
 		}

+ 6 - 6
htdocs/eventorganization/class/conferenceorboothattendee.class.php
View File 

@@ -197,14 +197,14 @@ class ConferenceOrBoothAttendee extends CommonObject
 
 
 		$this->db = $db;
 
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 
 			$this->fields['rowid']['visible'] = 0;
 
 		}
 
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 
 			$this->fields['entity']['enabled'] = 0;
 
 		}
 
 
-		if (!empty($conf->global->EVENTORGANIZATION_FILTERATTENDEES_CAT)) {
 
+		if (getDolGlobalString('EVENTORGANIZATION_FILTERATTENDEES_CAT')) {
 
 			$this->fields['fk_soc']['type'] .= ' AND rowid IN (SELECT DISTINCT c.fk_soc FROM '.MAIN_DB_PREFIX.'categorie_societe as c WHERE c.fk_categorie='.(int) $conf->global->EVENTORGANIZATION_FILTERATTENDEES_CAT.')';
 
 		}
 
 		if (isset($conf->global->EVENTORGANIZATION_FILTERATTENDEES_TYPE)
 
@@ -808,7 +808,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 
 
 		$linkclose = '';
 
 		if (empty($notooltip)) {
 
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 
 				$label = $langs->trans("ShowConferenceOrBoothAttendee");
 
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 
 			}
 
@@ -992,11 +992,11 @@ class ConferenceOrBoothAttendee extends CommonObject
 
 		global $langs, $conf;
 
 		$langs->load("eventorganization@eventorganization");
 
 
-		if (empty($conf->global->EVENTORGANIZATION_CONFERENCEORBOOTHATTENDEE_ADDON)) {
 
+		if (!getDolGlobalString('EVENTORGANIZATION_CONFERENCEORBOOTHATTENDEE_ADDON')) {
 
 			$conf->global->EVENTORGANIZATION_CONFERENCEORBOOTHATTENDEE_ADDON = 'mod_conferenceorboothattendee_standard';
 
 		}
 
 
-		if (!empty($conf->global->EVENTORGANIZATION_CONFERENCEORBOOTHATTENDEE_ADDON)) {
 
+		if (getDolGlobalString('EVENTORGANIZATION_CONFERENCEORBOOTHATTENDEE_ADDON')) {
 
 			$mybool = false;
 
 
 			$file = getDolGlobalString('EVENTORGANIZATION_CONFERENCEORBOOTHATTENDEE_ADDON') . ".php";
 
@@ -1062,7 +1062,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 
 
 			if (!empty($this->model_pdf)) {
 
 				$modele = $this->model_pdf;
 
-			} elseif (!empty($conf->global->CONFERENCEORBOOTHATTENDEE_ADDON_PDF)) {
 
+			} elseif (getDolGlobalString('CONFERENCEORBOOTHATTENDEE_ADDON_PDF')) {
 
 				$modele = $conf->global->CONFERENCEORBOOTHATTENDEE_ADDON_PDF;
 
 			}
 
 		}

+ 5 - 5
htdocs/eventorganization/conferenceorbooth_card.php
View File 

@@ -179,7 +179,7 @@ if ($action == 'create') {
 
 } else {
 
 	$result = $projectstatic->fetch($object->fk_project);
 
 }
 
-if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 
+if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 
 	$projectstatic->fetchComments();
 
 }
 
 if (!empty($projectstatic->socid)) {
 
@@ -228,24 +228,24 @@ if (!empty($withproject)) {
 
 	print '<table class="border tableforfield centpercent">';
 
 
 	// Usage
 
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 
+	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 
 		print '<tr><td class="tdtop">';
 
 		print $langs->trans("Usage");
 
 		print '</td>';
 
 		print '<td>';
 
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 
 			print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 
 			$htmltext = $langs->trans("ProjectFollowOpportunity");
 
 			print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 
 			print '<br>';
 
 		}
 
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 
 			print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
 
 			$htmltext = $langs->trans("ProjectFollowTasks");
 
 			print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 
 			print '<br>';
 
 		}
 
-		if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
 
 			print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 
 			$htmltext = $langs->trans("ProjectBillTimeDescription");
 
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);

+ 5 - 5
htdocs/eventorganization/conferenceorbooth_contact.php
View File 

@@ -160,7 +160,7 @@ llxHeader('', $title, $help_url);
 
 /* *************************************************************************** */
 
 
 $result = $projectstatic->fetch($object->fk_project);
 
-if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 
+if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 
 	$projectstatic->fetchComments();
 
 }
 
 if (!empty($projectstatic->socid)) {
 
@@ -206,24 +206,24 @@ if (!empty($withproject)) {
 
 	print '<table class="border tableforfield centpercent">';
 
 
 	// Usage
 
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 
+	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 
 		print '<tr><td class="tdtop">';
 
 		print $langs->trans("Usage");
 
 		print '</td>';
 
 		print '<td>';
 
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 
 			print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 
 			$htmltext = $langs->trans("ProjectFollowOpportunity");
 
 			print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 
 			print '<br>';
 
 		}
 
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 
 			print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
 
 			$htmltext = $langs->trans("ProjectFollowTasks");
 
 			print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 
 			print '<br>';
 
 		}
 
-		if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
 
 			print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 
 			$htmltext = $langs->trans("ProjectBillTimeDescription");
 
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);

+ 5 - 5
htdocs/eventorganization/conferenceorbooth_document.php
View File 

@@ -134,7 +134,7 @@ $help_url = '';
 
 llxHeader('', $title, $help_url);
 
 
 $result = $projectstatic->fetch($object->fk_project);
 
-if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 
+if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 
 	$projectstatic->fetchComments();
 
 }
 
 if (!empty($projectstatic->socid)) {
 
@@ -179,24 +179,24 @@ if (!empty($withproject)) {
 
 	print '<table class="border tableforfield centpercent">';
 
 
 	// Usage
 
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 
+	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 
 		print '<tr><td class="tdtop">';
 
 		print $langs->trans("Usage");
 
 		print '</td>';
 
 		print '<td>';
 
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 
 			print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 
 			$htmltext = $langs->trans("ProjectFollowOpportunity");
 
 			print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 
 			print '<br>';
 
 		}
 
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 
 			print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
 
 			$htmltext = $langs->trans("ProjectFollowTasks");
 
 			print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 
 			print '<br>';
 
 		}
 
-		if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
 
 			print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 
 			$htmltext = $langs->trans("ProjectBillTimeDescription");
 
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);

+ 5 - 5
htdocs/eventorganization/conferenceorbooth_list.php
View File 

@@ -293,7 +293,7 @@ if ($projectid > 0 || $projectref) {
 
 
 	$help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 
 	$title = $langs->trans("Project") . ' - ' . $langs->trans("EventOrganizationConfOrBoothes") . ' - ' . $project->ref . ' ' . $project->name;
 
-	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $project->name) {
 
+	if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $project->name) {
 
 		$title = $project->ref . ' ' . $project->name . ' - ' . $langs->trans("ListOfConferencesOrBooths");
 
 	}
 
 }
 
@@ -341,24 +341,24 @@ if ($projectid > 0) {
 
 	print '<table class="border tableforfield centpercent">';
 
 
 	// Usage
 
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 
+	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 
 		print '<tr><td class="tdtop">';
 
 		print $langs->trans("Usage");
 
 		print '</td>';
 
 		print '<td>';
 
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 
 			print '<input type="checkbox" disabled name="usage_opportunity"'.($project->usage_opportunity ? ' checked="checked"' : '').'"> ';
 
 			$htmltext = $langs->trans("ProjectFollowOpportunity");
 
 			print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 
 			print '<br>';
 
 		}
 
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 
 			print '<input type="checkbox" disabled name="usage_task"'.($project->usage_task ? ' checked="checked"' : '').'"> ';
 
 			$htmltext = $langs->trans("ProjectFollowTasks");
 
 			print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 
 			print '<br>';
 
 		}
 
-		if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
 
 			print '<input type="checkbox" disabled name="usage_bill_time"'.($project->usage_bill_time ? ' checked="checked"' : '').'"> ';
 
 			$htmltext = $langs->trans("ProjectBillTimeDescription");
 
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);

+ 5 - 5
htdocs/eventorganization/conferenceorboothattendee_card.php
View File 

@@ -208,7 +208,7 @@ $help_url = '';
 
 llxHeader('', $title, $help_url);
 
 
 $result = $projectstatic->fetch(empty($confOrBooth->fk_project) ? $fk_project : $confOrBooth->fk_project);
 
-if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 
+if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 
 	$projectstatic->fetchComments();
 
 }
 
 if (!empty($projectstatic->socid)) {
 
@@ -254,24 +254,24 @@ if (!empty($withproject)) {
 
 	print '<table class="border tableforfield centpercent">';
 
 
 	// Usage
 
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 
+	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 
 		print '<tr><td class="tdtop">';
 
 		print $langs->trans("Usage");
 
 		print '</td>';
 
 		print '<td>';
 
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 
 			print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 
 			$htmltext = $langs->trans("ProjectFollowOpportunity");
 
 			print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 
 			print '<br>';
 
 		}
 
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 
 			print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
 
 			$htmltext = $langs->trans("ProjectFollowTasks");
 
 			print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 
 			print '<br>';
 
 		}
 
-		if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
 
 			print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 
 			$htmltext = $langs->trans("ProjectBillTimeDescription");
 
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);

+ 6 - 6
htdocs/eventorganization/conferenceorboothattendee_list.php
View File 

@@ -372,7 +372,7 @@ if (!$resql) {
 
 $num = $db->num_rows($resql);
 
 
 // Direct jump if only one record found
 
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
 
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 
 	$obj = $db->fetch_object($resql);
 
 	$id = $obj->rowid;
 
 	header("Location: ".DOL_URL_ROOT.'/eventorganization/conferenceorboothattendee_card.php?id='.((int) $id));
 
@@ -393,7 +393,7 @@ llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'classforhoriz
 
 
 
 if ($projectstatic->id > 0 || $confOrBooth > 0) {
 
-	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 
+	if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 
 		$projectstatic->fetchComments();
 
 	}
 
 	if (!empty($projectstatic->socid)) {
 
@@ -441,24 +441,24 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 
 		print '<table class="border tableforfield centpercent">';
 
 
 		// Usage
 
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 
 			print '<tr><td class="tdtop">';
 
 			print $langs->trans("Usage");
 
 			print '</td>';
 
 			print '<td>';
 
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 
+			if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 
 				print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 
 				$htmltext = $langs->trans("ProjectFollowOpportunity");
 
 				print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 
 				print '<br>';
 
 			}
 
-			if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 
+			if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 
 				print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
 
 				$htmltext = $langs->trans("ProjectFollowTasks");
 
 				print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 
 				print '<br>';
 
 			}
 
-			if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 
+			if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
 
 				print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 
 				$htmltext = $langs->trans("ProjectBillTimeDescription");
 
 				print $form->textwithpicto($langs->trans("BillTime"), $htmltext);

+ 3 - 3
htdocs/eventorganization/core/actions_massactions_mail.inc.php
View File 

@@ -43,7 +43,7 @@ if (empty($objectclass) || empty($uploaddir)) {
 
 }
 
 
 // Mass actions. Controls on number of lines checked.
 
-$maxformassaction = (empty($conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS) ? 1000 : $conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS);
 
+$maxformassaction = (!getDolGlobalString('MAIN_LIMIT_FOR_MASS_ACTIONS') ? 1000 : $conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS);
 
 if (!empty($massaction) && is_array($toselect) && count($toselect) < 1) {
 
 	$error++;
 
 	setEventMessages($langs->trans("NoRecordSelected"), null, "warnings");
 
@@ -181,7 +181,7 @@ if (!$error && $massaction == 'confirm_presend_attendees') {
 
 			// Make substitution in email content
 
 			$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $attendees);
 
 
-			if (!empty($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY)) {
 
+			if (getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) {
 
 				$urlwithouturlroot = preg_replace('/' . preg_quote(DOL_URL_ROOT, '/') . '$/i', '', trim($dolibarr_main_url_root));
 
 				$urlwithroot = $urlwithouturlroot . DOL_URL_ROOT;
 
 				$url_link = $urlwithroot . '/public/agenda/agendaexport.php?format=ical' . ($conf->entity > 1 ? "&entity=" . $conf->entity : "");
 
@@ -260,7 +260,7 @@ if (!$error && $massaction == 'confirm_presend_attendees') {
 
 					if ($mailfile->error) {
 
 						$resaction .= $langs->trans('ErrorFailedToSendMail', $from, $sendto);
 
 						$resaction .= '<br><div class="error">' . $mailfile->error . '</div>';
 
-					} elseif (!empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
 
+					} elseif (getDolGlobalString('MAIN_DISABLE_ALL_MAILS')) {
 
 						$resaction .= '<div class="warning">No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS</div>';
 
 					} else {
 
 						$resaction .= $langs->trans('ErrorFailedToSendMail', $from, $sendto) . '<br><div class="error">(unhandled error)</div>';

+ 1 - 1
htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
View File 

@@ -47,7 +47,7 @@ function conferenceorboothPrepareHead($object, $with_project = 0)
 
 	$head[$h][2] = 'card';
 
 	$h++;
 
 
-	if (!empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
 
+	if (getDolGlobalString('MAIN_FEATURES_LEVEL') && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
 
 		$head[$h][0] = DOL_URL_ROOT.'/eventorganization/conferenceorbooth_contact.php?id='.$object->id.$withProjectUrl;
 
 		$head[$h][1] = $langs->trans("ContactsAddresses");
 
 		$head[$h][2] = 'contact';

+ 47 - 47
htdocs/expedition/card.php
View File 

@@ -90,9 +90,9 @@ $confirm	= GETPOST('confirm', 'alpha');
 
 $cancel = GETPOST('cancel', 'alpha');
 
 
 //PDF
 
-$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
 
-$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
 
-$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
 
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
 
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
 
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 
 $object = new Expedition($db);
 
 $objectorder = new Commande($db);
 
@@ -462,8 +462,8 @@ if (empty($reshook)) {
 
 			setEventMessages($object->error, $object->errors, 'errors');
 
 		}
 
 	} elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
 
-		((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'creer'))
 
-		|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'shipping_advance', 'validate')))
 
+		((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'creer'))
 
+		|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'shipping_advance', 'validate')))
 
 	) {
 
 		$object->fetch_thirdparty();
 
 
@@ -473,7 +473,7 @@ if (empty($reshook)) {
 
 			setEventMessages($object->error, $object->errors, 'errors');
 
 		} else {
 
 			// Define output language
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 				$outputlangs = $langs;
 
 				$newlang = '';
 
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -839,7 +839,7 @@ if (empty($reshook)) {
 
 		unset($_POST["lineid"]);
 
 
 		if (!$error) {
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 				// Define output language
 
 				$outputlangs = $langs;
 
 				$newlang = '';
 
@@ -1016,7 +1016,7 @@ if ($action == 'create') {
 
 			// Note Public
 
 			print '<tr><td>'.$langs->trans("NotePublic").'</td>';
 
 			print '<td colspan="3">';
 
-			$doleditor = new DolEditor('note_public', $object->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 
+			$doleditor = new DolEditor('note_public', $object->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 
 			print $doleditor->Create(1);
 
 			print "</td></tr>";
 
 
@@ -1024,7 +1024,7 @@ if ($action == 'create') {
 
 			if ($object->note_private && !$user->socid) {
 
 				print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
 
 				print '<td colspan="3">';
 
-				$doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 
+				$doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 
 				print $doleditor->Create(1);
 
 				print "</td></tr>";
 
 			}
 
@@ -1163,7 +1163,7 @@ if ($action == 'create') {
 
 						print '<td class="left">'.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").')</td>';
 
 					}
 
 				}
 
-				if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td class="left">'.$langs->trans('StockEntryDate').'</td>';
 
+				if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) print '<td class="left">'.$langs->trans('StockEntryDate').'</td>';
 
 				print "</tr>\n";
 
 			}
 
 
@@ -1262,7 +1262,7 @@ if ($action == 'create') {
 
 
 					// unit of order
 
 					$unit_order = '';
 
-					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 
+					if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 
 						$unit_order = measuringUnitString($line->fk_unit);
 
 					}
 
 
@@ -1281,7 +1281,7 @@ if ($action == 'create') {
 
 
 					// Qty to ship
 
 					$quantityAsked = $line->qty;
 
-					if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES) && empty($conf->global->SHIPMENT_SUPPORTS_SERVICES)) {
 
+					if ($line->product_type == 1 && !getDolGlobalString('STOCK_SUPPORTS_SERVICES') && !getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 
 						$quantityToBeDelivered = 0;
 
 					} else {
 
 						if (is_numeric($quantityDelivered)) {
 
@@ -1296,7 +1296,7 @@ if ($action == 'create') {
 
 						print '<!-- Case warehouse already known or product not a predefined product -->';
 
 						//ship from preselected location
 
 						$stock = + (isset($product->stock_warehouse[$warehouse_id]->real) ? $product->stock_warehouse[$warehouse_id]->real : 0); // Convert to number
 
-						if (!empty($conf->global->SHIPMENT_SUPPORTS_SERVICES)) {
 
+						if (getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 
 							$deliverableQty = $quantityToBeDelivered;
 
 						} else {
 
 							$deliverableQty = min($quantityToBeDelivered, $stock);
 
@@ -1307,7 +1307,7 @@ if ($action == 'create') {
 
 						if (empty($conf->productbatch->enabled) || !$product->hasbatch()) {
 
 							// Quantity to send
 
 							print '<td class="center">';
 
-							if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES) || !empty($conf->global->SHIPMENT_SUPPORTS_SERVICES)) {
 
+							if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES') || getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 
 								if (GETPOST('qtyl'.$indiceAsked, 'int')) {
 
 									$deliverableQty = GETPOST('qtyl'.$indiceAsked, 'int');
 
 								}
 
@@ -1326,7 +1326,7 @@ if ($action == 'create') {
 
 							// Stock
 
 							if (isModEnabled('stock')) {
 
 								print '<td class="left">';
 
-								if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {   // Type of product need stock change ?
 
+								if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {   // Type of product need stock change ?
 
 									// Show warehouse combo list
 
 									$ent = "entl".$indiceAsked;
 
 									$idl = "idl".$indiceAsked;
 
@@ -1352,11 +1352,11 @@ if ($action == 'create') {
 
 								}
 
 								print '</td>';
 
 							}
 
-							if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>'; //StockEntrydate
 
+							if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) print '<td></td>'; //StockEntrydate
 
 							print "</tr>\n";
 
 
 							// Show subproducts of product
 
-							if (!empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0) {
 
+							if (getDolGlobalString('PRODUIT_SOUSPRODUITS') && $line->fk_product > 0) {
 
 								$product->get_sousproduits_arbo();
 
 								$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
 
 								if (count($prods_arbo) > 0) {
 
@@ -1370,7 +1370,7 @@ if ($action == 'create') {
 
 											<a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
 
 											</a> (".$value['nb'].")</td><td class=\"center\"> ".$value['nb_total']."</td><td>&nbsp;</td><td>&nbsp;</td>
 
 											<td class=\"center\">".$value['stock']." ".$img."</td>";
 
-										if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>'; //StockEntrydate
 
+										if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) print '<td></td>'; //StockEntrydate
 
 										print "</tr>";
 
 									}
 
 								}
 
@@ -1378,7 +1378,7 @@ if ($action == 'create') {
 
 						} else {
 
 							// Product need lot
 
 							print '<td></td><td></td>';
 
-							if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE))  print '<td></td>'; //StockEntrydate
 
+							if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE'))  print '<td></td>'; //StockEntrydate
 
 							print '</tr>'; // end line and start a new one for lot/serial
 
 							print '<!-- Case product need lot -->';
 
 
@@ -1415,10 +1415,10 @@ if ($action == 'create') {
 
 
 									$detail = '';
 
 									$detail .= $langs->trans("Batch").': '.$dbatch->batch;
 
-									if (empty($conf->global->PRODUCT_DISABLE_SELLBY) && !empty($dbatch->sellby)) {
 
+									if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY') && !empty($dbatch->sellby)) {
 
 										$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
 
 									}
 
-									if (empty($conf->global->PRODUCT_DISABLE_EATBY) && !empty($dbatch->eatby)) {
 
+									if (!getDolGlobalString('PRODUCT_DISABLE_EATBY') && !empty($dbatch->eatby)) {
 
 										$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
 
 									}
 
 									$detail .= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
 
@@ -1454,7 +1454,7 @@ if ($action == 'create') {
 
 						if (empty($conf->productbatch->enabled) || !$product->hasbatch()) {
 
 							print '<!-- Case warehouse not already known and product does not need lot -->';
 
 							print '<td></td><td></td>';
 
-							if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>';//StockEntrydate
 
+							if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) print '<td></td>';//StockEntrydate
 
 							print '</tr>'."\n"; // end line and start a new one for each warehouse
 
 
 							print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 
@@ -1483,7 +1483,7 @@ if ($action == 'create') {
 
 									// Quantity to send
 
 									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? 'oddeven' : '').'>';
 
 									print '<td colspan="3" ></td><td class="center"><!-- qty to ship (no lot management for product line indiceAsked='.$indiceAsked.') -->';
 
-									if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES) || !empty($conf->global->SHIPMENT_SUPPORTS_SERVICES)) {
 
+									if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES') || getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 
 										if (isset($alreadyQtySetted[$line->fk_product][intval($warehouse_id)])) {
 
 											$deliverableQty = min($quantityToBeDelivered, $stock - $alreadyQtySetted[$line->fk_product][intval($warehouse_id)]);
 
 										} else {
 
@@ -1524,7 +1524,7 @@ if ($action == 'create') {
 
 									// Stock
 
 									if (isModEnabled('stock')) {
 
 										print '<td class="left">';
 
-										if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 
+										if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 
 											print $tmpwarehouseObject->getNomUrl(0).' ';
 
 
 											print '<!-- Show details of stock -->';
 
@@ -1539,12 +1539,12 @@ if ($action == 'create') {
 
 										$quantityToBeDelivered = 0;
 
 									}
 
 									$subj++;
 
-									if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>';//StockEntrydate
 
+									if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) print '<td></td>';//StockEntrydate
 
 									print "</tr>\n";
 
 								}
 
 							}
 
 							// Show subproducts of product (not recommanded)
 
-							if (!empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0) {
 
+							if (getDolGlobalString('PRODUIT_SOUSPRODUITS') && $line->fk_product > 0) {
 
 								$product->get_sousproduits_arbo();
 
 								$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
 
 								if (count($prods_arbo) > 0) {
 
@@ -1559,7 +1559,7 @@ if ($action == 'create') {
 
 										<a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
 
 										</a> (".$value['nb'].")</td><td class=\"center\"> ".$value['nb_total']."</td><td>&nbsp;</td><td>&nbsp;</td>
 
 										<td class=\"center\">".$value['stock']." ".$img."</td>";
 
-										if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>';//StockEntrydate
 
+										if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) print '<td></td>';//StockEntrydate
 
 										print "</tr>";
 
 									}
 
 								}
 
@@ -1567,7 +1567,7 @@ if ($action == 'create') {
 
 						} else {
 
 							print '<!-- Case warehouse not already known and product need lot -->';
 
 							print '<td></td><td></td>';
 
-							if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>';//StockEntrydate
 
+							if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) print '<td></td>';//StockEntrydate
 
 							print '</tr>'; // end line and start a new one for lot/serial
 
 
 							$subj = 0;
 
@@ -1644,10 +1644,10 @@ if ($action == 'create') {
 
 										} else {
 
 											print $langs->trans("TableLotIncompleteRunRepairWithParamStandardEqualConfirmed");
 
 										}
 
-										if (empty($conf->global->PRODUCT_DISABLE_SELLBY) && !empty($dbatch->sellby)) {
 
+										if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY') && !empty($dbatch->sellby)) {
 
 											print ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
 
 										}
 
-										if (empty($conf->global->PRODUCT_DISABLE_EATBY) && !empty($dbatch->eatby)) {
 
+										if (!getDolGlobalString('PRODUCT_DISABLE_EATBY') && !empty($dbatch->eatby)) {
 
 											print ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
 
 										}
 
 										print ' ('.$dbatch->qty.')';
 
@@ -1658,7 +1658,7 @@ if ($action == 'create') {
 
 										//dol_syslog('deliverableQty = '.$deliverableQty.' batchStock = '.$batchStock);
 
 										$subj++;
 
 										print '</td>';
 
-										if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) {
 
+										if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
 
 											print '<td class="left">'.dol_print_date($dbatch->context['stock_entry_date'], 'day').'</td>';
 
 										}
 
 										print '</tr>';
 
@@ -1672,7 +1672,7 @@ if ($action == 'create') {
 
 							print '<!-- line not shown yet, we show it -->';
 
 							print '<tr class="oddeven"><td colspan="3"></td><td class="center">';
 
 
-							if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES) || !empty($conf->global->SHIPMENT_SUPPORTS_SERVICES)) {
 
+							if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES') || getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 
 								$disabled = '';
 
 								if (isModEnabled('productbatch') && $product->hasbatch()) {
 
 									$disabled = 'disabled="disabled"';
 
@@ -1687,7 +1687,7 @@ if ($action == 'create') {
 
 							print '</td>';
 
 
 							print '<td class="left">';
 
-							if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 
+							if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 
 								if ($warehouse_selected_id > 0) {
 
 									$warehouseObject = new Entrepot($db);
 
 									$warehouseObject->fetch($warehouse_selected_id);
 
@@ -1703,7 +1703,7 @@ if ($action == 'create') {
 
 								print '<span class="opacitymedium">('.$langs->trans("Service").')</span>';
 
 							}
 
 							print '</td>';
 
-							if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>';//StockEntrydate
 
+							if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) print '<td></td>';//StockEntrydate
 
 							print '</tr>';
 
 						}
 
 					}
 
@@ -1772,7 +1772,7 @@ if ($action == 'create') {
 
 	// Confirm deletion
 
 	if ($action == 'delete') {
 
 		$formquestion = array();
 
-		if ($object->statut == Expedition::STATUS_CLOSED && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
 
+		if ($object->statut == Expedition::STATUS_CLOSED && getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {
 
 			$formquestion = array(
 
 					array(
 
 						'label' => $langs->trans('ShipmentIncrementStockOnDelete'),
 
@@ -2134,7 +2134,7 @@ if ($action == 'create') {
 
 	print '<thead>';
 
 	print '<tr class="liste_titre">';
 
 	// Adds a line numbering column
 
-	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 
+	if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 
 		print '<td width="5" class="center linecolnum">&nbsp;</td>';
 
 	}
 
 	// Product/Service
 
@@ -2191,7 +2191,7 @@ if ($action == 'create') {
 
 
 	$outputlangs = $langs;
 
 
-	if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 
+	if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 
 		$object->fetch_thirdparty();
 
 		$newlang = '';
 
 		if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -2263,14 +2263,14 @@ if ($action == 'create') {
 
 			print '<tr class="oddeven" id="row-'.$lines[$i]->id.'" data-id="'.$lines[$i]->id.'" data-element="'.$lines[$i]->element.'" >';
 
 
 			// #
 
-			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 
+			if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 
 				print '<td class="center linecolnum">'.($i + 1).'</td>';
 
 			}
 
 
 			// Predefined product or service
 
 			if ($lines[$i]->fk_product > 0) {
 
 				// Define output language
 
-				if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 
+				if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 
 					$prod = new Product($db);
 
 					$prod->fetch($lines[$i]->fk_product);
 
 					$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
 
@@ -2330,7 +2330,7 @@ if ($action == 'create') {
 
 			}
 
 
 			$unit_order = '';
 
-			if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 
+			if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 
 				$unit_order = measuringUnitString($lines[$i]->fk_unit);
 
 			}
 
 
@@ -2425,7 +2425,7 @@ if ($action == 'create') {
 
 								print '<td> - '.$langs->trans("NA").'</td>';
 
 								print '</tr>';
 
 							}
 
-						} elseif ($lines[$i]->product_type == Product::TYPE_SERVICE && !empty($conf->global->SHIPMENT_SUPPORTS_SERVICES)) {
 
+						} elseif ($lines[$i]->product_type == Product::TYPE_SERVICE && getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 
 							print '<!-- case edit 4 -->';
 
 							print '<tr>';
 
 							// Qty to ship or shipped
 
@@ -2468,7 +2468,7 @@ if ($action == 'create') {
 
 				// Warehouse source
 
 				if (isModEnabled('stock')) {
 
 					print '<td class="linecolwarehousesource tdoverflowmax200">';
 
-					if ($lines[$i]->product_type == Product::TYPE_SERVICE && !empty($conf->global->SHIPMENT_SUPPORTS_SERVICES)) {
 
+					if ($lines[$i]->product_type == Product::TYPE_SERVICE && getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 
 						print '<span class="opacitymedium">('.$langs->trans("Service").')</span>';
 
 					} elseif ($lines[$i]->entrepot_id > 0) {
 
 						$entrepot = new Entrepot($db);
 
@@ -2497,10 +2497,10 @@ if ($action == 'create') {
 
 							$detail = '';
 
 							foreach ($lines[$i]->detail_batch as $dbatch) {	// $dbatch is instance of ExpeditionLineBatch
 
 								$detail .= $langs->trans("Batch").': '.$dbatch->batch;
 
-								if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 
+								if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 
 									$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
 
 								}
 
-								if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 
+								if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 
 									$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
 
 								}
 
 								$detail .= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
 
@@ -2617,8 +2617,8 @@ if ($action == 'create') {
 
 																									   // modified by hook
 
 		if (empty($reshook)) {
 
 			if ($object->statut == Expedition::STATUS_DRAFT && $num_prod > 0) {
 
-				if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'creer'))
 
-				 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'shipping_advance', 'validate'))) {
 
+				if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'creer'))
 
+				 || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'shipping_advance', 'validate'))) {
 
 					print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=valid&token='.newToken().'&id='.$object->id, '');
 
 				} else {
 
 					print dolGetButtonAction($langs->trans('NotAllowed'), $langs->trans('Validate'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
 
@@ -2640,7 +2640,7 @@ if ($action == 'create') {
 
 			// Send
 
 			if (empty($user->socid)) {
 
 				if ($object->statut > 0) {
 
-					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->hasRight('expedition', 'shipping_advance', 'send')) {
 
+					if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('expedition', 'shipping_advance', 'send')) {
 
 						print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?action=presend&token='.newToken().'&id='.$object->id.'&mode=init#formmailbeforetitle', '');
 
 					} else {
 
 						print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER['PHP_SELF']. '#', '', false);

+ 17 - 17
htdocs/expedition/class/expedition.class.php
View File 

@@ -292,7 +292,7 @@ class Expedition extends CommonObject
 
 		global $langs, $conf;
 
 		$langs->load("sendings");
 
 
-		if (!empty($conf->global->EXPEDITION_ADDON_NUMBER)) {
 
+		if (getDolGlobalString('EXPEDITION_ADDON_NUMBER')) {
 
 			$mybool = false;
 
 
 			$file = getDolGlobalString('EXPEDITION_ADDON_NUMBER') . ".php";
 
@@ -420,7 +420,7 @@ class Expedition extends CommonObject
 
 				// Insert of lines
 
 				$num = count($this->lines);
 
 				for ($i = 0; $i < $num; $i++) {
 
-					if (empty($this->lines[$i]->product_type) || !empty($conf->global->STOCK_SUPPORTS_SERVICES) || !empty($conf->global->SHIPMENT_SUPPORTS_SERVICES)) {
 
+					if (empty($this->lines[$i]->product_type) || getDolGlobalString('STOCK_SUPPORTS_SERVICES') || getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 
 						if (!isset($this->lines[$i]->detail_batch)) {	// no batch management
 
 							if ($this->create_line($this->lines[$i]->entrepot_id, $this->lines[$i]->origin_line_id, $this->lines[$i]->qty, $this->lines[$i]->rang, $this->lines[$i]->array_options) <= 0) {
 
 								$error++;
 
@@ -679,7 +679,7 @@ class Expedition extends CommonObject
 
 					if (!empty($this->multicurrency_code)) {
 
 						$this->multicurrency_code = $this->thirdparty->multicurrency_code;
 
 					}
 
-					if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($this->thirdparty->multicurrency_tx)) {
 
+					if (getDolGlobalString('MULTICURRENCY_USE_ORIGIN_TX') && !empty($this->thirdparty->multicurrency_tx)) {
 
 						$this->multicurrency_tx = $this->thirdparty->multicurrency_tx;
 
 					}
 
 				}
 
@@ -725,8 +725,8 @@ class Expedition extends CommonObject
 
 			return 0;
 
 		}
 
 
-		if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'creer'))
 
-		|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'shipping_advance', 'validate')))) {
 
+		if (!((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'creer'))
 
+		|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'shipping_advance', 'validate')))) {
 
 			$this->error = 'Permission denied';
 
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 
 			return -1;
 
@@ -771,7 +771,7 @@ class Expedition extends CommonObject
 
 		}
 
 
 		// If stock increment is done on sending (recommanded choice)
 
-		if (!$error && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) {
 
+		if (!$error && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')) {
 
 			$result = $this->manageStockMvtOnEvt($user, "ShipmentValidatedInDolibarr");
 
 			if ($result < 0) {
 
 				return -2;
 
@@ -918,13 +918,13 @@ class Expedition extends CommonObject
 
 		if (isModEnabled('stock') && !empty($orderline->fk_product)) {
 
 			$fk_product = $orderline->fk_product;
 
 
-			if (!($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS)) {
 
+			if (!($entrepot_id > 0) && !getDolGlobalString('STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS')) {
 
 				$langs->load("errors");
 
 				$this->error = $langs->trans("ErrorWarehouseRequiredIntoShipmentLine");
 
 				return -1;
 
 			}
 
 
-			if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT)) {
 
+			if (getDolGlobalString('STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT')) {
 
 				$product = new Product($this->db);
 
 				$product->fetch($fk_product);
 
 
@@ -937,10 +937,10 @@ class Expedition extends CommonObject
 
 				}
 
 
 				$product_type = $product->type;
 
-				if ($product_type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 
+				if ($product_type == 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 
 					$isavirtualproduct = ($product->hasFatherOrChild(1) > 0);
 
 					// The product is qualified for a check of quantity (must be enough in stock to be added into shipment).
 
-					if (!$isavirtualproduct || empty($conf->global->PRODUIT_SOUSPRODUITS) || ($isavirtualproduct && empty($conf->global->STOCK_EXCLUDE_VIRTUAL_PRODUCTS))) {  // If STOCK_EXCLUDE_VIRTUAL_PRODUCTS is set, we do not manage stock for kits/virtual products.
 
+					if (!$isavirtualproduct || !getDolGlobalString('PRODUIT_SOUSPRODUITS') || ($isavirtualproduct && !getDolGlobalString('STOCK_EXCLUDE_VIRTUAL_PRODUCTS'))) {  // If STOCK_EXCLUDE_VIRTUAL_PRODUCTS is set, we do not manage stock for kits/virtual products.
 
 						if ($product_stock < $qty) {
 
 							$langs->load("errors");
 
 							$this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $product->ref);
 
@@ -962,7 +962,7 @@ class Expedition extends CommonObject
 
 		}
 
 
 		// extrafields
 
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
 
+		if (!getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED') && is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
 
 			$line->array_options = $array_options;
 
 		}
 
 
@@ -1030,7 +1030,7 @@ class Expedition extends CommonObject
 
 			$line->detail_batch = $tab;
 
 
 			// extrafields
 
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
 
+			if (!getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED') && is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
 
 				$line->array_options = $array_options;
 
 			}
 
 
@@ -1872,7 +1872,7 @@ class Expedition extends CommonObject
 
 
 		$linkclose = '';
 
 		if (empty($notooltip)) {
 
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 
 				$label = $langs->trans("Shipment");
 
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 
 			}
 
@@ -2172,7 +2172,7 @@ class Expedition extends CommonObject
 
 				foreach ($order->lines as $line) {
 
 					$lineid = $line->id;
 
 					$qty = $line->qty;
 
-					if (($line->product_type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) && $order->expeditions[$lineid] != $qty) {
 
+					if (($line->product_type == 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) && $order->expeditions[$lineid] != $qty) {
 
 						$shipments_match_order = 0;
 
 						$text = 'Qty for order line id '.$lineid.' is '.$qty.'. However in the shipments with status Expedition::STATUS_CLOSED='.self::STATUS_CLOSED.' we have qty = '.$order->expeditions[$lineid].', so we can t close order';
 
 						dol_syslog($text);
 
@@ -2190,7 +2190,7 @@ class Expedition extends CommonObject
 
 			$this->status = self::STATUS_CLOSED;	// Will be revert to STATUS_VALIDATED at end if there is a rollback
 
 
 			// If stock increment is done on closing
 
-			if (!$error && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
 
+			if (!$error && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {
 
 				$result = $this->manageStockMvtOnEvt($user);
 
 				if ($result<0) {
 
 					$error++;
 
@@ -2397,7 +2397,7 @@ class Expedition extends CommonObject
 
 			$this->billed = 0;
 
 
 			// If stock increment is done on closing
 
-			if (!$error && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
 
+			if (!$error && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {
 
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
 
 				$langs->load("agenda");
 
@@ -2509,7 +2509,7 @@ class Expedition extends CommonObject
 
 
 			if (!empty($this->model_pdf)) {
 
 				$modele = $this->model_pdf;
 
-			} elseif (!empty($conf->global->EXPEDITION_ADDON_PDF)) {
 
+			} elseif (getDolGlobalString('EXPEDITION_ADDON_PDF')) {
 
 				$modele = $conf->global->EXPEDITION_ADDON_PDF;
 
 			}
 
 		}

+ 22 - 22
htdocs/expedition/dispatch.php
View File 

@@ -451,7 +451,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 
 			if ($action != 'classify' && $permissiontoadd) {
 
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 
 			}
 
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
 		} else {
 
 			if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 
 				$proj = new Project($db);
 
@@ -589,7 +589,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 
 		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as l";
 
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product=p.rowid";
 
 		$sql .= " WHERE l.fk_commande = ".((int) $objectsrc->id);
 
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 
+		if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 
 			$sql .= " AND l.product_type = 0";
 
 		}
 
 		// Enable hooks to alter the SQL query (WHERE)
 
@@ -620,10 +620,10 @@ if ($object->id > 0 || !empty($object->ref)) {
 
 				print '<td>'.$langs->trans("Description").'</td>';
 
 				if (isModEnabled('productbatch')) {
 
 					print '<td class="dispatch_batch_number_title">'.$langs->trans("batch_number").'</td>';
 
-					if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 
+					if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 
 						print '<td class="dispatch_dlc_title">'.$langs->trans("SellByDate").'</td>';
 
 					}
 
-					if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 
+					if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 
 						print '<td class="dispatch_dluo_title">'.$langs->trans("EatByDate").'</td>';
 
 					}
 
 				} else {
 
@@ -640,7 +640,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 
 				print '<td class="right">'.$langs->trans("Details");
 
 				print '<td width="32"></td>';
 
 
-				if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
 
+				if (getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 
 					if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 
 						print '<td class="right">'.$langs->trans("Price").'</td>';
 
 						print '<td class="right">'.$langs->trans("ReductionShort").' (%)</td>';
 
@@ -691,11 +691,11 @@ if ($object->id > 0 || !empty($object->ref)) {
 
 				} else {
 
 					$alreadydispatched = isset($products_dispatched[$objp->rowid])?$products_dispatched[$objp->rowid]:0;
 
 					$remaintodispatch = price2num($objp->qty, 5); // Calculation of dispatched
 
-					if ($remaintodispatch < 0 && empty($conf->global->SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN)) {
 
+					if ($remaintodispatch < 0 && !getDolGlobalString('SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN')) {
 
 						$remaintodispatch = 0;
 
 					}
 
 
-					if ($remaintodispatch || empty($conf->global->SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED)) {
 
+					if ($remaintodispatch || !getDolGlobalString('SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED')) {
 
 						$nbproduct++;
 
 
 						// To show detail cref and description value, we must make calculation by cref
 
@@ -728,10 +728,10 @@ if ($object->id > 0 || !empty($object->ref)) {
 
 								print $linktoprod;
 
 								print "</td>";
 
 								print '<td class="dispatch_batch_number"></td>';
 
-								if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 
+								if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 
 									print '<td class="dispatch_dlc"></td>';
 
 								}
 
-								if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 
+								if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 
 									print '<td class="dispatch_dluo"></td>';
 
 								}
 
 							} else {
 
@@ -742,10 +742,10 @@ if ($object->id > 0 || !empty($object->ref)) {
 
 								print '<td class="dispatch_batch_number">';
 
 								print '<span class="opacitymedium small">'.$langs->trans("ProductDoesNotUseBatchSerial").'</span>';
 
 								print '</td>';
 
-								if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 
+								if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 
 									print '<td class="dispatch_dlc"></td>';
 
 								}
 
-								if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 
+								if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 
 									print '<td class="dispatch_dluo"></td>';
 
 								}
 
 							}
 
@@ -757,7 +757,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 
 
 						// Define unit price for PMP calculation
 
 						$up_ht_disc = $objp->subprice;
 
-						if (!empty($objp->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) {
 
+						if (!empty($objp->remise_percent) && !getDolGlobalString('STOCK_EXCLUDE_DISCOUNT_FOR_PMP')) {
 
 							$up_ht_disc = price2num($up_ht_disc * (100 - $objp->remise_percent) / 100, 'MU');
 
 						}
 
 
@@ -835,13 +835,13 @@ if ($object->id > 0 || !empty($object->ref)) {
 
 									print '<input type="text" class="inputlotnumber quatrevingtquinzepercent" id="lot_number'.$suffix.'" name="lot_number'.$suffix.'" value="'.(GETPOSTISSET('lot_number'.$suffix) ? GETPOST('lot_number'.$suffix) : $objd->batch).'">';
 
 									//print '<input type="hidden" id="lot_number'.$suffix.'" name="lot_number'.$suffix.'" value="'.$objd->batch.'">';
 
 									print '</td>';
 
-									if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 
+									if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 
 										print '<td class="nowraponall">';
 
 										$dlcdatesuffix = !empty($objd->sellby) ? dol_stringtotime($objd->sellby) : dol_mktime(0, 0, 0, GETPOST('dlc'.$suffix.'month'), GETPOST('dlc'.$suffix.'day'), GETPOST('dlc'.$suffix.'year'));
 
 										print $form->selectDate($dlcdatesuffix, 'dlc'.$suffix, '', '', 1, '');
 
 										print '</td>';
 
 									}
 
-									if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 
+									if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 
 										print '<td class="nowraponall">';
 
 										$dluodatesuffix = !empty($objd->eatby) ? dol_stringtotime($objd->eatby) : dol_mktime(0, 0, 0, GETPOST('dluo'.$suffix.'month'), GETPOST('dluo'.$suffix.'day'), GETPOST('dluo'.$suffix.'year'));
 
 										print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, '', '', 1, '');
 
@@ -851,8 +851,8 @@ if ($object->id > 0 || !empty($object->ref)) {
 
 								} else {
 
 									$type = 'dispatch';
 
 									$colspan = 6;
 
-									$colspan = (!empty($conf->global->PRODUCT_DISABLE_SELLBY)) ? --$colspan : $colspan;
 
-									$colspan = (!empty($conf->global->PRODUCT_DISABLE_EATBY)) ? --$colspan : $colspan;
 
+									$colspan = (getDolGlobalString('PRODUCT_DISABLE_SELLBY')) ? --$colspan : $colspan;
 
+									$colspan = (getDolGlobalString('PRODUCT_DISABLE_EATBY')) ? --$colspan : $colspan;
 
 
 									// Enable hooks to append additional columns
 
 									$parameters = array(
 
@@ -980,13 +980,13 @@ if ($object->id > 0 || !empty($object->ref)) {
 
 								print '<td>';
 
 								print '<input type="text" class="inputlotnumber quatrevingtquinzepercent" id="lot_number'.$suffix.'" name="lot_number'.$suffix.'" value="'.GETPOST('lot_number'.$suffix).'">';
 
 								print '</td>';
 
-								if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 
+								if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 
 									print '<td class="nowraponall">';
 
 									$dlcdatesuffix = dol_mktime(0, 0, 0, GETPOST('dlc'.$suffix.'month'), GETPOST('dlc'.$suffix.'day'), GETPOST('dlc'.$suffix.'year'));
 
 									print $form->selectDate($dlcdatesuffix, 'dlc'.$suffix, '', '', 1, '');
 
 									print '</td>';
 
 								}
 
-								if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 
+								if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 
 									print '<td class="nowraponall">';
 
 									$dluodatesuffix = dol_mktime(0, 0, 0, GETPOST('dluo'.$suffix.'month'), GETPOST('dluo'.$suffix.'day'), GETPOST('dluo'.$suffix.'year'));
 
 									print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, '', '', 1, '');
 
@@ -996,8 +996,8 @@ if ($object->id > 0 || !empty($object->ref)) {
 
 							} else {
 
 								$type = 'dispatch';
 
 								$colspan = 6;
 
-								$colspan = (!empty($conf->global->PRODUCT_DISABLE_SELLBY)) ? --$colspan : $colspan;
 
-								$colspan = (!empty($conf->global->PRODUCT_DISABLE_EATBY)) ? --$colspan : $colspan;
 
+								$colspan = (getDolGlobalString('PRODUCT_DISABLE_SELLBY')) ? --$colspan : $colspan;
 
+								$colspan = (getDolGlobalString('PRODUCT_DISABLE_EATBY')) ? --$colspan : $colspan;
 
 
 								// Enable hooks to append additional columns
 
 								$parameters = array(
 
@@ -1034,7 +1034,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 
 							// Qty to dispatch
 
 							print '<td class="right">';
 
 							print '<a href="" id="reset'.$suffix.'" class="resetline">'.img_picto($langs->trans("Reset"), 'eraser', 'class="pictofixedwidth opacitymedium"').'</a>';
 
-							$amounttosuggest = (GETPOSTISSET('qty'.$suffix) ? GETPOST('qty'.$suffix, 'int') : (empty($conf->global->SUPPLIER_ORDER_DISPATCH_FORCE_QTY_INPUT_TO_ZERO) ? $remaintodispatch : 0));
 
+							$amounttosuggest = (GETPOSTISSET('qty'.$suffix) ? GETPOST('qty'.$suffix, 'int') : (!getDolGlobalString('SUPPLIER_ORDER_DISPATCH_FORCE_QTY_INPUT_TO_ZERO') ? $remaintodispatch : 0));
 
 							if (count($products_dispatched)) {
 
 								// There is already existing lines into llx_expeditiondet, this means a plan for the shipment has already been started.
 
 								// In such a case, we do not suggest new values, we suggest the value known.
 
@@ -1139,7 +1139,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 
 		// Message if nothing to dispatch
 
 		if (!$nbproduct) {
 
 			print "<br>\n";
 
-			if (empty($conf->global->SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED)) {
 
+			if (!getDolGlobalString('SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED')) {
 
 				print '<div class="opacitymedium">'.$langs->trans("NoPredefinedProductToDispatch").'</div>'; // No predefined line at all
 
 			} else {
 
 				print '<div class="opacitymedium">'.$langs->trans("NoMorePredefinedProductToDispatch").'</div>'; // No predefined line that remain to be dispatched.

+ 3 - 3
htdocs/expedition/list.php
View File 

@@ -729,7 +729,7 @@ if (!empty($arrayfields['country.code_iso']['checked'])) {
 
 // Company type
 
 if (!empty($arrayfields['typent.code']['checked'])) {
 
 	print '<td class="liste_titre maxwidthonsmartphone center">';
 
-	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 
+	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 
 	print '</td>';
 
 }
 
 // Weight
 
@@ -944,7 +944,7 @@ while ($i < $imaxinloop) {
 
 		print '<tr class="oddeven">';
 
 
 		// Action column
 
-		if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
 
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 
 			print '<td class="nowrap center">';
 
 			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 
 				$selected = 0;
 
@@ -1137,7 +1137,7 @@ while ($i < $imaxinloop) {
 
 		}
 
 
 		// Action column
 
-		if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
 
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 
 			print '<td class="nowrap center">';
 
 			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 
 				$selected = 0;

+ 8 - 8
htdocs/expedition/shipment.php
View File 

@@ -321,7 +321,7 @@ if ($id > 0 || !empty($ref)) {
 
 		print '<table class="border centpercent tableforfield">';
 
 
 		// Discounts for third party
 
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 
+		if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 
 			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 
 			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 
 		} else {
 
@@ -416,7 +416,7 @@ if ($id > 0 || !empty($ref)) {
 
 		print '</tr>';
 
 
 		// Warehouse
 
-		if (isModEnabled('stock') && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
 
+		if (isModEnabled('stock') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')) {
 
 			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 
 			$formproduct = new FormProduct($db);
 
 			print '<tr><td>';
 
@@ -664,7 +664,7 @@ if ($id > 0 || !empty($ref)) {
 
 					// Product label
 
 					if ($objp->fk_product > 0) {
 
 						// Define output language
 
-						if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 
+						if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 
 							$object->fetch_thirdparty();
 
 
 							$prod = new Product($db);
 
@@ -764,7 +764,7 @@ if ($id > 0 || !empty($ref)) {
 
 
 					// Qty remains to ship
 
 					print '<td class="center">';
 
-					if ($type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)|| !empty($conf->global->SHIPMENT_SUPPORTS_SERVICES)) {
 
+					if ($type == 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')|| getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 
 						$toBeShipped[$objp->fk_product] = $objp->qty - $qtyAlreadyShipped;
 
 						$toBeShippedTotal += $toBeShipped[$objp->fk_product];
 
 						print $toBeShipped[$objp->fk_product];
 
@@ -779,18 +779,18 @@ if ($id > 0 || !empty($ref)) {
 
 						$product->load_stock('warehouseopen');
 
 					}
 
 
-					if ($objp->fk_product > 0 && ($type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) && isModEnabled('stock')) {
 
+					if ($objp->fk_product > 0 && ($type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) && isModEnabled('stock')) {
 
 						print '<td class="center">';
 
 						print $product->stock_reel;
 
 						if ($product->stock_reel < $toBeShipped[$objp->fk_product]) {
 
 							print ' '.img_warning($langs->trans("StockTooLow"));
 
-							if (!empty($conf->global->STOCK_CORRECT_STOCK_IN_SHIPMENT)) {
 
+							if (getDolGlobalString('STOCK_CORRECT_STOCK_IN_SHIPMENT')) {
 
 								$nbPiece = $toBeShipped[$objp->fk_product] - $product->stock_reel;
 
 								print ' &nbsp; '.$langs->trans("GoTo").' <a href="'.DOL_URL_ROOT.'/product/stock/product.php?id='.((int) $product->id).'&action=correction&nbpiece='.urlencode($nbPiece).'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.((int) $object->id)).'">'.$langs->trans("CorrectStock").'</a>';
 
 							}
 
 						}
 
 						print '</td>';
 
-					} elseif ($objp->fk_product > 0 && $type == Product::TYPE_SERVICE && !empty($conf->global->SHIPMENT_SUPPORTS_SERVICES) && isModEnabled('stock')) {
 
+					} elseif ($objp->fk_product > 0 && $type == Product::TYPE_SERVICE && getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES') && isModEnabled('stock')) {
 
 						print '<td class="center"><span class="opacitymedium">('.$langs->trans("Service").')</span></td>';
 
 					} else {
 
 						print '<td>&nbsp;</td>';
 
@@ -798,7 +798,7 @@ if ($id > 0 || !empty($ref)) {
 
 					print "</tr>\n";
 
 
 					// Show subproducts lines
 
-					if ($objp->fk_product > 0 && !empty($conf->global->PRODUIT_SOUSPRODUITS)) {
 
+					if ($objp->fk_product > 0 && getDolGlobalString('PRODUIT_SOUSPRODUITS')) {
 
 						// Set tree of subproducts in product->sousprods
 
 						$product->get_sousproduits_arbo();
 
 						//var_dump($product->sousprods);exit;

+ 1 - 1
htdocs/expedition/stats/index.php
View File 

@@ -42,7 +42,7 @@ if ($user->socid > 0) {
 
 
 $nowyear = dol_print_date(dol_now(), "%Y");
 
 $year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
 
-$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 
 $endyear = $year;
 
 
 // Load translation files required by the page

+ 51 - 51
htdocs/expensereport/card.php
View File 

@@ -70,7 +70,7 @@ $socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('socid_id',
 
 
 $childids = $user->getAllChildIds(1);
 
 
-if (!empty($conf->global->EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH)) {
 
+if (getDolGlobalString('EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH')) {
 
 	if (empty($date_start)) {
 
 		$date_start = dol_mktime(0, 0, 0, (int) dol_print_date(dol_now(), '%m'),  1, (int) dol_print_date(dol_now(), '%Y'));
 
 	}
 
@@ -96,9 +96,9 @@ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domai
 
 //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 
 // PDF
 
-$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
 
-$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
 
-$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
 
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
 
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
 
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 
 
 $object = new ExpenseReport($db);
 
@@ -119,8 +119,8 @@ $permissiontoadd = $user->rights->expensereport->creer; // Used by the include o
 
 
 $upload_dir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($object->ref);
 
 
-$projectRequired = isModEnabled('project') && !empty($conf->global->EXPENSEREPORT_PROJECT_IS_REQUIRED);
 
-$fileRequired = !empty($conf->global->EXPENSEREPORT_FILE_IS_REQUIRED);
 
+$projectRequired = isModEnabled('project') && getDolGlobalString('EXPENSEREPORT_PROJECT_IS_REQUIRED');
 
+$fileRequired = getDolGlobalString('EXPENSEREPORT_FILE_IS_REQUIRED');
 
 
 if ($object->id > 0) {
 
 	// Check current user can read this expense report
 
@@ -265,13 +265,13 @@ if (empty($reshook)) {
 
 		}
 
 
 		// Check that expense report is for a user inside the hierarchy, or that advanced permission for all is set
 
-		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->creer))
 
-			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->creer) && empty($user->rights->expensereport->writeall_advance))) {
 
+		if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && empty($user->rights->expensereport->creer))
 
+			|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && empty($user->rights->expensereport->creer) && empty($user->rights->expensereport->writeall_advance))) {
 
 			$error++;
 
 			setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
 
 		}
 
 		if (!$error) {
 
-			if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)) {
 
+			if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || empty($user->rights->expensereport->writeall_advance)) {
 
 				if (!in_array($object->fk_user_author, $childids)) {
 
 					$error++;
 
 					setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
 
@@ -295,7 +295,7 @@ if (empty($reshook)) {
 
 			}
 
 		}
 
 
-		if (!$error && empty($conf->global->EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS)) {
 
+		if (!$error && !getDolGlobalString('EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS')) {
 
 			$overlappingExpenseReportID = $object->periode_existe($fuser, $object->date_debut, $object->date_fin);
 
 
 			if ($overlappingExpenseReportID > 0) {
 
@@ -385,7 +385,7 @@ if (empty($reshook)) {
 
 
 		if ($result >= 0) {
 
 			// Define output language
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 				$outputlangs = $langs;
 
 				$newlang = '';
 
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -426,7 +426,7 @@ if (empty($reshook)) {
 
 
 				// SUBJECT
 
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
 
-				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
 
+				if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
 
 					$societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
 				}
 
 
@@ -495,7 +495,7 @@ if (empty($reshook)) {
 
 
 		if ($result > 0) {
 
 			// Define output language
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 				$outputlangs = $langs;
 
 				$newlang = '';
 
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -533,7 +533,7 @@ if (empty($reshook)) {
 
 
 				// SUBJECT
 
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
 
-				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
 
+				if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
 
 					$societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
 				}
 
 
@@ -605,7 +605,7 @@ if (empty($reshook)) {
 
 
 		if ($result > 0) {
 
 			// Define output language
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 				$outputlangs = $langs;
 
 				$newlang = '';
 
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -649,7 +649,7 @@ if (empty($reshook)) {
 
 
 				// SUBJECT
 
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
 
-				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
 
+				if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
 
 					$societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
 				}
 
 
@@ -719,7 +719,7 @@ if (empty($reshook)) {
 
 
 		if ($result > 0) {
 
 			// Define output language
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 				$outputlangs = $langs;
 
 				$newlang = '';
 
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -757,7 +757,7 @@ if (empty($reshook)) {
 
 
 				// SUBJECT
 
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
 
-				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
 
+				if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
 
 					$societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
 				}
 
 
@@ -833,7 +833,7 @@ if (empty($reshook)) {
 
 
 				if ($result > 0) {
 
 					// Define output language
 
-					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+					if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 						$outputlangs = $langs;
 
 						$newlang = '';
 
 						if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -871,7 +871,7 @@ if (empty($reshook)) {
 
 
 						// SUBJECT
 
 						$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
 
-						if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
 
+						if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
 
 							$societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
 						}
 
 
@@ -945,7 +945,7 @@ if (empty($reshook)) {
 
 
 			if ($result > 0) {
 
 				// Define output language
 
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 					$outputlangs = $langs;
 
 					$newlang = '';
 
 					if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -984,7 +984,7 @@ if (empty($reshook)) {
 
 
 		if ($result > 0) {
 
 			// Define output language
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 				$outputlangs = $langs;
 
 				$newlang = '';
 
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -1013,7 +1013,7 @@ if (empty($reshook)) {
 
 
 		if ($result > 0) {
 
 			// Define output language
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 				$outputlangs = $langs;
 
 				$newlang = '';
 
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -1051,7 +1051,7 @@ if (empty($reshook)) {
 
 
 				// SUBJECT
 
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
 
-				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
 
+				if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
 
 					$societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
 				}
 
 
@@ -1186,7 +1186,7 @@ if (empty($reshook)) {
 
 			if ($result > 0) {
 
 				$ret = $object->fetch($object->id); // Reload to get new records
 
 
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 					// Define output language
 
 					$outputlangs = $langs;
 
 					$newlang = GETPOST('lang_id', 'alpha');
 
@@ -1239,7 +1239,7 @@ if (empty($reshook)) {
 
 		if ($result >= 0) {
 
 			if ($result > 0) {
 
 				// Define output language
 
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 					$outputlangs = $langs;
 
 					$newlang = '';
 
 					if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -1331,7 +1331,7 @@ if (empty($reshook)) {
 
 			if ($result >= 0) {
 
 				if ($result > 0) {
 
 					// Define output language
 
-					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+					if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 						$outputlangs = $langs;
 
 						$newlang = '';
 
 						if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -1440,7 +1440,7 @@ if ($action == 'create') {
 
 		$defaultselectuser = GETPOST('fk_user_author', 'int');
 
 	}
 
 	$include_users = 'hierarchyme';
 
-	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expensereport->writeall_advance)) {
 
+	if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->expensereport->writeall_advance)) {
 
 		$include_users = array();
 
 	}
 
 	$s = $form->select_dolusers($defaultselectuser, "fk_user_author", 0, "", 0, $include_users, '', '0,'.$conf->entity);
 
@@ -1458,20 +1458,20 @@ if ($action == 'create') {
 
 		print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateExpenseReport");
 
 	} else {
 
 		$defaultselectuser = (empty($user->fk_user_expense_validator) ? $user->fk_user : $user->fk_user_expense_validator); // Will work only if supervisor has permission to approve so is inside include_users
 
-		if (!empty($conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR)) {
 
+		if (getDolGlobalString('EXPENSEREPORT_DEFAULT_VALIDATOR')) {
 
 			$defaultselectuser = $conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR; // Can force default approver
 
 		}
 
 		if (GETPOST('fk_user_validator', 'int') > 0) {
 
 			$defaultselectuser = GETPOST('fk_user_validator', 'int');
 
 		}
 
-		$s = $form->select_dolusers($defaultselectuser, "fk_user_validator", 1, "", ((empty($defaultselectuser) || empty($conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR_UNCHANGEABLE)) ? 0 : 1), $include_users);
 
+		$s = $form->select_dolusers($defaultselectuser, "fk_user_validator", 1, "", ((empty($defaultselectuser) || !getDolGlobalString('EXPENSEREPORT_DEFAULT_VALIDATOR_UNCHANGEABLE')) ? 0 : 1), $include_users);
 
 		print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
 
 	}
 
 	print '</td>';
 
 	print '</tr>';
 
 
 	// Payment mode
 
-	if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION)) {
 
+	if (getDolGlobalString('EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION')) {
 
 		print '<tr>';
 
 		print '<td>'.$langs->trans("ModePaiement").'</td>';
 
 		print '<td>';
 
@@ -1487,7 +1487,7 @@ if ($action == 'create') {
 
 	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
 
 	print '<td>';
 
 
-	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 
+	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 
 	print $doleditor->Create(1);
 
 	print '</td></tr>';
 
 
@@ -1499,7 +1499,7 @@ if ($action == 'create') {
 
 		print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
 
 		print '<td>';
 
 
-		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 
+		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 
 		print $doleditor->Create(1);
 
 		print '</td></tr>';
 
 	}
 
@@ -1526,7 +1526,7 @@ if ($action == 'create') {
 
 	if ($result > 0) {
 
 		if (!in_array($object->fk_user_author, $user->getAllChildIds(1))) {
 
 			if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
 
-				&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) {
 
+				&& (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || empty($user->rights->expensereport->writeall_advance))) {
 
 					print load_fiche_titre($langs->trans('TripCard'), '', 'trip');
 
 
 					print '<div class="tabBar">';
 
@@ -1589,7 +1589,7 @@ if ($action == 'create') {
 
 			print '</td>';
 
 			print '</tr>';
 
 
-			if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION)) {
 
+			if (getDolGlobalString('EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION')) {
 
 				print '<tr>';
 
 				print '<td>'.$langs->trans("ModePaiement").'</td>';
 
 				print '<td>';
 
@@ -1639,7 +1639,7 @@ if ($action == 'create') {
 
 
 			print '</form>';
 
 		} else {
 
-			$taxlessUnitPriceDisabled = !empty($conf->global->EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY) ? ' disabled' : '';
 
+			$taxlessUnitPriceDisabled = getDolGlobalString('EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY') ? ' disabled' : '';
 
 
 			print dol_get_fiche_head($head, 'card', $langs->trans("ExpenseReport"), -1, 'trip');
 
 
@@ -1737,7 +1737,7 @@ if ($action == 'create') {
 
 			print get_date_range($object->date_debut, $object->date_fin, 'day', $langs, 0);
 
 			print '</td>';
 
 			print '</tr>';
 
-			if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION)) {
 
+			if (getDolGlobalString('EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION')) {
 
 				print '<tr>';
 
 				print '<td>'.$langs->trans("ModePaiement").'</td>';
 
 				print '<td>'.$object->fk_c_paiement.'</td>';
 
@@ -2047,7 +2047,7 @@ if ($action == 'create') {
 
 					print '<td class="minwidth100imp linecolproject">'.$langs->trans('Project').'</td>';
 
 				}
 
 				print '<td class="center linecoltype">'.$langs->trans('Type').'</td>';
 
-				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 
+				if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 
 					print '<td class="center linecolcarcategory">'.$langs->trans('CarCategory').'</td>';
 
 				}
 
 				print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
 
@@ -2121,7 +2121,7 @@ if ($action == 'create') {
 
 						print '</td>';
 
 
 						// IK
 
-						if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 
+						if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 
 							print '<td class="fk_c_exp_tax_cat linecoltaxcat">';
 
 							$exp_tax_cat_label = dol_getIdFromCode($db, $line->fk_c_exp_tax_cat, 'c_exp_tax_cat', 'rowid', 'label');
 
 							print $langs->trans($exp_tax_cat_label);
 
@@ -2191,7 +2191,7 @@ if ($action == 'create') {
 
 										if ($pdfexists) {
 
 											// Conversion du PDF en image png si fichier png non existant
 
 											if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf))) {
 
-												if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) {		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
 
+												if (!getDolGlobalString('MAIN_DISABLE_PDF_THUMBS')) {		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
 
 													include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 													$ret = dol_convert_file($filepdf, 'png', $fileimage, '0'); // Convert first page of PDF into a file _preview.png
 
 													if ($ret < 0) {
 
@@ -2252,7 +2252,7 @@ if ($action == 'create') {
 
 						if (isModEnabled('project')) {
 
 							$colspan++;
 
 						}
 
-						if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 
+						if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 
 							$colspan++;
 
 						}
 
 
@@ -2267,7 +2267,7 @@ if ($action == 'create') {
 
 						print '<a href="" class="commonlink auploadnewfilenow reposition">'.$langs->trans("UploadANewFileNow");
 
 						print img_picto($langs->trans("UploadANewFileNow"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
 
 						print '</a>';
 
-						if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 
+						if (!getDolGlobalString('EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES')) {
 
 							print ' &nbsp; - &nbsp; <a href="" class="commonlink aattachtodoc reposition">'.$langs->trans("AttachTheNewLineToTheDocument");
 
 							print img_picto($langs->trans("AttachTheNewLineToTheDocument"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
 
 							print '</a>';
 
@@ -2335,7 +2335,7 @@ if ($action == 'create') {
 
 						print $formexpensereport->selectTypeExpenseReport($line->fk_c_type_fees, 'fk_c_type_fees');
 
 						print '</td>';
 
 
-						if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 
+						if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 
 							print '<td class="fk_c_exp_tax_cat">';
 
 							$params = array('fk_expense' => $object->id, 'fk_expense_det' => $line->id, 'date' => $line->date);
 
 							print $form->selectExpenseCategories($line->fk_c_exp_tax_cat, 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params);
 
@@ -2394,7 +2394,7 @@ if ($action == 'create') {
 
 			 // Add a new line
 
 			if (($object->status == ExpenseReport::STATUS_DRAFT || $object->status == ExpenseReport::STATUS_REFUSED) && $action != 'editline' && $user->rights->expensereport->creer) {
 
 				$colspan = 12;
 
-				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 
+				if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 
 					$colspan++;
 
 				}
 
 				if (isModEnabled('project')) {
 
@@ -2406,7 +2406,7 @@ if ($action == 'create') {
 
 
 				$nbFiles = $nbLinks = 0;
 
 				$arrayoffiles = array();
 
-				if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 
+				if (!getDolGlobalString('EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES')) {
 
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
 					require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 
@@ -2422,7 +2422,7 @@ if ($action == 'create') {
 
 				print '<a href="" class="commonlink auploadnewfilenow reposition">'.$langs->trans("UploadANewFileNow");
 
 				print img_picto($langs->trans("UploadANewFileNow"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
 
 				print '</a>';
 
-				if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 
+				if (!getDolGlobalString('EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES')) {
 
 					print ' &nbsp; - &nbsp; <a href="" class="commonlink aattachtodoc reposition">'.$langs->trans("AttachTheNewLineToTheDocument");
 
 					print img_picto($langs->trans("AttachTheNewLineToTheDocument"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
 
 					print '</a>';
 
@@ -2481,7 +2481,7 @@ if ($action == 'create') {
 
 					print '<td class="minwidth100imp">'.$form->textwithpicto($langs->trans('Project'), $langs->trans("ClosedProjectsAreHidden")).'</td>';
 
 				}
 
 				print '<td class="center expensereportcreatetype">'.$langs->trans('Type').'</td>';
 
-				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 
+				if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 
 					print '<td>'.$langs->trans('CarCategory').'</td>';
 
 				}
 
 				print '<td class="expensereportcreatedescription">'.$langs->trans('Description').'</td>';
 
@@ -2517,7 +2517,7 @@ if ($action == 'create') {
 
 					print $formexpensereport->selectTypeExpenseReport(!empty($fk_c_type_fees) ? $fk_c_type_fees : "", 'fk_c_type_fees', 1);
 
 					print '</td>';
 
 
-				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 
+				if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 
 					print '<td class="fk_c_exp_tax_cat">';
 
 					$params = array('fk_expense' => $object->id);
 
 					print $form->selectExpenseCategories('', 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params, 0);
 
@@ -2532,7 +2532,7 @@ if ($action == 'create') {
 
 				// Select VAT
 
 				print '<td class="right inputvat">';
 
 				$defaultvat = -1;
 
-				if (!empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) {
 
+				if (getDolGlobalString('EXPENSEREPORT_NO_DEFAULT_VAT')) {
 
 					// If option to have no default VAT on expense report is on, we force MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS
 
 					$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
 
 				}
 
@@ -2590,7 +2590,7 @@ if ($action == 'create') {
 
 				});
 
 			';
 
 
-			if (! empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 
+			if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 
 				print '
 
 
                 /* unit price coef calculation */
 
@@ -2620,7 +2620,7 @@ if ($action == 'create') {
 
 							success: function(response) {
 
 								if (response.response_status == "success"){';
 
 
-				if (!empty($conf->global->EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY)) {
 
+				if (getDolGlobalString('EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY')) {
 
 					print '
 
 									jQuery("#value_unit").val(parseFloat(response.data) * (100 + parseFloat(tva)) / 100);
 
 									jQuery("#value_unit").trigger("change");

+ 6 - 6
htdocs/expensereport/class/expensereport.class.php
View File 

@@ -1061,7 +1061,7 @@ class ExpenseReport extends CommonObject
 
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON de.fk_c_type_fees = ctf.id';
 
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON de.fk_projet = p.rowid';
 
 		$sql .= " WHERE de.".$this->fk_element." = ".((int) $this->id);
 
-		if (!empty($conf->global->EXPENSEREPORT_LINES_SORTED_BY_ROWID)) {
 
+		if (getDolGlobalString('EXPENSEREPORT_LINES_SORTED_BY_ROWID')) {
 
 			$sql .= ' ORDER BY de.rang ASC, de.rowid ASC';
 
 		} else {
 
 			$sql .= ' ORDER BY de.rang ASC, de.date ASC';
 
@@ -1657,7 +1657,7 @@ class ExpenseReport extends CommonObject
 
 		global $langs, $conf;
 
 		$langs->load("trips");
 
 
-		if (!empty($conf->global->EXPENSEREPORT_ADDON)) {
 
+		if (getDolGlobalString('EXPENSEREPORT_ADDON')) {
 
 			$mybool = false;
 
 
 			$file = $conf->global->EXPENSEREPORT_ADDON.".php";
 
@@ -1793,7 +1793,7 @@ class ExpenseReport extends CommonObject
 
 
 		$linkclose = '';
 
 		if (empty($notooltip)) {
 
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 
 				$label = $langs->trans("ShowExpenseReport");
 
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 
 			}
 
@@ -2063,7 +2063,7 @@ class ExpenseReport extends CommonObject
 
 	{
 
 		global $conf, $mysoc;
 
 
-		if (empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 
+		if (!getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 
 			return false;
 
 		}
 
 
@@ -2089,7 +2089,7 @@ class ExpenseReport extends CommonObject
 
 			return false;
 
 		}
 
 
-		if (!empty($conf->global->MAIN_EXPENSE_APPLY_ENTIRE_OFFSET)) {
 
+		if (getDolGlobalString('MAIN_EXPENSE_APPLY_ENTIRE_OFFSET')) {
 
 			$ikoffset = $range->ikoffset;
 
 		} else {
 
 			$ikoffset = $range->ikoffset / 12; // The amount of offset is a global value for the year
 
@@ -2431,7 +2431,7 @@ class ExpenseReport extends CommonObject
 
 		if (!dol_strlen($modele)) {
 
 			if (!empty($this->model_pdf)) {
 
 				$modele = $this->model_pdf;
 
-			} elseif (!empty($conf->global->EXPENSEREPORT_ADDON_PDF)) {
 
+			} elseif (getDolGlobalString('EXPENSEREPORT_ADDON_PDF')) {
 
 				$modele = $conf->global->EXPENSEREPORT_ADDON_PDF;
 
 			}
 
 		}

+ 3 - 3
htdocs/expensereport/index.php
View File 

@@ -89,7 +89,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as d, ".MAIN_DB_PREFIX."expensere
 
 $sql .= " WHERE de.fk_expensereport = d.rowid AND d.entity IN (".getEntity('expensereport').") AND de.fk_c_type_fees = tf.id";
 
 // RESTRICT RIGHTS
 
 if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
 
-	&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) {
 
+	&& (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || empty($user->rights->expensereport->writeall_advance))) {
 
 	$childids = $user->getAllChildIds();
 
 	$childids[] = $user->id;
 
 	$sql .= " AND d.fk_user_author IN (".$db->sanitize(join(',', $childids)).")\n";
 
@@ -164,7 +164,7 @@ if ($conf->use_javascript_ajax) {
 
 	$dolgraph = new DolGraph();
 
 	$dolgraph->SetData($dataseries);
 
 	$dolgraph->setHeight(350);
 
-	$dolgraph->combine = empty($conf->global->MAIN_EXPENSEREPORT_COMBINE_GRAPH_STAT) ? 0.05 : $conf->global->MAIN_EXPENSEREPORT_COMBINE_GRAPH_STAT;
 
+	$dolgraph->combine = !getDolGlobalString('MAIN_EXPENSEREPORT_COMBINE_GRAPH_STAT') ? 0.05 : $conf->global->MAIN_EXPENSEREPORT_COMBINE_GRAPH_STAT;
 
 	$dolgraph->setShowLegend(2);
 
 	$dolgraph->setShowPercent(1);
 
 	$dolgraph->SetType(array('pie'));
 
@@ -199,7 +199,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as d, ".MAIN_DB_PREFIX."user as u
 
 $sql .= " WHERE u.rowid = d.fk_user_author";
 
 // RESTRICT RIGHTS
 
 if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
 
-	&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) {
 
+	&& (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || empty($user->rights->expensereport->writeall_advance))) {
 
 	$childids = $user->getAllChildIds();
 
 	$childids[] = $user->id;
 
 	$sql .= " AND d.fk_user_author IN (".$db->sanitize(join(',', $childids)).")\n";

+ 1 - 1
htdocs/expensereport/list.php
View File 

@@ -334,7 +334,7 @@ if ($search_status != '' && $search_status >= 0) {
 
 }
 
 // RESTRICT RIGHTS
 
 if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
 
-	&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) {
 
+	&& (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || empty($user->rights->expensereport->writeall_advance))) {
 
 	$sql .= " AND d.fk_user_author IN (".$db->sanitize(join(',', $childids)).")\n";
 
 }
 
 // Add where from extra fields

+ 3 - 3
htdocs/expensereport/payment/list.php
View File 

@@ -190,7 +190,7 @@ $sql .= ' WHERE ndf.entity IN ('.getEntity("expensereport").')';
 
 
 // RESTRICT RIGHTS
 
 if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
 
-	&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) {
 
+	&& (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || empty($user->rights->expensereport->writeall_advance))) {
 
 	$sql .= " AND ndf.fk_user_author IN (".$db->sanitize(join(',', $childids)).")\n";
 
 }
 
 
@@ -445,7 +445,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 
 	print_liste_field_titre($selectedfields, $_SERVER['PHP_SELF'], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 
 	$totalarray['nbfield']++;
 
 }
 
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
 
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 
 	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
 
 	$totalarray['nbfield']++;
 
 }
 
@@ -546,7 +546,7 @@ while ($i < $imaxinloop) {
 
 		}
 
 
 		// No
 
-		if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
 
+		if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 
 			print '<td>'.(($offset * $limit) + $i).'</td>';
 
 			if (!$i) {
 
 				$totalarray['nbfield']++;

+ 1 - 1
htdocs/expensereport/payment/payment.php
View File 

@@ -236,7 +236,7 @@ if ($action == 'create' || empty($action)) {
 
 
 	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Date").'</td><td colspan="2">';
 
 	$datepaid = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
 
-	$datepayment = ($datepaid == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datepaid);
 
+	$datepayment = ($datepaid == '' ? (!getDolGlobalString('MAIN_AUTOFILL_DATE') ?-1 : '') : $datepaid);
 
 	print $form->selectDate($datepayment, '', '', '', 0, "add_payment", 1, 1);
 
 	print "</td>";
 
 	print '</tr>';

+ 1 - 1
htdocs/expensereport/stats/index.php
View File 

@@ -56,7 +56,7 @@ $result = restrictedArea($user, 'expensereport', $id, '');
 
 
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
 
 $year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
 
-$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 
 $endyear = $year;

+ 2 - 2
htdocs/expensereport/tpl/expensereport_addfile.tpl.php
View File 

@@ -1,7 +1,7 @@
 
 <?php
 
 // Add line to upload new file
 
 print '<!-- expensereport_addfile.tpl.php -->'."\n";
 
-print '<tr class="truploadnewfilenow'.(empty($tredited) ? ' oddeven nohover' : ' '.$tredited).'"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
 
+print '<tr class="truploadnewfilenow'.(empty($tredited) ? ' oddeven nohover' : ' '.$tredited).'"'.(!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? ' style="display: none"' : '').'>';
 
 
 // Num line
 
 if ($action == 'editline') {
 
@@ -16,7 +16,7 @@ $permission = $user->rights->expensereport->creer;
 
 
 // We define var to enable the feature to add prefix of uploaded files
 
 $savingdocmask = '';
 
-if (empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_PREFIX)) {
 
+if (!getDolGlobalString('MAIN_DISABLE_SUGGEST_REF_AS_PREFIX')) {
 
 	//var_dump($modulepart);
 
 	if (in_array($modulepart, array('facture_fournisseur', 'commande_fournisseur', 'facture', 'commande', 'propal', 'supplier_proposal', 'ficheinter', 'contract', 'expedition', 'project', 'project_task', 'expensereport', 'tax', 'produit', 'product_batch'))) {
 
 		$savingdocmask = dol_sanitizeFileName($object->ref).'-__file__';

+ 4 - 4
htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
View File 

@@ -1,6 +1,6 @@
 
 <?php
 
 // Add line to select existing file
 
-if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 
+if (!getDolGlobalString('EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES')) {
 
 	print '<!-- expensereport_linktofile.tpl.php -->'."\n";
 
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -12,7 +12,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 
 	$nbLinks = Link::count($db, $object->element, $object->id);
 
 
 	if ($nbFiles > 0) {
 
-		print '<tr class="trattachnewfilenow'.(empty($tredited) ? ' oddeven nohover' : ' '.$tredited).'"'.(!GETPOSTISSET('sendit') && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
 
+		print '<tr class="trattachnewfilenow'.(empty($tredited) ? ' oddeven nohover' : ' '.$tredited).'"'.(!GETPOSTISSET('sendit') && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? ' style="display: none"' : '').'>';
 
 
 		// Num line
 
 		if ($action == 'editline') {
 
@@ -62,7 +62,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 
 					if ($pdfexists) {
 
 						// Conversion du PDF en image png si fichier png non existant
 
 						if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf))) {
 
-							if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) {		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
 
+							if (!getDolGlobalString('MAIN_DISABLE_PDF_THUMBS')) {		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
 
 								include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 								$ret = dol_convert_file($filepdf, 'png', $fileimage, '0'); // Convert first page of PDF into a file _preview.png
 
 								if ($ret < 0) {
 
@@ -143,7 +143,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 
 			$css = 'trattachnewfilenow tredited';
 
 			$newcolspan = $colspan - 1;
 
 		}
 
-		print '<tr class="'.$css.'"'.(!GETPOSTISSET('sendit') && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
 
+		print '<tr class="'.$css.'"'.(!GETPOSTISSET('sendit') && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? ' style="display: none"' : '').'>';
 
 		if (!empty($tredited)) {
 
 			print '<td></td>';
 
 		}

+ 2 - 2
htdocs/exports/class/export.class.php
View File 

@@ -653,12 +653,12 @@ class Export
 
 		$resql = $this->db->query($sql);
 
 		if ($resql) {
 
 			//$this->array_export_label[$indice]
 
-			if (!empty($conf->global->EXPORT_PREFIX_SPEC)) {
 
+			if (getDolGlobalString('EXPORT_PREFIX_SPEC')) {
 
 				$filename = getDolGlobalString('EXPORT_PREFIX_SPEC') . "_".$datatoexport;
 
 			} else {
 
 				$filename = "export_".$datatoexport;
 
 			}
 
-			if (!empty($conf->global->EXPORT_NAME_WITH_DT)) {
 
+			if (getDolGlobalString('EXPORT_NAME_WITH_DT')) {
 
 				$filename .= dol_print_date(dol_now(), '%Y%m%d%_%H%M');
 
 			}
 
 			$filename .= '.'.$objmodel->getDriverExtension();

+ 2 - 2
htdocs/exports/export.php
View File 

@@ -270,7 +270,7 @@ if ($step == 1 || $action == 'cleanselect') {
 
 
 if ($action == 'builddoc') {
 
 	$separator = GETPOST('delimiter', 'alpha');
 
-	$max_execution_time_for_importexport = (empty($conf->global->EXPORT_MAX_EXECUTION_TIME) ? 300 : $conf->global->EXPORT_MAX_EXECUTION_TIME); // 5mn if not defined
 
+	$max_execution_time_for_importexport = (!getDolGlobalString('EXPORT_MAX_EXECUTION_TIME') ? 300 : $conf->global->EXPORT_MAX_EXECUTION_TIME); // 5mn if not defined
 
 	$max_time = @ini_get("max_execution_time");
 
 	if ($max_time && $max_time < $max_execution_time_for_importexport) {
 
 		dol_syslog("max_execution_time=".$max_time." is lower than max_execution_time_for_importexport=".$max_execution_time_for_importexport.". We try to increase it dynamically.");
 
@@ -1033,7 +1033,7 @@ if ($step == 4 && $datatoexport) {
 
 		$sql = "SELECT rowid, label, fk_user, entity";
 
 		$sql .= " FROM ".MAIN_DB_PREFIX."export_model";
 
 		$sql .= " WHERE type = '".$db->escape($datatoexport)."'";
 
-		if (empty($conf->global->EXPORTS_SHARE_MODELS)) {	// EXPORTS_SHARE_MODELS means all templates are visible, whatever is owner.
 
+		if (!getDolGlobalString('EXPORTS_SHARE_MODELS')) {	// EXPORTS_SHARE_MODELS means all templates are visible, whatever is owner.
 
 			$sql .= " AND fk_user IN (0, ".((int) $user->id).")";
 
 		}
 
 		$sql .= " ORDER BY rowid";

+ 2 - 2
htdocs/externalsite/admin/index.php
View File 

@@ -102,7 +102,7 @@ print "</tr>";
 
 
 print '<tr class="oddeven">';
 
 print '<td class="fieldrequired">'.$langs->trans("Label")."</td>";
 
-print "<td><input type=\"text\" class=\"flat\" name=\"EXTERNALSITE_LABEL\" value=\"".(GETPOST('EXTERNALSITE_LABEL', 'alpha') ?GETPOST('EXTERNALSITE_LABEL', 'alpha') : ((empty($conf->global->EXTERNALSITE_LABEL) || getDolGlobalString('EXTERNALSITE_LABEL') == 'ExternalSite') ? '' : $conf->global->EXTERNALSITE_LABEL))."\" size=\"12\"></td>";
 
+print "<td><input type=\"text\" class=\"flat\" name=\"EXTERNALSITE_LABEL\" value=\"".(GETPOST('EXTERNALSITE_LABEL', 'alpha') ?GETPOST('EXTERNALSITE_LABEL', 'alpha') : ((!getDolGlobalString('EXTERNALSITE_LABEL') || getDolGlobalString('EXTERNALSITE_LABEL') == 'ExternalSite') ? '' : $conf->global->EXTERNALSITE_LABEL))."\" size=\"12\"></td>";
 
 print "<td>".$langs->trans("ExampleMyMenuEntry")."</td>";
 
 print "</tr>";
 
 
@@ -115,7 +115,7 @@ $exturl = GETPOST('EXTERNALSITE_URL', 'restricthtml');
 
 $exturl = dol_string_onlythesehtmltags($exturl, 1, 1, 0, 1, array(), 1);
 
 $exturl = dol_string_onlythesehtmlattributes($exturl);
 
 
-print (GETPOSTISSET('EXTERNALSITE_URL') ? $exturl : (empty($conf->global->EXTERNALSITE_URL) ? '' : $conf->global->EXTERNALSITE_URL));
 
+print (GETPOSTISSET('EXTERNALSITE_URL') ? $exturl : (!getDolGlobalString('EXTERNALSITE_URL') ? '' : $conf->global->EXTERNALSITE_URL));
 
 print '</textarea></td>';
 
 print "<td>http://localhost/myurl/";
 
 print "<br>https://wikipedia.org/";

+ 2 - 2
htdocs/externalsite/frames.php
View File 

@@ -49,7 +49,7 @@ if (!isModEnabled("externalsite")) {
 
  * View
 
  */
 
 
-if (empty($keyforcontent) && empty($conf->global->EXTERNALSITE_URL)) {
 
+if (empty($keyforcontent) && !getDolGlobalString('EXTERNALSITE_URL')) {
 
 	llxHeader();
 
 	print '<div class="error">'.$langs->trans('ExternalSiteModuleNotComplete').'</div>';
 
 	llxFooter();
 
@@ -117,7 +117,7 @@ if (!empty($keyforcontent)) {
 
 	<title>Dolibarr frame for external web site</title>
 
 	</head>
 
 
-	<frameset ".(empty($conf->global->MAIN_MENU_INVERT) ? "rows" : "cols")."=\"".$heightforframes.",*\" border=0 framespacing=0 frameborder=0>
 
+	<frameset ".(!getDolGlobalString('MAIN_MENU_INVERT') ? "rows" : "cols")."=\"".$heightforframes.",*\" border=0 framespacing=0 frameborder=0>
 
 	    <frame name=\"barre\" src=\"frametop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu.($theme ? '&theme='.$theme : '').($codelang ? '&lang='.$codelang : '')."&nobackground=1\" noresize scrolling=\"NO\" noborder>
 
 	  ";
 
 		print '<frame name="main" src="';

+ 2 - 2
htdocs/fichinter/card-rec.php
View File 

@@ -332,7 +332,7 @@ if ($action == 'create') {
 
 		// Author
 
 		print "<tr><td>".$langs->trans("Author")."</td><td>".$user->getFullName($langs)."</td></tr>";
 
 
-		if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) {
 
+		if (!getDolGlobalString('FICHINTER_DISABLE_DETAILS')) {
 
 			// Duration
 
 			print '<tr><td>'.$langs->trans("TotalDuration").'</td>';
 
 			print '<td colspan="3">'.convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
 
@@ -554,7 +554,7 @@ if ($action == 'create') {
 
 
 			print "<tr><td>".$langs->trans("Author").'</td><td colspan="3">'.$author->getFullName($langs)."</td></tr>";
 
 
-			if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) {
 
+			if (!getDolGlobalString('FICHINTER_DISABLE_DETAILS')) {
 
 				// Duration
 
 				print '<tr><td class="titlefield">'.$langs->trans("TotalDuration").'</td>';
 
 				print '<td colspan="3">';

+ 54 - 54
htdocs/fichinter/card.php
View File 

@@ -47,7 +47,7 @@ if (isModEnabled('contrat')) {
 
 	require_once DOL_DOCUMENT_ROOT."/core/class/html.formcontract.class.php";
 
 	require_once DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php";
 
 }
 
-if (!empty($conf->global->FICHEINTER_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_" . getDolGlobalString('FICHEINTER_ADDON').".php")) {
 
+if (getDolGlobalString('FICHEINTER_ADDON') && is_readable(DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_" . getDolGlobalString('FICHEINTER_ADDON').".php")) {
 
 	require_once DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_" . getDolGlobalString('FICHEINTER_ADDON').'.php';
 
 }
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
@@ -76,9 +76,9 @@ $lineid = GETPOST('line_id', 'int');
 
 $error = 0;
 
 
 //PDF
 
-$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
 
-$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
 
-$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
 
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
 
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
 
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 
 $hookmanager->initHooks(array('interventioncard', 'globalcard'));
 
@@ -177,7 +177,7 @@ if (empty($reshook)) {
 
 		$result = $object->setValid($user);
 
 
 		if ($result >= 0) {
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 				// Define output language
 
 				$outputlangs = $langs;
 
 				$newlang = '';
 
@@ -202,7 +202,7 @@ if (empty($reshook)) {
 
 	} elseif ($action == 'confirm_modify' && $confirm == 'yes' && $user->hasRight('ficheinter', 'creer')) {
 
 		$result = $object->setDraft($user);
 
 		if ($result >= 0) {
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 				// Define output language
 
 				$outputlangs = $langs;
 
 				$newlang = '';
 
@@ -228,7 +228,7 @@ if (empty($reshook)) {
 
 		$result = $object->setClose($user);
 
 
 		if ($result >= 0) {
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 				// Define output language
 
 				$outputlangs = $langs;
 
 				$newlang = '';
 
@@ -335,7 +335,7 @@ if (empty($reshook)) {
 
 
 								$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : Product::TYPE_PRODUCT);
 
 
-								if ($product_type == Product::TYPE_SERVICE || !empty($conf->global->FICHINTER_PRINT_PRODUCTS)) { //only services except if config includes products
 
+								if ($product_type == Product::TYPE_SERVICE || getDolGlobalString('FICHINTER_PRINT_PRODUCTS')) { //only services except if config includes products
 
 									$duration = 3600; // Default to one hour
 
 
 									// Predefined products & services
 
@@ -344,7 +344,7 @@ if (empty($reshook)) {
 
 										$prod->id = $lines[$i]->fk_product;
 
 
 										// Define output language
 
-										if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 
+										if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 
 											$prod->getMultiLangs();
 
 											// We show if duration is present on service (so we get it)
 
 											$prod->fetch($lines[$i]->fk_product);
 
@@ -515,15 +515,15 @@ if (empty($reshook)) {
 
 		}
 
 	} elseif ($action == "addline" && $user->hasRight('ficheinter', 'creer')) {
 
 		// Add line
 
-		if (!GETPOST('np_desc', 'restricthtml') && empty($conf->global->FICHINTER_EMPTY_LINE_DESC)) {
 
+		if (!GETPOST('np_desc', 'restricthtml') && !getDolGlobalString('FICHINTER_EMPTY_LINE_DESC')) {
 
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description"));
 
 			$error++;
 
 		}
 
-		if (empty($conf->global->FICHINTER_WITHOUT_DURATION) && !GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int')) {
 
+		if (!getDolGlobalString('FICHINTER_WITHOUT_DURATION') && !GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int')) {
 
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Duration"));
 
 			$error++;
 
 		}
 
-		if (empty($conf->global->FICHINTER_WITHOUT_DURATION) && GETPOST('durationhour', 'int') >= 24 && GETPOST('durationmin', 'int') > 0) {
 
+		if (!getDolGlobalString('FICHINTER_WITHOUT_DURATION') && GETPOST('durationhour', 'int') >= 24 && GETPOST('durationmin', 'int') > 0) {
 
 			$mesg = $langs->trans("ErrorValueTooHigh");
 
 			$error++;
 
 		}
 
@@ -532,7 +532,7 @@ if (empty($reshook)) {
 
 
 			$desc = GETPOST('np_desc', 'restricthtml');
 
 			$date_intervention = dol_mktime(GETPOST('dihour', 'int'), GETPOST('dimin', 'int'), 0, GETPOST('dimonth', 'int'), GETPOST('diday', 'int'), GETPOST('diyear', 'int'));
 
-			$duration = empty($conf->global->FICHINTER_WITHOUT_DURATION) ? convertTime2Seconds(GETPOST('durationhour', 'int'), GETPOST('durationmin', 'int')) : 0;
 
+			$duration = !getDolGlobalString('FICHINTER_WITHOUT_DURATION') ? convertTime2Seconds(GETPOST('durationhour', 'int'), GETPOST('durationmin', 'int')) : 0;
 
 
 			// Extrafields
 
 			$extrafields->fetch_name_optionals_label($object->table_element_line);
 
@@ -564,7 +564,7 @@ if (empty($reshook)) {
 
 			if ($result >= 0) {
 
 				$db->commit();
 
 
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 					fichinter_create($db, $object, $object->model_pdf, $outputlangs);
 
 				}
 
 				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 
@@ -649,7 +649,7 @@ if (empty($reshook)) {
 
 			$outputlangs = new Translate("", $conf);
 
 			$outputlangs->setDefaultLang($newlang);
 
 		}
 
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+		if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 			fichinter_create($db, $object, $object->model_pdf, $outputlangs);
 
 		}
 
 
@@ -682,7 +682,7 @@ if (empty($reshook)) {
 
 			$outputlangs = new Translate("", $conf);
 
 			$outputlangs->setDefaultLang($newlang);
 
 		}
 
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+		if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 			fichinter_create($db, $object, $object->model_pdf, $outputlangs);
 
 		}
 
 	} elseif ($action == 'up' && $user->hasRight('ficheinter', 'creer')) {
 
@@ -702,7 +702,7 @@ if (empty($reshook)) {
 
 			$outputlangs = new Translate("", $conf);
 
 			$outputlangs->setDefaultLang($newlang);
 
 		}
 
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+		if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 			fichinter_create($db, $object, $object->model_pdf, $outputlangs);
 
 		}
 
 
@@ -724,7 +724,7 @@ if (empty($reshook)) {
 
 			$outputlangs = new Translate("", $conf);
 
 			$outputlangs->setDefaultLang($newlang);
 
 		}
 
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+		if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 			fichinter_create($db, $object, $object->model_pdf, $outputlangs);
 
 		}
 
 
@@ -769,7 +769,7 @@ if (empty($reshook)) {
 
 		}
 
 	}
 
 
-	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->hasRight('ficheinter', 'creer')) {
 
+	if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB') && $user->hasRight('ficheinter', 'creer')) {
 
 		if ($action == 'addcontact') {
 
 			if ($result > 0 && $id > 0) {
 
 				$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
 
@@ -979,7 +979,7 @@ if ($action == 'create') {
 
 		print '<tr>';
 
 		print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
 
 		print '<td>';
 
-		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 
+		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 
 		print $doleditor->Create(1);
 
 		//print '<textarea name="note_public" cols="80" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
 
 		print '</td></tr>';
 
@@ -989,7 +989,7 @@ if ($action == 'create') {
 
 			print '<tr>';
 
 			print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
 
 			print '<td>';
 
-			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 
+			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 
 			print $doleditor->Create(1);
 
 			//print '<textarea name="note_private" cols="80" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
 
 			print '</td></tr>';
 
@@ -1057,7 +1057,7 @@ if ($action == 'create') {
 
 			print '<div class="div-table-responsive-no-min">';
 
 			print '<table class="noborder centpercent">';
 
 
-			$objectsrc->printOriginLinesList(empty($conf->global->FICHINTER_PRINT_PRODUCTS) ? 'services' : ''); // Show only service, except if option FICHINTER_PRINT_PRODUCTS is on
 
+			$objectsrc->printOriginLinesList(!getDolGlobalString('FICHINTER_PRINT_PRODUCTS') ? 'services' : ''); // Show only service, except if option FICHINTER_PRINT_PRODUCTS is on
 
 
 			print '</table>';
 
 			print '</div>';
 
@@ -1225,7 +1225,7 @@ if ($action == 'create') {
 
 
 	print '<table class="border tableforfield centpercent">';
 
 
-	if (!empty($conf->global->FICHINTER_USE_PLANNED_AND_DONE_DATES)) {
 
+	if (getDolGlobalString('FICHINTER_USE_PLANNED_AND_DONE_DATES')) {
 
 		// Date Start
 
 		print '<tr><td class="titlefield">'.$langs->trans("Dateo").'</td>';
 
 		print '<td>';
 
@@ -1301,7 +1301,7 @@ if ($action == 'create') {
 
 
 	print '<table class="border tableforfield centpercent">';
 
 
-	if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) {
 
+	if (!getDolGlobalString('FICHINTER_DISABLE_DETAILS')) {
 
 		// Duration in time
 
 		print '<tr><td class="titlefield">'.$langs->trans("TotalDuration").'</td>';
 
 		print '<td>'.convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).' ('.convertDurationtoHour($object->duration, "s").' '.$langs->trans("h").')</td>';
 
@@ -1316,20 +1316,20 @@ if ($action == 'create') {
 
 	print '<div class="clearboth"></div><br>';
 
 
 
-	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 
+	if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 
 		$blocname = 'contacts';
 
 		$title = $langs->trans('ContactsAddresses');
 
 		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 
 	}
 
 
-	if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 
+	if (getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 
 		$blocname = 'notes';
 
 		$title = $langs->trans('Notes');
 
 		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 
 	}
 
 
 	// Line of interventions
 
-	if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) {
 
+	if (!getDolGlobalString('FICHINTER_DISABLE_DETAILS')) {
 
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" name="addinter" method="post">';
 
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
@@ -1346,7 +1346,7 @@ if ($action == 'create') {
 
 		$sql .= ' ft.date as date_intervention';
 
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft';
 
 		$sql .= ' WHERE ft.fk_fichinter = '.((int) $object->id);
 
-		if (!empty($conf->global->FICHINTER_HIDE_EMPTY_DURATION)) {
 
+		if (getDolGlobalString('FICHINTER_HIDE_EMPTY_DURATION')) {
 
 			$sql .= ' AND ft.duree <> 0';
 
 		}
 
 		$sql .= ' ORDER BY ft.rang ASC, ft.date ASC, ft.rowid';
 
@@ -1362,13 +1362,13 @@ if ($action == 'create') {
 
 				print '<tr class="liste_titre">';
 
 
 				// No.
 
-				if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 
+				if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 
 					print '<td width="5" class="center linecolnum"></td>';
 
 				}
 
 
 				print '<td class="liste_titre">'.$langs->trans('Description').'</td>';
 
 				print '<td class="liste_titre center">'.$langs->trans('Date').'</td>';
 
-				print '<td class="liste_titre right">'.(empty($conf->global->FICHINTER_WITHOUT_DURATION) ? $langs->trans('Duration') : '').'</td>';
 
+				print '<td class="liste_titre right">'.(!getDolGlobalString('FICHINTER_WITHOUT_DURATION') ? $langs->trans('Duration') : '').'</td>';
 
 				print '<td class="liste_titre">&nbsp;</td>';
 
 				print '<td class="liste_titre">&nbsp;</td>';
 
 				print "</tr>\n";
 
@@ -1381,7 +1381,7 @@ if ($action == 'create') {
 
 					print '<tr class="oddeven">';
 
 
 					// No.
 
-					if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 
+					if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 
 						print '<td class="center linecolnum">'.($i + 1).'</td>';
 
 					}
 
 
@@ -1407,10 +1407,10 @@ if ($action == 'create') {
 
 					print '</td>';
 
 
 					// Date
 
-					print '<td class="center" width="150">'.(empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR) ?dol_print_date($db->jdate($objp->date_intervention), 'dayhour') : dol_print_date($db->jdate($objp->date_intervention), 'day')).'</td>';
 
+					print '<td class="center" width="150">'.(!getDolGlobalString('FICHINTER_DATE_WITHOUT_HOUR') ?dol_print_date($db->jdate($objp->date_intervention), 'dayhour') : dol_print_date($db->jdate($objp->date_intervention), 'day')).'</td>';
 
 
 					// Duration
 
-					print '<td class="right" width="150">'.(empty($conf->global->FICHINTER_WITHOUT_DURATION) ?convertSecondToTime($objp->duree) : '').'</td>';
 
+					print '<td class="right" width="150">'.(!getDolGlobalString('FICHINTER_WITHOUT_DURATION') ?convertSecondToTime($objp->duree) : '').'</td>';
 
 
 					print "</td>\n";
 
 
@@ -1449,7 +1449,7 @@ if ($action == 'create') {
 
 					print '<tr class="oddeven nohover">';
 
 
 					// No.
 
-					if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 
+					if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 
 						print '<td class="center linecolnum">'.($i + 1).'</td>';
 
 					}
 
 
@@ -1480,7 +1480,7 @@ if ($action == 'create') {
 
 
 					// Date d'intervention
 
 					print '<td class="center nowrap">';
 
-					if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
 
+					if (getDolGlobalString('FICHINTER_DATE_WITHOUT_HOUR')) {
 
 						print $form->selectDate($db->jdate($objp->date_intervention), 'di', 0, 0, 0, "date_intervention");
 
 					} else {
 
 						print $form->selectDate($db->jdate($objp->date_intervention), 'di', 1, 1, 0, "date_intervention");
 
@@ -1489,9 +1489,9 @@ if ($action == 'create') {
 
 
 					// Duration
 
 					print '<td class="right">';
 
-					if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) {
 
+					if (!getDolGlobalString('FICHINTER_WITHOUT_DURATION')) {
 
 						$selectmode = 'select';
 
-						if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) {
 
+						if (getDolGlobalString('INTERVENTION_ADDLINE_FREEDUREATION')) {
 
 							$selectmode = 'text';
 
 						}
 
 						$form->select_duration('duration', $objp->duree, 0, $selectmode);
 
@@ -1510,14 +1510,14 @@ if ($action == 'create') {
 
 			$db->free($resql);
 
 
 			// Add new line
 
-			if ($object->statut == 0 && $user->hasRight('ficheinter', 'creer') && $action <> 'editline' && empty($conf->global->FICHINTER_DISABLE_DETAILS)) {
 
+			if ($object->statut == 0 && $user->hasRight('ficheinter', 'creer') && $action <> 'editline' && !getDolGlobalString('FICHINTER_DISABLE_DETAILS')) {
 
 				if (!$num) {
 
 					print '<br>';
 
 					print '<table class="noborder centpercent">';
 
 					print '<tr class="liste_titre">';
 
 
 					// No.
 
-					if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 
+					if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 
 						print '<td width="5" class="center linecolnum"></td>';
 
 					}
 
 
@@ -1525,7 +1525,7 @@ if ($action == 'create') {
 
 					print '<a name="add"></a>'; // ancre
 
 					print $langs->trans('Description').'</td>';
 
 					print '<td class="center">'.$langs->trans('Date').'</td>';
 
-					print '<td class="right">'.(empty($conf->global->FICHINTER_WITHOUT_DURATION) ? $langs->trans('Duration') : '').'</td>';
 
+					print '<td class="right">'.(!getDolGlobalString('FICHINTER_WITHOUT_DURATION') ? $langs->trans('Duration') : '').'</td>';
 
 					print '<td colspan="3">&nbsp;</td>';
 
 					print "</tr>\n";
 
 				}
 
@@ -1533,15 +1533,15 @@ if ($action == 'create') {
 
 				print '<tr class="oddeven nohover">'."\n";
 
 
 				// No.
 
-				if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 
+				if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 
 					print '<td class="center linecolnum">'.($i + 1).'</td>';
 
 				}
 
 
 				print '<td>';
 
 				// editeur wysiwyg
 
-				if (empty($conf->global->FICHINTER_EMPTY_LINE_DESC)) {
 
+				if (!getDolGlobalString('FICHINTER_EMPTY_LINE_DESC')) {
 
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-					$doleditor = new DolEditor('np_desc', GETPOST('np_desc', 'restricthtml'), '', 100, 'dolibarr_details', '', false, true, !empty($conf->global->FCKEDITOR_ENABLE_DETAILS), ROWS_2, '90%');
 
+					$doleditor = new DolEditor('np_desc', GETPOST('np_desc', 'restricthtml'), '', 100, 'dolibarr_details', '', false, true, getDolGlobalString('FCKEDITOR_ENABLE_DETAILS'), ROWS_2, '90%');
 
 					$doleditor->Create();
 
 				}
 
 
@@ -1582,9 +1582,9 @@ if ($action == 'create') {
 
 
 				// Duration
 
 				print '<td class="right">';
 
-				if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) {
 
+				if (!getDolGlobalString('FICHINTER_WITHOUT_DURATION')) {
 
 					$selectmode = 'select';
 
-					if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) {
 
+					if (getDolGlobalString('INTERVENTION_ADDLINE_FREEDUREATION')) {
 
 						$selectmode = 'text';
 
 					}
 
 					$form->select_duration('duration', (!GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int')) ? 3600 : (60 * 60 * GETPOST('durationhour', 'int') + 60 * GETPOST('durationmin', 'int')), 0, $selectmode);
 
@@ -1627,8 +1627,8 @@ if ($action == 'create') {
 
 		if ($user->socid == 0) {
 
 			if ($action != 'editdescription' && ($action != 'presend')) {
 
 				// Validate
 
-				if ($object->statut == Fichinter::STATUS_DRAFT && (count($object->lines) > 0 || !empty($conf->global->FICHINTER_DISABLE_DETAILS))) {
 
-					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('ficheinter', 'creer')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('ficheinter', 'ficheinter_advance', 'validate'))) {
 
+				if ($object->statut == Fichinter::STATUS_DRAFT && (count($object->lines) > 0 || getDolGlobalString('FICHINTER_DISABLE_DETAILS'))) {
 
+					if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('ficheinter', 'creer')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('ficheinter', 'ficheinter_advance', 'validate'))) {
 
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a></div>';
 
 					} else {
 
 						print '<div class="inline-block divButActionRefused"><span class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Validate").'</span></div>';
 
@@ -1636,9 +1636,9 @@ if ($action == 'create') {
 
 				}
 
 
 				// Modify
 
-				if ($object->statut == Fichinter::STATUS_VALIDATED && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('ficheinter', 'creer')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('ficheinter', 'ficheinter_advance', 'unvalidate')))) {
 
+				if ($object->statut == Fichinter::STATUS_VALIDATED && ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('ficheinter', 'creer')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('ficheinter', 'ficheinter_advance', 'unvalidate')))) {
 
 					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=modify">';
 
-					if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) {
 
+					if (!getDolGlobalString('FICHINTER_DISABLE_DETAILS')) {
 
 						print $langs->trans("Modify");
 
 					} else {
 
 						print $langs->trans("SetToDraft");
 
@@ -1658,7 +1658,7 @@ if ($action == 'create') {
 
 				// Send
 
 				if (empty($user->socid)) {
 
 					if ($object->statut > Fichinter::STATUS_DRAFT) {
 
-						if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->hasRight('ficheinter', 'ficheinter_advance', 'send')) {
 
+						if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('ficheinter', 'ficheinter_advance', 'send')) {
 
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
 
 						} else {
 
 							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
 
@@ -1696,7 +1696,7 @@ if ($action == 'create') {
 
 						}
 
 					}
 
 
-					if (!empty($conf->global->FICHINTER_CLASSIFY_BILLED)) {    // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
 
+					if (getDolGlobalString('FICHINTER_CLASSIFY_BILLED')) {    // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
 
 						if ($object->statut != Fichinter::STATUS_BILLED) {
 
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=classifybilled&token='.newToken().'">'.$langs->trans("InterventionClassifyBilled").'</a></div>';
 
 						} else {
 
@@ -1706,7 +1706,7 @@ if ($action == 'create') {
 
 				}
 
 
 				// Done
 
-				if (empty($conf->global->FICHINTER_CLASSIFY_BILLED) && $object->statut > Fichinter::STATUS_DRAFT && $object->statut < Fichinter::STATUS_CLOSED) {
 
+				if (!getDolGlobalString('FICHINTER_CLASSIFY_BILLED') && $object->statut > Fichinter::STATUS_DRAFT && $object->statut < Fichinter::STATUS_CLOSED) {
 
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=classifydone&token='.newToken().'">'.$langs->trans("InterventionClassifyDone").'</a></div>';
 
 				}
 
 
@@ -1741,13 +1741,13 @@ if ($action == 'create') {
 
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
 		// Show direct download link
 
-		if ($object->statut != Fichinter::STATUS_DRAFT && !empty($conf->global->FICHINTER_ALLOW_EXTERNAL_DOWNLOAD)) {
 
+		if ($object->statut != Fichinter::STATUS_DRAFT && getDolGlobalString('FICHINTER_ALLOW_EXTERNAL_DOWNLOAD')) {
 
 			print '<br><!-- Link to download main doc -->'."\n";
 
 			print showDirectDownloadLink($object).'<br>';
 
 		}
 
 
 		// Show online signature link
 
-		if ($object->statut != Fichinter::STATUS_DRAFT && !empty($conf->global->FICHINTER_ALLOW_ONLINE_SIGN)) {
 
+		if ($object->statut != Fichinter::STATUS_DRAFT && getDolGlobalString('FICHINTER_ALLOW_ONLINE_SIGN')) {
 
 			print '<br><!-- Link to sign -->';
 
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';

+ 3 - 3
htdocs/fichinter/class/fichinter.class.php
View File 

@@ -781,7 +781,7 @@ class Fichinter extends CommonObject
 
 
 			if (!empty($this->model_pdf)) {
 
 				$modele = $this->model_pdf;
 
-			} elseif (!empty($conf->global->FICHEINTER_ADDON_PDF)) {
 
+			} elseif (getDolGlobalString('FICHEINTER_ADDON_PDF')) {
 
 				$modele = $conf->global->FICHEINTER_ADDON_PDF;
 
 			}
 
 		}
 
@@ -907,7 +907,7 @@ class Fichinter extends CommonObject
 
 
 		$linkclose = '';
 
 		if (empty($notooltip)) {
 
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 
 				$label = $langs->trans("ShowIntervention");
 
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 
 			}
 
@@ -966,7 +966,7 @@ class Fichinter extends CommonObject
 
 		global $conf, $db, $langs;
 
 		$langs->load("interventions");
 
 
-		if (!empty($conf->global->FICHEINTER_ADDON)) {
 
+		if (getDolGlobalString('FICHEINTER_ADDON')) {
 
 			$mybool = false;
 
 
 			$file = "mod_" . getDolGlobalString('FICHEINTER_ADDON').".php";

+ 2 - 2
htdocs/fichinter/contact.php
View File 

@@ -157,10 +157,10 @@ if ($id > 0 || !empty($ref)) {
 
 
 	print '<br>';
 
 
-	if (!empty($conf->global->FICHINTER_HIDE_ADD_CONTACT_USER)) {
 
+	if (getDolGlobalString('FICHINTER_HIDE_ADD_CONTACT_USER')) {
 
 		$hideaddcontactforuser = 1;
 
 	}
 
-	if (!empty($conf->global->FICHINTER_HIDE_ADD_CONTACT_THIPARTY)) {
 
+	if (getDolGlobalString('FICHINTER_HIDE_ADD_CONTACT_THIPARTY')) {
 
 		$hideaddcontactforthirdparty = 1;
 
 	}

+ 1 - 1
htdocs/fichinter/index.php
View File 

@@ -115,7 +115,7 @@ if ($resql) {
 
 	print '<table class="noborder nohover centpercent">';
 
 	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Interventions").'</th></tr>'."\n";
 
 	$listofstatus = array(Fichinter::STATUS_DRAFT, Fichinter::STATUS_VALIDATED);
 
-	if (!empty($conf->global->FICHINTER_CLASSIFY_BILLED)) $listofstatus[] = Fichinter::STATUS_BILLED;
 
+	if (getDolGlobalString('FICHINTER_CLASSIFY_BILLED')) $listofstatus[] = Fichinter::STATUS_BILLED;
 
 
 	foreach ($listofstatus as $status) {
 
 		$dataseries[] = array($fichinterstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));

+ 9 - 9
htdocs/fichinter/list.php
View File 

@@ -113,7 +113,7 @@ $fieldstosearchall = array(
 
 if (empty($user->socid)) {
 
 	$fieldstosearchall["f.note_private"] = "NotePrivate";
 
 }
 
-if (!empty($conf->global->FICHINTER_DISABLE_DETAILS)) {
 
+if (getDolGlobalString('FICHINTER_DISABLE_DETAILS')) {
 
 	unset($fieldstosearchall['fd.description']);
 
 }
 
 
@@ -130,9 +130,9 @@ $arrayfields = array(
 
 	'f.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES'))),
 
 	'f.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES'))),
 
 	'f.fk_statut'=>array('label'=>'Status', 'checked'=>1, 'position'=>1000),
 
-	'fd.description'=>array('label'=>"DescriptionOfLine", 'checked'=>1, 'enabled'=>empty($conf->global->FICHINTER_DISABLE_DETAILS) ? 1 : 0),
 
-	'fd.date'=>array('label'=>'DateOfLine', 'checked'=>1, 'enabled'=>empty($conf->global->FICHINTER_DISABLE_DETAILS) ? 1 : 0),
 
-	'fd.duree'=>array('label'=>'DurationOfLine', 'type'=> 'duration', 'checked'=>1, 'enabled'=>empty($conf->global->FICHINTER_DISABLE_DETAILS) ? 1 : 0), //type duration is here because in database, column 'duree' is double
 
+	'fd.description'=>array('label'=>"DescriptionOfLine", 'checked'=>1, 'enabled'=>!getDolGlobalString('FICHINTER_DISABLE_DETAILS') ? 1 : 0),
 
+	'fd.date'=>array('label'=>'DateOfLine', 'checked'=>1, 'enabled'=>!getDolGlobalString('FICHINTER_DISABLE_DETAILS') ? 1 : 0),
 
+	'fd.duree'=>array('label'=>'DurationOfLine', 'type'=> 'duration', 'checked'=>1, 'enabled'=>!getDolGlobalString('FICHINTER_DISABLE_DETAILS') ? 1 : 0), //type duration is here because in database, column 'duree' is double
 
 );
 
 // Extra fields
 
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
@@ -233,7 +233,7 @@ foreach ($arrayfields as $tmpkey => $tmpval) {
 
 
 $sql = "SELECT";
 
 $sql .= " f.ref, f.ref_client, f.rowid, f.fk_statut as status, f.description, f.datec as date_creation, f.tms as date_update, f.note_public, f.note_private,";
 
-if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) {
 
+if (!getDolGlobalString('FICHINTER_DISABLE_DETAILS') && $atleastonefieldinlines) {
 
 	$sql .= " fd.rowid as lineid, fd.description as descriptiondetail, fd.date as dp, fd.duree,";
 
 }
 
 $sql .= " s.nom as name, s.rowid as socid, s.client, s.fournisseur, s.email, s.status as thirdpartystatus";
 
@@ -266,7 +266,7 @@ if (isModEnabled('contrat')) {
 
 if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (f.rowid = ef.fk_object)";
 
 }
 
-if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) {
 
+if (!getDolGlobalString('FICHINTER_DISABLE_DETAILS') && $atleastonefieldinlines) {
 
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as fd ON fd.fk_fichinter = f.rowid";
 
 }
 
 
@@ -297,7 +297,7 @@ if ($search_contrat_ref) {
 
 	$sql .= natural_search('c.ref', $search_contrat_ref);
 
 }
 
 if ($search_desc) {
 
-	if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) {
 
+	if (!getDolGlobalString('FICHINTER_DISABLE_DETAILS') && $atleastonefieldinlines) {
 
 		$sql .= natural_search(array('f.description', 'fd.description'), $search_desc);
 
 	} else {
 
 		$sql .= natural_search(array('f.description'), $search_desc);
 
@@ -372,7 +372,7 @@ $num = $db->num_rows($resql);
 
 
 
 // Direct jump if only one record found
 
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
 
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 
 	$obj = $db->fetch_object($resql);
 
 	$id = $obj->rowid;
 
 	header("Location: ".dol_buildpath('/fichinter/card.php', 1).'?id='.$id);
 
@@ -600,7 +600,7 @@ if (!empty($arrayfields['f.fk_statut']['checked'])) {
 
 		$object::STATUS_BILLED => $langs->transnoentitiesnoconv('StatusInterInvoiced'),
 
 		$object::STATUS_CLOSED => $langs->transnoentitiesnoconv('Done'),
 
 	];
 
-	if (empty($conf->global->FICHINTER_CLASSIFY_BILLED)) {
 
+	if (!getDolGlobalString('FICHINTER_CLASSIFY_BILLED')) {
 
 		unset($liststatus[2]); // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
 
 	}
 
 	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 1, 0, 0, '', 'search_status width100 onrightofpage');

+ 2 - 2
htdocs/fichinter/stats/index.php
View File 

@@ -45,7 +45,7 @@ if ($user->socid > 0) {
 
 
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
 
 $year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
 
-$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
 
 $endyear = $year;
 
 
 $object_status = GETPOST('object_status', 'intcomma');
 
@@ -232,7 +232,7 @@ print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0
 
 print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
 
 $tmp = $objectstatic->LibStatut(0); // To force load of $this->labelStatus
 
 $liststatus = $objectstatic->labelStatus;
 
-if (empty($conf->global->FICHINTER_CLASSIFY_BILLED)) {
 
+if (!getDolGlobalString('FICHINTER_CLASSIFY_BILLED')) {
 
 	unset($liststatus[$objectstatic::STATUS_BILLED]); // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
 
 }
 
 print $form->selectarray('object_status', $liststatus, $object_status, 1, 0, 0, '', 1);

+ 2 - 2
htdocs/fourn/ajax/getSupplierPrices.php
View File 

@@ -100,7 +100,7 @@ if ($idprod > 0) {
 
 	if (isModEnabled('stock')) {
 
 		// Add price for pmp
 
 		$price = $producttmp->pmp;
 
-		if (empty($price) && !empty($conf->global->PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY)) {
 
+		if (empty($price) && getDolGlobalString('PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY')) {
 
 			// get pmp for subproducts if any
 
 			$producttmp->get_sousproduits_arbo();
 
 			$prods_arbo=$producttmp->get_arbo_each_prod();
 
@@ -119,7 +119,7 @@ if ($idprod > 0) {
 
 
 	// Add price for costprice (at end)
 
 	$price = $producttmp->cost_price;
 
-	if (empty($price) && !empty($conf->global->PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY)) {
 
+	if (empty($price) && getDolGlobalString('PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY')) {
 
 		// get costprice for subproducts if any
 
 		$producttmp->get_sousproduits_arbo();
 
 		$prods_arbo=$producttmp->get_arbo_each_prod();

+ 8 - 8
htdocs/fourn/card.php
View File 

@@ -201,7 +201,7 @@ if ($id > 0 && empty($object->id)) {
 
 
 if ($object->id > 0) {
 
 	$title = $langs->trans("ThirdParty")." - ".$langs->trans('Supplier');
 
-	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 
+	if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 
 		$title = $object->name." - ".$langs->trans('Supplier');
 
 	}
 
 	$help_url = '';
 
@@ -228,7 +228,7 @@ if ($object->id > 0) {
 
 	print $object->getTypeUrl(1);
 
 	print '</td></tr>';
 
 
-	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
 
+	if (getDolGlobalString('SOCIETE_USEPREFIX')) {  // Old not used prefix field
 
 		print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 
 	}
 
 
@@ -385,12 +385,12 @@ if ($object->id > 0) {
 
 	print '</td>';
 
 	print '</tr>';
 
 
-	if (isModEnabled("supplier_order") && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT)) {
 
+	if (isModEnabled("supplier_order") && getDolGlobalString('ORDER_MANAGE_MIN_AMOUNT')) {
 
 		print '<tr class="nowrap">';
 
 		print '<td>';
 
 		print $form->editfieldkey("OrderMinAmount", 'supplier_order_min_amount', $object->supplier_order_min_amount, $object, $user->hasRight("societe", "creer"));
 
 		print '</td><td>';
 
-		$limit_field_type = (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount';
 
+		$limit_field_type = (getDolGlobalString('MAIN_USE_JQUERY_JEDITABLE')) ? 'numeric' : 'amount';
 
 		print $form->editfieldval("OrderMinAmount", 'supplier_order_min_amount', $object->supplier_order_min_amount, $object, $user->hasRight("societe", "creer"), $limit_field_type, ($object->supplier_order_min_amount != '' ? price($object->supplier_order_min_amount) : ''));
 
 		print '</td>';
 
 		print '</tr>';
 
@@ -714,7 +714,7 @@ if ($object->id > 0) {
 
 		$sql2 .= " AND c.entity IN (".getEntity('commande_fournisseur').")";
 
 		$sql2 .= ' AND s.rowid = '.((int) $object->id);
 
 		// Show orders we can bill
 
-		if (empty($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS)) {
 
+		if (!getDolGlobalString('SUPPLIER_ORDER_TO_INVOICE_STATUS')) {
 
 			$sql2 .= " AND c.fk_statut IN (".$db->sanitize(CommandeFournisseur::STATUS_RECEIVED_COMPLETELY).")"; //  Must match filter in htdocs/fourn/commande/list.php
 
 		} else {
 
 			// CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.", ".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY
 
@@ -931,7 +931,7 @@ if ($object->id > 0) {
 
 		}
 
 
 		// Add action
 
-		if (isModEnabled('agenda') && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1) {
 
+		if (isModEnabled('agenda') && getDolGlobalString('MAIN_REPEATTASKONEACHTAB') && $object->status == 1) {
 
 			if ($user->hasRight("agenda", "myactions", "create")) {
 
 				print dolGetButtonAction('', $langs->trans('AddAction'), 'default', DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;socid='.$object->id, '');
 
 			} else {
 
@@ -943,13 +943,13 @@ if ($object->id > 0) {
 
 	print '</div>';
 
 
 
-	if (!empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD)) {
 
+	if (getDolGlobalString('MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD')) {
 
 		print '<br>';
 
 		// List of contacts
 
 		show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
 
 	}
 
 
-	if (!empty($conf->global->MAIN_REPEATTASKONEACHTAB)) {
 
+	if (getDolGlobalString('MAIN_REPEATTASKONEACHTAB')) {
 
 		print load_fiche_titre($langs->trans("ActionsOnCompany"), '', '');
 
 
 		// List of todo actions

+ 22 - 22
htdocs/fourn/class/fournisseur.commande.class.php
View File 

@@ -581,7 +581,7 @@ class CommandeFournisseur extends CommonOrder
 
 				$line->ref_fourn           = $objp->ref_supplier; // The supplier ref of price when product was added. May have change since
 
 				$line->ref_supplier        = $objp->ref_supplier; // The supplier ref of price when product was added. May have change since
 
 
-				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 
+				if (getDolGlobalString('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 
 					// TODO We should not fetch this properties into the fetch_lines. This is NOT properties of a line.
 
 					// Move this into another method and call it when required.
 
 
@@ -660,8 +660,8 @@ class CommandeFournisseur extends CommonOrder
 
 
 		dol_syslog(get_class($this)."::valid");
 
 		$result = 0;
 
-		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")))
 
-			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("fournisseur", "supplier_order_advance", "validate"))) {
 
+		if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")))
 
+			|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("fournisseur", "supplier_order_advance", "validate"))) {
 
 				$this->db->begin();
 
 
 				// Definition of supplier order numbering model name
 
@@ -794,7 +794,7 @@ class CommandeFournisseur extends CommonOrder
 
 			$this->labelStatus[0] = 'StatusSupplierOrderDraft';
 
 			$this->labelStatus[1] = 'StatusSupplierOrderValidated';
 
 			$this->labelStatus[2] = 'StatusSupplierOrderApproved';
 
-			if (empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
 
+			if (!getDolGlobalString('SUPPLIER_ORDER_USE_DISPATCH_STATUS')) {
 
 				$this->labelStatus[3] = 'StatusSupplierOrderOnProcess';
 
 			} else {
 
 				$this->labelStatus[3] = 'StatusSupplierOrderOnProcessWithValidation';
 
@@ -953,7 +953,7 @@ class CommandeFournisseur extends CommonOrder
 
 
 		$linkclose = '';
 
 		if (empty($notooltip)) {
 
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 
 				$label = $langs->trans("ShowOrder");
 
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 
 			}
 
@@ -1013,7 +1013,7 @@ class CommandeFournisseur extends CommonOrder
 
 		global $db, $langs, $conf;
 
 		$langs->load("orders");
 
 
-		if (!empty($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER)) {
 
+		if (getDolGlobalString('COMMANDE_SUPPLIER_ADDON_NUMBER')) {
 
 			$mybool = false;
 
 
 			$file = getDolGlobalString('COMMANDE_SUPPLIER_ADDON_NUMBER').'.php';
 
@@ -1137,7 +1137,7 @@ class CommandeFournisseur extends CommonOrder
 
 			if (empty($secondlevel)) {	// standard or first level approval
 
 				$sql .= " date_approve='".$this->db->idate($now)."',";
 
 				$sql .= " fk_user_approve = ".$user->id;
 
-				if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $this->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) {
 
+				if (getDolGlobalString('SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED') && $this->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) {
 
 					if (empty($this->user_approve_id2)) {
 
 						$movetoapprovestatus = false; // second level approval not done
 
 						$comment = ' (first level)';
 
@@ -1162,7 +1162,7 @@ class CommandeFournisseur extends CommonOrder
 
 			$sql .= " AND fk_statut = ".self::STATUS_VALIDATED;
 
 
 			if ($this->db->query($sql)) {
 
-				if (!empty($conf->global->SUPPLIER_ORDER_AUTOADD_USER_CONTACT)) {
 
+				if (getDolGlobalString('SUPPLIER_ORDER_AUTOADD_USER_CONTACT')) {
 
 					$result = $this->add_contact($user->id, 'SALESREPFOLL', 'internal', 1);
 
 					if ($result < 0 && $result != -2) {	// -2 means already exists
 
 						$error++;
 
@@ -1170,7 +1170,7 @@ class CommandeFournisseur extends CommonOrder
 
 				}
 
 
 				// If stock is incremented on validate order, we must increment it
 
-				if (!$error && $movetoapprovestatus && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)) {
 
+				if (!$error && $movetoapprovestatus && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER')) {
 
 					require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
 					$langs->load("agenda");
 
 
@@ -1184,7 +1184,7 @@ class CommandeFournisseur extends CommonOrder
 
 							$mouvP->setOrigin($this->element, $this->id);
 
 							// We decrement stock of product (and sub-products)
 
 							$up_ht_disc = $this->lines[$i]->subprice;
 
-							if (!empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) {
 
+							if (!empty($this->lines[$i]->remise_percent) && !getDolGlobalString('STOCK_EXCLUDE_DISCOUNT_FOR_PMP')) {
 
 								$up_ht_disc = price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
 
 							}
 
 							$result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("OrderApprovedInDolibarr", $this->ref));
 
@@ -1901,7 +1901,7 @@ class CommandeFournisseur extends CommonOrder
 
 			$label = '';	// deprecated
 
 
 			if ($fk_product > 0) {
 
-				if (!empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY)) {	// Not the common case
 
+				if (getDolGlobalString('SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY')) {	// Not the common case
 
 					// Check quantity is enough
 
 					dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." fk_prod_fourn_price=".$fk_prod_fourn_price." qty=".$qty." ref_supplier=".$ref_supplier);
 
 					$prod = new ProductFournisseur($this->db);
 
@@ -1953,7 +1953,7 @@ class CommandeFournisseur extends CommonOrder
 
 				}
 
 
 				// Predefine quantity according to packaging
 
-				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 
+				if (getDolGlobalString('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 
 					$prod = new Product($this->db);
 
 					$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', (empty($this->fk_soc) ? $this->socid : $this->fk_soc));
 
 
@@ -2134,7 +2134,7 @@ class CommandeFournisseur extends CommonOrder
 
 		}
 
 
 		$dispatchstatus = 1;
 
-		if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
 
+		if (getDolGlobalString('SUPPLIER_ORDER_USE_DISPATCH_STATUS')) {
 
 			$dispatchstatus = 0; // Setting dispatch status (a validation step after receiving products) will be done manually to 1 or 2 if this option is on
 
 		}
 
 
@@ -2169,7 +2169,7 @@ class CommandeFournisseur extends CommonOrder
 
 			}
 
 
 			// If module stock is enabled and the stock increase is done on purchase order dispatching
 
-			if (!$error && $entrepot > 0 && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
 
+			if (!$error && $entrepot > 0 && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER')) {
 
 				$mouv = new MouvementStock($this->db);
 
 				if ($product > 0) {
 
 					// $price should take into account discount (except if option STOCK_EXCLUDE_DISCOUNT_FOR_PMP is on)
 
@@ -2177,7 +2177,7 @@ class CommandeFournisseur extends CommonOrder
 
 					$mouv->setOrigin($this->element, $this->id);
 
 
 					// Method change if qty < 0
 
-					if (!empty($conf->global->SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN) && $qty < 0) {
 
+					if (getDolGlobalString('SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN') && $qty < 0) {
 
 						$result = $mouv->livraison($user, $product, $entrepot, $qty*(-1), $price, $comment, $now, $eatby, $sellby, $batch, 0, $inventorycode);
 
 					} else {
 
 						$result = $mouv->reception($user, $product, $entrepot, $qty, $price, $comment, $eatby, $sellby, $batch, '', 0, $inventorycode);
 
@@ -2471,7 +2471,7 @@ class CommandeFournisseur extends CommonOrder
 
 			}
 
 
 			// Some checks to accept the record
 
-			if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
 
+			if (getDolGlobalString('SUPPLIER_ORDER_USE_DISPATCH_STATUS')) {
 
 				// If option SUPPLIER_ORDER_USE_DISPATCH_STATUS is on, we check all reception are approved to allow status "total/done"
 
 				if (!$error && ($type == 'tot')) {
 
 					$dispatchedlinearray = $this->getDispachedLines(0);
 
@@ -2482,7 +2482,7 @@ class CommandeFournisseur extends CommonOrder
 
 						dol_syslog('ErrorCantSetReceptionToTotalDoneWithReceptionToApprove', LOG_DEBUG);
 
 					}
 
 				}
 
-				if (!$error && !empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS_NEED_APPROVE) && ($type == 'tot')) {	// Accept to move to reception done, only if status of all line are ok (refuse denied)
 
+				if (!$error && getDolGlobalString('SUPPLIER_ORDER_USE_DISPATCH_STATUS_NEED_APPROVE') && ($type == 'tot')) {	// Accept to move to reception done, only if status of all line are ok (refuse denied)
 
 					$dispatcheddenied = $this->getDispachedLines(2);
 
 					if (count($dispatchedlinearray) > 0) {
 
 						$result = -1;
 
@@ -2893,7 +2893,7 @@ class CommandeFournisseur extends CommonOrder
 
 			$this->line->desc = $desc;
 
 
 			// redefine quantity according to packaging
 
-			if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 
+			if (getDolGlobalString('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 
 				if ($qty < $this->line->packaging) {
 
 					$qty = $this->line->packaging;
 
 				} else {
 
@@ -3251,7 +3251,7 @@ class CommandeFournisseur extends CommonOrder
 
 
 			if (!empty($this->model_pdf)) {
 
 				$modele = $this->model_pdf;
 
-			} elseif (!empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF)) {
 
+			} elseif (getDolGlobalString('COMMANDE_SUPPLIER_ADDON_PDF')) {
 
 				$modele = getDolGlobalString('COMMANDE_SUPPLIER_ADDON_PDF');
 
 			}
 
 		}
 
@@ -3427,7 +3427,7 @@ class CommandeFournisseur extends CommonOrder
 
 
 			$supplierorderdispatch = new CommandeFournisseurDispatch($this->db);
 
 			$filter = array('t.fk_commande'=>$this->id);
 
-			if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
 
+			if (getDolGlobalString('SUPPLIER_ORDER_USE_DISPATCH_STATUS')) {
 
 				$filter['t.status'] = 1; // Restrict to lines with status validated
 
 			}
 
 
@@ -3446,7 +3446,7 @@ class CommandeFournisseur extends CommonOrder
 
 					}
 
 					foreach ($this->lines as $line) {
 
 						// Exclude lines not qualified for shipment, similar code is found into interface_20_modWrokflow for customers
 
-						if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $line->product_type > 0) {
 
+						if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES') && $line->product_type > 0) {
 
 							continue;
 
 						}
 
 						$qtywished[$line->fk_product] += $line->qty;
 
@@ -3480,7 +3480,7 @@ class CommandeFournisseur extends CommonOrder
 
 							}
 
 							return 4;
 
 						}
 
-					} elseif (!empty($conf->global->SUPPLIER_ORDER_MORE_THAN_WISHED)) {
 
+					} elseif (getDolGlobalString('SUPPLIER_ORDER_MORE_THAN_WISHED')) {
 
 						//set livraison to 'tot' if more products received than wished. (and if $closeopenorder is set to 1 of course...)
 
 
 						$close = 0;

+ 10 - 10
htdocs/fourn/class/fournisseur.facture.class.php
View File 

@@ -1341,7 +1341,7 @@ class FactureFournisseur extends CommonInvoice
 
 			$facligne->rang = -1;
 
 			$facligne->info_bits = 2;
 
 
-			if (!empty($conf->global->MAIN_ADD_LINE_AT_POSITION)) {
 
+			if (getDolGlobalString('MAIN_ADD_LINE_AT_POSITION')) {
 
 				$facligne->rang = 1;
 
 				$linecount = count($this->lines);
 
 				for ($ii = 1; $ii <= $linecount; $ii++) {
 
@@ -1801,7 +1801,7 @@ class FactureFournisseur extends CommonInvoice
 
 				} else {
 
 					if ($key == 'EMAIL') {
 
 						// Check for mandatory
 
-						if (!empty($conf->global->SOCIETE_EMAIL_INVOICE_MANDATORY) && !isValidEMail($this->thirdparty->email)) {
 
+						if (getDolGlobalString('SOCIETE_EMAIL_INVOICE_MANDATORY') && !isValidEMail($this->thirdparty->email)) {
 
 							$langs->load("errors");
 
 							$this->error = $langs->trans("ErrorBadEMail", $this->thirdparty->email).' ('.$langs->trans("ForbiddenBySetupRules").') ['.$langs->trans('Company').' : '.$this->thirdparty->name.']';
 
 							dol_syslog(__METHOD__.' '.$this->error, LOG_ERR);
 
@@ -1809,7 +1809,7 @@ class FactureFournisseur extends CommonInvoice
 
 						}
 
 					} elseif ($key == 'ACCOUNTANCY_CODE_SUPPLIER') {
 
 						// Check for mandatory
 
-						if (!empty($conf->global->SOCIETE_ACCOUNTANCY_CODE_SUPPLIER_INVOICE_MANDATORY) && empty($this->thirdparty->code_compta_fournisseur)) {
 
+						if (getDolGlobalString('SOCIETE_ACCOUNTANCY_CODE_SUPPLIER_INVOICE_MANDATORY') && empty($this->thirdparty->code_compta_fournisseur)) {
 
 							$langs->load("errors");
 
 							$this->error = $langs->trans("ErrorAccountancyCodeSupplierIsMandatory", $this->thirdparty->name).' ('.$langs->trans("ForbiddenBySetupRules").')';
 
 							dol_syslog(__METHOD__.' '.$this->error, LOG_ERR);
 
@@ -1840,7 +1840,7 @@ class FactureFournisseur extends CommonInvoice
 
 		$resql = $this->db->query($sql);
 
 		if ($resql) {
 
 			// Si on incrémente le produit principal et ses composants à la validation de facture fournisseur
 
-			if (!$error && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
 
+			if (!$error && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_BILL')) {
 
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
 				$langs->load("agenda");
 
 
@@ -1852,7 +1852,7 @@ class FactureFournisseur extends CommonInvoice
 
 						$mouvP->setOrigin($this->element, $this->id);
 
 						// We increase stock for product
 
 						$up_ht_disc = $this->lines[$i]->subprice;
 
-						if (!empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) {
 
+						if (!empty($this->lines[$i]->remise_percent) && !getDolGlobalString('STOCK_EXCLUDE_DISCOUNT_FOR_PMP')) {
 
 							$up_ht_disc = price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
 
 						}
 
 						if ($this->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
 
@@ -1980,7 +1980,7 @@ class FactureFournisseur extends CommonInvoice
 
 			}
 
 
 			// Si on incremente le produit principal et ses composants a la validation de facture fournisseur, on decremente
 
-			if ($result >= 0 && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
 
+			if ($result >= 0 && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_BILL')) {
 
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
 				$langs->load("agenda");
 
 
@@ -2108,7 +2108,7 @@ class FactureFournisseur extends CommonInvoice
 
 			$this->db->begin();
 
 
 			if ($fk_product > 0) {
 
-				if (!empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY)) {
 
+				if (getDolGlobalString('SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY')) {
 
 					// Check quantity is enough
 
 					dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." qty=".$qty." ref_supplier=".$ref_supplier);
 
 					$prod = new ProductFournisseur($this->db);
 
@@ -2879,7 +2879,7 @@ class FactureFournisseur extends CommonInvoice
 
 
 		$linkclose = '';
 
 		if (empty($notooltip)) {
 
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 
 				$label = $langs->trans("ShowSupplierInvoice");
 
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 
 			}
 
@@ -2937,7 +2937,7 @@ class FactureFournisseur extends CommonInvoice
 
 		$langs->load("orders");
 
 
 		// Clean parameters (if not defined or using deprecated value)
 
-		if (empty($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER)) {
 
+		if (!getDolGlobalString('INVOICE_SUPPLIER_ADDON_NUMBER')) {
 
 			$conf->global->INVOICE_SUPPLIER_ADDON_NUMBER = 'mod_facture_fournisseur_cactus';
 
 		}
 
 
@@ -3210,7 +3210,7 @@ class FactureFournisseur extends CommonInvoice
 
 
 		// Set the model on the model name to use
 
 		if (empty($modele)) {
 
-			if (!empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF)) {
 
+			if (getDolGlobalString('INVOICE_SUPPLIER_ADDON_PDF')) {
 
 				$modele = $conf->global->INVOICE_SUPPLIER_ADDON_PDF;
 
 			} else {
 
 				$modele = ''; // No default value. For supplier invoice, we allow to disable all PDF generation

+ 7 - 7
htdocs/fourn/class/fournisseur.product.class.php
View File 

@@ -413,7 +413,7 @@ class ProductFournisseur extends Product
 
 			$sql .= " supplier_reputation = ".(empty($supplier_reputation) ? 'NULL' : "'".$this->db->escape($supplier_reputation)."'").",";
 
 			$sql .= " barcode = ".(empty($barcode) ? 'NULL' : "'".$this->db->escape($barcode)."'").",";
 
 			$sql .= " fk_barcode_type = ".(empty($fk_barcode_type) ? 'NULL' : "'".$this->db->escape($fk_barcode_type)."'");
 
-			if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 
+			if (getDolGlobalString('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 
 				$sql .= ", packaging = ".(empty($packaging) ? 1 : $packaging);
 
 			}
 
 			$sql .= " WHERE rowid = ".((int) $this->product_fourn_price_id);
 
@@ -447,7 +447,7 @@ class ProductFournisseur extends Product
 
 					$error++;
 
 				}
 
 				// End call triggers
 
-				if (!$error && empty($conf->global->PRODUCT_PRICE_SUPPLIER_NO_LOG)) {
 
+				if (!$error && !getDolGlobalString('PRODUCT_PRICE_SUPPLIER_NO_LOG')) {
 
 					$result = $this->logPrice($user, $now, $buyprice, $qty, $multicurrency_buyprice, $multicurrency_unitBuyPrice, $multicurrency_tx, $fk_multicurrency, $multicurrency_code);
 
 					if ($result < 0) {
 
 						$error++;
 
@@ -477,7 +477,7 @@ class ProductFournisseur extends Product
 
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price(";
 
 				$sql .= " multicurrency_price, multicurrency_unitprice, multicurrency_tx, fk_multicurrency, multicurrency_code,";
 
 				$sql .= "datec, fk_product, fk_soc, ref_fourn, desc_fourn, fk_user, price, quantity, remise_percent, remise, unitprice, tva_tx, charges, fk_availability, default_vat_code, info_bits, entity, delivery_time_days, supplier_reputation, barcode, fk_barcode_type";
 
-				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 
+				if (getDolGlobalString('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 
 					$sql .= ", packaging";
 
 				}
 
 				$sql .= ") values(";
 
@@ -507,7 +507,7 @@ class ProductFournisseur extends Product
 
 				$sql .= (empty($supplier_reputation) ? 'NULL' : "'".$this->db->escape($supplier_reputation)."'").",";
 
 				$sql .= (empty($barcode) ? 'NULL' : "'".$this->db->escape($barcode)."'").",";
 
 				$sql .= (empty($fk_barcode_type) ? 'NULL' : "'".$this->db->escape($fk_barcode_type)."'");
 
-				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 
+				if (getDolGlobalString('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 
 					$sql .= ", ".(empty($this->packaging) ? '1' : "'".$this->db->escape($this->packaging)."'");
 
 				}
 
 				$sql .= ")";
 
@@ -540,7 +540,7 @@ class ProductFournisseur extends Product
 
 					}
 
 				}
 
 
-				if (!$error && empty($conf->global->PRODUCT_PRICE_SUPPLIER_NO_LOG)) {
 
+				if (!$error && !getDolGlobalString('PRODUCT_PRICE_SUPPLIER_NO_LOG')) {
 
 					// Add record into log table
 
 					// $this->product_fourn_price_id must be set
 
 					$result = $this->logPrice($user, $now, $buyprice, $qty, $multicurrency_buyprice, $multicurrency_unitBuyPrice, $multicurrency_tx, $fk_multicurrency, $multicurrency_code);
 
@@ -1199,7 +1199,7 @@ class ProductFournisseur extends Product
 
 		}
 
 		$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
 
 
-		if ($this->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 
+		if ($this->type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 
 			if (isModEnabled('productbatch')) {
 
 				$langs->load("productbatch");
 
 				$label .= "<br><b>".$langs->trans("ManageLotSerial").'</b>: '.$this->getLibStatut(0, 2);
 
@@ -1274,7 +1274,7 @@ class ProductFournisseur extends Product
 
 
 		$linkclose = '';
 
 		if (empty($notooltip)) {
 
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 
 				$label = $langs->trans("SupplierRef");
 
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 
 			}

+ 5 - 5
htdocs/fourn/class/paiementfourn.class.php
View File 

@@ -363,7 +363,7 @@ class PaiementFourn extends Paiement
 
 							}
 
 
 							// Regenerate documents of invoices
 
-							if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+							if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 								$newlang = '';
 
 								$outputlangs = $langs;
 
 								if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang)) {
 
@@ -683,7 +683,7 @@ class PaiementFourn extends Paiement
 
 
 		$linkclose = '';
 
 		if (empty($notooltip)) {
 
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 
 				$label = $langs->trans("Payment");
 
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 
 			}
 
@@ -757,7 +757,7 @@ class PaiementFourn extends Paiement
 
 		$langs->load("bills");
 
 
 		// Clean parameters (if not defined or using deprecated value)
 
-		if (empty($conf->global->SUPPLIER_PAYMENT_ADDON)) {
 
+		if (!getDolGlobalString('SUPPLIER_PAYMENT_ADDON')) {
 
 			$conf->global->SUPPLIER_PAYMENT_ADDON = 'mod_supplier_payment_bronan';
 
 		} elseif (getDolGlobalString('SUPPLIER_PAYMENT_ADDON') == 'brodator') {
 
 			$conf->global->SUPPLIER_PAYMENT_ADDON = 'mod_supplier_payment_brodator';
 
@@ -765,7 +765,7 @@ class PaiementFourn extends Paiement
 
 			$conf->global->SUPPLIER_PAYMENT_ADDON = 'mod_supplier_payment_bronan';
 
 		}
 
 
-		if (!empty($conf->global->SUPPLIER_PAYMENT_ADDON)) {
 
+		if (getDolGlobalString('SUPPLIER_PAYMENT_ADDON')) {
 
 			$mybool = false;
 
 
 			$file = getDolGlobalString('SUPPLIER_PAYMENT_ADDON') . ".php";
 
@@ -844,7 +844,7 @@ class PaiementFourn extends Paiement
 
 
 		// Set the model on the model name to use
 
 		if (empty($modele)) {
 
-			if (!empty($conf->global->SUPPLIER_PAYMENT_ADDON_PDF)) {
 
+			if (getDolGlobalString('SUPPLIER_PAYMENT_ADDON_PDF')) {
 
 				$modele = $conf->global->SUPPLIER_PAYMENT_ADDON_PDF;
 
 			} else {
 
 				$modele = ''; // No default value. For supplier invoice, we allow to disable all PDF generation

+ 60 - 60
htdocs/fourn/commande/card.php
View File 

@@ -89,9 +89,9 @@ $originid  = (GETPOST('originid', 'int') ? GETPOST('originid', 'int') : GETPOST(
 
 $rank      = (GETPOST('rank', 'int') > 0) ? GETPOST('rank', 'int') : -1;
 
 
 // PDF
 
-$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
 
-$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
 
-$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
 
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
 
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
 
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 
 $datelivraison = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), GETPOST('liv_sec', 'int'), GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 
 
@@ -142,7 +142,7 @@ $usercancreate	= ($user->hasRight("fournisseur", "commande", "creer") || $user->
 
 $usercandelete	= (($user->hasRight("fournisseur", "commande", "supprimer") || $user->hasRight("supplier_order", "supprimer")) || ($usercancreate && isset($object->statut) && $object->statut == $object::STATUS_DRAFT));
 
 
 // Advanced permissions
 
-$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("fournisseur", "supplier_order_advance", "validate")));
 
+$usercanvalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($usercancreate)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("fournisseur", "supplier_order_advance", "validate")));
 
 
 // Additional area permissions
 
 $usercanapprove			= $user->hasRight("fournisseur", "commande", "approuver");
 
@@ -163,7 +163,7 @@ $permissiontoadd	= $usercancreate; // Used by the include of actions_addupdatede
 
 // Project permission
 
 $caneditproject = false;
 
 if (isModEnabled('project')) {
 
-	$caneditproject = empty($conf->global->SUPPLIER_ORDER_FORBID_EDIT_PROJECT) || ($object->statut == CommandeFournisseur::STATUS_DRAFT && preg_match('/^[\(]?PROV/i', $object->ref));
 
+	$caneditproject = !getDolGlobalString('SUPPLIER_ORDER_FORBID_EDIT_PROJECT') || ($object->statut == CommandeFournisseur::STATUS_DRAFT && preg_match('/^[\(]?PROV/i', $object->ref));
 
 }
 
 
 $error = 0;
 
@@ -271,7 +271,7 @@ if (empty($reshook)) {
 
 	}
 
 
 	// Edit Thirdparty
 
-	if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && $action == 'set_thirdparty' && $usercancreate && $object->statut == CommandeFournisseur::STATUS_DRAFT) {
 
+	if (getDolGlobalString('MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER') && $action == 'set_thirdparty' && $usercancreate && $object->statut == CommandeFournisseur::STATUS_DRAFT) {
 
 		$new_socid = GETPOST('new_socid', 'int');
 
 		if (!empty($new_socid) && $new_socid != $object->thirdparty->id) {
 
 			$db->begin();
 
@@ -508,7 +508,7 @@ if (empty($reshook)) {
 
 				$res = $productsupplier->fetch($idprod); // Load product from its id
 
 				// Call to init some price properties of $productsupplier
 
 				// So if a supplier price already exists for another thirdparty (first one found), we use it as reference price
 
-				if (!empty($conf->global->SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER)) {
 
+				if (getDolGlobalString('SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER')) {
 
 					$fksoctosearch = 0;
 
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 
 					if ($productsupplier->fourn_socid != $socid) {	// The price we found is for another supplier, so we clear supplier price
 
@@ -529,7 +529,7 @@ if (empty($reshook)) {
 
 				$label = $productsupplier->label;
 
 
 				// Define output language
 
-				if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 
+				if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 
 					$outputlangs = $langs;
 
 					$newlang = '';
 
 					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -547,20 +547,20 @@ if (empty($reshook)) {
 
 					$desc = $productsupplier->description;
 
 				}
 
 				// if we use supplier description of the products
 
-				if (!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) {
 
+				if (!empty($productsupplier->desc_supplier) && getDolGlobalString('PRODUIT_FOURN_TEXTS')) {
 
 					$desc = $productsupplier->desc_supplier;
 
 				}
 
 
 				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
 
-				if (trim($product_desc) == trim($desc) && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
 
+				if (trim($product_desc) == trim($desc) && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
 
 					$product_desc='';
 
 				}
 
 
-				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) {
 
+				if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) {
 
 					$desc = $product_desc;
 
 				}
 
 				if (!empty($product_desc) && trim($product_desc) != trim($desc)) {
 
-					$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 
+					$desc = dol_concatdesc($desc, $product_desc, '', getDolGlobalString('MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION'));
 
 				}
 
 
 				$ref_supplier = $productsupplier->ref_supplier;
 
@@ -677,7 +677,7 @@ if (empty($reshook)) {
 
 			$ret = $object->fetch($object->id); // Reload to get new records
 
 
 			// Define output language
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 				$outputlangs = $langs;
 
 				$newlang = '';
 
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang)) {
 
@@ -755,7 +755,7 @@ if (empty($reshook)) {
 
 		}
 
 
 		$productsupplier = new ProductFournisseur($db);
 
-		if (!empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY)) {
 
+		if (getDolGlobalString('SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY')) {
 
 			if ($line->fk_product > 0 && $productsupplier->get_buyprice(0, price2num(GETPOST('qty', 'int')), $line->fk_product, 'none', GETPOST('socid', 'int')) < 0) {
 
 				setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
 
 			}
 
@@ -853,7 +853,7 @@ if (empty($reshook)) {
 
 
 		if ($result >= 0) {
 
 			// Define output language
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 				$outputlangs = $langs;
 
 				$newlang = '';
 
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -904,7 +904,7 @@ if (empty($reshook)) {
 
 				$outputlangs = new Translate("", $conf);
 
 				$outputlangs->setDefaultLang($newlang);
 
 			}
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 				$ret = $object->fetch($object->id); // Reload to get new records
 
 				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
 			}
 
@@ -943,7 +943,7 @@ if (empty($reshook)) {
 
 		$result = $object->valid($user);
 
 		if ($result >= 0) {
 
 			// Define output language
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 				$outputlangs = $langs;
 
 				$newlang = '';
 
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -971,7 +971,7 @@ if (empty($reshook)) {
 
 		}
 
 
 		// If we have permission, and if we don't need to provide the idwarehouse, we go directly on approved step
 
-		if (!$error && empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE) && $usercanapprove && !(!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $object->hasProductsOrServices(1))) {
 
+		if (!$error && !getDolGlobalString('SUPPLIER_ORDER_NO_DIRECT_APPROVE') && $usercanapprove && !(getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER') && $object->hasProductsOrServices(1))) {
 
 			$action = 'confirm_approve'; // can make standard or first level approval also if permission is set
 
 		}
 
 
@@ -988,14 +988,14 @@ if (empty($reshook)) {
 
 		$idwarehouse = GETPOST('idwarehouse', 'int');
 
 
 		$qualified_for_stock_change = 0;
 
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 
+		if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 
 			$qualified_for_stock_change = $object->hasProductsOrServices(2);
 
 		} else {
 
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 
 		}
 
 
 		// Check parameters
 
-		if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $qualified_for_stock_change) {	// warning name of option should be STOCK_CALCULATE_ON_SUPPLIER_APPROVE_ORDER
 
+		if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER') && $qualified_for_stock_change) {	// warning name of option should be STOCK_CALCULATE_ON_SUPPLIER_APPROVE_ORDER
 
 			if (!$idwarehouse || $idwarehouse == -1) {
 
 				$error++;
 
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 
@@ -1006,7 +1006,7 @@ if (empty($reshook)) {
 
 		if (!$error) {
 
 			$result = $object->approve($user, $idwarehouse, ($action == 'confirm_approve2' ? 1 : 0));
 
 			if ($result > 0) {
 
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 					$outputlangs = $langs;
 
 					$newlang = '';
 
 					if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -1067,7 +1067,7 @@ if (empty($reshook)) {
 
 
 		$result = $object->commande($user, GETPOST("datecommande"), GETPOST("methode", 'int'), GETPOST('comment', 'alphanohtml'));
 
 		if ($result > 0) {
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 				$outputlangs = $langs;
 
 				$newlang = '';
 
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -1512,7 +1512,7 @@ if (empty($reshook)) {
 
 		}
 
 	}
 
 
-	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate) {
 
+	if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB') && $usercancreate) {
 
 		if ($action == 'addcontact') {
 
 			if ($object->id > 0) {
 
 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
 
@@ -1634,7 +1634,7 @@ if ($action == 'create') {
 
 		$demand_reason_id = (!empty($objectsrc->demand_reason_id) ? $objectsrc->demand_reason_id : (!empty($soc->demand_reason_id) ? $soc->demand_reason_id : 0));
 
 		//$remise_percent		= (!empty($objectsrc->remise_percent) ? $objectsrc->remise_percent : (!empty($soc->remise_supplier_percent) ? $soc->remise_supplier_percent : 0));
 
 		//$remise_absolue		= (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));
 
-		$dateinvoice		= empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '';
 
+		$dateinvoice		= !getDolGlobalString('MAIN_AUTOFILL_DATE') ?-1 : '';
 
 
 		$datedelivery = (!empty($objectsrc->delivery_date) ? $objectsrc->delivery_date : '');
 
 
@@ -1642,7 +1642,7 @@ if ($action == 'create') {
 
 			if (!empty($objectsrc->multicurrency_code)) {
 
 				$currency_code = $objectsrc->multicurrency_code;
 
 			}
 
-			if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx)) {
 
+			if (getDolGlobalString('MULTICURRENCY_USE_ORIGIN_TX') && !empty($objectsrc->multicurrency_tx)) {
 
 				$currency_tx = $objectsrc->multicurrency_tx;
 
 			}
 
 		}
 
@@ -1665,10 +1665,10 @@ if ($action == 'create') {
 
 	}
 
 
 	// If not defined, set default value from constant
 
-	if (empty($cond_reglement_id) && !empty($conf->global->SUPPLIER_ORDER_DEFAULT_PAYMENT_TERM_ID)) {
 
+	if (empty($cond_reglement_id) && getDolGlobalString('SUPPLIER_ORDER_DEFAULT_PAYMENT_TERM_ID')) {
 
 		$cond_reglement_id = $conf->global->SUPPLIER_ORDER_DEFAULT_PAYMENT_TERM_ID;
 
 	}
 
-	if (empty($mode_reglement_id) && !empty($conf->global->SUPPLIER_ORDER_DEFAULT_PAYMENT_MODE_ID)) {
 
+	if (empty($mode_reglement_id) && getDolGlobalString('SUPPLIER_ORDER_DEFAULT_PAYMENT_MODE_ID')) {
 
 		$mode_reglement_id = $conf->global->SUPPLIER_ORDER_DEFAULT_PAYMENT_MODE_ID;
 
 	}
 
 
@@ -1712,7 +1712,7 @@ if ($action == 'create') {
 
 			$filter = '((s.fournisseur:=:1) AND (s.status:=:1))';
 
 			print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company((empty($socid) ? '' : $socid), 'socid', $filter, 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');
 
 			// reload page to retrieve customer informations
 
-			if (empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE_DISABLED)) {
 
+			if (!getDolGlobalString('RELOAD_PAGE_ON_SUPPLIER_CHANGE_DISABLED')) {
 
 				print '<script>
 
 				$(document).ready(function() {
 
 					$("#socid").change(function() {
 
@@ -1764,7 +1764,7 @@ if ($action == 'create') {
 
 		print '</td>';
 
 		print '<td>';
 
 		$usehourmin = 0;
 
-		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) {
 
+		if (getDolGlobalString('SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE')) {
 
 			$usehourmin = 1;
 
 		}
 
 		print img_picto('', 'action', 'class="pictofixedwidth"');
 
@@ -1772,7 +1772,7 @@ if ($action == 'create') {
 
 		print '</td></tr>';
 
 
 		// Bank Account
 
-		if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && isModEnabled("banque")) {
 
+		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER') && isModEnabled("banque")) {
 
 			$langs->load("bank");
 
 			print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
 
 			print img_picto('', 'bank_account', 'class="pictofixedwidth"');
 
@@ -1786,7 +1786,7 @@ if ($action == 'create') {
 
 
 			$langs->load('projects');
 
 			print '<tr><td>'.$langs->trans('Project').'</td><td>';
 
-			print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
 
+			print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects((!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
 
 			print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?action=create&status=1'.(!empty($societe->id) ? '&socid='.$societe->id : "").'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create'.(!empty($societe->id) ? '&socid='.$societe->id : "")).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 
 			print '</td></tr>';
 
 		}
 
@@ -1815,7 +1815,7 @@ if ($action == 'create') {
 
 
 		print '<tr><td>'.$langs->trans('NotePublic').'</td>';
 
 		print '<td>';
 
-		$doleditor = new DolEditor('note_public', isset($note_public) ? $note_public : GETPOST('note_public', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 
+		$doleditor = new DolEditor('note_public', isset($note_public) ? $note_public : GETPOST('note_public', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 
 		print $doleditor->Create(1);
 
 		print '</td>';
 
 		//print '<textarea name="note_public" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea>';
 
@@ -1823,7 +1823,7 @@ if ($action == 'create') {
 
 
 		print '<tr><td>'.$langs->trans('NotePrivate').'</td>';
 
 		print '<td>';
 
-		$doleditor = new DolEditor('note_private', isset($note_private) ? $note_private : GETPOST('note_private', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 
+		$doleditor = new DolEditor('note_private', isset($note_private) ? $note_private : GETPOST('note_private', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 
 		print $doleditor->Create(1);
 
 		print '</td>';
 
 		//print '<td><textarea name="note_private" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
 
@@ -1955,14 +1955,14 @@ if ($action == 'create') {
 
 	// Confirm approval
 
 	if ($action == 'approve' || $action == 'approve2') {
 
 		$qualified_for_stock_change = 0;
 
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 
+		if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 
 			$qualified_for_stock_change = $object->hasProductsOrServices(2);
 
 		} else {
 
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 
 		}
 
 
 		$formquestion = array();
 
-		if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $qualified_for_stock_change) {
 
+		if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER') && $qualified_for_stock_change) {
 
 			$langs->load("stocks");
 
 			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 
 			$formproduct = new FormProduct($db);
 
@@ -2055,7 +2055,7 @@ if ($action == 'create') {
 
 	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
 
 	// Thirdparty
 
 	$morehtmlref .= '<br>';
 
-	if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && !empty($usercancreate) && $action == 'edit_thirdparty') {
 
+	if (getDolGlobalString('MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER') && !empty($usercancreate) && $action == 'edit_thirdparty') {
 
 		$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
 
 		$morehtmlref .= '<input type="hidden" name="action" value="set_thirdparty">';
 
 		$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
 
@@ -2064,12 +2064,12 @@ if ($action == 'create') {
 
 		$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 
 		$morehtmlref .= '</form>';
 
 	}
 
-	if (empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) || $action != 'edit_thirdparty') {
 
-		if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && $object->statut == CommandeFournisseur::STATUS_DRAFT) {
 
+	if (!getDolGlobalString('MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER') || $action != 'edit_thirdparty') {
 
+		if (getDolGlobalString('MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER') && $object->statut == CommandeFournisseur::STATUS_DRAFT) {
 
 			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=edit_thirdparty&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetThirdParty')).'</a>';
 
 		}
 
 		$morehtmlref .= $object->thirdparty->getNomUrl(1, 'supplier');
 
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
 
+		if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
 
 		}
 
 	}
 
@@ -2083,7 +2083,7 @@ if ($action == 'create') {
 
 			if ($action != 'classify' && $caneditproject) {
 
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 
 			}
 
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
 		} else {
 
 			if (!empty($object->fk_project)) {
 
 				$proj = new Project($db);
 
@@ -2114,7 +2114,7 @@ if ($action == 'create') {
 
 		// Date
 
 		if ($object->methode_commande_id > 0) {
 
 			$usehourmin = 0;
 
-			if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) {
 
+			if (getDolGlobalString('SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE')) {
 
 				$usehourmin = 1;
 
 			}
 
 			print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>';
 
@@ -2135,7 +2135,7 @@ if ($action == 'create') {
 
 		print '</tr>';
 
 
 		// Relative and absolute discounts
 
-		if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
 
+		if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 
 			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 
 			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 
 		} else {
 
@@ -2245,7 +2245,7 @@ if ($action == 'create') {
 
 		}
 
 
 		// Bank Account
 
-		if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && isModEnabled("banque")) {
 
+		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER') && isModEnabled("banque")) {
 
 			print '<tr><td class="nowrap">';
 
 			print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
 
 			print $langs->trans('BankAccount');
 
@@ -2285,7 +2285,7 @@ if ($action == 'create') {
 
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 
 			print '<input type="hidden" name="action" value="setdate_livraison">';
 
 			$usehourmin = 0;
 
-			if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) {
 
+			if (getDolGlobalString('SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE')) {
 
 				$usehourmin = 1;
 
 			}
 
 			print $form->selectDate($object->delivery_date ? $object->delivery_date : -1, 'liv_', $usehourmin, $usehourmin, '', "setdate_livraison");
 
@@ -2293,7 +2293,7 @@ if ($action == 'create') {
 
 			print '</form>';
 
 		} else {
 
 			$usehourmin = 'day';
 
-			if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) {
 
+			if (getDolGlobalString('SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE')) {
 
 				$usehourmin = 'dayhour';
 
 			}
 
 			print $object->delivery_date ? dol_print_date($object->delivery_date, $usehourmin) : '&nbsp;';
 
@@ -2378,7 +2378,7 @@ if ($action == 'create') {
 
 		}
 
 
 		$alert = '';
 
-		if (!empty($conf->global->ORDER_MANAGE_MIN_AMOUNT) && $object->total_ht < $object->thirdparty->supplier_order_min_amount) {
 
+		if (getDolGlobalString('ORDER_MANAGE_MIN_AMOUNT') && $object->total_ht < $object->thirdparty->supplier_order_min_amount) {
 
 			$alert = ' ' . img_warning($langs->trans('OrderMinAmount') . ': ' . price($object->thirdparty->supplier_order_min_amount));
 
 		}
 
 
@@ -2405,13 +2405,13 @@ if ($action == 'create') {
 
 
 		print '<div class="clearboth"></div><br>';
 
 
-		if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 
+		if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 
 			$blocname = 'contacts';
 
 			$title = $langs->trans('ContactsAddresses');
 
 			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 
 		}
 
 
-		if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 
+		if (getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 
 			$blocname = 'notes';
 
 			$title = $langs->trans('Notes');
 
 			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 
@@ -2443,7 +2443,7 @@ if ($action == 'create') {
 
 		global $forceall, $senderissupplier, $dateSelector, $inputalsopricewithtax;
 
 		$forceall = 1; $dateSelector = 0; $inputalsopricewithtax = 1;
 
 		$senderissupplier = 2; // $senderissupplier=2 is same than 1 but disable test on minimum qty and disable autofill qty with minimum.
 
-		if (!empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY)) {
 
+		if (getDolGlobalString('SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY')) {
 
 			$senderissupplier = 1;
 
 		}
 
 
@@ -2491,7 +2491,7 @@ if ($action == 'create') {
 
 				if ($object->statut == 0 && $num > 0) {
 
 					if ($usercanvalidate) {
 
 						$tmpbuttonlabel = $langs->trans('Validate');
 
-						if ($usercanapprove && empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE)) {
 
+						if ($usercanapprove && !getDolGlobalString('SUPPLIER_ORDER_NO_DIRECT_APPROVE')) {
 
 							$tmpbuttonlabel = $langs->trans("ValidateAndApprove");
 
 						}
 
 
@@ -2516,7 +2516,7 @@ if ($action == 'create') {
 
 				// Approve
 
 				if ($object->statut == CommandeFournisseur::STATUS_VALIDATED) {
 
 					if ($usercanapprove) {
 
-						if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED && !empty($object->user_approve_id)) {
 
+						if (getDolGlobalString('SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED') && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED && !empty($object->user_approve_id)) {
 
 							print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("FirstApprovalAlreadyDone")).'">'.$langs->trans("ApproveOrder").'</a>';
 
 						} else {
 
 							print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=approve">'.$langs->trans("ApproveOrder").'</a>';
 
@@ -2527,7 +2527,7 @@ if ($action == 'create') {
 
 				}
 
 
 				// Second approval (if option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set)
 
-				if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) {
 
+				if (getDolGlobalString('SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED') && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) {
 
 					if ($object->statut == CommandeFournisseur::STATUS_VALIDATED) {
 
 						if ($usercanapprovesecond) {
 
 							if (!empty($object->user_approve_id2)) {
 
@@ -2552,7 +2552,7 @@ if ($action == 'create') {
 
 
 				// Send
 
 				if (empty($user->socid)) {
 
-					if (in_array($object->statut, array(CommandeFournisseur::STATUS_ACCEPTED, 3, 4, 5)) || !empty($conf->global->SUPPLIER_ORDER_SENDBYEMAIL_FOR_ALL_STATUS)) {
 
+					if (in_array($object->statut, array(CommandeFournisseur::STATUS_ACCEPTED, 3, 4, 5)) || getDolGlobalString('SUPPLIER_ORDER_SENDBYEMAIL_FOR_ALL_STATUS')) {
 
 						if ($usercanorder) {
 
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
 
 						}
 
@@ -2563,15 +2563,15 @@ if ($action == 'create') {
 
 				if (in_array($object->statut, array(CommandeFournisseur::STATUS_ACCEPTED))) {
 
 					$buttonshown = 0;
 
 					if (!$buttonshown && $usercanapprove) {
 
-						if (empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY)
 
-							|| (!empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY) && $user->id == $object->user_approve_id)) {
 
+						if (!getDolGlobalString('SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY')
 
+							|| (getDolGlobalString('SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY') && $user->id == $object->user_approve_id)) {
 
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Disapprove").'</a>';
 
 							$buttonshown++;
 
 						}
 
 					}
 
-					if (!$buttonshown && $usercanapprovesecond && !empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)) {
 
-						if (empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY)
 
-							|| (!empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY) && $user->id == $object->user_approve_id2)) {
 
+					if (!$buttonshown && $usercanapprovesecond && getDolGlobalString('SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED')) {
 
+						if (!getDolGlobalString('SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY')
 
+							|| (getDolGlobalString('SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY') && $user->id == $object->user_approve_id2)) {
 
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Disapprove").'</a>';
 
 						}
 
 					}
 
@@ -2584,7 +2584,7 @@ if ($action == 'create') {
 
 
 				// Ship
 
 				$hasreception = 0;
 
-				if (isModEnabled('stock') && (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))) {
 
+				if (isModEnabled('stock') && (getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER') || getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION') || getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION_CLOSE'))) {
 
 					$labelofbutton = $langs->trans('ReceiveProducts');
 
 					if ($conf->reception->enabled) {
 
 						$labelofbutton = $langs->trans("CreateReception");
 
@@ -2726,7 +2726,7 @@ if ($action == 'create') {
 
 			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 
 			$genallowed = $usercanread;
 
 			$delallowed = $usercancreate;
 
-			$modelpdf = (!empty($object->model_pdf) ? $object->model_pdf : (empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF) ? '' : $conf->global->COMMANDE_SUPPLIER_ADDON_PDF));
 
+			$modelpdf = (!empty($object->model_pdf) ? $object->model_pdf : (!getDolGlobalString('COMMANDE_SUPPLIER_ADDON_PDF') ? '' : $conf->global->COMMANDE_SUPPLIER_ADDON_PDF));
 
 
 			print $formfile->showdocuments('commande_fournisseur', $objref, $filedir, $urlsource, $genallowed, $delallowed, $modelpdf, 1, 0, 0, 0, 0, '', '', '', $object->thirdparty->default_lang, '', $object);
 
 			$somethingshown = $formfile->numoffiles;

+ 1 - 1
htdocs/fourn/commande/contact.php
View File 

@@ -148,7 +148,7 @@ if ($id > 0 || !empty($ref)) {
 
 				if ($action != 'classify' && $caneditproject) {
 
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 
 				}
 
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
 			} else {
 
 				if (!empty($object->fk_project)) {
 
 					$proj = new Project($db);

+ 37 - 37
htdocs/fourn/commande/dispatch.php
View File 

@@ -87,10 +87,10 @@ if ($id > 0 || !empty($ref)) {
 
 
 if (empty($conf->reception->enabled)) {
 
 	$permissiontoreceive = $user->hasRight("fournisseur", "commande", "receptionner");
 
-	$permissiontocontrol = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("fournisseur", "commande", "receptionner")) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("fournisseur", "commande_advance", "check")));
 
+	$permissiontocontrol = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("fournisseur", "commande", "receptionner")) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("fournisseur", "commande_advance", "check")));
 
 } else {
 
 	$permissiontoreceive = $user->hasRight("reception", "creer");
 
-	$permissiontocontrol = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("reception", "creer")) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("reception", "reception_advance", "validate")));
 
+	$permissiontocontrol = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("reception", "creer")) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("reception", "reception_advance", "validate")));
 
 }
 
 
 // $id is id of a purchase order.
 
@@ -247,7 +247,7 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 
 			$pu = "pu_".$reg[1].'_'.$reg[2]; // This is unit price including discount
 
 			$fk_commandefourndet = "fk_commandefourndet_".$reg[1].'_'.$reg[2];
 
 
-			if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
 
+			if (getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 
 				if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 
 					$dto = GETPOST("dto_".$reg[1].'_'.$reg[2], 'int');
 
 					if (!empty($dto)) {
 
@@ -273,7 +273,7 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 
 						$error++;
 
 					}
 
 
-					if (!$error && !empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
 
+					if (!$error && getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 
 						if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 
 							$dto = price2num(GETPOST("dto_".$reg[1].'_'.$reg[2], 'int'), '');
 
 							if (empty($dto)) {
 
@@ -315,7 +315,7 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 
 
 			$fk_commandefourndet = 'fk_commandefourndet_'.$reg[1].'_'.$reg[2];
 
 
-			if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
 
+			if (getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 
 				if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 
 					$dto = GETPOST("dto_".$reg[1].'_'.$reg[2], 'int');
 
 					if (!empty($dto)) {
 
@@ -348,7 +348,7 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 
 						$error++;
 
 					}
 
 
-					if (!$error && !empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
 
+					if (!$error && getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 
 						if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 
 							$dto = GETPOST("dto_".$reg[1].'_'.$reg[2], 'int');
 
 							//update supplier price
 
@@ -413,7 +413,7 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && $permissiontoreceive
 
 		$error++;
 
 	} else {
 
 		// If module stock is enabled and the stock increase is done on purchase order dispatching
 
-		if ($entrepot > 0 && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) && empty($supplierorderdispatch->fk_reception)) {
 
+		if ($entrepot > 0 && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER') && empty($supplierorderdispatch->fk_reception)) {
 
 			$mouv = new MouvementStock($db);
 
 			if ($product > 0) {
 
 				$mouv->origin = &$object;
 
@@ -460,7 +460,7 @@ if ($action == 'updateline' && $permissiontoreceive) {
 
 		$errors = $supplierorderdispatch->errors;
 
 	} else {
 
 		// If module stock is enabled and the stock increase is done on purchase order dispatching
 
-		if ($entrepot > 0 && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
 
+		if ($entrepot > 0 && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER')) {
 
 			$mouv = new MouvementStock($db);
 
 			if ($product > 0) {
 
 				$mouv->origin = &$object;
 
@@ -557,7 +557,7 @@ if ($id > 0 || !empty($ref)) {
 
 			if ($action != 'classify' && $caneditproject) {
 
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 
 			}
 
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
 		} else {
 
 			if (!empty($object->fk_project)) {
 
 				$proj = new Project($db);
 
@@ -692,7 +692,7 @@ if ($id > 0 || !empty($ref)) {
 
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as l";
 
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product=p.rowid";
 
 		$sql .= " WHERE l.fk_commande = ".((int) $object->id);
 
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 
+		if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 
 			$sql .= " AND l.product_type = 0";
 
 		}
 
 
@@ -723,10 +723,10 @@ if ($id > 0 || !empty($ref)) {
 
 				print '<td>'.$langs->trans("Description").'</td>';
 
 				if (isModEnabled('productbatch')) {
 
 					print '<td class="dispatch_batch_number_title">'.$langs->trans("batch_number").'</td>';
 
-					if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 
+					if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 
 						print '<td class="dispatch_dlc_title">'.$langs->trans("SellByDate").'</td>';
 
 					}
 
-					if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 
+					if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 
 						print '<td class="dispatch_dluo_title">'.$langs->trans("EatByDate").'</td>';
 
 					}
 
 				} else {
 
@@ -741,7 +741,7 @@ if ($id > 0 || !empty($ref)) {
 
 				print '<br><a href="#" id="autoreset">'.img_picto($langs->trans("Reset"), 'eraser', 'class="pictofixedwidth opacitymedium"').$langs->trans("Reset").'</a></td>';
 
 				print '<td width="32"></td>';
 
 
-				if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
 
+				if (getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 
 					if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 
 						print '<td class="right">'.$langs->trans("Price").'</td>';
 
 						print '<td class="right">'.$langs->trans("ReductionShort").' (%)</td>';
 
@@ -792,11 +792,11 @@ if ($id > 0 || !empty($ref)) {
 
 				} else {
 
 					$alreadydispatched = isset($products_dispatched[$objp->rowid])?$products_dispatched[$objp->rowid]:0;
 
 					$remaintodispatch = price2num($objp->qty - ((float) $alreadydispatched), 5); // Calculation of dispatched
 
-					if ($remaintodispatch < 0 && empty($conf->global->SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN)) {
 
+					if ($remaintodispatch < 0 && !getDolGlobalString('SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN')) {
 
 						$remaintodispatch = 0;
 
 					}
 
 
-					if ($remaintodispatch || empty($conf->global->SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED)) {
 
+					if ($remaintodispatch || !getDolGlobalString('SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED')) {
 
 						$nbproduct++;
 
 
 						// To show detail cref and description value, we must make calculation by cref
 
@@ -829,10 +829,10 @@ if ($id > 0 || !empty($ref)) {
 
 								print $linktoprod;
 
 								print "</td>";
 
 								print '<td class="dispatch_batch_number"></td>';
 
-								if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 
+								if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 
 									print '<td class="dispatch_dlc"></td>';
 
 								}
 
-								if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 
+								if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 
 									print '<td class="dispatch_dluo"></td>';
 
 								}
 
 							} else {
 
@@ -843,10 +843,10 @@ if ($id > 0 || !empty($ref)) {
 
 								print '<td class="dispatch_batch_number">';
 
 								print '<span class="opacitymedium small">'.$langs->trans("ProductDoesNotUseBatchSerial").'</small>';
 
 								print '</td>';
 
-								if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 
+								if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 
 									print '<td class="dispatch_dlc"></td>';
 
 								}
 
-								if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 
+								if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 
 									print '<td class="dispatch_dluo"></td>';
 
 								}
 
 							}
 
@@ -858,7 +858,7 @@ if ($id > 0 || !empty($ref)) {
 
 
 						// Define unit price for PMP calculation
 
 						$up_ht_disc = $objp->subprice;
 
-						if (!empty($objp->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) {
 
+						if (!empty($objp->remise_percent) && !getDolGlobalString('STOCK_EXCLUDE_DISCOUNT_FOR_PMP')) {
 
 							$up_ht_disc = price2num($up_ht_disc * (100 - $objp->remise_percent) / 100, 'MU');
 
 						}
 
 
@@ -907,7 +907,7 @@ if ($id > 0 || !empty($ref)) {
 
 							print '<input name="product_batch'.$suffix.'" type="hidden" value="'.$objp->fk_product.'">';
 
 
 							print '<!-- This is a up (may include discount or not depending on STOCK_EXCLUDE_DISCOUNT_FOR_PMP. will be used for PMP calculation) -->';
 
-							if (!empty($conf->global->SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT)) { // Not tested !
 
+							if (getDolGlobalString('SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT')) { // Not tested !
 
 								print $langs->trans("BuyingPrice").': <input class="maxwidth75" name="pu'.$suffix.'" type="text" value="'.price2num($up_ht_disc, 'MU').'">';
 
 							} else {
 
 								print '<input class="maxwidth75" name="pu'.$suffix.'" type="hidden" value="'.price2num($up_ht_disc, 'MU').'">';
 
@@ -918,13 +918,13 @@ if ($id > 0 || !empty($ref)) {
 
 							print '<td>';
 
 							print '<input type="text" class="inputlotnumber quatrevingtquinzepercent" id="lot_number'.$suffix.'" name="lot_number'.$suffix.'" value="'.GETPOST('lot_number'.$suffix).'">';
 
 							print '</td>';
 
-							if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 
+							if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 
 								print '<td class="nowraponall">';
 
 								$dlcdatesuffix = dol_mktime(0, 0, 0, GETPOST('dlc'.$suffix.'month'), GETPOST('dlc'.$suffix.'day'), GETPOST('dlc'.$suffix.'year'));
 
 								print $form->selectDate($dlcdatesuffix, 'dlc'.$suffix, '', '', 1, '');
 
 								print '</td>';
 
 							}
 
-							if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 
+							if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 
 								print '<td class="nowraponall">';
 
 								$dluodatesuffix = dol_mktime(0, 0, 0, GETPOST('dluo'.$suffix.'month'), GETPOST('dluo'.$suffix.'day'), GETPOST('dluo'.$suffix.'year'));
 
 								print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, '', '', 1, '');
 
@@ -934,8 +934,8 @@ if ($id > 0 || !empty($ref)) {
 
 						} else {
 
 							$type = 'dispatch';
 
 							$colspan = 7;
 
-							$colspan = (!empty($conf->global->PRODUCT_DISABLE_SELLBY)) ? --$colspan : $colspan;
 
-							$colspan = (!empty($conf->global->PRODUCT_DISABLE_EATBY)) ? --$colspan : $colspan;
 
+							$colspan = (getDolGlobalString('PRODUCT_DISABLE_SELLBY')) ? --$colspan : $colspan;
 
+							$colspan = (getDolGlobalString('PRODUCT_DISABLE_EATBY')) ? --$colspan : $colspan;
 
 							print '<td class="right">';
 
 							print '</td>'; // Qty to dispatch
 
 							print '<td>';
 
@@ -970,7 +970,7 @@ if ($id > 0 || !empty($ref)) {
 
 							print '<input name="product'.$suffix.'" type="hidden" value="'.$objp->fk_product.'">';
 
 
 							print '<!-- This is a up (may include discount or not depending on STOCK_EXCLUDE_DISCOUNT_FOR_PMP. will be used for PMP calculation) -->';
 
-							if (!empty($conf->global->SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT)) { // Not tested !
 
+							if (getDolGlobalString('SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT')) { // Not tested !
 
 								print $langs->trans("BuyingPrice").': <input class="maxwidth75" name="pu'.$suffix.'" type="text" value="'.price2num($up_ht_disc, 'MU').'">';
 
 							} else {
 
 								print '<input class="maxwidth75" name="pu'.$suffix.'" type="hidden" value="'.price2num($up_ht_disc, 'MU').'">';
 
@@ -982,7 +982,7 @@ if ($id > 0 || !empty($ref)) {
 
 						// Qty to dispatch
 
 						print '<td class="right">';
 
 						print '<a href="#" id="reset'.$suffix.'" class="resetline">'.img_picto($langs->trans("Reset"), 'eraser', 'class="pictofixedwidth opacitymedium"').'</a>';
 
-						print '<input id="qty'.$suffix.'" name="qty'.$suffix.'" type="text" class="width50 right qtydispatchinput" value="'.(GETPOSTISSET('qty'.$suffix) ? GETPOST('qty'.$suffix, 'int') : (empty($conf->global->SUPPLIER_ORDER_DISPATCH_FORCE_QTY_INPUT_TO_ZERO) ? $remaintodispatch : 0)).'">';
 
+						print '<input id="qty'.$suffix.'" name="qty'.$suffix.'" type="text" class="width50 right qtydispatchinput" value="'.(GETPOSTISSET('qty'.$suffix) ? GETPOST('qty'.$suffix, 'int') : (!getDolGlobalString('SUPPLIER_ORDER_DISPATCH_FORCE_QTY_INPUT_TO_ZERO') ? $remaintodispatch : 0)).'">';
 
 						print '</td>';
 
 
 						print '<td>';
 
@@ -995,7 +995,7 @@ if ($id > 0 || !empty($ref)) {
 
 						}
 
 						print '</td>';
 
 
-						if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
 
+						if (getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 
 							if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 
 								// Price
 
 								print '<td class="right">';
 
@@ -1099,7 +1099,7 @@ if ($id > 0 || !empty($ref)) {
 
 		// Message if nothing to dispatch
 
 		if (!$nbproduct) {
 
 			print "<br>\n";
 
-			if (empty($conf->global->SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED)) {
 
+			if (!getDolGlobalString('SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED')) {
 
 				print '<div class="opacitymedium">'.$langs->trans("NoPredefinedProductToDispatch").'</div>'; // No predefined line at all
 
 			} else {
 
 				print '<div class="opacitymedium">'.$langs->trans("NoMorePredefinedProductToDispatch").'</div>'; // No predefined line that remain to be dispatched.
 
@@ -1189,10 +1189,10 @@ if ($id > 0 || !empty($ref)) {
 
 			print '<td class="center">'.$langs->trans("DateDeliveryPlanned").'</td>';
 
 			if (isModEnabled('productbatch')) {
 
 				print '<td class="dispatch_batch_number_title">'.$langs->trans("batch_number").'</td>';
 
-				if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 
+				if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 
 					print '<td class="dispatch_dlc_title">'.$langs->trans("SellByDate").'</td>';
 
 				}
 
-				if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 
+				if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 
 					print '<td class="dispatch_dluo_title">'.$langs->trans("EatByDate").'</td>';
 
 				}
 
 			}
 
@@ -1201,7 +1201,7 @@ if ($id > 0 || !empty($ref)) {
 
 			print '<td>'.$langs->trans("Comment").'</td>';
 
 
 			// Status
 
-			if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS) && empty($reception->rowid)) {
 
+			if (getDolGlobalString('SUPPLIER_ORDER_USE_DISPATCH_STATUS') && empty($reception->rowid)) {
 
 				print '<td class="center" colspan="2">'.$langs->trans("Status").'</td>';
 
 			} elseif (isModEnabled("reception")) {
 
 				print '<td class="center"></td>';
 
@@ -1263,18 +1263,18 @@ if ($id > 0 || !empty($ref)) {
 
 						$lot = new Productlot($db);
 
 						$lot->fetch(0, $objp->pid, $objp->batch);
 
 						print '<td class="dispatch_batch_number">'.$lot->getNomUrl(1).'</td>';
 
-						if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 
+						if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 
 							print '<td class="dispatch_dlc">'.dol_print_date($lot->sellby, 'day').'</td>';
 
 						}
 
-						if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 
+						if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 
 							print '<td class="dispatch_dluo">'.dol_print_date($lot->eatby, 'day').'</td>';
 
 						}
 
 					} else {
 
 						print '<td class="dispatch_batch_number"></td>';
 
-						if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 
+						if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 
 							print '<td class="dispatch_dlc"></td>';
 
 						}
 
-						if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 
+						if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 
 							print '<td class="dispatch_dluo"></td>';
 
 						}
 
 					}
 
@@ -1312,7 +1312,7 @@ if ($id > 0 || !empty($ref)) {
 
 				print '<td class="tdoverflowmax300" style="white-space: pre;">'.$objp->comment.'</td>';
 
 
 				// Status
 
-				if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS) && empty($reception->rowid)) {
 
+				if (getDolGlobalString('SUPPLIER_ORDER_USE_DISPATCH_STATUS') && empty($reception->rowid)) {
 
 					print '<td class="right">';
 
 					$supplierorderdispatch->status = (empty($objp->status) ? 0 : $objp->status);
 
 					// print $supplierorderdispatch->status;

+ 1 - 1
htdocs/fourn/commande/document.php
View File 

@@ -140,7 +140,7 @@ if ($object->id > 0) {
 
 			if ($action != 'classify' && $caneditproject) {
 
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 
 			}
 
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
 		} else {
 
 			if (!empty($object->fk_project)) {
 
 				$proj = new Project($db);

+ 2 - 2
htdocs/fourn/commande/index.php
View File 

@@ -224,12 +224,12 @@ if (isModEnabled("supplier_order")) {
 
  */
 
 
 $sql = "SELECT";
 
-if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 
+if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 
 	$sql .= " DISTINCT";
 
 }
 
 $sql .= " u.rowid, u.lastname, u.firstname, u.email, u.statut";
 
 $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 
-if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 
+if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 
 	$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
 
 	$sql .= " WHERE ((ug.fk_user = u.rowid";
 
 	$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";

+ 3 - 3
htdocs/fourn/commande/info.php
View File 

@@ -66,7 +66,7 @@ if (GETPOST('actioncode', 'array')) {
 
 		$actioncode = '0';
 
 	}
 
 } else {
 
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS));
 
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (!getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS') ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS));
 
 }
 
 $search_rowid = GETPOST('search_rowid');
 
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -121,7 +121,7 @@ if ($id > 0 || !empty($ref)) {
 
 }
 
 
 $title = $object->ref.' - '.$langs->trans('Info').' - '.$object->ref.' '.$object->name;
 
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
 
 }
 
 $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
 
@@ -154,7 +154,7 @@ if (isModEnabled('project')) {
 
 		if ($action != 'classify' && $caneditproject) {
 
 			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 
 		}
 
-		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
+		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
 	} else {
 
 		if (!empty($object->fk_project)) {
 
 			$proj = new Project($db);

+ 4 - 4
htdocs/fourn/commande/list.php
View File 

@@ -343,7 +343,7 @@ if (empty($reshook)) {
 
 						$result = $objecttmp->valid($user);
 
 						if ($result >= 0) {
 
 							// If we have permission, and if we don't need to provide the idwarehouse, we go directly on approved step
 
-							if (empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE) && $permissiontoapprove && !(!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $objecttmp->hasProductsOrServices(1))) {
 
+							if (!getDolGlobalString('SUPPLIER_ORDER_NO_DIRECT_APPROVE') && $permissiontoapprove && !(getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER') && $objecttmp->hasProductsOrServices(1))) {
 
 								$result = $objecttmp->approve($user);
 
 								setEventMessages($langs->trans("SupplierOrderValidatedAndApproved"), array($objecttmp->ref));
 
 							} else {
 
@@ -1009,7 +1009,7 @@ if ($resql) {
 
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
 
-	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
 
+	if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $sall) {
 
 		$obj = $db->fetch_object($resql);
 
 		$id = $obj->rowid;
 
 		header("Location: ".DOL_URL_ROOT.'/fourn/commande/card.php?id='.$id);
 
@@ -1185,7 +1185,7 @@ if ($resql) {
 
 	);
 
 
 	if ($permissiontovalidate) {
 
-		if ($permissiontoapprove && empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE)) {
 
+		if ($permissiontoapprove && !getDolGlobalString('SUPPLIER_ORDER_NO_DIRECT_APPROVE')) {
 
 			$arrayofmassactions['prevalidate'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("ValidateAndApprove");
 
 		} else {
 
 			$arrayofmassactions['prevalidate'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate");
 
@@ -1400,7 +1400,7 @@ if ($resql) {
 
 	// Company type
 
 	if (!empty($arrayfields['typent.code']['checked'])) {
 
 		print '<td class="liste_titre maxwidthonsmartphone center">';
 
-		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 
+		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 
 		print '</td>';
 
 	}
 
 	// Date order

+ 1 - 1
htdocs/fourn/commande/note.php
View File 

@@ -122,7 +122,7 @@ if ($id > 0 || !empty($ref)) {
 
 				if ($action != 'classify' && $caneditproject) {
 
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 
 				}
 
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
 			} else {
 
 				if (!empty($object->fk_project)) {
 
 					$proj = new Project($db);

+ 1 - 1
htdocs/fourn/contact.php
View File 

@@ -105,7 +105,7 @@ $result = $db->query($sql);
 
 if ($result) {
 
 	$num = $db->num_rows($result);
 
 
-	$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
 
+	$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
 
 	print_barre_liste($title." (".$langs->trans("Suppliers").")", $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num);
 
 
 	print '<table class="liste centpercent">';

+ 13 - 13
htdocs/fourn/facture/card-rec.php
View File 

@@ -114,10 +114,10 @@ $permissiontoedit = $user->hasRight("fournisseur", "facture", "creer") || $user-
 
 $usercanread = $user->hasRight("fournisseur", "facture", "lire") || $user->hasRight("supplier_invoice", "lire");
 
 $usercancreate = $user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer");
 
 $usercandelete = $user->hasRight("fournisseur", "facture", "supprimer") || $user->hasRight("supplier_invoice", "supprimer");
 
-$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("fournisseur", "supplier_invoice_advance", "validate")));
 
-$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->hasRight("fournisseur", "supplier_invoice_advance", "send"));
 
+$usercanvalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($usercancreate)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("fournisseur", "supplier_invoice_advance", "validate")));
 
+$usercansend = (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight("fournisseur", "supplier_invoice_advance", "send"));
 
 
-$usercanproductignorepricemin = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight("produit", "ignore_price_min_advance")) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
 
+$usercanproductignorepricemin = ((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight("produit", "ignore_price_min_advance")) || !getDolGlobalString('MAIN_USE_ADVANCED_PERMS'));
 
 $usercancreatemargin = $user->hasRight("margins", "creer");
 
 $usercanreadallmargin = $user->hasRight("margins", "liretous");
 
 $usercancreatewithdrarequest = $user->hasRight("prelevement", "bons", "creer");
 
@@ -492,7 +492,7 @@ if (empty($reshook)) {
 
 				$res = $productsupplier->fetch($idprod); // Load product from its id
 
 				// Call to init some price properties of $productsupplier
 
 				// So if a supplier price already exists for another thirdparty (first one found), we use it as reference price
 
-				if (!empty($conf->global->SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER)) {
 
+				if (getDolGlobalString('SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER')) {
 
 					$fksoctosearch = 0;
 
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 
 					if ($productsupplier->fourn_socid != $socid) {    // The price we found is for another supplier, so we clear supplier price
 
@@ -577,7 +577,7 @@ if (empty($reshook)) {
 
 				$desc = '';
 
 
 				// Define output language
 
-				if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 
+				if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 
 					$outputlangs = $langs;
 
 					$newlang = '';
 
 					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -599,10 +599,10 @@ if (empty($reshook)) {
 
 				$desc = dol_concatdesc($desc, $product_desc);
 
 
 				// Add custom code and origin country into description
 
-				if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (!empty($prod->customcode) || !empty($prod->country_code))) {
 
+				if (!getDolGlobalString('MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE') && (!empty($prod->customcode) || !empty($prod->country_code))) {
 
 					$tmptxt = '(';
 
 					// Define output language
 
-					if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 
+					if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 
 						$outputlangs = $langs;
 
 						$newlang = '';
 
 						if (empty($newlang) && GETPOST('lang_id', 'alpha')) {
 
@@ -793,14 +793,14 @@ if (empty($reshook)) {
 
 			$type = $product->type;
 
 
 			$price_min = $product->price_min;
 
-			if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($object->thirdparty->price_level)) {
 
+			if (getDolGlobalString('PRODUIT_MULTIPRICES') && !empty($object->thirdparty->price_level)) {
 
 				$price_min = $product->multiprices_min[$object->thirdparty->price_level];
 
 			}
 
 
 			$label = $product->label;
 
 
 			// Check price is not lower than minimum (check is done only for standard or replacement invoices)
 
-			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight("produit", "ignore_price_min_advance")) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && $price_min && (price2num($pu_ht) * (1 - $remise_percent / 100) < price2num($price_min))) {
 
+			if (((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight("produit", "ignore_price_min_advance")) || !getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) && $price_min && (price2num($pu_ht) * (1 - $remise_percent / 100) < price2num($price_min))) {
 
 				setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency)), null, 'errors');
 
 				$error++;
 
 			}
 
@@ -965,7 +965,7 @@ if ($action == 'create') {
 
 		print $form->textwithpicto($langs->trans('NotePublic'), $htmltext, 1, 'help', '', 0, 2, 'notepublic');
 
 		print '</td>';
 
 		print '<td>';
 
-		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 
+		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 
 		print $doleditor->Create(1);
 
 
 		// Private note
 
@@ -975,7 +975,7 @@ if ($action == 'create') {
 
 			print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext, 1, 'help', '', 0, 2, 'noteprivate');
 
 			print '</td>';
 
 			print '<td>';
 
-			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 
+			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 
 			print $doleditor->Create(1);
 
 			print '</td></tr>';
 
 		}
 
@@ -1054,7 +1054,7 @@ if ($action == 'create') {
 
 		print "</td></tr>";
 
 
 		// Auto generate document
 
-		if (!empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION)) {
 
+		if (getDolGlobalString('INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION')) {
 
 			print "<tr><td>" . $langs->trans("StatusOfAutoGeneratedDocuments") . "</td><td>";
 
 			$select = array('0' => $langs->trans('DoNotGenerateDoc'), '1' => $langs->trans('AutoGenerateDoc'));
 
 			print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf'));
 
@@ -1488,7 +1488,7 @@ if ($action == 'create') {
 
 		}
 
 		print '</td>';
 
 		// Auto generate documents
 
-		if (!empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION)) {
 
+		if (getDolGlobalString('INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION')) {
 
 			print '<tr>';
 
 			print '<td>';
 
 			if ($action == 'generate_pdf' || $object->frequency > 0) {

+ 74 - 74
htdocs/fourn/facture/card.php
View File 

@@ -86,9 +86,9 @@ $fac_recid = GETPOST('fac_rec', 'int');
 
 $rank = (GETPOST('rank', 'int') > 0) ? GETPOST('rank', 'int') : -1;
 
 
 // PDF
 
-$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
 
-$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
 
-$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
 
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
 
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
 
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 
 $hookmanager->initHooks(array('invoicesuppliercard', 'globalcard'));
 
@@ -127,8 +127,8 @@ $usercandelete = ($user->hasRight("fournisseur", "facture", "supprimer") || $use
 
 $usercancreatecontract = $user->hasRight("contrat", "creer");
 
 
 // Advanced permissions
 
-$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("fournisseur", "supplier_invoice_advance", "validate")));
 
-$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->hasRight("fournisseur", "supplier_invoice_advance", "send"));
 
+$usercanvalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($usercancreate)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("fournisseur", "supplier_invoice_advance", "validate")));
 
+$usercansend = (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight("fournisseur", "supplier_invoice_advance", "send"));
 
 
 // Permissions for includes
 
 $permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php
 
@@ -211,14 +211,14 @@ if (empty($reshook)) {
 
 		$object->fetch_thirdparty();
 
 
 		$qualified_for_stock_change = 0;
 
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 
+		if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 
 			$qualified_for_stock_change = $object->hasProductsOrServices(2);
 
 		} else {
 
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 
 		}
 
 
 		// Check parameters
 
-		if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change) {
 
+		if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_BILL') && $qualified_for_stock_change) {
 
 			$langs->load("stocks");
 
 			if (!$idwarehouse || $idwarehouse == -1) {
 
 				$error++;
 
@@ -239,7 +239,7 @@ if (empty($reshook)) {
 
 				$db->commit();
 
 
 				// Define output language
 
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 					$outputlangs = $langs;
 
 					$newlang = '';
 
 					if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -275,14 +275,14 @@ if (empty($reshook)) {
 
 				$idwarehouse = GETPOST('idwarehouse');
 
 
 				$qualified_for_stock_change = 0;
 
-				if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 
+				if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 
 					$qualified_for_stock_change = $object->hasProductsOrServices(2);
 
 				} else {
 
 					$qualified_for_stock_change = $object->hasProductsOrServices(1);
 
 				}
 
 
 				// Check parameters
 
-				if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change) {
 
+				if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_BILL') && $qualified_for_stock_change) {
 
 					$langs->load("stocks");
 
 					if (!$idwarehouse || $idwarehouse == -1) {
 
 						$error++;
 
@@ -395,7 +395,7 @@ if (empty($reshook)) {
 
 				$outputlangs = new Translate("", $conf);
 
 				$outputlangs->setDefaultLang($newlang);
 
 			}
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 				$ret = $object->fetch($object->id); // Reload to get new records
 
 				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
 			}
 
@@ -475,8 +475,8 @@ if (empty($reshook)) {
 
 		}
 
 	} elseif ($action == 'setdatef' && $usercancreate) {
 
 		$newdate = dol_mktime(0, 0, 0, GETPOST('datefmonth', 'int'), GETPOST('datefday', 'int'), GETPOST('datefyear', 'int'), 'tzserver');
 
-		if ($newdate > (dol_now('tzuserrel') + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 
-			if (empty($conf->global->INVOICE_MAX_FUTURE_DELAY)) {
 
+		if ($newdate > (dol_now('tzuserrel') + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 
+			if (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY')) {
 
 				setEventMessages($langs->trans("WarningInvoiceDateInFuture"), null, 'warnings');
 
 			} else {
 
 				setEventMessages($langs->trans("WarningInvoiceDateTooFarInFuture"), null, 'warnings');
 
@@ -544,7 +544,7 @@ if (empty($reshook)) {
 
 			}
 
 		}
 
 
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+		if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 			$outputlangs = $langs;
 
 			$newlang = '';
 
 			if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -604,7 +604,7 @@ if (empty($reshook)) {
 
 			}
 
 
 			// If some payments were already done, we change the amount to pay using same prorate
 
-			if (!empty($conf->global->SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED) && $object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
 
+			if (getDolGlobalString('SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED') && $object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
 
 				$alreadypaid = $object->getSommePaiement(); // This can be not 0 if we allow to create credit to reuse from credit notes partially refunded.
 
 				if ($alreadypaid && abs($alreadypaid) < abs($object->total_ttc)) {
 
 					$ratio = abs(($object->total_ttc - $alreadypaid) / $object->total_ttc);
 
@@ -780,7 +780,7 @@ if (empty($reshook)) {
 
 				$action = 'create';
 
 				$_GET['socid'] = $_POST['socid'];
 
 				$error++;
 
-			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 
 				$error++;
 
 				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
 
 				$action = 'create';
 
@@ -831,7 +831,7 @@ if (empty($reshook)) {
 
 		// Credit note invoice
 
 		if (GETPOST('type') == FactureFournisseur::TYPE_CREDIT_NOTE) {
 
 			$sourceinvoice = GETPOST('fac_avoir', 'int');
 
-			if (!($sourceinvoice > 0) && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) {
 
+			if (!($sourceinvoice > 0) && !getDolGlobalString('INVOICE_CREDIT_NOTE_STANDALONE')) {
 
 				$error++;
 
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CorrectInvoice")), null, 'errors');
 
 			}
 
@@ -846,7 +846,7 @@ if (empty($reshook)) {
 
 				$action = 'create';
 
 				$_GET['socid'] = $_POST['socid'];
 
 				$error++;
 
-			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 
 				$error++;
 
 				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
 
 				$action = 'create';
 
@@ -958,7 +958,7 @@ if (empty($reshook)) {
 
 				$error++;
 
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 
 				$action = 'create';
 
-			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 
 				$error++;
 
 				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
 
 				$action = 'create';
 
@@ -1014,7 +1014,7 @@ if (empty($reshook)) {
 
 				$action = 'create';
 
 				$_GET['socid'] = $_POST['socid'];
 
 				$error++;
 
-			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 
 				$error++;
 
 				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
 
 				$action = 'create';
 
@@ -1141,7 +1141,7 @@ if (empty($reshook)) {
 
 
 							// Define the array $amountdeposit
 
 							$amountdeposit = array();
 
-							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA)) {
 
+							if (getDolGlobalString('MAIN_DEPOSIT_MULTI_TVA')) {
 
 								if ($typeamount == 'amount') {
 
 									$amount = $valuedeposit;
 
 								} else {
 
@@ -1222,7 +1222,7 @@ if (empty($reshook)) {
 
 									0, // localtax1_tx
 
 									0, // localtax2_tx
 
 									1, // quantity
 
-									(empty($conf->global->INVOICE_PRODUCTID_DEPOSIT) ? 0 : $conf->global->INVOICE_PRODUCTID_DEPOSIT), // fk_product
 
+									(!getDolGlobalString('INVOICE_PRODUCTID_DEPOSIT') ? 0 : $conf->global->INVOICE_PRODUCTID_DEPOSIT), // fk_product
 
 									0, // remise_percent
 
 									0, // date_start
 
 									0, // date_end
 
@@ -1246,7 +1246,7 @@ if (empty($reshook)) {
 
 
 							$diff = $object->total_ttc - $amount_ttc_diff;
 
 
-							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA) && $diff != 0) {
 
+							if (getDolGlobalString('MAIN_DEPOSIT_MULTI_TVA') && $diff != 0) {
 
 								$object->fetch_lines();
 
 								$subprice_diff = $object->lines[0]->subprice - $diff / (1 + $object->lines[0]->tva_tx / 100);
 
 								$object->updateline(
 
@@ -1381,7 +1381,7 @@ if (empty($reshook)) {
 
 		} else {
 
 			$db->commit();
 
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 				$outputlangs = $langs;
 
 				$result = $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
 				if ($result < 0) {
 
@@ -1415,7 +1415,7 @@ if (empty($reshook)) {
 
 
 		if (GETPOST('productid') > 0) {
 
 			$productsupplier = new ProductFournisseur($db);
 
-			if (!empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY)) {
 
+			if (getDolGlobalString('SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY')) {
 
 				if (GETPOST('productid') > 0 && $productsupplier->get_buyprice(0, price2num(GETPOST('qty')), GETPOST('productid', 'int'), 'restricthtml', GETPOST('socid', 'int')) < 0) {
 
 					setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
 
 				}
 
@@ -1614,7 +1614,7 @@ if (empty($reshook)) {
 
 				$res = $productsupplier->fetch($idprod); // Load product from its id
 
 				// Call to init some price properties of $productsupplier
 
 				// So if a supplier price already exists for another thirdparty (first one found), we use it as reference price
 
-				if (!empty($conf->global->SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER)) {
 
+				if (getDolGlobalString('SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER')) {
 
 					$fksoctosearch = 0;
 
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 
 					if ($productsupplier->fourn_socid != $socid) {	// The price we found is for another supplier, so we clear supplier price
 
@@ -1634,7 +1634,7 @@ if (empty($reshook)) {
 
 			if ($idprod > 0) {
 
 				$label = $productsupplier->label;
 
 				// Define output language
 
-				if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 
+				if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 
 					$outputlangs = $langs;
 
 					$newlang = '';
 
 					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -1652,19 +1652,19 @@ if (empty($reshook)) {
 
 					$desc = $productsupplier->description;
 
 				}
 
 				// if we use supplier description of the products
 
-				if (!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) {
 
+				if (!empty($productsupplier->desc_supplier) && getDolGlobalString('PRODUIT_FOURN_TEXTS')) {
 
 					$desc = $productsupplier->desc_supplier;
 
 				}
 
 
 				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
 
-				if (trim($product_desc) == trim($desc) && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
 
+				if (trim($product_desc) == trim($desc) && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
 
 					$product_desc = '';
 
 				}
 
-				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) {
 
+				if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) {
 
 					$desc = $product_desc;
 
 				}
 
 				if (!empty($product_desc) && trim($product_desc) != trim($desc)) {
 
-					$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 
+					$desc = dol_concatdesc($desc, $product_desc, '', getDolGlobalString('MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION'));
 
 				}
 
 
 				$ref_supplier = $productsupplier->ref_supplier;
 
@@ -1786,7 +1786,7 @@ if (empty($reshook)) {
 
 			$db->commit();
 
 
 			// Define output language
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 				$outputlangs = $langs;
 
 				$newlang = '';
 
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -1867,14 +1867,14 @@ if (empty($reshook)) {
 
 				$object->fetch_thirdparty();
 
 
 				$qualified_for_stock_change = 0;
 
-				if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 
+				if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 
 					$qualified_for_stock_change = $object->hasProductsOrServices(2);
 
 				} else {
 
 					$qualified_for_stock_change = $object->hasProductsOrServices(1);
 
 				}
 
 
 				// Check parameters
 
-				if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change) {
 
+				if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_BILL') && $qualified_for_stock_change) {
 
 					$langs->load("stocks");
 
 					if (!$idwarehouse || $idwarehouse == -1) {
 
 						$error++;
 
@@ -1886,7 +1886,7 @@ if (empty($reshook)) {
 
 				$object->setDraft($user, $idwarehouse);
 
 
 				// Define output language
 
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 
 					$outputlangs = $langs;
 
 					$newlang = '';
 
 					if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 
@@ -1977,7 +1977,7 @@ if (empty($reshook)) {
 
 		}
 
 	}
 
 
-	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate) {
 
+	if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB') && $usercancreate) {
 
 		if ($action == 'addcontact') {
 
 			$result = $object->fetch($id);
 
 
@@ -2167,13 +2167,13 @@ if ($action == 'create') {
 
 			if (!empty($objectsrc->multicurrency_code)) {
 
 				$currency_code = $objectsrc->multicurrency_code;
 
 			}
 
-			if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx)) {
 
+			if (getDolGlobalString('MULTICURRENCY_USE_ORIGIN_TX') && !empty($objectsrc->multicurrency_tx)) {
 
 				$currency_tx = $objectsrc->multicurrency_tx;
 
 			}
 
 		}
 
 
 		$datetmp = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
-		$dateinvoice = ($datetmp == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ? -1 : '') : $datetmp);
 
+		$dateinvoice = ($datetmp == '' ? (!getDolGlobalString('MAIN_AUTOFILL_DATE') ? -1 : '') : $datetmp);
 
 		$datetmp = dol_mktime(12, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int'));
 
 		$datedue = ($datetmp == '' ?-1 : $datetmp);
 
 
@@ -2219,14 +2219,14 @@ if ($action == 'create') {
 
 		}
 
 	}
 
 
-	$note_public = $object->getDefaultCreateValueFor('note_public', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_public : null));
 
-	$note_private = $object->getDefaultCreateValueFor('note_private', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_private : null));
 
+	$note_public = $object->getDefaultCreateValueFor('note_public', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && getDolGlobalString('FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM')) ? $objectsrc->note_public : null));
 
+	$note_private = $object->getDefaultCreateValueFor('note_private', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && getDolGlobalString('FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM')) ? $objectsrc->note_private : null));
 
 
 	if ($origin == 'contrat') {
 
 		$langs->load("admin");
 
 		$text = $langs->trans("ToCreateARecurringInvoice");
 
 		$text .= ' '.$langs->trans("ToCreateARecurringInvoiceGene", $langs->transnoentitiesnoconv("MenuFinancial"), $langs->transnoentitiesnoconv("SupplierBills"), $langs->transnoentitiesnoconv("ListOfTemplates"));
 
-		if (empty($conf->global->INVOICE_DISABLE_AUTOMATIC_RECURRING_INVOICE)) {
 
+		if (!getDolGlobalString('INVOICE_DISABLE_AUTOMATIC_RECURRING_INVOICE')) {
 
 			$text .= ' '.$langs->trans("ToCreateARecurringInvoiceGeneAuto", $langs->transnoentitiesnoconv('Module2300Name'));
 
 		}
 
 		print info_admin($text, 0, 0, 0, 'opacitymedium').'<br>';
 
@@ -2277,7 +2277,7 @@ if ($action == 'create') {
 
 			$filter = '((s.fournisseur:=:1) AND (s.status:=:1))';
 
 			print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company(empty($societe->id) ? 0 : $societe->id, 'socid', $filter, 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 widthcentpercentminusxx maxwidth500');
 
 			// reload page to retrieve supplier informations
 
-			if (empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE_DISABLED)) {
 
+			if (!getDolGlobalString('RELOAD_PAGE_ON_SUPPLIER_CHANGE_DISABLED')) {
 
 				print '<script type="text/javascript">
 
 					$(document).ready(function() {
 
 						$("#socid").change(function() {
 
@@ -2343,7 +2343,7 @@ if ($action == 'create') {
 
 					}
 
 					print '</select>';
 
 					// Option to reload page to retrieve customer informations. Note, this clear other input
 
-					if (empty($conf->global->RELOAD_PAGE_ON_TEMPLATE_CHANGE_DISABLED)) {
 
+					if (!getDolGlobalString('RELOAD_PAGE_ON_TEMPLATE_CHANGE_DISABLED')) {
 
 						print '<script type="text/javascript">
 
 						$(document).ready(function() {
 
 							$("#fac_rec").change(function() {
 
@@ -2384,7 +2384,7 @@ if ($action == 'create') {
 
 
 		if (empty($origin) || ($origin == 'order_supplier' && !empty($originid))) {
 
 			// Deposit - Down payment
 
-			if (empty($conf->global->INVOICE_DISABLE_DEPOSIT)) {
 
+			if (!getDolGlobalString('INVOICE_DISABLE_DEPOSIT')) {
 
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 
 				$tmp='<input type="radio" id="radio_deposit" name="type" value="3"' . (GETPOST('type') == 3 ? ' checked' : '') . '> ';
 
 				print '<script type="text/javascript">
 
@@ -2509,7 +2509,7 @@ if ($action == 'create') {
 
 		if (empty($origin)) {
 
 			if (!empty($societe->id) && $societe->id > 0) {
 
 				// Credit note
 
-				if (empty($conf->global->INVOICE_DISABLE_CREDIT_NOTE)) {
 
+				if (!getDolGlobalString('INVOICE_DISABLE_CREDIT_NOTE')) {
 
 					// Show link for credit note
 
 					$facids = $facturestatic->list_qualified_avoir_supplier_invoices($societe->id);
 
 					if ($facids < 0) {
 
@@ -2537,7 +2537,7 @@ if ($action == 'create') {
 
 
 					print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 
 					$tmp = '<input type="radio" id="radio_creditnote" name="type" value="2"'.(GETPOST('type') == 2 ? ' checked' : '');
 
-					if (!$optionsav && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) {
 
+					if (!$optionsav && !getDolGlobalString('INVOICE_CREDIT_NOTE_STANDALONE')) {
 
 						$tmp .= ' disabled';
 
 					}
 
 					$tmp .= '> ';
 
@@ -2584,7 +2584,7 @@ if ($action == 'create') {
 
 				}
 
 			} else {
 
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 
-				if (empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) {
 
+				if (!getDolGlobalString('INVOICE_CREDIT_NOTE_STANDALONE')) {
 
 					$tmp = '<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
 
 				} else {
 
 					$tmp='<input type="radio" name="type" id="radio_creditnote" value="2"> ';
 
@@ -2663,7 +2663,7 @@ if ($action == 'create') {
 
 
 			$langs->load('projects');
 
 			print '<tr><td>'.$langs->trans('Project').'</td><td>';
 
-			print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
 
+			print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects((!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
 
 			print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.(!empty($soc->id) ? $soc->id : 0).'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.(!empty($soc->id) ? $soc->id : 0).($fac_recid > 0 ? '&fac_rec='.$fac_recid : '')).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 
 			print '</td></tr>';
 
 		}
 
@@ -2679,7 +2679,7 @@ if ($action == 'create') {
 
 		}
 
 
 		// Vat reverse-charge by default
 
-		if (!empty($conf->global->ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE)) {
 
+		if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
 
 			require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
 
 			print '<tr><td>' . $langs->trans('VATReverseCharge') . '</td><td>';
 
 			// Try to propose to use VAT reverse charge even if the VAT reverse charge is not activated in the supplier card, if this corresponds to the context of use, the activation is proposed
 
@@ -2746,7 +2746,7 @@ if ($action == 'create') {
 
 		// Public note
 
 		print '<tr><td>'.$langs->trans('NotePublic').'</td>';
 
 		print '<td>';
 
-		$doleditor = new DolEditor('note_public', (GETPOSTISSET('note_public') ?GETPOST('note_public', 'restricthtml') : $note_public), '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 
+		$doleditor = new DolEditor('note_public', (GETPOSTISSET('note_public') ?GETPOST('note_public', 'restricthtml') : $note_public), '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 
 		print $doleditor->Create(1);
 
 		print '</td>';
 
 		// print '<td><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
 
@@ -2755,7 +2755,7 @@ if ($action == 'create') {
 
 		// Private note
 
 		print '<tr><td>'.$langs->trans('NotePrivate').'</td>';
 
 		print '<td>';
 
-		$doleditor = new DolEditor('note_private', (GETPOSTISSET('note_private') ?GETPOST('note_private', 'restricthtml') : $note_private), '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 
+		$doleditor = new DolEditor('note_private', (GETPOSTISSET('note_private') ?GETPOST('note_private', 'restricthtml') : $note_private), '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 
 		print $doleditor->Create(1);
 
 		print '</td>';
 
 		// print '<td><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
 
@@ -2899,7 +2899,7 @@ if ($action == 'create') {
 
 		}
 
 		$resteapayeraffiche = $resteapayer;
 
 
-		if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {	// Never use this
 
+		if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {	// Never use this
 
 			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 
 			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 
 		} else {
 
@@ -2975,13 +2975,13 @@ if ($action == 'create') {
 
 				$formquestion = array();
 
 
 				$qualified_for_stock_change = 0;
 
-				if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 
+				if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 
 					$qualified_for_stock_change = $object->hasProductsOrServices(2);
 
 				} else {
 
 					$qualified_for_stock_change = $object->hasProductsOrServices(1);
 
 				}
 
 
-				if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change) {
 
+				if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_BILL') && $qualified_for_stock_change) {
 
 					$langs->load("stocks");
 
 					require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 
 					$formproduct = new FormProduct($db);
 
@@ -3008,12 +3008,12 @@ if ($action == 'create') {
 
 			$formquestion = array();
 
 
 			$qualified_for_stock_change = 0;
 
-			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 
+			if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
 
 			} else {
 
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
 
 			}
 
-			if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change) {
 
+			if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_BILL') && $qualified_for_stock_change) {
 
 				$langs->load("stocks");
 
 				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 
 				$formproduct = new FormProduct($db);
 
@@ -3034,11 +3034,11 @@ if ($action == 'create') {
 
 		}
 
 
 		// Confirmation set paid
 
-		if ($action == 'paid' && ($resteapayer <= 0 || (!empty($conf->global->SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) && $resteapayer == $object->total_ttc))) {
 
+		if ($action == 'paid' && ($resteapayer <= 0 || (getDolGlobalString('SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID') && $resteapayer == $object->total_ttc))) {
 
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ClassifyPaid'), $langs->trans('ConfirmClassifyPaidBill', $object->ref), 'confirm_paid', '', 0, 1);
 
 		}
 
 
-		if ($action == 'paid' && $resteapayer > 0 && (empty($conf->global->SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) || $resteapayer != $object->total_ttc)) {
 
+		if ($action == 'paid' && $resteapayer > 0 && (!getDolGlobalString('SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID') || $resteapayer != $object->total_ttc)) {
 
 			$close = array();
 
 			// Code
 
 			$i = 0;
 
@@ -3101,13 +3101,13 @@ if ($action == 'create') {
 
 			$formquestion = array();
 
 
 			$qualified_for_stock_change = 0;
 
-			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 
+			if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
 
 			} else {
 
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
 
 			}
 
 
-			if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change) {
 
+			if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_BILL') && $qualified_for_stock_change) {
 
 				$langs->load("stocks");
 
 				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 
 				$formproduct = new FormProduct($db);
 
@@ -3179,7 +3179,7 @@ if ($action == 'create') {
 
 		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', null, null, '', 1);
 
 		// Thirdparty
 
 		$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1, 'supplier');
 
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
 
+		if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 
 			$morehtmlref .= ' <div class="inline-block valignmiddle">(<a class="valignmiddle" href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.((int) $object->thirdparty->id).'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)</div>';
 
 		}
 
 		// Project
 
@@ -3191,7 +3191,7 @@ if ($action == 'create') {
 
 				if ($action != 'classify') {
 
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.((int) $object->id).'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 
 				}
 
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
 			} else {
 
 				if (!empty($object->fk_project)) {
 
 					$proj = new Project($db);
 
@@ -3433,7 +3433,7 @@ if ($action == 'create') {
 
 			}
 
 
 			// Vat reverse-charge by default
 
-			if (!empty($conf->global->ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE)) {
 
+			if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
 
 				print '<tr><td class="nowrap">';
 
 				print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 
 				print $langs->trans('VATReverseCharge');
 
@@ -3527,7 +3527,7 @@ if ($action == 'create') {
 
 			if (GETPOST('calculationrule')) {
 
 				$calculationrule = GETPOST('calculationrule', 'alpha');
 
 			} else {
 
-				$calculationrule = (empty($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND) ? 'totalofround' : 'roundoftotal');
 
+				$calculationrule = (!getDolGlobalString('MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND') ? 'totalofround' : 'roundoftotal');
 
 			}
 
 			if ($calculationrule == 'totalofround') {
 
 				$calculationrulenum = 1;
 
@@ -3897,13 +3897,13 @@ if ($action == 'create') {
 
 
 			print '<div class="clearboth"></div><br>';
 
 
-			if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 
+			if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 
 				$blocname = 'contacts';
 
 				$title = $langs->trans('ContactsAddresses');
 
 				include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 
 			}
 
 
-			if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 
+			if (getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 
 				$colwidth = 20;
 
 				$blocname = 'notes';
 
 				$title = $langs->trans('Notes');
 
@@ -3934,7 +3934,7 @@ if ($action == 'create') {
 
 			$forceall = 1; $dateSelector = 0; $inputalsopricewithtax = 1;
 
 			$senderissupplier = 2; // $senderissupplier=2 is same than 1 but disable test on minimum qty and disable autofill qty with minimum.
 
 			//if (!empty($conf->global->SUPPLIER_INVOICE_WITH_NOPRICEDEFINED)) $senderissupplier=2;
 
-			if (!empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY)) {
 
+			if (getDolGlobalString('SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY')) {
 
 				$senderissupplier = 1;
 
 			}
 
 
@@ -4002,7 +4002,7 @@ if ($action == 'create') {
 
 					} else {
 
 						if ($usercancreate) {
 
 							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('ReOpen').'</span>';
 
-						} elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
 
+						} elseif (!getDolGlobalString('MAIN_BUTTON_HIDE_UNAUTHORIZED')) {
 
 							print '<span class="butActionRefused classfortooltip">'.$langs->trans('ReOpen').'</span>';
 
 						}
 
 					}
 
@@ -4054,7 +4054,7 @@ if ($action == 'create') {
 
 					}
 
 					// For credit note
 
 					if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0 && $usercancreate
 
-						&& (!empty($conf->global->SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED) || $object->getSommePaiement() == 0)
 
+						&& (getDolGlobalString('SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED') || $object->getSommePaiement() == 0)
 
 						) {
 
 						print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc" title="'.dol_escape_htmltag($langs->trans("ConfirmConvertToReducSupplier2")).'">'.$langs->trans('ConvertToReduc').'</a>';
 
 					}
 
@@ -4066,21 +4066,21 @@ if ($action == 'create') {
 
 
 				// Classify paid
 
 				if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && (
 
-						($object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $object->type != FactureFournisseur::TYPE_DEPOSIT && ($resteapayer <= 0 || (!empty($conf->global->SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) && $object->total_ttc == $resteapayer))) ||
 
+						($object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $object->type != FactureFournisseur::TYPE_DEPOSIT && ($resteapayer <= 0 || (getDolGlobalString('SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID') && $object->total_ttc == $resteapayer))) ||
 
 						($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && $resteapayer >= 0) ||
 
-						($object->type == FactureFournisseur::TYPE_DEPOSIT && $object->total_ttc > 0 && ($resteapayer == 0 || (!empty($conf->global->SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) && $object->total_ttc == $resteapayer)))
 
+						($object->type == FactureFournisseur::TYPE_DEPOSIT && $object->total_ttc > 0 && ($resteapayer == 0 || (getDolGlobalString('SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID') && $object->total_ttc == $resteapayer)))
 
 					)
 
 				) {
 
 					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaid').'</a>';
 
 				}
 
 
 				// Classify 'closed not completely paid' (possible if validated and not yet filed paid)
 
-				if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $resteapayer > 0 && (empty($conf->global->SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) || $object->total_ttc != $resteapayer)) {
 
+				if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $resteapayer > 0 && (!getDolGlobalString('SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID') || $object->total_ttc != $resteapayer)) {
 
 					if ($totalpaid > 0 || $totalcreditnotes > 0) {
 
 						// If one payment or one credit note was linked to this invoice
 
 						print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaidPartially').'</a>';
 
 					} else {
 
-						if (empty($conf->global->INVOICE_CAN_NEVER_BE_CANCELED)) {
 
+						if (!getDolGlobalString('INVOICE_CAN_NEVER_BE_CANCELED')) {
 
 							print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=canceled">'.$langs->trans('ClassifyCanceled').'</a>';
 
 						}
 
 					}
 
@@ -4148,7 +4148,7 @@ if ($action == 'create') {
 
 					$urlsource = $_SERVER['PHP_SELF'].'?id='.$object->id;
 
 					$genallowed = $usercanread;
 
 					$delallowed = $usercancreate;
 
-					$modelpdf = (!empty($object->model_pdf) ? $object->model_pdf : (empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF) ? '' : $conf->global->INVOICE_SUPPLIER_ADDON_PDF));
 
+					$modelpdf = (!empty($object->model_pdf) ? $object->model_pdf : (!getDolGlobalString('INVOICE_SUPPLIER_ADDON_PDF') ? '' : $conf->global->INVOICE_SUPPLIER_ADDON_PDF));
 
 
 					print $formfile->showdocuments('facture_fournisseur', $subdir, $filedir, $urlsource, $genallowed, $delallowed, $modelpdf, 1, 0, 0, 40, 0, '', '', '', $societe->default_lang);
 
 					$somethingshown = $formfile->numoffiles;

+ 2 - 2
htdocs/fourn/facture/contact.php
View File 

@@ -137,7 +137,7 @@ if ($id > 0 || !empty($ref)) {
 
 		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
 
 		// Thirdparty
 
 		$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
 
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
 
+		if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 
 			$morehtmlref .= ' <div class="inline-block valignmiddle">(<a class="valignmiddle" href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)</div>';
 
 		}
 
 		// Project
 
@@ -149,7 +149,7 @@ if ($id > 0 || !empty($ref)) {
 
 				if ($action != 'classify') {
 
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 
 				}
 
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
 			} else {
 
 				if (!empty($object->fk_project)) {
 
 					$proj = new Project($db);

+ 2 - 2
htdocs/fourn/facture/document.php
View File 

@@ -113,7 +113,7 @@ if ($object->id > 0) {
 
 	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
 
 	// Thirdparty
 
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
 
-	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
 
+	if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 
 		$morehtmlref .= ' <div class="inline-block valignmiddle">(<a class="valignmiddle" href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)</div>';
 
 	}
 
 	// Project
 
@@ -125,7 +125,7 @@ if ($object->id > 0) {
 
 			if ($action != 'classify') {
 
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 
 			}
 
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
 		} else {
 
 			if (!empty($object->fk_project)) {
 
 				$proj = new Project($db);

+ 2 - 2
htdocs/fourn/facture/index.php
View File 

@@ -41,9 +41,9 @@ if (isset($user->socid) && $user->socid > 0) {
 
 $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 
 // Maximum elements of the tables
 
-$maxDraftCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
 
+$maxDraftCount = !getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
 
 $maxLatestEditCount = 5;
 
-$maxOpenCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
 
+$maxOpenCount = !getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
 
 
 // Security check
 
 restrictedArea($user, 'fournisseur', 0, '', 'facture');

+ 2 - 2
htdocs/fourn/facture/info.php
View File 

@@ -79,7 +79,7 @@ $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_
 
 $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
 
 // Thirdparty
 
 $morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
 
-if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
 
+if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 
 	$morehtmlref .= ' <div class="inline-block valignmiddle">(<a class="valignmiddle" href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)</div>';
 
 }
 
 // Project
 
@@ -91,7 +91,7 @@ if (isModEnabled('project')) {
 
 		if ($action != 'classify') {
 
 			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 
 		}
 
-		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
+		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
 	} else {
 
 		if (!empty($object->fk_project)) {
 
 			$proj = new Project($db);

+ 3 - 3
htdocs/fourn/facture/list.php
View File 

@@ -216,8 +216,8 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 
 if (!isModEnabled('supplier_invoice')) {
 
 	accessforbidden();
 
 }
 
-if ((!$user->hasRight("fournisseur", "facture", "lire") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD))
 
-	|| (!$user->hasRight("supplier_invoice", "lire") && !empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD))) {
 
+if ((!$user->hasRight("fournisseur", "facture", "lire") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD'))
 
+	|| (!$user->hasRight("supplier_invoice", "lire") && getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD'))) {
 
 	accessforbidden();
 
 }
 
 
@@ -1143,7 +1143,7 @@ if (!empty($arrayfields['country.code_iso']['checked'])) {
 
 // Company type
 
 if (!empty($arrayfields['typent.code']['checked'])) {
 
 	print '<td class="liste_titre maxwidthonsmartphone center">';
 
-	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 
+	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 
 	print '</td>';
 
 }
 
 // Condition of payment

+ 2 - 2
htdocs/fourn/facture/note.php
View File 

@@ -109,7 +109,7 @@ if ($object->id > 0) {
 
 	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
 
 	// Thirdparty
 
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
 
-	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
 
+	if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 
 		$morehtmlref .= ' <div class="inline-block valignmiddle">(<a class="valignmiddle" href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)</div>';
 
 	}
 
 	// Project
 
@@ -121,7 +121,7 @@ if ($object->id > 0) {
 
 			if ($action != 'classify') {
 
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 
 			}
 
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 
 		} else {
 
 			if (!empty($object->fk_project)) {
 
 				$proj = new Project($db);

+ 1 - 1
htdocs/fourn/facture/paiement.php
View File 

@@ -386,7 +386,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 	$result = $object->fetch($facid);
 
 
 	$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
-	$dateinvoice = ($datefacture == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datefacture);
 
+	$dateinvoice = ($datefacture == '' ? (!getDolGlobalString('MAIN_AUTOFILL_DATE') ?-1 : '') : $datefacture);
 
 
 	$sql = 'SELECT s.nom as name, s.rowid as socid,';
 
 	$sql .= ' f.rowid, f.ref, f.ref_supplier, f.total_ttc as total, f.fk_mode_reglement, f.fk_account';

+ 2 - 2
htdocs/fourn/index.php
View File 

@@ -230,14 +230,14 @@ print '</div><div class="fichetwothirdright">';
 
  */
 
 $max = 10;
 
 $sql = "SELECT s.rowid as socid, s.nom as name, s.town, s.datec, s.tms, s.prefix_comm, s.code_fournisseur";
 
-if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
 
+if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 
 	$sql .= ", spe.accountancy_code_supplier as code_compta_fournisseur";
 
 } else {
 
 	$sql .= ", s.code_compta_fournisseur";
 
 }
 
 $sql .= ", st.libelle as stcomm";
 
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 
-if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
 
+if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
 
 }
 
 $sql .= ", ".MAIN_DB_PREFIX."c_stcomm as st";

+ 8 - 8
htdocs/fourn/paiement/card.php
View File 

@@ -102,8 +102,8 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight("fournis
 
 }
 
 
 if ($action == 'confirm_validate' && $confirm == 'yes' &&
 
-	((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer")))
 
-	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("fournisseur", "supplier_invoice_advance", "validate")))
 
+	((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer")))
 
+	|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("fournisseur", "supplier_invoice_advance", "validate")))
 
 ) {
 
 	$db->begin();
 
 
@@ -224,7 +224,7 @@ if ($result > 0) {
 
 	print '<td><span class="amount">'.price($object->amount, '', $langs, 0, 0, -1, $conf->currency).'</span></td></tr>';
 
 
 	// Status of validation of payment
 
-	if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) {
 
+	if (getDolGlobalString('BILL_ADD_PAYMENT_VALIDATION')) {
 
 		print '<tr><td>'.$langs->trans('Status').'</td>';
 
 		print '<td>'.$object->getLibStatut(4).'</td></tr>';
 
 	}
 
@@ -355,7 +355,7 @@ if ($result > 0) {
 
 
 	// Send by mail
 
 	if ($user->socid == 0 && $action != 'presend') {
 
-		$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("fournisseur", "supplier_invoice_advance", "send")));
 
+		$usercansend = (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("fournisseur", "supplier_invoice_advance", "send")));
 
 		if ($usercansend) {
 
 			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
 
 		} else {
 
@@ -364,10 +364,10 @@ if ($result > 0) {
 
 	}
 
 
 	// Payment validation
 
-	if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) {
 
+	if (getDolGlobalString('BILL_ADD_PAYMENT_VALIDATION')) {
 
 		if ($user->socid == 0 && $object->statut == 0 && $action == '') {
 
-			if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer")))
 
-			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("fournisseur", "supplier_invoice_advance", "validate"))) {
 
+			if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer")))
 
+			|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("fournisseur", "supplier_invoice_advance", "validate"))) {
 
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=validate">'.$langs->trans('Valid').'</a>';
 
 			}
 
 		}
 
@@ -397,7 +397,7 @@ if ($result > 0) {
 
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$object->id;
 
 			$genallowed = ($user->hasRight("fournisseur", "facture", "lire") || $user->hasRight("supplier_invoice", "lire"));
 
 			$delallowed = ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer"));
 
-			$modelpdf = (!empty($object->model_pdf) ? $object->model_pdf : (empty($conf->global->SUPPLIER_PAYMENT_ADDON_PDF) ? '' : $conf->global->SUPPLIER_PAYMENT_ADDON_PDF));
 
+			$modelpdf = (!empty($object->model_pdf) ? $object->model_pdf : (!getDolGlobalString('SUPPLIER_PAYMENT_ADDON_PDF') ? '' : $conf->global->SUPPLIER_PAYMENT_ADDON_PDF));
 
 
 			print $formfile->showdocuments('supplier_payment', $ref, $filedir, $urlsource, $genallowed, $delallowed, $modelpdf, 1, 0, 0, 40, 0, '', '', '', $object->thirdparty->default_lang);
 
 			$somethingshown = $formfile->numoffiles;

+ 5 - 5
htdocs/fourn/paiement/list.php
View File 

@@ -127,8 +127,8 @@ if ($user->socid) {
 
 if (!isModEnabled('supplier_invoice')) {
 
 	accessforbidden();
 
 }
 
-if ((!$user->hasRight("fournisseur", "facture", "lire") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD))
 
-	|| (!$user->hasRight("supplier_invoice", "lire") && !empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD))) {
 
+if ((!$user->hasRight("fournisseur", "facture", "lire") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD'))
 
+	|| (!$user->hasRight("supplier_invoice", "lire") && getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD'))) {
 
 	accessforbidden();
 
 }
 
 
@@ -371,7 +371,7 @@ if (getDolGlobalInt('MAIN_CHECKBOX_LEFT_COLUMN')) {
 
 	print '</td>';
 
 }
 
 
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
 
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 
 	print '<td class="liste_titre">';
 
 	print '</td>';
 
 }
 
@@ -456,7 +456,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 
 	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 
 	$totalarray['nbfield']++;
 
 }
 
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
 
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 
 	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
 
 	$totalarray['nbfield']++;
 
 }
 
@@ -534,7 +534,7 @@ while ($i < min($num, $limit)) {
 
 	}
 
 
 	// No
 
-	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
 
+	if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 
 		print '<td class="nowraponall">'.(($offset * $limit) + $i).'</td>';
 
 		if (!$i) {
 
 			$totalarray['nbfield']++;

+ 1 - 1
htdocs/fourn/recap-fourn.php
View File 

@@ -64,7 +64,7 @@ if ($socid > 0) {
 
 	dol_banner_tab($societe, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
 
 	print dol_get_fiche_end();
 
 
-	if ((isModEnabled("fournisseur") && $user->hasRight("fournisseur", "facture", "lire") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled("supplier_invoice") && $user->hasRight("supplier_invoice", "lire"))) {
 
+	if ((isModEnabled("fournisseur") && $user->hasRight("fournisseur", "facture", "lire") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_invoice") && $user->hasRight("supplier_invoice", "lire"))) {
 
 		// Invoice list
 
 		print load_fiche_titre($langs->trans("SupplierPreview"));

+ 1 - 1
htdocs/ftp/admin/ftpclient.php
View File 

@@ -206,7 +206,7 @@ if (!function_exists('ftp_connect')) {
 
 	print '<td>'.$langs->trans("FTPPassiveMode").'</td>';
 
 	$defaultpassive = GETPOST("FTP_PASSIVE_".($lastftpentry + 1));
 
 	if (!GETPOSTISSET("FTP_PASSIVE_".($lastftpentry + 1))) {
 
-		$defaultpassive = empty($conf->global->FTP_SUGGEST_PASSIVE_BYDEFAULT) ? 0 : 1;
 
+		$defaultpassive = !getDolGlobalString('FTP_SUGGEST_PASSIVE_BYDEFAULT') ? 0 : 1;
 
 	}
 
 	print '<td>'.$form->selectyesno('FTP_PASSIVE_'.($lastftpentry + 1), $defaultpassive, 2).'</td>';
 
 	print '<td>'.$langs->trans("No").'</td>';

+ 1 - 1
htdocs/ftp/index.php
View File 

@@ -458,7 +458,7 @@ if (!function_exists('ftp_connect')) {
 
 			//$newsection='/home';
 
 
 			// List content of directory ($newsection = '/', '/home', ...)
 
-			if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
 
+			if (getDolGlobalString('FTP_CONNECT_WITH_SFTP')) {
 
 				if ($newsection == '/') {
 
 					//$newsection = '/./';
 
 					$newsection = ssh2_sftp_realpath($conn_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169