Fix: Payment mode not provided
This commit is contained in:
parent
12279fddec
commit
5a6b708626
@ -591,10 +591,15 @@ class pdf_crabe extends ModelePDFFactures
|
|||||||
$posy=$pdf->GetY()+3;
|
$posy=$pdf->GetY()+3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if ($object->type != 2)
|
||||||
|
{
|
||||||
/*
|
/*
|
||||||
* Check si absence mode reglement
|
* Check si absence mode reglement
|
||||||
*/
|
*/
|
||||||
if ($object->type != 2 && (! $conf->global->FACTURE_CHQ_NUMBER && ! $conf->global->FACTURE_RIB_NUMBER))
|
if (empty($object->mode_reglement_code)
|
||||||
|
&& ! $conf->global->FACTURE_CHQ_NUMBER
|
||||||
|
&& ! $conf->global->FACTURE_RIB_NUMBER)
|
||||||
{
|
{
|
||||||
$pdf->SetXY($this->marge_gauche, $posy);
|
$pdf->SetXY($this->marge_gauche, $posy);
|
||||||
$pdf->SetTextColor(200,0,0);
|
$pdf->SetTextColor(200,0,0);
|
||||||
@ -605,10 +610,28 @@ class pdf_crabe extends ModelePDFFactures
|
|||||||
$posy=$pdf->GetY()+1;
|
$posy=$pdf->GetY()+1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Sown payment mode
|
||||||
|
if ($object->mode_reglement_code
|
||||||
|
&& $object->mode_reglement_code != 'CHQ'
|
||||||
|
&& $object->mode_reglement_code != 'VIR')
|
||||||
|
{
|
||||||
|
$pdf->SetFont('Arial','B',8);
|
||||||
|
$pdf->SetXY($this->marge_gauche, $posy);
|
||||||
|
$titre = $outputlangs->transnoentities("PaymentMode").':';
|
||||||
|
$pdf->MultiCell(80, 5, $titre, 0, 'L');
|
||||||
|
|
||||||
|
$pdf->SetFont('Arial','',8);
|
||||||
|
$pdf->SetXY(50, $posy);
|
||||||
|
$lib_mode_reg=$outputlangs->transnoentities("PaymentMode".$object->mode_reglement_code)!=('PaymentMode'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentMode".$object->mode_reglement_code):$object->mode_reglement;
|
||||||
|
$pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
|
||||||
|
|
||||||
|
$posy=$pdf->GetY()+2;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Propose mode reglement par CHQ
|
* Propose mode reglement par CHQ
|
||||||
*/
|
*/
|
||||||
if ($object->type != 2 && (! $object->mode_reglement_code || $object->mode_reglement_code == 'CHQ'))
|
if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
|
||||||
{
|
{
|
||||||
// Si mode reglement non force ou si force a CHQ
|
// Si mode reglement non force ou si force a CHQ
|
||||||
if ($conf->global->FACTURE_CHQ_NUMBER)
|
if ($conf->global->FACTURE_CHQ_NUMBER)
|
||||||
@ -648,7 +671,7 @@ class pdf_crabe extends ModelePDFFactures
|
|||||||
/*
|
/*
|
||||||
* Propose mode reglement par RIB
|
* Propose mode reglement par RIB
|
||||||
*/
|
*/
|
||||||
if ($object->type != 2 && (! $object->mode_reglement_code || $object->mode_reglement_code == 'VIR'))
|
if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
|
||||||
{
|
{
|
||||||
// Si mode reglement non force ou si force a VIR
|
// Si mode reglement non force ou si force a VIR
|
||||||
if ($conf->global->FACTURE_RIB_NUMBER)
|
if ($conf->global->FACTURE_RIB_NUMBER)
|
||||||
@ -701,6 +724,7 @@ class pdf_crabe extends ModelePDFFactures
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return $posy;
|
return $posy;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user