diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 6c311224ba0..2bc8b86a19c 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3664,6 +3664,9 @@ else if ($id > 0 || ! empty($ref))
print '
';
print ' | ';
+ if (! empty($conf->banque->enabled))
+ print ' | ';
+
print '' . price($total_next_ht) . ' | ';
print '' . price($total_next_ttc) . ' | ';
print ' | ';
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index fc9bae07c9c..2b3209a183b 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -453,7 +453,7 @@ class pdf_crabe extends ModelePDFFactures
$pageposafter=$pageposbefore;
//print $pageposafter.'-'.$pageposbefore;exit;
$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
- pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
+ pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX-$progress_width,3,$curX,$curY,$hideref,$hidedesc);
$pageposafter=$pdf->getPage();
$posyafter=$pdf->GetY();
//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
@@ -1452,6 +1452,17 @@ class pdf_crabe extends ModelePDFFactures
$pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("ReductionShort"),'','C');
}
}
+
+ if ($this->situationinvoice)
+ {
+ $pdf->line($this->postotalht+4, $tab_top, $this->postotalht+4, $tab_top + $tab_height);
+ if (empty($hidetop))
+ {
+ $pdf->SetXY($this->postotalht-19, $tab_top+1);
+ $pdf->MultiCell(30,2, $outputlangs->transnoentities("Situation"),'','C');
+ }
+ }
+
if ($this->atleastonediscount)
{
$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
@@ -1532,6 +1543,7 @@ class pdf_crabe extends ModelePDFFactures
if ($object->type == 2) $title=$outputlangs->transnoentities("InvoiceAvoir");
if ($object->type == 3) $title=$outputlangs->transnoentities("InvoiceDeposit");
if ($object->type == 4) $title=$outputlangs->transnoentities("InvoiceProFormat");
+ if ($this->situationinvoice) $title=$outputlangs->transnoentities("InvoiceSituation");
$pdf->MultiCell($w, 3, $title, '', 'R');
$pdf->SetFont('','B',$default_font_size);