From 9c45b781af9446be13f5760848d7250b9387bda7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 30 Apr 2019 16:44:11 +0200 Subject: [PATCH] Fix balance of colspan --- htdocs/compta/facture/card.php | 33 ++++++----------------- htdocs/core/class/commonobject.class.php | 2 ++ htdocs/core/tpl/objectline_create.tpl.php | 2 ++ htdocs/core/tpl/objectline_edit.tpl.php | 29 +++++++++++--------- htdocs/core/tpl/objectline_view.tpl.php | 5 +++- htdocs/theme/eldy/global.inc.php | 2 +- 6 files changed, 34 insertions(+), 39 deletions(-) diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 5e3873a83bc..cf27f54a82b 100755 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -4457,7 +4457,9 @@ elseif ($id > 0 || ! empty($ref)) // Show global modifiers if (! empty($conf->global->INVOICE_USE_SITUATION)) { - if ($object->situation_cycle_ref && $object->statut == 0) { + if ($object->situation_cycle_ref && $object->statut == 0) + { + print ''."\n"; print '
'; print '
'; @@ -4473,38 +4475,19 @@ elseif ($id > 0 || ! empty($ref)) if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { print ' '; } - print '' . $langs->trans('ModifyAllLines') . ''; - print ' '; - print ' '; - if ($inputalsopricewithtax) print ' '; - print ' '; - print ' '; - print '' . $langs->trans('Progress') . ''; - if (! empty($conf->margin->enabled) && empty($user->societe_id)) - { - print ' '; - if ((! empty($conf->global->DISPLAY_MARGIN_RATES) || ! empty($conf->global->DISPLAY_MARK_RATES)) && $usercanreadallmargin) { - print ' '; - } - } - print ' '; + print '' . $langs->trans('ModifyAllLines') . ''; + print '' . $langs->trans('Progress') . ''; print ' '; - print ' '; - print ' '; print "\n"; + print ''; // Adds a line numbering column if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { - print ' '; + print ' '; } - print ''; print ' '; - print ' '; - print ' '; - print ' '; - print ' '; print '%'; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 60bfd1e5305..8b20479a154 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3963,8 +3963,10 @@ abstract class CommonObject // Reduction short print ''.$langs->trans('ReductionShort').''; + // Fields for situation invoice if ($this->situation_cycle_ref) { print '' . $langs->trans('Progress') . ''; + //print '' . $langs->trans('TotalHT100') . ''; } if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id)) diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index 10446760bef..93140c02ef0 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -131,8 +131,10 @@ if ($nolinesbefore) { ?> trans('ReductionShort'); ?> situation_cycle_ref) { print '' . $langs->trans('Progress') . ''; + //print ''; } if (! empty($usemargins)) { diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index e373e5fbda2..f43357df781 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -60,12 +60,15 @@ if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf- global->MAIN_VIEW_LINE_NUMBER)) { ?> - +
@@ -137,6 +140,7 @@ $coldisplay=-1; // We remove first td element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') // We must have same test in printObjectLines { + $coldisplay++; ?> '; if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { + $coldisplay++; print ''; } @@ -183,6 +188,7 @@ $coldisplay=-1; // We remove first td global->PRODUCT_USE_UNITS) { + $coldisplay++; print ''; print $form->selectUnits($line->fk_unit, "units"); print ''; @@ -205,12 +211,11 @@ $coldisplay=-1; // We remove first td } if (! empty($usemargins)) { - if (!empty($user->rights->margins->creer)) { -?> - -rights->margins->creer)) + { $coldisplay++; -?> + ?> + product->enabled) || ! empty($conf->service->enabled)) { ?> @@ -218,8 +223,8 @@ $coldisplay=-1; // We remove first td - -rights->margins->creer) { if (! empty($conf->global->DISPLAY_MARGIN_RATES)) { @@ -246,7 +251,7 @@ $coldisplay=-1; // We remove first td ?> - + ">
"> @@ -263,9 +268,9 @@ if (!empty($extrafieldsline)) service->enabled) && $line->product_type == 1 && $dateSelector) { ?> global->MAIN_VIEW_LINE_NUMBER)) { ?> - + - trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?> + trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?> global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:''); print $form->selectDate($line->date_start, 'date_start', $hourmin, $hourmin, $line->date_start?0:1, "updateline", 1, 0); diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index a3bf7d587af..ba52a4a63c5 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -237,9 +237,12 @@ $domData .= ' data-product_type="'.$line->product_type.'"';   situation_cycle_ref) { + // Fields for situation invoices + if ($this->situation_cycle_ref) + { $coldisplay++; print '' . $line->situation_percent . '%'; + //print '' . $line->situation_percent . ''; } if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id)) diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 38b05e30b9f..b8ffa08fbaf 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -2958,7 +2958,7 @@ table.nobottomiftotal tr.liste_total td { background-color: #fff; border-bottom: 0px !important; } -table.nobottom { +table.nobottom, td.nobottom { border-bottom: 0px !important; } div.liste_titre .tagtd {