diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 81685f3fda8..4a943a921ce 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -193,7 +193,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
if ($total>0)
{
- print '
| '.$langs->trans("Total").' | '.price($total)." |
";
+ print '| '.$langs->trans("Total").' | '.price($total)." |
";
}
}
else
@@ -272,7 +272,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
}
if ($total>0)
{
- print '| '.$langs->trans("Total").' | '.price($total)." |
";
+ print '| '.$langs->trans("Total").' | '.price($total)." |
";
}
}
else
@@ -348,7 +348,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
print ''.price($obj->total_ht).' | ';
}
else {
- print ''.price($obj->total_ttc).' | ';
+ print ''.price($obj->total_ttc).' | ';
}
$i++;
$total += $obj->total_ttc;
@@ -356,7 +356,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
if ($total>0)
{
- print '| '.$langs->trans("Total").' | '.price($total)." |
";
+ print '| '.$langs->trans("Total").' | '.price($total)." |
";
}
}
else
@@ -435,7 +435,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande
print ''.price($obj->total_ht).' | ';
}
else {
- print ''.price($obj->total_ttc).' | ';
+ print ''.price($obj->total_ttc).' | ';
}
$i++;
$total += $obj->total_ttc;
@@ -443,7 +443,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande
if ($total>0)
{
- print '| '.$langs->trans("Total").' | '.price($total)." |
";
+ print '| '.$langs->trans("Total").' | '.price($total)." |
";
}
}
else
@@ -500,7 +500,7 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
else if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastModifiedProspects",$max);
else print $langs->trans("BoxTitleLastModifiedCustomers",$max);
print '';
- print ''.$langs->trans("FullList").' | ';
+ print ''.$langs->trans("FullList").' | ';
print '';
if ($num)
{
@@ -515,10 +515,10 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
$companystatic->canvas=$objp->canvas;
print '';
print '| '.$companystatic->getNomUrl(1,'customer',48).' | ';
- print '';
+ print ' | ';
print $companystatic->getLibCustProspStatut();
print " | ";
- print ''.dol_print_date($db->jdate($objp->tms),'day')." | ";
+ print ''.dol_print_date($db->jdate($objp->tms),'day')." | ";
print '
';
$i++;
}
@@ -560,7 +560,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire)
print '';
print '';
print '| '.$langs->trans("BoxTitleLastModifiedSuppliers",min($max,$num)).' | ';
- print ''.$langs->trans("FullList").' | ';
+ print ''.$langs->trans("FullList").' | ';
print '
';
if ($num)
{
@@ -574,7 +574,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire)
$companystatic->canvas=$objp->canvas;
print '';
print '| '.$companystatic->getNomUrl(1,'supplier',44).' | ';
- print ''.dol_print_date($db->jdate($objp->dm),'day').' | ';
+ print ''.dol_print_date($db->jdate($objp->dm),'day').' | ';
print '
';
$i++;
@@ -656,7 +656,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TO
$companystatic->canvas=$objp->canvas;
print $companystatic->getNomUrl(1,'customer',44);
print ''."\n";
- print "".$staticcontrat->LibStatut($obj->statut,3)." | \n";
+ print "".$staticcontrat->LibStatut($obj->statut,3)." | \n";
$i++;
}
@@ -743,13 +743,13 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
$companystatic->canvas=$obj->canvas;
print $companystatic->getNomUrl(1, 'customer', 44);
print '';
- print '';
+ print ' | ';
print dol_print_date($db->jdate($obj->dp),'day').' | '."\n";
if(! empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
- print ''.price($obj->total_ht).' | ';
+ print ''.price($obj->total_ht).' | ';
}
else {
- print ''.price($obj->total_ttc).' | ';
+ print ''.price($obj->total_ttc).' | ';
}
print ''.$propalstatic->LibStatut($obj->fk_statut,3).' | '."\n";
print ''."\n";
@@ -762,7 +762,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
}
else if ($total>0)
{
- print '| '.$langs->trans("Total")." | ".price($total)." | |
";
+ print '| '.$langs->trans("Total")." | ".price($total)." | |
";
}
print "
";
print "
";
@@ -847,13 +847,13 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
$companystatic->canvas=$obj->canvas;
print $companystatic->getNomUrl(1, 'customer', 44);
print '';
- print '';
+ print ' | ';
print dol_print_date($db->jdate($obj->dp),'day').' | '."\n";
if(! empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
- print ''.price($obj->total_ht).' | ';
+ print ''.price($obj->total_ht).' | ';
}
else {
- print ''.price($obj->total_ttc).' | ';
+ print ''.price($obj->total_ttc).' | ';
}
print ''.$orderstatic->LibStatut($obj->fk_statut,$obj->billed,3).' | '."\n";
print ''."\n";
@@ -866,7 +866,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
}
else if ($total>0)
{
- print '| '.$langs->trans("Total")." | ".price($total)." | |
";
+ print '| '.$langs->trans("Total")." | ".price($total)." | |
";
}
print "";
print "
";
diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php
index 7bbf727a517..aed6e0c53cb 100644
--- a/htdocs/comm/multiprix.php
+++ b/htdocs/comm/multiprix.php
@@ -149,7 +149,7 @@ if ($_socid > 0)
print '';
print '| '.$langs->trans("Date").' | ';
print ''.$langs->trans("PriceLevel").' | ';
- print ''.$langs->trans("User").' | ';
+ print ''.$langs->trans("User").' | ';
print '
';
$i = 0 ;
$num = $db->num_rows($resql);
@@ -163,7 +163,7 @@ if ($_socid > 0)
print ''.$obj->price_level.' | ';
$userstatic->id=$obj->uid;
$userstatic->lastname=$obj->login;
- print ''.$userstatic->getNomUrl(1).' | ';
+ print ''.$userstatic->getNomUrl(1).' | ';
print '';
$i++;
}
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index fe002f81a97..1d3aa865460 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -434,9 +434,9 @@ if ($socid > 0)
print ''.$langs->trans("Date").' | '; // Need 120+ for format with AM/PM
print ''.$langs->trans("ReasonDiscount").' | ';
print ''.$langs->trans("ConsumedBy").' | ';
- print ''.$langs->trans("AmountHT").' | ';
- print ''.$langs->trans("VATRate").' | ';
- print ''.$langs->trans("AmountTTC").' | ';
+ print ''.$langs->trans("AmountHT").' | ';
+ print ''.$langs->trans("VATRate").' | ';
+ print ''.$langs->trans("AmountTTC").' | ';
print ''.$langs->trans("DiscountOfferedBy").' | ';
print ' | ';
print '';
@@ -487,9 +487,9 @@ if ($socid > 0)
print '';
}
print ''.$langs->trans("NotConsumed").' | ';
- print ''.price($obj->amount_ht).' | ';
- print ''.price2num($obj->tva_tx,'MU').'% | ';
- print ''.price($obj->amount_ttc).' | ';
+ print ''.price($obj->amount_ht).' | ';
+ print ''.price2num($obj->tva_tx,'MU').'% | ';
+ print ''.price($obj->amount_ttc).' | ';
print '';
print ''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'';
print ' | ';
@@ -573,9 +573,9 @@ if ($socid > 0)
print ''.$langs->trans("Date").' | '; // Need 120+ for format with AM/PM
print ''.$langs->trans("ReasonDiscount").' | ';
print ''.$langs->trans("ConsumedBy").' | ';
- print ''.$langs->trans("AmountHT").' | ';
- print ''.$langs->trans("VATRate").' | ';
- print ''.$langs->trans("AmountTTC").' | ';
+ print ''.$langs->trans("AmountHT").' | ';
+ print ''.$langs->trans("VATRate").' | ';
+ print ''.$langs->trans("AmountTTC").' | ';
print ''.$langs->trans("DiscountOfferedBy").' | ';
print ' | ';
print '';
@@ -626,9 +626,9 @@ if ($socid > 0)
print '';
}
print ''.$langs->trans("NotConsumed").' | ';
- print ''.price($obj->amount_ht).' | ';
- print ''.price2num($obj->tva_tx,'MU').'% | ';
- print ''.price($obj->amount_ttc).' | ';
+ print ''.price($obj->amount_ht).' | ';
+ print ''.price2num($obj->tva_tx,'MU').'% | ';
+ print ''.price($obj->amount_ttc).' | ';
print '';
print ''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'';
print ' | ';
@@ -746,9 +746,9 @@ if ($socid > 0)
print ''.$langs->trans("Date").' | '; // Need 120+ for format with AM/PM
print ''.$langs->trans("ReasonDiscount").' | ';
print ''.$langs->trans("ConsumedBy").' | ';
- print ''.$langs->trans("AmountHT").' | ';
- print ''.$langs->trans("VATRate").' | ';
- print ''.$langs->trans("AmountTTC").' | ';
+ print ''.$langs->trans("AmountHT").' | ';
+ print ''.$langs->trans("VATRate").' | ';
+ print ''.$langs->trans("AmountTTC").' | ';
print ''.$langs->trans("Author").' | ';
print ' | ';
print '';
@@ -820,9 +820,9 @@ if ($socid > 0)
print '';
}
print ''.img_object($langs->trans("ShowBill"),'bill').' '.$obj->ref.' | ';
- print ''.price($obj->amount_ht).' | ';
- print ''.price2num($obj->tva_tx,'MU').'% | ';
- print ''.price($obj->amount_ttc).' | ';
+ print ''.price($obj->amount_ht).' | ';
+ print ''.price2num($obj->tva_tx,'MU').'% | ';
+ print ''.price($obj->amount_ttc).' | ';
print '';
print ''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'';
print ' | ';
@@ -900,9 +900,9 @@ if ($socid > 0)
print ''.$langs->trans("Date").' | '; // Need 120+ for format with AM/PM
print ''.$langs->trans("ReasonDiscount").' | ';
print ''.$langs->trans("ConsumedBy").' | ';
- print ''.$langs->trans("AmountHT").' | ';
- print ''.$langs->trans("VATRate").' | ';
- print ''.$langs->trans("AmountTTC").' | ';
+ print ''.$langs->trans("AmountHT").' | ';
+ print ''.$langs->trans("VATRate").' | ';
+ print ''.$langs->trans("AmountTTC").' | ';
print ''.$langs->trans("Author").' | ';
print ' | ';
print '';
@@ -974,9 +974,9 @@ if ($socid > 0)
print '';
}
print ''.img_object($langs->trans("ShowBill"),'bill').' '.$obj->ref.' | ';
- print ''.price($obj->amount_ht).' | ';
- print ''.price2num($obj->tva_tx,'MU').'% | ';
- print ''.price($obj->amount_ttc).' | ';
+ print ''.price($obj->amount_ht).' | ';
+ print ''.price2num($obj->tva_tx,'MU').'% | ';
+ print ''.price($obj->amount_ttc).' | ';
print '';
print ''.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'';
print ' | ';