Skip to content
Snippets Groups Projects
Commit e0db9a8c authored by Laurent Destailleur's avatar Laurent Destailleur Committed by GitHub
Browse files

Merge pull request #6169 from atm-gauthier/FIX_ttc_and_ht_must_always_be_available

FIX : HT and TTC price should always be displayed together
parents b3d5f40f 1f1c75ad
No related branches found
No related tags found
No related merge requests found
...@@ -1269,14 +1269,14 @@ if ($result) ...@@ -1269,14 +1269,14 @@ if ($result)
} }
else else
{ {
print '<td align="right">' . ($objp->price_base_type != 'TTC' ? price($objp->price) : ''). "</td>"; print '<td align="right">' . price($objp->price). "</td>";
print '<td align="right">' . ($objp->price_base_type == 'TTC' ? price($objp->price_ttc) : '') . "</td>"; print '<td align="right">' . price($objp->price_ttc) . "</td>";
if (! empty($conf->dynamicprices->enabled)) { //Only if module is enabled if (! empty($conf->dynamicprices->enabled)) { //Only if module is enabled
print '<td align="right"></td>'; print '<td align="right"></td>';
} }
} }
print '<td align="right">' . ($objp->price_base_type != 'TTC' ? price($objp->price_min) : '') . '</td>'; print '<td align="right">' . price($objp->price_min) . '</td>';
print '<td align="right">' . ($objp->price_base_type == 'TTC' ? price($objp->price_min_ttc) : '') . '</td>'; print '<td align="right">' . price($objp->price_min_ttc) . '</td>';
// User // User
print '<td align="right"><a href="' . DOL_URL_ROOT . '/user/card.php?id=' . $objp->user_id . '">' . img_object($langs->trans("ShowUser"), 'user') . ' ' . $objp->login . '</a></td>'; print '<td align="right"><a href="' . DOL_URL_ROOT . '/user/card.php?id=' . $objp->user_id . '">' . img_object($langs->trans("ShowUser"), 'user') . ' ' . $objp->login . '</a></td>';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment