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

Merge pull request #7988 from OPEN-DSI/core_pdf_modele_propal_payment_mode_flag

Browse Source 
Fix PROPALE_PDF_HIDE_PAYMENTTERMMODE and SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE
This commit is contained in:
Laurent Destailleur 2017-12-28 07:18:57 +01:00 committed by GitHub
commit 836a94fab2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -869,7 +869,7 @@ class pdf_azur extends ModelePDFPropales
$posy=$pdf->GetY()+3; $posy=$pdf->GetY()+3;
} }
if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMCOND)) if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMMODE))
{ {
// Check a payment mode is defined // Check a payment mode is defined
/* Not required on a proposal /* Not required on a proposal

16
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
View File

@ -716,22 +716,8 @@ class pdf_aurore extends ModelePDFSupplierProposal
$posy=$pdf->GetY()+3; $posy=$pdf->GetY()+3;
} }
else {
$pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy);
$titre = $outputlangs->transnoentities("PaymentConditions").':';
$pdf->MultiCell(80, 4, $titre, 0, 'L');
$pdf->SetFont('','', $default_font_size - 2); if (! empty($conf->global->SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE))
$pdf->SetXY($posxval, $posy);
$lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement);
$pdf->MultiCell(80, 4, $lib_condition_paiement,0,'L');
$posy=$pdf->GetY()+3;
}
if (! empty($conf->global->SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMCOND))
{ {
// Show payment mode // Show payment mode
if ($object->mode_reglement_code if ($object->mode_reglement_code