Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0

Dolibarr · Feb 4, 2018 · 906a9ea · 906a9ea
2 parents dbe45d0 + e5cb2be
commit 906a9ea
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
@@ -636,7 +636,7 @@
 			$i = 0;
 			foreach ($object->lines as $line)
 			{
-				if ($line->total_ht!=0)
+				if ($line->product_type < 9 && $line->total_ht != 0) // Remove lines with product_type greater than or equal to 9
 				{ 	// no need to create discount if amount is null
 					$amount_ht[$line->tva_tx] += $line->total_ht;
 					$amount_tva[$line->tva_tx] += $line->total_tva;