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

FIX rendering of output of estimated amount on project overview page.

Browse Source
This commit is contained in:
Laurent Destailleur 2016-12-03 15:54:06 +01:00
parent 7a3b309013
commit 69b5baebc5
1 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
htdocs/projet/element.php
View File

@ -812,6 +812,8 @@ foreach ($listofreferent as $key => $value)
$warning=''; $warning='';
if (empty($value['disableamount'])) if (empty($value['disableamount']))
{ {
$total_ht_by_line=null;
$othermessage='';
if ($tablename == 'don') $total_ht_by_line=$element->amount; if ($tablename == 'don') $total_ht_by_line=$element->amount;
elseif ($tablename == 'projet_task') elseif ($tablename == 'projet_task')
{ {
@ -828,7 +830,7 @@ foreach ($listofreferent as $key => $value)
} }
else else
{ {
print $langs->trans("ModuleDisabled"); $othermessage=$form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
} }
} }
else else
@ -836,9 +838,13 @@ foreach ($listofreferent as $key => $value)
$total_ht_by_line=$element->total_ht; $total_ht_by_line=$element->total_ht;
} }
print '<td align="right">'; print '<td align="right">';
if (! $qualifiedfortotal) print '<strike>'; if ($othermessage) print $othermessage;
print (isset($total_ht_by_line)?price($total_ht_by_line):'&nbsp;'); if (isset($total_ht_by_line))
if (! $qualifiedfortotal) print '</strike>'; {
if (! $qualifiedfortotal) print '<strike>';
print price($total_ht_by_line);
if (! $qualifiedfortotal) print '</strike>';
}
if ($warning) print ' '.img_warning($warning); if ($warning) print ' '.img_warning($warning);
print '</td>'; print '</td>';
} }
@ -847,20 +853,33 @@ foreach ($listofreferent as $key => $value)
// Amount inc tax // Amount inc tax
if (empty($value['disableamount'])) if (empty($value['disableamount']))
{ {
$total_ttc_by_line=null;
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')
{ {
$defaultvat = get_default_tva($mysoc, $mysoc); if (! empty($conf->salaries->enabled))
$total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)),'MT'); {
// TODO Permission to read daily rate
$defaultvat = get_default_tva($mysoc, $mysoc);
$total_ttc_by_line = price2num($total_ht_by_line * (1 + ($defaultvat / 100)),'MT');
}
else
{
$othermessage=$form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
}
} }
else else
{ {
$total_ttc_by_line=$element->total_ttc; $total_ttc_by_line=$element->total_ttc;
} }
print '<td align="right">'; print '<td align="right">';
if (! $qualifiedfortotal) print '<strike>'; if ($othermessage) print $othermessage;
print (isset($total_ttc_by_line)?price($total_ttc_by_line):'&nbsp;'); if (isset($total_ttc_by_line))
if (! $qualifiedfortotal) print '</strike>'; {
if (! $qualifiedfortotal) print '<strike>';
print price($total_ttc_by_line);
if (! $qualifiedfortotal) print '</strike>';
}
if ($warning) print ' '.img_warning($warning); if ($warning) print ' '.img_warning($warning);
print '</td>'; print '</td>';
} }
@ -923,15 +942,25 @@ foreach ($listofreferent as $key => $value)
if ($breakline) print $breakline; if ($breakline) print $breakline;
// Total
print '<tr class="liste_total"><td colspan="4">'.$langs->trans("Number").': '.$i.'</td>'; print '<tr class="liste_total"><td colspan="4">'.$langs->trans("Number").': '.$i.'</td>';
//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td align="right" width="100">'.$langs->trans("TotalHT").' : '.price($total_ht).'</td>'; //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td align="right" width="100">'.$langs->trans("TotalHT").' : '.price($total_ht).'</td>';
//elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '<td align="right" width="100">'.$langs->trans("Total").' : '.price($total_ht).'</td>'; //elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '<td align="right" width="100">'.$langs->trans("Total").' : '.price($total_ht).'</td>';
if (empty($value['disableamount'])) print '<td align="right" width="100">'.$langs->trans("TotalHT").' : '.price($total_ht).'</td>'; print '<td align="right">';
else print '<td></td>'; if (empty($value['disableamount']))
{
if (! empty($conf->salaries->enabled)) print ''.$langs->trans("TotalHT").' : '.price($total_ht);
}
print '</td>';
//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td align="right" width="100">'.$langs->trans("TotalTTC").' : '.price($total_ttc).'</td>'; //if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print '<td align="right" width="100">'.$langs->trans("TotalTTC").' : '.price($total_ttc).'</td>';
//elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '<td align="right" width="100"></td>'; //elseif (empty($value['disableamount']) && in_array($tablename, array('projet_task'))) print '<td align="right" width="100"></td>';
if (empty($value['disableamount'])) print '<td align="right" width="100">'.$langs->trans("TotalTTC").' : '.price($total_ttc).'</td>'; print '<td align="right">';
else print '<td></td>'; if (empty($value['disableamount']))
{
if (! empty($conf->salaries->enabled)) print $langs->trans("TotalTTC").' : '.price($total_ttc);
}
print '</td>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
print '</tr>'; print '</tr>';
} }