D6/Cleo
2
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Activity

feat(v2.0.4): Corrections diverses et tri des tableaux devis

Browse Source 
- Correction affichage email contact dans SAP (models/msap.php)
- Ajout fonctionnalité tri des tableaux devis (jsap.js, jdevis.js)
- Améliorations diverses vues devis et SAP
- Mise à jour contrôleurs et modèles export

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Pierre
2025-12-05 10:32:19 +01:00
parent f6c5e96534
commit e96ad7a244
12 changed files with 1348 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
docs/TODO.md
View File

@@ -195,12 +195,90 @@ DB_PASSWORD=<PROD_PASSWORD> # À sécuriser
- [ ] Scripts de backup automatisés à mettre en place
- [ ] Réplication master-slave pour haute disponibilité (optionnel)
## ⚠️ CRITIQUE - Risque de collision de codes clients (EN ATTENTE CLIENT)
### Problématique identifiée
**Date**: 26 novembre 2025
**Statut**: 🔴 EN ATTENTE RÉPONSE CLIENT
#### Situation actuelle
Lorsqu'un commercial crée un nouveau client manuellement dans CLEO (client non présent dans SAP), le système génère automatiquement un code via :
```php
$newCode = MAX(code) + 1; // cjxdevis.php ligne 1326
```
#### Risque de collision
**Scénario catastrophe** :
1. Commercial crée un client manuel → code auto = `12345`
2. Commercial ajoute des contacts, fait des devis
3. **Import SAP suivant** : un nouveau client SAP arrive avec le code `12345`
4. L'import trouve le client existant (même code) et **écrase toutes les données** du client manuel
5. Les contacts du client manuel deviennent incohérents (pointent vers le mauvais client SAP)
6. Les devis du client manuel sont rattachés au mauvais client SAP
#### Question posée au client
**"Que se passe-t-il lorsqu'un devis avec un nouveau client (code = MAX+1) est intégré dans SAP ?"**
- Le client manuel reçoit-il un vrai code SAP ?
- Le code est-il synchronisé dans CLEO après intégration ?
- Existe-t-il un processus de réconciliation ?
### Solutions techniques envisagées
#### Option A : Plage réservée pour clients manuels
```php
// Codes 9000000+ réservés aux créations manuelles
$newCode = 9000000 + $compteur;
```
**Avantages** : Simple, pas de collision possible
**Inconvénients** : Nécessite coordination avec SAP
#### Option B : Codes négatifs pour clients manuels
```php
// Codes négatifs = clients manuels non SAP
$newCode = -1 * (MAX(ABS(code)) + 1);
```
**Avantages** : Distinction claire SAP/Manuel
**Inconvénients** : Peut poser problème avec certains systèmes
#### Option C : Flag `chk_manual` + protection
```sql
ALTER TABLE clients ADD COLUMN chk_manual TINYINT DEFAULT 0;
```
- `chk_manual = 1` → Client créé manuellement, jamais écrasé par import SAP
- Lors de l'import SAP, ignorer les clients avec `chk_manual = 1`
- Processus manuel de réconciliation si le client est créé dans SAP
**Avantages** : Protection garantie, traçabilité
**Inconvénients** : Nécessite gestion manuelle de la réconciliation
#### Option D : Code temporaire + synchronisation
- Client manuel créé avec code `TEMP_XXXXX`
- Lors de l'intégration SAP, récupération du vrai code SAP
- Mise à jour du code client + tous les contacts/devis associés
**Avantages** : Cohérence totale avec SAP
**Inconvénients** : Complexe, nécessite API ou process de sync
### Actions en attente
- [ ] **Réponse client** sur le processus actuel d'intégration SAP
- [ ] Choix de la solution technique selon la réponse
- [ ] Implémentation de la solution retenue
- [ ] Tests de non-régression sur imports SAP
- [ ] Documentation du processus de gestion des clients manuels
### Impact sur le code existant
**Fichiers concernés** :
- `controllers/cjxdevis.php` : fonction `save_new_client` (ligne 1308)
- `controllers/cjximport.php` : fonction `upload_clients` (ligne 112)
- Documentation utilisateur à mettre à jour
---
## Modification Contacts Clients - Migration vers clients.code
### Contexte
La relation entre `clients_contacts` et `clients` utilise actuellement `clients.rowid` comme clé étrangère.
Cela pose problème lors des imports SAP qui peuvent écraser ou modifier les `rowid`.
Il faut migrer vers `clients.code` (identifiant SAP immuable) pour garantir l'intégrité des relations.
La relation entre `clients_contacts` et `clients` utilise `clients.code` comme clé de référence.
Le système a été conçu pour utiliser le `code` SAP (clé métier immuable) plutôt que le `rowid` (clé technique auto-incrémentée).
### Plan de correction

376
docs/cleo.sql → docs/cleo-202512021157.sql
View File

@@ -1,9 +1,9 @@
/*M!999999\- enable the sandbox mode */
-- MariaDB dump 10.19 Distrib 10.11.9-MariaDB, for debian-linux-gnu (x86_64)
-- MariaDB dump 10.19-11.8.3-MariaDB, for debian-linux-gnu (x86_64)
--
-- Host: localhost Database: uof_linet
-- Host: localhost Database: cleo
-- ------------------------------------------------------
-- Server version 10.11.9-MariaDB-deb12
-- Server version 11.4.8-MariaDB-log
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -14,7 +14,7 @@
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
/*M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY=0 */;
--
-- Table structure for table `clients`
@@ -22,7 +22,7 @@
DROP TABLE IF EXISTS `clients`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `clients` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`code` int(11) NOT NULL,
@@ -51,9 +51,38 @@ CREATE TABLE `clients` (
UNIQUE KEY `code_UNIQUE` (`code`),
KEY `libelle` (`libelle`),
KEY `cp` (`cp`)
) ENGINE=InnoDB AUTO_INCREMENT=5307 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
) ENGINE=InnoDB AUTO_INCREMENT=5309 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `clients_contacts`
--
DROP TABLE IF EXISTS `clients_contacts`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `clients_contacts` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`fk_client` int(11) NOT NULL,
`nom` varchar(50) DEFAULT NULL,
`prenom` varchar(50) DEFAULT NULL,
`fonction` varchar(50) DEFAULT NULL,
`telephone` varchar(20) DEFAULT NULL,
`mobile` varchar(20) DEFAULT NULL,
`email` varchar(75) DEFAULT NULL,
`principal` tinyint(1) DEFAULT 0 COMMENT 'Contact principal du client',
`active` tinyint(1) DEFAULT 1,
`date_creat` datetime DEFAULT NULL,
`fk_user_creat` int(11) DEFAULT NULL,
`date_modif` datetime DEFAULT NULL,
`fk_user_modif` int(11) DEFAULT NULL,
PRIMARY KEY (`rowid`),
UNIQUE KEY `rowid_UNIQUE` (`rowid`),
KEY `fk_client` (`fk_client`),
KEY `principal` (`fk_client`,`principal`),
KEY `email` (`email`)
) ENGINE=InnoDB AUTO_INCREMENT=8199 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Contacts multiples par client' `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `clients_sites`
@@ -61,7 +90,7 @@ CREATE TABLE `clients` (
DROP TABLE IF EXISTS `clients_sites`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `clients_sites` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`fk_client` int(11) NOT NULL,
@@ -77,22 +106,13 @@ CREATE TABLE `clients_sites` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `clients_sites`
--
LOCK TABLES `clients_sites` WRITE;
/*!40000 ALTER TABLE `clients_sites` DISABLE KEYS */;
/*!40000 ALTER TABLE `clients_sites` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `commerciaux`
--
DROP TABLE IF EXISTS `commerciaux`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `commerciaux` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`fk_entite` int(11) DEFAULT 0,
@@ -133,14 +153,13 @@ CREATE TABLE `commerciaux` (
) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `commerciaux_entites`
--
DROP TABLE IF EXISTS `commerciaux_entites`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `commerciaux_entites` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`libelle` varchar(45) DEFAULT NULL,
@@ -157,26 +176,13 @@ CREATE TABLE `commerciaux_entites` (
) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `commerciaux_entites`
--
LOCK TABLES `commerciaux_entites` WRITE;
/*!40000 ALTER TABLE `commerciaux_entites` DISABLE KEYS */;
INSERT INTO `commerciaux_entites` VALUES
(1,'LINET',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1),
(2,'WISSNER-BOSSERHOFF',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1),
(3,'LINET & WI-BO',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1);
/*!40000 ALTER TABLE `commerciaux_entites` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `commerciaux_params`
--
DROP TABLE IF EXISTS `commerciaux_params`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `commerciaux_params` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`fk_commercial` int(11) DEFAULT NULL,
@@ -269,14 +275,13 @@ CREATE TABLE `commerciaux_params` (
) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `devis`
--
DROP TABLE IF EXISTS `devis`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `devis` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`fk_user` int(11) NOT NULL DEFAULT 0,
@@ -285,6 +290,7 @@ CREATE TABLE `devis` (
`date_remise` date DEFAULT NULL,
`num_opportunite` varchar(8) NOT NULL DEFAULT '',
`fk_client` int(11) NOT NULL DEFAULT 0,
`fk_contact` int(11) DEFAULT NULL,
`fk_marche` int(11) NOT NULL DEFAULT 0,
`fk_statut_devis` int(11) NOT NULL DEFAULT 0,
`chk_clients_secteur` tinyint(1) NOT NULL DEFAULT 1,
@@ -327,18 +333,18 @@ CREATE TABLE `devis` (
KEY `fk_client` (`fk_client`),
KEY `fk_statut_devis` (`fk_statut_devis`),
KEY `date_demande` (`date_demande`),
KEY `dossier` (`fk_user`,`dossier`)
) ENGINE=InnoDB AUTO_INCREMENT=4611 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
KEY `dossier` (`fk_user`,`dossier`),
KEY `fk_contact` (`fk_contact`)
) ENGINE=InnoDB AUTO_INCREMENT=4624 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `devis_histo`
--
DROP TABLE IF EXISTS `devis_histo`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `devis_histo` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`fk_devis` int(11) DEFAULT NULL,
@@ -350,7 +356,7 @@ CREATE TABLE `devis_histo` (
`fk_statut_devis` int(11) DEFAULT NULL,
PRIMARY KEY (`rowid`),
KEY `devis_histo_fk_devis_index` (`fk_devis`)
) ENGINE=InnoDB AUTO_INCREMENT=22331 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
) ENGINE=InnoDB AUTO_INCREMENT=22388 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -359,7 +365,7 @@ CREATE TABLE `devis_histo` (
DROP TABLE IF EXISTS `devis_produits`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `devis_produits` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`fk_devis` int(11) NOT NULL,
@@ -392,17 +398,16 @@ CREATE TABLE `devis_produits` (
PRIMARY KEY (`rowid`),
KEY `devis_produits__devis` (`fk_devis`),
KEY `devis_produits__produit` (`fk_produit`)
) ENGINE=InnoDB AUTO_INCREMENT=29277 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
) ENGINE=InnoDB AUTO_INCREMENT=29314 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `devis_speciaux`
--
DROP TABLE IF EXISTS `devis_speciaux`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `devis_speciaux` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`fk_devis` int(11) NOT NULL DEFAULT 0,
@@ -461,14 +466,13 @@ CREATE TABLE `devis_speciaux` (
) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `entites`
--
DROP TABLE IF EXISTS `entites`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `entites` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`libelle` varchar(45) DEFAULT '',
@@ -513,14 +517,13 @@ CREATE TABLE `entites` (
) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `import_ventes`
--
DROP TABLE IF EXISTS `import_ventes`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `import_ventes` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`source` varchar(15) DEFAULT '',
@@ -570,7 +573,7 @@ CREATE TABLE `import_ventes` (
DROP TABLE IF EXISTS `infos`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `infos` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`date_infos` date DEFAULT NULL,
@@ -586,14 +589,13 @@ CREATE TABLE `infos` (
) ENGINE=InnoDB AUTO_INCREMENT=29 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `marches`
--
DROP TABLE IF EXISTS `marches`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `marches` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`numero` varchar(20) NOT NULL DEFAULT '',
@@ -642,7 +644,7 @@ CREATE TABLE `marches` (
DROP TABLE IF EXISTS `marches_listes`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `marches_listes` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`fk_marche` int(11) DEFAULT NULL,
@@ -660,7 +662,7 @@ CREATE TABLE `marches_listes` (
DROP TABLE IF EXISTS `marches_produits`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `marches_produits` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`fk_marche` int(11) DEFAULT 0,
@@ -702,7 +704,7 @@ CREATE TABLE `marches_produits` (
DROP TABLE IF EXISTS `marches_versions`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `marches_versions` (
`rowid` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Id',
`libelle` varchar(75) DEFAULT NULL COMMENT 'Libellé',
@@ -713,24 +715,13 @@ CREATE TABLE `marches_versions` (
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Version des marchés' `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `marches_versions`
--
LOCK TABLES `marches_versions` WRITE;
/*!40000 ALTER TABLE `marches_versions` DISABLE KEYS */;
INSERT INTO `marches_versions` VALUES
(1,'Version Avril 2022','2022-04-01','0000-00-00',1);
/*!40000 ALTER TABLE `marches_versions` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `medias`
--
DROP TABLE IF EXISTS `medias`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `medias` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`dir0` varchar(150) DEFAULT NULL,
@@ -746,7 +737,7 @@ CREATE TABLE `medias` (
PRIMARY KEY (`rowid`),
UNIQUE KEY `rowid_UNIQUE` (`rowid`),
KEY `support` (`support`,`support_rowid`)
) ENGINE=InnoDB AUTO_INCREMENT=3866 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
) ENGINE=InnoDB AUTO_INCREMENT=3878 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -755,7 +746,7 @@ CREATE TABLE `medias` (
DROP TABLE IF EXISTS `notifications`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `notifications` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`dateheure` datetime DEFAULT NULL,
@@ -775,7 +766,7 @@ CREATE TABLE `notifications` (
DROP TABLE IF EXISTS `produits`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `produits` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`fk_marche` int(11) NOT NULL DEFAULT 0,
@@ -821,7 +812,7 @@ CREATE TABLE `produits` (
DROP TABLE IF EXISTS `produits_familles`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `produits_familles` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`groupe` varchar(30) NOT NULL,
@@ -841,7 +832,7 @@ CREATE TABLE `produits_familles` (
DROP TABLE IF EXISTS `regions`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `regions` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`libelle` varchar(75) DEFAULT NULL,
@@ -851,22 +842,13 @@ CREATE TABLE `regions` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `regions`
--
LOCK TABLES `regions` WRITE;
/*!40000 ALTER TABLE `regions` DISABLE KEYS */;
/*!40000 ALTER TABLE `regions` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `simul`
--
DROP TABLE IF EXISTS `simul`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `simul` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`fk_import_vente` int(11) DEFAULT NULL,
@@ -885,14 +867,13 @@ CREATE TABLE `simul` (
) ENGINE=InnoDB AUTO_INCREMENT=1057 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `users`
--
DROP TABLE IF EXISTS `users`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `users` (
`rowid` int(10) unsigned NOT NULL AUTO_INCREMENT,
`fk_entite` int(11) DEFAULT NULL,
@@ -940,13 +921,64 @@ CREATE TABLE `users` (
) ENGINE=InnoDB AUTO_INCREMENT=50 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `users_entites`
--
DROP TABLE IF EXISTS `users_entites`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `users_entites` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`libelle` varchar(45) DEFAULT '',
`http_host` varchar(150) DEFAULT '',
`adresse1` varchar(45) DEFAULT '',
`adresse2` varchar(45) DEFAULT '',
`cp` varchar(5) DEFAULT '',
`ville` varchar(45) DEFAULT '',
`type_entite` varchar(5) DEFAULT 'form',
`tva_intra` varchar(15) DEFAULT '',
`rcs` varchar(45) DEFAULT '',
`siret` varchar(17) DEFAULT NULL,
`ape` varchar(5) DEFAULT '',
`num_opca` varchar(15) DEFAULT '',
`logo` varchar(45) DEFAULT '',
`tel1` varchar(20) DEFAULT '',
`tel2` varchar(20) DEFAULT '',
`couleur` varchar(7) DEFAULT '#FFFAF0',
`prefecture` varchar(45) DEFAULT 'Bretagne',
`fk_titre_gerant` int(11) DEFAULT 1,
`gerant_prenom` varchar(45) DEFAULT '',
`gerant_nom` varchar(45) DEFAULT '',
`email` varchar(45) DEFAULT '',
`site_url` varchar(45) DEFAULT '',
`gerant_signature` varchar(45) DEFAULT '',
`tampon_signature` varchar(45) DEFAULT '',
`rib_banque` varchar(5) DEFAULT '',
`rib_guichet` varchar(5) DEFAULT '',
`rib_compte` varchar(11) DEFAULT '',
`rib_cle` varchar(2) DEFAULT '',
`rib_domiciliation` varchar(45) DEFAULT '',
`iban` varchar(33) DEFAULT '',
`bic` varchar(15) DEFAULT '',
`demo` tinyint(1) DEFAULT 0,
`genbase` varchar(45) DEFAULT '0',
`groupebase` varchar(45) DEFAULT '0',
`table_users_gen` varchar(50) DEFAULT '',
`appname` varchar(45) DEFAULT '',
`raz_num_devis` tinyint(1) DEFAULT 0,
`active` tinyint(1) DEFAULT 1,
PRIMARY KEY (`rowid`)
) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `ventes`
--
DROP TABLE IF EXISTS `ventes`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `ventes` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`source` varchar(45) DEFAULT NULL,
@@ -977,22 +1009,13 @@ CREATE TABLE `ventes` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `ventes`
--
LOCK TABLES `ventes` WRITE;
/*!40000 ALTER TABLE `ventes` DISABLE KEYS */;
/*!40000 ALTER TABLE `ventes` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `x_clients_types`
--
DROP TABLE IF EXISTS `x_clients_types`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `x_clients_types` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`code` char(3) DEFAULT NULL,
@@ -1004,28 +1027,13 @@ CREATE TABLE `x_clients_types` (
) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `x_clients_types`
--
LOCK TABLES `x_clients_types` WRITE;
/*!40000 ALTER TABLE `x_clients_types` DISABLE KEYS */;
INSERT INTO `x_clients_types` VALUES
(1,'PUB','Public',1),
(2,'PRA','Privé Associatif',1),
(3,'PRD','Privé Distributeur',1),
(4,'PRC','Privé Commercial',1),
(5,'ESP','ESPIC',1);
/*!40000 ALTER TABLE `x_clients_types` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `x_familles`
--
DROP TABLE IF EXISTS `x_familles`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `x_familles` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`libelle` varchar(20) NOT NULL DEFAULT '',
@@ -1037,34 +1045,13 @@ CREATE TABLE `x_familles` (
) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `x_familles`
--
LOCK TABLES `x_familles` WRITE;
/*!40000 ALTER TABLE `x_familles` DISABLE KEYS */;
INSERT INTO `x_familles` VALUES
(3,'Lits SBU1',1,1),
(4,'Lits SBU2',2,1),
(5,'Accessoires SBU1',3,1),
(6,'Accessoires SBU2',4,1),
(7,'Services',5,1),
(8,'Matelas mousse',6,1),
(9,'Matelas à air',7,1),
(10,'Mobilier',8,1),
(11,'Assises',9,1),
(12,'Autres',11,1),
(13,'Domalys',10,1);
/*!40000 ALTER TABLE `x_familles` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `x_regions`
--
DROP TABLE IF EXISTS `x_regions`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `x_regions` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`fk_entite` int(11) DEFAULT 0,
@@ -1075,39 +1062,13 @@ CREATE TABLE `x_regions` (
) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `x_regions`
--
LOCK TABLES `x_regions` WRITE;
/*!40000 ALTER TABLE `x_regions` DISABLE KEYS */;
INSERT INTO `x_regions` VALUES
(1,1,'SUD-OUEST',1),
(2,1,'RHONE-ALPES / AUVERGNE',1),
(3,1,'PACA',1),
(4,1,'EST',1),
(5,1,'NORD',1),
(6,1,'GRAND-OUEST',1),
(7,1,'IDF',1),
(8,1,'DOM-TOM',1),
(9,2,'WB-NORD',1),
(13,2,'WB-SUD OUEST',1),
(14,2,'WB-EST',1),
(15,2,'WB-ILE DE FRANCE',1),
(16,2,'WB-SUD-EST',1),
(17,2,'WB-CENTRE-EST ET DOM',1),
(18,1,'DIRECTION',1),
(19,2,'WB-NORD OUEST',1);
/*!40000 ALTER TABLE `x_regions` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `x_roles`
--
DROP TABLE IF EXISTS `x_roles`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `x_roles` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`libelle` varchar(45) DEFAULT '',
@@ -1118,30 +1079,13 @@ CREATE TABLE `x_roles` (
) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Les différents rôles des utilisateurs' `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `x_roles`
--
LOCK TABLES `x_roles` WRITE;
/*!40000 ALTER TABLE `x_roles` DISABLE KEYS */;
INSERT INTO `x_roles` VALUES
(1,'Direction Commerciale','DC',1),
(2,'Direction des Ventes','DV',1),
(3,'Commercial(e)','RR',1),
(4,'Clinicien(ne)','CL',1),
(5,'Direction Grands Comptes','GC',1),
(20,'Administration des ventes','ADV',1),
(90,'Administrateur','ADM',1);
/*!40000 ALTER TABLE `x_roles` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `x_statuts_devis`
--
DROP TABLE IF EXISTS `x_statuts_devis`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `x_statuts_devis` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`libelle` varchar(30) DEFAULT NULL,
@@ -1152,22 +1096,47 @@ CREATE TABLE `x_statuts_devis` (
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `x_statuts_devis`
-- Table structure for table `y_pages`
--
LOCK TABLES `x_statuts_devis` WRITE;
/*!40000 ALTER TABLE `x_statuts_devis` DISABLE KEYS */;
INSERT INTO `x_statuts_devis` VALUES
(1,'En cours de création',1),
(2,'En cours de validation DIR-CO',1),
(3,'En cours de validation DV/DGC',1),
(4,'A traiter sur SAP',1),
(6,'A vérifier par le RR',1),
(7,'A envoyer au client',1),
(10,'Envoyé au client',0),
(20,'Archivé',1);
/*!40000 ALTER TABLE `x_statuts_devis` ENABLE KEYS */;
UNLOCK TABLES;
DROP TABLE IF EXISTS `y_pages`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `y_pages` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`fk_parent` int(11) DEFAULT 0,
`link` varchar(75) DEFAULT NULL,
`libelle` varchar(45) DEFAULT NULL,
`titre` varchar(75) DEFAULT NULL,
`tooltip` varchar(45) DEFAULT NULL,
`description` varchar(200) DEFAULT NULL,
`keywords` varchar(200) DEFAULT NULL,
`script` varchar(45) DEFAULT NULL,
`enmaintenance` tinyint(1) DEFAULT 0 COMMENT '0 libre d''accès, 1 en maintenance mais accès aux données, 2 en maintenance sans accès aux données',
`admin` tinyint(1) DEFAULT 0,
`mail` tinyint(1) DEFAULT 0,
`admtools` tinyint(1) DEFAULT 0,
`magazine` tinyint(1) DEFAULT 0,
`files` tinyint(1) DEFAULT 0,
`editor` tinyint(1) DEFAULT 0,
`autocomplete` tinyint(1) DEFAULT 0,
`print` tinyint(1) DEFAULT 0,
`form` tinyint(1) DEFAULT 0,
`sidebar` tinyint(1) DEFAULT 0,
`chart` tinyint(1) DEFAULT 0,
`agenda` tinyint(1) DEFAULT 0,
`scheduler` tinyint(1) DEFAULT 0,
`osm` tinyint(1) DEFAULT 0,
`layout` varchar(45) DEFAULT 'default.php',
`in_menu` tinyint(1) DEFAULT 1,
`ordre_menu` int(11) DEFAULT 0,
`active` tinyint(1) DEFAULT 1,
PRIMARY KEY (`rowid`),
UNIQUE KEY `rowid_UNIQUE` (`rowid`),
KEY `script` (`script`),
KEY `admin` (`admin`)
) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `z_history`
@@ -1175,7 +1144,7 @@ UNLOCK TABLES;
DROP TABLE IF EXISTS `z_history`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `z_history` (
`fk_user` int(11) NOT NULL,
`libelle` varchar(20) NOT NULL DEFAULT 'tiers',
@@ -1185,22 +1154,13 @@ CREATE TABLE `z_history` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `z_history`
--
LOCK TABLES `z_history` WRITE;
/*!40000 ALTER TABLE `z_history` DISABLE KEYS */;
/*!40000 ALTER TABLE `z_history` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `z_logs`
--
DROP TABLE IF EXISTS `z_logs`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `z_logs` (
`date` datetime NOT NULL,
`ip` varchar(15) NOT NULL,
@@ -1220,7 +1180,7 @@ CREATE TABLE `z_logs` (
DROP TABLE IF EXISTS `z_sessions`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `z_sessions` (
`sid` text NOT NULL,
`fk_user` int(11) NOT NULL,
@@ -1238,7 +1198,7 @@ CREATE TABLE `z_sessions` (
DROP TABLE IF EXISTS `z_stats`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
/*!40101 SET character_set_client = utf8mb4 */;
CREATE TABLE `z_stats` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`libelle` varchar(75) DEFAULT NULL,
@@ -1253,6 +1213,10 @@ CREATE TABLE `z_stats` (
) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci `PAGE_COMPRESSED`='ON';
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping routines for database 'cleo'
--
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -1260,6 +1224,6 @@ CREATE TABLE `z_stats` (
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
/*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
-- Dump completed on 2025-09-11 14:44:41
-- Dump completed on 2025-12-02 11:57:09