root/THANASOFT-DV
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reference produit dans defunt

Browse Source
This commit is contained in:
Tiavina 2025-01-29 16:41:15 +03:00
parent 7dc7b556af
commit cc8bb6e44a
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gestion/lib/Db/Bdd.php
View File

@ -44,7 +44,7 @@ class Bdd {
"fk_client_group_facturation_id","group_facturation_name", "fk_client_group_facturation_id","group_facturation_name",
"fk_product_type_id", "fk_product_type_id",
"portal_code","alarm_code","funeral_code", "portal_code","alarm_code","funeral_code",
"product_brand"); "product_brand","product_reference");
$this->whiteTable = array( $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", "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", "client_group_discount","client_group",
@ -3195,6 +3195,7 @@ class Bdd {
defunt.sexe as defunt_sexe, defunt.sexe as defunt_sexe,
defunt.ref_pacemaker as defunt_reference_pacemaker, defunt.ref_pacemaker as defunt_reference_pacemaker,
defunt.product_brand as defunt_product_brand, defunt.product_brand as defunt_product_brand,
defunt.product_reference as defunt_product_reference,
client.nom as client_nom, client.nom as client_nom,
client.prenom as client_prenom, client.prenom as client_prenom,
client.entreprise as client_entreprise, client.entreprise as client_entreprise,

3
gestion/lib/Service/Certificate/PdfHandler/PacemakerCertificatePdfHandler.php
View File

@ -98,6 +98,9 @@ class PacemakerCertificatePdfHandler extends FPDF {
FileExportHelpers::FormatTextForExport("Numéro de série : "). FileExportHelpers::FormatTextForExport("Numéro de série : ").
FileExportHelpers::FormatTextForExport($this->devisOfDefunt['defunt_reference_pacemaker']),0,1); FileExportHelpers::FormatTextForExport($this->devisOfDefunt['defunt_reference_pacemaker']),0,1);
$this->Cell(0,6, $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("Marque du produit : ").
FileExportHelpers::FormatTextForExport($this->devisOfDefunt['defunt_product_brand']),0,1); 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); $this->Cell(0,12, FileExportHelpers::FormatTextForExport("La présente attestion est établie pour faire valoir ce que de droit."),0,5);

3
gestion/lib/Sql/20250129-ADD_PRODUCT_BRAND_ON_DEFUNT.sql
View File

@ -1,2 +1,3 @@
alter table oc_gestion_defunt add product_brand VARCHAR(255) DEFAULT ''; 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'; 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 '';

11
gestion/templates/content/defuntshow.php
View File

@ -81,11 +81,18 @@
</div> </div>
<!-- Référence pacemaker --> <!-- Référence pacemaker -->
<div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 16px"> <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 16px">
<div class="col-3">Référence du produit</div> <div class="col-3">Référence pacemaker</div>
<div class="col-9"> <div class="col-9">
<input class="gestion-input w-100" type="text" value="<?php echo ($_['defunt'][0]->ref_pacemaker ?? "") ?>" data-table="defunt" data-column="ref_pacemaker" data-id="<?php echo $_['defunt'][0]->id ?>"/> <input class="gestion-input w-100" type="text" value="<?php echo ($_['defunt'][0]->ref_pacemaker ?? "") ?>" data-table="defunt" data-column="ref_pacemaker" data-id="<?php echo $_['defunt'][0]->id ?>"/>
</div> </div>
</div> </div>
<!-- Product reference -->
<div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 16px">
<div class="col-3">Référence du produit</div>
<div class="col-9">
<input class="gestion-input w-100" type="text" value="<?php echo ($_['defunt'][0]->product_reference ?? "") ?>" data-table="defunt" data-column="product_reference" data-id="<?php echo $_['defunt'][0]->id ?>"/>
</div>
</div>
<!-- Product brand --> <!-- Product brand -->
<div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 16px"> <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 16px">
<div class="col-3">Marque du produit</div> <div class="col-3">Marque du produit</div>
@ -303,7 +310,7 @@
<ul class="ponction-list"></ul> <ul class="ponction-list"></ul>
</div> </div>
</div> </div>
<!-- Quantité ponction --> <!-- Quantité ponction -->nextcloud.oc_calendar_invitations
<div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 16px"> <div class="d-flex flex-row align-items-center col-12" style="margin-bottom: 16px">
<div class="col-3">Quantité(l)</div> <div class="col-3">Quantité(l)</div>
<div class="col-9"> <div class="col-9">