New: Add net and without tax price of project referrer page.
This commit is contained in:
parent
afc7fb1b59
commit
71f00ce669
@ -21,7 +21,7 @@
|
|||||||
/**
|
/**
|
||||||
* \file htdocs/projet/element.php
|
* \file htdocs/projet/element.php
|
||||||
* \ingroup projet facture
|
* \ingroup projet facture
|
||||||
* \brief Page des elements par projet
|
* \brief Page of project referrers
|
||||||
* \version $Id$
|
* \version $Id$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -183,7 +183,8 @@ foreach ($listofreferent as $key => $value)
|
|||||||
print '<td width="100">'.$langs->trans("Ref").'</td>';
|
print '<td width="100">'.$langs->trans("Ref").'</td>';
|
||||||
print '<td width="100" align="center">'.$langs->trans("Date").'</td>';
|
print '<td width="100" align="center">'.$langs->trans("Date").'</td>';
|
||||||
print '<td>'.$langs->trans("ThirdParty").'</td>';
|
print '<td>'.$langs->trans("ThirdParty").'</td>';
|
||||||
if (empty($value['disableamount'])) print '<td align="right">'.$langs->trans("AmountHT").'</td>';
|
if (empty($value['disableamount'])) print '<td align="right" width="120">'.$langs->trans("AmountHT").'</td>';
|
||||||
|
if (empty($value['disableamount'])) print '<td align="right" width="120">'.$langs->trans("AmountTTC").'</td>';
|
||||||
print '<td align="right" width="200">'.$langs->trans("Status").'</td>';
|
print '<td align="right" width="200">'.$langs->trans("Status").'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
$elementarray = $project->get_element_list($key);
|
$elementarray = $project->get_element_list($key);
|
||||||
@ -220,16 +221,21 @@ foreach ($listofreferent as $key => $value)
|
|||||||
// Amount
|
// Amount
|
||||||
if (empty($value['disableamount'])) print '<td align="right">'.(isset($element->total_ht)?price($element->total_ht):' ').'</td>';
|
if (empty($value['disableamount'])) print '<td align="right">'.(isset($element->total_ht)?price($element->total_ht):' ').'</td>';
|
||||||
|
|
||||||
|
// Amount
|
||||||
|
if (empty($value['disableamount'])) print '<td align="right">'.(isset($element->total_ttc)?price($element->total_ttc):' ').'</td>';
|
||||||
|
|
||||||
// Status
|
// Status
|
||||||
print '<td align="right">'.$element->getLibStatut(5).'</td>';
|
print '<td align="right">'.$element->getLibStatut(5).'</td>';
|
||||||
|
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
$total = $total + $element->total_ht;
|
$total_ht = $total_ht + $element->total_ht;
|
||||||
|
$total_ttc = $total_ttc + $element->total_ttc;
|
||||||
}
|
}
|
||||||
|
|
||||||
print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Number").': '.$i.'</td>';
|
print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Number").': '.$i.'</td>';
|
||||||
if (empty($value['disableamount'])) print '<td align="right" width="100">'.$langs->trans("TotalHT").' : '.price($total).'</td>';
|
if (empty($value['disableamount'])) print '<td align="right" width="100">'.$langs->trans("TotalHT").' : '.price($total_ht).'</td>';
|
||||||
|
if (empty($value['disableamount'])) print '<td align="right" width="100">'.$langs->trans("TotalTTC").' : '.price($total_ttc).'</td>';
|
||||||
print '<td> </td>';
|
print '<td> </td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user