Task #1045 - Amélioration apparence :
Amélioration thème light Correct bug dans Acc_Ledger_Purchase, résumé des totaux
This commit is contained in:
Dany De Bontridder
parent
2d51f52da1
commit
b0954f8e2a
5 changed files with 78 additions and 50 deletions
|
|
@ -5,8 +5,8 @@ BODY {
|
|||
font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
|
||||
padding: 0px 0px 0px 0px ;
|
||||
margin:0px;
|
||||
color:#605D5D;
|
||||
font-size:100%;
|
||||
color: #494141;
|
||||
font-size: 90%;
|
||||
}
|
||||
*|*:link {
|
||||
color: inherit;
|
||||
|
|
@ -42,7 +42,7 @@ table.sortable th, table.table_large th,table.result th {
|
|||
|
||||
h2 {
|
||||
font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
|
||||
color:#888;
|
||||
/* color:#888; */
|
||||
margin:1px;
|
||||
padding:1px;
|
||||
font-style: italic;
|
||||
|
|
@ -70,8 +70,6 @@ redcontent h2.info {
|
|||
margin:0px;
|
||||
}
|
||||
h2.info {
|
||||
background-color:#879ED4;
|
||||
color:#FFFFFF;
|
||||
text-align:center;
|
||||
padding:0px;
|
||||
margin:0px;
|
||||
|
|
@ -311,7 +309,7 @@ tr.odd {
|
|||
|
||||
tr.highlight {
|
||||
font-weight: bold;
|
||||
background:darkblue;
|
||||
background:darkslategrey;
|
||||
color:white;
|
||||
|
||||
}
|
||||
|
|
@ -334,7 +332,7 @@ td.cell{
|
|||
}
|
||||
|
||||
td.mtitle a.mtitle, div.content td.mtitle a.mtitle {
|
||||
color:darkslategrey;
|
||||
color:white;;
|
||||
/* font-variant: small-caps;*/
|
||||
}
|
||||
a.mtitle {
|
||||
|
|
@ -400,6 +398,10 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#596a72', end
|
|||
border-bottom-color: red;
|
||||
border-bottom-style: solid;
|
||||
border-bottom-width: 2px;
|
||||
border-top-color:red;
|
||||
border-top-style:solid;
|
||||
border-top-width:2px;
|
||||
|
||||
}
|
||||
td.mtitle:hover a , div.content a.mtitle:hover {
|
||||
background:transparent;
|
||||
|
|
@ -848,14 +850,14 @@ a#anchorbutton, .button, a.button,div.content a.button {
|
|||
font-weight: bold;
|
||||
text-decoration:none;
|
||||
font-family: arial,verdana,sans-serif,helvetica;
|
||||
background: rgb(174,188,191); /* Old browsers */
|
||||
background: -moz-linear-gradient(top, rgba(174,188,191,1) 0%, rgba(110,119,116,1) 50%, rgba(10,14,10,1) 51%, rgba(10,8,9,1) 100%); /* FF3.6+ */
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(174,188,191,1)), color-stop(50%,rgba(110,119,116,1)), color-stop(51%,rgba(10,14,10,1)), color-stop(100%,rgba(10,8,9,1))); /* Chrome,Safari4+ */
|
||||
background: -webkit-linear-gradient(top, rgba(174,188,191,1) 0%,rgba(110,119,116,1) 50%,rgba(10,14,10,1) 51%,rgba(10,8,9,1) 100%); /* Chrome10+,Safari5.1+ */
|
||||
background: -o-linear-gradient(top, rgba(174,188,191,1) 0%,rgba(110,119,116,1) 50%,rgba(10,14,10,1) 51%,rgba(10,8,9,1) 100%); /* Opera 11.10+ */
|
||||
background: -ms-linear-gradient(top, rgba(174,188,191,1) 0%,rgba(110,119,116,1) 50%,rgba(10,14,10,1) 51%,rgba(10,8,9,1) 100%); /* IE10+ */
|
||||
background: linear-gradient(to bottom, rgba(174,188,191,1) 0%,rgba(110,119,116,1) 50%,rgba(10,14,10,1) 51%,rgba(10,8,9,1) 100%); /* W3C */
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#aebcbf', endColorstr='#0a0809',GradientType=0 ); /* IE6-9 */
|
||||
background: #606c88; /* Old browsers */
|
||||
background: -moz-linear-gradient(top, #606c88 0%, #3f4c6b 100%); /* FF3.6+ */
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#606c88), color-stop(100%,#3f4c6b)); /* Chrome,Safari4+ */
|
||||
background: -webkit-linear-gradient(top, #606c88 0%,#3f4c6b 100%); /* Chrome10+,Safari5.1+ */
|
||||
background: -o-linear-gradient(top, #606c88 0%,#3f4c6b 100%); /* Opera 11.10+ */
|
||||
background: -ms-linear-gradient(top, #606c88 0%,#3f4c6b 100%); /* IE10+ */
|
||||
background: linear-gradient(to bottom, #606c88 0%,#3f4c6b 100%); /* W3C */
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#606c88', endColorstr='#3f4c6b',GradientType=0 ); /* IE6-9 */
|
||||
border-color: #605D5D;
|
||||
border-width:0px;
|
||||
padding:4px;
|
||||
|
|
@ -895,15 +897,14 @@ a#smallanchorbutton, .smallbutton, a.smallbutton,div.content a.smallbutton {
|
|||
margin:1px 2px 1px 2px;
|
||||
border-radius: 2px;
|
||||
moz-border-radius:2px;
|
||||
background: rgb(174,188,191); /* Old browsers */
|
||||
background: -moz-linear-gradient(top, rgba(174,188,191,1) 0%, rgba(110,119,116,1) 50%, rgba(10,14,10,1) 51%, rgba(10,8,9,1) 100%); /* FF3.6+ */
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(174,188,191,1)), color-stop(50%,rgba(110,119,116,1)), color-stop(51%,rgba(10,14,10,1)), color-stop(100%,rgba(10,8,9,1))); /* Chrome,Safari4+ */
|
||||
background: -webkit-linear-gradient(top, rgba(174,188,191,1) 0%,rgba(110,119,116,1) 50%,rgba(10,14,10,1) 51%,rgba(10,8,9,1) 100%); /* Chrome10+,Safari5.1+ */
|
||||
background: -o-linear-gradient(top, rgba(174,188,191,1) 0%,rgba(110,119,116,1) 50%,rgba(10,14,10,1) 51%,rgba(10,8,9,1) 100%); /* Opera 11.10+ */
|
||||
background: -ms-linear-gradient(top, rgba(174,188,191,1) 0%,rgba(110,119,116,1) 50%,rgba(10,14,10,1) 51%,rgba(10,8,9,1) 100%); /* IE10+ */
|
||||
background: linear-gradient(to bottom, rgba(174,188,191,1) 0%,rgba(110,119,116,1) 50%,rgba(10,14,10,1) 51%,rgba(10,8,9,1) 100%); /* W3C */
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#aebcbf', endColorstr='#0a0809',GradientType=0 ); /* IE6-9 */
|
||||
|
||||
background: #606c88; /* Old browsers */
|
||||
background: -moz-linear-gradient(top, #606c88 0%, #3f4c6b 100%); /* FF3.6+ */
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#606c88), color-stop(100%,#3f4c6b)); /* Chrome,Safari4+ */
|
||||
background: -webkit-linear-gradient(top, #606c88 0%,#3f4c6b 100%); /* Chrome10+,Safari5.1+ */
|
||||
background: -o-linear-gradient(top, #606c88 0%,#3f4c6b 100%); /* Opera 11.10+ */
|
||||
background: -ms-linear-gradient(top, #606c88 0%,#3f4c6b 100%); /* IE10+ */
|
||||
background: linear-gradient(to bottom, #606c88 0%,#3f4c6b 100%); /* W3C */
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#606c88', endColorstr='#3f4c6b',GradientType=0 ); /* IE6-9 */
|
||||
}
|
||||
a#smallanchorbutton:hover, .smallbutton:hover,a.smallbutton:hover,div.content a.smallbutton:hover {
|
||||
cursor:pointer;
|
||||
|
|
@ -940,23 +941,42 @@ div.topmenu td, td.mtitle {
|
|||
border-bottom-color: #333030;
|
||||
border-bottom-width: 2px;
|
||||
border-bottom-style: solid;
|
||||
border-top-color: #333030;
|
||||
border-top-width: 2px;
|
||||
border-top-style: solid;
|
||||
background: rgb(96,108,136); /* Old browsers */
|
||||
background: -moz-linear-gradient(top, rgba(96,108,136,1) 40%, rgba(63,76,107,1) 70%); /* FF3.6+ */
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(40%,rgba(96,108,136,1)), color-stop(70%,rgba(63,76,107,1))); /* Chrome,Safari4+ */
|
||||
background: -webkit-linear-gradient(top, rgba(96,108,136,1) 40%,rgba(63,76,107,1) 70%); /* Chrome10+,Safari5.1+ */
|
||||
background: -o-linear-gradient(top, rgba(96,108,136,1) 40%,rgba(63,76,107,1) 70%); /* Opera 11.10+ */
|
||||
background: -ms-linear-gradient(top, rgba(96,108,136,1) 40%,rgba(63,76,107,1) 70%); /* IE10+ */
|
||||
background: linear-gradient(to bottom, rgba(96,108,136,1) 40%,rgba(63,76,107,1) 70%); /* W3C */
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#606c88', endColorstr='#3f4c6b',GradientType=0 ); /* IE6-9 */
|
||||
|
||||
}
|
||||
div.menu2 td, div.menu2 td.mtitle {
|
||||
border-width:1px;
|
||||
border-bottom-color: #333030;
|
||||
border-bottom-width: 2px;
|
||||
border-bottom-style: solid;
|
||||
border-style: 1px;
|
||||
border-style: solid;
|
||||
border-color: #5D90CD;
|
||||
border-radius : 5px 5px 0px 0px;
|
||||
background: white;
|
||||
/* border-radius : 5px 5px 0px 0px; */
|
||||
|
||||
background: -moz-linear-gradient(top, rgba(96,108,136,1) 40%, rgba(63,76,107,1) 70%); /* FF3.6+ */
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(40%,rgba(96,108,136,1)), color-stop(70%,rgba(63,76,107,1))); /* Chrome,Safari4+ */
|
||||
background: -webkit-linear-gradient(top, rgba(96,108,136,1) 40%,rgba(63,76,107,1) 70%); /* Chrome10+,Safari5.1+ */
|
||||
background: -o-linear-gradient(top, rgba(96,108,136,1) 40%,rgba(63,76,107,1) 70%); /* Opera 11.10+ */
|
||||
background: -ms-linear-gradient(top, rgba(96,108,136,1) 40%,rgba(63,76,107,1) 70%); /* IE10+ */
|
||||
background: linear-gradient(to bottom, rgba(96,108,136,1) 40%,rgba(63,76,107,1) 70%); /* W3C */
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#606c88', endColorstr='#3f4c6b',GradientType=0 ); /* IE6-9 */
|
||||
}
|
||||
div.menu2 td.selectedcell a.mtitle,div.content div.menu2 td.selectedcell a.mtitle
|
||||
{
|
||||
color : red;
|
||||
/* color:red; */
|
||||
}
|
||||
div.topmenu td.selected,td.selectedcell{
|
||||
border-radius: 2px 50px 0px 16px;
|
||||
|
||||
background: rgb(96,108,136); /* Old browsers */
|
||||
background: -moz-linear-gradient(top, rgba(96,108,136,1) 40%, rgba(63,76,107,1) 70%); /* FF3.6+ */
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(40%,rgba(96,108,136,1)), color-stop(70%,rgba(63,76,107,1))); /* Chrome,Safari4+ */
|
||||
|
|
@ -965,7 +985,9 @@ background: -o-linear-gradient(top, rgba(96,108,136,1) 40%,rgba(63,76,107,1) 70%
|
|||
background: -ms-linear-gradient(top, rgba(96,108,136,1) 40%,rgba(63,76,107,1) 70%); /* IE10+ */
|
||||
background: linear-gradient(to bottom, rgba(96,108,136,1) 40%,rgba(63,76,107,1) 70%); /* W3C */
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#606c88', endColorstr='#3f4c6b',GradientType=0 ); /* IE6-9 */
|
||||
font-weight: bold;
|
||||
border-bottom-color:red !important;
|
||||
border-bottom-width : 4px !important;
|
||||
border-bottom-style:solid;
|
||||
color:#FFFFFF;
|
||||
text-align:center;
|
||||
width:120px;
|
||||
|
|
@ -1315,14 +1337,22 @@ h1.title {
|
|||
}
|
||||
h2.title {
|
||||
|
||||
background: rgb(149,149,149); /* Old browsers */
|
||||
background: -moz-linear-gradient(top, rgba(149,149,149,1) 0%, rgba(13,13,13,1) 46%, rgba(1,1,1,1) 50%, rgba(10,10,10,1) 53%, rgba(78,78,78,1) 76%, rgba(56,56,56,1) 87%, rgba(27,27,27,1) 100%); /* FF3.6+ */
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(149,149,149,1)), color-stop(46%,rgba(13,13,13,1)), color-stop(50%,rgba(1,1,1,1)), color-stop(53%,rgba(10,10,10,1)), color-stop(76%,rgba(78,78,78,1)), color-stop(87%,rgba(56,56,56,1)), color-stop(100%,rgba(27,27,27,1))); /* Chrome,Safari4+ */
|
||||
background: -webkit-linear-gradient(top, rgba(149,149,149,1) 0%,rgba(13,13,13,1) 46%,rgba(1,1,1,1) 50%,rgba(10,10,10,1) 53%,rgba(78,78,78,1) 76%,rgba(56,56,56,1) 87%,rgba(27,27,27,1) 100%); /* Chrome10+,Safari5.1+ */
|
||||
background: -o-linear-gradient(top, rgba(149,149,149,1) 0%,rgba(13,13,13,1) 46%,rgba(1,1,1,1) 50%,rgba(10,10,10,1) 53%,rgba(78,78,78,1) 76%,rgba(56,56,56,1) 87%,rgba(27,27,27,1) 100%); /* Opera 11.10+ */
|
||||
background: -ms-linear-gradient(top, rgba(149,149,149,1) 0%,rgba(13,13,13,1) 46%,rgba(1,1,1,1) 50%,rgba(10,10,10,1) 53%,rgba(78,78,78,1) 76%,rgba(56,56,56,1) 87%,rgba(27,27,27,1) 100%); /* IE10+ */
|
||||
background: linear-gradient(to bottom, rgba(149,149,149,1) 0%,rgba(13,13,13,1) 46%,rgba(1,1,1,1) 50%,rgba(10,10,10,1) 53%,rgba(78,78,78,1) 76%,rgba(56,56,56,1) 87%,rgba(27,27,27,1) 100%); /* W3C */
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#959595', endColorstr='#1b1b1b',GradientType=0 ); /* IE6-9 */
|
||||
// background: rgb(149,149,149); /* Old browsers */
|
||||
// background: -moz-linear-gradient(top, rgba(149,149,149,1) 0%, rgba(13,13,13,1) 46%, rgba(1,1,1,1) 50%, rgba(10,10,10,1) 53%, rgba(78,78,78,1) 76%, rgba(56,56,56,1) 87%, rgba(27,27,27,1) 100%); /* FF3.6+ */
|
||||
// background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(149,149,149,1)), color-stop(46%,rgba(13,13,13,1)), color-stop(50%,rgba(1,1,1,1)), color-stop(53%,rgba(10,10,10,1)), color-stop(76%,rgba(78,78,78,1)), color-stop(87%,rgba(56,56,56,1)), color-stop(100%,rgba(27,27,27,1))); /* Chrome,Safari4+ */
|
||||
// background: -webkit-linear-gradient(top, rgba(149,149,149,1) 0%,rgba(13,13,13,1) 46%,rgba(1,1,1,1) 50%,rgba(10,10,10,1) 53%,rgba(78,78,78,1) 76%,rgba(56,56,56,1) 87%,rgba(27,27,27,1) 100%); /* Chrome10+,Safari5.1+ */
|
||||
// background: -o-linear-gradient(top, rgba(149,149,149,1) 0%,rgba(13,13,13,1) 46%,rgba(1,1,1,1) 50%,rgba(10,10,10,1) 53%,rgba(78,78,78,1) 76%,rgba(56,56,56,1) 87%,rgba(27,27,27,1) 100%); /* Opera 11.10+ */
|
||||
// background: -ms-linear-gradient(top, rgba(149,149,149,1) 0%,rgba(13,13,13,1) 46%,rgba(1,1,1,1) 50%,rgba(10,10,10,1) 53%,rgba(78,78,78,1) 76%,rgba(56,56,56,1) 87%,rgba(27,27,27,1) 100%); /* IE10+ */
|
||||
///background: linear-gradient(to bottom, rgba(149,149,149,1) 0%,rgba(13,13,13,1) 46%,rgba(1,1,1,1) 50%,rgba(10,10,10,1) 53%,rgba(78,78,78,1) 76%,rgba(56,56,56,1) 87%,rgba(27,27,27,1) 100%); /* W3C */
|
||||
background: #606c88; /* Old browsers */
|
||||
background: -moz-linear-gradient(top, #606c88 0%, #3f4c6b 100%); /* FF3.6+ */
|
||||
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#606c88), color-stop(100%,#3f4c6b)); /* Chrome,Safari4+ */
|
||||
background: -webkit-linear-gradient(top, #606c88 0%,#3f4c6b 100%); /* Chrome10+,Safari5.1+ */
|
||||
background: -o-linear-gradient(top, #606c88 0%,#3f4c6b 100%); /* Opera 11.10+ */
|
||||
background: -ms-linear-gradient(top, #606c88 0%,#3f4c6b 100%); /* IE10+ */
|
||||
background: linear-gradient(to bottom, #606c88 0%,#3f4c6b 100%); /* W3C */
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#606c88', endColorstr='#3f4c6b',GradientType=0 ); /* IE6-9 */
|
||||
//filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#959595', endColorstr='#1b1b1b',GradientType=0 ); /* IE6-9 */
|
||||
color:#FFFFFF;
|
||||
text-align:center;
|
||||
padding:0.24%;
|
||||
|
|
@ -1364,6 +1394,7 @@ div.myfieldset
|
|||
div.menu2 a.mtitle{
|
||||
font-size:13.60px;
|
||||
font-size:0.85rem;
|
||||
/* color:brown; */
|
||||
}
|
||||
div.menu3 {
|
||||
font-size:13.60px;
|
||||
|
|
|
|||
|
|
@ -520,10 +520,6 @@ div.redcontent a.mtitle:hover {
|
|||
div.content a.mtitle {
|
||||
text-decoration:none;
|
||||
display:inline;
|
||||
color:#FF7F50;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
div.content a.mtitle:hover {
|
||||
|
|
|
|||
|
|
@ -1541,7 +1541,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
|
|||
{$tot_amount}
|
||||
</td>
|
||||
<td class="num">
|
||||
{$tot_amount}
|
||||
{$tot}
|
||||
</td>
|
||||
EOF;
|
||||
|
||||
|
|
@ -1552,12 +1552,11 @@ EOF;
|
|||
|
||||
$r.=(! $p_summary )?'<div id="total_div_id" style="float:right;width:30%;margin-top:50px;">':'<div>';
|
||||
$r.='<h2>Totaux</h2>';
|
||||
$tot = round(bcadd($tot_amount, $tot_tva), 2);
|
||||
/* use VAT */
|
||||
if ($g_parameter->MY_TVA_USE == 'Y') {
|
||||
$r.='<table>';
|
||||
$r.='<tr><td>Total HTVA</td>';
|
||||
$r.=td(hb(nbm($tot_amount) ),'class="num"');
|
||||
$r.=td(hb($tot_amount ),'class="num"');
|
||||
foreach ($tva as $i => $value) {
|
||||
$oTva->set_parameter('id', $i);
|
||||
$oTva->load();
|
||||
|
|
@ -1565,11 +1564,11 @@ EOF;
|
|||
$r.='<tr><td> TVA ' . $oTva->get_parameter('label').'</td>';
|
||||
$r.=td(hb(nbm($tva[$i])),'class="num"');
|
||||
}
|
||||
$r.='<tr>'.td(_('Total TVA')).td(hb(nbm($tot_tva)),'class="num"');
|
||||
$r.='<tr>'.td(_('Total TVAC')).td(hb(nbm($tot)),'class="num"');
|
||||
$r.='<tr>'.td(_('Total TVA')).td(hb($tot_tva),'class="num"');
|
||||
$r.='<tr>'.td(_('Total TVAC')).td(hb($tot),'class="num"');
|
||||
$r.='</table>';
|
||||
} else {
|
||||
$r.='<br>Total '.hb(nbm($tot));
|
||||
$r.='<br>Total '.hb($tot);
|
||||
}
|
||||
$r.='</div>';
|
||||
/* Add hidden */
|
||||
|
|
|
|||
|
|
@ -1594,7 +1594,9 @@ class Follow_Up
|
|||
if ($g_user->can_read_action($mag_id[$i]) == false) continue;
|
||||
$a=new Follow_Up($cn,$mag_id[$i]);
|
||||
$a->get();
|
||||
echo '<div class="content">';
|
||||
echo $a->Display("READ", false, "");
|
||||
echo '</div>';
|
||||
echo '<P id="breakhere"> - - </p>';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
<td>
|
||||
<a href="javascript:void(0)" onclick="<?php echo $array[$i]['javascript']?>">
|
||||
<span id="val<?php echo $i?>">
|
||||
<?php echo $array[$i]['pcm_val']?>
|
||||
<?php echo strip_tags($array[$i]['pcm_val'])?>
|
||||
</span>
|
||||
</a>
|
||||
</td>
|
||||
<td>
|
||||
<span id="lib<?php echo $i?>">
|
||||
<?php echo $array[$i]['pcm_lib']?>
|
||||
<?php echo strip_tags($array[$i]['pcm_lib'])?>
|
||||
</span>
|
||||
</td>
|
||||
<td>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue