diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 310dcb21808..15871c49b3b 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -1089,15 +1089,15 @@ if ($action == 'edit_price' && $object->getRights()->creer) print ''; // VAT - print ''; // Price base - print ''; - print ''; print ''; @@ -1105,7 +1105,7 @@ if ($action == 'edit_price' && $object->getRights()->creer) // Only show price mode and expression selector if module is enabled if (! empty($conf->dynamicprices->enabled)) { // Price mode selector - print 'global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) { - print ' colspan="2"'; - } - print '>'; + print ''; - if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) + if (! empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) { - print ''; + print '   '.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().''; } + print ''; print ''; - + print '
' . $langs->trans("VATRate") . ''; + print '
' . $langs->trans("VATRate") . ''; print $form->load_tva("tva_tx", $object->default_vat_code ? $object->tva_tx.' ('.$object->default_vat_code.')' : $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr, $object->type, false, 1); print '
'; + print '
'; print $langs->trans('PriceBase'); print ''; + print ''; print $form->selectPriceBaseType($object->price_base_type, "price_base_type"); print '
'.$langs->trans("PriceMode").''; + print '
'.$langs->trans("PriceMode").''; $price_expression = new PriceExpression($db); $price_expression_list = array(0 => $langs->trans("PriceNumeric")); //Put the numeric mode as first option foreach ($price_expression->list_price_expression() as $entry) { @@ -1141,10 +1141,10 @@ if ($action == 'edit_price' && $object->getRights()->creer) // Price $product = new Product($db); $product->fetch($id, $ref, '', 1); //Ignore the math expression when getting the price - print '
'; + print '
'; $text = $langs->trans('SellingPrice'); print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1); - print ''; + print ''; if ($object->price_base_type == 'TTC') { print ''; } else { @@ -1156,23 +1156,19 @@ if ($action == 'edit_price' && $object->getRights()->creer) print '
'; $text = $langs->trans('MinPrice'); print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1); - print ''; if ($object->price_base_type == 'TTC') { print ''; } else { print ''; } - print ''.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().'
'; dol_fiche_end();