Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-18 23:41:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

NEW Introduce getCurrency(). $conf is no more allowed into computed

Browse Source 
formulae.
This commit is contained in:
Laurent Destailleur
2025-11-17 10:29:55 +01:00
parent f837fb4fa8
commit 1dd28e352a
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/core/lib/functions.lib.php
View File

@@ -286,6 +286,17 @@ function getDolGlobalBool($key, $default = false)
return (bool) ($conf->global->$key ?? $default); return (bool) ($conf->global->$key ?? $default);
} }
/**
* Return the main currency ('EUR', 'USD', ...)
*
* @return string Value returned
*/
function getDolCurrency()
{
global $conf;
return (string) $conf->currency;
}
/** /**
* Return Dolibarr user constant string value * Return Dolibarr user constant string value
* *
@@ -11803,8 +11814,9 @@ function dol_eval_new($s)
function dol_eval_standard($s, $returnvalue = 1, $hideerrors = 1, $onlysimplestring = '1') function dol_eval_standard($s, $returnvalue = 1, $hideerrors = 1, $onlysimplestring = '1')
{ {
// Only this global variables can be read by eval function and returned to caller // Only this global variables can be read by eval function and returned to caller
global $conf; // Read of const is done with getDolGlobalString() but we need $conf->currency for example //global $conf; // Disabled. Read of const is done with getDolGlobalString() and read of $conf->currency is done with getDolCurrency()
global $db, $langs, $user, $website, $websitepage; global $db;
global $langs, $user, $website, $websitepage;
global $action, $mainmenu, $leftmenu; global $action, $mainmenu, $leftmenu;
global $mysoc; global $mysoc;
global $objectoffield; // To allow the use of $objectoffield in computed fields global $objectoffield; // To allow the use of $objectoffield in computed fields