diff --git a/gestion/lib/Db/Bdd.php b/gestion/lib/Db/Bdd.php index 1ce5924..8d77c99 100644 --- a/gestion/lib/Db/Bdd.php +++ b/gestion/lib/Db/Bdd.php @@ -263,7 +263,8 @@ class Bdd { .$this->tableprefix."client.adresse as adresse_cli,".$this->tableprefix."client.mail as mail_cli,".$this->tableprefix."client.telephone as telephone_cli,".$this->tableprefix."client.legal_one as legalone_cli," .$this->tableprefix."client.fk_client_group_facturation_id as fk_client_group_facturation_id," .$this->tableprefix."thanato.nom as nom_thanato, ".$this->tableprefix."thanato.prenom as prenom_thanato, ".$this->tableprefix."thanato.id as tid, " - .$this->tableprefix."devis.num, ".$this->tableprefix."devis.date, ".$this->tableprefix."devis.version, ".$this->tableprefix."devis.mentions, " + .$this->tableprefix."devis.num, ".$this->tableprefix."devis.date, ".$this->tableprefix."devis.version, ".$this->tableprefix."devis.mentions, " + .$this->tableprefix."devis.order_number, ".$this->tableprefix."devis.case_number, " .$this->tableprefix."lieu.id as lid, ".$this->tableprefix."lieu.nom as lieu,".$this->tableprefix."lieu.adresse as adresse_soin,".$this->tableprefix."devis.id_lieu, " .$this->tableprefix."defunt.id as id_defunt, ".$this->tableprefix."defunt.nom as nom_defunt, " .$this->tableprefix."devis.devis_full_number as devis_full_number diff --git a/gestion/templates/content/apercustousdevis.php b/gestion/templates/content/apercustousdevis.php index 6ce97b7..3e55cba 100644 --- a/gestion/templates/content/apercustousdevis.php +++ b/gestion/templates/content/apercustousdevis.php @@ -115,16 +115,16 @@ } ; - foreach ($devis as $key => $d) { + foreach ($devis as $key => $currentDevis) { ?>
prenom . ' ' . $d->nom ?>
- adresse_cli ?>
- mail_cli ?>
- telephone_cli ?>
- legalone_cli ?>
+ data-column="id_client">prenom . ' ' . $currentDevis->nom ?>
+ adresse_cli ?>
+ mail_cli ?>
+ telephone_cli ?>
+ legalone_cli ?>
-
-
-
+
+
+
+ style="display: none">entreprise . "_" . $currentDevis->id . "_v" . $currentDevis->version ?>
| reference ?> | description ?> | @@ -242,7 +257,7 @@ $tva = json_decode($_['configuration'])[0]->tva_default; $totalttc = 0; $totalprice = 0; - foreach ($d->dproduits as $key => $produit) { + foreach ($currentDevis->dproduits as $key => $produit) { $totalhtc = $totalhtc + ($produit->quantite * $produit->prix_unitaire); } $totalttc = ($totalhtc * $tva) / 100;