slambert/Thanasoft-Hytha
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finish bon de commande

Browse Source
This commit is contained in:
Tiavina 2025-02-06 10:29:58 +03:00
parent 9843977c2b
commit a8cdad27ba
4 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,8 @@ class Bdd {
"portal_code","alarm_code","funeral_code",
"product_brand","product_reference",
"fk_user_uuid",
"phone_number","address",'postal_code','city','email','siret_number','tva_intracommu');
"phone_number","address",'postal_code','city','email','siret_number','tva_intracommu',
'order_number','case_number');
$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",
@ -536,6 +537,8 @@ class Bdd {
.$this->tableprefix."facture.date, ".$this->tableprefix."devis.num as dnum, comment, date_paiement, type_paiement, id_devis, ".$this->tableprefix."client.nom, prenom, entreprise,"
.$this->tableprefix."devis.comment as dcomment,".$this->tableprefix."lieu.nom as lieu, ".$this->tableprefix."lieu.adresse as adresse_soin,"
.$this->tableprefix."defunt.nom as nom_defunt, "
.$this->tableprefix."devis.order_number as order_number, "
.$this->tableprefix."devis.case_number as case_number, "
.$this->tableprefix."facture_payment_type.facture_payment_type_label as facture_payment_type_label
FROM (".$this->tableprefix."facture
LEFT JOIN ".$this->tableprefix."devis on ".$this->tableprefix."facture.id_devis = ".$this->tableprefix."devis.id
@ -2868,6 +2871,8 @@ class Bdd {
devis.num as calendar_uuid,
devis.comment as devis_comment,
devis.id_client as devis_id_client,
devis.order_number as order_number,
devis.case_number as case_number,
client.nom as client_nom,
client.prenom as client_prenom,
client.entreprise as client_entreprise,
@ -2932,6 +2937,8 @@ class Bdd {
devis.num as calendar_uuid,
devis.comment as devis_comment,
devis.id_client as devis_id_client,
devis.order_number as order_number,
devis.case_number as case_number,
client.nom as client_nom,
client.prenom as client_prenom,
client.entreprise as client_entreprise,
@ -3019,6 +3026,8 @@ class Bdd {
devis.date as devis_date,
devis.num as calendar_uuid,
devis.comment as devis_comment,
devis.order_number as order_number,
devis.case_number as case_number,
client.nom as client_nom,
client.entreprise as client_entreprise,
client.adresse as client_adresse,

8
gestion/lib/Service/InvoicePdfHandler.php
View File

@ -145,7 +145,7 @@ class InvoicePdfHandler extends FPDF {
}
private function DrawInvoiceInfoTable(){
$this->setY(70);
$this->setY(67);
$factureDatePaiement = $this->factureData['date_paiement'];
$factureDatePaiement = DateTime::createFromFormat('Y-m-d',$factureDatePaiement);
$factureDateEcheance = $factureDatePaiement;
@ -164,6 +164,12 @@ class InvoicePdfHandler extends FPDF {
$this->Cell(40, 7, $this->factureData['num'], 1, 0, 'C');
$this->Cell(40, 7, $factureDateEcheance, 1, 1, 'C');
$this->Ln(2);
$orderNumber = ($this->factureData['order_number'] == "" || $this->factureData['order_number'] == "-" ) ? "Aucun" : $this->factureData['order_number'];
$caseNumber = ($this->factureData['case_number'] == "" || $this->factureData['case_number'] == "-") ? "Aucun" : $this->factureData['case_number'];
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport("Bon de commande: ".$orderNumber),0,1,'C');
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport("Numéro de dossier: ".$caseNumber),0,1,'C');
$this->Ln(8);
}

6
gestion/lib/Sql/20250206-ADD-ORDER-AND-CASE-NUMBER.sql Normal file
View File

@ -0,0 +1,6 @@
alter table oc_gestion_devis
add column order_number VARCHAR(255) DEFAULT '',
add column case_number VARCHAR(255) DEFAULT '';
update oc_gestion_devis set order_number = comment;
update oc_gestion_devis set order_number = '' where order_number = '-' or order_number = 'Commentaire' or order_number = 'New comment';

23
gestion/templates/content/factureshow.php
View File

@ -56,10 +56,27 @@
</div>
<div class="row">
<div class="col col-md">
<hr />
<div class="col col-xl mb-3 text-center editable" style="display:inline" data-table="devis" data-column="comment" data-id="<?php echo $_['facture'][0]->id_devis;?>"><?php echo ($_['facture'][0]->dcomment == "" ) ? "-" : $_['facture'][0]->dcomment ; ?></div>
<hr />
<label class="fw-bold">Commentaires:</label>
<div class="col col-xl mb-3 text-center editable"
style="display:inline"
data-table="devis" data-column="order_number"
data-id="<?php echo $_['facture'][0]->id_devis;?>">
<?php echo ($_['facture'][0]->order_number == "" ) ? "-" : $_['facture'][0]->order_number ; ?>
</div>
</div>
<hr />
</div>
<div class="row">
<div class="col col-md">
<label class="fw-bold">Numéro de dossier :</label>
<div class="col col-xl mb-3 text-center editable"
style="display:inline"
data-table="devis" data-column="case_number"
data-id="<?php echo $_['facture'][0]->id_devis;?>">
<?php echo ($_['facture'][0]->case_number == "" ) ? "-" : $_['facture'][0]->case_number ; ?>
</div>
</div>
<hr />
</div>
<div class="d-flex justify-content-between align-items-center">
<div><h2>Articles</h2></div>