diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index ff9cb2c37fb..575c7985e3a 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -175,7 +175,7 @@ if ($resql)
print '
'.$obj->town.' | ';
print ''.$obj->code_client.' | ';
print ''.$obj->code_compta.' | ';
- print ''.dol_print_date($db->jdate($obj->datec)).' | ';
+ print ''.dol_print_date($db->jdate($obj->datec)).' | ';
print "\n";
$i++;
}
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index a87c4d868bf..5c88a0597d0 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -145,7 +145,7 @@ if ($resql)
{
print '';
print '| '.$commandestatic->LibStatut($status,$bool,0).' | ';
- print ''.(isset($vals[$status.$bool])?$vals[$status.$bool]:0).' ';
+ print ' | '.(isset($vals[$status.$bool])?$vals[$status.$bool]:0).' ';
print $commandestatic->LibStatut($status,$bool,3);
print '';
print ' | ';
@@ -153,7 +153,7 @@ if ($resql)
}
}
//if ($totalinprocess != $total)
- print '
| '.$langs->trans("Total").' | '.$total.' |
';
+ print '| '.$langs->trans("Total").' | '.$total.' |
';
print "
";
}
else
@@ -289,7 +289,7 @@ if ($resql)
print ' ';
print '';
- print '';
+ print ' | ';
$filename=dol_sanitizeFileName($obj->ref);
$filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
@@ -302,7 +302,7 @@ if ($resql)
print $companystatic->getNomUrl(1,'company',16);
print ' | ';
print ''.dol_print_date($db->jdate($obj->datem),'day').' | ';
- print ''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).' | ';
+ print ''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).' | ';
print '';
$i++;
}
@@ -369,7 +369,7 @@ if (! empty($conf->commande->enabled))
print ' ';
print '';
- print '';
+ print ' | ';
$filename=dol_sanitizeFileName($obj->ref);
$filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
@@ -382,7 +382,7 @@ if (! empty($conf->commande->enabled))
print $companystatic->getNomUrl(1,'company',24);
print ' | ';
- print ''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).' | ';
+ print ''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).' | ';
print '';
$i++;
@@ -451,7 +451,7 @@ if (! empty($conf->commande->enabled))
print ' ';
print '';
- print '';
+ print ' | ';
$filename=dol_sanitizeFileName($obj->ref);
$filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
@@ -464,7 +464,7 @@ if (! empty($conf->commande->enabled))
print $companystatic->getNomUrl(1,'company');
print ' | ';
- print ''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).' | ';
+ print ''.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).' | ';
print '';
$i++;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 739e3699133..178f68ddd05 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1025,7 +1025,7 @@ if ($resql)
// Amount HT
if (! empty($arrayfields['c.total_ht']['checked']))
{
- print ''.price($obj->total_ht)." | \n";
+ print ''.price($obj->total_ht)." | \n";
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalhtfield']=$totalarray['nbfield'];
$totalarray['totalht'] += $obj->total_ht;
@@ -1033,7 +1033,7 @@ if ($resql)
// Amount VAT
if (! empty($arrayfields['c.total_vat']['checked']))
{
- print ''.price($obj->total_tva)." | \n";
+ print ''.price($obj->total_tva)." | \n";
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield'];
$totalarray['totalvat'] += $obj->total_tva;
@@ -1041,7 +1041,7 @@ if ($resql)
// Amount TTC
if (! empty($arrayfields['c.total_ttc']['checked']))
{
- print ''.price($obj->total_ttc)." | \n";
+ print ''.price($obj->total_ttc)." | \n";
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
$totalarray['totalttc'] += $obj->total_ttc;
@@ -1072,7 +1072,7 @@ if ($resql)
// Status
if (! empty($arrayfields['c.fk_statut']['checked']))
{
- print ''.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).' | ';
+ print ''.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).' | ';
if (! $i) $totalarray['nbfield']++;
}
// Billed
@@ -1118,9 +1118,9 @@ if ($resql)
if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").' | ';
else print ''.$langs->trans("Totalforthispage").' | ';
}
- elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).' | ';
- elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).' | ';
- elseif ($totalarray['totalttcfield'] == $i) print ''.price($totalarray['totalttc']).' | ';
+ elseif ($totalarray['totalhtfield'] == $i) print ''.price($totalarray['totalht']).' | ';
+ elseif ($totalarray['totalvatfield'] == $i) print ''.price($totalarray['totalvat']).' | ';
+ elseif ($totalarray['totalttcfield'] == $i) print ''.price($totalarray['totalttc']).' | ';
else print ' | ';
}
print '';
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 6fc778fb064..a57430f7ee8 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -306,12 +306,12 @@ print '';
print '
';
print '';
print '| '.$langs->trans("Year").' | ';
-print ''.$langs->trans("NbOfOrders").' | ';
-print '% | ';
-print ''.$langs->trans("AmountTotal").' | ';
-print '% | ';
-print ''.$langs->trans("AmountAverage").' | ';
-print '% | ';
+print ''.$langs->trans("NbOfOrders").' | ';
+print '% | ';
+print ''.$langs->trans("AmountTotal").' | ';
+print '% | ';
+print ''.$langs->trans("AmountAverage").' | ';
+print '% | ';
print '
';
$oldyear=0;
@@ -324,24 +324,24 @@ foreach ($data as $val)
print '';
print '| 0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.' | ';
- print '0 | ';
- print ' | ';
- print '0 | ';
- print ' | ';
- print '0 | ';
- print ' | ';
+ print '0 | ';
+ print ' | ';
+ print '0 | ';
+ print ' | ';
+ print '0 | ';
+ print ' | ';
print '
';
}
print '';
print '| 0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.' | ';
- print ''.$val['nb'].' | ';
- print ''.round($val['nb_diff']).' | ';
- print ''.price(price2num($val['total'],'MT'),1).' | ';
- print ''.round($val['total_diff']).' | ';
- print ''.price(price2num($val['avg'],'MT'),1).' | ';
- print ''.round($val['avg_diff']).' | ';
+ print ''.$val['nb'].' | ';
+ print ''.round($val['nb_diff']).' | ';
+ print ''.price(price2num($val['total'],'MT'),1).' | ';
+ print ''.round($val['total_diff']).' | ';
+ print ''.price(price2num($val['avg'],'MT'),1).' | ';
+ print ''.round($val['avg_diff']).' | ';
print '
';
$oldyear=$year;
}
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index 392d2455e2a..840ba06980a 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -81,9 +81,9 @@ if (count($linkedObjectBlock) > 1)
|
|
|
- |
- |
- |
+ |
+ |
+ |