[ bug #83 ] Le montant du bénéfice par tiers sur le menu 'Résultat /
Exercice' est de format incorrect
This commit is contained in:
parent
c6a380d5b6
commit
4ea692f85a
@ -648,7 +648,9 @@ else
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
$db->free($result);
|
$db->free($result);
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
dol_print_error($db);
|
dol_print_error($db);
|
||||||
}
|
}
|
||||||
print "<tr $bc[$var]><td> </td>";
|
print "<tr $bc[$var]><td> </td>";
|
||||||
@ -662,8 +664,8 @@ else
|
|||||||
if ($mysoc->tva_assuj != 'franchise') // Assujeti
|
if ($mysoc->tva_assuj != 'franchise') // Assujeti
|
||||||
{
|
{
|
||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
if ($modecompta == 'CREANCES-DETTES') print '<td colspan="3" align="right">'.price(price2num($subtotal_ht)).'</td>';
|
if ($modecompta == 'CREANCES-DETTES') print '<td colspan="3" align="right">'.price(price2num($subtotal_ht,'MT')).'</td>';
|
||||||
print '<td colspan="3" align="right">'.price(price2num($subtotal_ttc)).'</td>';
|
print '<td colspan="3" align="right">'.price(price2num($subtotal_ttc,'MT')).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -676,16 +678,15 @@ if ($mysoc->tva_assuj != 'franchise') // Assujeti
|
|||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("Profit").'</td>';
|
print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("Profit").'</td>';
|
||||||
if ($modecompta == 'CREANCES-DETTES') print '<td class="liste_total" align="right">'.price(price2num($total_ht)).'</td>';
|
if ($modecompta == 'CREANCES-DETTES') print '<td class="liste_total" align="right">'.price(price2num($total_ht,'MT')).'</td>';
|
||||||
print '<td class="liste_total" align="right">'.price(price2num($total_ttc)).'</td>';
|
print '<td class="liste_total" align="right">'.price(price2num($total_ttc,'MT')).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
print "</table>";
|
print "</table>";
|
||||||
print '<br>';
|
print '<br>';
|
||||||
|
|
||||||
|
llxFooter();
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter();
|
|
||||||
?>
|
?>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user