diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index c19c521ca65cf4f512ccb688d108349d6c87b154..59e52ac7b5d477f23fb58fb07425014ba7a9ef89 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -3327,7 +3327,7 @@ else if ($id > 0 || ! empty($ref)) print $object->situation_counter; print '</td>'; - print '<td align="right" class="nowrap">'; + print '<td align="left" class="nowrap">'; $prevsits_total_amount = 0; foreach ($prevsits as $situation) { @@ -3335,9 +3335,10 @@ else if ($id > 0 || ! empty($ref)) } $prevsits_total_amount += $object->total_ht; - print price($prevsits_total_amount); - print '</td>'; - print '<td>' . $langs->trans('Currency' . $conf->currency) . '</td></tr>'; + print price($prevsits_total_amount, 0, $langs, 1, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency) ); + + print '</td></tr>'; + // Previous situation(s) deduction(s) for ($i = 0; $i < $cprevsits; $i++) { @@ -3348,10 +3349,10 @@ else if ($id > 0 || ! empty($ref)) print $prevsits[$i]->situation_counter; print '</a></td>'; - print '<td align="right" class="nowrap">'; - print '- ' . price($prevsits[$i]->total_ht); - print '</td>'; - print '<td>' . $langs->trans('Currency' . $conf->currency) . '</td></tr>'; + print '<td align="left" class="nowrap">'; + print '- ' . price($prevsits[$i]->total_ht, 0, $langs, 1, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency) ); + print '</td></tr>'; + } } } diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index ea0ecc12f891d918f7acab7ec1e9ef4382b00d12..55da718cebc0145c75159bfa984ce197fbc2ca90 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -808,11 +808,6 @@ if (empty($reshook)) $price_min = $product->multiprices_min [$object->thirdparty->price_level]; $label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : ''); - - if ($price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent')) / 100) < price2num($price_min))) { - setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), null, 'errors'); - $error ++; - } } else { $type = GETPOST('type'); $label = (GETPOST('product_label') ? GETPOST('product_label') : '');