diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index a296b8656b9..5601152f90a 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -129,6 +129,7 @@ if ($result) { } else { dolibarr_print_error($db); } + // Ajoute paiements anciennes version non liés par paiement_facture if ($modecompta != 'CREANCES-DETTES') { $sql = "SELECT 'Autres' as nom, '0' as idp, sum(p.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm"; @@ -145,7 +146,6 @@ if ($modecompta != 'CREANCES-DETTES') { if ($result) { $num = $db->num_rows($result); $i = 0; - $var=true; if ($num) { while ($i < $num) { diff --git a/htdocs/theme/dev/dev.css b/htdocs/theme/dev/dev.css index dbebf45acd0..1284f09620a 100644 --- a/htdocs/theme/dev/dev.css +++ b/htdocs/theme/dev/dev.css @@ -376,21 +376,32 @@ div.titre { * */ tr.liste_titre { - background: #cacaca; - border: 1px solid #000000; - font-weight: bold; - text-decoration: none; - white-space: nowrap } + background: #cacaca; + border: 1px solid #000000; + font-weight: bold; + text-decoration: none; + white-space: nowrap +} + +tr.liste_total { + background: #F0F0F0; + font-weight: bold; + white-space: nowrap; + border-top: 1px solid #888888; +} tr.pair { - background: #dfdfdf; - border-bottom: 1px solid #000000; - text-decoration: none } + background: #dfdfdf; + border-bottom: 1px solid #000000; + text-decoration: none +} tr.impair { - background: #dfdfdf; - border-bottom: 1px solid #000000; - text-decoration: none } + background: #dfdfdf; + border-bottom: 1px solid #000000; + text-decoration: none +} + /* * */ diff --git a/htdocs/theme/dolibarr/dolibarr.css b/htdocs/theme/dolibarr/dolibarr.css index 05c1d248c33..6f98716b47a 100644 --- a/htdocs/theme/dolibarr/dolibarr.css +++ b/htdocs/theme/dolibarr/dolibarr.css @@ -376,52 +376,60 @@ div.titre { font-weight: bold; color: #336666; text-decoration: none } -/* - * - */ -tr.liste_titre { - background: #b3cccc; - font-family: Helvetica, Verdana; - font-size: 0.9em; - font-weight: bold; - border: 1px solid #8CACBB; - white-space: nowrap; - } - -tr.pair { - background: #b3cccc; - font-family: Helvetica, Verdana; - font-size: 0.9em; - } - -tr.impair { - background: #cceeee; - font-family: Helvetica, Verdana; - font-size: 0.9em; - } /* * */ -tr.box_titre { - font-family: Helvetica, Verdana; - font-size: 0.9em; - font-weight: bold; - } +tr.liste_titre { + background: #b3cccc; + font-family: Helvetica, Verdana; + font-size: 0.9em; + font-weight: bold; + border: 1px solid #8CACBB; + white-space: nowrap; +} -tr.box_pair { - background: #b3cccc; - font-size: 0.8em; - } +tr.liste_total { + background: #F0F0F0; + font-weight: bold; + white-space: nowrap; + border-top: 1px solid #888888; +} -tr.box_impair { - background: #cceeee; - font-size: 0.8em; - } +tr.pair { + background: #b3cccc; + font-family: Helvetica, Verdana; + font-size: 0.9em; +} -tr.fiche { - font-size: 0.6em; - } +tr.impair { + background: #cceeee; + font-family: Helvetica, Verdana; + font-size: 0.9em; +} + +/* + * + */ +tr.box_titre { + font-family: Helvetica, Verdana; + font-size: 0.9em; + font-weight: bold; +} + +tr.box_pair { + background: #b3cccc; + font-size: 0.8em; +} + +tr.box_impair { + background: #cceeee; + font-size: 0.8em; +} + +tr.fiche { +font-size: 0.6em; +} /* * diff --git a/htdocs/theme/eldy/eldy.css b/htdocs/theme/eldy/eldy.css index 8740819d804..701b8700767 100644 --- a/htdocs/theme/eldy/eldy.css +++ b/htdocs/theme/eldy/eldy.css @@ -537,6 +537,13 @@ border-bottom: 1px solid #FFFFFF; white-space: nowrap; } +tr.liste_total { +background: #F0F0F0; +font-weight: bold; +white-space: nowrap; +border-top: 1px solid #888888; +} + th { background: #7699A9; color: #334444; diff --git a/htdocs/theme/freelug/freelug.css b/htdocs/theme/freelug/freelug.css index c3ffe83b6a5..8108c8b8546 100644 --- a/htdocs/theme/freelug/freelug.css +++ b/htdocs/theme/freelug/freelug.css @@ -587,37 +587,46 @@ a.impayee:hover { font-weight: bold; color: #550000; } * ??? */ div.titre { - font: helvetica, verdana, arial, sans-serif; - font-weight: bold; - color: #777799; - text-decoration: none } + font: helvetica, verdana, arial, sans-serif; + font-weight: bold; + color: #777799; + text-decoration: none +} + /* * */ tr.liste_titre { -color: #FFFFFF; -background: #777799; -font: helvetica, verdana, arial, sans-serif; -font-weight: bold; -border-left: 1px solid #FFFFFF; -border-right: 1px solid #FFFFFF; -border-top: 1px solid #FFFFFF; -border-bottom: 1px solid #FFFFFF; -white-space: nowrap; -font-size: 1.0em; + color: #FFFFFF; + background: #777799; + font: helvetica, verdana, arial, sans-serif; + font-weight: bold; + border-left: 1px solid #FFFFFF; + border-right: 1px solid #FFFFFF; + border-top: 1px solid #FFFFFF; + border-bottom: 1px solid #FFFFFF; + white-space: nowrap; + font-size: 1.0em; +} + +tr.liste_total { + background: #F0F0F0; + font-weight: bold; + white-space: nowrap; + border-top: 1px solid #888888; } th { -color: #FFFFFF; -background: #777799; -font: helvetica, verdana, arial, sans-serif; -font-weight: bold; -border-left: 1px solid #FFFFFF; -border-right: 1px solid #FFFFFF; -border-top: 1px solid #FFFFFF; -border-bottom: 1px solid #FFFFFF; -white-space: nowrap; -font-size: 1.0em; + color: #FFFFFF; + background: #777799; + font: helvetica, verdana, arial, sans-serif; + font-weight: bold; + border-left: 1px solid #FFFFFF; + border-right: 1px solid #FFFFFF; + border-top: 1px solid #FFFFFF; + border-bottom: 1px solid #FFFFFF; + white-space: nowrap; + font-size: 1.0em; } diff --git a/htdocs/theme/yellow/yellow.css b/htdocs/theme/yellow/yellow.css index 08dd907d3d1..1a3c3d75267 100644 --- a/htdocs/theme/yellow/yellow.css +++ b/htdocs/theme/yellow/yellow.css @@ -572,38 +572,45 @@ div.titre { * */ tr.liste_titre { -background: #BBBB88; + background: #BBBB88; + + font: helvetica, verdana, arial, sans-serif; + font-weight: bold; + border-left: 1px solid #FFFFFF; + border-right: 1px solid #FFFFFF; + border-top: 1px solid #FFFFFF; + border-bottom: 1px solid #FFFFFF; + white-space: nowrap; + font-size: 1.0em; +} -font: helvetica, verdana, arial, sans-serif; -font-weight: bold; -border-left: 1px solid #FFFFFF; -border-right: 1px solid #FFFFFF; -border-top: 1px solid #FFFFFF; -border-bottom: 1px solid #FFFFFF; -white-space: nowrap; -font-size: 1.0em; +tr.liste_total { + background: #F0F0F0; + font-weight: bold; + white-space: nowrap; + border-top: 1px solid #888888; } th { -background: #BBBB88; -font: helvetica, verdana, arial, sans-serif; -font-weight: bold; -border-left: 1px solid #FFFFFF; -border-right: 1px solid #FFFFFF; -border-top: 1px solid #FFFFFF; -border-bottom: 1px solid #FFFFFF; -white-space: nowrap; -font-size: 1.0em; + background: #BBBB88; + font: helvetica, verdana, arial, sans-serif; + font-weight: bold; + border-left: 1px solid #FFFFFF; + border-right: 1px solid #FFFFFF; + border-top: 1px solid #FFFFFF; + border-bottom: 1px solid #FFFFFF; + white-space: nowrap; + font-size: 1.0em; } tr.pair { - background: #eeeecc; - font-size: 1.0em; - } + background: #eeeecc; + font-size: 1.0em; +} tr.impair { - background: #dcdcb3; - font-size: 1.0em; - } + background: #dcdcb3; + font-size: 1.0em; +} /* *