Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
This commit is contained in:
commit
f14833f856
2 changed files with 3 additions and 2 deletions
|
|
@ -1744,6 +1744,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
|
|||
}
|
||||
// Refresh value of MAIN_IHM_PARAMS_REV before forging the parameter line.
|
||||
if (GETPOST('dol_resetcache')) {
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
|
||||
dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", getDolGlobalInt('MAIN_IHM_PARAMS_REV') + 1, 'chaine', 0, '', $conf->entity);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1278,8 +1278,8 @@ foreach ($listofreferent as $key => $value) {
|
|||
$filedir = $conf->fournisseur->commande->multidir_output[$element->entity].'/'.dol_sanitizeFileName($element->ref);
|
||||
} elseif ($element_doc === 'invoice_supplier') {
|
||||
$element_doc = 'facture_fournisseur';
|
||||
$filename = get_exdir($element->id, 2, 0, 0, $element, 'product').dol_sanitizeFileName($element->ref);
|
||||
$filedir = $conf->fournisseur->facture->multidir_output[$element->entity].'/'.get_exdir($element->id, 2, 0, 0, $element, 'invoice_supplier').dol_sanitizeFileName($element->ref);
|
||||
$filename = get_exdir($element->id, 2, 0, 0, $element, 'invoice_supplier').dol_sanitizeFileName($element->ref);
|
||||
$filedir = $conf->fournisseur->facture->multidir_output[$element->entity].'/'.$filename;
|
||||
}
|
||||
|
||||
print '<div class="inline-block valignmiddle">';
|
||||
|
|
|
|||
Loading…
Reference in a new issue