lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1355 from FHenry/3.4

Browse Source 
Fix [ bug #1202 ] Wrong amount in deposit % invoice from proposal
This commit is contained in:
Laurent Destailleur 2013-12-23 02:21:23 -08:00
commit 39e2c3262a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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: fix unsubscribe URL into mailing when sending manually (not by script)
Fix: [ bug #1182 ] ODT company_country tag is htmlencoded 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 #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 ***** ***** ChangeLog for 3.4.1 compared to 3.4.0 *****
Fix: Display buying price on line edit when no supplier price is defined Fix: Display buying price on line edit when no supplier price is defined

2
htdocs/compta/facture.php
View File

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