diff --git a/application/modules/default/controllers/SaisieController.php b/application/modules/default/controllers/SaisieController.php
index 2f279cb70..d2c3b9800 100644
--- a/application/modules/default/controllers/SaisieController.php
+++ b/application/modules/default/controllers/SaisieController.php
@@ -9,203 +9,203 @@ class SaisieController extends Zend_Controller_Action
* test de type de voie
* @todo vérifier si type de voie à jour
*/
- protected $codVoie = array(
- 'ABE' => "Abbaye",
- 'AGL' => "Agglomération",
- 'AIRE' => "Aire",
- 'ALL' => "Allée",
- 'ALL' => "Allee",
- 'ACH' => "Ancien chemin",
- 'ART' => "Ancienne route",
- 'ANSE' => "Anse",
- 'ARC' => "Arcade",
- 'AUT' => "Autoroute",
- 'AV' => "Avenue",
- 'BRE' => "Barrière",
- 'BCH' => "Bas chemin",
- 'BSTD' => "Bastide",
- 'BAST' => "Baston",
- 'BEGI' => "Beguinage",
- 'BER' => "Berge",
- 'BOIS' => "Bois",
- 'BCLE' => "Boucle",
- 'BD' => "Boulevard",
- 'BRG' => "Bourg",
- 'BUT' => "Butte",
- 'CALE' => "Cale",
- 'CAMP' => "Camp",
- 'CGNE' => "Campagne",
- 'CPG' => "Camping",
- 'CARR' => "Carré",
- 'CAU' => "Carreau",
- 'CAR' => "Carrefour",
- 'CARE' => "Carrière",
- 'CST' => "Castel",
- 'CAV' => "Cavée",
- 'CTRE' => "Central",
- 'CTRE' => "Centre",
- 'CHL' => "Chalet",
- 'CHP' => "Chapelle",
- 'CHI' => "Charmille",
- 'CHT' => "Château",
- 'CHS' => "Chaussée",
- 'CHE' => "Chemin",
- 'CHV' => "Chemin vicinaux",
- 'CHV' => "Chemin vicinal",
- 'CHEM' => "Cheminement",
- 'CITE' => "Cîte",
- 'CLOI' => "Cloître",
- 'CLOS' => "Clos",
- 'COL' => "Col",
- 'COLI' => "Colline",
- 'CTR' => "Contour",
- 'COR' => "Corniche",
- 'COTE' => "Côte",
- 'COTT' => "Cottage",
- 'COUR' => "Cour",
- 'CRS' => "Cours",
- 'DARS' => "Darse",
- 'DEG' => "Degré",
- 'DSG' => "Descente",
- 'DSC' => "Descente",
- 'DIG' => "Digue",
- 'DOM' => "Domaine",
- 'ECA' => "Ecart",
- 'ECL' => "Ecluse",
- 'EGL' => "Eglise",
- 'EN' => "Enceinte",
- 'ENV' => "Enclave",
- 'ENC' => "Enclos",
- 'ESC' => "Escalier",
- 'ESPA' => "Espace",
- 'ESP' => "Esplanade",
- 'ETING' => "Etang",
- 'FG' => "Faubourg",
- 'FRM' => "Ferme",
- 'FON' => "Fontaine",
- 'FORT' => "Fort",
- 'FORM' => "Forum",
- 'FOS' => "Fosse",
- 'FOYR' => "Foyer",
- 'GAL' => "Galerie",
- 'GARE' => "Gare",
- 'GARN' => "Garenne",
- 'GBD' => "Grand boulevard",
- 'GDEN' => "Grande ensemble",
- 'GR' => "Grande rue",
- 'GRI' => "Grille",
- 'GRIM' => "Grimpette",
- 'GPE' => "Groupe",
- 'GPT' => "Groupement",
- 'HLE' => "Halle",
- 'HAM' => "Hameau",
- 'HCH' => "Haut chemin",
- 'HIP' => "Hippodrome",
- 'HLM' => "HLM",
- 'ILE' => "Ile",
- 'IMM' => "Immeuble",
- 'IMP' => "Impasse",
- 'JARD' => "Jardin",
- 'JTE' => "Jetée",
- 'LEVE' => "Levée",
- 'LD' => "Lieu dit",
- 'LD' => "Lieudit",
- 'LOT' => "Lotissement",
- 'MAIL' => "Mail",
- 'MF' => "Maison forestière",
- 'MAN' => "Manoir",
- 'MAR' => "Marche",
- 'MAS' => "Mas",
- 'MET' => "Métro",
- 'MTE' => "Montée",
- 'MLN' => "Moulin",
- 'MUS' => "Musée",
- 'NTE' => "Nouvelle route",
- 'PAL' => "Palais",
- 'PARC' => "Parc",
- 'PKG' => "Parking",
- 'PRV' => "Parvis",
- 'PAS' => "Passage",
- 'PN' => "Passage à niveau",
- 'PASS' => "Passe",
- 'PLE' => "Passerelle",
- 'PAT' => "Patio",
- 'PAV' => "Pavillon",
- 'PERI' => "Périphérique",
- 'PSTY' => "Péristyle",
- 'PTA' => "Petites allée",
- 'PCH' => "Petit chemin",
- 'PAE' => "Petite avenue",
- 'PIM' => "Petite impasse",
- 'PRT' => "Petite route",
- 'PTR' => "Petite rue",
- 'PL' => "Place",
- 'PLCI' => "Placis",
- 'PLAG' => "Plage",
- 'PLN' => "Plaine",
- 'PLAN' => "Plan",
- 'PLT' => "Plateau",
- 'PNT' => "Pointe",
- 'PONT' => "Pont",
- 'PCH' => "Porche",
- 'PORT' => "Port",
- 'PTE' => "Porte",
- 'PORQ' => "Portique",
- 'POT' => "Poterne",
- 'POUR' => "Pourtour",
- 'PRE' => "Pré",
- 'PRQ' => "Presqu'île",
- 'PROM' => "Promenade",
- 'QU' => "Quai",
- 'QUAI' => "Quai",
- 'QUA' => "Quartier",
- 'RAC' => "Raccourci",
- 'RAID' => "Raidillon",
- 'RPE' => "Rampe",
- 'REM' => "Rempart",
- 'RES' => "Résidence",
- 'ROC' => "Roc",
- 'ROC' => "Rocade",
- 'RPT' => "Rond point",
- 'ROQT' => "Roquet",
- 'RTD' => "Rotonde",
- 'RTE' => "Route",
- 'R' => "Rue",
- 'RUE' => "Rue",
- 'RLE' => "Ruelle",
- 'SEN' => "Sente",
- 'SEN' => "Sentier",
- 'SQ' => "Square",
- 'STDE' => "Stade",
- 'STA' => "Station",
- 'TPL' => "Terre plein",
- 'TRN' => "Terrain",
- 'TSSE' => "Terrasse",
- 'TRT' => "Tertre",
- 'TOUR' => "Tour",
- 'TRA' => "Traverse",
- 'VAL' => "Vallon",
- 'VAL' => "Vallée",
- 'VEN' => "Venelle",
- 'VIA' => "Via",
- 'VTE' => "Vieille route",
- 'VCHE' => "Vieux chemin",
- 'VLA' => "Villa",
- 'VGE' => "Village",
- 'VLGE' => "Village",
- 'VOI' => "Voie",
- 'VOIE' => "Voie",
- 'ZONE' => "Zone",
- 'ZAC' => "Zone d'aménagement concerté",
- 'Z A C' => "Zone d'aménagement concerté",
- 'ZAD' => "Zone d'aménagement différé",
- 'Z A D' => "Zone d'aménagement différé",
- 'ZA' => "Zone artisanale",
- 'Z A' => "Zone artisanale",
- 'ZI' => "Zone industrielle",
- 'Z I' => "Zone industrielle",
- 'ZUP' => "Zone à urbaniser en priorité",
- 'Z U P' => "Zone à urbaniser en priorité",
+ protected $codVoie = array(
+ 'ABE' => "Abbaye",
+ 'AGL' => "Agglomération",
+ 'AIRE' => "Aire",
+ 'ALL' => "Allée",
+ 'ALL' => "Allee",
+ 'ACH' => "Ancien chemin",
+ 'ART' => "Ancienne route",
+ 'ANSE' => "Anse",
+ 'ARC' => "Arcade",
+ 'AUT' => "Autoroute",
+ 'AV' => "Avenue",
+ 'BRE' => "Barrière",
+ 'BCH' => "Bas chemin",
+ 'BSTD' => "Bastide",
+ 'BAST' => "Baston",
+ 'BEGI' => "Beguinage",
+ 'BER' => "Berge",
+ 'BOIS' => "Bois",
+ 'BCLE' => "Boucle",
+ 'BD' => "Boulevard",
+ 'BRG' => "Bourg",
+ 'BUT' => "Butte",
+ 'CALE' => "Cale",
+ 'CAMP' => "Camp",
+ 'CGNE' => "Campagne",
+ 'CPG' => "Camping",
+ 'CARR' => "Carré",
+ 'CAU' => "Carreau",
+ 'CAR' => "Carrefour",
+ 'CARE' => "Carrière",
+ 'CST' => "Castel",
+ 'CAV' => "Cavée",
+ 'CTRE' => "Central",
+ 'CTRE' => "Centre",
+ 'CHL' => "Chalet",
+ 'CHP' => "Chapelle",
+ 'CHI' => "Charmille",
+ 'CHT' => "Château",
+ 'CHS' => "Chaussée",
+ 'CHE' => "Chemin",
+ 'CHV' => "Chemin vicinaux",
+ 'CHV' => "Chemin vicinal",
+ 'CHEM' => "Cheminement",
+ 'CITE' => "Cîte",
+ 'CLOI' => "Cloître",
+ 'CLOS' => "Clos",
+ 'COL' => "Col",
+ 'COLI' => "Colline",
+ 'CTR' => "Contour",
+ 'COR' => "Corniche",
+ 'COTE' => "Côte",
+ 'COTT' => "Cottage",
+ 'COUR' => "Cour",
+ 'CRS' => "Cours",
+ 'DARS' => "Darse",
+ 'DEG' => "Degré",
+ 'DSG' => "Descente",
+ 'DSC' => "Descente",
+ 'DIG' => "Digue",
+ 'DOM' => "Domaine",
+ 'ECA' => "Ecart",
+ 'ECL' => "Ecluse",
+ 'EGL' => "Eglise",
+ 'EN' => "Enceinte",
+ 'ENV' => "Enclave",
+ 'ENC' => "Enclos",
+ 'ESC' => "Escalier",
+ 'ESPA' => "Espace",
+ 'ESP' => "Esplanade",
+ 'ETING' => "Etang",
+ 'FG' => "Faubourg",
+ 'FRM' => "Ferme",
+ 'FON' => "Fontaine",
+ 'FORT' => "Fort",
+ 'FORM' => "Forum",
+ 'FOS' => "Fosse",
+ 'FOYR' => "Foyer",
+ 'GAL' => "Galerie",
+ 'GARE' => "Gare",
+ 'GARN' => "Garenne",
+ 'GBD' => "Grand boulevard",
+ 'GDEN' => "Grande ensemble",
+ 'GR' => "Grande rue",
+ 'GRI' => "Grille",
+ 'GRIM' => "Grimpette",
+ 'GPE' => "Groupe",
+ 'GPT' => "Groupement",
+ 'HLE' => "Halle",
+ 'HAM' => "Hameau",
+ 'HCH' => "Haut chemin",
+ 'HIP' => "Hippodrome",
+ 'HLM' => "HLM",
+ 'ILE' => "Ile",
+ 'IMM' => "Immeuble",
+ 'IMP' => "Impasse",
+ 'JARD' => "Jardin",
+ 'JTE' => "Jetée",
+ 'LEVE' => "Levée",
+ 'LD' => "Lieu dit",
+ 'LD' => "Lieudit",
+ 'LOT' => "Lotissement",
+ 'MAIL' => "Mail",
+ 'MF' => "Maison forestière",
+ 'MAN' => "Manoir",
+ 'MAR' => "Marche",
+ 'MAS' => "Mas",
+ 'MET' => "Métro",
+ 'MTE' => "Montée",
+ 'MLN' => "Moulin",
+ 'MUS' => "Musée",
+ 'NTE' => "Nouvelle route",
+ 'PAL' => "Palais",
+ 'PARC' => "Parc",
+ 'PKG' => "Parking",
+ 'PRV' => "Parvis",
+ 'PAS' => "Passage",
+ 'PN' => "Passage à niveau",
+ 'PASS' => "Passe",
+ 'PLE' => "Passerelle",
+ 'PAT' => "Patio",
+ 'PAV' => "Pavillon",
+ 'PERI' => "Périphérique",
+ 'PSTY' => "Péristyle",
+ 'PTA' => "Petites allée",
+ 'PCH' => "Petit chemin",
+ 'PAE' => "Petite avenue",
+ 'PIM' => "Petite impasse",
+ 'PRT' => "Petite route",
+ 'PTR' => "Petite rue",
+ 'PL' => "Place",
+ 'PLCI' => "Placis",
+ 'PLAG' => "Plage",
+ 'PLN' => "Plaine",
+ 'PLAN' => "Plan",
+ 'PLT' => "Plateau",
+ 'PNT' => "Pointe",
+ 'PONT' => "Pont",
+ 'PCH' => "Porche",
+ 'PORT' => "Port",
+ 'PTE' => "Porte",
+ 'PORQ' => "Portique",
+ 'POT' => "Poterne",
+ 'POUR' => "Pourtour",
+ 'PRE' => "Pré",
+ 'PRQ' => "Presqu'île",
+ 'PROM' => "Promenade",
+ 'QU' => "Quai",
+ 'QUAI' => "Quai",
+ 'QUA' => "Quartier",
+ 'RAC' => "Raccourci",
+ 'RAID' => "Raidillon",
+ 'RPE' => "Rampe",
+ 'REM' => "Rempart",
+ 'RES' => "Résidence",
+ 'ROC' => "Roc",
+ 'ROC' => "Rocade",
+ 'RPT' => "Rond point",
+ 'ROQT' => "Roquet",
+ 'RTD' => "Rotonde",
+ 'RTE' => "Route",
+ 'R' => "Rue",
+ 'RUE' => "Rue",
+ 'RLE' => "Ruelle",
+ 'SEN' => "Sente",
+ 'SEN' => "Sentier",
+ 'SQ' => "Square",
+ 'STDE' => "Stade",
+ 'STA' => "Station",
+ 'TPL' => "Terre plein",
+ 'TRN' => "Terrain",
+ 'TSSE' => "Terrasse",
+ 'TRT' => "Tertre",
+ 'TOUR' => "Tour",
+ 'TRA' => "Traverse",
+ 'VAL' => "Vallon",
+ 'VAL' => "Vallée",
+ 'VEN' => "Venelle",
+ 'VIA' => "Via",
+ 'VTE' => "Vieille route",
+ 'VCHE' => "Vieux chemin",
+ 'VLA' => "Villa",
+ 'VGE' => "Village",
+ 'VLGE' => "Village",
+ 'VOI' => "Voie",
+ 'VOIE' => "Voie",
+ 'ZONE' => "Zone",
+ 'ZAC' => "Zone d'aménagement concerté",
+ 'Z A C' => "Zone d'aménagement concerté",
+ 'ZAD' => "Zone d'aménagement différé",
+ 'Z A D' => "Zone d'aménagement différé",
+ 'ZA' => "Zone artisanale",
+ 'Z A' => "Zone artisanale",
+ 'ZI' => "Zone industrielle",
+ 'Z I' => "Zone industrielle",
+ 'ZUP' => "Zone à urbaniser en priorité",
+ 'Z U P' => "Zone à urbaniser en priorité",
);
/**
@@ -904,7 +904,7 @@ class SaisieController extends Zend_Controller_Action
$this->view->assign('siret', $siret);
}
- public function liasseAction()
+ public function liasseAction()
{
$request = $this->getRequest();
@@ -915,16 +915,18 @@ class SaisieController extends Zend_Controller_Action
$this->view->assign('siren', $siren);
$session = new Scores_Session_Entreprise($siret, $id);
- $this->view->assign('siret', $siret);
+ $this->view->assign('siret', $siret);
$this->view->assign('raisonSociale', $session->getRaisonSociale());
- require_once 'Scores/WsScores.php';
+ require_once 'Scores/WsScores.php';
$ws = new WsScores();
-
- $selection = $request->getParam('selection', '');
+
+ $selection = $request->getParam('selection', '');
if ( !empty($selection) ) {
- list($date, $type) = explode(':', $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;
@@ -1233,63 +1238,63 @@ class SaisieController extends Zend_Controller_Action
}
}
- $ancres = array(
- 'C' => array(
- 'actif' => 'Actif',
- 'passif' => 'Passif',
+ $ancres = array(
+ 'C' => array(
+ 'actif' => 'Actif',
+ 'passif' => 'Passif',
'compteDeResultat' => 'Compte de résultat',
- //+ Poste YP pour l'effectif du groupe
- ),
- 'N' => array(
- 'actif' => 'Actif',
- 'passif' => 'Passif',
- 'compteDeResultat' => 'Compte de résultat',
- 'immobilisations' => 'Immobilisations',
- 'amortissements' => 'Amortissements',
- 'provisions' => 'Provisions',
+ //+ Poste YP pour l'effectif du groupe
+ ),
+ 'N' => array(
+ 'actif' => 'Actif',
+ 'passif' => 'Passif',
+ 'compteDeResultat' => 'Compte de résultat',
+ 'immobilisations' => 'Immobilisations',
+ 'amortissements' => 'Amortissements',
+ 'provisions' => 'Provisions',
'creancesDettes' => 'Créances, Dettes',
'resultatfiscal' => 'Détermination du résultat fiscal',
- 'deficit' => 'DÉFICITS, INDEMNITÉS POUR CONGÉS À PAYER ET PROVISIONS NON DÉDUCTIBLES',
+ 'deficit' => 'DÉFICITS, INDEMNITÉS POUR CONGÉS À PAYER ET PROVISIONS NON DÉDUCTIBLES',
'affectation' => 'Affectation',
- 'annexe16' => 'DÉTERMINATION DE LA VALEUR AJOUTÉE PRODUITE AU COURS DE L\'EXERCICE',
- ),
- 'S' => array(
- 'actif' => 'Actif',
- 'passif' => 'Passif',
- 'compteDeResultat' => 'Compte de résultat',
- 'immobilisations' => 'Immobilisations',
- 'amortissements' => 'Amortissements',
- 'provisions' => 'Provisions',
- 'creancesDettes' => 'Créances, Dettes',
- 'affectation' => 'Affectation'
- ),
- 'A' => array(
- 'actif' => 'Actif',
- 'passif' => 'Passif',
- 'compteDeResultat' => 'Compte de résultat',
- ),
- 'B' => array(
- 'actif' => 'Actif',
- 'passif' => 'Passif',
- 'compteDeResultat' => 'Compte de résultat',
- ),
+ 'annexe16' => 'DÉTERMINATION DE LA VALEUR AJOUTÉE PRODUITE AU COURS DE L\'EXERCICE',
+ ),
+ 'S' => array(
+ 'actif' => 'Actif',
+ 'passif' => 'Passif',
+ 'compteDeResultat' => 'Compte de résultat',
+ 'immobilisations' => 'Immobilisations',
+ 'amortissements' => 'Amortissements',
+ 'provisions' => 'Provisions',
+ 'creancesDettes' => 'Créances, Dettes',
+ 'affectation' => 'Affectation'
+ ),
+ 'A' => array(
+ 'actif' => 'Actif',
+ 'passif' => 'Passif',
+ 'compteDeResultat' => 'Compte de résultat',
+ ),
+ 'B' => array(
+ 'actif' => 'Actif',
+ 'passif' => 'Passif',
+ 'compteDeResultat' => 'Compte de résultat',
+ ),
);
if (!empty($infos)) {
// --- Default value pour les nouveaux bilans
- if ( is_string($infos) && $infos == 'NEW' ) {
- $dateCloture = (date('Y')-1).'1231';
- $dureeMois = '12';
- $dateCloturePre = 'AAAAMMJJ';
+ if ( is_string($infos) && $infos == 'NEW' ) {
+ $dateCloture = (date('Y')-1).'1231';
+ $dureeMois = '12';
+ $dateCloturePre = 'AAAAMMJJ';
$dureeMoisPre = '0';
- $unite = 'U';
+ $unite = 'U';
}
// --- Default value pour l' edition de bilan
else {
- $dateCloture = ($infos->dateCloture!='') ? $infos->dateCloture : $date;
- $dureeMois = ($infos->dureeMois!='') ? $infos->dureeMois : '12';
- $dateCloturePre = empty($infos->dateCloturePre) ? 'AAAAMMJJ' : $infos->dateCloturePre ;
- $dureeMoisPre = empty($infos->dureeMoisPre) ? '0' : $infos->dureeMoisPre;
+ $dateCloture = ($infos->dateCloture!='') ? $infos->dateCloture : $date;
+ $dureeMois = ($infos->dureeMois!='') ? $infos->dureeMois : '12';
+ $dateCloturePre = empty($infos->dateCloturePre) ? 'AAAAMMJJ' : $infos->dateCloturePre ;
+ $dureeMoisPre = empty($infos->dureeMoisPre) ? '0' : $infos->dureeMoisPre;
$unite = $infos->unite;
$this->view->assign('liasse', $postes);
}
@@ -1298,23 +1303,24 @@ class SaisieController extends Zend_Controller_Action
$dateCloture = substr($dateCloture,6,2).'/'.substr($dateCloture,4,2).'/'.substr($dateCloture,0,4);
$dateCloturePre = substr($dateCloturePre,6,2).'/'.substr($dateCloturePre,4,2).'/'.substr($dateCloturePre,0,4);
- $this->view->assign('dateCloture', $dateCloture);
- $this->view->assign('dateCloturePre', $dateCloturePre);
- $this->view->assign('dureeMois', $dureeMois);
+ $this->view->assign('dateCloture', $dateCloture);
+ $this->view->assign('dateCloturePre', $dateCloturePre);
+ $this->view->assign('dureeMois', $dureeMois);
$this->view->assign('dureeMoisPre', $dureeMoisPre);
- $this->view->assign('unite', $unite);
+ $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');
$this->view->assign('infos', $infos);
- }
+ }
}
/**
* Sauvegarde de la liasse saisie
*/
- public function liassesaveAction()
+ public function liassesaveAction()
{
$this->_helper->layout()->disableLayout();
//Renvoyer flux json STATUS : OK ou ERR, MESSAGE : TEXTE, POSTE : ARRAY ou vide
@@ -1669,14 +1675,14 @@ class SaisieController extends Zend_Controller_Action
$this->_helper->layout()->disableLayout();
$dep = new Application_Model_TabDepartements();
$sql = $dep->select();
- $rows = $dep->fetchAll($sql);
- if ( count($rows)>0 ) {
- foreach ($rows as $item) {
- $depListe[] = array(
- 'num' => $item->numdep,
- 'lib' => $item->libdep,
- );
- }
+ $rows = $dep->fetchAll($sql);
+ if ( count($rows)>0 ) {
+ foreach ($rows as $item) {
+ $depListe[] = array(
+ 'num' => $item->numdep,
+ 'lib' => $item->libdep,
+ );
+ }
}
$this->view->assign('depListe', $depListe);
$this->view->assign('countries', $this->countries);
@@ -1872,9 +1878,9 @@ class SaisieController extends Zend_Controller_Action
if($params['transfer'] && ($params['MajMin'] == 'T' || $params['MajMin'] == 'F'))
{
- $liens = $ws->getLiensById($idPar);
+ $liens = $ws->getLiensById($idPar);
$participations = $liens->participations->item;
-
+
if (count($participations)>0) {
$ws->setLienChange('tupfusion', $idPar, $idAct);
}
@@ -2071,12 +2077,12 @@ class SaisieController extends Zend_Controller_Action
$ws = new WsScores();
$result = $ws->getSaisieBourse($isin);
$infos = json_decode($result, true);
- $dateFields = array(
- 'dateIntroduction',
- 'dateIntroYmd',
- 'dateRadiation',
- 'dateNbTitres',
- 'dateDerAG');
+ $dateFields = array(
+ 'dateIntroduction',
+ 'dateIntroYmd',
+ 'dateRadiation',
+ 'dateNbTitres',
+ 'dateDerAG');
if ( $infos === null ) {
$this->view->assign('error', $result);
@@ -2244,21 +2250,21 @@ class SaisieController extends Zend_Controller_Action
if ($items['PpPm']=='PM') {
$this->view->assign('nom', $items['RS']);
} else {
- $dep = new Application_Model_TabDepartements();
- $sql = $dep->select();
- $rows = $dep->fetchAll($sql);
- if ( count($rows)>0 ) {
- foreach ($rows as $item) {
- $depListe[] = array(
- 'num' => $item->numdep,
- 'lib' => $item->libdep,
+ $dep = new Application_Model_TabDepartements();
+ $sql = $dep->select();
+ $rows = $dep->fetchAll($sql);
+ if ( count($rows)>0 ) {
+ foreach ($rows as $item) {
+ $depListe[] = array(
+ 'num' => $item->numdep,
+ 'lib' => $item->libdep,
);
if ($item->numdep == $items['naissance_dept_pays']) {
$this->view->assign('naissance_dept_pays', 'FRA');
$this->view->assign('naissance_dept', $item->numdep);
- }
- }
- }
+ }
+ }
+ }
$this->view->assign('depListe', $depListe);
$this->view->assign('nom', $items['nom']);
}
@@ -2320,19 +2326,19 @@ class SaisieController extends Zend_Controller_Action
$request = $this->getRequest();
$id = $request->getParam('idFiche', null);
$infos = array ('delete' => '1');
-
- $ws = new WsScores();
-
- if ($id===null) {
- $siren = $request->getParam('siren');
- $result = $ws->searchLienRef($siren, 'siren');
- if (count($result->item)>0) {
- foreach ($result->item as $item) {
- $id = $item->id;
- break;
- }
- }
+ $ws = new WsScores();
+
+ if ($id===null) {
+ $siren = $request->getParam('siren');
+
+ $result = $ws->searchLienRef($siren, 'siren');
+ if (count($result->item)>0) {
+ foreach ($result->item as $item) {
+ $id = $item->id;
+ break;
+ }
+ }
}
if ( $request->isPost() ) {
@@ -2356,7 +2362,7 @@ class SaisieController extends Zend_Controller_Action
public function scorecutoffAction()
{
- $ws = new WsScores();
+ $ws = new WsScores();
$user = new Scores_Utilisateur();
$request = $this->getRequest();
@@ -2413,22 +2419,22 @@ class SaisieController extends Zend_Controller_Action
if ( $request->isPost() ) {
// check values one more time
- $paramlist = array(
- 'siren' => 'Siren',
- 'encours' => 'Encours',
- 'scoreSolv' => 'Indiscore',
- 'scoreDir' => 'Score dirigeance',
- 'scoreConf' => 'Score de conformité',
+ $paramlist = array(
+ 'siren' => 'Siren',
+ 'encours' => 'Encours',
+ 'scoreSolv' => 'Indiscore',
+ 'scoreDir' => 'Score dirigeance',
+ 'scoreConf' => 'Score de conformité',
'remarque' => 'Remarque',
- 'paiement' => 'Information de paiement',
- );
- foreach ($paramlist as $item => $val) {
- if ( !isset($params[$item]) ) {
- $message .= "Valeur $val vide !
";
- }
- if ( $params['encours']<0 || $params['encours']>500 ) {
- $message = "Encours : Erreur borne";
- }
+ 'paiement' => 'Information de paiement',
+ );
+ foreach ($paramlist as $item => $val) {
+ if ( !isset($params[$item]) ) {
+ $message .= "Valeur $val vide !
";
+ }
+ if ( $params['encours']<0 || $params['encours']>500 ) {
+ $message = "Encours : Erreur borne";
+ }
}
// end checking values
@@ -2483,7 +2489,7 @@ class SaisieController extends Zend_Controller_Action
) , 'default', true));
}
-
+
$this->view->assign('getcutoff', $getcutoff);
$this->view->assign('siren', $siren);
$this->view->assign('typescore', $user->getTypeScore());
@@ -2492,11 +2498,11 @@ class SaisieController extends Zend_Controller_Action
public function citysearchAction()
{
- $this->_helper->layout()->disableLayout();
-
+ $this->_helper->layout()->disableLayout();
+
$cpVille = $this->getRequest()->getParam('cpville', null);
- $output = array();
-
+ $output = array();
+
if ( null !== $cpVille) {
$city = new Application_Model_City();
$sql = $city->select('code, libelle');
@@ -2505,39 +2511,39 @@ class SaisieController extends Zend_Controller_Action
} else {
$sql->where('libelle LIKE ?', "%$cpVille%");
}
- $sql->limit(20);
- $rows = $city->fetchAll($sql);
- if ( count($rows)>0 ) {
- foreach ($rows as $item) {
- $output[] = array(
- 'label' => str_pad($item->code, 5, 0, STR_PAD_LEFT).": ".$item->libelle,
- 'value' => str_pad($item->code, 5, 0, STR_PAD_LEFT),
- );
- }
- }
+ $sql->limit(20);
+ $rows = $city->fetchAll($sql);
+ if ( count($rows)>0 ) {
+ foreach ($rows as $item) {
+ $output[] = array(
+ 'label' => str_pad($item->code, 5, 0, STR_PAD_LEFT).": ".$item->libelle,
+ 'value' => str_pad($item->code, 5, 0, STR_PAD_LEFT),
+ );
+ }
+ }
}
-
+
$this->view->assign('output', $output);
}
- public function codvoieAction()
- {
- $this->_helper->layout()->disableLayout();
-
- $codvoie = $this->getRequest()->getParam('codvoie', null);
- $output = array();
-
+ public function codvoieAction()
+ {
+ $this->_helper->layout()->disableLayout();
+
+ $codvoie = $this->getRequest()->getParam('codvoie', null);
+ $output = array();
+
if ( null !== $codvoie) {
foreach($this->codVoie as $key=>$val){
if (stripos($key, $codvoie)!==false || stripos($val, $codvoie)!==false){
- $output[] = array(
- 'label' => $key.": ".$val,
- 'value' => $key
+ $output[] = array(
+ 'label' => $key.": ".$val,
+ 'value' => $key
);
}
- }
- }
- $this->view->assign('output', $output);
+ }
+ }
+ $this->view->assign('output', $output);
}
/**
@@ -2553,8 +2559,8 @@ class SaisieController extends Zend_Controller_Action
$siret = $request->getParam('siret');
$siren = substr($siret, 0, 9);
$nic = substr($siret, 9, 5);
-
- $ws = new WsScores();
+
+ $ws = new WsScores();
switch ($mode) {
case 'add':
@@ -2575,23 +2581,23 @@ class SaisieController extends Zend_Controller_Action
$this->view->assign('mode', $mode);
$this->view->assign('id', $id);
$this->view->assign('siren', $siren);
- $this->view->assign('nic', $nic);
+ $this->view->assign('nic', $nic);
}
- /**
- * Sauvegarder les modifications des dirigeants oppérationnels
- */
- public function diropsaveAction()
- {
+ /**
+ * Sauvegarder les modifications des dirigeants oppérationnels
+ */
+ public function diropsaveAction()
+ {
$this->_helper->layout()->disableLayout();
$params = $this->getRequest()->getParams();
$message = '';
$newDate = '0000-00-00';
- if (trim($params['naiss_date']) != '') {
- $date = new Zend_Date($params['naiss_date'], 'dd/MM/yyyy');
- $newDate = $date->toString('yyyy-MM-dd');
+ if (trim($params['naiss_date']) != '') {
+ $date = new Zend_Date($params['naiss_date'], 'dd/MM/yyyy');
+ $newDate = $date->toString('yyyy-MM-dd');
}
$infos = array(
@@ -2611,25 +2617,25 @@ class SaisieController extends Zend_Controller_Action
$ws = new WsScores();
- if($params['mode'] == 'add'){
- $message = $this->view->translate('Ajout');
- } else if ($params['mode'] == 'edit') {
- $message = $this->view->translate('Edition');
- } else if ($params['mode'] == 'del') {
- $message = $this->view->translate('Suppression');
+ if($params['mode'] == 'add'){
+ $message = $this->view->translate('Ajout');
+ } else if ($params['mode'] == 'edit') {
+ $message = $this->view->translate('Edition');
+ } else if ($params['mode'] == 'del') {
+ $message = $this->view->translate('Suppression');
}
$result = $ws->setDirigeantsOp(json_encode($infos), $params['mode'], $params['id']);
- if ($result>0) {
- $message = $message.' '.$this->view->translate('a été réussi!');
- } else if ($result===0) {
- $message = $message.' '.$this->view->translate('n\'a pas été réussi!');
+ if ($result>0) {
+ $message = $message.' '.$this->view->translate('a été réussi!');
+ } else if ($result===0) {
+ $message = $message.' '.$this->view->translate('n\'a pas été réussi!');
} else {
$message = $result;
- }
-
- $this->view->assign('message', $message);
+ }
+
+ $this->view->assign('message', $message);
}
/**
diff --git a/application/modules/default/views/default/scripts/finance/liasse.phtml b/application/modules/default/views/default/scripts/finance/liasse.phtml
index ebbd23b96..7796b0d10 100644
--- a/application/modules/default/views/default/scripts/finance/liasse.phtml
+++ b/application/modules/default/views/default/scripts/finance/liasse.phtml
@@ -40,6 +40,15 @@
+exportObjet->TOP_CONFIDENTIEL) : ?>
+