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

Merge pull request #5862 from joseplluis/patch-4

Browse Source 
Fix bug: replaced invoices in projects
This commit is contained in:
Laurent Destailleur 2016-10-11 19:48:31 +02:00 committed by GitHub
commit fb2987ad56
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/projet/element.php
View File

@ -5,6 +5,7 @@
* Copyright (C) 2012-2016 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2012-2016 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com> * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2016 Josep Lluís Amador <joseplluis@lliuretic.cat>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -484,7 +485,13 @@ foreach ($listofreferent as $key => $value)
} }
else $total_ht_by_line=$element->total_ht; else $total_ht_by_line=$element->total_ht;
$total_ht = $total_ht + $total_ht_by_line; $qualifiedfortotal=true;
if ($key == 'invoice')
{
if (! empty($element->close_code) && $element->close_code == 'replaced') $qualifiedfortotal=false; // Replacement invoice, do not include into total
}
if ($qualifiedfortotal) $total_ht = $total_ht + $total_ht_by_line;
if ($tablename == 'don') $total_ttc_by_line=$element->amount; if ($tablename == 'don') $total_ttc_by_line=$element->amount;
elseif ($tablename == 'projet_task') elseif ($tablename == 'projet_task')
@ -494,7 +501,7 @@ foreach ($listofreferent as $key => $value)
} }
else $total_ttc_by_line=$element->total_ttc; else $total_ttc_by_line=$element->total_ttc;
$total_ttc = $total_ttc + $total_ttc_by_line; if ($qualifiedfortotal) $total_ttc = $total_ttc + $total_ttc_by_line;
} }
// Calculate margin // Calculate margin