Skip to content

Commit

Permalink
git push origin 3.5Merge branch 'marcosgdf-bug-2577' into 3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Apr 18, 2015
2 parents b75722d + b7cf0de commit 5f49b2a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
1 change: 1 addition & 0 deletions ChangeLog
Expand Up @@ -13,6 +13,7 @@ Fix: [ bug #1846 ] Browser IE11 not detected
Fix: [ bug #1906 ] Deplacement does not allow translated decimal format
Fix: [ bug #1905 ] Custom deplacement types do not get translated in deplacement card
Fix: [ bug #2583 ] Unable to create a bank transfer with localized numbers
Fix: [ bug #2577 ] Incorrect invoice status in "Linked objects" page of a project

***** ChangeLog for 3.5.6 compared to 3.5.5 *****
Fix: Avoid missing class error for fetch_thirdparty method #1973
Expand Down
10 changes: 9 additions & 1 deletion htdocs/projet/element.php
Expand Up @@ -3,6 +3,7 @@
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2010 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
*
* 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
Expand Down Expand Up @@ -281,7 +282,14 @@
if (empty($value['disableamount'])) print '<td align="right">'.(isset($element->total_ttc)?price($element->total_ttc):'&nbsp;').'</td>';

// Status
print '<td align="right">'.$element->getLibStatut(5).'</td>';
print '<td align="right">';
if ($element instanceof CommonInvoice) {
//This applies for Facture and FactureFournisseur
print $element->getLibStatut(5, $element->getSommePaiement());
} else {
print $element->getLibStatut(5);
}
print '</td>';

print '</tr>';

Expand Down

0 comments on commit 5f49b2a

Please sign in to comment.