diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 40242ee8068..799c06564df 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1563,14 +1563,14 @@ else
print '
';
print '| '.$langs->trans("ServiceNb", $cursorline).' | ';
print ''.$langs->trans("VAT").' | ';
- print ''.$langs->trans("PriceUHT").' | ';
+ print ''.$langs->trans("PriceUHT").' | ';
if (!empty($conf->multicurrency->enabled)) {
- print ''.$langs->trans("PriceUHTCurrency").' | ';
+ print ''.$langs->trans("PriceUHTCurrency").' | ';
}
print ''.$langs->trans("Qty").' | ';
- if ($conf->global->PRODUCT_USE_UNITS) print ''.$langs->trans("Unit").' | ';
- print ''.$langs->trans("ReductionShort").' | ';
- if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print ''.$langs->trans("BuyingPrice").' | ';
+ if ($conf->global->PRODUCT_USE_UNITS) print ''.$langs->trans("Unit").' | ';
+ print ''.$langs->trans("ReductionShort").' | ';
+ if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print ''.$langs->trans("BuyingPrice").' | ';
print ' | ';
print "
\n";
@@ -1618,10 +1618,10 @@ else
print vatrate($objp->tva_tx.($objp->vat_src_code?(' ('.$objp->vat_src_code.')'):''), '%', $objp->info_bits);
print '';
// Price
- print ''.($objp->subprice != '' ? price($objp->subprice) : '')." | \n";
+ print ''.($objp->subprice != '' ? price($objp->subprice) : '')." | \n";
// Price multicurrency
if (!empty($conf->multicurrency->enabled)) {
- print ''.price($objp->multicurrency_subprice).' | ';
+ print ''.price($objp->multicurrency_subprice).' | ';
}
// Quantite
print ''.$objp->qty.' | ';
@@ -1630,7 +1630,7 @@ else
// Remise
if ($objp->remise_percent > 0)
{
- print ''.$objp->remise_percent."% | \n";
+ print ''.$objp->remise_percent."% | \n";
}
else
{
@@ -1641,7 +1641,7 @@ else
if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print ''.price($objp->pa_ht).' | ';
// Icon move, update et delete (statut contrat 0=brouillon,1=valide,2=ferme)
- print '';
+ print ' | ';
if ($user->rights->contrat->creer && count($arrayothercontracts) && ($object->statut >= 0))
{
print '';
@@ -1746,10 +1746,10 @@ else
$doleditor->Create();
print ' | ';
- print '';
+ print ' | ';
print $form->load_tva("eltva_tx", $objp->tva_tx.($objp->vat_src_code?(' ('.$objp->vat_src_code.')'):''), $mysoc, $object->thirdparty, $objp->fk_product, $objp->info_bits, $objp->product_type, 0, 1);
print ' | ';
- print ' | ';
+ print ' | ';
print ' | ';
if ($conf->global->PRODUCT_USE_UNITS)
{
@@ -1757,10 +1757,10 @@ else
print $form->selectUnits($objp->fk_unit, "unit");
print '';
}
- print '% | ';
+ print '% | ';
if (! empty($usemargins))
{
- print '';
+ print ' | ';
if ($objp->fk_product) print '';
print ' | ';
}
@@ -1880,7 +1880,7 @@ else
print '';
print '| '.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).' | ';
- print '';
+ print ' | ';
if ($user->societe_id == 0)
{
if ($object->statut > 0 && $action != 'activateline' && $action != 'unactivateline')
|