From 6ca736e8a5490905901f7d4bd823e95fd32bebbc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 14 Dec 2023 15:16:11 +0100 Subject: [PATCH] Debug v19 --- htdocs/core/tpl/objectline_view.tpl.php | 8 ++++++-- htdocs/fourn/facture/card.php | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index 25a6fac0b16..ef78b72ce1c 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -497,8 +497,12 @@ if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlin $coldisplay++; } } else { - print ''; - $coldisplay = $coldisplay + 3; + $colspan = 3; + if (isModEnabled('asset') && $object->element == 'invoice_supplier') { + $colspan++; + } + print ''; + $coldisplay = $coldisplay + $colspan; } if ($action == 'selectlines') { ?> diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 93b72fbd900..c9092bf5f0c 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -2751,6 +2751,7 @@ if ($action == 'create') { // Intracomm report if (isModEnabled('intracommreport')) { $langs->loadLangs(array("intracommreport")); + print ''."\n"; print ''.$langs->trans('IntracommReportTransportMode').''; $form->selectTransportMode(GETPOSTISSET('transport_mode_id') ? GETPOST('transport_mode_id') : $transport_mode_id, 'transport_mode_id'); print ''; @@ -3500,6 +3501,7 @@ if ($action == 'create') { // Intracomm report if (isModEnabled('intracommreport')) { $langs->loadLangs(array("intracommreport")); + print ''."\n"; print ''; print '
'; print $langs->trans('IntracommReportTransportMode');