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

Clean placeholder of missing related project and products

Browse Source
This commit is contained in:
avolani 2023-02-08 16:41:06 +01:00 committed by GitHub
parent 637603731a
commit f35d63cec1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/class/commondocgenerator.class.php
View File

@ -538,6 +538,12 @@ abstract class CommonDocGenerator
$resarray[$array_key.'_project_description'] = $object->project->description; $resarray[$array_key.'_project_description'] = $object->project->description;
$resarray[$array_key.'_project_date_start'] = dol_print_date($object->project->date_start, 'day'); $resarray[$array_key.'_project_date_start'] = dol_print_date($object->project->date_start, 'day');
$resarray[$array_key.'_project_date_end'] = dol_print_date($object->project->date_end, 'day'); $resarray[$array_key.'_project_date_end'] = dol_print_date($object->project->date_end, 'day');
} else { // empty replacement
$resarray[$array_key.'_project_ref'] ='';
$resarray[$array_key.'_project_title'] = '';
$resarray[$array_key.'_project_description'] = '';
$resarray[$array_key.'_project_date_start'] = '';
$resarray[$array_key.'_project_date_end'] = '';
} }
// Add vat by rates // Add vat by rates
@ -701,6 +707,14 @@ abstract class CommonDocGenerator
foreach ($tmpproduct->array_options as $key => $label) { foreach ($tmpproduct->array_options as $key => $label) {
$resarray["line_product_".$key] = $label; $resarray["line_product_".$key] = $label;
} }
} else {
// Set unused placeholders as blank
$extrafields->fetch_name_optionals_label("product");
$extralabels = $extrafields->attributes["product"]['label'];
foreach ($extralabels as $key => $label) {
$resarray['line_product_options_'.$key] = '';
}
} }
return $resarray; return $resarray;