Balance :Show type of accounting
This commit is contained in:
parent
c2f125ec85
commit
6b463d9ffa
3 changed files with 27 additions and 8 deletions
|
|
@ -3847,6 +3847,7 @@ h2.h-section {
|
|||
.nav-level3 .nav-link.active::after {
|
||||
background-color:yellow;
|
||||
}
|
||||
|
||||
/***
|
||||
* Animate menu
|
||||
*
|
||||
|
|
@ -3901,18 +3902,23 @@ h2.h-section {
|
|||
* Info after UpgradeCore
|
||||
*/
|
||||
#info_admin {
|
||||
font-size:140%;
|
||||
font-size: 140%;
|
||||
text-align: center;
|
||||
background-color: red;
|
||||
display:block;
|
||||
position:fixed;
|
||||
top:15rem;
|
||||
left:15%;
|
||||
display: block;
|
||||
position: fixed;
|
||||
top: 15rem;
|
||||
left: 15%;
|
||||
width: 70%;
|
||||
padding:2.5em;
|
||||
border-radius:0.5em;
|
||||
scale:1.1;
|
||||
padding: 2.5em;
|
||||
border-radius: 0.5em;
|
||||
scale: 1.1;
|
||||
color: ghostwhite;
|
||||
opacity: 0.9;
|
||||
|
||||
}
|
||||
.text-70 {
|
||||
font-size:70% !important;
|
||||
vertical-align: super;
|
||||
|
||||
}
|
||||
|
|
@ -190,6 +190,14 @@ echo '</p>';
|
|||
echo '<p>';
|
||||
echo _("Avec la balance de l'année précédente")." ".$previous_exc->input();
|
||||
echo '</p>';
|
||||
echo '<p>';
|
||||
echo _('Indiquer le type de poste');
|
||||
echo '<span class="text-muted">',_("actif, passif,charge,..."),'</span>';
|
||||
// var $type_account int value 0 => no shown, 1=> show it
|
||||
$type_account=new ICheckBox('type_account',1);
|
||||
if ($http->request('type_account','string',0)==1) $type_account->selected=true;
|
||||
echo $type_account->input();
|
||||
echo '</p>';
|
||||
echo '</div>';
|
||||
?>
|
||||
<div>
|
||||
|
|
@ -311,6 +319,7 @@ if ( isset($_GET['view'] ) )
|
|||
$previous=(isset($_GET['previous_exc']))?1:0;
|
||||
$from_periode=$http->get("from_periode","number");
|
||||
$to_periode=$http->get("to_periode","number");
|
||||
// var $row array from Acc_Balance->get_row
|
||||
$row=$bal->get_row($from_periode,$to_periode,$previous);
|
||||
$previous= (isset ($row[0]['sum_cred_previous']))?1:0;
|
||||
|
||||
|
|
@ -439,6 +448,9 @@ if ( isset($_GET['view'] ) )
|
|||
echo td($view_history);
|
||||
// label + warning if the saldo is incorrect
|
||||
$label=$r['label'];
|
||||
if ( $type_account->selected ) {
|
||||
$label .= sprintf("<span class=\"text-70 text-muted\">(%s)</span>",$r['type']);
|
||||
}
|
||||
if (isset ($r['type']) && in_array($r['type'],array('CHA','ACT','PASINV','PROINV')) && $r['sum_deb']<$r['sum_cred'])
|
||||
{
|
||||
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ class Acc_Balance
|
|||
* array of
|
||||
* - $a['poste']
|
||||
* - $a['label']
|
||||
* - $a['type'] string pcm_type actif, passif...
|
||||
* - $a['sum_deb']
|
||||
* - $a['sum_cred']
|
||||
* - $a['solde_deb']
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue