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

Fix problem with multicompany on new feature Product propal merge PDF

Browse Source 
product
This commit is contained in:
Florian HENRY 2015-05-15 17:39:28 +02:00
parent 4bc2d55cb3
commit f29d8aed5b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -670,15 +670,24 @@ class pdf_azur extends ModelePDFPropales
} }
$already_merged[] = $line->fk_product; $already_merged[] = $line->fk_product;
$product = new Product($this->db);
$product->fetch($line->fk_product);
if ($product->entity!=$conf->entity) {
$entity_product_file=$product->entity;
} else {
$entity_product_file=$conf->entity;
}
// If PDF is selected and file is not empty // If PDF is selected and file is not empty
if (count($filetomerge->lines) > 0) { if (count($filetomerge->lines) > 0) {
foreach ( $filetomerge->lines as $linefile ) { foreach ( $filetomerge->lines as $linefile ) {
if (! empty($linefile->id) && ! empty($linefile->file_name)) { if (! empty($linefile->id) && ! empty($linefile->file_name)) {
if (! empty($conf->product->enabled)) if (! empty($conf->product->enabled))
$filetomerge_dir = $conf->product->multidir_output[$conf->entity] . '/' . dol_sanitizeFileName($line->product_ref); $filetomerge_dir = $conf->product->multidir_output[$entity_product_file] . '/' . dol_sanitizeFileName($line->product_ref);
elseif (! empty($conf->service->enabled)) elseif (! empty($conf->service->enabled))
$filetomerge_dir = $conf->service->multidir_output[$conf->entity] . '/' . dol_sanitizeFileName($line->product_ref); $filetomerge_dir = $conf->service->multidir_output[$entity_product_file] . '/' . dol_sanitizeFileName($line->product_ref);
dol_syslog(get_class($this) . ':: upload_dir=' . $filetomerge_dir, LOG_DEBUG); dol_syslog(get_class($this) . ':: upload_dir=' . $filetomerge_dir, LOG_DEBUG);