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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2019-12-09 13:25:49 +01:00
commit 63a26ed436
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/actions_massactions.inc.php
View File

@ -734,7 +734,10 @@ if ($massaction == 'confirm_createbills')
$lines[$i]->fk_fournprice, $lines[$i]->fk_fournprice,
$lines[$i]->pa_ht, $lines[$i]->pa_ht,
$lines[$i]->label, $lines[$i]->label,
$array_options $array_options,
100,
0,
$lines[$i]->fk_unit
); );
if ($result > 0) if ($result > 0)
{ {

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

@ -1435,6 +1435,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
$fileimagebis = $file.'_preview-0.png'; // If PDF has more than one page $fileimagebis = $file.'_preview-0.png'; // If PDF has more than one page
$relativepathimage = $relativepath.'_preview.png'; $relativepathimage = $relativepath.'_preview.png';
// Si fichier PDF existe // Si fichier PDF existe
if (file_exists($file)) if (file_exists($file))
{ {