scores/extranet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ajout message bilan confidentiel lors de la consultations d'un bilan de liasse fiscale, ajout d'un champ confidentiel lors de la saisie d'un bilan

Browse Source
This commit is contained in:
benoitpotier 2017-03-17 11:55:24 +01:00
parent c12ac41b8a
commit 4a384d6f79
6 changed files with 644 additions and 619 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/modules/default/controllers/SaisieController.php
View File

@ -925,6 +925,8 @@ class SaisieController extends Zend_Controller_Action
if ( !empty($selection) ) {
list($date, $type) = explode(':', $selection);
$confidentiel = 0;
// --- Correction d'un bilan
if ($date!='NEW') {
$milDate = $milDatePre = null;
@ -940,6 +942,7 @@ class SaisieController extends Zend_Controller_Action
$milDatePre = $item->dateExercice;
}
}
$confidentiel = $item->confidentiel;
}
}
@ -954,6 +957,7 @@ class SaisieController extends Zend_Controller_Action
$infos->dureeMois = $response->DUREE_MOIS;
$infos->dureeMoisPre = $response->DUREE_MOIS_PRE;
$infos->unite = empty($response->MONNAIE_LIV_UNITE) ? 'U' : $response->MONNAIE_LIV_UNITE;
$confidentiel = $response->TOP_CONFIDENTIEL;
$postes = array();
foreach ($response->POSTES->item as $item) {
$postes[$item->id] = $item->val;
@ -969,6 +973,7 @@ class SaisieController extends Zend_Controller_Action
$infos->dateCloturePre = $response->DATE_CLOTURE;
$infos->dureeMoisPre = $response->DUREE_MOIS;
$infos->unite = empty($response->MONNAIE_LIV_UNITE) ? 'U' : $response->MONNAIE_LIV_UNITE;
$confidentiel = $response->TOP_CONFIDENTIEL;
$postesN1 = array();
foreach ($response->POSTES->item as $item) {
$postesN1[$item->id] = $item->val;
@ -1304,6 +1309,7 @@ class SaisieController extends Zend_Controller_Action
$this->view->assign('dureeMoisPre', $dureeMoisPre);
$this->view->assign('unite', $unite);
$this->view->assign('typeBilan', $type);
$this->view->assign('confidentiel', $confidentiel);
$this->view->assign('ancres', $ancres[$type]);
$this->view->inlineScript()->appendFile('/libs/editable/jquery.jeditable.js');

9
application/modules/default/views/default/scripts/finance/liasse.phtml
View File

@ -40,6 +40,15 @@
</td>
</tr>
<?php }?>
<?php if (0 < $this->exportObjet->TOP_CONFIDENTIEL) : ?>
<tr>
<td width="30">&nbsp;</td>
<td colspan="2">
<span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
Ce bilan est confidentiel.
</td>
</tr>
<?php endif ?>
<?php if ( $this->champType == 'S' ) {?>
<tr>
<td colspan="3">

3
application/modules/default/views/default/scripts/saisie/liasse.phtml
View File

@ -31,12 +31,13 @@ span.poste input { width:50px; }
<h2>Liasse</h2>
<div class="paragraph">
<?php if ($this->infos) {?>
<?php if ($this->infos) { ?>
<div class="content">
<?php
$params = array(
'ancres' => $this->ancres,
'typeBilan' => $this->typeBilan,
'confidentiel' => $this->confidentiel,
'unite' => $this->unite,
'dateCloture' => $this->dateCloture,
'dureeMois'=> $this->dureeMois,

4
application/modules/default/views/default/scripts/saisie/liasse/2033.phtml
View File

@ -3,6 +3,10 @@
<label>Type de bilan</label>
<span id="typeBilan"><?=$this->typeBilan?></span>
</div>
<div class="clearfix">
<label>Confidentiel</label>
<input id="confidentiel" class="confidentiel" value="<?=$this->confidentiel?>">
</div>
<div class="clearfix">
<label>Valeurs exprimées en </label>
<span id="unit" class="unit editable"><?=$this->unite?></span>&nbsp;&euro;

4
application/modules/default/views/default/scripts/saisie/liasse/2050.phtml
View File

@ -3,6 +3,10 @@
<label>Type de bilan</label>
<span id="typeBilan" class="editable"><?=$this->typeBilan?></span>
</div>
<div class="clearfix">
<label>Confidentiel</label>
<input id="confidentiel" class="confidentiel" value="<?=$this->confidentiel?>">
</div>
<div class="clearfix">
<label>Valeurs exprimées en </label>
<span id="unit" class="unit editable"><?=$this->unite?></span>&nbsp;&euro;

3
library/Scores/WsScores.php
View File

@ -899,7 +899,7 @@ class WsScores
}
}
public function setBilan($siren, $originalDateCloture, $originalTypeBilan, $unite, $dateCloture, $dureeMois, $dateCloturePre, $dureeMoisPre, $typeBilan, $postes, $step = 'normal')
public function setBilan($siren, $originalDateCloture, $originalTypeBilan, $unite, $dateCloture, $dureeMois, $dateCloturePre, $dureeMoisPre, $typeBilan, $postes, $step = 'normal', $confidentiel=0)
{
$params = new stdClass();
$params->siren = $siren;
@ -913,6 +913,7 @@ class WsScores
$params->data->typeBilan = $typeBilan;
$params->data->postes = $postes;
$params->step = $step;
$params->confidentiel = $confidentiel;
$client = $this->loadClient('saisie');
try {
$reponse = $client->setBilan($params);