lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Amlioration facture crabe pour la rendre plus conforme aux rglementations franaises:

Browse Source 
- Gestion affichage des totaux de tva par taux
- Affichage de la forme juridique
This commit is contained in:
Laurent Destailleur 2005-08-20 21:54:16 +00:00
parent 7ac94a2fa8
commit afec1a2a09
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/includes/modules/facture/pdf_crabe.modules.php
View File

@ -49,10 +49,11 @@ class pdf_crabe extends ModelePDFFactures
$this->name = "crabe"; $this->name = "crabe";
$this->description = "Modèle de facture complet (Gère l'option fiscale de facturation TVA, le choix du mode de règlement à afficher, logo...)"; $this->description = "Modèle de facture complet (Gère l'option fiscale de facturation TVA, le choix du mode de règlement à afficher, logo...)";
$this->format="A4"; $this->format="A4";
$this->option_logo = 1; // Affiche logo FAC_PDF_LOGO $this->option_logo = 1; // Affiche logo FAC_PDF_LOGO
$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION $this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
$this->option_modereg = 1; // Gere choix mode règlement FACTURE_CHQ_NUMBER, FACTURE_RIB_NUMBER $this->option_modereg = 1; // Gere choix mode règlement FACTURE_CHQ_NUMBER, FACTURE_RIB_NUMBER
$this->option_codeproduitservice = 1; // Affiche code produit-service FACTURE_CODEPRODUITSERVICE $this->option_codeproduitservice = 1; // Affiche code produit-service
$this->option_tvaintra = 1; // Affiche tva intra MAIN_INFO_TVAINTRA $this->option_tvaintra = 1; // Affiche tva intra MAIN_INFO_TVAINTRA
$this->option_capital = 1; // Affiche capital MAIN_INFO_CAPITAL $this->option_capital = 1; // Affiche capital MAIN_INFO_CAPITAL
if (defined("FACTURE_TVAOPTION") && FACTURE_TVAOPTION == 'franchise') if (defined("FACTURE_TVAOPTION") && FACTURE_TVAOPTION == 'franchise')
@ -150,7 +151,6 @@ class pdf_crabe extends ModelePDFFactures
$tab_top = 96; $tab_top = 96;
$tab_height = 110; $tab_height = 110;
//$pdf->SetFillColor(220,220,220);
$pdf->SetFont('Arial','', 9); $pdf->SetFont('Arial','', 9);
$iniY = $tab_top + 8; $iniY = $tab_top + 8;
@ -208,7 +208,7 @@ class pdf_crabe extends ModelePDFFactures
$pdf->MultiCell(14, 5, $fac->lignes[$i]->remise_percent."%", 0, 'R'); $pdf->MultiCell(14, 5, $fac->lignes[$i]->remise_percent."%", 0, 'R');
} }
// Total TVA // Total HT ligne
$pdf->SetXY ($this->postotalht, $curY); $pdf->SetXY ($this->postotalht, $curY);
$total = price($fac->lignes[$i]->price * $fac->lignes[$i]->qty); $total = price($fac->lignes[$i]->price * $fac->lignes[$i]->qty);
$pdf->MultiCell(26, 5, $total, 0, 'R', 0); $pdf->MultiCell(26, 5, $total, 0, 'R', 0);
@ -489,7 +489,7 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetXY ($col2x, $tab2_top + 0); $pdf->SetXY ($col2x, $tab2_top + 0);
$pdf->MultiCell(26, $tab2_hl, price($fac->total_ht + $fac->remise), 0, 'R', 1); $pdf->MultiCell(26, $tab2_hl, price($fac->total_ht + $fac->remise), 0, 'R', 1);
// Remise global // Remise globale
if ($fac->remise > 0) if ($fac->remise > 0)
{ {
$pdf->SetXY ($col1x, $tab2_top + $tab2_hl); $pdf->SetXY ($col1x, $tab2_top + $tab2_hl);
@ -538,8 +538,6 @@ class pdf_crabe extends ModelePDFFactures
$pdf->MultiCell(26, $tab2_hl, price(0), 0, 'R', 1); $pdf->MultiCell(26, $tab2_hl, price(0), 0, 'R', 1);
} }
// $pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
// $pdf->MultiCell(26, $tab2_hl, price($fac->total_tva), 0, 'R', 0);
$useborder=0; $useborder=0;
$index++; $index++;