diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 1fecc0e1c28..b586241c11e 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -560,7 +560,7 @@ print '| | ';
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
- print '';
+ print ' | ';
print '';
print $annee;
if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee+1);
@@ -571,7 +571,7 @@ print '| '.$langs->trans("Month").
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
print ' | '.$langs->trans("Outcome").' | ';
- print ''.$langs->trans("Income").' | ';
+ print ''.$langs->trans("Income").' | ';
}
print ' ';
@@ -601,7 +601,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
}
print " | ";
- print ' ';
+ print ' | ';
//if (isset($encaiss_ttc[$case]) && $encaiss_ttc[$case] != 0)
if (isset($encaiss_ttc[$case]))
{
@@ -623,7 +623,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
$nbcols+=2;
print ' | '.(isset($totsorties[$annee])?price(price2num($totsorties[$annee],'MT')):' ').' | ';
- print ''.(isset($totentrees[$annee])?price(price2num($totentrees[$annee],'MT')):' ').' | ';
+ print ''.(isset($totentrees[$annee])?price(price2num($totentrees[$annee],'MT')):' ').' | ';
}
print "
\n";
@@ -637,7 +637,7 @@ $var=!$var;
print '| '.$langs->trans("Profit").' | ';
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
- print ' ';
+ print ' | ';
if (isset($totentrees[$annee]) || isset($totsorties[$annee]))
{
$in=(isset($totentrees[$annee])?price2num($totentrees[$annee], 'MT'):0);
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 69fdeff849c..b3fb130e185 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -184,7 +184,7 @@ print ' |
| | ';
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
if ($modecompta == 'CREANCES-DETTES') print '';
- else print ' | ';
+ else print ' | ';
print '';
print $annee;
if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee+1);
@@ -198,7 +198,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
if ($modecompta == 'CREANCES-DETTES') print ' | '.$langs->trans("AmountHT").' | ';
print ''.$langs->trans("AmountTTC").' | ';
- print ''.$langs->trans("Delta").' | ';
+ print ''.$langs->trans("Delta").' | ';
if ($annee != $year_end) print ' | ';
}
print '
';
@@ -244,7 +244,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
}
print "";
}
-
+
// Valeur CA du mois
print '';
if ($cum[$case])
@@ -266,29 +266,29 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
{
$percent=(round(($cum[$case]-$cum[$caseprev])/$cum[$caseprev],4)*100);
//print "X $cum[$case] - $cum[$caseprev] - $cum[$caseprev] - $percent X";
- print ' | '.($percent>=0?"+$percent":"$percent").'% | ';
+ print ''.($percent>=0?"+$percent":"$percent").'% | ';
}
if ($cum[$caseprev] && ! $cum[$case])
{
- print '-100% | ';
+ print '-100% | ';
}
if (! $cum[$caseprev] && $cum[$case])
{
//print '+Inf% | ';
- print '- | ';
+ print '- | ';
}
if (isset($cum[$caseprev]) && ! $cum[$caseprev] && ! $cum[$case])
{
- print '+0% | ';
+ print '+0% | ';
}
if (! isset($cum[$caseprev]) && ! $cum[$case])
{
- print '- | ';
+ print '- | ';
}
}
else
{
- print '';
+ print ' | ';
if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; }
else { print ' '; }
print ' | ';
@@ -382,7 +382,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
print ' | ';
}
}
-
+
// Montant total
if ($total[$annee] || ($annee >= $minyear && $annee <= max($nowyear,$maxyear)))
{
@@ -398,24 +398,24 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
if ($total[$annee-1] && $total[$annee]) {
$percent=(round(($total[$annee]-$total[$annee-1])/$total[$annee-1],4)*100);
- print ''.($percent>=0?"+$percent":"$percent").'% | ';
+ print ''.($percent>=0?"+$percent":"$percent").'% | ';
}
if ($total[$annee-1] && ! $total[$annee])
{
- print '-100% | ';
+ print '-100% | ';
}
if (! $total[$annee-1] && $total[$annee])
{
- print '+Inf% | ';
+ print '+Inf% | ';
}
if (! $total[$annee-1] && ! $total[$annee])
{
- print '+0% | ';
+ print '+0% | ';
}
}
else
{
- print '';
+ print ' | ';
if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear,$maxyear))) { print '-'; }
else { print ' '; }
print ' | ';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 0f5644dc406..3eb64ad5c2e 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -424,6 +424,10 @@ th .button {
border-radius: 10px;
}
+.borderrightlight
+{
+ border-right: 1px solid #DDD;
+}
/* ============================================================================== */
/* Styles to hide objects */
@@ -862,7 +866,7 @@ form#login {
max-width: 540px;
background-color: #FFFFFF;
-
+
-moz-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
-webkit-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
@@ -872,7 +876,7 @@ form#login {
border-radius: 8px;
border:solid 1px rgba(80,80,80,.4);
-
+
border-top:solid 1px f8f8f8;
/*
background-color: #f8f8f8;