Automated merge from 23.0 to develop
This commit is contained in:
commit
ddf784c0a7
2 changed files with 10 additions and 7 deletions
|
|
@ -955,7 +955,7 @@ if ($object->id > 0) {
|
|||
}
|
||||
}
|
||||
$relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf';
|
||||
print $formfile->showPreview($file_list, $propal_static->element, $relativepath, 0);
|
||||
print $formfile->showPreview($file_list, $propal_static->element, $relativepath, 0, 'entity=' . $objp->entity);
|
||||
}
|
||||
print '</td><td class="tdoverflowmax125">';
|
||||
if ($propal_static->fk_project > 0) {
|
||||
|
|
@ -1076,7 +1076,7 @@ if ($object->id > 0) {
|
|||
}
|
||||
}
|
||||
$relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf';
|
||||
print $formfile->showPreview($file_list, $commande_static->element, $relativepath, 0, $param);
|
||||
print $formfile->showPreview($file_list, $commande_static->element, $relativepath, 0, 'entity=' . $objp->entity);
|
||||
}
|
||||
print '</td><td class="tdoverflowmax125">';
|
||||
if ($commande_static->fk_project > 0) {
|
||||
|
|
@ -1109,6 +1109,8 @@ if ($object->id > 0) {
|
|||
* Latest shipments
|
||||
*/
|
||||
if (isModEnabled("shipping") && $user->hasRight('expedition', 'lire')) {
|
||||
$param = 'entity=' . ((int) $objp->entity);
|
||||
|
||||
$sql = 'SELECT e.rowid as id';
|
||||
$sql .= ', e.ref, e.entity, e.fk_projet';
|
||||
$sql .= ', e.date_creation';
|
||||
|
|
@ -1177,7 +1179,8 @@ if ($object->id > 0) {
|
|||
}
|
||||
}
|
||||
$relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf';
|
||||
print $formfile->showPreview($file_list, $sendingstatic->table_element, $relativepath, 0, $param);
|
||||
|
||||
print $formfile->showPreview($file_list, $sendingstatic->element, $relativepath, 0, $param);
|
||||
}
|
||||
print '</td><td class="tdoverflowmax125">';
|
||||
if ($sendingstatic->fk_project > 0) {
|
||||
|
|
@ -1291,7 +1294,7 @@ if ($object->id > 0) {
|
|||
}
|
||||
}
|
||||
$relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf';
|
||||
print $formfile->showPreview($file_list, $contrat->element, $relativepath, 0);
|
||||
print $formfile->showPreview($file_list, $contrat->element, $relativepath, 0, 'entity=' . $objp->entity);
|
||||
}
|
||||
}
|
||||
// $filename = dol_sanitizeFileName($objp->ref);
|
||||
|
|
@ -1392,7 +1395,7 @@ if ($object->id > 0) {
|
|||
}
|
||||
}
|
||||
$relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf';
|
||||
print $formfile->showPreview($file_list, $fichinter_static->element, $relativepath, 0);
|
||||
print $formfile->showPreview($file_list, $fichinter_static->element, $relativepath, 0, 'entity=' . $objp->entity);
|
||||
}
|
||||
print '</td><td class="tdoverflowmax125">';
|
||||
if ($fichinter_static->fk_project > 0) {
|
||||
|
|
@ -1623,7 +1626,7 @@ if ($object->id > 0) {
|
|||
}
|
||||
}
|
||||
$relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf';
|
||||
print $formfile->showPreview($file_list, $facturestatic->element, $relativepath, 0);
|
||||
print $formfile->showPreview($file_list, $facturestatic->element, $relativepath, 0, 'entity=' . $objp->entity);
|
||||
}
|
||||
print '</td><td class="tdoverflowmax125">';
|
||||
if ($facturestatic->fk_project > 0) {
|
||||
|
|
|
|||
|
|
@ -316,7 +316,7 @@ class modProjet extends DolibarrModules
|
|||
}
|
||||
}
|
||||
// End add extra fields
|
||||
$this->import_fieldshidden_array[$r] = array('t.fk_user_creat'=>'user->id', 'extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'projet'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
|
||||
$this->import_fieldshidden_array[$r] = array('t.fk_user_creat'=>'user->id', 't.fk_user_modif'=>'user->id', 'extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'projet'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
|
||||
$this->import_convertvalue_array[$r] = array(
|
||||
't.ref' => array(
|
||||
'rule' => 'getrefifauto',
|
||||
|
|
|
|||
Loading…
Reference in a new issue