[openaria-Commits] r2201 - branches/trunk_evo_OM_4.6/obj

[jyma...@adullact.net]

Author: jymadier
Date: 2017-07-17 10:34:57 +0200 (Mon, 17 Jul 2017)
New Revision: 2201

Modified:
branches/trunk_evo_OM_4.6/obj/autorite_police.class.php
branches/trunk_evo_OM_4.6/obj/dossier_coordination_type.class.php
branches/trunk_evo_OM_4.6/obj/proces_verbal.class.php
branches/trunk_evo_OM_4.6/obj/reglementation_applicable.class.php
Log:
* Correction de l'oubli de remplacement de certains noms de variable


Modified: branches/trunk_evo_OM_4.6/obj/autorite_police.class.php
===================================================================
--- branches/trunk_evo_OM_4.6/obj/autorite_police.class.php 2017-07-13 15:23:05 UTC (rev 2200)
+++ branches/trunk_evo_OM_4.6/obj/autorite_police.class.php 2017-07-17 08:34:57 UTC (rev 2201)
@@ -137,7 +137,7 @@
$sql_courriers_lies = $sql_courriers_lies_select.$sql_courriers_lies_from.$sql_courriers_lies_where;
$sql_courriers_lies_by_id = $sql_courriers_lies_select.$sql_courriers_lies_from.$sql_courriers_lies_by_id_where;
//
- $this->init_select($form, $db, $maj, $debug, "courriers_lies", $sql_courriers_lies, $sql_courriers_lies_by_id, false, true);
+ $this->init_select($form, $dnu1, $maj, $dnu2, "courriers_lies", $sql_courriers_lies, $sql_courriers_lies_by_id, false, true);

if ($maj == 1 || $maj == 2 || $maj == 3) { // Modification, suppression, consultation
// Paramétres envoyés au type link dossier_coordination

Modified: branches/trunk_evo_OM_4.6/obj/dossier_coordination_type.class.php
===================================================================
--- branches/trunk_evo_OM_4.6/obj/dossier_coordination_type.class.php 2017-07-13 15:23:05 UTC (rev 2200)
+++ branches/trunk_evo_OM_4.6/obj/dossier_coordination_type.class.php 2017-07-17 08:34:57 UTC (rev 2201)
@@ -104,9 +104,9 @@
$sql_analyses_type_disponible_acc = str_replace('<idx_service>', $id_ACC, $sql_analyses_type_disponible);
$sql_analyses_type_disponible_acc_by_id = str_replace('<idx_service>', $id_ACC, $sql_analyses_type_disponible_by_id);
//
- $this->init_select($form, $db, $maj, $debug, "analyses_type_disponible_si", $sql_analyses_type_disponible_si, $sql_analyses_type_disponible_si_by_id, false, true);
+ $this->init_select($form, $dnu1, $maj, $dnu2, "analyses_type_disponible_si", $sql_analyses_type_disponible_si, $sql_analyses_type_disponible_si_by_id, false, true);
//
- $this->init_select($form, $db, $maj, $debug, "analyses_type_disponible_acc", $sql_analyses_type_disponible_acc, $sql_analyses_type_disponible_acc_by_id, false, true);
+ $this->init_select($form, $dnu1, $maj, $dnu2, "analyses_type_disponible_acc", $sql_analyses_type_disponible_acc, $sql_analyses_type_disponible_acc_by_id, false, true);
}
/**
*

Modified: branches/trunk_evo_OM_4.6/obj/proces_verbal.class.php
===================================================================
--- branches/trunk_evo_OM_4.6/obj/proces_verbal.class.php 2017-07-13 15:23:05 UTC (rev 2200)
+++ branches/trunk_evo_OM_4.6/obj/proces_verbal.class.php 2017-07-17 08:34:57 UTC (rev 2201)
@@ -1263,9 +1263,9 @@

// modes ajout (génerer) et modification
if ($maj == 0 || $maj == 1) {
- $this->init_select($form, $db, $maj, $debug, "dossier_instruction_reunion", $sql_demande, $sql_demande_by_id, false, true);
- $this->init_select($form, $db, $maj, $debug, "modele_edition", $sql_modele_edition_pv, $sql_modele_edition_by_id, false, true);
- $this->init_select($form, $db, $maj, $debug, "signataire", $sql_signataire, $sql_signataire_by_id, false, true);
+ $this->init_select($form, $dnu1, $maj, $dnu2, "dossier_instruction_reunion", $sql_demande, $sql_demande_by_id, false, true);
+ $this->init_select($form, $dnu1, $maj, $dnu2, "modele_edition", $sql_modele_edition_pv, $sql_modele_edition_by_id, false, true);
+ $this->init_select($form, $dnu1, $maj, $dnu2, "signataire", $sql_signataire, $sql_signataire_by_id, false, true);
}

// mode consulter
@@ -1299,21 +1299,21 @@

// action ajouter
if ($maj == 6) {
- $this->init_select($form, $db, 0, $debug, "dossier_instruction", $sql_dossier_instruction, $sql_dossier_instruction_by_id, false, true);
- $this->init_select($form, $db, 0, $debug, "dossier_instruction_reunion", $sql_demande, $sql_demande_by_id, false, true);
- $this->init_select($form, $db, 0, $debug, "modele_edition", $sql_modele_edition_pv, $sql_modele_edition_by_id, false, true);
- $this->init_select($form, $db, 0, $debug, "signataire", $sql_signataire, $sql_signataire_by_id, false, true);
+ $this->init_select($form, $dnu1, 0, $dnu2, "dossier_instruction", $sql_dossier_instruction, $sql_dossier_instruction_by_id, false, true);
+ $this->init_select($form, $dnu1, 0, $dnu2, "dossier_instruction_reunion", $sql_demande, $sql_demande_by_id, false, true);
+ $this->init_select($form, $dnu1, 0, $dnu2, "modele_edition", $sql_modele_edition_pv, $sql_modele_edition_by_id, false, true);
+ $this->init_select($form, $dnu1, 0, $dnu2, "signataire", $sql_signataire, $sql_signataire_by_id, false, true);
}
// action regénérer
if ($maj == 7) {
- $this->init_select($form, $db, 1, $debug, "dossier_instruction", $sql_dossier_instruction, $sql_dossier_instruction_by_id, false, true);
- $this->init_select($form, $db, 1, $debug, "dossier_instruction_reunion", $sql_demande, $sql_demande_by_id, false, true);
- $this->init_select($form, $db, 1, $debug, "modele_edition", $sql_modele_edition_pv, $sql_modele_edition_by_id, false, true);
- $this->init_select($form, $db, 1, $debug, "signataire", $sql_signataire, $sql_signataire_by_id, false, true);
+ $this->init_select($form, $dnu1, 1, $dnu2, "dossier_instruction", $sql_dossier_instruction, $sql_dossier_instruction_by_id, false, true);
+ $this->init_select($form, $dnu1, 1, $dnu2, "dossier_instruction_reunion", $sql_demande, $sql_demande_by_id, false, true);
+ $this->init_select($form, $dnu1, 1, $dnu2, "modele_edition", $sql_modele_edition_pv, $sql_modele_edition_by_id, false, true);
+ $this->init_select($form, $dnu1, 1, $dnu2, "signataire", $sql_signataire, $sql_signataire_by_id, false, true);
}
// modes suppression et consultation
if ($maj == 2 || $maj == 3) {
- $this->init_select($form, $db, $maj, $debug, "dossier_instruction_reunion", $sql_demande, $sql_demande_by_id, false, true);
+ $this->init_select($form, $dnu1, $maj, $dnu2, "dossier_instruction_reunion", $sql_demande, $sql_demande_by_id, false, true);
}
}
/**

Modified: branches/trunk_evo_OM_4.6/obj/reglementation_applicable.class.php
===================================================================
--- branches/trunk_evo_OM_4.6/obj/reglementation_applicable.class.php 2017-07-13 15:23:05 UTC (rev 2200)
+++ branches/trunk_evo_OM_4.6/obj/reglementation_applicable.class.php 2017-07-17 08:34:57 UTC (rev 2201)
@@ -87,9 +87,9 @@
include "../sql/".OM_DB_PHPTYPE."/".$this->table.".form.inc";
}
//
- $this->init_select($form, $db, $maj, $debug, "etablissement_categorie", $sql_etablissement_categorie, $sql_etablissement_categorie_by_id, false, true);
+ $this->init_select($form, $dnu1, $maj, $dnu2, "etablissement_categorie", $sql_etablissement_categorie, $sql_etablissement_categorie_by_id, false, true);
//
- $this->init_select($form, $db, $maj, $debug, "etablissement_type", $sql_etablissement_type, $sql_etablissement_type_by_id, false, true);
+ $this->init_select($form, $dnu1, $maj, $dnu2, "etablissement_type", $sql_etablissement_type, $sql_etablissement_type_by_id, false, true);
}

/**