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

Merge pull request #16800 from FHenry/13.0

Browse Source 
fix: PRODUIT_PDF_MERGE_PROPAL options do not work with new product feature
This commit is contained in:
Laurent Destailleur 2021-03-18 22:55:45 +01:00 committed by GitHub
commit b1cf252989
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/comm/propal/card.php
View File

@ -285,6 +285,7 @@ if (empty($reshook))
} elseif ($action == 'setecheance' && $usercancreate) } elseif ($action == 'setecheance' && $usercancreate)
{ {
$result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear'])); $result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']));
$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
if ($result < 0) if ($result < 0)
dol_print_error($db, $object->error); dol_print_error($db, $object->error);
} elseif ($action == 'setdate_livraison' && $usercancreate) } elseif ($action == 'setdate_livraison' && $usercancreate)

4
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -762,9 +762,9 @@ class pdf_azur extends ModelePDFPropales
} }
} else { } else {
if (!empty($conf->product->enabled)) { if (!empty($conf->product->enabled)) {
$filetomerge_dir = $conf->product->multidir_output[$entity_product_file].'/'.get_exdir(0, 0, 0, 0, $product, 'product').dol_sanitizeFileName($product->ref); $filetomerge_dir = $conf->product->multidir_output[$entity_product_file].'/'.get_exdir(0, 0, 0, 0, $product, 'product');
} elseif (!empty($conf->service->enabled)) { } elseif (!empty($conf->service->enabled)) {
$filetomerge_dir = $conf->service->multidir_output[$entity_product_file].'/'.get_exdir(0, 0, 0, 0, $product, 'product').dol_sanitizeFileName($product->ref); $filetomerge_dir = $conf->service->multidir_output[$entity_product_file].'/'.get_exdir(0, 0, 0, 0, $product, 'product');
} }
} }

4
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
View File

@ -907,9 +907,9 @@ class pdf_cyan extends ModelePDFPropales
} }
} else { } else {
if (!empty($conf->product->enabled)) { if (!empty($conf->product->enabled)) {
$filetomerge_dir = $conf->product->multidir_output[$entity_product_file].'/'.get_exdir(0, 0, 0, 0, $product, 'product').dol_sanitizeFileName($product->ref); $filetomerge_dir = $conf->product->multidir_output[$entity_product_file].'/'.get_exdir(0, 0, 0, 0, $product, 'product');
} elseif (!empty($conf->service->enabled)) { } elseif (!empty($conf->service->enabled)) {
$filetomerge_dir = $conf->service->multidir_output[$entity_product_file].'/'.get_exdir(0, 0, 0, 0, $product, 'product').dol_sanitizeFileName($product->ref); $filetomerge_dir = $conf->service->multidir_output[$entity_product_file].'/'.get_exdir(0, 0, 0, 0, $product, 'product');
} }
} }