fray...@hephaestos.ovh.adullact.org
unread,Feb 26, 2020, 6:07:14 AM2/26/20Sign in to reply to author
Sign in to forward
You do not have permission to delete messages in this group
Sign in to report message
Either email addresses are anonymous for this group or you need the view member email addresses permission to view the original message
to openmairie-...@googlegroups.com
Author: fraynaud
Date: 2020-02-26 12:07:12 +0100 (Wed, 26 Feb 2020)
New Revision: 1093
Added:
branches/5.1.0/sql/pgsql/affaire.inc.php
branches/5.1.0/sql/pgsql/affaire_courrier.inc.php
branches/5.1.0/sql/pgsql/bible.inc.php
branches/5.1.0/sql/pgsql/categorie_courrier.inc.php
branches/5.1.0/sql/pgsql/categorie_tache.inc.php
branches/5.1.0/sql/pgsql/civilite.inc.php
branches/5.1.0/sql/pgsql/courrier.inc.php
branches/5.1.0/sql/pgsql/courrier_arrivee.inc.php
branches/5.1.0/sql/pgsql/courrier_arrivee_copie.inc.php
branches/5.1.0/sql/pgsql/courrier_arrivee_traitement.inc.php
branches/5.1.0/sql/pgsql/courrier_depart.inc.php
branches/5.1.0/sql/pgsql/courrier_depart_copie.inc.php
branches/5.1.0/sql/pgsql/courrier_depart_traitement.inc.php
branches/5.1.0/sql/pgsql/courrier_edition.inc.php
branches/5.1.0/sql/pgsql/courrier_edition_depart.inc.php
branches/5.1.0/sql/pgsql/courrier_recherche.inc.php
branches/5.1.0/sql/pgsql/courrier_scr.inc.php
branches/5.1.0/sql/pgsql/diffusion.inc.php
branches/5.1.0/sql/pgsql/diffusion_non_validee.inc.php
branches/5.1.0/sql/pgsql/dossier.inc.php
branches/5.1.0/sql/pgsql/emetteur.inc.php
branches/5.1.0/sql/pgsql/etat_diffusion.inc.php
branches/5.1.0/sql/pgsql/etat_tache.inc.php
branches/5.1.0/sql/pgsql/fonction.inc.php
branches/5.1.0/sql/pgsql/mode_diffusion.inc.php
branches/5.1.0/sql/pgsql/nature.inc.php
branches/5.1.0/sql/pgsql/note.inc.php
branches/5.1.0/sql/pgsql/tache.inc.php
branches/5.1.0/sql/pgsql/tachenonsolde.inc.php
branches/5.1.0/sql/pgsql/tachenonsolde_service.inc.php
branches/5.1.0/sql/pgsql/type_correspondant.inc.php
branches/5.1.0/sql/pgsql/type_courrier.inc.php
branches/5.1.0/sql/pgsql/type_diffusion.inc.php
branches/5.1.0/sql/pgsql/type_dossier.inc.php
branches/5.1.0/sql/pgsql/type_service.inc.php
Modified:
branches/5.1.0/sql/pgsql/service.inc.php
Log:
ajout des sql.inc
Added: branches/5.1.0/sql/pgsql/affaire.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/affaire.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/affaire.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,72 @@
+<?php
+//$Id$
+//gen openMairie le 28/08/2017 11:03
+
+include "../gen/sql/pgsql/affaire.inc.php";
+
+$table = DB_PREFIXE."affaire
+ LEFT JOIN ".DB_PREFIXE."civilite
+ ON affaire.civilite=civilite.civilite
+ LEFT JOIN ".DB_PREFIXE."emetteur
+ ON affaire.emetteur=emetteur.emetteur
+ LEFT JOIN ".DB_PREFIXE."service as service
+ ON affaire.service=service.service
+ LEFT JOIN ".DB_PREFIXE."service as service2
+ ON affaire.service_origine=service2.service
+ LEFT JOIN ".DB_PREFIXE."type_correspondant
+ ON affaire.type_correspondant=type_correspondant.type_correspondant ";
+
+$champAffiche = array(
+ 'affaire.affaire as "'._("affaire").'"',
+ 'affaire.libelle as "'._("libelle").'"',
+ 'to_char(affaire.dateaffaire ,\'DD/MM/YYYY\') as "'._("dateaffaire").'"',
+ 'service.libelle as "'._("service").'"',
+ 'concat (affaire.emetteurnom,\' \',affaire.emetteurprenom) as "'._("correspondant").'"',
+ 'type_correspondant.libelle as "'._("type").'"',
+ "case affaire.en_cours when 't' then 'Oui' else 'Non' end as \""._("en cours")."\"",
+
+ );
+// a voir session service
+$selection=" where service_origine =".$_SESSION['service'];
+
+$champs['libelle'] = array(
+ 'table' => 'affaire',
+ 'colonne' => 'libelle',
+ 'type' => 'text',
+ 'taille' => 30,
+ 'libelle' => _('libelle'));
+//
+$champs['emetteur'] = array(
+ 'table' => 'affaire',
+ 'colonne' => array('emetteurnom', 'emetteurprenom',
+ 'emetteurad1', 'emetteurad2', 'emetteurcp', 'emetteurville'),
+ 'type' => 'text',
+ 'taille' => 30,
+ 'libelle' => _('correspondant'));
+
+$champs['type_correspondant'] = array(
+ 'table' => 'type_correspondant',
+ 'colonne' => 'type_correspondant',
+ 'type' => 'select',
+ 'libelle' => _('correspondant'));
+
+
+$champs['service'] = array(
+ 'table' => 'service',
+ 'colonne' => 'service',
+ 'type' => 'select',
+ 'libelle' => _('service'));
+
+
+// Configuration de la recherche avancée
+$options[] = array(
+ 'type' => 'search',
+ 'display' => true,
+ 'advanced' => $champs,
+ 'default_form' => 'advanced',
+ 'absolute_object' => 'affaire',
+ 'export' => array("csv"));
+
+
+
+?>
Property changes on: branches/5.1.0/sql/pgsql/affaire.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/affaire_courrier.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/affaire_courrier.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/affaire_courrier.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,26 @@
+<?php
+//$Id$
+//gen openMairie le 28/08/2017 14:57
+
+include "../gen/sql/pgsql/affaire_courrier.inc.php";
+
+if ($retourformulaire== 'courrier_arrivee')
+ $selection=" where affaire_courrier.courrier ='".$idx."'";
+if ($retourformulaire== 'courrier_arrivee_traitement')
+ $selection=" where affaire_courrier.courrier ='".$idx."'";
+if ($retourformulaire== 'courrier_depart')
+ $selection=" where affaire_courrier.courrier ='".$idx."'";
+if ($retourformulaire== 'courrier_depart_traitement')
+ $selection=" where affaire_courrier.courrier ='".$idx."'";
+
+
+if (in_array($retourformulaire, $foreign_keys_extended["affaire"])) {
+ $tab_actions['corner']['ajouter'] = null;
+ $tab_actions['left']["consulter"]['lien'] = "#";
+ $tab_actions['content']['lien'] = "#";
+}
+
+
+
+
+?>
Property changes on: branches/5.1.0/sql/pgsql/affaire_courrier.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/bible.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/bible.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/bible.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,9 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 12:29
+
+include "../gen/sql/pgsql/bible.inc.php";
+
+$ent = __("parametrage metier")." -> ".__("bible");
+
+$selection=" where service_origine =".$_SESSION['service'];
Property changes on: branches/5.1.0/sql/pgsql/bible.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/categorie_courrier.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/categorie_courrier.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/categorie_courrier.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,26 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 12:29
+
+include "../gen/sql/pgsql/categorie_courrier.inc.php";
+
+$tab_title = _("categorie courrier");
+$ent = __("parametrage metier")." -> ".__("categorie courrier");
+
+/**
+ * Gestion SOUSFORMULAIRE => $sousformulaire
+ */
+$sousformulaire = array(
+ 'categorie_courrier_service',
+ 'categorie_courrier_tache',
+);
+$sousformulaire_parameters = array(
+ "categorie_courrier_service" => array(
+ "title" => _("service en copie"),
+ ),
+ "categorie_courrier_tache" => array(
+ "title" => _("tache affectee au service"),
+ ),
+
+);
+
Property changes on: branches/5.1.0/sql/pgsql/categorie_courrier.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/categorie_tache.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/categorie_tache.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/categorie_tache.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,21 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 12:29
+
+include "../gen/sql/pgsql/categorie_tache.inc.php";
+$tab_title = _("categorie tache");
+$ent = __("parametrage metier")." -> ".__("categorie tache");
+
+/**
+ * Gestion SOUSFORMULAIRE => $sousformulaire
+ */
+$sousformulaire = array(
+ 'categorie_courrier_tache',
+);
+
+$sousformulaire_parameters = array(
+ "categorie_courrier_tache" => array(
+ "title" => _("tache affectee par categorie de courrier"),
+ ),
+);
+
Property changes on: branches/5.1.0/sql/pgsql/categorie_tache.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/civilite.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/civilite.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/civilite.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,9 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 12:29
+
+include "../gen/sql/pgsql/civilite.inc.php";
+
+$ent = __("parametrage metier")." -> ".__("civilite");
+
+$sousformulaire = array();
Property changes on: branches/5.1.0/sql/pgsql/civilite.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/courrier.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/courrier.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/courrier.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,81 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 12:29
+
+include "../gen/sql/pgsql/courrier.inc.php";
+
+$champs['registre'] = array(
+ 'table' => 'courrier',
+ 'colonne' => 'registre',
+ 'type' => 'text',
+ 'taille' => 30,
+ 'libelle' => _('registre'));
+//
+
+$champs['type_courrier'] = array(
+ 'table' => 'type_courrier',
+ 'colonne' => 'type_courrier',
+ 'type' => 'select',
+ 'libelle' => _('type_courrier'));
+/*
+$champs['categorie_courrier'] = array(
+ 'table' => 'categorie_courrier',
+ 'colonne' => 'categorie_courrier',
+ 'type' => 'select',
+ 'libelle' => _('categorie_courrier'));
+*/
+
+$champs['type_correspondant'] = array(
+ 'table' => 'type_correspondant',
+ 'colonne' => 'type_correspondant',
+ 'type' => 'select',
+ 'libelle' => _('correspondant'));
+
+$champs['datearrivee'] = array(
+ 'colonne' => 'datearrivee',
+ 'table' => 'courrier',
+ 'libelle' => _("date d'arrivee ou de signature"),
+ 'lib1'=> _("debut"),
+ 'lib2' => _("fin"),
+ 'type' => 'date',
+ 'taille' => 8,
+ 'where' => 'intervaldate');
+//
+$champs['datecourrier'] = array(
+ 'colonne' => 'datecourrier',
+ 'table' => 'courrier',
+ 'libelle' => _('date courrier'),
+ 'lib1'=> _("debut"),
+ 'lib2' => _("fin"),
+ 'type' => 'date',
+ 'taille' => 8,
+ 'where' => 'intervaldate');
+//
+$champs['objetcourrier'] = array(
+ 'table' => 'courrier',
+ 'colonne' => 'objetcourrier',
+ 'type' => 'text',
+ 'taille' => 30,
+ 'libelle' => _('objet'));
+//
+$champs['emetteur'] = array(
+ 'table' => 'courrier',
+ 'colonne' => array('emetteurnom', 'emetteurprenom',
+ 'emetteurad1', 'emetteurad2', 'emetteurcp', 'emetteurville'),
+ 'type' => 'text',
+ 'taille' => 30,
+ 'libelle' => _('correspondant'));
+
+
+
+// Configuration de la recherche avancée
+$options[] = array(
+ 'type' => 'search',
+ 'display' => true,
+ 'advanced' => $champs,
+ 'default_form' => 'advanced',
+ 'absolute_object' => 'courrier',
+ 'export' => array("csv"));
+
+
+?>
Property changes on: branches/5.1.0/sql/pgsql/courrier.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/courrier_arrivee.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/courrier_arrivee.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/courrier_arrivee.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Script contenant les requetes effectuee par la class obj/courrier_arrivee.class.php
+ *
+ * @package openCourrier
+ *
+ *
+ */
+include('../sql/pgsql/courrier.inc.php');
+
+$champAffiche = array(
+ 'courrier.courrier as "'._("Id").'"',
+ 'registre as "'._("registre").'"',
+ 'to_char(datearrivee ,\'DD/MM/YYYY\') as "'._("Arrivée le").'"',
+ 'to_char(datecourrier ,\'DD/MM/YYYY\') as "'._("date du").'"',
+ 'concat (courrier.emetteurnom,\' \',courrier.emetteurprenom) as "'._("correspondant").'"',
+ 'categorie_courrier.libelle as "'._("categorie").'"',
+ 'substring(courrier.objetcourrier, 1,60) as "'._("objet").'"',
+);
+$selection =" where courrier.service_origine =".$_SESSION['service']." ";
+$selection .=" and courrier.nature=1";
+
+
+/*
+$table = DB_PREFIXE."courrier
+ LEFT JOIN ".DB_PREFIXE."categorie_courrier
+ ON courrier.categorie_courrier=categorie_courrier.categorie_courrier
+ LEFT JOIN ".DB_PREFIXE."civilite
+ ON courrier.civilite=civilite.civilite
+ LEFT JOIN ".DB_PREFIXE."emetteur
+ ON courrier.emetteur=emetteur.emetteur
+ LEFT JOIN ".DB_PREFIXE."nature
+ ON courrier.nature=nature.nature
+ LEFT JOIN ".DB_PREFIXE."type_correspondant
+ ON courrier.type_correspondant=type_correspondant.type_correspondant
+ LEFT JOIN ".DB_PREFIXE."type_courrier
+ ON courrier.type_courrier=type_courrier.type_courrier
+ LEFT JOIN ".DB_PREFIXE."diffusion
+ ON diffusion.courrier = courrier.courrier
+ LEFT JOIN ".DB_PREFIXE."service
+ ON diffusion.service = service.service
+ LEFT JOIN ".DB_PREFIXE."service as service2
+ ON diffusion.service_origine = service2.service
+ LEFT JOIN ".DB_PREFIXE."type_diffusion
+ ON diffusion.type_diffusion = type_diffusion.type_diffusion
+ LEFT JOIN ".DB_PREFIXE."etat_diffusion
+ ON diffusion.etat_diffusion = etat_diffusion.etat_diffusion ";
+*/
+
+
+//$selection=" where diffusion.service IN ('".$_SESSION['service']."'";
+// courrier vide
+
+// les courriers qui me sont affectes dans mon service
+
+// les courriers que j ai saisi et que j ai affectes en traitement a un service
+// avec etat diffusion ok et pas ?
+//$selection .=" or (diffusion.service_origine =".$_SESSION['service'].
+// " and diffusion.type_diffusion = 1)";
+// les courriers que j ai saisi mais qui n ont pas de diffusion
+//$selection .=" or (courrier.service_origine =".$_SESSION['service'].
+// " and diffusion.type_diffusion is null)";
+// les courriers à l origine sans service de traitement
+// $selection .=" or (courrier.service_origine =".$_SESSION['service']. ")";
+// a voir comment eviter toutes les copies
+// on ne peut traiter la copie que si il y a traitement ?
+//$selection .=") and courrier.nature=1";
+
+// les sous service ? p/r
+//if($_SESSION['ecriture_sous_service']==1)
+//foreach($_SESSION['sous_service'] as $elt)
+// $selection.=",'".$elt."'";
+//$selection.=") and courrier.nature=1";
+
+$tri="ORDER BY courrier.courrier DESC NULLS LAST";
+
+
+
+
+/*
+// Fil d'Ariane
+$ent = _("courrier")." -> "._("arrivee");
+if (isset($idx) && $idx != ']' && trim($idx) != '') {
+ $ent .= "-> ".$idx." ";
+}
+if (isset($idz) && trim($idz) != '') {
+ $ent .= " ".mb_strtoupper($idz, "UTF-8")." ";
+}
+
+//
+$label=_("courrier_arrivee");
+
+//Liste des champs affiches dans la liste des courriers
+$champAffiche=array(
+ 'courrier.courrier as "'._("courrier").'"',
+ 'registre as "'._("registre").'"',
+ 'nature as "'._("nature").'"',
+ 'to_char(datearrivee ,\'DD/MM/YYYY\') as "'._("date d'arrivee").'"',
+ 'to_char(datecourrier ,\'DD/MM/YYYY\') as "'._("date courrier").'"',
+ 'courrier.emetteurnom ||
+ CASE WHEN courrier.emetteurprenom IS NULL
+ THEN \'\'
+ ELSE \' \'
+ END
+ || COALESCE(courrier.emetteurprenom, \'\') as "'._("emetteur").'"',
+ 'service.servicelib as "'._("traitement").'"',
+ 'categorie_courrier.libelle as "'._("categorie").'"',
+ 'substring(courrier.objetcourrier, 1,50) as "'._("objet courrier").'"',
+ 'nbtache as "'._("Tache(s)").'"'
+ );
+
+$champRecherche = array(
+ "courrier",
+ "registre",
+ "service.servicelib as traitement",
+ "nature",
+ "courrier.emetteurnom || COALESCE(courrier.emetteurprenom, '') || COALESCE(to_char(courrier.emetteur, '999'), '') as emetteur",
+ "courrier.emetteurad1 || COALESCE(courrier.emetteurad2,'') || COALESCE(courrier.emetteurcp, '') || COALESCE(courrier.emetteurville, '') as emetteur adresse",
+ "courrier.objetcourrier as objet courrier",
+ "courrier.copiea as copie à",
+ "courrier.diffusion as diffusion",
+);
+
+//
+if($f->get_service_code($_SESSION['service'])=='*')
+ $selection=" WHERE typecourrier='arrivee'";
+elseif($f->getParameter('vue_sous_service') == 'true') //si la vue sur les sous-services est active
+{
+ $selection=" where traitement IN ('".$_SESSION['service']."'";
+ foreach($_SESSION['sous_service'] as $elt)
+ $selection.=",'".$elt."'";
+
+ $selection.=") AND typecourrier='arrivee'";
+
+}
+else
+ $selection=" WHERE traitement='".$_SESSION['service']."' AND typecourrier='arrivee'";
+
+$tab_actions['left']['accuse_reception'] = array(
+ "lien" => "../pdf/pdfetat.php?obj=ar&idx=",
+ "id" => "",
+ "lib" => "<span class=\"om-icon om-icon-16 om-icon-fix pdf-ar-16\" title=\""._("Accuse de reception")."\">"._("AR")."</span>",
+ "target" => "_blank",
+ "ajax" => false,
+ "ordre" => 110,
+ );
+*/
+?>
Property changes on: branches/5.1.0/sql/pgsql/courrier_arrivee.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/courrier_arrivee_copie.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/courrier_arrivee_copie.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/courrier_arrivee_copie.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Script contenant les requetes effectuee par la class obj/courrier_arrivee.class.php
+ *
+ * @package openCourrier
+ *
+ *
+ */
+include('../sql/pgsql/courrier.inc.php');
+
+$tab_actions['corner']['ajouter'] = NULL;
+$ent .= " -> "._("copie");
+$champAffiche = array(
+ 'courrier.courrier as "'._("Id").'"',
+ 'registre as "'._("registre").'"',
+ 'to_char(datearrivee ,\'DD/MM/YYYY\') as "'._("Arrivée le").'"',
+ 'to_char(datecourrier ,\'DD/MM/YYYY\') as "'._("date du").'"',
+ 'concat (courrier.emetteurnom,\' \',courrier.emetteurprenom) as "'._("correspondant").'"',
+ 'categorie_courrier.libelle as "'._("categorie").'"',
+ 'substring(courrier.objetcourrier, 1,60) as "'._("objet").'"',
+);
+$table = DB_PREFIXE."courrier
+ LEFT JOIN ".DB_PREFIXE."categorie_courrier
+ ON courrier.categorie_courrier=categorie_courrier.categorie_courrier
+ LEFT JOIN ".DB_PREFIXE."civilite
+ ON courrier.civilite=civilite.civilite
+ LEFT JOIN ".DB_PREFIXE."emetteur
+ ON courrier.emetteur=emetteur.emetteur
+ LEFT JOIN ".DB_PREFIXE."nature
+ ON courrier.nature=nature.nature
+ LEFT JOIN ".DB_PREFIXE."type_correspondant
+ ON courrier.type_correspondant=type_correspondant.type_correspondant
+ LEFT JOIN ".DB_PREFIXE."type_courrier
+ ON courrier.type_courrier=type_courrier.type_courrier
+ LEFT JOIN ".DB_PREFIXE."diffusion
+ ON diffusion.courrier = courrier.courrier
+ LEFT JOIN ".DB_PREFIXE."service
+ ON diffusion.service = service.service
+ LEFT JOIN ".DB_PREFIXE."service as service2
+ ON diffusion.service_origine = service2.service
+ LEFT JOIN ".DB_PREFIXE."type_diffusion
+ ON diffusion.type_diffusion = type_diffusion.type_diffusion
+ LEFT JOIN ".DB_PREFIXE."etat_diffusion
+ ON diffusion.etat_diffusion = etat_diffusion.etat_diffusion ";
+
+$selection =" where diffusion.service =".$_SESSION['service']." ";
+$selection .=" and courrier.nature=1 and diffusion.etat_diffusion=2 ";
+$selection .=" and diffusion.type_diffusion=2 ";
+
+$tri="ORDER BY courrier.courrier DESC NULLS LAST";
+
+$sousformulaire = array(
+ 'tache',
+);
+
+?>
Property changes on: branches/5.1.0/sql/pgsql/courrier_arrivee_copie.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/courrier_arrivee_traitement.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/courrier_arrivee_traitement.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/courrier_arrivee_traitement.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Script contenant les requetes effectuee par la class obj/courrier_arrivee.class.php
+ *
+ * @package openCourrier
+ *
+ *
+ */
+include('../sql/pgsql/courrier.inc.php');
+
+$tab_actions['corner']['ajouter'] = NULL;
+$ent .= " -> "._("traitement");
+$champAffiche = array(
+ 'courrier.courrier as "'._("Id").'"',
+ 'registre as "'._("registre").'"',
+ 'to_char(datearrivee ,\'DD/MM/YYYY\') as "'._("Arrivée le").'"',
+ 'to_char(datecourrier ,\'DD/MM/YYYY\') as "'._("date du").'"',
+ 'concat (courrier.emetteurnom,\' \',courrier.emetteurprenom) as "'._("correspondant").'"',
+ 'categorie_courrier.libelle as "'._("categorie").'"',
+ 'substring(courrier.objetcourrier, 1,60) as "'._("objet").'"',
+);
+$table = DB_PREFIXE."courrier
+ LEFT JOIN ".DB_PREFIXE."categorie_courrier
+ ON courrier.categorie_courrier=categorie_courrier.categorie_courrier
+ LEFT JOIN ".DB_PREFIXE."civilite
+ ON courrier.civilite=civilite.civilite
+ LEFT JOIN ".DB_PREFIXE."emetteur
+ ON courrier.emetteur=emetteur.emetteur
+ LEFT JOIN ".DB_PREFIXE."nature
+ ON courrier.nature=nature.nature
+ LEFT JOIN ".DB_PREFIXE."type_correspondant
+ ON courrier.type_correspondant=type_correspondant.type_correspondant
+ LEFT JOIN ".DB_PREFIXE."type_courrier
+ ON courrier.type_courrier=type_courrier.type_courrier
+ LEFT JOIN ".DB_PREFIXE."diffusion
+ ON diffusion.courrier = courrier.courrier
+ LEFT JOIN ".DB_PREFIXE."service
+ ON diffusion.service = service.service
+ LEFT JOIN ".DB_PREFIXE."service as service2
+ ON diffusion.service_origine = service2.service
+ LEFT JOIN ".DB_PREFIXE."type_diffusion
+ ON diffusion.type_diffusion = type_diffusion.type_diffusion
+ LEFT JOIN ".DB_PREFIXE."etat_diffusion
+ ON diffusion.etat_diffusion = etat_diffusion.etat_diffusion ";
+
+$selection =" where diffusion.service =".$_SESSION['service']." ";
+$selection .=" and courrier.nature=1 ";
+$selection .=" and ((diffusion.type_diffusion=1 and diffusion.etat_diffusion=2) ";
+$selection .=" or (diffusion.type_diffusion=3 and diffusion.etat_diffusion=2))";
+$selection .=" ";
+
+$sousformulaire = array(
+ 'diffusion',
+ 'dossier',
+ 'note',
+ 'tache',
+ 'affaire_courrier',
+);
+
+?>
Property changes on: branches/5.1.0/sql/pgsql/courrier_arrivee_traitement.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/courrier_depart.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/courrier_depart.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/courrier_depart.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Script contenant les requetes effectuee par la class obj/courrier_depart.class.php
+ *
+ * @package openCourrier
+ *
+ *
+ */
+include('../sql/pgsql/courrier.inc.php');
+
+$champAffiche = array(
+ 'courrier.courrier as "'._("Id").'"',
+ 'registre as "'._("registre").'"',
+ 'to_char(datearrivee ,\'DD/MM/YYYY\') as "'._("Arrivée le").'"',
+ 'to_char(datecourrier ,\'DD/MM/YYYY\') as "'._("date du").'"',
+ 'concat (courrier.emetteurnom,\' \',courrier.emetteurprenom) as "'._("correspondant").'"',
+ 'categorie_courrier.libelle as "'._("categorie").'"',
+ 'substring(courrier.objetcourrier, 1,60) as "'._("objet").'"',
+);
+$selection =" where courrier.service_origine =".$_SESSION['service']." ";
+$selection .=" and courrier.nature=2";
+
+$tri="ORDER BY courrier.courrier DESC NULLS LAST";
+
+
Property changes on: branches/5.1.0/sql/pgsql/courrier_depart.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/courrier_depart_copie.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/courrier_depart_copie.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/courrier_depart_copie.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Script contenant les requetes effectuee par la class obj/courrier_depart.class.php
+ *
+ * @package openCourrier
+ *
+ *
+ */
+include('../sql/pgsql/courrier.inc.php');
+$tab_actions['corner']['ajouter'] = NULL;
+$ent .= " -> "._("copie");
+$champAffiche = array(
+ 'courrier.courrier as "'._("Id").'"',
+ 'registre as "'._("registre").'"',
+ 'to_char(datearrivee ,\'DD/MM/YYYY\') as "'._("Arrivée le").'"',
+ 'to_char(datecourrier ,\'DD/MM/YYYY\') as "'._("date du").'"',
+ 'concat (courrier.emetteurnom,\' \',courrier.emetteurprenom) as "'._("correspondant").'"',
+ 'categorie_courrier.libelle as "'._("categorie").'"',
+ 'substring(courrier.objetcourrier, 1,60) as "'._("objet").'"',
+);
+$table = DB_PREFIXE."courrier
+ LEFT JOIN ".DB_PREFIXE."categorie_courrier
+ ON courrier.categorie_courrier=categorie_courrier.categorie_courrier
+ LEFT JOIN ".DB_PREFIXE."civilite
+ ON courrier.civilite=civilite.civilite
+ LEFT JOIN ".DB_PREFIXE."emetteur
+ ON courrier.emetteur=emetteur.emetteur
+ LEFT JOIN ".DB_PREFIXE."nature
+ ON courrier.nature=nature.nature
+ LEFT JOIN ".DB_PREFIXE."type_correspondant
+ ON courrier.type_correspondant=type_correspondant.type_correspondant
+ LEFT JOIN ".DB_PREFIXE."type_courrier
+ ON courrier.type_courrier=type_courrier.type_courrier
+ LEFT JOIN ".DB_PREFIXE."diffusion
+ ON diffusion.courrier = courrier.courrier
+ LEFT JOIN ".DB_PREFIXE."service
+ ON diffusion.service = service.service
+ LEFT JOIN ".DB_PREFIXE."service as service2
+ ON diffusion.service_origine = service2.service
+ LEFT JOIN ".DB_PREFIXE."type_diffusion
+ ON diffusion.type_diffusion = type_diffusion.type_diffusion
+ LEFT JOIN ".DB_PREFIXE."etat_diffusion
+ ON diffusion.etat_diffusion = etat_diffusion.etat_diffusion ";
+
+$selection =" where diffusion.service =".$_SESSION['service']." ";
+$selection .=" and courrier.nature=2 and diffusion.etat_diffusion=2 ";
+$selection .=" and diffusion.type_diffusion=2 ";
+$tri="ORDER BY courrier.courrier DESC NULLS LAST";
+
+$sousformulaire = array(
+ 'tache',
+);
Property changes on: branches/5.1.0/sql/pgsql/courrier_depart_copie.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/courrier_depart_traitement.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/courrier_depart_traitement.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/courrier_depart_traitement.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Script contenant les requetes effectuee par la class obj/courrier_depart.class.php
+ *
+ * @package openCourrier
+ *
+ *
+ */
+include('../sql/pgsql/courrier.inc.php');
+
+$champAffiche = array(
+ 'courrier.courrier as "'._("Id").'"',
+ 'registre as "'._("registre").'"',
+ 'to_char(datearrivee ,\'DD/MM/YYYY\') as "'._("Arrivée le").'"',
+ 'to_char(datecourrier ,\'DD/MM/YYYY\') as "'._("date du").'"',
+ 'concat (courrier.emetteurnom,\' \',courrier.emetteurprenom) as "'._("correspondant").'"',
+ 'categorie_courrier.libelle as "'._("categorie").'"',
+ 'substring(courrier.objetcourrier, 1,60) as "'._("objet").'"',
+);
+$tab_actions['corner']['ajouter'] = NULL;
+$ent .= " -> "._("traitement");
+$table = DB_PREFIXE."courrier
+ LEFT JOIN ".DB_PREFIXE."categorie_courrier
+ ON courrier.categorie_courrier=categorie_courrier.categorie_courrier
+ LEFT JOIN ".DB_PREFIXE."civilite
+ ON courrier.civilite=civilite.civilite
+ LEFT JOIN ".DB_PREFIXE."emetteur
+ ON courrier.emetteur=emetteur.emetteur
+ LEFT JOIN ".DB_PREFIXE."nature
+ ON courrier.nature=nature.nature
+ LEFT JOIN ".DB_PREFIXE."type_correspondant
+ ON courrier.type_correspondant=type_correspondant.type_correspondant
+ LEFT JOIN ".DB_PREFIXE."type_courrier
+ ON courrier.type_courrier=type_courrier.type_courrier
+ LEFT JOIN ".DB_PREFIXE."diffusion
+ ON diffusion.courrier = courrier.courrier
+ LEFT JOIN ".DB_PREFIXE."service
+ ON diffusion.service = service.service
+ LEFT JOIN ".DB_PREFIXE."service as service2
+ ON diffusion.service_origine = service2.service
+ LEFT JOIN ".DB_PREFIXE."type_diffusion
+ ON diffusion.type_diffusion = type_diffusion.type_diffusion
+ LEFT JOIN ".DB_PREFIXE."etat_diffusion
+ ON diffusion.etat_diffusion = etat_diffusion.etat_diffusion ";
+
+$selection =" where diffusion.service =".$_SESSION['service']." ";
+$selection .=" and courrier.nature=2 ";
+$selection .=" and ((diffusion.type_diffusion=1 and diffusion.etat_diffusion=2) ";
+$selection .=" or (diffusion.type_diffusion=3 and diffusion.etat_diffusion=2))";
+$selection .=" ";
+
+$sousformulaire = array(
+ 'diffusion',
+ 'dossier',
+ 'note',
+ 'tache',
+ 'affaire_courrier',
+);
+
+
Property changes on: branches/5.1.0/sql/pgsql/courrier_depart_traitement.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/courrier_edition.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/courrier_edition.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/courrier_edition.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,9 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 12:29
+
+include "../gen/sql/pgsql/courrier.inc.php";
+
+$sousformulaire = array();
+
+?>
Property changes on: branches/5.1.0/sql/pgsql/courrier_edition.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/courrier_edition_depart.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/courrier_edition_depart.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/courrier_edition_depart.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,9 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 12:29
+
+include "../gen/sql/pgsql/courrier.inc.php";
+
+$sousformulaire = array();
+
+?>
Property changes on: branches/5.1.0/sql/pgsql/courrier_edition_depart.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/courrier_recherche.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/courrier_recherche.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/courrier_recherche.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,178 @@
+<?php
+/**
+ * Script contenant les requetes effectuee par la class obj/courrier_arrivee.class.php
+ *
+ * @package openCourrier
+ *
+ *
+ */
+include "../gen/sql/pgsql/courrier.inc.php";
+$tab_actions['corner']['ajouter'] = NULL;
+$ent .= " -> "._("recherche");
+/*
+$champAffiche = array(
+ 'courrier.courrier as "'._("Id").'"',
+ 'registre as "'._("registre").'"',
+ 'to_char(datearrivee ,\'DD/MM/YYYY\') as "'._("Arrivée le").'"',
+ 'to_char(datecourrier ,\'DD/MM/YYYY\') as "'._("date du").'"',
+ 'concat (courrier.emetteurnom,\' \',courrier.emetteurprenom) as "'._("correspondant").'"',
+ 'categorie_courrier.libelle as "'._("categorie").'"',
+ 'substring(courrier.objetcourrier, 1,60) as "'._("objet").'"',
+);
+// liste hierarchique
+
+$selection = " where service_origine IN (";
+$i=0;
+
+foreach($_SESSION['sous_service'] as $elt) {
+ $i++;
+ if($i!=1)
+ $selection .= ",";
+ $selection .= $elt."";
+}
+if($i==0)
+ $selection .= "0)";
+else
+ $selection .= ")";
+*/
+$champAffiche = array(
+ 'courrier.courrier as "'._("Id").'"',
+ 'registre as "'._("registre").'"',
+ 'to_char(datearrivee ,\'DD/MM/YYYY\') as "'._("Arrivée le").'"',
+ 'to_char(datecourrier ,\'DD/MM/YYYY\') as "'._("date du").'"',
+ 'concat (courrier.emetteurnom,\' \',courrier.emetteurprenom) as "'._("correspondant").'"',
+ 'categorie_courrier.libelle as "'._("categorie").'"',
+ 'substring(courrier.objetcourrier, 1,60) as "'._("objet").'"',
+ 'service.libelle as "'._("traitement").'"',
+);
+$table = DB_PREFIXE."courrier
+ LEFT JOIN ".DB_PREFIXE."categorie_courrier
+ ON courrier.categorie_courrier=categorie_courrier.categorie_courrier
+ LEFT JOIN ".DB_PREFIXE."civilite
+ ON courrier.civilite=civilite.civilite
+ LEFT JOIN ".DB_PREFIXE."emetteur
+ ON courrier.emetteur=emetteur.emetteur
+ LEFT JOIN ".DB_PREFIXE."nature
+ ON courrier.nature=nature.nature
+ LEFT JOIN ".DB_PREFIXE."type_correspondant
+ ON courrier.type_correspondant=type_correspondant.type_correspondant
+ LEFT JOIN ".DB_PREFIXE."type_courrier
+ ON courrier.type_courrier=type_courrier.type_courrier
+ LEFT JOIN ".DB_PREFIXE."diffusion
+ ON diffusion.courrier = courrier.courrier
+ LEFT JOIN ".DB_PREFIXE."service
+ ON diffusion.service = service.service
+ LEFT JOIN ".DB_PREFIXE."service as service2
+ ON diffusion.service_origine = service2.service
+ LEFT JOIN ".DB_PREFIXE."type_diffusion
+ ON diffusion.type_diffusion = type_diffusion.type_diffusion
+ LEFT JOIN ".DB_PREFIXE."etat_diffusion
+ ON diffusion.etat_diffusion = etat_diffusion.etat_diffusion ";
+
+//$selection =" where diffusion.service =".$_SESSION['service']." ";
+$selection = " where diffusion.service IN (";
+$i=0;
+
+foreach($_SESSION['sous_service'] as $elt) {
+ $i++;
+ if($i!=1)
+ $selection .= ",";
+ $selection .= $elt."";
+}
+if($i==0)
+ $selection .= "0)";
+else
+ $selection .= ")";
+$selection .=" and courrier.nature=1 ";
+$selection .=" and ((diffusion.type_diffusion=1 and diffusion.etat_diffusion=2) ";
+$selection .=" or (diffusion.type_diffusion=3 and diffusion.etat_diffusion=2))";
+$selection .=" ";
+
+
+
+
+
+// pas de sous formulaire
+
+$sousformulaire = array();
+
+// echo $selection;
+// moteur de recherche avec nature
+$champs['registre'] = array(
+ 'table' => 'courrier',
+ 'colonne' => 'registre',
+ 'type' => 'text',
+ 'taille' => 30,
+ 'libelle' => _('registre'));
+
+$champs['type_courrier'] = array(
+ 'table' => 'type_courrier',
+ 'colonne' => 'type_courrier',
+ 'type' => 'select',
+ 'libelle' => _('type_courrier'));
+/*
+$champs['categorie_courrier'] = array(
+ 'table' => 'categorie_courrier',
+ 'colonne' => 'categorie_courrier',
+ 'type' => 'select',
+ 'libelle' => _('categorie'));
+*/
+$champs['nature'] = array(
+ 'table' => 'nature',
+ 'colonne' => 'nature',
+ 'type' => 'select',
+ 'libelle' => _('nature'));
+
+$champs['datearrivee'] = array(
+ 'colonne' => 'datearrivee',
+ 'table' => 'courrier',
+ 'libelle' => _("date d'arrivee ou de signature"),
+ 'lib1'=> _("debut"),
+ 'lib2' => _("fin"),
+ 'type' => 'date',
+ 'taille' => 8,
+ 'where' => 'intervaldate');
+//
+$champs['datecourrier'] = array(
+ 'colonne' => 'datecourrier',
+ 'table' => 'courrier',
+ 'libelle' => _('date courrier'),
+ 'lib1'=> _("debut"),
+ 'lib2' => _("fin"),
+ 'type' => 'date',
+ 'taille' => 8,
+ 'where' => 'intervaldate');
+//
+$champs['objetcourrier'] = array(
+ 'table' => 'courrier',
+ 'colonne' => 'objetcourrier',
+ 'type' => 'text',
+ 'taille' => 30,
+ 'libelle' => _('objet'));
+//
+$champs['emetteur'] = array(
+ 'table' => 'courrier',
+ 'colonne' => array('emetteurnom', 'emetteurprenom',
+ 'emetteurad1', 'emetteurad2', 'emetteurcp', 'emetteurville'),
+ 'type' => 'text',
+ 'taille' => 30,
+ 'libelle' => _('correspondant'));
+
+$champs['type_correspondant'] = array(
+ 'table' => 'type_correspondant',
+ 'colonne' => 'type_correspondant',
+ 'type' => 'select',
+ 'libelle' => _('type correspondant'));
+
+
+
+
+// Configuration de la recherche avancée
+$options[] = array(
+ 'type' => 'search',
+ 'display' => true,
+ 'advanced' => $champs,
+ 'default_form' => 'advanced',
+ 'absolute_object' => 'courrier',
+ 'export' => array("csv"));
+?>
Added: branches/5.1.0/sql/pgsql/courrier_scr.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/courrier_scr.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/courrier_scr.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,64 @@
+<?php
+/*
+ * Created on 6 oct. 2009
+ * $Id: courrier_scr.inc,v 1.1 2009-10-06 15:40:54 fraynaud Exp $
+*/
+// courrier
+
+$sql_courrier="select courrier,
+ courrier.diffusion,
+ courrier.type_courrier,
+ emetteurnom || ' ' || emetteurprenom as emetteur,
+ registre,
+ to_char(datecourrier ,'DD/MM/YYYY') as datecourrier,
+ to_char(datearrivee ,'DD/MM/YYYY') as datearrivee,
+ courrier.objetcourrier,
+ categorie_courrier.libelle as cate_courrier_lib,
+ liaison ";
+
+$sql_courrier.=" from ".DB_PREFIXE."courrier
+ left join ".DB_PREFIXE."categorie_courrier on courrier.categorie_courrier=categorie_courrier.categorie_courrier
+ ";
+$sql_courrier.=" where courrier = ".$idx;
+
+
+// tache
+$sql_tache="SELECT tache, service.code || ' ' || service.libelle as traitement,
+ to_char(datebutoir ,'DD/MM/YYYY') as datebutoir,
+ to_char(dateexecution ,'DD/MM/YYYY') as dateexecution,
+ solde,
+ chronoreponse,
+ substring(observation,1,60) as observation,
+ etat_tache.libelle as etat_lib,
+ categorie_tache.libelle as cate_tache_lib,
+ geom
+ ";
+$sql_tache.=" from ".DB_PREFIXE."tache
+ inner join ".DB_PREFIXE."service on service.service = tache.traitement
+ left join ".DB_PREFIXE."etat_tache on etat_tache.etat_tache=tache.etat_tache
+ left join ".DB_PREFIXE."categorie_tache on categorie_tache.categorie_tache=tache.categorie_tache";
+$sql_tache.=" where tache.courrier = ".$idx;
+
+// dossier
+$sql_dossier="select dossier, fichier,
+ to_char(datedossier ,'DD/MM/YYYY') as datedossier,
+ substring(observation,1,60) as observation,type_dossier";
+$sql_dossier.=" from ".DB_PREFIXE."dossier";
+$sql_dossier.=" where courrier = ".$idx;
+
+/**
+ * Courriers lies
+ */
+$sql_related_letters = "SELECT courrier,".
+ " typecourrier AS typecourrier,".
+ " registre AS registre,".
+ " CASE WHEN nature = 1 THEN datearrivee".
+ " ELSE datecourrier END AS date,".
+ " emetteurprenom || ' ' || emetteurnom AS personne ".
+ " FROM ".DB_PREFIXE."courrier".
+ " WHERE courrier <> ?".
+ " AND liaison = ?".
+ " AND liaison <> 0".
+ " ORDER BY courrier DESC";
+
+?>
Property changes on: branches/5.1.0/sql/pgsql/courrier_scr.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/diffusion.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/diffusion.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/diffusion.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,49 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 12:29
+
+include "../gen/sql/pgsql/diffusion.inc.php";
+
+if ($retourformulaire == 'courrier_arrivee') {
+ $selection=" where diffusion.courrier ='".$idx."'";
+}
+if ($retourformulaire == 'courrier_arrivee_traitement') {
+ $selection=" where diffusion.courrier ='".$idx."'";
+}
+if ($retourformulaire == 'courrier_depart') {
+ $selection=" where diffusion.courrier ='".$idx."'";
+}
+if ($retourformulaire == 'courrier_depart_traitement') {
+ $selection=" where diffusion.courrier ='".$idx."'";
+}
+// modification affichage du dossier (type dossier)
+$table = DB_PREFIXE."diffusion
+ LEFT JOIN ".DB_PREFIXE."courrier
+ ON diffusion.courrier=courrier.courrier
+ LEFT JOIN ".DB_PREFIXE."dossier
+ ON diffusion.dossier=dossier.dossier
+ LEFT JOIN ".DB_PREFIXE."etat_diffusion
+ ON diffusion.etat_diffusion=etat_diffusion.etat_diffusion
+ LEFT JOIN ".DB_PREFIXE."service as service
+ ON diffusion.service=service.service
+ LEFT JOIN ".DB_PREFIXE."service as service2
+ ON diffusion.service_origine=service2.service
+ LEFT JOIN ".DB_PREFIXE."type_diffusion
+ ON diffusion.type_diffusion=type_diffusion.type_diffusion
+ LEFT JOIN ".DB_PREFIXE."type_dossier
+ ON dossier.type_dossier=type_dossier.type_dossier ";
+
+// modification affichage du dossier (type dossier)
+$champAffiche = array(
+ 'diffusion.diffusion as "'._("Id").'"',
+ 'service.libelle as "'._("service").'"',
+ 'courrier.registre as "'._("courrier").'"',
+ 'to_char(diffusion.datediffusion ,\'DD/MM/YYYY\') as "'._("date").'"',
+ 'type_diffusion.libelle as "'._("type_diffusion").'"',
+ "concat(dossier.filename,' du ',to_char(datedossier, 'dd/mm/YYYY'),' ',type_dossier.libelle) as "._("dossier").'',
+ 'service2.libelle as "'._("origine").'"',
+ 'etat_diffusion.libelle as "'._("diffusion").'"',
+ );
+$tri="ORDER BY service.libelle ASC NULLS LAST";
+
+?>
Property changes on: branches/5.1.0/sql/pgsql/diffusion.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/diffusion_non_validee.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/diffusion_non_validee.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/diffusion_non_validee.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Script contenant les requetes effectuee par la class obj/diffusion.class.php
+ *
+ * @package openCourrier
+ *
+ *
+ */
+include('../sql/pgsql/diffusion.inc.php');
+
+
+$champAffiche = array(
+ 'diffusion.diffusion as "'._("Id").'"',
+ 'service.libelle as "'._("service").'"',
+ 'courrier.registre as "'._("courrier").'"',
+ 'to_char(diffusion.datediffusion ,\'DD/MM/YYYY\') as "'._("date").'"',
+ 'type_diffusion.libelle as "'._("type_diffusion").'"',
+ "concat(dossier.filename,' du ',to_char(datedossier, 'dd/mm/YYYY'),' ',type_dossier.libelle) as "._("dossier").'',
+ 'service2.libelle as "'._("origine").'"',
+ 'etat_diffusion.libelle as "'._("diffusion").'"',
+ );
+$tri="ORDER BY service.libelle ASC NULLS LAST";
+$selection =" where diffusion.etat_diffusion =1 ";
+$selection .=" and courrier.nature=1";
+
+// Lien vers l'enregistrement
+$link = '
+<a class="lienTable" href="form.php?'
+ .'obj=courrier_arrivee'
+ .'&action=3'
+ .'&idx=%s'
+ .'&idz=%s'
+ .'&premier=0'
+ .'&advs_id='
+ .'&recherche='
+ .'&tricol='
+ .'&selectioncol='
+ .'&valide='
+ .'&retour=tab">'
+ // Valeur affichée
+ .'%s'
+.'</a>';
+
+?>
+
Property changes on: branches/5.1.0/sql/pgsql/diffusion_non_validee.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/dossier.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/dossier.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/dossier.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,22 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 12:29
+
+include "../gen/sql/pgsql/dossier.inc.php";
+
+$champAffiche = array(
+ 'dossier.dossier as "'._("document").'"',
+ 'dossier.filename as "'._("nom de fichier").'"',
+ 'to_char(dossier.datedossier ,\'DD/MM/YYYY\') as "'._("date").'"',
+ 'type_dossier.libelle as "'._("type").'"',
+);
+
+if ($retourformulaire== 'courrier_arrivee')
+ $selection=" where dossier.courrier ='".$idx."'";
+if ($retourformulaire== 'courrier_arrivee_traitement')
+ $selection=" where dossier.courrier ='".$idx."'";
+if ($retourformulaire== 'courrier_depart')
+ $selection=" where dossier.courrier ='".$idx."'";
+if ($retourformulaire== 'courrier_depart_traitement')
+ $selection=" where dossier.courrier ='".$idx."'";
+?>
Property changes on: branches/5.1.0/sql/pgsql/dossier.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/emetteur.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/emetteur.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/emetteur.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,10 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 12:29
+
+include "../gen/sql/pgsql/emetteur.inc.php";
+
+$sousformulaire = array();
+
+
+?>
Property changes on: branches/5.1.0/sql/pgsql/emetteur.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/etat_diffusion.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/etat_diffusion.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/etat_diffusion.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,7 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 16:03
+
+include "../gen/sql/pgsql/etat_diffusion.inc.php";
+
+?>
Property changes on: branches/5.1.0/sql/pgsql/etat_diffusion.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/etat_tache.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/etat_tache.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/etat_tache.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,10 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 12:29
+
+include "../gen/sql/pgsql/etat_tache.inc.php";
+
+$tab_title = _("etat tache");
+$ent = __("parametrage metier")." -> ".__("etat tache");
+
+$sousformulaire = array();
Property changes on: branches/5.1.0/sql/pgsql/etat_tache.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/fonction.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/fonction.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/fonction.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,9 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 12:29
+
+include "../gen/sql/pgsql/fonction.inc.php";
+
+$ent = __("parametrage metier")." -> ".__("fonction");
+
+?>
Property changes on: branches/5.1.0/sql/pgsql/fonction.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/mode_diffusion.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/mode_diffusion.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/mode_diffusion.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,10 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 16:03
+
+include "../gen/sql/pgsql/mode_diffusion.inc.php";
+
+$tab_actions['corner']['ajouter'] = null;
+
+$tab_title = _("mode diffusion");
+$ent = __("parametrage metier")." -> ".__("mode_diffusion");
Property changes on: branches/5.1.0/sql/pgsql/mode_diffusion.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/nature.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/nature.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/nature.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,10 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 16:29
+
+include "../gen/sql/pgsql/nature.inc.php";
+
+$tab_actions['corner']['ajouter'] = null;
+
+
+?>
Property changes on: branches/5.1.0/sql/pgsql/nature.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/note.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/note.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/note.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,21 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 12:29
+
+include "../gen/sql/pgsql/note.inc.php";
+
+if ($retourformulaire == 'courrier_arrivee') {
+ $selection=" where note.courrier ='".$idx."'";
+}
+if ($retourformulaire == 'courrier_arrivee_traitement') {
+ $selection=" where note.courrier ='".$idx."'";
+}
+if ($retourformulaire == 'courrier_depart') {
+ $selection=" where note.courrier ='".$idx."'";
+}
+if ($retourformulaire == 'courrier_depart_traitement') {
+ $selection=" where note.courrier ='".$idx."'";
+}
+
+
+?>
Property changes on: branches/5.1.0/sql/pgsql/note.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/5.1.0/sql/pgsql/service.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/service.inc.php 2020-02-26 11:06:38 UTC (rev 1092)
+++ branches/5.1.0/sql/pgsql/service.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -4,12 +4,8 @@
include "../gen/sql/pgsql/service.inc.php";
-//$tab_title = _("service");
-
$ent = __("parametrage metier")." -> ".__("service");
-
-
// surcharge car generation de servicerattachement comme service
$table = DB_PREFIXE."service
LEFT JOIN ".DB_PREFIXE."mode_diffusion
@@ -30,9 +26,9 @@
);
$sousformulaire = array(
- 'affaire',
'categorie_courrier',
'categorie_courrier_service',
+ 'categorie_courrier_tache',
);
$sousformulaire_parameters = array(
@@ -42,8 +38,7 @@
"categorie_courrier_service" => array(
"title" => _("categorie courrier en copie"),
),
+ "categorie_courrier_tache" => array(
+ "title" => _("categorie tache"),
+ ),
);
-
-
-
-?>
Added: branches/5.1.0/sql/pgsql/tache.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/tache.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/tache.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,54 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 12:29
+
+include "../gen/sql/pgsql/tache.inc.php";
+
+if ($retourformulaire == 'courrier_arrivee') {
+ $selection=" where tache.courrier ='".$idx."'";
+}
+if ($retourformulaire == 'courrier_arrivee_traitement') {
+ $selection=" where tache.courrier ='".$idx."'";
+}
+if ($retourformulaire == 'courrier_arrivee_copie') {
+ $selection =" where tache.courrier ='".$idx."'";
+ $selection .=" and tache.service ='".$_SESSION['service']."'";
+ $tab_actions['corner']['ajouter'] = NULL;
+}
+if ($retourformulaire == 'courrier_depart') {
+ $selection=" where tache.courrier ='".$idx."'";
+}
+if ($retourformulaire == 'courrier_depart_traitement') {
+ $selection=" where tache.courrier ='".$idx."'";
+}
+if ($retourformulaire == 'courrier_depart_copie') {
+ $selection =" where tache.courrier ='".$idx."'";
+ $selection .=" and tache.service ='".$_SESSION['service']."'";
+ $tab_actions['corner']['ajouter'] = NULL;
+}
+// pointe sur 2 fois service
+$table = DB_PREFIXE."tache
+ LEFT JOIN ".DB_PREFIXE."categorie_tache
+ ON tache.categorie_tache=categorie_tache.categorie_tache
+ LEFT JOIN ".DB_PREFIXE."courrier
+ ON tache.courrier=courrier.courrier
+ LEFT JOIN ".DB_PREFIXE."etat_tache
+ ON tache.etat_tache=etat_tache.etat_tache
+ LEFT JOIN ".DB_PREFIXE."service as service
+ ON tache.service=service.service
+ LEFT JOIN ".DB_PREFIXE."service as service2
+ ON tache.service_origine=service2.service ";
+
+
+
+// enleve localisation
+$champAffiche = array(
+ 'tache.tache as "'._("tache").'"',
+ 'tache.libelle as "'._("libelle").'"',
+ 'categorie_tache.libelle as "'._("categorie_tache").'"',
+ 'courrier.registre as "'._("courrier").'"',
+ 'service.libelle as "'._("service").'"',
+ 'to_char(tache.datebutoir ,\'DD/MM/YYYY\') as "'._("datebutoir").'"',
+ 'to_char(tache.dateexecution ,\'DD/MM/YYYY\') as "'._("dateexecution").'"',
+ 'etat_tache.libelle as "'._("etat_tache").'"',
+ );
Property changes on: branches/5.1.0/sql/pgsql/tache.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/tachenonsolde.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/tachenonsolde.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/tachenonsolde.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,59 @@
+<?php
+//$Id: tachenonsolde.inc,v 1.6 2009-10-06 15:40:54 fraynaud Exp $
+include('../sql/pgsql/tache.inc.php');
+
+// Fil d'Ariane
+$ent = _("courrier")." -> "._("tache non soldee");
+if (isset($idx) && $idx != ']' && trim($idx) != '') {
+ $ent .= "-> ".$idx." ";
+}
+if (isset($idz) && trim($idz) != '') {
+ $ent .= " ".mb_strtoupper($idz, "UTF-8")." ";
+}
+
+$champAffiche=array('tache as "'._("tache").'"',
+ 'registre as "'._("registre").'"',
+ 'service.libelle as "'._("traitement").'"',
+ 'emetteurnom ||\' \'|| emetteurprenom as "'._("emetteur").'"',
+ 'substring(objetcourrier,1,30) as "'._("objet courrier").'"',
+ 'to_char(datebutoir ,\'DD/MM/YYYY\') as "'._("datebutoir").'"',
+ 'categorie_tache.libelle as "'._("Categorie").'"',
+ 'tache.etat_tache as "'._("Etat").'"',
+ 'extract(day FROM (tache.datebutoir - now())) as "'._("Temps Restant").'"'
+ );
+$champRecherche=array(
+ "service.libelle as traitement",
+ "registre",
+ "objetcourrier as objet courrier",
+ "categorie_tache.libelle as categorie",
+ "tache.etat_tache as Etat",
+ );
+
+$tri= "order by datebutoir desc";
+
+$selection = " where tache.etat_tache <3 ";
+// Si la vue sur les sous-services est active
+/*if ($f->getParameter('vue_sous_service') == 'true') {
+ //
+ $selection .= " AND service.libelle IN ('".$_SESSION['service']."'";
+ foreach($_SESSION['sous_service'] as $elt) {
+ $selection.=",'".$elt."'";
+ }
+ $selection.=')';
+} else {
+
+ // Si l'utilisateur n'est pas tous service
+ if($f->get_service_code($_SESSION['service']) != '*') {*/
+ $selection .= " AND tache.service='".$_SESSION['service']."'";
+ //}
+//}
+
+/*$tab_actions['left']['tdb'] = array(
+ "lien" => "../app/courrier.php?tache=",
+ "id" => "&tricol=".$tricol."&origin=".$obj."&obj=tachenonsolde&premier=".$premier."&recherche=".$recherche1."&selectioncol=".$selectioncol,
+ "lib" => "<span class=\"om-icon om-icon-16 om-icon-fix tb-16\" title=\""._("Tableau de bord du courrier")."\">"._("TB")."</span>",
+ "ajax" => false,
+ "ordre" => 100,
+ );*/
+
+?>
Property changes on: branches/5.1.0/sql/pgsql/tachenonsolde.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/tachenonsolde_service.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/tachenonsolde_service.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/tachenonsolde_service.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,20 @@
+<?php
+//$Id: tachenonsolde.inc,v 1.6 2009-10-06 15:40:54 fraynaud Exp $
+$DEBUG=0;
+$serie=20;
+$ent = _("taches non soldees");
+$ico = "../img/ico_tache.png";
+$edition="";
+$table=DB_PREFIXE."tache inner join ".DB_PREFIXE."service on service.service = tache.service inner join ".DB_PREFIXE."courrier on courrier.courrier=tache.courrier";
+$champAffiche=array('to_char(datebutoir ,\'DD/MM/YYYY\') as "'._("datebutoir").'"',
+ 'registre as "'._("registre").'"',
+ 'substring(objetcourrier,1,30) as "'._("obj").'"');
+$tri= "order by datebutoir desc";
+/*if($f->get_service_code($_SESSION['service'])=='*')
+ $selection="where tache.etat_tache = 1";
+else*/
+ $selection=" where tache.etat_tache < 3 and (tache.service='".
+ // $_SESSION['service']."' or courrier.traitement='".
+ // $_SESSION['service']."') ";
+ $_SESSION['service']."') ";
+?>
Property changes on: branches/5.1.0/sql/pgsql/tachenonsolde_service.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/type_correspondant.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/type_correspondant.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/type_correspondant.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,10 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 12:29
+
+include "../gen/sql/pgsql/type_correspondant.inc.php";
+
+$tab_title = _("type correspondant");
+$ent = __("parametrage metier")." -> ".__("type correspondant");
+
+$sousformulaire = array();
Property changes on: branches/5.1.0/sql/pgsql/type_correspondant.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/type_courrier.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/type_courrier.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/type_courrier.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,10 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 16:29
+
+include "../gen/sql/pgsql/type_courrier.inc.php";
+
+$tab_title = _("type courrier");
+$ent = __("parametrage metier")." -> ".__("type courrier");
+
+$sousformulaire = array();
Property changes on: branches/5.1.0/sql/pgsql/type_courrier.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/type_diffusion.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/type_diffusion.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/type_diffusion.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,12 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 16:03
+
+include "../gen/sql/pgsql/type_diffusion.inc.php";
+$tab_actions['corner']['ajouter'] = null;
+
+$tab_title = _("type diffusion");
+$ent = __("parametrage metier")." -> ".__("type_diffusion");
+
+// supprime diffusion
+$sousformulaire = array();
Property changes on: branches/5.1.0/sql/pgsql/type_diffusion.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/type_dossier.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/type_dossier.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/type_dossier.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,12 @@
+<?php
+//$Id$
+//gen openMairie le 09/08/2017 10:33
+
+include "../gen/sql/pgsql/type_dossier.inc.php";
+$tab_actions['corner']['ajouter'] = null;
+
+$tab_title = _("type dossier");
+$ent = __("parametrage metier")." -> ".__("type dossier");
+
+$sousformulaire = array();
+
Property changes on: branches/5.1.0/sql/pgsql/type_dossier.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/5.1.0/sql/pgsql/type_service.inc.php
===================================================================
--- branches/5.1.0/sql/pgsql/type_service.inc.php (rev 0)
+++ branches/5.1.0/sql/pgsql/type_service.inc.php 2020-02-26 11:07:12 UTC (rev 1093)
@@ -0,0 +1,8 @@
+<?php
+//$Id$
+//gen openMairie le 08/08/2017 16:03
+
+include "../gen/sql/pgsql/type_service.inc.php";
+
+$tab_title = _("type service");
+$ent = __("parametrage metier")." -> ".__("type service");
Property changes on: branches/5.1.0/sql/pgsql/type_service.inc.php
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property