issue #0001692 : Modification de l'affichage pour avoir l'affichage des chiffres toujours su une ligne

This commit is contained in:
Michael RICOIS 2013-09-04 06:16:52 +00:00
parent c6e408bde7
commit 71a89e01ce
3 changed files with 1429 additions and 1365 deletions

View File

@ -14,7 +14,7 @@
</tr>
<?php if($this->haveLiasse):?>
<form method="post" action="<?=$this->url(array('controller' => 'finance', 'action' => 'liasse', 'siret' => $this->siret, 'id' => $this->id))?>">
<form method="post" action="<?=$this->url(array('controller'=>'finance','action'=>'liasse','siret'=>$this->siret,'id'=>$this->id))?>">
<tr>
<td width="30">&nbsp;</td>
<td width="200" class="StyleInfoLib">Valeurs exprimées en</td>
@ -56,9 +56,6 @@
<a href="<?=$this->url(array('controller'=>'saisie', 'action'=>'liasse', 'siret'=>$this->siren, 'selection'=>'NEW:N'))?>">Normal (2050)</a>,
<a href="<?=$this->url(array('controller'=>'saisie', 'action'=>'liasse', 'siret'=>$this->siren, 'selection'=>'NEW:C'))?>">Consolidé (2050)</a>,
<a href="<?=$this->url(array('controller'=>'saisie', 'action'=>'liasse', 'siret'=>$this->siren, 'selection'=>'NEW:S'))?>">Simplifié (2033)</a>
<script>
</script>
</td>
</tr>
<?php }?>
@ -103,35 +100,38 @@
</td>
</tr>
<?php }?>
<?php if ( $this->champType == 'S' ):?>
<?php if ( $this->champType == 'S' ) {?>
<tr>
<td colspan="3">Ce bilan a été déposé au format réel simplifié mais vous est livré au format réel normal pour des raisons de standardisation.</td>
<td colspan="3">
Ce bilan a été déposé au format réel simplifié mais vous est livré au
format réel normal pour des raisons de standardisation.
</td>
</tr>
<?php endif;?>
<?php }?>
</table>
</div>
<div class="paragraph">
<?php if(empty($this->date)):?>
<?php if(empty($this->date)) {?>
<table>
<tr>
<td width="30">&nbsp;</td>
<td colspan="2" class="StyleInfoLib" width="200">Aucun bilan disponible.</td>
</tr>
<tr>
<td width="30">&nbsp;</td>
<td colspan="2" class="StyleInfoLib" width="200">Aucun bilan disponible.</td>
</tr>
</table>
<?php else:?>
<?php } else {?>
<div class="tabbed_area">
<ul class="tabs">
<?php foreach ($this->ancres as $id => $name):?>
<?php foreach ($this->ancres as $id => $name) {?>
<li><a href="#<?=$id?>" title="<?=$name?>" class="tab"><?=$name?></a></li>
<?php endforeach;?>
<?php }?>
</ul>
</div>
<div class="content">
<?php if( in_array($this->champType, array('S', 'N', 'C')) ):?>
<?php if( in_array($this->champType, array('S', 'N', 'C')) ) {?>
<?php echo $this->partial('finance/liasse/2050.phtml', array(
'liasse' => $this->liasse,
@ -141,9 +141,9 @@
'dureesMoisPre'=> $this->dureesMoisPre,
'unite'=> $this->unite,
));?>
<?php elseif ($this->champType == 'B'):?>
<?php } elseif ($this->champType == 'B') {?>
<?php echo $this->partial('finance/liasse/banque.phtml', array(
'liasse' => $this->liasse,
'dateCloture' => $this->dateFunction->dateT('Ymd', 'd/m/Y', $this->dateCloture),
@ -152,9 +152,9 @@
'dureesMoisPre'=> $this->dureesMoisPre,
'unite'=> $this->unite,
));?>
<?php elseif ($this->champType == 'A'):?>
<?php } elseif ($this->champType == 'A') {?>
<?php echo $this->partial('finance/liasse/assurance.phtml', array(
'liasse' => $this->liasse,
'dateCloture' => $this->dateFunction->dateT('Ymd', 'd/m/Y', $this->dateCloture),
@ -163,12 +163,12 @@
'dureesMoisPre'=> $this->dureesMoisPre,
'unite'=> $this->unite,
));?>
<?php endif;?>
<?php }?>
</div>
<?php endif;?>
<?php }?>
</div>
<?php echo $this->render('cgu.phtml', $this->cgu);?>
</div>

File diff suppressed because it is too large Load Diff

View File

@ -511,6 +511,7 @@ a.AncienSiege { background-color: #4D90FE; border: 1px solid #3079ED; color: #FF
#ratio {clear: both;font-family: "Lucida Sans Unicode","Lucida Grande",Sans-Serif;font-size: 12px;margin: 10px 0 0;text-align: left;width: 100%;}
#LiasseTable {border-collapse: collapse;color:#606060;margin:5px 0 10px 0;}
#LiasseTable td {font-size:11px;font-family: arial,sans-serif;border:1px solid silver;padding:2px;}
#LiasseTable td.amount-value {min-width:70px;}
#liasseForm th {color:#606060;font-weight:bold;}
#liasseForm {margin-left:30px;}
#liasseForm td {color:#606060;}