lesanges/facturation
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Upgrade pour Garradin 1.0

Browse source
This commit is contained in:
Noizette 2020-12-29 17:07:26 +00:00
parent 9c52dc8b4e
commit 3001646e37
29 changed files with 860 additions and 828 deletions
Download patch file Download diff file Expand all files Collapse all files

32
www/admin/pdf.php
View file

@ -17,8 +17,7 @@ if (!$f = $facture->get($id))
throw new UserException("Ce document n'existe pas.");
}
$cats = new Compta\Categories;
$moyen_paiement = $cats->getMoyenPaiement($f->moyen_paiement);
$moyen_paiement = $facture->getMoyenPaiement($f->moyen_paiement);
try
{
@ -55,6 +54,11 @@ $pdf = new \Mpdf\Mpdf([
$pdf->SetAuthor($config->get('nom_asso'));
$emission = $f->date_emission->format('d/m/Y');
if (isset($f->date_echeance))
{
$echeance = $f->date_echeance->format('d/m/Y');
}
// Génération factures et devis
if ($f->type_facture < 2)
@ -62,7 +66,6 @@ if ($f->type_facture < 2)
ob_start();
$doc = ($f->type_facture?'Facture':'Devis').' n°'.$f->numero;
$emission = date('d/m/Y' ,$f->date_emission);
$pdf->SetTitle($doc.' - '.$emission);
$asso =
@ -83,7 +86,6 @@ if ($f->type_facture < 2)
(($t = $c->telephone)?"Tel : $t<br>":'');
$total = number_format($f->total, 2, ',', ' ');
$echeance = date('d/m/Y' ,$f->date_echeance);
$echeance = ($f->type_facture?'Échéance de paiement':'Échéance du devis')." : ".$echeance;
$reglee = !$f->reglee?'Cette facture est en attente de règlement.':'Cette facture a été reglée.';
$footer = str_replace("\n", '<br>', $plugin->getConfig('footer'));
@ -263,11 +265,11 @@ elseif ($f->type_facture == 2)
$pdf->WriteText(81, 45, $c->ville);
$pdf->WriteText(90, 70, utf8_decode("***".$f->total."***"));
// numfmt a l'air de patauger avec des valeurs < 1
$pdf->WriteText(62, 80, utf8_decode(numfmt_create('fr_FR', \NumberFormatter::SPELLOUT)->format($f->total)) . ' euros');
$pdf->WriteText(62, 80, numfmt_create('fr_FR', \NumberFormatter::SPELLOUT)->format($f->total) . ' euros');
$pdf->WriteText(73, 89.5, utf8_decode(strftime('%d', $f->date_emission)));
$pdf->WriteText(84, 89.5, utf8_decode(strftime('%m', $f->date_emission)));
$pdf->WriteText(100, 89.5, utf8_decode(strftime('%Y', $f->date_emission)));
$pdf->WriteText(73, 89.5, utf8_decode($f->date_emission->format('d')));
$pdf->WriteText(84, 89.5, utf8_decode($f->date_emission->format('m')));
$pdf->WriteText(100, 89.5, utf8_decode($f->date_emission->format('Y')));
if($plugin->getConfig('droit_art200')){
$pdf->WriteText(57.5, 103.5, "X");
@ -299,9 +301,9 @@ elseif ($f->type_facture == 2)
}
// Date d'édition du document
$pdf->WriteText(144.4, 246.2, utf8_decode(strftime('%d', $f->date_echeance)));
$pdf->WriteText(152.2, 246.2, utf8_decode(strftime('%m', $f->date_echeance)));
$pdf->WriteText(160, 246.2, utf8_decode(strftime('%Y', $f->date_echeance)));
$pdf->WriteText(144.4, 246.2, utf8_decode($f->date_echeance->format('d')));
$pdf->WriteText(152.2, 246.2, utf8_decode($f->date_echeance->format('m')));
$pdf->WriteText(160, 246.2, utf8_decode($f->date_echeance->format('Y')));
// Signature
$img = new Fichiers($plugin->getConfig('signaturetxt'));
@ -322,7 +324,6 @@ elseif ($f->type_facture == 3)
ob_start();
$doc = 'Reçu n°'.$f->numero;
$emission = date('d/m/Y',$f->date_emission);
$pdf->SetTitle($doc.' - '.$emission);
$asso =
@ -342,7 +343,8 @@ elseif ($f->type_facture == 3)
(($t = $c->email)?"Email : $t<br>":'').
(($t = $c->telephone)?"Tel : $t<br>":'');
$total = number_format($f->total, 2, ',', ' ');
$total = $f->total / 100;
$total = number_format($total, 2, ',', ' ');
$lieu = $plugin->getConfig('ville_asso');
$intitule = $f->contenu['intitule'];
@ -445,7 +447,7 @@ Bonjour,
Nous accusons réception de votre cotisation « $intitule » reçue le $emission et nous vous en remercions.
<br><br>
Nous reconnaissons que vous avez acquitté la somme de $total € par $moyen_paiement .
Nous reconnaissons que vous avez acquitté la somme de {$total} €.
<br>
Votre adhésion sera donc effective à compter du $souscription jusqu’au $expiration.
<br><br><br>
@ -474,5 +476,5 @@ else
$pdf->Output(
($f->type_facture?'Facture':'Devis').' '.$f->numero
. ' du '.date('d-m-Y' ,$f->date_emission)
. ' du '.$emission
.'.pdf', $t);