lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing $conf

Browse Source
This commit is contained in:
Laurent Destailleur 2019-09-27 20:01:57 +02:00
parent fc59193123
commit 24ad67e0e1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4558,7 +4558,7 @@ function price2num($amount, $rounding = '', $alreadysqlnb = 0)
* Output a dimension with best unit * Output a dimension with best unit
* *
* @param float $dimension Dimension * @param float $dimension Dimension
* @param int $unit Unit of dimension (Example: 0=kg, -3=g, 98=ounce, 99=pound, ...) * @param int $unit Unit scale of dimension (Example: 0=kg, -3=g, 98=ounce, 99=pound, ...)
* @param string $type 'weight', 'volume', ... * @param string $type 'weight', 'volume', ...
* @param Translate $outputlangs Translate language object * @param Translate $outputlangs Translate language object
* @param int $round -1 = non rounding, x = number of decimal * @param int $round -1 = non rounding, x = number of decimal

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

@ -43,6 +43,8 @@ class modHoliday extends DolibarrModules
*/ */
public function __construct($db) public function __construct($db)
{ {
global $conf, $user; // Required by some include code
$this->db = $db; $this->db = $db;
// Id for module (must be unique). // Id for module (must be unique).