Merge pull request #5863 from benlo06/fr_total_tva

New: Permit to print TotalTTC price in objectline_view
This commit is contained in:
Laurent Destailleur
2016-11-08 14:46:16 +01:00
committed by GitHub
2 changed files with 9 additions and 2 deletions

View File

@@ -3280,7 +3280,7 @@ abstract class CommonObject
{
global $conf, $hookmanager, $langs, $user;
// TODO We should not use global var for this !
global $inputalsopricewithtax, $usemargins, $disableedit, $disablemove, $disableremove;
global $inputalsopricewithtax, $usemargins, $disableedit, $disablemove, $disableremove, $outputalsopricetotalwithtax;
// Define usemargins
$usemargins=0;
@@ -3343,6 +3343,8 @@ abstract class CommonObject
// Multicurrency
if (!empty($conf->multicurrency->enabled)) print '<td class="linecoltotalht_currency" align="right">'.$langs->trans('TotalHTShortCurrency').'</td>';
if ($outputalsopricetotalwithtax) print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>';
print '<td class="linecoledit"></td>'; // No width to allow autodim
print '<td class="linecoldelete" width="10"></td>';