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

Merge pull request #5863 from benlo06/fr_total_tva

Browse Source 
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
commit a28e2a7fb6
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/commonobject.class.php
View File

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

7
htdocs/core/tpl/objectline_view.tpl.php Normal file → Executable file
View File

@ -36,7 +36,7 @@
* $type, $text, $description, $line * $type, $text, $description, $line
*/ */
global $forceall, $senderissupplier, $inputalsopricewithtax, $usemargins; global $forceall, $senderissupplier, $inputalsopricewithtax, $usemargins, $outputalsopricetotalwithtax;
$usemargins=0; $usemargins=0;
if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1; if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
@ -45,6 +45,7 @@ if (empty($dateSelector)) $dateSelector=0;
if (empty($forceall)) $forceall=0; if (empty($forceall)) $forceall=0;
if (empty($senderissupplier)) $senderissupplier=0; if (empty($senderissupplier)) $senderissupplier=0;
if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0; if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
if (empty($outputalsopricetotalwithtax)) $outputalsopricetotalwithtax=0;
if (empty($usemargins)) $usemargins=0; if (empty($usemargins)) $usemargins=0;
?> ?>
<?php $coldisplay=0; ?> <?php $coldisplay=0; ?>
@ -203,6 +204,10 @@ if (empty($usemargins)) $usemargins=0;
<td align="right" class="linecolutotalht_currency nowrap"><?php $coldisplay++; ?><?php echo price($line->multicurrency_total_ht); ?></td> <td align="right" class="linecolutotalht_currency nowrap"><?php $coldisplay++; ?><?php echo price($line->multicurrency_total_ht); ?></td>
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
<?php if ($outputalsopricetotalwithtax) { ?>
<td align="right" class="liencolht nowrap"><?php $coldisplay++; ?><?php echo price($line->total_ttc); ?></td>
<?php } ?>
<?php <?php
if ($this->statut == 0 && ($object_rights->creer)) { ?> if ($this->statut == 0 && ($object_rights->creer)) { ?>