Fix problem with multicompany on new feature Product propal merge PDF

product
Dolibarr · May 15, 2015 · f29d8ae · f29d8ae
1 parent 4bc2d55
commit f29d8ae
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -670,15 +670,24 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
 							}
 
 							$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 (count($filetomerge->lines) > 0) {
 								foreach ( $filetomerge->lines as $linefile ) {
 									if (! empty($linefile->id) && ! empty($linefile->file_name)) {
 										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))
-											$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);