Merge pull request #1355 from FHenry/3.4

Fix [ bug #1202 ] Wrong amount in deposit % invoice from proposal

ChangeLog

@@ -22,6 +22,7 @@ Fix: [ bug #1171 ] Documents lost in interventions after validating
 Fix: fix unsubscribe URL into mailing when sending manually (not by script)
 Fix: [ bug #1182 ] ODT company_country tag is htmlencoded
 Fix: [ bug #1196 ] Product barcode search does not expect 13th digit on EAN13 type
+Fix: [ bug #1202 ] Wrong amount in deposit % invoice from proposal
 
 ***** ChangeLog for 3.4.1 compared to 3.4.0 *****
 Fix: Display buying price on line edit when no supplier price is defined

htdocs/compta/facture.php

@@ -900,7 +900,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
 								$numlines=count($lines);
 								for ($i=0; $i<$numlines; $i++)
 								{
-									$totalamount += $lines[$i]->subprice;
+									$totalamount += $lines[$i]->total_ht;
 								}
 
 								if ($totalamount!=0)