Commit e5a4a7b3 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

BACKUP : Rapport d'utilisation des comptes de dépenses en cours

parent 034c2eb2

module/Oscar/src/Oscar/Command/OscarSpentAccountListCommand.php

+2 −2
Original line number Diff line number Diff line
@@ -64,11 +64,11 @@ class OscarSpentAccountListCommand extends OscarCommandAbstract 


                foreach ($masse['comptes'] as $compte) {

                    $table[] = [

                        $masseCode, $masse['label'], $compte['masse_inherit'], $compte['code'], $compte['label']

                        $masseCode, $masse['label'], $compte['masse_inherit'], $compte['code'], $compte['label'], $compte['total']

                    ];

                }

            }

            $io->table(['Masse(cd)','Masse', 'Masse Héritée', 'Compte', 'Intitulé'], $table);

            $io->table(['Masse(cd)','Masse', 'Masse Héritée', 'Compte', 'Intitulé', 'Montant'], $table);



        } catch (\Exception $e) {

            $io->error($e->getMessage());

module/Oscar/src/Oscar/Service/SpentService.php

+3 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ class SpentService implements UseLoggerService, UseOscarConfigurationService, Us 
    {

        $out = [];



        $sql = 'SELECT DISTINCT comptegeneral FROM spentline ORDER BY comptegeneral::varchar ';

        $sql = 'SELECT DISTINCT "comptegeneral"::varchar as comptegeneral, sum(montant) as total FROM spentline GROUP BY comptegeneral';

        $stmt = $this->getEntityManager()->getConnection()->prepare($sql);

        $stmt->execute();

        $used = $stmt->fetchAll();
@@ -80,6 +80,7 @@ class SpentService implements UseLoggerService, UseOscarConfigurationService, Us 
            $compteCode = strval($compteInfos['code']);

            $compteLabel = $compteInfos['label'];

            $compteInherit = $compteInfos['compte_inherit'];

            $compteTotal = $compte['total'];

            $masseInherit = $compteInfos['masse_inherit'];

            if( !$compteMasse )

                $compteMasse = $masseInherit;
@@ -99,6 +100,7 @@ class SpentService implements UseLoggerService, UseOscarConfigurationService, Us 
                    'annexe' => $compteMasse,

                    'compte_inherit' => $compteInherit,

                    'masse_inherit' => $masseInherit,

                    'total' => $compteTotal,

                ];

            }

        }

public/css/_common.scss

+4 −0
Original line number Diff line number Diff line
@@ -5275,6 +5275,10 @@ pre.alert-danger, pre.alert-info { 
  transition: all .3s ;

  box-shadow: none;



  &.card {

    font-size: 10px;

  }



  &.level-1 > h3 { font-weight: 900 }

  &.level-2 > h3 { font-weight: 700 }

  &.level-3 > h3 { font-weight: 500 }

public/css/adaj.css

+3 −0
Original line number Diff line number Diff line
@@ -11485,6 +11485,9 @@ pre.alert-danger, pre.alert-info { 
  -khtml-user-drag: element;

  -webkit-user-drag: element;

}

.spenttype.card {

  font-size: 10px;

}

.spenttype.level-1 > h3 {

  font-weight: 900;

}

public/css/adaj.css.map

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.