Merge pull request #11442 from atm-john/9.0_Fix_column_price_display

Fix column price display
This commit is contained in:
Laurent Destailleur 2019-07-04 10:50:35 +02:00 committed by GitHub
commit 3d0a5d9f00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1557,12 +1557,12 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
{ {
print '<td class="right">'; print '<td class="right">';
if (empty($objp->price_by_qty)) { if (empty($objp->price_by_qty)) {
print ($objp->price_base_type != 'TTC' ? price($objp->price) : ''); print price($objp->price);
} }
print "</td>"; print "</td>";
print '<td class="right">'; print '<td class="right">';
if (empty($objp->price_by_qty)) { if (empty($objp->price_by_qty)) {
print ($objp->price_base_type == 'TTC' ? price($objp->price_ttc) : ''); print price($objp->price_ttc);
} }
print "</td>"; print "</td>";
if (! empty($conf->dynamicprices->enabled)) { //Only if module is enabled if (! empty($conf->dynamicprices->enabled)) { //Only if module is enabled
@ -1572,13 +1572,13 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
print '<td class="right">'; print '<td class="right">';
if (empty($objp->price_by_qty)) { if (empty($objp->price_by_qty)) {
print ($objp->price_base_type != 'TTC' ? price($objp->price_min) : ''); print price($objp->price_min);
} }
print '</td>'; print '</td>';
print '<td class="right">'; print '<td class="right">';
if (empty($objp->price_by_qty)) { if (empty($objp->price_by_qty)) {
print ($objp->price_base_type == 'TTC' ? price($objp->price_min_ttc) : ''); print price($objp->price_min_ttc);
} }
print '</td>'; print '</td>';