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

case and order number condition in facture

Browse Source
This commit is contained in:
Tiavina 2025-02-07 16:52:41 +03:00
parent 3f6a94b869
commit b66521b3f8
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gestion/lib/Controller/PageController.php
View File

@ -1110,7 +1110,7 @@ class PageController extends Controller {
public function getFactures() {
//$this->synchronize_facture();
$result = $this->myDb->getFactures($this->idNextcloud);
$this->refreshFEC();
// $this->refreshFEC();
return $result;
}
@ -1120,7 +1120,7 @@ class PageController extends Controller {
*/
public function getFacturesWithProduits() {
$result = $this->myDb->getFacturesWithProduits($this->idNextcloud);
$this->refreshFEC();
// $this->refreshFEC();
return $result;
}
@ -1374,7 +1374,7 @@ class PageController extends Controller {
*/
public function insertFacture(){
$result = $this->myDb->insertFacture($this->idNextcloud);
$this->refreshFEC();
// $this->refreshFEC();
return $result;
}
@ -1486,7 +1486,7 @@ class PageController extends Controller {
// $this->generer_document_comptable($facturecourant->date_paiement);
}
}
$this->refreshFEC();
// $this->refreshFEC();
return $result;
}
return $this->myDb->gestion_update($table, $column, $data, $id, $this->idNextcloud);
@ -1501,7 +1501,7 @@ class PageController extends Controller {
public function exportDevisToFacture($devisToFacture,$paymentDate) {
$factureIdsGenerated = $this->myDb->insertFactureForeEachDevisId($this->idNextcloud,$devisToFacture,$paymentDate);
$this->invoicePdfService->generateFacturePdfByFactureIds($factureIdsGenerated,$this->idNextcloud);
$this->refreshFEC();
// $this->refreshFEC();
return true;
}
@ -1520,7 +1520,7 @@ class PageController extends Controller {
} else {
$result = $this->myDb->gestion_delete($table, $id, $this->idNextcloud);
}
$this->refreshFEC();
// $this->refreshFEC();
return $result;
}
return $this->myDb->gestion_delete($table, $id, $this->idNextcloud);

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

@ -165,10 +165,20 @@ class InvoicePdfHandler extends FPDF {
$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');
$orderNumberIsProvided = (trim($this->factureData['order_number']) !== "" && trim($this->factureData['order_number']) !== "-" );
$caseNumberIsProvided = (trim($this->factureData['case_number']) !== "" && trim($this->factureData['case_number']) !== "-");
if($orderNumberIsProvided){
if($caseNumberIsProvided == false){
$this->Ln(3);
}
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport("Bon de commande: ".$this->factureData['order_number']),0,1,'C');
}
if($caseNumberIsProvided){
if($orderNumberIsProvided == false){
$this->Ln(3);
}
$this->Cell(0, 5, FileExportHelpers::FormatTextForExport("Numéro de dossier: ".$this->factureData['case_number']),0,1,'C');
}
$this->Ln(8);
}

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

@ -56,7 +56,7 @@
</div>
<div class="row">
<div class="col col-md">
<label class="fw-bold">Commentaires:</label>
<label class="fw-bold">Commande :</label>
<div class="col col-xl mb-3 text-center editable"
style="display:inline"
data-table="devis" data-column="order_number"