Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 09:08:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean dead code

Browse Source
This commit is contained in:
ldestailleur
2025-06-20 14:00:29 +02:00
parent 2a85b73fa2
commit 446efdc432
2 changed files with 1 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@@ -749,17 +749,6 @@ class pdf_crabe extends ModelePDFFactures
$localtax1_type = $object->lines[$i]->localtax1_type;
$localtax2_type = $object->lines[$i]->localtax2_type;
// TODO remise_percent is an obsolete field for object parent
/*if ($object->remise_percent) {
$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
}
if ($object->remise_percent) {
$localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
}
if ($object->remise_percent) {
$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
}*/
$vatrate = (string) $object->lines[$i]->tva_tx;
// Retrieve type from database for backward compatibility with old records
@@ -1527,7 +1516,7 @@ class pdf_crabe extends ModelePDFFactures
$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, $outputlangs), 0, 'R', true);
$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $total_ht, 0, $outputlangs), 0, 'R', true);
if (getDolGlobalInt('PDF_INVOICE_SHOW_VAT_ANALYSIS')) {
$index++;

26
htdocs/core/modules/facture/doc/pdf_octopus.modules.php
View File

@@ -998,17 +998,6 @@ class pdf_octopus extends ModelePDFFactures
$localtax1_type = $object->lines[$i]->localtax1_type;
$localtax2_type = $object->lines[$i]->localtax2_type;
// TODO remise_percent is an obsolete field for object parent
/*if ($object->remise_percent) {
$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
}
if ($object->remise_percent) {
$localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
}
if ($object->remise_percent) {
$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
}*/
$vatrate = (string) $object->lines[$i]->tva_tx;
// Retrieve type from database for backward compatibility with old records
@@ -1677,21 +1666,6 @@ class pdf_octopus extends ModelePDFFactures
$pdf->SetXY($col2x, $tab2_top + 0);
$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht, 0, $outputlangs), 0, 'R', true);
$remise = !empty($object->remise) ? $object->remise : 0;
if ($remise > 0) {
$index++;
$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("DiscountHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("DiscountHT") : ''), 0, 'L', true);
$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($largcol2, $tab2_hl, price($remise, 0, $outputlangs), 0, 'R', true);
$index++;
$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTWithDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHTWithDiscount") : ''), 0, 'L', true);
$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht - $remise, 0, $outputlangs), 0, 'R', true);
}
if (getDolGlobalInt('PDF_INVOICE_SHOW_VAT_ANALYSIS')) {
$index++;
$pdf->SetFillColor(255, 255, 255);