diff --git a/gestion/lib/Db/Bdd.php b/gestion/lib/Db/Bdd.php index fb027fc..79e75f4 100644 --- a/gestion/lib/Db/Bdd.php +++ b/gestion/lib/Db/Bdd.php @@ -44,7 +44,7 @@ class Bdd { "fk_client_group_facturation_id","group_facturation_name", "fk_product_type_id", "portal_code","alarm_code","funeral_code", - "product_brand"); + "product_brand","product_reference"); $this->whiteTable = array( "client", "lieu", "trajet", "devis", "produit_devis", "facture", "produit", "configuration", "ligne_trajet", "thanato", "article", "defunt", "article_devis", "bibliotheque", "bijou_defunt", "obs_defunt", "hypo_defunt", "client_group_discount","client_group", @@ -3195,6 +3195,7 @@ class Bdd { defunt.sexe as defunt_sexe, defunt.ref_pacemaker as defunt_reference_pacemaker, defunt.product_brand as defunt_product_brand, + defunt.product_reference as defunt_product_reference, client.nom as client_nom, client.prenom as client_prenom, client.entreprise as client_entreprise, diff --git a/gestion/lib/Service/Certificate/PdfHandler/PacemakerCertificatePdfHandler.php b/gestion/lib/Service/Certificate/PdfHandler/PacemakerCertificatePdfHandler.php index c71afd0..a301982 100644 --- a/gestion/lib/Service/Certificate/PdfHandler/PacemakerCertificatePdfHandler.php +++ b/gestion/lib/Service/Certificate/PdfHandler/PacemakerCertificatePdfHandler.php @@ -98,6 +98,9 @@ class PacemakerCertificatePdfHandler extends FPDF { FileExportHelpers::FormatTextForExport("Numéro de série : "). FileExportHelpers::FormatTextForExport($this->devisOfDefunt['defunt_reference_pacemaker']),0,1); $this->Cell(0,6, + FileExportHelpers::FormatTextForExport("Référence du produit : "). + FileExportHelpers::FormatTextForExport($this->devisOfDefunt['defunt_product_reference']),0,1); + $this->Cell(0,6, FileExportHelpers::FormatTextForExport("Marque du produit : "). FileExportHelpers::FormatTextForExport($this->devisOfDefunt['defunt_product_brand']),0,1); $this->Cell(0,12, FileExportHelpers::FormatTextForExport("La présente attestion est établie pour faire valoir ce que de droit."),0,5); diff --git a/gestion/lib/Sql/20250129-ADD_PRODUCT_BRAND_ON_DEFUNT.sql b/gestion/lib/Sql/20250129-ADD_PRODUCT_BRAND_ON_DEFUNT.sql index b8350ec..79d7385 100644 --- a/gestion/lib/Sql/20250129-ADD_PRODUCT_BRAND_ON_DEFUNT.sql +++ b/gestion/lib/Sql/20250129-ADD_PRODUCT_BRAND_ON_DEFUNT.sql @@ -1,2 +1,3 @@ alter table oc_gestion_defunt add product_brand VARCHAR(255) DEFAULT ''; -update oc_gestion_defunt SET ref_pacemaker = '' WHERE ref_pacemaker = 'Référence pacemaker'; \ No newline at end of file +update oc_gestion_defunt SET ref_pacemaker = '' WHERE ref_pacemaker = 'Référence pacemaker'; +alter table oc_gestion_defunt add product_reference VARCHAR(255) DEFAULT ''; \ No newline at end of file diff --git a/gestion/templates/content/defuntshow.php b/gestion/templates/content/defuntshow.php index 59388f3..e720f71 100644 --- a/gestion/templates/content/defuntshow.php +++ b/gestion/templates/content/defuntshow.php @@ -81,11 +81,18 @@
-
Référence du produit
+
Référence pacemaker
" data-table="defunt" data-column="ref_pacemaker" data-id="id ?>"/>
+ +
+
Référence du produit
+
+ " data-table="defunt" data-column="product_reference" data-id="id ?>"/> +
+
Marque du produit
@@ -303,7 +310,7 @@
- + nextcloud.oc_calendar_invitations
Quantité(l)