Ver Fonte

Merge remote-tracking branch 'origin/3.7' into 3.8

# Conflicts:
#	htdocs/core/boxes/box_task.php
Juanjo Menent há 10 anos atrás
pai
commit
b2f5ae7aa8
2 ficheiros alterados com 3 adições e 1 exclusões
  1. 1 0
      ChangeLog
  2. 2 1
      htdocs/core/boxes/box_task.php

+ 1 - 0
ChangeLog

@@ -236,6 +236,7 @@ FIX [ bug 1925 ] "Link to order" option in supplier invoices is not working prop
 FIX [ bug #3198 ] Trigger LINECONTRACT_INSERT passes Contrat as $object instead of ContratLigne
 FIX: Not showing delivery date on rouget pdf
 FIX: Not showing task extrafields when creating from left menu
+FIX [ bug #3288 ] Tasks box is not properly drawn
 
 NEW: Created new ContratLigne::insert function
 

+ 2 - 1
htdocs/core/boxes/box_task.php

@@ -122,7 +122,8 @@ class box_task extends ModeleBoxes
 
 
 		// Add the sum à the bottom of the boxes
-		$this->info_box_contents[$i][0] = array('tr' => 'class="liste_total"', 'td' => 'align="left" ', 'text' => $langs->trans("Total")." ".$textHead);
+		$this->info_box_contents[$i][0] = array('tr' => 'class="liste_total"', 'td' => 'align="left"', 'text' => $langs->trans("Total")." ".$textHead);
+		$this->info_box_contents[$i][1] = array('td' => '', 'text' => "");
 		$this->info_box_contents[$i][2] = array('td' => 'align="right" ', 'text' => number_format($totalnb, 0, ',', ' ')." ".$langs->trans("Tasks"));
 		$this->info_box_contents[$i][3] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5));
 		$this->info_box_contents[$i][4] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5));